diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..6ee8cfc06f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+* text eol=lf
+
+*.jar binary
+*.jpg binary
+*.pdf binary
+*.png binary
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 0000000000..d85ac7999c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Encountered an issue with Querydsl? Report it here.
+labels: 'bug'
+---
+
+## Observed vs. expected behavior
+
+<!--
+    Describe the issue you are experiencing:
+    What behaviour do you see?
+    What is the expected behaviour?
+-->
+
+## Steps to reproduce
+
+<!--
+    Describe the steps to reproduce the issue.
+    Consider providing a minimal working example.
+-->
+
+## Environment
+
+<!--
+    This information helps the maintainers to reproduce the issue in their environment.
+-->
+
+Querydsl version:
+
+Querydsl module:
+
+Database:
+
+JDK:
+
+## Additional details
+
+<!--
+    Do you have any other details you find relevant? Please specify them below.
+-->
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..54867f9a34
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Querydsl's User Guide
+    url: https://querydsl.github.io/static/querydsl/latest/reference/html_single/
+    about: Learn about Querydsl's features
+  - name: Querydsl's Google Group
+    url: https://groups.google.com/forum/#!forum/querydsl
+    about: Ask questions, suggest changes and provide feedback.
+  - name: Querydsl on Stackoverflow
+    url: https://stackoverflow.com/questions/tagged/querydsl
+    about: Seek help on setup and usage.
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 0000000000..b40c19c578
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,11 @@
+---
+name: Documentation improvement
+about: Encountered lacking or outdated documentation? Suggest improvements here.
+labels: 'documentation'
+---
+
+## Description
+
+<!--
+    Give a short summary on how the documentation can be improved.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 0000000000..c67e2078fe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Missing a feature? Suggest it here.
+labels: 'enhancement'
+---
+
+## Why the new feature should be added
+
+<!--
+    Give a short overview of your suggested feature.
+    Please describe why the feature will benefit the users of Querydsl.
+    Provide the context in which the feature will work best.
+-->
+
+## How the new feature should work
+
+<!--
+    What is the current behavior?
+    What is the new expected behaviour?
+    How does it affect existing features?
+-->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..83774e0f51
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 40
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 0000000000..f810c11c0c
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 365
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/.github/touched-file-so-ci-runs b/.github/touched-file-so-ci-runs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.github/touched-file-so-ci-runs2 b/.github/touched-file-so-ci-runs2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..b6de806a82
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,89 @@
+name: querydsl
+
+on:
+  push:
+    branches:
+      - '*'
+    paths-ignore:
+      - README.md
+
+  pull_request:
+    branches:
+      - '*'
+    paths-ignore:
+      - README.md
+
+env:
+  MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+jobs:
+  check_duplicate:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          concurrent_skipping: 'same_content_newer'
+
+  build:
+    needs: check_duplicate
+    if: ${{ needs.check_duplicate.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
+
+    strategy:
+      matrix:
+        target: [test]
+        java: [1.8, 11, 17, 21]
+        include:
+          - target: test
+            containers: db2 mysql postgresql mongo sqlserver oracle cubrid firebird
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Start test databases
+        if: ${{ matrix.containers }}
+        run: |
+          docker-compose up --detach ${{ matrix.containers }} &&\
+          time docker-compose up block-until-healthy &&\
+          docker ps
+
+      - name: Initialize cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
+      - name: Run tests
+        run: mvn --batch-mode install -am jacoco:report --activate-profiles all,travis,examples -Duser.timezone=UTC
+
+      - name: Upload test reports
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-reports
+          path: './**/target/surefire-reports/'
+
+      - name: Report coverage
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: mvn --batch-mode coveralls:report --activate-profiles all,travis
+
+      - name: Deploy snapshot 🚀
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        env:
+          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+        run: mvn --batch-mode clean deploy --settings deploy/.m2/settings.xml -DskipTests
+
+      - name: Clean up before caching
+        run: rm -rf ~/.m2/repository/com/querydsl/
diff --git a/.gitignore b/.gitignore
index e86640bd83..841de60045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ derby.log
 /devops/*.rpm.zip
 /devops/**/*.semaphore
 /devops/test-connection/.lein-repl-history
+**/.flattened-pom.xml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b463661444..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-services:
-  - mongodb
-addons:
-  postgresql: "9.3"
-install:
-  - sh -c 'cd querydsl-root && mvn -B -q install -Dmaven.javadoc.skip=true -DskipTests=true'
-before_script:
-  - mysql -e "create database querydsl;" -u root
-  - mysql -e "create database querydsl2;" -u root
-  - mysql -e "create user 'querydsl'@'localhost' identified by 'querydsl';" -u root
-  - mysql -e "grant all privileges on querydsl.* to 'querydsl'@'localhost';" -u root
-  - mysql -e "grant all privileges on querydsl2.* to 'querydsl'@'localhost';" -u root
-  - psql -c 'create database querydsl;' -U postgres
-  - psql -c 'create database querydsl2;' -U postgres
-  - psql -c "create user querydsl with password 'querydsl';" -U postgres
-  - psql -c 'grant all privileges on database querydsl to querydsl;' -U postgres
-  - psql -c 'grant all privileges on database querydsl2 to querydsl;' -U postgres
-  - psql -c 'create extension postgis;' -d querydsl -U postgres
-  - echo 'yes' | sudo add-apt-repository ppa:cubrid/cubrid
-  - sudo apt-get update
-  - sudo apt-get install cubrid
-  - sudo apt-get install cubrid-demodb
-  - /etc/profile.d/cubrid.sh
-  - hostname | sed 's/^/127.0.0.1 /g' | cat - /etc/hosts > /tmp/etchoststemp && sudo mv /tmp/etchoststemp /etc/hosts --force
-script:
-  - sh -c 'cd querydsl-root && mvn -B test -Pall,travis'
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..c121be66a6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,126 @@
+# Changelog
+
+### 5.0.0
+
+This release of QueryDSL targets Java 8 minimally and comes with various improvements to make QueryDSL ready for the modern Java ecosystem.
+This version also removes `joda-time:joda-time`, `com.google.guava:guava`  and `com.google.code.findbugs:jsr305` as required runtime dependencies for using QueryDSL.
+
+QueryDSL 5.0 is the long awaited major release after the QueryDSL project was left mostly unmaintained for over two years.
+With this release the team worked hard on resolving the most pressing issues that have been requested repeatedly for a long time.
+
+A huge thanks goes out to all contributors that made this release possible in their free time:
+
+* **[@mp911de](https://github.com/mp911de)**, for working on the MongoDB Document API;
+* **[@daniel-shuy](https://github.com/daniel-shuy)**, for working on decoupling `querydsl-sql` from `joda-time:joda-time`;
+* **[@heesuk-ahn](https://github.com/heesuk-ahn)**, for working on improved Hibernate support and count query generation in `JPASQLQuery`;
+* **[@harshtuna](https://github.com/harshtuna)**, for working on NullsLast ordering in `querydsl-collections`;
+* **[@kherrala](https://github.com/kherrala)**, **[@ridoo](https://github.com/ridoo)** and **[@NikitaKochkurov](https://github.com/NikitaKochkurov)** for working on the JTS and GeoLatte upgrade for `querydsl-spatial`;
+* **[@ridoo](https://github.com/ridoo)**, for working on Spatial support in `HibernateDomainExporter` and `JPADomainExporter`;
+* **[@lpandzic](https://github.com/lpandzic)**, for working on codegen support for Java 15 records and general improvements;
+* **[@F43nd1r](https://github.com/F43nd1r)**, for working on Kotlin Code generation, Java 11 support, general improvements and Continuous Integration;
+* **[@jwgmeligmeyling](https://github.com/jwgmeligmeyling)**, **[@Shredder121](https://github.com/Shredder121)**, **[@johnktims](https://github.com/johnktims)**, **[@idosal](https://github.com/idosal)** and **[@robertandrewbain](https://github.com/robertandrewbain)**.
+
+#### New features
+
+* [#2672](https://github.com/querydsl/querydsl/pull/2672) - Various performance and code improvements possible by targeting Java 8 source level.
+* [#2672](https://github.com/querydsl/querydsl/pull/2672) - Added `Fetchable#stream()` which returns a `Stream<T>`.
+  Make sure that the returned stream is always closed to free up resources, for example using _try-with-resources_.
+  It does not suffice to rely on a terminating operation on the stream for this (i.e. `forEach`, `collect`).
+* [#2324](https://github.com/querydsl/querydsl/issues/2324) - Removal of Guava as dependency.
+  Almost no required transitive dependencies to get started with QueryDSL.
+  And no more conflicts with Guava versions required by your other tools or own application.
+* [#2025](https://github.com/querydsl/querydsl/issues/2025) - `joda-time:joda-time` is no longer a required dependency for `querydsl-sql`.
+  By default, the Java 8 date/time API is used for date/time operations.
+  The `joda-time:joda-time` types will still be registered automatically if they are on the classpath.
+* [#2215](https://github.com/querydsl/querydsl/issues/2215) - MongoDB 4 support through the Document API 
+* [#2697](https://github.com/querydsl/querydsl/issues/2697) - Allow `com.querydsl.core.alias.Alias.*` to be used on a JRE by relying on ECJ as compiler
+* [#2479](https://github.com/querydsl/querydsl/issues/2479) - Swap out JSR305 for Jetbrains Annotations.
+  Because the Jetbrains Annotations, contrary to the JSR305 annotations, use a Class retention level, Jetbrains Annotations
+  does not have to be available at runtime and is not a transitive dependency.
+* [#658](https://github.com/querydsl/querydsl/issues/658) - Added `JPAExpressions#treat` which can be used to generate JPA 2.1 Treated path expressions.
+* [#2666](https://github.com/querydsl/querydsl/issues/2666) - More descriptive error message when using unsupported query features in JPA.
+* [#2106](https://github.com/querydsl/querydsl/issues/2106) - Support NullsLast ordering in `querydsl-collections`.
+* [#2404](https://github.com/querydsl/querydsl/issues/2404) - Upgrade of JTS / Geolatte in `querydsl-spatial`
+* [#2320](https://github.com/querydsl/querydsl/issues/2320) - Make Spatial support available to `HibernateDomainExporter` and `JPADomainExporter`. 
+* [#2612](https://github.com/querydsl/querydsl/issues/2612) - Support jakarta.* packages for new Jakarta EE releases (available through the`jakarta` classifiers for Maven)
+* [#1376](https://github.com/querydsl/querydsl/issues/1376) - Return typed expression from `nullif` and `coalesce` methods.
+* [#1828](https://github.com/querydsl/querydsl/issues/1828) - Kotlin Codegen support
+* [#2798](https://github.com/querydsl/querydsl/pull/2798) - Java Record support
+
+#### Bugfixes
+
+* [#2579](https://github.com/querydsl/querydsl/issues/2579) - Count query generation in `JPASQLQuery`
+* [#2671](https://github.com/querydsl/querydsl/issues/2671) - Fixed a concurrency issue in `Alias.*`. `Alias.*` is now Thread safe.
+* [#2053](https://github.com/querydsl/querydsl/issues/2053) - Work around issues with `AbstractJPAQuery#fetchResults` and `AbstractJPAQuery#fetchCount` in a query with a having clause by using an in-memory calculation.
+* [#2504](https://github.com/querydsl/querydsl/issues/2504) - Work around issues with `AbstractJPAQuery#fetchResults` and `AbstractJPAQuery#fetchCount` in a query with multiple group by expressions by using an in-memory calculation.
+* [#2663](https://github.com/querydsl/querydsl/issues/2663) - Fix issues with the JPA implementation of `InsertClause`.
+* [#2706](https://github.com/querydsl/querydsl/pull/2706) - Fix a memory leak in `TemplateFactory`.
+* [#2467](https://github.com/querydsl/querydsl/issues/2467) - Prevent `ExtendedBeanSerializer` from generating `toString` method twice
+* [#2326](https://github.com/querydsl/querydsl/issues/2326) - Use JPA indexed parameters instead of HQL's legacy positional parameters
+* [#2816](https://github.com/querydsl/querydsl/issues/2816) - Generated JPA query with incorrect argument binding indexes
+* [#1413](https://github.com/querydsl/querydsl/issues/1413) - Incorrect parameter values with Hibernate custom types
+* [#1429](https://github.com/querydsl/querydsl/issues/1429) - Reusing of constants in JPQL generation causes issues with hibernate query caching
+
+#### Breaking changes
+
+* Java 8 minimal requirement. If you still rely on Java <7, please use the latest 4.x.x version.
+* `JavaSE6SQLExceptionWrapper` and other parts regarding pre-Java 7 exception handling are removed. 
+* Removed bridge method that were in place for backwards compatibility of legacy API's. This may lead to some breaking API changes.
+* Removed Guava as a dependency. If your application relies on Guava, make sure to add it as a direct dependency for your project and not rely on QueryDSL shipping it transitively.
+* In order for Guava to be removed Mysema Codegen had to be rereleased as QueryDSL Codegen Utils.
+  Therefore, the classes in this module moved to a different package: `com.mysema.codegen` is now `com.querydsl.codegen.utils`.
+  This for example affects `com.mysema.codegen.model.SimpleType`.
+  Although many applications won't touch the codgen internal classes, custom APT extensions might be affected by this.
+* Due to the removal of Guava, any method that received an `ImmutableList` as parameter, now accepts any `List` instead.
+  Normal code should handle this signature just fine.
+  However, make sure to check any reflective uses of these parameters.
+* The `querydsl.variableNameFunctionClass` property for the `DefaultConfiguration` should now be provided as a `java.util.function.Function` instead of a `com.google.common.base.Function`.
+* `CodeWriter#beginStaticMethod` now takes a `java.util.function.Function` instead of a `com.google.common.base.Function`.
+* `AbstractLuceneQuery` now takes a `java.util.function.Function` instead of a `com.google.common.base.Function`.
+* `AbstractMongodbQuery` now takes a `java.util.function.Function` instead of a `com.google.common.base.Function`.
+* `com.querydsl.codegen.NamingFunction`, `EvaluatorFunction`, `DefaultVariableFunction` now extend `java.util.function.Function` instead of `com.google.common.base.Function`.
+* Any constructor that received a `javax.inject.Provider`, now takes a `java.util.function.Supplier` instead. In most cases you can replace the argument with `provider::get`.
+* This release targets Hibernate 5.2 in the Hibernate integration. If you need Hibernate 4 dialect specific workarounds, use the `HQLTemplates` instead of the `Hibernate5Templates`.
+* Removal of various deprecated methods.
+* `joda-time:joda-time` is now an optional dependency. If your application relies on `joda-time:joda-time` make sure to specify it as a direct dependency rather than relying on QueryDSL to include it transitively.
+* `com.google.code.findbugs:jsr305` is no longer a dependency. If your application currently relies on QueryDSL shipping JSR305 transitively, you should add JSR305 as a direct dependency to your project.
+* MDC keys now use an underscore instead of a dot as separator: ` querydsl.query` now is `querydsl_query` and `querydsl.parameters` is `querydsl_parameters`.
+* Removal of `PolyHedralSurface` in `querydsl-spatial` and `querydsl-sql-spatial` due to the upgrade of `geolatte-geom`.
+* `com.querydsl.apt.Extension` moved to `com.querydsl.codegen` and now resides in the `querydsl-codegen` module.
+* `com.querydsl.apt.SpatialSupport` moved to `com.querydsl.spatial.apt.SpatialSupport` and now resides in the `querydsl-spatial` module.
+* `com.querydsl.sql.codegen.SpatialSupport` moved to `com.querydsl.sql.spatial.SpatialSupport` and now resides in the `querydsl-sql-spatial` module.
+* `SQLServerGeometryReader` in `querydsl-sql-spatial` is removed in favour of `org.geolatte.geom.codec.db.sqlserver.*`.
+* `PGgeometryConverter` in `querydsl-sql-spatial` is removed in favour of `org.geolatte.geom.codec.Wkt`.
+* `JGeometryConverter` in `querydsl-sql-spatial` is removed in favour of `org.geolatte.geom.codec.db.oracle.*`.
+* Removal of `HibernateDomainExporter` in `querysql-jpa-codegen`. `HibernateDomainExporter` only supported Hibernate 4, which QueryDSL no longer actively supports. Instead, use the `JPADomainExporter` with Hibernate.
+* `ComparableExpression#coalesce` (and subtypes) no longer return a mutable `Coalesce` expression, but instead return a typed expression.
+  If you need the Coalesce builder, use `new Coalesce<T>().add(expression)` instead.
+* `getConstantToNamedLabel`, `getConstantToNumberedLabel` and `getConstantToAllLabels` that were temporarily introduced to `SerializerBase` and `JPQLSerializer` 
+  in QueryDSL 4.3.0 to eventually replace `getConstantToLabel` are now removed in favor of `getConstants`.
+
+#### Deprecations
+* `AbstractJPAQuery#fetchResults` and `AbstractJPAQuery#fetchCount` are now deprecated for queries that have multiple group by
+  expressions or a having clause, because these scenarios cannot be supported by pure JPA and are instead computed in-memory.
+  If the total count of results is not necessary, we recommend to always use `AbstractJPAQuery#fetch` instead.
+  If you want a reliable way of computing the result count for a paginated result for even the most complicated queries,
+  we recommend using the [Blaze-Persistence QueryDSL integration](https://persistence.blazebit.com/documentation/1.5/core/manual/en_US/#querydsl-integration).
+  `BlazeJPAQuery` properly implements both `fetchResults` and `fetchCount` and even comes with a `page` method.
+* `getConstantToLabel` which was deprecated in QueryDSL 4.3.0 is no longer deprecated.
+
+#### Dependency updates
+
+* `cglib:cglib` to 3.3.0 for Java 8+ support
+* `org.eclipse.jdt.core.compiler:ecj` to 4.6.1 for Java 8+ support
+* `joda-time:joda-time` to 2.10.10 for better interoperability with other frameworks that use more recent versions than QueryDSL.
+    `joda-time:joda-time` is also no longer a required dependency and as such is no longer provided transitively to your application.
+    If your application relies on `joda-time:joda-time` being available, make sure to add the dependency to your project. 
+* `org.geolatte:geolatte-geom` to 1.8.1 for better interopability with Hibernate Spatial.
+  `querydsl-spatial` is still backwards compatible with older versions of Geolatte, however, `querydsl-sql-spatial` is not and requires 1.4.0 or newer.
+* `com.vividsolutions:jts` to `org.locationtech:jts` for better interopability with Hibernate Spatial.
+  `com.vividsolutions:jts` is still supported for `querydsl-spatial` if an older version of `org.geolatte:geolatte-geom` is provided.
+* DataNucleus 5.2.x for Java 8+ support
+  * JDO now uses `org.datanucleus:javax.jdo` instead of `javax.jdo:jdo-api`
+* `com.google.guava:guava` is no longer a dependency of QueryDSL  and as such is no longer provided transitively to your application.
+    If your application relies on `com.google.guava:guava` being available, make sure to add the dependency to your project.
+* `com.google.code.findbugs:jsr305` is no longer a dependency of QueryDSL  and as such is no longer provided transitively to your application.
+    If your application relies on `com.google.code.findbugs:jsr305` being available, make sure to add the dependency to your project.
\ No newline at end of file
diff --git a/querydsl-root/LICENSE.txt b/LICENSE.txt
similarity index 98%
rename from querydsl-root/LICENSE.txt
rename to LICENSE.txt
index 29f81d812f..261eeb9e9f 100644
--- a/querydsl-root/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
index c048b52dab..7284d11e2f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,11 @@ Querydsl is a framework which enables the construction of type-safe SQL-like que
 
 Instead of writing queries as inline strings or externalizing them into XML files they are constructed via a fluent API.
 
-[![Build Status](https://travis-ci.org/querydsl/querydsl.svg?branch=master)](https://travis-ci.org/querydsl/querydsl)
+[![Website shields.io](https://img.shields.io/website-up-down-green-red/http/querydsl.github.io.svg)](https://querydsl.github.io/)
+[![Build Status](https://github.com/querydsl/querydsl/workflows/querydsl/badge.svg)](https://github.com/querydsl/querydsl/actions)
+[![Coverage Status](https://coveralls.io/repos/github/querydsl/querydsl/badge.svg?branch=master)](https://coveralls.io/github/querydsl/querydsl?branch=master)
+[![Stackoverflow](https://img.shields.io/badge/StackOverflow-querydsl-yellow.svg)](https://stackoverflow.com/questions/tagged/querydsl)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.querydsl/querydsl-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.querydsl/querydsl-core/)
 
 **Getting started**
 
@@ -12,55 +16,50 @@ Use these tutorials to get started
 
 * [Querying JPA](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02.html#jpa_integration)
 * [Querying SQL](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s03.html)
-* [Querying Mongodb](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s06.html)
-* [Querying Lucene](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s04.html)
-* [Querying Collections](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s07.html)
+* [Querying Mongodb](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s07.html)
+* [Querying Lucene](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s05.html)
+* [Querying Collections](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s08.html)
 * [Querydsl Spatial](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s04.html)
 * [Querying JDO](http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s02.html)
 
 **Examples**
 
-Querydsl example projects
-
-* [Querydsl JPA example](https://github.com/querydsl/querydsl-jpa-example)
-* [Querydsl SQL example](https://github.com/querydsl/querydsl-sql-example)
-* [Querydsl Customer DAO](https://github.com/querydsl/querydsl-customer-dao)
+[Querydsl example projects](https://github.com/querydsl/querydsl/tree/master/querydsl-examples)
 
 **Support**
 
-Free support is provided in the Querydsl Google Group https://groups.google.com/forum/#!forum/querydsl
+Free support is provided in the [Discussion Section](https://github.com/querydsl/querydsl/discussions) and on [StackOverflow](http://stackoverflow.com/questions/tagged/querydsl).
+Please do not post questions as issue. Such issues will be closed immediately.
 
 **How to build**
 
-Querydsl provides releases via public Maven repositories, but you can build the sources also yourself like this
+Querydsl provides releases via public Maven repositories, but you can also build the sources yourself like this
 
-    cd querydsl-root
-    mvn -DskipTests=true clean install 
+```BASH
+$ mvn -Pquickbuild,{projectname} clean install
+```
+Where projectname is one of the Maven profiles (e.g. `jpa`, `sql`, `mongodb`, etc. or `all`)
 
-For more information visit the project homepage at http://www.querydsl.com/.
+For more information visit the project homepage at https://querydsl.github.io.
 
-**Vagrant/Puppet setup**
+**Docker Compose setup**
 
-For running tests, a Vagrant/Puppet setup is provided. It is based on Ubuntu 12.04 and comes with the following databases:
+For running tests, a Docker Compose setup is provided. It comes with the following databases:
 
 * Oracle Express Edition 11g
 * PostgreSQL 9.1.10
 * MySQL 5.5.34
 * Cubrid 9.2
 
-You will need to install [VirtualBox], [Puppet], [Vagrant], the [vagrant-vbguest] plugin and [librarian-puppet]. You will also need to 
-download the Oracle XE 11g installer file (```oracle-xe-11.2.0-1.0.x86_64.rpm.zip```) manually and 
-place it in the ```devops``` directory.
+You will need to install [Docker] and [docker-compose].
 
-To launch the virtual machine:
+To launch the database containers:
 
-```
-$> cd devops
-devops$> librarian-puppet install
-devops$> vagrant up
+```BASH
+$ docker-compose up -d
 ``` 
 
-All of the databases' default ports are forwarded to the host machine. See the Vagrantfile for details.
+All of the databases' default ports are forwarded to the host machine.
 
 
 **How to contribute**
@@ -69,18 +68,9 @@ GitHub pull requests are the way to contribute to Querydsl.
 
 If you are unsure about the details of a contribution, ask on the Querydsl Google Group or create a ticket on GitHub.
 
-[VirtualBox]: https://www.virtualbox.org/
-[Vagrant]: http://www.vagrantup.com/
-[Puppet]: http://puppetlabs.com/
-[vagrant-vbguest]: https://github.com/dotless-de/vagrant-vbguest
-[librarian-puppet]: http://librarian-puppet.com/
-
-**Continuous integration**
-
-Querydsl uses Cloudbees for Jenkins based CI
-
-[![CloudBees](http://www.cloudbees.com/sites/default/files/Button-Built-on-CB-1.png)](https://querydsl.ci.cloudbees.com)
+[Docker]: https://www.docker.com/products/docker-desktop
+[docker-compose]: https://docs.docker.com/compose/
 
-As well as Travis CI for pull request validation
+### Slack
 
-[![Build Status](https://travis-ci.org/querydsl/querydsl.svg?branch=master)](https://travis-ci.org/querydsl/querydsl)
+If you want to join Slack workspace for Querydsl contributors join by following [this link](https://join.slack.com/t/querydsl/shared_invite/zt-r7ufzz6q-zxIHgpOSSMFvoU3YU4SclQ).
diff --git a/db/mysql.sh b/db/mysql.sh
new file mode 100644
index 0000000000..b6a038e9ac
--- /dev/null
+++ b/db/mysql.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "CREATE SCHEMA querydsl"
+mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "CREATE SCHEMA querydsl2"
+
+mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "GRANT ALL PRIVILEGES ON *.* TO 'querydsl'@'%'"
diff --git a/db/postgresql.sql b/db/postgresql.sql
new file mode 100644
index 0000000000..34de9ea9fa
--- /dev/null
+++ b/db/postgresql.sql
@@ -0,0 +1,2 @@
+create database querydsl2;
+grant all privileges on database querydsl2 to querydsl;
diff --git a/deploy/.m2/settings.xml b/deploy/.m2/settings.xml
new file mode 100644
index 0000000000..005d2529d8
--- /dev/null
+++ b/deploy/.m2/settings.xml
@@ -0,0 +1,16 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>sonatype-nexus-staging</id>
+            <username>${env.NEXUS_USERNAME}</username>
+            <password>${env.NEXUS_PASSWORD}</password>
+        </server>
+        <server>
+            <id>sonatype-nexus-snapshots</id>
+            <username>${env.NEXUS_USERNAME}</username>
+            <password>${env.NEXUS_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
\ No newline at end of file
diff --git a/devops/test-connection/src/test_connection/core.clj b/devops/test-connection/src/test_connection/core.clj
index 9fc1721aad..5f6d1eb0a9 100644
--- a/devops/test-connection/src/test_connection/core.clj
+++ b/devops/test-connection/src/test_connection/core.clj
@@ -22,7 +22,7 @@
 
 (def cubrid-db {:classname "cubrid.jdbc.driver.CUBRIDDriver"
                 :subprotocol "cubrid"
-                :subname "localhost:30000:demodb:public::"})
+                :subname "localhost:30000:demodb:dba::"})
 
 (count (j/query oracle-db (s/select * :all_tables)))
 (count (j/query postgres-db (s/select * :pg_catalog.pg_tables)))
diff --git a/dist.sh b/dist.sh
new file mode 100755
index 0000000000..0dead02a00
--- /dev/null
+++ b/dist.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+rm -rf target/dist
+mkdir -p target/dist
+mvn javadoc:aggregate
+
+for module in apt collections hibernate-search jpa jdo lucene3 lucene4 sql sql-codegen
+do
+  mvn -pl querydsl-$module -Dtest=X clean assembly:assembly
+done
+
+mkdir -p target/dist/reference
+mvn -f querydsl-docs/pom.xml -Dxslthl.config=http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml clean package
+cp -R querydsl-docs/target/docbook/publish/en-US/* target/dist/reference/
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000..035354a772
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,103 @@
+version: "2.4"
+services:
+  # Provides an easy way to ensure slow-starting databases are ready when the tests run
+  block-until-healthy:
+    image: alpine:latest
+    depends_on:
+      cubrid:
+        condition: service_healthy
+      db2:
+        condition: service_healthy
+      sqlserver:
+        condition: service_healthy
+
+  mysql:
+    image: mysql:5.6.38
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./db/mysql.sh:/docker-entrypoint-initdb.d/mysql.sh
+    environment:
+      - MYSQL_ROOT_PASSWORD=querydsl
+      - MYSQL_USER=querydsl
+      - MYSQL_PASSWORD=querydsl
+
+  postgresql:
+    image: mdillon/postgis:9.3-alpine
+    ports:
+      - "5433:5432"
+    volumes:
+      - ./db/postgresql.sql:/docker-entrypoint-initdb.d/postgresql.sql
+    environment:
+      - POSTGRES_USER=querydsl
+      - POSTGRES_PASSWORD=querydsl
+      - POSTGRES_DB=querydsl
+
+  oracle:
+    image: wnameless/oracle-xe-11g-r2:latest
+    ports:
+      - "1521:1521"
+    volumes:
+    - "./devops/sql-snippets/oracle.sql:/docker-entrypoint-initdb.d/oracle.sql"
+
+  cubrid:
+    image: lighthopper/cubrid:9.2.26.0004
+    command: "./create-start-demodb.sh"
+    ports:
+      - "33000:33000"
+      - "30000:30000"
+      - "8001:8001"
+      - "8002:8002"
+      - "1523:1523"
+    healthcheck:
+      test: csql demodb -c "SELECT 1"
+      interval: 5s
+      timeout: 60s
+      start_period: 60s
+
+  mongo:
+    image: mongo:3.6.1
+    ports:
+      - "27017:27017"
+
+  db2:
+    image: ibmcom/db2:11.5.0.0
+    privileged: true
+    ports:
+      - "50000:50000"
+    environment:
+      - DB2INST1_PASSWORD=a3sd!fDj
+      - DB2INSTANCE=db2inst1
+      - DBNAME=sample
+      - LICENSE=accept
+      - ARCHIVE_LOGS=false
+      - AUTOCONFIG=false
+    healthcheck:
+      test: /opt/ibm/db2/V11.5/bin/db2 CONNECT TO $$DBNAME
+      interval: 5s
+      timeout: 240s
+      start_period: 240s
+
+  sqlserver:
+    image: mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+    environment:
+      - ACCEPT_EULA=Y
+      - SA_PASSWORD=Password1!
+      - MSSQL_PID=Express
+    ports:
+      - "1433:1433"
+    healthcheck:
+      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$$SA_PASSWORD" -Q "SELECT 1" || exit 1
+      interval: 5s
+      timeout: 60s
+      start_period: 60s
+
+  firebird:
+    image: jacobalberty/firebird:v4
+    ports:
+      - "3050:3050"
+    environment:
+      - ISC_PASSWORD=masterkey
+      - FIREBIRD_DATABASE=querydsl.fdb
+      - FIREBIRD_USER=querydsl
+      - FIREBIRD_PASSWORD=querydsl
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..36a93c514f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,981 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-root</artifactId>
+  <version>5.1.0</version>
+    <name>Querydsl</name>
+  <description>parent project for Querydsl modules</description>
+  <url>https://querydsl.github.io/</url>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-parent</artifactId>
+    <version>0.1.0</version>
+  </parent>
+
+  <packaging>pom</packaging>
+
+  <inceptionYear>2007</inceptionYear>
+
+  <properties>
+    <failIfNoTests>false</failIfNoTests>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.homepage>http://www.querydsl.com</project.homepage>
+    <project.githubpage>http://github.com/querydsl/querydsl</project.githubpage>
+    <project.checkout>scm:git:git@github.com:querydsl/querydsl.git</project.checkout>
+
+    <!-- default groups to exclude from surefire plugin -->
+    <excludedGroups>
+      com.querydsl.core.testutil.ExternalDatabase,
+      com.querydsl.core.testutil.SlowTest,
+      com.querydsl.core.testutil.Performance,
+      com.querydsl.core.testutil.ReportingOnly
+    </excludedGroups>
+
+    <!-- groups to run with surefire plugin - intended to be overridden on the command line -->
+    <includedGroups></includedGroups>
+
+    <argLine>-Xms256m -Xmx512m</argLine>
+
+    <!-- SQL deps -->
+    <db2.version>11.5.7.0</db2.version>
+    <derby.version>10.15.2.0</derby.version>
+    <hsqldb.version>2.6.0</hsqldb.version>
+    <h2.version>1.4.197</h2.version>
+    <postgresql.version>42.3.4</postgresql.version>
+    <oracle.version>21.7.0.0</oracle.version>
+    <mysql.version>8.0.29</mysql.version>
+    <mssql.version>11.2.1.jre8</mssql.version>
+    <cubrid.version>9.3.9.0002</cubrid.version>
+    <sqlite.version>3.36.0.3</sqlite.version>
+    <teradata.version>13.10.00.35</teradata.version>
+    <firebird.version>4.0.6.java8</firebird.version>
+
+    <!-- JPA deps -->
+    <hibernate.version>5.4.8.Final</hibernate.version>
+    <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
+    <eclipselink.version>2.7.8</eclipselink.version>
+
+    <guava.version>31.1-jre</guava.version>
+    <codegen.version>0.6.8</codegen.version>
+    <mysema.lang.version>0.2.4</mysema.lang.version>
+    <cglib.version>3.3.0</cglib.version>
+    <asm.version>9.6</asm.version>
+    <slf4j.version>1.7.35</slf4j.version>
+    <surefire.version>3.2.2</surefire.version>
+    <animal-sniffer.version>1.20</animal-sniffer.version>
+    <jodatime.version>2.10.14</jodatime.version>
+    <h2gis.version>1.5.0</h2gis.version>
+    <morphia.version>1.3.2</morphia.version>
+    <jmh.version>1.35</jmh.version>
+    <hamcrest.veresion>2.2</hamcrest.veresion>
+    <kotlin.version>2.0.0-Beta4</kotlin.version>
+    <dokka.version>1.9.20</dokka.version>
+
+    <!-- Import-Package definitions for maven-bundle-plugin -->
+    <osgi.import.package.root>
+      *
+    </osgi.import.package.root>
+    <osgi.import.package>${osgi.import.package.root}</osgi.import.package>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>4.3</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib-nodep</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>animal-sniffer-annotations</artifactId>
+      <version>${animal-sniffer.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jetbrains</groupId>
+        <artifactId>annotations</artifactId>
+        <version>23.0.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.persistence</groupId>
+        <artifactId>jakarta.persistence-api</artifactId>
+        <version>2.2.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.datanucleus</groupId>
+        <artifactId>javax.jdo</artifactId>
+        <version>3.2.0-release</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vividsolutions</groupId>
+        <artifactId>jts</artifactId>
+        <version>1.13</version>
+      </dependency>
+      <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>${h2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>2.0.1.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jdt.core.compiler</groupId>
+        <artifactId>ecj</artifactId>
+        <version>4.6.1</version>
+      </dependency>
+      <dependency>
+        <groupId>io.github.classgraph</groupId>
+        <artifactId>classgraph</artifactId>
+        <version>4.8.146</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.28.0-GA</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.geolatte</groupId>
+        <artifactId>geolatte-geom</artifactId>
+        <version>1.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-bom</artifactId>
+        <version>${kotlin.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-scripting-jsr223</artifactId>
+        <version>${kotlin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml</groupId>
+        <artifactId>classmate</artifactId>
+        <version>1.5.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>3.4.3.Final</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <scm>
+    <connection>${project.checkout}</connection>
+    <developerConnection>${project.checkout}</developerConnection>
+    <url>${project.githubpage}</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>timowest</id>
+      <name>Timo Westkämper</name>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Project Manager</role>
+        <role>Architect</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>ssaarela</id>
+      <name>Samppa Saarela</name>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>ponzao</id>
+      <name>Vesa Marttila</name>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mangolas</id>
+      <name>Lassi Immonen</name>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>Shredder121</id>
+      <name>Ruben Dijkstra</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>johnktims</id>
+      <name>John Tims</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>robertandrewbain</id>
+      <name>Robert Bain</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>jwgmeligmeyling</id>
+      <name>Jan-Willem Gmelig Meyling</name>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.12.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>com.mysema.maven</groupId>
+          <artifactId>apt-maven-plugin</artifactId>
+          <version>1.1.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>5.1.4</version>
+          <executions>
+            <execution>
+              <id>bundle-manifest</id>
+              <phase>process-classes</phase>
+              <goals>
+                <goal>manifest</goal>
+              </goals>
+              <inherited>true</inherited>
+              <configuration>
+                <instructions>
+                  <Import-Package>
+                    ${osgi.import.package}
+                  </Import-Package>
+                  <Export-Package>com.querydsl.*</Export-Package>
+                </instructions>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.jetbrains.dokka</groupId>
+          <artifactId>dokka-maven-plugin</artifactId>
+          <version>${dokka.version}</version>
+          <executions>
+            <execution>
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>javadocJar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>kotlin-maven-plugin</artifactId>
+          <version>${kotlin.version}</version>
+          <configuration>
+            <jvmTarget>1.8</jvmTarget>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4.1</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <dependencyConvergence/>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>enforce-banned-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <!-- Jetbrains Annotations should be in provided scope -->
+                    <exclude>org.jetbrains:annotations:*:*:compile</exclude>
+                    <!-- JSR-305 annotations should not be used, instead use Jetbrains Annotations -->
+                    <exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
+                    <!-- The following API's should be optionally provided and declare provided scope -->
+                    <exclude>org.hibernate:hibernate-core:*:*:compile</exclude>
+                    <exclude>org.hibernate:hibernate-envers:*:*:compile</exclude>
+                    <exclude>org.hibernate.validator:hibernate-validator:*:*:compile</exclude>
+                    <exclude>org.eclipse.persistence:eclipselink:*:*:compile</exclude>
+                    <exclude>javax.transaction:jta:*:*:compile</exclude>
+                    <exclude>org.datanucleus:javax.jdo:*:*:compile</exclude>
+                    <exclude>org.springframework.roo:org.springframework.roo.annotations:*:*:compile</exclude>
+                    <exclude>org.mongodb.morphia:morphia:*:*:compile</exclude>
+                    <exclude>joda-time:joda-time:*:*:compile</exclude>
+                    <exclude>org.joda:joda-money:*:*:compile</exclude>
+                    <exclude>javax.el:javax.el-api:*:*:compile</exclude>
+                    <exclude>jakarta.persistence:jakarta.persistence-api:*:*:compile</exclude>
+                    <exclude>org.batoo.jpa:batoo-jpa:*:*:compile</exclude>
+                    <!-- The following database drivers should be in test scope -->
+                    <exclude>org.hsqldb:hsqldb:*:*:compile</exclude>
+                    <exclude>com.h2database:h2:*:*:compile</exclude>
+                    <exclude>org.apche.derby:derby:*:*:compile</exclude>
+                    <exclude>mysql:mysql-connector-java:*:*:compile</exclude>
+                    <exclude>com.microsoft.sqlserver:mssql-jdbc:*:*:compile</exclude>
+                    <exclude>com.oracle:ojdbc8:*:*:compile</exclude>
+                    <exclude>org.postgresql:postgresql:*:*:compile</exclude>
+                    <exclude>cubrid:cubrid-jdbc:*:*:compile</exclude>
+                    <exclude>org.firebirdsql.jdbc:jaybird:*:*:compile</exclude>
+                    <exclude>org.xerial:sqlite-jdbc:*:*:compile</exclude>
+                    <!-- hibernate-entitymanager is a legacy artefact and should not be used anymore -->
+                    <exclude>org.hibernate:hibernate-entitymanager</exclude>
+                    <!-- We favor JUL over Slf4j -->
+                    <exclude>org.slf4j:slf4j-api:*:*:compile</exclude>
+                    <exclude>org.slf4j:slf4j-log4j12:*:*:compile</exclude>
+                  </excludes>
+                  <searchTransitive>false</searchTransitive>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <version>0.15.3</version>
+        <configuration>
+          <parameter>
+            <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+            <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
+            <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
+            <ignoreMissingClasses>true</ignoreMissingClasses>
+            <excludeModules>
+              <excludeModule>querydsl-maven-plugin</excludeModule>
+              <excludeModule>querydsl-example.*</excludeModule>
+            </excludeModules>
+          </parameter>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>cmp</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../src/main/assembly.xml</descriptor>
+          </descriptors>
+          <outputDirectory>../target/dist</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eluder.coveralls</groupId>
+        <artifactId>coveralls-maven-plugin</artifactId>
+        <version>4.3.0</version>
+        <configuration>
+          <repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.11</version>
+        <executions>
+          <execution>
+            <id>prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.4.0</version>
+        <configuration>
+          <source>8</source>
+          <excludePackageNames>com.querydsl.examples.kotlin.*</excludePackageNames>
+          <outputDirectory>${project.build.directory}/dist/apidocs</outputDirectory>
+          <reportOutputDirectory>${project.build.directory}/dist/apidocs</reportOutputDirectory>
+          <detectJavaApiLink>false</detectJavaApiLink>
+          <groups>
+            <group>
+              <title>Core</title>
+              <packages>com.querydsl.core*</packages>
+            </group>
+            <group>
+              <title>Codegen</title>
+              <packages>com.querydsl.codegen*</packages>
+            </group>
+            <group>
+              <title>APT</title>
+              <packages>com.querydsl.apt*</packages>
+            </group>
+            <group>
+              <title>Maven</title>
+              <packages>com.querydsl.maven*</packages>
+            </group>
+            <group>
+              <title>Spatial</title>
+              <packages>com.querydsl.spatial*</packages>
+            </group>
+            <group>
+              <title>Collections</title>
+              <packages>com.querydsl.collections*</packages>
+            </group>
+            <group>
+              <title>JPA</title>
+              <packages>com.querydsl.jpa*</packages>
+            </group>
+            <group>
+              <title>JDO</title>
+              <packages>com.querydsl.jdo*</packages>
+            </group>
+            <group>
+              <title>SQL</title>
+              <packages>com.querydsl.sql*</packages>
+            </group>
+            <group>
+              <title>Lucene 3</title>
+              <packages>com.querydsl.lucene3*</packages>
+            </group>
+            <group>
+              <title>Lucene 4</title>
+              <packages>com.querydsl.lucene4*</packages>
+            </group>
+            <group>
+              <title>Lucene 5</title>
+              <packages>com.querydsl.lucene5*</packages>
+            </group>
+            <group>
+              <title>Hibernate Search</title>
+              <packages>com.querydsl.hibernate.search*</packages>
+            </group>
+            <group>
+              <title>Mongodb</title>
+              <packages>com.querydsl.mongodb*</packages>
+            </group>
+          </groups>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.15.0</version>
+        <configuration>
+          <targetJdk>1.6</targetJdk>
+          <includeTests>true</includeTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludedGroups>${excludedGroups}</excludedGroups>
+          <groups>${includedGroups}</groups>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>${animal-sniffer.version}</version>
+        <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java18</artifactId>
+            <version>1.0</version>
+          </signature>
+        </configuration>
+        <executions>
+          <execution>
+            <id>ensure-java-1.6-class-library</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>3.1.2</version>
+        <executions>
+          <execution>
+            <id>checkstyle</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <configLocation>src/main/resources/querydsl_checks_base.xml</configLocation>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <failOnViolation>true</failOnViolation>
+            </configuration>
+          </execution>
+          <execution>
+            <id>checkstyle-main</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <configLocation>src/main/resources/querydsl_checks_main.xml</configLocation>
+              <failOnViolation>true</failOnViolation>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>9.3</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <excludes>**/generated/**/*,**/jmh_generated/**/*,**/com/querydsl/codegen/utils/**/*</excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <pluginRepositories />
+
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation><activeByDefault>true</activeByDefault></activation>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-spatial</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-collections</module>
+        <module>querydsl-guava</module>
+        <module>querydsl-sql</module>
+        <module>querydsl-sql-spatial</module>
+        <module>querydsl-sql-codegen</module>
+        <module>querydsl-sql-spring</module>
+        <module>querydsl-maven-plugin</module>
+        <module>querydsl-jpa</module>
+        <module>querydsl-jpa-codegen</module>
+        <module>querydsl-jdo</module>
+        <module>querydsl-bom</module>
+        <module>querydsl-kotlin-codegen</module>
+
+        <!-- Lucene related -->
+        <module>querydsl-lucene3</module>
+        <module>querydsl-lucene4</module>
+        <module>querydsl-lucene5</module>
+        <module>querydsl-hibernate-search</module>
+
+        <!-- NoSQL -->
+        <module>querydsl-mongodb</module>
+
+        <!-- Languages -->
+        <module>querydsl-scala</module>
+        <module>querydsl-kotlin</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>hibernate-search</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-lucene3</module>
+        <module>querydsl-hibernate-search</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jpa</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-spatial</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-sql</module>
+        <module>querydsl-sql-spatial</module>
+        <module>querydsl-sql-codegen</module>
+        <module>querydsl-sql-spring</module>
+        <module>querydsl-maven-plugin</module>
+        <module>querydsl-jpa</module>
+        <module>querydsl-jpa-codegen</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jdo</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-spatial</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-sql</module>
+        <module>querydsl-sql-spatial</module>
+        <module>querydsl-sql-codegen</module>
+        <module>querydsl-sql-spring</module>
+        <module>querydsl-maven-plugin</module>
+        <module>querydsl-jdo</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>lucene</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-lucene3</module>
+        <module>querydsl-lucene4</module>
+        <module>querydsl-lucene5</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>mongodb</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-mongodb</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>sql</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-spatial</module>
+        <module>querydsl-sql</module>
+        <module>querydsl-sql-spatial</module>
+        <module>querydsl-sql-codegen</module>
+        <module>querydsl-sql-spring</module>
+        <module>querydsl-maven-plugin</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>collections</id>
+      <modules>
+        <module>querydsl-core</module>
+        <module>querydsl-codegen</module>
+        <module>querydsl-codegen-utils</module>
+        <module>querydsl-apt</module>
+        <module>querydsl-collections</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>docs</id>
+      <modules>
+        <module>querydsl-docs</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>examples</id>
+      <modules>
+        <module>querydsl-examples</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>jenkins</id>
+      <properties>
+        <excludedGroups>
+          com.querydsl.core.testutil.Performance,
+
+          com.querydsl.core.testutil.DB2,
+          com.querydsl.core.testutil.SQLServer
+        </excludedGroups>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>travis</id>
+      <properties>
+        <excludedGroups>
+          com.querydsl.core.testutil.Performance,
+          com.querydsl.core.testutil.ReportingOnly,
+
+          com.querydsl.core.testutil.Teradata
+        </excludedGroups>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <disableXmlReport>true</disableXmlReport>
+              <printSummary>false</printSummary>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>quickbuild</id>
+      <properties>
+        <skipTests>true</skipTests>
+        <checkstyle.skip>true</checkstyle.skip>
+        <enforcer.skip>true</enforcer.skip>
+        <animal.sniffer.skip>true</animal.sniffer.skip>
+        <japicmp.skip>true</japicmp.skip>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>java-8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <hsqldb.version>2.5.2</hsqldb.version>
+        <derby.version>10.14.2.0</derby.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>1.8</source>
+              <target>11</target>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.eluder.coveralls</groupId>
+            <artifactId>coveralls-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>2.3.2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>2.3.2</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>java-17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <version>${surefire.version}</version>
+              <configuration>
+                <argLine>
+                  --add-opens=java.base/java.lang=ALL-UNNAMED
+                  --add-opens=java.base/java.util=ALL-UNNAMED
+                </argLine>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>junit-report-maven-plugin</artifactId>
+        <version>devel</version>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>
diff --git a/querydsl-ant-test/build.xml b/querydsl-ant-test/build.xml
index b251dee1c9..2a0abd591a 100755
--- a/querydsl-ant-test/build.xml
+++ b/querydsl-ant-test/build.xml
@@ -1,55 +1,55 @@
-<project name="MyProject" default="dist" basedir=".">
-    <description>
-        simple example build file
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="generated" location="generated"/>
-
-    <path id="cp">
-      <fileset dir="lib">
-        <include name="*.jar"/>
-      </fileset>
-    </path>
-
-
-  <target name="init">
-    <tstamp/>
-    <mkdir dir="${build}"/>
-    <mkdir dir="${generated}"/>
-  </target>
-
-  <target name="compile" depends="init"
-        description="compile the source " >
-        
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.QuerydslAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>
-    
-  </target>
-
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
-    <mkdir dir="${dist}/lib"/>
-    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
-  </target>
-
-  <target name="clean"
-        description="clean up" >
-    <delete dir="${build}"/>
-    <delete dir="${generated}"/>
-    <delete dir="${dist}"/>
-  </target>
-  
-</project>
+<project name="MyProject" default="dist" basedir=".">
+    <description>
+        simple example build file
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+  <property name="generated" location="generated"/>
+
+    <path id="cp">
+      <fileset dir="lib">
+        <include name="*.jar"/>
+      </fileset>
+    </path>
+
+
+  <target name="init">
+    <tstamp/>
+    <mkdir dir="${build}"/>
+    <mkdir dir="${generated}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source " >
+        
+    <javac srcdir="${src}" classpathref="cp">
+      <compilerarg value="-proc:only"/>      
+      <compilerarg value="-processor"/>
+      <compilerarg value="com.mysema.query.apt.QuerydslAnnotationProcessor"/>
+      <compilerarg value="-s"/>
+      <compilerarg value="${generated}"/>
+    </javac>
+    
+    <javac classpathref="cp" destdir="${build}">      
+      <src path="${src}"/>
+      <src path="${generated}"/>
+    </javac>
+    
+  </target>
+
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <mkdir dir="${dist}/lib"/>
+    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
+  </target>
+
+  <target name="clean"
+        description="clean up" >
+    <delete dir="${build}"/>
+    <delete dir="${generated}"/>
+    <delete dir="${dist}"/>
+  </target>
+  
+</project>
diff --git a/querydsl-ant-test/src/test/Test.java b/querydsl-ant-test/src/test/Test.java
index 02ee9ee8f9..1785678916 100755
--- a/querydsl-ant-test/src/test/Test.java
+++ b/querydsl-ant-test/src/test/Test.java
@@ -1,15 +1,15 @@
-package test;
-import java.math.BigDecimal;
-
-import com.mysema.query.annotations.QueryEntity;
-
-
-@QueryEntity
-public class Test {
-    
-    private String property;
-
-    private int intProperty;
-    
-    private BigDecimal bigDecimal;
-}
+package test;
+import java.math.BigDecimal;
+
+import com.mysema.query.annotations.QueryEntity;
+
+
+@QueryEntity
+public class Test {
+
+    private String property;
+
+    private int intProperty;
+
+    private BigDecimal bigDecimal;
+}
diff --git a/querydsl-apt/etc/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/etc/META-INF/services/javax.annotation.processing.Processor
index 3c35a2e619..9a9230aef5 100644
--- a/querydsl-apt/etc/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/etc/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.EntityAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.EntityAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/etc/readme.txt b/querydsl-apt/etc/readme.txt
deleted file mode 100644
index 3d27748804..0000000000
--- a/querydsl-apt/etc/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-* TODO : supertype references need to preserve type parameters
\ No newline at end of file
diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index b113fca31c..5cecb9ae2f 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-apt</artifactId>
   <name>Querydsl - APT support</name>
   <description>APT based Source code generation for Querydsl</description>
@@ -22,15 +22,9 @@
     <url>${project.githubpage}</url>
   </scm>
 
-  <properties>
-    <hibernate.version>4.2.0.Final</hibernate.version>
-    <jdo.version>2.3-eb</jdo.version>
-    <morphia.version>0.105</morphia.version>
-  </properties>
-
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-codegen</artifactId>
       <version>${project.version}</version>
       <exclusions>
@@ -40,24 +34,28 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
-    <!-- provided -->    
     <dependency>
-      <groupId>javax.jdo</groupId>
-      <artifactId>jdo2-api</artifactId>
-      <version>${jdo.version}</version>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>2.2.3</version>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
+    
+    <!-- provided -->
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
+      <groupId>org.datanucleus</groupId>
+      <artifactId>javax.jdo</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.roo</groupId>
       <artifactId>org.springframework.roo.annotations</artifactId>
-      <version>1.2.3.RELEASE</version>
+      <version>1.3.2.RELEASE</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -85,7 +83,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>${jodatime.version}</version>
       <scope>test</scope>
     </dependency>  
     <dependency>
@@ -93,6 +91,12 @@
       <artifactId>hibernate-core</artifactId>
       <version>${hibernate.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>javassist</artifactId>
+          <groupId>org.javassist</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>     
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -101,7 +105,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -111,14 +115,13 @@
     <dependency>
       <groupId>org.joda</groupId>
       <artifactId>joda-money</artifactId>
-      <version>0.9</version>
+      <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
     
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.7.1</version>
       <scope>test</scope>
     </dependency>
             
@@ -128,21 +131,34 @@
     <plugins>
     <!-- 
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
           <testClasspath>true</testClasspath>
           <targetFolder>target/genericExporter</targetFolder>
           <packages>
-            <package>com.mysema.query.domain</package>
+            <package>com.querydsl.core.domain</package>
           </packages>
         </configuration>
       </plugin>
        -->
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.apt</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>    
          
       <plugin>
@@ -150,7 +166,25 @@
         <configuration>
           <useSystemClassLoader>false</useSystemClassLoader>
         </configuration>
-      </plugin>  
+      </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>org.eclipse.transformer.maven</artifactId>
+        <version>0.2.0</version>
+        <executions>
+          <execution>
+            <id>jakarta-ee</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <classifier>jakarta</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -167,6 +201,7 @@
                 <descriptor>src/main/hibernate.xml</descriptor>
                 <descriptor>src/main/jdo.xml</descriptor>
                 <descriptor>src/main/jpa.xml</descriptor>
+                <descriptor>src/main/jakarta.xml</descriptor>
                 <descriptor>src/main/morphia.xml</descriptor>
                 <descriptor>src/main/roo.xml</descriptor>
                 <descriptor>src/main/onejar.xml</descriptor>
@@ -176,7 +211,7 @@
           </execution>    
         </executions>        
       </plugin>         
-         
+
       <plugin>
         <groupId>com.mysema.maven</groupId>
         <artifactId>apt-maven-plugin</artifactId>
@@ -191,10 +226,10 @@
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
               <logOnlyOnError>true</logOnlyOnError>
               <processors>
-                <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
-                <processor>com.mysema.query.apt.hibernate.HibernateAnnotationProcessor</processor> 
-                <processor>com.mysema.query.apt.jdo.JDOAnnotationProcessor</processor>
-                <processor>com.mysema.query.apt.roo.RooAnnotationProcessor</processor>
+                <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+                <processor>com.querydsl.apt.hibernate.HibernateAnnotationProcessor</processor>
+                <processor>com.querydsl.apt.jdo.JDOAnnotationProcessor</processor>
+                <processor>com.querydsl.apt.roo.RooAnnotationProcessor</processor>
               </processors>              
             </configuration>
           </execution>                            
@@ -224,12 +259,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <!--for org.springframework.roo:org.springframework.roo.annotations -->
-    <repository>
-      <id>spring roo repository</id>
-      <url>http://spring-roo-repository.springsource.org/release</url>
-    </repository>
-  </repositories>
+  <repositories />
   
-</project>
+</project>
diff --git a/querydsl-apt/src/apt/general/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/general/META-INF/services/javax.annotation.processing.Processor
index 819d6cd88f..e31d641cff 100644
--- a/querydsl-apt/src/apt/general/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/general/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.QuerydslAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.QuerydslAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/apt/hibernate/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/hibernate/META-INF/services/javax.annotation.processing.Processor
index 4f7291436b..bb12f8599e 100644
--- a/querydsl-apt/src/apt/hibernate/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/hibernate/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.hibernate.HibernateAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.hibernate.HibernateAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/apt/jdo/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/jdo/META-INF/services/javax.annotation.processing.Processor
index 390c5f8f7f..ff511957d0 100644
--- a/querydsl-apt/src/apt/jdo/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/jdo/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.jdo.JDOAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.jdo.JDOAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/apt/jpa/META-INF/gradle/incremental.annotation.processors b/querydsl-apt/src/apt/jpa/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 0000000000..e6e3960816
--- /dev/null
+++ b/querydsl-apt/src/apt/jpa/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+com.querydsl.apt.jpa.JPAAnnotationProcessor,isolating
diff --git a/querydsl-apt/src/apt/jpa/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/jpa/META-INF/services/javax.annotation.processing.Processor
index 4774bfb506..720345c294 100644
--- a/querydsl-apt/src/apt/jpa/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/jpa/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.jpa.JPAAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.jpa.JPAAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/apt/morphia/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/morphia/META-INF/services/javax.annotation.processing.Processor
index 7a4886bc1e..d0b82f8576 100644
--- a/querydsl-apt/src/apt/morphia/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/morphia/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.morphia.MorphiaAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.morphia.MorphiaAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/apt/roo/META-INF/services/javax.annotation.processing.Processor b/querydsl-apt/src/apt/roo/META-INF/services/javax.annotation.processing.Processor
index 689f34fa38..8ba591975e 100644
--- a/querydsl-apt/src/apt/roo/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-apt/src/apt/roo/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.roo.RooAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.roo.RooAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-apt/src/main/general.xml b/querydsl-apt/src/main/general.xml
index 0ad441d8df..8c6293e7d1 100644
--- a/querydsl-apt/src/main/general.xml
+++ b/querydsl-apt/src/main/general.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt/general</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt/general</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/main/hibernate.xml b/querydsl-apt/src/main/hibernate.xml
index 98cb428ca2..4861280d03 100644
--- a/querydsl-apt/src/main/hibernate.xml
+++ b/querydsl-apt/src/main/hibernate.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt/hibernate</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt/hibernate</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/main/jakarta.xml b/querydsl-apt/src/main/jakarta.xml
new file mode 100644
index 0000000000..959d5d1cc9
--- /dev/null
+++ b/querydsl-apt/src/main/jakarta.xml
@@ -0,0 +1,29 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>jakarta</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+      <useAllReactorProjects>true</useAllReactorProjects>
+      <includes>
+        <include>${project.groupId}:${project.artifactId}</include>
+      </includes>
+      <binaries>
+        <unpack>true</unpack>
+        <includeDependencies>false</includeDependencies>
+        <attachmentClassifier>jakarta</attachmentClassifier>
+        <outputDirectory>/</outputDirectory>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+  <fileSets>
+    <fileSet>
+      <directory>src/apt/jpa</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/APTException.java b/querydsl-apt/src/main/java/com/mysema/query/apt/APTException.java
deleted file mode 100644
index 066264e0fe..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/APTException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-/**
- * Exception thrown on APT processing errors
- * 
- * @author tiwe
- *
- */
-public class APTException extends RuntimeException {
-
-    private static final long serialVersionUID = -8456970330509020462L;
-
-    public APTException(String msg) {
-        super(msg);
-    }
-
-    public APTException(String msg, Throwable t) {
-        super(msg, t);
-    }
-
-    public APTException(Throwable t) {
-        super(t);
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/APTOptions.java b/querydsl-apt/src/main/java/com/mysema/query/apt/APTOptions.java
deleted file mode 100644
index f98bb65395..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/APTOptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-/**
- * APT options supported by Querydsl
- *
- * @author tiwe
- *
- */
-public final class APTOptions {
-
-    public static final String QUERYDSL_CREATE_DEFAULT_VARIABLE = "querydsl.createDefaultVariable";
-
-    public static final String QUERYDSL_PREFIX = "querydsl.prefix";
-
-    public static final String QUERYDSL_SUFFIX = "querydsl.suffix";
-
-    public static final String QUERYDSL_PACKAGE_SUFFIX = "querydsl.packageSuffix";
-
-    public static final String QUERYDSL_MAP_ACCESSORS = "querydsl.mapAccessors";
-
-    public static final String QUERYDSL_LIST_ACCESSORS = "querydsl.listAccessors";
-
-    public static final String QUERYDSL_ENTITY_ACCESSORS = "querydsl.entityAccessors";
-
-    public static final String QUERYDSL_EXCLUDED_PACKAGES = "querydsl.excludedPackages";
-
-    public static final String QUERYDSL_EXCLUDED_CLASSES = "querydsl.excludedClasses";
-
-    public static final String QUERYDSL_INCLUDED_PACKAGES = "querydsl.includedPackages";
-
-    public static final String QUERYDSL_INCLUDED_CLASSES = "querydsl.includedClasses";
-
-    public static final String QUERYDSL_UNKNOWN_AS_EMBEDDABLE = "querydsl.unknownAsEmbeddable";
-
-    private APTOptions() {}
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java b/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java
deleted file mode 100644
index 9a24f5f4b3..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeMirror;
-
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.util.Annotations;
-
-/**
- * Configuration defines the configuration options for APT based Querydsl code generation
- *
- * @author tiwe
- *
- */
-public interface Configuration {
-
-    /**
-     * @return
-     */
-    boolean isUnknownAsEmbedded();
-
-    /**
-     * @return
-     */
-    TypeMappings getTypeMappings();
-
-    /**
-     * @param e
-     * @param elements
-     * @return
-     */
-    VisitorConfig getConfig(TypeElement e, List<? extends Element> elements);
-
-    /**
-     * @return
-     */
-    Serializer getDTOSerializer();
-
-    /**
-     * @return
-     */
-    @Nullable
-    Class<? extends Annotation> getEntitiesAnnotation();
-
-    /**
-     * @return
-     */
-    @Nullable
-    Class<? extends Annotation> getEmbeddedAnnotation();
-
-    /**
-     * @return
-     */
-    @Nullable
-    Class<? extends Annotation> getEmbeddableAnnotation();
-
-    /**
-     * @return
-     */
-    Serializer getEmbeddableSerializer();
-
-    /**
-     * @return
-     */
-    Class<? extends Annotation> getEntityAnnotation();
-
-    /**
-     * @return
-     */
-    Class<? extends Annotation> getAlternativeEntityAnnotation();
-
-    /**
-     * @return
-     */
-    Set<Class<? extends Annotation>> getEntityAnnotations();
-
-    /**
-     * @return
-     */
-    Serializer getEntitySerializer();
-
-    /**
-     * @return
-     */
-    String getNamePrefix();
-
-    /**
-     * @return
-     */
-    String getNameSuffix();
-
-    /**
-     * @param entityType
-     * @return
-     */
-    SerializerConfig getSerializerConfig(EntityType entityType);
-
-    /**
-     * @return
-     */
-    @Nullable
-    Class<? extends Annotation> getSkipAnnotation();
-
-    /**
-     * @return
-     */
-    @Nullable
-    Class<? extends Annotation> getSuperTypeAnnotation();
-
-    /**
-     * @return
-     */
-    Serializer getSupertypeSerializer();
-
-    /**
-     * @param field
-     * @return
-     */
-    boolean isBlockedField(VariableElement field);
-
-    /**
-     * @param getter
-     * @return
-     */
-    boolean isBlockedGetter(ExecutableElement getter);
-
-    /**
-     * @return
-     */
-    boolean isUseFields();
-
-    /**
-     * @return
-     */
-    boolean isUseGetters();
-
-    /**
-     * @param constructor
-     * @return
-     */
-    boolean isValidConstructor(ExecutableElement constructor);
-
-    /**
-     * @param field
-     * @return
-     */
-    boolean isValidField(VariableElement field);
-
-    /**
-     * @param getter
-     * @return
-     */
-    boolean isValidGetter(ExecutableElement getter);
-
-    /**
-     * @return
-     */
-    Collection<String> getKeywords();
-
-    /**
-     * @return
-     */
-    QueryTypeFactory getQueryTypeFactory();
-
-    /**
-     * @param packageName
-     */
-    void addExcludedPackage(String packageName);
-
-    /**
-     * @param className
-     */
-    void addExcludedClass(String className);
-
-    /**
-     * @param method
-     * @return
-     */
-    TypeMirror getRealType(ExecutableElement method);
-
-    /**
-     * @param field
-     * @return
-     */
-    TypeMirror getRealType(VariableElement field);
-
-    /**
-     * @param packageName
-     * @return
-     */
-    boolean isExcludedPackage(String packageName);
-
-    /**
-     * @param className
-     * @return
-     */
-    boolean isExcludedClass(String className);
-
-    /**
-     * @param element
-     * @param annotations
-     */
-    void inspect(Element element, Annotations annotations);
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/Context.java b/querydsl-apt/src/main/java/com/mysema/query/apt/Context.java
deleted file mode 100644
index 9af8e5ab22..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/Context.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.lang.model.element.TypeElement;
-
-import com.mysema.query.codegen.EntityType;
-
-/**
- * Context of handled types used by {@link AbstractQuerydslProcessor}
- * 
- * @author tiwe
- *
- */
-public class Context {
-
-    final Map<String, EntityType> supertypes  = new HashMap<String, EntityType>();
-
-    final Map<String, EntityType> allTypes = new HashMap<String, EntityType>();
-
-    final Map<String, EntityType> projectionTypes = new HashMap<String, EntityType>();
-
-    final Map<String, EntityType> embeddableTypes = new HashMap<String,EntityType>();
-
-    final Map<String, EntityType> entityTypes = new HashMap<String, EntityType>();
-
-    final Map<String, EntityType> extensionTypes = new HashMap<String,EntityType>();
-    
-    final Map<String, Set<TypeElement>> typeElements = new HashMap<String,Set<TypeElement>>();
-
-    public void clean() {
-        for (String key : supertypes.keySet()) {
-            entityTypes.remove(key);
-            extensionTypes.remove(key);
-            embeddableTypes.remove(key);
-        }
-        
-        for (String key : entityTypes.keySet()) {
-            supertypes.remove(key);
-            extensionTypes.remove(key);
-            embeddableTypes.remove(key);
-        }
-    }
-    
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java b/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java
deleted file mode 100644
index 02c48989b4..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static com.mysema.query.apt.APTOptions.QUERYDSL_CREATE_DEFAULT_VARIABLE;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_ENTITY_ACCESSORS;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_EXCLUDED_CLASSES;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_EXCLUDED_PACKAGES;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_INCLUDED_CLASSES;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_INCLUDED_PACKAGES;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_LIST_ACCESSORS;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_MAP_ACCESSORS;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_PACKAGE_SUFFIX;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_PREFIX;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_SUFFIX;
-import static com.mysema.query.apt.APTOptions.QUERYDSL_UNKNOWN_AS_EMBEDDABLE;
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeMirror;
-
-import com.google.common.base.Strings;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.query.annotations.Config;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.codegen.EmbeddableSerializer;
-import com.mysema.query.codegen.EntitySerializer;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.ProjectionSerializer;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-import com.mysema.query.codegen.SupertypeSerializer;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.query.types.Expression;
-import com.mysema.util.Annotations;
-
-/**
- * DefaultConfiguration is a simple implementation of the {@link Configuration} interface
- *
- * @author tiwe
- *
- */
-public class DefaultConfiguration implements Configuration {
-
-    private static final String DEFAULT_SEPARATOR = ",";
-
-    private boolean unknownAsEmbedded;
-
-    private final CodegenModule module = new CodegenModule();
-
-    private final SerializerConfig defaultSerializerConfig;
-
-    private final Map<String, SerializerConfig> packageToConfig = new HashMap<String, SerializerConfig>();
-
-    protected final Class<? extends Annotation> entityAnn;
-
-    @Nonnull
-    private final Set<String> excludedPackages, excludedClasses;
-
-    @Nonnull
-    private final Set<String> includedPackages, includedClasses;
-
-    @Nullable
-    protected final Class<? extends Annotation> entitiesAnn, superTypeAnn, embeddedAnn, embeddableAnn, skipAnn;
-
-    @Nullable
-    protected Class<? extends Annotation> altEntityAnn;
-
-    private final Set<Class<? extends Annotation>> entityAnnotations = new HashSet<Class<? extends Annotation>>();
-
-    private final Map<String, SerializerConfig> typeToConfig = new HashMap<String, SerializerConfig>();
-
-    private boolean useFields = true, useGetters = true;
-
-    public DefaultConfiguration(
-            RoundEnvironment roundEnv,
-            Map<String, String> options,
-            Collection<String> keywords,
-            @Nullable Class<? extends Annotation> entitiesAnn,
-            Class<? extends Annotation> entityAnn,
-            @Nullable Class<? extends Annotation> superTypeAnn,
-            @Nullable Class<? extends Annotation> embeddableAnn,
-            @Nullable Class<? extends Annotation> embeddedAnn,
-            @Nullable Class<? extends Annotation> skipAnn) {
-        this.excludedClasses = new HashSet<String>();
-        this.excludedPackages = new HashSet<String>();
-        this.includedClasses = new HashSet<String>();
-        this.includedPackages = new HashSet<String>();
-        module.bind(RoundEnvironment.class, roundEnv);
-        module.bind(CodegenModule.KEYWORDS, keywords);
-        this.entitiesAnn = entitiesAnn;
-        this.entityAnn = entityAnn;
-        this.superTypeAnn = superTypeAnn;
-        this.embeddableAnn = embeddableAnn;
-        this.embeddedAnn = embeddedAnn;
-        this.skipAnn = skipAnn;
-
-        entityAnnotations.add(entityAnn);
-        if (superTypeAnn != null) {
-            entityAnnotations.add(superTypeAnn);
-        }
-        if (embeddableAnn != null) {
-            entityAnnotations.add(embeddableAnn);
-        }
-        for (Element element : roundEnv.getElementsAnnotatedWith(Config.class)) {
-            Config querydslConfig = element.getAnnotation(Config.class);
-            SerializerConfig config = SimpleSerializerConfig.getConfig(querydslConfig);
-            if (element instanceof PackageElement) {
-                PackageElement packageElement = (PackageElement)element;
-                packageToConfig.put(packageElement.getQualifiedName().toString(), config);
-            } else if (element instanceof TypeElement) {
-                TypeElement typeElement = (TypeElement)element;
-                typeToConfig.put(typeElement.getQualifiedName().toString(), config);
-            }
-        }
-        boolean entityAccessors = false;
-        boolean listAccessors = false;
-        boolean mapAccessors = false;
-        boolean createDefaultVariable = true;
-
-        if (options.containsKey(QUERYDSL_ENTITY_ACCESSORS)) {
-            entityAccessors = Boolean.valueOf(options.get(QUERYDSL_ENTITY_ACCESSORS));
-        }
-        if (options.containsKey(QUERYDSL_LIST_ACCESSORS)) {
-            listAccessors = Boolean.valueOf(options.get(QUERYDSL_LIST_ACCESSORS));
-        }
-        if (options.containsKey(QUERYDSL_MAP_ACCESSORS)) {
-            mapAccessors = Boolean.valueOf(options.get(QUERYDSL_MAP_ACCESSORS));
-        }
-        if (options.containsKey(QUERYDSL_CREATE_DEFAULT_VARIABLE)) {
-            createDefaultVariable = Boolean.valueOf(options.get(QUERYDSL_CREATE_DEFAULT_VARIABLE));
-        }
-        if (options.containsKey(QUERYDSL_PACKAGE_SUFFIX)) {
-            module.bind(CodegenModule.PACKAGE_SUFFIX, Strings.nullToEmpty(options.get(QUERYDSL_PACKAGE_SUFFIX)));
-        }
-        if (options.containsKey(QUERYDSL_PREFIX)) {
-            module.bind(CodegenModule.PREFIX, Strings.nullToEmpty(options.get(QUERYDSL_PREFIX)));
-        }
-        if (options.containsKey(QUERYDSL_SUFFIX)) {
-            module.bind(CodegenModule.SUFFIX, Strings.nullToEmpty(options.get(QUERYDSL_SUFFIX)));
-        }
-        if (options.containsKey(QUERYDSL_UNKNOWN_AS_EMBEDDABLE)) {
-            unknownAsEmbedded = Boolean.valueOf(options.get(QUERYDSL_UNKNOWN_AS_EMBEDDABLE));
-        }
-
-        if (options.containsKey(QUERYDSL_EXCLUDED_PACKAGES)) {
-            String packageString = options.get(QUERYDSL_EXCLUDED_PACKAGES);
-            if (!Strings.isNullOrEmpty(packageString)) {
-                for (String packageName : packageString.split(DEFAULT_SEPARATOR)) {
-                    excludedPackages.add(packageName);
-                }
-            }
-        }
-
-        if (options.containsKey(QUERYDSL_EXCLUDED_CLASSES)) {
-            String classString = options.get(QUERYDSL_EXCLUDED_CLASSES);
-            if (!Strings.isNullOrEmpty(classString)) {
-                for (String className : classString.split(DEFAULT_SEPARATOR)) {
-                    excludedClasses.add(className);
-                }
-            }
-        }
-
-        if (options.containsKey(QUERYDSL_INCLUDED_PACKAGES)) {
-            String packageString = options.get(QUERYDSL_INCLUDED_PACKAGES);
-            if (!Strings.isNullOrEmpty(packageString)) {
-                for (String packageName : packageString.split(DEFAULT_SEPARATOR)) {
-                    includedPackages.add(packageName);
-                }
-            }
-        }
-
-        if (options.containsKey(QUERYDSL_INCLUDED_CLASSES)) {
-            String classString = options.get(QUERYDSL_INCLUDED_CLASSES);
-            if (!Strings.isNullOrEmpty(classString)) {
-                for (String className : classString.split(DEFAULT_SEPARATOR)) {
-                    includedClasses.add(className);
-                }
-            }
-        }
-
-        defaultSerializerConfig = new SimpleSerializerConfig(entityAccessors, listAccessors,
-                mapAccessors, createDefaultVariable, "");
-
-    }
-
-    @Override
-    public void addExcludedClass(String className) {
-        excludedClasses.add(className);
-    }
-
-    @Override
-    public void addExcludedPackage(String packageName) {
-        excludedPackages.add(packageName);
-    }
-
-    @Override
-    public VisitorConfig getConfig(TypeElement e, List<? extends Element> elements) {
-        if (useFields) {
-            if (useGetters) {
-                return VisitorConfig.ALL;
-            } else {
-                return VisitorConfig.FIELDS_ONLY;
-            }
-        } else if (useGetters) {
-            return VisitorConfig.METHODS_ONLY;
-        } else {
-            return VisitorConfig.NONE;
-        }
-    }
-
-    @Override
-    public Serializer getDTOSerializer() {
-        return module.get(ProjectionSerializer.class);
-    }
-
-    @Override
-    @Nullable
-    public Class<? extends Annotation> getEntitiesAnnotation() {
-        return entitiesAnn;
-    }
-
-    @Override
-    @Nullable
-    public Class<? extends Annotation> getEmbeddableAnnotation() {
-        return embeddableAnn;
-    }
-
-    @Override
-    public Serializer getEmbeddableSerializer() {
-        return module.get(EmbeddableSerializer.class);
-    }
-
-    @Override
-    public Class<? extends Annotation> getEntityAnnotation() {
-        return entityAnn;
-    }
-
-    @Override
-    public Class<? extends Annotation> getAlternativeEntityAnnotation() {
-        return altEntityAnn;
-    }
-
-    public void setAlternativeEntityAnnotation(Class<? extends Annotation> ann) {
-        altEntityAnn = ann;
-        entityAnnotations.add(ann);
-    }
-
-    @Override
-    @Nullable
-    public Class<? extends Annotation> getEmbeddedAnnotation() {
-        return embeddedAnn;
-    }
-
-    @Override
-    public Set<Class<? extends Annotation>> getEntityAnnotations() {
-        return entityAnnotations;
-    }
-
-    @Override
-    public Serializer getEntitySerializer() {
-        return module.get(EntitySerializer.class);
-    }
-
-    @Override
-    public String getNamePrefix() {
-        return module.get(String.class, "prefix");
-    }
-
-    @Override
-    public SerializerConfig getSerializerConfig(EntityType entityType) {
-        if (typeToConfig.containsKey(entityType.getFullName())) {
-            return typeToConfig.get(entityType.getFullName());
-        } else if (packageToConfig.containsKey(entityType.getPackageName())) {
-            return packageToConfig.get(entityType.getPackageName());
-        } else {
-            return defaultSerializerConfig;
-        }
-    }
-
-    @Override
-    @Nullable
-    public Class<? extends Annotation> getSkipAnnotation() {
-        return skipAnn;
-    }
-
-    @Override
-    @Nullable
-    public Class<? extends Annotation> getSuperTypeAnnotation() {
-        return superTypeAnn;
-    }
-
-    @Override
-    public Serializer getSupertypeSerializer() {
-        return module.get(SupertypeSerializer.class);
-    }
-
-    @Override
-    public void inspect(Element element, Annotations annotations) {
-        // do nothing
-    }
-
-    @Override
-    public boolean isBlockedField(VariableElement field) {
-        if (field.getAnnotation(QueryType.class) != null) {
-            return false;
-        } else {
-            return field.getAnnotation(skipAnn) != null
-                || field.getModifiers().contains(Modifier.TRANSIENT)
-                || field.getModifiers().contains(Modifier.STATIC);
-        }
-    }
-
-    @Override
-    public boolean isBlockedGetter(ExecutableElement getter) {
-        if (getter.getAnnotation(QueryType.class) != null) {
-            return false;
-        } else {
-            return getter.getAnnotation(skipAnn) != null
-                || getter.getModifiers().contains(Modifier.STATIC);
-        }
-    }
-
-    @Override
-    public boolean isUseFields() {
-        return useFields;
-    }
-
-    @Override
-    public boolean isUseGetters() {
-        return useGetters;
-    }
-
-    @Override
-    public boolean isValidConstructor(ExecutableElement constructor) {
-        return constructor.getModifiers().contains(Modifier.PUBLIC)
-            && constructor.getAnnotation(QueryProjection.class) != null
-            && !constructor.getParameters().isEmpty();
-    }
-
-    @Override
-    public boolean isValidField(VariableElement field) {
-        if (field.getAnnotation(QueryType.class) != null) {
-            return true;
-        } else {
-            return field.getAnnotation(skipAnn) == null
-                && !field.getModifiers().contains(Modifier.TRANSIENT)
-                && !field.getModifiers().contains(Modifier.STATIC);
-        }
-    }
-
-    @Override
-    public boolean isValidGetter(ExecutableElement getter) {
-        if (getter.getAnnotation(QueryType.class) != null) {
-            return true;
-        } else {
-            return getter.getAnnotation(skipAnn) == null
-                && !getter.getModifiers().contains(Modifier.STATIC);
-        }
-    }
-
-    public void setNamePrefix(String namePrefix) {
-        module.bind(CodegenModule.PREFIX, namePrefix);
-    }
-
-    public void setUseFields(boolean b) {
-        this.useFields = b;
-    }
-
-    public void setUseGetters(boolean b) {
-        this.useGetters = b;
-    }
-
-    @Override
-    public TypeMappings getTypeMappings() {
-        return module.get(TypeMappings.class);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Collection<String> getKeywords() {
-        return module.get(Collection.class, CodegenModule.KEYWORDS);
-    }
-
-    @Override
-    public String getNameSuffix() {
-        return module.get(String.class, CodegenModule.SUFFIX);
-    }
-
-    public void setNameSuffix(String nameSuffix) {
-        module.bind(CodegenModule.SUFFIX, nameSuffix);
-    }
-
-    public <T> void addCustomType(Class<T> type, Class<? extends Expression<T>> queryType) {
-        module.get(TypeMappings.class).register(new ClassType(type), new ClassType(queryType));
-    }
-
-    @Override
-    public QueryTypeFactory getQueryTypeFactory() {
-        return module.get(QueryTypeFactory.class);
-    }
-
-    @Override
-    public boolean isExcludedPackage(@Nonnull String packageName) {
-        if (!includedPackages.isEmpty()) {
-            boolean included = false;
-            for (String includedPackage : includedPackages) {
-                if (packageName.startsWith(includedPackage)) {
-                    included = true;
-                    break;
-                }
-            }
-            if (!included) {
-                return true;
-            }
-        }
-        if (!excludedPackages.isEmpty()) {
-            for (String excludedPackage : excludedPackages) {
-                if (packageName.startsWith(excludedPackage)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isExcludedClass(@Nonnull String className) {
-        if (!includedClasses.isEmpty() && !includedClasses.contains(className)) {
-            return true;
-        } else {
-            return excludedClasses.contains(className);
-        }
-    }
-
-    @Override
-    public TypeMirror getRealType(ExecutableElement method) {
-        return null;
-    }
-
-    @Override
-    public TypeMirror getRealType(VariableElement field) {
-        return null;
-    }
-
-    @Override
-    public boolean isUnknownAsEmbedded() {
-        return unknownAsEmbedded;
-    }
-
-    public void setUnknownAsEmbedded(boolean unknownAsEmbedded) {
-        this.unknownAsEmbedded = unknownAsEmbedded;
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/QuerydslAnnotationProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/QuerydslAnnotationProcessor.java
deleted file mode 100644
index bf25cbf9d4..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/QuerydslAnnotationProcessor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntities;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.annotations.QueryTransient;
-
-/**
- * Default annotation processor for Querydsl which handles {@link QueryEntity}, {@link QuerySupertype}, 
- * {@link QueryEmbeddable}, {@link QueryEmbedded} and {@link QueryTransient}
- * 
- * @author tiwe
- *
- */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*"})
-public class QuerydslAnnotationProcessor extends AbstractQuerydslProcessor {
-    
-    @Override
-    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
-        Class<? extends Annotation> entities = QueryEntities.class;
-        Class<? extends Annotation> entity = QueryEntity.class;
-        Class<? extends Annotation> superType = QuerySupertype.class;
-        Class<? extends Annotation> embeddable = QueryEmbeddable.class;
-        Class<? extends Annotation> embedded = QueryEmbedded.class;
-        Class<? extends Annotation> skip = QueryTransient.class;
-        
-        return new DefaultConfiguration(
-                roundEnv, processingEnv.getOptions(), Collections.<String>emptySet(), entities, 
-                entity, superType, embeddable, embedded, skip);
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeExtractor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/TypeExtractor.java
deleted file mode 100644
index 6a36a5d3f9..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeExtractor.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.ErrorType;
-import javax.lang.model.type.ExecutableType;
-import javax.lang.model.type.NoType;
-import javax.lang.model.type.NullType;
-import javax.lang.model.type.PrimitiveType;
-import javax.lang.model.type.TypeVariable;
-import javax.lang.model.type.WildcardType;
-import javax.lang.model.util.AbstractTypeVisitor6;
-
-/**
- * TypeExtractor is a visitor implementation which a concrete type given a general {@link TypeElement}
- * 
- * @author tiwe
- *
- */
-public class TypeExtractor extends AbstractTypeVisitor6<TypeElement, Void> {
-
-    private final boolean skipEnum;
-    
-    public TypeExtractor(boolean skipEnum) {
-        this.skipEnum = skipEnum;
-    }
-    
-    @Override
-    public TypeElement visitPrimitive(PrimitiveType t, Void p) {
-        return null;
-    }
-
-    @Override
-    public TypeElement visitNull(NullType t, Void p) {
-        return null;
-    }
-
-    @Override
-    public TypeElement visitArray(ArrayType t, Void p) {
-        return visit(t.getComponentType());
-    }
-
-    @Override
-    public TypeElement visitDeclared(DeclaredType t, Void p) {
-        if (t.asElement() instanceof TypeElement) {
-            TypeElement typeElement = (TypeElement)t.asElement();
-            switch (typeElement.getKind()) {
-                case ENUM:      return skipEnum ? null : typeElement;
-                case CLASS:     return typeElement;
-                case INTERFACE: return visitInterface(t);
-                default: throw new IllegalArgumentException("Illegal type " + typeElement);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    private TypeElement visitInterface(DeclaredType t) {
-        if (t.getTypeArguments().isEmpty()) {
-            return (TypeElement)t.asElement();
-        } else {
-            int count = t.getTypeArguments().size();
-            if (t.asElement().toString().startsWith("java.util")) {
-                return t.getTypeArguments().get(count - 1).accept(this, null);
-            } else {
-                return (TypeElement)t.asElement();
-            }
-        }
-    }
-
-    @Override
-    public TypeElement visitError(ErrorType t, Void p) {
-        return visitDeclared(t, p);
-    }
-
-    @Override
-    public TypeElement visitTypeVariable(TypeVariable t, Void p) {
-        if (t.getUpperBound() != null) {
-            return visit(t.getUpperBound());
-        } else if (t.getLowerBound() != null) {
-            return visit(t.getLowerBound());
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public TypeElement visitWildcard(WildcardType t, Void p) {
-        if (t.getExtendsBound() != null) {
-            return visit(t.getExtendsBound());    
-        } else if (t.getSuperBound() != null) {    
-            return visit(t.getSuperBound());
-        } else {
-            return null;
-        }
-        
-    }
-
-    @Override
-    public TypeElement visitExecutable(ExecutableType t, Void p) {
-        return null;
-    }
-
-    @Override
-    public TypeElement visitNoType(NoType t, Void p) {
-        return null;
-    }
-       
-    
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/UnsupportedTypeException.java b/querydsl-apt/src/main/java/com/mysema/query/apt/UnsupportedTypeException.java
deleted file mode 100644
index b77a4f12e1..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/UnsupportedTypeException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import javax.lang.model.type.TypeMirror;
-
-/**
- * UnsupportedTypeException is thrown for unsupported types
- * 
- * @author tiwe
- *
- */
-public class UnsupportedTypeException extends APTException {
-
-    private static final long serialVersionUID = 1082936662325717262L;
-
-    public UnsupportedTypeException(TypeMirror mirror) {
-        super("Unsupported type " + mirror);
-    }
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateAnnotationProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateAnnotationProcessor.java
deleted file mode 100644
index f1b9b2e127..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateAnnotationProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt.hibernate;
-
-import java.lang.annotation.Annotation;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-
-import com.mysema.query.apt.Configuration;
-import com.mysema.query.apt.jpa.JPAAnnotationProcessor;
-
-/**
- * HibernateAnnotationProcessor extends {@link JPAAnnotationProcessor} to take Hibernate specific 
- * annotations into account
- * 
- * @author tiwe
- * @see JPAAnnotationProcessor
- */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*","javax.persistence.*", "org.hibernate.annotations.*"})
-public class HibernateAnnotationProcessor extends JPAAnnotationProcessor {
-    
-    @Override
-    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
-        try {
-            Class<? extends Annotation> entity = Entity.class;
-            Class<? extends Annotation> superType = MappedSuperclass.class;
-            Class<? extends Annotation> embeddable = Embeddable.class;
-            Class<? extends Annotation> embedded = Embedded.class;
-            Class<? extends Annotation> skip = Transient.class;
-            return new HibernateConfiguration(roundEnv, processingEnv.getOptions(), entity, superType, 
-                    embeddable, embedded, skip);
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }        
-    }
-    
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/package-info.java b/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/package-info.java
deleted file mode 100644
index 39a6940570..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * APT Hibernate support
- */
-package com.mysema.query.apt.hibernate;
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/JDOAnnotationProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/JDOAnnotationProcessor.java
deleted file mode 100644
index 3e6674a6d6..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/JDOAnnotationProcessor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt.jdo;
-
-import java.lang.annotation.Annotation;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.jdo.annotations.EmbeddedOnly;
-import javax.jdo.annotations.NotPersistent;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.persistence.Embedded;
-
-import com.mysema.query.annotations.QueryEntities;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.apt.AbstractQuerydslProcessor;
-import com.mysema.query.apt.Configuration;
-import com.mysema.query.apt.DefaultConfiguration;
-import com.mysema.query.codegen.Keywords;
-
-/**
- * AnnotationProcessor for JDO which takes {@link PersistenceCapable}, {@link EmbeddedOnly} and
- * {@link NotPersistent} into account
- *
- * @author tiwe
- *
- */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*","javax.jdo.annotations.*"})
-public class JDOAnnotationProcessor extends AbstractQuerydslProcessor {
-
-    @Override
-    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
-        Class<? extends Annotation> entities = QueryEntities.class;
-        Class<? extends Annotation> entity = PersistenceCapable.class;
-        Class<? extends Annotation> superType = QuerySupertype.class;
-        Class<? extends Annotation> embeddable = EmbeddedOnly.class;
-        Class<? extends Annotation> embedded = Embedded.class;
-        Class<? extends Annotation> skip = NotPersistent.class;
-        return new DefaultConfiguration(roundEnv, processingEnv.getOptions(), Keywords.JDO,
-                entities, entity, superType, embeddable, embedded, skip);
-    }
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/package-info.java b/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/package-info.java
deleted file mode 100644
index e58068427e..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/jdo/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * APT JDO support
- */
-package com.mysema.query.apt.jdo;
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAAnnotationProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAAnnotationProcessor.java
deleted file mode 100644
index bfd3e44514..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAAnnotationProcessor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt.jpa;
-
-import java.lang.annotation.Annotation;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-
-import com.mysema.query.apt.AbstractQuerydslProcessor;
-import com.mysema.query.apt.Configuration;
-
-/**
- * AnnotationProcessor for JPA which takes {@link Entity}, {@link MappedSuperclass}, {@link Embeddable}
- * and {@link Transient} into account
- *
- * @author tiwe
- *
- */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*","javax.persistence.*"})
-public class JPAAnnotationProcessor extends AbstractQuerydslProcessor {
-
-    @Override
-    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
-        Class<? extends Annotation> entity = Entity.class;
-        Class<? extends Annotation> superType = MappedSuperclass.class;
-        Class<? extends Annotation> embeddable = Embeddable.class;
-        Class<? extends Annotation> embedded = Embedded.class;
-        Class<? extends Annotation> skip = Transient.class;
-        return new JPAConfiguration(roundEnv, processingEnv.getOptions(),
-                entity, superType, embeddable, embedded, skip);
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAConfiguration.java b/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAConfiguration.java
deleted file mode 100644
index e8c57cc853..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/JPAConfiguration.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt.jpa;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.*;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Types;
-import javax.persistence.*;
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntities;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.apt.*;
-import com.mysema.query.codegen.Keywords;
-import com.mysema.util.Annotations;
-
-/**
- * Configuration for {@link JPAAnnotationProcessor}
- *
- * @author tiwe
- * @see JPAAnnotationProcessor
- */
-public class JPAConfiguration extends DefaultConfiguration {
-
-    private final List<Class<? extends Annotation>> annotations;
-
-    private final Types types;
-
-    public JPAConfiguration(RoundEnvironment roundEnv,
-            Map<String,String> options,
-            Class<? extends Annotation> entityAnn,
-            Class<? extends Annotation> superTypeAnn,
-            Class<? extends Annotation> embeddableAnn,
-            Class<? extends Annotation> embeddedAnn,
-            Class<? extends Annotation> skipAnn) {
-        super(roundEnv, options, Keywords.JPA, QueryEntities.class, entityAnn, superTypeAnn,
-            embeddableAnn, embeddedAnn, skipAnn);
-        this.annotations = getAnnotations();
-        // TODO replace with proper injection in Querydsl 4.0.0
-        this.types = AbstractQuerydslProcessor.TYPES;
-    }
-
-    @SuppressWarnings("unchecked")
-    protected List<Class<? extends Annotation>> getAnnotations() {
-        return ImmutableList.of(
-            Access.class, Basic.class, Column.class, ElementCollection.class,
-            Embedded.class, EmbeddedId.class, Enumerated.class, GeneratedValue.class, Id.class,
-            JoinColumn.class, ManyToOne.class, ManyToMany.class, MapKeyEnumerated.class,
-            OneToOne.class, OneToMany.class, PrimaryKeyJoinColumn.class, QueryType.class,
-            QueryTransient.class, Temporal.class, Transient.class, Version.class);
-    }
-
-    @Override
-    public VisitorConfig getConfig(TypeElement e, List<? extends Element> elements) {
-        Access access = e.getAnnotation(Access.class);
-        if (access != null) {
-            if (access.value() == AccessType.FIELD) {
-                return VisitorConfig.FIELDS_ONLY;
-            } else {
-                return VisitorConfig.METHODS_ONLY;
-            }
-        }
-        boolean fields = false, methods = false;
-        for (Element element : elements) {
-            if (hasRelevantAnnotation(element)) {
-                fields |= element.getKind().equals(ElementKind.FIELD);
-                methods |= element.getKind().equals(ElementKind.METHOD);
-            }
-        }
-        return VisitorConfig.get(fields, methods);
-    }
-
-    @Override
-    public TypeMirror getRealType(ExecutableElement method) {
-        return getRealElementType(method);
-    }
-
-    @Override
-    public TypeMirror getRealType(VariableElement field) {
-        return getRealElementType(field);
-    }
-
-    private TypeMirror getRealElementType(Element element) {
-        AnnotationMirror mirror = TypeUtils.getAnnotationMirrorOfType(element, ManyToOne.class);
-        if (mirror == null) {
-            mirror = TypeUtils.getAnnotationMirrorOfType(element, OneToOne.class);
-        }
-        if (mirror != null) {
-            return TypeUtils.getAnnotationValueAsTypeMirror(mirror, "targetEntity");
-        }
-
-        mirror = TypeUtils.getAnnotationMirrorOfType(element, OneToMany.class);
-        if (mirror == null) {
-            mirror = TypeUtils.getAnnotationMirrorOfType(element, ManyToMany.class);
-        }
-        if (mirror != null) {
-            TypeMirror typeArg = TypeUtils.getAnnotationValueAsTypeMirror(mirror, "targetEntity");
-            TypeMirror erasure = types.erasure(element.asType());
-            TypeElement typeElement = (TypeElement) types.asElement(erasure);
-            if (typeElement != null && typeArg != null) {
-                if (typeElement.getTypeParameters().size() == 1) {
-                    return types.getDeclaredType(typeElement, typeArg);
-                } else if (typeElement.getTypeParameters().size() == 2) {
-                    if (element.asType() instanceof DeclaredType) {
-                        TypeMirror first = ((DeclaredType)element.asType()).getTypeArguments().get(0);
-                        return types.getDeclaredType(typeElement, first, typeArg);
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public void inspect(Element element, Annotations annotations) {
-        Temporal temporal = element.getAnnotation(Temporal.class);
-        if (temporal != null && element.getAnnotation(ElementCollection.class) == null) {
-            PropertyType propertyType = null;
-            switch (temporal.value()) {
-            case DATE: propertyType = PropertyType.DATE; break;
-            case TIME: propertyType = PropertyType.TIME; break;
-            case TIMESTAMP: propertyType = PropertyType.DATETIME;
-            }
-            annotations.addAnnotation(new QueryTypeImpl(propertyType));
-        }
-    }
-
-    private boolean hasRelevantAnnotation(Element element) {
-        for (Class<? extends Annotation> annotation : annotations) {
-            if (element.getAnnotation(annotation) != null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/package-info.java b/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/package-info.java
deleted file mode 100644
index 00bb6e6401..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/jpa/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * APT JPA support
- */
-package com.mysema.query.apt.jpa;
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/MorphiaAnnotationProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/MorphiaAnnotationProcessor.java
deleted file mode 100644
index a53c20ac49..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/MorphiaAnnotationProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt.morphia;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-
-import org.mongodb.morphia.annotations.Embedded;
-import org.mongodb.morphia.annotations.Entity;
-import org.mongodb.morphia.annotations.Transient;
-
-import com.mysema.query.annotations.QueryEntities;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.apt.AbstractQuerydslProcessor;
-import com.mysema.query.apt.Configuration;
-import com.mysema.query.apt.DefaultConfiguration;
-
-/**
- * Annotation processor to create Querydsl query types for Morphia annotated classes
- *
- * @author tiwe
- *
- */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*","org.mongodb.morphia.annotations.*"})
-public class MorphiaAnnotationProcessor extends AbstractQuerydslProcessor {
-
-    @Override
-    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
-        Class<? extends Annotation> entities = QueryEntities.class;
-        Class<? extends Annotation> entity = Entity.class;
-        Class<? extends Annotation> superType = QuerySupertype.class;
-        Class<? extends Annotation> embedded = Embedded.class;
-        Class<? extends Annotation> skip = Transient.class;
-        DefaultConfiguration conf = new DefaultConfiguration(roundEnv,
-                processingEnv.getOptions(), Collections.<String>emptySet(),
-                entities, entity, superType, null, embedded, skip);
-        try {
-            Class cl = Class.forName("com.mysema.query.mongodb.Point");
-            conf.addCustomType(Double[].class, cl);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalStateException(e);
-        }
-        return conf;
-    }
-
-}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/package-info.java b/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/package-info.java
deleted file mode 100644
index ff7202df51..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/morphia/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * APT Morphia support
- */
-package com.mysema.query.apt.morphia;
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/package-info.java b/querydsl-apt/src/main/java/com/mysema/query/apt/package-info.java
deleted file mode 100644
index 043294e3e5..0000000000
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * APT related classes
- */
-package com.mysema.query.apt;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/APTOptions.java b/querydsl-apt/src/main/java/com/querydsl/apt/APTOptions.java
new file mode 100644
index 0000000000..cae2e4018c
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/APTOptions.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+/**
+ * APT options supported by Querydsl
+ *
+ * @author tiwe
+ *
+ */
+public final class APTOptions {
+
+    /**
+     * set whether default variables are created (default: true)
+     */
+    public static final String QUERYDSL_CREATE_DEFAULT_VARIABLE = "querydsl.createDefaultVariable";
+
+    /**
+     * set the prefix for query types (default: Q)
+     */
+    public static final String QUERYDSL_PREFIX = "querydsl.prefix";
+
+    /**
+     * set a suffix for query types (default: empty)
+     */
+    public static final String QUERYDSL_SUFFIX = "querydsl.suffix";
+
+    /**
+     * set a suffix for query type packages (default: empty)
+     */
+    public static final String QUERYDSL_PACKAGE_SUFFIX = "querydsl.packageSuffix";
+
+    /**
+     * enable accessors for direct key based map access (default: false)
+     */
+    public static final String QUERYDSL_MAP_ACCESSORS = "querydsl.mapAccessors";
+
+    /**
+     * enable accessors for direct indexed list access (default: false)
+     */
+    public static final String QUERYDSL_LIST_ACCESSORS = "querydsl.listAccessors";
+
+    /**
+     * enable reference field accessors (default: false)
+     */
+    public static final String QUERYDSL_ENTITY_ACCESSORS = "querydsl.entityAccessors";
+
+    /**
+     * Set whether fields are used as metadata source (default: true)
+     */
+    public static final String QUERYDSL_USE_FIELDS = "querydsl.useFields";
+
+    /**
+     * Set whether accessors are used as metadata source (default: true)
+     */
+    public static final String QUERYDSL_USE_GETTERS = "querydsl.useGetters";
+
+    /**
+     * comma separated list of packages to be excluded from code generation (default: none)
+     */
+    public static final String QUERYDSL_EXCLUDED_PACKAGES = "querydsl.excludedPackages";
+
+    /**
+     * comma separated list of class names to be excluded from code generation (default: none)
+     */
+    public static final String QUERYDSL_EXCLUDED_CLASSES = "querydsl.excludedClasses";
+
+    /**
+     * comma separated list of packages to be included into code generation (default: all)
+     */
+    public static final String QUERYDSL_INCLUDED_PACKAGES = "querydsl.includedPackages";
+
+    /**
+     * comma separated list of class names to be included into code generation (default: all)
+     */
+    public static final String QUERYDSL_INCLUDED_CLASSES = "querydsl.includedClasses";
+
+    /**
+     * set whether unknown non-annotated classes should be treated as embeddable (default: false)
+     */
+    public static final String QUERYDSL_UNKNOWN_AS_EMBEDDABLE = "querydsl.unknownAsEmbeddable";
+
+    /**
+     * set the variable name function class
+     */
+    public static final String QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS = "querydsl.variableNameFunctionClass";
+
+    /**
+     * set whether info level messages should be written to stdout (default: false)
+     */
+    public static final String QUERYDSL_LOG_INFO = "querydsl.logInfo";
+
+    /**
+     * the class instance of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * (default: depending on java version: javax.annotation.Generated or javax.annotation.processing.Generated)
+     *  @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    public static final String QUERYDSL_GENERATED_ANNOTATION_CLASS = "querydsl.generatedAnnotationClass";
+
+    private APTOptions() { }
+
+}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java
similarity index 78%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java
index 022adc17df..920eae2518 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
+
+import static com.querydsl.apt.APTOptions.*;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.annotation.Annotation;
+import java.util.*;
+import java.util.stream.Stream;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
@@ -21,41 +29,26 @@
 import javax.lang.model.type.NoType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
-import javax.tools.JavaFileObject;
-import java.io.IOException;
-import java.io.Writer;
-import java.lang.annotation.Annotation;
-import java.util.*;
 
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.annotations.QueryExclude;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.codegen.*;
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.*;
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.annotations.QueryExclude;
+import com.querydsl.core.annotations.QueryProjection;
 
 /**
- * Base class for Querydsl annotation processors, contains the main processing logic. The subclasses
- * just provide the configuration.
+ * {@code AbstractQuerydslProcessor} is the base class for Querydsl annotation processors and
+ * contains the main processing logic. The subclasses just provide the configuration.
  *
  * @author tiwe
  *
  */
 public abstract class AbstractQuerydslProcessor extends AbstractProcessor {
 
-    // TODO replace with proper injections in Querydsl 4.0.0
-    public static Types TYPES;
-
-    public static Elements ELEMENTS;
-
-    private static final Set<Element> DELEGATE_METHODS = new HashSet<Element>();
-
     public static final Boolean ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS = Boolean.FALSE;
 
     private final TypeExtractor typeExtractor = new TypeExtractor(true);
@@ -70,19 +63,19 @@ public abstract class AbstractQuerydslProcessor extends AbstractProcessor {
 
     private Context context;
 
+    private boolean shouldLogInfo;
+
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        TYPES = processingEnv.getTypeUtils();
-        ELEMENTS = processingEnv.getElementUtils();
-
-        processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Running " + getClass().getSimpleName());
+        setLogInfo();
+        logInfo("Running " + getClass().getSimpleName());
 
         if (roundEnv.processingOver() || annotations.size() == 0) {
             return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS;
         }
 
         if (roundEnv.getRootElements() == null || roundEnv.getRootElements().isEmpty()) {
-            processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "No sources to process");
+            logInfo("No sources to process");
             return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS;
         }
 
@@ -91,8 +84,8 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         Set<Class<? extends Annotation>> entityAnnotations = conf.getEntityAnnotations();
         TypeMappings typeMappings = conf.getTypeMappings();
         QueryTypeFactory queryTypeFactory = conf.getQueryTypeFactory();
-        this.typeFactory = new ExtendedTypeFactory(processingEnv, conf, entityAnnotations, typeMappings, queryTypeFactory);
-        elementHandler = new TypeElementHandler(conf, typeFactory, typeMappings, queryTypeFactory);
+        this.typeFactory = createTypeFactory(entityAnnotations, typeMappings, queryTypeFactory);
+        elementHandler = createElementHandler(typeMappings, queryTypeFactory);
         this.roundEnv = roundEnv;
 
         // process annotations
@@ -106,7 +99,16 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS;
     }
 
-    private void processAnnotations() {
+    protected TypeElementHandler createElementHandler(TypeMappings typeMappings, QueryTypeFactory queryTypeFactory) {
+        return new TypeElementHandler(conf, typeFactory, typeMappings, queryTypeFactory);
+    }
+
+    protected ExtendedTypeFactory createTypeFactory(Set<Class<? extends Annotation>> entityAnnotations,
+                                                  TypeMappings typeMappings, QueryTypeFactory queryTypeFactory) {
+        return new ExtendedTypeFactory(processingEnv, entityAnnotations, typeMappings, queryTypeFactory, conf.getVariableNameFunction());
+    }
+
+    protected void processAnnotations() {
         processExclusions();
 
         Set<TypeElement> elements = collectElements();
@@ -126,11 +128,11 @@ private void processAnnotations() {
         for (TypeElement element : elements) {
             EntityType entityType = elementHandler.handleEntityType(element);
             registerTypeElement(entityType.getFullName(), element);
-            if (element.getAnnotation(conf.getEntityAnnotation()) != null) {
+            if (typeFactory.isSimpleTypeEntity(element, conf.getEntityAnnotation())) {
                 context.entityTypes.put(entityType.getFullName(), entityType);
             } else if (altEntityAnn && element.getAnnotation(conf.getAlternativeEntityAnnotation()) != null) {
                 context.entityTypes.put(entityType.getFullName(), entityType);
-            } else if (embeddableAnn && element.getAnnotation(conf.getEmbeddableAnnotation()) != null ) {
+            } else if (embeddableAnn && element.getAnnotation(conf.getEmbeddableAnnotation()) != null) {
                 context.embeddableTypes.put(entityType.getFullName(), entityType);
             } else if (superAnn && element.getAnnotation(conf.getSuperTypeAnnotation()) != null) {
                 context.supertypes.put(entityType.getFullName(), entityType);
@@ -146,7 +148,6 @@ private void processAnnotations() {
         for (EntityType entityType : new ArrayList<EntityType>(typeFactory.getEntityTypes())) {
             String fullName = entityType.getFullName();
             if (!context.allTypes.keySet().contains(fullName)) {
-                //System.err.println(fullName);
                 TypeElement element = processingEnv.getElementUtils().getTypeElement(fullName);
                 if (element != null) {
                     elementHandler.handleEntityType(element);
@@ -188,6 +189,9 @@ private void addExternalParents(EntityType entityType) {
                 if (typeElement == null) {
                     throw new IllegalStateException("Found no type for " + superType.getFullName());
                 }
+                if (conf.isStrictMode() && !TypeUtils.hasAnnotationOfType(typeElement, conf.getEntityAnnotations())) {
+                    continue;
+                }
                 EntityType superEntityType = elementHandler.handleEntityType(typeElement);
                 if (superEntityType.getSuperType() != null) {
                     superTypes.push(superEntityType.getSuperType().getType());
@@ -199,10 +203,9 @@ private void addExternalParents(EntityType entityType) {
     }
 
     protected Set<TypeElement> collectElements() {
-        Set<TypeElement> elements = new HashSet<TypeElement>();
 
         // from delegate methods
-        elements.addAll(processDelegateMethods());
+        Set<TypeElement> elements = new HashSet<TypeElement>(processDelegateMethods());
 
         // from class annotations
         for (Class<? extends Annotation> annotation : conf.getEntityAnnotations()) {
@@ -232,7 +235,9 @@ protected Set<TypeElement> collectElements() {
         }
 
         // from annotation less supertypes
-        elements.addAll(getAnnotationlessSupertypes(elements));
+        if (!conf.isStrictMode()) {
+            elements.addAll(getAnnotationlessSupertypes(elements));
+        }
 
         // register possible embedded types of non-tracked supertypes
         if (conf.getEmbeddedAnnotation() != null) {
@@ -294,11 +299,7 @@ private Set<TypeElement> getAnnotationlessSupertypes(Set<TypeElement> elements)
     }
 
     private void registerTypeElement(String entityName, TypeElement element) {
-        Set<TypeElement> elements = context.typeElements.get(entityName);
-        if (elements == null) {
-            elements = new HashSet<TypeElement>();
-            context.typeElements.put(entityName, elements);
-        }
+        Set<TypeElement> elements = context.typeElements.computeIfAbsent(entityName, k -> new HashSet<TypeElement>());
         elements.add(element);
     }
 
@@ -307,8 +308,8 @@ private void processProjectionTypes(Set<TypeElement> elements) {
         for (Element element : getElements(QueryProjection.class)) {
             Element parent = element.getEnclosingElement();
             if (!elements.contains(parent) && !visited.contains(parent)) {
-                EntityType model = elementHandler.handleProjectionType((TypeElement)parent);
-                registerTypeElement(model.getFullName(), (TypeElement)parent);
+                EntityType model = elementHandler.handleProjectionType((TypeElement) parent);
+                registerTypeElement(model.getFullName(), (TypeElement) parent);
                 context.projectionTypes.put(model.getFullName(), model);
                 visited.add(parent);
             }
@@ -327,17 +328,17 @@ private Set<TypeElement> getEmbeddedTypes() {
     private void handleEmbeddedType(Element element, Set<TypeElement> elements) {
         TypeMirror type = element.asType();
         if (element.getKind() == ElementKind.METHOD) {
-            type = ((ExecutableElement)element).getReturnType();
+            type = ((ExecutableElement) element).getReturnType();
         }
         String typeName = type.toString();
 
         if (typeName.startsWith(Collection.class.getName())
          || typeName.startsWith(List.class.getName())
          || typeName.startsWith(Set.class.getName())) {
-            type = ((DeclaredType)type).getTypeArguments().get(0);
+            type = ((DeclaredType) type).getTypeArguments().get(0);
 
         } else if (typeName.startsWith(Map.class.getName())) {
-            type = ((DeclaredType)type).getTypeArguments().get(1);
+            type = ((DeclaredType) type).getTypeArguments().get(1);
         }
 
         TypeElement typeElement = typeExtractor.visit(type);
@@ -353,7 +354,7 @@ private Set<TypeElement> getTypeFromProperties(Set<TypeElement> parents) {
         Set<TypeElement> elements = new HashSet<TypeElement>();
         for (Element element : parents) {
             if (element instanceof TypeElement) {
-                processFromProperties((TypeElement)element, elements);
+                processFromProperties((TypeElement) element, elements);
             }
         }
 
@@ -421,9 +422,9 @@ private void addSupertypeFields(EntityType model, Set<EntityType> handled) {
     private void processExclusions() {
         for (Element element : getElements(QueryExclude.class)) {
             if (element instanceof PackageElement) {
-                conf.addExcludedPackage(((PackageElement)element).getQualifiedName().toString());
+                conf.addExcludedPackage(((PackageElement) element).getQualifiedName().toString());
             } else if (element instanceof TypeElement) {
-                conf.addExcludedClass(((TypeElement)element).getQualifiedName().toString());
+                conf.addExcludedClass(((TypeElement) element).getQualifiedName().toString());
             } else {
                 throw new IllegalArgumentException(element.toString());
             }
@@ -431,27 +432,11 @@ private void processExclusions() {
     }
 
     private Set<TypeElement> processDelegateMethods() {
-        Set<Element> delegateMethods = new HashSet<Element>();
-        delegateMethods.addAll(getElements(QueryDelegate.class));
-        for (Element element : DELEGATE_METHODS) {
-            TypeElement parent = (TypeElement)element.getEnclosingElement();
-            // replace with element from current session
-            parent = processingEnv.getElementUtils().getTypeElement(parent.getQualifiedName().toString());
-            if (parent != null) {
-                for (Element child : parent.getEnclosedElements()) {
-                    if (child.getKind() == element.getKind() && child.getSimpleName().equals(element.getSimpleName())) {
-                        delegateMethods.add(child);
-                    }
-                }
-            }
-        }
-        DELEGATE_METHODS.clear();
-        DELEGATE_METHODS.addAll(delegateMethods);
-
+        Set<? extends Element> delegateMethods = getElements(QueryDelegate.class);
         Set<TypeElement> typeElements = new HashSet<TypeElement>();
 
         for (Element delegateMethod : delegateMethods) {
-            ExecutableElement method = (ExecutableElement)delegateMethod;
+            ExecutableElement method = (ExecutableElement) delegateMethod;
             Element element = delegateMethod.getEnclosingElement();
             String name = method.getSimpleName().toString();
             Type delegateType = typeFactory.getType(element.asType(), true);
@@ -471,7 +456,7 @@ private Set<TypeElement> processDelegateMethods() {
             }
 
             if (entityType != null) {
-                registerTypeElement(entityType.getFullName(), (TypeElement)element);
+                registerTypeElement(entityType.getFullName(), (TypeElement) element);
                 entityType.addDelegate(new Delegate(entityType, delegateType, name, parameters, returnType));
                 TypeElement typeElement = processingEnv.getElementUtils().getTypeElement(entityType.getFullName());
                 boolean isAnnotated = false;
@@ -495,58 +480,54 @@ private Set<TypeElement> processDelegateMethods() {
     }
 
     private void validateMetaTypes() {
-        for (Collection<EntityType> entityTypes : Arrays.asList(
+        Stream.of(
                 context.supertypes.values(),
                 context.entityTypes.values(),
                 context.extensionTypes.values(),
                 context.embeddableTypes.values(),
-                context.projectionTypes.values())) {
-            for (EntityType entityType : entityTypes) {
-                for (Property property : entityType.getProperties()) {
-                    if (property.getInits() != null && property.getInits().size() > 0) {
-                        validateInits(entityType, property);
-                    }
-                }
-            }
-        }
+                context.projectionTypes.values()
+        ).flatMap(Collection::stream).forEach(entityType ->
+                entityType.getProperties().stream()
+                        .filter(property -> property.getInits() != null && property.getInits().size() > 0)
+                        .forEach(property -> validateInits(entityType, property)));
     }
 
     protected void validateInits(EntityType entityType, Property property) {
         for (String init : property.getInits()) {
             if (!init.startsWith("*") && property.getType() instanceof EntityType) {
                 String initProperty = init.contains(".") ? init.substring(0, init.indexOf('.')) : init;
-                if (!((EntityType)property.getType()).getPropertyNames().contains(initProperty)) {
+                Set<String> propertyNames = ((EntityType) property.getType()).getPropertyNames();
+                if (!propertyNames.contains(initProperty)) {
                     processingEnv.getMessager().printMessage(Kind.ERROR,
-                        "Illegal inits of " + entityType.getFullName()+ "." + property.getName() + ": " +
-                        initProperty + " not found");
+                            "Illegal inits of " + entityType.getFullName() + "." + property.getName() + ": " +
+                                    initProperty + " not found in " + propertyNames);
                 }
             }
         }
     }
-
     private void serializeMetaTypes() {
         if (!context.supertypes.isEmpty()) {
-            processingEnv.getMessager().printMessage(Kind.NOTE, "Serializing Supertypes");
+            logInfo("Serializing Supertypes");
             serialize(conf.getSupertypeSerializer(), context.supertypes.values());
         }
 
         if (!context.entityTypes.isEmpty()) {
-            processingEnv.getMessager().printMessage(Kind.NOTE, "Serializing Entity types");
+            logInfo("Serializing Entity types");
             serialize(conf.getEntitySerializer(), context.entityTypes.values());
         }
 
         if (!context.extensionTypes.isEmpty()) {
-            processingEnv.getMessager().printMessage(Kind.NOTE, "Serializing Extension types");
+            logInfo("Serializing Extension types");
             serialize(conf.getEmbeddableSerializer(), context.extensionTypes.values());
         }
 
         if (!context.embeddableTypes.isEmpty()) {
-            processingEnv.getMessager().printMessage(Kind.NOTE, "Serializing Embeddable types");
+            logInfo("Serializing Embeddable types");
             serialize(conf.getEmbeddableSerializer(), context.embeddableTypes.values());
         }
 
         if (!context.projectionTypes.isEmpty()) {
-            processingEnv.getMessager().printMessage(Kind.NOTE, "Serializing Projection types");
+            logInfo("Serializing Projection types");
             serialize(conf.getDTOSerializer(), context.projectionTypes.values());
         }
 
@@ -558,15 +539,49 @@ private Set<? extends Element> getElements(Class<? extends Annotation> a) {
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.latest();
+        return SourceVersion.latestSupported();
+    }
+
+    @Override
+    public Set<String> getSupportedOptions() {
+        return new HashSet<>(Arrays.asList(
+                QUERYDSL_CREATE_DEFAULT_VARIABLE,
+                QUERYDSL_PREFIX,
+                QUERYDSL_SUFFIX,
+                QUERYDSL_PACKAGE_SUFFIX,
+                QUERYDSL_MAP_ACCESSORS,
+                QUERYDSL_LIST_ACCESSORS,
+                QUERYDSL_ENTITY_ACCESSORS,
+                QUERYDSL_USE_FIELDS,
+                QUERYDSL_USE_GETTERS,
+                QUERYDSL_EXCLUDED_PACKAGES,
+                QUERYDSL_EXCLUDED_CLASSES,
+                QUERYDSL_INCLUDED_PACKAGES,
+                QUERYDSL_INCLUDED_CLASSES,
+                QUERYDSL_UNKNOWN_AS_EMBEDDABLE,
+                QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS,
+                QUERYDSL_LOG_INFO,
+                QUERYDSL_GENERATED_ANNOTATION_CLASS));
+    }
+
+    private void setLogInfo() {
+        boolean hasProperty = processingEnv.getOptions().containsKey(QUERYDSL_LOG_INFO);
+        if (hasProperty) {
+            String val = processingEnv.getOptions().get(QUERYDSL_LOG_INFO);
+            shouldLogInfo = Boolean.parseBoolean(val);
+        }
+    }
+
+    private void logInfo(String message) {
+        if (shouldLogInfo) {
+            processingEnv.getMessager().printMessage(Kind.NOTE, message);
+        }
     }
 
     private void serialize(Serializer serializer, Collection<EntityType> models) {
         for (EntityType model : models) {
             try {
-                Type type = conf.getTypeMappings().getPathType(model, model, true);
-                String packageName = type.getPackageName();
-                String className = !packageName.isEmpty() ? (packageName + "." + type.getSimpleName()) : type.getSimpleName();
+                String className = getClassName(model);
 
                 // skip if type is excluded class or in excluded package
                 if (conf.isExcludedPackage(model.getPackageName()) || conf.isExcludedClass(model.getFullName())) {
@@ -587,17 +602,10 @@ private void serialize(Serializer serializer, Collection<EntityType> models) {
                     }
                 }
 
-                processingEnv.getMessager().printMessage(Kind.NOTE, "Generating " + className + " for " + elements);
-                JavaFileObject fileObject = processingEnv.getFiler().createSourceFile(className,
-                        elements.toArray(new Element[elements.size()]));
-                Writer writer = fileObject.openWriter();
-                try {
+                logInfo("Generating " + className + " for " + elements);
+                try (Writer writer = conf.getFiler().createFile(processingEnv, className, elements)) {
                     SerializerConfig serializerConfig = conf.getSerializerConfig(model);
                     serializer.serialize(model, serializerConfig, new JavaWriter(writer));
-                } finally {
-                    if (writer != null) {
-                        writer.close();
-                    }
                 }
 
             } catch (IOException e) {
@@ -607,6 +615,11 @@ private void serialize(Serializer serializer, Collection<EntityType> models) {
         }
     }
 
+    protected String getClassName(EntityType model) {
+        Type type = conf.getTypeMappings().getPathType(model, model, true);
+        String packageName = type.getPackageName();
+        return packageName.isEmpty() ? type.getSimpleName() : (packageName + "." + type.getSimpleName());
+    }
 
     protected abstract Configuration createConfiguration(RoundEnvironment roundEnv);
 
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/Configuration.java b/querydsl-apt/src/main/java/com/querydsl/apt/Configuration.java
new file mode 100644
index 0000000000..affc5a4e3b
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/Configuration.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import com.querydsl.codegen.*;
+import com.querydsl.core.util.Annotations;
+
+import org.jetbrains.annotations.Nullable;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code Configuration} defines the configuration options for APT-based Querydsl code generation
+ *
+ * @author tiwe
+ *
+ */
+public interface Configuration {
+
+    boolean isUnknownAsEmbedded();
+
+    TypeMappings getTypeMappings();
+
+    VisitorConfig getConfig(TypeElement e, List<? extends Element> elements);
+
+    Serializer getDTOSerializer();
+
+    @Nullable
+    Class<? extends Annotation> getEntitiesAnnotation();
+
+    @Nullable
+    Class<? extends Annotation> getEmbeddedAnnotation();
+
+    @Nullable
+    Class<? extends Annotation> getEmbeddableAnnotation();
+
+    Serializer getEmbeddableSerializer();
+
+    Class<? extends Annotation> getEntityAnnotation();
+
+    Class<? extends Annotation> getAlternativeEntityAnnotation();
+
+    Set<Class<? extends Annotation>> getEntityAnnotations();
+
+    Serializer getEntitySerializer();
+
+    String getNamePrefix();
+
+    String getNameSuffix();
+
+    SerializerConfig getSerializerConfig(EntityType entityType);
+
+    @Nullable
+    Class<? extends Annotation> getSkipAnnotation();
+
+    @Nullable
+    Class<? extends Annotation> getSuperTypeAnnotation();
+
+    Serializer getSupertypeSerializer();
+
+    boolean isBlockedField(VariableElement field);
+
+    boolean isBlockedGetter(ExecutableElement getter);
+
+    boolean isUseFields();
+
+    boolean isUseGetters();
+
+    boolean isValidConstructor(ExecutableElement constructor);
+
+    boolean isValidField(VariableElement field);
+
+    boolean isValidGetter(ExecutableElement getter);
+
+    Collection<String> getKeywords();
+
+    QueryTypeFactory getQueryTypeFactory();
+
+    void addExcludedPackage(String packageName);
+
+    void addExcludedClass(String className);
+
+    TypeMirror getRealType(ExecutableElement method);
+
+    TypeMirror getRealType(VariableElement field);
+
+    boolean isExcludedPackage(String packageName);
+
+    boolean isExcludedClass(String className);
+
+    void inspect(Element element, Annotations annotations);
+
+    boolean isStrictMode();
+
+    Function<EntityType, String> getVariableNameFunction();
+
+    Filer getFiler();
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/Context.java b/querydsl-apt/src/main/java/com/querydsl/apt/Context.java
new file mode 100644
index 0000000000..3707f6f8fe
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/Context.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.lang.model.element.TypeElement;
+
+import com.querydsl.codegen.EntityType;
+
+/**
+ * Context of handled types used by {@link AbstractQuerydslProcessor}
+ *
+ * @author tiwe
+ *
+ */
+class Context {
+
+    final Map<String, EntityType> supertypes  = new HashMap<String, EntityType>();
+
+    final Map<String, EntityType> allTypes = new HashMap<String, EntityType>();
+
+    final Map<String, EntityType> projectionTypes = new HashMap<String, EntityType>();
+
+    final Map<String, EntityType> embeddableTypes = new HashMap<String,EntityType>();
+
+    final Map<String, EntityType> entityTypes = new HashMap<String, EntityType>();
+
+    final Map<String, EntityType> extensionTypes = new HashMap<String,EntityType>();
+
+    final Map<String, Set<TypeElement>> typeElements = new HashMap<String,Set<TypeElement>>();
+
+    public void clean() {
+        for (String key : supertypes.keySet()) {
+            entityTypes.remove(key);
+            extensionTypes.remove(key);
+            embeddableTypes.remove(key);
+        }
+
+        for (String key : entityTypes.keySet()) {
+            supertypes.remove(key);
+            extensionTypes.remove(key);
+            embeddableTypes.remove(key);
+        }
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java
new file mode 100644
index 0000000000..ca24d2a5a8
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java
@@ -0,0 +1,577 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import com.querydsl.codegen.*;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.util.Annotations;
+import com.querydsl.core.util.StringUtils;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import static com.querydsl.apt.APTOptions.QUERYDSL_CREATE_DEFAULT_VARIABLE;
+import static com.querydsl.apt.APTOptions.QUERYDSL_ENTITY_ACCESSORS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_EXCLUDED_CLASSES;
+import static com.querydsl.apt.APTOptions.QUERYDSL_EXCLUDED_PACKAGES;
+import static com.querydsl.apt.APTOptions.QUERYDSL_GENERATED_ANNOTATION_CLASS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_INCLUDED_CLASSES;
+import static com.querydsl.apt.APTOptions.QUERYDSL_INCLUDED_PACKAGES;
+import static com.querydsl.apt.APTOptions.QUERYDSL_LIST_ACCESSORS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_MAP_ACCESSORS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_PACKAGE_SUFFIX;
+import static com.querydsl.apt.APTOptions.QUERYDSL_PREFIX;
+import static com.querydsl.apt.APTOptions.QUERYDSL_SUFFIX;
+import static com.querydsl.apt.APTOptions.QUERYDSL_UNKNOWN_AS_EMBEDDABLE;
+import static com.querydsl.apt.APTOptions.QUERYDSL_USE_FIELDS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_USE_GETTERS;
+import static com.querydsl.apt.APTOptions.QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS;
+
+/**
+ * {@code DefaultConfiguration} is a simple implementation of the {@link Configuration} interface.
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultConfiguration implements Configuration {
+
+    private boolean unknownAsEmbedded;
+
+    private final CodegenModule module;
+
+    private final SerializerConfig defaultSerializerConfig;
+
+    private final Map<String, SerializerConfig> packageToConfig = new HashMap<String, SerializerConfig>();
+
+    protected final Class<? extends Annotation> entityAnn;
+
+    @NotNull
+    private final Set<String> excludedPackages, excludedClasses;
+
+    @NotNull
+    private final Set<String> includedPackages, includedClasses;
+
+    @Nullable
+    protected final Class<? extends Annotation> entitiesAnn, superTypeAnn, embeddedAnn, embeddableAnn, skipAnn;
+
+    @Nullable
+    protected Class<? extends Annotation> altEntityAnn;
+
+    private final Set<Class<? extends Annotation>> entityAnnotations = new HashSet<Class<? extends Annotation>>();
+
+    private final Map<String, SerializerConfig> typeToConfig = new HashMap<String, SerializerConfig>();
+
+    private boolean useFields = true, useGetters = true;
+
+    private boolean strictMode;
+
+    private Function<EntityType, String> variableNameFunction;
+
+    public DefaultConfiguration(
+            ProcessingEnvironment processingEnvironment,
+            RoundEnvironment roundEnv,
+            Collection<String> keywords,
+            @Nullable Class<? extends Annotation> entitiesAnn,
+            Class<? extends Annotation> entityAnn,
+            @Nullable Class<? extends Annotation> superTypeAnn,
+            @Nullable Class<? extends Annotation> embeddableAnn,
+            @Nullable Class<? extends Annotation> embeddedAnn,
+            @Nullable Class<? extends Annotation> skipAnn
+            ) {
+        this(processingEnvironment, roundEnv, processingEnvironment.getOptions(), keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
+             embeddedAnn, skipAnn, new CodegenModule());
+    }
+
+    @Deprecated
+    public DefaultConfiguration(
+            RoundEnvironment roundEnv,
+            Map<String, String> options,
+            Collection<String> keywords,
+            @Nullable Class<? extends Annotation> entitiesAnn,
+            Class<? extends Annotation> entityAnn,
+            @Nullable Class<? extends Annotation> superTypeAnn,
+            @Nullable Class<? extends Annotation> embeddableAnn,
+            @Nullable Class<? extends Annotation> embeddedAnn,
+            @Nullable Class<? extends Annotation> skipAnn
+    ) {
+        this(null, roundEnv, options, keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
+                embeddedAnn, skipAnn, new CodegenModule());
+    }
+
+    @Deprecated
+    public DefaultConfiguration(
+            ProcessingEnvironment processingEnvironment,
+            RoundEnvironment roundEnv,
+            Collection<String> keywords,
+            @Nullable Class<? extends Annotation> entitiesAnn,
+            Class<? extends Annotation> entityAnn,
+            @Nullable Class<? extends Annotation> superTypeAnn,
+            @Nullable Class<? extends Annotation> embeddableAnn,
+            @Nullable Class<? extends Annotation> embeddedAnn,
+            @Nullable Class<? extends Annotation> skipAnn,
+            CodegenModule codegenModule) {
+        this(processingEnvironment, roundEnv, processingEnvironment.getOptions(), keywords, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn,
+                embeddedAnn, skipAnn, codegenModule);
+    }
+
+    public DefaultConfiguration(
+            ProcessingEnvironment processingEnvironment,
+            RoundEnvironment roundEnv,
+            Map<String, String> options,
+            Collection<String> keywords,
+            @Nullable Class<? extends Annotation> entitiesAnn,
+            Class<? extends Annotation> entityAnn,
+            @Nullable Class<? extends Annotation> superTypeAnn,
+            @Nullable Class<? extends Annotation> embeddableAnn,
+            @Nullable Class<? extends Annotation> embeddedAnn,
+            @Nullable Class<? extends Annotation> skipAnn,
+            CodegenModule codegenModule) {
+        this.excludedClasses = new HashSet<String>();
+        this.excludedPackages = new HashSet<String>();
+        this.includedClasses = new HashSet<String>();
+        this.includedPackages = new HashSet<String>();
+        module = codegenModule;
+        module.bind(ProcessingEnvironment.class, processingEnvironment);
+        module.bind(RoundEnvironment.class, roundEnv);
+        module.bind(CodegenModule.KEYWORDS, keywords);
+        this.entitiesAnn = entitiesAnn;
+        this.entityAnn = entityAnn;
+        this.superTypeAnn = superTypeAnn;
+        this.embeddableAnn = embeddableAnn;
+        this.embeddedAnn = embeddedAnn;
+        this.skipAnn = skipAnn;
+
+        entityAnnotations.add(entityAnn);
+        if (superTypeAnn != null) {
+            entityAnnotations.add(superTypeAnn);
+        }
+        if (embeddableAnn != null) {
+            entityAnnotations.add(embeddableAnn);
+        }
+        for (Element element : roundEnv.getElementsAnnotatedWith(Config.class)) {
+            Config querydslConfig = element.getAnnotation(Config.class);
+            SerializerConfig config = SimpleSerializerConfig.getConfig(querydslConfig);
+            if (element instanceof PackageElement) {
+                PackageElement packageElement = (PackageElement) element;
+                packageToConfig.put(packageElement.getQualifiedName().toString(), config);
+            } else if (element instanceof TypeElement) {
+                TypeElement typeElement = (TypeElement) element;
+                typeToConfig.put(typeElement.getQualifiedName().toString(), config);
+            }
+        }
+        boolean entityAccessors = false;
+        boolean listAccessors = false;
+        boolean mapAccessors = false;
+        boolean createDefaultVariable = true;
+
+        if (options.containsKey(QUERYDSL_ENTITY_ACCESSORS)) {
+            entityAccessors = Boolean.parseBoolean(options.get(QUERYDSL_ENTITY_ACCESSORS));
+        }
+        if (options.containsKey(QUERYDSL_LIST_ACCESSORS)) {
+            listAccessors = Boolean.parseBoolean(options.get(QUERYDSL_LIST_ACCESSORS));
+        }
+        if (options.containsKey(QUERYDSL_MAP_ACCESSORS)) {
+            mapAccessors = Boolean.parseBoolean(options.get(QUERYDSL_MAP_ACCESSORS));
+        }
+        if (options.containsKey(QUERYDSL_CREATE_DEFAULT_VARIABLE)) {
+            createDefaultVariable = Boolean.parseBoolean(options.get(QUERYDSL_CREATE_DEFAULT_VARIABLE));
+        }
+        if (options.containsKey(QUERYDSL_PACKAGE_SUFFIX)) {
+            module.bind(CodegenModule.PACKAGE_SUFFIX, StringUtils.nullToEmpty(options.get(QUERYDSL_PACKAGE_SUFFIX)));
+        }
+        if (options.containsKey(QUERYDSL_PREFIX)) {
+            module.bind(CodegenModule.PREFIX, StringUtils.nullToEmpty(options.get(QUERYDSL_PREFIX)));
+        }
+        if (options.containsKey(QUERYDSL_SUFFIX)) {
+            module.bind(CodegenModule.SUFFIX, StringUtils.nullToEmpty(options.get(QUERYDSL_SUFFIX)));
+        }
+        if (options.containsKey(QUERYDSL_UNKNOWN_AS_EMBEDDABLE)) {
+            unknownAsEmbedded = Boolean.parseBoolean(options.get(QUERYDSL_UNKNOWN_AS_EMBEDDABLE));
+        }
+
+        if (options.containsKey(QUERYDSL_EXCLUDED_PACKAGES)) {
+            String packageString = options.get(QUERYDSL_EXCLUDED_PACKAGES);
+            if (!StringUtils.isNullOrEmpty(packageString)) {
+                List<String> packages = Arrays.asList(packageString.split(","));
+                excludedPackages.addAll(packages);
+            }
+        }
+
+        if (options.containsKey(QUERYDSL_EXCLUDED_CLASSES)) {
+            String classString = options.get(QUERYDSL_EXCLUDED_CLASSES);
+            if (!StringUtils.isNullOrEmpty(classString)) {
+                List<String> classes = Arrays.asList(classString.split(","));
+                excludedClasses.addAll(classes);
+            }
+        }
+
+        if (options.containsKey(QUERYDSL_INCLUDED_PACKAGES)) {
+            String packageString = options.get(QUERYDSL_INCLUDED_PACKAGES);
+            if (!StringUtils.isNullOrEmpty(packageString)) {
+                List<String> packages = Arrays.asList(packageString.split(","));
+                includedPackages.addAll(packages);
+            }
+        }
+
+        if (options.containsKey(QUERYDSL_INCLUDED_CLASSES)) {
+            String classString = options.get(QUERYDSL_INCLUDED_CLASSES);
+            if (!StringUtils.isNullOrEmpty(classString)) {
+                List<String> classes = Arrays.asList(classString.split(","));
+                includedClasses.addAll(classes);
+            }
+        }
+
+        if (options.containsKey(QUERYDSL_USE_FIELDS)) {
+            useFields = Boolean.parseBoolean(options.get(QUERYDSL_USE_FIELDS));
+        }
+
+        if (options.containsKey(QUERYDSL_USE_GETTERS)) {
+            useGetters = Boolean.parseBoolean(options.get(QUERYDSL_USE_GETTERS));
+        }
+
+        if (options.containsKey(QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS)) {
+            try {
+                @SuppressWarnings("unchecked")
+                Class<Function<EntityType, String>> variableNameFunctionClass = (Class<Function<EntityType, String>>) Class.forName(options.get(QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS));
+                variableNameFunction = variableNameFunctionClass.newInstance();
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            } catch (Exception e) {
+                variableNameFunction = DefaultVariableNameFunction.INSTANCE;
+            }
+        } else {
+            variableNameFunction = DefaultVariableNameFunction.INSTANCE;
+        }
+
+        module.bind(CodegenModule.VARIABLE_NAME_FUNCTION_CLASS, variableNameFunction);
+
+        module.loadExtensions();
+
+        Class<? extends Annotation> generatedAnnotationClass = GeneratedAnnotationResolver.resolve(options.get(QUERYDSL_GENERATED_ANNOTATION_CLASS));
+        module.bindInstance(CodegenModule.GENERATED_ANNOTATION_CLASS, generatedAnnotationClass);
+
+        defaultSerializerConfig = new SimpleSerializerConfig(entityAccessors, listAccessors,
+                mapAccessors, createDefaultVariable, "");
+
+    }
+
+    @Override
+    public void addExcludedClass(String className) {
+        excludedClasses.add(className);
+    }
+
+    @Override
+    public void addExcludedPackage(String packageName) {
+        excludedPackages.add(packageName);
+    }
+
+    @Override
+    public VisitorConfig getConfig(TypeElement e, List<? extends Element> elements) {
+        if (useFields) {
+            if (useGetters) {
+                return VisitorConfig.ALL;
+            } else {
+                return VisitorConfig.FIELDS_ONLY;
+            }
+        } else if (useGetters) {
+            return VisitorConfig.METHODS_ONLY;
+        } else {
+            return VisitorConfig.NONE;
+        }
+    }
+
+    @Override
+    public Serializer getDTOSerializer() {
+        return module.get(ProjectionSerializer.class);
+    }
+
+    @Override
+    @Nullable
+    public Class<? extends Annotation> getEntitiesAnnotation() {
+        return entitiesAnn;
+    }
+
+    @Override
+    @Nullable
+    public Class<? extends Annotation> getEmbeddableAnnotation() {
+        return embeddableAnn;
+    }
+
+    @Override
+    public Serializer getEmbeddableSerializer() {
+        return module.get(EmbeddableSerializer.class);
+    }
+
+    @Override
+    public Class<? extends Annotation> getEntityAnnotation() {
+        return entityAnn;
+    }
+
+    @Override
+    public Class<? extends Annotation> getAlternativeEntityAnnotation() {
+        return altEntityAnn;
+    }
+
+    public void setAlternativeEntityAnnotation(Class<? extends Annotation> ann) {
+        altEntityAnn = ann;
+        entityAnnotations.add(ann);
+    }
+
+    @Override
+    @Nullable
+    public Class<? extends Annotation> getEmbeddedAnnotation() {
+        return embeddedAnn;
+    }
+
+    @Override
+    public Set<Class<? extends Annotation>> getEntityAnnotations() {
+        return entityAnnotations;
+    }
+
+    @Override
+    public Serializer getEntitySerializer() {
+        return module.get(EntitySerializer.class);
+    }
+
+    @Override
+    public String getNamePrefix() {
+        return module.get(String.class, "prefix");
+    }
+
+    @Override
+    public SerializerConfig getSerializerConfig(EntityType entityType) {
+        if (typeToConfig.containsKey(entityType.getFullName())) {
+            return typeToConfig.get(entityType.getFullName());
+        } else {
+            return packageToConfig.getOrDefault(entityType.getPackageName(), defaultSerializerConfig);
+        }
+    }
+
+    @Override
+    @Nullable
+    public Class<? extends Annotation> getSkipAnnotation() {
+        return skipAnn;
+    }
+
+    @Override
+    @Nullable
+    public Class<? extends Annotation> getSuperTypeAnnotation() {
+        return superTypeAnn;
+    }
+
+    @Override
+    public Serializer getSupertypeSerializer() {
+        return module.get(SupertypeSerializer.class);
+    }
+
+    @Override
+    public void inspect(Element element, Annotations annotations) {
+        // do nothing
+    }
+
+    @Override
+    public boolean isBlockedField(VariableElement field) {
+        if (field.getAnnotation(QueryType.class) != null) {
+            return false;
+        } else {
+            return field.getAnnotation(skipAnn) != null
+                || field.getModifiers().contains(Modifier.TRANSIENT)
+                || field.getModifiers().contains(Modifier.STATIC);
+        }
+    }
+
+    @Override
+    public boolean isBlockedGetter(ExecutableElement getter) {
+        if (getter.getAnnotation(QueryType.class) != null) {
+            return false;
+        } else {
+            return getter.getAnnotation(skipAnn) != null
+                || getter.getModifiers().contains(Modifier.STATIC);
+        }
+    }
+
+    @Override
+    public boolean isUseFields() {
+        return useFields;
+    }
+
+    @Override
+    public boolean isUseGetters() {
+        return useGetters;
+    }
+
+    @Override
+    public boolean isValidConstructor(ExecutableElement constructor) {
+        return constructor.getModifiers().contains(Modifier.PUBLIC)
+            && constructor.getAnnotation(QueryProjection.class) != null
+            && !constructor.getParameters().isEmpty();
+    }
+
+    @Override
+    public boolean isValidField(VariableElement field) {
+        if (field.getAnnotation(QueryType.class) != null) {
+            return true;
+        } else {
+            return field.getAnnotation(skipAnn) == null
+                && !field.getModifiers().contains(Modifier.TRANSIENT)
+                && !field.getModifiers().contains(Modifier.STATIC);
+        }
+    }
+
+    @Override
+    public boolean isValidGetter(ExecutableElement getter) {
+        if (getter.getAnnotation(QueryType.class) != null) {
+            return true;
+        } else {
+            return getter.getAnnotation(skipAnn) == null
+                && !getter.getModifiers().contains(Modifier.STATIC);
+        }
+    }
+
+    public void setNamePrefix(String namePrefix) {
+        module.bind(CodegenModule.PREFIX, namePrefix);
+    }
+
+    public void setUseFields(boolean b) {
+        this.useFields = b;
+    }
+
+    public void setUseGetters(boolean b) {
+        this.useGetters = b;
+    }
+
+    @Override
+    public TypeMappings getTypeMappings() {
+        return module.get(TypeMappings.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Collection<String> getKeywords() {
+        return module.get(Collection.class, CodegenModule.KEYWORDS);
+    }
+
+    @Override
+    public String getNameSuffix() {
+        return module.get(String.class, CodegenModule.SUFFIX);
+    }
+
+    public void setNameSuffix(String nameSuffix) {
+        module.bind(CodegenModule.SUFFIX, nameSuffix);
+    }
+
+    public <T> void addCustomType(Class<T> type, Class<? extends Expression<T>> queryType) {
+        module.get(TypeMappings.class).register(new ClassType(type), new ClassType(queryType));
+    }
+
+    @Override
+    public QueryTypeFactory getQueryTypeFactory() {
+        return module.get(QueryTypeFactory.class);
+    }
+
+    @Override
+    public boolean isExcludedPackage(@NotNull String packageName) {
+        if (!includedPackages.isEmpty()) {
+            boolean included = false;
+            for (String includedPackage : includedPackages) {
+                if (packageName.startsWith(includedPackage)) {
+                    included = true;
+                    break;
+                }
+            }
+            if (!included) {
+                return true;
+            }
+        }
+        if (!excludedPackages.isEmpty()) {
+            for (String excludedPackage : excludedPackages) {
+                if (packageName.startsWith(excludedPackage)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isExcludedClass(@NotNull String className) {
+        if (!includedClasses.isEmpty() && !includedClasses.contains(className)) {
+            return true;
+        } else {
+            return excludedClasses.contains(className);
+        }
+    }
+
+    @Override
+    public TypeMirror getRealType(ExecutableElement method) {
+        return null;
+    }
+
+    @Override
+    public TypeMirror getRealType(VariableElement field) {
+        return null;
+    }
+
+    @Override
+    public boolean isUnknownAsEmbedded() {
+        return unknownAsEmbedded;
+    }
+
+    @Override
+    public boolean isStrictMode() {
+        return strictMode;
+    }
+
+    public void setStrictMode(boolean s) {
+        strictMode = s;
+    }
+
+    public void setUnknownAsEmbedded(boolean unknownAsEmbedded) {
+        this.unknownAsEmbedded = unknownAsEmbedded;
+    }
+
+    @Override
+    public Function<EntityType, String> getVariableNameFunction() {
+        return variableNameFunction;
+    }
+
+    @Override
+    public Filer getFiler() {
+        return module.get(Filer.class);
+    }
+}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java b/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java
similarity index 79%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java
index 689ca6f0ea..9a5cd04b02 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
+package com.querydsl.apt;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.TypeExtends;
+import com.querydsl.codegen.utils.model.TypeSuper;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.QueryTypeFactory;
+import com.querydsl.codegen.Supertype;
+import com.querydsl.codegen.TypeMappings;
+import com.querydsl.core.annotations.QueryExclude;
+
+import org.jetbrains.annotations.Nullable;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
@@ -41,28 +43,25 @@
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.TypeVisitor;
 import javax.lang.model.type.WildcardType;
-import javax.lang.model.util.AbstractTypeVisitor6;
-
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.codegen.model.TypeSuper;
-import com.mysema.codegen.model.Types;
-import com.mysema.query.annotations.QueryExclude;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Supertype;
-import com.mysema.query.codegen.TypeMappings;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
 
 /**
- * ExtendedTypeFactory is a factory for APT inspection based Type creation
+ * {@code ExtendedTypeFactory} is a factory for APT-based inspection {@link Type} creation
  *
  * @author tiwe
  *
  */
-public final class ExtendedTypeFactory {
+public class ExtendedTypeFactory {
 
     private final Map<List<String>, Type> typeCache = new HashMap<List<String>, Type>();
 
@@ -82,7 +81,9 @@ public final class ExtendedTypeFactory {
 
     private boolean doubleIndexEntities = true;
 
-    private final TypeVisitor<Type, Boolean> visitor = new AbstractTypeVisitor6<Type, Boolean>() {
+    private Function<EntityType, String> variableNameFunction;
+
+    private final TypeVisitor<Type, Boolean> visitor = new SimpleTypeVisitorAdapter<Type, Boolean>() {
 
         @Override
         public Type visitPrimitive(PrimitiveType primitiveType, Boolean p) {
@@ -132,13 +133,19 @@ public Type visitArray(ArrayType arrayType, Boolean p) {
         @Override
         public Type visitDeclared(DeclaredType declaredType, Boolean p) {
             if (declaredType.asElement() instanceof TypeElement) {
-                TypeElement typeElement = (TypeElement)declaredType.asElement();
-                switch(typeElement.getKind()) {
-                case ENUM:      return createEnumType(declaredType, typeElement, p);
-                case ANNOTATION_TYPE:
-                case CLASS:     return createClassType(declaredType, typeElement, p);
-                case INTERFACE: return createInterfaceType(declaredType, typeElement, p);
-                default: throw new IllegalArgumentException("Illegal type " + typeElement);
+                TypeElement typeElement = (TypeElement) declaredType.asElement();
+                switch (typeElement.getKind()) {
+                    case ENUM:      return createEnumType(declaredType, typeElement, p);
+                    case ANNOTATION_TYPE:
+                    case CLASS:     return createClassType(declaredType, typeElement, p);
+                    case INTERFACE: return createInterfaceType(declaredType, typeElement, p);
+                    default: {
+                        if (typeElement.getKind().name().equals("RECORD")) {
+                            return createClassType(declaredType, typeElement, p);
+                        }
+
+                        throw new IllegalArgumentException("Illegal type " + typeElement);
+                    }
                 }
             } else {
                 throw new IllegalArgumentException("Unsupported element type " + declaredType.asElement());
@@ -165,12 +172,12 @@ public Type visitTypeVariable(TypeVariable typeVariable, Boolean p) {
         }
 
         @Override
-        public Type visitWildcard(WildcardType wildardType, Boolean p) {
-            if (wildardType.getExtendsBound() != null) {
-                Type type = visit(wildardType.getExtendsBound(), p);
+        public Type visitWildcard(WildcardType wildcardType, Boolean p) {
+            if (wildcardType.getExtendsBound() != null) {
+                Type type = visit(wildcardType.getExtendsBound(), p);
                 return new TypeExtends(type);
-            } else if (wildardType.getSuperBound() != null) {
-                Type type = visit(wildardType.getSuperBound(), p);
+            } else if (wildcardType.getSuperBound() != null) {
+                Type type = visit(wildcardType.getSuperBound(), p);
                 return new TypeSuper(type);
             } else {
                 return null;
@@ -187,16 +194,13 @@ public Type visitNoType(NoType t, Boolean p) {
             return defaultType;
         }
 
-        @Override
-        public Type visitUnknown(TypeMirror t, Boolean p) {
-            return defaultType;
-        }
-
     };
 
     // TODO : return TypeMirror instead ?!?
 
-    private final TypeVisitor<List<String>, Boolean> keyBuilder = new AbstractTypeVisitor6<List<String>, Boolean>() {
+    private final TypeVisitor<List<String>, Boolean> keyBuilder = new SimpleTypeVisitorAdapter<List<String>, Boolean>() {
+
+        private final List<String> defaultValue = Collections.singletonList("Object");
 
         private List<String> visitBase(TypeMirror t) {
             List<String> rv = new ArrayList<String>();
@@ -215,7 +219,7 @@ public List<String> visitPrimitive(PrimitiveType t, Boolean p) {
 
         @Override
         public List<String> visitNull(NullType t, Boolean p) {
-            return Collections.singletonList("Object");
+            return defaultValue;
         }
 
         @Override
@@ -274,17 +278,18 @@ public List<String> visitExecutable(ExecutableType t, Boolean p) {
 
         @Override
         public List<String> visitNoType(NoType t, Boolean p) {
-            return Collections.singletonList("Object");
+            return defaultValue;
         }
 
     };
 
     public ExtendedTypeFactory(
             ProcessingEnvironment env,
-            Configuration configuration,
             Set<Class<? extends Annotation>> annotations,
             TypeMappings typeMappings,
-            QueryTypeFactory queryTypeFactory) {
+            QueryTypeFactory queryTypeFactory,
+            Function<EntityType,
+            String> variableNameFunction) {
         this.env = env;
         this.defaultType = new TypeExtends(Types.OBJECT);
         this.entityAnnotations = annotations;
@@ -297,13 +302,14 @@ public ExtendedTypeFactory(
         this.mapType = getErasedType(Map.class);
         this.typeMappings = typeMappings;
         this.queryTypeFactory = queryTypeFactory;
+        this.variableNameFunction = variableNameFunction;
     }
 
     private TypeMirror getErasedType(Class<?> clazz) {
         return env.getTypeUtils().erasure(env.getElementUtils().getTypeElement(clazz.getName()).asType());
     }
 
-    private Type createType(TypeElement typeElement, TypeCategory category,
+    protected Type createType(TypeElement typeElement, TypeCategory category,
             List<? extends TypeMirror> typeArgs, boolean deep) {
         String name = typeElement.getQualifiedName().toString();
         String simpleName = typeElement.getSimpleName().toString();
@@ -350,6 +356,24 @@ private Type createType(TypeMirror typeMirror, List<String> key, boolean deep) {
     private Type createClassType(DeclaredType declaredType, TypeElement typeElement, boolean deep) {
         // other
         String name = typeElement.getQualifiedName().toString();
+
+        if (name.startsWith("java.")) {
+            Iterator<? extends TypeMirror> i = declaredType.getTypeArguments().iterator();
+
+            if (isAssignable(declaredType, mapType)) {
+                return createMapType(i, deep);
+
+            } else if (isAssignable(declaredType, listType)) {
+                return createCollectionType(Types.LIST, i, deep);
+
+            } else if (isAssignable(declaredType, setType)) {
+                return createCollectionType(Types.SET, i, deep);
+
+            } else if (isAssignable(declaredType, collectionType)) {
+                return createCollectionType(Types.COLLECTION, i, deep);
+            }
+        }
+
         TypeCategory typeCategory = TypeCategory.get(name);
 
         if (typeCategory != TypeCategory.NUMERIC
@@ -361,11 +385,11 @@ && isSubType(typeElement.asType(), numberType)) {
                 && isAssignable(typeElement.asType(), comparableType)) {
             typeCategory = TypeCategory.COMPARABLE;
 
-        } if (typeCategory == TypeCategory.SIMPLE) {
-            for (Class<? extends Annotation> entityAnn : entityAnnotations) {
-                if (typeElement.getAnnotation(entityAnn) != null) {
-                    typeCategory = TypeCategory.ENTITY;
-                }
+        }
+
+        for (Class<? extends Annotation> entityAnn : entityAnnotations) {
+            if (isSimpleTypeEntity(typeElement, entityAnn)) {
+                typeCategory = TypeCategory.ENTITY;
             }
         }
 
@@ -384,9 +408,9 @@ && isAssignable(typeElement.asType(), comparableType)) {
                     type = superType;
                 }
             }
-            typeElement = (TypeElement)env.getTypeUtils().asElement(type);
+            typeElement = (TypeElement) env.getTypeUtils().asElement(type);
             if (type instanceof DeclaredType) {
-                arguments = ((DeclaredType)type).getTypeArguments();
+                arguments = ((DeclaredType) type).getTypeArguments();
             }
         }
 
@@ -395,14 +419,14 @@ && isAssignable(typeElement.asType(), comparableType)) {
         TypeMirror superType = typeElement.getSuperclass();
         TypeElement superTypeElement = null;
         if (superType instanceof DeclaredType) {
-            superTypeElement = (TypeElement) ((DeclaredType)superType).asElement();
+            superTypeElement = (TypeElement) ((DeclaredType) superType).asElement();
         }
 
         // entity type
         for (Class<? extends Annotation> entityAnn : entityAnnotations) {
             if (typeElement.getAnnotation(entityAnn) != null ||
                     (superTypeElement != null && superTypeElement.getAnnotation(entityAnn) != null)) {
-                EntityType entityType = new EntityType(type);
+                EntityType entityType = new EntityType(type, variableNameFunction);
                 typeMappings.register(entityType, queryTypeFactory.create(entityType));
                 return entityType;
             }
@@ -410,7 +434,11 @@ && isAssignable(typeElement.asType(), comparableType)) {
         return type;
     }
 
-    private Type createMapType(String simpleName, Iterator<? extends TypeMirror> typeMirrors, boolean deep) {
+    public boolean isSimpleTypeEntity(TypeElement typeElement, Class<? extends Annotation> entityAnn) {
+        return typeElement.getAnnotation(entityAnn) != null;
+    }
+
+    protected Type createMapType(Iterator<? extends TypeMirror> typeMirrors, boolean deep) {
         if (!typeMirrors.hasNext()) {
             return new SimpleType(Types.MAP, defaultType, defaultType);
         }
@@ -435,8 +463,8 @@ private Type createMapType(String simpleName, Iterator<? extends TypeMirror> typ
         return new SimpleType(Types.MAP, keyType, valueType);
     }
 
-    private Type createCollectionType(Type baseType, String simpleName,
-            Iterator<? extends TypeMirror> typeMirrors, boolean deep) {
+    private Type createCollectionType(Type baseType,
+                                      Iterator<? extends TypeMirror> typeMirrors, boolean deep) {
         if (!typeMirrors.hasNext()) {
             return new SimpleType(baseType, defaultType);
         }
@@ -463,7 +491,7 @@ public EntityType getEntityType(TypeMirror typeMirror, boolean deep) {
         if (entityTypeCache.containsKey(key)) {
             EntityType entityType = entityTypeCache.get(key);
             if (deep && entityType.getSuperTypes().isEmpty()) {
-                for (Type superType : getSupertypes(typeMirror, entityType, deep)) {
+                for (Type superType : getSupertypes(typeMirror, deep)) {
                     entityType.addSupertype(new Supertype(superType));
                 }
             }
@@ -483,15 +511,15 @@ private EntityType createEntityType(TypeMirror typeMirror, List<String> key, boo
         if (value != null) {
             EntityType entityType = null;
             if (value instanceof EntityType) {
-                entityType = (EntityType)value;
+                entityType = (EntityType) value;
             } else {
-                entityType = new EntityType(value);
+                entityType = new EntityType(value, variableNameFunction);
                 typeMappings.register(entityType, queryTypeFactory.create(entityType));
             }
             entityTypeCache.put(key, entityType);
 
             if (deep) {
-                for (Type superType : getSupertypes(typeMirror, value, deep)) {
+                for (Type superType : getSupertypes(typeMirror, deep)) {
                     entityType.addSupertype(new Supertype(superType));
                 }
             }
@@ -508,7 +536,7 @@ private Type createEnumType(DeclaredType declaredType, TypeElement typeElement,
 
         for (Class<? extends Annotation> entityAnn : entityAnnotations) {
             if (typeElement.getAnnotation(entityAnn) != null) {
-                EntityType entityType = new EntityType(enumType);
+                EntityType entityType = new EntityType(enumType, variableNameFunction);
                 typeMappings.register(entityType, queryTypeFactory.create(entityType));
                 return entityType;
             }
@@ -524,20 +552,19 @@ private Type createInterfaceType(DeclaredType declaredType, TypeElement typeElem
             }
         }
 
-        String simpleName = typeElement.getSimpleName().toString();
         Iterator<? extends TypeMirror> i = declaredType.getTypeArguments().iterator();
 
         if (isAssignable(declaredType, mapType)) {
-            return createMapType(simpleName, i, deep);
+            return createMapType(i, deep);
 
         } else if (isAssignable(declaredType, listType)) {
-            return createCollectionType(Types.LIST, simpleName, i, deep);
+            return createCollectionType(Types.LIST, i, deep);
 
         } else if (isAssignable(declaredType, setType)) {
-            return createCollectionType(Types.SET, simpleName, i, deep);
+            return createCollectionType(Types.SET, i, deep);
 
         } else if (isAssignable(declaredType, collectionType)) {
-            return createCollectionType(Types.COLLECTION, simpleName, i, deep);
+            return createCollectionType(Types.COLLECTION, i, deep);
 
         } else {
             String name = typeElement.getQualifiedName().toString();
@@ -545,20 +572,20 @@ private Type createInterfaceType(DeclaredType declaredType, TypeElement typeElem
         }
     }
 
-    private Set<Type> getSupertypes(TypeMirror typeMirror, Type type, boolean deep) {
+    private Set<Type> getSupertypes(TypeMirror typeMirror, boolean deep) {
         boolean doubleIndex = doubleIndexEntities;
         doubleIndexEntities = false;
         Set<Type> superTypes = Collections.emptySet();
         typeMirror = normalize(typeMirror);
         if (typeMirror.getKind() == TypeKind.DECLARED) {
-            DeclaredType declaredType = (DeclaredType)typeMirror;
-            TypeElement e = (TypeElement)declaredType.asElement();
+            DeclaredType declaredType = (DeclaredType) typeMirror;
+            TypeElement e = (TypeElement) declaredType.asElement();
             // class
             if (e.getKind() == ElementKind.CLASS) {
                 if (e.getSuperclass().getKind() != TypeKind.NONE) {
                     TypeMirror supertype = normalize(e.getSuperclass());
                     if (supertype instanceof DeclaredType
-                            && ((DeclaredType)supertype).asElement().getAnnotation(QueryExclude.class) != null) {
+                            && ((DeclaredType) supertype).asElement().getAnnotation(QueryExclude.class) != null) {
                         return Collections.emptySet();
                     } else {
                         Type superClass = getType(supertype, deep);
@@ -572,7 +599,7 @@ private Set<Type> getSupertypes(TypeMirror typeMirror, Type type, boolean deep)
                 }
             // interface
             } else {
-                superTypes = new HashSet<Type>(e.getInterfaces().size());
+                superTypes = new LinkedHashSet<Type>(e.getInterfaces().size());
                 for (TypeMirror mirror : e.getInterfaces()) {
                     Type iface = getType(mirror, deep);
                     if (!iface.getFullName().startsWith("java")) {
@@ -602,12 +629,12 @@ private boolean isSubType(TypeMirror type1, TypeMirror clazz) {
 
     private TypeMirror normalize(TypeMirror type) {
         if (type.getKind() == TypeKind.TYPEVAR) {
-            TypeVariable typeVar = (TypeVariable)type;
+            TypeVariable typeVar = (TypeVariable) type;
             if (typeVar.getUpperBound() != null) {
                 return typeVar.getUpperBound();
             }
         } else if (type.getKind() == TypeKind.WILDCARD) {
-            WildcardType wildcard = (WildcardType)type;
+            WildcardType wildcard = (WildcardType) type;
             if (wildcard.getExtendsBound() != null) {
                 return wildcard.getExtendsBound();
             }
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/QueryTypeImpl.java b/querydsl-apt/src/main/java/com/querydsl/apt/QueryTypeImpl.java
similarity index 79%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/QueryTypeImpl.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/QueryTypeImpl.java
index a41f04eddf..3f0ba17ffd 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/QueryTypeImpl.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/QueryTypeImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2013, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
 import java.lang.annotation.Annotation;
 
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryType;
 
 /**
+ * Implementation of the {@link QueryType} annotation
+ *
  * @author tiwe
  *
  */
@@ -26,11 +28,11 @@
 public class QueryTypeImpl implements QueryType {
 
     private final PropertyType value;
-    
+
     public QueryTypeImpl(PropertyType value) {
         this.value = value;
     }
-    
+
     @Override
     public Class<? extends Annotation> annotationType() {
         return QueryType.class;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java
new file mode 100644
index 0000000000..ea9384ba19
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+
+import com.querydsl.core.annotations.*;
+
+/**
+ * Default annotation processor for Querydsl which handles {@link QueryEntity}, {@link QuerySupertype},
+ * {@link QueryEmbeddable}, {@link QueryEmbedded} and {@link QueryTransient}
+ *
+ * @author tiwe
+ *
+ */
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*"})
+public class QuerydslAnnotationProcessor extends AbstractQuerydslProcessor {
+
+    @Override
+    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
+        Class<? extends Annotation> entities = QueryEntities.class;
+        Class<? extends Annotation> entity = QueryEntity.class;
+        Class<? extends Annotation> superType = QuerySupertype.class;
+        Class<? extends Annotation> embeddable = QueryEmbeddable.class;
+        Class<? extends Annotation> embedded = QueryEmbedded.class;
+        Class<? extends Annotation> skip = QueryTransient.class;
+
+        return new DefaultConfiguration(
+                processingEnv, roundEnv, Collections.<String>emptySet(), entities,
+                entity, superType, embeddable, embedded, skip);
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/SimpleTypeVisitorAdapter.java b/querydsl-apt/src/main/java/com/querydsl/apt/SimpleTypeVisitorAdapter.java
new file mode 100644
index 0000000000..35f3dfd06c
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/SimpleTypeVisitorAdapter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.SimpleTypeVisitor6;
+
+/**
+ * Converts Java 8 {@link javax.lang.model.type.IntersectionType IntersectionType} instances into their first bound when visiting
+ *
+ * @param <R>
+ * @param <P>
+ */
+class SimpleTypeVisitorAdapter<R, P> extends SimpleTypeVisitor6<R, P> {
+
+    private static final Class<?> intersectionTypeClass;
+
+    private static final Method getBoundsMethod;
+
+    static {
+        Class<?> availableClass;
+        Method availableMethod;
+        try {
+            availableClass = Class.forName("javax.lang.model.type.IntersectionType");
+            availableMethod = availableClass.getMethod("getBounds");
+        } catch (Exception e) {
+            // Not using Java 8
+            availableClass = null;
+            availableMethod = null;
+        }
+        intersectionTypeClass = availableClass;
+        getBoundsMethod = availableMethod;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public R visitUnknown(TypeMirror t, P p) {
+        if (intersectionTypeClass != null && intersectionTypeClass.isInstance(t)) {
+            try {
+                List<TypeMirror> bounds = (List<TypeMirror>) getBoundsMethod.invoke(t);
+                return bounds.get(0).accept(this, p);
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        } else {
+            return super.visitUnknown(t, p);
+        }
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java b/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java
similarity index 88%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java
index 37a6082bff..93a06f811a 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,9 +11,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
+
+import com.querydsl.codegen.utils.model.Constructor;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.QueryTypeFactory;
+import com.querydsl.codegen.TypeMappings;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.util.Annotations;
+import com.querydsl.core.util.BeanUtils;
 
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -21,35 +42,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.codegen.model.Constructor;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryInit;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.util.Annotations;
-import com.mysema.util.BeanUtils;
-
 /**
- * TypeElementHandler is a an APT visitor for entity types
+ * {@code TypeElementHandler} is an APT visitor for entity types
  *
  * @author tiwe
  *
  */
-public final class TypeElementHandler {
+public class TypeElementHandler {
 
     private final TypeMappings typeMappings;
 
@@ -165,9 +164,9 @@ private Property toProperty(EntityType entityType, String name, TypeMirror type,
         }
 
         // inits
-        List<String> inits = Collections.<String>emptyList();
+        List<String> inits = Collections.emptyList();
         if (annotations.isAnnotationPresent(QueryInit.class)) {
-            inits = ImmutableList.copyOf(annotations.getAnnotation(QueryInit.class).value());
+            inits = Arrays.asList(annotations.getAnnotation(QueryInit.class).value());
         }
 
         return new Property(entityType, name, propertyType, inits);
@@ -176,7 +175,7 @@ private Property toProperty(EntityType entityType, String name, TypeMirror type,
 
     public EntityType handleProjectionType(TypeElement e) {
         Type c = typeFactory.getType(e.asType(), true);
-        EntityType entityType = new EntityType(c.as(TypeCategory.ENTITY));
+        EntityType entityType = new EntityType(c.as(TypeCategory.ENTITY), configuration.getVariableNameFunction());
         typeMappings.register(entityType, queryTypeFactory.create(entityType));
         List<? extends Element> elements = e.getEnclosedElements();
         handleConstructors(entityType, elements);
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/TypeExtractor.java b/querydsl-apt/src/main/java/com/querydsl/apt/TypeExtractor.java
new file mode 100644
index 0000000000..12f7229773
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/TypeExtractor.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.*;
+
+/**
+ * {@code TypeExtractor} is a visitor implementation which extracts a concrete type from a generic {@link TypeElement}
+ *
+ * @author tiwe
+ *
+ */
+class TypeExtractor extends SimpleTypeVisitorAdapter<TypeElement, Void> {
+
+    private final boolean skipEnum;
+
+    TypeExtractor(boolean skipEnum) {
+        this.skipEnum = skipEnum;
+    }
+
+    @Override
+    public TypeElement visitPrimitive(PrimitiveType t, Void p) {
+        return null;
+    }
+
+    @Override
+    public TypeElement visitNull(NullType t, Void p) {
+        return null;
+    }
+
+    @Override
+    public TypeElement visitArray(ArrayType t, Void p) {
+        return visit(t.getComponentType());
+    }
+
+    @Override
+    public TypeElement visitDeclared(DeclaredType t, Void p) {
+        if (t.asElement() instanceof TypeElement) {
+            TypeElement typeElement = (TypeElement) t.asElement();
+            switch (typeElement.getKind()) {
+                case ENUM:      return skipEnum ? null : typeElement;
+                case CLASS:     return typeElement;
+                case INTERFACE: return visitInterface(t);
+                default: throw new IllegalArgumentException("Illegal type: " + typeElement);
+            }
+        } else {
+            return null;
+        }
+    }
+
+    private TypeElement visitInterface(DeclaredType t) {
+        if (t.getTypeArguments().isEmpty()) {
+            return (TypeElement) t.asElement();
+        } else {
+            int count = t.getTypeArguments().size();
+            if (t.asElement().toString().startsWith("java.util")) {
+                return t.getTypeArguments().get(count - 1).accept(this, null);
+            } else {
+                return (TypeElement) t.asElement();
+            }
+        }
+    }
+
+    @Override
+    public TypeElement visitError(ErrorType t, Void p) {
+        return visitDeclared(t, p);
+    }
+
+    @Override
+    public TypeElement visitTypeVariable(TypeVariable t, Void p) {
+        if (t.getUpperBound() != null) {
+            return visit(t.getUpperBound());
+        } else if (t.getLowerBound() != null) {
+            return visit(t.getLowerBound());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public TypeElement visitWildcard(WildcardType t, Void p) {
+        if (t.getExtendsBound() != null) {
+            return visit(t.getExtendsBound());
+        } else if (t.getSuperBound() != null) {
+            return visit(t.getSuperBound());
+        } else {
+            return null;
+        }
+
+    }
+
+    @Override
+    public TypeElement visitExecutable(ExecutableType t, Void p) {
+        return null;
+    }
+
+    @Override
+    public TypeElement visitNoType(NoType t, Void p) {
+        return null;
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeUtils.java b/querydsl-apt/src/main/java/com/querydsl/apt/TypeUtils.java
similarity index 91%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/TypeUtils.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/TypeUtils.java
index 020eab9087..79ce91dc1c 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeUtils.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
 import java.lang.annotation.Annotation;
 import java.util.HashSet;
@@ -19,11 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.*;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
@@ -66,6 +62,7 @@ public static boolean isAnnotationMirrorOfType(AnnotationMirror annotationMirror
         return annotationClassName.equals(className);
     }
 
+    @SuppressWarnings("unchecked")
     public static Set<TypeElement> getAnnotationValuesAsElements(AnnotationMirror mirror, String method) {
         Set<TypeElement> elements = new HashSet<TypeElement>();
         for (Map.Entry<? extends ExecutableElement,? extends AnnotationValue> entry : mirror.getElementValues().entrySet()) {
@@ -89,6 +86,6 @@ public static TypeMirror getAnnotationValueAsTypeMirror(AnnotationMirror mirror,
         return null;
     }
 
-    private TypeUtils() {}
+    private TypeUtils() { }
 
 }
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/VisitorConfig.java b/querydsl-apt/src/main/java/com/querydsl/apt/VisitorConfig.java
similarity index 76%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/VisitorConfig.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/VisitorConfig.java
index 48994e6d98..860df21860 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/VisitorConfig.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/VisitorConfig.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
+
+import com.querydsl.codegen.EntityType;
 
 /**
- * VisitorConfig defines the entity type specific visiting configuration
+ * {@code VisitorConfig} defines the {@link EntityType}-specific visiting configuration
  *
  * @author tiwe
  *
@@ -43,21 +45,27 @@ public enum VisitorConfig {
     private final boolean visitFieldProperties, visitMethodProperties, visitConstructors;
 
     public static VisitorConfig get(boolean fields, boolean methods) {
-        if (fields && !methods) {
+        return get(fields, methods, VisitorConfig.ALL);
+    }
+
+    public static VisitorConfig get(boolean fields, boolean methods, VisitorConfig defaultConfig) {
+        if (fields && methods) {
+            return VisitorConfig.ALL;
+        } else if (fields) {
             return VisitorConfig.FIELDS_ONLY;
-        } else if (methods && !fields) {
+        } else if (methods) {
             return VisitorConfig.METHODS_ONLY;
         } else {
-            return VisitorConfig.ALL;
+            return defaultConfig;
         }
     }
-    
+
     VisitorConfig(boolean fields, boolean methods, boolean constructors) {
         this.visitFieldProperties = fields;
         this.visitMethodProperties = methods;
         this.visitConstructors = constructors;
     }
-    
+
     public boolean visitConstructors() {
         return visitConstructors;
     }
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java
new file mode 100644
index 0000000000..a59c7f417b
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.hibernate;
+
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.persistence.*;
+
+import com.querydsl.apt.Configuration;
+import com.querydsl.apt.jpa.JPAAnnotationProcessor;
+
+/**
+ * {@code HibernateAnnotationProcessor} extends {@link JPAAnnotationProcessor} to take Hibernate-specific
+ * annotations into account
+ *
+ * @author tiwe
+ * @see JPAAnnotationProcessor
+ */
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*", "javax.persistence.*", "jakarta.persistence.*", "org.hibernate.annotations.*"})
+public class HibernateAnnotationProcessor extends JPAAnnotationProcessor {
+
+    @Override
+    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
+        try {
+            Class<? extends Annotation> entity = Entity.class;
+            Class<? extends Annotation> superType = MappedSuperclass.class;
+            Class<? extends Annotation> embeddable = Embeddable.class;
+            Class<? extends Annotation> embedded = Embedded.class;
+            Class<? extends Annotation> skip = Transient.class;
+            return new HibernateConfiguration(roundEnv, processingEnv, entity, superType,
+                    embeddable, embedded, skip);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java
similarity index 76%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateConfiguration.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java
index cf99086e7c..077d5df54a 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/hibernate/HibernateConfiguration.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt.hibernate;
+package com.querydsl.apt.hibernate;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
+import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 
-import com.mysema.query.apt.jpa.JPAConfiguration;
+import com.querydsl.apt.jpa.JPAConfiguration;
 
 /**
  * Configuration for {@link HibernateAnnotationProcessor}
- * 
+ *
  * @author tiwe
  * @see HibernateAnnotationProcessor
  * @see JPAConfiguration
@@ -34,28 +34,27 @@ public class HibernateConfiguration extends JPAConfiguration {
 
     public HibernateConfiguration(
             RoundEnvironment roundEnv,
-            Map<String,String> options,
+            ProcessingEnvironment processingEnv,
             Class<? extends Annotation> entityAnn,
             Class<? extends Annotation> superTypeAnn,
             Class<? extends Annotation> embeddableAnn,
             Class<? extends Annotation> embeddedAnn,
             Class<? extends Annotation> skipAnn) throws ClassNotFoundException {
-        super(roundEnv, options, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn);
+        super(roundEnv, processingEnv, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     protected List<Class<? extends Annotation>> getAnnotations() {
-        try {            
-            List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-            annotations.addAll(super.getAnnotations());
+        try {
+            List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>(super.getAnnotations());
             for (String simpleName : Arrays.asList("Type", "Cascade", "LazyCollection", "OnDelete")) {
-                annotations.add((Class<? extends Annotation>) Class.forName("org.hibernate.annotations."+simpleName));
+                annotations.add((Class<? extends Annotation>) Class.forName("org.hibernate.annotations." + simpleName));
             }
-            return annotations;    
+            return annotations;
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
-    
+
 }
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/package-info.java
new file mode 100644
index 0000000000..4b648f3150
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT Hibernate support
+ */
+package com.querydsl.apt.hibernate;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java
new file mode 100644
index 0000000000..190d7a5c12
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.jdo;
+
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.jdo.annotations.EmbeddedOnly;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+
+import com.querydsl.apt.AbstractQuerydslProcessor;
+import com.querydsl.apt.Configuration;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntities;
+import com.querydsl.core.annotations.QuerySupertype;
+
+/**
+ * AnnotationProcessor for JDO which takes {@link PersistenceCapable}, {@link EmbeddedOnly} and
+ * {@link NotPersistent} into account
+ *
+ * @author tiwe
+ *
+ */
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*","javax.jdo.annotations.*"})
+public class JDOAnnotationProcessor extends AbstractQuerydslProcessor {
+
+    @Override
+    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
+        Class<? extends Annotation> entities = QueryEntities.class;
+        Class<? extends Annotation> entity = PersistenceCapable.class;
+        Class<? extends Annotation> superType = QuerySupertype.class;
+        Class<? extends Annotation> embeddable = EmbeddedOnly.class;
+        Class<? extends Annotation> embedded = QueryEmbedded.class;
+        Class<? extends Annotation> skip = NotPersistent.class;
+        return new JDOConfiguration(processingEnv, roundEnv,
+                entities, entity, superType, embeddable, embedded, skip);
+    }
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java
new file mode 100644
index 0000000000..edac3b9587
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.jdo;
+
+import com.querydsl.apt.DefaultConfiguration;
+import com.querydsl.apt.VisitorConfig;
+import com.querydsl.codegen.Keywords;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.annotations.QueryType;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.RoundEnvironment;
+import javax.jdo.annotations.Cacheable;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Columns;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.Extension;
+import javax.jdo.annotations.Extensions;
+import javax.jdo.annotations.ForeignKey;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.Order;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
+import javax.jdo.annotations.Serialized;
+import javax.jdo.annotations.Transactional;
+import javax.jdo.annotations.Unique;
+import javax.jdo.annotations.Value;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Configuration for {@link JDOAnnotationProcessor}
+ *
+ * @author tiwe
+ * @see JDOAnnotationProcessor
+ */
+public class JDOConfiguration extends DefaultConfiguration {
+
+    @SuppressWarnings("unchecked")
+    private static final Iterable<Class<? extends Annotation>> relevantAnnotations
+            = Collections.unmodifiableList(Arrays.asList(
+                    Cacheable.class, Column.class, Columns.class,
+                    javax.jdo.annotations.Element.class, Embedded.class,
+                    Extension.class, Extensions.class, ForeignKey.class,
+                    Index.class, Join.class, Key.class, NotPersistent.class,
+                    Order.class, Persistent.class, PrimaryKey.class, QueryType.class, QueryInit.class,
+                    QueryTransient.class, Serialized.class, Transactional.class, Unique.class, Value.class));
+
+    public JDOConfiguration(ProcessingEnvironment processingEnvironment,
+            RoundEnvironment roundEnv,
+            Class<? extends Annotation> entitiesAnn,
+            Class<? extends Annotation> entityAnn,
+            Class<? extends Annotation> superTypeAnn,
+            Class<? extends Annotation> embeddableAnn,
+            Class<? extends Annotation> embeddedAnn, Class<? extends Annotation> skipAnn) {
+        super(processingEnvironment, roundEnv, Keywords.JDO, entitiesAnn, entityAnn, superTypeAnn,
+                embeddableAnn, embeddedAnn, skipAnn);
+    }
+
+    @Override
+    public VisitorConfig getConfig(TypeElement e, List<? extends Element> elements) {
+        boolean fields = false, methods = false;
+        for (Element element : elements) {
+            if (hasRelevantAnnotation(element)) {
+                fields |= element.getKind().equals(ElementKind.FIELD);
+                methods |= element.getKind().equals(ElementKind.METHOD);
+            }
+        }
+        return VisitorConfig.get(fields, methods, VisitorConfig.FIELDS_ONLY);
+    }
+
+    private boolean hasRelevantAnnotation(Element element) {
+        for (Class<? extends Annotation> relevantAnnotation : relevantAnnotations) {
+            if (element.getAnnotation(relevantAnnotation) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/package-info.java
new file mode 100644
index 0000000000..6ec2d627bb
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT JDO support
+ */
+package com.querydsl.apt.jdo;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java
new file mode 100644
index 0000000000..3292354126
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.jpa;
+
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.persistence.*;
+
+import com.querydsl.apt.AbstractQuerydslProcessor;
+import com.querydsl.apt.Configuration;
+
+/**
+ * AnnotationProcessor for JPA which takes {@link Entity}, {@link MappedSuperclass}, {@link Embeddable}
+ * and {@link Transient} into account
+ *
+ * @author tiwe
+ *
+ */
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*", "jakarta.persistence.*", "javax.persistence.*"})
+public class JPAAnnotationProcessor extends AbstractQuerydslProcessor {
+
+    @Override
+    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
+        Class<? extends Annotation> entity = Entity.class;
+        Class<? extends Annotation> superType = MappedSuperclass.class;
+        Class<? extends Annotation> embeddable = Embeddable.class;
+        Class<? extends Annotation> embedded = Embedded.class;
+        Class<? extends Annotation> skip = Transient.class;
+        return new JPAConfiguration(roundEnv, processingEnv,
+                entity, superType, embeddable, embedded, skip);
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java
new file mode 100644
index 0000000000..f8f147e616
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.jpa;
+
+import com.querydsl.apt.DefaultConfiguration;
+import com.querydsl.apt.QueryTypeImpl;
+import com.querydsl.apt.TypeUtils;
+import com.querydsl.apt.VisitorConfig;
+import com.querydsl.codegen.Keywords;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntities;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.util.Annotations;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embedded;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapKeyEnumerated;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Temporal;
+import javax.persistence.Transient;
+import javax.persistence.Version;
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Configuration for {@link JPAAnnotationProcessor}
+ *
+ * @author tiwe
+ * @see JPAAnnotationProcessor
+ */
+public class JPAConfiguration extends DefaultConfiguration {
+
+    private final List<Class<? extends Annotation>> annotations;
+
+    private final Types types;
+
+    public JPAConfiguration(RoundEnvironment roundEnv,
+            ProcessingEnvironment processingEnv,
+            Class<? extends Annotation> entityAnn,
+            Class<? extends Annotation> superTypeAnn,
+            Class<? extends Annotation> embeddableAnn,
+            Class<? extends Annotation> embeddedAnn,
+            Class<? extends Annotation> skipAnn) {
+        super(processingEnv, roundEnv, Keywords.JPA, QueryEntities.class, entityAnn, superTypeAnn,
+            embeddableAnn, embeddedAnn, skipAnn);
+        this.annotations = getAnnotations();
+        this.types = processingEnv.getTypeUtils();
+        setStrictMode(true);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected List<Class<? extends Annotation>> getAnnotations() {
+        return Collections.unmodifiableList(Arrays.asList(
+            Access.class, Basic.class, Column.class, ElementCollection.class,
+            Embedded.class, EmbeddedId.class, Enumerated.class, GeneratedValue.class, Id.class,
+            JoinColumn.class, ManyToOne.class, ManyToMany.class, MapKeyEnumerated.class,
+            OneToOne.class, OneToMany.class, PrimaryKeyJoinColumn.class, QueryType.class, QueryInit.class,
+            QueryTransient.class, Temporal.class, Transient.class, Version.class));
+    }
+
+    @Override
+    public VisitorConfig getConfig(TypeElement e, List<? extends Element> elements) {
+        Access access = e.getAnnotation(Access.class);
+        if (access != null) {
+            if (access.value() == AccessType.FIELD) {
+                return VisitorConfig.FIELDS_ONLY;
+            } else {
+                return VisitorConfig.METHODS_ONLY;
+            }
+        }
+        boolean fields = false, methods = false;
+        for (Element element : elements) {
+            if (hasRelevantAnnotation(element)) {
+                fields |= element.getKind().equals(ElementKind.FIELD);
+                methods |= element.getKind().equals(ElementKind.METHOD);
+            }
+        }
+        return VisitorConfig.get(fields, methods, VisitorConfig.ALL);
+    }
+
+    @Override
+    public TypeMirror getRealType(ExecutableElement method) {
+        return getRealElementType(method);
+    }
+
+    @Override
+    public TypeMirror getRealType(VariableElement field) {
+        return getRealElementType(field);
+    }
+
+    private TypeMirror getRealElementType(Element element) {
+        AnnotationMirror mirror = TypeUtils.getAnnotationMirrorOfType(element, ManyToOne.class);
+        if (mirror == null) {
+            mirror = TypeUtils.getAnnotationMirrorOfType(element, OneToOne.class);
+        }
+        if (mirror != null) {
+            return TypeUtils.getAnnotationValueAsTypeMirror(mirror, "targetEntity");
+        }
+
+        mirror = TypeUtils.getAnnotationMirrorOfType(element, OneToMany.class);
+        if (mirror == null) {
+            mirror = TypeUtils.getAnnotationMirrorOfType(element, ManyToMany.class);
+        }
+        if (mirror != null) {
+            TypeMirror typeArg = TypeUtils.getAnnotationValueAsTypeMirror(mirror, "targetEntity");
+            TypeMirror erasure;
+            if (element instanceof ExecutableElement) {
+                erasure = ((ExecutableElement) element).getReturnType();
+            } else {
+                erasure = types.erasure(element.asType());
+            }
+            TypeElement typeElement = (TypeElement) types.asElement(erasure);
+            if (typeElement != null && typeArg != null) {
+                if (typeElement.getTypeParameters().size() == 1) {
+                    return types.getDeclaredType(typeElement, typeArg);
+                } else if (typeElement.getTypeParameters().size() == 2) {
+                    if (element.asType() instanceof DeclaredType) {
+                        TypeMirror first = ((DeclaredType) element.asType()).getTypeArguments().get(0);
+                        return types.getDeclaredType(typeElement, first, typeArg);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public void inspect(Element element, Annotations annotations) {
+        Temporal temporal = element.getAnnotation(Temporal.class);
+        if (temporal != null && element.getAnnotation(ElementCollection.class) == null) {
+            PropertyType propertyType = null;
+            switch (temporal.value()) {
+            case DATE: propertyType = PropertyType.DATE; break;
+            case TIME: propertyType = PropertyType.TIME; break;
+            case TIMESTAMP: propertyType = PropertyType.DATETIME;
+            }
+            annotations.addAnnotation(new QueryTypeImpl(propertyType));
+        }
+    }
+
+    private boolean hasRelevantAnnotation(Element element) {
+        for (Class<? extends Annotation> annotation : annotations) {
+            if (element.getAnnotation(annotation) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/package-info.java
new file mode 100644
index 0000000000..3cab073449
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT JPA support
+ */
+package com.querydsl.apt.jpa;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java
new file mode 100644
index 0000000000..1d7d41bbdf
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.morphia;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+
+import org.mongodb.morphia.annotations.Embedded;
+import org.mongodb.morphia.annotations.Entity;
+import org.mongodb.morphia.annotations.Transient;
+
+import com.querydsl.apt.AbstractQuerydslProcessor;
+import com.querydsl.apt.Configuration;
+import com.querydsl.apt.DefaultConfiguration;
+import com.querydsl.core.annotations.QueryEntities;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.types.Expression;
+
+/**
+ * Annotation processor to create Querydsl query types for Morphia annotated classes
+ *
+ * @author tiwe
+ *
+ */
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*","org.mongodb.morphia.annotations.*"})
+public class MorphiaAnnotationProcessor extends AbstractQuerydslProcessor {
+
+    @Override
+    protected Configuration createConfiguration(RoundEnvironment roundEnv) {
+        Class<? extends Annotation> entities = QueryEntities.class;
+        Class<? extends Annotation> entity = Entity.class;
+        Class<? extends Annotation> superType = QuerySupertype.class;
+        Class<? extends Annotation> embedded = Embedded.class;
+        Class<? extends Annotation> skip = Transient.class;
+        DefaultConfiguration conf = new DefaultConfiguration(processingEnv, roundEnv,
+                Collections.<String>emptySet(),
+                entities, entity, superType, null, embedded, skip);
+        try {
+            @SuppressWarnings("unchecked") // Point is an Expression<Double[]>
+            Class<? extends Expression<Double[]>> cl =
+                    (Class<? extends Expression<Double[]>>) Class.forName("com.querydsl.mongodb.Point");
+            conf.addCustomType(Double[].class, cl);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException(e);
+        }
+        return conf;
+    }
+
+}
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/morphia/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/package-info.java
new file mode 100644
index 0000000000..16b717272f
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT Morphia support
+ */
+package com.querydsl.apt.morphia;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/package-info.java
new file mode 100644
index 0000000000..87460624f3
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT-related classes
+ */
+package com.querydsl.apt;
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/roo/RooAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java
similarity index 81%
rename from querydsl-apt/src/main/java/com/mysema/query/apt/roo/RooAnnotationProcessor.java
rename to querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java
index 6c75dd3576..bdfba58cf4 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/roo/RooAnnotationProcessor.java
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt.roo;
+package com.querydsl.apt.roo;
 
 import java.lang.annotation.Annotation;
 
@@ -25,10 +25,10 @@
 import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
 import org.springframework.roo.addon.jpa.entity.RooJpaEntity;
 
-import com.mysema.query.apt.AbstractQuerydslProcessor;
-import com.mysema.query.apt.Configuration;
-import com.mysema.query.apt.DefaultConfiguration;
-import com.mysema.query.apt.jpa.JPAConfiguration;
+import com.querydsl.apt.AbstractQuerydslProcessor;
+import com.querydsl.apt.Configuration;
+import com.querydsl.apt.DefaultConfiguration;
+import com.querydsl.apt.jpa.JPAConfiguration;
 
 /**
  * AnnotationProcessor for Spring Roo which takes {@link RooJpaEntity}, {@link RooJpaActiveRecord},
@@ -37,7 +37,7 @@
  * @author tiwe
  *
  */
-@SupportedAnnotationTypes({"com.mysema.query.annotations.*","javax.persistence.*","org.springframework.roo.addon.jpa.entity.*"})
+@SupportedAnnotationTypes({"com.querydsl.core.annotations.*","javax.persistence.*","org.springframework.roo.addon.jpa.entity.*"})
 public class RooAnnotationProcessor extends AbstractQuerydslProcessor {
 
     @Override
@@ -47,7 +47,7 @@ protected Configuration createConfiguration(RoundEnvironment roundEnv) {
         Class<? extends Annotation> embeddable = Embeddable.class;
         Class<? extends Annotation> embedded = Embedded.class;
         Class<? extends Annotation> skip = Transient.class;
-        DefaultConfiguration conf = new JPAConfiguration(roundEnv, processingEnv.getOptions(),
+        DefaultConfiguration conf = new JPAConfiguration(roundEnv, processingEnv,
                 entity, superType, embeddable, embedded, skip);
         conf.setAlternativeEntityAnnotation(RooJpaActiveRecord.class);
         return conf;
diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/roo/package-info.java b/querydsl-apt/src/main/java/com/querydsl/apt/roo/package-info.java
new file mode 100644
index 0000000000..1901efb011
--- /dev/null
+++ b/querydsl-apt/src/main/java/com/querydsl/apt/roo/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT Roo support
+ */
+package com.querydsl.apt.roo;
diff --git a/querydsl-apt/src/main/jdo.xml b/querydsl-apt/src/main/jdo.xml
index ca16f117c0..016a08ac4d 100644
--- a/querydsl-apt/src/main/jdo.xml
+++ b/querydsl-apt/src/main/jdo.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt/jdo</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt/jdo</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/main/jpa.xml b/querydsl-apt/src/main/jpa.xml
index 9680191b55..6c9fa68af9 100644
--- a/querydsl-apt/src/main/jpa.xml
+++ b/querydsl-apt/src/main/jpa.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt/jpa</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt/jpa</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/main/onejar.xml b/querydsl-apt/src/main/onejar.xml
index c77d705e49..120779d545 100644
--- a/querydsl-apt/src/main/onejar.xml
+++ b/querydsl-apt/src/main/onejar.xml
@@ -27,16 +27,13 @@
       <unpack>true</unpack>
       <excludes>
         <exclude>cglib:cglib</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>              
       </excludes>
     </dependencySet>
     <dependencySet>
       <unpack>true</unpack>
       <scope>provided</scope>
       <includes>
-        <include>com.mysema.querydsl:*</include>
-        <include>com.mysema.codegen:*</include>
+        <include>com.querydsl:*</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/querydsl-apt/src/main/roo.xml b/querydsl-apt/src/main/roo.xml
index 5d3a20c379..6e56b67f02 100644
--- a/querydsl-apt/src/main/roo.xml
+++ b/querydsl-apt/src/main/roo.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt/roo</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt/roo</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions.java b/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions.java
deleted file mode 100644
index 7f5232919b..0000000000
--- a/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.annotations.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-public class BooleanExtensions {
-    
-    @QueryDelegate(Boolean.class)
-    public static Predicate isFalse(BooleanPath path) {
-        return path.isNotNull().or(path.eq(false));
-    }
-
-    @QueryDelegate(Boolean.class)
-    public static Predicate isTrue(BooleanPath path) {
-        return path.eq(true);
-    }
-
-}
diff --git a/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions2.java b/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions2.java
deleted file mode 100644
index 6708d17b95..0000000000
--- a/querydsl-apt/src/test/apt/com/mysema/query/BooleanExtensions2.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.annotations.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-public class BooleanExtensions2 {
-    
-    @QueryDelegate(boolean.class)
-    public static Predicate isFalse(BooleanPath path) {
-        return path.isNotNull().or(path.eq(false));
-    }
-
-    @QueryDelegate(boolean.class)
-    public static Predicate isTrue(BooleanPath path) {
-        return path.eq(true);
-    }
-
-}
diff --git a/querydsl-apt/src/test/apt/com/mysema/query/ExampleEntity.java b/querydsl-apt/src/test/apt/com/mysema/query/ExampleEntity.java
deleted file mode 100644
index 09ba0b4ea9..0000000000
--- a/querydsl-apt/src/test/apt/com/mysema/query/ExampleEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query;
-
-import java.math.BigDecimal;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class ExampleEntity {
-
-    private boolean booleanProp;
-    
-    private Boolean booleanProp2;
-    
-    
-    
-}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java b/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java
new file mode 100644
index 0000000000..d6675ad459
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java
@@ -0,0 +1,19 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.BooleanPath;
+
+public class BooleanExtensions {
+
+    @QueryDelegate(Boolean.class)
+    public static Predicate isFalse(BooleanPath path) {
+        return path.isNotNull().or(path.eq(false));
+    }
+
+    @QueryDelegate(Boolean.class)
+    public static Predicate isTrue(BooleanPath path) {
+        return path.eq(true);
+    }
+
+}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java b/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java
new file mode 100644
index 0000000000..2ab0bb0eb9
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java
@@ -0,0 +1,19 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.BooleanPath;
+
+public class BooleanExtensions2 {
+
+    @QueryDelegate(boolean.class)
+    public static Predicate isFalse(BooleanPath path) {
+        return path.isNotNull().or(path.eq(false));
+    }
+
+    @QueryDelegate(boolean.class)
+    public static Predicate isTrue(BooleanPath path) {
+        return path.eq(true);
+    }
+
+}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java b/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java
new file mode 100644
index 0000000000..82793204eb
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java
@@ -0,0 +1,14 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class ExampleEntity {
+
+    private boolean booleanProp;
+
+    private Boolean booleanProp2;
+
+
+
+}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java b/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java
new file mode 100644
index 0000000000..55fbb9db11
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java
@@ -0,0 +1,9 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.AbstractEntity;
+
+@QueryEntity
+public class ExampleEntity2 extends AbstractEntity<ExampleEntity2> {
+// id inherited
+}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java b/querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java
new file mode 100644
index 0000000000..46ecd3916d
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java
@@ -0,0 +1,15 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+public class InnerExtensions {
+
+    public static class ExampleEntity2Extensions {
+
+        @QueryDelegate(ExampleEntity2.class)
+        public static BooleanExpression isZero(QExampleEntity2 left) {
+            return left.id.eq(0);
+        }
+    }
+}
diff --git a/querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java b/querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java
new file mode 100644
index 0000000000..96b96a985f
--- /dev/null
+++ b/querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java
@@ -0,0 +1,13 @@
+package com.querydsl;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class IntegerExtensions {
+
+    @QueryDelegate(Integer.class)
+    public static NumberExpression<Integer> difference(NumberPath<Integer> left, NumberExpression<Integer> right) {
+        return right.subtract(left);
+    }
+}
diff --git a/querydsl-apt/src/test/apt/com/mysema/query/eclipse/SimpleEntity.java b/querydsl-apt/src/test/apt/com/querydsl/eclipse/SimpleEntity.java
similarity index 87%
rename from querydsl-apt/src/test/apt/com/mysema/query/eclipse/SimpleEntity.java
rename to querydsl-apt/src/test/apt/com/querydsl/eclipse/SimpleEntity.java
index dcb62f74df..5be697627b 100644
--- a/querydsl-apt/src/test/apt/com/mysema/query/eclipse/SimpleEntity.java
+++ b/querydsl-apt/src/test/apt/com/querydsl/eclipse/SimpleEntity.java
@@ -1,24 +1,24 @@
-package com.mysema.query.eclipse;
+package com.querydsl.eclipse;
 
 import java.math.BigDecimal;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class SimpleEntity {
-    
+
     CustomComparable comparableProp;
-    
+
     CustomNumber customNumber;
-    
+
     int intProp;
-    
+
     Integer integerProp;
-    
+
     BigDecimal bigDecimalProp;
-    
+
     String stringProp;
-    
+
     SimpleEntity entityProp;
 
 }
@@ -29,7 +29,7 @@ class CustomComparable implements Comparable<CustomComparable> {
     public int compareTo(CustomComparable o) {
         return 0;
     }
-    
+
 }
 
 class CustomNumber extends Number implements Comparable<CustomNumber> {
@@ -60,6 +60,6 @@ public long longValue() {
     public int compareTo(CustomNumber o) {
         return 0;
     }
-    
-    
+
+
 }
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/Entity.java b/querydsl-apt/src/test/java/Entity.java
index 6e734ac557..88246f2d3b 100644
--- a/querydsl-apt/src/test/java/Entity.java
+++ b/querydsl-apt/src/test/java/Entity.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
-public class Entity {
+public final class Entity {
+
+    private Entity() { }
 
     static final QEntity entity = QEntity.entity;
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/BooleanExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/BooleanExtensionsTest.java
deleted file mode 100644
index 7d2f12cbc0..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/BooleanExtensionsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
-public class BooleanExtensionsTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/apt/com/mysema/query/";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> sources = Arrays.asList(
-                new File(packagePath, "BooleanExtensions.java").getPath(),
-                new File(packagePath, "ExampleEntity.java").getPath());
-        process(QuerydslAnnotationProcessor.class, sources,"booleanExtensions");
-        String qtypeContent = Files.toString(new File("target/booleanExtensions/com/mysema/query/QExampleEntity.java"), Charsets.UTF_8);
-        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp"));
-        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp2"));
-    }
-    
-    @Test
-    public void Process2() throws IOException {
-        List<String> sources = Arrays.asList(
-                new File(packagePath, "BooleanExtensions2.java").getPath(),
-                new File(packagePath, "ExampleEntity.java").getPath());
-        process(QuerydslAnnotationProcessor.class, sources,"booleanExtensions2");
-        String qtypeContent = Files.toString(new File("target/booleanExtensions2/com/mysema/query/QExampleEntity.java"), Charsets.UTF_8);
-        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp"));
-        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp2"));
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensions.java b/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensions.java
deleted file mode 100644
index f14802eb66..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensions.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import java.sql.Date;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.path.BooleanPath;
-
-public class DateExtensions {
-        
-    @QueryDelegate(Date.class)
-    public static Predicate extension(DateExpression<Date> date) {
-        return new BooleanPath("b");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java
deleted file mode 100644
index 45a8569173..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
-@Ignore
-public class DateExtensionsTest extends AbstractProcessorTest {
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/apt/";
-    
-    @Test
-    public void Handles_Date_Extensions_Correctly() throws IOException, InterruptedException {
-        File source = new File(packagePath,  "EntityWithExtensions.java");
-        File source2 = new File(packagePath, "DateExtensions.java");
-        List<String> sources = Arrays.asList(source.getPath(), source2.getPath());
-        File qType = new File("target/overwrite3/com/mysema/query/apt/QEntityWithExtensions.java");
-        
-        // QEntityWithExtensions is generated
-        process(QuerydslAnnotationProcessor.class, sources, "overwrite3");
-        assertTrue(qType.exists());
-        long modified = qType.lastModified();
-        Thread.sleep(1000);        
-        System.out.println(Files.toString(qType, Charsets.UTF_8).contains("QDate"));
-        
-        // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
-        assertEquals(modified, qType.lastModified());
-
-        // EntityWithExtensions is updated, QEntityWithExtensions is overwritten
-        Files.touch(source);
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
-        assertTrue("" + modified + " >= " + qType.lastModified(), modified < qType.lastModified());
-        assertTrue(Files.toString(qType, Charsets.UTF_8).contains("QDate"));
-        
-        // QEntityWithExtensions is deleted and regenerated 
-        assertTrue(qType.delete());
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
-        assertTrue(qType.exists());
-        assertTrue(Files.toString(qType, Charsets.UTF_8).contains("QDate"));
-    }
-    
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-AdefaultOverwrite=true");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EmbeddableTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/EmbeddableTest.java
deleted file mode 100644
index 46e2168a47..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/EmbeddableTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-public class EmbeddableTest extends AbstractProcessorTest {
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = Collections.singletonList("src/test/java/com/mysema/query/domain/Embeddable2Test.java");
-        process(QuerydslAnnotationProcessor.class, classes,"embeddable");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensions.java b/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensions.java
deleted file mode 100644
index ecb6431f13..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensions.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.BooleanPath;
-
-public class EntityExtensions {
-    
-    @QueryDelegate(EntityWithExtensions.class)
-    public static Predicate extension(QEntityWithExtensions entity) {
-        return new BooleanPath("b");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java
deleted file mode 100644
index 0cded84adb..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
-@Ignore
-public class EntityExtensionsTest extends AbstractProcessorTest {
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/apt/";
-    
-    @Test
-    public void Handles_Entity_Extensions_Correctly() throws IOException, InterruptedException {
-        File source = new File(packagePath,  "EntityWithExtensions.java");
-        File source2 = new File(packagePath, "EntityExtensions.java");
-        List<String> sources = Arrays.asList(source.getPath(), source2.getPath());
-        File qType = new File("target/overwrite2/com/mysema/query/apt/QEntityWithExtensions.java");
-        
-        // QEntityWithExtensions is generated
-        process(QuerydslAnnotationProcessor.class, sources, "overwrite2");
-        assertTrue(qType.exists());
-        long modified = qType.lastModified();
-        Thread.sleep(1000);        
-        System.out.println(Files.toString(qType, Charsets.UTF_8).contains("extension()"));
-        
-        // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
-        assertEquals(modified, qType.lastModified());
-
-        // EntityWithExtensions is updated, QEntityWithExtensions is overwritten
-        Files.touch(source);
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
-        assertTrue("" + modified + " >= " + qType.lastModified(), modified < qType.lastModified());
-        assertTrue(Files.toString(qType, Charsets.UTF_8).contains("extension()"));
-        
-        // QEntityWithExtensions is deleted and regenerated 
-        assertTrue(qType.delete());
-        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
-        assertTrue(qType.exists());
-        assertTrue(Files.toString(qType, Charsets.UTF_8).contains("extension()"));
-    }
-    
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-AdefaultOverwrite=true");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedClassesTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedClassesTest.java
deleted file mode 100644
index d7dea48a1c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedClassesTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class ExcludedClassesTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/java/com/mysema/query/";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = getFiles(packagePath);
-        process(QuerydslAnnotationProcessor.class, classes, "excludedClasses");
-
-        assertFalse(new File("target/excludedClasses/com/mysema/query/domain/QArrayTest_ArrayTestEntity.java").exists());
-    }
-
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.excludedClasses=com.mysema.query.domain.ArrayTest.ArrayTestEntity");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedPackagesTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedPackagesTest.java
deleted file mode 100644
index c99d29c045..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/ExcludedPackagesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class ExcludedPackagesTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/java/com/mysema/query/";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = getFiles(packagePath);
-        process(QuerydslAnnotationProcessor.class, classes, "excludedPackages");
-
-        assertFalse(new File("target/excludedPackages/com/mysema/query/domain/p1").exists());
-        assertTrue(new File("target/excludedPackages/com/mysema/query/domain/p2").exists());
-    }
-
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.excludedPackages=com.mysema.query.domain.p1");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
deleted file mode 100644
index 6f2ed002c6..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.mysema.query.apt;
-
-import javax.persistence.*;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.base.Charsets;
-import com.google.common.collect.ForwardingSet;
-import com.google.common.io.Files;
-import com.mysema.query.apt.hibernate.HibernateAnnotationProcessor;
-import com.mysema.query.codegen.GenericExporter;
-import com.mysema.query.codegen.Keywords;
-import com.mysema.query.domain.AbstractEntityTest;
-import com.mysema.query.domain.CustomCollection;
-import com.mysema.query.domain.Generic2Test;
-import org.junit.Test;
-import static org.junit.Assert.fail;
-
-public class GenericExporterTest extends AbstractProcessorTest {
-
-    private static final String PACKAGE_PATH = "src/test/java/com/mysema/query/domain/";
-
-    private static final List<String> CLASSES = getFiles(PACKAGE_PATH);
-
-    @Test
-    public void Execute() throws IOException {
-        // via APT
-        process(QuerydslAnnotationProcessor.class, CLASSES, "QuerydslAnnotationProcessor");
-
-        // via GenericExporter
-        GenericExporter exporter = new GenericExporter();
-        exporter.setTargetFolder(new File("target/GenericExporterTest"));
-        exporter.export(AbstractEntityTest.class.getPackage());
-
-        List<String> expected = new ArrayList<String>();
-        // delegates are not supported
-        expected.add("QDelegateTest_SimpleUser.java");
-        expected.add("QDelegateTest_SimpleUser2.java");
-        expected.add("QDelegateTest_User.java");
-        expected.add("QDelegate2Test_Entity.java");
-        expected.add("QExampleEntity.java");
-
-        expected.add("QQueryProjectionTest_DTOWithProjection.java");
-
-        // FIXME
-        expected.add("QExternalEntityTest_MyEntity.java");
-        expected.add("QQueryEmbedded4Test_User.java");
-
-        execute(expected, "GenericExporterTest", "QuerydslAnnotationProcessor");
-    }
-
-    @Test
-    public void Execute2() throws IOException {
-        // via APT
-        process(HibernateAnnotationProcessor.class, CLASSES, "HibernateAnnotationProcessor");
-
-        // via GenericExporter
-        GenericExporter exporter = new GenericExporter();
-        exporter.setKeywords(Keywords.JPA);
-        exporter.setEntityAnnotation(Entity.class);
-        exporter.setEmbeddableAnnotation(Embeddable.class);
-        exporter.setEmbeddedAnnotation(Embedded.class);
-        exporter.setSupertypeAnnotation(MappedSuperclass.class);
-        exporter.setSkipAnnotation(Transient.class);
-        exporter.setTargetFolder(new File("target/GenericExporterTest2"));
-        exporter.addStopClass(ForwardingSet.class);
-        exporter.export(AbstractEntityTest.class.getPackage());
-
-        List<String> expected = new ArrayList<String>();
-        // GenericExporter doesn't include field/method selection
-        expected.add("QFileAttachment.java");
-        expected.add("QJodaTest_BaseEntity.java");
-        expected.add("QEnum3Test_Entity1.java");
-        expected.add("QCustomCollection_MyCustomCollection.java");
-        expected.add("QCustomCollection_MyCustomCollection2.java");
-
-        expected.add("QTemporalTest_MyEntity.java");
-
-        expected.add("QTemporal2Test_Cheque.java");
-        expected.add("QQueryProjectionTest_DTOWithProjection.java");
-
-        // FIXME
-        expected.add("QGeneric4Test_HidaBez.java");
-        expected.add("QGeneric4Test_HidaBezGruppe.java");
-        expected.add("QInterfaceType2Test_UserImpl.java");
-        expected.add("QOrderTest_Order.java");
-        expected.add("QManagedEmailTest_ManagedEmails.java");
-        expected.add("QGeneric12Test_ChannelRole.java");
-        expected.add("QManyToManyTest_Person.java");
-        expected.add("QOneToOneTest_Person.java");
-
-        execute(expected, "GenericExporterTest2", "HibernateAnnotationProcessor");
-    }
-
-    @Test
-    public void Execute3() {
-        GenericExporter exporter = new GenericExporter();
-        exporter.setKeywords(Keywords.JPA);
-        exporter.setEntityAnnotation(Entity.class);
-        exporter.setEmbeddableAnnotation(Embeddable.class);
-        exporter.setEmbeddedAnnotation(Embedded.class);
-        exporter.setSupertypeAnnotation(MappedSuperclass.class);
-        exporter.setSkipAnnotation(Transient.class);
-        exporter.setTargetFolder(new File("target/GenericExporterTest3"));
-        //exporter.addStopClass(ForwardingSet.class);
-        exporter.export(CustomCollection.MyCustomCollection.class,
-                        CustomCollection.MyCustomCollection2.class,
-                        CustomCollection.MyEntity.class);
-    }
-
-    @Test
-    public void Execute4() throws IOException {
-        GenericExporter exporter = new GenericExporter();
-        exporter.setKeywords(Keywords.JPA);
-        exporter.setEntityAnnotation(Entity.class);
-        exporter.setEmbeddableAnnotation(Embeddable.class);
-        exporter.setEmbeddedAnnotation(Embedded.class);
-        exporter.setSupertypeAnnotation(MappedSuperclass.class);
-        exporter.setSkipAnnotation(Transient.class);
-        exporter.setTargetFolder(new File("target/GenericExporterTest4"));
-        exporter.addStopClass(ForwardingSet.class);
-        exporter.export(Generic2Test.class.getClasses());
-    }
-
-    private void execute(List<String> expected, String genericExporterFolder, String aptFolder) throws IOException {
-        List<String> failures = new ArrayList<String>();
-        int successes = 0;
-        for (File file : new File("target/"+genericExporterFolder+"/com/mysema/query/domain").listFiles()) {
-            File other = new File("target/"+aptFolder+"/com/mysema/query/domain", file.getName());
-            if (!other.exists() || !other.isFile()) continue;
-            String result1 = Files.toString(file, Charsets.UTF_8);
-            String result2 = Files.toString(other, Charsets.UTF_8);
-            if (!result1.equals(result2)) {
-                if (!expected.contains(file.getName())) {
-                    System.err.println(file.getName());
-                    failures.add(file.getName());
-                }
-            } else {
-                successes++;
-            }
-        }
-        if (!failures.isEmpty()) {
-            for (String failure : failures) {
-                System.err.println(failure);
-            }
-            fail("Failed with " + failures.size() + " failures, " + successes + " succeeded");
-        }
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericTest.java
deleted file mode 100644
index 3971cbb3c1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.apt;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.apt.jpa.JPAAnnotationProcessor;
-
-public class GenericTest extends AbstractProcessorTest {
-    
-    @Test
-    public void test() throws IOException {
-        List<String> classes = Collections.singletonList("src/test/java/com/mysema/query/domain/Generic7Test.java");
-        process(QuerydslAnnotationProcessor.class, classes,"GenericTest");
-    }
-    
-    @Test
-    public void test2() throws IOException {
-        List<String> classes = Collections.singletonList("src/test/java/com/mysema/query/domain/Generic9Test.java");
-        process(JPAAnnotationProcessor.class, classes,"GenericTest2");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedClassesTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedClassesTest.java
deleted file mode 100644
index a192b28fba..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedClassesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class IncludedClassesTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/java/com/mysema/query/";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = getFiles(packagePath);
-        process(QuerydslAnnotationProcessor.class, classes, "includedClasses");
-
-        assertTrue(new File("target/includedClasses/com/mysema/query/domain/QArrayTest_ArrayTestEntity.java").exists());
-        assertFalse(new File("target/includedClasses/com/mysema/query/domain/QArray2Test_Example.java").exists());
-    }
-
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.includedClasses=com.mysema.query.domain.ArrayTest.ArrayTestEntity");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedPackagesTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedPackagesTest.java
deleted file mode 100644
index 196c09b224..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/IncludedPackagesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class IncludedPackagesTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/java/com/mysema/query/";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = getFiles(packagePath);
-        process(QuerydslAnnotationProcessor.class, classes, "includedPackages");
-
-        assertFalse(new File("target/includedPackages/com/mysema/query/domain/p1").exists());
-        assertTrue(new File("target/includedPackages/com/mysema/query/domain/p2").exists());
-    }
-
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.includedPackages=com.mysema.query.domain.p2");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/NamePrefixTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/NamePrefixTest.java
deleted file mode 100644
index 80b5276185..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/NamePrefixTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class NamePrefixTest extends AbstractProcessorTest {
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/domain/";
-
-    @Test
-    public void ProcessAll() throws IOException {
-        // works only in Eclipse for the moment
-        List<String> classes = getFiles(packagePath);
-
-        // default Processor
-        process(QuerydslAnnotationProcessor.class, classes,"prefix");
-        
-        assertTrue(new File("target/prefix/com/mysema/query/domain/QTAnimalTest_Animal.java").exists());
-    }
-    
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.prefix=QT");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/PackageSuffixTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/PackageSuffixTest.java
deleted file mode 100644
index 051a368769..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/PackageSuffixTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class PackageSuffixTest extends AbstractProcessorTest {
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/domain/";
-
-    @Test
-    public void ProcessAll() throws IOException {
-        // works only in Eclipse for the moment
-        List<String> classes = getFiles(packagePath);
-
-        // default Processor
-        process(QuerydslAnnotationProcessor.class, classes,"packageSuffix");
-        
-        assertTrue(new File("target/packageSuffix/com/mysema/query/domain/query/QAnimalTest_Animal.java").exists());
-    }
-    
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.packageSuffix=.query");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java
deleted file mode 100644
index aa1fbdd643..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/QuerydslAnnotationProcessorTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.apt.hibernate.HibernateAnnotationProcessor;
-import com.mysema.query.apt.jdo.JDOAnnotationProcessor;
-import com.mysema.query.apt.jpa.JPAAnnotationProcessor;
-import com.mysema.query.apt.roo.RooAnnotationProcessor;
-
-public class QuerydslAnnotationProcessorTest extends AbstractProcessorTest {
-
-    private static final String PACKAGE_PATH = "src/test/java/com/mysema/query/domain/";
-
-    private static final List<String> CLASSES = getFiles(PACKAGE_PATH);
-
-    @Test
-    public void Process() throws IOException {
-        File file = new File(PACKAGE_PATH, "AbstractEntityTest.java");
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(file.getPath()),"qdsl");
-    }
-
-    @Test
-    public void Process_MonitoredCompany() throws IOException {
-        String path = new File(PACKAGE_PATH, "MonitoredCompany.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"MonitoredCompany");
-    }
-
-    @Test
-    public void Process_Inheritance3() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/inheritance/Inheritance3Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Inheritance3Test");
-    }
-
-    @Test
-    public void Process_Inheritance8() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/inheritance/Inheritance8Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Inheritance8Test");
-    }
-
-    @Test
-    public void Process_QueryEmbedded3() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/QueryEmbedded3Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"QueryEmbedded3Test");
-    }
-
-    @Test
-    public void Process_QueryEmbedded4() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/QueryEmbedded4Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"QueryEmbedded4Test");
-    }
-
-    @Test
-    public void Process_Delegate() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/DelegateTest.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"DelegateTest");
-    }
-
-    @Test
-    public void Process_AbstractClasses() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/AbstractClassesTest.java").getPath();
-        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"AbstractClassesTest");
-    }
-
-    @Test
-    public void Process_AbstractClasses2() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/AbstractClasses2Test.java").getPath();
-        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"abstractClasses2");
-    }
-
-    @Test
-    public void Process_GenericSignature() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/GenericSignatureTest.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"GenericSignatureTest");
-    }
-
-    @Test
-    public void Process_AbstractProperties2Test() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/AbstractProperties2Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"AbstractProperties2Test");
-    }
-
-    @Test
-    public void Process_Inheritance2Test() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/inheritance/Inheritance2Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"InheritanceTest2");
-    }
-
-    @Test
-    public void Process_EntityInheritanceTest() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/EntityInheritanceTest.java").getPath();
-        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"EntityInheritanceTest");
-    }
-
-    @Test
-    public void Process_Enum2Test() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/Enum2Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Enum2Test");
-    }
-
-    @Test
-    public void Process_ExternalEntityTest() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/ExternalEntityTest.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"ExternalEntityTest");
-    }
-
-    @Test
-    public void Process_Generic13Test() throws IOException {
-        String path = new File("src/test/java/com/mysema/query/domain/Generic13Test.java").getPath();
-        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Generic13Test");
-    }
-
-    @Test
-    public void QuerydslAnnotationProcessor() throws IOException {
-        process(QuerydslAnnotationProcessor.class, CLASSES, "querydsl");
-    }
-
-    @Test
-    public void JPAAnnotationProcessor() throws IOException {
-        process(JPAAnnotationProcessor.class, CLASSES, "jpa");
-    }
-
-    @Test
-    public void HibernateAnnotationProcessor() throws IOException {
-        process(HibernateAnnotationProcessor.class, CLASSES, "hibernate");
-    }
-
-    @Test
-    public void JDOAnnotationProcessor() throws IOException {
-        process(JDOAnnotationProcessor.class, CLASSES, "jdo");
-    }
-
-    @Test
-    public void RooAnnotationProcessor() throws IOException {
-        process(RooAnnotationProcessor.class, CLASSES, "roo");
-
-        assertTrue(new File("target/roo/com/mysema/query/domain/QRooEntities_MyEntity.java").exists());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/UnknownAsEmbeddableTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/UnknownAsEmbeddableTest.java
deleted file mode 100644
index 282bca063a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/UnknownAsEmbeddableTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.apt;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.Test;
-
-public class UnknownAsEmbeddableTest extends AbstractProcessorTest {
-
-    private static final String packagePath = "src/test/java/com/mysema/query/domain";
-
-    @Test
-    public void Process() throws IOException {
-        List<String> classes = getFiles(packagePath);
-        process(QuerydslAnnotationProcessor.class, classes,"unknownAsEmbeddable");
-
-        assertTrue(new File("target/unknownAsEmbeddable/com/mysema/query/domain/custom/QEntity.java").exists());
-        assertTrue(new File("target/unknownAsEmbeddable/com/mysema/query/domain/custom/QEmbeddedType.java").exists());
-        assertTrue(new File("target/unknownAsEmbeddable/com/mysema/query/domain/custom/QEmbeddedType2.java").exists());
-        assertTrue(new File("target/unknownAsEmbeddable/com/mysema/query/domain/custom/QEmbeddedType3.java").exists());
-    }
-
-    @Override
-    protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.unknownAsEmbeddable=true");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractEntityTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractEntityTest.java
deleted file mode 100644
index 79512a22b1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractEntityTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
-
-public class AbstractEntityTest {
-
-    @QueryEntity
-    public static abstract class Category<T extends Category<T>> {
-
-        public Category<T> defaultChild;
-
-    }
-
-    @QueryEntity
-    public static class CategoryReference {
-
-        @QueryInit("defaultChild")
-        public Category<?> category;
-
-    }
-
-    @Test
-    public void Path_Is_Available() {
-        QAbstractEntityTest_CategoryReference categoryReference = QAbstractEntityTest_CategoryReference.categoryReference;
-        assertNotNull(categoryReference.category.defaultChild);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties2Test.java
deleted file mode 100644
index ee35257715..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties2Test.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.Serializable;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-
-public class AbstractProperties2Test {
-
-    public static abstract class GenericEntity<K extends Serializable & Comparable<K>, E extends GenericEntity<K, ?>> {
-
-        public abstract K getId();
-
-        public abstract void setId(K id);
-
-    }
-
-    public static abstract class AbstractEntity<P extends AbstractEntity<P>> extends GenericEntity<Integer, P> {
-
-        private Integer id;
-
-        @Override
-        public Integer getId() {
-            return id;
-        }
-
-        @Override
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-    }
-
-    @QueryEntity
-    public static class User extends AbstractEntity<User> {
-
-    }
-    
-    @Test
-    public void GenericEntity_id_Is_Available() {
-        assertNotNull(QAbstractProperties2Test_GenericEntity.genericEntity.id);
-    }
-
-    @Test
-    public void AbstractEntity_Is_Available() {
-        assertNotNull(QAbstractProperties2Test_AbstractEntity.abstractEntity.id);
-    }
-    
-    @Test
-    public void AbstractEntity_Super_Is_Available() {
-        assertEquals(QAbstractProperties2Test_GenericEntity.class, QAbstractProperties2Test_AbstractEntity.abstractEntity._super.getClass());
-    }
-    
-    @Test
-    public void User_Is_Available() {
-        assertNotNull(QAbstractProperties2Test_User.user.id);        
-    }
-    
-    @Test
-    public void User_Super_Is_Available() {
-        assertEquals(QAbstractProperties2Test_AbstractEntity.class, QAbstractProperties2Test_User.user._super.getClass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties3Test.java
deleted file mode 100644
index af92b64733..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractProperties3Test.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
-
-@Ignore
-public class AbstractProperties3Test {
-
-    @MappedSuperclass
-    public static class BaseEntity {
-
-    }
-
-    @Entity
-    public static class Compound extends BaseEntity {
-
-        String name;
-
-    }
-
-    @Entity
-    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-    public static abstract class Containable extends BaseEntity implements Serializable {
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.AUTO, generator = "containable_seq_gen")
-        @SequenceGenerator(name = "containable_seq_gen", sequenceName = "seq_containable")
-        @Column(name = "id")
-        Long id;
-
-        @QueryType(PropertyType.ENTITY)
-        public abstract Compound getCompound();
-
-    }
-
-    @MappedSuperclass
-    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
-    public static abstract class CompoundContainer extends BaseEntity implements Serializable {
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.AUTO, generator = "compound_container_seq_gen")
-        @SequenceGenerator(name = "compound_container_seq_gen", sequenceName = "seq_compound_container", allocationSize = 1000)
-        @Column(name = "compound_container_id")
-        Long id;
-
-        @JoinColumn(name = "containable_id")
-        @OneToOne(fetch = FetchType.EAGER)
-        Containable containable;
-
-    }
-    
-    @Test
-    public void test() {
-        QAbstractProperties3Test_CompoundContainer.compoundContainer.containable.compound.name.isNotNull();
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractTest.java
deleted file mode 100644
index d3aefdbc86..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-import junit.framework.Assert;
-
-public abstract class AbstractTest {
-
-    public Class<?> cl;
-
-    protected void match(Class<?> expectedType, String name) throws SecurityException, NoSuchFieldException {
-        assertTrue(cl.getSimpleName()+"."+name + " failed", expectedType.isAssignableFrom(cl.getField(name).getType()));
-    }
-
-    protected void assertMissing(String name) {
-        try {
-            cl.getField(name);
-            Assert.fail("Expected missing field : " + cl.getSimpleName() + "." + name);
-        } catch (NoSuchFieldException e) {
-            // expected
-        }
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Address.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Address.java
deleted file mode 100644
index 7e07594a55..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Address.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-
-@QueryEmbeddable
-public final class Address {
-
-    public Address() {
-        
-    }
-    
-    public Address(String street, String postCode, City city) {
-        this.street = street; this.postCode = postCode; this.city = city;
-    }
-    
-    public String street;
-    
-    public String postCode;
-    
-    @QueryEmbedded
-    public City city;
-    
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AnimalTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AnimalTest.java
deleted file mode 100644
index c5134cffc2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AnimalTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
-
-public class AnimalTest {
-
-    @QueryEntity
-    public static class Animal {
-
-        public String name;
-
-    }
-
-    @QueryEntity
-    public static class Cat extends Animal {
-
-        @QueryInit("name")
-        public Cat mate;
-
-    }
-
-    @Test
-    public void Properties_Are_Copied_From_Super() {
-        assertTrue("direct copy of StringPath field failed",  QAnimalTest_Cat.cat.name == QAnimalTest_Cat.cat._super.name);
-
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AnnotationTypeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AnnotationTypeTest.java
deleted file mode 100644
index 326503f43e..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AnnotationTypeTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query.domain;
-
-import java.lang.annotation.Annotation;
-
-import javax.persistence.Embeddable;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Ignore;
-
-@Ignore
-public class AnnotationTypeTest {
-
-    @MappedSuperclass
-    public static abstract class BaseObject<T extends Annotation> {
-        
-    }
-
-    @Entity
-    public static class Person extends BaseObject<javax.persistence.Id> {
-        @Id
-        private Long id;
-    }
-
-    @Embeddable
-    public static class Address extends BaseObject<javax.persistence.EmbeddedId> {
-        @EmbeddedId
-        private String street;
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AnyPathTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AnyPathTest.java
deleted file mode 100644
index f35c888d79..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AnyPathTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Embeddable;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryInit;
-import com.mysema.query.types.expr.BooleanExpression;
-
-public class AnyPathTest {
-    @Entity
-    public static class Foo {
-
-        @OneToMany(mappedBy = "key.foo")
-        @QueryInit("key.student")
-        private Set<Bar> bars = new HashSet<Bar>();
-
-    }
-
-    @Entity
-    public static class Bar {
-
-        @EmbeddedId
-        @QueryInit("student")
-        private BarId key = new BarId();
-
-    }
-
-    @Embeddable
-    public static class BarId {
-
-        @ManyToOne
-        private Student student;
-
-        @ManyToOne
-        private Foo foo;
-
-    }
-
-    @Entity
-    public static class Student {
-
-    }
-
-    private BooleanExpression authorFilter(Student student){
-        //return QFoo.foo.bars.any().key.student.eq(Student student);
-        return QAnyPathTest_Foo.foo.bars.any().key.student.eq(student);
-    }
-
-    @Test
-    public void AnyPath() {
-        assertNotNull(authorFilter(new Student()));
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AnyUsageTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/AnyUsageTest.java
deleted file mode 100644
index 5bc1e6c9c3..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AnyUsageTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
-import org.junit.Test;
-
-import com.mysema.query.types.expr.BooleanExpression;
-
-public class AnyUsageTest {
-
-    @Entity
-    public static class DealerGroup implements Serializable {
-        private static final long serialVersionUID = 8001287260658920066L;
-
-        @Id
-        @GeneratedValue
-        public Long id;
-
-        @OneToMany(mappedBy = "dealerGroup")
-        public Set<Dealer> dealers;
-
-    }
-
-    @Entity
-    public static class Dealer implements Serializable {
-        private static final long serialVersionUID = -6832045219902674887L;
-
-        @Id
-        @GeneratedValue
-        public Long id;
-
-        @ManyToOne
-        public DealerGroup dealerGroup;
-        
-        @ManyToOne
-        public Company company;
-
-    }
-    
-    @Entity
-    public static class Company implements Serializable {        
-        private static final long serialVersionUID = -5369301332567282659L;
-        
-        @Id
-        @GeneratedValue
-        public Long id;
-        
-    }
-
-    @Test
-    public void test() {
-        QAnyUsageTest_Dealer dealer = QAnyUsageTest_DealerGroup.dealerGroup.dealers.any(); 
-        assertNotNull(dealer);
-        assertNotNull(dealer.company);
-    }
-    
-    @Test
-    public void WithQDealer() {
-        List<Company> companies = new LinkedList<Company>();
-        companies.add( new Company() );
-        QAnyUsageTest_Dealer qDealer = QAnyUsageTest_Dealer.dealer;
-        BooleanExpression expression = qDealer.company.in( companies );
-        assertNotNull(expression);
-    }
-
-    @Test
-    public void WithQDealerGroup() {
-        List<Company> companies = new LinkedList<Company>();
-        companies.add( new Company() );
-        QAnyUsageTest_Dealer qDealer = QAnyUsageTest_DealerGroup.dealerGroup.dealers.any();                   
-        BooleanExpression expression = qDealer.company.in( companies );
-        assertNotNull(expression);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Array2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Array2Test.java
deleted file mode 100644
index 431303713c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Array2Test.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.domain;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.types.path.SimplePath;
-
-public class Array2Test {
-
-    public static class Example {
-
-        byte[] imageData;
-
-        @QueryProjection
-        public Example(byte[] param0) {
-            this.imageData = param0;
-        }
-    }
-
-    @Test
-    public void test() {
-        new QArray2Test_Example(new SimplePath<byte[]>(byte[].class, "bytes")).newInstance(new byte[0]);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Array3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Array3Test.java
deleted file mode 100644
index e5e24eec4b..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Array3Test.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-
-public class Array3Test {
-
-    @QueryEntity
-    public static class Domain {
-
-        byte[] bytes;
-
-        Byte[] bytes2;
-    }
-
-    @QueryEntity
-    public static class Domain2 {
-
-        byte[] bytes;
-    }
-
-    @QueryEntity
-    public static class Domain3 {
-
-        Byte[] bytes;
-    }
-
-    @Test
-    public void Domain() {
-        assertEquals(byte[].class, QArray3Test_Domain.domain.bytes.getType());
-        assertEquals(Byte[].class, QArray3Test_Domain.domain.bytes2.getType());
-    }
-
-    @Test
-    public void Domain2() {
-        assertEquals(byte[].class, QArray3Test_Domain2.domain2.bytes.getType());
-    }
-
-    @Test
-    public void Domain3() {
-        assertEquals(Byte[].class, QArray3Test_Domain3.domain3.bytes.getType());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/B.java b/querydsl-apt/src/test/java/com/mysema/query/domain/B.java
deleted file mode 100644
index 96f40d06d2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/B.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class B extends A {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/BlockingTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/BlockingTest.java
deleted file mode 100644
index ddf8958f11..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/BlockingTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.annotations.QueryType;
-
-public class BlockingTest extends AbstractTest {
-
-    @QueryEntity
-    public static class Entity {
-
-        Entity field1;
-
-        @QueryTransient
-        @QueryType(PropertyType.ENTITY)
-        Entity field2;
-
-        @QueryTransient
-        Entity blockedField;
-    }
-
-    @QueryEntity
-    public static abstract class Entity2 {
-
-        @QueryTransient
-        @QueryType(PropertyType.ENTITY)
-        public abstract Entity getField2();
-
-        @QueryTransient
-        public abstract Entity getBlockedField();
-    }
-
-    @Test
-    public void Entity_Fields_are_available() {
-        assertTrue(QBlockingTest_Entity.entity.field1 != null);
-
-        cl = QBlockingTest_Entity.class;
-        assertMissing("blockedField");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/City.java b/querydsl-apt/src/test/java/com/mysema/query/domain/City.java
deleted file mode 100644
index 20d0d5204c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/City.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-
-public final class City {
-
-    public City() {}
-    
-    public City(String name, Double latitude, Double longitude) {
-        this.name = name;
-        this.latitude = latitude;
-        this.longitude = longitude;
-    }
-    
-    public String name;
-    
-    public Double latitude;
-    
-    public Double longitude;
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/CollectionTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/CollectionTest.java
deleted file mode 100644
index ece0949574..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/CollectionTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-
-public class CollectionTest {
-    
-    @QueryEntity
-    public static class Person {
-
-        Map<String, ?> map1;
-    
-        Map<?, String> map2;
-        
-        Map<?,?> map3;
-        
-        Map map4;
-        
-        List<?> list1;
-        
-        List list2;
-        
-        Collection<?> collection1;
-        
-        Collection collection2;
-        
-        Collection<Collection<Person>> collectionOfCOllection;
-        
-        Collection<Set<String>> collectionOfSet;
-        
-        Set<?> set1;
-        
-        Set set2;
-    }
-    
-    @Test
-    public void test() {
-//        assertEquals(String.class, QMapWithUndefinedValueTest_Person.person.appData.getParameter(1));
-//        assertEquals(Object.class, QMapWithUndefinedValueTest_Person.person.appData.getParameter(1));
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ComparableTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ComparableTest.java
deleted file mode 100644
index 1d5b0c8e21..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ComparableTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
-
-public class ComparableTest {
-    
-    @QueryEntity
-    public static class CustomComparable implements Comparable<CustomComparable>{
-
-        @Override
-        public int compareTo(CustomComparable o) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-        
-    }
-    
-    @QueryEmbeddable
-    public static class CustomComparable2 implements Comparable<CustomComparable2>{
-
-        @Override
-        public int compareTo(CustomComparable2 o) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-        
-    }
-    
-    @Test
-    public void CustomComparable_is_Properly_Handled() {
-        assertNotNull(QComparableTest_CustomComparable.customComparable.asc());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ConstructorTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ConstructorTest.java
deleted file mode 100644
index 33b528d2f9..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ConstructorTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class ConstructorTest {
-
-    @QuerySupertype
-    public static class CategorySuperclass {
-
-    }
-
-    @QueryEntity
-    public static class Category<T extends Category<T>> extends CategorySuperclass {
-
-        public Category(int i) {}
-
-    }
-
-    @QueryEntity
-    public static class ClassWithConstructor {
-
-        public ClassWithConstructor() {}
-
-    }
-
-    @Test
-    public void Classes_are_available() {
-        assertNotNull(QConstructorTest_CategorySuperclass.class);
-        assertNotNull(QConstructorTest_Category.class);
-        assertNotNull(QConstructorTest_ClassWithConstructor.class);
-    }
-    
-    @Test
-    public void Category_Super_Reference_is_Correct() {
-        assertEquals(QConstructorTest_CategorySuperclass.class, QConstructorTest_Category.category._super.getClass());
-        assertEquals(Category.class, QConstructorTest_Category.category._super.getType());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/CustomCollection.java b/querydsl-apt/src/test/java/com/mysema/query/domain/CustomCollection.java
deleted file mode 100644
index 674139f19c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/CustomCollection.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.Set;
-
-import javax.persistence.Entity;
-
-import com.google.common.collect.ForwardingSet;
-
-public class CustomCollection {
-    
-    @Entity
-    public static class MyCustomCollection<T> extends ForwardingSet<T> {
-
-        @Override
-        protected Set<T> delegate() {
-            return null;
-        }
-
-    }
-    
-    @Entity
-    public static class MyCustomCollection2 extends ForwardingSet<String> {
-
-        @Override
-        protected Set<String> delegate() {
-            return null;
-        }
-
-    }
-    
-    @Entity
-    public static class MyEntity {
-        
-        MyCustomCollection<String> strings;
-        
-        MyCustomCollection2 strings2;
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/DeepInitializationTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/DeepInitializationTest.java
deleted file mode 100644
index 2f1a160e8c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/DeepInitializationTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.Collection;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryInit;
-
-public class DeepInitializationTest {
-
-    @MappedSuperclass
-    public static abstract class AbstractEntity implements Cloneable {
-
-        @Id
-        @Column(name = "ID")
-        @GeneratedValue(generator="SEQUENCE")
-        private long id;
-
-        public long getId() {
-            return id;
-        }
-
-        @Override
-        protected Object clone() throws CloneNotSupportedException {
-            return super.clone();
-        }
-    }
-
-    @Entity
-    @SequenceGenerator(name = "SEQUENCE", sequenceName = "PARENT_SEQUENCE")
-    public static class Parent extends AbstractEntity {
-        @JoinColumn(name = "FK_PARENT_ID", nullable = false)
-        @OneToMany(cascade = CascadeType.PERSIST)
-        @QueryInit("subChild.*")
-        private Collection<Child> children;
-
-        public Parent() {
-        }
-
-        public Collection<Child> getChildren() {
-            return children;
-        }
-
-        public void setChildren(Collection<Child> children) {
-            this.children = children;
-        }
-    }
-
-    @Entity
-    @SequenceGenerator(name = "SEQUENCE", sequenceName = "CHILD_SEQUENCE")
-    public static class Child extends AbstractEntity {
-        @OneToOne
-        @JoinColumn(name = "FK_SUBCHILD_ID", referencedColumnName = "ID")
-        private SubChild subChild;
-
-        public Child() {
-        }
-
-        public SubChild getSubChild() {
-            return subChild;
-        }
-
-        public void setSubChild(SubChild subChild) {
-            this.subChild = subChild;
-        }
-    }
-
-    @Entity
-    @SequenceGenerator(name = "SEQUENCE", sequenceName = "SUBCHILD_SEQUENCE")
-    public static class SubChild extends AbstractEntity {
-        @Embedded
-        private MyEmbeddable myEmbeddable;
-
-        public SubChild() {
-        }
-
-        public MyEmbeddable getMyEmbeddable() {
-            return myEmbeddable;
-        }
-
-        public void setMyEmbeddable(MyEmbeddable myEmbeddable) {
-            this.myEmbeddable = myEmbeddable;
-        }
-    }
-
-    @Embeddable
-    public static class MyEmbeddable {
-        
-        private String nummer;
-
-        public MyEmbeddable() {
-        }
-
-        public String getNummer() {
-            return nummer;
-        }
-
-        public void setNummer(String nummer) {
-            this.nummer = nummer;
-        }
-    }
-    
-    @Test
-    public void Init_Via_Parent() {
-        QDeepInitializationTest_Parent parent = QDeepInitializationTest_Parent.parent;
-        parent.children.any().subChild.myEmbeddable.nummer.eq("Test");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate2Test.java
deleted file mode 100644
index 8382d64ad4..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate2Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.template.NumberTemplate;
-
-public class Delegate2Test {
-
-    @QueryEntity
-    public static class Entity {
-
-        Point point;
-    }
-
-    public static class Point {
-
-    }
-
-    @QueryDelegate(Point.class)
-    public static NumberExpression<Integer> geoDistance(Path<Point> point, Point other) {
-        return NumberTemplate.create(Integer.class, "geo_distance({0},{1})", point, ConstantImpl.create(other));
-    }
-
-    @Test
-    public void test() {
-        QDelegate2Test_Entity entity = QDelegate2Test_Entity.entity;
-        assertNotNull(entity.point.geoDistance(new Point()));
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate3Test.java
deleted file mode 100644
index 5773ed8fb9..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Delegate3Test.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mysema.query.domain;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.template.BooleanTemplate;
-
-public class Delegate3Test {
-
-    public static class Geometry implements Comparable<Geometry> {
-
-        @Override
-        public int compareTo(Geometry o) {
-            return 0;
-        }
-
-    }
-
-    public static class Point extends Geometry {
-
-    }
-
-    public static class Polygon extends Geometry {
-
-    }
-
-    @QueryDelegate(Geometry.class)
-    public static BooleanExpression isWithin( ComparablePath<? extends Geometry> geo1, ComparablePath<? extends Geometry> geo2){
-        return BooleanTemplate.TRUE;
-    }
-
-    @Test
-    public void test() {
-        QDelegate3Test_Geometry.geometry.isWithin(null);
-        QDelegate3Test_Point.point.isWithin(null);
-        QDelegate3Test_Polygon.polygon.isWithin(null);
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java
deleted file mode 100644
index eb9a57d30b..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.StringPath;
-
-public class DelegateTest {
-
-    @QuerySupertype
-    public static class Identifiable {
-
-        long id;
-
-    }
-
-    @QueryEntity
-    public static class User extends Identifiable {
-
-        String name;
-
-        User managedBy;
-
-    }
-
-    @QueryEntity
-    public static class SimpleUser extends User {
-
-    }
-
-    @QueryEntity
-    public static class SimpleUser2 extends SimpleUser {
-
-    }
-
-    @QueryDelegate(User.class)
-    public static Expression<Boolean> isManagedBy(QDelegateTest_User user, User other) {
-        return ConstantImpl.create(true);
-    }
-
-    @QueryDelegate(User.class)
-    public static Expression<Boolean> isManagedBy(QDelegateTest_User user, QDelegateTest_User other) {
-        return ConstantImpl.create(true);
-    }
-
-    @QueryDelegate(User.class)
-    public static Expression<Boolean> simpleMethod(QDelegateTest_User user) {
-        return ConstantImpl.create(true);
-    }
-
-    @QueryDelegate(DelegateTest.User.class)
-    public static StringPath getName(QDelegateTest_User user) {
-        return user.name;
-    }
-
-    @Test
-    public void User() {
-        QDelegateTest_User user = QDelegateTest_User.user;
-        assertNotNull(user.isManagedBy(new User()));
-        assertNotNull(user.isManagedBy(user));
-        assertNotNull(user.simpleMethod());
-        assertEquals(user.name, user.getName());
-    }
-
-    @Test
-    public void SimpleUser() {
-        QDelegateTest_SimpleUser user = QDelegateTest_SimpleUser.simpleUser;
-        assertNotNull(user.isManagedBy(new User()));
-        assertNotNull(user.isManagedBy(user._super));
-        assertEquals(user.name, user.getName());
-    }
-
-    @Test
-    public void SimpleUser2() {
-        QDelegateTest_SimpleUser2 user = QDelegateTest_SimpleUser2.simpleUser2;
-        assertNotNull(user.isManagedBy(new User()));
-        assertNotNull(user.isManagedBy(user._super._super));
-        assertEquals(user.name, user.getName());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Embeddable2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Embeddable2Test.java
deleted file mode 100644
index f39fe95b39..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Embeddable2Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.PathInits;
-
-public class Embeddable2Test {
-    
-    @QuerySupertype
-    public static abstract class SomeMappedSuperClassHavingMyEmbeddable {
-
-        @QueryEmbedded
-        MyEmbeddable embeddable;
-    }
-    
-    @QueryEntity
-    public static abstract class SomeEntityClassHavingMyEmbeddable {
-        
-        @QueryEmbedded
-        MyEmbeddable embeddable;
-        
-    }
-    
-    @QueryEntity
-    public static class SomeEntity extends SomeMappedSuperClassHavingMyEmbeddable {
-        
-    }
-    
-    @Test
-    @Ignore
-    public void MappedSuperClassConstructors() throws SecurityException, NoSuchMethodException {
-        assertNotNull(QEmbeddable2Test_SomeMappedSuperClassHavingMyEmbeddable.class.getConstructor(
-                Class.class, PathMetadata.class, PathInits.class));
-    }
-    
-    @Test
-    @Ignore
-    public void EntityConstructors() throws SecurityException, NoSuchMethodException {
-        assertNotNull(QEmbeddable2Test_SomeEntityClassHavingMyEmbeddable.class.getConstructor(
-                Class.class, PathMetadata.class, PathInits.class));
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableInterfaceTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableInterfaceTest.java
deleted file mode 100644
index fd10783b64..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableInterfaceTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-
-import org.junit.Test;
-
-public class EmbeddableInterfaceTest {
-
-    @Entity
-    public static class EntityClass {
-        
-        @ElementCollection(targetClass=EmbeddableClass.class)
-        Collection<EmbeddableInterface> children;
-        
-    }
-        
-    @Embeddable
-    public interface EmbeddableInterface {
-     
-        String getName();
-    }
-    
-    @Embeddable
-    public static class EmbeddableClass implements EmbeddableInterface {
-
-        @Override
-        public String getName() {
-            return null;
-        }
-        
-    }
-    
-    @Test
-    public void Type() {
-        assertEquals(
-            QEmbeddableInterfaceTest_EmbeddableInterface.class, 
-            QEmbeddableInterfaceTest_EntityClass.entityClass.children.any().getClass());
-    }
-    
-    @Test
-    public void Properties() {
-        assertNotNull(QEmbeddableInterfaceTest_EmbeddableInterface.embeddableInterface.name);
-        assertNotNull(QEmbeddableInterfaceTest_EmbeddableClass.embeddableClass.name);
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableTest.java
deleted file mode 100644
index a350ab1c1f..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.util.List;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.domain.AnimalTest.Cat;
-
-@Ignore
-public class EmbeddableTest {
-
-    @QueryEntity
-    public static class EntityWithEmbedded {
-
-        public WithEntityRef e1;
-
-        public WithStringProp e2;
-
-        public WithEntityAndString e3;
-
-        public WithList e4;
-    }
-
-    @QueryEmbeddable
-    public static class WithEntityRef {
-
-        public Cat cat;
-
-    }
-
-    @QueryEmbeddable
-    public static class WithStringProp {
-
-        public String str;
-    }
-
-    @QueryEmbeddable
-    public static class WithEntityAndString extends WithEntityRef {
-
-        public String str2;
-
-    }
-
-    @QueryEmbeddable
-    public static class WithList extends WithStringProp {
-
-        public List<Cat> cats;
-
-        public String str3;
-
-    }
-
-    @QueryEntity
-    @QueryEmbeddable
-    public static class EntityAndEmbeddable {
-
-    }
-
-    @QuerySupertype
-    @QueryEmbeddable
-    public static class SuperclassAndEmbeddable {
-
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Embedded2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Embedded2Test.java
deleted file mode 100644
index 48aabbd764..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Embedded2Test.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class Embedded2Test {
-    
-    @MappedSuperclass
-    public static class EntityCode {
-
-        @Column(name = "code", unique = true)
-        String code;
-
-    }
-    
-    @MappedSuperclass
-    public static abstract class AbstractEntity<C extends EntityCode> {
-
-        @Embedded
-        @Column(name = "code", nullable = false, unique = true)
-        C code;
-        
-    }
-    
-    @MappedSuperclass
-    public static class AbstractMultilingualEntity<C extends EntityCode> extends AbstractEntity<C> {
-
-    }
-    
-    @MappedSuperclass
-    public static abstract class AbstractNamedEntity<C extends EntityCode> extends AbstractMultilingualEntity<C> {
-
-        @Column(name = "name_en", nullable = false)
-        String nameEn;
-
-        @Column(name = "name_nl")
-        String nameNl;
-
-    }
-        
-    @javax.persistence.Entity
-    public static class Brand extends AbstractNamedEntity<BrandCode> {
-
-        @Id
-        @GeneratedValue(strategy = GenerationType.AUTO)
-        @Column(name = "brand_id")
-        Long id;
-
-    }
-        
-    public interface Entity<T> extends Serializable {
-
-        boolean sameIdentityAs(T other);
-
-    }
-     
-    @Embeddable
-    public static class BrandCode extends EntityCode {
-
-    }
-    
-    @Test
-    public void test() {
-        // TODO
-    }
-
-
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddedTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddedTest.java
deleted file mode 100644
index 37f5a3bc41..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddedTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class EmbeddedTest {
-    
-    @Entity
-    public static class EntityClass extends AbstractEntity<SubEntityCode> {
-        
-    }
-    
-    @MappedSuperclass
-    public static abstract class AbstractEntity<C extends EntityCode> {
-
-        @Embedded
-        @Column(name = "code", nullable = false, unique = true)
-        C code;
-    }
-
-    @MappedSuperclass
-    public static class EntityCode {
-
-        @Column(name = "code", unique = true)
-        String code;
-
-    }
-    
-    @Embeddable
-    public static class SubEntityCode extends EntityCode {
-        
-        String property;
-        
-    }
-    
-    @Test
-    public void EntityClass() {
-        assertNotNull(QEmbeddedTest_EntityClass.entityClass.code.property);
-        assertEquals(SubEntityCode.class, QEmbeddedTest_EntityClass.entityClass.code.getType());
-    }
-    
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EntityInheritanceTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/EntityInheritanceTest.java
deleted file mode 100644
index 3d2c36e056..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EntityInheritanceTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class EntityInheritanceTest {
-    
-    @MappedSuperclass
-    public static class TreeEntity<T extends TreeEntity<T>> {
-        
-        Integer id;
-        
-        T parent;
-        
-    }
-
-    @Entity
-    public static class TestEntity extends TreeEntity<TestEntity> {
-        
-        String name;
-        
-    }
-    
-    @Test
-    public void test() {
-        assertEquals(
-            QEntityInheritanceTest_TestEntity.class, 
-            QEntityInheritanceTest_TestEntity.testEntity.parent.getClass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java
deleted file mode 100644
index 0f1fe905e2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum2Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@Ignore
-public class Enum2Test {
-    
-    @QueryEntity
-    public static abstract class EnumPermissions<P extends Enum<P> & Permission> extends EntityImpl implements Permissions<P> {
-    
-    }
-
-    @QueryEntity
-    public static abstract class EntityImpl {
-                
-    }
-
-    public interface Permission {
-        
-    }
-    
-    public interface Permissions<P> {
-        
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EnumTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/EnumTest.java
deleted file mode 100644
index 93677a72b5..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EnumTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
-
-public class EnumTest {
-    
-    @QueryEntity
-    public enum Gender {
-        MALE,
-        FEMALE
-    }
-    
-    @QueryEmbeddable
-    public enum Gender2 {
-        MALE,
-        FEMALE
-    }
-    
-    @QueryEntity
-    public static class Bean {
-        Gender gender;
-    }
-    
-    @Test
-    public void Enum_as_Comparable() {
-        assertNotNull(QEnumTest_Gender.gender.asc());        
-    }
-    
-    @Test
-    public void EnumOrdinal_as_Comparable() {
-        assertNotNull(QEnumTest_Gender.gender.ordinal().asc());        
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExampleEntity.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ExampleEntity.java
deleted file mode 100644
index 58a13839cd..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExampleEntity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class ExampleEntity {
-
-    String name;
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java
deleted file mode 100644
index d65c0308ff..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Examples.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.OrderSpecifier;
-
-public class Examples {
-    
-    public static class Supertype {
-        
-        String supertypeProperty;
-    }
-    
-    @QueryEntity
-    public static class SimpleEntity extends Supertype {
-
-    }
-
-    @QueryEntity
-    public static abstract class AbstractEntity<Id extends java.io.Serializable> {
-
-        Id id;
-
-        String first;
-
-    }
-
-    @QueryEntity
-    public static class SubEntity extends AbstractEntity<java.lang.Long> {
-     
-        String second;
-     
-    } 
-    
-    @QueryEntity
-    public static class ComplexCollections {
-    
-        @QueryEmbedded
-        List<Complex<String>> list;
-        
-        @QueryEmbedded
-        Map<String, Complex<String>> map;
-        
-        @QueryEmbedded
-        Map<String, Complex<?>> map2;
-        
-        @QueryEmbedded
-        Map<?, Complex<String>> map3;
-
-    }
-    
-    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
-
-        T a;
-        
-        @Override
-        public int compareTo(Complex<T> arg0) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-    }
-    
-    @QueryEntity
-    public static class OrderBys {
-        
-        @QueryEmbedded
-        List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExcludedClassTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ExcludedClassTest.java
deleted file mode 100644
index fdb3be10e0..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExcludedClassTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryExclude;
-
-@QueryExclude
-@QueryEntity
-public class ExcludedClassTest {
-
-    @QueryExclude
-    @QueryEntity
-    public static class InnerClass {
-        
-    }
-    
-    @Test(expected=ClassNotFoundException.class)
-    public void OuterClass() throws ClassNotFoundException {
-        Class.forName(getClass().getPackage().getName() + ".Q" + getClass().getSimpleName()); 
-    }
-    
-    @Test(expected=ClassNotFoundException.class)
-    public void InnerClass() throws ClassNotFoundException {
-        Class.forName(getClass().getPackage().getName() + ".QExcludedClassTest_InnerClass");
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java
deleted file mode 100644
index f9bcef6ce6..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Expression.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Expression {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEmbeddableTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEmbeddableTest.java
deleted file mode 100644
index f5a7333d24..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEmbeddableTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-
-import org.junit.Ignore;
-
-@Ignore
-public class ExternalEmbeddableTest {
-
-    @Entity
-    public static class EntityWithExternalEmbeddable {
-        
-        @Embedded
-        EmbeddableWithoutQType embeddable;
-        
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic10Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic10Test.java
deleted file mode 100644
index ed9302b9c2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic10Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
-
-import org.junit.Ignore;
-
-@Ignore
-public class Generic10Test {
-    
-    public interface Tradable {}
-
-    public interface Market<T extends Tradable> {}
-    
-    @Entity
-    public static class FutureTrade implements Tradable {}
-
-    @MappedSuperclass
-    public static abstract class AbstractTradingMarket<T extends Tradable> implements Market<T>{
-
-        // XXX
-        @OneToOne
-        private TradingMarketLedger<AbstractTradingMarket<T>> ledger;
-    }
-
-    @Entity
-    public static abstract class AbstractFuturesMarket extends AbstractTradingMarket<FutureTrade> {}
-
-    // XXX
-    @Entity
-    public static class CommonFuturesMarket extends AbstractFuturesMarket {}
-
-    @Entity
-    public static class TradingMarketLedger<M extends Market<? extends Tradable>> {}
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic13Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic13Test.java
deleted file mode 100644
index 468d3dd4a1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic13Test.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.domain;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@Ignore
-public class Generic13Test {
-
-    @QueryEntity
-    public static class GenericBase<T extends AnotherClass> {
-        T t;
-    }
-
-    @QueryEntity
-    public static class GenericBaseSubclass<P> extends GenericBase<AnotherClass> {
-        P p;
-    }
-
-    @QueryEntity
-    public static class Subclass extends GenericBaseSubclass<Object> {
-    }
-
-    public static class AnotherClass {
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic14Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic14Test.java
deleted file mode 100644
index fc01b201b1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic14Test.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import java.io.Serializable;
-
-import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
-
-public class Generic14Test {
-
-    @Entity
-    public static class UserAccount extends BaseReferencablePersistable<Long> {
-
-    }
-
-    @MappedSuperclass
-    public static abstract class BaseReferencablePersistable<PK extends Serializable> extends BasePersistable<PK> {
-
-    }
-
-    @MappedSuperclass
-    public static class BasePersistable<T extends Serializable> extends AbstractPersistable<T> implements UpdateInfo {
-
-    }
-
-    @MappedSuperclass
-    public static abstract class AbstractPersistable<PK extends Serializable> implements Persistable<PK> {
-
-    }
-
-    public interface Persistable<T> {
-
-    }
-
-    public interface UpdateInfo {
-
-    }
-
-    @Test
-    public void test() {
-        assertNotNull(QGeneric14Test_UserAccount.userAccount);
-        assertNotNull(QGeneric14Test_BaseReferencablePersistable.baseReferencablePersistable);
-        assertNotNull(QGeneric14Test_BasePersistable.basePersistable);
-        assertNotNull(QGeneric14Test_AbstractPersistable.abstractPersistable);
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic2Test.java
deleted file mode 100644
index 5271e7fb55..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic2Test.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class Generic2Test {
-
-    public static class Range<T extends Comparable<? super T>> {
-        private T min;
-        private T max;
-
-        public T getMin() {
-            return min;
-        }
-
-        public void setMin(T min) {
-            this.min = min;
-        }
-
-        public T getMax() {
-            return max;
-        }
-
-        public void setMax(T max) {
-            this.max = max;
-        }
-    }
-
-    @MappedSuperclass
-    public static abstract class BaseEntity<T extends Comparable<? super T>> implements
-            Serializable {
-        @Embedded
-        private Range<T> range;
-
-        public Range<T> getRange() {
-            return range;
-        }
-
-        public void setRange(Range<T> range) {
-            this.range = range;
-        }
-    }
-
-    @Entity
-    public static class Foo extends BaseEntity<Integer> {
-        
-    }
-    
-    @Test
-    public void test() {
-        
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic3Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic3Test.java
deleted file mode 100644
index a64c9b2287..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic3Test.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class Generic3Test {
-    
-    @MappedSuperclass
-    public static abstract class BaseEntity<E extends BaseEntity<E>> {
-        
-    }
-    
-    @MappedSuperclass
-    public static abstract class Order<O extends Order<O>> extends BaseEntity<O> implements Cloneable {
-        
-        String property1;        
-    }
-    
-    @Entity
-    public static class MyOrder<O extends MyOrder<O>> extends Order<O> {
-        
-        String property2;
-    }
-    
-    @Test
-    public void test() {
-        
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java
deleted file mode 100644
index bb8de62b16..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.MappedSuperclass;
-
-import org.junit.Test;
-
-public class Generic4Test {
-    
-    @MappedSuperclass
-    public static abstract class CapiBCKeyedByGrundstueck {
-        
-    }
-    
-    @MappedSuperclass
-    public static abstract class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
-        
-    }
-
-    @MappedSuperclass
-    public static abstract class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends
-            CapiBCKeyedByGrundstueck {
-        
-    }
-    
-    @Test
-    public void test() {
-        
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic8Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic8Test.java
deleted file mode 100644
index 322c4e8e50..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic8Test.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class Generic8Test {
-    
-    @QuerySupertype
-    public static class Superclass<T> {
-
-        Long id;
-        
-        List<T> values;
-        
-        List<? extends T> values2;
-
-    }
-    
-    @QueryEntity
-    public static class Entity extends Superclass<String> {
-
-    }
-
-    
-    @QueryEntity
-    public static class Entity2 extends Superclass<Integer> {
-
-    }
-
-    @Test
-    public void test() {
-        
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic9Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic9Test.java
deleted file mode 100644
index 98aac2a5e1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic9Test.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Table;
-
-import org.junit.Test;
-
-public class Generic9Test {
-    
-    @MappedSuperclass
-    public static abstract class CommonOrganizationalUnit<T extends EntityLocalized, E extends TenantPreference, P extends CommonOrganizationalUnit<?, ?, ?>> extends
-        LocalizableEntity<T> implements Serializable, Comparable<CommonOrganizationalUnit<T, E, P>> {
-        
-        P parent;
-        
-//        CommonOrganizationalUnit<?,?,?> parent2;
-//        
-//        CommonOrganizationalUnit<T,E,P> parent3;
-        
-    }
-
-    @MappedSuperclass
-    public static abstract class ProductionSurface<T extends EntityLocalized, E extends TenantPreference, P extends CommonOrganizationalUnit<?, ?, ?>> extends
-        CommonOrganizationalUnit<T, E, P> implements Serializable {
-        
-    }
-
-//    @Entity
-//    public class Building extends ProductionSurface<BuildingLocalized, BuildingPreference, Site> {
-//        
-//    }
-    
-    @MappedSuperclass
-    public static abstract class EntityLocalized extends CommonEntity {
-        
-    }
-    
-    @Entity
-    public static class Preference {
-        
-    }
-
-    @Entity
-    @Table(name = "preference")
-    @DiscriminatorColumn(name = "discriminator", discriminatorType = DiscriminatorType.STRING)
-    public static abstract class TenantPreference extends Preference {
-        
-    }
-
-    @MappedSuperclass
-    public static abstract class CommonEntity {
-        
-    }
-    
-    @MappedSuperclass
-    public static abstract class LocalizableEntity<T extends EntityLocalized> extends CommonEntity {
-        
-    }
-    
-    @Test
-    public void test() {
-        new QGeneric9Test_CommonOrganizationalUnit("test");   
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/GenericTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/GenericTest.java
deleted file mode 100644
index 1f73665565..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/GenericTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.util.Date;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.domain.rel.SimpleType;
-import com.mysema.query.domain.rel.SimpleType2;
-
-@Ignore
-public class GenericTest {
-
-    @QueryEntity
-    public static class GenericType<T extends ItemType> {
-        T itemType;
-    }
-
-    @QueryEntity
-    @SuppressWarnings("unchecked")
-    public static class GenericType2<T extends ItemType> {
-        T itemType;
-
-        // simple        
-        GenericSimpleType prop1;
-        GenericSimpleType<?> prop2;
-        GenericSimpleType<? extends GenericSimpleType<?>> prop3;
-
-        // comparable
-        GenericComparableType comp1;
-        GenericComparableType<Number> comp2;
-        GenericComparableType<Date> comp3;
-
-        // number
-
-        @QueryTransient
-        GenericNumberType num1; // NOTE : doesn't work!
-
-        GenericNumberType<Number> num2;
-        GenericNumberType<Date> num3;
-    }
-
-    public static class GenericSimpleType<T extends GenericSimpleType<T>>{
-
-    }
-
-    @SuppressWarnings("unchecked")
-    public static class GenericComparableType<T> implements Comparable<GenericComparableType<T>>{
-        @Override
-        public int compareTo(GenericComparableType<T> o) {
-            return 0;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof GenericComparableType;
-        }
-    }
-
-    @SuppressWarnings({ "unchecked", "serial" })
-    public static class GenericNumberType<T> extends Number implements Comparable<GenericNumberType<T>>{
-        @Override
-        public double doubleValue() {
-            return 0;
-        }
-        @Override
-        public float floatValue() {
-            return 0;
-        }
-        @Override
-        public int intValue() {
-            return 0;
-        }
-        @Override
-        public long longValue() {
-            return 0;
-        }
-        @Override
-        public int compareTo(GenericNumberType<T> o) {
-            return 0;
-        }
-
-        @Override
-        public int hashCode() {
-            return super.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof GenericNumberType;
-        }
-    }
-
-    @QueryEntity
-    @SuppressWarnings("unchecked")
-    public static class ItemType {
-        Amount<SimpleType> prop;
-        SimpleType2<Amount<SimpleType>> prop2;        
-        SimpleType2<Amount> prop3;
-        SimpleType2<?> prop4;
-    }
-
-    public static class Amount<T>{
-
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceTypeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceTypeTest.java
deleted file mode 100644
index 5f8581d3ef..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceTypeTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.NumberPath;
-
-public class InterfaceTypeTest extends AbstractTest {
-
-    @QueryEntity
-    public interface InterfaceType {
-        InterfaceType getRelation();
-
-        List<InterfaceType> getRelation2();
-
-        List<? extends InterfaceType> getRelation3();
-
-        int getRelation4();
-
-        String getProp();
-    }
-
-    @QueryEntity
-    public interface InterfaceType2 {
-
-        public String getProp2();
-
-    }
-
-    @QueryEntity
-    public interface InterfaceType3 extends InterfaceType, InterfaceType2 {
-
-        public String getProp3();
-
-    }
-
-    @QueryEntity
-    public interface InterfaceType4 {
-
-        public String getProp4();
-
-    }
-
-    @QueryEntity
-    public interface InterfaceType5 extends InterfaceType3, InterfaceType4 {
-
-        public String getProp5();
-
-    }
-
-    @Test
-    public void QInterfaceType_relation() throws SecurityException, NoSuchFieldException {
-        cl = QInterfaceTypeTest_InterfaceType.class;
-        match(QInterfaceTypeTest_InterfaceType.class, "relation");
-    }
-
-    @Test
-    public void QInterfaceType_relation2() throws SecurityException, NoSuchFieldException {
-        cl = QInterfaceTypeTest_InterfaceType.class;
-        match(ListPath.class, "relation2");
-    }
-
-    @Test
-    public void QInterfaceType_relation3() throws SecurityException, NoSuchFieldException {
-        cl = QInterfaceTypeTest_InterfaceType.class;
-        match(ListPath.class, "relation3");
-    }
-
-    @Test
-    public void QInterfaceType_relation4() throws SecurityException, NoSuchFieldException {
-        cl = QInterfaceTypeTest_InterfaceType.class;
-        match(NumberPath.class, "relation4");
-    }
-
-    @Test
-    public void QInterfaceType3() throws SecurityException, NoSuchFieldException {
-        Class<?> cl = QInterfaceTypeTest_InterfaceType3.class;
-        cl.getField("prop");
-        cl.getField("prop2");
-        cl.getField("prop3");
-    }
-
-    @Test
-    public void QInterfaceType5() throws SecurityException, NoSuchFieldException{
-        Class<?> cl = QInterfaceTypeTest_InterfaceType5.class;
-        cl.getField("prop");
-        cl.getField("prop2");
-        cl.getField("prop3");
-        cl.getField("prop4");
-        cl.getField("prop5");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JDOTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/JDOTest.java
deleted file mode 100644
index c74a9b3f2a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JDOTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import javax.jdo.annotations.NotPersistent;
-import javax.jdo.annotations.PersistenceCapable;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-public class JDOTest extends AbstractTest {
-
-    @PersistenceCapable
-    public static class JDOEntity {
-
-        String prop;
-
-        @NotPersistent
-        String skipped;
-
-        @NotPersistent
-        JDOEntity skippedEntity;
-    }
-
-    @PersistenceCapable
-    public static class JDOEntity2 {
-
-        @SuppressWarnings("unused")
-        private String stringField1;
-
-        private String stringField2;
-
-        public String getStringField2() {
-            return stringField2;
-        }
-    }
-
-    @Test
-    public void test() throws SecurityException, NoSuchFieldException {
-        cl = QJDOTest_JDOEntity.class;
-        match(StringPath.class, "prop");
-        assertMissing("skipped");
-        assertMissing("skippedEntity");
-
-        cl = QJDOTest_JDOEntity2.class;
-        match(StringPath.class, "stringField1");
-        match(StringPath.class, "stringField2");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JPATest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/JPATest.java
deleted file mode 100644
index a744b37389..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JPATest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
-import org.junit.Test;
-
-import com.mysema.query.domain.JDOTest.JDOEntity;
-import com.mysema.query.types.path.StringPath;
-
-public class JPATest extends AbstractTest {
-
-    @Entity
-    public static class JPAEntity {
-
-        String prop;
-
-        @Transient
-        String skipped;
-
-        @Transient
-        JDOEntity skippedEntity;
-    }
-
-    @Test
-    public void test() throws SecurityException, NoSuchFieldException {
-        cl = QJPATest_JPAEntity.class;
-        match(StringPath.class, "prop");
-        assertMissing("skipped");
-        assertMissing("skippedEntity");
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyHelpers.java b/querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyHelpers.java
deleted file mode 100644
index 592c07c425..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyHelpers.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mysema.query.domain;
-
-import java.math.BigDecimal;
-
-import org.joda.money.Money;
-import org.joda.money.QMoney;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-public class JodaMoneyHelpers {
-
-    @QueryDelegate(Money.class)
-    public static NumberExpression<BigDecimal> sum(QMoney money) {
-        return NumberOperation.<BigDecimal>create(BigDecimal.class, Ops.AggOps.SUM_AGG, money);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTest.java
deleted file mode 100644
index 560c8eb62a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.Date;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.joda.time.DateTime;
-import org.junit.Test;
-
-public class JodaTest {
-
-    @MappedSuperclass
-    @Access(AccessType.FIELD)
-    public abstract class BaseEntity {
-
-        public abstract Long getId();
-
-        @Temporal(TemporalType.TIMESTAMP)
-        private Date createdDate;
-
-        public boolean isNew() {
-            return null == getId();
-        }
-
-        public DateTime getCreatedDate() {
-            return null == createdDate ? null : new DateTime(createdDate);
-        }
-
-        public void setCreatedDate(DateTime creationDate) {
-            this.createdDate = null == creationDate ? null : creationDate.toDate();
-        }
-    }
-    
-    @Test
-    public void test() {
-        assertEquals(Date.class, QJodaTest_BaseEntity.baseEntity.createdDate.getType());
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTimeSupportTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTimeSupportTest.java
deleted file mode 100644
index 02e1af7691..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaTimeSupportTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import org.joda.time.DateMidnight;
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.joda.time.Partial;
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.TimePath;
-
-public class JodaTimeSupportTest extends AbstractTest {
-
-    @QueryEntity
-    public static class JodaTimeSupport {
-
-        DateMidnight dateMidnight;
-
-        DateTime dateTime;
-
-        Instant instant;
-
-        LocalDate localDate;
-
-        LocalDateTime localDateTime;
-
-        LocalTime localTime;
-
-        Partial partial;
-
-    }
-
-    @Test
-    public void test() throws SecurityException, NoSuchFieldException {
-        cl = QJodaTimeSupportTest_JodaTimeSupport.class;
-        match(DateTimePath.class, "dateMidnight");
-        match(DateTimePath.class, "dateTime");
-        match(DateTimePath.class, "instant");
-        match(DatePath.class, "localDate");
-        match(DateTimePath.class, "localDateTime");
-        match(TimePath.class, "localTime");
-        match(ComparablePath.class, "partial");
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Location.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Location.java
deleted file mode 100644
index 46bf140afe..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Location.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.Set;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Location {
-
-    public Set<Path> paths;
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ManyToManyTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ManyToManyTest.java
deleted file mode 100644
index 49753dfe23..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ManyToManyTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
-
-import org.junit.Test;
-
-public class ManyToManyTest {
-
-    public interface PhoneNumber {
-
-    }
-
-    @Entity
-    public static class PhoneNumberImpl {
-
-    }
-
-    @Entity
-    public static class Person {
-
-        @ManyToMany(targetEntity=PhoneNumberImpl.class)
-        Set<PhoneNumber> phones;
-    }
-
-    @Test
-    public void test() {
-        assertEquals(PhoneNumberImpl.class, QManyToManyTest_Person.person.phones.getElementType());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompany.java b/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompany.java
deleted file mode 100644
index 5dc4c69d31..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompany.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
-
-@QueryEntity
-public class MonitoredCompany {
-
-    private Long key;
-
-    @QueryInit("mainCompany")
-    private CompanyGroup companyGroup;
-
-    public Long getKey() {
-        return key;
-    }
-
-    public void setKey(final Long aKey) {
-        this.key = aKey;
-    }
-
-    public CompanyGroup getCompanyGroup() {
-        return companyGroup;
-    }
-
-    public void setCompanyGroup(CompanyGroup aCompanyGroup) {
-        this.companyGroup = aCompanyGroup;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompanyTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompanyTest.java
deleted file mode 100644
index e27310cd1a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/MonitoredCompanyTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class MonitoredCompanyTest {
-    
-    @Test
-    public void test() {
-        QMonitoredCompany monitoredCompany = QMonitoredCompany.monitoredCompany; 
-        assertNotNull(monitoredCompany.companyGroup);
-        assertNotNull(monitoredCompany.companyGroup.mainCompany);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/NumberTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/NumberTest.java
deleted file mode 100644
index 9c506b269b..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/NumberTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mysema.query.domain;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.custom.CustomNumber;
-
-@Ignore
-public class NumberTest {
-
-    @QueryEntity
-    public static class Entity {
-
-        CustomNumber customNumber;
-
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/OneToOneTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/OneToOneTest.java
deleted file mode 100644
index a69b00a897..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/OneToOneTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class OneToOneTest {
-
-    public interface PhoneNumber {
-
-    }
-
-    @Entity
-    public static class PhoneNumberImpl {
-
-    }
-
-    @Entity
-    public static class Person {
-
-        @OneToOne(targetEntity=PhoneNumberImpl.class)
-        PhoneNumber phone;
-    }
-
-    @Test
-    public void test() {
-        assertEquals(PhoneNumberImpl.class, QOneToOneTest_Person.person.phone.getType());
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/OrderTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/OrderTest.java
deleted file mode 100644
index 1b9fc1a976..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/OrderTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-
-import org.junit.Test;
-
-public class OrderTest {
-
-    @Entity
-    public static class Order {
-        @OneToMany(targetEntity = OrderItemImpl.class)
-        List<OrderItem> orderItems;
-    }
-
-    @Entity
-    public interface OrderItem { }
-
-    @Entity
-    public static class OrderItemImpl implements OrderItem { }
-
-    @Test
-    public void test() {
-        assertEquals(QOrderTest_OrderItemImpl.class,
-                QOrderTest_Order.order.orderItems.any().getClass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Path.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Path.java
deleted file mode 100644
index f2884af7fb..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Path.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Path {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PathInits.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PathInits.java
deleted file mode 100644
index 9276736a55..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PathInits.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain;
-
-public class PathInits {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadata.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadata.java
deleted file mode 100644
index c239e009b1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadata.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain;
-
-public class PathMetadata {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PathTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PathTest.java
deleted file mode 100644
index d6c82ce594..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PathTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class PathTest {
-    
-    @Test
-    public void test() {
-        assertEquals(Path.class, QPath.path.getType());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Person.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Person.java
deleted file mode 100644
index 349325ea7c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Person.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- *
- * @author Arash
- */
-@Entity
-@Table(name = "Person", catalog = "TestDB", schema = "dbo")
-@XmlRootElement
-@NamedQueries({
-    @NamedQuery(name = "Person.findAll", query = "SELECT p FROM Person p"),
-    @NamedQuery(name = "Person.findByPersonId", query = "SELECT p FROM Person p WHERE p.personId = :personId"),
-    @NamedQuery(name = "Person.findByPersonName", query = "SELECT p FROM Person p WHERE p.personName = :personName"),
-    @NamedQuery(name = "Person.findByPersonFamily", query = "SELECT p FROM Person p WHERE p.personFamily = :personFamily"),
-    @NamedQuery(name = "Person.findByPersonReference", query = "SELECT p FROM Person p WHERE p.personReference = :personReference")})
-public class Person implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @Id
-    @Basic(optional = false)
-    @Column(name = "person_id", nullable = false)
-    private Integer personId;
-
-    @Column(name = "person_name", length = 50)
-    private String personName;
-
-    @Column(name = "person_family", length = 50)
-    private String personFamily;
-    
-    @Column(name = "person_reference")
-    
-    private Integer personReference;
-    @OneToOne(cascade = CascadeType.ALL, mappedBy = "person1", fetch = FetchType.LAZY)
-    
-    private Person person;
-    @JoinColumn(name = "person_id", referencedColumnName = "person_id", nullable = false, insertable = false, updatable = false)
-    @OneToOne(optional = false, fetch = FetchType.LAZY)
-    
-    private Person person1;
-
-    public Person() {
-    }
-
-    public Person(Integer personId) {
-        this.personId = personId;
-    }
-
-    public Integer getPersonId() {
-        return personId;
-    }
-
-    public void setPersonId(Integer personId) {
-        this.personId = personId;
-    }
-
-    public String getPersonName() {
-        return personName;
-    }
-
-    public void setPersonName(String personName) {
-        this.personName = personName;
-    }
-
-    public String getPersonFamily() {
-        return personFamily;
-    }
-
-    public void setPersonFamily(String personFamily) {
-        this.personFamily = personFamily;
-    }
-
-    public Integer getPersonReference() {
-        return personReference;
-    }
-
-    public void setPersonReference(Integer personReference) {
-        this.personReference = personReference;
-    }
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-
-    public Person getPerson1() {
-        return person1;
-    }
-
-    public void setPerson1(Person person1) {
-        this.person1 = person1;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (personId != null ? personId.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
-        if (!(object instanceof Person)) {
-            return false;
-        }
-        Person other = (Person) object;
-        if ((this.personId == null && other.personId != null) || (this.personId != null && !this.personId.equals(other.personId))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "newpackage.Person[ personId=" + personId + " ]";
-    }
-    
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PropertiesTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PropertiesTest.java
deleted file mode 100644
index 0679950e3c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PropertiesTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.junit.Test;
-
-public class PropertiesTest {
-    
-    @Entity
-    public static abstract class AbstractEntity {
-        
-    }
-    
-    @Entity
-    @Table(name = "Customer")
-    public static class Customer extends AbstractEntity {
-
-        private String name;
-        private List<Pizza> pizzas = new ArrayList<Pizza>(0);
-
-        @Column
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        @OneToMany(mappedBy = "customer")
-        public List<Pizza> getPizzas() {
-            return pizzas;
-        }
-
-        public void setPizzas(List<Pizza> pizzas) {
-            this.pizzas = pizzas;
-        }
-    }
-    
-    @Entity
-    @Table(name = "Pizza")
-    public static class Pizza extends AbstractEntity {
-
-        private Date orderTime;
-        private Customer customer;
-        private List<Topping> toppings = new ArrayList<Topping>(0);
-
-        @Column @Temporal(TemporalType.TIMESTAMP)
-        public Date getOrderTime() {
-            return new Date(orderTime.getTime());
-        }
-
-        public void setOrderTime(Date orderTime) {
-            this.orderTime = new Date(orderTime.getTime());
-        }
-
-        @ManyToOne
-        @JoinColumn(name = "customerId")
-        public Customer getCustomer() {
-            return customer;
-        }
-
-        public void setCustomer(Customer customer) {
-            this.customer = customer;
-        }
-
-        @OneToMany(mappedBy = "pizza")
-        public List<Topping> getToppings() {
-            return toppings;
-        }
-
-        public void setToppings(List<Topping> toppings) {
-            this.toppings = toppings;
-        }
-    }
-
-    @Entity
-    public static class Topping {
-        
-    }
-    
-    @Test
-    public void Customer() {
-        assertNotNull(QPropertiesTest_Customer.customer.name);
-        assertNotNull(QPropertiesTest_Customer.customer.pizzas);
-    }
-    
-    @Test
-    public void Pizza() {
-        assertNotNull(QPropertiesTest_Pizza.pizza.orderTime);
-        assertNotNull(QPropertiesTest_Pizza.pizza.customer);
-        assertNotNull(QPropertiesTest_Pizza.pizza.toppings);
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PropertyTypeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PropertyTypeTest.java
deleted file mode 100644
index 6e419f0b61..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PropertyTypeTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryType;
-
-@Ignore
-public class PropertyTypeTest {
-
-    @QueryEntity
-    public static class Entity {
-        
-        @QueryType(PropertyType.STRING)
-        Integer numberAsString;
-        
-    }
-    
-    @Test
-    public void NumberAsString_Like() {
-        QPropertyTypeTest_Entity.entity.numberAsString.like("a");
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryByExampleTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryByExampleTest.java
deleted file mode 100644
index 4c3df131cb..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryByExampleTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.types.Predicate;
-
-
-public class QueryByExampleTest {
-        
-    @QueryDelegate(ExampleEntity.class)
-    public static Predicate like(QExampleEntity qtype, ExampleEntity example) {
-        return example.name != null ? qtype.name.eq(example.name) : null; 
-    }
-    
-    @Test
-    public void Name_Not_Set() {
-        ExampleEntity entity = new ExampleEntity();
-        Predicate qbe = QExampleEntity.exampleEntity.like(entity);
-        assertNull(qbe);
-    }
-    
-    @Test
-    public void Name_Set() {
-        ExampleEntity entity = new ExampleEntity();
-        entity.name = "XXX";
-        Predicate qbe = QExampleEntity.exampleEntity.like(entity);
-        assertEquals("exampleEntity.name = XXX", qbe.toString());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable2Test.java
deleted file mode 100644
index 297dd9a182..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable2Test.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
-
-public class QueryEmbeddable2Test {
-
-    @QueryEntity
-    public static class User {
-    
-        Complex<String> complex;
-    }
-    
-    @QueryEmbeddable
-    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
-
-        T a;
-        
-        @Override
-        public int compareTo(Complex<T> arg0) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-        
-    }
-    
-    @Test
-    public void User_Complex_a() {
-        assertNotNull(QQueryEmbeddable2Test_User.user.complex.a);
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded6Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded6Test.java
deleted file mode 100644
index deee753cce..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded6Test.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.EntityPathBase;
-
-public class QueryEmbedded6Test {
-
-    @QueryEntity
-    public static class User {
-        
-        @QueryEmbedded
-        List<User> list;
-        
-    }
-    
-    @Test
-    public void EntityPathBase_is_SuperClass() {
-        assertEquals(EntityPathBase.class, QQueryEmbedded6Test_User.class.getSuperclass());    
-    }
-    
-    @Test
-    public void User_list_any() {
-        assertEquals(QQueryEmbedded6Test_User.class, QQueryEmbedded6Test_User.user.list.any().getClass());        
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java
deleted file mode 100644
index de19c6efc1..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded7Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collection;
-import java.util.Locale;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QueryEmbedded7Test {
-
-    @QueryEntity
-    static class Entity {
-        
-        @QueryEmbedded
-        Collection<String> users;
-
-        @QueryEmbedded
-        Set<Long> productRoles;
-        
-        // misuse, but shouldn't cause problems
-        @QueryEmbedded 
-        Locale locale;
-
-        // misuse, but shouldn't cause problems
-        @QueryEmbedded
-        String string;
-        
-    }
-
-    @Test
-    public void test() {
-        assertEquals(StringPath.class, QQueryEmbedded7Test_Entity.entity.users.any().getClass());
-        assertEquals(NumberPath.class, QQueryEmbedded7Test_Entity.entity.productRoles.any().getClass());
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExcludeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExcludeTest.java
deleted file mode 100644
index c085f9af9a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryExcludeTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryExclude;
-import com.mysema.query.types.path.EntityPathBase;
-
-public class QueryExcludeTest {
-    
-    @QueryExclude
-    @QueryEntity
-    public static class Entity {
-        
-    }
-    
-    @QueryEntity
-    public static class SubEntity extends Entity {
-        
-    }
-    
-    @Test
-    public void SubEntity() {
-        assertEquals(EntityPathBase.class, QQueryExcludeTest_SubEntity.class.getSuperclass());
-    }
-    
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeOverTransientTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeOverTransientTest.java
deleted file mode 100644
index 00dc7a7c64..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeOverTransientTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.annotations.QueryType;
-
-public class QueryTypeOverTransientTest {
-    
-    @QueryEntity
-    public static class Entity {
-        
-        @QueryType(PropertyType.ENTITY)
-        @QueryTransient
-        Entity reference;
-        
-    }
-    
-    @QueryEntity 
-    public static abstract class  Entity2 {
-        
-        @QueryType(PropertyType.ENTITY)
-        @QueryTransient
-        public abstract Entity getReference();
-        
-    }
-    
-    @Test
-    public void Entity_Reference_Is_Available() {
-        assertNotNull(QQueryTypeOverTransientTest_Entity.entity.reference);
-    }
-    
-    @Test
-    public void Entity2_Reference_Is_Available() {
-        assertNotNull(QQueryTypeOverTransientTest_Entity2.entity2.reference);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeTest.java
deleted file mode 100644
index 162f8e4bc6..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryTypeTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.TimePath;
-
-public class QueryTypeTest extends AbstractTest {
-
-    @QueryEntity
-    public static class QueryTypeEntity {
-        @QueryType(PropertyType.SIMPLE)
-        public String stringAsSimple;
-
-        @QueryType(PropertyType.COMPARABLE)
-        public String stringAsComparable;
-
-        @QueryType(PropertyType.DATE)
-        public String stringAsDate;
-
-        @QueryType(PropertyType.DATETIME)
-        public String stringAsDateTime;
-
-        @QueryType(PropertyType.TIME)
-        public String stringAsTime;
-
-        @QueryType(PropertyType.NONE)
-        public String stringNotInQuerydsl;
-
-    }
-
-    @Test
-    public void test() throws SecurityException, NoSuchFieldException{
-        cl = QQueryTypeTest_QueryTypeEntity.class;
-        match(SimplePath.class, "stringAsSimple");
-        match(ComparablePath.class, "stringAsComparable");
-        match(DatePath.class, "stringAsDate");
-        match(DateTimePath.class, "stringAsDateTime");
-        match(TimePath.class, "stringAsTime");
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfig2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfig2Test.java
deleted file mode 100644
index a90cf6c678..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfig2Test.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.Config;
-
-public class QuerydslConfig2Test {
-
-    @Config(entityAccessors=true)
-    @QueryEntity
-    public static class Entity extends Superclass {
-
-        Entity prop1;
-
-    }
-
-    @Config(createDefaultVariable=false)
-    @QueryEntity
-    public static class Entity2 extends Superclass2 {
-
-        Entity prop1;
-
-    }
-
-    @QueryEntity
-    public static class Superclass {
-
-        Entity prop2;
-    }
-
-    @Config(entityAccessors=true)
-    @QueryEntity
-    public static class Superclass2 {
-
-        Entity prop2;
-    }
-
-    @Test
-    public void test() {
-        assertNotNull(QQuerydslConfig2Test_Entity.entity);
-    }
-
-    @Test(expected=NoSuchFieldException.class)
-    public void Create_Default_Variable() throws SecurityException, NoSuchFieldException {
-        QQuerydslConfig2Test_Entity2.class.getField("entity2");
-    }
-}
-
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/RawTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/RawTest.java
deleted file mode 100644
index 18724f8ef4..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/RawTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.domain;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class RawTest {
-
-    @QuerySupertype
-    public static class SuperClass<T extends Comparable<T>> {
-        
-        public String property;
-        
-    }
-    
-    @SuppressWarnings("rawtypes")
-    @QueryEntity
-    public static class Entity extends SuperClass {
-        
-        public String property2;
-    }
-    
-    @Test
-    public void test() {
-        
-    }
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/RooEntitiesTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/RooEntitiesTest.java
deleted file mode 100644
index cafdf99011..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/RooEntitiesTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class RooEntitiesTest {
-
-    @Test
-    public void RooJpaEntity() {
-        assertNotNull(QRooEntities_MyEntity.myEntity);
-    }
-
-    @Test
-    public void RooJpaActiveRecord() {
-        assertNotNull(QRooEntities_MyEntity2.myEntity2);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SecurableEntity.java b/querydsl-apt/src/test/java/com/mysema/query/domain/SecurableEntity.java
deleted file mode 100644
index 143ecc4cf2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/SecurableEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.domain;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.TableGenerator;
-
-/**
- * This is an example of using system ACL function. Note, field id is must,
- * abstract function getId must also implemented.
- */
-@Entity
-public class SecurableEntity extends AbstractSecurable<Long, Long> {
-
-    private static final long serialVersionUID = 3197097608363811501L;
-
-    @Id
-    @TableGenerator(name = "SECUREENTITY_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "SECUREENTITY_SEQ")
-    private Long securableEntityId;
-
-    @Column(length = 50)
-    private String name;
-
-    // public Long getId() {
-    // return getSecurableEntityId();
-    // }
-
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java
deleted file mode 100644
index 54bee4f463..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/SignatureTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import java.io.Serializable;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.path.ComparablePath;
-
-public class SignatureTest {
-    
-    @QuerySupertype
-    public static abstract class APropertyChangeSupported implements Comparable<Object>, Cloneable, Serializable {
-        
-    }
-
-    @QuerySupertype
-    public static abstract class AValueObject extends APropertyChangeSupported implements Comparable<Object>, Cloneable, Serializable {
-        
-    }
-    
-    @Test
-    public void APropertyChangeSupported() {
-        assertEquals(ComparablePath.class, QSignatureTest_APropertyChangeSupported.class.getSuperclass());
-    }
-    
-    @Test
-    public void AValueObject() {
-        assertEquals(ComparablePath.class, QSignatureTest_AValueObject.class.getSuperclass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SimpleTypesTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/SimpleTypesTest.java
deleted file mode 100644
index e4faa94e3b..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/SimpleTypesTest.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Time;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.Config;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-public class SimpleTypesTest extends AbstractTest {
-
-    public enum MyEnum {
-        VAL1,
-        VAL2
-    }
-
-    public static class CustomLiteral {
-
-    }
-
-    @SuppressWarnings("serial")
-    public static class CustomNumber extends Number {
-
-        @Override
-        public double doubleValue() {
-            return 0;
-        }
-
-        @Override
-        public float floatValue() {
-            return 0;
-        }
-
-        @Override
-        public int intValue() {
-            return 0;
-        }
-
-        @Override
-        public long longValue() {
-            return 0;
-        }
-
-    }
-
-    public static class CustomComparableNumber extends CustomNumber implements Comparable<CustomComparableNumber> {
-
-        private static final long serialVersionUID = 4398583038967396133L;
-
-        @Override
-        public int compareTo(CustomComparableNumber o) {
-            return 0;
-        }
-
-        @Override
-        public int hashCode() {
-            return super.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof CustomComparableNumber;
-        }
-    }
-
-    public static class CustomComparableLiteral implements Comparable<CustomComparableLiteral> {
-
-        @Override
-        public int compareTo(CustomComparableLiteral o) {
-            return 0;
-        }
-
-        @Override
-        public int hashCode() {
-            return super.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof CustomComparableLiteral;
-        }
-    }
-
-    public static class CustomGenericComparableLiteral<C> implements Comparable<CustomComparableLiteral> {
-
-        @Override
-        public int compareTo(CustomComparableLiteral o) {
-            return 0;
-        }
-
-        @Override
-        public int hashCode() {
-            return super.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof CustomGenericComparableLiteral;
-        }
-    }
-
-    @QueryEntity
-    @Config(listAccessors=true)
-    public static class SimpleTypes {
-        transient int test;
-        List<Integer> testList;
-
-        Calendar calendar;
-        List<Calendar> calendarList;
-
-        long id;
-        List<Long> idList;
-
-        BigDecimal bigDecimal;
-        List<BigDecimal> bigDecimalList;
-
-        Byte bbyte;
-        List<Byte> bbyteList;
-        byte bbyte2;
-
-        Short sshort;
-        List<Short> sshortList;
-        short sshort2;
-
-        Character cchar;
-        List<Character> ccharList;
-        char cchar2;
-
-        Double ddouble;
-        List<Double> ddoubleList;
-        double ddouble2;
-
-        Float ffloat;
-        List<Float> ffloatList;
-        float ffloat2;
-
-        Integer iint;
-        List<Integer> iintList;
-        int iint2;
-
-        Locale llocale;
-        List<Locale> llocaleList;
-
-        Long llong;
-        List<Long> llongList;
-        long llong2;
-
-        BigInteger bigInteger;
-
-        String sstring;
-        List<String> sstringList;
-
-        Date date;
-        List<Date> dateList;
-
-        java.sql.Time time;
-        List<java.sql.Time> timeList;
-
-        java.sql.Timestamp timestamp;
-        List<java.sql.Timestamp> timestampList;
-
-        Serializable serializable;
-        List<Serializable> serializableList;
-
-        Object object;
-        List<Object> objectList;
-
-        Class<?> clazz;
-        List<Class> classList2;
-        List<Class<?>> classList3;
-        List<Class<Package>> classList4;
-        List<Class<? extends Date>> classList5;
-
-        Package packageAsLiteral;
-        List<Package> packageAsLiteralList;
-
-        CustomLiteral customLiteral;
-        List<CustomLiteral> customLiteralList;
-
-        CustomComparableLiteral customComparableLiteral;
-        List<CustomComparableLiteral> customComparableLiteralList;
-
-        CustomNumber customNumber;
-        List<CustomNumber> customNumberList;
-
-        CustomComparableNumber customComparableNumber;
-        List<CustomComparableNumber> customComparableNumber2;
-
-        CustomGenericComparableLiteral customComparableLiteral2;
-        List<CustomGenericComparableLiteral> customComparableLiteral2List;
-
-        CustomGenericComparableLiteral<Number> customComparableLiteral3;
-        List<CustomGenericComparableLiteral<Number>> customComparableLiteral3List;
-
-        java.sql.Clob clob;
-        List<java.sql.Clob> clobList;
-
-        java.sql.Blob blob;
-        List<java.sql.Blob> blobList;
-
-        @QueryTransient
-        String skipMe;
-
-        MyEnum myEnum;
-
-        int[] intArray;
-        byte[] byteArray;
-        long[] longArray;
-        float[] floatArray;
-        double[] doubleArray;
-        short[] shortArray;
-
-        @QueryType(PropertyType.SIMPLE)
-        byte[] byteArrayAsSimple;
-    }
-
-    @Test
-    public void List_Access() {
-        // date / time
-        QSimpleTypesTest_SimpleTypes.simpleTypes.dateList.get(0).after(new Date());
-        QSimpleTypesTest_SimpleTypes.simpleTypes.timeList.get(0).after(new Time(0l));
-        QSimpleTypesTest_SimpleTypes.simpleTypes.calendarList.get(0).before(Calendar.getInstance());
-
-        // numeric
-        QSimpleTypesTest_SimpleTypes.simpleTypes.bbyteList.get(0).abs();
-
-        // string
-        QSimpleTypesTest_SimpleTypes.simpleTypes.sstringList.get(0).toLowerCase();
-
-        // boolean
-//        QSimpleTypes.simpleTypes.b
-
-    }
-
-    @Test
-    public void Simple_Types() throws SecurityException, NoSuchFieldException {
-        cl = QSimpleTypesTest_SimpleTypes.class;
-        match(NumberPath.class, "id");
-        match(NumberPath.class, "bigDecimal");
-        match(NumberPath.class, "bigInteger");
-//        match(PNumber.class, "bbyte");
-        match(NumberPath.class, "bbyte2");
-        match(NumberPath.class, "ddouble");
-        match(NumberPath.class, "ddouble2");
-        match(NumberPath.class, "ffloat");
-        match(NumberPath.class, "ffloat2");
-//        match(PNumber.class, "iint");
-        match(NumberPath.class, "iint2");
-        match(NumberPath.class, "llong");
-        match(NumberPath.class, "llong2");
-
-        match(ComparablePath.class, "cchar");
-        match(ComparablePath.class, "cchar2");
-
-        match(StringPath.class, "sstring");
-
-        match(DateTimePath.class, "date");
-        match(DateTimePath.class, "calendar");
-//        match(PDateTime.class, "timestamp");
-
-        match(TimePath.class, "time");
-
-        match(SimplePath.class, "llocale");
-        match(SimplePath.class, "serializable");
-        match(SimplePath.class, "object");
-        match(SimplePath.class, "clazz");
-        match(SimplePath.class, "packageAsLiteral");
-
-        match(SimplePath.class, "clob");
-        match(SimplePath.class, "blob");
-
-        match(EnumPath.class, "myEnum");
-    }
-
-    @Test
-    public void Custom_Literal() throws SecurityException, NoSuchFieldException {
-        cl = QSimpleTypesTest_SimpleTypes.class;
-        match(SimplePath.class, "customLiteral");
-    }
-
-    @Test
-    public void Custom_ComparableLiteral() throws SecurityException, NoSuchFieldException {
-        cl = QSimpleTypesTest_SimpleTypes.class;
-        match(ComparablePath.class, "customComparableLiteral");
-    }
-
-    @Test
-    public void Custom_Number() throws SecurityException, NoSuchFieldException {
-        cl = QSimpleTypesTest_SimpleTypes.class;
-        match(SimplePath.class, "customNumber");
-    }
-
-    @Test
-    public void Custom_ComparableNumber() throws SecurityException, NoSuchFieldException {
-        cl = QSimpleTypesTest_SimpleTypes.class;
-        match(NumberPath.class, "customComparableNumber");
-    }
-
-    @Test(expected=NoSuchFieldException.class)
-    public void Skipped_Field1() throws SecurityException, NoSuchFieldException {
-        QSimpleTypesTest_SimpleTypes.class.getField("skipMe");
-    }
-
-    @Test(expected=NoSuchFieldException.class)
-    public void Skipped_Field2() throws SecurityException, NoSuchFieldException {
-        QSimpleTypesTest_SimpleTypes.class.getField("test");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SubCat.java b/querydsl-apt/src/test/java/com/mysema/query/domain/SubCat.java
deleted file mode 100644
index 31dadb8a15..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/SubCat.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain;
-
-public class SubCat {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Subclass.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Subclass.java
deleted file mode 100644
index a779d0b6d2..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Subclass.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Subclass extends com.mysema.query.domain.Superclass {
-    
-    private int number;
-
-    public int getNumber() {
-        return number;
-    }
-
-    public void setNumber(int number) {
-        this.number = number;
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Temporal2Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Temporal2Test.java
deleted file mode 100644
index 489d5d0275..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Temporal2Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.NumberPath;
-
-public class Temporal2Test {
-
-    @Entity
-    public static class Cheque {
-        @Temporal(TemporalType.DATE)
-        private Date dataVencimento;
-
-        @Column(precision=15, scale=2)
-        private BigDecimal valor;
-
-        @QueryProjection
-        public Cheque(Date param0, BigDecimal param1) {
-            this.dataVencimento = param0;
-            this.valor = param1;
-        }
-
-    }
-
-    @Test
-    public void test() {
-        DatePath<Date> datePath = new DatePath<Date>(Date.class, "date");
-        NumberPath<BigDecimal> numberPath = new NumberPath<BigDecimal>(BigDecimal.class, "num");
-        new QTemporal2Test_Cheque(datePath, numberPath);
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/TemporalTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/TemporalTest.java
deleted file mode 100644
index d9190c7b73..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/TemporalTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mysema.query.domain;
-
-import static org.junit.Assert.*;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.TimePath;
-
-public class TemporalTest {
-        
-    @Entity
-    public static class MyEntity {
-        
-        @Temporal(value=TemporalType.DATE)
-        private Date date;
-        
-        @Temporal(value=TemporalType.TIME)
-        private Date time;        
-    }
-    
-    @Test
-    public void test() {
-        assertEquals(DatePath.class, QTemporalTest_MyEntity.myEntity.date.getClass());
-        assertEquals(TimePath.class, QTemporalTest_MyEntity.myEntity.time.getClass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType.java b/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType.java
deleted file mode 100644
index a454a1b3a3..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain.custom;
-
-public class EmbeddedType {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/Entity.java b/querydsl-apt/src/test/java/com/mysema/query/domain/custom/Entity.java
deleted file mode 100644
index b29b4d4020..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/Entity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain.custom;
-
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Entity {
-
-    List<EmbeddedType> list;
-    
-    EmbeddedType2 embedded;
-    
-    Map<String, EmbeddedType3> map;
-    
-    String stringProperty;
-    
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p1/SEntity1.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p1/SEntity1.java
deleted file mode 100644
index b2595329d6..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p1/SEntity1.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain.p1;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class SEntity1 {
-
-    String entity1Field;
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/Persistable.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p10/Persistable.java
deleted file mode 100644
index ddf50c046a..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/Persistable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain.p10;
-
-public interface Persistable<T> {
-
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/UpdateInfo.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p10/UpdateInfo.java
deleted file mode 100644
index 6dd02e6089..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/UpdateInfo.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain.p10;
-
-public interface UpdateInfo {
-
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/TypeTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p6/TypeTest.java
deleted file mode 100644
index 622b18fecf..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/TypeTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain.p6;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class TypeTest {
-
-    @Test
-    public void test() {
-        QType1 type1 = QType1.type1;
-        QType2 type2 = QType2.type2;
-        assertEquals(type2.getType(), type1.property.getType());
-        assertEquals(type2.getClass(), type1.property.getClass());
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/package-info.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p6/package-info.java
deleted file mode 100644
index 86ebd83346..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-@QueryEntities({Type1.class, Type2.class})
-package com.mysema.query.domain.p6;
-
-
-import com.mysema.query.annotations.*;
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p7/MyEntity.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p7/MyEntity.java
deleted file mode 100644
index a7953bc120..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p7/MyEntity.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain.p7;
-
-import javax.persistence.Entity;
-
-@Entity
-public class MyEntity {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Custom.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Custom.java
deleted file mode 100644
index 821c7a8bef..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Custom.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain.p8;
-
-public class Custom {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Entity.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Entity.java
deleted file mode 100644
index 662939f914..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p8/Entity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.domain.p8;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Entity {
-
-    private Long id;
-
-    private Custom custom;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Custom getCustom() {
-        return custom;
-    }
-
-    public void setCustom(Custom custom) {
-        this.custom = custom;
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Article.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Article.java
deleted file mode 100644
index d8b9384e9c..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Article.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.domain.p9;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Article {
-
-    String name;
-
-    Content content;
-
-    Person author;
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Content.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Content.java
deleted file mode 100644
index ed9a566a02..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Content.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mysema.query.domain.p9;
-
-import javax.persistence.Embeddable;
-
-@Embeddable
-public class Content {
-
-    Article article;
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Person.java b/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Person.java
deleted file mode 100644
index 1c05c44e24..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p9/Person.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query.domain.p9;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Person {
-
-    String firstName, lastName;
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java b/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java
deleted file mode 100644
index 06be2c671d..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@QueryEntities({A.class, Tenant.class, DefaultRevisionEntity.class, Delegate3Test.Point.class, Delegate3Test.Polygon.class})
-package com.mysema.query.domain;
-
-import org.hibernate.envers.DefaultRevisionEntity;
-
-import com.mysema.query.annotations.QueryEntities;
-
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType.java b/querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType.java
deleted file mode 100644
index 9bca2db8de..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain.rel;
-
-public class SimpleType {
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain2/BImpl.java b/querydsl-apt/src/test/java/com/mysema/query/domain2/BImpl.java
deleted file mode 100644
index b68b2af8f9..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/domain2/BImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain2;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class BImpl extends AImpl {
-
-}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java
deleted file mode 100644
index 10b32348f5..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance2Test.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.inheritance;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@Ignore
-public class Inheritance2Test {
-
-    @QueryEntity
-    public abstract class Base<T extends Base<T>> {
-        @SuppressWarnings("unchecked")
-        Base2 base;
-        Base2<?,?> base2;
-    }
-
-    @QueryEntity
-    public abstract class Base2<T extends Base2<T,U>,U extends IFace> {
-
-    }
-
-    @QueryEntity
-    public abstract class BaseSub extends Base<BaseSub> {
-
-    }
-
-    @QueryEntity
-    public abstract class BaseSub2<T extends BaseSub2<T>> extends Base<T> {
-
-    }
-
-    @QueryEntity
-    public abstract class Base2Sub<T extends IFace> extends Base2<Base2Sub<T>,T> {
-
-    }
-
-    public interface IFace {
-
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java
deleted file mode 100644
index aa8c35fd1d..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance3Test.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.inheritance;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.AbstractTest;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-
-public class Inheritance3Test extends AbstractTest {
-
-    /*
-     * TODO : map type variables to BeanModels
-     */
-
-    @QueryEntity
-    public class GenericSupertype<A>{
-        A field;
-        Collection<A> fieldCol;
-        Set<A> fieldSet;
-        List<A> fieldList;
-        Map<String,A> fieldMap1;
-        Map<A,String> fieldMap2;
-
-        String stringField;
-    }
-
-    @QueryEntity
-    public class GenericSupertypeC<D extends Comparable<D>> extends GenericSupertype<D>{
-
-    }
-
-    @QueryEntity
-    public class GenericSupertypeS extends GenericSupertypeC<String>{
-
-    }
-    
-    @QueryEntity
-    public class GenericSupertypeS2 extends GenericSupertype<String>{
-
-    }
-
-    @Test
-    public void GenericSupertype() throws SecurityException, NoSuchFieldException {
-        cl = QInheritance3Test_GenericSupertype.class;
-        match(SimplePath.class, "field");    
-    }
-    
-    @Test
-    public void GenericSupertypeC() throws SecurityException, NoSuchFieldException {
-        cl = QInheritance3Test_GenericSupertypeC.class;
-        match(SimplePath.class, "field");    
-    }
-    
-    @Test
-    public void GenericSupertypeS() throws SecurityException, NoSuchFieldException {
-        cl = QInheritance3Test_GenericSupertypeS.class;
-        match(StringPath.class, "field");
-    }
-    
-    @Test
-    public void GenericSupertypeS2() throws SecurityException, NoSuchFieldException {
-        cl = QInheritance3Test_GenericSupertypeS2.class;
-        match(StringPath.class, "field");
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java
deleted file mode 100644
index f16cdc65c6..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance4Test.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.inheritance;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.AbstractTest;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-
-public class Inheritance4Test extends AbstractTest {
-
-    @QueryEntity
-    public class EntityWithComparable {
-        private Comparable<?> field;
-
-        public Comparable<?> getField() {
-            return field;
-        }
-
-    }
-
-    @QueryEntity
-    public class EntityWithNumber extends EntityWithComparable {
-        private Long field;
-
-        public Long getField() {
-            return field;
-        }
-
-    }
-
-    @QueryEntity
-    public class EntityWithString extends EntityWithComparable{
-        private String field;
-
-        public String getField() {
-            return field;
-        }
-
-    }
-
-    @Test
-    public void test() throws SecurityException, NoSuchFieldException{
-        cl = QInheritance4Test_EntityWithComparable.class;
-        match(SimplePath.class, "field");
-
-        cl = QInheritance4Test_EntityWithNumber.class;
-        match(NumberPath.class, "field");
-
-        cl = QInheritance4Test_EntityWithString.class;
-        match(StringPath.class, "field");
-
-    }
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java b/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java
deleted file mode 100644
index 02bd9a5d65..0000000000
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance8Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.inheritance;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.CommonIdentifiable;
-import com.mysema.query.domain.CommonPersistence;
-import com.mysema.query.types.path.NumberPath;
-
-public class Inheritance8Test {
-
-    @QueryEntity
-    public static class SimpleSubclass extends CommonPersistence {
-    }
-
-    @QueryEntity
-    public static class GenericSubclass extends CommonIdentifiable<Long> {
-    }
-
-    @Test
-    public void Simple_subclass_should_contain_fields_from_external_superclass() {
-        assertEquals(NumberPath.class, QInheritance8Test_SimpleSubclass.simpleSubclass.version.getClass());
-    }
-
-    @Test
-    public void Generic_subclass_should_contain_fields_from_external_superclass() {
-        assertEquals(NumberPath.class, QInheritance8Test_GenericSubclass.genericSubclass.version.getClass());
-    }
-
-}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java
index 748cc5a89f..f2013c28bf 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
-import javax.annotation.processing.AbstractProcessor;
-import javax.tools.JavaCompiler;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -23,9 +21,13 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.mysema.codegen.SimpleCompiler;
-import com.mysema.util.FileUtils;
-import junit.framework.Assert;
+import javax.annotation.processing.AbstractProcessor;
+import javax.tools.JavaCompiler;
+
+import org.junit.Assert;
+
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.core.util.FileUtils;
 
 public abstract class AbstractProcessorTest {
 
@@ -50,8 +52,8 @@ protected void process(Class<? extends AbstractProcessor> processorClass, List<S
             Assert.fail("Creation of " + out.getPath() + " failed");
         }
         compile(processorClass, classes, target);
-    } 
-    
+    }
+
     protected void compile(Class<? extends AbstractProcessor> processorClass, List<String> classes, String target) throws IOException {
         List<String> options = new ArrayList<String>(classes.size() + 3);
         options.add("-s");
@@ -63,18 +65,26 @@ protected void compile(Class<? extends AbstractProcessor> processorClass, List<S
         options.add("src/test/java");
         options.addAll(getAPTOptions());
         options.addAll(classes);
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-        int compilationResult = compiler.run(null, out, err, options.toArray(new String[options.size()]));
+
+        ByteArrayOutputStream out = getStdOut();
+        ByteArrayOutputStream err = getStdErr();
+        int compilationResult = compiler.run(null, out, err, options.toArray(new String[0]));
 
 //        Processor.elementCache.clear();
         if (compilationResult != 0) {
             System.err.println(compiler.getClass().getName());
-            Assert.fail("Compilation Failed");
+            Assert.fail("Compilation Failed:\n " + new String(err.toByteArray(), "UTF-8"));
         }
     }
-    
+
+    protected ByteArrayOutputStream getStdOut() {
+        return new ByteArrayOutputStream();
+    }
+
+    protected ByteArrayOutputStream getStdErr() {
+        return new ByteArrayOutputStream();
+    }
+
     protected Collection<String> getAPTOptions() {
         return Collections.emptyList();
     }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java
new file mode 100644
index 0000000000..2ffa88b031
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class BooleanExtensionsTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/apt/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> sources = Arrays.asList(
+                new File(packagePath, "BooleanExtensions.java").getPath(),
+                new File(packagePath, "ExampleEntity.java").getPath());
+        process(QuerydslAnnotationProcessor.class, sources,"booleanExtensions");
+
+        String qtypeContent = new String(Files.readAllBytes(Paths.get("target", "booleanExtensions", "com", "querydsl", "QExampleEntity.java")), StandardCharsets.UTF_8);
+        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp"));
+        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp2"));
+    }
+
+    @Test
+    public void process2() throws IOException {
+        List<String> sources = Arrays.asList(
+                new File(packagePath, "BooleanExtensions2.java").getPath(),
+                new File(packagePath, "ExampleEntity.java").getPath());
+        process(QuerydslAnnotationProcessor.class, sources,"booleanExtensions2");
+        String qtypeContent = new String(Files.readAllBytes(Paths.get("target", "booleanExtensions2", "com", "querydsl", "QExampleEntity.java")), StandardCharsets.UTF_8);
+        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp"));
+        assertTrue(qtypeContent.contains("ext.java.lang.QBoolean booleanProp2"));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensions.java b/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensions.java
new file mode 100644
index 0000000000..bc296923bb
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensions.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import java.sql.Date;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Expressions;
+
+public final class DateExtensions {
+
+    private DateExtensions() { }
+
+    @QueryDelegate(Date.class)
+    public static Predicate extension(DateExpression<Date> date) {
+        return Expressions.booleanPath("b");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensionsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensionsTest.java
new file mode 100644
index 0000000000..e354eaacfe
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/DateExtensionsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore
+public class DateExtensionsTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/";
+
+    @Test
+    public void handles_date_extensions_correctly() throws IOException, InterruptedException {
+        File source = new File(packagePath,  "EntityWithExtensions.java");
+        File source2 = new File(packagePath, "DateExtensions.java");
+        List<String> sources = Arrays.asList(source.getPath(), source2.getPath());
+        File qType = new File("target/overwrite3/com/querydsl/apt/QEntityWithExtensions.java");
+
+        // QEntityWithExtensions is generated
+        process(QuerydslAnnotationProcessor.class, sources, "overwrite3");
+        assertTrue(qType.exists());
+        long modified = qType.lastModified();
+        Thread.sleep(1000);
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("QDate"));
+
+        // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
+        assertEquals(modified, qType.lastModified());
+
+        // EntityWithExtensions is updated, QEntityWithExtensions is overwritten
+        Files.createFile(source.toPath());
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
+        assertTrue("" + modified + " >= " + qType.lastModified(), modified < qType.lastModified());
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("QDate"));
+
+        // QEntityWithExtensions is deleted and regenerated
+        assertTrue(qType.delete());
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite3");
+        assertTrue(qType.exists());
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("QDate"));
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-AdefaultOverwrite=true");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java
similarity index 83%
rename from querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java
index 85839086ac..46ae72b1c9 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,32 +11,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.tools.JavaCompiler;
 
-import junit.framework.Assert;
-
 import org.eclipse.jdt.internal.compiler.tool.EclipseCompiler;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.codegen.SimpleCompiler;
-import com.mysema.util.FileUtils;
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.core.util.FileUtils;
 
 public class EclipseCompilationTest {
 
-    private static final String packagePath = "src/test/apt/com/mysema/query/eclipse/";
+    private static final String packagePath = "src/test/apt/com/querydsl/eclipse/";
 
     @Test
     @Ignore
@@ -73,16 +72,16 @@ public void test() throws IOException {
         options.add("-verbose");
         options.addAll(classes);
 
-        int compilationResult = compiler.run(null, System.out, System.err, options.toArray(new String[options.size()]));
+        int compilationResult = compiler.run(null, System.out, System.err, options.toArray(new String[0]));
         if (compilationResult == 0) {
             System.out.println("Compilation is successful");
         } else {
             Assert.fail("Compilation Failed");
         }
 
-        File resultFile = new File("target/out-eclipse/com/mysema/query/eclipse/QSimpleEntity.java");
+        File resultFile = new File("target/out-eclipse/com/querydsl/eclipse/QSimpleEntity.java");
         assertTrue(resultFile.exists());
-        String result = Files.toString(resultFile, Charsets.UTF_8);
+        String result = new String(Files.readAllBytes(resultFile.toPath()), StandardCharsets.UTF_8);
         assertTrue(result.contains("NumberPath<java.math.BigDecimal> bigDecimalProp"));
         assertTrue(result.contains("NumberPath<Integer> integerProp"));
         assertTrue(result.contains("NumberPath<Integer> intProp"));
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/EmbeddableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/EmbeddableTest.java
new file mode 100644
index 0000000000..d76d1bc6f3
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/EmbeddableTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class EmbeddableTest extends AbstractProcessorTest {
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = Collections.singletonList("src/test/java/com/querydsl/apt/domain/Embeddable2Test.java");
+        process(QuerydslAnnotationProcessor.class, classes,"embeddable");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensions.java b/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensions.java
new file mode 100644
index 0000000000..0a7222de62
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensions.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+
+public final class EntityExtensions {
+
+    private EntityExtensions() { }
+
+    @QueryDelegate(EntityWithExtensions.class)
+    public static Predicate extension(QEntityWithExtensions entity) {
+        return Expressions.booleanPath("b");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensionsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensionsTest.java
new file mode 100644
index 0000000000..100e37eeb7
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/EntityExtensionsTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore
+public class EntityExtensionsTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/";
+
+    @Test
+    public void handles_entity_extensions_correctly() throws IOException, InterruptedException {
+        File source = new File(packagePath,  "EntityWithExtensions.java");
+        File source2 = new File(packagePath, "EntityExtensions.java");
+        List<String> sources = Arrays.asList(source.getPath(), source2.getPath());
+        File qType = new File("target/overwrite2/com/querydsl/apt/QEntityWithExtensions.java");
+
+        // QEntityWithExtensions is generated
+        process(QuerydslAnnotationProcessor.class, sources, "overwrite2");
+        assertTrue(qType.exists());
+        long modified = qType.lastModified();
+        Thread.sleep(1000);
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("extension()"));
+
+        // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
+        assertEquals(modified, qType.lastModified());
+
+        // EntityWithExtensions is updated, QEntityWithExtensions is overwritten
+        Files.createFile(source.toPath());
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
+        assertTrue("" + modified + " >= " + qType.lastModified(), modified < qType.lastModified());
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("extension()"));
+
+        // QEntityWithExtensions is deleted and regenerated
+        assertTrue(qType.delete());
+        compile(QuerydslAnnotationProcessor.class, sources, "overwrite2");
+        assertTrue(qType.exists());
+        assertTrue(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8).contains("extension()"));
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-AdefaultOverwrite=true");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityWithExtensions.java b/querydsl-apt/src/test/java/com/querydsl/apt/EntityWithExtensions.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/apt/EntityWithExtensions.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/EntityWithExtensions.java
index 2e7a72d5de..eea62a8dcd 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityWithExtensions.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/EntityWithExtensions.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
 import java.sql.Date;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class EntityWithExtensions {
 
     String id;
-    
+
     Date date;
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedClassesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedClassesTest.java
new file mode 100644
index 0000000000..25f6f79db9
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedClassesTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ExcludedClassesTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes, "excludedClasses");
+
+        assertFalse(new File("target/excludedClasses/com/querydsl/apt/domain/QArrayTest_ArrayTestEntity.java").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.excludedClasses=com.querydsl.apt.domain.ArrayTest.ArrayTestEntity");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java
new file mode 100644
index 0000000000..7fdc5e4268
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ExcludedPackagesTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes, "excludedPackages");
+
+        assertFalse(new File("target/excludedPackages/com/querydsl/apt/domain/p1").exists());
+        assertTrue(new File("target/excludedPackages/com/querydsl/apt/domain/p2").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.excludedPackages=com.querydsl.apt.domain.p1");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/GenericExporterTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/GenericExporterTest.java
new file mode 100644
index 0000000000..bb319e0f60
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/GenericExporterTest.java
@@ -0,0 +1,162 @@
+package com.querydsl.apt;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.apt.domain.AbstractEntityTest;
+import com.querydsl.apt.domain.CustomCollection;
+import com.querydsl.apt.domain.Generic2Test;
+import com.querydsl.apt.hibernate.HibernateAnnotationProcessor;
+import com.querydsl.codegen.GenericExporter;
+import com.querydsl.codegen.Keywords;
+import com.querydsl.codegen.PropertyHandling;
+import com.querydsl.core.domain.A;
+
+public class GenericExporterTest extends AbstractProcessorTest {
+
+    private static final String PACKAGE_PATH = "src/test/java/com/querydsl/apt/domain/";
+
+    private static final List<String> CLASSES = getFiles(PACKAGE_PATH);
+
+    @Test
+    public void execute() throws IOException {
+        // via APT
+        process(QuerydslAnnotationProcessor.class, CLASSES, "QuerydslAnnotationProcessor");
+
+        // via GenericExporter
+        GenericExporter exporter = new GenericExporter();
+        exporter.setTargetFolder(new File("target/GenericExporterTest"));
+        exporter.export(AbstractEntityTest.class.getPackage(), A.class.getPackage());
+
+        List<String> expected = new ArrayList<String>();
+        // delegates are not supported
+        expected.add("QDelegateTest_SimpleUser.java");
+        expected.add("QDelegateTest_SimpleUser2.java");
+        expected.add("QDelegateTest_User.java");
+        expected.add("QDelegate2Test_Entity.java");
+        expected.add("QExampleEntity.java");
+        expected.add("QQueryProjectionTest_DTOWithProjection.java");
+        expected.add("QQueryProjectionTest_EntityWithProjection.java");
+        expected.add("QEmbeddable3Test_EmbeddableClass.java");
+        expected.add("QQueryEmbedded4Test_User.java");
+
+        execute(expected, "GenericExporterTest", "QuerydslAnnotationProcessor");
+    }
+
+    @Test
+    public void execute2() throws IOException {
+        // via APT
+        process(HibernateAnnotationProcessor.class, CLASSES, "HibernateAnnotationProcessor");
+
+        // via GenericExporter
+        GenericExporter exporter = new GenericExporter();
+        exporter.setKeywords(Keywords.JPA);
+        exporter.setEntityAnnotation(Entity.class);
+        exporter.setEmbeddableAnnotation(Embeddable.class);
+        exporter.setEmbeddedAnnotation(Embedded.class);
+        exporter.setSupertypeAnnotation(MappedSuperclass.class);
+        exporter.setSkipAnnotation(Transient.class);
+        exporter.setTargetFolder(new File("target/GenericExporterTest2"));
+        exporter.setStrictMode(true);
+        exporter.setPropertyHandling(PropertyHandling.JPA);
+        exporter.export(AbstractEntityTest.class.getPackage(), A.class.getPackage());
+
+        List<String> expected = new ArrayList<String>();
+        // GenericExporter doesn't include field/method selection
+        expected.add("QTemporalTest_MyEntity.java");
+        expected.add("QTemporal2Test_Cheque.java");
+        expected.add("QQueryProjectionTest_DTOWithProjection.java");
+        expected.add("QQueryProjectionTest_EntityWithProjection.java");
+        expected.add("QEmbeddable3Test_EmbeddableClass.java");
+        expected.add("QGeneric4Test_HidaBez.java");
+        expected.add("QGeneric4Test_HidaBezGruppe.java");
+        expected.add("QInterfaceType2Test_UserImpl.java");
+        expected.add("QOrderTest_Order.java");
+        expected.add("QManagedEmailTest_ManagedEmails.java");
+        expected.add("QGeneric12Test_ChannelRole.java");
+        expected.add("QManyToManyTest_Person.java");
+        expected.add("QOneToOneTest_Person.java");
+        expected.add("QGeneric16Test_HidaBez.java");
+        expected.add("QGeneric16Test_HidaBezGruppe.java");
+
+        execute(expected, "GenericExporterTest2", "HibernateAnnotationProcessor");
+    }
+
+    @Test
+    public void execute3() {
+        GenericExporter exporter = new GenericExporter();
+        exporter.setKeywords(Keywords.JPA);
+        exporter.setEntityAnnotation(Entity.class);
+        exporter.setEmbeddableAnnotation(Embeddable.class);
+        exporter.setEmbeddedAnnotation(Embedded.class);
+        exporter.setSupertypeAnnotation(MappedSuperclass.class);
+        exporter.setSkipAnnotation(Transient.class);
+        exporter.setTargetFolder(new File("target/GenericExporterTest3"));
+        exporter.setPropertyHandling(PropertyHandling.JPA);
+        exporter.export(CustomCollection.MyCustomCollection.class,
+                        CustomCollection.MyCustomCollection2.class,
+                        CustomCollection.MyEntity.class);
+    }
+
+    @Test
+    public void execute4() throws IOException {
+        GenericExporter exporter = new GenericExporter();
+        exporter.setKeywords(Keywords.JPA);
+        exporter.setEntityAnnotation(Entity.class);
+        exporter.setEmbeddableAnnotation(Embeddable.class);
+        exporter.setEmbeddedAnnotation(Embedded.class);
+        exporter.setSupertypeAnnotation(MappedSuperclass.class);
+        exporter.setSkipAnnotation(Transient.class);
+        exporter.setTargetFolder(new File("target/GenericExporterTest4"));
+        exporter.setPropertyHandling(PropertyHandling.JPA);
+        exporter.export(Generic2Test.class.getClasses());
+    }
+
+    private void execute(List<String> expected, String genericExporterFolder, String aptFolder) throws IOException {
+        List<String> failures = new ArrayList<String>();
+        int successes = 0;
+        for (File file : new File("target/" + genericExporterFolder + "/com/querydsl/apt/domain").listFiles()) {
+            File other = new File("target/" + aptFolder + "/com/querydsl/apt/domain", file.getName());
+            if (!other.exists() || !other.isFile()) {
+                continue;
+            }
+            String result1 = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+            String result2 = new String(Files.readAllBytes(other.toPath()), StandardCharsets.UTF_8);
+            if (!result1.equals(result2)) {
+                if (!expected.contains(file.getName())) {
+                    System.err.println(file.getName());
+                    failures.add(file.getName());
+                } else {
+                    expected.remove(file.getName());
+                }
+            } else {
+                successes++;
+            }
+        }
+        expected.remove("QGeneric16Test_HidaBez.java"); // unstable
+        expected.remove("QGeneric4Test_HidaBez.java"); // unstable
+        expected.remove("QGeneric16Test_HidaBezGruppe.java"); // unstable
+        expected.remove("QGeneric4Test_HidaBezGruppe.java"); // unstable
+        if (!expected.isEmpty()) {
+            fail("Following expected failures succeeded: " + expected);
+        }
+
+        if (!failures.isEmpty()) {
+            for (String failure : failures) {
+                System.err.println(failure);
+            }
+            fail("Failed with " + failures.size() + " failures, " + successes + " succeeded, " + failures);
+        }
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/GenericTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/GenericTest.java
new file mode 100644
index 0000000000..e9f93dc70f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/GenericTest.java
@@ -0,0 +1,25 @@
+package com.querydsl.apt;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.apt.jpa.JPAAnnotationProcessor;
+
+public class GenericTest extends AbstractProcessorTest {
+
+    @Test
+    public void test() throws IOException {
+        List<String> classes = Collections.singletonList("src/test/java/com/querydsl/apt/domain/Generic7Test.java");
+        process(QuerydslAnnotationProcessor.class, classes,"GenericTest");
+    }
+
+    @Test
+    public void test2() throws IOException {
+        List<String> classes = Collections.singletonList("src/test/java/com/querydsl/apt/domain/Generic9Test.java");
+        process(JPAAnnotationProcessor.class, classes,"GenericTest2");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/IncludedClassesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/IncludedClassesTest.java
new file mode 100644
index 0000000000..86551d1497
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/IncludedClassesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class IncludedClassesTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes, "includedClasses");
+
+        assertTrue(new File("target/includedClasses/com/querydsl/apt/domain/QArrayTest_ArrayTestEntity.java").exists());
+        assertFalse(new File("target/includedClasses/com/querydsl/apt/domain/QArray2Test_Example.java").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.includedClasses=com.querydsl.apt.domain.ArrayTest.ArrayTestEntity");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/IncludedPackagesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/IncludedPackagesTest.java
new file mode 100644
index 0000000000..ee9abf6d61
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/IncludedPackagesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class IncludedPackagesTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes, "includedPackages");
+
+        assertFalse(new File("target/includedPackages/com/querydsl/apt/domain/p1").exists());
+        assertTrue(new File("target/includedPackages/com/querydsl/apt/domain/p2").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.includedPackages=com.querydsl.apt.domain.p2");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java
index 8220935b3e..f1a1d60743 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,50 +11,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Collections;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.google.common.io.Files;
-
 @Ignore
-public class IncrementalCompilationTest extends AbstractProcessorTest{
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/domain/";
+public class IncrementalCompilationTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/domain/";
 
     @Test
-    public void Does_Not_Overwrite_Unchanged_Files() throws IOException, InterruptedException {
+    public void does_not_overwrite_unchanged_files() throws IOException, InterruptedException {
         File source = new File(packagePath, "ExampleEntity.java");
         String path = source.getPath();
-        File qType = new File("target/overwrite/com/mysema/query/domain/QExampleEntity.java");
-        
+        File qType = new File("target/overwrite/com/querydsl/apt/domain/QExampleEntity.java");
+
         // QTestEntity is generated
         process(QuerydslAnnotationProcessor.class, Collections.singletonList(path), "overwrite");
         assertTrue(qType.exists());
         long modified = qType.lastModified();
         Thread.sleep(1000);
-        
+
         // TestEntity has not changed, QTestEntity is not overwritten
         compile(QuerydslAnnotationProcessor.class, Collections.singletonList(path), "overwrite");
         assertEquals(modified, qType.lastModified());
 
         // TestEntity is updated, QTestEntity is overwritten
-        Files.touch(source);
+        Files.createFile(source.toPath());
         compile(QuerydslAnnotationProcessor.class, Collections.singletonList(path), "overwrite");
         assertTrue("" + modified + " >= " + qType.lastModified(), modified < qType.lastModified());
-        
-        // QTestEntity is deleted and regenerated 
+
+        // QTestEntity is deleted and regenerated
         assertTrue(qType.delete());
         compile(QuerydslAnnotationProcessor.class, Collections.singletonList(path), "overwrite");
         assertTrue(qType.exists());
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java
new file mode 100644
index 0000000000..c37343f272
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class IntegerExtensionsTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/apt/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> sources = Arrays.asList(
+                new File(packagePath, "IntegerExtensions.java").getPath(),
+                new File(packagePath, "ExampleEntity2.java").getPath());
+        process(QuerydslAnnotationProcessor.class, sources, "integerExtensions");
+                String qtypeContent = new String(Files.readAllBytes(Paths.get("target", "integerExtensions", "com", "querydsl", "QExampleEntity2.java")), StandardCharsets.UTF_8);
+        //The superclass' id property is inherited, but can't be assigned to the custom QInteger
+        assertTrue(qtypeContent.contains("public final ext.java.lang.QInteger id = new ext.java.lang.QInteger(_super.id);"));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/NamePrefixTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/NamePrefixTest.java
new file mode 100644
index 0000000000..bb662f0f1b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/NamePrefixTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Test;
+
+public class NamePrefixTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/domain/";
+
+    @Test
+    public void process_all() throws IOException {
+        // works only in Eclipse for the moment
+        List<String> classes = getFiles(packagePath);
+
+        // default Processor
+        process(QuerydslAnnotationProcessor.class, classes,"prefix");
+
+        assertTrue(new File("target/prefix/com/querydsl/apt/domain/query3/QTAnimalTest_Animal.java").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Arrays.asList("-Aquerydsl.packageSuffix=.query3", "-Aquerydsl.prefix=QT");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/NameSuffixTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/NameSuffixTest.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/apt/NameSuffixTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/NameSuffixTest.java
index 7d57353b9f..c6e6ccc55c 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/NameSuffixTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/NameSuffixTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.apt;
+package com.querydsl.apt;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,23 +24,23 @@
 import org.junit.Test;
 
 public class NameSuffixTest extends AbstractProcessorTest {
-    
-    private static final String packagePath = "src/test/java/com/mysema/query/domain/";
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/domain/";
 
     @Test
-    public void ProcessAll() throws IOException {
+    public void process_all() throws IOException {
         // works only in Eclipse for the moment
         List<String> classes = getFiles(packagePath);
 
         // default Processor
         process(QuerydslAnnotationProcessor.class, classes,"suffix");
-        
-        assertTrue(new File("target/suffix/com/mysema/query/domain/QAnimalTest_AnimalType.java").exists());
+
+        assertTrue(new File("target/suffix/com/querydsl/apt/domain/query2/QAnimalTest_AnimalType.java").exists());
     }
-    
+
     @Override
     protected Collection<String> getAPTOptions() {
-        return Arrays.asList("-Aquerydsl.suffix=Type");
+        return Arrays.asList("-Aquerydsl.packageSuffix=.query2", "-Aquerydsl.suffix=Type");
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/NoteTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/NoteTest.java
new file mode 100644
index 0000000000..13b38cde22
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/NoteTest.java
@@ -0,0 +1,62 @@
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class NoteTest extends AbstractProcessorTest {
+
+    private Collection<String> aptOptions;
+
+    private ByteArrayOutputStream err = new ByteArrayOutputStream();
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/";
+
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes, "includedClasses");
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return aptOptions;
+    }
+
+    @Override
+    protected ByteArrayOutputStream getStdErr() {
+        return err;
+    }
+
+    protected boolean isStdErrEmpty() {
+        return getStdErr().toByteArray().length == 0;
+    }
+
+    @Test
+    public void processDefault() throws IOException {
+        aptOptions = Collections.emptyList();
+        process();
+        assertTrue(isStdErrEmpty());
+    }
+
+    @Test
+    public void processEnabled() throws IOException {
+        aptOptions = Collections.singletonList("-Aquerydsl.logInfo=true");
+        process();
+        assertFalse(isStdErrEmpty());
+    }
+
+    @Test
+    public void processDisabled() throws IOException {
+        aptOptions = Collections.singletonList("-Aquerydsl.logInfo=false");
+        process();
+        assertTrue(isStdErrEmpty());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/PackageSuffixTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/PackageSuffixTest.java
new file mode 100644
index 0000000000..b521b2987b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/PackageSuffixTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class PackageSuffixTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/domain/";
+
+    @Test
+    public void process_all() throws IOException {
+        // works only in Eclipse for the moment
+        List<String> classes = getFiles(packagePath);
+
+        // default Processor
+        process(QuerydslAnnotationProcessor.class, classes,"packageSuffix");
+
+        assertTrue(new File("target/packageSuffix/com/querydsl/apt/domain/query/QAnimalTest_Animal.java").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.packageSuffix=.query");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java
new file mode 100644
index 0000000000..c841c4ba2b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.apt.hibernate.HibernateAnnotationProcessor;
+import com.querydsl.apt.jdo.JDOAnnotationProcessor;
+import com.querydsl.apt.jpa.JPAAnnotationProcessor;
+import com.querydsl.apt.roo.RooAnnotationProcessor;
+
+public class QuerydslAnnotationProcessorTest extends AbstractProcessorTest {
+
+    private static final String PACKAGE_PATH = "src/test/java/com/querydsl/apt/domain/";
+
+    private static final List<String> CLASSES = getFiles(PACKAGE_PATH);
+
+    @Test
+    public void process() throws IOException {
+        File file = new File(PACKAGE_PATH, "AbstractEntityTest.java");
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(file.getPath()),"qdsl");
+    }
+
+    @Test
+    public void process_monitoredCompany() throws IOException {
+        String path = new File(PACKAGE_PATH, "MonitoredCompany.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"MonitoredCompany");
+    }
+
+    @Test
+    public void process_inheritance3() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Inheritance3Test");
+    }
+
+    @Test
+    public void process_inheritance8() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Inheritance8Test");
+    }
+
+    @Test
+    public void process_queryEmbedded3() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"QueryEmbedded3Test");
+    }
+
+    @Test
+    public void process_queryEmbedded4() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"QueryEmbedded4Test");
+    }
+
+    @Test
+    public void process_delegate() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/DelegateTest.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"DelegateTest");
+    }
+
+    @Test
+    public void process_abstractClasses() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java").getPath();
+        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"AbstractClassesTest");
+    }
+
+    @Test
+    public void process_abstractClasses2() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java").getPath();
+        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"abstractClasses2");
+    }
+
+    @Test
+    public void process_genericSignature() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"GenericSignatureTest");
+    }
+
+    @Test
+    public void process_abstractProperties2Test() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"AbstractProperties2Test");
+    }
+
+    @Test
+    public void process_inheritance2Test() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"InheritanceTest2");
+    }
+
+    @Test
+    public void process_entityInheritanceTest() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java").getPath();
+        process(JPAAnnotationProcessor.class, Collections.singletonList(path),"EntityInheritanceTest");
+    }
+
+    @Test
+    public void process_enum2Test() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/Enum2Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Enum2Test");
+    }
+
+    @Test
+    public void process_externalEntityTest() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"ExternalEntityTest");
+    }
+
+    @Test
+    public void process_generic13Test() throws IOException {
+        String path = new File("src/test/java/com/querydsl/apt/domain/Generic13Test.java").getPath();
+        process(QuerydslAnnotationProcessor.class, Collections.singletonList(path),"Generic13Test");
+    }
+
+    @Test
+    public void querydslAnnotationProcessor() throws IOException {
+        process(QuerydslAnnotationProcessor.class, CLASSES, "querydsl");
+    }
+
+    @Test
+    public void jpaAnnotationProcessor() throws IOException {
+        process(JPAAnnotationProcessor.class, CLASSES, "jpa");
+    }
+
+    @Test
+    public void hibernateAnnotationProcessor() throws IOException {
+        process(HibernateAnnotationProcessor.class, CLASSES, "hibernate");
+    }
+
+    @Test
+    public void jdoAnnotationProcessor() throws IOException {
+        process(JDOAnnotationProcessor.class, CLASSES, "jdo");
+    }
+
+    @Test
+    public void rooAnnotationProcessor() throws IOException {
+        process(RooAnnotationProcessor.class, CLASSES, "roo");
+
+        assertTrue(new File("target/roo/com/querydsl/apt/domain/QRooEntities_MyEntity.java").exists());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java
new file mode 100644
index 0000000000..ea3e6f9f43
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class UnknownAsEmbeddableTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/java/com/querydsl/apt/domain";
+
+    @Test
+    public void process() throws IOException {
+        List<String> classes = getFiles(packagePath);
+        process(QuerydslAnnotationProcessor.class, classes,"unknownAsEmbeddable");
+
+        assertTrue(new File("target/unknownAsEmbeddable/com/querydsl/apt/domain/custom/QEntity.java").exists());
+        assertTrue(new File("target/unknownAsEmbeddable/com/querydsl/apt/domain/custom/QEmbeddedType.java").exists());
+        assertTrue(new File("target/unknownAsEmbeddable/com/querydsl/apt/domain/custom/QEmbeddedType2.java").exists());
+        assertTrue(new File("target/unknownAsEmbeddable/com/querydsl/apt/domain/custom/QEmbeddedType3.java").exists());
+    }
+
+    @Override
+    protected Collection<String> getAPTOptions() {
+        return Collections.singletonList("-Aquerydsl.unknownAsEmbeddable=true");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClasses2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java
similarity index 76%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClasses2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java
index c3dd89ba99..fd16e74f62 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClasses2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,26 +19,22 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
 
+import org.junit.Assert;
 import org.junit.Test;
 
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.types.dsl.NumberPath;
 
-@SuppressWarnings("serial")
+@SuppressWarnings({"rawtypes", "serial", "unchecked"})
 public class AbstractClasses2Test {
-    
+
     public interface Archetype<PK extends Serializable, DO extends Serializable> extends Serializable, Comparable<DO>  {
 
     }
-    
+
     @MappedSuperclass
-    public static abstract class BaseArchetype<PK extends Serializable, DO extends Serializable> implements Archetype<PK, DO> {
+    public abstract static class BaseArchetype<PK extends Serializable, DO extends Serializable> implements Archetype<PK, DO> {
 
         @Id
         @GeneratedValue
@@ -46,29 +42,29 @@ public static abstract class BaseArchetype<PK extends Serializable, DO extends S
         String name;
         String description;
 
-        public BaseArchetype() {}
+        public BaseArchetype() { }
 
 
         public int compareTo(BaseArchetype o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
     }
-    
+
     @Entity
     public static class Grant<P extends Party, S extends Party> extends BaseArchetype<P, S> {
         public int compareTo(S o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
     }
-    
+
     @Entity
     public static class Party extends BaseArchetype<Long, Party> {
         @OneToMany()
@@ -80,36 +76,36 @@ public Party() {
         public int compareTo(Party o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
     }
-    
+
     @Entity
     public static class PartyRole<P extends Party> extends BaseArchetype<Long, PartyRole<P>> {
         @ManyToOne()
         P party;
 
-        public PartyRole() {}
+        public PartyRole() { }
 
         public int compareTo(PartyRole o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
     }
-    
+
     @Test
-    public void Grant_id_Type_And_Class() {
-        assertEquals(QAbstractClasses2Test_Party.class, QAbstractClasses2Test_Grant.grant.id.getClass());
+    public void grant_id_type_and_class() {
+        Assert.assertEquals(QAbstractClasses2Test_Party.class, QAbstractClasses2Test_Grant.grant.id.getClass());
         assertEquals(Party.class, QAbstractClasses2Test_Grant.grant.id.getType());
     }
 
     @Test
-    public void Party_id_Type_And_Class() {
+    public void party_id_type_and_class() {
         assertEquals(NumberPath.class, QAbstractClasses2Test_Party.party.id.getClass());
         assertEquals(Long.class, QAbstractClasses2Test_Party.party.id.getType());
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClassesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClassesTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java
index 216a860074..ab33d3eda1 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractClassesTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,11 +22,12 @@
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 
+import org.junit.Assert;
 import org.junit.Test;
 
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.types.dsl.NumberPath;
 
-@SuppressWarnings("serial")
+@SuppressWarnings({"rawtypes", "serial", "unchecked"})
 public class AbstractClassesTest {
 
     public interface Archetype<PK extends Serializable, DO extends Serializable> extends Serializable, Comparable<DO>  {
@@ -35,7 +36,7 @@ public interface Archetype<PK extends Serializable, DO extends Serializable> ext
 
 
     @MappedSuperclass
-    public static abstract class BaseArchetype<PK extends Serializable, DO extends Serializable> implements Archetype<PK, DO> {
+    public abstract static class BaseArchetype<PK extends Serializable, DO extends Serializable> implements Archetype<PK, DO> {
 
         @Id
         @GeneratedValue
@@ -43,12 +44,12 @@ public static abstract class BaseArchetype<PK extends Serializable, DO extends S
         String name;
         String description;
 
-        public BaseArchetype() {}
+        public BaseArchetype() { }
 
         public int compareTo(BaseArchetype o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
@@ -60,7 +61,7 @@ public static class Grant<P extends Party, S extends Party> extends BaseArchetyp
         public int compareTo(S o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
@@ -76,7 +77,7 @@ public Party() {
         public int compareTo(Party o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
@@ -84,13 +85,13 @@ public boolean equals(Object o) {
     }
 
     @Test
-    public void Grant_id_Type() {
-        assertEquals(QAbstractClassesTest_Party.class, QAbstractClassesTest_Grant.grant.id.getClass());
+    public void grant_id_type() {
+        Assert.assertEquals(QAbstractClassesTest_Party.class, QAbstractClassesTest_Grant.grant.id.getClass());
         assertEquals(Party.class, QAbstractClassesTest_Grant.grant.id.getType());
     }
 
     @Test
-    public void Party_id_Type() {
+    public void party_id_type() {
         assertEquals(NumberPath.class, QAbstractClassesTest_Party.party.id.getClass());
         assertEquals(Long.class, QAbstractClassesTest_Party.party.id.getType());
     }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java
new file mode 100644
index 0000000000..b8e8b839f0
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
+
+public class AbstractEntityTest {
+
+    @QueryEntity
+    public abstract static class Category<T extends Category<T>> {
+
+        public Category<T> defaultChild;
+
+    }
+
+    @QueryEntity
+    public static class CategoryReference {
+
+        @QueryInit("defaultChild")
+        public Category<?> category;
+
+    }
+
+    @Test
+    public void path_is_available() {
+        QAbstractEntityTest_CategoryReference categoryReference = QAbstractEntityTest_CategoryReference.categoryReference;
+        assertNotNull(categoryReference.category.defaultChild);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java
new file mode 100644
index 0000000000..ab876c165d
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+public class AbstractProperties2Test {
+
+    public abstract static class GenericEntity<K extends Serializable & Comparable<K>, E extends GenericEntity<K, ?>> {
+
+        public abstract K getId();
+
+        public abstract void setId(K id);
+
+    }
+
+    public abstract static class AbstractEntity<P extends AbstractEntity<P>> extends GenericEntity<Integer, P> {
+
+        private Integer id;
+
+        @Override
+        public Integer getId() {
+            return id;
+        }
+
+        @Override
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+    }
+
+    @QueryEntity
+    public static class User extends AbstractEntity<User> {
+
+    }
+
+    @Test
+    public void genericEntity_id_is_available() {
+        assertNotNull(QAbstractProperties2Test_GenericEntity.genericEntity.id);
+    }
+
+    @Test
+    public void abstractEntity_is_available() {
+        assertNotNull(QAbstractProperties2Test_AbstractEntity.abstractEntity.id);
+    }
+
+    @Test
+    public void abstractEntity_super_is_available() {
+        assertEquals(QAbstractProperties2Test_GenericEntity.class, QAbstractProperties2Test_AbstractEntity.abstractEntity._super.getClass());
+    }
+
+    @Test
+    public void user_is_available() {
+        assertNotNull(QAbstractProperties2Test_User.user.id);
+    }
+
+    @Test
+    public void user_super_is_available() {
+        assertEquals(QAbstractProperties2Test_AbstractEntity.class, QAbstractProperties2Test_User.user._super.getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java
new file mode 100644
index 0000000000..137a528e5f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java
@@ -0,0 +1,67 @@
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryType;
+
+@Ignore
+public class AbstractProperties3Test {
+
+    @MappedSuperclass
+    public static class BaseEntity {
+
+    }
+
+    @Entity
+    public static class Compound extends BaseEntity {
+
+        String name;
+
+    }
+
+    @Entity
+    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+    public abstract static class Containable extends BaseEntity implements Serializable {
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO, generator = "containable_seq_gen")
+        @SequenceGenerator(name = "containable_seq_gen", sequenceName = "seq_containable")
+        @Column(name = "id")
+        Long id;
+
+        @QueryType(PropertyType.ENTITY)
+        public abstract Compound getCompound();
+
+    }
+
+    @MappedSuperclass
+    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    public abstract static class CompoundContainer extends BaseEntity implements Serializable {
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO, generator = "compound_container_seq_gen")
+        @SequenceGenerator(name = "compound_container_seq_gen", sequenceName = "seq_compound_container", allocationSize = 1000)
+        @Column(name = "compound_container_id")
+        Long id;
+
+        @JoinColumn(name = "containable_id")
+        @OneToOne(fetch = FetchType.EAGER)
+        Containable containable;
+
+    }
+
+    @Test
+    public void test() {
+        QAbstractProperties3Test_CompoundContainer.compoundContainer.containable.compound.name.isNotNull();
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractPropertiesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java
similarity index 88%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/AbstractPropertiesTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java
index 5597fcbd26..a3464d3f10 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractPropertiesTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.io.Serializable;
 
@@ -22,7 +22,7 @@
 @Ignore
 public class AbstractPropertiesTest {
 
-    public static abstract class GenericEntity<K extends Serializable & Comparable<K>> {
+    public abstract static class GenericEntity<K extends Serializable & Comparable<K>> {
 
         private static final long serialVersionUID = -3988499137919577054L;
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractSecurable.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/AbstractSecurable.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java
index 045ca7a859..09fa2eb9f0 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AbstractSecurable.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractSecurable.java
@@ -1,22 +1,22 @@
-package com.mysema.query.domain;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
-
-@MappedSuperclass
-
-public abstract class AbstractSecurable<U, PK extends Serializable> {
-
-    private static final long serialVersionUID = -6151927948714098845L;
-
-    // ~ Meta-data
-    @OneToMany(cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
-    @JoinColumn(name = "SOURCE")
-    private List<SecurableEntity> securityEntries;
-
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.JoinColumn;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToMany;
+
+@MappedSuperclass
+
+public abstract class AbstractSecurable<U, PK extends Serializable> {
+
+    private static final long serialVersionUID = -6151927948714098845L;
+
+    // ~ Meta-data
+    @OneToMany(cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
+    @JoinColumn(name = "SOURCE")
+    private List<SecurableEntity> securityEntries;
+
 }
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java
new file mode 100644
index 0000000000..ed82d215d2
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public abstract class AbstractTest {
+
+    private Class<?> cl;
+
+    private com.querydsl.core.types.Expression<?> standardVariable;
+
+    protected <T extends com.querydsl.core.types.Expression<?>> void start(Class<T> cl, T standardVariable) {
+        this.cl = cl;
+        this.standardVariable = standardVariable;
+
+    }
+
+    protected void match(Class<?> expectedType, String name) throws SecurityException, NoSuchFieldException {
+        assertTrue(cl.getSimpleName() + "." + name + " failed", expectedType.isAssignableFrom(cl.getField(name).getType()));
+    }
+
+    protected void matchType(Class<?> expectedType, String name) throws NoSuchFieldException, IllegalAccessException {
+        Class<?> type = ((com.querydsl.core.types.Expression) cl.getField(name).get(standardVariable)).getType();
+        assertTrue(cl.getSimpleName() + "." + name + " failed", expectedType.isAssignableFrom(type));
+    }
+
+    protected void assertPresent(String name) {
+        try {
+            cl.getField(name);
+        } catch (NoSuchFieldException e) {
+            fail("Expected present field : " + cl.getSimpleName() + "." + name);
+        }
+    }
+
+    protected void assertMissing(String name) {
+        try {
+            cl.getField(name);
+            fail("Expected missing field : " + cl.getSimpleName() + "." + name);
+        } catch (NoSuchFieldException e) {
+            // expected
+        }
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Address.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Address.java
new file mode 100644
index 0000000000..9871fa3c16
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Address.java
@@ -0,0 +1,24 @@
+package com.querydsl.apt.domain;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbedded;
+
+@QueryEmbeddable
+public final class Address {
+
+    public Address() {
+
+    }
+
+    public Address(String street, String postCode, City city) {
+        this.street = street; this.postCode = postCode; this.city = city;
+    }
+
+    public String street;
+
+    public String postCode;
+
+    @QueryEmbedded
+    public City city;
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnimalTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnimalTest.java
new file mode 100644
index 0000000000..f0c7c4a137
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnimalTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
+
+public class AnimalTest {
+
+    @QueryEntity
+    public static class Animal {
+
+        public String name;
+
+    }
+
+    @QueryEntity
+    public static class Cat extends Animal {
+
+        @QueryInit("name")
+        public Cat mate;
+
+    }
+
+    @Test
+    public void properties_are_copied_from_super() {
+        assertTrue("direct copy of StringPath field failed",  QAnimalTest_Cat.cat.name == QAnimalTest_Cat.cat._super.name);
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/AnnotatedGettersTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/AnnotatedGettersTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java
index 722d55b603..373f8edc23 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/AnnotatedGettersTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class AnnotatedGettersTest {
 
@@ -27,7 +27,7 @@ public interface Entity {
     }
 
     @Test
-    public void Annotated_Getter_Is_Supported() {
+    public void annotated_getter_is_supported() {
         assertNotNull(QAnnotatedGettersTest_Entity.entity.name);
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java
new file mode 100644
index 0000000000..77030b4450
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.apt.domain;
+
+import java.lang.annotation.Annotation;
+
+import javax.persistence.*;
+
+import org.junit.Ignore;
+
+@Ignore
+public class AnnotationTypeTest {
+
+    @MappedSuperclass
+    public abstract static class BaseObject<T extends Annotation> {
+
+    }
+
+    @Entity
+    public static class Person extends BaseObject<javax.persistence.Id> {
+        @Id
+        private Long id;
+    }
+
+    @Embeddable
+    public static class Address extends BaseObject<javax.persistence.EmbeddedId> {
+        @EmbeddedId
+        private String street;
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyPathTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyPathTest.java
new file mode 100644
index 0000000000..65f0c60470
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyPathTest.java
@@ -0,0 +1,60 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+public class AnyPathTest {
+    @Entity
+    public static class Foo {
+
+        @OneToMany(mappedBy = "key.foo")
+        @QueryInit("key.student")
+        private Set<Bar> bars = new HashSet<Bar>();
+
+    }
+
+    @Entity
+    public static class Bar {
+
+        @EmbeddedId
+        @QueryInit("student")
+        private BarId key = new BarId();
+
+    }
+
+    @Embeddable
+    public static class BarId {
+
+        @ManyToOne
+        private Student student;
+
+        @ManyToOne
+        private Foo foo;
+
+    }
+
+    @Entity
+    public static class Student {
+
+    }
+
+    private BooleanExpression authorFilter(Student student) {
+        //return QFoo.foo.bars.any().key.student.eq(Student student);
+        return QAnyPathTest_Foo.foo.bars.any().key.student.eq(student);
+    }
+
+    @Test
+    public void anyPath() {
+        assertNotNull(authorFilter(new Student()));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java
new file mode 100644
index 0000000000..ad1c4c6580
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+public class AnyUsageTest {
+
+    @Entity
+    public static class DealerGroup implements Serializable {
+        private static final long serialVersionUID = 8001287260658920066L;
+
+        @Id
+        @GeneratedValue
+        public Long id;
+
+        @OneToMany(mappedBy = "dealerGroup")
+        public Set<Dealer> dealers;
+
+    }
+
+    @Entity
+    public static class Dealer implements Serializable {
+        private static final long serialVersionUID = -6832045219902674887L;
+
+        @Id
+        @GeneratedValue
+        public Long id;
+
+        @ManyToOne
+        public DealerGroup dealerGroup;
+
+        @ManyToOne
+        public Company company;
+
+    }
+
+    @Entity
+    public static class Company implements Serializable {
+        private static final long serialVersionUID = -5369301332567282659L;
+
+        @Id
+        @GeneratedValue
+        public Long id;
+
+    }
+
+    @Test
+    public void test() {
+        QAnyUsageTest_Dealer dealer = QAnyUsageTest_DealerGroup.dealerGroup.dealers.any();
+        assertNotNull(dealer);
+        assertNotNull(dealer.company);
+    }
+
+    @Test
+    public void withQDealer() {
+        List<Company> companies = new LinkedList<Company>();
+        companies.add(new Company());
+        QAnyUsageTest_Dealer qDealer = QAnyUsageTest_Dealer.dealer;
+        BooleanExpression expression = qDealer.company.in(companies);
+        assertNotNull(expression);
+    }
+
+    @Test
+    public void withQDealerGroup() {
+        List<Company> companies = new LinkedList<Company>();
+        companies.add(new Company());
+        QAnyUsageTest_Dealer qDealer = QAnyUsageTest_DealerGroup.dealerGroup.dealers.any();
+        BooleanExpression expression = qDealer.company.in(companies);
+        assertNotNull(expression);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array2Test.java
new file mode 100644
index 0000000000..512ce3c659
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array2Test.java
@@ -0,0 +1,25 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class Array2Test {
+
+    public static class Example {
+
+        byte[] imageData;
+
+        @QueryProjection
+        public Example(byte[] param0) {
+            this.imageData = param0;
+        }
+    }
+
+    @Test
+    public void test() {
+        new QArray2Test_Example(Expressions.path(byte[].class, "bytes")).newInstance(new byte[0]);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array3Test.java
new file mode 100644
index 0000000000..2c04a0a7d9
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Array3Test.java
@@ -0,0 +1,48 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+public class Array3Test {
+
+    @QueryEntity
+    public static class Domain {
+
+        byte[] bytes;
+
+        Byte[] bytes2;
+    }
+
+    @QueryEntity
+    public static class Domain2 {
+
+        byte[] bytes;
+    }
+
+    @QueryEntity
+    public static class Domain3 {
+
+        Byte[] bytes;
+    }
+
+    @Test
+    public void domain() {
+        Assert.assertEquals(byte[].class, QArray3Test_Domain.domain.bytes.getType());
+        assertEquals(Byte[].class, QArray3Test_Domain.domain.bytes2.getType());
+    }
+
+    @Test
+    public void domain2() {
+        Assert.assertEquals(byte[].class, QArray3Test_Domain2.domain2.bytes.getType());
+    }
+
+    @Test
+    public void domain3() {
+        Assert.assertEquals(Byte[].class, QArray3Test_Domain3.domain3.bytes.getType());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ArrayExtTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ArrayExtTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java
index 7d4d53bf3b..43ef387849 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ArrayExtTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,65 +20,61 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.ArrayPath;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.*;
 
 public class ArrayExtTest {
 
     private static final QArrayExtTest_BinaryFile binaryFile = QArrayExtTest_BinaryFile.binaryFile;
-    
+
     @QueryEntity
     public static class BinaryFile {
 
         byte[] contentPart;
-        
+
         List<byte[]> list;
-        
+
         Map<String, byte[]> map1;
-        
+
         Map<byte[], String> map2;
     }
 
     @Test
-    public void BinaryFile_contentPart() {
+    public void binaryFile_contentPart() {
         assertEquals(ArrayPath.class, binaryFile.contentPart.getClass());
         assertEquals(byte[].class, binaryFile.contentPart.getType());
     }
-    
+
     @Test
-    public void BinaryFile_list() {
+    public void binaryFile_list() {
         assertEquals(ListPath.class, binaryFile.list.getClass());
-        assertEquals(List.class, binaryFile.list.getType());        
+        assertEquals(List.class, binaryFile.list.getType());
         assertEquals(byte[].class, binaryFile.list.getParameter(0));
-        
+
         assertEquals(SimplePath.class, binaryFile.list.get(0).getClass());
         assertEquals(byte[].class, binaryFile.list.get(0).getType());
     }
-    
+
     @Test
-    public void BinaryFile_map1() {
+    public void binaryFile_map1() {
         assertEquals(MapPath.class, binaryFile.map1.getClass());
         assertEquals(Map.class, binaryFile.map1.getType());
         assertEquals(String.class, binaryFile.map1.getParameter(0));
         assertEquals(byte[].class, binaryFile.map1.getParameter(1));
-        
+
         assertEquals(SimplePath.class, binaryFile.map1.get("").getClass());
         assertEquals(byte[].class, binaryFile.map1.get("").getType());
     }
-    
+
     @Test
-    public void BinaryFile_map2() {
+    public void binaryFile_map2() {
         assertEquals(MapPath.class, binaryFile.map2.getClass());
         assertEquals(Map.class, binaryFile.map2.getType());
         assertEquals(byte[].class, binaryFile.map2.getParameter(0));
         assertEquals(String.class, binaryFile.map2.getParameter(1));
-        
+
         assertEquals(StringPath.class, binaryFile.map2.get(new byte[0]).getClass());
         assertEquals(String.class, binaryFile.map2.get(new byte[0]).getType());
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ArrayTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayTest.java
similarity index 87%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ArrayTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayTest.java
index 5f97e9ff1d..eb80d0494f 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ArrayTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ArrayTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,23 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class ArrayTest {
 
     @QueryEntity
     public static class ArrayTestEntity {
-        
+
         ArrayTestEntity[] entityArray;
-        
+
         int[] primitiveArray;
-        
+
         String[] stringArray;
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/B.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/B.java
new file mode 100644
index 0000000000..c9498b9ca2
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/B.java
@@ -0,0 +1,9 @@
+package com.querydsl.apt.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.A;
+
+@QueryEntity
+public class B extends A {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/BlockingTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/BlockingTest.java
new file mode 100644
index 0000000000..958f925b45
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/BlockingTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.annotations.QueryType;
+
+public class BlockingTest extends AbstractTest {
+
+    @QueryEntity
+    public static class Entity {
+
+        Entity field1;
+
+        @QueryTransient
+        @QueryType(PropertyType.ENTITY)
+        Entity field2;
+
+        @QueryTransient
+        Entity blockedField;
+    }
+
+    @QueryEntity
+    public abstract static class Entity2 {
+
+        @QueryTransient
+        @QueryType(PropertyType.ENTITY)
+        public abstract Entity getField2();
+
+        @QueryTransient
+        public abstract Entity getBlockedField();
+    }
+
+    @Test
+    public void entity_fields_are_available() {
+        start(QBlockingTest_Entity.class, QBlockingTest_Entity.entity);
+        assertPresent("field1");
+        assertMissing("blockedField");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/City.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/City.java
new file mode 100644
index 0000000000..ac3a926885
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/City.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+
+public final class City {
+
+    public City() { }
+
+    public City(String name, Double latitude, Double longitude) {
+        this.name = name;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    public String name;
+
+    public Double latitude;
+
+    public Double longitude;
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java
new file mode 100644
index 0000000000..e9325cd67a
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CollectionTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.*;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.MapPath;
+import com.querydsl.core.types.dsl.SetPath;
+
+public class CollectionTest {
+
+    @QueryEntity
+    public static class Person {
+
+        Map<String, ?> map1;
+
+        Map<?, String> map2;
+
+        Map<?,?> map3;
+
+        Map map4;
+
+        List<?> list1;
+
+        List list2;
+
+        Collection<?> collection1;
+
+        Collection collection2;
+
+        Collection<Collection<Person>> collectionOfCollection;
+
+        Collection<Set<String>> collectionOfSet;
+
+        Set<?> set1;
+
+        Set set2;
+    }
+
+    @QueryEntity
+    public static class Classes {
+
+        HashMap map1;
+
+        HashMap<?,?> map2;
+
+        HashMap<String, String> map3;
+
+        ArrayList list1;
+
+        ArrayList<?> list2;
+
+        ArrayList<String> list3;
+
+        HashSet set1;
+
+        HashSet<?> set2;
+
+        HashSet<String> set3;
+
+    }
+
+    @Test
+    public void test() {
+//        assertEquals(String.class, QMapWithUndefinedValueTest_Person.person.appData.getParameter(1));
+//        assertEquals(Object.class, QMapWithUndefinedValueTest_Person.person.appData.getParameter(1));
+
+        Assert.assertEquals(MapPath.class, QCollectionTest_Classes.classes.map1.getClass());
+        assertEquals(MapPath.class, QCollectionTest_Classes.classes.map2.getClass());
+        assertEquals(MapPath.class, QCollectionTest_Classes.classes.map3.getClass());
+
+        assertEquals(ListPath.class, QCollectionTest_Classes.classes.list1.getClass());
+        assertEquals(ListPath.class, QCollectionTest_Classes.classes.list2.getClass());
+        assertEquals(ListPath.class, QCollectionTest_Classes.classes.list3.getClass());
+
+        assertEquals(SetPath.class, QCollectionTest_Classes.classes.set1.getClass());
+        assertEquals(SetPath.class, QCollectionTest_Classes.classes.set2.getClass());
+        assertEquals(SetPath.class, QCollectionTest_Classes.classes.set3.getClass());
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ComparableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ComparableTest.java
new file mode 100644
index 0000000000..5e2e7f57c6
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ComparableTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class ComparableTest {
+
+    @QueryEntity
+    public static class CustomComparableHolder {
+
+        private CustomComparable customComparable;
+
+        public CustomComparable getCustomComparable() {
+            return customComparable;
+        }
+
+        public void setCustomComparable(CustomComparable customComparable) {
+            this.customComparable = customComparable;
+        }
+    }
+
+    @QueryEmbeddable
+    public static class CustomComparable2 {
+
+
+        private CustomComparable customComparable;
+
+        public CustomComparable getCustomComparable() {
+            return customComparable;
+        }
+
+        public void setCustomComparable(CustomComparable customComparable) {
+            this.customComparable = customComparable;
+        }
+
+    }
+
+    public static class CustomComparable implements Comparable<CustomComparable> {
+
+        @Override
+        public int compareTo(CustomComparable o) {
+            return 0;
+        }
+
+        public boolean equals(Object o) {
+            return o == this;
+        }
+
+    }
+
+    @Test
+    public void customComparable_is_properly_handled() {
+        assertNotNull(QComparableTest_CustomComparableHolder.customComparableHolder.customComparable.asc());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ConstructorTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ConstructorTest.java
new file mode 100644
index 0000000000..7314b56ec2
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ConstructorTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class ConstructorTest {
+
+    @QuerySupertype
+    public static class CategorySuperclass {
+
+    }
+
+    @QueryEntity
+    public static class Category<T extends Category<T>> extends CategorySuperclass {
+
+        public Category(int i) { }
+
+    }
+
+    @QueryEntity
+    public static class ClassWithConstructor {
+
+        public ClassWithConstructor() { }
+
+    }
+
+    @Test
+    public void classes_are_available() {
+        assertNotNull(QConstructorTest_CategorySuperclass.class);
+        assertNotNull(QConstructorTest_Category.class);
+        assertNotNull(QConstructorTest_ClassWithConstructor.class);
+    }
+
+    @Test
+    public void category_super_reference_is_correct() {
+        assertEquals(QConstructorTest_CategorySuperclass.class, QConstructorTest_Category.category._super.getClass());
+        assertEquals(Category.class, QConstructorTest_Category.category._super.getType());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomCollection.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomCollection.java
new file mode 100644
index 0000000000..67fa2ccb70
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomCollection.java
@@ -0,0 +1,48 @@
+package com.querydsl.apt.domain;
+
+import java.util.AbstractSet;
+import java.util.Iterator;
+
+import javax.persistence.Entity;
+
+public class CustomCollection {
+
+    @Entity
+    public static class MyCustomCollection<T> extends AbstractSet<T> {
+
+        @Override
+        public Iterator<T> iterator() {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+    }
+
+    @Entity
+    public static class MyCustomCollection2<T> extends AbstractSet<T> {
+
+        @Override
+        public Iterator<T> iterator() {
+            return null;
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+    }
+
+    @Entity
+    public static class MyEntity {
+
+        MyCustomCollection<String> strings;
+
+        MyCustomCollection2 strings2;
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/CustomMethods.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomMethods.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/CustomMethods.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomMethods.java
index ed925e57b6..bb736bec5c 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/CustomMethods.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/CustomMethods.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 public class CustomMethods {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java
new file mode 100644
index 0000000000..ac21b956ce
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java
@@ -0,0 +1,111 @@
+package com.querydsl.apt.domain;
+
+import java.util.Collection;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryInit;
+
+public class DeepInitializationTest {
+
+    @MappedSuperclass
+    public abstract static class AbstractEntity implements Cloneable {
+
+        @Id
+        @Column(name = "ID")
+        @GeneratedValue(generator = "SEQUENCE")
+        private long id;
+
+        public long getId() {
+            return id;
+        }
+
+        @Override
+        protected Object clone() throws CloneNotSupportedException {
+            return super.clone();
+        }
+    }
+
+    @Entity
+    @SequenceGenerator(name = "SEQUENCE", sequenceName = "PARENT_SEQUENCE")
+    public static class Parent extends AbstractEntity {
+        @JoinColumn(name = "FK_PARENT_ID", nullable = false)
+        @OneToMany(cascade = CascadeType.PERSIST)
+        @QueryInit("subChild.*")
+        private Collection<Child> children;
+
+        public Parent() {
+        }
+
+        public Collection<Child> getChildren() {
+            return children;
+        }
+
+        public void setChildren(Collection<Child> children) {
+            this.children = children;
+        }
+    }
+
+    @Entity
+    @SequenceGenerator(name = "SEQUENCE", sequenceName = "CHILD_SEQUENCE")
+    public static class Child extends AbstractEntity {
+        @OneToOne
+        @JoinColumn(name = "FK_SUBCHILD_ID", referencedColumnName = "ID")
+        private SubChild subChild;
+
+        public Child() {
+        }
+
+        public SubChild getSubChild() {
+            return subChild;
+        }
+
+        public void setSubChild(SubChild subChild) {
+            this.subChild = subChild;
+        }
+    }
+
+    @Entity
+    @SequenceGenerator(name = "SEQUENCE", sequenceName = "SUBCHILD_SEQUENCE")
+    public static class SubChild extends AbstractEntity {
+        @Embedded
+        private MyEmbeddable myEmbeddable;
+
+        public SubChild() {
+        }
+
+        public MyEmbeddable getMyEmbeddable() {
+            return myEmbeddable;
+        }
+
+        public void setMyEmbeddable(MyEmbeddable myEmbeddable) {
+            this.myEmbeddable = myEmbeddable;
+        }
+    }
+
+    @Embeddable
+    public static class MyEmbeddable {
+
+        private String number;
+
+        public MyEmbeddable() {
+        }
+
+        public String getNumber() {
+            return number;
+        }
+
+        public void setNumber(String number) {
+            this.number = number;
+        }
+    }
+
+    @Test
+    public void init_via_parent() {
+        QDeepInitializationTest_Parent parent = QDeepInitializationTest_Parent.parent;
+        parent.children.any().subChild.myEmbeddable.number.eq("Test");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate2Test.java
new file mode 100644
index 0000000000..860955164b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate2Test.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public class Delegate2Test {
+
+    @QueryEntity
+    public static class Entity {
+
+        Point point;
+    }
+
+    public static class Point {
+
+    }
+
+    @QueryDelegate(Point.class)
+    public static NumberExpression<Integer> geoDistance(Path<Point> point, Point other) {
+        return Expressions.numberTemplate(Integer.class, "geo_distance({0},{1})", point, ConstantImpl.create(other));
+    }
+
+    @Test
+    public void test() {
+        QDelegate2Test_Entity entity = QDelegate2Test_Entity.entity;
+        assertNotNull(entity.point.geoDistance(new Point()));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate3Test.java
new file mode 100644
index 0000000000..874b763c5f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Delegate3Test.java
@@ -0,0 +1,40 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.ComparablePath;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class Delegate3Test {
+
+    public static class Geometry implements Comparable<Geometry> {
+
+        @Override
+        public int compareTo(Geometry o) {
+            return 0;
+        }
+
+    }
+
+    public static class Point extends Geometry {
+
+    }
+
+    public static class Polygon extends Geometry {
+
+    }
+
+    @QueryDelegate(Geometry.class)
+    public static BooleanExpression isWithin(ComparablePath<? extends Geometry> geo1, ComparablePath<? extends Geometry> geo2) {
+        return Expressions.TRUE;
+    }
+
+    @Test
+    public void test() {
+        QDelegate3Test_Geometry.geometry.isWithin(null);
+        QDelegate3Test_Point.point.isWithin(null);
+        QDelegate3Test_Polygon.polygon.isWithin(null);
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/DelegateTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/DelegateTest.java
new file mode 100644
index 0000000000..9708e00026
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/DelegateTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class DelegateTest {
+
+    @QuerySupertype
+    public static class Identifiable {
+
+        long id;
+
+    }
+
+    @QueryEntity
+    public static class User extends Identifiable {
+
+        String name;
+
+        User managedBy;
+
+    }
+
+    @QueryEntity
+    public static class SimpleUser extends User {
+
+    }
+
+    @QueryEntity
+    public static class SimpleUser2 extends SimpleUser {
+
+    }
+
+    @QueryDelegate(User.class)
+    public static Expression<Boolean> isManagedBy(QDelegateTest_User user, User other) {
+        return ConstantImpl.create(true);
+    }
+
+    @QueryDelegate(User.class)
+    public static Expression<Boolean> isManagedBy(QDelegateTest_User user, QDelegateTest_User other) {
+        return ConstantImpl.create(true);
+    }
+
+    @QueryDelegate(User.class)
+    public static Expression<Boolean> simpleMethod(QDelegateTest_User user) {
+        return ConstantImpl.create(true);
+    }
+
+    @QueryDelegate(DelegateTest.User.class)
+    public static StringPath getName(QDelegateTest_User user) {
+        return user.name;
+    }
+
+    @Test
+    public void user() {
+        QDelegateTest_User user = QDelegateTest_User.user;
+        assertNotNull(user.isManagedBy(new User()));
+        assertNotNull(user.isManagedBy(user));
+        assertNotNull(user.simpleMethod());
+        assertEquals(user.name, user.getName());
+    }
+
+    @Test
+    public void simpleUser() {
+        QDelegateTest_SimpleUser user = QDelegateTest_SimpleUser.simpleUser;
+        assertNotNull(user.isManagedBy(new User()));
+        assertNotNull(user.isManagedBy(user._super));
+        assertEquals(user.name, user.getName());
+    }
+
+    @Test
+    public void simpleUser2() {
+        QDelegateTest_SimpleUser2 user = QDelegateTest_SimpleUser2.simpleUser2;
+        assertNotNull(user.isManagedBy(new User()));
+        assertNotNull(user.isManagedBy(user._super._super));
+        assertEquals(user.name, user.getName());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java
new file mode 100644
index 0000000000..d25608357e
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.domain.MyEmbeddable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.PathInits;
+
+public class Embeddable2Test {
+
+    @QuerySupertype
+    public abstract static class SomeMappedSuperClassHavingMyEmbeddable {
+
+        @QueryEmbedded
+        MyEmbeddable embeddable;
+    }
+
+    @QueryEntity
+    public abstract static class SomeEntityClassHavingMyEmbeddable {
+
+        @QueryEmbedded
+        MyEmbeddable embeddable;
+
+    }
+
+    @QueryEntity
+    public static class SomeEntity extends SomeMappedSuperClassHavingMyEmbeddable {
+
+    }
+
+    @Test
+    @Ignore
+    public void mapped_superClass_constructors() throws SecurityException, NoSuchMethodException {
+        assertNotNull(QEmbeddable2Test_SomeMappedSuperClassHavingMyEmbeddable.class.getConstructor(
+                Class.class, PathMetadata.class, PathInits.class));
+    }
+
+    @Test
+    @Ignore
+    public void entity_constructors() throws SecurityException, NoSuchMethodException {
+        assertNotNull(QEmbeddable2Test_SomeEntityClassHavingMyEmbeddable.class.getConstructor(
+                Class.class, PathMetadata.class, PathInits.class));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java
new file mode 100644
index 0000000000..317b1f2a81
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java
@@ -0,0 +1,38 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class Embeddable3Test {
+
+    @QueryEmbeddable
+    public static class EmbeddableClass {
+        private Integer embeddedProperty;
+
+        public EmbeddableClass() { }
+
+        @QueryProjection
+        public EmbeddableClass(Integer embeddedProperty) {
+            super();
+            this.embeddedProperty = embeddedProperty;
+        }
+
+        public Integer getEmbeddedProperty() {
+            return embeddedProperty;
+        }
+
+        public void setEmbeddedProperty(Integer embeddedProperty) {
+            this.embeddedProperty = embeddedProperty;
+        }
+
+    }
+
+    @Test
+    public void test() {
+        QEmbeddable3Test_EmbeddableClass.create(Expressions.path(Integer.class, "num"));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableDeepTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java
similarity index 87%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableDeepTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java
index 4535472247..4ea8d591f0 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EmbeddableDeepTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.io.Serializable;
 
@@ -31,12 +31,12 @@ public enum SomeType {
     }
 
     @MappedSuperclass
-    public static abstract class AValueObject implements Cloneable, Serializable {
+    public abstract static class AValueObject implements Cloneable, Serializable {
 
     }
 
     @MappedSuperclass
-    public static abstract class AEntity extends AValueObject {
+    public abstract static class AEntity extends AValueObject {
 
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java
new file mode 100644
index 0000000000..4b5e2249b6
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+
+import org.junit.Test;
+
+public class EmbeddableInterfaceTest {
+
+    @Entity
+    public static class EntityClass {
+
+        @ElementCollection(targetClass = EmbeddableClass.class)
+        Collection<EmbeddableInterface> children;
+
+    }
+
+    @Embeddable
+    public interface EmbeddableInterface {
+
+        String getName();
+    }
+
+    @Embeddable
+    public static class EmbeddableClass implements EmbeddableInterface {
+
+        @Override
+        public String getName() {
+            return null;
+        }
+
+    }
+
+    @Test
+    public void type() {
+        assertEquals(
+                QEmbeddableInterfaceTest_EmbeddableInterface.class,
+                QEmbeddableInterfaceTest_EntityClass.entityClass.children.any().getClass());
+    }
+
+    @Test
+    public void properties() {
+        assertNotNull(QEmbeddableInterfaceTest_EmbeddableInterface.embeddableInterface.name);
+        assertNotNull(QEmbeddableInterfaceTest_EmbeddableClass.embeddableClass.name);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java
new file mode 100644
index 0000000000..83a7cf1c26
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import java.util.List;
+
+import org.junit.Ignore;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+@Ignore
+public class EmbeddableTest {
+
+    @QueryEntity
+    public static class EntityWithEmbedded {
+
+        public WithEntityRef e1;
+
+        public WithStringProp e2;
+
+        public WithEntityAndString e3;
+
+        public WithList e4;
+    }
+
+    @QueryEmbeddable
+    public static class WithEntityRef {
+
+        public AnimalTest.Cat cat;
+
+    }
+
+    @QueryEmbeddable
+    public static class WithStringProp {
+
+        public String str;
+    }
+
+    @QueryEmbeddable
+    public static class WithEntityAndString extends WithEntityRef {
+
+        public String str2;
+
+    }
+
+    @QueryEmbeddable
+    public static class WithList extends WithStringProp {
+
+        public List<AnimalTest.Cat> cats;
+
+        public String str3;
+
+    }
+
+    @QueryEntity
+    @QueryEmbeddable
+    public static class EntityAndEmbeddable {
+
+    }
+
+    @QuerySupertype
+    @QueryEmbeddable
+    public static class SuperclassAndEmbeddable {
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embedded2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embedded2Test.java
new file mode 100644
index 0000000000..c8881699f1
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Embedded2Test.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+public class Embedded2Test {
+
+    @MappedSuperclass
+    public static class EntityCode {
+
+        @Column(name = "code", unique = true)
+        String code;
+
+    }
+
+    @MappedSuperclass
+    public abstract static class AbstractEntity<C extends EntityCode> {
+
+        @Embedded
+        @Column(name = "code", nullable = false, unique = true)
+        C code;
+
+    }
+
+    @MappedSuperclass
+    public static class AbstractMultilingualEntity<C extends EntityCode> extends AbstractEntity<C> {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class AbstractNamedEntity<C extends EntityCode> extends AbstractMultilingualEntity<C> {
+
+        @Column(name = "name_en", nullable = false)
+        String nameEn;
+
+        @Column(name = "name_nl")
+        String nameNl;
+
+    }
+
+    @javax.persistence.Entity
+    public static class Brand extends AbstractNamedEntity<BrandCode> {
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        @Column(name = "brand_id")
+        Long id;
+
+    }
+
+    public interface Entity<T> extends Serializable {
+
+        boolean sameIdentityAs(T other);
+
+    }
+
+    @Embeddable
+    public static class BrandCode extends EntityCode {
+
+    }
+
+    @Test
+    public void test() {
+        // TODO
+    }
+
+
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java
new file mode 100644
index 0000000000..b38f1dfd7d
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+public class EmbeddedTest {
+
+    @Entity
+    public static class EntityClass extends AbstractEntity<SubEntityCode> {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class AbstractEntity<C extends EntityCode> {
+
+        @Embedded
+        @Column(name = "code", nullable = false, unique = true)
+        C code;
+    }
+
+    @MappedSuperclass
+    public static class EntityCode {
+
+        @Column(name = "code", unique = true)
+        String code;
+
+    }
+
+    @Embeddable
+    public static class SubEntityCode extends EntityCode {
+
+        String property;
+
+    }
+
+    @Test
+    public void entityClass() {
+        assertNotNull(QEmbeddedTest_EntityClass.entityClass.code.property);
+        assertEquals(SubEntityCode.class, QEmbeddedTest_EntityClass.entityClass.code.getType());
+    }
+
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java
new file mode 100644
index 0000000000..4dd4a86311
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EntityInheritanceTest {
+
+    @MappedSuperclass
+    public static class TreeEntity<T extends TreeEntity<T>> {
+
+        Integer id;
+
+        T parent;
+
+    }
+
+    @Entity
+    public static class TestEntity extends TreeEntity<TestEntity> {
+
+        String name;
+
+    }
+
+    @Test
+    public void test() {
+        Assert.assertEquals(
+                QEntityInheritanceTest_TestEntity.class,
+                QEntityInheritanceTest_TestEntity.testEntity.parent.getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/EntityTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityTest.java
similarity index 76%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/EntityTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityTest.java
index c563df6b35..69fd3c7e28 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/EntityTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EntityTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.PathInits;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.PathInits;
 
 public class EntityTest extends AbstractTest {
 
@@ -71,14 +71,14 @@ public static class Supertype {
     public static class Supertype2 extends Supertype {
 
     }
-    
+
     @Test
-    public void Initialization_Depth() {
+    public void initialization_depth() {
         assertNotNull(QEntityTest_Entity1.entity1.entity1Ref.entity1Ref.entity1Field);
     }
 
     @Test
-    public void Inheritance() {
+    public void inheritance() {
         assertNotNull(entity3.entity3Ref.entity2Ref);
         assertNotNull(entity3.entity3Ref.entity3Ref);
 
@@ -87,7 +87,7 @@ public void Inheritance() {
     }
 
     @Test
-    public void SupertypePaths() {
+    public void supertype_paths() {
         assertNotNull(entity3.superTypeEntityRef.entity2Ref);
         assertNotNull(entity3._super.superTypeEntityRef.entity2Ref);
         assertNotNull(entity3._super._super.superTypeEntityRef.entity2Ref);
@@ -96,8 +96,8 @@ public void SupertypePaths() {
     }
 
     @Test
-    public void Constructors() throws SecurityException, NoSuchMethodException {
-        Class[] types = new Class[]{Class.class, PathMetadata.class, PathInits.class};
+    public void constructors() throws SecurityException, NoSuchMethodException {
+        Class<?>[] types = new Class<?>[]{Class.class, PathMetadata.class, PathInits.class};
         QEntityTest_Entity1.class.getConstructor(types);
         QEntityTest_Entity2.class.getConstructor(types);
         QEntityTest_Entity3.class.getConstructor(types);
@@ -106,9 +106,9 @@ public void Constructors() throws SecurityException, NoSuchMethodException {
         QEntityTest_Supertype2.class.getConstructor(types);
     }
 
-    @Test(expected=NoSuchMethodException.class)
-    public void Constructors2() throws SecurityException, NoSuchMethodException {
-        Class[] types = new Class[]{Class.class, PathMetadata.class, PathInits.class};
+    @Test(expected = NoSuchMethodException.class)
+    public void constructors2() throws SecurityException, NoSuchMethodException {
+        Class<?>[] types = new Class<?>[]{Class.class, PathMetadata.class, PathInits.class};
         QEntityTest_EntityNoReferences.class.getConstructor(types);
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum2Test.java
new file mode 100644
index 0000000000..1cf8060470
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum2Test.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.junit.Ignore;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@Ignore
+public class Enum2Test {
+
+    @QueryEntity
+    public abstract static class EnumPermissions<P extends Enum<P> & Permission> extends EntityImpl implements Permissions<P> {
+
+    }
+
+    @QueryEntity
+    public abstract static class EntityImpl {
+
+    }
+
+    public interface Permission {
+
+    }
+
+    public interface Permissions<P> {
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum3Test.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum3Test.java
index 7ce0d028a4..851cd7238b 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum3Test.java
@@ -1,8 +1,9 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.Enumerated;
-import java.io.Serializable;
 
 import org.junit.Test;
 
@@ -12,7 +13,7 @@ public interface BaseInterface extends Serializable {
         String getFoo();
         String getBar();
     }
-    
+
     public enum EnumImplementation implements SpecificInterface {
         FOO,
         BAR;
@@ -27,49 +28,49 @@ public String getBar() {
             return name();
         }
     }
-    
+
     public interface SpecificInterface extends BaseInterface {
         EnumImplementation getValue();
     }
-    
+
     @Entity
     public static class Entity1 {
-        
+
         @Enumerated(javax.persistence.EnumType.STRING)
         private EnumImplementation value;
-        
+
         public SpecificInterface getValue() {
             return value;
         }
 
     }
-    
+
     @Entity
     public static class Entity2 {
-        
+
         private EnumImplementation value;
-        
+
         @Enumerated(javax.persistence.EnumType.STRING)
         public SpecificInterface getValue() {
             return value;
         }
 
     }
-    
+
     @Entity
     public static class Entity3 {
-        
+
         private EnumImplementation value;
-        
+
         public SpecificInterface getValue() {
             return value;
         }
 
     }
-    
+
     @Test
     public void test() {
-        
+
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum4Test.java
similarity index 90%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Enum4Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum4Test.java
index 2c370f6321..74b7735ed1 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Enum4Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Enum4Test.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -9,7 +9,7 @@
 public class Enum4Test {
 
     @Entity
-    public static class Product{
+    public static class Product {
         @Id
         long objectId;
 
@@ -40,7 +40,7 @@ public enum ExportUnit {
         private final int code;
         private final Integer factor; // to minutes
 
-        private ExportUnit(int code, Integer factor) {
+        ExportUnit(int code, Integer factor) {
             this.code = code;
             this.factor = factor;
         }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/EnumTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EnumTest.java
new file mode 100644
index 0000000000..8450c57692
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/EnumTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class EnumTest {
+
+    @QueryEntity
+    public enum Gender {
+        MALE,
+        FEMALE
+    }
+
+    @QueryEmbeddable
+    public enum Gender2 {
+        MALE,
+        FEMALE
+    }
+
+    @QueryEntity
+    public static class Bean {
+        Gender gender;
+    }
+
+    @Test
+    public void enum_as_comparable() {
+        assertNotNull(QEnumTest_Gender.gender.asc());
+    }
+
+    @Test
+    public void enumOrdinal_as_comparable() {
+        assertNotNull(QEnumTest_Gender.gender.ordinal().asc());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExampleEntity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExampleEntity.java
new file mode 100644
index 0000000000..fec6002809
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExampleEntity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class ExampleEntity {
+
+    String name;
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Examples.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Examples.java
new file mode 100644
index 0000000000..cf7646de2b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Examples.java
@@ -0,0 +1,77 @@
+package com.querydsl.apt.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.OrderSpecifier;
+
+public class Examples {
+
+    public static class Supertype {
+
+        String supertypeProperty;
+    }
+
+    @QueryEntity
+    public static class SimpleEntity extends Supertype {
+
+    }
+
+    @QueryEntity
+    public abstract static class AbstractEntity<Id extends java.io.Serializable> {
+
+        Id id;
+
+        String first;
+
+    }
+
+    @QueryEntity
+    public static class SubEntity extends AbstractEntity<java.lang.Long> {
+
+        String second;
+
+    }
+
+    @QueryEntity
+    public static class ComplexCollections {
+
+        @QueryEmbedded
+        List<Complex<String>> list;
+
+        @QueryEmbedded
+        Map<String, Complex<String>> map;
+
+        @QueryEmbedded
+        Map<String, Complex<?>> map2;
+
+        @QueryEmbedded
+        Map<?, Complex<String>> map3;
+
+    }
+
+    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
+
+        T a;
+
+        @Override
+        public int compareTo(Complex<T> arg0) {
+            return 0;
+        }
+
+        public boolean equals(Object o) {
+            return o == this;
+        }
+    }
+
+    @QueryEntity
+    public static class OrderBys {
+
+        @QueryEmbedded
+        List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java
new file mode 100644
index 0000000000..c8d0874dec
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryExclude;
+
+@QueryExclude
+@QueryEntity
+public class ExcludedClassTest {
+
+    @QueryExclude
+    @QueryEntity
+    public static class InnerClass {
+
+    }
+
+    @Test(expected = ClassNotFoundException.class)
+    public void outerClass() throws ClassNotFoundException {
+        Class.forName(getClass().getPackage().getName() + ".Q" + getClass().getSimpleName());
+    }
+
+    @Test(expected = ClassNotFoundException.class)
+    public void innerClass() throws ClassNotFoundException {
+        Class.forName(getClass().getPackage().getName() + ".QExcludedClassTest_InnerClass");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Expression.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Expression.java
new file mode 100644
index 0000000000..a585866af7
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Expression.java
@@ -0,0 +1,8 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Expression {
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExpressionTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ExpressionTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java
index ede41b10ba..86ce0d67b1 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExpressionTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExpressionTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,22 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 import org.junit.Test;
 
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.StringExpression;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.StringExpression;
 
 public class ExpressionTest {
 
@@ -61,26 +57,24 @@ public void test() throws Throwable {
 
         exprs.add(ConstantImpl.create("Hello World!"));
         exprs.add(ConstantImpl.create(1000));
-        exprs.add(ConstantImpl.create(10l));
+        exprs.add(ConstantImpl.create(10L));
         exprs.add(ConstantImpl.create(true));
         exprs.add(ConstantImpl.create(false));
 
-        Set<Expression<?>> toVisit = new HashSet<Expression<?>>();
-
         // all entities
-        toVisit.addAll(exprs);
+        Set<Expression<?>> toVisit = new HashSet<Expression<?>>(exprs);
         // and all their direct properties
         for (Expression<?> expr : exprs) {
             for (Field field : expr.getClass().getFields()) {
                 Object rv = field.get(expr);
                 if (rv instanceof Expression) {
                     if (rv instanceof StringExpression) {
-                        StringExpression str = (StringExpression)rv;
+                        StringExpression str = (StringExpression) rv;
                         toVisit.add(str.toLowerCase());
                         toVisit.add(str.charAt(0));
                         toVisit.add(str.isEmpty());
                     } else if (rv instanceof BooleanExpression) {
-                        BooleanExpression b = (BooleanExpression)rv;
+                        BooleanExpression b = (BooleanExpression) rv;
                         toVisit.add(b.not());
                     }
                     toVisit.add((Expression<?>) rv);
@@ -92,8 +86,12 @@ public void test() throws Throwable {
 
         for (Expression<?> expr : toVisit) {
             for (Method method : expr.getClass().getMethods()) {
-                if (method.getName().equals("getParameter")) continue;
-                if (method.getName().equals("getArg")) continue;
+                if (method.getName().equals("getParameter")) {
+                    continue;
+                }
+                if (method.getName().equals("getArg")) {
+                    continue;
+                }
                 if (method.getReturnType() != void.class
                  && !method.getReturnType().isPrimitive()) {
                     Class<?>[] types = method.getParameterTypes();
@@ -102,7 +100,7 @@ public void test() throws Throwable {
                         args = new Object[0];
                     } else if (types.length == 1) {
                         if (types[0] == int.class) {
-                            args = new Object[]{Integer.valueOf(1)};
+                            args = new Object[]{1};
                         } else if (types[0] == boolean.class) {
                             args = new Object[]{Boolean.TRUE};
                         } else {
@@ -114,14 +112,14 @@ public void test() throws Throwable {
                     }
                     Object rv = method.invoke(expr, args);
                     if (method.invoke(expr, args) != rv) {
-                        failures.add(expr.getClass().getSimpleName()+"."+method.getName()+" is unstable");
+                        failures.add(expr.getClass().getSimpleName() + "." + method.getName() + " is unstable");
                     }
                 }
             }
         }
 
         if (failures.size() > 0) {
-            System.err.println("Got "+failures.size()+" failures\n");
+            System.err.println("Got " + failures.size() + " failures\n");
         }
         for (String failure : failures) {
             System.err.println(failure);
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExtendsAndSuperTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ExtendsAndSuperTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java
index ab6416dcdd..ce998a0d13 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExtendsAndSuperTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,12 +23,12 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class ExtendsAndSuperTest {
 
     @QueryEntity
-    public static class ExtendsAndSuper<A>{
+    public static class ExtendsAndSuper<A> {
         // col
         Collection<? extends A> extendsCol;
         Collection<? extends CharSequence> extendsCol2;
@@ -55,7 +55,7 @@ public static class ExtendsAndSuper<A>{
     }
 
     @Test
-    public void Validate() {
+    public void validate() {
         QExtendsAndSuperTest_ExtendsAndSuper var = QExtendsAndSuperTest_ExtendsAndSuper.extendsAndSuper;
         assertEquals(Object.class, var.extendsCol.getElementType());
         assertEquals(CharSequence.class, var.extendsCol2.getElementType());
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java
new file mode 100644
index 0000000000..f439330b8b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+
+import org.junit.Ignore;
+
+import com.querydsl.core.domain.EmbeddableWithoutQType;
+
+@Ignore
+public class ExternalEmbeddableTest {
+
+    @Entity
+    public static class EntityWithExternalEmbeddable {
+
+        @Embedded
+        EmbeddableWithoutQType embeddable;
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java
similarity index 76%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java
index 01b839f4d9..2c71cc8063 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExternalEntityTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,24 +11,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.AbstractEntity;
 
 public class ExternalEntityTest {
 
     @QueryEntity
     public static class MyEntity extends AbstractEntity<MyEntity> {
-        
+
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QExternalEntityTest_MyEntity.myEntity.id);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/FileAttachment.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/FileAttachment.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/FileAttachment.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/FileAttachment.java
index 66d90e7115..a06bb6e9ce 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/FileAttachment.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/FileAttachment.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.io.File;
 
@@ -6,7 +6,6 @@
 import javax.persistence.Transient;
 
 @Embeddable
-@Deprecated
 public class FileAttachment {
 
     @Transient
@@ -41,12 +40,10 @@ public static File getStore() {
         return null;
     }
 
-    @Deprecated
     public boolean exists() {
         return isSet();
     }
 
-    @Deprecated
     public long length() {
         return get().length();
     }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic10Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic10Test.java
new file mode 100644
index 0000000000..d98a7abcf0
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic10Test.java
@@ -0,0 +1,51 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+
+import org.junit.Test;
+
+public class Generic10Test extends AbstractTest {
+
+    public interface Tradable { }
+
+    public interface Market<T extends Tradable> { }
+
+    @Entity
+    public static class FutureTrade implements Tradable { }
+
+    @MappedSuperclass
+    public abstract static class AbstractTradingMarket<T extends Tradable> implements Market<T> {
+
+        @OneToOne
+        private TradingMarketLedger<AbstractTradingMarket<T>> ledger;
+    }
+
+    @Entity
+    public abstract static class AbstractFuturesMarket extends AbstractTradingMarket<FutureTrade> { }
+
+    @Entity
+    public static class CommonFuturesMarket extends AbstractFuturesMarket { }
+
+    @Entity
+    public static class TradingMarketLedger<M extends Market<? extends Tradable>> { }
+
+    @Test
+    public void test() {
+        assertNotNull(QGeneric10Test_FutureTrade.futureTrade);
+
+        start(QGeneric10Test_AbstractTradingMarket.class, QGeneric10Test_AbstractTradingMarket.abstractTradingMarket);
+        assertPresent("ledger");
+
+        start(QGeneric10Test_AbstractFuturesMarket.class, QGeneric10Test_AbstractFuturesMarket.abstractFuturesMarket);
+        assertPresent("ledger");
+
+        start(QGeneric10Test_CommonFuturesMarket.class, QGeneric10Test_CommonFuturesMarket.commonFuturesMarket);
+        assertPresent("ledger");
+
+        start(QGeneric10Test_TradingMarketLedger.class, QGeneric10Test_TradingMarketLedger.tradingMarketLedger);
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic11Test.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic11Test.java
index a3ab6a2411..0c492e184f 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic11Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic11Test.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
@@ -6,21 +6,21 @@
 import org.junit.Test;
 
 public class Generic11Test {
-    
-    // 1    
+
+    // 1
     public interface WhatEver { }
-    
+
     @Entity
     public static class A<T extends WhatEver> { }
-    
+
     @Entity
     public static class B extends A { } // note the missing type parameter
-    
-    
-    // 2    
+
+
+    // 2
     @MappedSuperclass
-    public static abstract class WhatEver2 { } 
-    
+    public abstract static class WhatEver2 { }
+
     @Entity
     public static class A2<T extends WhatEver2> { }
 
@@ -29,7 +29,7 @@ public static class B2 extends A2 { } // note the missing type parameter
 
     @Test
     public void test() {
-        
+
     }
 
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic12Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic12Test.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Generic12Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic12Test.java
index d2b1e59e7a..7f788c5a05 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic12Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic12Test.java
@@ -1,25 +1,20 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.ManyToMany;
+import javax.persistence.*;
 
 import org.junit.Test;
 
-import com.google.common.collect.Lists;
-
 public class Generic12Test {
 
     @Entity
     @Inheritance
     @DiscriminatorColumn(name = "CONTEXT")
-    public static abstract class Permission {
+    public abstract static class Permission {
         // some common stuff
     }
 
@@ -40,10 +35,10 @@ public static class SubjectPermission extends Permission {
     @Entity
     @Inheritance
     @DiscriminatorColumn(name = "CONTEXT")
-    public static abstract class Role<T extends Permission> {
+    public abstract static class Role<T extends Permission> {
 
         @ManyToMany(targetEntity = Permission.class)
-        private final List<T> permissions = Lists.newArrayList();
+        private final List<T> permissions = new ArrayList<>();
 
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic13Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic13Test.java
new file mode 100644
index 0000000000..6452e0c1c9
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic13Test.java
@@ -0,0 +1,37 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+public class Generic13Test extends AbstractTest {
+
+    @QueryEntity
+    public static class GenericBase<T extends AnotherClass> {
+        T t;
+    }
+
+    @QueryEntity
+    public static class GenericBaseSubclass<P> extends GenericBase<AnotherClass> {
+        P p;
+    }
+
+    @QueryEntity
+    public static class Subclass extends GenericBaseSubclass<Number> {
+    }
+
+    public static class AnotherClass {
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        start(QGeneric13Test_GenericBase.class, QGeneric13Test_GenericBase.genericBase);
+        matchType(AnotherClass.class, "t");
+
+        start(QGeneric13Test_GenericBaseSubclass.class, QGeneric13Test_GenericBaseSubclass.genericBaseSubclass);
+        matchType(Object.class, "p");
+
+        start(QGeneric13Test_Subclass.class, QGeneric13Test_Subclass.subclass);
+        matchType(Number.class, "p");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic14Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic14Test.java
new file mode 100644
index 0000000000..4b2d3a6b69
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic14Test.java
@@ -0,0 +1,75 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic14Test extends AbstractTest {
+
+    @Entity
+    public static class UserAccount extends BaseReferencablePersistable<UserAccount, Long> {
+
+        public UserAccount() {
+            super(UserAccount.class);
+        }
+
+    }
+
+    @MappedSuperclass
+    public abstract static class BaseReferencablePersistable<T, PK extends Serializable> extends BasePersistable<PK> {
+
+        private Class<T> entityClass;
+
+        public BaseReferencablePersistable(Class<T> entityClass) {
+            this.entityClass = entityClass;
+        }
+
+    }
+
+    @MappedSuperclass
+    public static class BasePersistable<T extends Serializable> extends AbstractPersistable<T> implements UpdateInfo {
+
+        private T id;
+
+        @Override
+        public T getId() {
+            return id;
+        }
+
+    }
+
+    @MappedSuperclass
+    public abstract static class AbstractPersistable<PK extends Serializable> implements Persistable<PK> {
+
+    }
+
+    public interface Persistable<T> {
+
+        T getId();
+
+    }
+
+    public interface UpdateInfo {
+
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        assertNotNull(QGeneric14Test_AbstractPersistable.abstractPersistable);
+
+        start(QGeneric14Test_BasePersistable.class, QGeneric14Test_BasePersistable.basePersistable);
+        matchType(Serializable.class, "id");
+
+        start(QGeneric14Test_BaseReferencablePersistable.class, QGeneric14Test_BaseReferencablePersistable.baseReferencablePersistable);
+        matchType(Class.class, "entityClass");
+        matchType(Serializable.class, "id");
+
+        start(QGeneric14Test_UserAccount.class, QGeneric14Test_UserAccount.userAccount);
+        matchType(Long.class, "id");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic15Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic15Test.java
new file mode 100644
index 0000000000..83924cc6b1
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic15Test.java
@@ -0,0 +1,41 @@
+package com.querydsl.apt.domain;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic15Test extends AbstractTest {
+
+    @MappedSuperclass
+    public abstract static class Compound<T extends Containable> {
+
+        private Set<T> containables = new HashSet<T>();
+    }
+
+    @MappedSuperclass
+    public abstract static class Containable<T extends Compound> {
+
+        private T compound;
+    }
+
+    @Entity
+    public static class MyCompound extends Compound<MyContainable> {
+    }
+
+    @Entity
+    public static class MyContainable extends Containable<MyCompound> {
+
+        private String additionalField;
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        start(QGeneric15Test_MyContainable.class, QGeneric15Test_MyContainable.myContainable);
+        match(QGeneric15Test_MyCompound.class, "compound");
+        matchType(MyCompound.class, "compound");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic16Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic16Test.java
new file mode 100644
index 0000000000..f64d2eb8e6
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic16Test.java
@@ -0,0 +1,50 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic16Test extends AbstractTest {
+
+    @Entity
+    public abstract static class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
+
+    }
+
+    @Entity
+    public abstract static class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends CapiBCKeyedByGrundstueck {
+
+        SortedSet<B> bez = new TreeSet<B>();
+
+    }
+
+    @MappedSuperclass
+    public abstract static class CapiBCKeyedByGrundstueck extends CapiBusinessClass {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class CapiBusinessClass implements ICapiBusinessClass {
+
+    }
+
+    public interface ICapiBusinessClass extends Comparable<ICapiBusinessClass> {
+
+
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(QGeneric16Test_HidaBez.hidaBez);
+        assertNotNull(QGeneric4Test_HidaBezGruppe.hidaBezGruppe);
+        assertTrue(QGeneric16Test_HidaBezGruppe.hidaBezGruppe.bez.getElementType().equals(HidaBez.class));
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic2Test.java
new file mode 100644
index 0000000000..447c9bf25d
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic2Test.java
@@ -0,0 +1,61 @@
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic2Test extends AbstractTest {
+
+    public static class Range<T extends Comparable<? super T>> {
+        private T min;
+        private T max;
+
+        public T getMin() {
+            return min;
+        }
+
+        public void setMin(T min) {
+            this.min = min;
+        }
+
+        public T getMax() {
+            return max;
+        }
+
+        public void setMax(T max) {
+            this.max = max;
+        }
+    }
+
+    @MappedSuperclass
+    public abstract static class BaseEntity<T extends Comparable<? super T>> implements
+            Serializable {
+        @Embedded
+        private Range<T> range;
+
+        public Range<T> getRange() {
+            return range;
+        }
+
+        public void setRange(Range<T> range) {
+            this.range = range;
+        }
+    }
+
+    @Entity
+    public static class Foo extends BaseEntity<Integer> {
+
+    }
+
+    @Test
+    public void test() throws NoSuchFieldException {
+        start(QGeneric2Test_Foo.class, QGeneric2Test_Foo.foo);
+        assertPresent("range");
+        match(QGeneric2Test_Range.class, "range");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic3Test.java
new file mode 100644
index 0000000000..c621110a6b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic3Test.java
@@ -0,0 +1,36 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.StringPath;
+
+public class Generic3Test extends AbstractTest {
+
+    @MappedSuperclass
+    public abstract static class BaseEntity<E extends BaseEntity<E>> {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class Order<O extends Order<O>> extends BaseEntity<O> implements Cloneable {
+
+        String property1;
+    }
+
+    @Entity
+    public static class MyOrder<O extends MyOrder<O>> extends Order<O> {
+
+        String property2;
+    }
+
+    @Test
+    public void test() throws NoSuchFieldException {
+        start(QGeneric3Test_MyOrder.class, QGeneric3Test_MyOrder.myOrder);
+        match(StringPath.class, "property1");
+        match(StringPath.class, "property2");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic4Test.java
new file mode 100644
index 0000000000..be6cc75021
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic4Test.java
@@ -0,0 +1,30 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic4Test {
+
+    @MappedSuperclass
+    public abstract static class CapiBCKeyedByGrundstueck {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends
+            CapiBCKeyedByGrundstueck {
+
+    }
+
+    @Test
+    public void test() {
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic5Test.java
similarity index 82%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic5Test.java
index 45f40be89b..8d5bf66b95 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic5Test.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
@@ -6,35 +6,35 @@
 import org.junit.Test;
 
 public class Generic5Test {
-    
+
     @MappedSuperclass
     public static class Base<B extends Base<B>> {
-        
+
     }
-    
+
     @Entity
     public static class Entity1<T extends Entity1<T>> {
-        
+
     }
-    
+
     @Entity
     public static class Entity2 extends Entity1<Entity2> {
-        
+
     }
-    
+
     @Entity
     public static class Entity3<T extends Entity3<T>> extends Base<T> {
-        
+
     }
-    
+
     @Entity
     public static class Entity4 extends Entity3<Entity4> {
-        
+
     }
-        
+
     @Test
     public void test() {
-        
+
     }
 
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic6Test.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic6Test.java
index 01d278770b..d1bd4497c6 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic6Test.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import javax.persistence.Entity;
 
@@ -8,9 +8,9 @@ public class Generic6Test {
 
     @Entity
     public static class Cycle2<T extends Cycle1<?,?>> {
-        
+
     }
-    
+
     @Entity
     public static class Cycle1<U extends Comparable<U>, T extends Cycle2<?>> implements Comparable<Cycle1<U, T>> {
 
@@ -18,12 +18,12 @@ public static class Cycle1<U extends Comparable<U>, T extends Cycle2<?>> impleme
         public int compareTo(Cycle1<U, T> o) {
             return 0;
         }
-        
+
     }
-    
+
     @Test
     public void test() {
-    
+
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic7Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic7Test.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Generic7Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic7Test.java
index 9429f05faf..9f055af4cf 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic7Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic7Test.java
@@ -1,11 +1,11 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.util.Collection;
 import java.util.List;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class Generic7Test {
 
@@ -30,10 +30,10 @@ public static class Product {
         ListAttribute<String> stringAttributes;
 
     }
-    
+
     @Test
     public void test() {
-        
+
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic8Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic8Test.java
new file mode 100644
index 0000000000..2aba2456f5
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic8Test.java
@@ -0,0 +1,52 @@
+package com.querydsl.apt.domain;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class Generic8Test {
+
+    @QuerySupertype
+    public static class Superclass<T> {
+
+        Long id;
+
+        List<T> values;
+
+        List<? extends T> values2;
+
+    }
+
+    @QueryEntity
+    public static class IntermediateEntity<E> extends Superclass<E> {
+
+    }
+
+    @QueryEntity
+    public static class Entity extends Superclass<String> {
+
+    }
+
+
+    @QueryEntity
+    public static class Entity2 extends Superclass<Integer> {
+
+    }
+
+    @QueryEntity
+    public static class Entity3 extends IntermediateEntity<String> {
+
+    }
+
+    @Test
+    public void test() {
+        Assert.assertEquals(String.class, QGeneric8Test_Entity.entity.values.getElementType());
+        Assert.assertEquals(Integer.class, QGeneric8Test_Entity2.entity2.values.getElementType());
+        Assert.assertEquals(String.class, QGeneric8Test_Entity3.entity3.values.getElementType());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic9Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic9Test.java
new file mode 100644
index 0000000000..a24c47945f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Generic9Test.java
@@ -0,0 +1,66 @@
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+public class Generic9Test {
+
+    @MappedSuperclass
+    public abstract static class CommonOrganizationalUnit<T extends EntityLocalized, E extends TenantPreference, P extends CommonOrganizationalUnit<?, ?, ?>> extends
+        LocalizableEntity<T> implements Serializable, Comparable<CommonOrganizationalUnit<T, E, P>> {
+
+        P parent;
+
+//        CommonOrganizationalUnit<?,?,?> parent2;
+//
+//        CommonOrganizationalUnit<T,E,P> parent3;
+
+    }
+
+    @MappedSuperclass
+    public abstract static class ProductionSurface<T extends EntityLocalized, E extends TenantPreference, P extends CommonOrganizationalUnit<?, ?, ?>> extends
+        CommonOrganizationalUnit<T, E, P> implements Serializable {
+
+    }
+
+//    @Entity
+//    public class Building extends ProductionSurface<BuildingLocalized, BuildingPreference, Site> {
+//
+//    }
+
+    @MappedSuperclass
+    public abstract static class EntityLocalized extends CommonEntity {
+
+    }
+
+    @Entity
+    public static class Preference {
+
+    }
+
+    @Entity
+    @Table(name = "preference")
+    @DiscriminatorColumn(name = "discriminator", discriminatorType = DiscriminatorType.STRING)
+    public abstract static class TenantPreference extends Preference {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class CommonEntity {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class LocalizableEntity<T extends EntityLocalized> extends CommonEntity {
+
+    }
+
+    @Test
+    public void test() {
+        new QGeneric9Test_CommonOrganizationalUnit("test");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/GenericSignatureTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/GenericSignatureTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java
index 27845dc69a..4c675fdfa1 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/GenericSignatureTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,43 +22,43 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class GenericSignatureTest {
-    
+
     @QueryEntity
     @SuppressWarnings("unchecked")
     public static class Entity<T extends Entity<T>> {
-        
-        // collection        
-        Collection<Entity> rawCollection;       
-        
-        Collection<Entity<T>> genericCollection;        
-        
+
+        // collection
+        Collection<Entity> rawCollection;
+
+        Collection<Entity<T>> genericCollection;
+
         Collection<T> genericCollection2;
-        
+
         // list
-        List<Entity> rawList;        
-        
-        List<Entity<T>> genericList;        
-        
+        List<Entity> rawList;
+
+        List<Entity<T>> genericList;
+
         List<T> genericList2;
-        
+
         // set
-        Set<Entity> rawSet;        
-        
-        Set<Entity<T>> genericSet;        
-        
+        Set<Entity> rawSet;
+
+        Set<Entity<T>> genericSet;
+
         Set<T> genericSet2;
-        
+
         // map
-        Map<String,Entity> rawMap;        
-        
-        Map<String,Entity<T>> genericMap;        
-        
+        Map<String,Entity> rawMap;
+
+        Map<String,Entity<T>> genericMap;
+
         Map<String,T> genericMap2;
     }
-    
+
     @Test
     public void test() {
         QGenericSignatureTest_Entity entity = QGenericSignatureTest_Entity.entity;
@@ -66,17 +66,17 @@ public void test() {
         assertEquals(Entity.class, entity.rawCollection.getParameter(0));
         assertEquals(Entity.class, entity.genericCollection.getParameter(0));
         assertEquals(Entity.class, entity.genericCollection2.getParameter(0));
-        
+
         // list
         assertEquals(Entity.class, entity.rawList.getParameter(0));
         assertEquals(Entity.class, entity.genericList.getParameter(0));
         assertEquals(Entity.class, entity.genericList2.getParameter(0));
-        
+
         // set
         assertEquals(Entity.class, entity.rawSet.getParameter(0));
         assertEquals(Entity.class, entity.genericSet.getParameter(0));
         assertEquals(Entity.class, entity.genericSet2.getParameter(0));
-        
+
         // map
         assertEquals(Entity.class, entity.rawMap.getParameter(1));
         assertEquals(Entity.class, entity.genericMap.getParameter(1));
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java
new file mode 100644
index 0000000000..8b435d8168
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class GenericStackOverflowTest extends AbstractTest {
+
+    public interface Identifiable<ID extends Comparable<ID> & Serializable> {
+    }
+
+    @QuerySupertype
+    public abstract static class AbstractEntity<ID extends Comparable<ID> & Serializable> implements Identifiable<ID> {
+    }
+
+    @QueryEntity
+    public static class TestEntity extends AbstractEntity<Long> {
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(QGenericStackOverflowTest_AbstractEntity.abstractEntity);
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericTest.java
new file mode 100644
index 0000000000..02c706276f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/GenericTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Date;
+
+import org.junit.Test;
+
+import com.querydsl.apt.domain.rel.SimpleType;
+import com.querydsl.apt.domain.rel.SimpleType2;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryTransient;
+
+public class GenericTest extends AbstractTest {
+
+    @QueryEntity
+    public static class GenericType<T extends ItemType> {
+        T itemType;
+    }
+
+    @QueryEntity
+    @SuppressWarnings("unchecked")
+    public static class GenericType2<T extends ItemType> {
+        T itemType;
+
+        // simple
+        GenericSimpleType prop1;
+        GenericSimpleType<?> prop2;
+        GenericSimpleType<? extends GenericSimpleType<?>> prop3;
+
+        // comparable
+        GenericComparableType comp1;
+        GenericComparableType<Number> comp2;
+        GenericComparableType<Date> comp3;
+
+        // number
+
+        @QueryTransient
+        GenericNumberType num1; // NOTE : doesn't work!
+
+        GenericNumberType<Number> num2;
+        GenericNumberType<Date> num3;
+    }
+
+    public static class GenericSimpleType<T extends GenericSimpleType<T>> {
+
+    }
+
+    @SuppressWarnings("unchecked")
+    public static class GenericComparableType<T> implements Comparable<GenericComparableType<T>> {
+        @Override
+        public int compareTo(GenericComparableType<T> o) {
+            return 0;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof GenericComparableType;
+        }
+    }
+
+    @SuppressWarnings({ "unchecked", "serial" })
+    public static class GenericNumberType<T> extends Number implements Comparable<GenericNumberType<T>> {
+        @Override
+        public double doubleValue() {
+            return 0;
+        }
+        @Override
+        public float floatValue() {
+            return 0;
+        }
+        @Override
+        public int intValue() {
+            return 0;
+        }
+        @Override
+        public long longValue() {
+            return 0;
+        }
+        @Override
+        public int compareTo(GenericNumberType<T> o) {
+            return 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof GenericNumberType;
+        }
+    }
+
+    @QueryEntity
+    @SuppressWarnings("unchecked")
+    public static class ItemType {
+        Amount<SimpleType> prop;
+        SimpleType2<Amount<SimpleType>> prop2;
+        SimpleType2<Amount> prop3;
+        SimpleType2<?> prop4;
+    }
+
+    public static class Amount<T> {
+
+    }
+
+    @Test
+    public void test() throws NoSuchFieldException, IllegalAccessException {
+        assertNotNull(QGenericTest_ItemType.itemType);
+        assertNotNull(QGenericTest_GenericType.genericType);
+        assertNotNull(QGenericTest_GenericType2.genericType2);
+
+        start(QGenericTest_GenericType.class, QGenericTest_GenericType.genericType);
+        matchType(ItemType.class, "itemType");
+
+        start(QGenericTest_GenericType2.class, QGenericTest_GenericType2.genericType2);
+        matchType(ItemType.class, "itemType");
+        matchType(GenericSimpleType.class, "prop1");
+        matchType(GenericSimpleType.class, "prop2");
+        matchType(GenericSimpleType.class, "prop3");
+        matchType(GenericComparableType.class, "comp1");
+        matchType(GenericComparableType.class, "comp2");
+        matchType(GenericComparableType.class, "comp3");
+        assertMissing("num1");
+        matchType(GenericNumberType.class, "num2");
+        matchType(GenericNumberType.class, "num3");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java
index 3ed97bf269..3d0442e24e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Hierarchy2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import javax.persistence.Basic;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 
 import org.junit.Ignore;
 
@@ -26,7 +21,7 @@
 public class Hierarchy2Test {
 
     @MappedSuperclass
-    public static abstract class SomeMappedSuperClassHavingMyEmbeddable {
+    public abstract static class SomeMappedSuperClassHavingMyEmbeddable {
 
         @Embedded
         MyEmbeddable embeddable;
@@ -55,7 +50,7 @@ public static class MyEmbeddable implements Comparable<MyEmbeddable> {
         public int compareTo(MyEmbeddable individualToCompare) {
             return -1;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/HierarchyTest.java
similarity index 88%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/HierarchyTest.java
index bb394c9d67..80f6d49b06 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/HierarchyTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/HierarchyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
 import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
 
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryType;
 
 public class HierarchyTest {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/InitTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InitTest.java
new file mode 100644
index 0000000000..b88430b343
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InitTest.java
@@ -0,0 +1,49 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import javax.persistence.*;
+
+import static org.junit.Assert.assertNotNull;
+
+public class InitTest {
+
+    @Entity
+    public static class User {
+
+        @ManyToOne(fetch = FetchType.EAGER)
+        private Address address;
+
+    }
+
+    @Entity
+    public static class Address extends AddressBase {
+
+    }
+
+    @MappedSuperclass
+    public abstract static class AddressBase {
+
+        @Id
+        private long idAddress;
+
+        @Id
+        private int numVersion;
+
+        @ManyToOne
+        private City city;
+
+    }
+
+    @Entity
+    public static class City {
+
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(QInitTest_User.user.address.city);
+    }
+
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java
new file mode 100644
index 0000000000..fff4c181cc
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.apt.AbstractProcessorTest;
+import com.querydsl.apt.QuerydslAnnotationProcessor;
+
+public class InnerExtensionsTest extends AbstractProcessorTest {
+
+    private static final String packagePath = "src/test/apt/com/querydsl/";
+
+    @Test
+    public void process() throws IOException {
+        List<String> sources = Arrays.asList(
+                new File(packagePath, "InnerExtensions.java").getPath(),
+                new File(packagePath, "ExampleEntity2.java").getPath());
+        process(QuerydslAnnotationProcessor.class, sources, "innerextensions");
+        String qtypeContent = new String(Files.readAllBytes(Paths.get("target", "innerextensions", "com", "querydsl", "QExampleEntity2.java")), StandardCharsets.UTF_8);
+        assertTrue(qtypeContent.contains("return InnerExtensions.ExampleEntity2Extensions.isZero(this);"));
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java
index 9643c3d176..f57822609e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java
@@ -1,18 +1,9 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.assertEquals;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import org.hibernate.annotations.NaturalId;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class InterfaceType2Test {
@@ -90,7 +81,7 @@ public void setParty(Party party) {
     @Table(name = "PARTY")
     @org.hibernate.annotations.AccessType("field")
     @org.hibernate.annotations.Proxy(proxyClass = Party.class)
-    public static abstract class PartyImpl extends EntityImpl implements Party {
+    public abstract static class PartyImpl extends EntityImpl implements Party {
 
         @Column(name = "NAME", nullable = false)
         private String name;
@@ -108,7 +99,7 @@ public void setName(String name) {
 
     @Test
     public void test() {
-        assertEquals(
+        Assert.assertEquals(
                 QInterfaceType2Test_PartyImpl.class,
                 QInterfaceType2Test_UserImpl.userImpl.party.getClass());
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java
index e0c7e2ffa8..00b8bed962 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/InterfaceType3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java
@@ -1,11 +1,13 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryEntity;
-import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+
 public class InterfaceType3Test {
-    
+
     @QueryEntity
     public interface A {
       String getA();
@@ -20,7 +22,7 @@ public interface B {
     public interface C extends A, B {
       String getC();
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QInterfaceType3Test_C.c1.a);
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java
new file mode 100644
index 0000000000..012eccce47
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class InterfaceTypeTest extends AbstractTest {
+
+    @QueryEntity
+    public interface InterfaceType {
+        InterfaceType getRelation();
+
+        List<InterfaceType> getRelation2();
+
+        List<? extends InterfaceType> getRelation3();
+
+        int getRelation4();
+
+        String getProp();
+    }
+
+    @QueryEntity
+    public interface InterfaceType2 {
+
+        String getProp2();
+
+    }
+
+    @QueryEntity
+    public interface InterfaceType3 extends InterfaceType, InterfaceType2 {
+
+        String getProp3();
+
+    }
+
+    @QueryEntity
+    public interface InterfaceType4 {
+
+        String getProp4();
+
+    }
+
+    @QueryEntity
+    public interface InterfaceType5 extends InterfaceType3, InterfaceType4 {
+
+        String getProp5();
+
+    }
+
+    @Test
+    public void qInterfaceType_relation() throws SecurityException, NoSuchFieldException {
+        start(QInterfaceTypeTest_InterfaceType.class, QInterfaceTypeTest_InterfaceType.interfaceType);
+        match(QInterfaceTypeTest_InterfaceType.class, "relation");
+    }
+
+    @Test
+    public void qInterfaceType_relation2() throws SecurityException, NoSuchFieldException {
+        start(QInterfaceTypeTest_InterfaceType.class, QInterfaceTypeTest_InterfaceType.interfaceType);
+        match(ListPath.class, "relation2");
+    }
+
+    @Test
+    public void qInterfaceType_relation3() throws SecurityException, NoSuchFieldException {
+        start(QInterfaceTypeTest_InterfaceType.class, QInterfaceTypeTest_InterfaceType.interfaceType);
+        match(ListPath.class, "relation3");
+    }
+
+    @Test
+    public void qInterfaceType_relation4() throws SecurityException, NoSuchFieldException {
+        start(QInterfaceTypeTest_InterfaceType.class, QInterfaceTypeTest_InterfaceType.interfaceType);
+        match(NumberPath.class, "relation4");
+    }
+
+    @Test
+    public void qInterfaceType3() throws SecurityException, NoSuchFieldException {
+        Class<?> cl = QInterfaceTypeTest_InterfaceType3.class;
+        cl.getField("prop");
+        cl.getField("prop2");
+        cl.getField("prop3");
+    }
+
+    @Test
+    public void qInterfaceType5() throws SecurityException, NoSuchFieldException {
+        Class<?> cl = QInterfaceTypeTest_InterfaceType5.class;
+        cl.getField("prop");
+        cl.getField("prop2");
+        cl.getField("prop3");
+        cl.getField("prop4");
+        cl.getField("prop5");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/JDOTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JDOTest.java
new file mode 100644
index 0000000000..ffc6e01bab
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JDOTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class JDOTest extends AbstractTest {
+
+    @PersistenceCapable
+    public static class JDOEntity {
+
+        String prop;
+
+        @NotPersistent
+        String skipped;
+
+        @NotPersistent
+        JDOEntity skippedEntity;
+    }
+
+    @PersistenceCapable
+    public static class JDOEntity2 {
+
+        private String stringField1;
+
+        private String stringField2;
+
+        public String getStringfield1() {
+            return stringField1;
+        }
+
+        public String getStringField2() {
+            return stringField2;
+        }
+    }
+
+    @PersistenceCapable
+    public static class JDOEntity3 {
+
+        private Integer integerField;
+
+        private String stringField;
+
+        @PrimaryKey
+        public Integer getId() {
+            return integerField;
+        }
+
+        @Persistent
+        public String getName() {
+            return stringField;
+        }
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        start(QJDOTest_JDOEntity.class, QJDOTest_JDOEntity.jDOEntity);
+        match(StringPath.class, "prop");
+        assertMissing("skipped");
+        assertMissing("skippedEntity");
+
+        start(QJDOTest_JDOEntity2.class, QJDOTest_JDOEntity2.jDOEntity2);
+        match(StringPath.class, "stringField1");
+        assertMissing("stringfield1");
+        match(StringPath.class, "stringField2");
+
+        start(QJDOTest_JDOEntity3.class, QJDOTest_JDOEntity3.jDOEntity3);
+        match(NumberPath.class, "id");
+        matchType(Integer.class, "id");
+        match(StringPath.class, "name");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/JPATest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JPATest.java
new file mode 100644
index 0000000000..e49463d609
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JPATest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.StringPath;
+
+public class JPATest extends AbstractTest {
+
+    @Entity
+    public static class JPAEntity {
+
+        String prop;
+
+        @Transient
+        String skipped;
+
+        @Transient
+        JDOTest.JDOEntity skippedEntity;
+    }
+
+    @Test
+    public void test() throws SecurityException, NoSuchFieldException {
+        start(QJPATest_JPAEntity.class, QJPATest_JPAEntity.jPAEntity);
+        match(StringPath.class, "prop");
+        assertMissing("skipped");
+        assertMissing("skippedEntity");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java
new file mode 100644
index 0000000000..9425c39e1e
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyHelpers.java
@@ -0,0 +1,22 @@
+package com.querydsl.apt.domain;
+
+import java.math.BigDecimal;
+
+import org.joda.money.Money;
+import org.joda.money.QMoney;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public final class JodaMoneyHelpers {
+
+    private JodaMoneyHelpers() { }
+
+    @QueryDelegate(Money.class)
+    public static NumberExpression<BigDecimal> sum(QMoney money) {
+        return Expressions.numberOperation(BigDecimal.class, Ops.AggOps.SUM_AGG, money);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java
similarity index 77%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java
index 9b7a15d6a3..0863132af0 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/JodaMoneyTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -7,7 +7,7 @@
 import org.joda.money.QMoney;
 import org.junit.Test;
 
-import com.mysema.query.types.expr.NumberExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
 
 public class JodaMoneyTest {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTest.java
new file mode 100644
index 0000000000..7e2313fe2f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTest.java
@@ -0,0 +1,40 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.joda.time.DateTime;
+import org.junit.Test;
+
+public class JodaTest {
+
+    @MappedSuperclass
+    @Access(AccessType.FIELD)
+    public abstract static class BaseEntity {
+
+        public abstract Long getId();
+
+        @Temporal(TemporalType.TIMESTAMP)
+        private Date createdDate;
+
+        public boolean isNew() {
+            return null == getId();
+        }
+
+        public DateTime getCreatedDate() {
+            return null == createdDate ? null : new DateTime(createdDate);
+        }
+
+        public void setCreatedDate(DateTime creationDate) {
+            this.createdDate = null == creationDate ? null : creationDate.toDate();
+        }
+    }
+
+    @Test
+    public void test() {
+        assertEquals(Date.class, QJodaTest_BaseEntity.baseEntity.createdDate.getType());
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTimeSupportTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTimeSupportTest.java
new file mode 100644
index 0000000000..8d4f0cfcfe
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/JodaTimeSupportTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.joda.time.*;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.ComparablePath;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.TimePath;
+
+public class JodaTimeSupportTest extends AbstractTest {
+
+    @QueryEntity
+    public static class JodaTimeSupport {
+
+        DateMidnight dateMidnight;
+
+        DateTime dateTime;
+
+        Instant instant;
+
+        LocalDate localDate;
+
+        LocalDateTime localDateTime;
+
+        LocalTime localTime;
+
+        Partial partial;
+
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        start(QJodaTimeSupportTest_JodaTimeSupport.class, QJodaTimeSupportTest_JodaTimeSupport.jodaTimeSupport);
+        match(DateTimePath.class, "dateMidnight");
+        matchType(DateMidnight.class, "dateMidnight");
+        match(DateTimePath.class, "dateTime");
+        matchType(DateTime.class, "dateTime");
+        match(DateTimePath.class, "instant");
+        matchType(Instant.class, "instant");
+        match(DatePath.class, "localDate");
+        matchType(LocalDate.class, "localDate");
+        match(DateTimePath.class, "localDateTime");
+        matchType(LocalDateTime.class, "localDateTime");
+        match(TimePath.class, "localTime");
+        matchType(LocalTime.class, "localTime");
+        match(ComparablePath.class, "partial");
+        matchType(Partial.class, "partial");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/KeywordsTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/KeywordsTest.java
similarity index 76%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/KeywordsTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/KeywordsTest.java
index 53abcc5f02..34fbc262c9 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/KeywordsTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/KeywordsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -47,10 +47,10 @@ public static class Distinct {
 
     @Test
     public void test() {
-        assertEquals("order1",QKeywordsTest_Order.order.toString());
+        assertEquals("order1", QKeywordsTest_Order.order.toString());
         assertEquals("from1", QKeywordsTest_From.from.toString());
-        assertEquals("nonKeyword",QKeywordsTest_NonKeyword.nonKeyword.toString());
-        assertEquals("distinct1",QKeywordsTest_Distinct.distinct1.toString());
+        assertEquals("nonKeyword", QKeywordsTest_NonKeyword.nonKeyword.toString());
+        assertEquals("distinct1", QKeywordsTest_Distinct.distinct1.toString());
     }
 
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java
similarity index 82%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java
index f28a3ff6e9..029e47559e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/LiteralEntityTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.path.EnumPath;
-import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.EnumPath;
+
 public class LiteralEntityTest {
 
     @QueryEntity
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Location.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Location.java
new file mode 100644
index 0000000000..3a6d27813a
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Location.java
@@ -0,0 +1,11 @@
+package com.querydsl.apt.domain;
+
+import java.util.Set;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Location {
+
+    public Set<Path> paths;
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ManagedEmailTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ManagedEmailTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java
index 09541eaefe..8da49c6a2d 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ManagedEmailTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -8,6 +8,7 @@
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ManagedEmailTest {
@@ -34,7 +35,7 @@ public static class ManagedEmails {
 
     @Test
     public void test() {
-        assertEquals(EmailType.class, QManagedEmailTest_ManagedEmails.managedEmails.emails.getKeyType());
+        Assert.assertEquals(EmailType.class, QManagedEmailTest_ManagedEmails.managedEmails.emails.getKeyType());
         assertEquals(ManagedEmailImpl.class, QManagedEmailTest_ManagedEmails.managedEmails.emails.getValueType());
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java
new file mode 100644
index 0000000000..c0547f9ae3
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java
@@ -0,0 +1,34 @@
+package com.querydsl.apt.domain;
+
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ManyToManyTest {
+
+    public interface PhoneNumber {
+
+    }
+
+    @Entity
+    public static class PhoneNumberImpl {
+
+    }
+
+    @Entity
+    public static class Person {
+
+        @ManyToMany(targetEntity = PhoneNumberImpl.class)
+        Set<PhoneNumber> phones;
+    }
+
+    @Test
+    public void test() {
+        Assert.assertEquals(PhoneNumberImpl.class, QManyToManyTest_Person.person.phones.getElementType());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java
new file mode 100644
index 0000000000..5ddbf321f3
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompany.java
@@ -0,0 +1,31 @@
+package com.querydsl.apt.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.domain.CompanyGroup;
+
+@QueryEntity
+public class MonitoredCompany {
+
+    private Long key;
+
+    @QueryInit("mainCompany")
+    private CompanyGroup companyGroup;
+
+    public Long getKey() {
+        return key;
+    }
+
+    public void setKey(final Long aKey) {
+        this.key = aKey;
+    }
+
+    public CompanyGroup getCompanyGroup() {
+        return companyGroup;
+    }
+
+    public void setCompanyGroup(CompanyGroup aCompanyGroup) {
+        this.companyGroup = aCompanyGroup;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java
new file mode 100644
index 0000000000..37c87a78a4
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java
@@ -0,0 +1,16 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class MonitoredCompanyTest {
+
+    @Test
+    public void test() {
+        QMonitoredCompany monitoredCompany = QMonitoredCompany.monitoredCompany;
+        assertNotNull(monitoredCompany.companyGroup);
+        assertNotNull(monitoredCompany.companyGroup.mainCompany);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/NumberTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/NumberTest.java
new file mode 100644
index 0000000000..769d39e9f1
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/NumberTest.java
@@ -0,0 +1,17 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Ignore;
+
+import com.querydsl.apt.domain.custom.CustomNumber;
+import com.querydsl.core.annotations.QueryEntity;
+
+@Ignore
+public class NumberTest {
+
+    @QueryEntity
+    public static class Entity {
+
+        CustomNumber customNumber;
+
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/OneToOneTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/OneToOneTest.java
new file mode 100644
index 0000000000..3821444b1b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/OneToOneTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class OneToOneTest {
+
+    public interface PhoneNumber {
+
+    }
+
+    @Entity
+    public static class PhoneNumberImpl {
+
+    }
+
+    @Entity
+    public static class Person {
+
+        @OneToOne(targetEntity = PhoneNumberImpl.class)
+        PhoneNumber phone;
+    }
+
+    @Test
+    public void test() {
+        Assert.assertEquals(PhoneNumberImpl.class, QOneToOneTest_Person.person.phone.getType());
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/OrderTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/OrderTest.java
new file mode 100644
index 0000000000..06b65f3d28
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/OrderTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+
+import org.junit.Test;
+
+public class OrderTest {
+
+    @Entity
+    public static class Order {
+        @OneToMany(targetEntity = OrderItemImpl.class)
+        List<OrderItem> orderItems;
+    }
+
+    @Entity
+    public interface OrderItem { }
+
+    @Entity
+    public static class OrderItemImpl implements OrderItem { }
+
+    @Test
+    public void test() {
+        assertEquals(QOrderTest_OrderItemImpl.class,
+                QOrderTest_Order.order.orderItems.any().getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Path.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Path.java
new file mode 100644
index 0000000000..cb7e3516f4
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Path.java
@@ -0,0 +1,8 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Path {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathInits.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathInits.java
new file mode 100644
index 0000000000..43ff18930b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathInits.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain;
+
+public class PathInits {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadata.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadata.java
new file mode 100644
index 0000000000..33a735e53a
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadata.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain;
+
+public class PathMetadata {
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java
similarity index 89%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java
index 4f8005ab22..0b0e33d028 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -23,8 +23,8 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.StringExpression;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringExpression;
 
 @Ignore
 public class PathMetadataTest {
@@ -38,7 +38,7 @@ public void setUp() {
     }
 
     @SuppressWarnings("unchecked")
-    @Test    
+    @Test
     public void test() throws Exception {
         Field field = ConstantImpl.class.getDeclaredField("STRINGS");
         field.setAccessible(true);
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathTest.java
new file mode 100644
index 0000000000..c56971e01f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PathTest.java
@@ -0,0 +1,14 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class PathTest {
+
+    @Test
+    public void test() {
+        assertEquals(Path.class, QPath.path.getType());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Person.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Person.java
new file mode 100644
index 0000000000..7f4e3f4a62
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Person.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * @author Arash
+ */
+@Entity
+@Table(name = "Person", catalog = "TestDB", schema = "dbo")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "Person.findAll", query = "SELECT p FROM Person p"),
+    @NamedQuery(name = "Person.findByPersonId", query = "SELECT p FROM Person p WHERE p.personId = :personId"),
+    @NamedQuery(name = "Person.findByPersonName", query = "SELECT p FROM Person p WHERE p.personName = :personName"),
+    @NamedQuery(name = "Person.findByPersonFamily", query = "SELECT p FROM Person p WHERE p.personFamily = :personFamily"),
+    @NamedQuery(name = "Person.findByPersonReference", query = "SELECT p FROM Person p WHERE p.personReference = :personReference")})
+public class Person implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @Basic(optional = false)
+    @Column(name = "person_id", nullable = false)
+    private Integer personId;
+
+    @Column(name = "person_name", length = 50)
+    private String personName;
+
+    @Column(name = "person_family", length = 50)
+    private String personFamily;
+
+    @Column(name = "person_reference")
+
+    private Integer personReference;
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "person1", fetch = FetchType.LAZY)
+
+    private Person person;
+    @JoinColumn(name = "person_id", referencedColumnName = "person_id", nullable = false, insertable = false, updatable = false)
+    @OneToOne(optional = false, fetch = FetchType.LAZY)
+
+    private Person person1;
+
+    public Person() {
+    }
+
+    public Person(Integer personId) {
+        this.personId = personId;
+    }
+
+    public Integer getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(Integer personId) {
+        this.personId = personId;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getPersonFamily() {
+        return personFamily;
+    }
+
+    public void setPersonFamily(String personFamily) {
+        this.personFamily = personFamily;
+    }
+
+    public Integer getPersonReference() {
+        return personReference;
+    }
+
+    public void setPersonReference(Integer personReference) {
+        this.personReference = personReference;
+    }
+
+    public Person getPerson() {
+        return person;
+    }
+
+    public void setPerson(Person person) {
+        this.person = person;
+    }
+
+    public Person getPerson1() {
+        return person1;
+    }
+
+    public void setPerson1(Person person1) {
+        this.person1 = person1;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (personId != null ? personId.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof Person)) {
+            return false;
+        }
+        Person other = (Person) object;
+        if ((this.personId == null && other.personId != null) || (this.personId != null && !this.personId.equals(other.personId))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "newpackage.Person[ personId=" + personId + " ]";
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PersonTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PersonTest.java
similarity index 87%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/PersonTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/PersonTest.java
index 846db2bc5a..cc46cea16c 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/PersonTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PersonTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -23,5 +23,5 @@ public class PersonTest {
     public void test() {
         assertNotNull(QPerson.person2.person);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Private.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Private.java
similarity index 79%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Private.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Private.java
index 2d2c9f11d8..4c3f86214c 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Private.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Private.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class Private {
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties2Test.java
new file mode 100644
index 0000000000..15f0f85986
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties2Test.java
@@ -0,0 +1,38 @@
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.junit.Test;
+
+public class Properties2Test {
+
+    public abstract static class BaseX<T extends Serializable> implements Serializable {
+
+        public abstract T getId();
+    }
+
+    @SuppressWarnings("serial")
+    @Entity
+    @Table(name = "X")
+    public static class ConcreteX extends BaseX<String> {
+
+        @Id
+        @Column(name = "name", nullable = false)
+        private String name;
+
+        @Override
+        public String getId() {
+            return name;
+        }
+    }
+
+    @Test(expected = NoSuchFieldException.class)
+    public void test() throws NoSuchFieldException {
+        QProperties2Test_ConcreteX.class.getDeclaredField("id");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties3Test.java
new file mode 100644
index 0000000000..41ab3cb6e5
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties3Test.java
@@ -0,0 +1,34 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.joda.time.LocalDateTime;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.DateTimePath;
+
+public class Properties3Test extends AbstractTest {
+
+    @Entity
+    public static class Order {
+
+        @Column(name = "order_date")
+        @Temporal(TemporalType.TIMESTAMP)
+        private java.util.Date orderDate;
+
+        public LocalDateTime getOrderDate() {
+            return orderDate != null ? new LocalDateTime(orderDate) : null;
+        }
+    }
+
+    @Test
+    public void propertyType() throws IllegalAccessException, NoSuchFieldException {
+        start(QProperties3Test_Order.class, QProperties3Test_Order.order);
+        match(DateTimePath.class, "orderDate");
+        matchType(java.util.Date.class, "orderDate");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties4Test.java
new file mode 100644
index 0000000000..c0ebcc9c3c
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Properties4Test.java
@@ -0,0 +1,22 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Properties4Test extends AbstractTest {
+
+    @MappedSuperclass
+    public abstract static class Naming {
+
+        public abstract boolean is8FRecord();
+
+    }
+
+    @Test
+    public void test() {
+        assertEquals("8FRecord", QProperties4Test_Naming.naming._8FRecord.getMetadata().getName());
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertiesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertiesTest.java
new file mode 100644
index 0000000000..6571533b5d
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertiesTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+public class PropertiesTest {
+
+    @Entity
+    public abstract static class AbstractEntity {
+
+    }
+
+    @Entity
+    @Table(name = "Customer")
+    public static class Customer extends AbstractEntity {
+
+        private String name;
+        private List<Pizza> pizzas = new ArrayList<Pizza>(0);
+
+        @Column
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @OneToMany(mappedBy = "customer")
+        public List<Pizza> getPizzas() {
+            return pizzas;
+        }
+
+        public void setPizzas(List<Pizza> pizzas) {
+            this.pizzas = pizzas;
+        }
+    }
+
+    @Entity
+    @Table(name = "Pizza")
+    public static class Pizza extends AbstractEntity {
+
+        private Date orderTime;
+        private Customer customer;
+        private List<Topping> toppings = new ArrayList<Topping>(0);
+
+        @Column @Temporal(TemporalType.TIMESTAMP)
+        public Date getOrderTime() {
+            return new Date(orderTime.getTime());
+        }
+
+        public void setOrderTime(Date orderTime) {
+            this.orderTime = new Date(orderTime.getTime());
+        }
+
+        @ManyToOne
+        @JoinColumn(name = "customerId")
+        public Customer getCustomer() {
+            return customer;
+        }
+
+        public void setCustomer(Customer customer) {
+            this.customer = customer;
+        }
+
+        @OneToMany(mappedBy = "pizza")
+        public List<Topping> getToppings() {
+            return toppings;
+        }
+
+        public void setToppings(List<Topping> toppings) {
+            this.toppings = toppings;
+        }
+    }
+
+    @Entity
+    public static class Topping {
+
+    }
+
+    @Test
+    public void customer() {
+        assertNotNull(QPropertiesTest_Customer.customer.name);
+        assertNotNull(QPropertiesTest_Customer.customer.pizzas);
+    }
+
+    @Test
+    public void pizza() {
+        assertNotNull(QPropertiesTest_Pizza.pizza.orderTime);
+        assertNotNull(QPropertiesTest_Pizza.pizza.customer);
+        assertNotNull(QPropertiesTest_Pizza.pizza.toppings);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java
new file mode 100644
index 0000000000..25a030c5ce
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryType;
+
+@Ignore
+public class PropertyTypeTest {
+
+    @QueryEntity
+    public static class Entity {
+
+        @QueryType(PropertyType.STRING)
+        Integer numberAsString;
+
+    }
+
+    @Test
+    public void numberAsString_like() {
+        QPropertyTypeTest_Entity.entity.numberAsString.like("a");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Public.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Public.java
similarity index 79%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Public.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Public.java
index 3a312a350d..02e6395c1d 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Public.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Public.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class Public {
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java
new file mode 100644
index 0000000000..30f864f96c
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java
@@ -0,0 +1,33 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.Predicate;
+
+public class QueryByExampleTest {
+
+    @QueryDelegate(ExampleEntity.class)
+    public static Predicate like(QExampleEntity qtype, ExampleEntity example) {
+        return example.name != null ? qtype.name.eq(example.name) : null;
+    }
+
+    @Test
+    public void name_not_set() {
+        ExampleEntity entity = new ExampleEntity();
+        Predicate qbe = QExampleEntity.exampleEntity.like(entity);
+        assertNull(qbe);
+    }
+
+    @Test
+    public void name_set() {
+        ExampleEntity entity = new ExampleEntity();
+        entity.name = "XXX";
+        Predicate qbe = QExampleEntity.exampleEntity.like(entity);
+        assertEquals("exampleEntity.name = XXX", qbe.toString());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java
new file mode 100644
index 0000000000..b71f58ddbb
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class QueryEmbeddable2Test {
+
+    @QueryEntity
+    public static class User {
+
+        Complex<String> complex;
+    }
+
+    @QueryEmbeddable
+    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
+
+        T a;
+
+        @Override
+        public int compareTo(Complex<T> arg0) {
+            return 0;
+        }
+
+        public boolean equals(Object o) {
+            return o == this;
+        }
+
+    }
+
+    @Test
+    public void user_complex_a() {
+        assertNotNull(QQueryEmbeddable2Test_User.user.complex.a);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java
similarity index 77%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java
index 142d3f4c73..4832234c05 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddable3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,83 +20,84 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.junit.Assert;
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbeddable3Test {
 
     @QueryEntity
     public static class User {
-        
+
         List<Complex<?>> rawList;
-    
+
         List<Complex<String>> list;
-        
+
         Set<Complex<String>> set;
-        
+
         Collection<Complex<String>> collection;
-        
+
         Map<String, Complex<String>> map;
-        
+
         Map<String, Complex<String>> rawMap1;
-        
+
         Map<String, Complex<?>> rawMap2;
-        
+
         Map<?, Complex<String>> rawMap3;
-                
+
     }
-    
+
     @QueryEmbeddable
     public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
 
         T a;
-        
+
         @Override
         public int compareTo(Complex<T> arg0) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
-        
+
     }
-    
+
     @Test
-    public void User_rawList() {
-        assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.rawList.any().getClass());
+    public void user_rawList() {
+        Assert.assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.rawList.any().getClass());
     }
-    
+
     @Test
-    public void User_list() {
+    public void user_list() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.list.any().getClass());
     }
-    
+
     @Test
-    public void User_set() {
+    public void user_set() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.set.any().getClass());
     }
-    
+
     @Test
-    public void User_collection() {
+    public void user_collection() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.collection.any().getClass());
     }
-    
+
     @Test
-    public void User_map() {
+    public void user_map() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.map.get("XXX").getClass());
     }
-    
+
     @Test
-    public void User_rawMap1() {
+    public void user_rawMap1() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.rawMap1.get("XXX").getClass());
     }
-    
+
     @Test
-    public void User_rawMap2() {
+    public void user_rawMap2() {
         assertEquals(QQueryEmbeddable3Test_Complex.class, QQueryEmbeddable3Test_User.user.rawMap2.get("XXX").getClass());
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddableTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddableTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java
index f724c8c3ca..a644c9fea0 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddableTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,36 +11,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbeddableTest {
 
     @QueryEntity
     public static class Parent {
-    
+
         String parentProperty;
-        
+
         Child child;
-        
+
     }
-    
+
     @QueryEmbeddable
     public static class Child {
-     
+
         String childProperty;
-        
+
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QQueryEmbeddableTest_Parent.parent.child.childProperty);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java
index b962915fa3..1701b41fc2 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,38 +11,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbedded2Test {
 
     @QueryEntity
     public static class Parent {
-    
+
         String parentProperty;
-        
+
         @QueryEmbedded
         Child child;
-        
+
     }
-    
+
     @QueryEmbeddable
     public static class Child {
-     
+
         String childProperty;
-        
+
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QQueryEmbedded2Test_Parent.parent.child.childProperty);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java
similarity index 83%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java
index baf6640ce2..fc3cfd43bc 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -19,34 +19,34 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbedded3Test {
 
     @QueryEntity
     public static class Parent {
-    
+
         String parentProperty;
 
         @QueryEmbedded
         List<Child> children;
-        
+
         @QueryEmbedded
         Child child;
-        
+
     }
-        
+
     public static class Child {
-     
+
         String childProperty;
-        
+
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QQueryEmbedded3Test_Parent.parent.child.childProperty);
         assertNotNull(QQueryEmbedded3Test_Parent.parent.children.any().childProperty);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java
similarity index 77%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded4Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java
index 27d99e760f..36b6713373 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded4Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,76 +11,76 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
 
 public class QueryEmbedded4Test {
 
     @QueryEntity
     public static class User {
-    
+
         @QueryEmbedded
         @QueryInit("city.name")
         Address address;
-     
+
         @QueryEmbedded
         Complex<String> complex;
     }
-    
+
     public static class Address {
-        
+
         @QueryEmbedded
         City city;
-        
+
         String name;
     }
-    
+
     public static class City {
-     
+
         String name;
-        
+
     }
-    
+
     public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
 
         T a;
-        
+
         @Override
         public int compareTo(Complex<T> arg0) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
-        
+
     }
-    
+
     @Test
-    public void User_Address_City() {
+    public void user_address_city() {
         assertNotNull(QQueryEmbedded4Test_User.user.address.city);
     }
-    
+
     @Test
-    public void User_Address_Name() {
+    public void user_address_name() {
         assertNotNull(QQueryEmbedded4Test_User.user.address.name);
     }
-    
+
     @Test
-    public void User_Address_City_Name() {
+    public void user_address_city_name() {
         assertNotNull(QQueryEmbedded4Test_User.user.address.city.name);
     }
-    
+
     @Test
-    public void User_Complex_a() {
+    public void user_complex_a() {
         assertNotNull(QQueryEmbedded4Test_User.user.complex.a);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded5Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded5Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java
index 970cef3958..fbf6b2f897 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbedded5Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collection;
 import java.util.List;
@@ -22,93 +22,93 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbedded5Test {
 
     @QueryEntity
     public static class User {
-        
+
         @QueryEmbedded
         List<Complex<?>> rawList;
-    
+
         @QueryEmbedded
         List<Complex<String>> list;
-        
+
         @QueryEmbedded
         Set<Complex<String>> set;
-        
+
         @QueryEmbedded
         Collection<Complex<String>> collection;
-        
+
         @QueryEmbedded
         Map<String, Complex<String>> map;
-        
+
         @QueryEmbedded
         Map<String, Complex<String>> rawMap1;
-        
+
         @QueryEmbedded
         Map<String, Complex<?>> rawMap2;
-        
+
         @QueryEmbedded
         Map<?, Complex<String>> rawMap3;
-                
+
     }
-    
-    
+
+
     public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
 
         T a;
-        
+
         @Override
         public int compareTo(Complex<T> arg0) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
-        
+
     }
-    
+
     @Test
-    public void User_rawList() {
+    public void user_rawList() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.rawList.any().getClass());
     }
-    
+
     @Test
-    public void User_list() {
+    public void user_list() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.list.any().getClass());
     }
-    
+
     @Test
-    public void User_set() {
+    public void user_set() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.set.any().getClass());
     }
-    
+
     @Test
-    public void User_collection() {
+    public void user_collection() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.collection.any().getClass());
     }
-    
+
     @Test
-    public void User_map() {
+    public void user_map() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.map.get("XXX").getClass());
     }
-    
+
     @Test
-    public void User_rawMap1() {
+    public void user_rawMap1() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.rawMap1.get("XXX").getClass());
     }
-    
+
     @Test
-    public void User_rawMap2() {
+    public void user_rawMap2() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.rawMap2.get("XXX").getClass());
     }
-    
+
     @Test
-    public void User_rawMap3() {
+    public void user_rawMap3() {
         assertEquals(QQueryEmbedded5Test_Complex.class, QQueryEmbedded5Test_User.user.rawMap3.get("XXX").getClass());
     }
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java
new file mode 100644
index 0000000000..b509686a7b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.EntityPathBase;
+
+public class QueryEmbedded6Test {
+
+    @QueryEntity
+    public static class User {
+
+        @QueryEmbedded
+        List<User> list;
+
+    }
+
+    @Test
+    public void entityPathBase_is_superClass() {
+        assertEquals(EntityPathBase.class, QQueryEmbedded6Test_User.class.getSuperclass());
+    }
+
+    @Test
+    public void user_list_any() {
+        assertEquals(QQueryEmbedded6Test_User.class, QQueryEmbedded6Test_User.user.list.any().getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java
new file mode 100644
index 0000000000..c62995c296
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java
@@ -0,0 +1,43 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QueryEmbedded7Test {
+
+    @QueryEntity
+    public static class Entity {
+
+        @QueryEmbedded
+        Collection<String> users;
+
+        @QueryEmbedded
+        Set<Long> productRoles;
+
+        // misuse, but shouldn't cause problems
+        @QueryEmbedded
+        Locale locale;
+
+        // misuse, but shouldn't cause problems
+        @QueryEmbedded
+        String string;
+
+    }
+
+    @Test
+    public void test() {
+        Assert.assertEquals(StringPath.class, QQueryEmbedded7Test_Entity.entity.users.any().getClass());
+        assertEquals(NumberPath.class, QQueryEmbedded7Test_Entity.entity.productRoles.any().getClass());
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddedTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java
similarity index 78%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddedTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java
index adc45b479e..d970b893d4 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryEmbeddedTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -20,52 +20,52 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QueryEmbeddedTest {
 
     @QueryEntity
     public static class Parent {
-    
+
         String parentProperty;
-        
+
         @QueryEmbedded
         Child child;
-        
+
     }
 
     @QueryEntity
     public static class Parent2 {
-    
+
         String parentProperty;
-        
+
         @QueryEmbedded
         List<Child> children;
-        
+
         @QueryEmbedded
         Map<String,Child> children2;
-        
+
     }
-    
+
     public static class Child {
-        
+
         String childProperty;
-        
+
     }
-    
+
     @Test
-    public void Parent_Child_ChildProperty() {
+    public void parent_child_childProperty() {
         assertNotNull(QQueryEmbeddedTest_Parent.parent.child.childProperty);
     }
-    
+
     @Test
-    public void Parent_Children_Any_ChildrenProperty() {
+    public void parent_children_any_childProperty() {
         assertNotNull(QQueryEmbeddedTest_Parent2.parent2.children.any().childProperty);
     }
-    
+
     @Test
-    public void Parent_Children2_MapAccess() {
+    public void parent_children2_mapAccess() {
         assertNotNull(QQueryEmbeddedTest_Parent2.parent2.children2.containsKey("XXX"));
         assertNotNull(QQueryEmbeddedTest_Parent2.parent2.children2.get("XXX").childProperty);
     }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java
new file mode 100644
index 0000000000..55a6701e2f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryExclude;
+import com.querydsl.core.types.dsl.EntityPathBase;
+
+public class QueryExcludeTest {
+
+    @QueryExclude
+    @QueryEntity
+    public static class Entity {
+
+    }
+
+    @QueryEntity
+    public static class SubEntity extends Entity {
+
+    }
+
+    @Test
+    public void subEntity() {
+        assertEquals(EntityPathBase.class, QQueryExcludeTest_SubEntity.class.getSuperclass());
+    }
+
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java
similarity index 77%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java
index 00e8e2e55c..94b8ec7279 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
 
 public class QueryInit2Test {
 
@@ -36,23 +36,23 @@ public static class Event {
     }
 
     @QueryEntity
-    public static class Activation extends Event { 
+    public static class Activation extends Event {
 
     }
 
     @QueryEntity
-    public static class Account{
+    public static class Account {
 
         Owner owner;
     }
 
     @QueryEntity
-    public static class Owner{
+    public static class Owner {
 
     }
 
     @Test
-    public void Long_Path() {
+    public void long_path() {
         assertNotNull(QQueryInit2Test_Categorization.categorization.event.account.owner);
         assertNotNull(QQueryInit2Test_Categorization.categorization.event.as(QQueryInit2Test_Activation.class).account.owner);
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java
index 97ac26ad5b..ce8a5152ba 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
 
 public class QueryInit3Test {
 
@@ -38,10 +38,10 @@ public static class Entity {
 
         Map<String,Entity> entityMap;
     }
-    
+
     @Test
     public void test() {
         assertEquals("entity.prop1.prop2.prop1", QQueryInit3Test_Entity.entity.prop1.prop2.prop1.toString());
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit4Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java
index 3bf6b6ab91..64a9cca811 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit4Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java
@@ -1,25 +1,25 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import java.sql.Date;
 import java.util.Set;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
 
 public class QueryInit4Test {
-    
+
     @QueryEntity
     public static class Organization {
-        
+
     }
-    
+
     @QueryEntity
     public static class Application {
-        
+
     }
 
     @QueryEntity
@@ -34,7 +34,7 @@ public static class Tenant {
 
         @QueryInit({"user.primaryTenant", "tenant"})
         Set<UserTenantApplication> userTenantApplications;
-        
+
         Set<Organization> organizations;
 
         Date lastModifiedDate;
@@ -46,11 +46,11 @@ public static class Tenant {
     public static class UserTenantApplication {
 
         User user;
-        
+
         Tenant tenant;
 
         Application application;
-        
+
         Date lastModifiedDate;
 
         Long lastModifiedUserId;
@@ -65,10 +65,10 @@ public static class User {
         Set<UserTenantApplication> userTenantApplications;
 
     }
-    
+
     @Test
     public void test() {
-        QQueryInit4Test_Tenant tenant = QQueryInit4Test_Tenant.tenant; 
+        QQueryInit4Test_Tenant tenant = QQueryInit4Test_Tenant.tenant;
         assertNotNull(tenant.userTenantApplications.any().user.id);
         assertNotNull(tenant.userTenantApplications.any().tenant.id);
         assertNotNull(tenant.userTenantApplications.any().user.primaryTenant.id);
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java
similarity index 79%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java
index 156c843672..65ea069971 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInit5Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java
@@ -1,45 +1,47 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
-import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
 
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
+
 public class QueryInit5Test {
-    
+
     @QueryEntity
     public static class OtherClass {
         OtherClass entity;
     }
-    
+
     @QueryEntity
     public static class OtherClassTwo {
-        OtherClassTwo entity;        
+        OtherClassTwo entity;
     }
-    
+
     @QueryEntity
     public static class Parent {
         int x;
-        
+
         @QueryInit("*")
         OtherClass z;
     }
-    
+
     @QueryEntity
     public static class Child extends Parent {
         @QueryInit("*")
         OtherClassTwo y;
     }
-    
+
     @Test
     public void test() {
         //QChild c = QParent.parent.as(QChild.class)
         assertNotNull(QQueryInit5Test_Parent.parent.z.entity);
-        
+
         QQueryInit5Test_Child child = QQueryInit5Test_Parent.parent.as(QQueryInit5Test_Child.class);
         assertNotNull(child.z.entity);
         assertNotNull(child.y.entity);
-        
+
     }
 
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java
new file mode 100644
index 0000000000..c0d8bababc
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java
@@ -0,0 +1,195 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.*;
+
+import org.hibernate.proxy.HibernateProxy;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryType;
+
+public class QueryInit6Test {
+
+    @Entity(name = Component.NAME)
+    @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+    public abstract static class Component implements Serializable {
+        public static final String NAME = "Component";
+
+        @Id
+        protected String id;
+
+        @ManyToOne(fetch = FetchType.LAZY)
+        @JoinColumn(name = "parent_id")
+        private Component parent;
+
+        @QueryType(PropertyType.ENTITY)
+        @QueryInit("*")
+        @Transient
+        public Container getContainer() {
+            Component temp = this.parent;
+            if (this.parent instanceof HibernateProxy) {
+                temp = (Component) ((HibernateProxy) this.parent)
+                        .getHibernateLazyInitializer().getImplementation();
+            }
+
+            if (temp instanceof Container) {
+                return (Container) temp;
+            } else {
+                if (!temp.isRoot()) {
+                    return temp.getParent().getContainer();
+                } else {
+                    return null;
+                }
+            }
+        }
+
+        @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+        private Set<Component> children;
+
+        protected Component() {
+
+        }
+
+        protected Component(String id, Component parent) {
+            this.id = id;
+            this.parent = parent;
+            this.children = new HashSet<Component>();
+        }
+
+        @Transient
+        public boolean isRoot() {
+            return (parent == null);
+        }
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Set<Component> getChildren() {
+            return children;
+        }
+
+        public void setChildren(Set<Component> children) {
+            this.children = children;
+        }
+
+        public Component getParent() {
+            return parent;
+        }
+
+        public void setParent(Component parent) {
+            this.parent = parent;
+        }
+    }
+
+    @Entity(name = Content.NAME)
+    public static class Content extends Component {
+
+        public static final String NAME = "Content";
+
+        @Column(name = "quantity")
+        private long quantity;
+
+        public Content() {
+            super(null, null);
+        }
+
+        public Content(String id, Component parent) {
+            super(id, parent);
+            this.quantity = 0;
+        }
+
+        @Override
+        public String toString() {
+            return "Content [id=" + id + " qty=" + quantity + "]";
+        }
+
+        public long getQuantity() {
+            return quantity;
+        }
+
+        public void setQuantity(long quantity) {
+            this.quantity = quantity;
+        }
+    }
+
+    @Entity(name = Container.NAME)
+    public static class Container extends Component {
+
+        public static final String NAME = "Container";
+
+        @ManyToOne(fetch = FetchType.LAZY)
+        @JoinColumn(name = "packaging_id")
+        private Packaging packaging;
+
+        public Container() {
+            super(null, null);
+        }
+
+        public Container(String id, Component parent) {
+            super(id, parent);
+            this.packaging = null;
+        }
+
+        public Packaging getPackaging() {
+            return packaging;
+        }
+
+        public void setPackaging(Packaging packaging) {
+            this.packaging = packaging;
+        }
+    }
+
+    @Entity(name = Packaging.NAME)
+    public static class Packaging implements Serializable {
+
+        public static final String NAME = "Packaging";
+
+        @Id
+        private String id;
+
+        @Column(name = "description")
+        private String description;
+
+        public Packaging() {
+
+        }
+
+        public Packaging(String id, String description) {
+            this.id = id;
+            this.description = description;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(QQueryInit6Test_Content.content.container.packaging);
+        assertNotNull(QQueryInit6Test_Content.content.container.packaging.id);
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java
new file mode 100644
index 0000000000..b88020967e
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryInit;
+
+public class QueryInit7Test {
+
+    @MappedSuperclass
+    public abstract static class Access<I extends AccessId<S, T>, S extends Serializable, T extends Serializable> implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @EmbeddedId
+        @QueryEmbedded
+        private I id;
+
+        public I getId() {
+            return id;
+        }
+
+        public void setId(I id) {
+            this.id = id;
+        }
+
+    }
+
+
+    @MappedSuperclass
+    public static class AccessId<S extends Serializable, T extends Serializable> implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @ManyToOne
+        private S source;
+
+        @ManyToOne
+        private T target;
+
+    }
+
+    @Entity
+    public static class Source implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        private Long id;
+
+    }
+
+    @Entity
+    public static class SourceToTarget1 extends Access<SourceToTargetId, Source, Target> {
+
+        private static final long serialVersionUID = 1L;
+
+    }
+
+    @Entity
+    public static class SourceToTarget2 extends Access<SourceToTargetId, Source, Target> {
+
+        private static final long serialVersionUID = 1L;
+
+        @QueryInit({"source", "target"})
+        @Override
+        public SourceToTargetId getId() {
+            return super.getId();
+        }
+
+    }
+
+    @Entity
+    public static class SourceToTarget3 extends Access<SourceToTargetId, Source, Target> {
+
+        private static final long serialVersionUID = 1L;
+
+        @Column
+        private String imNotEmpty;
+
+        @QueryInit({"source", "target"})
+        @Override
+        public SourceToTargetId getId() {
+            return super.getId();
+        }
+
+    }
+
+    @Embeddable
+    public static class SourceToTargetId extends AccessId<Source, Target> {
+
+        private static final long serialVersionUID = 1L;
+
+    }
+
+    @Entity
+    public static class Target implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        private Long id;
+
+    }
+
+    @Test
+    public void test1DefaultCase() {
+        assertNotNull(QQueryInit7Test_SourceToTarget1.sourceToTarget1.id.source);
+    }
+
+    @Test
+    public void test2AtQueryInitAndEmptyClass() {
+        assertNotNull(QQueryInit7Test_SourceToTarget2.sourceToTarget2.id.source);
+    }
+
+    @Test
+    public void test3AtQueryInitAndNonEmptyClass() {
+        assertNotNull(QQueryInit7Test_SourceToTarget3.sourceToTarget3.id.source);
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInitTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInitTest.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryInitTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInitTest.java
index c797c801bd..f66db190e3 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryInitTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryInitTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryInit;
 
 public class QueryInitTest {
 
@@ -45,7 +45,7 @@ public static class PEntity {
     }
 
     @QueryEntity
-    public static class PEntity2Super{
+    public static class PEntity2Super {
 
         public PEntity3 e333;
 
@@ -54,7 +54,7 @@ public static class PEntity2Super{
     }
 
     @QueryEntity
-    public static class PEntity2 extends PEntity2Super{
+    public static class PEntity2 extends PEntity2Super {
 
         public PEntity3 e3;
 
@@ -62,7 +62,7 @@ public static class PEntity2 extends PEntity2Super{
     }
 
     @QueryEntity
-    public static class PEntity3{
+    public static class PEntity3 {
 
         public PEntity4 e4;
 
@@ -70,7 +70,7 @@ public static class PEntity3{
     }
 
     @QueryEntity
-    public static class PEntity4{
+    public static class PEntity4 {
 
         public PEntity e1;
 
@@ -78,7 +78,7 @@ public static class PEntity4{
     }
 
     @Test
-    public void Basic_Inits() {
+    public void basic_inits() {
         // e2
         assertNotNull(e1.e2);
         assertNotNull(e1.e2.e3.e4);
@@ -92,12 +92,12 @@ public void Basic_Inits() {
     }
 
     @Test
-    public void Deep_Super_Inits() {
+    public void deep_super_inits() {
         assertNotNull(e1.e22._super.e333);
     }
 
     @Test
-    public void Root_Super_Inits() {
+    public void root_super_inits() {
         assertNotNull(e2.e3333.e4);
         assertNotNull(e2._super.e3333.e4);
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java
index 78af88af3c..fcd2e98c8b 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.util.Map;
 
@@ -20,14 +20,13 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.StringExpression;
 
 public class QueryProjectionTest {
 
@@ -64,13 +63,13 @@ public EntityWithProjection(String param0, CharSequence param1) {
     }
 
     @Test
-    public void Entity_Case() {
-        NumberExpression<Long> longExpr = new NumberPath<Long>(Long.class, "x");
-        StringExpression stringExpr = new StringPath("x");
+    public void entity_case() {
+        NumberExpression<Long> longExpr = Expressions.numberPath(Long.class, "x");
+        StringExpression stringExpr = Expressions.stringPath("x");
 
-        QQueryProjectionTest_EntityWithProjection.create(longExpr).newInstance(0l);
+        QQueryProjectionTest_EntityWithProjection.create(longExpr).newInstance(0L);
         QQueryProjectionTest_EntityWithProjection.create(stringExpr).newInstance("");
-        QQueryProjectionTest_EntityWithProjection.create(longExpr, stringExpr).newInstance(0l,"");
+        QQueryProjectionTest_EntityWithProjection.create(longExpr, stringExpr).newInstance(0L,"");
         QQueryProjectionTest_EntityWithProjection.create(stringExpr,stringExpr).newInstance("","");
     }
 
@@ -117,13 +116,13 @@ public DTOWithProjection(String param0, CharSequence param1, Map<Long,String> pa
     }
 
     @Test
-    public void Dto_Case() throws SecurityException, NoSuchMethodException{
-        NumberExpression<Long> longExpr = new NumberPath<Long>(Long.class, "x");
-        StringExpression stringExpr = new StringPath("x");
+    public void dto_case() throws SecurityException, NoSuchMethodException {
+        NumberExpression<Long> longExpr = Expressions.numberPath(Long.class, "x");
+        StringExpression stringExpr = Expressions.stringPath("x");
 
-        new QQueryProjectionTest_DTOWithProjection(longExpr).newInstance(0l);
+        new QQueryProjectionTest_DTOWithProjection(longExpr).newInstance(0L);
         new QQueryProjectionTest_DTOWithProjection(stringExpr).newInstance("");
-        new QQueryProjectionTest_DTOWithProjection(longExpr, stringExpr).newInstance(0l,"");
+        new QQueryProjectionTest_DTOWithProjection(longExpr, stringExpr).newInstance(0L,"");
         new QQueryProjectionTest_DTOWithProjection(stringExpr, stringExpr).newInstance("","");
 
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerySuperTypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerySuperTypeTest.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QuerySuperTypeTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerySuperTypeTest.java
index fa670125af..931266f830 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerySuperTypeTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerySuperTypeTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QuerySupertype;
 
 public class QuerySuperTypeTest {
 
@@ -23,7 +23,7 @@ public static class JdoEntity {
     }
 
     @Test
-    public void JdoEntity() {
+    public void jdoEntity() {
         assertEquals(QQuerySuperTypeTest_Supertype.class,
                 QQuerySuperTypeTest_JdoEntity.jdoEntity.references.any().getClass());
     }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java
new file mode 100644
index 0000000000..8ae5bf63e0
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.annotations.QueryType;
+
+public class QueryTypeOverTransientTest {
+
+    @QueryEntity
+    public static class Entity {
+
+        @QueryType(PropertyType.ENTITY)
+        @QueryTransient
+        Entity reference;
+
+    }
+
+    @QueryEntity
+    public abstract static class  Entity2 {
+
+        @QueryType(PropertyType.ENTITY)
+        @QueryTransient
+        public abstract Entity getReference();
+
+    }
+
+    @Test
+    public void entity_reference_is_available() {
+        assertNotNull(QQueryTypeOverTransientTest_Entity.entity.reference);
+    }
+
+    @Test
+    public void entity2_reference_is_available() {
+        assertNotNull(QQueryTypeOverTransientTest_Entity2.entity2.reference);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java
new file mode 100644
index 0000000000..9a92e345f3
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.types.dsl.*;
+
+public class QueryTypeTest extends AbstractTest {
+
+    @QueryEntity
+    public static class QueryTypeEntity {
+        @QueryType(PropertyType.SIMPLE)
+        public String stringAsSimple;
+
+        @QueryType(PropertyType.COMPARABLE)
+        public String stringAsComparable;
+
+        @QueryType(PropertyType.DATE)
+        public String stringAsDate;
+
+        @QueryType(PropertyType.DATETIME)
+        public String stringAsDateTime;
+
+        @QueryType(PropertyType.TIME)
+        public String stringAsTime;
+
+        @QueryType(PropertyType.NONE)
+        public String stringNotInQuerydsl;
+
+    }
+
+    @Test
+    public void test() throws SecurityException, NoSuchFieldException {
+        start(QQueryTypeTest_QueryTypeEntity.class, QQueryTypeTest_QueryTypeEntity.queryTypeEntity);
+        match(SimplePath.class, "stringAsSimple");
+        match(ComparablePath.class, "stringAsComparable");
+        match(DatePath.class, "stringAsDate");
+        match(DateTimePath.class, "stringAsDateTime");
+        match(TimePath.class, "stringAsTime");
+        assertMissing("stringNotInQuerydsl");
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java
new file mode 100644
index 0000000000..4f2f454376
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class QuerydslConfig2Test {
+
+    @Config(entityAccessors = true)
+    @QueryEntity
+    public static class Entity extends Superclass {
+
+        Entity prop1;
+
+    }
+
+    @Config(createDefaultVariable = false)
+    @QueryEntity
+    public static class Entity2 extends Superclass2 {
+
+        Entity prop1;
+
+    }
+
+    @QueryEntity
+    public static class Superclass {
+
+        Entity prop2;
+    }
+
+    @Config(entityAccessors = true)
+    @QueryEntity
+    public static class Superclass2 {
+
+        Entity prop2;
+    }
+
+    @Test
+    public void test() {
+        assertNotNull(QQuerydslConfig2Test_Entity.entity);
+    }
+
+    @Test(expected = NoSuchFieldException.class)
+    public void create_default_variable() throws SecurityException, NoSuchFieldException {
+        QQuerydslConfig2Test_Entity2.class.getField("entity2");
+    }
+}
+
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfigTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java
similarity index 76%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfigTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java
index 14dfdaf85c..b1e9255b69 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/QuerydslConfigTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,19 +20,19 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.Config;
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class QuerydslConfigTest {
 
-    @Config(entityAccessors=true)
+    @Config(entityAccessors = true)
     @QueryEntity
     public static class Superclass {
 
         Entity prop3;
     }
 
-    @Config(entityAccessors=true, listAccessors = true, mapAccessors= true)
+    @Config(entityAccessors = true, listAccessors = true, mapAccessors = true)
     @QueryEntity
     public static class Entity extends Superclass {
 
@@ -46,7 +46,7 @@ public static class Entity extends Superclass {
     }
 
     @Test
-    public void Long_Path() {
+    public void long_path() {
         assertEquals("entity.prop1.prop2.prop1", QQuerydslConfigTest_Entity.entity.prop1().prop2().prop1().toString());
     }
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/RawTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RawTest.java
new file mode 100644
index 0000000000..2c67a486de
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RawTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.apt.domain;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class RawTest {
+
+    @QuerySupertype
+    public static class SuperClass<T extends Comparable<T>> {
+
+        public String property;
+
+    }
+
+    @SuppressWarnings("rawtypes")
+    @QueryEntity
+    public static class Entity extends SuperClass {
+
+        public String property2;
+    }
+
+    @Test
+    public void test() {
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RelationTest.java
similarity index 86%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/RelationTest.java
index 2b620a8ae0..d51bbcf486 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/RelationTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RelationTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,26 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
+import java.util.*;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.Config;
-import com.mysema.query.domain.rel.RelationType2;
-import com.mysema.query.types.path.CollectionPath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.SetPath;
+import com.querydsl.apt.domain.rel.RelationType2;
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.*;
 
 public class RelationTest extends AbstractTest {
 
@@ -62,7 +54,7 @@ public static class GenericRelations {
     }
 
     @QueryEntity
-    @Config(listAccessors=true, mapAccessors=true)
+    @Config(listAccessors = true, mapAccessors = true)
     public static class RelationType {
 
         MyEnum enumProperty;
@@ -115,7 +107,7 @@ public static class RelationType {
 
     @Test
     public void test() throws SecurityException, NoSuchFieldException {
-        cl = QRelationTest_RelationType.class;
+        start(QRelationTest_RelationType.class, QRelationTest_RelationType.relationType);
         match(EnumPath.class, "enumProperty");
         match(ListPath.class, "enumList");
         match(MapPath.class, "enumMap1");
@@ -154,7 +146,7 @@ public void test() throws SecurityException, NoSuchFieldException {
     }
 
     @Test
-    public void List_Usage() {
+    public void list_usage() {
         String expected = "relationType.list.get(0).set";
         assertEquals(expected, QRelationTest_RelationType.relationType.list.get(0).set.toString());
 //        assertEquals(expected, QRelationTest_RelationType.relationType.getList(0).set.toString());
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesInTypesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesInTypesTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java
index eb2c24d9ee..d5f90b57d2 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesInTypesTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
 public class ReservedNamesInTypesTest {
-    
+
     @Test
-    public void Correctly_Escaped() {
+    public void correctly_escaped() {
         assertNotNull(QPublic.public$);
         assertNotNull(QPrivate.private$);
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java
similarity index 92%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java
index b6fa510462..4fcdc3cb77 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/ReservedNamesTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class ReservedNamesTest {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
similarity index 89%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
index cb2e22fb47..d8506639b2 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 import javax.persistence.Entity;
 
 import org.hibernate.envers.DefaultRevisionEntity;
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/RooEntities.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntities.java
similarity index 94%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/RooEntities.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntities.java
index 088f2edefb..127bb13880 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/RooEntities.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntities.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntitiesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntitiesTest.java
new file mode 100644
index 0000000000..e4f4463037
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/RooEntitiesTest.java
@@ -0,0 +1,19 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class RooEntitiesTest {
+
+    @Test
+    public void rooJpaEntity() {
+        assertNotNull(QRooEntities_MyEntity.myEntity);
+    }
+
+    @Test
+    public void rooJpaActiveRecord() {
+        assertNotNull(QRooEntities_MyEntity2.myEntity2);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java
new file mode 100644
index 0000000000..159d98e050
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SecurableEntity.java
@@ -0,0 +1,26 @@
+package com.querydsl.apt.domain;
+
+import javax.persistence.*;
+
+/**
+ * This is an example of using system ACL function. Note, field id is required,
+ * abstract function getId must also be implemented.
+ */
+@Entity
+public class SecurableEntity extends AbstractSecurable<Long, Long> {
+
+    private static final long serialVersionUID = 3197097608363811501L;
+
+    @Id
+    @TableGenerator(name = "SECUREENTITY_SEQ", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "SECUREENTITY_SEQ")
+    private Long securableEntityId;
+
+    @Column(length = 50)
+    private String name;
+
+    // public Long getId() {
+    // return getSecurableEntityId();
+    // }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SignatureTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SignatureTest.java
new file mode 100644
index 0000000000..d92a14c3f6
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SignatureTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.Serializable;
+
+import com.querydsl.core.types.dsl.EntityPathBase;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class SignatureTest {
+
+    @QuerySupertype
+    public abstract static class APropertyChangeSupported implements Comparable<Object>, Cloneable, Serializable {
+
+    }
+
+    @QuerySupertype
+    public abstract static class AValueObject extends APropertyChangeSupported implements Comparable<Object>, Cloneable, Serializable {
+
+    }
+
+    @Test
+    public void aPropertyChangeSupported() {
+        assertEquals(EntityPathBase.class, QSignatureTest_APropertyChangeSupported.class.getSuperclass());
+    }
+
+    @Test
+    public void aValueObject() {
+        assertEquals(EntityPathBase.class, QSignatureTest_AValueObject.class.getSuperclass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java
new file mode 100644
index 0000000000..82f5d7c6fe
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Time;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.*;
+import com.querydsl.core.types.dsl.*;
+
+public class SimpleTypesTest extends AbstractTest {
+
+    public enum MyEnum {
+        VAL1,
+        VAL2
+    }
+
+    public static class CustomLiteral {
+
+    }
+
+    @SuppressWarnings("serial")
+    public static class CustomNumber extends Number {
+
+        @Override
+        public double doubleValue() {
+            return 0;
+        }
+
+        @Override
+        public float floatValue() {
+            return 0;
+        }
+
+        @Override
+        public int intValue() {
+            return 0;
+        }
+
+        @Override
+        public long longValue() {
+            return 0;
+        }
+
+    }
+
+    public static class CustomComparableNumber extends CustomNumber implements Comparable<CustomComparableNumber> {
+
+        private static final long serialVersionUID = 4398583038967396133L;
+
+        @Override
+        public int compareTo(CustomComparableNumber o) {
+            return 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof CustomComparableNumber;
+        }
+    }
+
+    public static class CustomComparableLiteral implements Comparable<CustomComparableLiteral> {
+
+        @Override
+        public int compareTo(CustomComparableLiteral o) {
+            return 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof CustomComparableLiteral;
+        }
+    }
+
+    public static class CustomGenericComparableLiteral<C> implements Comparable<CustomComparableLiteral> {
+
+        @Override
+        public int compareTo(CustomComparableLiteral o) {
+            return 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof CustomGenericComparableLiteral;
+        }
+    }
+
+    @QueryEntity
+    @Config(listAccessors = true)
+    public static class SimpleTypes {
+        transient int test;
+        List<Integer> testList;
+
+        Calendar calendar;
+        List<Calendar> calendarList;
+
+        long id;
+        List<Long> idList;
+
+        BigDecimal bigDecimal;
+        List<BigDecimal> bigDecimalList;
+
+        Byte bbyte;
+        List<Byte> bbyteList;
+        byte bbyte2;
+
+        Short sshort;
+        List<Short> sshortList;
+        short sshort2;
+
+        Character cchar;
+        List<Character> ccharList;
+        char cchar2;
+
+        Double ddouble;
+        List<Double> ddoubleList;
+        double ddouble2;
+
+        Float ffloat;
+        List<Float> ffloatList;
+        float ffloat2;
+
+        Integer iint;
+        List<Integer> iintList;
+        int iint2;
+
+        Locale llocale;
+        List<Locale> llocaleList;
+
+        Long llong;
+        List<Long> llongList;
+        long llong2;
+
+        BigInteger bigInteger;
+
+        String sstring;
+        List<String> sstringList;
+
+        Date date;
+        List<Date> dateList;
+
+        java.sql.Time time;
+        List<java.sql.Time> timeList;
+
+        java.sql.Timestamp timestamp;
+        List<java.sql.Timestamp> timestampList;
+
+        Serializable serializable;
+        List<Serializable> serializableList;
+
+        Object object;
+        List<Object> objectList;
+
+        Class<?> clazz;
+        List<Class> classList2;
+        List<Class<?>> classList3;
+        List<Class<Package>> classList4;
+        List<Class<? extends Date>> classList5;
+
+        Package packageAsLiteral;
+        List<Package> packageAsLiteralList;
+
+        CustomLiteral customLiteral;
+        List<CustomLiteral> customLiteralList;
+
+        CustomComparableLiteral customComparableLiteral;
+        List<CustomComparableLiteral> customComparableLiteralList;
+
+        CustomNumber customNumber;
+        List<CustomNumber> customNumberList;
+
+        CustomComparableNumber customComparableNumber;
+        List<CustomComparableNumber> customComparableNumber2;
+
+        CustomGenericComparableLiteral customComparableLiteral2;
+        List<CustomGenericComparableLiteral> customComparableLiteral2List;
+
+        CustomGenericComparableLiteral<Number> customComparableLiteral3;
+        List<CustomGenericComparableLiteral<Number>> customComparableLiteral3List;
+
+        java.sql.Clob clob;
+        List<java.sql.Clob> clobList;
+
+        java.sql.Blob blob;
+        List<java.sql.Blob> blobList;
+
+        @QueryTransient
+        String skipMe;
+
+        MyEnum myEnum;
+
+        int[] intArray;
+        byte[] byteArray;
+        long[] longArray;
+        float[] floatArray;
+        double[] doubleArray;
+        short[] shortArray;
+
+        @QueryType(PropertyType.SIMPLE)
+        byte[] byteArrayAsSimple;
+    }
+
+    @Test
+    public void list_access() {
+        // date / time
+        QSimpleTypesTest_SimpleTypes.simpleTypes.dateList.get(0).after(new Date());
+        QSimpleTypesTest_SimpleTypes.simpleTypes.timeList.get(0).after(new Time(0L));
+        QSimpleTypesTest_SimpleTypes.simpleTypes.calendarList.get(0).before(Calendar.getInstance());
+
+        // numeric
+        QSimpleTypesTest_SimpleTypes.simpleTypes.bbyteList.get(0).abs();
+
+        // string
+        QSimpleTypesTest_SimpleTypes.simpleTypes.sstringList.get(0).toLowerCase();
+
+        // boolean
+//        QSimpleTypes.simpleTypes.b
+
+    }
+
+    @Test
+    public void simple_types() throws IllegalAccessException, NoSuchFieldException {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        match(NumberPath.class, "id");
+        matchType(Long.class, "id");
+        match(NumberPath.class, "bigDecimal");
+        matchType(BigDecimal.class, "bigDecimal");
+        match(NumberPath.class, "bigInteger");
+        matchType(BigInteger.class, "bigInteger");
+//        match(PNumber.class, "bbyte");
+        match(NumberPath.class, "bbyte2");
+        matchType(Byte.class, "bbyte");
+        match(NumberPath.class, "ddouble");
+        matchType(Double.class, "ddouble");
+        match(NumberPath.class, "ddouble2");
+        matchType(Double.class, "ddouble2");
+        match(NumberPath.class, "ffloat");
+        matchType(Float.class, "ffloat");
+        match(NumberPath.class, "ffloat2");
+        matchType(Float.class, "ffloat2");
+//        match(PNumber.class, "iint");
+        match(NumberPath.class, "iint2");
+        matchType(Integer.class, "iint2");
+        match(NumberPath.class, "llong");
+        matchType(Long.class, "llong");
+        match(NumberPath.class, "llong2");
+        matchType(Long.class, "llong2");
+
+        match(ComparablePath.class, "cchar");
+        matchType(Character.class, "cchar");
+        match(ComparablePath.class, "cchar2");
+        matchType(Character.class, "cchar2");
+
+        match(StringPath.class, "sstring");
+
+        match(DateTimePath.class, "date");
+        matchType(Date.class, "date");
+        match(DateTimePath.class, "calendar");
+        matchType(Calendar.class, "calendar");
+//        match(PDateTime.class, "timestamp");
+
+        match(TimePath.class, "time");
+        matchType(Time.class, "time");
+
+        match(SimplePath.class, "llocale");
+        matchType(Locale.class, "llocale");
+        match(SimplePath.class, "serializable");
+        matchType(Serializable.class, "serializable");
+        match(SimplePath.class, "object");
+        matchType(Object.class, "object");
+        match(SimplePath.class, "clazz");
+        matchType(Class.class, "clazz");
+        match(SimplePath.class, "packageAsLiteral");
+        matchType(Package.class, "packageAsLiteral");
+
+        match(SimplePath.class, "clob");
+        matchType(Clob.class, "clob");
+        match(SimplePath.class, "blob");
+        matchType(Blob.class, "blob");
+
+        match(EnumPath.class, "myEnum");
+        matchType(MyEnum.class, "myEnum");
+    }
+
+    @Test
+    public void custom_literal() throws IllegalAccessException, NoSuchFieldException {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        match(SimplePath.class, "customLiteral");
+        matchType(CustomLiteral.class, "customLiteral");
+    }
+
+    @Test
+    public void custom_comparableLiteral() throws IllegalAccessException, NoSuchFieldException {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        match(ComparablePath.class, "customComparableLiteral");
+        matchType(CustomComparableLiteral.class, "customComparableLiteral");
+    }
+
+    @Test
+    public void custom_number() throws IllegalAccessException, NoSuchFieldException {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        match(SimplePath.class, "customNumber");
+        matchType(CustomNumber.class, "customNumber");
+    }
+
+    @Test
+    public void custom_comparableNumber() throws IllegalAccessException, NoSuchFieldException {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        match(NumberPath.class, "customComparableNumber");
+        matchType(CustomComparableNumber.class, "customComparableNumber");
+    }
+
+    @Test
+    public void skipped_field1() {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        assertMissing("skipMe");
+    }
+
+    @Test
+    public void skipped_field2() {
+        start(QSimpleTypesTest_SimpleTypes.class, QSimpleTypesTest_SimpleTypes.simpleTypes);
+        assertMissing("test");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/SubCat.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SubCat.java
new file mode 100644
index 0000000000..b5d3832aea
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SubCat.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain;
+
+public class SubCat {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Subclass.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Subclass.java
new file mode 100644
index 0000000000..41c10acfdc
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Subclass.java
@@ -0,0 +1,19 @@
+package com.querydsl.apt.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Subclass extends com.querydsl.core.domain.Superclass {
+
+    private int number;
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass2Test.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Superclass2Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass2Test.java
index a69d437431..d80be80d84 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass2Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -49,15 +49,15 @@ public static class Subtype extends CommonPersistence {
     }
 
     @Test
-    public void DefaultInstance() {
+    public void defaultInstance() {
         assertNotNull(QSuperclass2Test_CommonPersistence.commonPersistence);
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QSuperclass2Test_Subtype.subtype.createdOn);
     }
-    
-    
+
+
 
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass3Test.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Superclass3Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass3Test.java
index 60adeb7484..fd74120f2b 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass3Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass3Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class Superclass3Test {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass4Test.java
similarity index 81%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Superclass4Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass4Test.java
index 67219782c4..317ce31ffd 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass4Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass4Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,38 +11,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class Superclass4Test {
-    
+
     public static class SuperClass {
-        
+
         String superClassProperty;
-        
+
     }
-    
+
     @QueryEntity
     public static class Entity extends SuperClass {
-        
+
         String entityProperty;
-        
+
     }
 
     @Test
-    public void SuperClass_Properties() {
+    public void superClass_properties() {
         assertNotNull(QSuperclass4Test_SuperClass.superClass.superClassProperty);
     }
-    
+
     @Test
-    public void Entity_Properties() {
+    public void entity_properties() {
         assertNotNull(QSuperclass4Test_Entity.entity.entityProperty);
         assertNotNull(QSuperclass4Test_Entity.entity.superClassProperty);
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass5Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass5Test.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/Superclass5Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass5Test.java
index 97f18b6ab5..8d0ba7d3ee 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Superclass5Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Superclass5Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,38 +11,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class Superclass5Test {
-    
+
     public static class SuperClass {
-        
+
         String superClassProperty;
-        
+
     }
-    
+
     @QueryEmbeddable
     public static class Embeddable extends SuperClass {
-        
+
         String embeddableProperty;
-        
+
     }
 
     @Test
-    public void SuperClass_Properties() {
+    public void superClass_properties() {
         QSuperclass5Test_SuperClass qtype = new QSuperclass5Test_SuperClass(PathMetadataFactory.forVariable("var"));
         assertNotNull(qtype.superClassProperty);
     }
-    
+
     @Test
-    public void Entity_Properties() {
+    public void entity_properties() {
         QSuperclass5Test_Embeddable qtype = new QSuperclass5Test_Embeddable(PathMetadataFactory.forVariable("var"));
         assertNotNull(qtype.superClassProperty);
         assertNotNull(qtype.embeddableProperty);
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/SuperclassTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SuperclassTest.java
similarity index 82%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/SuperclassTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/SuperclassTest.java
index d2048c23e6..92591c206e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/SuperclassTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/SuperclassTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
 import org.junit.Ignore;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
 
 @Ignore
 public class SuperclassTest {
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/Temporal2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Temporal2Test.java
new file mode 100644
index 0000000000..64499fa1fc
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/Temporal2Test.java
@@ -0,0 +1,43 @@
+package com.querydsl.apt.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class Temporal2Test {
+
+    @Entity
+    public static class Cheque {
+        @Temporal(TemporalType.DATE)
+        private Date dataVencimento;
+
+        @Column(precision = 15, scale = 2)
+        private BigDecimal valor;
+
+        @QueryProjection
+        public Cheque(Date param0, BigDecimal param1) {
+            this.dataVencimento = param0;
+            this.valor = param1;
+        }
+
+    }
+
+    @Test
+    public void test() {
+        DatePath<Date> datePath = Expressions.datePath(Date.class, "date");
+        NumberPath<BigDecimal> numberPath = Expressions.numberPath(BigDecimal.class, "num");
+        new QTemporal2Test_Cheque(datePath, numberPath);
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/TemporalTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/TemporalTest.java
new file mode 100644
index 0000000000..dc4388e20d
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/TemporalTest.java
@@ -0,0 +1,34 @@
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.TimePath;
+
+public class TemporalTest {
+
+    @Entity
+    public static class MyEntity {
+
+        @Temporal(value = TemporalType.DATE)
+        private Date date;
+
+        @Temporal(value = TemporalType.TIME)
+        private Date time;
+    }
+
+    @Test
+    public void test() {
+        assertEquals(DatePath.class, QTemporalTest_MyEntity.myEntity.date.getClass());
+        assertEquals(TimePath.class, QTemporalTest_MyEntity.myEntity.time.getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/TransientTest.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/TransientTest.java
index bf8b1236e8..926e24d540 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/TransientTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/TransientTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,34 +11,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
+
+import static org.junit.Assert.assertNotNull;
 
 import javax.persistence.Entity;
 import javax.persistence.Transient;
 
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
 import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryType;
 
 public class TransientTest {
-    
+
     @Entity
     public static class ExampleEntity {
-        
+
         @QueryType(PropertyType.SIMPLE)
         @Transient
         String property1;
-        
+
         @Transient
         String property2;
-        
+
         @QueryType(PropertyType.SIMPLE)
         transient String property3;
-        
+
         transient String property4;
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QTransientTest_ExampleEntity.exampleEntity.property1);
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/UserUtils.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/UserUtils.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/UserUtils.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/UserUtils.java
index dec4cfcfcc..c71c46635f 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/UserUtils.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/UserUtils.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,15 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.apt.domain;
 
-import com.mysema.query.annotations.QueryDelegate;
-import com.mysema.query.domain.QDelegateTest_User;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.annotations.QueryDelegate;
+import com.querydsl.core.types.dsl.StringPath;
 
 public final class UserUtils {
 
-    private UserUtils() {}
+    private UserUtils() { }
 
     @QueryDelegate(DelegateTest.User.class)
     public static StringPath getName(QDelegateTest_User user) {
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/CustomNumber.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java
similarity index 94%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/custom/CustomNumber.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java
index ee6cb2c906..f777a9e97d 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/CustomNumber.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/CustomNumber.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain.custom;
+package com.querydsl.apt.domain.custom;
 
 public class CustomNumber extends Number implements Comparable<CustomNumber> {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java
new file mode 100644
index 0000000000..97913e6e41
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain.custom;
+
+public class EmbeddedType {
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType2.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType2.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java
index a2d4d97c95..2ea10a5d05 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType2.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.custom;
+package com.querydsl.apt.domain.custom;
 
 public class EmbeddedType2 {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType3.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType3.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java
index 1eb092f9ab..8dacf630f8 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/custom/EmbeddedType3.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/EmbeddedType3.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.custom;
+package com.querydsl.apt.domain.custom;
 
 public class EmbeddedType3 {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/Entity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/Entity.java
new file mode 100644
index 0000000000..097d67f33e
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/custom/Entity.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain.custom;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Entity {
+
+    List<EmbeddedType> list;
+
+    EmbeddedType2 embedded;
+
+    Map<String, EmbeddedType3> map;
+
+    String stringProperty;
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java
new file mode 100644
index 0000000000..fb918a5e82
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p1/SEntity1.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain.p1;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class SEntity1 {
+
+    String entity1Field;
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/AbstractPersistable.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java
similarity index 83%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p10/AbstractPersistable.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java
index 65cb68082f..c2aed8b97e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/AbstractPersistable.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/AbstractPersistable.java
@@ -1,8 +1,9 @@
-package com.mysema.query.domain.p10;
+package com.querydsl.apt.domain.p10;
 
-import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 
+import javax.persistence.MappedSuperclass;
+
 @MappedSuperclass
 public abstract class AbstractPersistable<PK extends Serializable> implements Persistable<PK> {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/BasePersistable.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p10/BasePersistable.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java
index 05b7c468cb..ff380ce735 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/BasePersistable.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BasePersistable.java
@@ -1,8 +1,9 @@
-package com.mysema.query.domain.p10;
+package com.querydsl.apt.domain.p10;
 
-import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 
+import javax.persistence.MappedSuperclass;
+
 @MappedSuperclass
 public class BasePersistable<T extends Serializable> extends AbstractPersistable<T> implements UpdateInfo {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/BaseReferencablePersistable.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java
similarity index 83%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p10/BaseReferencablePersistable.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java
index 88ea4580a1..fdb1228b74 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/BaseReferencablePersistable.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/BaseReferencablePersistable.java
@@ -1,8 +1,9 @@
-package com.mysema.query.domain.p10;
+package com.querydsl.apt.domain.p10;
 
-import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
 
+import javax.persistence.MappedSuperclass;
+
 @MappedSuperclass
 public abstract class BaseReferencablePersistable<PK extends Serializable> extends BasePersistable<PK> {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/Persistable.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/Persistable.java
new file mode 100644
index 0000000000..4e43cd3e66
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/Persistable.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain.p10;
+
+public interface Persistable<T> {
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java
new file mode 100644
index 0000000000..29efe72257
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UpdateInfo.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain.p10;
+
+public interface UpdateInfo {
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/UserAccount.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p10/UserAccount.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java
index 8f515431a6..823ceb477f 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p10/UserAccount.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p10/UserAccount.java
@@ -1,4 +1,4 @@
-package com.mysema.query.domain.p10;
+package com.querydsl.apt.domain.p10;
 
 import javax.persistence.Entity;
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p2/SEntity2.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p2/SEntity2.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java
index 1b49dcc162..9c3865f343 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p2/SEntity2.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p2/SEntity2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.p2;
+package com.querydsl.apt.domain.p2;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.p4.SSupertype;
+import com.querydsl.apt.domain.p4.SSupertype;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class SEntity2 extends SSupertype {
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p3/SEntity3.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java
similarity index 75%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p3/SEntity3.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java
index 772053900b..0e14c8c5b9 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p3/SEntity3.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p3/SEntity3.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.p3;
+package com.querydsl.apt.domain.p3;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.p2.SEntity2;
+import com.querydsl.apt.domain.p2.SEntity2;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class SEntity3 extends SEntity2 {
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p4/SSupertype.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java
similarity index 79%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p4/SSupertype.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java
index b507851ad8..f7512cb5b2 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p4/SSupertype.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p4/SSupertype.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.p4;
+package com.querydsl.apt.domain.p4;
 
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QuerySupertype;
 
 @QuerySupertype
 public class SSupertype {
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type1.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type1.java
similarity index 87%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type1.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type1.java
index 799cd6f223..9db4bc2106 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type1.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type1.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.p6;
+package com.querydsl.apt.domain.p6;
 
 public class Type1 {
-    
+
     private Type2 property;
 
     public Type2 getProperty() {
@@ -24,5 +24,5 @@ public Type2 getProperty() {
     public void setProperty(Type2 property) {
         this.property = property;
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type2.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type2.java
similarity index 87%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type2.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type2.java
index 549554eebc..b44f80ae42 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/p6/Type2.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/Type2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.p6;
+package com.querydsl.apt.domain.p6;
 
 public class Type2 {
-    
+
     private String property;
 
     public String getProperty() {
@@ -24,5 +24,5 @@ public String getProperty() {
     public void setProperty(String property) {
         this.property = property;
     }
-    
+
 }
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java
new file mode 100644
index 0000000000..879c1c7f14
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain.p6;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TypeTest {
+
+    @Test
+    public void test() {
+        QType1 type1 = QType1.type1;
+        QType2 type2 = QType2.type2;
+        assertEquals(type2.getType(), type1.property.getType());
+        assertEquals(type2.getClass(), type1.property.getClass());
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/package-info.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/package-info.java
new file mode 100644
index 0000000000..481fa709ba
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p6/package-info.java
@@ -0,0 +1,5 @@
+@QueryEntities({Type1.class, Type2.class})
+package com.querydsl.apt.domain.p6;
+
+
+import com.querydsl.core.annotations.QueryEntities;
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java
new file mode 100644
index 0000000000..76aaa2ad78
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p7/MyEntity.java
@@ -0,0 +1,8 @@
+package com.querydsl.apt.domain.p7;
+
+import javax.persistence.Entity;
+
+@Entity
+public class MyEntity {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Custom.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Custom.java
new file mode 100644
index 0000000000..8699dbf85b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Custom.java
@@ -0,0 +1,5 @@
+package com.querydsl.apt.domain.p8;
+
+public class Custom {
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Entity.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Entity.java
new file mode 100644
index 0000000000..c01dcea19e
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p8/Entity.java
@@ -0,0 +1,28 @@
+package com.querydsl.apt.domain.p8;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Entity {
+
+    private Long id;
+
+    private Custom custom;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Custom getCustom() {
+        return custom;
+    }
+
+    public void setCustom(Custom custom) {
+        this.custom = custom;
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Article.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Article.java
new file mode 100644
index 0000000000..149cbd9407
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Article.java
@@ -0,0 +1,14 @@
+package com.querydsl.apt.domain.p9;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Article {
+
+    String name;
+
+    Content content;
+
+    Person author;
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Content.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Content.java
new file mode 100644
index 0000000000..bcc0ac62a5
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Content.java
@@ -0,0 +1,10 @@
+package com.querydsl.apt.domain.p9;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class Content {
+
+    Article article;
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Person.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Person.java
new file mode 100644
index 0000000000..f973529758
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/p9/Person.java
@@ -0,0 +1,9 @@
+package com.querydsl.apt.domain.p9;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Person {
+
+    String firstName, lastName;
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/package-info.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/package-info.java
new file mode 100644
index 0000000000..1ef37ed62b
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/package-info.java
@@ -0,0 +1,8 @@
+@QueryEntities({A.class, Tenant.class, DefaultRevisionEntity.class, Delegate3Test.Point.class, Delegate3Test.Polygon.class})
+package com.querydsl.apt.domain;
+
+import org.hibernate.envers.DefaultRevisionEntity;
+
+import com.querydsl.core.annotations.QueryEntities;
+import com.querydsl.core.domain.A;
+import com.querydsl.core.domain.Tenant;
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/RelationType2.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/rel/RelationType2.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java
index 31a30055d6..3cd9a1931d 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/RelationType2.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/RelationType2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.rel;
+package com.querydsl.apt.domain.rel;
 
 import java.util.List;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class RelationType2<D extends RelationType2<D>> {
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java
new file mode 100644
index 0000000000..14d725a53c
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.domain.rel;
+
+public class SimpleType {
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType2.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType2.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java
index 1daf7e8f43..eb8a3ca11d 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/rel/SimpleType2.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain/rel/SimpleType2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain.rel;
+package com.querydsl.apt.domain.rel;
 
 public class SimpleType2<T> {
 
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/domain2/BImpl.java b/querydsl-apt/src/test/java/com/querydsl/apt/domain2/BImpl.java
new file mode 100644
index 0000000000..23af2149b7
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/domain2/BImpl.java
@@ -0,0 +1,9 @@
+package com.querydsl.apt.domain2;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain2.AImpl;
+
+@QueryEntity
+public class BImpl extends AImpl {
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance11Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java
similarity index 84%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance11Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java
index 4d08329599..412b72f790 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance11Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,36 +11,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class Inheritance11Test {
-    
+
     @QueryEntity
     public class Foo extends FooBase<Foo> {
-     
+
     }
 
     @QueryEntity
     public class FooBase<T> {
-        
+
     }
 
     @QueryEntity
     public class BarBase<T> {
-        
+
     }
-    
+
     @QueryEntity
     public class Bar extends BarBase<Foo> {
-     
+
     }
-    
+
     @Test
     public void test() {
         assertNotNull(QInheritance11Test_Foo.foo);
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java
new file mode 100644
index 0000000000..c410718972
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.inheritance;
+
+import org.junit.Ignore;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@Ignore
+public class Inheritance2Test {
+
+    @QueryEntity
+    public abstract class Base<T extends Base<T>> {
+        @SuppressWarnings("unchecked")
+        Base2 base;
+        Base2<?,?> base2;
+    }
+
+    @QueryEntity
+    public abstract class Base2<T extends Base2<T,U>,U extends IFace> {
+
+    }
+
+    @QueryEntity
+    public abstract class BaseSub extends Base<BaseSub> {
+
+    }
+
+    @QueryEntity
+    public abstract class BaseSub2<T extends BaseSub2<T>> extends Base<T> {
+
+    }
+
+    @QueryEntity
+    public abstract class Base2Sub<T extends IFace> extends Base2<Base2Sub<T>,T> {
+
+    }
+
+    public interface IFace {
+
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java
new file mode 100644
index 0000000000..ba6d070d3f
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.inheritance;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.querydsl.apt.domain.AbstractTest;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class Inheritance3Test extends AbstractTest {
+
+    /*
+     * TODO : map type variables to BeanModels
+     */
+
+    @QueryEntity
+    public class GenericSupertype<A> {
+        A field;
+        Collection<A> fieldCol;
+        Set<A> fieldSet;
+        List<A> fieldList;
+        Map<String,A> fieldMap1;
+        Map<A,String> fieldMap2;
+
+        String stringField;
+    }
+
+    @QueryEntity
+    public class GenericSupertypeC<D extends Comparable<D>> extends GenericSupertype<D> {
+
+    }
+
+    @QueryEntity
+    public class GenericSupertypeS extends GenericSupertypeC<String> {
+
+    }
+
+    @QueryEntity
+    public class GenericSupertypeS2 extends GenericSupertype<String> {
+
+    }
+
+    @Test
+    public void genericSupertype() throws IllegalAccessException, NoSuchFieldException {
+        start(QInheritance3Test_GenericSupertype.class, QInheritance3Test_GenericSupertype.genericSupertype);
+        match(SimplePath.class, "field");
+        matchType(Object.class, "field");
+    }
+
+    @Test
+    public void genericSupertypeC() throws IllegalAccessException, NoSuchFieldException {
+        start(QInheritance3Test_GenericSupertypeC.class, QInheritance3Test_GenericSupertypeC.genericSupertypeC);
+        match(SimplePath.class, "field");
+        matchType(Comparable.class, "field");
+    }
+
+    @Test
+    public void genericSupertypeS() throws IllegalAccessException, NoSuchFieldException {
+        start(QInheritance3Test_GenericSupertypeS.class, QInheritance3Test_GenericSupertypeS.genericSupertypeS);
+        match(StringPath.class, "field");
+    }
+
+    @Test
+    public void genericSupertypeS2() throws IllegalAccessException, NoSuchFieldException {
+        start(QInheritance3Test_GenericSupertypeS2.class, QInheritance3Test_GenericSupertypeS2.genericSupertypeS2);
+        match(StringPath.class, "field");
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java
new file mode 100644
index 0000000000..21dcd68f10
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.inheritance;
+
+import org.junit.Test;
+
+import com.querydsl.apt.domain.AbstractTest;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class Inheritance4Test extends AbstractTest {
+
+    @QueryEntity
+    public class EntityWithComparable {
+        private Comparable<?> field;
+
+        public Comparable<?> getField() {
+            return field;
+        }
+
+    }
+
+    @QueryEntity
+    public class EntityWithNumber extends EntityWithComparable {
+        private Long field;
+
+        public Long getField() {
+            return field;
+        }
+
+    }
+
+    @QueryEntity
+    public class EntityWithString extends EntityWithComparable {
+        private String field;
+
+        public String getField() {
+            return field;
+        }
+
+    }
+
+    @Test
+    public void test() throws IllegalAccessException, NoSuchFieldException {
+        start(QInheritance4Test_EntityWithComparable.class, QInheritance4Test_EntityWithComparable.entityWithComparable);
+        match(SimplePath.class, "field");
+        matchType(Comparable.class, "field");
+
+        start(QInheritance4Test_EntityWithNumber.class, QInheritance4Test_EntityWithNumber.entityWithNumber);
+        match(NumberPath.class, "field");
+        matchType(Long.class, "field");
+
+        start(QInheritance4Test_EntityWithString.class, QInheritance4Test_EntityWithString.entityWithString);
+        match(StringPath.class, "field");
+        matchType(String.class, "field");
+
+    }
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java
similarity index 85%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java
index e8a917561b..c4f7ed3426 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance5Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,9 +20,9 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.types.dsl.NumberPath;
 
 public class Inheritance5Test {
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java
similarity index 80%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java
index b8f63a051e..91e66bf066 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance6Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,10 +20,10 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
 
 /**
  * Test multiple level superclasses with generics.
@@ -69,23 +69,23 @@ public static class GlossKey extends TranslationKey<Gloss, GlossKey> {
     }
 
     @Test
-    public void Gloss_subtype_should_contain_fields_from_superclass() {
+    public void gloss_subtype_should_contain_fields_from_superclass() {
         assertEquals(String.class, QInheritance6Test_Gloss.gloss.value.getType());
     }
 
     @Test
-    public void Intermediate_superclass_should_contain_fields_from_top_superclass() {
+    public void intermediate_superclass_should_contain_fields_from_top_superclass() {
          QInheritance6Test_Translation translation = QInheritance6Test_Gloss.gloss._super;
          assertEquals(DateTimePath.class, translation.createdOn.getClass());
     }
 
     @Test
-    public void Gloss_subtype_should_contain_fields_from_top_superclass() {
+    public void gloss_subtype_should_contain_fields_from_top_superclass() {
         assertEquals(DateTimePath.class, QInheritance6Test_Gloss.gloss.createdOn.getClass());
     }
 
     @Test
-    public void Gloss_subtype_should_contain_id_from_top_superclass() {
+    public void gloss_subtype_should_contain_id_from_top_superclass() {
         assertEquals(NumberPath.class, QInheritance6Test_Gloss.gloss.id.getClass());
     }
 
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java
similarity index 90%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java
index 79fb83b977..49ac4a3741 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance7Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,7 +20,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class Inheritance7Test {
 
@@ -35,7 +35,7 @@ public static class SubCategory extends Category<SubCategory> {
     }
 
     @QueryEntity
-    public static class Category<T extends Category<T>> implements Comparable<T>{
+    public static class Category<T extends Category<T>> implements Comparable<T> {
 
         private User owner;
 
@@ -51,11 +51,11 @@ public User getOwner() {
         public int compareTo(T o) {
             return 0;
         }
-        
+
         public boolean equals(Object o) {
             return o == this;
         }
-        
+
         public T getParent() {
             return parent;
         }
@@ -73,7 +73,7 @@ public static class SubCategory2 extends Category<SubCategory2> {
 
     @Test
     @Ignore
-    public void Parent() {
+    public void parent() {
         // FIXME
         assertEquals(Category.class, QInheritance7Test_Category.category.parent.getType());
         assertEquals(SubCategory.class, QInheritance7Test_SubCategory.subCategory.parent.getType());
@@ -82,7 +82,7 @@ public void Parent() {
 
     @Test
     @Ignore
-    public void Children() {
+    public void children() {
         // FIXME
         assertEquals(Category.class, QInheritance7Test_Category.category.children.getElementType());
         assertEquals(SubCategory.class, QInheritance7Test_SubCategory.subCategory.children.getElementType());
diff --git a/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java
new file mode 100644
index 0000000000..dc012774db
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.apt.inheritance;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.CommonIdentifiable;
+import com.querydsl.core.domain.CommonPersistence;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class Inheritance8Test {
+
+    @QueryEntity
+    public static class SimpleSubclass extends CommonPersistence {
+    }
+
+    @QueryEntity
+    public static class GenericSubclass extends CommonIdentifiable<Long> {
+    }
+
+    @Test
+    public void simple_subclass_should_contain_fields_from_external_superclass() {
+        assertEquals(NumberPath.class, QInheritance8Test_SimpleSubclass.simpleSubclass.version.getClass());
+    }
+
+    @Test
+    public void generic_subclass_should_contain_fields_from_external_superclass() {
+        assertEquals(NumberPath.class, QInheritance8Test_GenericSubclass.genericSubclass.version.getClass());
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java
similarity index 86%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java
index a1c962e884..ca6ac9ad15 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/Inheritance9Test.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.SuperSupertype;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.SuperSupertype;
 
 /**
  * related to https://bugs.launchpad.net/querydsl/+bug/538148
diff --git a/querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java
similarity index 91%
rename from querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java
rename to querydsl-apt/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java
index b5132fcd70..d04252d377 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/inheritance/InheritanceTest.java
+++ b/querydsl-apt/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.inheritance;
+package com.querydsl.apt.inheritance;
 
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 public class InheritanceTest {
 
     @QueryEntity
-    public abstract class BobbinGenOperation<M extends FlexPlasticFilm> extends Operation<M>{
+    public abstract class BobbinGenOperation<M extends FlexPlasticFilm> extends Operation<M> {
 
     }
 
@@ -37,7 +37,7 @@ public abstract class FlexPlastic extends Storable {
     }
 
     @QueryEntity
-    public abstract class FlexPlasticFilm extends FlexPlastic implements Rimmable { 
+    public abstract class FlexPlasticFilm extends FlexPlastic implements Rimmable {
 
     }
 
diff --git a/querydsl-apt/template.mf b/querydsl-apt/template.mf
deleted file mode 100644
index 38f0a7c8ae..0000000000
--- a/querydsl-apt/template.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.apt
-Bundle-Name: Querydsl APT
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.codegen.*;version="${codegen.version}",
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",    
-  com.mysema.query.*;version="${project.version}",
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",  
-  javax.lang.model.*;version="0",
-  javax.tools.*;version="0",
-  net.sf.cglib.proxy.*;version="${cglib.version}",
-  com.google.common.*;version="${guava.version}"
-Excluded-Imports:
-  javax.persistence.*;version="[2.0.0,2.1.0)",
-  javax.jdo.*;version="[2.0.0,3.0.0)",
-  org.springframework.roo.*;version="1.2.3",
-  org.mongodb.morphia.annotations.*;version="0.99"
\ No newline at end of file
diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml
new file mode 100644
index 0000000000..7aa0f87bac
--- /dev/null
+++ b/querydsl-bom/pom.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-root</artifactId>
+        <version>5.1.0</version>
+    </parent>
+
+    <artifactId>querydsl-bom</artifactId>
+    <name>Querydsl - Bill of materials</name>
+    <description>Bill of materials</description>
+    <url>${project.homepage}</url>
+    <packaging>pom</packaging>
+
+    <properties>
+        <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-codegen</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>codegen-utils</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-spatial</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-apt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-collections</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-guava</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-sql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-sql-spatial</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-sql-codegen</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-sql-spring</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-jpa</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-jpa-codegen</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-jdo</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-kotlin-codegen</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-lucene3</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-lucene4</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-lucene5</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-hibernate-search</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-mongodb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-scala</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>querydsl-kotlin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>bom</flattenMode>
+                            <pomElements>
+                                <properties>remove</properties>
+                                <repositories>remove</repositories>
+                                <dependencies>remove</dependencies>
+                            </pomElements>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>flatten-clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/querydsl-codegen-utils/pom.xml b/querydsl-codegen-utils/pom.xml
new file mode 100644
index 0000000000..8e825d818a
--- /dev/null
+++ b/querydsl-codegen-utils/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>codegen-utils</artifactId>
+  <version>5.1.0</version>
+  <name>Querydsl - Codegen utils</name>
+  <description>Code generation and compilation for Java</description>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  
+  <packaging>jar</packaging>
+
+  <inceptionYear>2010</inceptionYear>
+  
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  
+  <scm>
+    <connection>scm:git:git@github.com:querydsl/codegen.git</connection>
+    <url>git@github.com:querydsl/codegen.git</url>
+  </scm>    
+  
+  <properties>
+    <commons.collections.version>4.01</commons.collections.version>
+    <commons.lang.version>3.0.1</commons.lang.version>
+    <ecj.version>3.26.0</ecj.version>
+    <osgi.import.package>javax.annotation.*;version="0",javax.tools.*;version="0",org.eclipse.jdt.*;version="3.7.2"${osgi.import.package.root}</osgi.import.package>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>ecj</artifactId>
+      <version>${ecj.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>compile</scope>
+    </dependency>
+         
+    <!-- test -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.2</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.codegen.utils</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>com.springsource.repository.bundles.release</id>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+
+  <developers>
+    <developer>
+      <id>tiwe</id>
+      <name>Timo Westkämper</name>
+      <email>timo.westkamper@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Architect</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>laim</id>
+      <name>Lassi Immonen</name>
+      <email>lassi.immonen@mysema.com</email>
+      <organization>Mysema Ltd</organization>
+      <roles>
+        <role>Consultant</role>
+      </roles>
+    </developer>
+  </developers>
+</project>
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractCodeWriter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractCodeWriter.java
new file mode 100644
index 0000000000..8941de6078
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractCodeWriter.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+
+/**
+ * @author tiwe
+ * 
+ * @param <T>
+ */
+public abstract class AbstractCodeWriter<T extends AbstractCodeWriter<T>> implements Appendable,
+        CodeWriter {
+
+    private final Appendable appendable;
+
+    private final int spaces;
+
+    private final String spacesString;
+
+    private String indent = "";
+
+    @SuppressWarnings("unchecked")
+    private final T self = (T) this;
+
+    public AbstractCodeWriter(Appendable appendable, int spaces) {
+        if (appendable == null) {
+            throw new IllegalArgumentException("appendable is null");
+        }
+        this.appendable = appendable;
+        this.spaces = spaces;
+        this.spacesString = StringUtils.repeat(' ', spaces);
+    }
+
+    @Override
+    public T append(char c) throws IOException {
+        appendable.append(c);
+        return self;
+    }
+
+    @Override
+    public T append(CharSequence csq) throws IOException {
+        appendable.append(csq);
+        return self;
+    }
+
+    @Override
+    public T append(CharSequence csq, int start, int end) throws IOException {
+        appendable.append(csq, start, end);
+        return self;
+    }
+
+    @Override
+    public T beginLine(String... segments) throws IOException {
+        append(indent);
+        for (String segment : segments) {
+            append(segment);
+        }
+        return self;
+    }
+
+    protected T goIn() {
+        indent += spacesString;
+        return self;
+    }
+
+    protected T goOut() {
+        if (indent.length() >= spaces) {
+            indent = indent.substring(0, indent.length() - spaces);
+        }
+        return self;
+    }
+
+    @Override
+    public T line(String... segments) throws IOException {
+        append(indent);
+        for (String segment : segments) {
+            append(segment);
+        }
+        return nl();
+    }
+
+    @Override
+    public T nl() throws IOException {
+        return append(System.lineSeparator());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractEvaluatorFactory.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractEvaluatorFactory.java
new file mode 100644
index 0000000000..f54357ad62
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/AbstractEvaluatorFactory.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2012, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.support.ClassUtils;
+
+/**
+ * @author tiwe
+ *
+ */
+public abstract class AbstractEvaluatorFactory implements EvaluatorFactory {
+    
+    private final Map<String, Method> cache = new WeakHashMap<String, Method>();
+    
+    protected ClassLoader loader;
+    
+    /**
+     * @param source
+     * @param projection
+     * @param names
+     * @param types
+     * @param id
+     * @param constants
+     * @throws IOException
+     */
+    protected abstract void compile(String source, ClassType projection, String[] names, Type[] types,
+            String id, Map<String, Object> constants) throws IOException;
+    
+    /**
+     * @param source
+     * @param projectionType
+     * @param names
+     * @param types
+     * @param id
+     * @param constants
+     * @return
+     * @throws IOException
+     */
+    protected String createSource(String source, ClassType projectionType, String[] names,
+            Type[] types, String id, Map<String, Object> constants) throws IOException {
+        // create source
+        StringWriter writer = new StringWriter();
+        JavaWriter javaw = new JavaWriter(writer);
+        SimpleType idType = new SimpleType(id, "", id);
+        javaw.beginClass(idType, null);
+        Parameter[] params = new Parameter[names.length + constants.size()];
+        for (int i = 0; i < names.length; i++) {
+            params[i] = new Parameter(names[i], types[i]);
+        }
+        int i = names.length;
+        for (Map.Entry<String, Object> entry : constants.entrySet()) {
+            Type type = new ClassType(TypeCategory.SIMPLE, ClassUtils.normalize(entry.getValue().getClass()));
+            params[i++] = new Parameter(entry.getKey(), type);
+        }
+
+        javaw.beginStaticMethod(projectionType, "eval", params);
+        javaw.append(source);
+        javaw.end();
+        javaw.end();
+        return writer.toString();
+    }
+
+    
+    @Override
+    public <T> Evaluator<T> createEvaluator(String source, Class<? extends T> projectionType,
+            String[] names, Class<?>[] classes, Map<String, Object> constants) {
+        Type[] types = new Type[classes.length];
+        for (int i = 0; i < types.length; i++) {
+            types[i] = new ClassType(TypeCategory.SIMPLE, classes[i]);
+        }
+        return createEvaluator(source, new ClassType(TypeCategory.SIMPLE, projectionType), names,
+                types, classes, constants);
+    }
+
+
+    /**
+     * Create a new Evaluator instance
+     * 
+     * @param <T>
+     *            projection type
+     * @param source
+     *            expression in Java source code form
+     * @param projection
+     *            type of the source expression
+     * @param names
+     *            names of the arguments
+     * @param types
+     *            types of the arguments
+     * @param constants
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public synchronized <T> Evaluator<T> createEvaluator(String source, ClassType projection, String[] names,
+            Type[] types, Class<?>[] classes, Map<String, Object> constants) {
+        try {
+            final String id = toId(source, projection.getJavaClass(), types, constants.values());
+            Method method = cache.get(id);
+                        
+            if (method == null) {
+                Class<?> clazz;
+                try {
+                    clazz = loader.loadClass(id);
+                } catch (ClassNotFoundException e) {
+                    compile(source, projection, names, types, id, constants);
+                    // reload
+                    clazz = loader.loadClass(id);
+                }
+                method = findEvalMethod(clazz);
+                cache.put(id, method);
+            }
+            
+            return new MethodEvaluator<T>(method, constants, (Class) projection.getJavaClass());
+        } catch (ClassNotFoundException e) {
+            throw new CodegenException(e);
+        } catch (SecurityException e) {
+            throw new CodegenException(e);
+        } catch (IOException e) {
+            throw new CodegenException(e);
+        }
+    }
+
+    protected Method findEvalMethod(Class<?> clazz) {
+        /*
+         * Note 1:
+         * Some Java instrumentation tools (e.g. JaCoCo) insert code into
+         * classes at runtime. This means that the static eval() method *could*
+         * not be the first method of our runtime generated classes anymore.
+         *
+         * Note 2:
+         * We can't use clazz.getDeclaredMethod(name, classes), as the argument
+         * types of the eval() method could be normalized (see createSource()).
+         */
+        for (Method method : clazz.getDeclaredMethods()) {
+            if ("eval".equals(method.getName())) {
+                return method;
+            }
+        }
+
+        throw new IllegalArgumentException("Couldn't find eval method!");
+    }
+
+    protected String toId(String source, Class<?> returnType, Type[] types, Collection<Object> constants) {
+        StringBuilder b = new StringBuilder(128);
+        b.append("Q");
+        b.append("_").append(source.hashCode());
+        b.append("_").append(returnType.getName().hashCode());
+        for (Type type : types) {
+            b.append("_").append(type.getFullName().hashCode());
+        }
+        for (Object constant : constants) {
+            b.append("_").append(constant.getClass().getName().hashCode());
+        }
+        return b.toString().replace('-', '0');
+    }
+    
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodeWriter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodeWriter.java
new file mode 100644
index 0000000000..555c2f502d
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodeWriter.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.function.Function;
+
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * CodeWriter defines an interface for serializing Java source code
+ * 
+ * @author tiwe
+ * 
+ */
+public interface CodeWriter extends Appendable {
+
+    String getRawName(Type type);
+
+    String getGenericName(boolean asArgType, Type type);
+
+    String getClassConstant(String className);
+
+    CodeWriter annotation(Annotation annotation) throws IOException;
+
+    CodeWriter annotation(Class<? extends Annotation> annotation) throws IOException;
+
+    CodeWriter beginClass(Type type) throws IOException;
+
+    CodeWriter beginClass(Type type, Type superClass, Type... interfaces) throws IOException;
+
+    <T> CodeWriter beginConstructor(Collection<T> params, Function<T, Parameter> transformer) throws IOException;
+
+    CodeWriter beginConstructor(Parameter... params) throws IOException;
+
+    CodeWriter beginInterface(Type type, Type... interfaces) throws IOException;
+
+    CodeWriter beginLine(String... segments) throws IOException;
+
+    <T> CodeWriter beginPublicMethod(Type returnType, String methodName, Collection<T> parameters,
+            Function<T, Parameter> transformer) throws IOException;
+
+    CodeWriter beginPublicMethod(Type returnType, String methodName, Parameter... args) throws IOException;
+
+    <T> CodeWriter beginStaticMethod(Type type, String name, Collection<T> params,
+            Function<T, Parameter> transformer) throws IOException;
+
+    CodeWriter beginStaticMethod(Type returnType, String methodName, Parameter... args) throws IOException;
+
+    CodeWriter end() throws IOException;
+
+    CodeWriter field(Type type, String name) throws IOException;
+
+    CodeWriter imports(Class<?>... imports) throws IOException;
+
+    CodeWriter imports(Package... imports) throws IOException;
+
+    CodeWriter importClasses(String... classes) throws IOException;
+
+    CodeWriter importPackages(String... packages) throws IOException;
+
+    CodeWriter javadoc(String... lines) throws IOException;
+
+    CodeWriter line(String... segments) throws IOException;
+
+    CodeWriter nl() throws IOException;
+
+    CodeWriter packageDecl(String packageName) throws IOException;
+
+    CodeWriter privateField(Type type, String name) throws IOException;
+
+    CodeWriter privateFinal(Type type, String name) throws IOException;
+
+    CodeWriter privateFinal(Type type, String name, String value) throws IOException;
+
+    CodeWriter privateStaticFinal(Type type, String name, String value) throws IOException;
+
+    CodeWriter protectedField(Type type, String name) throws IOException;
+
+    CodeWriter protectedFinal(Type type, String name) throws IOException;
+
+    CodeWriter protectedFinal(Type type, String name, String value) throws IOException;
+
+    CodeWriter publicField(Type type, String name) throws IOException;
+
+    CodeWriter publicField(Type type, String name, String value) throws IOException;
+
+    CodeWriter publicFinal(Type type, String name) throws IOException;
+
+    CodeWriter publicFinal(Type type, String name, String value) throws IOException;
+
+    CodeWriter publicStaticFinal(Type type, String name, String value) throws IOException;
+
+    CodeWriter staticimports(Class<?>... imports) throws IOException;
+
+    CodeWriter suppressWarnings(String type) throws IOException;
+
+    CodeWriter suppressWarnings(String... types) throws IOException;
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodegenException.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodegenException.java
new file mode 100644
index 0000000000..52d34c9022
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/CodegenException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+/**
+ * @author tiwe
+ * 
+ */
+public class CodegenException extends RuntimeException {
+
+    private static final long serialVersionUID = -8704782349669898467L;
+
+    public CodegenException(String msg) {
+        super(msg);
+    }
+
+    public CodegenException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public CodegenException(Throwable t) {
+        super(t);
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java
new file mode 100644
index 0000000000..77ec0e39c0
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ECJEvaluatorFactory.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.stream.Collectors;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+import org.eclipse.jdt.core.compiler.CategorizedProblem;
+import org.eclipse.jdt.core.compiler.CharOperation;
+import org.eclipse.jdt.internal.compiler.*;
+import org.eclipse.jdt.internal.compiler.Compiler;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
+import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
+import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
+import org.eclipse.jdt.internal.compiler.tool.EclipseFileManager;
+
+/**
+ * EvaluatorFactory is a factory implementation for creating Evaluator instances
+ * 
+ * @author tiwe
+ * 
+ */
+public class ECJEvaluatorFactory extends AbstractEvaluatorFactory {
+    
+    private final MemFileManager fileManager;
+    
+    private final ClassLoader parentClassLoader;
+    
+    private final List<String> problemList = new ArrayList<>();
+    
+    private final CompilerOptions compilerOptions;
+    
+    public static CompilerOptions getDefaultCompilerOptions() {
+        String javaSpecVersion = System.getProperty("java.specification.version");
+        Map<String, String> settings = new HashMap<>();
+        settings.put(CompilerOptions.OPTION_Source, javaSpecVersion);
+        settings.put(CompilerOptions.OPTION_TargetPlatform, javaSpecVersion);
+        settings.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.IGNORE);
+        return new CompilerOptions(settings);
+    }
+
+    public ECJEvaluatorFactory(ClassLoader parent) {
+        this(parent, getDefaultCompilerOptions());
+    }
+    
+    public ECJEvaluatorFactory(ClassLoader parent, CompilerOptions compilerOptions) {
+        this.parentClassLoader = parent;
+        this.fileManager = new MemFileManager(parent, new EclipseFileManager(Locale.getDefault(), Charset.defaultCharset()));
+        this.loader = fileManager.getClassLoader(StandardLocation.CLASS_OUTPUT);
+        this.compilerOptions = compilerOptions;
+    }
+
+    protected void compile(String source, ClassType projectionType, String[] names, Type[] types,
+                           String id, Map<String, Object> constants) throws IOException {
+        // create source
+        source = createSource(source, projectionType, names, types, id, constants);
+
+        // compile
+        final char[] targetContents = source.toCharArray();
+        final String targetName = id;
+        final ICompilationUnit[] targetCompilationUnits = new ICompilationUnit[] { new ICompilationUnit() {
+            @Override
+            public char[] getContents() {
+                return targetContents;
+            }
+
+            @Override
+            public char[] getMainTypeName() {
+                int dot = targetName.lastIndexOf('.');
+                if (dot > 0) {
+                    return targetName.substring(dot + 1).toCharArray();
+                } else {
+                    return targetName.toCharArray();
+                }
+            }
+
+            @Override
+            public char[][] getPackageName() {
+                StringTokenizer tok = new StringTokenizer(targetName, ".");
+                char[][] result = new char[tok.countTokens() - 1][];
+                for (int j = 0; j < result.length; j++) {
+                    result[j] = tok.nextToken().toCharArray();
+                }
+                return result;
+            }
+
+            @Override
+            public char[] getFileName() {
+                return CharOperation.concat(targetName.toCharArray(), ".java".toCharArray());
+            }
+
+            @Override
+            public boolean ignoreOptionalProblems() {
+                return true;
+            }
+        } };
+        
+        INameEnvironment env = new INameEnvironment() {
+
+            private String join(char[][] compoundName, char separator) {
+                if (compoundName == null) {
+                    return "";
+                } else {
+                    List<String> parts = new ArrayList<>(compoundName.length);
+                    for (char[] part: compoundName) {
+                        parts.add(new String(part));
+                    }
+                    return parts.stream().collect(Collectors.joining(new String(new char[] { separator })));
+                }
+            }
+            
+            @Override
+            public NameEnvironmentAnswer findType(char[][] compoundTypeName) {
+                return findType(join(compoundTypeName, '.'));
+            }
+
+            @Override
+            public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) {
+                return findType(CharOperation.arrayConcat(packageName, typeName));
+            }
+
+            private boolean isClass(String result) {
+                if (result == null || result.isEmpty()) {
+                    return false;
+                }
+                
+                // if it's the class we're compiling, then of course it's a class
+                if (result.equals(targetName)) {
+                    return true;
+                }
+                InputStream is = null;
+                try {
+                    // if this is a class we've already compiled, it's a class
+                    is = loader.getResourceAsStream(result);
+                    if (is == null) {
+                        // use our normal class loader now...
+                        String resourceName = result.replace('.', '/') + ".class";
+                        is = parentClassLoader.getResourceAsStream(resourceName);
+                        if (is == null && !result.contains(".")) {
+                            // we couldn't find the class, and it has no package; is it a core class?
+                            is = parentClassLoader.getResourceAsStream("java/lang/" + resourceName);
+                        }
+                    }
+                    return is != null;
+                } finally {
+                    if (is != null) {
+                        try {
+                            is.close();
+                        } catch (IOException ex) { }
+                    }
+                }
+            }
+            
+            @Override
+            public boolean isPackage(char[][] parentPackageName, char[] packageName) {
+                // if the parent is a class, the child can't be a package
+                String parent = join(parentPackageName, '.');
+                if (isClass(parent)) {
+                    return false;
+                }
+
+                // if the child is a class, it's not a package
+                String qualifiedName = (parent.isEmpty() ? "" : parent + ".") + new String(packageName);
+                return !isClass(qualifiedName);
+            }
+            
+            @Override
+            public void cleanup() {
+            }
+            
+            private NameEnvironmentAnswer findType(String className) {
+                String resourceName = className.replace('.', '/') + ".class";
+                InputStream is = null;
+                try {
+                    // we're only asking ECJ to compile a single class; we shouldn't need this
+                    if (className.equals(targetName)) {
+                        return new NameEnvironmentAnswer(targetCompilationUnits[0], null);
+                    }
+                    
+                    is = loader.getResourceAsStream(resourceName);
+                    if (is == null) {
+                        is = parentClassLoader.getResourceAsStream(resourceName);
+                    }
+                    
+                    if (is != null) {
+
+                        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+                        int nRead;
+                        byte[] data = new byte[1024];
+                        while ((nRead = is.read(data, 0, data.length)) != -1) {
+                            buffer.write(data, 0, nRead);
+                        }
+                        buffer.flush();
+
+                        ClassFileReader cfr = new ClassFileReader(buffer.toByteArray(), className.toCharArray(), true);
+                        return new NameEnvironmentAnswer(cfr, null);
+                    } else {
+                        return null;
+                    }
+                } catch (ClassFormatException | IOException ex) {
+                    throw new RuntimeException(ex);
+                } finally {
+                    if (is != null) {
+                        try {
+                            is.close();
+                        } catch (IOException e) { }
+                    }
+                }
+                
+            }
+        };
+        
+        ICompilerRequestor requestor = new ICompilerRequestor() {
+
+            @Override
+            public void acceptResult(CompilationResult result) {
+                if (result.hasErrors()) {
+                    for (CategorizedProblem problem: result.getProblems()) {
+                        if (problem.isError()) {
+                            problemList.add(problem.getMessage());
+                        }
+                    }
+                } else {
+                    for (ClassFile clazz: result.getClassFiles()) {
+                        try {
+                            MemJavaFileObject jfo = (MemJavaFileObject) fileManager
+                                    .getJavaFileForOutput(StandardLocation.CLASS_OUTPUT,
+                                            new String(clazz.fileName()), JavaFileObject.Kind.CLASS, null);
+                            OutputStream os = jfo.openOutputStream();
+                            os.write(clazz.getBytes());
+                        } catch (IOException ex) {
+                            throw new RuntimeException(ex);
+                        }
+                    }
+                }
+            }
+        };
+        
+        problemList.clear();
+
+        IErrorHandlingPolicy policy = DefaultErrorHandlingPolicies.exitAfterAllProblems();
+        IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault());
+
+        try {
+            //Compiler compiler = new Compiler(env, policy, getCompilerOptions(), requestor, problemFactory, true);
+            Compiler compiler = new Compiler(env, policy, compilerOptions, requestor, problemFactory);
+            compiler.compile(targetCompilationUnits);
+            if (!problemList.isEmpty()) {
+                StringBuilder sb = new StringBuilder();
+                for (String problem: problemList) {
+                    sb.append("\t").append(problem).append("\n");
+                }
+                throw new CodegenException("Compilation of " + id + " failed:\n" + source + "\n" + sb.toString());
+            }
+        } catch (RuntimeException ex) {
+            // if we encountered an IOException, unbox and throw it;
+            // if we encountered a ClassFormatException, box it as an IOException and throw it
+            // otherwise, it's a legit RuntimeException, 
+            //    not one of our checked exceptions boxed as unchecked; just rethrow
+            Throwable cause = ex.getCause();
+            if (cause != null) {
+                if (cause instanceof IOException) {
+                    throw (IOException) cause;
+                } else if (cause instanceof ClassFormatException) {
+                    throw new IOException(cause);
+                }
+            }
+            throw ex;
+        }
+    }
+
+    public CompilerOptions getCompilerOptions() {
+        return compilerOptions;
+    }
+    
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Evaluator.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Evaluator.java
new file mode 100644
index 0000000000..d49d5dd175
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Evaluator.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+/**
+ * Evaluator defines an interface for returning a value as a result of
+ * evaluating an expression using the given argument array
+ * 
+ * @author tiwe
+ * 
+ */
+public interface Evaluator<T> {
+
+    /**
+     * @param args
+     * @return
+     */
+    T evaluate(Object... args);
+
+    /**
+     * @return
+     */
+    Class<? extends T> getType();
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/EvaluatorFactory.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/EvaluatorFactory.java
new file mode 100644
index 0000000000..12a7d43ca4
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/EvaluatorFactory.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+
+import java.util.Map;
+
+/**
+ *
+ * @author pgrant
+ */
+public interface EvaluatorFactory {
+
+    /**
+     * @param source
+     * @param projectionType
+     * @param names
+     * @param classes
+     * @param constants
+     * @return
+     */
+    <T> Evaluator<T> createEvaluator(String source, Class<? extends T> projectionType,
+            String[] names, Class<?>[] classes, Map<String, Object> constants);
+
+    /**
+     * Create a new Evaluator instance
+     *
+     * @param <T>
+     * projection type
+     * @param source
+     * expression in Java source code form
+     * @param projection
+     * type of the source expression
+     * @param names
+     * names of the arguments
+     * @param types
+     * types of the arguments
+     * @param constants
+     * @return
+     */
+    <T> Evaluator<T> createEvaluator(String source, ClassType projection, String[] names,
+                                     Type[] types, Class<?>[] classes, Map<String, Object> constants);
+    
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java
new file mode 100644
index 0000000000..2c5b731cd7
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * JDKEvaluatorFactory is a factory implementation for creating Evaluator instances
+ * 
+ * @author tiwe
+ * 
+ */
+public class JDKEvaluatorFactory extends AbstractEvaluatorFactory {
+
+    private final MemFileManager fileManager;
+
+    private final String classpath;
+
+    private final List<String> compilationOptions;
+
+    private final JavaCompiler compiler;
+
+    public JDKEvaluatorFactory(URLClassLoader parent) {
+        this(parent, ToolProvider.getSystemJavaCompiler());
+    }
+
+    public JDKEvaluatorFactory(URLClassLoader parent, JavaCompiler compiler) {
+        this.fileManager = new MemFileManager(parent, compiler.getStandardFileManager(null, null, null));
+        this.compiler = compiler;
+        this.classpath = SimpleCompiler.getClassPath(parent);
+        this.loader = fileManager.getClassLoader(StandardLocation.CLASS_OUTPUT);
+        this.compilationOptions = Arrays.asList("-classpath", classpath, "-g:none");
+    }
+
+    protected void compile(String source, ClassType projectionType, String[] names, Type[] types,
+                           String id, Map<String, Object> constants) throws IOException {
+        // create source
+        source = createSource(source, projectionType, names, types, id, constants);
+
+        // compile
+        SimpleJavaFileObject javaFileObject = new MemSourceFileObject(id, source);
+        Writer out = new StringWriter();
+
+        CompilationTask task = compiler.getTask(out, fileManager, null, compilationOptions, null,
+                Collections.singletonList(javaFileObject));
+        if (!task.call().booleanValue()) {
+            throw new CodegenException("Compilation of " + source + " failed.\n" + out.toString());
+        }
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JavaWriter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JavaWriter.java
new file mode 100644
index 0000000000..762a2d5c87
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JavaWriter.java
@@ -0,0 +1,492 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Stack;
+import java.util.function.Function;
+
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * JavaWriter is the default implementation of the CodeWriter interface
+ * 
+ * @author tiwe
+ * 
+ */
+public final class JavaWriter extends AbstractCodeWriter<JavaWriter> {
+
+    private static final String EXTENDS = " extends ";
+
+    private static final String IMPLEMENTS = " implements ";
+
+    private static final String IMPORT = "import ";
+
+    private static final String IMPORT_STATIC = "import static ";
+
+    private static final String PACKAGE = "package ";
+
+    private static final String PRIVATE = "private ";
+
+    private static final String PRIVATE_FINAL = "private final ";
+
+    private static final String PRIVATE_STATIC_FINAL = "private static final ";
+
+    private static final String PROTECTED = "protected ";
+
+    private static final String PROTECTED_FINAL = "protected final ";
+
+    private static final String PUBLIC = "public ";
+
+    private static final String PUBLIC_CLASS = "public class ";
+
+    private static final String PUBLIC_FINAL = "public final ";
+
+    private static final String PUBLIC_INTERFACE = "public interface ";
+
+    private static final String PUBLIC_STATIC = "public static ";
+
+    private static final String PUBLIC_STATIC_FINAL = "public static final ";
+
+    private final Set<String> classes = new HashSet<String>();
+
+    private final Set<String> packages = new HashSet<String>();
+
+    private final Stack<Type> types = new Stack<Type>();
+
+    public JavaWriter(Appendable appendable) {
+        super(appendable, 4);
+        this.packages.add("java.lang");
+    }
+
+    @Override
+    public JavaWriter annotation(Annotation annotation) throws IOException {
+        beginLine().append("@").appendType(annotation.annotationType());
+        Method[] methods = annotation.annotationType().getDeclaredMethods();
+        if (methods.length == 1 && methods[0].getName().equals("value")) {
+            try {
+                Object value = methods[0].invoke(annotation);
+                append("(");
+                annotationConstant(value);
+                append(")");
+            } catch (IllegalArgumentException e) {
+                throw new CodegenException(e);
+            } catch (IllegalAccessException e) {
+                throw new CodegenException(e);
+            } catch (InvocationTargetException e) {
+                throw new CodegenException(e);
+            }
+        } else {
+            boolean first = true;
+            for (Method method : methods) {
+                try {
+                    Object value = method.invoke(annotation);
+                    if (value == null || value.equals(method.getDefaultValue())) {
+                        continue;
+                    } else if (value.getClass().isArray()
+                            && Arrays.equals((Object[]) value, (Object[]) method.getDefaultValue())) {
+                        continue;
+                    } else if (!first) {
+                        append(Symbols.COMMA);
+                    } else {
+                        append("(");
+                    }
+                    append(method.getName()).append("=");
+                    annotationConstant(value);
+                } catch (IllegalArgumentException e) {
+                    throw new CodegenException(e);
+                } catch (IllegalAccessException e) {
+                    throw new CodegenException(e);
+                } catch (InvocationTargetException e) {
+                    throw new CodegenException(e);
+                }
+                first = false;
+            }
+            if (!first) {
+                append(")");
+            }
+        }
+        return nl();
+    }
+
+    @Override
+    public JavaWriter annotation(Class<? extends Annotation> annotation) throws IOException {
+        return beginLine().append("@").appendType(annotation).nl();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void annotationConstant(Object value) throws IOException {
+        if (value.getClass().isArray()) {
+            append("{");
+            boolean first = true;
+            for (Object o : (Object[]) value) {
+                if (!first) {
+                    append(", ");
+                }
+                annotationConstant(o);
+                first = false;
+            }
+            append("}");
+        } else if (value instanceof Class) {
+            appendType((Class) value).append(".class");
+        } else if (value instanceof Number || value instanceof Boolean) {
+            append(value.toString());
+        } else if (value instanceof Enum) {
+            Enum<?> enumValue = (Enum<?>) value;
+            if (classes.contains(enumValue.getClass().getName())
+                    || packages.contains(enumValue.getClass().getPackage().getName())) {
+                append(enumValue.name());
+            } else {
+                append(enumValue.getDeclaringClass().getName()).append(Symbols.DOT).append(enumValue.name());
+            }
+        } else if (value instanceof String) {
+            String escaped = StringUtils.escapeJava(value.toString());
+            append(Symbols.QUOTE).append(escaped.replace("\\/", "/")).append(Symbols.QUOTE);
+        } else {
+            throw new IllegalArgumentException("Unsupported annotation value : " + value);
+        }
+    }
+
+    private JavaWriter appendType(Class<?> type) throws IOException {
+        if (classes.contains(type.getName()) || packages.contains(type.getPackage().getName())) {
+            append(type.getSimpleName());
+        } else {
+            append(type.getName());
+        }
+        return this;
+    }
+
+    @Override
+    public JavaWriter beginClass(Type type) throws IOException {
+        return beginClass(type, null);
+    }
+
+    @Override
+    public JavaWriter beginClass(Type type, Type superClass, Type... interfaces) throws IOException {
+        packages.add(type.getPackageName());
+        beginLine(PUBLIC_CLASS, type.getGenericName(false, packages, classes));
+        if (superClass != null) {
+            append(EXTENDS).append(superClass.getGenericName(false, packages, classes));
+        }
+        if (interfaces.length > 0) {
+            append(IMPLEMENTS);
+            for (int i = 0; i < interfaces.length; i++) {
+                if (i > 0) {
+                    append(Symbols.COMMA);
+                }
+                append(interfaces[i].getGenericName(false, packages, classes));
+            }
+        }
+        append(" {").nl().nl();
+        goIn();
+        types.push(type);
+        return this;
+    }
+
+    @Override
+    public <T> JavaWriter beginConstructor(Collection<T> parameters,
+            Function<T, Parameter> transformer) throws IOException {
+        types.push(types.peek());
+        beginLine(PUBLIC, types.peek().getSimpleName()).params(parameters, transformer)
+                .append(" {").nl();
+        return goIn();
+    }
+
+    @Override
+    public JavaWriter beginConstructor(Parameter... parameters) throws IOException {
+        types.push(types.peek());
+        beginLine(PUBLIC, types.peek().getSimpleName()).params(parameters).append(" {").nl();
+        return goIn();
+    }
+
+    @Override
+    public JavaWriter beginInterface(Type type, Type... interfaces) throws IOException {
+        packages.add(type.getPackageName());
+        beginLine(PUBLIC_INTERFACE, type.getGenericName(false, packages, classes));
+        if (interfaces.length > 0) {
+            append(EXTENDS);
+            for (int i = 0; i < interfaces.length; i++) {
+                if (i > 0) {
+                    append(Symbols.COMMA);
+                }
+                append(interfaces[i].getGenericName(false, packages, classes));
+            }
+        }
+        append(" {").nl().nl();
+        goIn();
+        types.push(type);
+        return this;
+    }
+
+    private JavaWriter beginMethod(String modifiers, Type returnType, String methodName,
+            Parameter... args) throws IOException {
+        types.push(types.peek());
+        beginLine(
+                modifiers, returnType.getGenericName(true, packages, classes), Symbols.SPACE, methodName)
+                .params(args).append(" {").nl();
+        return goIn();
+    }
+
+    @Override
+    public <T> JavaWriter beginPublicMethod(Type returnType, String methodName,
+            Collection<T> parameters, Function<T, Parameter> transformer) throws IOException {
+        return beginMethod(PUBLIC, returnType, methodName, transform(parameters, transformer));
+    }
+
+    @Override
+    public JavaWriter beginPublicMethod(Type returnType, String methodName, Parameter... args)
+            throws IOException {
+        return beginMethod(PUBLIC, returnType, methodName, args);
+    }
+
+    @Override
+    public <T> JavaWriter beginStaticMethod(Type returnType, String methodName,
+            Collection<T> parameters, Function<T, Parameter> transformer) throws IOException {
+        return beginMethod(PUBLIC_STATIC, returnType, methodName,
+                transform(parameters, transformer));
+    }
+
+    @Override
+    public JavaWriter beginStaticMethod(Type returnType, String methodName, Parameter... args)
+            throws IOException {
+        return beginMethod(PUBLIC_STATIC, returnType, methodName, args);
+    }
+
+    @Override
+    public JavaWriter end() throws IOException {
+        types.pop();
+        goOut();
+        return line("}").nl();
+    }
+
+    @Override
+    public JavaWriter field(Type type, String name) throws IOException {
+        return line(type.getGenericName(true, packages, classes), Symbols.SPACE, name, Symbols.SEMICOLON).nl();
+    }
+
+    private JavaWriter field(String modifier, Type type, String name) throws IOException {
+        return line(
+                modifier, type.getGenericName(true, packages, classes), Symbols.SPACE, name, Symbols.SEMICOLON)
+                .nl();
+    }
+
+    private JavaWriter field(String modifier, Type type, String name, String value)
+            throws IOException {
+        return line(
+                modifier, type.getGenericName(true, packages, classes), Symbols.SPACE, name,
+                Symbols.ASSIGN, value, Symbols.SEMICOLON).nl();
+    }
+
+
+    @Override
+    public String getClassConstant(String className) {
+        return className + ".class";
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Type type) {
+        return type.getGenericName(asArgType, packages, classes);
+    }
+
+    @Override
+    public String getRawName(Type type) {
+        return type.getRawName(packages, classes);
+    }
+
+    @Override
+    public JavaWriter imports(Class<?>... imports) throws IOException {
+        for (Class<?> cl : imports) {
+            classes.add(cl.getName());
+            line(IMPORT, cl.getName(), Symbols.SEMICOLON);
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public JavaWriter imports(Package... imports) throws IOException {
+        for (Package p : imports) {
+            packages.add(p.getName());
+            line(IMPORT, p.getName(), ".*;");
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public JavaWriter importClasses(String... imports) throws IOException {
+        for (String cl : imports) {
+            classes.add(cl);
+            line(IMPORT, cl, Symbols.SEMICOLON);
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public JavaWriter importPackages(String... imports) throws IOException {
+        for (String p : imports) {
+            packages.add(p);
+            line(IMPORT, p, ".*;");
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public JavaWriter javadoc(String... lines) throws IOException {
+        line("/**");
+        for (String line : lines) {
+            line(" * ", line);
+        }
+        return line(" */");
+    }
+
+    @Override
+    public JavaWriter packageDecl(String packageName) throws IOException {
+        packages.add(packageName);
+        return line(PACKAGE, packageName, Symbols.SEMICOLON).nl();
+    }
+
+    private <T> JavaWriter params(Collection<T> parameters, Function<T, Parameter> transformer)
+            throws IOException {
+        append("(");
+        boolean first = true;
+        for (T param : parameters) {
+            if (!first) {
+                append(Symbols.COMMA);
+            }
+            param(transformer.apply(param));
+            first = false;
+        }
+        append(")");
+        return this;
+    }
+
+    private JavaWriter params(Parameter... params) throws IOException {
+        append("(");
+        for (int i = 0; i < params.length; i++) {
+            if (i > 0) {
+                append(Symbols.COMMA);
+            }
+            param(params[i]);
+        }
+        append(")");
+        return this;
+    }
+
+    private JavaWriter param(Parameter parameter) throws IOException {
+        append(parameter.getType().getGenericName(true, packages, classes));
+        append(" ");
+        append(parameter.getName());
+        return this;
+    }
+
+    @Override
+    public JavaWriter privateField(Type type, String name) throws IOException {
+        return field(PRIVATE, type, name);
+    }
+
+    @Override
+    public JavaWriter privateFinal(Type type, String name) throws IOException {
+        return field(PRIVATE_FINAL, type, name);
+    }
+
+    @Override
+    public JavaWriter privateFinal(Type type, String name, String value) throws IOException {
+        return field(PRIVATE_FINAL, type, name, value);
+    }
+
+    @Override
+    public JavaWriter privateStaticFinal(Type type, String name, String value) throws IOException {
+        return field(PRIVATE_STATIC_FINAL, type, name, value);
+    }
+
+    @Override
+    public JavaWriter protectedField(Type type, String name) throws IOException {
+        return field(PROTECTED, type, name);
+    }
+
+    @Override
+    public JavaWriter protectedFinal(Type type, String name) throws IOException {
+        return field(PROTECTED_FINAL, type, name);
+    }
+
+    @Override
+    public JavaWriter protectedFinal(Type type, String name, String value) throws IOException {
+        return field(PROTECTED_FINAL, type, name, value);
+    }
+
+    @Override
+    public JavaWriter publicField(Type type, String name) throws IOException {
+        return field(PUBLIC, type, name);
+    }
+
+    @Override
+    public JavaWriter publicField(Type type, String name, String value) throws IOException {
+        return field(PUBLIC, type, name, value);
+    }
+
+    @Override
+    public JavaWriter publicFinal(Type type, String name) throws IOException {
+        return field(PUBLIC_FINAL, type, name);
+    }
+
+    @Override
+    public JavaWriter publicFinal(Type type, String name, String value) throws IOException {
+        return field(PUBLIC_FINAL, type, name, value);
+    }
+
+    @Override
+    public JavaWriter publicStaticFinal(Type type, String name, String value) throws IOException {
+        return field(PUBLIC_STATIC_FINAL, type, name, value);
+    }
+
+    @Override
+    public JavaWriter staticimports(Class<?>... imports) throws IOException {
+        for (Class<?> cl : imports) {
+            line(IMPORT_STATIC, cl.getName(), ".*;");
+        }
+        return this;
+    }
+
+    @Override
+    public JavaWriter suppressWarnings(String type) throws IOException {
+        return line("@SuppressWarnings(\"", type, "\")");
+    }
+
+    @Override
+    public CodeWriter suppressWarnings(String... types) throws IOException {
+        return annotation(new MultiSuppressWarnings(types));
+    }
+
+    private <T> Parameter[] transform(Collection<T> parameters,
+            Function<T, Parameter> transformer) {
+        Parameter[] rv = new Parameter[parameters.size()];
+        int i = 0;
+        for (T value : parameters) {
+            rv[i++] = transformer.apply(value);
+        }
+        return rv;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/LocationAndKind.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/LocationAndKind.java
new file mode 100644
index 0000000000..1aef4714c1
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/LocationAndKind.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import javax.tools.JavaFileManager.Location;
+import javax.tools.JavaFileObject.Kind;
+
+/**
+ * LocationAndKind defines a pair of Location and Kind
+ * 
+ * @author tiwe
+ * 
+ */
+public class LocationAndKind {
+
+    private final Kind kind;
+
+    private final Location location;
+
+    public LocationAndKind(Location location, Kind kind) {
+        this.location = location;
+        this.kind = kind;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof LocationAndKind) {
+            LocationAndKind other = (LocationAndKind) obj;
+            return location.equals(other.location) && kind.equals(other.kind);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return kind.hashCode() * 31 + location.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return kind.toString() + "@" + location.toString();
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemClassLoader.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemClassLoader.java
new file mode 100644
index 0000000000..90bcd12410
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemClassLoader.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.StandardLocation;
+
+/**
+ * MemClassLoader is a mmemory based implementation of the ClassLoader interface
+ * 
+ * @author tiwe
+ * 
+ */
+public final class MemClassLoader extends ClassLoader {
+
+    private static final LocationAndKind CLASS_KEY = new LocationAndKind(
+            StandardLocation.CLASS_OUTPUT, Kind.CLASS);
+
+    private static final LocationAndKind OTHER_KEY = new LocationAndKind(
+            StandardLocation.CLASS_OUTPUT, Kind.OTHER);
+
+    private static final LocationAndKind SOURCE_KEY = new LocationAndKind(
+            StandardLocation.CLASS_OUTPUT, Kind.SOURCE);
+
+    private final Map<LocationAndKind, Map<String, JavaFileObject>> memFileSystem;
+
+    public MemClassLoader(ClassLoader parent,
+            Map<LocationAndKind, Map<String, JavaFileObject>> ramFileSystem) {
+        super(parent);
+        this.memFileSystem = ramFileSystem;
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        JavaFileObject jfo = memFileSystem.get(CLASS_KEY).get(name);
+        if (jfo != null) {
+            byte[] bytes = ((MemJavaFileObject) jfo).getByteArray();
+            return defineClass(name, bytes, 0, bytes.length);
+        } else {
+            return super.findClass(name);
+        }
+    }
+
+    @Override
+    protected URL findResource(String name) {
+        URL retValue = super.findResource(name);
+        if (retValue != null) {
+            return retValue;
+        } else {
+            JavaFileObject jfo = getFileObject(name);
+            if (jfo != null) {
+                try {
+                    return jfo.toUri().toURL();
+                } catch (MalformedURLException ex) {
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        }
+    }
+
+    private JavaFileObject getFileObject(String n) {
+        LocationAndKind key;
+        String name;
+        if (n.endsWith(Kind.CLASS.extension)) {
+            name = n.replace('.', '/') + Kind.CLASS.extension;
+            key = CLASS_KEY;
+        } else if (n.endsWith(Kind.SOURCE.extension)) {
+            name = n.replace('.', '/') + Kind.SOURCE.extension;
+            key = SOURCE_KEY;
+        } else {
+            name = n;
+            key = OTHER_KEY;
+        }
+        if (memFileSystem.containsKey(key)) {
+            return memFileSystem.get(key).get(name);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String name) {
+        JavaFileObject jfo = getFileObject(name);
+        if (jfo != null) {
+            byte[] bytes = ((MemJavaFileObject) jfo).getByteArray();
+            return new ByteArrayInputStream(bytes);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        List<URL> retValue;
+        retValue = Collections.list(super.getResources(name));
+        JavaFileObject jfo = getFileObject(name);
+        if (jfo != null) {
+            retValue.add(jfo.toUri().toURL());
+        }
+        return Collections.enumeration(retValue);
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileManager.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileManager.java
new file mode 100644
index 0000000000..ab34d13768
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileManager.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.JavaFileObject.Kind;
+
+/**
+ * MemFileManager is a memory based implementation of the JavaFileManager
+ * interface
+ * 
+ * @author tiwe
+ * 
+ */
+public class MemFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+
+    private final ClassLoader classLoader;
+
+    private final Map<LocationAndKind, Map<String, JavaFileObject>> ramFileSystem;
+
+    private final String urlPrefix;
+
+    public MemFileManager(ClassLoader parent, StandardJavaFileManager sjfm) {
+        super(sjfm);
+        ramFileSystem = new HashMap<LocationAndKind, Map<String, JavaFileObject>>();
+        Map<String, JavaFileObject> classLoaderContent = new HashMap<String, JavaFileObject>();
+        ramFileSystem.put(new LocationAndKind(StandardLocation.CLASS_OUTPUT, Kind.CLASS),
+                classLoaderContent);
+        classLoader = new MemClassLoader(parent, ramFileSystem);
+        urlPrefix = MemFileSystemRegistry.DEFAULT.getUrlPrefix(this);
+    }
+
+    @Override
+    public ClassLoader getClassLoader(JavaFileManager.Location location) {
+        return classLoader;
+    }
+
+    @Override
+    public FileObject getFileForInput(JavaFileManager.Location location, String packageName,
+            String relativeName) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FileObject getFileForOutput(JavaFileManager.Location location, String packageName,
+            String relativeName, FileObject sibling) throws IOException {
+        String name = null;
+        if ("".equals(packageName)) {
+            name = relativeName;
+        } else {
+            name = packageName.replace('.', '/') + "/" + relativeName;
+        }
+        LocationAndKind key = new LocationAndKind(location, Kind.OTHER);
+        if (ramFileSystem.containsKey(key)) {
+            JavaFileObject jfo = ramFileSystem.get(key).get(name);
+            if (jfo != null) {
+                return jfo;
+            }
+        }
+        JavaFileObject jfo = new MemJavaFileObject(urlPrefix, name, Kind.OTHER);
+        register(key, jfo);
+        return jfo;
+    }
+
+    @Override
+    public JavaFileObject getJavaFileForOutput(Location location, String name, Kind kind,
+            FileObject sibling) throws IOException {
+        JavaFileObject javaFileObject = null;
+        LocationAndKind key = new LocationAndKind(location, kind);
+
+        if (ramFileSystem.containsKey(key)) {
+            javaFileObject = ramFileSystem.get(key).get(name);
+            if (javaFileObject != null) {
+                return javaFileObject;
+            }
+        }
+        if (kind == Kind.SOURCE) {
+            javaFileObject = new MemSourceFileObject(name);
+        } else {
+            javaFileObject = new MemJavaFileObject(urlPrefix, name, kind);
+        }
+        register(key, javaFileObject);
+        return javaFileObject;
+    }
+
+    @Override
+    public String inferBinaryName(Location loc, JavaFileObject javaFileObject) {
+        String result;
+        if (loc == StandardLocation.CLASS_PATH && javaFileObject instanceof MemJavaFileObject) {
+            result = javaFileObject.getName();
+        } else {
+            result = super.inferBinaryName(loc, javaFileObject);
+        }
+        return result;
+    }
+
+    @Override
+    public boolean isSameFile(FileObject a, FileObject b) {
+        return a.equals(b);
+    }
+
+    @Override
+    public Iterable<JavaFileObject> list(Location location, String pkg, Set<Kind> kinds,
+            boolean recurse) throws IOException {
+
+        List<JavaFileObject> result = new ArrayList<JavaFileObject>();
+        for (JavaFileObject f : super.list(location, pkg, kinds, recurse)) {
+            result.add(f);
+        }
+        if (location == StandardLocation.CLASS_PATH) {
+            location = StandardLocation.CLASS_OUTPUT;
+        }
+
+        for (Kind kind : kinds) {
+            LocationAndKind key = new LocationAndKind(location, kind);
+            if (ramFileSystem.containsKey(key)) {
+                Map<String, JavaFileObject> locatedFiles = ramFileSystem.get(key);
+                for (Map.Entry<String, JavaFileObject> entry : locatedFiles.entrySet()) {
+                    String name = entry.getKey();
+                    String packageName = "";
+                    if (name.indexOf('.') > -1) {
+                        packageName = name.substring(0, name.lastIndexOf('.'));
+                    }
+                    if (recurse ? packageName.startsWith(pkg) : packageName.equals(pkg)) {
+                        JavaFileObject candidate = entry.getValue();
+                        if (kinds.contains(candidate.getKind())) {
+                            result.add(candidate);
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private void register(LocationAndKind key, JavaFileObject javaFileObject) {
+        if (!ramFileSystem.containsKey(key)) {
+            ramFileSystem.put(key, new HashMap<String, JavaFileObject>());
+        }
+        ramFileSystem.get(key).put(javaFileObject.getName(), javaFileObject);
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileSystemRegistry.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileSystemRegistry.java
new file mode 100644
index 0000000000..85e4f1dc1b
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemFileSystemRegistry.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.lang.ref.WeakReference;
+import java.net.URL;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import javax.tools.JavaFileManager;
+
+/**
+ * @author tiwe
+ * 
+ */
+public final class MemFileSystemRegistry {
+
+    public static final MemFileSystemRegistry DEFAULT = new MemFileSystemRegistry();
+
+    private final Map<JavaFileManager, String> jfm2prefix = new WeakHashMap<JavaFileManager, String>();
+
+    private Map<String, WeakReference<JavaFileManager>> prefix2jfm = new WeakHashMap<String, WeakReference<JavaFileManager>>();
+
+    private final String protocolName;
+
+    private int sequence = 0;
+
+    private MemFileSystemRegistry() {
+        String pkgName = MemFileSystemRegistry.class.getPackage().getName();
+        protocolName = pkgName.substring(pkgName.lastIndexOf('.') + 1);
+        String pkgs = System.getProperty("java.protocol.handler.pkgs");
+        String parentPackage = pkgName.substring(0, pkgName.lastIndexOf('.'));
+        pkgs = pkgs == null ? parentPackage : pkgs + "|" + parentPackage;
+        System.setProperty("java.protocol.handler.pkgs", pkgs);
+    }
+
+    public JavaFileManager getFileSystem(URL url) {
+        String prefix = url.getProtocol() + "://" + url.getHost() + "/";
+        if (prefix2jfm.containsKey(prefix)) {
+            return prefix2jfm.get(prefix).get();
+        } else {
+            return null;
+        }
+    }
+
+    public String getUrlPrefix(JavaFileManager jfm) {
+        if (jfm2prefix.containsKey(jfm)) {
+            return jfm2prefix.get(jfm);
+        } else {
+            String result = protocolName + "://jfm" + (sequence++) + "/";
+            jfm2prefix.put(jfm, result);
+            prefix2jfm.put(result, new WeakReference<JavaFileManager>(jfm));
+            return result;
+        }
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemJavaFileObject.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemJavaFileObject.java
new file mode 100644
index 0000000000..f762e4c99f
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemJavaFileObject.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
+import javax.tools.SimpleJavaFileObject;
+
+/**
+ * MemJavaFileObject defines an in memory compiled Java file
+ * 
+ * @author tiwe
+ * 
+ */
+public class MemJavaFileObject extends SimpleJavaFileObject {
+
+    private ByteArrayOutputStream baos;
+
+    private final String name;
+
+    public MemJavaFileObject(String urlPrefix, String name, Kind kind) {
+        super(URI.create(urlPrefix + name + kind.extension), kind);
+        this.name = name;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+        if (baos == null) {
+            throw new FileNotFoundException(name);
+        }
+        return new String(baos.toByteArray(), StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public byte[] getByteArray() {
+        return baos.toByteArray();
+    }
+
+    @Override
+    public InputStream openInputStream() throws IOException {
+        if (baos == null) {
+            throw new FileNotFoundException(name);
+        }
+        return new ByteArrayInputStream(baos.toByteArray());
+    }
+
+    @Override
+    public OutputStream openOutputStream() throws IOException {
+        if (baos == null) {
+            baos = new ByteArrayOutputStream();
+        }
+        return baos;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemSourceFileObject.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemSourceFileObject.java
new file mode 100644
index 0000000000..931b3e341e
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MemSourceFileObject.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URI;
+
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+
+/**
+ * MemSourceFileObject defines a in-memory Java source file object
+ * 
+ * @author tiwe
+ * 
+ */
+public class MemSourceFileObject extends SimpleJavaFileObject {
+
+    private static URI toUri(String fqname) {
+        return URI.create("file:///" + fqname.replace(".", "/") + ".java");
+    }
+
+    private final StringBuilder contents;
+
+    public MemSourceFileObject(String fullName) {
+        super(toUri(fullName), JavaFileObject.Kind.SOURCE);
+        contents = new StringBuilder(1000);
+    }
+
+    public MemSourceFileObject(String fullName, String content) {
+        this(fullName);
+        contents.append(content);
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return contents;
+    }
+
+    @Override
+    public Writer openWriter() {
+        return new Writer() {
+            @Override
+            public Writer append(CharSequence csq) throws IOException {
+                contents.append(csq);
+                return this;
+            }
+
+            @Override
+            public void close() {
+            }
+
+            @Override
+            public void flush() {
+            }
+
+            @Override
+            public void write(char[] cbuf, int off, int len) throws IOException {
+                contents.append(cbuf, off, len);
+            }
+        };
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MethodEvaluator.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MethodEvaluator.java
new file mode 100644
index 0000000000..6109b67668
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MethodEvaluator.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * @author tiwe
+ * 
+ * @param <T>
+ */
+public final class MethodEvaluator<T> implements Evaluator<T> {
+
+    private final Method method;
+
+    private final Class<? extends T> projectionType;
+    
+    private final Object[] args;
+
+    MethodEvaluator(Method method, Map<String, Object> constants, Class<? extends T> projectionType) {
+        this.method = method;
+        this.projectionType = projectionType;
+        this.args = new Object[method.getParameterTypes().length];
+        int i = args.length - constants.size();
+        for (Object value : constants.values()) {
+            args[i++] = value;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T evaluate(Object... args) {
+        try {
+            System.arraycopy(args, 0, this.args, 0, args.length);
+            return (T) method.invoke(null, this.args);
+        } catch (IllegalAccessException e) {
+            throw new IllegalArgumentException(e);
+        } catch (InvocationTargetException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    @Override
+    public Class<? extends T> getType() {
+        return projectionType;
+    }
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MultiSuppressWarnings.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MultiSuppressWarnings.java
new file mode 100644
index 0000000000..6014cd4803
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/MultiSuppressWarnings.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+
+@SuppressWarnings("AnnotationAsSuperInterface") // Internal helper class
+class MultiSuppressWarnings implements SuppressWarnings {
+
+    private final String[] values;
+
+    MultiSuppressWarnings(String... values) {
+        this.values = Arrays.copyOf(values, values.length);
+    }
+
+    @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")
+    public String[] value() {
+        return values;
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return SuppressWarnings.class;
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ScalaWriter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ScalaWriter.java
new file mode 100644
index 0000000000..75509a599d
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/ScalaWriter.java
@@ -0,0 +1,617 @@
+/*
+ * Copyright 2011, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import static com.querydsl.codegen.utils.Symbols.ASSIGN;
+import static com.querydsl.codegen.utils.Symbols.COMMA;
+import static com.querydsl.codegen.utils.Symbols.DOT;
+import static com.querydsl.codegen.utils.Symbols.QUOTE;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.utils.support.ScalaSyntaxUtils;
+
+/**
+ * @author tiwe
+ * 
+ */
+public class ScalaWriter extends AbstractCodeWriter<ScalaWriter> {
+
+    private static final Set<String> PRIMITIVE_TYPES = new HashSet<String>(Arrays.asList("boolean",
+            "byte", "char", "int", "long", "short", "double", "float"));
+
+    private static final String DEF = "def ";
+
+    private static final String OVERRIDE_DEF = "override " + DEF;
+
+    private static final String EXTENDS = " extends ";
+
+    private static final String WITH = " with ";
+
+    private static final String IMPORT = "import ";
+
+    private static final String IMPORT_STATIC = "import ";
+
+    private static final String PACKAGE = "package ";
+
+    private static final String PRIVATE = "private ";
+
+    private static final String PRIVATE_VAL = "private val ";
+
+    private static final String PROTECTED = "protected ";
+
+    private static final String PROTECTED_VAL = "protected val ";
+
+    private static final String PUBLIC = "public ";
+
+    private static final String PUBLIC_CLASS = "class ";
+
+    private static final String PUBLIC_OBJECT = "object ";
+
+    private static final String CASE_CLASS = "case class ";
+
+    private static final String VAR = "var ";
+
+    private static final String VAL = "val ";
+
+    private static final String THIS = "this";
+
+    private static final String TRAIT = "trait ";
+
+    private final Set<String> classes = new HashSet<String>();
+
+    private final Set<String> packages = new HashSet<String>();
+
+    private Type type;
+
+    private final boolean compact;
+
+    public ScalaWriter(Appendable appendable) {
+        this(appendable, false);
+    }
+
+    public ScalaWriter(Appendable appendable, boolean compact) {
+        super(appendable, 2);
+        this.classes.add("java.lang.String");
+        this.classes.add("java.lang.Object");
+        this.classes.add("java.lang.Integer");
+        this.classes.add("java.lang.Comparable");
+        this.compact = compact;
+    }
+
+    @Override
+    public ScalaWriter annotation(Annotation annotation) throws IOException {
+        beginLine().append("@").appendType(annotation.annotationType());
+        Method[] methods = annotation.annotationType().getDeclaredMethods();
+        if (methods.length == 1 && methods[0].getName().equals("value")) {
+            try {
+                Object value = methods[0].invoke(annotation);
+                append("(");
+                annotationConstant(value);
+                append(")");
+            } catch (IllegalArgumentException e) {
+                throw new CodegenException(e);
+            } catch (IllegalAccessException e) {
+                throw new CodegenException(e);
+            } catch (InvocationTargetException e) {
+                throw new CodegenException(e);
+            }
+        } else {
+            boolean first = true;
+            for (Method method : methods) {
+                try {
+                    Object value = method.invoke(annotation);
+                    if (value == null
+                            || value.equals(method.getDefaultValue())
+                            || (value.getClass().isArray() && Arrays.equals((Object[]) value,
+                                    (Object[]) method.getDefaultValue()))) {
+                        continue;
+                    } else if (!first) {
+                        append(COMMA);
+                    } else {
+                        append("(");
+                    }
+                    append(escape(method.getName())).append("=");
+                    annotationConstant(value);
+                } catch (IllegalArgumentException e) {
+                    throw new CodegenException(e);
+                } catch (IllegalAccessException e) {
+                    throw new CodegenException(e);
+                } catch (InvocationTargetException e) {
+                    throw new CodegenException(e);
+                }
+                first = false;
+            }
+            if (!first) {
+                append(")");
+            }
+        }
+        return nl();
+    }
+
+    @Override
+    public ScalaWriter annotation(Class<? extends Annotation> annotation) throws IOException {
+        return beginLine().append("@").appendType(annotation).nl();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void annotationConstant(Object value) throws IOException {
+        if (value.getClass().isArray()) {
+            append("Array(");
+            boolean first = true;
+            for (Object o : (Object[]) value) {
+                if (!first) {
+                    append(", ");
+                }
+                annotationConstant(o);
+                first = false;
+            }
+            append(")");
+        } else if (value instanceof Class) {
+            append("classOf[");
+            appendType((Class) value);
+            append("]");
+        } else if (value instanceof Number || value instanceof Boolean) {
+            append(value.toString());
+        } else if (value instanceof Enum) {
+            Enum<?> enumValue = (Enum<?>) value;
+            if (classes.contains(enumValue.getClass().getName())
+                    || packages.contains(enumValue.getClass().getPackage().getName())) {
+                append(enumValue.name());
+            } else {
+                append(enumValue.getDeclaringClass().getName()).append(DOT).append(enumValue.name());
+            }
+        } else if (value instanceof String) {
+            append(QUOTE).append(StringUtils.escapeJava(value.toString())).append(QUOTE);
+        } else {
+            throw new IllegalArgumentException("Unsupported annotation value : " + value);
+        }
+    }
+
+    private ScalaWriter appendType(Class<?> type) throws IOException {
+        if (type.isPrimitive()) {
+            append(StringUtils.capitalize(type.getName()));
+        } else if (type.getPackage() == null || classes.contains(type.getName())
+                || packages.contains(type.getPackage().getName())) {
+            append(type.getSimpleName());
+        } else {
+            append(type.getName());
+        }
+        return this;
+    }
+
+    public ScalaWriter beginObject(String header) throws IOException {
+        line(PUBLIC_OBJECT, header, " {");
+        goIn();
+        return this;
+    }
+
+    public ScalaWriter beginClass(String header) throws IOException {
+        line(PUBLIC_CLASS, header, " {");
+        goIn();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter beginClass(Type type) throws IOException {
+        return beginClass(type, null);
+    }
+
+    @Override
+    public ScalaWriter beginClass(Type type, Type superClass, Type... interfaces)
+            throws IOException {
+        packages.add(type.getPackageName());
+        beginLine(PUBLIC_CLASS, getGenericName(false, type));
+        if (superClass != null) {
+            append(EXTENDS).append(getGenericName(false, superClass));
+        }
+        if (interfaces.length > 0) {
+            if (superClass == null) {
+                append(EXTENDS);
+                append(getGenericName(false, interfaces[0]));
+                append(WITH);
+                for (int i = 1; i < interfaces.length; i++) {
+                    if (i > 1) {
+                        append(COMMA);
+                    }
+                    append(getGenericName(false, interfaces[i]));
+                }
+            } else {
+                append(WITH);
+                for (int i = 0; i < interfaces.length; i++) {
+                    if (i > 0) {
+                        append(COMMA);
+                    }
+                    append(getGenericName(false, interfaces[i]));
+                }
+            }
+        }
+        append(" {").nl().nl();
+        goIn();
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    public <T> ScalaWriter beginConstructor(Collection<T> parameters,
+            Function<T, Parameter> transformer) throws IOException {
+        beginLine(DEF, THIS).params(parameters, transformer).append(" {").nl();
+        return goIn();
+    }
+
+    @Override
+    public ScalaWriter beginConstructor(Parameter... params) throws IOException {
+        beginLine(DEF, THIS).params(params).append(" {").nl();
+        return goIn();
+    }
+
+    @Override
+    public ScalaWriter beginInterface(Type type, Type... interfaces) throws IOException {
+        packages.add(type.getPackageName());
+        beginLine(TRAIT, getGenericName(false, type));
+        if (interfaces.length > 0) {
+            append(EXTENDS);
+            append(getGenericName(false, interfaces[0]));
+            if (interfaces.length > 1) {
+                append(WITH);
+                for (int i = 1; i < interfaces.length; i++) {
+                    if (i > 1) {
+                        append(COMMA);
+                    }
+                    append(getGenericName(false, interfaces[i]));
+                }
+            }
+
+        }
+        append(" {").nl().nl();
+        goIn();
+        this.type = type;
+        return this;
+    }
+
+    private ScalaWriter beginMethod(String modifiers, Type returnType, String methodName,
+            Parameter... args) throws IOException {
+        if (returnType.equals(Types.VOID)) {
+            beginLine(modifiers, escape(methodName)).params(args).append(" {").nl();
+        } else {
+            beginLine(modifiers, escape(methodName)).params(args)
+                    .append(": ").append(getGenericName(true, returnType)).append(" = {").nl();
+        }
+
+        return goIn();
+    }
+
+    @Override
+    public <T> ScalaWriter beginPublicMethod(Type returnType, String methodName,
+            Collection<T> parameters, Function<T, Parameter> transformer) throws IOException {
+        return beginMethod(DEF, returnType, methodName, transform(parameters, transformer));
+    }
+
+    @Override
+    public ScalaWriter beginPublicMethod(Type returnType, String methodName, Parameter... args)
+            throws IOException {
+        return beginMethod(DEF, returnType, methodName, args);
+    }
+
+    public <T> ScalaWriter beginOverridePublicMethod(Type returnType, String methodName,
+                                                     Collection<T> parameters, Function<T, Parameter> transformer)
+            throws IOException {
+        return beginMethod(OVERRIDE_DEF, returnType, methodName, transform(parameters, transformer));
+    }
+
+    public ScalaWriter beginOverridePublicMethod(Type returnType, String methodName, Parameter... args)
+            throws IOException {
+        return beginMethod(OVERRIDE_DEF, returnType, methodName, args);
+    }
+
+    @Override
+    public <T> ScalaWriter beginStaticMethod(Type returnType, String methodName,
+            Collection<T> parameters, Function<T, Parameter> transformer) throws IOException {
+        return beginMethod(DEF, returnType, methodName, transform(parameters, transformer));
+    }
+
+    @Override
+    public ScalaWriter beginStaticMethod(Type returnType, String methodName, Parameter... args)
+            throws IOException {
+        return beginMethod(DEF, returnType, methodName, args);
+    }
+
+    public ScalaWriter caseClass(String header, Parameter... parameters) throws IOException {
+        beginLine(CASE_CLASS, header).params(parameters).nl();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter end() throws IOException {
+        goOut();
+        return line("}").nl();
+    }
+
+    public ScalaWriter field(Type type, String name) throws IOException {
+        line(VAR, escape(name), ": ", getGenericName(true, type));
+        return compact ? this : nl();
+    }
+
+    private ScalaWriter field(String modifier, Type type, String name) throws IOException {
+        line(modifier, escape(name), ": ", getGenericName(true, type));
+        return compact ? this : nl();
+    }
+
+    private ScalaWriter field(String modifier, Type type, String name, String value)
+            throws IOException {
+        line(modifier, escape(name), ": ", getGenericName(true, type), ASSIGN, value);
+        return compact ? this : nl();
+    }
+
+    @Override
+    public String getClassConstant(String className) {
+        return "classOf[" + className + "]";
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Type type) {
+        if (type.getParameters().isEmpty()) {
+            return getRawName(type);
+        } else {
+            StringBuilder builder = new StringBuilder();
+            builder.append(getRawName(type));
+            builder.append("[");
+            boolean first = true;
+            String fullName = type.getFullName();
+            for (Type parameter : type.getParameters()) {
+                if (!first) {
+                    builder.append(", ");
+                }
+                if (parameter == null || parameter.getFullName().equals(fullName)) {
+                    builder.append("_");
+                } else {
+                    builder.append(getGenericName(false, parameter));
+                }
+                first = false;
+            }
+            builder.append("]");
+            return builder.toString();
+        }
+    }
+
+    @Override
+    public String getRawName(Type type) {
+        String fullName = type.getFullName();
+        if (PRIMITIVE_TYPES.contains(fullName)) {
+            fullName = StringUtils.capitalize(fullName);
+        }
+        String packageName = type.getPackageName();
+        if (packageName != null && packageName.length() > 0) {
+            fullName = packageName + "." + fullName.substring(packageName.length() + 1).replace('.', '$');
+        } else {
+            fullName = fullName.replace('.', '$');
+        }
+        String rv = fullName;
+        if (type.isPrimitive() && packageName.isEmpty()) {
+            rv = Character.toUpperCase(rv.charAt(0)) + rv.substring(1);
+        }
+        if (packages.contains(packageName) || classes.contains(fullName)) {
+            if (packageName.length() > 0) {
+                rv = fullName.substring(packageName.length() + 1);
+            }
+        }
+        if (rv.endsWith("[]")) {
+            rv = rv.substring(0, rv.length() - 2);
+            if (PRIMITIVE_TYPES.contains(rv)) {
+                rv = StringUtils.capitalize(rv);
+            } else if (classes.contains(rv)) {
+                rv = rv.substring(packageName.length() + 1);
+            }
+            return "Array[" + rv + "]";
+        } else {
+            return rv;
+        }
+    }
+
+    @Override
+    public ScalaWriter imports(Class<?>... imports) throws IOException {
+        for (Class<?> cl : imports) {
+            classes.add(cl.getName());
+            line(IMPORT, cl.getName());
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter imports(Package... imports) throws IOException {
+        for (Package p : imports) {
+            packages.add(p.getName());
+            line(IMPORT, p.getName(), "._");
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter importClasses(String... imports) throws IOException {
+        for (String cl : imports) {
+            classes.add(cl);
+            line(IMPORT, cl);
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter importPackages(String... imports) throws IOException {
+        for (String p : imports) {
+            packages.add(p);
+            line(IMPORT, p, "._");
+        }
+        nl();
+        return this;
+    }
+
+    @Override
+    public ScalaWriter javadoc(String... lines) throws IOException {
+        line("/**");
+        for (String line : lines) {
+            line(" * ", line);
+        }
+        return line(" */");
+    }
+
+    @Override
+    public ScalaWriter packageDecl(String packageName) throws IOException {
+        packages.add(packageName);
+        return line(PACKAGE, packageName).nl();
+    }
+
+    private <T> ScalaWriter params(Collection<T> parameters, Function<T, Parameter> transformer)
+            throws IOException {
+        append("(");
+        boolean first = true;
+        for (T param : parameters) {
+            if (!first) {
+                append(COMMA);
+            }
+            param(transformer.apply(param));
+            first = false;
+        }
+        append(")");
+        return this;
+    }
+
+    private ScalaWriter params(Parameter... params) throws IOException {
+        append("(");
+        for (int i = 0; i < params.length; i++) {
+            if (i > 0) {
+                append(COMMA);
+            }
+            param(params[i]);
+        }
+        append(")");
+        return this;
+    }
+
+    private ScalaWriter param(Parameter parameter) throws IOException {
+        append(escape(parameter.getName()));
+        append(": ");
+        append(getGenericName(true, parameter.getType()));
+        return this;
+    }
+
+    @Override
+    public ScalaWriter privateField(Type type, String name) throws IOException {
+        return field(PRIVATE, type, name);
+    }
+
+    @Override
+    public ScalaWriter privateFinal(Type type, String name) throws IOException {
+        return field(PRIVATE_VAL, type, name);
+    }
+
+    @Override
+    public ScalaWriter privateFinal(Type type, String name, String value) throws IOException {
+        return field(PRIVATE_VAL, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter privateStaticFinal(Type type, String name, String value) throws IOException {
+        return field(PRIVATE_VAL, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter protectedField(Type type, String name) throws IOException {
+        return field(PROTECTED, type, name);
+    }
+
+    @Override
+    public ScalaWriter protectedFinal(Type type, String name) throws IOException {
+        return field(PROTECTED_VAL, type, name);
+    }
+
+    @Override
+    public ScalaWriter protectedFinal(Type type, String name, String value) throws IOException {
+        return field(PROTECTED_VAL, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter publicField(Type type, String name) throws IOException {
+        return field(VAR, type, name);
+    }
+
+    @Override
+    public ScalaWriter publicField(Type type, String name, String value) throws IOException {
+        return field(VAR, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter publicFinal(Type type, String name) throws IOException {
+        return field(VAL, type, name);
+    }
+
+    @Override
+    public ScalaWriter publicFinal(Type type, String name, String value) throws IOException {
+        return field(VAL, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter publicStaticFinal(Type type, String name, String value) throws IOException {
+        return field(VAL, type, name, value);
+    }
+
+    @Override
+    public ScalaWriter staticimports(Class<?>... imports) throws IOException {
+        for (Class<?> cl : imports) {
+            line(IMPORT_STATIC, cl.getName(), "._;");
+        }
+        return this;
+    }
+
+    @Override
+    public ScalaWriter suppressWarnings(String type) throws IOException {
+        return line("@SuppressWarnings(\"", type, "\")");
+    }
+
+    @Override
+    public CodeWriter suppressWarnings(String... types) throws IOException {
+        return annotation(new MultiSuppressWarnings(types));
+    }
+
+    private <T> Parameter[] transform(Collection<T> parameters,
+            Function<T, Parameter> transformer) {
+        Parameter[] rv = new Parameter[parameters.size()];
+        int i = 0;
+        for (T value : parameters) {
+            rv[i++] = transformer.apply(value);
+        }
+        return rv;
+    }
+
+    private String escape(String token) {
+        if (ScalaSyntaxUtils.isReserved(token)) {
+            return "`" + token + "`";
+        } else {
+            return token;
+        }
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java
new file mode 100644
index 0000000000..3f4725a364
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import io.github.classgraph.ClassGraph;
+
+import javax.lang.model.SourceVersion;
+import javax.tools.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * SimpleCompiler provides a convenience wrapper of the JavaCompiler interface
+ * with automatic classpath generation
+ *
+ * @author tiwe
+ *
+ */
+public class SimpleCompiler implements JavaCompiler {
+
+    protected static boolean isSureFireBooter(URLClassLoader cl) {
+        for (URL url : cl.getURLs()) {
+            if (url.getPath().contains("surefirebooter")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static String getClassPath(ClassLoader cl) {
+        return new ClassGraph().overrideClassLoaders(cl).getClasspath();
+    }
+
+    private final ClassLoader classLoader;
+
+    private String classPath;
+
+    private final JavaCompiler compiler;
+
+    public SimpleCompiler() {
+        this(ToolProvider.getSystemJavaCompiler(), Thread.currentThread().getContextClassLoader());
+    }
+
+    public SimpleCompiler(JavaCompiler compiler, ClassLoader classLoader) {
+        this.compiler = compiler;
+        this.classLoader = classLoader;
+    }
+
+    private String getClasspath() {
+        if (classPath == null) {
+            classPath = getClassPath(classLoader);
+        }
+        return classPath;
+    }
+
+    @Override
+    public Set<SourceVersion> getSourceVersions() {
+        return compiler.getSourceVersions();
+    }
+
+    @Override
+    public StandardJavaFileManager getStandardFileManager(
+            DiagnosticListener<? super JavaFileObject> diagnosticListener, Locale locale,
+            Charset charset) {
+        return compiler.getStandardFileManager(diagnosticListener, locale, charset);
+    }
+
+    @Override
+    public CompilationTask getTask(Writer out, JavaFileManager fileManager,
+            DiagnosticListener<? super JavaFileObject> diagnosticListener,
+            Iterable<String> options, Iterable<String> classes,
+            Iterable<? extends JavaFileObject> compilationUnits) {
+        return compiler.getTask(out, fileManager, diagnosticListener, options, classes,
+                compilationUnits);
+    }
+
+    @Override
+    public int isSupportedOption(String option) {
+        return compiler.isSupportedOption(option);
+    }
+
+    @Override
+    public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) {
+        for (String a : arguments) {
+            if (a.equals("-classpath")) {
+                return compiler.run(in, out, err, arguments);
+            }
+        }
+
+        // no classpath given
+        List<String> args = new ArrayList<String>(arguments.length + 2);
+        args.add("-classpath");
+        args.add(getClasspath());
+        for (String arg : arguments) {
+            args.add(arg);
+        }
+        return compiler.run(in, out, err, args.toArray(new String[args.size()]));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/StringUtils.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/StringUtils.java
new file mode 100644
index 0000000000..8a1c476369
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/StringUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+import java.util.Arrays;
+
+public final class StringUtils {
+    
+    public static String capitalize(String str) {
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+    
+    public static String uncapitalize(String str) {
+        return str.substring(0, 1).toLowerCase() + str.substring(1);
+    }
+
+    public static String escapeJava(String str) {
+        str = str.replace("\\", "\\\\");
+        str = str.replace("\"", "\\\"");
+        str = str.replace("\r", "\\\r");
+        str = str.replace("\t", "\\\t");
+        str = str.replace("\n", "\\\n");
+        return str;
+    }
+
+    public static String repeat(char value, int times) {
+        char[] chars = new char[times];
+        Arrays.fill(chars, value);
+        return new String(chars);
+    }
+    
+    private StringUtils() { }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java
new file mode 100644
index 0000000000..61b08bc363
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils;
+
+/**
+ * Defines general String constants
+ * 
+ * @author tiwe
+ * 
+ */
+public final class Symbols {
+
+    public static final String ASSIGN = " = ";
+
+    public static final String COMMA = ", ";
+
+    public static final String DOT = ".";
+
+    public static final String DOT_CLASS = ".class";
+
+    public static final String EMPTY = "";
+
+    public static final String NEW = "new ";
+
+    public static final String NEWLINE = "\n";
+
+    public static final String QUOTE = "\"";
+
+    public static final String RETURN = "return ";
+
+    public static final String SEMICOLON = ";";
+
+    public static final String SERIAL = "serial";
+
+    public static final String SPACE = " ";
+
+    public static final String STAR = "*";
+
+    public static final String SUPER = "super";
+
+    public static final String THIS = "this";
+
+    public static final String UNCHECKED = "unchecked";
+
+    private Symbols() {
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/ClassType.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/ClassType.java
new file mode 100644
index 0000000000..d582ceef16
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/ClassType.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import com.querydsl.codegen.utils.support.ClassUtils;
+
+/**
+ * @author tiwe
+ *
+ */
+public class ClassType implements Type {
+
+    private final TypeCategory category;
+
+    private final Class<?> javaClass;
+
+    private final String className;
+
+    private final List<Type> parameters;
+
+    private Type arrayType, componentType, enclosingType;
+
+    public ClassType(Class<?> javaClass, Type... parameters) {
+        this(TypeCategory.SIMPLE, javaClass, Arrays.asList(parameters));
+    }
+
+    public ClassType(TypeCategory category, Class<?> clazz, Type... parameters) {
+        this(category, clazz, Arrays.asList(parameters));
+    }
+
+    public ClassType(TypeCategory category, Class<?> clazz, List<Type> parameters) {
+        this.category = category;
+        this.javaClass = clazz;
+        this.parameters = parameters;
+        this.className = ClassUtils.getFullName(javaClass);
+    }
+
+    
+    @Override
+    public Type as(TypeCategory c) {
+        if (category == c) {
+            return this;
+        } else {
+            return new ClassType(c, javaClass);
+        }
+    }
+
+    @Override
+    public Type asArrayType() {
+        if (arrayType == null) {
+            String fullName = ClassUtils.getFullName(javaClass) + "[]";
+            String simpleName = javaClass.getSimpleName() + "[]";
+            arrayType = new SimpleType(TypeCategory.ARRAY, fullName, getPackageName(), simpleName,
+                    false, false);
+        }
+        return arrayType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Type) {
+            Type t = (Type) o;
+            return t.getFullName().equals(className) && t.getParameters().equals(parameters);
+        } else {
+            return false;
+        }
+    }
+
+    public TypeCategory getCategory() {
+        return category;
+    }
+
+    @Override
+    public Type getComponentType() {
+        Class<?> clazz = javaClass.getComponentType();
+        if (clazz != null && componentType == null) {
+            componentType = new ClassType(TypeCategory.SIMPLE, clazz);
+        }
+        return componentType;
+    }
+
+    @Override
+    public Type getEnclosingType() {
+        if (enclosingType == null) {
+            Class<?> enclosingClass = javaClass.getEnclosingClass();
+            if (enclosingClass != null) {
+                enclosingType = new ClassType(enclosingClass);
+            }
+        }
+        return enclosingType;
+    }
+
+    @Override
+    public String getFullName() {
+        return className;
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType) {
+        return getGenericName(asArgType, Collections.singleton("java.lang"),
+                Collections.<String> emptySet());
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
+        if (parameters.isEmpty()) {
+            return ClassUtils.getName(javaClass, packages, classes);
+        } else {
+            StringBuilder builder = new StringBuilder();
+            builder.append(ClassUtils.getName(javaClass, packages, classes));
+            builder.append("<");
+            boolean first = true;
+            for (Type parameter : parameters) {
+                if (!first) {
+                    builder.append(", ");
+                }
+                if (parameter == null || parameter.getFullName().equals(getFullName())) {
+                    builder.append("?");
+                } else {
+                    builder.append(parameter.getGenericName(false, packages, classes));
+                }
+                first = false;
+            }
+            builder.append(">");
+            return builder.toString();
+        }
+    }
+
+    public Class<?> getJavaClass() {
+        return javaClass;
+    }
+
+    @Override
+    public String getPackageName() {
+        return ClassUtils.getPackageName(javaClass);
+    }
+
+    @Override
+    public List<Type> getParameters() {
+        return parameters;
+    }
+
+    @Override
+    public String getRawName(Set<String> packages, Set<String> classes) {
+        return ClassUtils.getName(javaClass, packages, classes);
+    }
+
+    @Override
+    public String getSimpleName() {
+        return javaClass.getSimpleName();
+    }
+
+    @Override
+    public int hashCode() {
+        return className.hashCode();
+    }
+
+    @Override
+    public boolean isFinal() {
+        return Modifier.isFinal(javaClass.getModifiers());
+    }
+
+    @Override
+    public boolean isPrimitive() {
+        return javaClass.isPrimitive();
+    }
+
+    @Override
+    public boolean isMember() {
+        return javaClass.getEnclosingClass() != null;
+    }
+
+    @Override
+    public String toString() {
+        return getGenericName(true);
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Constructor.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Constructor.java
new file mode 100644
index 0000000000..6afc52bad7
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Constructor.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.Collection;
+
+/**
+ * @author tiwe
+ * 
+ */
+public final class Constructor {
+
+    private final Collection<Parameter> parameters;
+
+    public Constructor(Collection<Parameter> params) {
+        parameters = params;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Constructor) {
+            return ((Constructor) o).parameters.equals(parameters);
+        } else {
+            return false;
+        }
+    }
+
+    public Collection<Parameter> getParameters() {
+        return parameters;
+    }
+
+    @Override
+    public int hashCode() {
+        return parameters.hashCode();
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Parameter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Parameter.java
new file mode 100644
index 0000000000..241ed73b3f
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Parameter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+/**
+ * Parameter represents a parameter in a Constructor
+ * 
+ * @author tiwe
+ */
+public final class Parameter {
+
+    private final String name;
+
+    private final Type type;
+
+    public Parameter(String name, Type type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Parameter) {
+            Parameter t = (Parameter) o;
+            return type.equals(t.type) && name.equals(t.name);
+        } else {
+            return false;
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    @Override
+    public int hashCode() {
+        return type.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return type + " " + name;
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/SimpleType.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/SimpleType.java
new file mode 100644
index 0000000000..bec61531b5
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/SimpleType.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author tiwe
+ */
+public class SimpleType implements Type {
+
+    private static final Map<String, Class<?>> PRIMITIVES = new HashMap<String, Class<?>>();
+    
+    static {
+        for (Class<?> cl : Arrays.<Class<?>>asList(byte.class, int.class, long.class, short.class,
+                float.class, double.class, boolean.class, char.class)) {
+            PRIMITIVES.put(cl.getName(), cl);
+        }
+    }
+    
+    private final TypeCategory category;
+
+    private final String fullName, outerClassName, packageName, simpleName, localName;
+
+    private final List<Type> parameters;
+
+    private final boolean primitiveClass, finalClass, memberClass;
+
+    private Type arrayType, componentType, enclosingType;
+    
+    private transient Class<?> javaClass;
+
+    public SimpleType(String fullName, String packageName, String simpleName, Type... parameters) {
+        this(TypeCategory.SIMPLE, fullName, packageName, simpleName, false, false, Arrays
+                .asList(parameters));
+    }
+
+    public SimpleType(String simpleName) {
+        this(TypeCategory.SIMPLE, simpleName, "", simpleName, false, false);
+    }
+
+    public SimpleType(Type type, List<Type> parameters) {
+        this(type.getCategory(), type.getFullName(), type.getPackageName(), type.getSimpleName(),
+                type.isPrimitive(), type.isFinal(), parameters);
+    }
+
+    public SimpleType(Type type, Type... parameters) {
+        this(type.getCategory(), type.getFullName(), type.getPackageName(), type.getSimpleName(),
+                type.isPrimitive(), type.isFinal(), Arrays.asList(parameters));
+    }
+
+    public SimpleType(TypeCategory category, String fullName, String packageName,
+            String simpleName, boolean primitiveClass, boolean finalClass, List<Type> parameters) {
+        this.category = category;
+        this.fullName = fullName;
+        this.packageName = packageName;
+        this.simpleName = simpleName;
+        if (packageName.length() > 0) {
+            this.localName = fullName.substring(packageName.length() + 1);
+        } else {
+            this.localName = fullName;
+        }
+        if (localName.contains(".")) {
+            this.outerClassName = fullName.substring(0, fullName.lastIndexOf('.'));
+        } else {
+            this.outerClassName = fullName;
+        }
+        this.primitiveClass = primitiveClass;
+        this.finalClass = finalClass;
+        this.parameters = parameters;
+        this.memberClass = localName.contains(".");
+    }
+
+    public SimpleType(TypeCategory typeCategory, String fullName, String packageName,
+            String simpleName, boolean p, boolean f, Type... parameters) {
+        this(typeCategory, fullName, packageName, simpleName, p, f, Arrays.asList(parameters));
+    }
+
+    @Override
+    public Type as(TypeCategory c) {
+        if (category != c) {
+            return new SimpleType(c, fullName, packageName, simpleName, primitiveClass, finalClass,
+                    parameters);
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public Type asArrayType() {
+        if (arrayType == null) {
+            String newFullName = getFullName() + "[]";
+            String newSimpleName = getSimpleName() + "[]";
+            arrayType = new SimpleType(TypeCategory.ARRAY, newFullName, getPackageName(),
+                    newSimpleName, false, false);
+        }
+        return arrayType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Type) {
+            Type t = (Type) o;
+            return t.getFullName().equals(fullName) && t.getParameters().equals(parameters);
+        } else {
+            return false;
+        }
+    }
+
+    public TypeCategory getCategory() {
+        return category;
+    }
+
+    @Override
+    public Type getComponentType() {
+        if (fullName.endsWith("[]")) {
+            if (componentType == null) {
+                String newFullName = fullName.substring(0, fullName.length() - 2);
+                String newSimpleName = simpleName.substring(0, simpleName.length() - 2);
+                componentType = new SimpleType(TypeCategory.SIMPLE, newFullName, getPackageName(),
+                        newSimpleName, false, false);
+            }
+            return componentType;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Type getEnclosingType() {
+        if (enclosingType == null && memberClass) {
+            String newLocalName = localName.substring(0, localName.lastIndexOf('.'));
+            String newSimpleName = newLocalName.substring(newLocalName.lastIndexOf('.') + 1);
+            enclosingType = new SimpleType(outerClassName, packageName, newSimpleName);
+        }
+        return enclosingType;
+    }
+
+    @Override
+    public String getFullName() {
+        return fullName;
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType) {
+        return getGenericName(asArgType, Collections.singleton("java.lang"),
+                Collections.<String> emptySet());
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
+        if (parameters.isEmpty()) {
+            return getRawName(packages, classes);
+        } else {
+            StringBuilder builder = new StringBuilder();
+            builder.append(getRawName(packages, classes));
+            builder.append("<");
+            boolean first = true;
+            for (Type parameter : parameters) {
+                if (!first) {
+                    builder.append(", ");
+                }
+                if (parameter == null || parameter.getFullName().equals(fullName)) {
+                    builder.append("?");
+                } else {
+                    builder.append(parameter.getGenericName(false, packages, classes));
+                }
+                first = false;
+            }
+            builder.append(">");
+            return builder.toString();
+        }
+    }
+
+    @Override
+    public Class<?> getJavaClass() {
+        if (javaClass == null) {
+            String className;
+            if (packageName.length() > 0) {
+                className = packageName + "." + localName.replace('.', '$');
+            } else {
+                className = localName.replace('.', '$');
+            }
+            try {
+                if (className.endsWith("[]")) {
+                    Class<?> component = getComponentType().getJavaClass();
+                    javaClass = Array.newInstance(component, 0).getClass();
+                } else if (PRIMITIVES.containsKey(className)) {
+                    javaClass = PRIMITIVES.get(className);
+                } else {
+                    javaClass = Class.forName(className);
+                }
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return javaClass;
+    }
+
+    @Override
+    public String getPackageName() {
+        return packageName;
+    }
+
+    @Override
+    public List<Type> getParameters() {
+        return parameters;
+    }
+
+    @Override
+    public String getRawName(Set<String> packages, Set<String> classes) {
+        if (classes.contains(fullName)) {
+            return simpleName;
+        } else if (classes.contains(outerClassName)) {
+            return fullName.substring(outerClassName.lastIndexOf('.') + 1);
+        } else if (packages.contains(packageName)) {
+            return localName;
+        } else {
+            return fullName;
+        }
+    }
+
+    @Override
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    @Override
+    public int hashCode() {
+        return fullName.hashCode();
+    }
+
+    @Override
+    public boolean isFinal() {
+        return finalClass;
+    }
+
+    @Override
+    public boolean isPrimitive() {
+        return primitiveClass;
+    }
+
+    @Override
+    public boolean isMember() {
+        return memberClass;
+    }
+
+    @Override
+    public String toString() {
+        return getGenericName(true);
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Type.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Type.java
new file mode 100644
index 0000000000..568d6b373f
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Type.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author tiwe
+ */
+public interface Type {
+
+    Type as(TypeCategory category);
+
+    Type asArrayType();
+
+    Type getComponentType();
+
+    Type getEnclosingType();
+
+    TypeCategory getCategory();
+
+    String getFullName();
+
+    String getGenericName(boolean asArgType);
+
+    String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes);
+
+    Class<?> getJavaClass();
+
+    String getPackageName();
+
+    List<Type> getParameters();
+
+    String getRawName(Set<String> packages, Set<String> classes);
+
+    String getSimpleName();
+
+    boolean isFinal();
+
+    boolean isPrimitive();
+
+    boolean isMember();
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeAdapter.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeAdapter.java
new file mode 100644
index 0000000000..158359b5e6
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeAdapter.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * TypeAdapter is a basic adapter implementation for the Type interface
+ * 
+ * @author tiwe
+ * 
+ */
+public class TypeAdapter implements Type {
+
+    protected final Type type;
+
+    public TypeAdapter(Type type) {
+        this.type = type;
+    }
+
+    @Override
+    public Type as(TypeCategory category) {
+        return type.as(category);
+    }
+
+    @Override
+    public Type asArrayType() {
+        return type.asArrayType();
+    }
+
+    @Override
+    public Type getComponentType() {
+        return type.getComponentType();
+    }
+
+    @Override
+    public Type getEnclosingType() {
+        return type.getEnclosingType();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return type.equals(o);
+    }
+
+    @Override
+    public TypeCategory getCategory() {
+        return type.getCategory();
+    }
+
+    @Override
+    public String getFullName() {
+        return type.getFullName();
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType) {
+        return type.getGenericName(asArgType);
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
+        return type.getGenericName(asArgType, packages, classes);
+    }
+
+    @Override
+    public Class<?> getJavaClass() {
+        return type.getJavaClass();
+    }
+
+    @Override
+    public String getPackageName() {
+        return type.getPackageName();
+    }
+
+    @Override
+    public List<Type> getParameters() {
+        return type.getParameters();
+    }
+
+    @Override
+    public String getRawName(Set<String> packages, Set<String> classes) {
+        return type.getRawName(packages, classes);
+    }
+
+    @Override
+    public String getSimpleName() {
+        return type.getSimpleName();
+    }
+
+    protected Type getType() {
+        return type;
+    }
+
+    @Override
+    public int hashCode() {
+        return type.hashCode();
+    }
+
+    @Override
+    public boolean isFinal() {
+        return type.isFinal();
+    }
+
+    @Override
+    public boolean isPrimitive() {
+        return type.isPrimitive();
+    }
+
+    @Override
+    public boolean isMember() {
+        return type.isMember();
+    }
+
+    @Override
+    public String toString() {
+        return type.toString();
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeCategory.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeCategory.java
new file mode 100644
index 0000000000..80e31cf29c
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeCategory.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * TypeCategory defines the expression type used for a Field
+ * 
+ * @author tiwe
+ * 
+ */
+public enum TypeCategory {
+    /**
+     *
+     */
+    SIMPLE(null),
+    /**
+     *
+     */
+    MAP(null),
+    /**
+     *
+     */
+    COLLECTION(null),
+    /**
+     *
+     */
+    LIST(COLLECTION),
+    /**
+     *
+     */
+    SET(COLLECTION),
+    /**
+     *
+     */
+    ARRAY(null),
+    /**
+     *
+     */
+    COMPARABLE(SIMPLE),
+    /**
+     *
+     */
+    BOOLEAN(COMPARABLE, Boolean.class.getName()),
+    /**
+     *
+     */
+    DATE(COMPARABLE, java.sql.Date.class.getName(), "org.joda.time.LocalDate",
+            "java.time.LocalDate"),
+    /**
+     *
+     */
+    DATETIME(COMPARABLE, java.util.Calendar.class.getName(), java.util.Date.class.getName(),
+            java.sql.Timestamp.class.getName(), "org.joda.time.LocalDateTime",
+            "org.joda.time.Instant", "org.joda.time.DateTime", "org.joda.time.DateMidnight",
+            "java.time.Instant", "java.time.LocalDateTime", "java.time.OffsetDateTime", "java.time.ZonedDateTime"),
+    /**
+     * 
+     */
+    ENUM(COMPARABLE),
+    /**
+     * 
+     */
+    CUSTOM(null),
+
+    /**
+     *
+     */
+    ENTITY(null),
+
+    /**
+     *
+     */
+    NUMERIC(COMPARABLE),
+    /**
+     *
+     */
+    STRING(COMPARABLE, String.class.getName()),
+    /**
+     *
+     */
+    TIME(COMPARABLE, java.sql.Time.class.getName(), "org.joda.time.LocalTime",
+            "java.time.LocalTime", "java.time.OffsetTime");
+
+    private final TypeCategory superType;
+
+    private final Set<String> types;
+
+    TypeCategory(TypeCategory superType, String... types) {
+        this.superType = superType;
+        this.types = new HashSet<String>(types.length);
+        for (String type : types) {
+            this.types.add(type);
+        }
+    }
+
+    public TypeCategory getSuperType() {
+        return superType;
+    }
+
+    public boolean supports(Class<?> cl) {
+        return supports(cl.getName());
+    }
+
+    public boolean supports(String className) {
+        return types.contains(className);
+    }
+
+    /**
+     * transitive and reflexive subCategoryOf check
+     * 
+     * @param ancestor
+     * @return
+     */
+    public boolean isSubCategoryOf(TypeCategory ancestor) {
+        if (this == ancestor) {
+            return true;
+        } else if (superType == null) {
+            return false;
+        } else {
+            return superType == ancestor || superType.isSubCategoryOf(ancestor);
+        }
+    }
+
+    public static TypeCategory get(String className) {
+        for (TypeCategory category : values()) {
+            if (category.supports(className)) {
+                return category;
+            }
+        }
+        return SIMPLE;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeExtends.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeExtends.java
new file mode 100644
index 0000000000..c0bd393255
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeExtends.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * @author tiwe
+ * 
+ */
+public class TypeExtends extends TypeAdapter {
+
+    private final String varName;
+
+    public TypeExtends(String varName, Type type) {
+        super(type);
+        this.varName = varName;
+    }
+
+    public TypeExtends(Type type) {
+        super(type);
+        varName = null;
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType) {
+        return getGenericName(asArgType, Collections.<String> emptySet(),
+                Collections.<String> emptySet());
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
+        if (!asArgType) {
+            if (Types.OBJECT.equals(type)) {
+                return "?";
+            } else {
+                String genericName = super.getGenericName(true, packages, classes);
+                return genericName == null || genericName.isEmpty() ? "?" : "? extends " + genericName;
+            }
+        } else {
+            return super.getGenericName(asArgType, packages, classes);
+        }
+    }
+
+    public String getVarName() {
+        return varName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof TypeExtends) {
+            return Objects.equals(((TypeExtends) o).varName, varName)
+                && ((TypeExtends) o).type.equals(type);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeSuper.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeSuper.java
new file mode 100644
index 0000000000..71a1cd7587
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/TypeSuper.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * TypeSuper is a Type for type variables and wildcard types
+ * 
+ * @author tiwe
+ * 
+ */
+public class TypeSuper extends TypeAdapter {
+
+    private final Type superType;
+
+    private final String varName;
+
+    public TypeSuper(String varName, Type type) {
+        super(Types.OBJECT);
+        this.superType = type;
+        this.varName = varName;
+    }
+
+    public TypeSuper(Type type) {
+        super(Types.OBJECT);
+        this.superType = type;
+        this.varName = null;
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType) {
+        return getGenericName(asArgType, Collections.<String> emptySet(),
+                Collections.<String> emptySet());
+    }
+
+    @Override
+    public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
+        if (!asArgType) {
+            if (superType instanceof TypeExtends) {
+                return "?";
+            } else {
+                return "? super " + superType.getGenericName(true, packages, classes);
+            }
+            
+        } else {
+            return super.getGenericName(asArgType, packages, classes);
+        }
+    }
+
+    public String getVarName() {
+        return varName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof TypeSuper) {
+            return Objects.equals(((TypeSuper) o).varName, varName)
+                    && ((TypeSuper) o).superType.equals(superType);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Types.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Types.java
new file mode 100644
index 0000000000..c0870ef9d4
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/model/Types.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.model;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author tiwe
+ * 
+ */
+public final class Types {
+    
+    public static final Map<Type, Type> PRIMITIVES;
+        
+    public static final ClassType OBJECT = new ClassType(TypeCategory.SIMPLE, Object.class);
+
+    public static final ClassType OBJECTS = new ClassType(TypeCategory.ARRAY, Object[].class);
+
+    public static final ClassType BIG_DECIMAL = new ClassType(TypeCategory.NUMERIC, BigDecimal.class);
+
+    public static final ClassType BIG_INTEGER = new ClassType(TypeCategory.NUMERIC, BigInteger.class);
+
+    public static final ClassType BOOLEAN = new ClassType(TypeCategory.BOOLEAN, Boolean.class);
+
+    public static final ClassType BOOLEAN_P = new ClassType(TypeCategory.BOOLEAN, boolean.class);
+
+    public static final ClassType BYTE = new ClassType(TypeCategory.NUMERIC, Byte.class);
+
+    public static final ClassType BYTE_P = new ClassType(TypeCategory.NUMERIC, byte.class);
+
+    public static final ClassType CHARACTER = new ClassType(TypeCategory.COMPARABLE, Character.class);
+
+    public static final ClassType CHAR = new ClassType(TypeCategory.COMPARABLE, char.class);
+
+    public static final ClassType COLLECTION = new ClassType(TypeCategory.COLLECTION, Collection.class, OBJECT);
+
+    public static final ClassType DOUBLE = new ClassType(TypeCategory.NUMERIC, Double.class);
+
+    public static final ClassType DOUBLE_P = new ClassType(TypeCategory.NUMERIC, double.class);
+
+    public static final ClassType FLOAT = new ClassType(TypeCategory.NUMERIC, Float.class);
+
+    public static final ClassType FLOAT_P = new ClassType(TypeCategory.NUMERIC, float.class);
+
+    public static final ClassType INTEGER = new ClassType(TypeCategory.NUMERIC, Integer.class);
+
+    public static final ClassType INT = new ClassType(TypeCategory.NUMERIC, int.class);
+
+    public static final ClassType ITERABLE = new ClassType(TypeCategory.SIMPLE, Iterable.class, OBJECT);
+
+    public static final ClassType LIST = new ClassType(TypeCategory.LIST, List.class, OBJECT);
+
+    public static final ClassType LOCALE = new ClassType(TypeCategory.SIMPLE, Locale.class);
+
+    public static final ClassType LONG = new ClassType(TypeCategory.NUMERIC, Long.class);
+
+    public static final ClassType LONG_P = new ClassType(TypeCategory.NUMERIC, long.class);
+
+    public static final ClassType MAP = new ClassType(TypeCategory.MAP, Map.class, OBJECT, OBJECT);
+
+    public static final ClassType SET = new ClassType(TypeCategory.SET, Set.class, OBJECT);
+
+    public static final ClassType SHORT = new ClassType(TypeCategory.NUMERIC, Short.class);
+
+    public static final ClassType SHORT_P = new ClassType(TypeCategory.NUMERIC, short.class);
+
+    public static final ClassType STRING = new ClassType(TypeCategory.STRING, String.class);
+
+    public static final ClassType URI = new ClassType(TypeCategory.COMPARABLE, URI.class);
+
+    public static final ClassType VOID = new ClassType(TypeCategory.SIMPLE, void.class);
+
+    public static final SimpleType DATE_TIME = new SimpleType(TypeCategory.DATETIME,
+            "org.joda.time.DateTime", "org.joda.time", "DateTime", false, false);
+
+    public static final SimpleType LOCAL_DATE = new SimpleType(TypeCategory.DATE,
+            "org.joda.time.LocalDate", "org.joda.time", "LocalDate", false, false);
+
+    public static final SimpleType LOCAL_TIME = new SimpleType(TypeCategory.TIME,
+            "org.joda.time.LocalTime", "org.joda.time", "LocalTime", false, false);
+
+    static {
+        Map<Type, Type> primitives = new HashMap<Type, Type>();
+        primitives.put(BOOLEAN, BOOLEAN_P);
+        primitives.put(BYTE, BYTE_P);
+        primitives.put(CHARACTER, CHAR);
+        primitives.put(DOUBLE, DOUBLE_P);
+        primitives.put(FLOAT, FLOAT_P);
+        primitives.put(INTEGER, INT);
+        primitives.put(LONG, LONG_P);
+        primitives.put(SHORT, SHORT_P);
+        PRIMITIVES = Collections.unmodifiableMap(primitives);
+    }
+
+    
+    private Types() {
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ClassUtils.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ClassUtils.java
new file mode 100644
index 0000000000..ad2b8592bb
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ClassUtils.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.support;
+
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+/**
+ * @author tiwe
+ * 
+ */
+public final class ClassUtils {
+
+    private static final Set<String> JAVA_LANG = Collections.singleton("java.lang");
+    
+    public static String getName(Class<?> cl) {
+        return getName(cl, JAVA_LANG, Collections.<String> emptySet());
+    }
+
+    public static String getFullName(Class<?> cl) {
+        if (cl.isArray()) {
+            return getFullName(cl.getComponentType()) + "[]";
+        }
+        final String name = cl.getName();
+        if (name.indexOf('$') > 0) {
+            return getFullName(cl.getDeclaringClass()) + "." + cl.getSimpleName();
+        }
+        return name;
+    }
+
+    public static String getPackageName(Class<?> cl) {
+        while (cl.isArray()) {
+            cl = cl.getComponentType();
+        }
+        final String name = cl.getName();
+        final int i = name.lastIndexOf('.');
+        if (i > 0) {
+            return name.substring(0, i);
+        } else {
+            return "";
+        }
+    }
+    
+    public static String getName(Class<?> cl, Set<String> packages, Set<String> classes) {
+        if (cl.isArray()) {
+            return getName(cl.getComponentType(), packages, classes) + "[]";
+        }
+        final String canonicalName = cl.getName().replace('$', '.');
+        final int i = cl.getName().lastIndexOf('.');
+        if (classes.contains(canonicalName)) {
+            return cl.getSimpleName();
+        } else if (cl.getEnclosingClass() != null) {
+            return getName(cl.getEnclosingClass(), packages, classes) + "." + cl.getSimpleName();
+        } else if (i == -1) {
+            return canonicalName;
+        } else if (packages.contains(canonicalName.substring(0, i))) {
+            return canonicalName.substring(i + 1);
+        }  else {
+            return canonicalName;
+        }
+    }
+
+    public static Class<?> normalize(Class<?> clazz) {
+        if (List.class.isAssignableFrom(clazz)) {
+            return List.class;
+        } else if (Set.class.isAssignableFrom(clazz)) {
+            return Set.class;
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            return Collection.class;
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            return Map.class;
+        // check for CGLIB generated classes
+        } else if (clazz.getName().contains("$$")) {
+            Class<?> zuper = clazz.getSuperclass();
+            if (zuper != null && !Object.class.equals(zuper)) {
+                return zuper;
+            }
+        } else if (!Modifier.isPublic(clazz.getModifiers())) {
+            return normalize(clazz.getSuperclass());
+        }
+        return clazz;
+    }
+
+    private ClassUtils() {
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ScalaSyntaxUtils.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ScalaSyntaxUtils.java
new file mode 100644
index 0000000000..1d7a6f058e
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/ScalaSyntaxUtils.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.support;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author tiwe
+ *
+ */
+public final class ScalaSyntaxUtils {
+
+    private ScalaSyntaxUtils() { }
+
+    private static final Set<String> reserved = new HashSet<String>(Arrays.asList("abstract", "do",
+            "finally", "import", "object", "return", "trait", "var", "_", ":", "case", "else",
+            "for", "lazy", "override", "sealed", "try", "while", "=", "=>", "<-", "catch",
+            "extends", "forSome", "match", "package", "super", "true", "with", "<:", "class",
+            "false", "if", "new", "private", "this", "type", "yield", "<%", ">:", "def", "final",
+            "implicit", "null", "protected", "throw", "val", "#", "@"));
+
+    public static boolean isReserved(String token) {
+        return reserved.contains(token);
+    }
+}
diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/package-info.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/package-info.java
new file mode 100644
index 0000000000..3b18ad601e
--- /dev/null
+++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/support/package-info.java
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+
+package com.querydsl.codegen.utils.support;
+
diff --git a/querydsl-codegen-utils/src/test/java/NestedTest.java b/querydsl-codegen-utils/src/test/java/NestedTest.java
new file mode 100644
index 0000000000..75b7c36a6b
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/NestedTest.java
@@ -0,0 +1,25 @@
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.support.ClassUtils;
+
+public class NestedTest {
+
+    public static class Inner {
+
+    }
+
+    @Test
+    public void ClassUtils_getName() {
+        String name = ClassUtils.getName(NestedTest.Inner.class);
+        assertEquals("NestedTest.Inner", name);
+    }
+
+    @Test
+    public void ClassType_getName() {
+        assertEquals("NestedTest.Inner", new ClassType(NestedTest.Inner.class).getFullName());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation.java
new file mode 100644
index 0000000000..7218a81313
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Annotation {
+
+    boolean prop1() default false;
+
+    boolean prop2();
+
+    Class<?> clazz();
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2.java
new file mode 100644
index 0000000000..49bb20c371
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2.java
@@ -0,0 +1,18 @@
+/**
+ * 
+ */
+package com.querydsl.codegen.utils;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Annotation2 {
+
+    String value();
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2Impl.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2Impl.java
new file mode 100644
index 0000000000..52b9ac0396
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation2Impl.java
@@ -0,0 +1,24 @@
+package com.querydsl.codegen.utils;
+
+import java.lang.annotation.Annotation;
+
+@SuppressWarnings("all")
+public class Annotation2Impl implements Annotation2 {
+
+    private final String value;
+
+    public Annotation2Impl(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String value() {
+        return value;
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return Annotation2.class;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation3.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation3.java
new file mode 100644
index 0000000000..4981b1c1ce
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Annotation3.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Annotation3 {
+
+    ElementType type();
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java
new file mode 100644
index 0000000000..8d29b0e25d
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.annotation.ElementType;
+
+import org.junit.Test;
+
+@Annotation(prop2 = false, clazz = AnnotationTest.class)
+@Annotation2("Hello")
+@Annotation3(type = ElementType.ANNOTATION_TYPE)
+public class AnnotationTest {
+
+    private StringWriter w = new StringWriter();
+    private CodeWriter writer = new JavaWriter(w);
+
+    @Test
+    public void ClassAnnotation() throws IOException {
+        writer.annotation(getClass().getAnnotation(Annotation.class));
+        String option1 = "@com.querydsl.codegen.utils.Annotation(clazz=com.querydsl.codegen.utils.AnnotationTest.class, prop2=false)";
+        String option2 = "@com.querydsl.codegen.utils.Annotation(prop2=false, clazz=com.querydsl.codegen.utils.AnnotationTest.class)";
+        String serialized = w.toString().trim();
+        assertTrue(serialized.equals(option1) || serialized.equals(option2));
+    }
+
+    @Test
+    public void ClassAnnotation2() throws IOException {
+        writer.annotation(getClass().getAnnotation(Annotation2.class));
+        assertEquals("@com.querydsl.codegen.utils.Annotation2(\"Hello\")", w.toString().trim());
+    }
+
+    @Test
+    public void ClassAnnotation3() throws IOException {
+        writer.annotation(getClass().getAnnotation(Annotation3.class));
+        assertEquals(
+                "@com.querydsl.codegen.utils.Annotation3(type=java.lang.annotation.ElementType.ANNOTATION_TYPE)",
+                w.toString().trim());
+    }
+
+    @Test
+    public void MethodAnnotation() throws IOException, SecurityException, NoSuchMethodException {
+        writer.annotation(getClass().getMethod("MethodAnnotation").getAnnotation(Test.class));
+        assertEquals("@org.junit.Test", w.toString().trim());
+    }
+
+    @Test
+    public void Min() throws IOException {
+        writer.annotation(new MinImpl(10));
+        assertEquals("@javax.validation.constraints.Min(value=10)", w.toString().trim());
+    }
+
+    @Test
+    public void Max() throws IOException {
+        writer.annotation(new MaxImpl(10));
+        assertEquals("@javax.validation.constraints.Max(value=10)", w.toString().trim());
+    }
+
+    @Test
+    public void NotNull() throws IOException {
+        writer.annotation(new NotNullImpl());
+        assertEquals("@javax.validation.constraints.NotNull", w.toString().trim());
+    }
+
+    @Test
+    public void Uri_Value() throws IOException {
+        writer.annotation(new Annotation2Impl("http://www.example.com#"));
+        assertEquals("@com.querydsl.codegen.utils.Annotation2(\"http://www.example.com#\")", w.toString()
+                .trim());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java
new file mode 100644
index 0000000000..6fadc442d9
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.support.Cat;
+
+public class ComplexEvaluationTest {
+
+    private EvaluatorFactory factory = new ECJEvaluatorFactory(getClass().getClassLoader());
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void Complex() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.STRING);
+        StringBuilder source = new StringBuilder();
+        source.append("java.util.List<String> rv = new java.util.ArrayList<String>();\n");
+        source.append("for (String a : a_){\n");
+        source.append("    for (String b : b_){\n");
+        source.append("        if (a.equals(b)){\n");
+        source.append("            rv.add(a);\n");
+        source.append("        }\n");
+        source.append("    }\n");
+        source.append("}\n");
+        source.append("return rv;");
+
+        @SuppressWarnings("rawtypes") // cannot specify further than List.class
+        Evaluator<List> evaluator = factory.createEvaluator(source.toString(), resultType,
+                new String[] { "a_", "b_" }, new Type[] { resultType, resultType }, new Class<?>[] {
+                        List.class, List.class }, Collections.<String, Object> emptyMap());
+
+        List<String> a = Arrays.asList("1", "2", "3", "4");
+        List<String> b = Arrays.asList("2", "4", "6", "8");
+
+        assertEquals(Arrays.asList("2", "4"), evaluator.evaluate(a, b));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void ComplexClassLoading() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.OBJECTS);
+        StringBuilder source = new StringBuilder();
+        source.append("java.util.List<Object[]> rv = new java.util.ArrayList<Object[]>();\n");
+        source.append("for (com.querydsl.codegen.utils.support.Cat cat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n");
+        source.append("for (com.querydsl.codegen.utils.support.Cat otherCat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)otherCat_){\n");
+        source.append("rv.add(new Object[]{cat,otherCat});\n");
+        source.append("}\n");
+        source.append("}\n");
+        source.append("return rv;\n");
+
+        Cat fuzzy = new Cat("fuzzy");
+        Cat spot = new Cat("spot");
+        Cat mittens = new Cat("mittens");
+        Cat sparkles = new Cat("sparkles");
+
+        List<Cat> a = Arrays.asList(fuzzy, spot);
+        List<Cat> b = Arrays.asList(mittens, sparkles);
+
+        ClassType argType = new ClassType(TypeCategory.LIST, List.class, new ClassType(Cat.class));
+        @SuppressWarnings("rawtypes") // cannot specify further than List.class
+        Evaluator<List> evaluator = factory.createEvaluator(source.toString(), resultType,
+                new String[] { "cat_", "otherCat_" }, new Type[] { argType, argType }, new Class<?>[] {
+                        List.class, List.class }, Collections.<String, Object> emptyMap());
+        
+        Object[][] expResults = { {fuzzy, mittens}, {fuzzy, sparkles}, {spot, mittens}, {spot, sparkles} };
+        List<Object[]> result = evaluator.evaluate(a, b);
+        assertEquals(expResults.length, result.size());
+        
+        for (int i = 0; i < expResults.length; i++) {
+            assertEquals(expResults[i].length, result.get(i).length);
+            for (int j = 0; j < expResults[i].length; j++) {
+                assertEquals(expResults[i][j], result.get(i)[j]);
+            }
+        }
+    }
+    
+    @Test(expected = CodegenException.class)
+    @SuppressWarnings("unchecked")
+    public void ComplexClassLoadingFailure() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.STRING);
+        StringBuilder source = new StringBuilder();
+        source.append("java.util.List<String> rv = (java.util.List<String>) new java.util.ArrayList<Franklin>();\n");
+        source.append("for (String a : a_){\n");
+        source.append("    for (String b : b_){\n");
+        source.append("        if (a.equals(b)){\n");
+        source.append("            rv.add(a);\n");
+        source.append("        }\n");
+        source.append("    }\n");
+        source.append("}\n");
+        source.append("return rv;");
+
+        @SuppressWarnings("rawtypes") // cannot specify further than List.class
+        Evaluator<List> evaluator = factory.createEvaluator(source.toString(), resultType,
+                new String[] { "a_", "b_" }, new Type[] { resultType, resultType }, new Class<?>[] {
+                        List.class, List.class }, Collections.<String, Object> emptyMap());
+
+        List<String> a = Arrays.asList("1", "2", "3", "4");
+        List<String> b = Arrays.asList("2", "4", "6", "8");
+
+        assertEquals(Arrays.asList("2", "4"), evaluator.evaluate(a, b));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void ComplexPrimitiveType() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.BOOLEAN);
+        StringBuilder source = new StringBuilder();
+        source.append("java.util.List<Boolean> rv = new java.util.ArrayList<Boolean>();\n");
+        source.append("for (boolean a : a_){\n");
+        source.append("    for (boolean b : b_){\n");
+        source.append("        if (a == b){\n");
+        source.append("            rv.add(a);\n");
+        source.append("        }\n");
+        source.append("    }\n");
+        source.append("}\n");
+        source.append("return rv;");
+
+        @SuppressWarnings("rawtypes") // cannot specify further than List.class
+        Evaluator<List> evaluator = factory.createEvaluator(source.toString(), resultType,
+                new String[] { "a_", "b_" }, new Type[] { resultType, resultType }, new Class<?>[] {
+                        List.class, List.class }, Collections.<String, Object> emptyMap());
+
+        List<Boolean> a = Arrays.asList(true, true, true);
+        List<Boolean> b = Arrays.asList(false, false, true);
+
+        assertEquals(Arrays.asList(true, true, true), evaluator.evaluate(a, b));
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void ComplexEmbeddedClass() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.BOOLEAN);
+        StringBuilder source = new StringBuilder();
+        source.append("java.util.List<Boolean> rv = new java.util.ArrayList<Boolean>();\n");
+        source.append("for (boolean a : a_){\n");
+        source.append("    for (boolean b : b_){\n");
+        source.append("        if (a == b && new TestEmbedded().DO_RETURN()){\n");
+        source.append("            rv.add(a);\n");
+        source.append("        }\n");
+        source.append("    }\n");
+        source.append("}\n");
+        source.append("return rv;} private static class TestEmbedded { public TestEmbedded() {} public boolean DO_RETURN() { return true; } ");
+
+        @SuppressWarnings("rawtypes") // cannot specify further than List.class
+        Evaluator<List> evaluator = factory.createEvaluator(source.toString(), resultType,
+                new String[] { "a_", "b_" }, new Type[] { resultType, resultType }, new Class<?>[] {
+                        List.class, List.class }, Collections.<String, Object> emptyMap());
+
+        List<Boolean> a = Arrays.asList(true, true, true);
+        List<Boolean> b = Arrays.asList(false, false, true);
+
+        assertEquals(Arrays.asList(true, true, true), evaluator.evaluate(a, b));
+    }
+
+    public static final class SuperCat extends Cat {
+        private SuperCat(String name) {
+            super(name);
+        }
+    }
+
+    @Test
+    public void ComplexDifferentConstants() {
+        ClassType resultType = new ClassType(TypeCategory.LIST, List.class, new ClassType(Cat.class));
+        String source = new StringBuilder()
+                .append("java.util.List<com.querydsl.codegen.utils.support.Cat> rv = new java.util.ArrayList<com.querydsl.codegen.utils.support.Cat>();\n")
+                .append("for (com.querydsl.codegen.utils.support.Cat cat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n")
+                    .append("if (cat.equals(a1)) {\n")
+                        .append("rv.add(cat);\n")
+                    .append("}\n")
+                .append("}\n")
+                .append("return rv;\n")
+                .toString();
+
+        List<Cat> cats = Arrays.asList(new Cat("fuzzy"), new Cat("spot"));
+        String[] names = new String[] { "cat_" };
+        Type[] types = new Type[] { new ClassType(TypeCategory.LIST, List.class, new ClassType(Cat.class)) };
+        Class<?>[] classes = new Class<?>[] { List.class };
+
+        // first pass
+        factory.createEvaluator(
+                source,
+                resultType,
+                names,
+                types,
+                classes,
+                Collections.singletonMap("a1", (Object) new SuperCat("superMittens"))
+        ).evaluate(cats);
+
+        // second pass
+        factory.createEvaluator(
+                source,
+                resultType,
+                names,
+                types,
+                classes,
+                Collections.singletonMap("a1", (Object) new Cat("normalMittens"))
+        ).evaluate(cats);
+    }
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java
new file mode 100644
index 0000000000..9d9c3633ed
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ECJEvaluatorFactoryTest {
+
+    public static class TestEntity {
+
+        private final String name;
+
+        public TestEntity(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+    }
+
+    private EvaluatorFactory factory;
+
+    private List<String> names = Arrays.asList("a", "b");
+
+    private List<Class<?>> ints = Arrays.<Class<?>> asList(int.class, int.class);
+
+    private List<Class<?>> strings = Arrays.<Class<?>> asList(String.class, String.class);
+
+    private List<Class<?>> string_int = Arrays.<Class<?>> asList(String.class, int.class);
+
+    @Before
+    public void setUp() throws IOException {
+        factory = new ECJEvaluatorFactory(getClass().getClassLoader());
+    }
+
+    @Test
+    public void Simple() {
+        for (String expr : Arrays.asList("a.equals(b)", "a.startsWith(b)", "a.equalsIgnoreCase(b)")) {
+            long start = System.currentTimeMillis();
+            evaluate(expr, boolean.class, names, strings, Arrays.asList("a", "b"),
+                    Collections.<String, Object> emptyMap());
+            long duration = System.currentTimeMillis() - start;
+            System.err.println(expr + " took " + duration + "ms\n");
+        }
+
+        for (String expr : Arrays.asList("a != b", "a < b", "a > b", "a <= b", "a >= b")) {
+            long start = System.currentTimeMillis();
+            evaluate(expr, boolean.class, names, ints, Arrays.asList(0, 1),
+                    Collections.<String, Object> emptyMap());
+            long duration = System.currentTimeMillis() - start;
+            System.err.println(expr + " took " + duration + "ms\n");
+        }
+    }
+
+    @Test
+    public void Results() {
+        // String + String
+        test("a + b", String.class, names, strings, Arrays.asList("Hello ", "World"), "Hello World");
+
+        // String + int
+        test("a.substring(b)", String.class, names, string_int,
+                Arrays.<Object> asList("Hello World", 6), "World");
+
+        // int + int
+        test("a + b", int.class, names, ints, Arrays.asList(1, 2), 3);
+    }
+
+    @Test
+    public void WithConstants() {
+        Map<String, Object> constants = new HashMap<String, Object>();
+        constants.put("x", "Hello World");
+        List<Class<?>> types = Arrays.<Class<?>> asList(String.class);
+        List<String> names = Arrays.asList("a");
+        assertEquals(
+                Boolean.TRUE,
+                evaluate("a.equals(x)", boolean.class, names, types, Arrays.asList("Hello World"),
+                        constants));
+        assertEquals(
+                Boolean.FALSE,
+                evaluate("a.equals(x)", boolean.class, names, types, Arrays.asList("Hello"),
+                        constants));
+    }
+
+    @Test
+    public void CustomType() {
+        test("a.getName()", String.class, Collections.singletonList("a"),
+                Collections.<Class<?>> singletonList(TestEntity.class),
+                Arrays.asList(new TestEntity("Hello World")), "Hello World");
+    }
+
+    private void test(String source, Class<?> projectionType, List<String> names,
+            List<Class<?>> types, List<?> args, Object expectedResult) {
+        Assert.assertEquals(
+                expectedResult,
+                evaluate(source, projectionType, names, types, args,
+                        Collections.<String, Object> emptyMap()));
+    }
+
+    private Object evaluate(String source, Class<?> projectionType, List<String> names,
+            List<Class<?>> types, List<?> args, Map<String, Object> constants) {
+        Evaluator<?> evaluator = factory.createEvaluator("return " + source + ";", projectionType,
+                names.toArray(new String[names.size()]), types.toArray(new Class<?>[types.size()]),
+                constants);
+        return evaluator.evaluate(args.toArray());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Entity.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Entity.java
new file mode 100644
index 0000000000..829a3f2ef2
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/Entity.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
+package com.querydsl.codegen.utils;
+
+public @interface Entity {
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java
new file mode 100644
index 0000000000..c58d44d045
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java
@@ -0,0 +1,52 @@
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Type;
+
+public class InnerClassesTest {
+
+    public static class Entity {
+
+    }
+
+    @Test
+    public void DirectParameter() throws IOException {
+        Type entityType = new ClassType(Entity.class);
+        Type type = new SimpleType("com.querydsl.codegen.utils.gen.QEntity", "com.querydsl.codegen.utils.gen",
+                "QEntity", entityType);
+
+        StringWriter str = new StringWriter();
+        JavaWriter writer = new JavaWriter(str);
+        writer.beginClass(type);
+        writer.end();
+
+        System.err.println(str.toString());
+    }
+    
+    @Test
+    public void Java() {
+        StringWriter str = new StringWriter();
+        JavaWriter writer = new JavaWriter(str);
+        
+        assertEquals("com.querydsl.codegen.utils.InnerClassesTest.Entity",
+                writer.getRawName(new ClassType(Entity.class)));
+    }
+    
+    @Test
+    public void Scala() {
+        StringWriter str = new StringWriter();
+        ScalaWriter writer = new ScalaWriter(str);
+        
+        assertEquals("com.querydsl.codegen.utils.InnerClassesTest$Entity",
+                writer.getRawName(new ClassType(Entity.class)));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java
new file mode 100644
index 0000000000..3ddc1f3cd1
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ * 
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JDKEvaluatorFactoryTest {
+
+    public static class TestEntity {
+
+        private final String name;
+
+        public TestEntity(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+    }
+
+    private EvaluatorFactory factory;
+
+    private List<String> names = Arrays.asList("a", "b");
+
+    private List<Class<?>> ints = Arrays.<Class<?>> asList(int.class, int.class);
+
+    private List<Class<?>> strings = Arrays.<Class<?>> asList(String.class, String.class);
+
+    private List<Class<?>> string_int = Arrays.<Class<?>> asList(String.class, int.class);
+
+    @Before
+    public void setUp() throws IOException {
+        factory = new JDKEvaluatorFactory((URLClassLoader) getClass().getClassLoader());
+    }
+
+    @Test
+    public void Simple() {
+        for (String expr : Arrays.asList("a.equals(b)", "a.startsWith(b)", "a.equalsIgnoreCase(b)")) {
+            long start = System.currentTimeMillis();
+            evaluate(expr, boolean.class, names, strings, Arrays.asList("a", "b"),
+                    Collections.<String, Object> emptyMap());
+            long duration = System.currentTimeMillis() - start;
+            System.err.println(expr + " took " + duration + "ms\n");
+        }
+
+        for (String expr : Arrays.asList("a != b", "a < b", "a > b", "a <= b", "a >= b")) {
+            long start = System.currentTimeMillis();
+            evaluate(expr, boolean.class, names, ints, Arrays.asList(0, 1),
+                    Collections.<String, Object> emptyMap());
+            long duration = System.currentTimeMillis() - start;
+            System.err.println(expr + " took " + duration + "ms\n");
+        }
+    }
+
+    @Test
+    public void Results() {
+        // String + String
+        test("a + b", String.class, names, strings, Arrays.asList("Hello ", "World"), "Hello World");
+
+        // String + int
+        test("a.substring(b)", String.class, names, string_int,
+                Arrays.<Object> asList("Hello World", 6), "World");
+
+        // int + int
+        test("a + b", int.class, names, ints, Arrays.asList(1, 2), 3);
+    }
+
+    @Test
+    public void WithConstants() {
+        Map<String, Object> constants = new HashMap<String, Object>();
+        constants.put("x", "Hello World");
+        List<Class<?>> types = Arrays.<Class<?>> asList(String.class);
+        List<String> names = Arrays.asList("a");
+        assertEquals(
+                Boolean.TRUE,
+                evaluate("a.equals(x)", boolean.class, names, types, Arrays.asList("Hello World"),
+                        constants));
+        assertEquals(
+                Boolean.FALSE,
+                evaluate("a.equals(x)", boolean.class, names, types, Arrays.asList("Hello"),
+                        constants));
+    }
+
+    @Test
+    public void CustomType() {
+        test("a.getName()", String.class, Collections.singletonList("a"),
+                Collections.<Class<?>> singletonList(TestEntity.class),
+                Arrays.asList(new TestEntity("Hello World")), "Hello World");
+    }
+
+    private void test(String source, Class<?> projectionType, List<String> names,
+            List<Class<?>> types, List<?> args, Object expectedResult) {
+        Assert.assertEquals(
+                expectedResult,
+                evaluate(source, projectionType, names, types, args,
+                        Collections.<String, Object> emptyMap()));
+    }
+
+    private Object evaluate(String source, Class<?> projectionType, List<String> names,
+            List<Class<?>> types, List<?> args, Map<String, Object> constants) {
+        Evaluator<?> evaluator = factory.createEvaluator("return " + source + ";", projectionType,
+                names.toArray(new String[names.size()]), types.toArray(new Class<?>[types.size()]),
+                constants);
+        return evaluator.evaluate(args.toArray());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java
new file mode 100644
index 0000000000..98f321e42f
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.function.Function;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JavaWriterTest {
+
+    private static final Function<Parameter, Parameter> transformer = new Function<Parameter, Parameter>() {
+        @Override
+        public Parameter apply(Parameter input) {
+            return input;
+        }
+    };
+
+    private StringWriter w;
+
+    private CodeWriter writer;
+
+    private Type testType, testType2, testSuperType, testInterface1, testInterface2;
+
+    private static void match(String resource, String text) throws IOException {
+        // TODO : try to compile ?
+        final InputStream resourceAsStream = JavaWriterTest.class.getResourceAsStream(resource);
+        StringBuilder textBuilder = new StringBuilder();
+        try (Reader reader = new BufferedReader(new InputStreamReader(resourceAsStream, StandardCharsets.UTF_8))) {
+            int c = 0;
+            while ((c = reader.read()) != -1) {
+                textBuilder.append((char) c);
+            }
+        }
+        String expected = textBuilder.toString().replace("\r\n", System.lineSeparator()).trim();
+        String actual = text.trim();
+        assertEquals(expected, actual);
+    }
+
+    @Before
+    public void setUp() {
+        w = new StringWriter();
+        writer = new JavaWriter(w);
+        testType = new ClassType(JavaWriterTest.class);
+        testType2 = new SimpleType("com.querydsl.codegen.utils.Test", "com.querydsl.codegen.utils", "Test");
+        testSuperType = new SimpleType("com.querydsl.codegen.utils.Superclass", "com.querydsl.codegen.utils",
+                "Superclass");
+        testInterface1 = new SimpleType("com.querydsl.codegen.utils.TestInterface1", "com.querydsl.codegen.utils",
+                "TestInterface1");
+        testInterface2 = new SimpleType("com.querydsl.codegen.utils.TestInterface2", "com.querydsl.codegen.utils",
+                "TestInterface2");
+    }
+
+    @Test
+    public void Arrays() throws IOException {
+        writer.beginClass(new SimpleType("Main"));
+        writer.field(Types.STRING.asArrayType(), "stringArray");
+        writer.beginPublicMethod(Types.VOID, "main",
+                new Parameter("args", Types.STRING.asArrayType()));
+        writer.line("//");
+        writer.end();
+        writer.beginPublicMethod(Types.VOID, "main2", new Parameter("args", new ClassType(
+                TypeCategory.ARRAY, String[].class)));
+        writer.line("//");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+        assertTrue(w.toString().contains("String[] stringArray;"));
+        assertTrue(w.toString().contains("public void main(String[] args) {"));
+        assertTrue(w.toString().contains("public void main2(String[] args) {"));
+    }
+
+    @Test
+    public void Primitive_Arrays() {
+        ClassType byteArray = new ClassType(byte[].class);
+        assertEquals("byte[]", writer.getRawName(byteArray));
+    }
+
+    @Test
+    public void Basic() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.beginClass(testType);
+        writer.annotation(Test.class);
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.line("// TODO");
+        writer.end();
+        writer.end();
+
+        match("/testBasic", w.toString());
+    }
+
+    @Test
+    public void Extends() throws IOException {
+        writer.beginClass(testType2, testSuperType);
+        writer.end();
+
+        match("/testExtends", w.toString());
+    }
+
+    @Test
+    public void Implements() throws IOException {
+        writer.beginClass(testType2, null, testInterface1, testInterface2);
+        writer.end();
+
+        match("/testImplements", w.toString());
+    }
+
+    @Test
+    public void Interface() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.beginInterface(testType);
+        writer.end();
+
+        match("/testInterface", w.toString());
+    }
+
+    @Test
+    public void Interface2() throws IOException {
+        writer.beginInterface(testType2, testInterface1);
+        writer.end();
+
+        match("/testInterface2", w.toString());
+    }
+
+    @Test
+    public void Interface3() throws IOException {
+        writer.beginInterface(testType, testType2, testInterface1, testInterface2);
+        writer.end();
+
+        assertTrue(w.toString().contains(
+                "public interface JavaWriterTest extends Test, TestInterface1, TestInterface2 {"));
+    }
+
+    @Test
+    public void Javadoc() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.javadoc("JavaWriterTest is a test class");
+        writer.beginClass(testType);
+        writer.end();
+
+        match("/testJavadoc", w.toString());
+    }
+
+    @Test
+    public void Annotations() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class);
+        writer.annotation(Entity.class);
+        writer.beginClass(testType);
+        writer.annotation(Test.class);
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.end();
+        writer.end();
+
+        match("/testAnnotations", w.toString());
+    }
+
+    @Test
+    public void Annotations2() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class.getPackage(), StringWriter.class.getPackage());
+        writer.annotation(Entity.class);
+        writer.beginClass(testType);
+        writer.annotation(new Test() {
+            @Override
+            public Class<? extends Throwable> expected() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public long timeout() {
+
+                return 0;
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Test.class;
+            }
+        });
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.end();
+        writer.end();
+
+        match("/testAnnotations2", w.toString());
+    }
+
+    @Test
+    public void Annotation_With_ArrayMethod() throws IOException {
+        Target annotation = new Target() {
+            @Override
+            public ElementType[] value() {
+                return new ElementType[] { ElementType.FIELD, ElementType.METHOD };
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Target.class;
+            }
+        };
+
+        writer.imports(Target.class.getPackage());
+        writer.annotation(annotation);
+        assertTrue(w.toString().contains("@Target({FIELD, METHOD})"));
+    }
+
+    @Test
+    public void ClassConstants() {
+        assertEquals("SomeClass.class", writer.getClassConstant("SomeClass"));
+    }
+
+    @Test
+    public void Fields() throws IOException {
+        writer.beginClass(testType);
+        // private
+        writer.privateField(Types.STRING, "privateField");
+        writer.privateStaticFinal(Types.STRING, "privateStaticFinal", "\"val\"");
+        // protected
+        writer.protectedField(Types.STRING, "protectedField");
+        // field
+        writer.field(Types.STRING, "field");
+        // public
+        writer.publicField(Types.STRING, "publicField");
+        writer.publicStaticFinal(Types.STRING, "publicStaticFinal", "\"val\"");
+        writer.publicFinal(Types.STRING, "publicFinalField");
+        writer.publicFinal(Types.STRING, "publicFinalField2", "\"val\"");
+
+        writer.end();
+
+        match("/testFields", w.toString());
+    }
+
+    @Test
+    public void Methods() throws IOException {
+        writer.beginClass(testType);
+        // private
+
+        // protected
+
+        // method
+
+        // public
+        writer.beginPublicMethod(Types.STRING, "publicMethod",
+                Arrays.asList(new Parameter("a", Types.STRING)), transformer);
+        writer.line("return null;");
+        writer.end();
+
+        writer.beginStaticMethod(Types.STRING, "staticMethod",
+                Arrays.asList(new Parameter("a", Types.STRING)), transformer);
+        writer.line("return null;");
+        writer.end();
+
+        writer.end();
+
+        match("/testMethods", w.toString());
+    }
+
+    @Test
+    public void Constructors() throws IOException {
+        writer.beginClass(testType);
+
+        writer.beginConstructor(
+                Arrays.asList(new Parameter("a", Types.STRING), new Parameter("b", Types.STRING)),
+                transformer);
+        writer.end();
+
+        writer.beginConstructor(new Parameter("a", Types.STRING));
+        writer.end();
+
+        writer.end();
+
+        match("/testConstructors", w.toString());
+
+    }
+
+    @Test
+    public void Inner_Classes() throws IOException {
+        writer.beginClass(testType);
+
+        writer.beginClass(testType2);
+        writer.end();
+
+        writer.beginConstructor(new Parameter("a", Types.STRING));
+        writer.end();
+
+        writer.end();
+
+        match("/testInnerClasses", w.toString());
+    }
+
+    @Test
+    public void Imports() throws IOException {
+        writer.staticimports(Arrays.class);
+
+        match("/testImports", w.toString());
+    }
+
+    @Test
+    public void Imports2() throws IOException {
+        writer.importPackages("java.lang.reflect", "java.util");
+
+        match("/testImports2", w.toString());
+    }
+
+    @Test
+    public void Imports3() throws IOException {
+        writer.importClasses("java.util.Locale");
+
+        assertTrue(w.toString().contains("import java.util.Locale;"));
+    }
+
+    @Test
+    public void SuppressWarnings() throws IOException {
+        writer.suppressWarnings("unused");
+        writer.privateField(Types.STRING, "test");
+
+        match("/testSuppressWarnings", w.toString());
+    }
+
+    @Test
+    public void SuppressWarnings2() throws IOException {
+        writer.suppressWarnings("all", "unused");
+        writer.privateField(Types.STRING, "test");
+
+        match("/testSuppressWarnings2", w.toString());
+    }
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MaxImpl.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MaxImpl.java
new file mode 100644
index 0000000000..fbfcb2fe72
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MaxImpl.java
@@ -0,0 +1,46 @@
+package com.querydsl.codegen.utils;
+
+import java.lang.annotation.Annotation;
+
+import javax.validation.Payload;
+import javax.validation.constraints.*;
+
+/**
+ * @author tiwe
+ * 
+ */
+@SuppressWarnings("all")
+public class MaxImpl implements Max {
+
+    private final long value;
+
+    public MaxImpl(long value) {
+        this.value = value;
+    }
+
+    @Override
+    public Class<?>[] groups() {
+        return new Class<?>[0];
+    }
+
+    @Override
+    public String message() {
+        return "{javax.validation.constraints.Max.message}";
+    }
+
+    @Override
+    public Class<? extends Payload>[] payload() {
+        return new Class[0];
+    }
+
+    @Override
+    public long value() {
+        return value;
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return Max.class;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java
new file mode 100644
index 0000000000..afa63c4a62
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.tools.JavaFileObject.Kind;
+
+import org.junit.Test;
+
+public class MemJavaFileObjectTest {
+
+    @Test
+    public void getCharContent() throws IOException {
+        MemJavaFileObject obj = new MemJavaFileObject("mem", "Test", Kind.SOURCE);
+        Writer writer = obj.openWriter();
+        writer.write("Hello World");
+        writer.flush();
+        writer.close();
+        assertEquals("Hello World", obj.getCharContent(true).toString());
+    }
+
+    @Test
+    public void openInputStream() throws IOException {
+        MemJavaFileObject obj = new MemJavaFileObject("mem", "Test", Kind.SOURCE);
+        obj.openWriter().write("test");
+        obj.openInputStream().close();
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java
new file mode 100644
index 0000000000..f7feb6adad
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class MemSourceFileObjectTest {
+
+    @Test
+    public void Simple() {
+        MemSourceFileObject obj = new MemSourceFileObject("Test", "Hello World");
+        assertEquals("Hello World", obj.getCharContent(true).toString());
+    }
+
+    @Test
+    public void OpenWriter() throws IOException {
+        MemSourceFileObject obj = new MemSourceFileObject("Test");
+        obj.openWriter().write("Hello World");
+        assertEquals("Hello World", obj.getCharContent(true).toString());
+    }
+
+    @Test
+    public void OpenWriter2() throws IOException {
+        MemSourceFileObject obj = new MemSourceFileObject("Test");
+        obj.openWriter().append("Hello World");
+        assertEquals("Hello World", obj.getCharContent(true).toString());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MinImpl.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MinImpl.java
new file mode 100644
index 0000000000..5375790685
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MinImpl.java
@@ -0,0 +1,46 @@
+package com.querydsl.codegen.utils;
+
+import java.lang.annotation.Annotation;
+
+import javax.validation.Payload;
+import javax.validation.constraints.*;
+
+/**
+ * @author tiwe
+ * 
+ */
+@SuppressWarnings("all")
+public class MinImpl implements Min {
+
+    private final long value;
+
+    public MinImpl(long value) {
+        this.value = value;
+    }
+
+    @Override
+    public Class<?>[] groups() {
+        return new Class<?>[0];
+    }
+
+    @Override
+    public String message() {
+        return "{javax.validation.constraints.Min.message}";
+    }
+
+    @Override
+    public Class<? extends Payload>[] payload() {
+        return new Class[0];
+    }
+
+    @Override
+    public long value() {
+        return value;
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return Min.class;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/NotNullImpl.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/NotNullImpl.java
new file mode 100644
index 0000000000..6e3bf29527
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/NotNullImpl.java
@@ -0,0 +1,35 @@
+package com.querydsl.codegen.utils;
+
+import java.lang.annotation.Annotation;
+
+import javax.validation.Payload;
+import javax.validation.constraints.*;
+
+/**
+ * @author tiwe
+ * 
+ */
+@SuppressWarnings("all")
+public class NotNullImpl implements NotNull {
+
+    @Override
+    public Class<?>[] groups() {
+        return new Class<?>[0];
+    }
+
+    @Override
+    public Class<? extends Payload>[] payload() {
+        return new Class[0];
+    }
+
+    @Override
+    public String message() {
+        return "{javax.validation.constraints.NotNull.message}";
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return NotNull.class;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java
new file mode 100644
index 0000000000..f0ccf847d5
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java
@@ -0,0 +1,424 @@
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+import javax.validation.constraints.Max;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ScalaWriterTest {
+
+    private static final Function<Parameter, Parameter> transformer = new Function<Parameter, Parameter>() {
+        @Override
+        public Parameter apply(Parameter input) {
+            return input;
+        }
+    };
+
+    private final Writer w = new StringWriter();
+
+    private final ScalaWriter writer = new ScalaWriter(w, true);
+
+    private Type testType, testType2, testSuperType, testInterface1, testInterface2;
+
+    @Before
+    public void setUp() {
+        testType = new ClassType(JavaWriterTest.class);
+        testType2 = new SimpleType("com.querydsl.codegen.utils.Test", "com.querydsl.codegen.utils", "Test");
+        testSuperType = new SimpleType("com.querydsl.codegen.utils.Superclass", "com.querydsl.codegen.utils",
+                "Superclass");
+        testInterface1 = new SimpleType("com.querydsl.codegen.utils.TestInterface1", "com.querydsl.codegen.utils",
+                "TestInterface1");
+        testInterface2 = new SimpleType("com.querydsl.codegen.utils.TestInterface2", "com.querydsl.codegen.utils",
+                "TestInterface2");
+    }
+
+    @Test
+    public void Object() throws IOException {
+        writer.beginObject("Test");
+        writer.end();
+        assertTrue(w.toString().contains("object Test {"));
+    }
+
+    @Test
+    public void Class_With_Interfaces() throws IOException {
+        writer.beginClass(testType, testType2, testInterface1);
+        assertTrue(w.toString().contains("class JavaWriterTest extends Test with TestInterface1 {"));
+    }
+
+    @Test
+    public void Interface_With_Superinterfaces() throws IOException {
+        writer.beginInterface(testType, testType2, testInterface1);
+        assertTrue(w.toString().contains("trait JavaWriterTest extends Test with TestInterface1 {"));
+    }
+
+    @Test
+    public void CustomHeader() throws IOException {
+        // class QDepartment(path: String) extends
+        // RelationalPathBase[QDepartment](classOf[QDepartment], path){
+        // val id = createNumber("ID", classOf[Integer]);
+        // val company = createNumber("COMPANY", classOf[Integer]);
+        // val idKey = createPrimaryKey(id);
+        // val companyKey: ForeignKey[QCompany] = createForeignKey(company,
+        // "ID");
+        // }
+        writer.beginClass("QDepartment(path: String) extends RelationalPathBase[QDepartment](classOf[QDepartment], path)");
+        writer.publicFinal(Types.OBJECT, "id", "createNumber(\"ID\", classOf[Integer])");
+        writer.publicFinal(Types.OBJECT, "company", "createNumber(\"COMPANY\", classOf[Integer])");
+        writer.publicFinal(Types.OBJECT, "idKey", "createPrimaryKey(id)");
+        writer.publicFinal(Types.OBJECT, "companyKey", "createForeignKey(company,\"ID\")");
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void BeanAccessors() throws IOException {
+        writer.beginClass(new SimpleType("Person"));
+        writer.beginPublicMethod(Types.STRING, "getName");
+        writer.line("\"Daniel Spiewak\"");
+        writer.end();
+        writer.beginPublicMethod(Types.VOID, "setName", new Parameter("name", Types.STRING));
+        writer.line("//");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Arrays() throws IOException {
+        // def main(args: Array[String]) {
+        writer.beginClass(new SimpleType("Main"));
+        writer.field(Types.STRING.asArrayType(), "stringArray");
+        writer.beginPublicMethod(Types.VOID, "main",
+                new Parameter("args", Types.STRING.asArrayType()));
+        writer.line("//");
+        writer.end();
+        writer.beginPublicMethod(Types.VOID, "main2", new Parameter("args", new ClassType(
+                TypeCategory.ARRAY, String[].class)));
+        writer.line("//");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+        assertTrue(w.toString().contains("var stringArray: Array[String]"));
+        assertTrue(w.toString().contains("def main(args: Array[String])"));
+        assertTrue(w.toString().contains("def main2(args: Array[String])"));
+    }
+
+    @Test
+    public void Arrays2() throws IOException {
+        writer.field(Types.BYTE_P.asArrayType(), "byteArray");
+
+        System.out.println(w);
+        assertTrue(w.toString().contains("var byteArray: Array[Byte]"));
+    }
+
+    @Test
+    public void Trait() throws IOException {
+        // trait MyTrait
+        writer.beginInterface(new SimpleType("MyTrait"));
+        writer.line("//");
+        writer.end();
+
+        System.out.println(w);
+        assertTrue(w.toString().contains("trait MyTrait"));
+    }
+
+    @Test
+    public void Field() throws IOException {
+        // private val people: List[Person]
+        writer.imports(List.class);
+        writer.beginClass(new SimpleType("Main"));
+        writer.privateFinal(new SimpleType(Types.LIST, new SimpleType("Person")), "people");
+        writer.end();
+
+        System.out.println(w);
+        assertTrue(w.toString().contains("private val people: List[Person]"));
+    }
+
+    @Test
+    public void Basic() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.beginClass(testType);
+        writer.annotation(Test.class);
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.line("// TODO");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Extends() throws IOException {
+        writer.beginClass(testType2, testSuperType);
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Implements() throws IOException {
+        writer.beginClass(testType2, null, testInterface1, testInterface2);
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Interface() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.beginInterface(testType);
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Interface2() throws IOException {
+        writer.beginInterface(testType2, testInterface1);
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Javadoc() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class, Test.class);
+        writer.javadoc("JavaWriterTest is a test class");
+        writer.beginClass(testType);
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void AnnotationConstant() throws IOException {
+        Max annotation = new MaxImpl(0L) {
+            @Override
+            public Class<?>[] groups() {
+                return new Class<?>[] { Object.class, String.class, int.class };
+            }
+        };
+        writer.annotation(annotation);
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Annotation_With_ArrayMethod() throws IOException {
+        Target annotation = new Target() {
+            @Override
+            public ElementType[] value() {
+                return new ElementType[] { ElementType.FIELD, ElementType.METHOD };
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Target.class;
+            }
+        };
+
+        writer.imports(Target.class.getPackage());
+        writer.annotation(annotation);
+        assertTrue(w.toString().contains("@Target(Array(FIELD, METHOD))"));
+    }
+
+    @Test
+    public void Annotations() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class, StringWriter.class);
+        writer.annotation(Entity.class);
+        writer.beginClass(testType);
+        writer.annotation(Test.class);
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Annotations2() throws IOException {
+        writer.packageDecl("com.querydsl.codegen.utils");
+        writer.imports(IOException.class.getPackage(), StringWriter.class.getPackage());
+        writer.annotation(Entity.class);
+        writer.beginClass(testType);
+        writer.annotation(new Test() {
+            @Override
+            public Class<? extends Throwable> expected() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public long timeout() {
+
+                return 0;
+            }
+
+            @Override
+            public Class<? extends Annotation> annotationType() {
+                return Test.class;
+            }
+        });
+        writer.beginPublicMethod(Types.VOID, "test");
+        writer.end();
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Fields() throws IOException {
+        writer.beginClass(testType);
+        // private
+        writer.privateField(Types.STRING, "privateField");
+        writer.privateStaticFinal(Types.STRING, "privateStaticFinal", "\"val\"");
+        // protected
+        writer.protectedField(Types.STRING, "protectedField");
+        // field
+        writer.field(Types.STRING, "field");
+        // public
+        writer.publicField(Types.STRING, "publicField");
+        writer.publicStaticFinal(Types.STRING, "publicStaticFinal", "\"val\"");
+        writer.publicFinal(Types.STRING, "publicFinalField");
+        writer.publicFinal(Types.STRING, "publicFinalField2", "\"val\"");
+
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Methods() throws IOException {
+        writer.beginClass(testType);
+        // private
+
+        // protected
+
+        // method
+
+        // public
+        writer.beginPublicMethod(Types.STRING, "publicMethod",
+                Arrays.asList(new Parameter("a", Types.STRING)), transformer);
+        writer.line("return null;");
+        writer.end();
+
+        writer.beginStaticMethod(Types.STRING, "staticMethod",
+                Arrays.asList(new Parameter("a", Types.STRING)), transformer);
+        writer.line("return null;");
+        writer.end();
+
+        writer.end();
+
+        System.out.println(w);
+    }
+
+    @Test
+    public void Constructors() throws IOException {
+        writer.beginClass(testType);
+
+        writer.beginConstructor(
+                Arrays.asList(new Parameter("a", Types.STRING), new Parameter("b", Types.STRING)),
+                transformer);
+        writer.end();
+
+        writer.beginConstructor(new Parameter("a", Types.STRING));
+        writer.end();
+
+        writer.end();
+
+        System.out.println(w);
+
+    }
+
+    @Test
+    public void CaseClass() throws IOException {
+        writer.caseClass("TestType", new Parameter("a", Types.STRING), new Parameter("b",
+                Types.STRING));
+
+        System.out.println(w);
+        assertEquals("case class TestType(a: String, b: String)\n", w.toString());
+    }
+
+    @Test
+    public void ClassConstants() {
+        assertEquals("classOf[SomeClass]", writer.getClassConstant("SomeClass"));
+    }
+
+    @Test
+    public void Primitive() throws IOException {
+        writer.beginClass(testType);
+
+        writer.beginConstructor(new Parameter("a", Types.INT));
+        writer.end();
+
+        writer.end();
+
+        System.out.println(w);
+
+        assertTrue(w.toString().contains("def this(a: Int) {"));
+    }
+
+    @Test
+    public void Primitive_Types() throws IOException {
+        writer.field(Types.BOOLEAN_P, "field");
+        writer.field(Types.BYTE_P, "field");
+        writer.field(Types.CHAR, "field");
+        writer.field(Types.INT, "field");
+        writer.field(Types.LONG_P, "field");
+        writer.field(Types.SHORT_P, "field");
+        writer.field(Types.DOUBLE_P, "field");
+        writer.field(Types.FLOAT_P, "field");
+
+        for (String type : Arrays.asList("boolean", "byte", "char", "int", "long", "short",
+                "double", "float")) {
+            assertTrue(w.toString().contains("field: " + StringUtils.capitalize(type)));
+        }
+    }
+
+    @Test
+    public void ReservedWords() throws IOException {
+        writer.beginClass(testType);
+
+        writer.beginConstructor(new Parameter("type", Types.INT));
+        writer.end();
+
+        writer.publicField(testType, "class");
+
+        writer.beginPublicMethod(testType, "var");
+        writer.end();
+
+        writer.end();
+
+        System.out.println(w);
+
+        assertTrue(w.toString().contains("`type`: Int"));
+        assertTrue(w.toString().contains("`class`: JavaWriterTest"));
+        assertTrue(w.toString().contains("`var`(): JavaWriterTest"));
+    }
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java
new file mode 100644
index 0000000000..38ccbe2d02
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class SimpleCompilerTest {
+
+    @After
+    public void tearDown() {
+        new File("src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.class").delete();
+    }
+
+    @Test
+    @Ignore
+    public void Run() throws UnsupportedEncodingException {
+        new File("target/out").mkdir();
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        URLClassLoader classLoader = (URLClassLoader) Thread.currentThread().getContextClassLoader();
+        
+        // create classpath
+        StringBuilder path = new StringBuilder();
+        for (URL url : classLoader.getURLs()) {
+            if (path.length() > 0) {
+                path.append(File.pathSeparator);
+            }
+            String decodedPath = URLDecoder.decode(url.getPath(), "UTF-8");
+            path.append(new File(decodedPath).getAbsolutePath());
+        }
+        System.err.println(path);
+        
+        // compile
+        List<String> options = Arrays.asList(
+          "-classpath", path.toString(),
+          "-s", "target/out",
+          "src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java");
+        int compilationResult = compiler.run(null, null, null,
+                options.toArray(new String[options.size()]));
+        if (compilationResult != 0) {
+            Assert.fail("Compilation Failed");
+        }
+    }
+    
+    @Test
+    public void Run2() {
+        new File("target/out2").mkdir();
+        JavaCompiler compiler = new SimpleCompiler();
+        System.out.println(compiler.getClass().getName());
+        List<String> options = new ArrayList<String>(3);
+        options.add("-s");
+        options.add("target/out2");
+        options.add("src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java");
+        int compilationResult = compiler.run(null, null, null,
+                options.toArray(new String[options.size()]));
+        if (compilationResult != 0) {
+            Assert.fail("Compilation Failed");
+        }
+    }
+
+    @Test
+    public void Surefire() {
+        URLClassLoader cl = (URLClassLoader) Thread.currentThread().getContextClassLoader();
+        assertTrue(SimpleCompiler.isSureFireBooter(cl));
+    }
+    
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java
new file mode 100644
index 0000000000..d5cf4b0b4a
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java
@@ -0,0 +1,25 @@
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.Manifest;
+
+import org.junit.Test;
+
+public class SurefireBooterTest {
+    
+    @Test
+    public void test() throws IOException {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        if (classLoader instanceof URLClassLoader) {
+            URLClassLoader cl = (URLClassLoader) classLoader;
+            if (cl.getURLs().length == 1 && cl.getURLs()[0].getPath().contains("surefirebooter")) {
+                URL url = cl.findResource("META-INF/MANIFEST.MF");
+                Manifest manifest = new Manifest(url.openStream());
+                System.out.println(manifest.getMainAttributes().getValue("Class-Path"));
+            }
+        }
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java
new file mode 100644
index 0000000000..c1e5554154
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Test;
+
+public class ClassTypeTest {
+
+    public class Inner {
+        public class Inner2 {
+            public class Inner3 {
+            }
+        }
+    }
+
+    private final ClassType stringType = new ClassType(TypeCategory.STRING, String.class);
+
+    // @Test
+    // public void asArrayType(){
+    // assertEquals(stringType, stringType.asArrayType().getParameter(0));
+    // }
+
+    @Test
+    public void InnerClass_Name() {
+        assertEquals("com.querydsl.codegen.utils.model.ClassTypeTest.Inner",
+                new ClassType(Inner.class).getFullName());
+        assertEquals("com.querydsl.codegen.utils.model.ClassTypeTest.Inner[]", new ClassType(Inner.class)
+                .asArrayType().getFullName());
+    }
+
+    @Test
+    public void ArrayType() {
+        Type type = new ClassType(TypeCategory.ARRAY, String[].class);
+        assertEquals("java.lang", type.getPackageName());
+    }
+
+    @Test
+    public void ArrayType_Equals_SimpleType() {
+        Type type = new ClassType(TypeCategory.ARRAY, String[].class);
+        Type type2 = new SimpleType("java.lang.String[]", "java.lang", "String[]");
+        assertEquals(type, type2);
+    }
+
+    @Test
+    public void As() {
+        assertEquals(TypeCategory.COMPARABLE, stringType.as(TypeCategory.COMPARABLE).getCategory());
+    }
+
+    @Test
+    public void GetParameters() {
+        ClassType mapType = new ClassType(TypeCategory.MAP, Map.class, stringType, stringType);
+        assertEquals(2, mapType.getParameters().size());
+        assertEquals(stringType, mapType.getParameters().get(0));
+        assertEquals(stringType, mapType.getParameters().get(1));
+        // assertEquals(stringType, mapType.getSelfOrValueType());
+        assertFalse(mapType.isPrimitive());
+    }
+
+    @Test
+    public void GetComponentType() {
+        assertEquals("java.lang.String", new ClassType(String[].class).getComponentType()
+                .getFullName());
+    }
+
+    @Test
+    public void Primitive_Arrays() {
+        ClassType byteArray = new ClassType(byte[].class);
+        assertEquals(
+                "byte[]",
+                byteArray.getRawName(Collections.singleton("java.lang"),
+                        Collections.<String> emptySet()));
+        assertEquals("byte[]", byteArray.getSimpleName());
+        assertEquals("byte[]", byteArray.getFullName());
+    }
+
+    @Test
+    public void Array() {
+        ClassType byteArray = new ClassType(Byte[].class);
+        assertEquals(
+                "Byte[]",
+                byteArray.getRawName(Collections.singleton("java.lang"),
+                        Collections.<String> emptySet()));
+        assertEquals("Byte[]", byteArray.getSimpleName());
+        assertEquals("java.lang.Byte[]", byteArray.getFullName());
+    }
+
+    @Test
+    public void IsPrimitive() {
+        assertTrue(Types.CHAR.isPrimitive());
+        assertTrue(Types.DOUBLE_P.isPrimitive());
+        assertTrue(Types.FLOAT_P.isPrimitive());
+        assertTrue(Types.INT.isPrimitive());
+        assertTrue(Types.LONG_P.isPrimitive());
+        assertTrue(Types.SHORT_P.isPrimitive());
+    }
+
+//    @Test
+//    public void GetPrimitiveName() {
+//        assertEquals("char", Types.CHARACTER.getPrimitiveName());
+//        assertEquals("double", Types.DOUBLE.getPrimitiveName());
+//        assertEquals("float", Types.FLOAT.getPrimitiveName());
+//        assertEquals("int", Types.INTEGER.getPrimitiveName());
+//        assertEquals("long", Types.LONG.getPrimitiveName());
+//        assertEquals("short", Types.SHORT.getPrimitiveName());
+//    }
+
+    @Test
+    public void GetEnclosingType() {
+        Type outer = new ClassType(ClassTypeTest.class);
+        Type inner = new ClassType(ClassTypeTest.Inner.class);
+        Type inner2 = new ClassType(ClassTypeTest.Inner.Inner2.class);
+        Type inner3 = new ClassType(ClassTypeTest.Inner.Inner2.Inner3.class);
+
+        assertEquals(inner2, inner3.getEnclosingType());
+        assertEquals(inner, inner2.getEnclosingType());
+        assertEquals(outer, inner.getEnclosingType());
+        assertNull(outer.getEnclosingType());
+
+        assertEquals("ClassTypeTest.Inner.Inner2.Inner3",
+                inner3.getRawName(Collections.singleton(outer.getPackageName()), Collections.emptySet()));
+        assertEquals("Inner2.Inner3",
+                inner3.getRawName(Collections.emptySet(), Collections.singleton(inner2.getFullName())));
+        assertEquals("Inner3",
+                inner3.getRawName(Collections.emptySet(), Collections.singleton(inner3.getFullName())));
+    }
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java
new file mode 100644
index 0000000000..95c819ae10
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+public class ConstructorTest {
+
+    @Test
+    public void test() {
+        Parameter firstName = new Parameter("firstName", new ClassType(TypeCategory.STRING,
+                String.class));
+        Parameter lastName = new Parameter("lastName", new ClassType(TypeCategory.STRING,
+                String.class));
+        Constructor c1 = new Constructor(Arrays.asList(firstName, lastName));
+        Constructor c2 = new Constructor(Arrays.asList(firstName, lastName));
+        assertEquals(c1, c1);
+        assertEquals(c1, c2);
+        assertEquals(c1.hashCode(), c2.hashCode());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java
new file mode 100644
index 0000000000..265adac9c4
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+public class ParameterTest {
+
+    @Test
+    public void test() {
+        Parameter param1 = new Parameter("test", new ClassType(TypeCategory.STRING, String.class));
+        Parameter param2 = new Parameter("test2", new ClassType(TypeCategory.STRING, String.class));
+        Parameter param3 = new Parameter("test2",
+                new ClassType(TypeCategory.NUMERIC, Integer.class));
+
+        assertFalse(param1.equals(param2));
+        assertFalse(param1.equals(param3));
+        assertFalse(param2.equals(param3));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java
new file mode 100644
index 0000000000..fb9c838ca3
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java
@@ -0,0 +1,97 @@
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+public class SimpleTypeTest {
+
+    public static class Inner {
+        public class Inner2 {
+            public class Inner3 {
+            }
+        }
+    }
+    
+    @Test
+    public void PrimitiveArray() {
+        Type byteArray = new ClassType(byte[].class);
+        Type byteArray2 = new SimpleType(byteArray, byteArray.getParameters());
+        assertEquals(
+                "byte[]",
+                byteArray.getRawName(Collections.singleton("java.lang"),
+                        Collections.<String> emptySet()));
+        assertEquals(
+                "byte[]",
+                byteArray2.getRawName(Collections.singleton("java.lang"),
+                        Collections.<String> emptySet()));
+    }
+
+    @Test
+    public void Array_FullName() {
+        Type type = new SimpleType(new ClassType(String[].class));
+        assertEquals("java.lang.String[]", type.getFullName());
+    }
+
+    @Test
+    public void GetComponentType() {
+        Type type = new SimpleType(new ClassType(String[].class));
+        assertEquals("java.lang.String", type.getComponentType().getFullName());
+    }
+
+    @Test
+    public void GetRawName() {
+        assertEquals("String", new SimpleType(Types.STRING).getRawName(
+                Collections.<String> emptySet(), Collections.singleton(Types.STRING.getFullName())));
+    }
+
+    @Test
+    public void GetJavaClass_For_Array() {
+        System.out.println(Inner.class.getName());
+        assertEquals(byte[].class, new ClassType(byte[].class).getJavaClass());
+        assertEquals(byte[].class, new SimpleType(new ClassType(byte[].class)).getJavaClass());
+    }
+
+    @Test
+    public void GetJavaClass_For_InnerClass() {
+        assertEquals(Inner.class, new ClassType(Inner.class).getJavaClass());
+        assertEquals(Inner.class, new SimpleType(new ClassType(Inner.class)).getJavaClass());
+    }
+    
+//    @Test
+//    public void GetPrimitiveName() {
+//        assertEquals("int", Types.INT.getPrimitiveName());
+//        assertEquals("int", new SimpleType(Types.INT).getPrimitiveName());
+//        
+//        assertEquals("int", Types.INTEGER.getPrimitiveName());
+//        assertEquals("int", new SimpleType(Types.INTEGER).getPrimitiveName());
+//    }
+
+    @Test
+    public void GetEnclosingType() {
+        Type outer = new SimpleType(new ClassType(SimpleTypeTest.class));
+        Type inner = new SimpleType(new ClassType(SimpleTypeTest.Inner.class));
+        Type inner2 = new SimpleType(new ClassType(SimpleTypeTest.Inner.Inner2.class));
+        Type inner3 = new SimpleType(new ClassType(SimpleTypeTest.Inner.Inner2.Inner3.class));
+
+        assertEquals(inner2, inner3.getEnclosingType());
+        assertEquals(inner, inner2.getEnclosingType());
+        assertEquals(outer, inner.getEnclosingType());
+        assertNull(outer.getEnclosingType());
+
+        assertEquals("SimpleTypeTest.Inner.Inner2.Inner3",
+                inner3.getRawName(Collections.singleton(outer.getPackageName()), Collections.emptySet()));
+        assertEquals("Inner2.Inner3",
+                inner3.getRawName(Collections.emptySet(), Collections.singleton(inner2.getFullName())));
+        assertEquals("Inner3",
+                inner3.getRawName(Collections.emptySet(), Collections.singleton(inner3.getFullName())));
+    }
+    @Test
+    public void IsMember() {
+        assertTrue(new SimpleType(new ClassType(SimpleTypeTest.Inner.class)).isMember());
+        assertFalse(new SimpleType(new ClassType(SimpleType.class)).isMember());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java
new file mode 100644
index 0000000000..b0b5b2e992
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TypeAdapterTest {
+
+    @Test
+    public void Delegation() {
+        Type inner = Types.OBJECT;
+        Type type = new TypeAdapter(inner);
+        assertEquals(inner.getCategory(), type.getCategory());
+        assertEquals(inner.getComponentType(), type.getComponentType());
+        assertEquals(inner.getFullName(), type.getFullName());
+        assertEquals(inner.getGenericName(true), type.getGenericName(true));
+        assertEquals(inner.getPackageName(), type.getPackageName());
+        assertEquals(inner.getParameters(), type.getParameters());
+//        assertEquals(inner.getPrimitiveName(), type.getPrimitiveName());
+        assertEquals(inner.getSimpleName(), type.getSimpleName());
+        assertEquals(inner.isFinal(), type.isFinal());
+        assertEquals(inner.isPrimitive(), type.isPrimitive());
+    }
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java
new file mode 100644
index 0000000000..f141dd63a3
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Date;
+import java.sql.Time;
+
+import org.junit.Test;
+
+public class TypeCategoryTest {
+
+    @Test
+    public void IsSubCategoryOf() {
+        assertTrue(TypeCategory.BOOLEAN.isSubCategoryOf(TypeCategory.COMPARABLE));
+        assertTrue(TypeCategory.STRING.isSubCategoryOf(TypeCategory.COMPARABLE));
+        assertTrue(TypeCategory.NUMERIC.isSubCategoryOf(TypeCategory.COMPARABLE));
+        assertTrue(TypeCategory.COMPARABLE.isSubCategoryOf(TypeCategory.SIMPLE));
+        assertFalse(TypeCategory.ENTITY.isSubCategoryOf(TypeCategory.SIMPLE));
+    }
+
+    @Test
+    public void Get() {
+        assertEquals(TypeCategory.BOOLEAN, TypeCategory.get(Boolean.class.getName()));
+        assertEquals(TypeCategory.STRING, TypeCategory.get(String.class.getName()));
+        assertEquals(TypeCategory.DATE, TypeCategory.get(Date.class.getName()));
+        assertEquals(TypeCategory.TIME, TypeCategory.get(Time.class.getName()));
+    }
+
+    @Test
+    public void Java8() {
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.Instant"));
+        assertEquals(TypeCategory.DATE, TypeCategory.get("java.time.LocalDate"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.LocalDateTime"));
+        assertEquals(TypeCategory.TIME, TypeCategory.get("java.time.LocalTime"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.OffsetDateTime"));
+        assertEquals(TypeCategory.TIME, TypeCategory.get("java.time.OffsetTime"));
+        assertEquals(TypeCategory.DATETIME, TypeCategory.get("java.time.ZonedDateTime"));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java
new file mode 100644
index 0000000000..e0b1621b61
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TypeExtendsTest {
+
+    @Test
+    public void GetVarName() {
+        assertEquals("var", new TypeExtends("var", Types.COLLECTION).getVarName());
+    }
+
+    @Test
+    public void GetGenericName() {
+        assertEquals("? extends java.util.Collection<java.lang.Object>", new TypeExtends(
+                Types.COLLECTION).getGenericName(false));
+    }
+
+    @Test
+    public void GetGenericName_As_ArgType() {
+        assertEquals("java.util.Collection<java.lang.Object>",
+                new TypeExtends(Types.COLLECTION).getGenericName(true));
+    }
+
+    @Test
+    public void GetGenericName_With_Object() {
+        assertEquals("?", new TypeExtends(Types.OBJECT).getGenericName(false));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java
new file mode 100644
index 0000000000..95ddee3fcd
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java
@@ -0,0 +1,33 @@
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TypeSuperTest {
+
+    @Test
+    public void GetVarName() {
+        assertEquals("var", new TypeSuper("var", Types.STRING).getVarName());
+    }
+
+    @Test
+    public void GetGenericName() {
+        assertEquals("? super java.lang.String", new TypeSuper(Types.STRING).getGenericName(false));
+    }
+
+    @Test
+    public void GetGenericName_As_ArgType() {
+        assertEquals("java.lang.Object", new TypeSuper(Types.STRING).getGenericName(true));
+    }
+    
+    @Test
+    public void Comparable() {
+        // T extends Comparable<? super T>
+        Type comparable = new ClassType(Comparable.class);
+        Type type = new TypeExtends("T",
+                new SimpleType(comparable, new TypeSuper(new TypeExtends("T", comparable))));
+        assertEquals("? extends java.lang.Comparable<?>", type.getGenericName(false));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java
new file mode 100644
index 0000000000..e3e6ab60b2
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+public class TypeTest {
+
+    private Set<String> packages = Collections.singleton("java.lang");
+
+    private Set<String> classes = Collections.emptySet();
+
+    private ClassType locale = new ClassType(TypeCategory.SIMPLE, Locale.class);
+
+    private Type string = Types.STRING;
+
+    private Type string2 = new SimpleType(string);
+
+    private Type locale2 = new SimpleType(locale);
+
+    private Type stringList = new ClassType(TypeCategory.LIST, List.class, Types.STRING);
+
+    private Type stringList2 = new SimpleType(Types.LIST, Types.STRING);
+
+    private Type stringMap = new ClassType(TypeCategory.MAP, Map.class, Types.STRING, Types.STRING);
+
+    private Type stringMap2 = new SimpleType(Types.MAP, Types.STRING, Types.STRING);
+
+    @Test
+    public void arrayType() {
+        assertEquals("Object[]", Types.OBJECTS.getGenericName(true).toString());
+    }
+
+    @Test
+    public void Equals() {
+        assertEquals(locale, locale2);
+        assertEquals(locale2, locale);
+        assertEquals(stringList, stringList2);
+        assertEquals(stringList2, stringList);
+    }
+
+    @Test
+    public void Hashcode() {
+        assertEquals(locale.hashCode(), locale2.hashCode());
+        assertEquals(stringList.hashCode(), stringList2.hashCode());
+    }
+
+    @Test
+    public void GetGenericNameBoolean() {
+        assertEquals("java.util.Locale", locale.getGenericName(true));
+        assertEquals("java.util.Locale", locale2.getGenericName(true));
+        assertEquals("java.util.List<String>", stringList.getGenericName(true));
+        assertEquals("java.util.List<String>", stringList2.getGenericName(true));
+        assertEquals("java.util.Map<String, String>", stringMap.getGenericName(true));
+        assertEquals("java.util.Map<String, String>", stringMap2.getGenericName(true));
+
+        assertEquals("String", string.getGenericName(true));
+        assertEquals("String", string2.getGenericName(true));
+    }
+
+    @Test
+    public void GetRawName() {
+        assertEquals("java.util.Locale", locale.getRawName(packages, classes));
+        assertEquals("java.util.Locale", locale2.getRawName(packages, classes));
+        assertEquals("java.util.List", stringList.getRawName(packages, classes));
+        assertEquals("java.util.List", stringList2.getRawName(packages, classes));
+
+        assertEquals("String", string.getRawName(packages, classes));
+        assertEquals("String", string2.getRawName(packages, classes));
+    }
+
+    @Test
+    public void GetGenericNameBooleanSetOfStringSetOfString() {
+        assertEquals("java.util.Locale", locale.getGenericName(true, packages, classes));
+        assertEquals("java.util.Locale", locale2.getGenericName(true, packages, classes));
+        assertEquals("java.util.List<String>", stringList.getGenericName(true, packages, classes));
+        assertEquals("java.util.List<String>", stringList2.getGenericName(true, packages, classes));
+    }
+
+    @Test
+    public void GetFullName() {
+        assertEquals("java.util.Locale", locale.getFullName());
+        assertEquals("java.util.Locale", locale2.getFullName());
+        assertEquals("java.util.List", stringList.getFullName());
+        assertEquals("java.util.List", stringList2.getFullName());
+    }
+
+    @Test
+    public void GetPackageName() {
+        assertEquals("java.util", locale.getPackageName());
+        assertEquals("java.util", locale2.getPackageName());
+        assertEquals("java.util", stringList.getPackageName());
+        assertEquals("java.util", stringList2.getPackageName());
+    }
+
+    @Test
+    public void GetParameters() {
+        assertEquals(Collections.emptyList(), locale.getParameters());
+        assertEquals(Collections.emptyList(), locale2.getParameters());
+        assertEquals(Collections.singletonList(Types.STRING), stringList.getParameters());
+        assertEquals(Collections.singletonList(Types.STRING), stringList2.getParameters());
+    }
+
+    @Test
+    public void GetSimpleName() {
+        assertEquals("Locale", locale.getSimpleName());
+        assertEquals("Locale", locale2.getSimpleName());
+        assertEquals("List", stringList.getSimpleName());
+        assertEquals("List", stringList2.getSimpleName());
+    }
+
+    @Test
+    public void GetJavaClass() {
+        assertEquals(Locale.class, locale.getJavaClass());
+    }
+
+    @Test
+    public void IsFinal() {
+        assertTrue(locale.isFinal());
+        assertTrue(locale2.isFinal());
+        assertFalse(stringList.isFinal());
+
+        assertTrue(Types.STRING.isFinal());
+        assertTrue(Types.LONG.isFinal());
+    }
+
+    @Test
+    public void IsPrimitive() {
+        assertFalse(locale.isPrimitive());
+        assertFalse(locale2.isPrimitive());
+        assertFalse(stringList.isPrimitive());
+        assertFalse(stringList2.isPrimitive());
+    }
+
+    @Test
+    public void GetCategory() {
+        assertEquals(TypeCategory.SIMPLE, locale.getCategory());
+        assertEquals(TypeCategory.SIMPLE, locale2.getCategory());
+        assertEquals(TypeCategory.LIST, stringList.getCategory());
+        assertEquals(TypeCategory.LIST, stringList2.getCategory());
+    }
+
+    @Test
+    public void As() {
+        assertEquals(TypeCategory.SIMPLE, stringList.as(TypeCategory.SIMPLE).getCategory());
+        assertEquals(TypeCategory.SIMPLE, stringList2.as(TypeCategory.SIMPLE).getCategory());
+    }
+
+//    @Test
+//    public void GetPrimitiveName() {
+//        assertNull(locale.getPrimitiveName());
+//        assertNull(locale2.getPrimitiveName());
+//        assertNull(stringList.getPrimitiveName());
+//        assertNull(stringList2.getPrimitiveName());
+//    }
+
+    @Test
+    public void ToString() {
+        assertEquals("java.util.Locale", locale.toString());
+        assertEquals("java.util.Locale", locale2.toString());
+        assertEquals("java.util.List<String>", stringList.toString());
+        assertEquals("java.util.List<String>", stringList2.toString());
+    }
+
+    @Test
+    public void AsArrayType() {
+        assertEquals("java.util.Locale[]", locale.asArrayType().getFullName());
+        assertEquals(TypeCategory.ARRAY, locale.asArrayType().getCategory());
+        assertEquals("java.util.Locale[]", locale2.asArrayType().getFullName());
+        assertEquals(TypeCategory.ARRAY, locale2.asArrayType().getCategory());
+        assertEquals("java.util.List[]", stringList.asArrayType().getFullName());
+        assertEquals("java.util.List[]", stringList2.asArrayType().getFullName());
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/Cat.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/Cat.java
new file mode 100644
index 0000000000..853acc0aec
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/Cat.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2011, Mysema Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.utils.support;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class Cat {
+
+    private int breed;
+
+    private java.sql.Date dateField;
+
+    public enum Color {
+        BLUE, GREEN, BROWN
+    }
+    private Color eyecolor;
+
+    private List<Cat> kittens;
+
+    private Cat[] kittenArray;
+
+    private Map<String, Cat> kittensByName;
+
+    private Cat mate;
+
+    private String stringAsSimple;
+
+    private java.sql.Time timeField;
+    
+    private String name;
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    private Date birthdate;
+    private int id;
+
+    public Cat() {
+        this.kittensByName = Collections.emptyMap();
+    }
+
+    public Cat(String name) {
+        Cat kitten = new Cat();
+        this.kittens = Arrays.asList(kitten);
+        this.kittenArray = new Cat[]{kitten};
+        this.kittensByName = Collections.singletonMap("Kitty", kitten);
+        this.name = name;
+    }
+    
+    public Cat(String name, String kittenName) {
+        this(name);
+        kittens.get(0).setName(kittenName);
+    }
+
+    public Cat(String name, int id) {
+        this(name);
+        this.id = id;
+    }
+
+    public Cat(String name, int id, Date birthdate) {
+        this(name, id);
+        this.birthdate = new Date(birthdate.getTime());
+        this.dateField = new java.sql.Date(birthdate.getTime());
+        this.timeField = new java.sql.Time(birthdate.getTime());
+    }
+
+    public int getBreed() {
+        return breed;
+    }
+
+    public java.sql.Date getDateField() {
+        return dateField;
+    }
+
+    public Color getEyecolor() {
+        return eyecolor;
+    }
+
+    public List<Cat> getKittens() {
+        return kittens;
+    }
+
+    public Map<String, Cat> getKittensByName() {
+        return kittensByName;
+    }
+
+    public Cat getMate() {
+        return mate;
+    }
+
+    public String getStringAsSimple() {
+        return stringAsSimple;
+    }
+
+    public java.sql.Time getTimeField() {
+        return timeField;
+    }
+
+    public void setBreed(int breed) {
+        this.breed = breed;
+    }
+
+    public void setDateField(java.sql.Date dateField) {
+        this.dateField = new java.sql.Date(dateField.getTime());
+    }
+
+    public void setEyecolor(Color eyecolor) {
+        this.eyecolor = eyecolor;
+    }
+
+    public void setKittens(List<Cat> kittens) {
+        this.kittens = kittens;
+    }
+
+    public void setKittensByName(Map<String, Cat> kittensByName) {
+        this.kittensByName = kittensByName;
+    }
+
+    public void setMate(Cat mate) {
+        this.mate = mate;
+    }
+
+    public void setStringAsSimple(String stringAsSimple) {
+        this.stringAsSimple = stringAsSimple;
+    }
+
+    public void setTimeField(java.sql.Time timeField) {
+        this.timeField = timeField;
+    }
+
+    public Cat[] getKittenArray() {
+        return kittenArray;
+    }
+
+    public void setKittenArray(Cat[] kittenArray) {
+        this.kittenArray = kittenArray.clone();
+    }
+
+    public String toString() {
+        return name;
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java
new file mode 100644
index 0000000000..c9a847ec12
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.codegen.utils.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.*;
+
+import org.junit.Test;
+public class ClassUtilsTest {
+
+    @Test
+    public void GetName() {
+        assertEquals("int", ClassUtils.getName(int.class));
+        assertEquals("int", ClassUtils.getName(int.class, Collections.<String> emptySet(),
+                        Collections.<String> emptySet()));
+        assertEquals("Object", ClassUtils.getName(Object.class));
+        assertEquals("Object[]", ClassUtils.getName(Object[].class));
+        assertEquals("int", ClassUtils.getName(int.class));
+        assertEquals("int[]", ClassUtils.getName(int[].class));
+        assertEquals("void", ClassUtils.getName(void.class));
+        assertEquals("java.util.Locale", ClassUtils.getName(Locale.class));
+        assertEquals("java.util.Locale[]", ClassUtils.getName(Locale[].class));
+    }
+    
+    @Test
+    public void GetName_Packge() {
+        assertEquals("Locale", ClassUtils.getName(Locale.class,
+                Collections.singleton("java.util"), Collections.<String>emptySet()));
+        assertEquals("java.util.Locale", ClassUtils.getName(Locale.class,
+                Collections.singleton("java.util.gen"), Collections.<String>emptySet()));
+    }
+
+    @Test
+    public void Normalize() {
+        assertEquals(List.class, ClassUtils.normalize(ArrayList.class));
+        assertEquals(Set.class, ClassUtils.normalize(HashSet.class));
+        assertEquals(Map.class, ClassUtils.normalize(HashMap.class));
+//        assertEquals(Collection.class, ClassUtils.normalize(Bag.class));
+    }
+
+}
diff --git a/querydsl-codegen-utils/src/test/resources/testAnnotations b/querydsl-codegen-utils/src/test/resources/testAnnotations
new file mode 100644
index 0000000000..40e5682067
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testAnnotations
@@ -0,0 +1,13 @@
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+@Entity
+public class JavaWriterTest {
+
+    @org.junit.Test
+    public void test() {
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testAnnotations2 b/querydsl-codegen-utils/src/test/resources/testAnnotations2
new file mode 100644
index 0000000000..2082dd3fe9
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testAnnotations2
@@ -0,0 +1,13 @@
+package com.querydsl.codegen.utils;
+
+import java.io.*;
+import java.io.*;
+
+@Entity
+public class JavaWriterTest {
+
+    @org.junit.Test
+    public void test() {
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testBasic b/querydsl-codegen-utils/src/test/resources/testBasic
new file mode 100644
index 0000000000..9f9656a21f
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testBasic
@@ -0,0 +1,14 @@
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import org.junit.Test;
+
+public class JavaWriterTest {
+
+    @Test
+    public void test() {
+        // TODO
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testConstructors b/querydsl-codegen-utils/src/test/resources/testConstructors
new file mode 100644
index 0000000000..ded6f3dfe3
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testConstructors
@@ -0,0 +1,9 @@
+public class JavaWriterTest {
+
+    public JavaWriterTest(String a, String b) {
+    }
+
+    public JavaWriterTest(String a) {
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testExtends b/querydsl-codegen-utils/src/test/resources/testExtends
new file mode 100644
index 0000000000..d2a98860a4
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testExtends
@@ -0,0 +1,3 @@
+public class Test extends Superclass {
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testFields b/querydsl-codegen-utils/src/test/resources/testFields
new file mode 100644
index 0000000000..ef17ae75e3
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testFields
@@ -0,0 +1,19 @@
+public class JavaWriterTest {
+
+    private String privateField;
+
+    private static final String privateStaticFinal = "val";
+
+    protected String protectedField;
+
+    String field;
+
+    public String publicField;
+
+    public static final String publicStaticFinal = "val";
+
+    public final String publicFinalField;
+
+    public final String publicFinalField2 = "val";
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testImplements b/querydsl-codegen-utils/src/test/resources/testImplements
new file mode 100644
index 0000000000..f85cf9519d
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testImplements
@@ -0,0 +1,3 @@
+public class Test implements TestInterface1, TestInterface2 {
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testImports b/querydsl-codegen-utils/src/test/resources/testImports
new file mode 100644
index 0000000000..788beac7e4
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testImports
@@ -0,0 +1 @@
+import static java.util.Arrays.*;
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testImports2 b/querydsl-codegen-utils/src/test/resources/testImports2
new file mode 100644
index 0000000000..9779566dd2
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testImports2
@@ -0,0 +1,2 @@
+import java.lang.reflect.*;
+import java.util.*;
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testInnerClasses b/querydsl-codegen-utils/src/test/resources/testInnerClasses
new file mode 100644
index 0000000000..0a0651554d
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testInnerClasses
@@ -0,0 +1,10 @@
+public class JavaWriterTest {
+
+    public class Test {
+
+    }
+
+    public JavaWriterTest(String a) {
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testInterface b/querydsl-codegen-utils/src/test/resources/testInterface
new file mode 100644
index 0000000000..ecb168c5aa
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testInterface
@@ -0,0 +1,9 @@
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import org.junit.Test;
+
+public interface JavaWriterTest {
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testInterface2 b/querydsl-codegen-utils/src/test/resources/testInterface2
new file mode 100644
index 0000000000..72e4517ad4
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testInterface2
@@ -0,0 +1,3 @@
+public interface Test extends TestInterface1 {
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testJavadoc b/querydsl-codegen-utils/src/test/resources/testJavadoc
new file mode 100644
index 0000000000..684cdaa51d
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testJavadoc
@@ -0,0 +1,12 @@
+package com.querydsl.codegen.utils;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import org.junit.Test;
+
+/**
+ * JavaWriterTest is a test class
+ */
+public class JavaWriterTest {
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testMethods b/querydsl-codegen-utils/src/test/resources/testMethods
new file mode 100644
index 0000000000..7f13cb4d76
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testMethods
@@ -0,0 +1,11 @@
+public class JavaWriterTest {
+
+    public String publicMethod(String a) {
+        return null;
+    }
+
+    public static String staticMethod(String a) {
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testSuppressWarnings b/querydsl-codegen-utils/src/test/resources/testSuppressWarnings
new file mode 100644
index 0000000000..f8902e4aa7
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testSuppressWarnings
@@ -0,0 +1,2 @@
+@SuppressWarnings("unused")
+private String test;
\ No newline at end of file
diff --git a/querydsl-codegen-utils/src/test/resources/testSuppressWarnings2 b/querydsl-codegen-utils/src/test/resources/testSuppressWarnings2
new file mode 100644
index 0000000000..cd9e88ce05
--- /dev/null
+++ b/querydsl-codegen-utils/src/test/resources/testSuppressWarnings2
@@ -0,0 +1,2 @@
+@SuppressWarnings({"all", "unused"})
+private String test;
diff --git a/querydsl-codegen/pom.xml b/querydsl-codegen/pom.xml
index de1745e403..e334caf605 100644
--- a/querydsl-codegen/pom.xml
+++ b/querydsl-codegen/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-codegen</artifactId>
   <name>Querydsl - Codegen module</name>
   <description>codegen module for querydsl</description>
@@ -24,25 +24,34 @@
   
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
-    </dependency>  
+    </dependency>
     <dependency>
-      <groupId>com.mysema.codegen</groupId>
-      <artifactId>codegen</artifactId>
-      <version>${codegen.version}</version>
-    </dependency>    
-    
-    <dependency>  
-      <groupId>javax.inject</groupId>  
-      <artifactId>javax.inject</artifactId>  
-      <version>1</version>  
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>codegen-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>compile</scope>
     </dependency>
     
     <!-- test -->    
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -54,8 +63,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>    
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -68,6 +77,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.codegen</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -83,4 +99,20 @@
     </plugins>
   </build>
 
-</project>
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/BeanSerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/BeanSerializer.java
deleted file mode 100644
index b5baff4e45..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/BeanSerializer.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import javax.annotation.Generated;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.*;
-import com.mysema.util.BeanUtils;
-
-/**
- * BeanSerializer is a {@link Serializer} implementation which serializes {@link EntityType}
- * instances into JavaBean classes
- *
- * @author tiwe
- *
- */
-public class BeanSerializer implements Serializer{
-
-    private static final Function<Property, Parameter> propertyToParameter = new Function<Property, Parameter>() {
-        @Override
-        public Parameter apply(Property input) {
-            return new Parameter(input.getName(), input.getType());
-        }
-    };
-
-    private final boolean propertyAnnotations;
-
-    private final List<Type> interfaces = Lists.newArrayList();
-
-    private final String javadocSuffix;
-
-    private boolean addToString, addFullConstructor;
-
-    private boolean printSupertype = false;
-
-    /**
-     * Create a new BeanSerializer
-     */
-    public BeanSerializer() {
-        this(true, " is a Querydsl bean type");
-    }
-
-    /**
-     * Create a new BeanSerializer with the given javadoc suffix
-     *
-     * @param javadocSuffix
-     */
-    public BeanSerializer(String javadocSuffix) {
-        this(true, javadocSuffix);
-    }
-
-    /**
-     * Create a new BeanSerializer
-     *
-     * @param propertyAnnotations
-     */
-    public BeanSerializer(boolean propertyAnnotations) {
-        this(propertyAnnotations, " is a Querydsl bean type");
-    }
-
-    /**
-     * Create a new BeanSerializer
-     *
-     * @param propertyAnnotations
-     * @param javadocSuffix
-     */
-    public BeanSerializer(boolean propertyAnnotations, String javadocSuffix) {
-        this.propertyAnnotations = propertyAnnotations;
-        this.javadocSuffix = javadocSuffix;
-    }
-
-    @Override
-    public void serialize(EntityType model, SerializerConfig serializerConfig,
-            CodeWriter writer) throws IOException {
-        String simpleName = model.getSimpleName();
-
-        // package
-        if (!model.getPackageName().isEmpty()) {
-            writer.packageDecl(model.getPackageName());
-        }
-
-        // imports
-        Set<String> importedClasses = getAnnotationTypes(model);
-        for (Type iface : interfaces) {
-            importedClasses.add(iface.getFullName());
-        }
-        importedClasses.add(Generated.class.getName());
-        if (model.hasLists()) {
-            importedClasses.add(List.class.getName());
-        }
-        if (model.hasCollections()) {
-            importedClasses.add(Collection.class.getName());
-        }
-        if (model.hasSets()) {
-            importedClasses.add(Set.class.getName());
-        }
-        if (model.hasMaps()) {
-            importedClasses.add(Map.class.getName());
-        }
-        if (addToString && model.hasArrays()) {
-            importedClasses.add(Arrays.class.getName());
-        }
-        writer.importClasses(importedClasses.toArray(new String[importedClasses.size()]));
-
-        // javadoc
-        writer.javadoc(simpleName + javadocSuffix);
-
-        // header
-        for (Annotation annotation : model.getAnnotations()) {
-            writer.annotation(annotation);
-        }
-
-        writer.line("@Generated(\"", getClass().getName(), "\")");
-
-        if (!interfaces.isEmpty()) {
-            Type superType = null;
-            if (printSupertype && model.getSuperType() != null) {
-                superType = model.getSuperType().getType();
-            }
-            Type[] ifaces = interfaces.toArray(new Type[interfaces.size()]);
-            writer.beginClass(model, superType, ifaces);
-        } else if (printSupertype && model.getSuperType() != null) {
-            writer.beginClass(model, model.getSuperType().getType());
-        } else {
-            writer.beginClass(model);
-        }
-
-
-        bodyStart(model, writer);
-
-        if (addFullConstructor) {
-            addFullConstructor(model, writer);
-        }
-
-        // fields
-        for (Property property : model.getProperties()) {
-            if (propertyAnnotations) {
-                for (Annotation annotation : property.getAnnotations()) {
-                    writer.annotation(annotation);
-                }
-            }
-            writer.privateField(property.getType(), property.getEscapedName());
-        }
-
-        // accessors
-        for (Property property : model.getProperties()) {
-            String propertyName = property.getEscapedName();
-            // getter
-            writer.beginPublicMethod(property.getType(), "get"+BeanUtils.capitalize(propertyName));
-            writer.line("return ", propertyName, ";");
-            writer.end();
-            // setter
-            Parameter parameter = new Parameter(propertyName, property.getType());
-            writer.beginPublicMethod(Types.VOID, "set"+BeanUtils.capitalize(propertyName), parameter);
-            writer.line("this.", propertyName, " = ", propertyName, ";");
-            writer.end();
-        }
-
-        if (addToString) {
-            addToString(model, writer);
-        }
-
-        bodyEnd(model, writer);
-
-        writer.end();
-    }
-
-    protected void addFullConstructor(EntityType model, CodeWriter writer) throws IOException {
-        // public empty constructor
-        writer.beginConstructor();
-        writer.end();
-
-        // full constructor
-        writer.beginConstructor(model.getProperties(), propertyToParameter);
-        for (Property property : model.getProperties()) {
-            writer.line("this.", property.getEscapedName(), " = ", property.getEscapedName(), ";");
-        }
-        writer.end();
-    }
-
-    protected void addToString(EntityType model, CodeWriter writer) throws IOException {
-        writer.beginPublicMethod(Types.STRING, "toString");
-        StringBuilder builder = new StringBuilder();
-        for (Property property : model.getProperties()) {
-            String propertyName = property.getEscapedName();
-            if (builder.length() > 0) {
-                builder.append(" + \", ");
-            } else {
-                builder.append("\"");
-            }
-            builder.append(propertyName + " = \" + ");
-            if (property.getType().getCategory() == TypeCategory.ARRAY) {
-                builder.append("Arrays.toString(" + propertyName + ")");
-            } else {
-                builder.append(propertyName);
-            }
-        }
-        writer.line(" return ", builder.toString(), ";");
-        writer.end();
-    }
-
-    protected void bodyStart(EntityType model, CodeWriter writer) throws IOException {
-        // template method
-    }
-
-    protected void bodyEnd(EntityType model, CodeWriter writer) throws IOException {
-        // template method
-    }
-
-    private Set<String> getAnnotationTypes(EntityType model) {
-        Set<String> imports = new HashSet<String>();
-        for (Annotation annotation : model.getAnnotations()) {
-            imports.add(annotation.annotationType().getName());
-        }
-        if (propertyAnnotations) {
-            for (Property property : model.getProperties()) {
-                for (Annotation annotation : property.getAnnotations()) {
-                    imports.add(annotation.annotationType().getName());
-                }
-            }
-        }
-        return imports;
-    }
-
-    public void addInterface(Class<?> iface) {
-        interfaces.add(new ClassType(iface));
-    }
-
-    public void addInterface(Type type) {
-        interfaces.add(type);
-    }
-
-    public void setAddToString(boolean addToString) {
-        this.addToString = addToString;
-    }
-
-    public void setAddFullConstructor(boolean addFullConstructor) {
-        this.addFullConstructor = addFullConstructor;
-    }
-
-    public void setPrintSupertype(boolean printSupertype) {
-        this.printSupertype = printSupertype;
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodeGenerationException.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodeGenerationException.java
deleted file mode 100644
index a4c68a525a..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodeGenerationException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-/**
- * @author tiwe
- *
- */
-public class CodeGenerationException extends RuntimeException{
-
-    private static final long serialVersionUID = -7692082275150033814L;
-
-    CodeGenerationException(String msg) {
-        super(msg);
-    }
-
-    CodeGenerationException(String msg, Throwable t) {
-        super(msg, t);
-    }
-
-    CodeGenerationException(Throwable t) {
-        super(t);
-    }
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodegenModule.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodegenModule.java
deleted file mode 100644
index 16555a1c3e..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/CodegenModule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.util.Collections;
-
-/**
- * CodegenModule provides a module general serialization
- *
- * @author tiwe
- *
- */
-public class CodegenModule  extends AbstractModule {
-
-    public static final String PREFIX = "prefix";
-
-    public static final String SUFFIX = "suffix";
-
-    public static final String KEYWORDS = "keywords";
-
-    public static final String PACKAGE_SUFFIX = "packageSuffix";
-
-    public static final String IMPORTS = "imports";
-
-    @Override
-    protected void configure() {
-        bind(TypeMappings.class, JavaTypeMappings.class);
-        bind(QueryTypeFactory.class, QueryTypeFactoryImpl.class);
-        bind(EntitySerializer.class);
-        bind(EmbeddableSerializer.class);
-        bind(ProjectionSerializer.class);
-        bind(SupertypeSerializer.class);
-
-        // configuration for QueryTypeFactory
-        bind(PREFIX, "Q");
-        bind(SUFFIX, "");
-        bind(PACKAGE_SUFFIX, "");
-        bind(KEYWORDS, Collections.<String>emptySet());
-        bind(IMPORTS, Collections.<String>emptySet());
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
deleted file mode 100644
index daf2361549..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EmbeddableSerializer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static com.mysema.codegen.Symbols.UNCHECKED;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.Types;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-/**
- * EmbeddableSerializer is a {@link Serializer} implementation for embeddable types
- *
- * @author tiwe
- *
- */
-public final class EmbeddableSerializer extends EntitySerializer {
-
-    /**
-     * Create a new EmbeddableSerializer instance
-     *
-     * @param typeMappings
-     * @param keywords
-     */
-    @Inject
-    public EmbeddableSerializer(TypeMappings typeMappings, @Named("keywords") Collection<String> keywords) {
-        super(typeMappings, keywords);
-    }
-
-    @Override
-    @SuppressWarnings(UNCHECKED)
-    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, true);
-
-        TypeCategory category = model.getOriginalCategory();
-        Class<? extends Path> pathType;
-        if (model.getProperties().isEmpty() ) {
-            switch(category) {
-                case COMPARABLE : pathType = ComparablePath.class; break;
-                case ENUM: pathType = EnumPath.class; break;
-                case DATE: pathType = DatePath.class; break;
-                case DATETIME: pathType = DateTimePath.class; break;
-                case TIME: pathType = TimePath.class; break;
-                case NUMERIC: pathType = NumberPath.class; break;
-                case STRING: pathType = StringPath.class; break;
-                case BOOLEAN: pathType = BooleanPath.class; break;
-                default : pathType = BeanPath.class;
-            }
-        } else {
-            pathType = BeanPath.class;
-        }
-
-        for (Annotation annotation : model.getAnnotations()) {
-            writer.annotation(annotation);
-        }
-
-        writer.line("@Generated(\"", getClass().getName(), "\")");
-
-        if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) {
-            writer.beginClass(queryType, new ClassType(pathType));
-        } else {
-            writer.beginClass(queryType, new ClassType(category, pathType, model));
-        }
-
-        // TODO : generate proper serialVersionUID here
-        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", model.hashCode() + "L");
-    }
-
-    @Override
-    protected void introFactoryMethods(CodeWriter writer, EntityType model) throws IOException {
-        // no factory methods
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
deleted file mode 100644
index d4ed16c3eb..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
+++ /dev/null
@@ -1,826 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-import static com.mysema.codegen.Symbols.*;
-
-/**
- * EntitySerializer is a {@link Serializer} implementation for entity types
- *
- * @author tiwe
- *
- */
-public class EntitySerializer implements Serializer {
-
-    private static final Joiner JOINER = Joiner.on("\", \"");
-
-    private static final Parameter PATH_METADATA = new Parameter("metadata", new ClassType(PathMetadata.class, (Type)null));
-
-    private static final Parameter PATH_INITS = new Parameter("inits", new ClassType(PathInits.class));
-
-    private static final ClassType PATH_INITS_TYPE = new ClassType(PathInits.class);
-
-    protected final TypeMappings typeMappings;
-
-    protected final Collection<String> keywords;
-
-    /**
-     * Create a new EntitySerializer instance
-     *
-     * @param mappings
-     * @param keywords
-     */
-    @Inject
-    public EntitySerializer(TypeMappings mappings, @Named("keywords") Collection<String> keywords) {
-        this.typeMappings = mappings;
-        this.keywords = keywords;
-    }
-
-    protected void constructors(EntityType model, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        String localName = writer.getRawName(model);
-        String genericName = writer.getGenericName(true, model);
-
-        boolean hasEntityFields = model.hasEntityFields();
-        boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING
-                || model.getOriginalCategory() == TypeCategory.BOOLEAN;
-        String thisOrSuper = hasEntityFields ? THIS : SUPER;
-        String additionalParams = getAdditionalConstructorParameter(model);
-        String classCast = localName.equals(genericName) ? EMPTY : "(Class)";
-
-        // String
-        constructorsForVariables(writer, model);
-
-        // Path
-        if (!localName.equals(genericName)) {
-            writer.suppressWarnings("all");
-        }
-        Type simpleModel = new SimpleType(model);
-        if (model.isFinal()) {
-            Type type = new ClassType(Path.class, simpleModel);
-            writer.beginConstructor(new Parameter("path", type));
-        } else {
-            Type type = new ClassType(Path.class, new TypeExtends(simpleModel));
-            writer.beginConstructor(new Parameter("path", type));
-        }
-        if (!hasEntityFields) {
-            if (stringOrBoolean) {
-                writer.line("super(path.getMetadata());");
-            } else {
-                writer.line("super(", classCast, "path.getType(), path.getMetadata()" +additionalParams+");");
-            }
-            constructorContent(writer, model);
-        } else {
-            writer.line("this(", classCast, "path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);");
-        }
-        writer.end();
-
-        // PathMetadata
-        if (hasEntityFields) {
-            writer.beginConstructor(PATH_METADATA);
-            writer.line("this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);");
-            writer.end();
-        } else {
-            if (!localName.equals(genericName)) {
-                writer.suppressWarnings("all");
-            }
-            writer.beginConstructor(PATH_METADATA);
-            if (stringOrBoolean) {
-                writer.line("super(metadata);");
-            } else {
-                writer.line("super(", classCast, writer.getClassConstant(localName) + COMMA + "metadata" + additionalParams + ");");
-            }
-            constructorContent(writer, model);
-            writer.end();
-        }
-
-        // PathMetadata, PathInits
-        if (hasEntityFields) {
-            if (!localName.equals(genericName)) {
-                writer.suppressWarnings("all");
-            }
-            writer.beginConstructor(PATH_METADATA, PATH_INITS);
-            writer.line(thisOrSuper, "(", classCast, writer.getClassConstant(localName) + COMMA + "metadata, inits" + additionalParams+ ");");
-            if (!hasEntityFields) {
-                constructorContent(writer, model);
-            }
-            writer.end();
-        }
-
-        // Class, PathMetadata, PathInits
-        if (hasEntityFields) {
-            Type type = new ClassType(Class.class, new TypeExtends(model));
-            writer.beginConstructor(new Parameter("type", type), PATH_METADATA, PATH_INITS);
-            writer.line("super(type, metadata, inits"+additionalParams+");");
-            initEntityFields(writer, config, model);
-            constructorContent(writer, model);
-            writer.end();
-        }
-
-    }
-
-    protected void constructorContent(CodeWriter writer, EntityType model) throws IOException {
-        // override in subclasses
-    }
-
-    protected String getAdditionalConstructorParameter(EntityType model) {
-        return "";
-    }
-
-    protected void constructorsForVariables(CodeWriter writer, EntityType model) throws IOException {
-        String localName = writer.getRawName(model);
-        String genericName = writer.getGenericName(true, model);
-
-        boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING
-                || model.getOriginalCategory() == TypeCategory.BOOLEAN;
-        boolean hasEntityFields = model.hasEntityFields();
-        String thisOrSuper = hasEntityFields ? THIS : SUPER;
-        String additionalParams = hasEntityFields ? "" : getAdditionalConstructorParameter(model);
-
-        if (!localName.equals(genericName)) {
-            writer.suppressWarnings("all");
-        }
-        writer.beginConstructor(new Parameter("variable", Types.STRING));
-        if (stringOrBoolean) {
-            writer.line(thisOrSuper,"(forVariable(variable)",additionalParams,");");
-        } else {
-            writer.line(thisOrSuper,"(", localName.equals(genericName) ? EMPTY : "(Class)",
-            writer.getClassConstant(localName) + COMMA + "forVariable(variable)", hasEntityFields ? ", INITS" : EMPTY,
-                            additionalParams,");");
-        }
-        if (!hasEntityFields) {
-            constructorContent(writer, model);
-        }
-        writer.end();
-    }
-
-    protected void entityAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
-        Type queryType = typeMappings.getPathType(field.getType(), model, false);
-        writer.beginPublicMethod(queryType, field.getEscapedName());
-        writer.line("if (", field.getEscapedName(), " == null) {");
-        writer.line("    ", field.getEscapedName(), " = new ", writer.getRawName(queryType),
-                "(forProperty(\"", field.getName(), "\"));");
-        writer.line("}");
-        writer.line(RETURN, field.getEscapedName(), SEMICOLON);
-        writer.end();
-    }
-
-    protected void entityField(EntityType model, Property field, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        Type queryType = typeMappings.getPathType(field.getType(), model, false);
-        if (field.isInherited()) {
-            writer.line("// inherited");
-        }
-        if (config.useEntityAccessors()) {
-            writer.protectedField(queryType, field.getEscapedName());
-        } else {
-            writer.publicFinal(queryType, field.getEscapedName());
-        }
-    }
-
-    protected boolean hasOwnEntityProperties(EntityType model) {
-        if (model.hasEntityFields()) {
-            for (Property property : model.getProperties()) {
-                if (!property.isInherited() && property.getType().getCategory() == TypeCategory.ENTITY) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    protected void initEntityFields(CodeWriter writer, SerializerConfig config,
-            EntityType model) throws IOException {
-        Supertype superType = model.getSuperType();
-        if (superType != null && superType.getEntityType() == null) {
-            throw new IllegalStateException("No entity type for " + superType.getType().getFullName());
-        }
-        if (superType != null && superType.getEntityType().hasEntityFields()) {
-            Type superQueryType = typeMappings.getPathType(superType.getEntityType(), model, false);
-            writer.line("this._super = new " + writer.getRawName(superQueryType) + "(type, metadata, inits);");
-        }
-
-        for (Property field : model.getProperties()) {
-            if (field.getType().getCategory() == TypeCategory.ENTITY) {
-                initEntityField(writer, config, model, field);
-
-            } else if (field.isInherited() && superType != null && superType.getEntityType().hasEntityFields()) {
-                writer.line("this.", field.getEscapedName(), " = _super.", field.getEscapedName(), SEMICOLON);
-            }
-        }
-    }
-
-    protected void initEntityField(CodeWriter writer, SerializerConfig config, EntityType model,
-            Property field) throws IOException {
-        Type queryType = typeMappings.getPathType(field.getType(), model, false);
-        if (!field.isInherited()) {
-            boolean hasEntityFields = field.getType() instanceof EntityType
-                    && ((EntityType)field.getType()).hasEntityFields();
-            writer.line("this." + field.getEscapedName() + ASSIGN,
-                "inits.isInitialized(\""+field.getName()+"\") ? ",
-                NEW + writer.getRawName(queryType) + "(forProperty(\"" + field.getName() + "\")",
-                hasEntityFields ? (", inits.get(\""+field.getName()+"\")") : EMPTY,
-                ") : null;");
-        } else if (!config.useEntityAccessors()) {
-            writer.line("this.", field.getEscapedName(), ASSIGN, "_super.", field.getEscapedName(), SEMICOLON);
-        }
-    }
-
-    protected void intro(EntityType model, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        introPackage(writer, model);
-        introImports(writer, config, model);
-
-        writer.nl();
-
-        introJavadoc(writer, model);
-        introClassHeader(writer, model);
-
-        introFactoryMethods(writer, model);
-        introInits(writer, model);
-        if (config.createDefaultVariable()) {
-            introDefaultInstance(writer, model, config.defaultVariableName());
-        }
-        if (model.getSuperType() != null && model.getSuperType().getEntityType() != null) {
-            introSuper(writer, model);
-        }
-    }
-
-    @SuppressWarnings(UNCHECKED)
-    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, true);
-
-        TypeCategory category = model.getOriginalCategory();
-        Class<? extends Path> pathType;
-
-        if (model.getProperties().isEmpty()) {
-            switch(category) {
-                case COMPARABLE : pathType = ComparablePath.class; break;
-                case ENUM: pathType = EnumPath.class; break;
-                case DATE: pathType = DatePath.class; break;
-                case DATETIME: pathType = DateTimePath.class; break;
-                case TIME: pathType = TimePath.class; break;
-                case NUMERIC: pathType = NumberPath.class; break;
-                case STRING: pathType = StringPath.class; break;
-                case BOOLEAN: pathType = BooleanPath.class; break;
-                default : pathType = EntityPathBase.class;
-            }
-        } else {
-            pathType = EntityPathBase.class;
-        }
-
-        for (Annotation annotation : model.getAnnotations()) {
-            writer.annotation(annotation);
-        }
-
-        writer.line("@Generated(\"", getClass().getName(), "\")");
-
-        if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) {
-            writer.beginClass(queryType, new ClassType(pathType));
-        } else {
-            writer.beginClass(queryType, new ClassType(category, pathType, model));
-        }
-
-        // TODO : generate proper serialVersionUID here
-        long serialVersionUID = model.getFullName().hashCode();
-        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", serialVersionUID + "L");
-    }
-
-    protected void introDefaultInstance(CodeWriter writer, EntityType model, String defaultName) throws IOException {
-        String simpleName = !defaultName.isEmpty() ? defaultName : model.getUncapSimpleName();
-        Type queryType = typeMappings.getPathType(model, model, true);
-        String alias = simpleName;
-        if (keywords.contains(simpleName.toUpperCase())) {
-            alias += "1";
-        }
-        writer.publicStaticFinal(queryType, simpleName, NEW + queryType.getSimpleName() + "(\"" + alias + "\")");
-
-    }
-
-    protected void introFactoryMethods(CodeWriter writer, final EntityType model) throws IOException {
-        String localName = writer.getRawName(model);
-        String genericName = writer.getGenericName(true, model);
-        Set<Integer> sizes = Sets.newHashSet();
-
-        for (Constructor c : model.getConstructors()) {
-            // begin
-            if (!localName.equals(genericName)) {
-                writer.suppressWarnings(UNCHECKED);
-            }
-            Type returnType = new ClassType(ConstructorExpression.class, model);
-            final boolean asExpr = sizes.add(c.getParameters().size());
-            writer.beginStaticMethod(returnType, "create", c.getParameters(),
-                    new Function<Parameter, Parameter>() {
-                @Override
-                public Parameter apply(Parameter p) {
-                    Type type;
-                    if (!asExpr) {
-                        type = typeMappings.getExprType(
-                                p.getType(), model, false, false, true);
-                    } else if (p.getType().isFinal()) {
-                        type = new ClassType(Expression.class, p.getType());
-                    } else {
-                        type = new ClassType(Expression.class, new TypeExtends(p.getType()));
-                    }
-                    return new Parameter(p.getName(), type);
-                }
-            });
-
-            // body
-            // TODO : replace with class reference
-            writer.beginLine("return new ConstructorExpression<" + genericName + ">(");
-            if (!localName.equals(genericName)) {
-                writer.append("(Class)");
-            }
-            writer.append(writer.getClassConstant(localName));
-            writer.append(", new Class[]{");
-            boolean first = true;
-            for (Parameter p : c.getParameters()) {
-                if (!first) {
-                    writer.append(COMMA);
-                }
-                if (Types.PRIMITIVES.containsKey(p.getType())) {
-                    Type primitive = Types.PRIMITIVES.get(p.getType());
-                    writer.append(writer.getClassConstant(primitive.getFullName()));
-                } else {
-                    writer.append(writer.getClassConstant(writer.getRawName(p.getType())));
-                }
-                first = false;
-            }
-            writer.append("}");
-
-            for (Parameter p : c.getParameters()) {
-                writer.append(COMMA + p.getName());
-            }
-
-            // end
-            writer.append(");\n");
-            writer.end();
-        }
-    }
-
-    protected void introImports(CodeWriter writer, SerializerConfig config,
-            EntityType model) throws IOException {
-        writer.staticimports(PathMetadataFactory.class);
-
-        // import package of query type
-        Type queryType = typeMappings.getPathType(model, model, true);
-        if (!model.getPackageName().isEmpty()
-            && !queryType.getPackageName().equals(model.getPackageName())
-            && !queryType.getSimpleName().equals(model.getSimpleName())) {
-            String fullName = model.getFullName();
-            String packageName = model.getPackageName();
-            if (fullName.substring(packageName.length()+1).contains(".")) {
-                fullName = fullName.substring(0, fullName.lastIndexOf('.'));
-            }
-            writer.importClasses(fullName);
-        }
-
-        // delegate packages
-        introDelegatePackages(writer, model);
-
-        // other packages
-        List<Package> packages = Lists.newArrayList();
-        packages.add(SimplePath.class.getPackage());
-        if (!model.getConstructors().isEmpty()) {
-            packages.add(SimpleExpression.class.getPackage());
-        }
-        if (isImportExprPackage(model)) {
-            packages.add(ComparableExpression.class.getPackage());
-        }
-        writer.imports(packages.toArray(new Package[packages.size()]));
-
-        // other classes
-        List<Class<?>> classes = Lists.<Class<?>>newArrayList(PathMetadata.class, Generated.class);
-        if (!getUsedClassNames(model).contains("Path")) {
-            classes.add(Path.class);
-        }
-        if (!model.getConstructors().isEmpty()) {
-            classes.add(ConstructorExpression.class);
-            classes.add(Expression.class);
-        }
-        boolean inits = false;
-        if (model.hasEntityFields() || model.hasInits()) {
-            inits = true;
-        } else {
-            Set<TypeCategory> collections = Sets.newHashSet(TypeCategory.COLLECTION, TypeCategory.LIST, TypeCategory.SET);
-            for (Property property : model.getProperties()) {
-                if (!property.isInherited() && collections.contains(property.getType().getCategory())) {
-                    inits = true;
-                    break;
-                }
-            }
-        }
-        if (inits) {
-            classes.add(PathInits.class);
-        }
-        writer.imports(classes.toArray(new Class[classes.size()]));
-    }
-
-    private Set<String> getUsedClassNames(EntityType model) {
-        Set<String> result = Sets.newHashSet();
-        result.add(model.getSimpleName());
-        for (Property property : model.getProperties()) {
-            result.add(property.getType().getSimpleName());
-            for (Type type : property.getType().getParameters()) {
-                if (type != null) {
-                    result.add(type.getSimpleName());
-                }
-            }
-        }
-        return result;
-    }
-
-    protected boolean isImportExprPackage(EntityType model) {
-        if (!model.getConstructors().isEmpty() || !model.getDelegates().isEmpty()) {
-            boolean importExprPackage = false;
-            for (Constructor c : model.getConstructors()) {
-                for (Parameter cp : c.getParameters()) {
-                    importExprPackage |= cp.getType().getPackageName()
-                            .equals(ComparableExpression.class.getPackage().getName());
-                }
-            }
-            for (Delegate d : model.getDelegates()) {
-                for (Parameter dp : d.getParameters()) {
-                    importExprPackage |= dp.getType().getPackageName()
-                            .equals(ComparableExpression.class.getPackage().getName());
-                }
-            }
-            return importExprPackage;
-
-        } else {
-            return false;
-        }
-    }
-
-    protected void introDelegatePackages(CodeWriter writer, EntityType model) throws IOException {
-        Set<String> packages = new HashSet<String>();
-        for (Delegate delegate : model.getDelegates()) {
-            if (!delegate.getDelegateType().getPackageName().equals(model.getPackageName())) {
-                packages.add(delegate.getDelegateType().getPackageName());
-            }
-        }
-        writer.importPackages(packages.toArray(new String[packages.size()]));
-    }
-
-    protected void introInits(CodeWriter writer, EntityType model) throws IOException {
-        List<String> inits = new ArrayList<String>();
-        for (Property property : model.getProperties()) {
-            for (String init : property.getInits()) {
-                inits.add(property.getEscapedName() + DOT + init);
-            }
-        }
-        if (!inits.isEmpty()) {
-            inits.add(0, STAR);
-            String initsAsString = QUOTE + JOINER.join(inits) + QUOTE;
-            writer.privateStaticFinal(PATH_INITS_TYPE, "INITS", "new PathInits(" + initsAsString + ")");
-        } else if (model.hasEntityFields()) {
-            writer.privateStaticFinal(PATH_INITS_TYPE, "INITS", "PathInits.DIRECT2");
-        }
-    }
-
-    protected void introJavadoc(CodeWriter writer, EntityType model) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, true);
-        writer.javadoc(queryType.getSimpleName() + " is a Querydsl query type for " +
-        model.getSimpleName());
-    }
-
-    protected void introPackage(CodeWriter writer, EntityType model) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, false);
-        if (!queryType.getPackageName().isEmpty()) {
-            writer.packageDecl(queryType.getPackageName());
-        }
-    }
-
-    protected void introSuper(CodeWriter writer, EntityType model) throws IOException {
-        EntityType superType = model.getSuperType().getEntityType();
-        Type superQueryType = typeMappings.getPathType(superType, model, false);
-        if (!superType.hasEntityFields()) {
-            writer.publicFinal(superQueryType, "_super", NEW + writer.getRawName(superQueryType) + "(this)");
-        } else {
-            writer.publicFinal(superQueryType, "_super");
-        }
-    }
-
-    protected void listAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
-        String escapedName = field.getEscapedName();
-        Type queryType = typeMappings.getPathType(field.getParameter(0), model, false);
-
-        writer.beginPublicMethod(queryType, escapedName, new Parameter("index", Types.INT));
-        writer.line(RETURN + escapedName + ".get(index);").end();
-
-        writer.beginPublicMethod(queryType, escapedName, new Parameter("index",
-                new ClassType(Expression.class, Types.INTEGER)));
-        writer.line(RETURN + escapedName +".get(index);").end();
-    }
-
-    protected void mapAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
-        String escapedName = field.getEscapedName();
-        Type queryType = typeMappings.getPathType(field.getParameter(1), model, false);
-
-        writer.beginPublicMethod(queryType, escapedName, new Parameter("key", field.getParameter(0)));
-        writer.line(RETURN + escapedName + ".get(key);").end();
-
-        writer.beginPublicMethod(queryType, escapedName, new Parameter("key",
-                new ClassType(Expression.class, field.getParameter(0))));
-        writer.line(RETURN + escapedName + ".get(key);").end();
-    }
-
-    private void delegate(final EntityType model, Delegate delegate, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        Parameter[] params = delegate.getParameters().toArray(new Parameter[delegate.getParameters().size()]);
-        writer.beginPublicMethod(delegate.getReturnType(), delegate.getName(), params);
-
-        // body start
-        writer.beginLine(RETURN + delegate.getDelegateType().getSimpleName() + "."+delegate.getName()+"(");
-        writer.append("this");
-        if (!model.equals(delegate.getDeclaringType())) {
-            int counter = 0;
-            EntityType type = model;
-            while (type != null && !type.equals(delegate.getDeclaringType())) {
-                type = type.getSuperType() != null ? type.getSuperType().getEntityType() : null;
-                counter++;
-            }
-            for (int i = 0; i < counter; i++) {
-                writer.append("._super");
-            }
-        }
-        for (Parameter parameter : delegate.getParameters()) {
-            writer.append(COMMA + parameter.getName());
-        }
-        writer.append(");\n");
-
-        // body end
-        writer.end();
-    }
-
-    protected void outro(EntityType model, CodeWriter writer) throws IOException {
-        writer.end();
-    }
-
-    @Override
-    public void serialize(EntityType model, SerializerConfig config,
-            CodeWriter writer) throws IOException{
-        intro(model, config, writer);
-
-        // properties
-        serializeProperties(model, config, writer);
-
-        // constructors
-        constructors(model, config, writer);
-
-        // delegates
-        for (Delegate delegate : model.getDelegates()) {
-            delegate(model, delegate, config, writer);
-        }
-
-        // property accessors
-        for (Property property : model.getProperties()) {
-            TypeCategory category = property.getType().getCategory();
-            if (category == TypeCategory.MAP && config.useMapAccessors()) {
-                mapAccessor(model, property, writer);
-            } else if (category == TypeCategory.LIST && config.useListAccessors()) {
-                listAccessor(model, property, writer);
-            } else if (category == TypeCategory.ENTITY && config.useEntityAccessors()) {
-                entityAccessor(model, property, writer);
-            }
-        }
-        outro(model, writer);
-    }
-
-    protected void serialize(EntityType model, Property field, Type type, CodeWriter writer,
-            String factoryMethod, String... args) throws IOException {
-        Supertype superType = model.getSuperType();
-        // construct value
-        StringBuilder value = new StringBuilder();
-        if (field.isInherited() && superType != null) {
-            if (!superType.getEntityType().hasEntityFields()) {
-                value.append("_super." + field.getEscapedName());
-            }
-        } else {
-            value.append(factoryMethod + "(\"" + field.getName() + QUOTE);
-            for (String arg : args) {
-                value.append(COMMA + arg);
-            }
-            value.append(")");
-        }
-
-        // serialize it
-        if (field.isInherited()) {
-            writer.line("//inherited");
-        }
-        if (value.length() > 0) {
-            writer.publicFinal(type, field.getEscapedName(), value.toString());
-        } else {
-            writer.publicFinal(type, field.getEscapedName());
-        }
-    }
-
-    protected void customField(EntityType model, Property field, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        Type queryType = typeMappings.getPathType(field.getType(), model, false);
-        writer.line("// custom");
-        if (field.isInherited()) {
-            writer.line("// inherited");
-            Supertype superType = model.getSuperType();
-            if (!superType.getEntityType().hasEntityFields()) {
-                writer.publicFinal(queryType, field.getEscapedName(),"_super." + field.getEscapedName());
-            } else {
-                writer.publicFinal(queryType, field.getEscapedName());
-            }
-        } else {
-            String value = NEW + writer.getRawName(queryType) + "(forProperty(\"" + field.getName() + "\"))";
-            writer.publicFinal(queryType, field.getEscapedName(), value);
-        }
-    }
-
-    // TODO move this to codegen
-    private Type wrap(Type type) {
-        if (type.equals(Types.BOOLEAN_P)) {
-            return Types.BOOLEAN;
-        } else if (type.equals(Types.BYTE_P)) {
-            return Types.BYTE;
-        } else if (type.equals(Types.CHAR)) {
-            return Types.CHARACTER;
-        } else if (type.equals(Types.DOUBLE_P)) {
-            return Types.DOUBLE;
-        } else if (type.equals(Types.FLOAT_P)) {
-            return Types.FLOAT;
-        } else if (type.equals(Types.INT)) {
-            return Types.INTEGER;
-        } else if (type.equals(Types.LONG_P)) {
-            return Types.LONG;
-        } else if (type.equals(Types.SHORT_P)) {
-            return Types.SHORT;
-        } else {
-            return type;
-        }
-    }
-
-    protected void serializeProperties(EntityType model,  SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        for (Property property : model.getProperties()) {
-            // FIXME : the custom types should have the custom type category
-            if (typeMappings.isRegistered(property.getType())
-                    && property.getType().getCategory() != TypeCategory.CUSTOM
-                    && property.getType().getCategory() != TypeCategory.ENTITY) {
-                customField(model, property, config, writer);
-                continue;
-            }
-
-            // strips of "? extends " etc
-            Type propertyType = new SimpleType(property.getType(), property.getType().getParameters());
-            Type queryType = typeMappings.getPathType(propertyType, model, false);
-            Type genericQueryType = null;
-            String localRawName = writer.getRawName(property.getType());
-            String inits = getInits(property);
-
-            switch(property.getType().getCategory()) {
-            case STRING:
-                serialize(model, property, queryType, writer, "createString");
-                break;
-
-            case BOOLEAN:
-                serialize(model, property, queryType, writer, "createBoolean");
-                break;
-
-            case SIMPLE:
-                serialize(model, property, queryType, writer, "createSimple", writer.getClassConstant(localRawName));
-                break;
-
-            case COMPARABLE:
-                serialize(model, property, queryType, writer, "createComparable", writer.getClassConstant(localRawName));
-                break;
-
-            case ENUM:
-                serialize(model, property, queryType, writer, "createEnum", writer.getClassConstant(localRawName));
-                break;
-
-            case DATE:
-                serialize(model, property, queryType, writer, "createDate", writer.getClassConstant(localRawName));
-                break;
-
-            case DATETIME:
-                serialize(model, property, queryType, writer, "createDateTime", writer.getClassConstant(localRawName));
-                break;
-
-            case TIME:
-                serialize(model, property, queryType, writer, "createTime", writer.getClassConstant(localRawName));
-                break;
-
-            case NUMERIC:
-                serialize(model, property, queryType, writer, "createNumber", writer.getClassConstant(localRawName));
-                break;
-
-            case CUSTOM:
-                customField(model, property, config, writer);
-                break;
-
-            case ARRAY:
-                serialize(model, property, new ClassType(ArrayPath.class,
-                        property.getType(),
-                        wrap(property.getType().getComponentType())),
-                        writer, "createArray", writer.getClassConstant(localRawName));
-                break;
-
-            case COLLECTION:
-                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
-                String genericKey = writer.getGenericName(true, property.getParameter(0));
-                localRawName = writer.getRawName(property.getParameter(0));
-                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
-
-                serialize(model, property, new ClassType(CollectionPath.class, getRaw(property.getParameter(0)), genericQueryType),
-                        writer, "this.<"+genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createCollection",
-                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
-                break;
-
-            case SET:
-                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
-                genericKey = writer.getGenericName(true, property.getParameter(0));
-                localRawName = writer.getRawName(property.getParameter(0));
-                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
-
-                serialize(model, property, new ClassType(SetPath.class, getRaw(property.getParameter(0)), genericQueryType),
-                        writer, "this.<"+genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createSet",
-                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
-                break;
-
-            case LIST:
-                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
-                genericKey = writer.getGenericName(true, property.getParameter(0));
-                localRawName = writer.getRawName(property.getParameter(0));
-                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
-
-                serialize(model, property, new ClassType(ListPath.class, getRaw(property.getParameter(0)), genericQueryType),
-                        writer, "this.<"+genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createList",
-                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
-                break;
-
-            case MAP:
-                genericKey = writer.getGenericName(true, property.getParameter(0));
-                String genericValue = writer.getGenericName(true, property.getParameter(1));
-                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(1)), model, false);
-                String keyType = writer.getRawName(property.getParameter(0));
-                String valueType = writer.getRawName(property.getParameter(1));
-                queryType = typeMappings.getPathType(property.getParameter(1), model, true);
-
-                serialize(model, property, new ClassType(MapPath.class, getRaw(property.getParameter(0)),
-                        getRaw(property.getParameter(1)), genericQueryType),
-                        writer, "this.<" + genericKey + COMMA + genericValue + COMMA +
-                            writer.getGenericName(true, genericQueryType) + ">createMap",
-                 writer.getClassConstant(keyType), writer.getClassConstant(valueType), writer.getClassConstant(writer.getRawName(queryType)));
-                break;
-
-            case ENTITY:
-                entityField(model, property, config, writer);
-                break;
-            }
-        }
-    }
-
-    private String getInits(Property property) {
-        if (!property.getInits().isEmpty()) {
-            return "INITS.get(\"" + property.getName() + "\")";
-        } else {
-            return "PathInits.DIRECT2";
-        }
-    }
-
-    private Type getRaw(Type type) {
-        if (type instanceof EntityType && type.getPackageName().startsWith("ext.java")) {
-            return type;
-        } else {
-            return new SimpleType(type, type.getParameters());
-        }
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntityType.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntityType.java
deleted file mode 100644
index c1f5c665cb..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/EntityType.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.annotation.Nullable;
-
-import com.mysema.codegen.StringUtils;
-import com.mysema.codegen.model.Constructor;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeAdapter;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.util.JavaSyntaxUtils;
-
-/**
- * EntityType represents a model of a query domain type with properties
- *
- * @author tiwe
- */
-public class EntityType extends TypeAdapter implements Comparable<EntityType> {
-
-    private final Map<Class<?>,Annotation> annotations = new HashMap<Class<?>,Annotation>();
-
-    private final Set<Constructor> constructors = new HashSet<Constructor>();
-
-    private int escapeSuffix = 1;
- 
-    private final Set<Delegate> delegates = new HashSet<Delegate>();
-
-    private final Set<Property> properties = new TreeSet<Property>();
-    
-    private final Set<String> propertyNames = new HashSet<String>();
-    
-    private final Set<String> escapedPropertyNames = new HashSet<String>();
-
-    private final Set<Supertype> superTypes;
-
-    private final Map<Object, Object> data = new HashMap<Object,Object>();
-
-    private String uncapSimpleName;
-    
-    /**
-     * Create a new EntityType instance for the given type
-     * 
-     * @param type
-     */
-    public EntityType(Type type) {
-        this(type, new HashSet<Supertype>());
-    }
-    
-    /**
-     * Create a new EntityType instance for the given type and superTypes
-     * 
-     * @param type
-     * @param superTypes
-     */
-    public EntityType(Type type, Set<Supertype> superTypes) {
-        super(type);
-        this.uncapSimpleName = StringUtils.uncapitalize(type.getSimpleName());
-        if (JavaSyntaxUtils.isReserved(uncapSimpleName)) {
-            this.uncapSimpleName = uncapSimpleName + "$";    
-        }
-        this.superTypes = superTypes;
-    }
-
-    public void addAnnotation(Annotation annotation) {
-        annotations.put(annotation.annotationType(), annotation);
-    }
-
-    public void addConstructor(Constructor co) {
-        constructors.add(co);
-    }
-
-    public void addDelegate(Delegate delegate) {
-        delegates.add(delegate);
-    }
-
-    public void addProperty(Property field) {
-        propertyNames.add(field.getName());
-        escapedPropertyNames.add(field.getEscapedName());
-        properties.add(validateField(field));
-    }
-
-    public void addSupertype(Supertype entityType) {
-        superTypes.add(entityType);
-    }
-
-    @Override
-    public int compareTo(EntityType o) {
-        return getType().getSimpleName().compareTo(o.getType().getSimpleName());
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Type) {
-            return getFullName().equals(((Type)o).getFullName());    
-        } else {
-            return false;
-        }        
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Annotation> T getAnnotation(Class<T> type) {
-        return (T) annotations.get(type);
-    }
-
-    public Collection<Annotation> getAnnotations() {
-        return annotations.values();
-    }
-
-    @Override
-    public TypeCategory getCategory() {       
-        if (getType().getCategory() == TypeCategory.ENTITY || !properties.isEmpty()) {
-            return TypeCategory.ENTITY;    
-        } else {
-            return TypeCategory.CUSTOM;
-        }        
-    }
-
-    public Set<Constructor> getConstructors() {
-        return constructors;
-    }
-
-    public Map<Object, Object> getData() {
-        return data;
-    }
-
-    public Set<Delegate> getDelegates() {
-        return delegates;
-    }
-
-    public TypeCategory getOriginalCategory() {
-        return super.getCategory();
-    }
-
-    public Set<Property> getProperties() {
-        return properties;
-    }
-    
-    @Nullable
-    public Supertype getSuperType() {
-        return superTypes.size() == 1 ? superTypes.iterator().next() : null;
-    }
-
-    public Set<Supertype> getSuperTypes() {
-        return superTypes;
-    }
-
-    public String getUncapSimpleName() {
-        return uncapSimpleName;
-    }
-
-    @Override
-    public int hashCode() {
-        return getFullName().hashCode();
-    }
-    
-    public boolean hasArrays() {
-        return hasPropertyWithType(TypeCategory.ARRAY);
-    }
-    
-    public boolean hasEntityFields() {
-        return hasPropertyWithType(TypeCategory.ENTITY);
-    }
-    
-    public boolean hasInits() {
-        for (Property property : properties) {
-            if (!property.getInits().isEmpty()) {
-                return true;
-            }
-        }
-        return false;        
-    }
-    
-    public boolean hasLists() {
-        return hasPropertyWithType(TypeCategory.LIST);
-    }
-    
-    public boolean hasCollections() {
-        return hasPropertyWithType(TypeCategory.COLLECTION);
-    }
-    
-    public boolean hasSets() {
-        return hasPropertyWithType(TypeCategory.SET);
-    }
-    
-    public boolean hasMaps() {
-        return hasPropertyWithType(TypeCategory.MAP);
-    }
-    
-    private boolean hasPropertyWithType(TypeCategory category) {
-        for (Property property : properties) {
-            if (property.getType().getCategory() == category) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void include(Supertype supertype) {
-        EntityType entityType = supertype.getEntityType();
-        for (Delegate delegate : entityType.getDelegates()) {
-            addDelegate(delegate);
-        }
-        for (Property property : entityType.getProperties()) {
-            addProperty(property.createCopy(this));
-        }
-    }
-    
-    private Property validateField(Property field) {
-        if (field.getName().equals(uncapSimpleName) || field.getEscapedName().equals(uncapSimpleName)) {
-            do {
-                uncapSimpleName = StringUtils.uncapitalize(getType().getSimpleName()) + (escapeSuffix++);
-            } while (propertyNames.contains(uncapSimpleName));
-        }
-        return field;
-    }
-
-    public Set<String> getPropertyNames() {
-        return propertyNames;
-    }
-
-    public Set<String> getEscapedPropertyNames() {
-        return escapedPropertyNames;
-    }
-    
-    public Type getInnerType() {
-        return type;
-    }
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/GenericExporter.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/GenericExporter.java
deleted file mode 100644
index bc6d57799a..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/GenericExporter.java
+++ /dev/null
@@ -1,720 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.ScalaWriter;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.support.ClassUtils;
-import com.mysema.query.QueryException;
-import com.mysema.query.annotations.Config;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryExclude;
-import com.mysema.query.annotations.QueryInit;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.annotations.QuerySupertype;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.util.BeanUtils;
-import com.mysema.util.ClassPathUtils;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * GenericExporter provides query type serialization logic for cases where APT annotation processors
- * can't be used. GenericExporter scans the classpath for classes annotated with specified annotations
- * in specific packages and mirrors them into Querydsl expression types.
- *
- * <p>Example with Querydsl annotations: </p>
- * <pre>
- * {@code
- * GenericExporter exporter = new GenericExporter();
- * exporter.setTargetFolder(new File("target/generated-sources/java"));
- * exporter.export(com.example.domain.Entity.class.getPackage());}
- * </pre>
- *
- * <p>Example with JPA annotations:</p>
- * <pre>
- * {@code
- * GenericExporter exporter = new GenericExporter();
- * exporter.setKeywords(Keywords.JPA);
- * exporter.setEntityAnnotation(Entity.class);
- * exporter.setEmbeddableAnnotation(Embeddable.class);
- * exporter.setEmbeddedAnnotation(Embedded.class);
- * exporter.setSupertypeAnnotation(MappedSuperclass.class);
- * exporter.setSkipAnnotation(Transient.class);
- * exporter.setTargetFolder(new File("target/generated-sources/java"));
- * exporter.export(com.example.domain.Entity.class.getPackage());}
- * </pre>
- *
- * @author tiwe
- *
- */
-public class GenericExporter {
-
-    private Class<? extends Annotation> entityAnnotation = QueryEntity.class;
-
-    private Class<? extends Annotation> supertypeAnnotation = QuerySupertype.class;
-
-    private Class<? extends Annotation> embeddableAnnotation = QueryEmbeddable.class;
-
-    private Class<? extends Annotation> embeddedAnnotation = QueryEmbedded.class;
-
-    private Class<? extends Annotation> skipAnnotation = QueryTransient.class;
-
-    private boolean createScalaSources = false;
-
-    private final Set<Class<?>> stopClasses = Sets.newHashSet();
-
-    private final Map<String, EntityType> allTypes = Maps.newHashMap();
-
-    private final Map<Class<?>, EntityType> entityTypes = Maps.newHashMap();
-
-    private final Map<Class<?>, EntityType> superTypes = Maps.newHashMap();
-
-    private final Map<Class<?>, EntityType> embeddableTypes = Maps.newHashMap();
-
-    private final Map<Class<?>, EntityType> projectionTypes = Maps.newHashMap();
-
-    private final CodegenModule codegenModule = new CodegenModule();
-
-    private final SerializerConfig serializerConfig = SimpleSerializerConfig.DEFAULT;
-
-    private boolean handleFields = true, handleMethods = true;
-
-    @Nullable
-    private File targetFolder;
-
-    @Nullable
-    private TypeFactory typeFactory;
-
-    @Nullable
-    private TypeMappings typeMappings;
-
-    @Nullable
-    private QueryTypeFactory queryTypeFactory;
-
-    @Nullable
-    private Class<? extends Serializer> serializerClass;
-
-    private final Charset charset;
-
-    private final ClassLoader classLoader;
-
-    private Set<File> generatedFiles = new HashSet<File>();
-
-    /**
-     * Create a GenericExporter instance using the given classloader and charset for serializing
-     * source files
-     *
-     * @param classLoader
-     * @param charset
-     */
-    public GenericExporter(ClassLoader classLoader, Charset charset) {
-        this.classLoader = classLoader;
-        this.charset = charset;
-        stopClasses.add(Object.class);
-        stopClasses.add(Enum.class);
-    }
-
-    /**
-     * Create a GenericExporter instance using the given classloader and default charset
-     *
-     * @param classLoader
-     */
-    public GenericExporter(ClassLoader classLoader) {
-        this(classLoader, Charset.defaultCharset());
-    }
-
-    /**
-     * Create a GenericExporter instance using the context classloader and the given charset
-     *
-     * @param charset
-     */
-    public GenericExporter(Charset charset) {
-        this(Thread.currentThread().getContextClassLoader(), charset);
-    }
-
-    /**
-     * Create a GenericExporter instance using the context classloader and default charset
-     */
-    public GenericExporter() {
-        this(Thread.currentThread().getContextClassLoader(), Charset.defaultCharset());
-    }
-
-    /**
-     * Export the given packages
-     *
-     * @param packages
-     */
-    public void export(Package... packages) {
-        String[] pkgs = new String[packages.length];
-        for (int i = 0; i < packages.length; i++) {
-            pkgs[i] = packages[i].getName();
-        }
-        export(pkgs);
-    }
-
-    /**
-     * Export the given packages
-     *
-     * @param packages
-     */
-    public void export(String... packages) {
-        scanPackages(packages);
-        innerExport();
-    }
-
-    /**
-     * Export the given classes
-     *
-     * @param classes
-     */
-    public void export(Class<?>...classes) {
-        for (Class<?> cl : classes) {
-            handleClass(cl);
-        }
-        innerExport();
-    }
-
-    @SuppressWarnings("unchecked")
-    private void innerExport() {
-        typeMappings = codegenModule.get(TypeMappings.class);
-        queryTypeFactory = codegenModule.get(QueryTypeFactory.class);
-        typeFactory = new TypeFactory(ImmutableList.of(entityAnnotation, supertypeAnnotation, embeddableAnnotation));
-
-        // process supertypes
-        for (Class<?> cl : superTypes.keySet()) {
-            createEntityType(cl, superTypes);
-        }
-
-        // process embeddables
-        for (Class<?> cl : embeddableTypes.keySet()) {
-            createEntityType(cl, embeddableTypes);
-        }
-
-        // process entities
-        for (Class<?> cl : entityTypes.keySet()) {
-            createEntityType(cl, entityTypes);
-        }
-
-        // process projections
-        for (Class<?> cl : projectionTypes.keySet()) {
-            createEntityType(cl, projectionTypes);
-        }
-
-        // add constructors and properties
-        for (Map<Class<?>, EntityType> entries : Arrays.asList(superTypes, embeddableTypes, entityTypes, projectionTypes)) {
-            for (Map.Entry<Class<?>, EntityType> entry : Sets.newHashSet(entries.entrySet())) {
-                addConstructors(entry.getKey(), entry.getValue());
-                addProperties(entry.getKey(), entry.getValue());
-            }
-        }
-
-        // merge supertype fields into subtypes
-        Set<EntityType> handled = new HashSet<EntityType>();
-        for (EntityType type : superTypes.values()) {
-            addSupertypeFields(type, allTypes, handled);
-        }
-        for (EntityType type : entityTypes.values()) {
-            addSupertypeFields(type, allTypes, handled);
-        }
-        for (EntityType type : embeddableTypes.values()) {
-            addSupertypeFields(type, allTypes, handled);
-        }
-
-        // extend types
-        typeFactory.extendTypes();
-
-        try {
-            Serializer supertypeSerializer, entitySerializer, embeddableSerializer, projectionSerializer;
-
-            if (serializerClass != null) {
-                Serializer serializer = codegenModule.get(serializerClass);
-                supertypeSerializer = serializer;
-                entitySerializer = serializer;
-                embeddableSerializer = serializer;
-                projectionSerializer = serializer;
-            } else {
-                supertypeSerializer = codegenModule.get(SupertypeSerializer.class);
-                entitySerializer = codegenModule.get(EntitySerializer.class);
-                embeddableSerializer = codegenModule.get(EmbeddableSerializer.class);
-                projectionSerializer = codegenModule.get(ProjectionSerializer.class);
-            }
-
-            // serialize super types
-            serialize(supertypeSerializer, superTypes);
-
-            // serialze entity types
-            serialize(entitySerializer, entityTypes);
-
-            // serialize embeddables
-            serialize(embeddableSerializer, embeddableTypes);
-
-            // serialize projections
-            serialize(projectionSerializer, projectionTypes);
-
-        } catch (IOException e) {
-            throw new QueryException(e);
-        }
-
-    }
-
-    private void addSupertypeFields(EntityType model, Map<String, EntityType> superTypes,
-            Set<EntityType> handled) {
-        if (handled.add(model)) {
-            for (Supertype supertype : model.getSuperTypes()) {
-                EntityType entityType = superTypes.get(supertype.getType().getFullName());
-                if (entityType == null) {
-                    if (supertype.getType().getPackageName().startsWith("java.")) {
-                        // skip internal supertypes
-                        continue;
-                    }
-                    // FIXME this misses the generics
-                    Class<?> cl = supertype.getType().getJavaClass();
-                    typeFactory.addEmbeddableType(cl);
-                    entityType = createEntityType(cl, new HashMap<Class<?>, EntityType>());
-                    addProperties(cl, entityType);
-
-                }
-                addSupertypeFields(entityType, superTypes, handled);
-                supertype.setEntityType(entityType);
-                model.include(supertype);
-            }
-        }
-    }
-
-    private EntityType createEntityType(Class<?> cl, Map<Class<?>, EntityType> types) {
-        if (types.get(cl) != null) {
-            return types.get(cl);
-        } else {
-            EntityType type = allTypes.get(ClassUtils.getFullName(cl));
-            if (type == null) {
-                type = typeFactory.getEntityType(cl);
-            }
-            types.put(cl, type);
-            String fullName = ClassUtils.getFullName(cl);
-            if (!allTypes.containsKey(fullName)) {
-                allTypes.put(fullName, type);
-            }
-
-            typeMappings.register(type, queryTypeFactory.create(type));
-            if (cl.getSuperclass() != null && !stopClasses.contains(cl.getSuperclass())
-                && !cl.getSuperclass().isAnnotationPresent(QueryExclude.class)) {
-                type.addSupertype(new Supertype(typeFactory.get(cl.getSuperclass(), cl.getGenericSuperclass())));
-            }
-            if (cl.isInterface()) {
-                for (Class<?> iface : cl.getInterfaces()) {
-                    if (!stopClasses.contains(iface) && !iface.isAnnotationPresent(QueryExclude.class)) {
-                        type.addSupertype(new Supertype(typeFactory.get(iface)));
-                    }
-                }
-            }
-
-            return type;
-        }
-    }
-
-    private void addConstructors(Class<?> cl, EntityType type) {
-        for (Constructor<?> constructor : cl.getConstructors()) {
-            if (constructor.getAnnotation(QueryProjection.class) != null) {
-                List<Parameter> parameters = Lists.newArrayList();
-                for (int i = 0; i < constructor.getParameterTypes().length; i++) {
-                    Type parameterType = typeFactory.get(
-                            constructor.getParameterTypes()[i],
-                            constructor.getGenericParameterTypes()[i]);
-                    for (Annotation annotation : constructor.getParameterAnnotations()[i]) {
-                        if (annotation.annotationType().equals(QueryType.class)) {
-                            QueryType queryType = (QueryType)annotation;
-                            parameterType = parameterType.as(TypeCategory.valueOf(queryType.value().name()));
-                        }
-                    }
-                    parameters.add(new Parameter("param" + i, parameterType));
-                }
-                type.addConstructor(new com.mysema.codegen.model.Constructor(parameters));
-            }
-        }
-    }
-
-    private void addProperties(Class<?> cl, EntityType type) {
-        Set<String> handled = new HashSet<String>();
-
-        // fields
-        if (handleFields) {
-            for (Field field : cl.getDeclaredFields()) {
-                if (!Modifier.isStatic(field.getModifiers())) {
-                    if (Modifier.isTransient(field.getModifiers()) && !field.isAnnotationPresent(QueryType.class)) {
-                        continue;
-                    }
-                    AnnotatedElement annotated = ReflectionUtils.getAnnotatedElement(cl, field.getName(), field.getType());
-                    Method method = ReflectionUtils.getGetterOrNull(cl, field.getName(), field.getType());
-                    Type propertyType = null;
-                    if (method != null) {
-                        propertyType = getPropertyType(cl, annotated, method.getReturnType(), method.getGenericReturnType());
-                    } else {
-                        propertyType = getPropertyType(cl, annotated, field.getType(), field.getGenericType());
-                    }
-                    Property property = createProperty(type, field.getName(), propertyType, field);
-                    if (property != null) {
-                        type.addProperty(property);
-                    }
-                    handled.add(field.getName());
-                }
-            }
-        }
-
-        // getters
-        if (handleMethods) {
-            for (Method method : cl.getDeclaredMethods()) {
-                String name = method.getName();
-                if (method.getParameterTypes().length == 0
-                    && ((name.startsWith("get") && name.length() > 3)
-                     || (name.startsWith("is") && name.length() > 2))) {
-                    String propertyName;
-                    if (name.startsWith("get")) {
-                        propertyName = BeanUtils.uncapitalize(name.substring(3));
-                    } else {
-                        propertyName = BeanUtils.uncapitalize(name.substring(2));
-                    }
-                    if (handled.contains(propertyName)) {
-                        continue;
-                    }
-                    Type propertyType = getPropertyType(cl, method, method.getReturnType(), method.getGenericReturnType());
-                    Property property = createProperty(type, propertyName, propertyType, method);
-                    if (property != null) {
-                        type.addProperty(property);
-                    }
-                }
-            }
-        }
-    }
-
-    private Type getPropertyType(Class<?> cl, AnnotatedElement annotated, Class<?> type,
-            java.lang.reflect.Type genericType) {
-        Type propertyType = null;
-        if (annotated.isAnnotationPresent(embeddedAnnotation)) {
-            Class<?> embeddableType = type;
-            if (Collection.class.isAssignableFrom(type)) {
-                embeddableType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
-            } else if (Map.class.isAssignableFrom(type)) {
-                embeddableType = ReflectionUtils.getTypeParameterAsClass(genericType, 1);
-            }
-            if (!embeddableType.getName().startsWith("java.")) {
-                typeFactory.addEmbeddableType(embeddableType);
-                if (!embeddableTypes.containsKey(embeddableType)
-                  && !entityTypes.containsKey(embeddableType)
-                  && !superTypes.containsKey(embeddableType)) {
-                    EntityType entityType = createEntityType(embeddableType, embeddableTypes);
-                    addProperties(embeddableType, entityType);
-                    if (embeddableType == type) {
-                        propertyType = entityType;
-                    }
-                }
-            }
-        }
-        if (propertyType == null) {
-            propertyType = typeFactory.get(type, genericType);
-            if (propertyType instanceof EntityType && !allTypes.containsKey(ClassUtils.getFullName(type))) {
-                String fullName = ClassUtils.getFullName(type);
-                if (!allTypes.containsKey(fullName)) {
-                    allTypes.put(fullName, (EntityType)propertyType);
-                }
-            }
-        }
-        return propertyType;
-    }
-
-    @Nullable
-    private Property createProperty(EntityType entityType, String propertyName, Type propertyType,
-            AnnotatedElement annotated) {
-        List<String> inits = Collections.<String>emptyList();
-        if (annotated.isAnnotationPresent(skipAnnotation)
-            && !annotated.isAnnotationPresent(QueryType.class)) {
-            return null;
-        }
-        if (annotated.isAnnotationPresent(QueryInit.class)) {
-            inits = ImmutableList.copyOf(annotated.getAnnotation(QueryInit.class).value());
-        }
-        if (annotated.isAnnotationPresent(QueryType.class)) {
-            QueryType queryType = annotated.getAnnotation(QueryType.class);
-            if (queryType.value().equals(PropertyType.NONE)) {
-                return null;
-            }
-            propertyType = propertyType.as(TypeCategory.valueOf(queryType.value().name()));
-        }
-        return new Property(entityType, propertyName, propertyType, inits);
-    }
-
-    private void scanPackages(String... packages) {
-        if (packages == null) {
-            return;
-        }
-        for (String pkg : packages) {
-            try {
-                for (Class<?> cl : ClassPathUtils.scanPackage(classLoader, pkg)) {
-                    handleClass(cl);
-                }
-            } catch (IOException e) {
-                throw new QueryException(e);
-            }
-        }
-    }
-
-    private void handleClass(Class<?> cl) {
-        if (stopClasses.contains(cl) || cl.isAnnotationPresent(QueryExclude.class)) {
-            return;
-        } else if (cl.getAnnotation(entityAnnotation) != null) {
-            entityTypes.put(cl, null);
-        } else if (cl.getAnnotation(embeddableAnnotation) != null) {
-            embeddableTypes.put(cl, null);
-        } else if (cl.getAnnotation(supertypeAnnotation) != null) {
-            superTypes.put(cl, null);
-        } else {
-            for (Constructor<?> constructor : cl.getConstructors()) {
-                if (constructor.getAnnotation(QueryProjection.class) != null) {
-                    projectionTypes.put(cl, null);
-                    break;
-                }
-            }
-        }
-    }
-
-    private void serialize(Serializer serializer, Map<Class<?>, EntityType> types) throws IOException {
-        for (Map.Entry<Class<?>, EntityType> entityType : types.entrySet()) {
-            Type type = typeMappings.getPathType(entityType.getValue(), entityType.getValue(), true);
-            String packageName = type.getPackageName();
-            String className = packageName.length() > 0 ? (packageName + "." + type.getSimpleName()) : type.getSimpleName();
-            SerializerConfig config = serializerConfig;
-            if (entityType.getKey().isAnnotationPresent(Config.class)) {
-                config = SimpleSerializerConfig.getConfig(entityType.getKey().getAnnotation(Config.class));
-            }
-            String fileSuffix = createScalaSources ? ".scala" : ".java";
-            write(serializer, className.replace('.', '/') + fileSuffix, config, entityType.getValue());
-        }
-    }
-
-    private void write(Serializer serializer, String path, SerializerConfig serializerConfig,
-            EntityType type) throws IOException {
-        File targetFile = new File(targetFolder, path);
-        generatedFiles.add(targetFile);
-        Writer w = writerFor(targetFile);
-        try {
-            CodeWriter writer = createScalaSources ? new ScalaWriter(w) : new JavaWriter(w);
-            serializer.serialize(type, serializerConfig, writer);
-        } finally {
-            w.close();
-        }
-    }
-
-    private Writer writerFor(File file) {
-        if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
-            System.err.println("Folder " + file.getParent() + " could not be created");
-        }
-        try {
-            return new OutputStreamWriter(new FileOutputStream(file), charset);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-
-    /**
-     * @return
-     */
-    public Set<File> getGeneratedFiles() {
-        return generatedFiles;
-    }
-
-    /**
-     * Set the entity annotation
-     *
-     * @param entityAnnotation
-     */
-    public void setEntityAnnotation(Class<? extends Annotation> entityAnnotation) {
-        this.entityAnnotation = entityAnnotation;
-    }
-
-    /**
-     * Set the supertype annotation
-     *
-     * @param supertypeAnnotation
-     */
-    public void setSupertypeAnnotation(
-            Class<? extends Annotation> supertypeAnnotation) {
-        this.supertypeAnnotation = supertypeAnnotation;
-    }
-
-    /**
-     * Set the embeddable annotation
-     *
-     * @param embeddableAnnotation
-     */
-    public void setEmbeddableAnnotation(
-            Class<? extends Annotation> embeddableAnnotation) {
-        this.embeddableAnnotation = embeddableAnnotation;
-    }
-
-    /**
-     * Set the embedded annotation
-     *
-     * @param embeddedAnnotation
-     */
-    public void setEmbeddedAnnotation(Class<? extends Annotation> embeddedAnnotation) {
-        this.embeddedAnnotation = embeddedAnnotation;
-    }
-
-    /**
-     * Set the skip annotation
-     *
-     * @param skipAnnotation
-     */
-    public void setSkipAnnotation(Class<? extends Annotation> skipAnnotation) {
-        this.skipAnnotation = skipAnnotation;
-    }
-
-    /**
-     * Set the target folder for generated sources
-     *
-     * @param targetFolder
-     */
-    public void setTargetFolder(File targetFolder) {
-        this.targetFolder = targetFolder;
-    }
-
-    /**
-     * Set the serializer class to be used
-     *
-     * @param serializerClass
-     */
-    public void setSerializerClass(Class<? extends Serializer> serializerClass) {
-        codegenModule.bind(serializerClass);
-        this.serializerClass = serializerClass;
-    }
-
-    /**
-     * Set the typemappings class to be used
-     *
-     * @param typeMappingsClass
-     */
-    public void setTypeMappingsClass(Class<? extends TypeMappings> typeMappingsClass) {
-        codegenModule.bind(TypeMappings.class, typeMappingsClass);
-    }
-
-    /**
-     * Set whether Scala sources are generated
-     *
-     * @param createScalaSources
-     */
-    public void setCreateScalaSources(boolean createScalaSources) {
-        this.createScalaSources = createScalaSources;
-    }
-
-    /**
-     * Set the keywords to be used
-     *
-     * @param keywords
-     */
-    public void setKeywords(Collection<String> keywords) {
-        codegenModule.bind(CodegenModule.KEYWORDS, keywords);
-    }
-
-    /**
-     * Set the name prefix
-     *
-     * @param prefix
-     */
-    public void setNamePrefix(String prefix) {
-        codegenModule.bind(CodegenModule.PREFIX, prefix);
-    }
-
-    /**
-     * Set the name suffix
-     *
-     * @param suffix
-     */
-    public void setNameSuffix(String suffix) {
-        codegenModule.bind(CodegenModule.SUFFIX, suffix);
-    }
-
-    /**
-     * Set the package suffix
-     *
-     * @param suffix
-     */
-    public void setPackageSuffix(String suffix) {
-        codegenModule.bind(CodegenModule.PACKAGE_SUFFIX, suffix);
-    }
-
-    /**
-     * Set whether fields are handled (default true)
-     *
-     * @param b
-     */
-    public void setHandleFields(boolean b) {
-        handleFields = b;
-    }
-
-    /**
-     * Set whether fields are handled (default true)
-     *
-     * @param b
-     */
-    public void setHandleMethods(boolean b) {
-        handleMethods = b;
-    }
-
-    /**
-     * Add a stop class to be used (default Object.class and Enum.class)
-     *
-     * @param cl
-     */
-    public void addStopClass(Class<?> cl) {
-        stopClasses.add(cl);
-    }
-
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/JavaTypeMappings.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/JavaTypeMappings.java
deleted file mode 100644
index 84930e9d79..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/JavaTypeMappings.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.EnumExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TemporalExpression;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-import com.mysema.query.types.template.BooleanTemplate;
-import com.mysema.query.types.template.ComparableTemplate;
-import com.mysema.query.types.template.DateTemplate;
-import com.mysema.query.types.template.DateTimeTemplate;
-import com.mysema.query.types.template.EnumTemplate;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.query.types.template.SimpleTemplate;
-import com.mysema.query.types.template.StringTemplate;
-import com.mysema.query.types.template.TimeTemplate;
-
-/**
- * JavaTypeMappings defines mappings from {@link TypeCategory} instances to {@link Expression} types
- *
- * @author tiwe
- *
- */
-public class JavaTypeMappings extends TypeMappings {
-
-    public JavaTypeMappings() {
-        register(TypeCategory.STRING,     StringExpression.class,     StringPath.class,     StringTemplate.class);
-        register(TypeCategory.BOOLEAN,    BooleanExpression.class,    BooleanPath.class,    BooleanTemplate.class);
-        register(TypeCategory.COMPARABLE, ComparableExpression.class, ComparablePath.class, ComparableTemplate.class);
-        register(TypeCategory.ENUM,       EnumExpression.class,       EnumPath.class,       EnumTemplate.class);
-        register(TypeCategory.DATE,       TemporalExpression.class,   DatePath.class,       DateTemplate.class);
-        register(TypeCategory.DATETIME,   TemporalExpression.class,   DateTimePath.class,   DateTimeTemplate.class);
-        register(TypeCategory.TIME,       TemporalExpression.class,   TimePath.class,       TimeTemplate.class);
-        register(TypeCategory.NUMERIC,    NumberExpression.class,     NumberPath.class,     NumberTemplate.class);
-        register(TypeCategory.SIMPLE,     Expression.class,           SimplePath.class,     SimpleTemplate.class);
-
-        register(TypeCategory.ARRAY,      Expression.class,           SimplePath.class,     SimpleTemplate.class);
-        register(TypeCategory.COLLECTION, Expression.class,           SimplePath.class,     SimpleTemplate.class);
-        register(TypeCategory.SET,        Expression.class,           SimplePath.class,     SimpleTemplate.class);
-        register(TypeCategory.LIST,       Expression.class,           SimplePath.class,     SimpleTemplate.class);
-        register(TypeCategory.MAP,        Expression.class,           SimplePath.class,     SimpleTemplate.class);
-
-        register(TypeCategory.CUSTOM,     Expression.class,           Path.class,           SimpleTemplate.class);
-        register(TypeCategory.ENTITY,     Expression.class,           Path.class,           SimpleTemplate.class);
-    }
-
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Keywords.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/Keywords.java
deleted file mode 100644
index 905777aa16..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Keywords.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.util.Collection;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Keywords sets in capitalized form to be used in GenericExporter and the APT processors
- * 
- * @author tiwe
- *
- */
-public final class Keywords {
-    
-    private Keywords() {}
-    
-    public static final Collection<String> JPA = ImmutableList.of(
-            "ABS","ALL","AND","ANY","AS","ASC","AVG","BETWEEN",
-            "BIT_LENGTH[51]","BOTH","BY","CASE","CHAR_LENGTH",
-            "CHARACTER_LENGTH","CLASS",
-            "COALESCE","CONCAT","COUNT","CURRENT_DATE","CURRENT_TIME",
-            "CURRENT_TIMESTAMP",
-            "DELETE","DESC","DISTINCT","ELSE","EMPTY","END","ENTRY",
-            "ESCAPE","EXISTS","FALSE","FETCH",
-            "FROM","GROUP","HAVING","IN","INDEX","INNER","IS","JOIN",
-            "KEY","LEADING","LEFT","LENGTH","LIKE",
-            "LOCATE","LOWER","MAX","MEMBER","MIN","MOD","NEW","NOT",
-            "NULL","NULLIF","OBJECT","OF","OR",
-            "ORDER","OUTER","POSITION","SELECT","SET","SIZE","SOME",
-            "SQRT","SUBSTRING","SUM","THEN",
-            "TRAILING","TRIM","TRUE","TYPE","UNKNOWN","UPDATE","UPPER",
-            "VALUE","WHEN","WHERE");
-    
-    public static final Collection<String> JDO = ImmutableList.of(
-            "AS","ASC", "ASCENDING","AVG",
-            "BY","COUNT", "DESC","DESCENDING",
-            "DISTINCT","EXCLUDE", "FROM","GROUP",
-            "HAVING","INTO","MAX","MIN",
-            "ORDER","PARAMETERS","RANGE","SELECT",
-            "SUBCLASSES","SUM","UNIQUE","VARIABLES","WHERE");
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/ProjectionSerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/ProjectionSerializer.java
deleted file mode 100644
index 8a7fa9f8e7..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/ProjectionSerializer.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.*;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-
-import javax.annotation.Generated;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.Set;
-
-/**
- * ProjectionSerializer is a {@link Serializer} implementation for projection types
- *
- * @author tiwe
- *
- */
-public final class ProjectionSerializer implements Serializer{
-
-    private final TypeMappings typeMappings;
-
-    /**
-     * Create a new ProjectionSerializer instance
-     *
-     * @param typeMappings
-     */
-    @Inject
-    public ProjectionSerializer(TypeMappings typeMappings) {
-        this.typeMappings = typeMappings;
-    }
-
-    protected void intro(EntityType model, CodeWriter writer) throws IOException {
-        String simpleName = model.getSimpleName();
-        Type queryType = typeMappings.getPathType(model, model, false);
-
-        // package
-        if (!queryType.getPackageName().isEmpty()) {
-            writer.packageDecl(queryType.getPackageName());
-        }
-
-        // imports
-        writer.imports(NumberExpression.class.getPackage());
-        writer.imports(Expression.class, ConstructorExpression.class, Generated.class);
-
-        // javadoc
-        writer.javadoc(queryType + " is a Querydsl Projection type for " + simpleName);
-
-        writer.line("@Generated(\"", getClass().getName(), "\")");
-
-        // class header
-//        writer.suppressWarnings("serial");
-        Type superType = new ClassType(TypeCategory.SIMPLE, ConstructorExpression.class, model);
-        writer.beginClass(queryType, superType);
-        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", model.hashCode() + "L");
-    }
-
-    protected void outro(EntityType model, CodeWriter writer) throws IOException {
-        writer.end();
-    }
-
-    @Override
-    public void serialize(final EntityType model, SerializerConfig serializerConfig,
-            CodeWriter writer) throws IOException{
-        // intro
-        intro(model, writer);
-
-        String localName = writer.getRawName(model);
-        Set<Integer> sizes = Sets.newHashSet();
-
-        for (Constructor c : model.getConstructors()) {
-            final boolean asExpr = sizes.add(c.getParameters().size());
-            // begin
-            writer.beginConstructor(c.getParameters(), new Function<Parameter,Parameter>() {
-                @Override
-                public Parameter apply(Parameter p) {
-                    Type type;
-                    if (!asExpr) {
-                        type = typeMappings.getExprType(p.getType(),
-                                model, false, false, true);
-                    } else if (p.getType().isFinal()) {
-                        type = new ClassType(Expression.class, p.getType());
-                    } else {
-                        type = new ClassType(Expression.class, new TypeExtends(p.getType()));
-                    }
-                    return new Parameter(p.getName(), type);
-                }
-            });
-
-            // body
-            writer.beginLine("super(" + writer.getClassConstant(localName));
-            // TODO: Fix for Scala (Array[Class])
-            writer.append(", new Class[]{");
-            boolean first = true;
-
-            for (Parameter p : c.getParameters()) {
-                if (!first) {
-                    writer.append(", ");
-                }
-                if (Types.PRIMITIVES.containsKey(p.getType())) {
-                    Type primitive = Types.PRIMITIVES.get(p.getType());
-                    writer.append(writer.getClassConstant(primitive.getFullName()));
-                } else {
-                    writer.append(writer.getClassConstant(writer.getRawName(p.getType())));
-                }
-                first = false;
-            }
-            writer.append("}");
-
-            for (Parameter p : c.getParameters()) {
-                writer.append(", " + p.getName());
-            }
-
-            // end
-            writer.append(");\n");
-            writer.end();
-        }
-
-        // outro
-        outro(model, writer);
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactory.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactory.java
deleted file mode 100644
index 43363db9c2..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.mysema.codegen.model.Type;
-
-/**
- * QueryTypeFactory defines an interface for mapping domain types to Querydsl expression types
- *
- * @author tiwe
- *
- */
-public interface QueryTypeFactory {
-
-    /**
-     * @param type
-     * @return
-     */
-    Type create(Type type);
-
-}
\ No newline at end of file
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactoryImpl.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactoryImpl.java
deleted file mode 100644
index e71ffe2219..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/QueryTypeFactoryImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-
-/**
- * QueryTypeFactoryImpl is the default implementation of the {@link QueryTypeFactory} interface 
- * 
- * @author tiwe
- *
- */
-public class QueryTypeFactoryImpl implements QueryTypeFactory {
-    
-    private final String prefix, suffix, packageSuffix;
-    
-    @Inject
-    public QueryTypeFactoryImpl(
-            @Named(CodegenModule.PREFIX) String prefix, 
-            @Named(CodegenModule.SUFFIX) String suffix, 
-            @Named(CodegenModule.PACKAGE_SUFFIX) String packageSuffix) {
-        this.prefix = prefix;
-        this.suffix = suffix;
-        this.packageSuffix = packageSuffix;
-    }
-    
-    @Override
-    public Type create(Type type) {
-        if (type.getPackageName().isEmpty()) {
-            return createWithoutPackage(type);
-        } else {
-            return createWithPackage(type);
-        }
-    }
-    
-    private Type createWithPackage(Type type) {
-        String packageName = type.getPackageName();
-        String simpleName = prefix + normalizeName(type.getFullName()
-                .substring(packageName.length()+1)) + suffix;        
-        packageName = (packageName.startsWith("java") ? "ext." : "") 
-                + packageName + packageSuffix; 
-        return new SimpleType(type.getCategory(), packageName+"."+simpleName, 
-                packageName, simpleName, false, false);
-    }
-    
-    private Type createWithoutPackage(Type type) {
-        String simpleName = prefix + normalizeName(type.getFullName()) + suffix;
-        return new SimpleType(type.getCategory(), simpleName, "", simpleName, false, false);
-    }
-    
-    private String normalizeName(String name) {
-        return name.replace('.', '_').replace('$', '_');
-    }
-
-    
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SerializerConfig.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/SerializerConfig.java
deleted file mode 100644
index 76f0755b7a..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SerializerConfig.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-/**
- * SerializerConfig defines serialization options to be used in the {@link Serializer}
- * 
- * @author tiwe
- *
- */
-public interface SerializerConfig {
-
-    /**
-     * @return if accessors are used for entity fields
-     */
-    boolean useEntityAccessors();
-
-    /**
-     * @return if indexed list accessors are used 
-     */
-    boolean useListAccessors();
-
-    /**
-     * @return if keyed map accessors are used
-     */
-    boolean useMapAccessors();
-
-    /**
-     * @return if the default variable is created
-     */
-    boolean createDefaultVariable();
-
-    /**
-     * @return the name of the default variable
-     */
-    String defaultVariableName();
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Supertype.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/Supertype.java
deleted file mode 100644
index cdcb7c3df0..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Supertype.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import javax.annotation.Nullable;
-
-import com.mysema.codegen.model.Type;
-
-/**
- * Supertype defines a tuple of a {@link Type} and an optional {@link EntityType} instance used for 
- * supertype references in EntityType instances
- * 
- * @author tiwe
- *
- */
-public class Supertype {
-
-    @Nullable
-    private EntityType entityType;
-
-    private final Type type;
-
-    public Supertype(Type type) {
-        this.type = type;
-    }
-    
-    public Supertype(Type type, EntityType entityType) {
-        this.type = type;
-        this.entityType = entityType;
-    }
-
-    @Nullable
-    public EntityType getEntityType() {
-        return entityType;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setEntityType(EntityType entityType) {
-        this.entityType = entityType;
-    }
-
-    @Override
-    public int hashCode() {
-        return type.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Supertype) {
-            return ((Supertype)o).type.equals(type);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return type.toString();
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java
deleted file mode 100644
index 509bbbb339..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SupertypeSerializer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-/**
- * SupertypeSerializer is a {@link Serializer} implementation for supertypes
- *
- * @author tiwe
- *
- */
-public final class SupertypeSerializer extends EntitySerializer{
-
-    /**
-     * Create a new SupertypeSerializer instance
-     * 
-     * @param typeMappings
-     * @param keywords
-     */
-    @Inject
-    public SupertypeSerializer(TypeMappings typeMappings, @Named("keywords") Collection<String> keywords) {
-        super(typeMappings, keywords);
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeFactory.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeFactory.java
deleted file mode 100644
index 8f675985c2..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeFactory.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.collect.Lists;
-import com.google.common.primitives.Primitives;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.codegen.model.TypeSuper;
-import com.mysema.codegen.model.Types;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * TypeFactory is a factory class for {@link Type} instances
- *
- * @author tiwe
- *
- */
-public final class TypeFactory {
-
-    private static final Type ANY = new TypeExtends(Types.OBJECT);
-
-    private final Map<List<java.lang.reflect.Type>, Type> cache = new HashMap<List<java.lang.reflect.Type>, Type>();
-
-    private final List<Class<? extends Annotation>> entityAnnotations;
-
-    private final Set<Class<?>> embeddableTypes = new HashSet<Class<?>>();
-
-    private boolean unknownAsEntity = false;
-
-    public TypeFactory() {
-        this(Lists.<Class<? extends Annotation>>newArrayList());
-    }
-
-    public TypeFactory(List<Class<? extends Annotation>> entityAnnotations) {
-        this.entityAnnotations = entityAnnotations;
-    }
-
-    public EntityType getEntityType(Class<?> cl) {
-        java.lang.reflect.Type generic = cl;
-        if (cl.getTypeParameters().length > 0) {
-            generic = new ParameterizedTypeImpl(cl, cl.getTypeParameters());
-        }
-        return (EntityType) get(true, cl, generic);
-    }
-
-    public Type get(Class<?> cl) {
-        return get(isEntityClass(cl), cl, cl);
-    }
-
-    public Type get(Class<?> cl, java.lang.reflect.Type genericType) {
-        return get(isEntityClass(cl), cl, genericType);
-    }
-
-    public Type get(boolean entity, Class<?> cl, java.lang.reflect.Type genericType) {
-        List<java.lang.reflect.Type> key = Arrays.<java.lang.reflect.Type> asList(cl, genericType);
-        if (cache.containsKey(key)) {
-            Type value = cache.get(key);
-            if (entity && !(value instanceof EntityType)) {
-                value = new EntityType(value);
-                cache.put(key, value);
-            }
-            return value;
-
-        } else {
-            Type value = create(entity, cl, genericType, key);
-            cache.put(key, value);
-            return value;
-        }
-    }
-
-    private Type create(boolean entity, Class<?> cl, java.lang.reflect.Type genericType,
-            List<java.lang.reflect.Type> key) {
-        if (cl.isPrimitive()) {
-            cl = Primitives.wrap(cl);
-        }
-        Type value;
-        Type[] tempParams = (Type[]) Array.newInstance(Type.class,
-                ReflectionUtils.getTypeParameterCount(genericType));
-        cache.put(key, new ClassType(cl, tempParams));
-        Type[] parameters = getParameters(cl, genericType);
-
-        if (cl.isArray()) {
-            Type componentType = get(cl.getComponentType());
-            if (cl.getComponentType().isPrimitive()) {
-                componentType = Types.PRIMITIVES.get(componentType);
-            }
-            value = componentType.asArrayType();
-        } else if (cl.isEnum()) {
-            value = new ClassType(TypeCategory.ENUM, cl);
-        } else if (Number.class.isAssignableFrom(cl) && Comparable.class.isAssignableFrom(cl)) {
-            value = new ClassType(TypeCategory.NUMERIC, cl, parameters);
-        } else if (entity) {
-            value = createOther(cl, entity, parameters);
-        } else if (Map.class.isAssignableFrom(cl)) {
-            value = new SimpleType(Types.MAP, parameters[0], asGeneric(parameters[1]));
-        } else if (List.class.isAssignableFrom(cl)) {
-            value = new SimpleType(Types.LIST, asGeneric(parameters[0]));
-        } else if (Set.class.isAssignableFrom(cl)) {
-            value = new SimpleType(Types.SET, asGeneric(parameters[0]));
-        } else if (Collection.class.isAssignableFrom(cl)) {
-            value = new SimpleType(Types.COLLECTION, asGeneric(parameters[0]));
-        } else {
-            value = createOther(cl, entity, parameters);
-        }
-
-        if (genericType instanceof TypeVariable) {
-            TypeVariable tv = (TypeVariable)genericType;
-            if (tv.getBounds().length == 1 && tv.getBounds()[0].equals(Object.class)) {
-                value = new TypeSuper(tv.getName(), value);
-            } else {
-                value = new TypeExtends(tv.getName(), value);
-            }
-        }
-
-        if (entity && !(value instanceof EntityType)) {
-            value = new EntityType(value);
-        }
-        return value;
-    }
-
-    private Type asGeneric(Type type) {
-        if (type.getParameters().size() == 0) {
-            int count = type.getJavaClass().getTypeParameters().length;
-            if (count > 0) {
-                return new SimpleType(type, new Type[count]);
-            }
-        }
-        return type;
-    }
-
-    private Type createOther(Class<?> cl, boolean entity, Type[] parameters) {
-        TypeCategory typeCategory = TypeCategory.get(cl.getName());
-        if (!typeCategory.isSubCategoryOf(TypeCategory.COMPARABLE) && Comparable.class.isAssignableFrom(cl)
-            && !cl.equals(Comparable.class)) {
-            typeCategory = TypeCategory.COMPARABLE;
-        } else if (embeddableTypes.contains(cl)) {
-            typeCategory = TypeCategory.CUSTOM;
-        } else if (typeCategory == TypeCategory.SIMPLE && entity) {
-            typeCategory = TypeCategory.ENTITY;
-        } else if (unknownAsEntity && typeCategory == TypeCategory.SIMPLE && !cl.getName().startsWith("java")) {
-            typeCategory = TypeCategory.CUSTOM;
-        }
-        return new ClassType(typeCategory, cl, parameters);
-    }
-
-    private Type[] getParameters(Class<?> cl, java.lang.reflect.Type genericType) {
-        int parameterCount = ReflectionUtils.getTypeParameterCount(genericType);
-        if (parameterCount > 0) {
-            return getGenericParameters(cl, genericType, parameterCount);
-        } else if (Map.class.isAssignableFrom(cl)) {
-            return new Type[]{ Types.OBJECT, Types.OBJECT };
-        } else if (Collection.class.isAssignableFrom(cl)) {
-            return new Type[]{ Types.OBJECT };
-        } else {
-            return new Type[0];
-        }
-    }
-
-    private Type[] getGenericParameters(Class<?> cl, java.lang.reflect.Type genericType,
-            int parameterCount) {
-        Type[] types = new Type[parameterCount];
-        for (int i = 0; i < types.length; i++) {
-            types[i] = getGenericParameter(cl, genericType, i);
-        }
-        return types;
-    }
-
-    @SuppressWarnings("rawtypes")
-    private Type getGenericParameter(Class<?> cl, java.lang.reflect.Type genericType, int i) {
-        java.lang.reflect.Type parameter = ReflectionUtils.getTypeParameter(genericType, i);
-        if (parameter instanceof TypeVariable) {
-            TypeVariable variable = (TypeVariable)parameter;
-            Type rv = get(ReflectionUtils.getTypeParameterAsClass(genericType, i), parameter);
-            return new TypeExtends(variable.getName(), rv);
-        } else if (parameter instanceof WildcardType
-            && ((WildcardType)parameter).getUpperBounds()[0].equals(Object.class)
-            && ((WildcardType)parameter).getLowerBounds().length == 0) {
-            return ANY;
-        } else {
-            Type rv = get(ReflectionUtils.getTypeParameterAsClass(genericType, i), parameter);
-            if (parameter instanceof WildcardType) {
-                rv = new TypeExtends(rv);
-            }
-            return rv;
-        }
-    }
-
-    private boolean isEntityClass(Class<?> cl) {
-        for (Class<? extends Annotation> clazz : entityAnnotations) {
-            if (cl.getAnnotation(clazz) != null) {
-                return true;
-            }
-        }
-        return embeddableTypes.contains(cl);
-    }
-
-    public void extendTypes() {
-        for (Map.Entry<List<java.lang.reflect.Type>, Type> entry : cache.entrySet()) {
-            if (entry.getValue() instanceof EntityType) {
-                EntityType entityType = (EntityType)entry.getValue();
-                if (entityType.getProperties().isEmpty()) {
-                    for (Type type : cache.values()) {
-                        if (type.getFullName().equals(entityType.getFullName()) && type instanceof EntityType) {
-                            EntityType base = (EntityType)type;
-                            for (Property property : base.getProperties()) {
-                                entityType.addProperty(property);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public void setUnknownAsEntity(boolean unknownAsEntity) {
-        this.unknownAsEntity = unknownAsEntity;
-    }
-
-    public void addEmbeddableType(Class<?> cl) {
-        embeddableTypes.add(cl);
-    }
-
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeResolver.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeResolver.java
deleted file mode 100644
index 884b94ff65..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeResolver.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.google.common.base.Objects;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.codegen.model.TypeSuper;
-
-/**
- * TypeResolver provides type resolving functionality for resolving generic type variables to 
- * concrete types
- * 
- * @author tiwe
- *
- */
-public final class TypeResolver {
-
-    /**
-     * Resolve type declared in declaringType for context
-     * 
-     * @param type type
-     * @param declaringType
-     * @param context
-     * @return
-     */
-    public static Type resolve(Type type, Type declaringType, EntityType context) {         
-        Type resolved = unwrap(type);
-        
-        String varName = getVarName(resolved);        
-        if (varName != null) {
-            resolved = resolveVar(resolved, varName, declaringType, context);
-        } else if (!resolved.getParameters().isEmpty()) {
-            resolved = resolveWithParameters(resolved, declaringType, context);
-        }
-        
-        // rewrap entity type
-        if (type instanceof EntityType) {
-            if (!unwrap(type).equals(resolved)) {
-                resolved = new EntityType(resolved, ((EntityType)type).getSuperTypes());    
-            } else {
-                // reset to original type
-                resolved = type;
-            }            
-        }
-        
-        return resolved;
-    }
-
-    /**
-     * @param resolved
-     * @param varName
-     * @param declaringType
-     * @param context
-     * @return
-     */
-    private static Type resolveVar(Type resolved, String varName, Type declaringType, EntityType context) {
-        // get parameter index of var in declaring type
-        int index = -1;
-        for (int i = 0; i < declaringType.getParameters().size(); i++) {
-            Type param = unwrap(declaringType.getParameters().get(i));
-            if (param instanceof TypeExtends && Objects.equal(((TypeExtends)param).getVarName(), varName)) {
-                index = i;
-            }
-        }
-        
-        if (index == -1) {
-            throw new IllegalStateException("Did not find type " + varName
-                    + " in " + declaringType.getParameters());
-        }
-
-        Supertype type = context.getSuperType();            
-        while (!type.getEntityType().equals(declaringType)) {
-            type = type.getEntityType().getSuperType();                
-        }        
-        if (!type.getType().getParameters().isEmpty()) {
-            return type.getType().getParameters().get(index);    
-        } else {
-            // raw type
-            return resolved;
-        }        
-    }
-
-    /**
-     * @param type
-     * @param declaringType
-     * @param context
-     * @return
-     */
-    private static Type resolveWithParameters(Type type, Type declaringType, EntityType context) {
-        Type[] params = new Type[type.getParameters().size()];
-        boolean transformed = false;
-        for (int i = 0; i < type.getParameters().size(); i++) {
-            Type param = type.getParameters().get(i);
-            if (param != null && !param.getFullName().equals(type.getFullName())) {
-                params[i] = resolve(param, declaringType, context);
-                if (!params[i].equals(param)) {
-                    transformed = true;
-                }
-            }
-        }
-        if (transformed) {
-            return new SimpleType(type, params);
-        } else {
-            return type;
-        }
-    }
-    
-    /**
-     * @param type
-     * @return
-     */
-    private static String getVarName(Type type) {
-        if (type instanceof TypeExtends) {
-            return ((TypeExtends)type).getVarName();
-        } else if (type instanceof TypeSuper) {
-            return ((TypeSuper)type).getVarName();
-        } else {
-            return null;
-        }
-    }
-         
-    /**
-     * @param type
-     * @return
-     */
-    private static Type unwrap(Type type) {
-        if (type instanceof EntityType) {
-            return ((EntityType)type).getInnerType();
-        } else {
-            return type;
-        }
-    }
-
-    private TypeResolver() {}
-}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/package-info.java b/querydsl-codegen/src/main/java/com/mysema/query/codegen/package-info.java
deleted file mode 100644
index 297f98c74f..0000000000
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Code generations models and serializers
- */
-package com.mysema.query.codegen;
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/AbstractModule.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/AbstractModule.java
similarity index 83%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/AbstractModule.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/AbstractModule.java
index 1257503692..7581d6fcff 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/AbstractModule.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/AbstractModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ServiceLoader;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
- * AbstractModule provides a base class for annotation based dependency injection
+ * {@code AbstractModule} provides a base class for annotation based dependency injection
  *
  * @author tiwe
  *
@@ -75,15 +76,23 @@ public final <T> AbstractModule bind(Class<T> iface, T implementation) {
         return this;
     }
 
+    public final void loadExtensions() {
+        ServiceLoader<Extension> loader = ServiceLoader.load(Extension.class, Extension.class.getClassLoader());
+
+        for (Extension extension : loader) {
+            extension.addSupport(this);
+        }
+    }
+
     protected abstract void configure();
 
     @SuppressWarnings("unchecked")
     public final <T> T get(Class<T> iface) {
         if (instances.containsKey(iface)) {
-            return (T)instances.get(iface);
+            return (T) instances.get(iface);
         } else if (bindings.containsKey(iface)) {
             Class<?> implementation = bindings.get(iface);
-            T instance = (T)createInstance(implementation);
+            T instance = (T) createInstance(implementation);
             instances.put(iface, instance);
             return instance;
         } else {
@@ -94,11 +103,11 @@ public final <T> T get(Class<T> iface) {
     @SuppressWarnings("unchecked")
     public final <T> T get(Class<T> iface, String name) {
         if (namedInstances.containsKey(name)) {
-            return (T)namedInstances.get(name);
+            return (T) namedInstances.get(name);
         } else if (namedBindings.containsKey(name)) {
             Class<?> implementation = namedBindings.get(name);
             if (implementation != null) {
-                T instance = (T)createInstance(implementation);
+                T instance = (T) createInstance(implementation);
                 namedInstances.put(name, instance);
                 return instance;
             } else {
@@ -113,7 +122,7 @@ public final <T> T get(Class<T> iface, String name) {
     private <T> T createInstance(Class<? extends T> implementation) {
         Constructor<?> constructor = null;
         for (Constructor<?> c : implementation.getConstructors()) {
-            if (c.getAnnotation(Inject.class) != null) {
+            if (c.isAnnotationPresent(Inject.class)) {
                 constructor = c;
                 break;
             }
@@ -123,9 +132,7 @@ private <T> T createInstance(Class<? extends T> implementation) {
         if (constructor == null) {
             try {
                 constructor = implementation.getConstructor();
-            } catch (SecurityException e) {
-                throw new RuntimeException(e);
-            } catch (NoSuchMethodException e) {
+            } catch (SecurityException | NoSuchMethodException e) {
                 throw new RuntimeException(e);
             }
         }
@@ -143,11 +150,7 @@ private <T> T createInstance(Class<? extends T> implementation) {
             try {
                 return (T) constructor.newInstance(args);
                 // TODO : populate fields as well?!?
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
+            } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
 
@@ -160,7 +163,7 @@ private <T> T createInstance(Class<? extends T> implementation) {
     private Named getNamedAnnotation(Annotation[] annotations) {
         for (Annotation annotation : annotations) {
             if (annotation.annotationType().equals(Named.class)) {
-                return (Named)annotation;
+                return (Named) annotation;
             }
         }
         return null;
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/AnnotationHelper.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/AnnotationHelper.java
new file mode 100644
index 0000000000..c61a0fc6f3
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/AnnotationHelper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.lang.annotation.Annotation;
+
+import com.querydsl.codegen.utils.model.TypeCategory;
+
+/**
+ * {@code AnnotationHelper} defines a interface to provide custom annotation processing
+ * for {@link TypeFactory}.
+ *
+ * @author dyorgio
+ */
+public interface AnnotationHelper {
+
+    /**
+     * Verify if AnnotationHelper instance can handle the annotation.
+     * @param annotationClass Annotation class.
+     * @return {@code true} if this AnnotationHelper can handle the annotation.
+     */
+    boolean isSupported(Class<? extends Annotation> annotationClass);
+
+    /**
+     * Get specific object that will be used as part of type cache key.
+     * @param annotation Annotation instance.
+     * @return Any object, normally a annotation param. Can be {@code null}.
+     */
+    Object getCustomKey(Annotation annotation);
+
+    /**
+     * Get the {@link TypeCategory} according with object Class and Annotation.
+     * @param cl Class of type.
+     * @param annotation Annotation found on element.
+     * @return Custom {@link TypeCategory}.
+     */
+    TypeCategory getTypeByAnnotation(Class<?> cl, Annotation annotation);
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java
new file mode 100644
index 0000000000..7d4200d2ba
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.core.util.BeanUtils;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code BeanSerializer} is a {@link Serializer} implementation which serializes {@link EntityType}
+ * instances into JavaBean classes
+ *
+ * @author tiwe
+ */
+public class BeanSerializer implements Serializer {
+
+    public static final String DEFAULT_JAVADOC_SUFFIX = " is a Querydsl bean type";
+
+    public static final boolean DEFAULT_PROPERTY_ANNOTATIONS = true;
+
+    private static final Function<Property, Parameter> propertyToParameter = new Function<Property, Parameter>() {
+        @Override
+        public Parameter apply(Property input) {
+            return new Parameter(input.getName(), input.getType());
+        }
+    };
+    private final Class<? extends Annotation> generatedAnnotationClass;
+
+    private final boolean propertyAnnotations;
+
+    private final List<Type> interfaces = new ArrayList<>();
+
+    private final String javadocSuffix;
+
+    private boolean addToString, addFullConstructor;
+
+    private boolean printSupertype = false;
+
+    /**
+     * Create a new BeanSerializer
+     */
+    public BeanSerializer() {
+        this(DEFAULT_PROPERTY_ANNOTATIONS, DEFAULT_JAVADOC_SUFFIX, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    /**
+     * Create a new BeanSerializer with the given javadoc suffix
+     *
+     * @param javadocSuffix suffix to be used after the simple name in class level javadoc
+     */
+    public BeanSerializer(String javadocSuffix) {
+        this(DEFAULT_PROPERTY_ANNOTATIONS, javadocSuffix);
+    }
+
+    /**
+     * Create a new BeanSerializer with the given javadoc suffix and generatedAnnotationClass
+     *
+     * @param javadocSuffix suffix to be used after the simple name in class level javadoc
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public BeanSerializer(
+            @Named(CodegenModule.JAVADOC_SUFFIX) String javadocSuffix,
+            @Named(CodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        this(DEFAULT_PROPERTY_ANNOTATIONS, javadocSuffix, generatedAnnotationClass);
+    }
+
+    /**
+     * Create a new BeanSerializer
+     *
+     * @param propertyAnnotations true, to serialize property annotations
+     */
+    public BeanSerializer(boolean propertyAnnotations) {
+        this(propertyAnnotations, DEFAULT_JAVADOC_SUFFIX);
+    }
+
+    /**
+     * Create a new BeanSerializer
+     *
+     * @param propertyAnnotations true, to serialize property annotations
+     * @param javadocSuffix       suffix to be used after the simple name in class level javadoc
+     */
+    public BeanSerializer(boolean propertyAnnotations, String javadocSuffix) {
+        this(propertyAnnotations, javadocSuffix, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    /**
+     * Create a new BeanSerializer
+     *
+     * @param propertyAnnotations      true, to serialize property annotations
+     * @param javadocSuffix            suffix to be used after the simple name in class level javadoc
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     *      * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    public BeanSerializer(boolean propertyAnnotations, String javadocSuffix, Class<? extends Annotation> generatedAnnotationClass) {
+        this.propertyAnnotations = propertyAnnotations;
+        this.javadocSuffix = javadocSuffix;
+        this.generatedAnnotationClass = generatedAnnotationClass;
+    }
+
+    @Override
+    public void serialize(
+            EntityType model, SerializerConfig serializerConfig,
+            CodeWriter writer) throws IOException {
+        String simpleName = model.getSimpleName();
+
+        // package
+        if (!model.getPackageName().isEmpty()) {
+            writer.packageDecl(model.getPackageName());
+        }
+
+        // imports
+        Set<String> importedClasses = getAnnotationTypes(model);
+        for (Type iface : interfaces) {
+            importedClasses.add(iface.getFullName());
+        }
+        importedClasses.add(generatedAnnotationClass.getName());
+        if (model.hasLists()) {
+            importedClasses.add(List.class.getName());
+        }
+        if (model.hasCollections()) {
+            importedClasses.add(Collection.class.getName());
+        }
+        if (model.hasSets()) {
+            importedClasses.add(Set.class.getName());
+        }
+        if (model.hasMaps()) {
+            importedClasses.add(Map.class.getName());
+        }
+        if (addToString && model.hasArrays()) {
+            importedClasses.add(Arrays.class.getName());
+        }
+        writer.importClasses(importedClasses.toArray(new String[0]));
+
+        // javadoc
+        writer.javadoc(simpleName + javadocSuffix);
+
+        // header
+        for (Annotation annotation : model.getAnnotations()) {
+            writer.annotation(annotation);
+        }
+
+        writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")");
+
+        if (!interfaces.isEmpty()) {
+            Type superType = null;
+            if (printSupertype && model.getSuperType() != null) {
+                superType = model.getSuperType().getType();
+            }
+            Type[] ifaces = interfaces.toArray(new Type[0]);
+            writer.beginClass(model, superType, ifaces);
+        } else if (printSupertype && model.getSuperType() != null) {
+            writer.beginClass(model, model.getSuperType().getType());
+        } else {
+            writer.beginClass(model);
+        }
+
+
+        bodyStart(model, writer);
+
+        if (addFullConstructor) {
+            addFullConstructor(model, writer);
+        }
+
+        // fields
+        for (Property property : model.getProperties()) {
+            if (propertyAnnotations) {
+                for (Annotation annotation : property.getAnnotations()) {
+                    writer.annotation(annotation);
+                }
+            }
+            writer.privateField(property.getType(), property.getEscapedName());
+        }
+
+        // accessors
+        for (Property property : model.getProperties()) {
+            String propertyName = property.getEscapedName();
+            // getter
+            writer.beginPublicMethod(property.getType(), "get" + BeanUtils.capitalize(propertyName));
+            writer.line("return ", propertyName, ";");
+            writer.end();
+            // setter
+            Parameter parameter = new Parameter(propertyName, property.getType());
+            writer.beginPublicMethod(Types.VOID, "set" + BeanUtils.capitalize(propertyName), parameter);
+            writer.line("this.", propertyName, " = ", propertyName, ";");
+            writer.end();
+        }
+
+        if (addToString) {
+            addToString(model, writer);
+        }
+
+        bodyEnd(model, writer);
+
+        writer.end();
+    }
+
+    protected void addFullConstructor(EntityType model, CodeWriter writer) throws IOException {
+        // public empty constructor
+        writer.beginConstructor();
+        writer.end();
+
+        // full constructor
+        writer.beginConstructor(model.getProperties(), propertyToParameter::apply);
+        for (Property property : model.getProperties()) {
+            writer.line("this.", property.getEscapedName(), " = ", property.getEscapedName(), ";");
+        }
+        writer.end();
+    }
+
+    protected void addToString(EntityType model, CodeWriter writer) throws IOException {
+        writer.line("@Override");
+        writer.beginPublicMethod(Types.STRING, "toString");
+        StringBuilder builder = new StringBuilder();
+        for (Property property : model.getProperties()) {
+            String propertyName = property.getEscapedName();
+            if (builder.length() > 0) {
+                builder.append(" + \", ");
+            } else {
+                builder.append("\"");
+            }
+            builder.append(propertyName).append(" = \" + ");
+            if (property.getType().getCategory() == TypeCategory.ARRAY) {
+                builder.append("Arrays.toString(").append(propertyName).append(")");
+            } else {
+                builder.append(propertyName);
+            }
+        }
+        writer.line(" return ", builder.toString(), ";");
+        writer.end();
+    }
+
+    protected void bodyStart(EntityType model, CodeWriter writer) throws IOException {
+        // template method
+    }
+
+    protected void bodyEnd(EntityType model, CodeWriter writer) throws IOException {
+        // template method
+    }
+
+    private Set<String> getAnnotationTypes(EntityType model) {
+        Set<String> imports = new HashSet<String>();
+        for (Annotation annotation : model.getAnnotations()) {
+            imports.add(annotation.annotationType().getName());
+        }
+        if (propertyAnnotations) {
+            for (Property property : model.getProperties()) {
+                for (Annotation annotation : property.getAnnotations()) {
+                    imports.add(annotation.annotationType().getName());
+                }
+            }
+        }
+        return imports;
+    }
+
+    public void addInterface(Class<?> iface) {
+        interfaces.add(new ClassType(iface));
+    }
+
+    public void addInterface(Type type) {
+        interfaces.add(type);
+    }
+
+    public void setAddToString(boolean addToString) {
+        this.addToString = addToString;
+    }
+
+    public void setAddFullConstructor(boolean addFullConstructor) {
+        this.addFullConstructor = addFullConstructor;
+    }
+
+    public void setPrintSupertype(boolean printSupertype) {
+        this.printSupertype = printSupertype;
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/ClassPathUtils.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/ClassPathUtils.java
new file mode 100644
index 0000000000..803d87adb2
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/ClassPathUtils.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import io.github.classgraph.ClassGraph;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * {@code ClassPathUtils} provides classpath scanning functionality
+ *
+ * @author tiwe
+ */
+public final class ClassPathUtils {
+
+    /**
+     * Return the classes from the given package and subpackages using the supplied classloader
+     *
+     * @param classLoader classloader to be used
+     * @param pkg package to scan
+     * @return set of found classes
+     * @throws IOException
+     */
+    public static Set<Class<?>> scanPackage(ClassLoader classLoader, Package pkg) throws IOException {
+        return scanPackage(classLoader, pkg.getName());
+    }
+
+    /**
+     * Return the classes from the given package and subpackages using the supplied classloader
+     *
+     * @param classLoader classloader to be used
+     * @param pkg package to scan
+     * @return set of found classes
+     * @throws IOException
+     */
+    public static Set<Class<?>> scanPackage(ClassLoader classLoader, String pkg) throws IOException {
+        return new ClassGraph()
+                .enableClassInfo()
+                .acceptPackages(pkg)
+                .rejectPackages("com.sun", "com.apple")
+                .overrideClassLoaders(classLoader)
+                .scan()
+                .getAllClasses()
+                .stream().map(info -> safeClassForName(classLoader, info.getName()))
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Get the class for the given className via the given classLoader
+     *
+     * @param classLoader classloader to be used
+     * @param className fully qualified class name
+     * @return {@code Class} instance matching the class name or null if not found
+     */
+    public static Class<?> safeClassForName(ClassLoader classLoader, String className) {
+        try {
+            if (className.startsWith("com.sun.") || className.startsWith("com.apple.")) {
+                return null;
+            } else {
+                return Class.forName(className, true, classLoader);
+            }
+        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+            return null;
+        }
+    }
+
+    private ClassPathUtils() { }
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/CodegenModule.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/CodegenModule.java
new file mode 100644
index 0000000000..4bd5bd7698
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/CodegenModule.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static com.querydsl.codegen.BeanSerializer.DEFAULT_JAVADOC_SUFFIX;
+
+import java.util.Collections;
+
+/**
+ * {@code CodegenModule} provides a module for general serialization
+ *
+ * @author tiwe
+ *
+ */
+public class CodegenModule  extends AbstractModule {
+
+    /**
+     * key for the query type name prefix
+     */
+    public static final String PREFIX = "prefix";
+
+    /**
+     * key for the query type name suffix
+     */
+    public static final String SUFFIX = "suffix";
+
+    /**
+     * key for the keywords set
+     */
+    public static final String KEYWORDS = "keywords";
+
+    /**
+     * key for the package suffix
+     */
+    public static final String PACKAGE_SUFFIX = "packageSuffix";
+
+    /**
+     * key for the custom imports set
+     */
+    public static final String IMPORTS = "imports";
+
+    /**
+     * key for the variable name function class
+     */
+    public static final String VARIABLE_NAME_FUNCTION_CLASS = "variableNameFunction";
+
+    /**
+     * the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element)
+     * to indicate that these have been generated. Defaults to java's {@code Generated} annotation (depending on java version)
+     */
+    public static final String GENERATED_ANNOTATION_CLASS = "generatedAnnotationClass";
+
+    protected static final String JAVADOC_SUFFIX = "javadocSuffix";
+
+    @Override
+    protected void configure() {
+        bind(TypeMappings.class, JavaTypeMappings.class);
+        bind(QueryTypeFactory.class, QueryTypeFactoryImpl.class);
+        bind(EntitySerializer.class, DefaultEntitySerializer.class);
+        bind(EmbeddableSerializer.class, DefaultEmbeddableSerializer.class);
+        bind(ProjectionSerializer.class, DefaultProjectionSerializer.class);
+        bind(SupertypeSerializer.class, DefaultSupertypeSerializer.class);
+        bind(Filer.class, DefaultFiler.class);
+
+        // configuration for QueryTypeFactory
+        bind(PREFIX, "Q");
+        bind(SUFFIX, "");
+        bind(PACKAGE_SUFFIX, "");
+        bind(KEYWORDS, Collections.<String>emptySet());
+        bind(IMPORTS, Collections.<String>emptySet());
+        bind(VARIABLE_NAME_FUNCTION_CLASS, DefaultVariableNameFunction.INSTANCE);
+        bindInstance(GENERATED_ANNOTATION_CLASS, GeneratedAnnotationResolver.resolveDefault());
+        bind(JAVADOC_SUFFIX, DEFAULT_JAVADOC_SUFFIX);
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java
new file mode 100644
index 0000000000..819c18147e
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static com.querydsl.codegen.utils.Symbols.UNCHECKED;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * {@code EmbeddableSerializer} is a {@link Serializer} implementation for embeddable types
+ *
+ * @author tiwe
+ *
+ */
+public final class DefaultEmbeddableSerializer extends DefaultEntitySerializer implements EmbeddableSerializer {
+
+    /**
+     * Create a new {@code EmbeddableSerializer} instance
+     *
+     * @param typeMappings type mappings to be used
+     * @param keywords keywords to be used
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public DefaultEmbeddableSerializer(
+            TypeMappings typeMappings,
+            @Named(CodegenModule.KEYWORDS) Collection<String> keywords,
+            @Named(CodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        super(typeMappings, keywords, generatedAnnotationClass);
+    }
+
+    /**
+     * Create a new {@code EmbeddableSerializer} instance.
+     *
+     * @param typeMappings type mappings to be used
+     * @param keywords keywords to be used
+     */
+    public DefaultEmbeddableSerializer(
+            TypeMappings typeMappings,
+            Collection<String> keywords) {
+        this(typeMappings, keywords, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    @Override
+    @SuppressWarnings(UNCHECKED)
+    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
+        Type queryType = typeMappings.getPathType(model, model, true);
+
+        TypeCategory category = model.getOriginalCategory();
+        Class<? extends Path> pathType;
+        if (model.getProperties().isEmpty()) {
+            switch (category) {
+                case COMPARABLE : pathType = ComparablePath.class; break;
+                case ENUM: pathType = EnumPath.class; break;
+                case DATE: pathType = DatePath.class; break;
+                case DATETIME: pathType = DateTimePath.class; break;
+                case TIME: pathType = TimePath.class; break;
+                case NUMERIC: pathType = NumberPath.class; break;
+                case STRING: pathType = StringPath.class; break;
+                case BOOLEAN: pathType = BooleanPath.class; break;
+                default : pathType = BeanPath.class;
+            }
+        } else {
+            pathType = BeanPath.class;
+        }
+
+        for (Annotation annotation : model.getAnnotations()) {
+            writer.annotation(annotation);
+        }
+
+        writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")");
+
+        if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) {
+            writer.beginClass(queryType, new ClassType(pathType));
+        } else {
+            writer.beginClass(queryType, new ClassType(category, pathType, model));
+        }
+
+        // TODO : generate proper serialVersionUID here
+        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", model.hashCode() + "L");
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java
new file mode 100644
index 0000000000..1dbe0b7955
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java
@@ -0,0 +1,847 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static com.querydsl.codegen.utils.Symbols.*;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.*;
+import java.util.function.Function;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * {@code EntitySerializer} is a {@link Serializer} implementation for entity types
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultEntitySerializer implements EntitySerializer {
+
+    private static final Parameter PATH_METADATA = new Parameter("metadata", new ClassType(PathMetadata.class));
+
+    private static final Parameter PATH_INITS = new Parameter("inits", new ClassType(PathInits.class));
+
+    private static final ClassType PATH_INITS_TYPE = new ClassType(PathInits.class);
+
+    protected final TypeMappings typeMappings;
+
+    protected final Collection<String> keywords;
+
+    protected final Class<? extends Annotation> generatedAnnotationClass;
+
+    /**
+     * Create a new {@code EntitySerializer} instance
+     *
+     * @param mappings type mappings to be used
+     * @param keywords keywords to be used
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public DefaultEntitySerializer(
+            TypeMappings mappings,
+            @Named(CodegenModule.KEYWORDS) Collection<String> keywords,
+            @Named(CodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        this.typeMappings = mappings;
+        this.keywords = keywords;
+        this.generatedAnnotationClass = generatedAnnotationClass;
+    }
+
+    /**
+     * Create a new {@code EntitySerializer} instance
+     *
+     * @param mappings type mappings to be used
+     * @param keywords keywords to be used
+     */
+    public DefaultEntitySerializer(TypeMappings mappings, Collection<String> keywords) {
+        this(mappings, keywords, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    private boolean superTypeHasEntityFields(EntityType model) {
+        Supertype superType = model.getSuperType();
+        return null != superType && null != superType.getEntityType()
+                && superType.getEntityType().hasEntityFields();
+    }
+
+    protected void constructors(EntityType model, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+
+        String localName = writer.getRawName(model);
+        String genericName = writer.getGenericName(true, model);
+
+        boolean hasEntityFields = model.hasEntityFields() || superTypeHasEntityFields(model);
+        boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING
+                || model.getOriginalCategory() == TypeCategory.BOOLEAN;
+        String thisOrSuper = hasEntityFields ? THIS : SUPER;
+        String additionalParams = getAdditionalConstructorParameter(model);
+        String classCast = localName.equals(genericName) ? EMPTY : "(Class) ";
+
+
+        // String
+        constructorsForVariables(writer, model);
+
+        // Path
+        if (!localName.equals(genericName)) {
+            suppressAllWarnings(writer);
+        }
+        Type simpleModel = new SimpleType(model);
+        if (model.isFinal()) {
+            Type type = new ClassType(Path.class, simpleModel);
+            writer.beginConstructor(new Parameter("path", type));
+        } else {
+            Type type = new ClassType(Path.class, new TypeExtends(simpleModel));
+            writer.beginConstructor(new Parameter("path", type));
+        }
+
+        if (!hasEntityFields) {
+            if (stringOrBoolean) {
+                writer.line("super(path.getMetadata());");
+            } else {
+                writer.line("super(", classCast, "path.getType(), path.getMetadata()" + additionalParams + ");");
+            }
+            constructorContent(writer, model);
+        } else {
+            writer.line("this(", classCast, "path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));");
+        }
+        writer.end();
+
+        // PathMetadata
+        if (hasEntityFields) {
+            writer.beginConstructor(PATH_METADATA);
+            writer.line("this(metadata, PathInits.getFor(metadata, INITS));");
+            writer.end();
+        } else {
+            if (!localName.equals(genericName)) {
+                suppressAllWarnings(writer);
+            }
+            writer.beginConstructor(PATH_METADATA);
+            if (stringOrBoolean) {
+                writer.line("super(metadata);");
+            } else {
+                writer.line("super(", classCast, writer.getClassConstant(localName) + COMMA + "metadata" + additionalParams + ");");
+            }
+            constructorContent(writer, model);
+            writer.end();
+        }
+
+        // PathMetadata, PathInits
+        if (hasEntityFields) {
+            if (!localName.equals(genericName)) {
+                suppressAllWarnings(writer);
+            }
+            writer.beginConstructor(PATH_METADATA, PATH_INITS);
+            writer.line(thisOrSuper, "(", classCast, writer.getClassConstant(localName) + COMMA + "metadata, inits" + additionalParams + ");");
+            if (!hasEntityFields) {
+                constructorContent(writer, model);
+            }
+            writer.end();
+        }
+
+        // Class, PathMetadata, PathInits
+        if (hasEntityFields) {
+            Type type = new ClassType(Class.class, new TypeExtends(model));
+            writer.beginConstructor(new Parameter("type", type), PATH_METADATA, PATH_INITS);
+            writer.line("super(type, metadata, inits" + additionalParams + ");");
+            initEntityFields(writer, config, model);
+            constructorContent(writer, model);
+            writer.end();
+        }
+
+    }
+
+    protected void constructorContent(CodeWriter writer, EntityType model) throws IOException {
+        // override in subclasses
+    }
+
+    protected String getAdditionalConstructorParameter(EntityType model) {
+        return "";
+    }
+
+    protected void constructorsForVariables(CodeWriter writer, EntityType model) throws IOException {
+        String localName = writer.getRawName(model);
+        String genericName = writer.getGenericName(true, model);
+
+        boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING
+                || model.getOriginalCategory() == TypeCategory.BOOLEAN;
+        boolean hasEntityFields = model.hasEntityFields() || superTypeHasEntityFields(model);
+        String thisOrSuper = hasEntityFields ? THIS : SUPER;
+        String additionalParams = hasEntityFields ? "" : getAdditionalConstructorParameter(model);
+
+        if (!localName.equals(genericName)) {
+            suppressAllWarnings(writer);
+        }
+        writer.beginConstructor(new Parameter("variable", Types.STRING));
+        if (stringOrBoolean) {
+            writer.line(thisOrSuper,"(forVariable(variable)",additionalParams,");");
+        } else {
+            writer.line(thisOrSuper,"(", localName.equals(genericName) ? EMPTY : "(Class) ",
+            writer.getClassConstant(localName) + COMMA + "forVariable(variable)", hasEntityFields ? ", INITS" : EMPTY,
+                            additionalParams,");");
+        }
+        if (!hasEntityFields) {
+            constructorContent(writer, model);
+        }
+        writer.end();
+    }
+
+    protected void entityAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
+        Type queryType = typeMappings.getPathType(field.getType(), model, false);
+        writer.beginPublicMethod(queryType, field.getEscapedName());
+        writer.line("if (", field.getEscapedName(), " == null) {");
+        writer.line("    ", field.getEscapedName(), " = new ", writer.getRawName(queryType),
+                "(forProperty(\"", field.getName(), "\"));");
+        writer.line("}");
+        writer.line(RETURN, field.getEscapedName(), SEMICOLON);
+        writer.end();
+    }
+
+    protected void entityField(EntityType model, Property field, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        Type queryType = typeMappings.getPathType(field.getType(), model, false);
+        if (field.isInherited()) {
+            writer.line("// inherited");
+        }
+        if (config.useEntityAccessors()) {
+            writer.protectedField(queryType, field.getEscapedName());
+        } else {
+            writer.publicFinal(queryType, field.getEscapedName());
+        }
+    }
+
+    protected boolean hasOwnEntityProperties(EntityType model) {
+        if (model.hasEntityFields()) {
+            for (Property property : model.getProperties()) {
+                if (!property.isInherited() && property.getType().getCategory() == TypeCategory.ENTITY) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    protected void initEntityFields(CodeWriter writer, SerializerConfig config,
+            EntityType model) throws IOException {
+        Supertype superType = model.getSuperType();
+        if (superType != null) {
+            EntityType entityType = superType.getEntityType();
+            if (entityType != null && entityType.hasEntityFields()) {
+                Type superQueryType = typeMappings.getPathType(entityType, model, false);
+                writer.line("this._super = new " + writer.getRawName(superQueryType) + "(type, metadata, inits);");
+            }
+        }
+
+        for (Property field : model.getProperties()) {
+            if (field.getType().getCategory() == TypeCategory.ENTITY) {
+                initEntityField(writer, config, model, field);
+
+            } else if (field.isInherited() && superType != null && superType.getEntityType().hasEntityFields()) {
+                writer.line("this.", field.getEscapedName(), " = _super.", field.getEscapedName(), SEMICOLON);
+            }
+        }
+    }
+
+    protected void initEntityField(CodeWriter writer, SerializerConfig config, EntityType model,
+            Property field) throws IOException {
+        Type queryType = typeMappings.getPathType(field.getType(), model, false);
+        if (!field.isInherited()) {
+            boolean hasEntityFields = field.getType() instanceof EntityType
+                    && ((EntityType) field.getType()).hasEntityFields();
+            writer.line("this." + field.getEscapedName() + ASSIGN,
+                "inits.isInitialized(\"" + field.getName() + "\") ? ",
+                NEW + writer.getRawName(queryType) + "(forProperty(\"" + field.getName() + "\")",
+                hasEntityFields ? (", inits.get(\"" + field.getName() + "\")") : EMPTY,
+                ") : null;");
+        } else if (!config.useEntityAccessors()) {
+            writer.line("this.", field.getEscapedName(), ASSIGN, "_super.", field.getEscapedName(), SEMICOLON);
+        }
+    }
+
+    protected void intro(EntityType model, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        introPackage(writer, model);
+        introImports(writer, config, model);
+
+        writer.nl();
+
+        introJavadoc(writer, model);
+        introClassHeader(writer, model);
+
+        introFactoryMethods(writer, model);
+        introInits(writer, model);
+        if (config.createDefaultVariable()) {
+            introDefaultInstance(writer, model, config.defaultVariableName());
+        }
+        if (model.getSuperType() != null && model.getSuperType().getEntityType() != null) {
+            introSuper(writer, model);
+        }
+    }
+
+    @SuppressWarnings(UNCHECKED)
+    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
+        Type queryType = typeMappings.getPathType(model, model, true);
+
+        TypeCategory category = model.getOriginalCategory();
+        Class<? extends Path> pathType;
+
+        if (model.getProperties().isEmpty()) {
+            switch (category) {
+                case COMPARABLE : pathType = ComparablePath.class; break;
+                case ENUM: pathType = EnumPath.class; break;
+                case DATE: pathType = DatePath.class; break;
+                case DATETIME: pathType = DateTimePath.class; break;
+                case TIME: pathType = TimePath.class; break;
+                case NUMERIC: pathType = NumberPath.class; break;
+                case STRING: pathType = StringPath.class; break;
+                case BOOLEAN: pathType = BooleanPath.class; break;
+                default : pathType = EntityPathBase.class;
+            }
+        } else {
+            pathType = EntityPathBase.class;
+        }
+
+        for (Annotation annotation : model.getAnnotations()) {
+            writer.annotation(annotation);
+        }
+
+        writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")");
+
+        if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) {
+            writer.beginClass(queryType, new ClassType(pathType));
+        } else {
+            writer.beginClass(queryType, new ClassType(category, pathType, model));
+        }
+
+        // TODO : generate proper serialVersionUID here
+        long serialVersionUID = model.getFullName().hashCode();
+        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", serialVersionUID + "L");
+    }
+
+    protected void introDefaultInstance(CodeWriter writer, EntityType model, String defaultName) throws IOException {
+        String simpleName = !defaultName.isEmpty() ? defaultName : model.getModifiedSimpleName();
+        Type queryType = typeMappings.getPathType(model, model, true);
+        String alias = simpleName;
+        if (keywords.contains(simpleName.toUpperCase())) {
+            alias += "1";
+        }
+        writer.publicStaticFinal(queryType, simpleName, NEW + queryType.getSimpleName() + "(\"" + alias + "\")");
+
+    }
+
+    protected void introFactoryMethods(CodeWriter writer, final EntityType model) throws IOException {
+        String localName = writer.getRawName(model);
+        String genericName = writer.getGenericName(true, model);
+        Set<Integer> sizes = new HashSet<>();
+
+        for (Constructor c : model.getConstructors()) {
+            // begin
+            if (!localName.equals(genericName)) {
+                writer.suppressWarnings(UNCHECKED);
+            }
+            Type returnType = new ClassType(ConstructorExpression.class, model);
+            final boolean asExpr = sizes.add(c.getParameters().size());
+            writer.beginStaticMethod(returnType, "create", c.getParameters(),
+                    new Function<Parameter, Parameter>() {
+                @Override
+                public Parameter apply(Parameter p) {
+                    Type type;
+                    if (!asExpr) {
+                        type = typeMappings.getExprType(
+                                p.getType(), model, false, false, true);
+                    } else if (p.getType().isFinal()) {
+                        type = new ClassType(Expression.class, p.getType());
+                    } else {
+                        type = new ClassType(Expression.class, new TypeExtends(p.getType()));
+                    }
+                    return new Parameter(p.getName(), type);
+                }
+            });
+
+            // body
+            // TODO : replace with class reference
+            writer.beginLine("return Projections.constructor(");
+//            if (!localName.equals(genericName)) {
+//                writer.append("(Class)");
+//            }
+            writer.append(writer.getClassConstant(localName));
+            writer.append(", new Class<?>[]{");
+            boolean first = true;
+            for (Parameter p : c.getParameters()) {
+                if (!first) {
+                    writer.append(COMMA);
+                }
+                if (Types.PRIMITIVES.containsKey(p.getType())) {
+                    Type primitive = Types.PRIMITIVES.get(p.getType());
+                    writer.append(writer.getClassConstant(primitive.getFullName()));
+                } else {
+                    writer.append(writer.getClassConstant(writer.getRawName(p.getType())));
+                }
+                first = false;
+            }
+            writer.append("}");
+
+            for (Parameter p : c.getParameters()) {
+                writer.append(COMMA).append(p.getName());
+            }
+
+            // end
+            writer.append(");\n");
+            writer.end();
+        }
+    }
+
+    protected void introImports(CodeWriter writer, SerializerConfig config,
+            EntityType model) throws IOException {
+        writer.staticimports(PathMetadataFactory.class);
+
+        // import package of query type
+        Type queryType = typeMappings.getPathType(model, model, true);
+        if (!model.getPackageName().isEmpty()
+            && !queryType.getPackageName().equals(model.getPackageName())
+            && !queryType.getSimpleName().equals(model.getSimpleName())) {
+            String fullName = model.getFullName();
+            String packageName = model.getPackageName();
+            if (fullName.substring(packageName.length() + 1).contains(".")) {
+                fullName = fullName.substring(0, fullName.lastIndexOf('.'));
+            }
+            writer.importClasses(fullName);
+        }
+
+        // delegate packages
+        introDelegatePackages(writer, model);
+
+        // other packages
+        writer.imports(SimpleExpression.class.getPackage());
+
+        // other classes
+        List<Class<?>> classes = new ArrayList<>();
+        classes.add(PathMetadata.class);
+        classes.add(generatedAnnotationClass);
+
+        if (!getUsedClassNames(model).contains("Path")) {
+            classes.add(Path.class);
+        }
+        if (!model.getConstructors().isEmpty()) {
+            classes.add(ConstructorExpression.class);
+            classes.add(Projections.class);
+            classes.add(Expression.class);
+        }
+        boolean inits = false;
+        if (model.hasEntityFields() || model.hasInits()) {
+            inits = true;
+        } else {
+            Set<TypeCategory> collections = EnumSet.of(TypeCategory.COLLECTION, TypeCategory.LIST, TypeCategory.SET);
+            for (Property property : model.getProperties()) {
+                if (!property.isInherited() && collections.contains(property.getType().getCategory())) {
+                    inits = true;
+                    break;
+                }
+            }
+        }
+        if (inits) {
+            classes.add(PathInits.class);
+        }
+        writer.imports(classes.toArray(new Class<?>[0]));
+    }
+
+    private Set<String> getUsedClassNames(EntityType model) {
+        Set<String> result = new HashSet<>();
+        result.add(model.getSimpleName());
+        for (Property property : model.getProperties()) {
+            result.add(property.getType().getSimpleName());
+            for (Type type : property.getType().getParameters()) {
+                if (type != null) {
+                    result.add(type.getSimpleName());
+                }
+            }
+        }
+        return result;
+    }
+
+    protected boolean isImportExprPackage(EntityType model) {
+        if (!model.getConstructors().isEmpty() || !model.getDelegates().isEmpty()) {
+            boolean importExprPackage = false;
+            for (Constructor c : model.getConstructors()) {
+                for (Parameter cp : c.getParameters()) {
+                    importExprPackage |= cp.getType().getPackageName()
+                            .equals(ComparableExpression.class.getPackage().getName());
+                }
+            }
+            for (Delegate d : model.getDelegates()) {
+                for (Parameter dp : d.getParameters()) {
+                    importExprPackage |= dp.getType().getPackageName()
+                            .equals(ComparableExpression.class.getPackage().getName());
+                }
+            }
+            return importExprPackage;
+
+        } else {
+            return false;
+        }
+    }
+
+    protected void introDelegatePackages(CodeWriter writer, EntityType model) throws IOException {
+        Set<String> packages = new HashSet<String>();
+        for (Delegate delegate : model.getDelegates()) {
+            if (!delegate.getDelegateType().getPackageName().equals(model.getPackageName())) {
+                packages.add(delegate.getDelegateType().getPackageName());
+            }
+        }
+        writer.importPackages(packages.toArray(new String[0]));
+    }
+
+    protected void introInits(CodeWriter writer, EntityType model) throws IOException {
+        List<String> inits = new ArrayList<String>();
+        for (Property property : model.getProperties()) {
+            for (String init : property.getInits()) {
+                inits.add(property.getEscapedName() + DOT + init);
+            }
+        }
+        if (!inits.isEmpty()) {
+            inits.add(0, STAR);
+            String initsAsString = QUOTE + String.join("\", \"", inits) + QUOTE;
+            writer.privateStaticFinal(PATH_INITS_TYPE, "INITS", "new PathInits(" + initsAsString + ")");
+        } else if (model.hasEntityFields() || superTypeHasEntityFields(model)) {
+            writer.privateStaticFinal(PATH_INITS_TYPE, "INITS", "PathInits.DIRECT2");
+        }
+    }
+
+    protected void introJavadoc(CodeWriter writer, EntityType model) throws IOException {
+        Type queryType = typeMappings.getPathType(model, model, true);
+        writer.javadoc(queryType.getSimpleName() + " is a Querydsl query type for " +
+        model.getSimpleName());
+    }
+
+    protected void introPackage(CodeWriter writer, EntityType model) throws IOException {
+        Type queryType = typeMappings.getPathType(model, model, false);
+        if (!queryType.getPackageName().isEmpty()) {
+            writer.packageDecl(queryType.getPackageName());
+        }
+    }
+
+    protected void introSuper(CodeWriter writer, EntityType model) throws IOException {
+        EntityType superType = model.getSuperType().getEntityType();
+        Type superQueryType = typeMappings.getPathType(superType, model, false);
+        if (!superType.hasEntityFields()) {
+            writer.publicFinal(superQueryType, "_super", NEW + writer.getRawName(superQueryType) + "(this)");
+        } else {
+            writer.publicFinal(superQueryType, "_super");
+        }
+    }
+
+    protected void listAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
+        String escapedName = field.getEscapedName();
+        Type queryType = typeMappings.getPathType(field.getParameter(0), model, false);
+
+        writer.beginPublicMethod(queryType, escapedName, new Parameter("index", Types.INT));
+        writer.line(RETURN + escapedName + ".get(index);").end();
+
+        writer.beginPublicMethod(queryType, escapedName, new Parameter("index",
+                new ClassType(Expression.class, Types.INTEGER)));
+        writer.line(RETURN + escapedName + ".get(index);").end();
+    }
+
+    protected void mapAccessor(EntityType model, Property field, CodeWriter writer) throws IOException {
+        String escapedName = field.getEscapedName();
+        Type queryType = typeMappings.getPathType(field.getParameter(1), model, false);
+
+        writer.beginPublicMethod(queryType, escapedName, new Parameter("key", field.getParameter(0)));
+        writer.line(RETURN + escapedName + ".get(key);").end();
+
+        writer.beginPublicMethod(queryType, escapedName, new Parameter("key",
+                new ClassType(Expression.class, field.getParameter(0))));
+        writer.line(RETURN + escapedName + ".get(key);").end();
+    }
+
+    private void delegate(final EntityType model, Delegate delegate, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        Parameter[] params = delegate.getParameters().toArray(new Parameter[0]);
+        writer.beginPublicMethod(delegate.getReturnType(), delegate.getName(), params);
+
+        // body start
+        writer.beginLine(RETURN + writer.getRawName(delegate.getDelegateType()) + "." + delegate.getName() + "(");
+        writer.append("this");
+        if (!model.equals(delegate.getDeclaringType())) {
+            int counter = 0;
+            EntityType type = model;
+            while (type != null && !type.equals(delegate.getDeclaringType())) {
+                type = type.getSuperType() != null ? type.getSuperType().getEntityType() : null;
+                counter++;
+            }
+            for (int i = 0; i < counter; i++) {
+                writer.append("._super");
+            }
+        }
+        for (Parameter parameter : delegate.getParameters()) {
+            writer.append(COMMA).append(parameter.getName());
+        }
+        writer.append(");\n");
+
+        // body end
+        writer.end();
+    }
+
+    protected void outro(EntityType model, CodeWriter writer) throws IOException {
+        writer.end();
+    }
+
+    @Override
+    public void serialize(EntityType model, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        intro(model, config, writer);
+
+        // properties
+        serializeProperties(model, config, writer);
+
+        // constructors
+        constructors(model, config, writer);
+
+        // delegates
+        for (Delegate delegate : model.getDelegates()) {
+            delegate(model, delegate, config, writer);
+        }
+
+        // property accessors
+        for (Property property : model.getProperties()) {
+            TypeCategory category = property.getType().getCategory();
+            if (category == TypeCategory.MAP && config.useMapAccessors()) {
+                mapAccessor(model, property, writer);
+            } else if (category == TypeCategory.LIST && config.useListAccessors()) {
+                listAccessor(model, property, writer);
+            } else if (category == TypeCategory.ENTITY && config.useEntityAccessors()) {
+                entityAccessor(model, property, writer);
+            }
+        }
+        outro(model, writer);
+    }
+
+    protected void serialize(EntityType model, Property field, Type type, CodeWriter writer,
+            String factoryMethod, String... args) throws IOException {
+        Supertype superType = model.getSuperType();
+        // construct value
+        StringBuilder value = new StringBuilder();
+        if (field.isInherited() && superType != null) {
+            if (!superType.getEntityType().hasEntityFields()) {
+                value.append("_super.").append(field.getEscapedName());
+            }
+        } else {
+            value.append(factoryMethod).append("(\"").append(field.getName()).append(QUOTE);
+            for (String arg : args) {
+                value.append(COMMA).append(arg);
+            }
+            value.append(")");
+        }
+
+        // serialize it
+        if (field.isInherited()) {
+            writer.line("//inherited");
+        }
+        if (value.length() > 0) {
+            writer.publicFinal(type, field.getEscapedName(), value.toString());
+        } else {
+            writer.publicFinal(type, field.getEscapedName());
+        }
+    }
+
+    protected void customField(EntityType model, Property field, SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        Type queryType = typeMappings.getPathType(field.getType(), model, false);
+        writer.line("// custom");
+        if (field.isInherited()) {
+            writer.line("// inherited");
+            Supertype superType = model.getSuperType();
+            if (!superType.getEntityType().hasEntityFields()) {
+                String value = NEW + writer.getRawName(queryType) + "(_super." + field.getEscapedName() + ")";
+                writer.publicFinal(queryType, field.getEscapedName(), value);
+            } else {
+                writer.publicFinal(queryType, field.getEscapedName());
+            }
+        } else {
+            String value = NEW + writer.getRawName(queryType) + "(forProperty(\"" + field.getName() + "\"))";
+            writer.publicFinal(queryType, field.getEscapedName(), value);
+        }
+    }
+
+    // TODO move this to codegen
+    private Type wrap(Type type) {
+        if (type.equals(Types.BOOLEAN_P)) {
+            return Types.BOOLEAN;
+        } else if (type.equals(Types.BYTE_P)) {
+            return Types.BYTE;
+        } else if (type.equals(Types.CHAR)) {
+            return Types.CHARACTER;
+        } else if (type.equals(Types.DOUBLE_P)) {
+            return Types.DOUBLE;
+        } else if (type.equals(Types.FLOAT_P)) {
+            return Types.FLOAT;
+        } else if (type.equals(Types.INT)) {
+            return Types.INTEGER;
+        } else if (type.equals(Types.LONG_P)) {
+            return Types.LONG;
+        } else if (type.equals(Types.SHORT_P)) {
+            return Types.SHORT;
+        } else {
+            return type;
+        }
+    }
+
+    protected void serializeProperties(EntityType model,  SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        for (Property property : model.getProperties()) {
+            // FIXME : the custom types should have the custom type category
+            if (typeMappings.isRegistered(property.getType())
+                    && property.getType().getCategory() != TypeCategory.CUSTOM
+                    && property.getType().getCategory() != TypeCategory.ENTITY) {
+                customField(model, property, config, writer);
+                continue;
+            }
+
+            // strips of "? extends " etc
+            Type propertyType = new SimpleType(property.getType(), property.getType().getParameters());
+            Type queryType = typeMappings.getPathType(propertyType, model, false);
+            Type genericQueryType = null;
+            String localRawName = writer.getRawName(property.getType());
+            String inits = getInits(property);
+
+            switch (property.getType().getCategory()) {
+            case STRING:
+                serialize(model, property, queryType, writer, "createString");
+                break;
+
+            case BOOLEAN:
+                serialize(model, property, queryType, writer, "createBoolean");
+                break;
+
+            case SIMPLE:
+                serialize(model, property, queryType, writer, "createSimple", writer.getClassConstant(localRawName));
+                break;
+
+            case COMPARABLE:
+                serialize(model, property, queryType, writer, "createComparable", writer.getClassConstant(localRawName));
+                break;
+
+            case ENUM:
+                serialize(model, property, queryType, writer, "createEnum", writer.getClassConstant(localRawName));
+                break;
+
+            case DATE:
+                serialize(model, property, queryType, writer, "createDate", writer.getClassConstant(localRawName));
+                break;
+
+            case DATETIME:
+                serialize(model, property, queryType, writer, "createDateTime", writer.getClassConstant(localRawName));
+                break;
+
+            case TIME:
+                serialize(model, property, queryType, writer, "createTime", writer.getClassConstant(localRawName));
+                break;
+
+            case NUMERIC:
+                serialize(model, property, queryType, writer, "createNumber", writer.getClassConstant(localRawName));
+                break;
+
+            case CUSTOM:
+                customField(model, property, config, writer);
+                break;
+
+            case ARRAY:
+                serialize(model, property, new ClassType(ArrayPath.class,
+                        property.getType(),
+                        wrap(property.getType().getComponentType())),
+                        writer, "createArray", writer.getClassConstant(localRawName));
+                break;
+
+            case COLLECTION:
+                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
+                String genericKey = writer.getGenericName(true, property.getParameter(0));
+                localRawName = writer.getRawName(property.getParameter(0));
+                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
+
+                serialize(model, property, new ClassType(CollectionPath.class, getRaw(property.getParameter(0)), genericQueryType),
+                        writer, "this.<" + genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createCollection",
+                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
+                break;
+
+            case SET:
+                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
+                genericKey = writer.getGenericName(true, property.getParameter(0));
+                localRawName = writer.getRawName(property.getParameter(0));
+                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
+
+                serialize(model, property, new ClassType(SetPath.class, getRaw(property.getParameter(0)), genericQueryType),
+                        writer, "this.<" + genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createSet",
+                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
+                break;
+
+            case LIST:
+                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false);
+                genericKey = writer.getGenericName(true, property.getParameter(0));
+                localRawName = writer.getRawName(property.getParameter(0));
+                queryType = typeMappings.getPathType(property.getParameter(0), model, true);
+
+                serialize(model, property, new ClassType(ListPath.class, getRaw(property.getParameter(0)), genericQueryType),
+                        writer, "this.<" + genericKey + COMMA + writer.getGenericName(true, genericQueryType) + ">createList",
+                        writer.getClassConstant(localRawName), writer.getClassConstant(writer.getRawName(queryType)), inits);
+                break;
+
+            case MAP:
+                genericKey = writer.getGenericName(true, property.getParameter(0));
+                String genericValue = writer.getGenericName(true, property.getParameter(1));
+                genericQueryType = typeMappings.getPathType(getRaw(property.getParameter(1)), model, false);
+                String keyType = writer.getRawName(property.getParameter(0));
+                String valueType = writer.getRawName(property.getParameter(1));
+                queryType = typeMappings.getPathType(property.getParameter(1), model, true);
+
+                serialize(model, property, new ClassType(MapPath.class, getRaw(property.getParameter(0)),
+                        getRaw(property.getParameter(1)), genericQueryType),
+                        writer, "this.<" + genericKey + COMMA + genericValue + COMMA +
+                            writer.getGenericName(true, genericQueryType) + ">createMap",
+                 writer.getClassConstant(keyType), writer.getClassConstant(valueType), writer.getClassConstant(writer.getRawName(queryType)));
+                break;
+
+            case ENTITY:
+                entityField(model, property, config, writer);
+                break;
+            }
+        }
+    }
+
+    private String getInits(Property property) {
+        if (!property.getInits().isEmpty()) {
+            return "INITS.get(\"" + property.getName() + "\")";
+        } else {
+            return "PathInits.DIRECT2";
+        }
+    }
+
+    private Type getRaw(Type type) {
+        if (type instanceof EntityType && type.getPackageName().startsWith("ext.java")) {
+            return type;
+        } else {
+            return new SimpleType(type, type.getParameters());
+        }
+    }
+
+    private static CodeWriter suppressAllWarnings(CodeWriter writer) throws IOException {
+        return writer.suppressWarnings("all", "rawtypes", "unchecked");
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultFiler.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultFiler.java
new file mode 100644
index 0000000000..c40f905ea1
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultFiler.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+
+/**
+ * creates files with {@link javax.annotation.processing.Filer}.
+ *
+ * @author f43nd1r
+ */
+public class DefaultFiler implements Filer {
+    @Override
+    public Writer createFile(ProcessingEnvironment processingEnvironment, String classname, Collection<? extends Element> elements) throws IOException {
+        return processingEnvironment.getFiler().createSourceFile(classname, elements.toArray(new Element[0])).openWriter();
+    }
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java
new file mode 100644
index 0000000000..0010e6b260
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.io.IOException;
+
+import java.util.HashSet;
+import java.lang.annotation.Annotation;
+import java.util.Set;
+import java.util.function.Function;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * {@code ProjectionSerializer} is a {@link Serializer} implementation for projection types
+ *
+ * @author tiwe
+ *
+ */
+public final class DefaultProjectionSerializer implements ProjectionSerializer {
+
+    private final Class<? extends Annotation> generatedAnnotationClass;
+    private final TypeMappings typeMappings;
+
+    /**
+     * Create a new {@code ProjectionSerializer} instance
+     *
+     * @param typeMappings type mappings to be used
+     */
+    public DefaultProjectionSerializer(TypeMappings typeMappings) {
+        this(typeMappings, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    /**
+     * Create a new {@code ProjectionSerializer} instance
+     *
+     * @param typeMappings type mappings to be used
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public DefaultProjectionSerializer(
+            TypeMappings typeMappings,
+            @Named(CodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        this.typeMappings = typeMappings;
+        this.generatedAnnotationClass = generatedAnnotationClass;
+    }
+
+    protected void intro(EntityType model, CodeWriter writer) throws IOException {
+        String simpleName = model.getSimpleName();
+        Type queryType = typeMappings.getPathType(model, model, false);
+
+        // package
+        if (!queryType.getPackageName().isEmpty()) {
+            writer.packageDecl(queryType.getPackageName());
+        }
+
+        // imports
+        writer.imports(NumberExpression.class.getPackage());
+        writer.imports(ConstructorExpression.class, generatedAnnotationClass);
+
+        Set<Integer> sizes = new HashSet<>();
+        for (Constructor c : model.getConstructors()) {
+            sizes.add(c.getParameters().size());
+        }
+        if (sizes.size() != model.getConstructors().size()) {
+            writer.imports(Expression.class);
+        }
+
+        // javadoc
+        writer.javadoc(queryType + " is a Querydsl Projection type for " + simpleName);
+
+        writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")");
+
+        // class header
+//        writer.suppressWarnings("serial");
+        Type superType = new ClassType(TypeCategory.SIMPLE, ConstructorExpression.class, model);
+        writer.beginClass(queryType, superType);
+        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", model.hashCode() + "L");
+    }
+
+    protected void outro(EntityType model, CodeWriter writer) throws IOException {
+        writer.end();
+    }
+
+    @Override
+    public void serialize(final EntityType model, SerializerConfig serializerConfig,
+            CodeWriter writer) throws IOException {
+        // intro
+        intro(model, writer);
+
+        String localName = writer.getRawName(model);
+        Set<Integer> sizes = new HashSet<>();
+
+        for (Constructor c : model.getConstructors()) {
+            final boolean asExpr = sizes.add(c.getParameters().size());
+            // begin
+            writer.beginConstructor(c.getParameters(), new Function<Parameter,Parameter>() {
+                @Override
+                public Parameter apply(Parameter p) {
+                    Type type;
+                    if (!asExpr) {
+                        type = typeMappings.getExprType(p.getType(),
+                                model, false, false, true);
+                    } else if (p.getType().isFinal()) {
+                        type = new ClassType(Expression.class, p.getType());
+                    } else {
+                        type = new ClassType(Expression.class, new TypeExtends(p.getType()));
+                    }
+                    return new Parameter(p.getName(), type);
+                }
+            });
+
+            // body
+            writer.beginLine("super(" + writer.getClassConstant(localName));
+            // TODO: Fix for Scala (Array[Class])
+            writer.append(", new Class<?>[]{");
+            boolean first = true;
+
+            for (Parameter p : c.getParameters()) {
+                if (!first) {
+                    writer.append(", ");
+                }
+                if (Types.PRIMITIVES.containsKey(p.getType())) {
+                    Type primitive = Types.PRIMITIVES.get(p.getType());
+                    writer.append(writer.getClassConstant(primitive.getFullName()));
+                } else {
+                    writer.append(writer.getClassConstant(writer.getRawName(p.getType())));
+                }
+                first = false;
+            }
+            writer.append("}");
+
+            for (Parameter p : c.getParameters()) {
+                writer.append(", ").append(p.getName());
+            }
+
+            // end
+            writer.append(");\n");
+            writer.end();
+        }
+
+        // outro
+        outro(model, writer);
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultSupertypeSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultSupertypeSerializer.java
new file mode 100644
index 0000000000..06d236bafa
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultSupertypeSerializer.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * {@code SupertypeSerializer} is a {@link Serializer} implementation for supertypes
+ *
+ * @author tiwe
+ *
+ */
+public final class DefaultSupertypeSerializer extends DefaultEntitySerializer implements SupertypeSerializer {
+
+    /**
+     * Create a new SupertypeSerializer instance
+     *
+     * @param typeMappings type mappings to be used
+     * @param keywords keywords to be used
+     * @param generatedAnnotationClass fully qualified class name to be used as class level "@Generated" annotation.
+     */
+    @Inject
+    public DefaultSupertypeSerializer(
+            TypeMappings typeMappings,
+            @Named(CodegenModule.KEYWORDS) Collection<String> keywords,
+            @Named(CodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        super(typeMappings, keywords, generatedAnnotationClass);
+    }
+    /**
+     * Create a new SupertypeSerializer instance
+     *
+     * @param typeMappings type mappings to be used
+     * @param keywords keywords to be used
+     */
+    public DefaultSupertypeSerializer(TypeMappings typeMappings, Collection<String> keywords) {
+        super(typeMappings, keywords, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
new file mode 100644
index 0000000000..790c62ae5c
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.StringUtils;
+
+import javax.lang.model.SourceVersion;
+import java.util.function.Function;
+
+/**
+ * Default variable name generation strategy which un-capitalizes the first letter of the class name.
+ *
+ */
+public final class DefaultVariableNameFunction implements Function<EntityType, String> {
+
+    public static final DefaultVariableNameFunction INSTANCE = new DefaultVariableNameFunction();
+
+    @Override
+    public String apply(EntityType entity) {
+        String uncapSimpleName = StringUtils.uncapitalize(entity.getInnerType().getSimpleName());
+        if (SourceVersion.isKeyword(uncapSimpleName)) {
+            uncapSimpleName = uncapSimpleName + "$";
+        }
+        return uncapSimpleName;
+    }
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Delegate.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Delegate.java
similarity index 81%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/Delegate.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/Delegate.java
index c402923e1e..322a7362ec 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Delegate.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Delegate.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.util.List;
+import java.util.Objects;
 
-import com.google.common.base.Objects;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Type;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
 
 /**
- * Delegate defines a delegate method which dispatches to an external static method
- * 
+ * {@code Delegate} defines a delegate method which dispatches to an external static method
+ *
  * @author tiwe
  *
  */
@@ -37,7 +37,7 @@ public class Delegate {
 
     private final Type returnType;
 
-    public Delegate(Type declaringType, Type delegateType, String name, List<Parameter> params, 
+    public Delegate(Type declaringType, Type delegateType, String name, List<Parameter> params,
             Type returnType) {
         this.declaringType = declaringType;
         this.delegateType = delegateType;
@@ -51,7 +51,7 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof Delegate) {
-            Delegate m = (Delegate)o;
+            Delegate m = (Delegate) o;
             return m.name.equals(name) && m.parameters.equals(parameters);
         } else {
             return false;
@@ -80,7 +80,7 @@ public Type getReturnType() {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(name, parameters);
+        return Objects.hash(name, parameters);
     }
 
     @Override
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/EmbeddableSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/EmbeddableSerializer.java
new file mode 100644
index 0000000000..9528ba18c8
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/EmbeddableSerializer.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code EmbeddableSerializer} is a {@link Serializer} for entity types
+ *
+ * @author f43nd1r
+ */
+public interface EmbeddableSerializer extends Serializer {
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/EntitySerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/EntitySerializer.java
new file mode 100644
index 0000000000..5fb66291e3
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/EntitySerializer.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code EntitySerializer} is a {@link Serializer} for entity types
+ *
+ * @author f43nd1r
+ */
+public interface EntitySerializer extends Serializer {
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/EntityType.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/EntityType.java
new file mode 100644
index 0000000000..04e68b87e5
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/EntityType.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.StringUtils;
+import com.querydsl.codegen.utils.model.Constructor;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeAdapter;
+import com.querydsl.codegen.utils.model.TypeCategory;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Function;
+import org.jetbrains.annotations.Nullable;
+/**
+ * {@code EntityType} represents a model of a query domain type with properties
+ *
+ * @author tiwe
+ */
+public class EntityType extends TypeAdapter implements Comparable<EntityType> {
+
+    private final Map<Class<?>,Annotation> annotations = new HashMap<Class<?>,Annotation>();
+
+    private final Set<Constructor> constructors = new LinkedHashSet<Constructor>();
+
+    private int escapeSuffix = 1;
+
+    private final Set<Delegate> delegates = new HashSet<Delegate>();
+
+    private final Set<Property> properties = new TreeSet<Property>();
+
+    private final Set<String> propertyNames = new HashSet<String>();
+
+    private final Set<String> escapedPropertyNames = new HashSet<String>();
+
+    private final Set<Supertype> superTypes;
+
+    private final Map<Object, Object> data = new HashMap<Object,Object>();
+
+    private String modifiedSimpleName;
+
+    /**
+     * Create a new {@code EntityType} instance for the given type
+     *
+     * @param type
+     */
+    public EntityType(Type type) {
+        this(type, new LinkedHashSet<Supertype>(), DefaultVariableNameFunction.INSTANCE);
+    }
+
+    /**
+     * Create a new {@code EntityType} instance for the given type
+     *
+     * @param type the type to be used
+     * @param variableNameFunction the variable name function to be used
+     */
+    public EntityType(Type type, Function<EntityType, String> variableNameFunction) {
+        this(type, new LinkedHashSet<Supertype>(), variableNameFunction);
+    }
+
+    /**
+     * Create a new {@code EntityType} instance for the given type and superTypes
+     *
+     * @param type
+     * @param superTypes
+     */
+    public EntityType(Type type, Set<Supertype> superTypes) {
+        this(type, superTypes, DefaultVariableNameFunction.INSTANCE);
+    }
+
+    /**
+     * Create a new {@code EntityType} instance for the given type and superTypes
+     *
+     * @param type the type to be used
+     * @param superTypes the super types to be used
+     * @param variableNameFunction the variable name function to be used
+     */
+    private EntityType(Type type, Set<Supertype> superTypes, Function<EntityType, String> variableNameFunction) {
+        super(type);
+        this.superTypes = superTypes;
+        this.modifiedSimpleName = variableNameFunction.apply(this);
+    }
+
+    public void addAnnotation(Annotation annotation) {
+        annotations.put(annotation.annotationType(), annotation);
+    }
+
+    public void addConstructor(Constructor co) {
+        constructors.add(co);
+    }
+
+    public void addDelegate(Delegate delegate) {
+        delegates.add(delegate);
+    }
+
+    public void addProperty(Property field) {
+        if (!propertyNames.contains(field.getName())) {
+            propertyNames.add(field.getName());
+            escapedPropertyNames.add(field.getEscapedName());
+            properties.add(validateField(field));
+        }
+    }
+
+    public void addSupertype(Supertype entityType) {
+        superTypes.add(entityType);
+    }
+
+    @Override
+    public int compareTo(EntityType o) {
+        return getType().getSimpleName().compareTo(o.getType().getSimpleName());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Type) {
+            return getFullName().equals(((Type) o).getFullName());
+        } else {
+            return false;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Annotation> T getAnnotation(Class<T> type) {
+        return (T) annotations.get(type);
+    }
+
+    public Collection<Annotation> getAnnotations() {
+        return annotations.values();
+    }
+
+    @Override
+    public Type as(TypeCategory category) {
+        if (getCategory() == category) {
+            return this;
+        } else {
+            return super.as(category);
+        }
+    }
+
+    @Override
+    public TypeCategory getCategory() {
+        if (getType().getCategory() == TypeCategory.ENTITY || !properties.isEmpty()) {
+            return TypeCategory.ENTITY;
+        } else {
+            return TypeCategory.CUSTOM;
+        }
+    }
+
+    public Set<Constructor> getConstructors() {
+        return constructors;
+    }
+
+    public Map<Object, Object> getData() {
+        return data;
+    }
+
+    public Set<Delegate> getDelegates() {
+        return delegates;
+    }
+
+    public TypeCategory getOriginalCategory() {
+        return super.getCategory();
+    }
+
+    public Set<Property> getProperties() {
+        return properties;
+    }
+
+    @Nullable
+    public Supertype getSuperType() {
+        return superTypes.size() == 1 ? superTypes.iterator().next() : null;
+    }
+
+    public Set<Supertype> getSuperTypes() {
+        return superTypes;
+    }
+
+    /**
+     * Use {@link #getModifiedSimpleName()}
+     */
+    @Deprecated
+    public String getUncapSimpleName() {
+        return modifiedSimpleName;
+    }
+
+    public String getModifiedSimpleName() {
+        return modifiedSimpleName;
+    }
+
+    @Override
+    public int hashCode() {
+        return getFullName().hashCode();
+    }
+
+    public boolean hasArrays() {
+        return hasPropertyWithType(TypeCategory.ARRAY);
+    }
+
+    public boolean hasEntityFields() {
+        return hasPropertyWithType(TypeCategory.ENTITY);
+    }
+
+    public boolean hasInits() {
+        for (Property property : properties) {
+            if (!property.getInits().isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean hasLists() {
+        return hasPropertyWithType(TypeCategory.LIST);
+    }
+
+    public boolean hasCollections() {
+        return hasPropertyWithType(TypeCategory.COLLECTION);
+    }
+
+    public boolean hasSets() {
+        return hasPropertyWithType(TypeCategory.SET);
+    }
+
+    public boolean hasMaps() {
+        return hasPropertyWithType(TypeCategory.MAP);
+    }
+
+    private boolean hasPropertyWithType(TypeCategory category) {
+        for (Property property : properties) {
+            if (property.getType().getCategory() == category) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void include(Supertype supertype) {
+        EntityType entityType = supertype.getEntityType();
+        for (Delegate delegate : entityType.getDelegates()) {
+            addDelegate(delegate);
+        }
+        for (Property property : entityType.getProperties()) {
+            addProperty(property.createCopy(this));
+        }
+    }
+
+    private Property validateField(Property field) {
+        if (field.getName().equals(modifiedSimpleName) || field.getEscapedName().equals(modifiedSimpleName)) {
+            do {
+                modifiedSimpleName = StringUtils.uncapitalize(getType().getSimpleName()) + (escapeSuffix++);
+            } while (propertyNames.contains(modifiedSimpleName));
+        }
+        return field;
+    }
+
+    public Set<String> getPropertyNames() {
+        return propertyNames;
+    }
+
+    public Set<String> getEscapedPropertyNames() {
+        return escapedPropertyNames;
+    }
+
+    public Type getInnerType() {
+        return type;
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/Extension.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Extension.java
new file mode 100644
index 0000000000..7dfca17eaa
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Extension.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code Extension} allows for custom code generation extensions to be registered as service provider
+ *
+ * @author Jan-Willem Gmelig Meyling
+ *
+ */
+public interface Extension {
+
+    /**
+     * Register custom types to the given codegen module
+     *
+     * @param module module to be customized
+     */
+    void addSupport(AbstractModule module);
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/Filer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Filer.java
new file mode 100644
index 0000000000..139df581a4
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Filer.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+
+/**
+ * provides files in annotation processing to write classes to
+ *
+ * @author f43nd1r
+ */
+public interface Filer {
+    Writer createFile(ProcessingEnvironment processingEnvironment, String classname, Collection<? extends Element> elements) throws IOException;
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/GeneratedAnnotationResolver.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/GeneratedAnnotationResolver.java
new file mode 100644
index 0000000000..4f517411c2
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/GeneratedAnnotationResolver.java
@@ -0,0 +1,72 @@
+package com.querydsl.codegen;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * {@code GeneratedAnnotationClassResolver} provides class name resolving functionality for resolving the annotation
+ * type to be used on {@link Serializer}s generated sources.
+ */
+public final class GeneratedAnnotationResolver {
+
+    private static final Class<? extends Annotation> DEFAULT_GENERATED_ANNOTATION_CLASS = resolveJavaDefault();
+
+    /**
+     * Use the {@code generatedAnnotationClass} or use the JDK one.
+     * <p>
+     * A {@code null generatedAnnotationClass} will resolve to the java {@code @Generated} annotation (can be of type {@code javax.annotation.Generated}
+     * or {@code javax.annotation.processing.Generated} depending on the java version.
+     *
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element)
+     *                                 to use or {@code null}.
+     * @return the provided {@code generatedAnnotationClass} if not {@code null} or the one from java. Never {@code null}.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    public static Class<?extends Annotation> resolve(@Nullable String generatedAnnotationClass) {
+        if (generatedAnnotationClass != null) {
+            try {
+                return (Class<? extends Annotation>) Class.forName(generatedAnnotationClass);
+            } catch (Exception e) {
+                // Try next one
+            }
+        }
+
+        return resolveDefault();
+    }
+
+    /**
+     * Resolve the java {@code @Generated} annotation (can be of type {@code javax.annotation.Generated}
+     * or {@code javax.annotation.processing.Generated} depending on the java version.
+     *
+     * @return the Generated annotation class from java. Never {@code null}.
+     */
+    public static Class<? extends Annotation> resolveDefault() {
+        return DEFAULT_GENERATED_ANNOTATION_CLASS;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Class<? extends Annotation> resolveJavaDefault() {
+        try {
+            return (Class<? extends Annotation>) Class.forName("javax.annotation.processing.Generated");
+        } catch (Exception e) {
+            // Try next one
+        }
+
+        try {
+            return (Class<? extends Annotation>) Class.forName("javax.annotation.Generated");
+        } catch (Exception e) {
+            // Try next one
+        }
+
+        try {
+            return (Class<? extends Annotation>) Class.forName("jakarta.annotation.Generated");
+        } catch (Exception e) {
+            // Try next one
+        }
+
+        throw new IllegalStateException("Can't find Generated annotation");
+    }
+
+    private GeneratedAnnotationResolver() { }
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/GenericExporter.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/GenericExporter.java
new file mode 100644
index 0000000000..1764e2a8c2
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/GenericExporter.java
@@ -0,0 +1,829 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.ScalaWriter;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.support.ClassUtils;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryExclude;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.util.Annotations;
+import com.querydsl.core.util.BeanUtils;
+import com.querydsl.core.util.ReflectionUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code GenericExporter} provides query type serialization logic for cases where APT annotation processors
+ * can't be used. {@code GenericExporter} scans the classpath for classes annotated with specified annotations
+ * in specific packages and mirrors them into Querydsl expression types.
+ *
+ * <p>Example with Querydsl annotations: </p>
+ * <pre>
+ * {@code
+ * GenericExporter exporter = new GenericExporter();
+ * exporter.setTargetFolder(new File("target/generated-sources/java"));
+ * exporter.export(com.example.domain.Entity.class.getPackage());}
+ * </pre>
+ *
+ * <p>Example with JPA annotations:</p>
+ * <pre>
+ * {@code
+ * GenericExporter exporter = new GenericExporter();
+ * exporter.setKeywords(Keywords.JPA);
+ * exporter.setEntityAnnotation(Entity.class);
+ * exporter.setEmbeddableAnnotation(Embeddable.class);
+ * exporter.setEmbeddedAnnotation(Embedded.class);
+ * exporter.setSupertypeAnnotation(MappedSuperclass.class);
+ * exporter.setSkipAnnotation(Transient.class);
+ * exporter.setTargetFolder(new File("target/generated-sources/java"));
+ * exporter.export(com.example.domain.Entity.class.getPackage());}
+ * </pre>
+ *
+ * @author tiwe
+ *
+ */
+public class GenericExporter {
+
+    private Class<? extends Annotation> entityAnnotation = QueryEntity.class;
+
+    private Class<? extends Annotation> supertypeAnnotation = QuerySupertype.class;
+
+    private Class<? extends Annotation> embeddableAnnotation = QueryEmbeddable.class;
+
+    private Class<? extends Annotation> embeddedAnnotation = QueryEmbedded.class;
+
+    private Class<? extends Annotation> skipAnnotation = QueryTransient.class;
+
+    private boolean createScalaSources = false;
+
+    private final Set<Class<?>> stopClasses = new HashSet<>();
+
+    private final Map<String, EntityType> allTypes = new HashMap<>();
+
+    private final Map<Class<?>, EntityType> entityTypes = new HashMap<>();
+
+    private final Map<Class<?>, EntityType> superTypes = new HashMap<>();
+
+    private final Map<Class<?>, EntityType> embeddableTypes = new HashMap<>();
+
+    private final Map<Class<?>, EntityType> projectionTypes = new HashMap<>();
+
+    private final CodegenModule codegenModule = new CodegenModule();
+
+    private SerializerConfig serializerConfig = SimpleSerializerConfig.DEFAULT;
+
+    @Deprecated
+    private boolean handleFields = true, handleMethods = true;
+
+    private PropertyHandling propertyHandling = PropertyHandling.ALL;
+
+    private boolean useFieldTypes = false;
+
+    @Nullable
+    private File targetFolder;
+
+    @Nullable
+    private TypeFactory typeFactory;
+
+    private final List<AnnotationHelper> annotationHelpers = new ArrayList<>();
+
+    @Nullable
+    private TypeMappings typeMappings;
+
+    @Nullable
+    private QueryTypeFactory queryTypeFactory;
+
+    @Nullable
+    private Class<? extends Serializer> serializerClass;
+
+    private final Charset charset;
+
+    private final ClassLoader classLoader;
+
+    private Set<File> generatedFiles = new HashSet<File>();
+
+    private boolean strictMode;
+
+
+    /**
+     * Create a GenericExporter instance using the given classloader and charset for serializing
+     * source files
+     *
+     * @param classLoader classloader to use
+     * @param charset charset of target sources
+     */
+    public GenericExporter(ClassLoader classLoader, Charset charset) {
+        this.classLoader = classLoader;
+        this.charset = charset;
+        stopClasses.add(Object.class);
+        stopClasses.add(Enum.class);
+    }
+
+    /**
+     * Create a GenericExporter instance using the given classloader and default charset
+     *
+     * @param classLoader classloader to use
+     */
+    public GenericExporter(ClassLoader classLoader) {
+        this(classLoader, Charset.defaultCharset());
+    }
+
+    /**
+     * Create a GenericExporter instance using the context classloader and the given charset
+     *
+     * @param charset charset of target sources
+     */
+    public GenericExporter(Charset charset) {
+        this(Thread.currentThread().getContextClassLoader(), charset);
+    }
+
+    /**
+     * Create a GenericExporter instance using the context classloader and default charset
+     */
+    public GenericExporter() {
+        this(Thread.currentThread().getContextClassLoader(), Charset.defaultCharset());
+    }
+
+    /**
+     * Export the given packages
+     *
+     * @param packages packages to be scanned
+     */
+    public void export(Package... packages) {
+        String[] pkgs = new String[packages.length];
+        for (int i = 0; i < packages.length; i++) {
+            pkgs[i] = packages[i].getName();
+        }
+        export(pkgs);
+    }
+
+    /**
+     * Export the given packages
+     *
+     * @param packages packages to be scanned
+     */
+    public void export(String... packages) {
+        scanPackages(packages);
+        innerExport();
+    }
+
+    /**
+     * Export the given classes
+     *
+     * @param classes classes to be scanned
+     */
+    public void export(Class<?>...classes) {
+        for (Class<?> cl : classes) {
+            handleClass(cl);
+        }
+        innerExport();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void innerExport() {
+        typeMappings = codegenModule.get(TypeMappings.class);
+        queryTypeFactory = codegenModule.get(QueryTypeFactory.class);
+        typeFactory = new TypeFactory(Arrays.asList(entityAnnotation, supertypeAnnotation, embeddableAnnotation), codegenModule.get(Function.class, CodegenModule.VARIABLE_NAME_FUNCTION_CLASS));
+
+        // copy annotations helpers to typeFactory
+        for (AnnotationHelper helper : annotationHelpers) {
+            typeFactory.addAnnotationHelper(helper);
+        }
+
+        // process supertypes
+        for (Class<?> cl : superTypes.keySet()) {
+            createEntityType(cl, superTypes);
+        }
+
+        // process embeddables
+        for (Class<?> cl : embeddableTypes.keySet()) {
+            createEntityType(cl, embeddableTypes);
+        }
+
+        // process entities
+        for (Class<?> cl : entityTypes.keySet()) {
+            createEntityType(cl, entityTypes);
+        }
+
+        // process projections
+        for (Class<?> cl : projectionTypes.keySet()) {
+            createEntityType(cl, projectionTypes);
+        }
+
+        // add constructors and properties
+        for (Map<Class<?>, EntityType> entries : Arrays.asList(superTypes, embeddableTypes, entityTypes, projectionTypes)) {
+            for (Map.Entry<Class<?>, EntityType> entry : new HashSet<>(entries.entrySet())) {
+                addConstructors(entry.getKey(), entry.getValue());
+                addProperties(entry.getKey(), entry.getValue());
+            }
+        }
+
+        // merge supertype fields into subtypes
+        Set<EntityType> handled = new HashSet<EntityType>();
+        for (EntityType type : superTypes.values()) {
+            addSupertypeFields(type, allTypes, handled);
+        }
+        for (EntityType type : entityTypes.values()) {
+            addSupertypeFields(type, allTypes, handled);
+        }
+        for (EntityType type : embeddableTypes.values()) {
+            addSupertypeFields(type, allTypes, handled);
+        }
+
+        // extend types
+        typeFactory.extendTypes();
+
+        try {
+            Serializer supertypeSerializer, entitySerializer, embeddableSerializer, projectionSerializer;
+
+            if (serializerClass != null) {
+                Serializer serializer = codegenModule.get(serializerClass);
+                supertypeSerializer = serializer;
+                entitySerializer = serializer;
+                embeddableSerializer = serializer;
+                projectionSerializer = serializer;
+            } else {
+                supertypeSerializer = codegenModule.get(SupertypeSerializer.class);
+                entitySerializer = codegenModule.get(EntitySerializer.class);
+                embeddableSerializer = codegenModule.get(EmbeddableSerializer.class);
+                projectionSerializer = codegenModule.get(ProjectionSerializer.class);
+            }
+
+            // serialize super types
+            serialize(supertypeSerializer, superTypes);
+
+            // serialize entity types
+            serialize(entitySerializer, entityTypes);
+
+            // serialize embeddable types
+            serialize(embeddableSerializer, embeddableTypes);
+
+            // serialize projection types
+            serialize(projectionSerializer, projectionTypes);
+
+        } catch (IOException e) {
+            throw new QueryException(e);
+        }
+
+    }
+
+    private void addSupertypeFields(EntityType model, Map<String, EntityType> superTypes,
+            Set<EntityType> handled) {
+        if (handled.add(model)) {
+            for (Supertype supertype : model.getSuperTypes()) {
+                EntityType entityType = superTypes.get(supertype.getType().getFullName());
+                if (entityType == null) {
+                    if (supertype.getType().getPackageName().startsWith("java.")) {
+                        // skip internal supertypes
+                        continue;
+                    }
+                    // FIXME this misses the generics
+                    Class<?> cl = supertype.getType().getJavaClass();
+                    typeFactory.addEmbeddableType(cl);
+                    entityType = createEntityType(cl, new HashMap<Class<?>, EntityType>());
+                    addProperties(cl, entityType);
+
+                }
+                addSupertypeFields(entityType, superTypes, handled);
+                supertype.setEntityType(entityType);
+                model.include(supertype);
+            }
+        }
+    }
+
+    private boolean containsAny(Class<?> clazz, Class<? extends Annotation>... annotations) {
+        for (Class<? extends Annotation> annType : annotations) {
+            if (clazz.isAnnotationPresent(annType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private EntityType createEntityType(Class<?> cl, Map<Class<?>, EntityType> types) {
+        if (types.get(cl) != null) {
+            return types.get(cl);
+        } else {
+            EntityType type = allTypes.get(ClassUtils.getFullName(cl));
+            if (type == null) {
+                type = typeFactory.getEntityType(cl);
+            }
+            types.put(cl, type);
+            String fullName = ClassUtils.getFullName(cl);
+            if (!allTypes.containsKey(fullName)) {
+                allTypes.put(fullName, type);
+            }
+
+            typeMappings.register(type, queryTypeFactory.create(type));
+
+            if (strictMode && cl.getSuperclass() != null) {
+                @SuppressWarnings("unchecked")
+                Class<? extends Annotation>[] annotations =
+                        (Class<? extends Annotation>[]) new Class<?>[] {entityAnnotation, supertypeAnnotation, embeddableAnnotation};
+                if (!containsAny(cl.getSuperclass(), annotations)) {
+                    // skip supertype handling
+                    return type;
+                }
+            }
+
+            if (cl.getSuperclass() != null && !stopClasses.contains(cl.getSuperclass())
+                && !cl.getSuperclass().isAnnotationPresent(QueryExclude.class)) {
+                type.addSupertype(new Supertype(typeFactory.get(cl.getSuperclass(), cl.getGenericSuperclass())));
+            }
+            if (cl.isInterface()) {
+                for (Class<?> iface : cl.getInterfaces()) {
+                    if (!stopClasses.contains(iface) && !iface.isAnnotationPresent(QueryExclude.class)) {
+                        type.addSupertype(new Supertype(typeFactory.get(iface)));
+                    }
+                }
+            }
+
+            return type;
+        }
+    }
+
+    private void addConstructors(Class<?> cl, EntityType type) {
+        for (Constructor<?> constructor : cl.getConstructors()) {
+            if (constructor.isAnnotationPresent(QueryProjection.class)) {
+                List<Parameter> parameters = new ArrayList<>();
+                for (int i = 0; i < constructor.getParameterTypes().length; i++) {
+                    Type parameterType = typeFactory.get(
+                            constructor.getParameterTypes()[i],
+                            constructor.getGenericParameterTypes()[i]);
+                    for (Annotation annotation : constructor.getParameterAnnotations()[i]) {
+                        if (annotation.annotationType().equals(QueryType.class)) {
+                            QueryType queryType = (QueryType) annotation;
+                            parameterType = parameterType.as(TypeCategory.valueOf(queryType.value().name()));
+                        }
+                    }
+                    parameters.add(new Parameter("param" + i, parameterType));
+                }
+                type.addConstructor(new com.querydsl.codegen.utils.model.Constructor(parameters));
+            }
+        }
+    }
+
+    private void addProperties(Class<?> cl, EntityType type) {
+        Map<String, Type> types = new HashMap<>();
+        Map<String, Annotations> annotations = new HashMap<>();
+
+        PropertyHandling.Config config = propertyHandling.getConfig(cl);
+
+        // fields
+        if (config.isFields()) {
+            for (Field field : cl.getDeclaredFields()) {
+                if (!Modifier.isStatic(field.getModifiers())) {
+                    if (Modifier.isTransient(field.getModifiers()) && !field.isAnnotationPresent(QueryType.class)) {
+                        continue;
+                    }
+                    AnnotatedElement annotated = ReflectionUtils.getAnnotatedElement(cl, field.getName(), field.getType());
+                    Type propertyType = getPropertyType(cl, annotated, field.getType(), field.getGenericType());
+                    Annotations ann = new Annotations(field);
+                    types.put(field.getName(), propertyType);
+                    annotations.put(field.getName(), ann);
+                }
+            }
+        }
+
+        // getters
+        if (config.isMethods()) {
+            for (Method method : cl.getDeclaredMethods()) {
+                String name = method.getName();
+                if (method.getParameterTypes().length == 0
+                    && !Modifier.isStatic(method.getModifiers())
+                    && !method.isBridge()
+                    && ((name.startsWith("get") && name.length() > 3)
+                     || (name.startsWith("is") && name.length() > 2))) {
+                    String propertyName;
+                    if (name.startsWith("get")) {
+                        propertyName = BeanUtils.uncapitalize(name.substring(3));
+                    } else {
+                        propertyName = BeanUtils.uncapitalize(name.substring(2));
+                    }
+                    Type propertyType = getPropertyType(cl, method, method.getReturnType(), method.getGenericReturnType());
+                    if (!types.containsKey(propertyName) || !useFieldTypes) {
+                        types.put(propertyName, propertyType);
+                    }
+                    Annotations ann = annotations.get(propertyName);
+                    if (ann == null) {
+                        ann = new Annotations();
+                        annotations.put(propertyName, ann);
+                    }
+                    ann.addAnnotations(method);
+                }
+            }
+        }
+
+        for (Map.Entry<String, Type> entry : types.entrySet()) {
+            Annotations ann = annotations.get(entry.getKey());
+            Property property = createProperty(type, entry.getKey(), entry.getValue(), ann);
+            if (property != null) {
+                type.addProperty(property);
+            }
+        }
+    }
+
+    private Type getPropertyType(Class<?> cl, AnnotatedElement annotated, Class<?> type,
+            java.lang.reflect.Type genericType) {
+        Type propertyType = null;
+        if (annotated.isAnnotationPresent(embeddedAnnotation)) {
+            Class<?> embeddableType = type;
+            if (Collection.class.isAssignableFrom(type)) {
+                embeddableType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
+            } else if (Map.class.isAssignableFrom(type)) {
+                embeddableType = ReflectionUtils.getTypeParameterAsClass(genericType, 1);
+            }
+            if (!embeddableType.getName().startsWith("java.")) {
+                typeFactory.addEmbeddableType(embeddableType);
+                if (!embeddableTypes.containsKey(embeddableType)
+                  && !entityTypes.containsKey(embeddableType)
+                  && !superTypes.containsKey(embeddableType)) {
+                    EntityType entityType = createEntityType(embeddableType, embeddableTypes);
+                    addProperties(embeddableType, entityType);
+                    if (embeddableType == type) {
+                        propertyType = entityType;
+                    }
+                }
+            }
+        }
+        if (propertyType == null) {
+            propertyType = typeFactory.get(type, annotated, genericType);
+            if (propertyType instanceof EntityType && !allTypes.containsKey(ClassUtils.getFullName(type))) {
+                String fullName = ClassUtils.getFullName(type);
+                if (!allTypes.containsKey(fullName)) {
+                    allTypes.put(fullName, (EntityType) propertyType);
+                }
+            }
+        }
+        return propertyType;
+    }
+
+    @Nullable
+    private Property createProperty(EntityType entityType, String propertyName, Type propertyType,
+            AnnotatedElement annotated) {
+        List<String> inits = Collections.emptyList();
+        if (annotated.isAnnotationPresent(skipAnnotation)
+            && !annotated.isAnnotationPresent(QueryType.class)) {
+            return null;
+        }
+        if (annotated.isAnnotationPresent(QueryInit.class)) {
+            inits = Arrays.asList(annotated.getAnnotation(QueryInit.class).value());
+        }
+        if (annotated.isAnnotationPresent(QueryType.class)) {
+            QueryType queryType = annotated.getAnnotation(QueryType.class);
+            if (queryType.value().equals(PropertyType.NONE)) {
+                return null;
+            }
+            propertyType = propertyType.as(TypeCategory.valueOf(queryType.value().name()));
+        }
+        return new Property(entityType, propertyName, propertyType, inits);
+    }
+
+    private void scanPackages(String... packages) {
+        if (packages == null) {
+            return;
+        }
+        for (String pkg : packages) {
+            try {
+                for (Class<?> cl : ClassPathUtils.scanPackage(classLoader, pkg)) {
+                    handleClass(cl);
+                }
+            } catch (IOException e) {
+                throw new QueryException(e);
+            }
+        }
+    }
+
+    private void handleClass(Class<?> cl) {
+        if (stopClasses.contains(cl) || cl.isAnnotationPresent(QueryExclude.class)) {
+            return;
+        } else if (cl.isAnnotationPresent(entityAnnotation)) {
+            entityTypes.put(cl, null);
+        } else if (cl.isAnnotationPresent(embeddableAnnotation)) {
+            embeddableTypes.put(cl, null);
+        } else if (cl.isAnnotationPresent(supertypeAnnotation)) {
+            superTypes.put(cl, null);
+        } else {
+            for (Constructor<?> constructor : cl.getConstructors()) {
+                if (constructor.isAnnotationPresent(QueryProjection.class)) {
+                    projectionTypes.put(cl, null);
+                    break;
+                }
+            }
+        }
+    }
+
+    private void serialize(Serializer serializer, Map<Class<?>, EntityType> types) throws IOException {
+        for (Map.Entry<Class<?>, EntityType> entityType : types.entrySet()) {
+            Type type = typeMappings.getPathType(entityType.getValue(), entityType.getValue(), true);
+            String packageName = type.getPackageName();
+            String className = packageName.length() > 0 ? (packageName + "." + type.getSimpleName()) : type.getSimpleName();
+            SerializerConfig config = serializerConfig;
+            if (entityType.getKey().isAnnotationPresent(Config.class)) {
+                config = SimpleSerializerConfig.getConfig(entityType.getKey().getAnnotation(Config.class));
+            }
+            String fileSuffix = createScalaSources ? ".scala" : ".java";
+            write(serializer, className.replace('.', '/') + fileSuffix, config, entityType.getValue());
+        }
+    }
+
+    private void write(Serializer serializer, String path, SerializerConfig serializerConfig,
+            EntityType type) throws IOException {
+        File targetFile = new File(targetFolder, path);
+        generatedFiles.add(targetFile);
+        try (Writer w = writerFor(targetFile)) {
+            CodeWriter writer = createScalaSources ? new ScalaWriter(w) : new JavaWriter(w);
+            serializer.serialize(type, serializerConfig, writer);
+        }
+    }
+
+    private Writer writerFor(File file) {
+        if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
+            System.err.println("Folder " + file.getParent() + " could not be created");
+        }
+        try {
+            return new OutputStreamWriter(new FileOutputStream(file), charset);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+
+    /**
+     * Return the set of generated files
+     *
+     * @return a set of generated files
+     */
+    public Set<File> getGeneratedFiles() {
+        return generatedFiles;
+    }
+
+    /**
+     * Set the entity annotation
+     *
+     * @param entityAnnotation entity annotation
+     */
+    public void setEntityAnnotation(Class<? extends Annotation> entityAnnotation) {
+        this.entityAnnotation = entityAnnotation;
+    }
+
+    /**
+     * Set the supertype annotation
+     *
+     * @param supertypeAnnotation supertype annotation
+     */
+    public void setSupertypeAnnotation(
+            Class<? extends Annotation> supertypeAnnotation) {
+        this.supertypeAnnotation = supertypeAnnotation;
+    }
+
+    /**
+     * Set the embeddable annotation
+     *
+     * @param embeddableAnnotation embeddable annotation
+     */
+    public void setEmbeddableAnnotation(
+            Class<? extends Annotation> embeddableAnnotation) {
+        this.embeddableAnnotation = embeddableAnnotation;
+    }
+
+    /**
+     * Set the embedded annotation
+     *
+     * @param embeddedAnnotation embedded annotation
+     */
+    public void setEmbeddedAnnotation(Class<? extends Annotation> embeddedAnnotation) {
+        this.embeddedAnnotation = embeddedAnnotation;
+    }
+
+    /**
+     * Set the skip annotation
+     *
+     * @param skipAnnotation skip annotation
+     */
+    public void setSkipAnnotation(Class<? extends Annotation> skipAnnotation) {
+        this.skipAnnotation = skipAnnotation;
+    }
+
+    /**
+     * Set the target folder for generated sources
+     *
+     * @param targetFolder
+     */
+    public void setTargetFolder(File targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    /**
+     * Set the serializer class to be used
+     *
+     * @param serializerClass
+     */
+    public void setSerializerClass(Class<? extends Serializer> serializerClass) {
+        codegenModule.bind(serializerClass);
+        this.serializerClass = serializerClass;
+    }
+
+    /**
+     * Set the typemappings class to be used
+     *
+     * @param typeMappingsClass
+     */
+    public void setTypeMappingsClass(Class<? extends TypeMappings> typeMappingsClass) {
+        codegenModule.bind(TypeMappings.class, typeMappingsClass);
+    }
+
+    /**
+     * Set whether Scala sources are generated
+     *
+     * @param createScalaSources
+     */
+    public void setCreateScalaSources(boolean createScalaSources) {
+        this.createScalaSources = createScalaSources;
+    }
+
+    /**
+     * Set the keywords to be used
+     *
+     * @param keywords
+     */
+    public void setKeywords(Collection<String> keywords) {
+        codegenModule.bind(CodegenModule.KEYWORDS, keywords);
+    }
+
+    /**
+     * Set the name prefix
+     *
+     * @param prefix
+     */
+    public void setNamePrefix(String prefix) {
+        codegenModule.bind(CodegenModule.PREFIX, prefix);
+    }
+
+    /**
+     * Set the name suffix
+     *
+     * @param suffix
+     */
+    public void setNameSuffix(String suffix) {
+        codegenModule.bind(CodegenModule.SUFFIX, suffix);
+    }
+
+    /**
+     * Set the package suffix
+     *
+     * @param suffix
+     */
+    public void setPackageSuffix(String suffix) {
+        codegenModule.bind(CodegenModule.PACKAGE_SUFFIX, suffix);
+    }
+
+    /**
+     * Set whether fields are handled (default true)
+     *
+     * @param b
+     * @deprecated Use {@link #setPropertyHandling(PropertyHandling)} instead
+     */
+    @Deprecated
+    public void setHandleFields(boolean b) {
+        handleFields = b;
+        setPropertyHandling();
+    }
+
+    /**
+     * Set whether methods are handled (default true)
+     *
+     * @param b
+     * @deprecated Use {@link #setPropertyHandling(PropertyHandling)} instead
+     */
+    @Deprecated
+    public void setHandleMethods(boolean b) {
+        handleMethods = b;
+        setPropertyHandling();
+    }
+
+    private void setPropertyHandling() {
+        if (handleFields) {
+            propertyHandling = handleMethods ? PropertyHandling.ALL : PropertyHandling.FIELDS;
+        } else if (handleMethods) {
+            propertyHandling = PropertyHandling.METHODS;
+        } else {
+            propertyHandling = PropertyHandling.NONE;
+        }
+    }
+
+    /**
+     * Set the property handling mode
+     *
+     * @param propertyHandling
+     */
+    public void setPropertyHandling(PropertyHandling propertyHandling) {
+        this.propertyHandling = propertyHandling;
+    }
+
+    /**
+     * Set whether field types should be used instead of getter return types (default false)
+     *
+     * @param b
+     */
+    public void setUseFieldTypes(boolean b) {
+        useFieldTypes = b;
+    }
+
+    /**
+     * Add a stop class to be used (default Object.class and Enum.class)
+     *
+     * @param cl
+     */
+    public void addStopClass(Class<?> cl) {
+        stopClasses.add(cl);
+    }
+
+    /**
+     * Set whether annotationless superclasses are handled or not (default: true)
+     *
+     * @param s
+     */
+    public void setStrictMode(boolean s) {
+        strictMode = s;
+    }
+
+    /**
+     * Set the serializer configuration to use
+     *
+     * @param serializerConfig
+     */
+    public void setSerializerConfig(SerializerConfig serializerConfig) {
+        this.serializerConfig = serializerConfig;
+    }
+
+    /**
+     * Add a annotation helper object to process custom annotations
+     *
+     * @param annotationHelper
+     */
+    public void addAnnotationHelper(AnnotationHelper annotationHelper) {
+        annotationHelpers.add(annotationHelper);
+    }
+
+    /**
+     * Set the Generated annotation class. Will default to java {@code @Generated}
+     *
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on
+     *                                 the generated sources, or {@code null} (defaulting to {@code javax.annotation.Generated} or
+     *                                {@code javax.annotation.processing.Generated} depending on the java version).
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    public void setGeneratedAnnotationClass(@Nullable String generatedAnnotationClass) {
+        codegenModule.bindInstance(CodegenModule.GENERATED_ANNOTATION_CLASS, GeneratedAnnotationResolver.resolve(generatedAnnotationClass));
+    }
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/GroovyBeanSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/GroovyBeanSerializer.java
similarity index 79%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/GroovyBeanSerializer.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/GroovyBeanSerializer.java
index 7f95865229..057ff1f0aa 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/GroovyBeanSerializer.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/GroovyBeanSerializer.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,63 +11,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
-import com.mysema.codegen.CodeWriter;
+import com.querydsl.codegen.utils.CodeWriter;
 
 /**
- * GroovyBeanSerializer is a {@link Serializer} implementation which serializes {@link EntityType} 
+ * {@code GroovyBeanSerializer} is a {@link Serializer} implementation which serializes {@link EntityType}
  * instances into Groovy classes
  *
  * @author tiwe
  *
  */
 public class GroovyBeanSerializer implements Serializer {
-    
+
     private final boolean propertyAnnotations;
-    
+
     private final String javadocSuffix;
-    
+
     private boolean printSupertype = false;
 
     /**
-     * Create a new GroovyBeanSerializer instance
+     * Create a new {@code GroovyBeanSerializer} instance
      */
     public GroovyBeanSerializer() {
         this(true, " is a Querydsl bean type");
     }
 
     /**
-     * Create a new GroovyBeanSerializer instance
-     * 
-     * @param javadocSuffix
+     * Create a new {@code GroovyBeanSerializer} instance
+     *
+     * @param javadocSuffix suffix to be used after the simple name in class level javadoc
      */
     public GroovyBeanSerializer(String javadocSuffix) {
         this(true, javadocSuffix);
     }
-    
+
     /**
-     * Create a new GroovyBeanSerializer instance
-     * 
-     * @param propertyAnnotations
+     * Create a new {@code GroovyBeanSerializer} instance
+     *
+     * @param propertyAnnotations true, to serialize property annotations
      */
     public GroovyBeanSerializer(boolean propertyAnnotations) {
         this(propertyAnnotations, " is a Querydsl bean type");
     }
 
     /**
-     * Create a new GroovyBeanSerializer instance
-     * 
-     * @param propertyAnnotations
-     * @param javadocSuffix
+     * Create a new {@code GroovyBeanSerializer} instance
+     *
+     * @param propertyAnnotations true, to serialize property annotations
+     * @param javadocSuffix suffix to be used after the simple name in class level javadoc
      */
     public GroovyBeanSerializer(boolean propertyAnnotations, String javadocSuffix) {
         this.propertyAnnotations = propertyAnnotations;
@@ -75,7 +71,7 @@ public GroovyBeanSerializer(boolean propertyAnnotations, String javadocSuffix) {
     }
 
     @Override
-    public void serialize(EntityType model, SerializerConfig serializerConfig, 
+    public void serialize(EntityType model, SerializerConfig serializerConfig,
             CodeWriter writer) throws IOException {
         String simpleName = model.getSimpleName();
 
@@ -98,7 +94,7 @@ public void serialize(EntityType model, SerializerConfig serializerConfig,
         if (model.hasMaps()) {
             importedClasses.add(Map.class.getName());
         }
-        writer.importClasses(importedClasses.toArray(new String[importedClasses.size()]));
+        writer.importClasses(importedClasses.toArray(new String[0]));
 
         // javadoc
         writer.javadoc(simpleName + javadocSuffix);
@@ -112,30 +108,30 @@ public void serialize(EntityType model, SerializerConfig serializerConfig,
         } else {
             writer.beginClass(model);
         }
-        
+
         bodyStart(model, writer);
-                
+
         // fields
         for (Property property : model.getProperties()) {
             if (propertyAnnotations) {
                 for (Annotation annotation : property.getAnnotations()) {
                     writer.annotation(annotation);
-                }    
-            }            
+                }
+            }
             writer.field(property.getType(), property.getEscapedName());
         }
-        
+
         bodyEnd(model, writer);
-        
+
         writer.end();
     }
 
     protected void bodyStart(EntityType model, CodeWriter writer) throws IOException {
-        // template method        
+        // template method
     }
 
     protected void bodyEnd(EntityType model, CodeWriter writer) throws IOException {
-        // template method        
+        // template method
     }
 
     private Set<String> getAnnotationTypes(EntityType model) {
@@ -148,13 +144,13 @@ private Set<String> getAnnotationTypes(EntityType model) {
                 for (Annotation annotation : property.getAnnotations()) {
                     imports.add(annotation.annotationType().getName());
                 }
-            }    
-        }        
+            }
+        }
         return imports;
     }
 
     public void setPrintSupertype(boolean printSupertype) {
         this.printSupertype = printSupertype;
     }
-        
+
 }
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/JavaTypeMappings.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/JavaTypeMappings.java
new file mode 100644
index 0000000000..78e5ba7ae4
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/JavaTypeMappings.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.types.dsl.StringTemplate;
+
+/**
+ * {@code JavaTypeMappings} defines mappings from {@link TypeCategory} instances to {@link Expression} types
+ *
+ * @author tiwe
+ *
+ */
+public class JavaTypeMappings extends TypeMappings {
+
+    public JavaTypeMappings() {
+        register(TypeCategory.STRING,     StringExpression.class,     StringPath.class,     StringTemplate.class);
+        register(TypeCategory.BOOLEAN,    BooleanExpression.class,    BooleanPath.class,    BooleanTemplate.class);
+        register(TypeCategory.COMPARABLE, ComparableExpression.class, ComparablePath.class, ComparableTemplate.class);
+        register(TypeCategory.ENUM,       EnumExpression.class,       EnumPath.class,       EnumTemplate.class);
+        register(TypeCategory.DATE,       TemporalExpression.class,   DatePath.class,       DateTemplate.class);
+        register(TypeCategory.DATETIME,   TemporalExpression.class,   DateTimePath.class,   DateTimeTemplate.class);
+        register(TypeCategory.TIME,       TemporalExpression.class,   TimePath.class,       TimeTemplate.class);
+        register(TypeCategory.NUMERIC,    NumberExpression.class,     NumberPath.class,     NumberTemplate.class);
+        register(TypeCategory.SIMPLE,     SimpleExpression.class,     SimplePath.class,     SimpleTemplate.class);
+
+        register(TypeCategory.ARRAY,      Expression.class,           SimplePath.class,     SimpleTemplate.class);
+        register(TypeCategory.COLLECTION, Expression.class,           SimplePath.class,     SimpleTemplate.class);
+        register(TypeCategory.SET,        Expression.class,           SimplePath.class,     SimpleTemplate.class);
+        register(TypeCategory.LIST,       Expression.class,           SimplePath.class,     SimpleTemplate.class);
+        register(TypeCategory.MAP,        Expression.class,           SimplePath.class,     SimpleTemplate.class);
+
+        register(TypeCategory.CUSTOM,     Expression.class,           Path.class,           SimpleTemplate.class);
+        register(TypeCategory.ENTITY,     Expression.class,           Path.class,           SimpleTemplate.class);
+    }
+
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/Keywords.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Keywords.java
new file mode 100644
index 0000000000..ed78f227f4
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Keywords.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * {@code Keywords} provides keywords sets in capitalized form to
+ * be used in {@link GenericExporter} and the APT processors
+ *
+ * @author tiwe
+ *
+ */
+public final class Keywords {
+
+    private Keywords() { }
+
+    public static final Collection<String> JPA = Collections.unmodifiableList(Arrays.asList(
+            "ABS", "ALL", "AND", "ANY", "AS", "ASC", "AVG", "BETWEEN",
+            "BIT_LENGTH[51]", "BOTH", "BY", "CASE", "CHAR_LENGTH",
+            "CHARACTER_LENGTH", "CLASS",
+            "COALESCE", "CONCAT", "COUNT", "CURRENT_DATE", "CURRENT_TIME",
+            "CURRENT_TIMESTAMP",
+            "DELETE", "DESC", "DISTINCT", "ELSE", "EMPTY", "END", "ENTRY",
+            "ESCAPE", "EXISTS", "FALSE", "FETCH",
+            "FROM", "GROUP", "HAVING", "IN", "INDEX", "INNER", "IS", "JOIN",
+            "KEY", "LEADING", "LEFT", "LENGTH", "LIKE",
+            "LOCATE", "LOWER", "MAX", "MEMBER", "MIN", "MOD", "NEW", "NOT",
+            "NULL", "NULLIF", "OBJECT", "OF", "OR",
+            "ORDER", "OUTER", "POSITION", "SELECT", "SET", "SIZE", "SOME",
+            "SQRT", "SUBSTRING", "SUM", "THEN",
+            "TRAILING", "TRIM", "TRUE", "TYPE", "UNKNOWN", "UPDATE", "UPPER",
+            "VALUE", "WHEN", "WHERE"));
+
+    public static final Collection<String> JDO = Collections.unmodifiableList(Arrays.asList(
+            "AS","ASC", "ASCENDING","AVG",
+            "BY","COUNT", "DESC","DESCENDING",
+            "DISTINCT","EXCLUDE", "FROM","GROUP",
+            "HAVING","INTO","MAX","MIN",
+            "ORDER","PARAMETERS","RANGE","SELECT",
+            "SUBCLASSES","SUM","UNIQUE","VARIABLES","WHERE"));
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/NamingFunction.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/NamingFunction.java
new file mode 100644
index 0000000000..6aee3f4028
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/NamingFunction.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.util.function.Function;
+
+/**
+ * The {@link Function} signature to convert {@link EntityType} to {@code String}.
+ *
+ * @author Shredder121
+ */
+public interface NamingFunction extends Function<EntityType, String> {
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/ParameterizedTypeImpl.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/ParameterizedTypeImpl.java
similarity index 83%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/ParameterizedTypeImpl.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/ParameterizedTypeImpl.java
index b4a656c4ea..81cc0dda14 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/ParameterizedTypeImpl.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/ParameterizedTypeImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,27 +11,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
 /**
+ * {@code ParameterizedTypeImpl} provides an implementation of the {@link ParameterizedType} interface
+ *
  * @author tiwe
  *
  */
 public class ParameterizedTypeImpl implements ParameterizedType {
 
     private final Type rawType;
-    
+
     private final Type[] arguments;
-    
+
     public ParameterizedTypeImpl(Type rawType, Type[] arguments) {
         this.rawType = rawType;
         this.arguments = arguments;
     }
-    
+
     @Override
     public Type[] getActualTypeArguments() {
         return arguments;
@@ -46,23 +48,23 @@ public Type getRawType() {
     public Type getOwnerType() {
         return rawType;
     }
-    
+
     @Override
-    public boolean equals(Object o) { 
+    public boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof ParameterizedTypeImpl) {
-            ParameterizedTypeImpl other = (ParameterizedTypeImpl)o;
-            return other.rawType.equals(rawType) 
+            ParameterizedTypeImpl other = (ParameterizedTypeImpl) o;
+            return other.rawType.equals(rawType)
                     && Arrays.equals(other.arguments, arguments);
         } else {
             return false;
         }
     }
-    
+
     @Override
     public int hashCode() {
         return rawType.hashCode();
     }
-    
+
 }
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/ProjectionSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/ProjectionSerializer.java
new file mode 100644
index 0000000000..f0571ff5ef
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/ProjectionSerializer.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code ProjectionSerializer} is a {@link Serializer} for projection types
+ *
+ * @author f43nd1r
+ *
+ */
+public interface ProjectionSerializer extends Serializer {
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Property.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
similarity index 85%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/Property.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
index ee4ec7c30e..79f8dea6d8 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Property.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,21 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-import com.google.common.base.Objects;
-import com.mysema.codegen.model.Type;
-import com.mysema.util.JavaSyntaxUtils;
+import javax.lang.model.SourceVersion;
+
+import com.querydsl.codegen.utils.model.Type;
 
 /**
- * Property represents a property in a query domain type.
+ * {@code Property} represents a property in a query domain type.
  *
  * @author tiwe
  */
@@ -55,8 +51,7 @@ public Property(EntityType declaringType, String name, Type type, List<String> i
 
     public Property(EntityType declaringType, String name, Type type, List<String> inits,
             boolean inherited) {
-        this(declaringType, name, JavaSyntaxUtils.isReserved(name) ? (name + "$") : name, type,
-                inits, inherited);
+        this(declaringType, name, escapeName(name), type, inits, inherited);
     }
 
     public Property(EntityType declaringType, String name, String escapedName, Type type,
@@ -69,6 +64,15 @@ public Property(EntityType declaringType, String name, String escapedName, Type
         this.inherited = inherited;
     }
 
+    private static String escapeName(String name) {
+        if (SourceVersion.isKeyword(name)) {
+            name = name + "$";
+        } else if (!Character.isJavaIdentifierStart(name.charAt(0))) {
+            name = "_" + name;
+        }
+        return name;
+    }
+
     public void addAnnotation(Annotation annotation) {
         annotations.put(annotation.annotationType(), annotation);
     }
@@ -107,7 +111,7 @@ public Collection<Annotation> getAnnotations() {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(name, type);
+        return Objects.hash(name, type);
     }
 
     @Override
@@ -115,7 +119,7 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof Property) {
-            Property p = (Property)o;
+            Property p = (Property) o;
             return p.name.equals(name) && p.type.equals(type);
         } else {
             return false;
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/PropertyHandling.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/PropertyHandling.java
new file mode 100644
index 0000000000..6257cc9b4a
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/PropertyHandling.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryType;
+
+/**
+ * Defines handling of fields and getters in property extractions
+ */
+public enum PropertyHandling {
+    /**
+     * Inspect fields and methods
+     */
+    ALL {
+        @Override
+        public Config getConfig(Class<?> type) {
+            return Config.ALL;
+        }
+    },
+    /**
+     * Inspect fields only
+     */
+    FIELDS {
+        @Override
+        public Config getConfig(Class<?> type) {
+            return Config.FIELDS;
+        }
+    },
+    /**
+     * Inspect methods only
+     */
+    METHODS {
+        @Override
+        public Config getConfig(Class<?> type) {
+            return Config.METHODS;
+        }
+    },
+    /**
+     * No member inspection
+     */
+    NONE {
+        @Override
+        public Config getConfig(Class<?> type) {
+            return Config.NONE;
+        }
+    },
+    /**
+     * JDO compatibility
+     */
+    JDO {
+        @Override
+        public Config getConfig(Class<?> type) {
+            boolean fields = false;
+            boolean methods = false;
+            for (Field field : type.getDeclaredFields()) {
+                fields |= hasAnnotations(field, "javax.jdo.annotations.");
+            }
+            for (Method method : type.getDeclaredMethods()) {
+                methods |= hasAnnotations(method, "javax.jdo.annotations.");
+            }
+            return Config.of(fields, methods, Config.FIELDS);
+        }
+    },
+    /**
+     * JPA compatibility
+     */
+    JPA {
+        @Override
+        public Config getConfig(Class<?> type) {
+            boolean fields = false;
+            boolean methods = false;
+            for (Field field : type.getDeclaredFields()) {
+                fields |= hasAnnotations(field, "javax.persistence.");
+                fields |= hasAnnotations(field, "jakarta.persistence.");
+            }
+            for (Method method : type.getDeclaredMethods()) {
+                methods |= hasAnnotations(method, "javax.persistence.");
+                methods |= hasAnnotations(method, "jakarta.persistence.");
+            }
+            return Config.of(fields, methods, Config.ALL);
+        }
+    };
+
+    private static boolean hasAnnotations(AnnotatedElement element, String packagePrefix) {
+        for (Annotation ann : element.getAnnotations()) {
+            if (ann.annotationType().getName().startsWith(packagePrefix)) {
+                return true;
+            }
+        }
+        return element.isAnnotationPresent(QueryType.class)
+            || element.isAnnotationPresent(QueryInit.class);
+    }
+
+    public abstract Config getConfig(Class<?> type);
+
+    /**
+     * Property handling options
+     */
+    public enum Config {
+        ALL(true, true),
+        FIELDS(true, false),
+        METHODS(false, true),
+        NONE(false, false);
+
+        private final boolean fields, methods;
+
+        Config(boolean fields, boolean methods) {
+            this.fields = fields;
+            this.methods = methods;
+        }
+
+        public boolean isFields() {
+            return fields;
+        }
+
+        public boolean isMethods() {
+            return methods;
+        }
+
+        public static Config of(boolean fields, boolean methods, Config defaultConfig) {
+            if (fields && methods) {
+                return ALL;
+            } else if (fields) {
+                return FIELDS;
+            } else if (methods) {
+                return METHODS;
+            } else {
+                return defaultConfig;
+            }
+        }
+    }
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactory.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactory.java
new file mode 100644
index 0000000000..5990a3703f
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactory.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * {@code QueryTypeFactory} defines an interface for mapping domain types to Querydsl expression types
+ *
+ * @author tiwe
+ *
+ */
+public interface QueryTypeFactory {
+
+    /**
+     * Create an expression type based on the given actual type
+     *
+     * @param type actual type
+     * @return expression type
+     */
+    Type create(Type type);
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactoryImpl.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactoryImpl.java
new file mode 100644
index 0000000000..b82a79c881
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/QueryTypeFactoryImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * {@code QueryTypeFactoryImpl} is the default implementation of the {@link QueryTypeFactory} interface
+ *
+ * @author tiwe
+ *
+ */
+public class QueryTypeFactoryImpl implements QueryTypeFactory {
+
+    private final String prefix, suffix, packageSuffix;
+
+    @Inject
+    public QueryTypeFactoryImpl(
+            @Named(CodegenModule.PREFIX) String prefix,
+            @Named(CodegenModule.SUFFIX) String suffix,
+            @Named(CodegenModule.PACKAGE_SUFFIX) String packageSuffix) {
+        this.prefix = prefix;
+        this.suffix = suffix;
+        this.packageSuffix = packageSuffix;
+    }
+
+    @Override
+    public Type create(Type type) {
+        if (type.getPackageName().isEmpty()) {
+            return createWithoutPackage(type);
+        } else {
+            return createWithPackage(type);
+        }
+    }
+
+    private Type createWithPackage(Type type) {
+        String packageName = type.getPackageName();
+        String simpleName = prefix + normalizeName(type.getFullName()
+                .substring(packageName.length() + 1)) + suffix;
+        packageName = (packageName.startsWith("java") ? "ext." : "")
+                + packageName + packageSuffix;
+        return new SimpleType(type.getCategory(), packageName + "." + simpleName,
+                packageName, simpleName, false, false);
+    }
+
+    private Type createWithoutPackage(Type type) {
+        String simpleName = prefix + normalizeName(type.getFullName()) + suffix;
+        return new SimpleType(type.getCategory(), simpleName, "", simpleName, false, false);
+    }
+
+    private String normalizeName(String name) {
+        return name.replace('.', '_').replace('$', '_');
+    }
+
+
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Serializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Serializer.java
similarity index 76%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/Serializer.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/Serializer.java
index 1e4fe80c9f..139f213ce4 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/Serializer.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Serializer.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.io.IOException;
 
-import com.mysema.codegen.CodeWriter;
+import com.querydsl.codegen.utils.CodeWriter;
 
 /**
- * Serializer defines a common interface for {@link EntityType} serializers
+ * {@code Serializer} defines a common interface for {@link EntityType} serializers
  *
  * @author tiwe
  *
@@ -29,7 +29,7 @@ public interface Serializer {
      * Serialize the given {@link EntityType}
      *
      * @param type EntityType to serialize
-     * @param serializerConfig TODO
+     * @param serializerConfig serializer configuration
      * @param writer serialization target
      * @throws IOException
      */
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/SerializerConfig.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/SerializerConfig.java
new file mode 100644
index 0000000000..eb912bdc9b
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/SerializerConfig.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code SerializerConfig} defines serialization options to be used in the {@link Serializer}
+ *
+ * @author tiwe
+ *
+ */
+public interface SerializerConfig {
+
+    /**
+     * accessors are used for entity fields
+     *
+     * @return if accessors are used for entity fields
+     */
+    boolean useEntityAccessors();
+
+    /**
+     * indexed list accessors are used
+     *
+     * @return if indexed list accessors are used
+     */
+    boolean useListAccessors();
+
+    /**
+     * keyed map accessors are used
+     *
+     * @return if keyed map accessors are used
+     */
+    boolean useMapAccessors();
+
+    /**
+     * the default variable is created
+     *
+     * @return if the default variable is created
+     */
+    boolean createDefaultVariable();
+
+    /**
+     * the name of the default variable
+     *
+     * @return the name of the default variable
+     */
+    String defaultVariableName();
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/SimpleSerializerConfig.java
similarity index 89%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/SimpleSerializerConfig.java
index 46d1cde371..3c600ee221 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/SimpleSerializerConfig.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/SimpleSerializerConfig.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import com.mysema.query.annotations.Config;
+import com.querydsl.core.annotations.Config;
 
 /**
- * SimpleSerializerConfig is the default implementation of the {@link SerializerConfig} interface
- * 
+ * {@code SimpleSerializerConfig} is the default implementation of the {@link SerializerConfig} interface
+ *
  * @author tiwe
  *
  */
-public final class SimpleSerializerConfig implements SerializerConfig{
+public final class SimpleSerializerConfig implements SerializerConfig {
 
     public static final SerializerConfig DEFAULT = new SimpleSerializerConfig(false, false, false, true, "");
 
@@ -35,6 +35,7 @@ public static SerializerConfig getConfig(Config annotation) {
     }
 
     private final boolean entityAccessors, listAccessors, mapAccessors, createDefaultVariable;
+
     private final String defaultVariableName;
 
     public SimpleSerializerConfig(
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/Supertype.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/Supertype.java
new file mode 100644
index 0000000000..3bce3dd95e
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/Supertype.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * {@code Supertype} defines a tuple of a {@link Type} and an optional {@link EntityType} instance used for
+ * supertype references in {@link EntityType} instances
+ *
+ * @author tiwe
+ *
+ */
+public class Supertype {
+
+    @Nullable
+    private EntityType entityType;
+
+    private final Type type;
+
+    public Supertype(Type type) {
+        this.type = type;
+    }
+
+    public Supertype(Type type, EntityType entityType) {
+        this.type = type;
+        this.entityType = entityType;
+    }
+
+    @Nullable
+    public EntityType getEntityType() {
+        return entityType;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setEntityType(EntityType entityType) {
+        this.entityType = entityType;
+    }
+
+    @Override
+    public int hashCode() {
+        return type.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Supertype) {
+            return ((Supertype) o).type.equals(type);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return type.toString();
+    }
+
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/SupertypeSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/SupertypeSerializer.java
new file mode 100644
index 0000000000..0316405521
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/SupertypeSerializer.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+/**
+ * {@code SupertypeSerializer} is a {@link Serializer} for supertypes
+ *
+ * @author tiwe
+ *
+ */
+public interface SupertypeSerializer extends EntitySerializer {
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeFactory.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeFactory.java
new file mode 100644
index 0000000000..60e928ee6c
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeFactory.java
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.TypeExtends;
+import com.querydsl.codegen.utils.model.TypeSuper;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.core.util.PrimitiveUtils;
+import com.querydsl.core.util.ReflectionUtils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Array;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code TypeFactory} is a factory class for {@link Type} instances
+ *
+ * @author tiwe
+ *
+ */
+public final class TypeFactory {
+
+    private static final Type ANY = new TypeExtends(Types.OBJECT);
+
+    private final Map<List<?>, Type> cache = new HashMap<>();
+
+    private final List<Class<? extends Annotation>> entityAnnotations;
+
+    private final List<AnnotationHelper> annotationHelpers = new ArrayList<>();
+
+    private final Set<Class<?>> embeddableTypes = new HashSet<>();
+
+    private boolean unknownAsEntity = false;
+
+    private Function<EntityType, String> variableNameFunction;
+
+    public TypeFactory() {
+        this(new ArrayList<>(), DefaultVariableNameFunction.INSTANCE);
+    }
+
+    public TypeFactory(List<Class<? extends Annotation>> entityAnnotations) {
+        this(entityAnnotations, DefaultVariableNameFunction.INSTANCE);
+    }
+
+    public TypeFactory(List<Class<? extends Annotation>> entityAnnotations, Function<EntityType, String> variableNameFunction) {
+        this.entityAnnotations = entityAnnotations;
+        this.variableNameFunction = variableNameFunction;
+    }
+
+    public EntityType getEntityType(Class<?> cl) {
+        java.lang.reflect.Type generic = cl;
+        if (cl.getTypeParameters().length > 0) {
+            generic = new ParameterizedTypeImpl(cl, cl.getTypeParameters());
+        }
+        return (EntityType) get(true, cl, null, generic);
+    }
+
+    public Type get(Class<?> cl) {
+        return get(cl, cl);
+    }
+
+    public Type get(Class<?> cl, java.lang.reflect.Type genericType) {
+        return get(isEntityClass(cl), cl, null, genericType);
+    }
+
+    public Type get(Class<?> cl, AnnotatedElement annotated, java.lang.reflect.Type genericType) {
+        return get(isEntityClass(cl), cl, annotated, genericType);
+    }
+
+    public Type get(boolean entity, Class<?> cl, java.lang.reflect.Type genericType) {
+        return get(entity, cl, null, genericType);
+    }
+
+    public Type get(boolean entity, Class<?> cl, AnnotatedElement annotated, java.lang.reflect.Type genericType) {
+        List<Object> key = new ArrayList<>();
+        key.add(genericType);
+        AnnotationHelper annotationHelper = null;
+        Annotation selectedAnnotation = null;
+        if (annotated != null) {
+            for (Annotation annotation : annotated.getDeclaredAnnotations()) {
+                for (AnnotationHelper helper : annotationHelpers) {
+                    if (helper.isSupported(annotation.annotationType())) {
+                        key.add(annotation.annotationType());
+                        selectedAnnotation = annotated.getAnnotation(annotation.annotationType());
+                        annotationHelper = helper;
+                        key.add(helper.getCustomKey(selectedAnnotation));
+                        break;
+                    }
+                }
+            }
+        }
+        key = Collections.unmodifiableList(key);
+        if (cache.containsKey(key)) {
+            Type value = cache.get(key);
+            if (entity && !(value instanceof EntityType)) {
+                value = new EntityType(value, variableNameFunction);
+                cache.put(key, value);
+            }
+            return value;
+
+        } else {
+            Type value = create(entity, cl, annotationHelper, selectedAnnotation, genericType, key);
+            cache.put(key, value);
+            return value;
+        }
+    }
+
+    private Type create(boolean entity, Class<?> cl, AnnotationHelper annotationHelper, Annotation annotation, java.lang.reflect.Type genericType,
+            List<?> key) {
+        if (cl.isPrimitive()) {
+            cl = PrimitiveUtils.wrap(cl);
+        }
+        Type value;
+        Type[] tempParams = (Type[]) Array.newInstance(Type.class,
+                ReflectionUtils.getTypeParameterCount(genericType));
+        cache.put(key, new ClassType(cl, tempParams));
+        Type[] parameters = getParameters(cl, genericType);
+
+        if (cl.isArray()) {
+            Type componentType = get(cl.getComponentType());
+            if (cl.getComponentType().isPrimitive()) {
+                componentType = Types.PRIMITIVES.get(componentType);
+            }
+            value = componentType.asArrayType();
+        } else if (cl.isEnum()) {
+            value = new ClassType(TypeCategory.ENUM, cl);
+        } else if (Number.class.isAssignableFrom(cl) && Comparable.class.isAssignableFrom(cl)) {
+            value = new ClassType(TypeCategory.NUMERIC, cl, parameters);
+        } else if (entity) {
+            value = createOther(cl, entity, annotationHelper, annotation, parameters);
+        } else if (Map.class.isAssignableFrom(cl)) {
+            value = new SimpleType(Types.MAP, parameters[0], asGeneric(parameters[1]));
+        } else if (List.class.isAssignableFrom(cl)) {
+            value = new SimpleType(Types.LIST, asGeneric(parameters[0]));
+        } else if (Set.class.isAssignableFrom(cl)) {
+            value = new SimpleType(Types.SET, asGeneric(parameters[0]));
+        } else if (Collection.class.isAssignableFrom(cl)) {
+            value = new SimpleType(Types.COLLECTION, asGeneric(parameters[0]));
+        } else {
+            value = createOther(cl, entity, annotationHelper, annotation, parameters);
+        }
+
+        if (genericType instanceof TypeVariable) {
+            TypeVariable tv = (TypeVariable) genericType;
+            if (tv.getBounds().length == 1 && tv.getBounds()[0].equals(Object.class)) {
+                value = new TypeSuper(tv.getName(), value);
+            } else {
+                value = new TypeExtends(tv.getName(), value);
+            }
+        }
+
+        if (entity && !(value instanceof EntityType)) {
+            value = new EntityType(value, variableNameFunction);
+        }
+        return value;
+    }
+
+    private Type asGeneric(Type type) {
+        if (type.getParameters().size() == 0) {
+            int count = type.getJavaClass().getTypeParameters().length;
+            if (count > 0) {
+                return new SimpleType(type, new Type[count]);
+            }
+        }
+        return type;
+    }
+
+    private Type createOther(Class<?> cl, boolean entity, AnnotationHelper annotationHelper, Annotation annotation, Type[] parameters) {
+        TypeCategory typeCategory = TypeCategory.get(cl.getName());
+        if (annotationHelper != null) {
+            typeCategory = annotationHelper.getTypeByAnnotation(cl, annotation);
+        } else if (embeddableTypes.contains(cl)) {
+            typeCategory = TypeCategory.CUSTOM;
+        } else if (unknownAsEntity && typeCategory == TypeCategory.SIMPLE && !cl.getName().startsWith("java")) {
+            typeCategory = TypeCategory.CUSTOM;
+        } else if (typeCategory == TypeCategory.SIMPLE && entity) {
+            typeCategory = TypeCategory.ENTITY;
+        } else if (!typeCategory.isSubCategoryOf(TypeCategory.COMPARABLE) && Comparable.class.isAssignableFrom(cl)
+                && !cl.equals(Comparable.class)) {
+            typeCategory = TypeCategory.COMPARABLE;
+        }
+
+        return new ClassType(typeCategory, cl, parameters);
+    }
+
+    private Type[] getParameters(Class<?> cl, java.lang.reflect.Type genericType) {
+        int parameterCount = ReflectionUtils.getTypeParameterCount(genericType);
+        if (parameterCount > 0) {
+            return getGenericParameters(cl, genericType, parameterCount);
+        } else if (Map.class.isAssignableFrom(cl)) {
+            return new Type[]{Types.OBJECT, Types.OBJECT};
+        } else if (Collection.class.isAssignableFrom(cl)) {
+            return new Type[]{Types.OBJECT};
+        } else {
+            return new Type[0];
+        }
+    }
+
+    private Type[] getGenericParameters(Class<?> cl, java.lang.reflect.Type genericType,
+            int parameterCount) {
+        Type[] types = new Type[parameterCount];
+        for (int i = 0; i < types.length; i++) {
+            types[i] = getGenericParameter(cl, genericType, i);
+        }
+        return types;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private Type getGenericParameter(Class<?> cl, java.lang.reflect.Type genericType, int i) {
+        java.lang.reflect.Type parameter = ReflectionUtils.getTypeParameter(genericType, i);
+        if (parameter instanceof TypeVariable) {
+            TypeVariable variable = (TypeVariable) parameter;
+            Type rv = get(ReflectionUtils.getTypeParameterAsClass(genericType, i), null, parameter);
+            return new TypeExtends(variable.getName(), rv);
+        } else if (parameter instanceof WildcardType
+                && ((WildcardType) parameter).getUpperBounds()[0].equals(Object.class)
+                && ((WildcardType) parameter).getLowerBounds().length == 0) {
+            return ANY;
+        } else {
+            Type rv = get(ReflectionUtils.getTypeParameterAsClass(genericType, i), null, parameter);
+            if (parameter instanceof WildcardType) {
+                rv = new TypeExtends(rv);
+            }
+            return rv;
+        }
+    }
+
+    private boolean isEntityClass(Class<?> cl) {
+        for (Class<? extends Annotation> clazz : entityAnnotations) {
+            if (cl.isAnnotationPresent(clazz)) {
+                return true;
+            }
+        }
+        return embeddableTypes.contains(cl);
+    }
+
+    public void extendTypes() {
+        for (Map.Entry<List<?>, Type> entry : cache.entrySet()) {
+            if (entry.getValue() instanceof EntityType) {
+                EntityType entityType = (EntityType) entry.getValue();
+                if (entityType.getProperties().isEmpty()) {
+                    for (Type type : cache.values()) {
+                        if (type.getFullName().equals(entityType.getFullName()) && type instanceof EntityType) {
+                            EntityType base = (EntityType) type;
+                            for (Property property : base.getProperties()) {
+                                entityType.addProperty(property);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public void setUnknownAsEntity(boolean unknownAsEntity) {
+        this.unknownAsEntity = unknownAsEntity;
+    }
+
+    public void addEmbeddableType(Class<?> cl) {
+        embeddableTypes.add(cl);
+    }
+
+    public void addAnnotationHelper(AnnotationHelper annotationHelper) {
+        annotationHelpers.add(annotationHelper);
+    }
+}
diff --git a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeMappings.java
similarity index 81%
rename from querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java
rename to querydsl-codegen/src/main/java/com/querydsl/codegen/TypeMappings.java
index f3ba67c19b..1dac1e5d94 100644
--- a/querydsl-codegen/src/main/java/com/mysema/query/codegen/TypeMappings.java
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeMappings.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,25 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.TemplateExpression;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.TemplateExpression;
 
 /**
- * TypeMappings defines mappings from Java types to {@link Expression}, {@link Path} and 
+ * {@code TypeMappings} defines mappings from Java types to {@link Expression}, {@link Path} and
  * {@link TemplateExpression} types
  *
  * @author tiwe
@@ -37,6 +33,8 @@
  */
 public abstract class TypeMappings {
 
+    private final Map<Type, Type> genericQueryTypes = new HashMap<Type, Type>();
+
     private final Map<String, Type> queryTypes = new HashMap<String, Type>();
 
     private final Map<TypeCategory, Type> exprTypes
@@ -47,7 +45,7 @@ public abstract class TypeMappings {
 
     private final Map<TypeCategory, Type> templateTypes
             = new EnumMap<TypeCategory, Type>(TypeCategory.class);
-    
+
     public Type getTemplateType(Type type, EntityType model, boolean raw) {
         return getTemplateType(type, model, raw, false, false);
     }
@@ -61,7 +59,9 @@ public Type getExprType(Type type, EntityType model, boolean raw) {
     }
 
     public Type getExprType(Type type, EntityType model, boolean raw, boolean rawParameters, boolean extend) {
-        if (queryTypes.containsKey(type.getFullName())) {
+        if (genericQueryTypes.containsKey(type)) {
+            return genericQueryTypes.get(type);
+        } else if (queryTypes.containsKey(type.getFullName())) {
             return queryTypes.get(type.getFullName());
         } else {
             return getQueryType(exprTypes, type, model, raw, rawParameters, extend);
@@ -73,20 +73,22 @@ public Type getPathType(Type type, EntityType model, boolean raw) {
     }
 
     public Type getPathType(Type type, EntityType model, boolean raw, boolean rawParameters, boolean extend) {
-        if (queryTypes.containsKey(type.getFullName())) {
+        if (genericQueryTypes.containsKey(type)) {
+            return genericQueryTypes.get(type);
+        } else if (queryTypes.containsKey(type.getFullName())) {
             return queryTypes.get(type.getFullName());
         } else {
             return getQueryType(pathTypes, type, model, raw, rawParameters, extend);
         }
     }
 
-    private Type getQueryType(Map<TypeCategory, Type> types, Type type, EntityType model, boolean raw, 
+    private Type getQueryType(Map<TypeCategory, Type> types, Type type, EntityType model, boolean raw,
             boolean rawParameters, boolean extend) {
         Type exprType = types.get(type.getCategory());
         return getQueryType(type, model, exprType, raw, rawParameters, extend);
     }
 
-    public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw, 
+    public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw,
             boolean rawParameters, boolean extend) {
         TypeCategory category = type.getCategory();
         if (raw && category != TypeCategory.ENTITY && category != TypeCategory.CUSTOM) {
@@ -106,7 +108,7 @@ public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw
 
         }
     }
-    
+
     @SuppressWarnings("rawtypes")
     public void register(TypeCategory category,
             @Nullable Class<? extends Expression> expr,
@@ -125,9 +127,11 @@ public void register(TypeCategory category,
 
     public void register(Type type, Type queryType) {
         queryTypes.put(type.getFullName(), queryType);
+        genericQueryTypes.put(type, queryType);
     }
 
     public boolean isRegistered(Type type) {
         return queryTypes.containsKey(type.getFullName());
     }
+
 }
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeResolver.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeResolver.java
new file mode 100644
index 0000000000..5bed50c757
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/TypeResolver.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeExtends;
+import com.querydsl.codegen.utils.model.TypeSuper;
+
+import java.util.Objects;
+
+/**
+ * {@code TypeResolver} provides type resolving functionality for resolving generic type variables to
+ * concrete types
+ *
+ * @author tiwe
+ *
+ */
+final class TypeResolver {
+
+    /**
+     * Resolve type declared in declaringType for context
+     *
+     * @param type type to be resolved
+     * @param declaringType declaration context of type
+     * @param context target context of type
+     * @return resolved type
+     */
+    public static Type resolve(Type type, Type declaringType, EntityType context) {
+        Type resolved = unwrap(type);
+
+        String varName = getVarName(resolved);
+        if (varName != null) {
+            resolved = resolveVar(resolved, varName, declaringType, context);
+        } else if (!resolved.getParameters().isEmpty()) {
+            resolved = resolveWithParameters(resolved, declaringType, context);
+        }
+
+        // rewrap entity type
+        if (type instanceof EntityType) {
+            if (!unwrap(type).equals(resolved)) {
+                resolved = new EntityType(resolved, ((EntityType) type).getSuperTypes());
+            } else {
+                // reset to original type
+                resolved = type;
+            }
+        }
+
+        return resolved;
+    }
+
+    private static Type resolveVar(Type resolved, String varName, Type declaringType, EntityType context) {
+        // get parameter index of var in declaring type
+        int index = -1;
+        for (int i = 0; i < declaringType.getParameters().size(); i++) {
+            Type param = unwrap(declaringType.getParameters().get(i));
+            if (Objects.equals(getVarName(param), varName)) {
+                index = i;
+            }
+        }
+
+        if (index == -1) {
+            throw new IllegalStateException("Did not find type " + varName
+                    + " in " + declaringType + " for " + context);
+        }
+
+        Supertype type = context.getSuperType();
+        while (!type.getEntityType().equals(declaringType)) {
+            type = type.getEntityType().getSuperType();
+        }
+        if (!type.getType().getParameters().isEmpty()) {
+            return type.getType().getParameters().get(index);
+        } else {
+            // raw type
+            return resolved;
+        }
+    }
+
+    private static Type resolveWithParameters(Type type, Type declaringType, EntityType context) {
+        Type[] params = new Type[type.getParameters().size()];
+        boolean transformed = false;
+        for (int i = 0; i < type.getParameters().size(); i++) {
+            Type param = type.getParameters().get(i);
+            if (param != null && !param.getFullName().equals(type.getFullName())) {
+                params[i] = resolve(param, declaringType, context);
+                if (!params[i].equals(param)) {
+                    transformed = true;
+                }
+            }
+        }
+        if (transformed) {
+            return new SimpleType(type, params);
+        } else {
+            return type;
+        }
+    }
+
+    private static String getVarName(Type type) {
+        if (type instanceof TypeExtends) {
+            return ((TypeExtends) type).getVarName();
+        } else if (type instanceof TypeSuper) {
+            return ((TypeSuper) type).getVarName();
+        } else {
+            return null;
+        }
+    }
+
+    private static Type unwrap(Type type) {
+        if (type instanceof EntityType) {
+            return ((EntityType) type).getInnerType();
+        } else {
+            return type;
+        }
+    }
+
+    private TypeResolver() { }
+}
diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/package-info.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/package-info.java
new file mode 100644
index 0000000000..ea768ab1e4
--- /dev/null
+++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Code generations models and serializers
+ */
+package com.querydsl.codegen;
diff --git a/querydsl-codegen/src/test/java/Entity.java b/querydsl-codegen/src/test/java/Entity.java
new file mode 100644
index 0000000000..fba51de198
--- /dev/null
+++ b/querydsl-codegen/src/test/java/Entity.java
@@ -0,0 +1,17 @@
+
+public class Entity {
+
+    private String name;
+
+    public static String test(Object o) {
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/querydsl-codegen/src/test/java/Entity2.java b/querydsl-codegen/src/test/java/Entity2.java
new file mode 100644
index 0000000000..6c355cec1c
--- /dev/null
+++ b/querydsl-codegen/src/test/java/Entity2.java
@@ -0,0 +1,13 @@
+
+public class Entity2 {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/querydsl-core/src/test/java/com/SomeClass.java b/querydsl-codegen/src/test/java/com/SomeClass.java
similarity index 89%
rename from querydsl-core/src/test/java/com/SomeClass.java
rename to querydsl-codegen/src/test/java/com/SomeClass.java
index 79be9b3fbf..a9b89077d5 100644
--- a/querydsl-core/src/test/java/com/SomeClass.java
+++ b/querydsl-codegen/src/test/java/com/SomeClass.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/querydsl-codegen/src/test/java/com/applejuice/ShouldBeLoaded.java b/querydsl-codegen/src/test/java/com/applejuice/ShouldBeLoaded.java
new file mode 100644
index 0000000000..8402147751
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/applejuice/ShouldBeLoaded.java
@@ -0,0 +1,4 @@
+package com.applejuice;
+
+public class ShouldBeLoaded {
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java
deleted file mode 100644
index f00802f4cd..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Date;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.StringUtils;
-import com.mysema.codegen.model.*;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class BeanSerializerTest {
-
-    private Type typeModel;
-
-    private EntityType type;
-
-    private final Writer writer = new StringWriter();
-
-    @Before
-    public void setUp() {
-        typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false,false);
-        type = new EntityType(typeModel);
-    }
-
-    @Test
-    public void Annotations() throws IOException{
-        type.addAnnotation(new QueryEntityImpl());
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        String str = writer.toString();
-
-        assertTrue(str.contains("import com.mysema.query.annotations.QueryEntity;"));
-        assertTrue(str.contains("@QueryEntity"));
-    }
-
-    @Test
-    public void Annotated_Property() throws IOException{
-        Property property = new Property(type, "entityField", type);
-        property.addAnnotation(new QueryEntityImpl());
-        type.addProperty(property);
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        String str = writer.toString();
-
-        assertTrue(str.contains("import com.mysema.query.annotations.QueryEntity;"));
-        assertTrue(str.contains("@QueryEntity"));
-    }
-
-    @Test
-    public void Annotated_Property_Not_Serialized() throws IOException{
-        Property property = new Property(type, "entityField", type);
-        property.addAnnotation(new QueryEntityImpl());
-        type.addProperty(property);
-
-        BeanSerializer serializer = new BeanSerializer(false);
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        String str = writer.toString();
-
-        assertFalse(str.contains("import com.mysema.query.annotations.QueryEntity;"));
-        assertFalse(str.contains("@QueryEntity"));
-    }
-
-    @Test
-    public void Capitalization() throws IOException{
-        // property
-        type.addProperty(new Property(type, "cId", type));
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public DomainClass getcId() {"));
-    }
-
-    @Test
-    public void Interfaces() throws IOException {
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.addInterface(new ClassType(Serializable.class));
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public class DomainClass implements Serializable {"));
-    }
-
-    @Test
-    public void Interfaces2() throws IOException {
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.addInterface(Serializable.class);
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public class DomainClass implements Serializable {"));
-    }
-
-    @Test
-    public void ToString() throws IOException{
-        // property
-        type.addProperty(new Property(type, "entityField", type));
-        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
-        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
-        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
-        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
-        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.setAddToString(true);
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        //System.out.println(writer.toString());
-    }
-
-    @Test
-    public void FullConstructor() throws IOException{
-        // property
-        type.addProperty(new Property(type, "entityField", type));
-        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
-        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
-        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
-        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
-        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.setAddFullConstructor(true);
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        //System.out.println(writer.toString());
-    }
-
-    @Test
-    public void Properties() throws IOException{
-        // property
-        type.addProperty(new Property(type, "entityField", type));
-        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
-        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
-        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
-        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
-        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
-
-        for (Class<?> cl : Arrays.<Class<?>>asList(Boolean.class, Comparable.class, Integer.class, Date.class, java.sql.Date.class, java.sql.Time.class)) {
-            Type classType = new ClassType(TypeCategory.get(cl.getName()), cl);
-            type.addProperty(new Property(type, StringUtils.uncapitalize(cl.getSimpleName()), classType));
-        }
-
-        BeanSerializer serializer = new BeanSerializer();
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        String str = writer.toString();
-        //System.err.println(str);
-        for (String prop : Arrays.asList(
-                "String[] arrayField;",
-                "Boolean boolean$;",
-                "Collection<DomainClass> collection;",
-                "Comparable comparable;",
-                "java.util.Date date;",
-                "DomainClass entityField;",
-                "Integer integer;",
-                "List<DomainClass> listField;",
-                "Map<DomainClass, DomainClass> mapField;",
-                "Set<DomainClass> setField;",
-                "java.sql.Time time;")) {
-            assertTrue(prop + " was not contained", str.contains(prop));
-        }
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/CodegenModuleTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/CodegenModuleTest.java
deleted file mode 100644
index 1ec1a7e95b..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/CodegenModuleTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class CodegenModuleTest {
-
-    private final CodegenModule module = new CodegenModule();
-
-    @Test
-    public void DefaultPrefix() {
-        assertEquals("Q", module.get(String.class, CodegenModule.PREFIX));
-    }
-
-    @Test
-    public void TypeMappings() {
-        assertNotNull(module.get(TypeMappings.class));
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void Get_With_Unknown_Key() {
-        module.get(String.class, "XXX");
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/CustomTypeTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/CustomTypeTest.java
deleted file mode 100644
index 6ae90eebe5..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/CustomTypeTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.TypeCategory;
-
-public class CustomTypeTest {
-
-    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
-
-    private final TypeMappings typeMappings = new JavaTypeMappings();
-
-    private final EntitySerializer serializer = new EntitySerializer(typeMappings, Collections.<String>emptySet());
-
-    private final StringWriter writer = new StringWriter();
-
-    @Test
-    public void CustomType() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "property", new ClassType(Double[].class)));
-        typeMappings.register(new ClassType(Double[].class), new ClassType(Point.class));
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-        assertTrue(typeMappings.isRegistered(entityType.getProperties().iterator().next().getType()));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains(
-                "public final com.mysema.query.codegen.Point property = " +
-        	"new com.mysema.query.codegen.Point(forProperty(\"property\"));"));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/DelegateTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/DelegateTest.java
deleted file mode 100644
index dd1112361c..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/DelegateTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Types;
-
-public class DelegateTest {
-
-    @Test
-    public void Equals_Object() {
-        Delegate delegate = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
-        Delegate delegate2 = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
-        assertEquals(delegate, delegate2);
-    }
-
-    @Test
-    public void Not_Equals_Object() {
-        Delegate delegate = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
-        Delegate delegate2 = new Delegate(Types.STRING, Types.STRING, "delegate2", Collections.<Parameter>emptyList(), Types.STRING);
-        assertFalse(delegate.equals(delegate2));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java
deleted file mode 100644
index bc0f1acb3a..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddableSerializerTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.sql.Time;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.Map;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.*;
-import com.mysema.query.annotations.PropertyType;
-import org.junit.Test;
-
-public class EmbeddableSerializerTest {
-
-    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
-
-    private final TypeMappings typeMappings = new JavaTypeMappings();
-
-    private final EntitySerializer serializer = new EmbeddableSerializer(typeMappings, Collections.<String>emptySet());
-
-    private final StringWriter writer = new StringWriter();
-
-    @Test
-    public void Properties() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
-        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
-        entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
-        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
-        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
-        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
-        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        // TODO : assertions
-    }
-
-    @Test
-    public void OriginalCategory() throws IOException{
-        Map<TypeCategory, String> categoryToSuperClass
-                = new EnumMap<TypeCategory, String>(TypeCategory.class);
-        categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
-        categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.DATETIME, "DateTimePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.TIME, "TimePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.NUMERIC, "NumberPath<Entity>");
-        categoryToSuperClass.put(TypeCategory.STRING, "StringPath");
-        categoryToSuperClass.put(TypeCategory.BOOLEAN, "BooleanPath");
-
-        for (Map.Entry<TypeCategory, String> entry : categoryToSuperClass.entrySet()) {
-            SimpleType type = new SimpleType(entry.getKey(), "Entity", "", "Entity",false,false);
-            EntityType entityType = new EntityType(type);
-            typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-            assertTrue(entry.toString(), writer.toString().contains("public class QEntity extends "+entry.getValue()+" {"));
-        }
-
-    }
-
-    @Test
-    public void Empty() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        // TODO : assertions
-    }
-
-    @Test
-    public void No_Package() throws IOException {
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public class QEntity extends BeanPath<Entity> {"));
-    }
-
-    @Test
-    public void Correct_Superclass() throws IOException {
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale",false,false);
-        EntityType entityType = new EntityType(type);
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        //System.out.println(writer);
-        assertTrue(writer.toString().contains("public class QLocale extends BeanPath<Locale> {"));
-    }
-
-    @Test
-    public void Primitive_Array() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "bytes", new ClassType(byte[].class)));
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public final SimplePath<byte[]> bytes"));
-    }
-
-    @Test
-    public void Include() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
-        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
-        entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
-        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
-        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
-        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
-        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
-
-        EntityType subType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
-        subType.include(new Supertype(type,entityType));
-
-        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        // TODO : assertions
-    }
-
-    @Test
-    public void SuperType() throws IOException{
-        EntityType superType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type, Collections.singleton(new Supertype(superType, superType)));
-        typeMappings.register(superType, queryTypeFactory.create(superType));
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public final QEntity2 _super = new QEntity2(this);"));
-    }
-
-    @Test
-    public void Delegates() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        Delegate delegate = new Delegate(type, type, "test", Collections.<Parameter>emptyList(), Types.STRING);
-        entityType.addDelegate(delegate);
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("return Entity.test(this);"));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Embedded2Test.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Embedded2Test.java
deleted file mode 100644
index 5a9e226f81..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Embedded2Test.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.io.Serializable;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class Embedded2Test extends AbstractExporterTest {
-    
-    @QuerySupertype
-    public static class EntityCode {
-
-        public String code;
-
-    }
-    
-    @QuerySupertype
-    public static abstract class AbstractEntity<C extends EntityCode> {
-
-        @QueryEmbedded
-        public C code;
-        
-    }
-    
-    @QuerySupertype
-    public static class AbstractMultilingualEntity<C extends EntityCode> extends AbstractEntity<C> {
-
-    }
-    
-    @QuerySupertype
-    public static abstract class AbstractNamedEntity<C extends EntityCode> extends AbstractMultilingualEntity<C> {
-
-        public String nameEn;
-
-        public String nameNl;
-
-    }
-        
-    @QueryEntity
-    public static class Brand extends AbstractNamedEntity<BrandCode> {
-
-        public Long id;
-
-    }
-        
-    public interface Entity<T> extends Serializable {
-
-        boolean sameIdentityAs(T other);
-
-    }
-     
-    @QueryEmbeddable
-    public static class BrandCode extends EntityCode {
-
-    }
-    
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddedTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddedTest.java
deleted file mode 100644
index ba8af58f95..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EmbeddedTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mysema.query.codegen;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class EmbeddedTest extends AbstractExporterTest {
-    
-    @QueryEntity
-    public static class EntityClass extends AbstractEntity<SubEntityCode> {
-        
-    }
-    
-    @QuerySupertype
-    public static abstract class AbstractEntity<C extends EntityCode> {
-
-        @QueryEmbedded
-        public C code;
-    }
-
-    @QuerySupertype
-    public static class EntityCode {
-
-        public String code;
-
-    }
-    
-    @QueryEmbeddable
-    public static class SubEntityCode extends EntityCode {
-        
-        public String property;
-        
-    }
-    
-}    
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityInheritanceTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityInheritanceTest.java
deleted file mode 100644
index ad68e019d8..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityInheritanceTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mysema.query.codegen;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QuerySupertype;
-
-public class EntityInheritanceTest extends AbstractExporterTest {
-    
-    @QuerySupertype
-    public static class TreeEntity<T extends TreeEntity<T>> {
-        
-        public Integer id;
-        
-        public T parent;
-        
-    }
-
-    @QueryEntity
-    public static class TestEntity extends TreeEntity<TestEntity> {
-        
-        public String name;
-        
-    }
-    
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java
deleted file mode 100644
index 58c5a2baaf..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntitySerializerTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.sql.Time;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.Types;
-import com.mysema.query.annotations.PropertyType;
-
-public class EntitySerializerTest {
-
-    private QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
-
-    private final TypeMappings typeMappings = new JavaTypeMappings();
-
-    private final EntitySerializer serializer = new EntitySerializer(typeMappings, Collections.<String>emptySet());
-
-    private final StringWriter writer = new StringWriter();
-
-    public class Entity {
-
-    }
-
-    @Test
-    public void Javadocs_For_InnerClass() throws IOException{
-        EntityType entityType = new EntityType(new ClassType(Entity.class));
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("QEntitySerializerTest_Entity is a Querydsl query type for Entity"));
-    }
-    
-    @Test
-    public void Different_Package() throws IOException {
-        queryTypeFactory = new QueryTypeFactoryImpl("Q", "", ".gen");
-        
-        EntityType entityType = new EntityType(new ClassType(Entity.class));
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-        
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));        
-//        System.err.println(writer.toString());
-        assertTrue(writer.toString().contains("public class QEntitySerializerTest_Entity " +
-        		"extends EntityPathBase<EntitySerializerTest.Entity>"));
-    }
-    
-    @Test
-    public void No_Package() throws IOException {
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public class QEntity extends EntityPathBase<Entity> {"));
-    }
-
-    @Test
-    public void OriginalCategory() throws IOException{
-        Map<TypeCategory, String> categoryToSuperClass
-                = new EnumMap<TypeCategory, String>(TypeCategory.class);
-        categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
-        categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.DATETIME, "DateTimePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.TIME, "TimePath<Entity>");
-        categoryToSuperClass.put(TypeCategory.NUMERIC, "NumberPath<Entity>");
-        categoryToSuperClass.put(TypeCategory.STRING, "StringPath");
-        categoryToSuperClass.put(TypeCategory.BOOLEAN, "BooleanPath");
-
-        for (Map.Entry<TypeCategory, String> entry : categoryToSuperClass.entrySet()) {
-            SimpleType type = new SimpleType(entry.getKey(), "Entity", "", "Entity",false,false);
-            EntityType entityType = new EntityType(type);
-            typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-            assertTrue(entry.toString(), writer.toString().contains("public class QEntity extends "+entry.getValue()+" {"));
-        }
-
-    }
-
-    @Test
-    public void Correct_Superclass() throws IOException {
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale",false,false);
-        EntityType entityType = new EntityType(type);
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-//        System.out.println(writer);
-        assertTrue(writer.toString().contains("public class QLocale extends EntityPathBase<Locale> {"));
-    }
-
-    @Test
-    public void Primitive_Array() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "bytes", new ClassType(byte[].class)));
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public final SimplePath<byte[]> bytes"));
-    }
-
-    @Test
-    public void Include() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
-        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
-        entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
-        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
-        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
-        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
-        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
-
-        EntityType subType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
-        subType.include(new Supertype(type,entityType));
-
-        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        // TODO : assertions
-    }
-
-    @Test
-    public void Properties() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
-        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
-        entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
-        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
-        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
-        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
-        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
-        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        // TODO : assertions
-    }
-
-    @Test
-    public void SuperType() throws IOException{
-        EntityType superType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type, Collections.singleton(new Supertype(superType, superType)));
-        typeMappings.register(superType, queryTypeFactory.create(superType));
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("public final QEntity2 _super = new QEntity2(this);"));
-    }
-
-    @Test
-    public void Delegates() throws IOException{
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        Delegate delegate = new Delegate(type, type, "test", Collections.<Parameter>emptyList(), Types.STRING);
-        entityType.addDelegate(delegate);
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("return Entity.test(this);"));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityTypeTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityTypeTest.java
deleted file mode 100644
index 5ea061bb74..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/EntityTypeTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.TypeCategory;
-
-public class EntityTypeTest {
-
-    @Test
-    public void UncapSimpleName_Escaped() {
-        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Object.class);
-        EntityType entityModel = new EntityType(typeModel);
-        assertEquals("object", entityModel.getUncapSimpleName());
-
-        entityModel.addProperty(new Property(entityModel, "object", typeModel));
-        assertEquals("object1", entityModel.getUncapSimpleName());
-    }
-
-    @Test
-    public void UncapSimpleName_Escaped2() {
-        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Object.class);
-        EntityType entityModel = new EntityType(typeModel);
-        assertEquals("object", entityModel.getUncapSimpleName());
-
-        entityModel.addProperty(new Property(entityModel, "OBJECT", "object", typeModel,
-                Collections.<String> emptyList(), false));
-        assertEquals("object1", entityModel.getUncapSimpleName());
-    }
-
-    @Test
-    public void UncapSimpleName_Escaped3() {
-        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Void.class);
-        EntityType entityModel = new EntityType(typeModel);
-        assertEquals("void$", entityModel.getUncapSimpleName());
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntity.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntity.java
deleted file mode 100644
index 2dd06575a5..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntity.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class ExampleEntity extends ExampleSupertype {
-
-    private String name;
-
-    private ExampleEntity mate;
-
-    private List<ExampleEntity> mates;
-
-    private Map<String, ExampleEntity> matesByName;
-
-    private ExampleEmbeddable embeddable;
-
-    @QueryEmbedded
-    private ExampleEmbedded embedded;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ExampleEntity getMate() {
-        return mate;
-    }
-
-    public void setMate(ExampleEntity mate) {
-        this.mate = mate;
-    }
-
-    public ExampleEmbeddable getEmbeddable() {
-        return embeddable;
-    }
-
-    public void setEmbeddable(ExampleEmbeddable embeddable) {
-        this.embeddable = embeddable;
-    }
-
-    public List<ExampleEntity> getMates() {
-        return mates;
-    }
-
-    public void setMates(List<ExampleEntity> mates) {
-        this.mates = mates;
-    }
-
-    public Map<String, ExampleEntity> getMatesByName() {
-        return matesByName;
-    }
-
-    public void setMatesByName(Map<String, ExampleEntity> matesByName) {
-        this.matesByName = matesByName;
-    }
-
-    public ExampleEmbedded getEmbedded() {
-        return embedded;
-    }
-
-    public void setEmbedded(ExampleEmbedded embedded) {
-        this.embedded = embedded;
-    }
-
-
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Examples.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Examples.java
deleted file mode 100644
index 22a8570ad6..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Examples.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.mysema.query.codegen;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.types.OrderSpecifier;
-
-
-public class Examples {
-    
-    public static class Supertype {
-        
-        public String supertypeProperty;
-    }
-    
-    @QueryEntity
-    public static class SimpleEntity extends Supertype{
-
-    }
-
-    @QueryEntity
-    public static abstract class AbstractEntity<Id extends java.io.Serializable> {
-
-        public Id id;
-
-        public String first;
-
-    }
-
-    @QueryEntity
-    public static class SubEntity extends AbstractEntity<java.lang.Long> {
-     
-        public String second;
-     
-    } 
-    
-
-    @QueryEntity
-    public static class ComplexCollections {
-    
-        @QueryEmbedded
-        public List<Complex<String>> list;
-        
-        @QueryEmbedded
-        public Map<String, Complex<String>> map;
-        
-        @QueryEmbedded
-        public Map<String, Complex<?>> map2;
-        
-        @QueryEmbedded
-        public Map<?, Complex<String>> map3;
-                
-                
-    }
-    
-    
-    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
-
-        public T a;
-        
-        @Override
-        public int compareTo(Complex<T> arg0) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-    }
-    
-    @QueryEntity
-    public static class Reference {
-
-    }
-
-    @QueryEntity
-    public static class GenericRelations{
-        public Collection<Collection<Reference>> col1;
-        public Collection<List<Reference>> col2;
-        public Collection<Collection<? extends Reference>> col3;
-        public Collection<List<? extends Reference>> col4;
-
-        public Set<List<Reference>> set1;
-        public Set<Collection<Reference>> set2;
-        public Set<List<? extends Reference>> set3;
-        public Set<Collection<? extends Reference>> set4;
-
-        public Map<String,List<String>> map1;
-        public Map<List<String>,String> map2;
-        public Map<String,List<? extends String>> map3;
-        public Map<List<? extends String>,String> map4;
-    }
-
-    @QueryEntity
-    public static class Subtype extends DefaultQueryMetadata{
-
-        private static final long serialVersionUID = -218949941713252847L;
-
-    }
-    
-    @QueryEntity
-    public static class OrderBys {
-        
-        List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
-        
-    }
-    
-    @QueryEntity
-    public static class SimpleTypes {
-        
-        List<Class<? extends Date>> classList5;
-    }
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExternalEmbeddableTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExternalEmbeddableTest.java
deleted file mode 100644
index 1865d97e77..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExternalEmbeddableTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mysema.query.codegen;
-
-import org.junit.Ignore;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.domain.EmbeddableWithoutQType;
-
-@Ignore
-public class ExternalEmbeddableTest {
-
-    @QueryEntity
-    public static class EntityWithExternalEmbeddable {
-        
-        @QueryEmbedded
-        EmbeddableWithoutQType embeddable;
-        
-    }
-    
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Generic2Test.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Generic2Test.java
deleted file mode 100644
index fe520c2da3..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Generic2Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.Type;
-import com.mysema.query.annotations.QueryEntity;
-
-public class Generic2Test {
-    
-    @QueryEntity
-    public static class AbstractCollectionAttribute<T extends Collection<?>> {
-
-        T value;
-
-    }
-
-    @QueryEntity
-    public static class ListAttribute<T> extends AbstractCollectionAttribute<List<T>> {
-
-        String name;
-
-    }
-
-    @QueryEntity
-    public static class Product {
-
-        ListAttribute<Integer> integerAttributes;
-        ListAttribute<String> stringAttributes;
-
-    }
-    
-    @Test
-    public void Resolve() {
-        TypeFactory factory = new TypeFactory(Collections.<Class<? extends Annotation>>emptyList());
-        Type type = factory.get(AbstractCollectionAttribute.class);
-        assertEquals("com.mysema.query.codegen.Generic2Test.AbstractCollectionAttribute", type.getGenericName(false));
-        assertEquals("com.mysema.query.codegen.Generic2Test.AbstractCollectionAttribute", type.getGenericName(true));
-    }
-    
-    @Test
-    public void Resolve2() {
-        TypeFactory factory = new TypeFactory(Collections.<Class<? extends Annotation>>emptyList());
-        Type type = factory.getEntityType(AbstractCollectionAttribute.class);
-        assertEquals("com.mysema.query.codegen.Generic2Test.AbstractCollectionAttribute<? extends java.util.Collection<?>>", type.getGenericName(false));
-        assertEquals("com.mysema.query.codegen.Generic2Test.AbstractCollectionAttribute<? extends java.util.Collection<?>>", type.getGenericName(true));
-    }
-
-
-    @Test
-    public void Export() {
-        GenericExporter exporter = new GenericExporter();
-        exporter.setTargetFolder(new File("target/Generic2Test"));
-        exporter.export(Generic2Test.class.getClasses());
-    }
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericExporterTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericExporterTest.java
deleted file mode 100644
index 286858ff55..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericExporterTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.domain.Cat;
-
-public class GenericExporterTest {
-
-    private GenericExporter exporter;
-
-    @Before
-    public void setUp() {
-        exporter = new GenericExporter();
-    }
-    
-    @Test
-    public void Export() {        
-        exporter.setTargetFolder(new File("target/gen1"));
-        exporter.export(getClass().getPackage());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/QExampleEmbeddable.java").exists());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/QExampleEmbedded.java").exists());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/QExampleEntity.java").exists());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/QExampleEntityInterface.java").exists());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/QExampleSupertype.java").exists());
-        assertTrue(new File("target/gen1/com/mysema/query/codegen/sub/QExampleEntity2.java").exists());
-    }
-
-    @Test
-    public void Export_With_Keywords() throws IOException {
-        exporter.setKeywords(Keywords.JPA);
-        exporter.setTargetFolder(new File("target/gen1_jpa"));
-        exporter.export(getClass().getPackage());
-        String str = Files.toString(new File("target/gen1_jpa/com/mysema/query/codegen/QGroup.java"), Charsets.UTF_8);
-        assertTrue(str.contains("QGroup group = new QGroup(\"group1\");"));
-    }
-    
-    @Test
-    public void Export_With_Stopclass() {        
-        exporter.setTargetFolder(new File("target/gen1_stop"));
-        exporter.addStopClass(Examples.Supertype.class);
-        exporter.export(getClass().getPackage());
-        assertFalse(new File("target/gen1_stop/com/mysema/query/codegen/QExamples_Supertype.java").exists());        
-    }
-    
-    @Test
-    public void OverrideSerializer() {
-        exporter.setTargetFolder(new File("target/gen2"));
-        exporter.setSerializerClass(EntitySerializer.class);
-        exporter.export(getClass().getPackage());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/QExampleEmbeddable.java").exists());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/QExampleEmbedded.java").exists());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/QExampleEntity.java").exists());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/QExampleEntityInterface.java").exists());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/QExampleSupertype.java").exists());
-        assertTrue(new File("target/gen2/com/mysema/query/codegen/sub/QExampleEntity2.java").exists());
-    }
-    
-    @Test
-    public void Export_Package_as_String() {        
-        exporter.setTargetFolder(new File("target/gen3"));
-        exporter.export(getClass().getPackage().getName());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/QExampleEmbeddable.java").exists());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/QExampleEmbedded.java").exists());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/QExampleEntity.java").exists());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/QExampleEntityInterface.java").exists());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/QExampleSupertype.java").exists());
-        assertTrue(new File("target/gen3/com/mysema/query/codegen/sub/QExampleEntity2.java").exists());
-    }
-    
-    @Test
-    public void Export_With_Package_Suffix() {        
-        exporter.setTargetFolder(new File("target/gen4"));
-        exporter.setPackageSuffix("types");
-        exporter.export(getClass().getPackage());
-        assertTrue(new File("target/gen4/com/mysema/query/codegentypes/QExampleEmbeddable.java").exists());
-        assertTrue(new File("target/gen4/com/mysema/query/codegentypes/QExampleEmbedded.java").exists());
-        assertTrue(new File("target/gen4/com/mysema/query/codegentypes/QExampleEntity.java").exists());
-        assertTrue(new File("target/gen4/com/mysema/query/codegentypes/QExampleEntityInterface.java").exists());
-        assertTrue(new File("target/gen4/com/mysema/query/codegentypes/QExampleSupertype.java").exists());
-        assertTrue(new File("target/gen4/com/mysema/query/codegen/subtypes/QExampleEntity2.java").exists());
-    }
-    
-    @Test
-    public void Export_Handle_No_Methods_Nor_Fields() {        
-        exporter.setTargetFolder(new File("target/gen5"));
-        exporter.setHandleFields(false);
-        exporter.setHandleMethods(false);
-        exporter.export(getClass().getPackage());
-        assertTrue(new File("target/gen5/com/mysema/query/codegen/QExampleEmbeddable.java").exists());
-    }
-    
-    @Test
-    public void Export_Domain_Package() {
-        exporter.setTargetFolder(new File("target/gen6"));
-        exporter.export(Cat.class.getPackage());
-    }
-
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericTest.java
deleted file mode 100644
index 5ba655d037..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GenericTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mysema.query.codegen;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.Type;
-
-
-public class GenericTest {
-    
-    public static abstract class CapiBCKeyedByGrundstueck {
-        
-    }
-    
-    public static abstract class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
-        
-    }
-
-    public static abstract class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends
-            CapiBCKeyedByGrundstueck {
-    }
-    
-    private TypeFactory typeFactory = new TypeFactory();
-    
-    @Test
-    public void HidaBez() {
-        Type type = typeFactory.getEntityType(HidaBez.class);
-        //System.out.println(type.getGenericName(true));
-    }
-    
-    @Test
-    public void HidaBezGruppe() {
-        Type type = typeFactory.getEntityType(HidaBezGruppe.class);
-        //System.out.println(type.getGenericName(true));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Group.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Group.java
deleted file mode 100644
index a6ca9df9a7..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Group.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.codegen;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Group {
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Inheritance2Test.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Inheritance2Test.java
deleted file mode 100644
index 4dd26476c8..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Inheritance2Test.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.File;
-import java.lang.reflect.Field;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.query.annotations.QueryEntity;
-
-public class Inheritance2Test {
-
-    @QueryEntity
-    public abstract class Base<T extends Base<T>> {
-        @SuppressWarnings("unchecked")
-        Base2 base;
-        Base2<?,?> base2;
-    }
-
-    @QueryEntity
-    public abstract class Base2<T extends Base2<T,U>,U extends IFace> {
-
-    }
-
-    @QueryEntity
-    public abstract class BaseSub extends Base<BaseSub> {
-
-    }
-
-    @QueryEntity
-    public abstract class BaseSub2<T extends BaseSub2<T>> extends Base<T> {
-
-    }
-
-    @QueryEntity
-    public abstract class Base2Sub<T extends IFace> extends Base2<Base2Sub<T>,T> {
-
-    }
-
-    public interface IFace {
-
-    }
-    
-    @Test
-    public void Base_base() throws SecurityException, NoSuchFieldException {        
-        TypeFactory typeFactory = new TypeFactory();
-        Field field = Base.class.getDeclaredField("base");
-        Type type = typeFactory.get(field.getType(), field.getGenericType());
-        assertEquals(0, type.getParameters().size());
-    }
-    
-    @Test
-    public void Base_base2() throws SecurityException, NoSuchFieldException {        
-        TypeFactory typeFactory = new TypeFactory();
-        Field field = Base.class.getDeclaredField("base2");
-        Type type = typeFactory.get(field.getType(), field.getGenericType());
-        assertEquals(2, type.getParameters().size());
-        assertNull(((TypeExtends)type.getParameters().get(0)).getVarName());
-        assertNull(((TypeExtends)type.getParameters().get(1)).getVarName());
-    }
-    
-    @Test
-    public void test() {
-        GenericExporter exporter = new GenericExporter();
-        exporter.setTargetFolder(new File("target/" + getClass().getSimpleName()));
-        exporter.export(getClass().getClasses());
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/PackageSuffixTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/PackageSuffixTest.java
deleted file mode 100644
index 344a8b21cf..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/PackageSuffixTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.TypeCategory;
-
-public class PackageSuffixTest {
-    
-    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", ".query");
-
-    private final TypeMappings typeMappings = new JavaTypeMappings();
-
-    private final EntitySerializer serializer = new EntitySerializer(typeMappings, Collections.<String>emptySet());
-
-    private final StringWriter writer = new StringWriter();
-
-    @Test
-    public void Correct_Imports() throws IOException {
-        SimpleType type = new SimpleType(TypeCategory.ENTITY, "test.Entity", "test", "Entity",false,false);
-        EntityType entityType = new EntityType(type);
-        typeMappings.register(entityType, queryTypeFactory.create(entityType));
-
-        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("import test.Entity;"));
-        assertTrue(writer.toString().contains("public class QEntity extends EntityPathBase<Entity> {"));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Point.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/Point.java
deleted file mode 100644
index 80067fe691..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/Point.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.ArrayPath;
-
-
-public class Point extends ArrayPath<Double[], Double>{
-
-    private static final long serialVersionUID = 1776628530121566388L;
-
-    public Point(String variable) {
-        super(Double[].class, variable);
-    }
-
-    public Point(Path<?> parent, String property) {
-        super(Double[].class, parent, property);
-    }
-
-    public Point(PathMetadata<?> metadata) {
-        super(Double[].class, metadata);
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ProjectionSerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/ProjectionSerializerTest.java
deleted file mode 100644
index b30990ce81..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ProjectionSerializerTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.*;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Arrays;
-
-import static org.junit.Assert.assertTrue;
-
-
-public class ProjectionSerializerTest {
-    
-    @Test
-    public void Constructors() throws IOException{
-        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false,false);
-        EntityType type = new EntityType(typeModel);
-
-        // constructor
-        Parameter firstName = new Parameter("firstName", Types.STRING);
-        Parameter lastName = new Parameter("lastName", Types.STRING);
-        Parameter age = new Parameter("age", Types.INTEGER);
-        type.addConstructor(new Constructor(Arrays.asList(firstName, lastName, age)));
-        
-        Writer writer = new StringWriter();
-        ProjectionSerializer serializer = new ProjectionSerializer(new JavaTypeMappings());
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-        assertTrue(writer.toString().contains("Expression<String> firstName"));
-        assertTrue(writer.toString().contains("Expression<String> lastName"));
-        assertTrue(writer.toString().contains("Expression<Integer> age"));
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEmbeddable2Test.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEmbeddable2Test.java
deleted file mode 100644
index 283dc08246..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEmbeddable2Test.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.codegen;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-import com.mysema.query.annotations.QueryEntity;
-
-public class QueryEmbeddable2Test extends AbstractExporterTest {
-
-    @QueryEntity
-    public static class User {
-    
-        Complex<String> complex;
-        
-    }
-    
-    @QueryEmbeddable
-    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
-
-        T a;
-        
-        @Override
-        public int compareTo(Complex<T> arg0) {
-            return 0;
-        }
-        
-        public boolean equals(Object o) {
-            return o == this;
-        }
-        
-    }
-        
-}
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryTypeFactoryTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryTypeFactoryTest.java
deleted file mode 100644
index b17ad6575f..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryTypeFactoryTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Type;
-
-public class QueryTypeFactoryTest {
-
-    private Type type = new ClassType(Point.class);
-    
-    @Test
-    public void Prefix_Only() {
-        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "", "");
-        assertEquals("com.mysema.query.codegen.QPoint", factory.create(type).getFullName());
-    }
-    
-    @Test
-    public void Prefix_And_Suffix() {
-        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "Type", "");
-        assertEquals("com.mysema.query.codegen.QPointType", factory.create(type).getFullName());
-    }
-    
-    @Test
-    public void Suffix_Only() {
-        QueryTypeFactory factory = new QueryTypeFactoryImpl("", "Type", "");
-        assertEquals("com.mysema.query.codegen.PointType", factory.create(type).getFullName());
-    }
-    
-    @Test
-    public void Prefix_And_Package_Suffix() {
-        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "", ".query");
-        assertEquals("com.mysema.query.codegen.query.QPoint", factory.create(type).getFullName());
-    }
-    
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/SerializerTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/SerializerTest.java
deleted file mode 100644
index 08f0416860..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/SerializerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.StringUtils;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Constructor;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.codegen.model.TypeSuper;
-
-public class SerializerTest {
-
-    private EntityType type;
-
-    private Writer writer = new StringWriter();
-
-    private TypeMappings typeMappings = new JavaTypeMappings();
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void setUp() {
-        // type
-        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false, false);
-        type = new EntityType(typeModel);
-
-        // property
-        type.addProperty(new Property(type, "entityField", type));
-        type.addProperty(new Property(type, "collection", new ClassType(TypeCategory.COLLECTION, Collection.class, typeModel)));
-        type.addProperty(new Property(type, "listField", new ClassType(TypeCategory.LIST, List.class, typeModel)));
-        type.addProperty(new Property(type, "setField", new ClassType(TypeCategory.SET, Set.class, typeModel)));
-        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class, typeModel)));
-        type.addProperty(new Property(type, "mapField", new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel)));
-        type.addProperty(new Property(type, "superTypeField", new TypeExtends(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel))));
-        type.addProperty(new Property(type, "extendsTypeField", new TypeSuper(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel))));
-
-        for (Class<?> cl : Arrays.asList(Boolean.class, Comparable.class, Integer.class, Date.class, java.sql.Date.class, java.sql.Time.class)) {
-            Type classType = new ClassType(TypeCategory.get(cl.getName()), cl);
-            type.addProperty(new Property(type, StringUtils.uncapitalize(cl.getSimpleName()), classType));
-        }
-
-        // constructor
-        Parameter firstName = new Parameter("firstName", new ClassType(TypeCategory.STRING, String.class));
-        Parameter lastName = new Parameter("lastName", new ClassType(TypeCategory.STRING, String.class));
-        type.addConstructor(new Constructor(Arrays.asList(firstName, lastName)));
-    }
-
-    @Test
-    public void EntitySerializer() throws Exception {
-        new EntitySerializer(typeMappings, Collections.<String>emptyList())
-            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-    }
-
-    @Test
-    public void EntitySerializer2() throws Exception {
-        new EntitySerializer(typeMappings,Collections.<String>emptyList())
-            .serialize(type, new SimpleSerializerConfig(true,true,true,true,""), new JavaWriter(writer));
-    }
-
-    @Test
-    public void EmbeddableSerializer() throws Exception {
-        new EmbeddableSerializer(typeMappings,Collections.<String>emptyList())
-            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-    }
-
-    @Test
-    public void SupertypeSerializer() throws IOException{
-        new SupertypeSerializer(typeMappings,Collections.<String>emptyList())
-            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-    }
-
-    @Test
-    public void DTOSerializer() throws IOException{
-        new ProjectionSerializer(typeMappings)
-            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
-    }
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeMappingsTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeMappingsTest.java
deleted file mode 100644
index 2298f1b909..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeMappingsTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Type;
-
-public class TypeMappingsTest {
-
-    static class Entity { }
-
-    @Test
-    public void GetPathType_Of_InnerClass() {
-        TypeMappings typeMappings = new JavaTypeMappings();
-        EntityType model = new EntityType(new ClassType(TypeMappingsTest.class));
-        EntityType type = new EntityType(new ClassType(Entity.class));
-        typeMappings.register(type, new QueryTypeFactoryImpl("Q","","").create(type));
-
-        Type pathType = typeMappings.getPathType(type, model, false);
-        assertEquals("QTypeMappingsTest_Entity", pathType.getSimpleName());
-    }
-
-    @Test
-    public void IsRegistered() {
-        TypeMappings typeMappings = new JavaTypeMappings();
-        typeMappings.register(new ClassType(Double[].class), new ClassType(Point.class));
-        assertTrue(typeMappings.isRegistered(new ClassType(Double[].class)));
-
-    }
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeResolverTest.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeResolverTest.java
deleted file mode 100644
index 1f4c35d080..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeResolverTest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.query.codegen;
-
-public class TypeResolverTest {
-    
-    // generic parameter
-
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/sub/ExampleEntity2.java b/querydsl-codegen/src/test/java/com/mysema/query/codegen/sub/ExampleEntity2.java
deleted file mode 100644
index 04c354e2d1..0000000000
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/sub/ExampleEntity2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.codegen.sub;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class ExampleEntity2 {
-
-    private int id;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-    
-}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/AbstractExporterTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java
similarity index 89%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/AbstractExporterTest.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java
index b5156f9d15..b7830e4939 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/AbstractExporterTest.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java
@@ -1,11 +1,11 @@
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.io.File;
 
 import org.junit.Test;
 
 public abstract class AbstractExporterTest {
-    
+
     @Test
     public void test() {
         GenericExporter exporter = new GenericExporter();
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java
new file mode 100644
index 0000000000..afa7945288
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.StringUtils;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.core.annotations.Generated;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Date;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class BeanSerializerTest {
+
+    private Type typeModel;
+
+    private EntityType type;
+
+    private final Writer writer = new StringWriter();
+
+    @Before
+    public void setUp() {
+        typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
+        type = new EntityType(typeModel);
+    }
+
+    @Test
+    public void annotations() throws IOException {
+        type.addAnnotation(new QueryEntityImpl());
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String str = writer.toString();
+
+        assertTrue(str.contains("import com.querydsl.core.annotations.QueryEntity;"));
+        assertTrue(str.contains("@QueryEntity"));
+    }
+
+    @Test
+    public void annotated_property() throws IOException {
+        Property property = new Property(type, "entityField", type);
+        property.addAnnotation(new QueryEntityImpl());
+        type.addProperty(property);
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String str = writer.toString();
+
+        assertTrue(str.contains("import com.querydsl.core.annotations.QueryEntity;"));
+        assertTrue(str.contains("@QueryEntity"));
+    }
+
+    @Test
+    public void annotated_property_not_serialized() throws IOException {
+        Property property = new Property(type, "entityField", type);
+        property.addAnnotation(new QueryEntityImpl());
+        type.addProperty(property);
+
+        BeanSerializer serializer = new BeanSerializer(false);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String str = writer.toString();
+
+        assertFalse(str.contains("import com.querydsl.core.annotations.QueryEntity;"));
+        assertFalse(str.contains("@QueryEntity"));
+    }
+
+    @Test
+    public void capitalization() throws IOException {
+        // property
+        type.addProperty(new Property(type, "cId", type));
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public DomainClass getcId() {"));
+    }
+
+    @Test
+    public void interfaces() throws IOException {
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.addInterface(new ClassType(Serializable.class));
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class DomainClass implements Serializable {"));
+    }
+
+    @Test
+    public void interfaces2() throws IOException {
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.addInterface(Serializable.class);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class DomainClass implements Serializable {"));
+    }
+
+    @Test
+    public void toString_() throws IOException {
+        // property
+        type.addProperty(new Property(type, "entityField", type));
+        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
+        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
+        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
+        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
+        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.setAddToString(true);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(String.valueOf(writer).contains(
+                "    @Override\n"
+                + "    public String toString()"));
+    }
+
+    @Test
+    public void fullConstructor() throws IOException {
+        // property
+        type.addProperty(new Property(type, "entityField", type));
+        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
+        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
+        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
+        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
+        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.setAddFullConstructor(true);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        //System.out.println(writer.toString());
+    }
+
+    @Test
+    public void properties() throws IOException {
+        // property
+        type.addProperty(new Property(type, "entityField", type));
+        type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
+        type.addProperty(new Property(type, "listField", new SimpleType(Types.LIST, typeModel)));
+        type.addProperty(new Property(type, "setField", new SimpleType(Types.SET, typeModel)));
+        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
+        type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
+
+        for (Class<?> cl : Arrays.<Class<?>>asList(Boolean.class, Comparable.class, Integer.class, Date.class, java.sql.Date.class, java.sql.Time.class)) {
+            Type classType = new ClassType(TypeCategory.get(cl.getName()), cl);
+            type.addProperty(new Property(type, StringUtils.uncapitalize(cl.getSimpleName()), classType));
+        }
+
+        BeanSerializer serializer = new BeanSerializer();
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String str = writer.toString();
+        //System.err.println(str);
+        for (String prop : Arrays.asList(
+                "String[] arrayField;",
+                "Boolean boolean$;",
+                "Collection<DomainClass> collection;",
+                "Comparable comparable;",
+                "java.util.Date date;",
+                "DomainClass entityField;",
+                "Integer integer;",
+                "List<DomainClass> listField;",
+                "Map<DomainClass, DomainClass> mapField;",
+                "Set<DomainClass> setField;",
+                "java.sql.Time time;")) {
+            assertTrue(prop + " was not contained", str.contains(prop));
+        }
+    }
+
+    @Test
+    public void defaultsGeneratedAnnotation() throws IOException {
+        Serializer serializer = new BeanSerializer();
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSource = String.valueOf(writer);
+        assertThat(generatedSource, containsString(String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName())));
+        assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.BeanSerializer\")\npublic class"));
+    }
+
+    @Test
+    public void customGeneratedAnnotation() throws IOException {
+        Serializer serializer = new BeanSerializer(BeanSerializer.DEFAULT_JAVADOC_SUFFIX, Generated.class);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSource = String.valueOf(writer);
+        assertThat(generatedSource, containsString("import com.querydsl.core.annotations.Generated;"));
+        assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.BeanSerializer\")\npublic class"));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java
new file mode 100644
index 0000000000..910219fe77
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.SomeClass;
+
+public class ClassPathUtilsTest {
+
+    @Test
+    public void scanPackage() throws IOException {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        Set<Class<?>> classes = ClassPathUtils.scanPackage(classLoader, SomeClass.class.getPackage());
+        assertFalse(classes.isEmpty());
+    }
+
+    @Test
+    public void scanPackage_check_initialized() throws IOException {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        Set<Class<?>> classes = ClassPathUtils.scanPackage(classLoader, getClass().getPackage());
+        assertFalse(classes.isEmpty());
+        assertEquals("XXX", SomeOtherClass2.property);
+    }
+
+    @Test
+    public void safeClassForName() {
+        assertNull(safeForName("com.sun.nio.file.ExtendedOpenOption"));
+        assertNotNull(safeForName("com.suntanning.ShouldBeLoaded"));
+        assertNotNull(safeForName("com.applejuice.ShouldBeLoaded"));
+    }
+
+    private Class<?> safeForName(String className) {
+        return ClassPathUtils.safeClassForName(ClassPathUtilsTest.class.getClassLoader(), className);
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java
new file mode 100644
index 0000000000..14a1e31d4e
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import java.lang.annotation.Annotation;
+
+public class CodegenModuleTest {
+
+    private final CodegenModule module = new CodegenModule();
+
+    @Test
+    public void defaultPrefix() {
+        assertEquals("Q", module.get(String.class, CodegenModule.PREFIX));
+    }
+
+    @Test
+    public void typeMappings() {
+        assertNotNull(module.get(TypeMappings.class));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void get_with_unknown_key() {
+        module.get(String.class, "XXX");
+    }
+
+    @Test
+    public void defaultGeneratedClass() {
+        Class<? extends Annotation> o = module.get(Class.class, CodegenModule.GENERATED_ANNOTATION_CLASS);
+        assertEquals(o, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    @Test
+    public void javadocSuffixForBeanSerializerOverloadedConstructorInjection() {
+        String o = module.get(String.class, CodegenModule.JAVADOC_SUFFIX);
+        assertEquals(o, BeanSerializer.DEFAULT_JAVADOC_SUFFIX);
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/CompileUtils.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/CompileUtils.java
new file mode 100644
index 0000000000..04b80eab41
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/CompileUtils.java
@@ -0,0 +1,40 @@
+package com.querydsl.codegen;
+
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.tools.JavaCompiler;
+import javax.tools.SimpleJavaFileObject;
+
+import org.junit.Assert;
+
+import com.querydsl.codegen.utils.MemFileManager;
+import com.querydsl.codegen.utils.MemSourceFileObject;
+import com.querydsl.codegen.utils.SimpleCompiler;
+
+public final class CompileUtils {
+
+    private CompileUtils() { }
+
+    public static void assertCompiles(String name, String source) {
+        ClassLoader parent = CompileUtils.class.getClassLoader();
+        SimpleCompiler compiler = new SimpleCompiler();
+        MemFileManager fileManager = new MemFileManager(parent, compiler.getStandardFileManager(null, null, null));
+        String classpath = SimpleCompiler.getClassPath(parent);
+        List<String> compilationOptions = Arrays.asList("-classpath", classpath, "-g:none");
+
+        // compile
+        SimpleJavaFileObject javaFileObject = new MemSourceFileObject(name, source);
+        Writer out = new StringWriter();
+        JavaCompiler.CompilationTask task = compiler.getTask(out, fileManager, null, compilationOptions, null,
+                Collections.singletonList(javaFileObject));
+        if (!task.call()) {
+            Assert.fail("Compilation of " + source + " failed.\n" + out.toString());
+        }
+
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java
new file mode 100644
index 0000000000..25f8f241b3
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.TypeCategory;
+
+public class CustomTypeTest {
+
+    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
+
+    private final TypeMappings typeMappings = new JavaTypeMappings();
+
+    private final EntitySerializer serializer = new DefaultEntitySerializer(typeMappings, Collections.<String>emptySet());
+
+    private final StringWriter writer = new StringWriter();
+
+    @Test
+    public void customType() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "property", new ClassType(Double[].class)));
+        typeMappings.register(new ClassType(Double[].class), new ClassType(Point.class));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        assertTrue(typeMappings.isRegistered(entityType.getProperties().iterator().next().getType()));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains(
+                "public final com.querydsl.codegen.Point property = " +
+            "new com.querydsl.codegen.Point(forProperty(\"property\"));"));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java
new file mode 100644
index 0000000000..373ca5cffa
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Types;
+
+public class DelegateTest {
+
+    @Test
+    public void equals_object() {
+        Delegate delegate = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
+        Delegate delegate2 = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
+        assertEquals(delegate, delegate2);
+    }
+
+    @Test
+    public void not_equals_object() {
+        Delegate delegate = new Delegate(Types.STRING, Types.STRING, "delegate", Collections.<Parameter>emptyList(), Types.STRING);
+        Delegate delegate2 = new Delegate(Types.STRING, Types.STRING, "delegate2", Collections.<Parameter>emptyList(), Types.STRING);
+        assertFalse(delegate.equals(delegate2));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java
new file mode 100644
index 0000000000..bae7f3edef
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.sql.Time;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.annotations.PropertyType;
+
+public class EmbeddableSerializerTest {
+
+    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
+
+    private final TypeMappings typeMappings = new JavaTypeMappings();
+
+    private final EntitySerializer serializer = new DefaultEmbeddableSerializer(typeMappings, Collections.<String>emptySet());
+
+    private final StringWriter writer = new StringWriter();
+
+    @Test
+    public void properties() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
+        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
+        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
+        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
+        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
+        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void originalCategory() throws IOException {
+        Map<TypeCategory, String> categoryToSuperClass
+                = new EnumMap<TypeCategory, String>(TypeCategory.class);
+        categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
+        categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.DATETIME, "DateTimePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.TIME, "TimePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.NUMERIC, "NumberPath<Entity>");
+        categoryToSuperClass.put(TypeCategory.STRING, "StringPath");
+        categoryToSuperClass.put(TypeCategory.BOOLEAN, "BooleanPath");
+
+        for (Map.Entry<TypeCategory, String> entry : categoryToSuperClass.entrySet()) {
+            StringWriter w = new StringWriter();
+            SimpleType type = new SimpleType(entry.getKey(), "Entity", "", "Entity",false,false);
+            EntityType entityType = new EntityType(type);
+            typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(w));
+            assertTrue(entry.getValue() + " is missing from " + w, w.toString().contains("public class QEntity extends " + entry.getValue() + " {"));
+        }
+
+    }
+
+    @Test
+    public void empty() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void no_package() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class QEntity extends BeanPath<Entity> {"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void correct_superclass() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class QLocale extends BeanPath<Locale> {"));
+        CompileUtils.assertCompiles("QLocale", writer.toString());
+    }
+
+    @Test
+    public void primitive_array() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "bytes", new ClassType(byte[].class)));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+
+        assertTrue(writer.toString().contains("public final SimplePath<byte[]> bytes"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void include() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
+        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
+        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
+        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
+        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
+        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
+
+        EntityType subType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
+        subType.include(new Supertype(type,entityType));
+
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        typeMappings.register(subType, queryTypeFactory.create(subType));
+
+        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        CompileUtils.assertCompiles("QEntity2", writer.toString());
+    }
+
+    @Test
+    public void superType() throws IOException {
+        EntityType superType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type, Collections.singleton(new Supertype(superType, superType)));
+        typeMappings.register(superType, queryTypeFactory.create(superType));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public final QEntity2 _super = new QEntity2(this);"));
+        //CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void delegates() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        Delegate delegate = new Delegate(type, type, "test", Collections.<Parameter>emptyList(), Types.STRING);
+        entityType.addDelegate(delegate);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("return Entity.test(this);"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void defaultGeneratedAnnotation() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        final String generatedSource = writer.toString();
+        assertThat(generatedSource, containsString(String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName())));
+        assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultEmbeddableSerializer\")\npublic class"));
+        CompileUtils.assertCompiles("QEntity", generatedSource);
+    }
+
+    @Test
+    public void customGeneratedAnnotation() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        new DefaultEmbeddableSerializer(typeMappings, Collections.<String>emptySet(), com.querydsl.core.annotations.Generated.class).serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSourceCode = writer.toString();
+        assertThat(generatedSourceCode, containsString("@Generated(\"com.querydsl.codegen.DefaultEmbeddableSerializer\")\npublic class"));
+        CompileUtils.assertCompiles("QEntity", generatedSourceCode);
+    }
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Embedded2Test.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Embedded2Test.java
new file mode 100644
index 0000000000..c9d7de9ff2
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Embedded2Test.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.io.Serializable;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class Embedded2Test extends AbstractExporterTest {
+
+    @QuerySupertype
+    public static class EntityCode {
+
+        public String code;
+
+    }
+
+    @QuerySupertype
+    public abstract static class AbstractEntity<C extends EntityCode> {
+
+        @QueryEmbedded
+        public C code;
+
+    }
+
+    @QuerySupertype
+    public static class AbstractMultilingualEntity<C extends EntityCode> extends AbstractEntity<C> {
+
+    }
+
+    @QuerySupertype
+    public abstract static class AbstractNamedEntity<C extends EntityCode> extends AbstractMultilingualEntity<C> {
+
+        public String nameEn;
+
+        public String nameNl;
+
+    }
+
+    @QueryEntity
+    public static class Brand extends AbstractNamedEntity<BrandCode> {
+
+        public Long id;
+
+    }
+
+    public interface Entity<T> extends Serializable {
+
+        boolean sameIdentityAs(T other);
+
+    }
+
+    @QueryEmbeddable
+    public static class BrandCode extends EntityCode {
+
+    }
+
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddedTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddedTest.java
new file mode 100644
index 0000000000..5d502351da
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddedTest.java
@@ -0,0 +1,36 @@
+package com.querydsl.codegen;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class EmbeddedTest extends AbstractExporterTest {
+
+    @QueryEntity
+    public static class EntityClass extends AbstractEntity<SubEntityCode> {
+
+    }
+
+    @QuerySupertype
+    public abstract static class AbstractEntity<C extends EntityCode> {
+
+        @QueryEmbedded
+        public C code;
+    }
+
+    @QuerySupertype
+    public static class EntityCode {
+
+        public String code;
+
+    }
+
+    @QueryEmbeddable
+    public static class SubEntityCode extends EntityCode {
+
+        public String property;
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityInheritanceTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityInheritanceTest.java
new file mode 100644
index 0000000000..efdac87af0
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityInheritanceTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.codegen;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QuerySupertype;
+
+public class EntityInheritanceTest extends AbstractExporterTest {
+
+    @QuerySupertype
+    public static class TreeEntity<T extends TreeEntity<T>> {
+
+        public Integer id;
+
+        public T parent;
+
+    }
+
+    @QueryEntity
+    public static class TestEntity extends TreeEntity<TestEntity> {
+
+        public String name;
+
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java
new file mode 100644
index 0000000000..eb1801aadb
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.sql.Time;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.annotations.PropertyType;
+
+public class EntitySerializerTest {
+
+    private QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", "");
+
+    private final TypeMappings typeMappings = new JavaTypeMappings();
+
+    private final EntitySerializer serializer = new DefaultEntitySerializer(typeMappings, Collections.<String>emptySet());
+
+    private final StringWriter writer = new StringWriter();
+
+    public static class Entity {
+
+    }
+
+    @Test
+    public void javadocs_for_innerClass() throws IOException {
+        EntityType entityType = new EntityType(new ClassType(Entity.class));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("QEntitySerializerTest_Entity is a Querydsl query type for Entity"));
+        CompileUtils.assertCompiles("QEntitySerializerTest_Entity", writer.toString());
+    }
+
+    @Test
+    public void different_package() throws IOException {
+        queryTypeFactory = new QueryTypeFactoryImpl("Q", "", ".gen");
+
+        EntityType entityType = new EntityType(new ClassType(Entity.class));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class QEntitySerializerTest_Entity " +
+                "extends EntityPathBase<EntitySerializerTest.Entity>"));
+        CompileUtils.assertCompiles("QEntitySerializerTest_Entity", writer.toString());
+    }
+
+    @Test
+    public void no_package() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class QEntity extends EntityPathBase<Entity> {"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void original_category() throws IOException {
+        Map<TypeCategory, String> categoryToSuperClass
+                = new EnumMap<TypeCategory, String>(TypeCategory.class);
+        categoryToSuperClass.put(TypeCategory.COMPARABLE, "ComparablePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.ENUM, "EnumPath<Entity>");
+        categoryToSuperClass.put(TypeCategory.DATE, "DatePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.DATETIME, "DateTimePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.TIME, "TimePath<Entity>");
+        categoryToSuperClass.put(TypeCategory.NUMERIC, "NumberPath<Entity>");
+        categoryToSuperClass.put(TypeCategory.STRING, "StringPath");
+        categoryToSuperClass.put(TypeCategory.BOOLEAN, "BooleanPath");
+
+        for (Map.Entry<TypeCategory, String> entry : categoryToSuperClass.entrySet()) {
+            SimpleType type = new SimpleType(entry.getKey(), "Entity", "", "Entity",false,false);
+            EntityType entityType = new EntityType(type);
+            typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+            assertTrue(entry.toString(), writer.toString().contains("public class QEntity extends " + entry.getValue() + " {"));
+        }
+
+    }
+
+    @Test
+    public void correct_superclass() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public class QLocale extends EntityPathBase<Locale> {"));
+        CompileUtils.assertCompiles("QLocale", writer.toString());
+    }
+
+    @Test
+    public void primitive_array() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "bytes", new ClassType(byte[].class)));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public final SimplePath<byte[]> bytes"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void include() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
+        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
+        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
+        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
+        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
+        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
+
+        EntityType subType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
+        subType.include(new Supertype(type, entityType));
+        typeMappings.register(subType, queryTypeFactory.create(subType));
+
+        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        CompileUtils.assertCompiles("QEntity2", writer.toString());
+    }
+
+    @Test
+    public void properties() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        entityType.addProperty(new Property(entityType, "b", new ClassType(TypeCategory.BOOLEAN, Boolean.class)));
+        entityType.addProperty(new Property(entityType, "c", new ClassType(TypeCategory.COMPARABLE, String.class)));
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "d", new ClassType(TypeCategory.DATE, Date.class)));
+        entityType.addProperty(new Property(entityType, "e", new ClassType(TypeCategory.ENUM, PropertyType.class)));
+        entityType.addProperty(new Property(entityType, "dt", new ClassType(TypeCategory.DATETIME, Date.class)));
+        entityType.addProperty(new Property(entityType, "i", new ClassType(TypeCategory.NUMERIC, Integer.class)));
+        entityType.addProperty(new Property(entityType, "s", new ClassType(TypeCategory.STRING, String.class)));
+        entityType.addProperty(new Property(entityType, "t", new ClassType(TypeCategory.TIME, Time.class)));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void superType() throws IOException {
+        EntityType superType = new EntityType(new SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2",false,false));
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type, Collections.singleton(new Supertype(superType, superType)));
+        typeMappings.register(superType, queryTypeFactory.create(superType));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("public final QEntity2 _super = new QEntity2(this);"));
+        //CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void delegates() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        Delegate delegate = new Delegate(type, type, "test", Collections.<Parameter>emptyList(), Types.STRING);
+        entityType.addDelegate(delegate);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("return Entity.test(this);"));
+        CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    public void defaultGeneratedAnnotation() throws IOException {
+        EntityType entityType = new EntityType(new ClassType(Entity.class));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSourceCode = writer.toString();
+        assertTrue(generatedSourceCode.contains(String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName())));
+        assertTrue(generatedSourceCode.contains("@Generated(\"com.querydsl.codegen.DefaultEntitySerializer\")\npublic class"));
+        CompileUtils.assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode);
+    }
+
+    @Test
+    public void customGeneratedAnnotation() throws IOException {
+        EntityType entityType = new EntityType(new ClassType(Entity.class));
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        new DefaultEntitySerializer(typeMappings, Collections.<String>emptySet(), com.querydsl.core.annotations.Generated.class).serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSourceCode = writer.toString();
+        assertTrue(generatedSourceCode.contains("import " + com.querydsl.core.annotations.Generated.class.getName() + ";"));
+        assertTrue(generatedSourceCode.contains("@" + com.querydsl.core.annotations.Generated.class.getSimpleName() + "(\"com.querydsl.codegen.DefaultEntitySerializer\")\npublic class"));
+        CompileUtils.assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode);
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java
new file mode 100644
index 0000000000..ed5de491b8
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.TypeCategory;
+
+public class EntityTypeTest {
+
+    @Test
+    public void uncapSimpleName_escaped() {
+        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Object.class);
+        EntityType entityModel = new EntityType(typeModel);
+        assertEquals("object", entityModel.getModifiedSimpleName());
+
+        entityModel.addProperty(new Property(entityModel, "object", typeModel));
+        assertEquals("object1", entityModel.getModifiedSimpleName());
+    }
+
+    @Test
+    public void uncapSimpleName_escaped2() {
+        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Object.class);
+        EntityType entityModel = new EntityType(typeModel);
+        assertEquals("object", entityModel.getModifiedSimpleName());
+
+        entityModel.addProperty(new Property(entityModel, "OBJECT", "object", typeModel,
+                Collections.<String> emptyList(), false));
+        assertEquals("object1", entityModel.getModifiedSimpleName());
+    }
+
+    @Test
+    public void uncapSimpleName_escaped3() {
+        ClassType typeModel = new ClassType(TypeCategory.ENTITY, Void.class);
+        EntityType entityModel = new EntityType(typeModel);
+        assertEquals("void$", entityModel.getModifiedSimpleName());
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbeddable.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbeddable.java
similarity index 83%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbeddable.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbeddable.java
index 45022514b2..5593515f9b 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbeddable.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbeddable.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import com.mysema.query.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbeddable;
 
 @QueryEmbeddable
 public class ExampleEmbeddable {
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbedded.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbedded.java
similarity index 88%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbedded.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbedded.java
index e379a02675..c85b5a7618 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEmbedded.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEmbedded.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 public class ExampleEmbedded {
 
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntity.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntity.java
new file mode 100644
index 0000000000..cb4c983e3d
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntity.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class ExampleEntity extends ExampleSupertype {
+
+    private String name;
+
+    private ExampleEntity mate;
+
+    private List<ExampleEntity> mates;
+
+    private Map<String, ExampleEntity> matesByName;
+
+    private ExampleEmbeddable embeddable;
+
+    @QueryEmbedded
+    private ExampleEmbedded embedded;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ExampleEntity getMate() {
+        return mate;
+    }
+
+    public void setMate(ExampleEntity mate) {
+        this.mate = mate;
+    }
+
+    public ExampleEmbeddable getEmbeddable() {
+        return embeddable;
+    }
+
+    public void setEmbeddable(ExampleEmbeddable embeddable) {
+        this.embeddable = embeddable;
+    }
+
+    public List<ExampleEntity> getMates() {
+        return mates;
+    }
+
+    public void setMates(List<ExampleEntity> mates) {
+        this.mates = mates;
+    }
+
+    public Map<String, ExampleEntity> getMatesByName() {
+        return matesByName;
+    }
+
+    public void setMatesByName(Map<String, ExampleEntity> matesByName) {
+        this.matesByName = matesByName;
+    }
+
+    public ExampleEmbedded getEmbedded() {
+        return embedded;
+    }
+
+    public void setEmbedded(ExampleEmbedded embedded) {
+        this.embedded = embedded;
+    }
+
+
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntityInterface.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntityInterface.java
similarity index 80%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntityInterface.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntityInterface.java
index 6cfeaa97da..377b4cab5c 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleEntityInterface.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleEntityInterface.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public interface ExampleEntityInterface {
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleSupertype.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleSupertype.java
similarity index 82%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleSupertype.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleSupertype.java
index e05eb12a27..665902421a 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ExampleSupertype.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExampleSupertype.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QuerySupertype;
 
 @QuerySupertype
 public class ExampleSupertype {
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Examples.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Examples.java
new file mode 100644
index 0000000000..2dde5cee96
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Examples.java
@@ -0,0 +1,115 @@
+package com.querydsl.codegen;
+
+import java.util.*;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.types.OrderSpecifier;
+
+
+public class Examples {
+
+    public static class Supertype {
+
+        public String supertypeProperty;
+    }
+
+    @QueryEntity
+    public static class SimpleEntity extends Supertype {
+
+    }
+
+    @QueryEntity
+    public abstract static class AbstractEntity<Id extends java.io.Serializable> {
+
+        public Id id;
+
+        public String first;
+
+    }
+
+    @QueryEntity
+    public static class SubEntity extends AbstractEntity<java.lang.Long> {
+
+        public String second;
+
+    }
+
+
+    @QueryEntity
+    public static class ComplexCollections {
+
+        @QueryEmbedded
+        public List<Complex<String>> list;
+
+        @QueryEmbedded
+        public Map<String, Complex<String>> map;
+
+        @QueryEmbedded
+        public Map<String, Complex<?>> map2;
+
+        @QueryEmbedded
+        public Map<?, Complex<String>> map3;
+
+
+    }
+
+
+    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
+
+        public T a;
+
+        @Override
+        public int compareTo(Complex<T> arg0) {
+            return 0;
+        }
+
+        public boolean equals(Object o) {
+            return o == this;
+        }
+    }
+
+    @QueryEntity
+    public static class Reference {
+
+    }
+
+    @QueryEntity
+    public static class GenericRelations {
+        public Collection<Collection<Reference>> col1;
+        public Collection<List<Reference>> col2;
+        public Collection<Collection<? extends Reference>> col3;
+        public Collection<List<? extends Reference>> col4;
+
+        public Set<List<Reference>> set1;
+        public Set<Collection<Reference>> set2;
+        public Set<List<? extends Reference>> set3;
+        public Set<Collection<? extends Reference>> set4;
+
+        public Map<String,List<String>> map1;
+        public Map<List<String>,String> map2;
+        public Map<String,List<? extends String>> map3;
+        public Map<List<? extends String>,String> map4;
+    }
+
+    @QueryEntity
+    public static class Subtype extends DefaultQueryMetadata {
+
+        private static final long serialVersionUID = -218949941713252847L;
+
+    }
+
+    @QueryEntity
+    public static class OrderBys {
+
+        List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
+
+    }
+
+    @QueryEntity
+    public static class SimpleTypes {
+
+        List<Class<? extends Date>> classList5;
+    }
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java
new file mode 100644
index 0000000000..d0c608e502
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java
@@ -0,0 +1,20 @@
+package com.querydsl.codegen;
+
+import org.junit.Ignore;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.domain.EmbeddableWithoutQType;
+
+@Ignore
+public class ExternalEmbeddableTest {
+
+    @QueryEntity
+    public static class EntityWithExternalEmbeddable {
+
+        @QueryEmbedded
+        EmbeddableWithoutQType embeddable;
+
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java
new file mode 100644
index 0000000000..849fbf4f65
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.codegen;
+
+import org.junit.Test;
+
+import javax.annotation.Generated;
+import java.lang.annotation.Annotation;
+
+import static org.junit.Assert.assertNotNull;
+
+public class GeneratedAnnotationResolverTest {
+
+    private static final String defaultGenerated = Generated.class.getName();
+
+    @Test
+    public void resolveCustom() {
+        String customClass = "some.random.Class";
+        Class<? extends Annotation> resolvedAnnotationClass = GeneratedAnnotationResolver.resolve(customClass);
+        assertNotNull(resolvedAnnotationClass);
+    }
+
+    @Test
+    public void resolveNull() {
+        Class<? extends Annotation>  resolvedAnnotationClass = GeneratedAnnotationResolver.resolve(null);
+        assertNotNull(resolvedAnnotationClass);
+    }
+
+    @Test
+    public void resolveDefault() {
+        Class<? extends Annotation> resolvedAnnotationClass = GeneratedAnnotationResolver.resolveDefault();
+        assertNotNull(resolvedAnnotationClass);
+    }
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java
new file mode 100644
index 0000000000..0e0bfc38af
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java
@@ -0,0 +1,63 @@
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class Generic2Test {
+
+    @QueryEntity
+    public static class AbstractCollectionAttribute<T extends Collection<?>> {
+
+        T value;
+
+    }
+
+    @QueryEntity
+    public static class ListAttribute<T> extends AbstractCollectionAttribute<List<T>> {
+
+        String name;
+
+    }
+
+    @QueryEntity
+    public static class Product {
+
+        ListAttribute<Integer> integerAttributes;
+        ListAttribute<String> stringAttributes;
+
+    }
+
+    @Test
+    public void resolve() {
+        TypeFactory factory = new TypeFactory(Collections.<Class<? extends Annotation>>emptyList());
+        Type type = factory.get(AbstractCollectionAttribute.class);
+        assertEquals("com.querydsl.codegen.Generic2Test.AbstractCollectionAttribute", type.getGenericName(false));
+        assertEquals("com.querydsl.codegen.Generic2Test.AbstractCollectionAttribute", type.getGenericName(true));
+    }
+
+    @Test
+    public void resolve2() {
+        TypeFactory factory = new TypeFactory(Collections.<Class<? extends Annotation>>emptyList());
+        Type type = factory.getEntityType(AbstractCollectionAttribute.class);
+        assertEquals("com.querydsl.codegen.Generic2Test.AbstractCollectionAttribute<? extends java.util.Collection<?>>", type.getGenericName(false));
+        assertEquals("com.querydsl.codegen.Generic2Test.AbstractCollectionAttribute<? extends java.util.Collection<?>>", type.getGenericName(true));
+    }
+
+
+    @Test
+    public void export() {
+        GenericExporter exporter = new GenericExporter();
+        exporter.setTargetFolder(new File("target/Generic2Test"));
+        exporter.export(Generic2Test.class.getClasses());
+    }
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java
new file mode 100644
index 0000000000..c886a0f52f
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.querydsl.core.domain.Cat;
+
+public class GenericExporterTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    private GenericExporter exporter;
+
+    @Before
+    public void setUp() {
+        exporter = new GenericExporter();
+    }
+
+    @Test
+    public void export() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_with_keywords() throws IOException {
+        exporter.setKeywords(Keywords.JPA);
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(getClass().getPackage());
+        String str = new String(Files.readAllBytes(new File(folder.getRoot(), "com/querydsl/codegen/QGroup.java").toPath()), StandardCharsets.UTF_8);
+        assertTrue(str.contains("QGroup group = new QGroup(\"group1\");"));
+    }
+
+    @Test
+    public void export_with_stopClass() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.addStopClass(Examples.Supertype.class);
+        exporter.export(getClass().getPackage());
+        assertFalse(new File(folder.getRoot(), "com/querydsl/codegen/QExamples_Supertype.java").exists());
+    }
+
+    @Test
+    public void override_serializer() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setSerializerClass(DefaultEntitySerializer.class);
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_package_as_string() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(getClass().getPackage().getName());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_with_package_suffix() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setPackageSuffix("types");
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/subtypes/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_handle_no_methods_nor_fields() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setHandleFields(false);
+        exporter.setHandleMethods(false);
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+    }
+
+    @Test
+    public void export_domain_package() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(Cat.class.getPackage());
+    }
+
+    @Test
+    public void export_serializerConfig() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setSerializerConfig(new SimpleSerializerConfig(true, true, true, true, ""));
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_useFieldTypes() {
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setUseFieldTypes(true);
+        exporter.export(getClass().getPackage());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java").exists());
+        assertTrue(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+    }
+
+    @Test
+    public void export_propertyHandling() throws IOException {
+        for (PropertyHandling ph : PropertyHandling.values()) {
+            File f = folder.newFolder();
+            GenericExporter e = new GenericExporter();
+            e.setTargetFolder(f);
+            e.setPropertyHandling(ph);
+            e.export(getClass().getPackage());
+            assertTrue(new File(f, "com/querydsl/codegen/QExampleEmbeddable.java").exists());
+            assertTrue(new File(f, "com/querydsl/codegen/QExampleEntity.java").exists());
+            assertTrue(new File(f, "com/querydsl/codegen/QExampleEntityInterface.java").exists());
+            assertTrue(new File(f, "com/querydsl/codegen/QExampleSupertype.java").exists());
+            assertTrue(new File(f, "com/querydsl/codegen/sub/QExampleEntity2.java").exists());
+        }
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java
new file mode 100644
index 0000000000..6391c25ead
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java
@@ -0,0 +1,36 @@
+package com.querydsl.codegen;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Type;
+
+
+public class GenericTest {
+
+    public abstract static class CapiBCKeyedByGrundstueck {
+
+    }
+
+    public abstract static class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
+
+    }
+
+    public abstract static class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends
+            CapiBCKeyedByGrundstueck {
+    }
+
+    private TypeFactory typeFactory = new TypeFactory();
+
+    @Test
+    public void hidaBez() {
+        Type type = typeFactory.getEntityType(HidaBez.class);
+        //System.out.println(type.getGenericName(true));
+    }
+
+    @Test
+    public void hidaBezGruppe() {
+        Type type = typeFactory.getEntityType(HidaBezGruppe.class);
+        //System.out.println(type.getGenericName(true));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GroovyBeanSerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java
similarity index 84%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/GroovyBeanSerializerTest.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java
index bedcc28d48..7b3e14fb96 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/GroovyBeanSerializerTest.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -19,29 +21,29 @@
 import java.util.Arrays;
 import java.util.Date;
 
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.StringUtils;
-import com.mysema.codegen.model.*;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.StringUtils;
+import com.querydsl.codegen.utils.model.*;
 
 public class GroovyBeanSerializerTest {
-    
+
     private Type typeModel;
-    
+
     private EntityType type;
 
     private final Writer writer = new StringWriter();
 
     @Before
     public void setUp() {
-        typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false,false);
-        type = new EntityType(typeModel);                    
+        typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
+        type = new EntityType(typeModel);
     }
-        
+
     @Test
-    public void Properties() throws IOException{
+    public void properties() throws IOException {
         // property
         type.addProperty(new Property(type, "entityField", type));
         type.addProperty(new Property(type, "collection", new SimpleType(Types.COLLECTION, typeModel)));
@@ -50,7 +52,7 @@ public void Properties() throws IOException{
         type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class)));
         type.addProperty(new Property(type, "mapField", new SimpleType(Types.MAP, typeModel, typeModel)));
 
-        for (Class<?> cl : Arrays.<Class<?>>asList(Boolean.class, Comparable.class, Integer.class, 
+        for (Class<?> cl : Arrays.<Class<?>>asList(Boolean.class, Comparable.class, Integer.class,
                 Date.class, java.sql.Date.class, java.sql.Time.class)) {
             Type classType = new ClassType(TypeCategory.get(cl.getName()), cl);
             type.addProperty(new Property(type, StringUtils.uncapitalize(cl.getSimpleName()), classType));
@@ -75,5 +77,5 @@ public void Properties() throws IOException{
             assertTrue(prop + " was not contained", str.contains(prop));
         }
     }
-    
+
 }
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Group.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Group.java
new file mode 100644
index 0000000000..f654be2b02
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Group.java
@@ -0,0 +1,8 @@
+package com.querydsl.codegen;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Group {
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java
new file mode 100644
index 0000000000..dc6d24c7a3
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java
@@ -0,0 +1,73 @@
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.File;
+import java.lang.reflect.Field;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeExtends;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class Inheritance2Test {
+
+    @QueryEntity
+    public abstract class Base<T extends Base<T>> {
+        @SuppressWarnings("unchecked")
+        Base2 base;
+        Base2<?,?> base2;
+    }
+
+    @QueryEntity
+    public abstract class Base2<T extends Base2<T,U>,U extends IFace> {
+
+    }
+
+    @QueryEntity
+    public abstract class BaseSub extends Base<BaseSub> {
+
+    }
+
+    @QueryEntity
+    public abstract class BaseSub2<T extends BaseSub2<T>> extends Base<T> {
+
+    }
+
+    @QueryEntity
+    public abstract class Base2Sub<T extends IFace> extends Base2<Base2Sub<T>,T> {
+
+    }
+
+    public interface IFace {
+
+    }
+
+    @Test
+    public void base_base() throws SecurityException, NoSuchFieldException {
+        TypeFactory typeFactory = new TypeFactory();
+        Field field = Base.class.getDeclaredField("base");
+        Type type = typeFactory.get(field.getType(), field.getGenericType());
+        assertEquals(0, type.getParameters().size());
+    }
+
+    @Test
+    public void base_base2() throws SecurityException, NoSuchFieldException {
+        TypeFactory typeFactory = new TypeFactory();
+        Field field = Base.class.getDeclaredField("base2");
+        Type type = typeFactory.get(field.getType(), field.getGenericType());
+        assertEquals(2, type.getParameters().size());
+        assertNull(((TypeExtends) type.getParameters().get(0)).getVarName());
+        assertNull(((TypeExtends) type.getParameters().get(1)).getVarName());
+    }
+
+    @Test
+    public void test() {
+        GenericExporter exporter = new GenericExporter();
+        exporter.setTargetFolder(new File("target/" + getClass().getSimpleName()));
+        exporter.export(getClass().getClasses());
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java
new file mode 100644
index 0000000000..153b2b8f79
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.TypeCategory;
+
+public class PackageSuffixTest {
+
+    private final QueryTypeFactory queryTypeFactory = new QueryTypeFactoryImpl("Q", "", ".query");
+
+    private final TypeMappings typeMappings = new JavaTypeMappings();
+
+    private final EntitySerializer serializer = new DefaultEntitySerializer(typeMappings, Collections.<String>emptySet());
+
+    private final StringWriter writer = new StringWriter();
+
+    @Test
+    public void correct_imports() throws IOException {
+        SimpleType type = new SimpleType(TypeCategory.ENTITY, "test.Entity", "test", "Entity",false,false);
+        EntityType entityType = new EntityType(type);
+        typeMappings.register(entityType, queryTypeFactory.create(entityType));
+
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("import test.Entity;"));
+        assertTrue(writer.toString().contains("public class QEntity extends EntityPathBase<Entity> {"));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/Point.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/Point.java
new file mode 100644
index 0000000000..282e5da357
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/Point.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.ArrayPath;
+
+
+public class Point extends ArrayPath<Double[], Double> {
+
+    private static final long serialVersionUID = 1776628530121566388L;
+
+    public Point(String variable) {
+        super(Double[].class, variable);
+    }
+
+    public Point(Path<?> parent, String property) {
+        super(Double[].class, parent, property);
+    }
+
+    public Point(PathMetadata metadata) {
+        super(Double[].class, metadata);
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java
new file mode 100644
index 0000000000..69f86c8cf3
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.Constructor;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.core.annotations.Generated;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Arrays;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class ProjectionSerializerTest {
+
+    @Test
+    public void constructors() throws IOException {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
+        EntityType type = new EntityType(typeModel);
+
+        // constructor
+        Parameter firstName = new Parameter("firstName", Types.STRING);
+        Parameter lastName = new Parameter("lastName", Types.STRING);
+        Parameter age = new Parameter("age", Types.INTEGER);
+        type.addConstructor(new Constructor(Arrays.asList(firstName, lastName, age)));
+
+        Writer writer = new StringWriter();
+        ProjectionSerializer serializer = new DefaultProjectionSerializer(new JavaTypeMappings());
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        assertTrue(writer.toString().contains("Expression<String> firstName"));
+        assertTrue(writer.toString().contains("Expression<String> lastName"));
+        assertTrue(writer.toString().contains("Expression<Integer> age"));
+    }
+
+    @Test
+    public void defaultGeneratedAnnotation() throws IOException {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
+        EntityType type = new EntityType(typeModel);
+
+        Writer writer = new StringWriter();
+        ProjectionSerializer serializer = new DefaultProjectionSerializer(new JavaTypeMappings());
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSource = writer.toString();
+        assertThat(generatedSource, containsString(String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName())));
+        assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultProjectionSerializer\")\npublic class"));
+    }
+
+    @Test
+    public void customGeneratedAnnotation() throws IOException {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
+        EntityType type = new EntityType(typeModel);
+
+        Writer writer = new StringWriter();
+        ProjectionSerializer serializer = new DefaultProjectionSerializer(new JavaTypeMappings(), Generated.class);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+        String generatedSource = writer.toString();
+        assertThat(generatedSource, containsString("import com.querydsl.core.annotations.Generated"));
+        assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultProjectionSerializer\")\npublic class"));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/PropertyTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java
similarity index 75%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/PropertyTest.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java
index f6fc9bfd5d..5ec735a80e 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/PropertyTest.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
 
 public class PropertyTest {
 
     @Test
-    public void Equals_And_HashCode() {
-        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false,false);
+    public void equals_and_hashCode() {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
         EntityType type = new EntityType(typeModel);
         Property p1 = new Property(type, "property", type, Collections.<String>emptyList());
         Property p2 = new Property(type, "property", type, Collections.<String>emptyList());
@@ -37,11 +37,11 @@ public void Equals_And_HashCode() {
     }
 
     @Test
-    public void EscapedName() {
-        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false,false);
+    public void escapedName() {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false,false);
         EntityType type = new EntityType(typeModel);
         Property property = new Property(type, "boolean", type, Collections.<String>emptyList());
         assertEquals("boolean$", property.getEscapedName());
     }
-    
+
 }
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEmbeddable2Test.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEmbeddable2Test.java
new file mode 100644
index 0000000000..bbe35c3973
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEmbeddable2Test.java
@@ -0,0 +1,31 @@
+package com.querydsl.codegen;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEntity;
+
+public class QueryEmbeddable2Test extends AbstractExporterTest {
+
+    @QueryEntity
+    public static class User {
+
+        Complex<String> complex;
+
+    }
+
+    @QueryEmbeddable
+    public static class Complex<T extends Comparable<T>> implements Comparable<Complex<T>> {
+
+        T a;
+
+        @Override
+        public int compareTo(Complex<T> arg0) {
+            return 0;
+        }
+
+        public boolean equals(Object o) {
+            return o == this;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEntityImpl.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEntityImpl.java
similarity index 78%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEntityImpl.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEntityImpl.java
index a06b2f789a..21801ad322 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/QueryEntityImpl.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryEntityImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.lang.annotation.Annotation;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @SuppressWarnings("all")
-public class QueryEntityImpl implements QueryEntity{
+public class QueryEntityImpl implements QueryEntity {
 
     @Override
     public Class<? extends Annotation> annotationType() {
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java
new file mode 100644
index 0000000000..ae5e165426
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+
+public class QueryTypeFactoryTest {
+
+    private Type type = new ClassType(Point.class);
+
+    @Test
+    public void prefix_only() {
+        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "", "");
+        assertEquals("com.querydsl.codegen.QPoint", factory.create(type).getFullName());
+    }
+
+    @Test
+    public void prefix_and_suffix() {
+        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "Type", "");
+        assertEquals("com.querydsl.codegen.QPointType", factory.create(type).getFullName());
+    }
+
+    @Test
+    public void suffix_only() {
+        QueryTypeFactory factory = new QueryTypeFactoryImpl("", "Type", "");
+        assertEquals("com.querydsl.codegen.PointType", factory.create(type).getFullName());
+    }
+
+    @Test
+    public void prefix_and_package_suffix() {
+        QueryTypeFactory factory = new QueryTypeFactoryImpl("Q", "", ".query");
+        assertEquals("com.querydsl.codegen.query.QPoint", factory.create(type).getFullName());
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ScalaTypeDump.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java
similarity index 75%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/ScalaTypeDump.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java
index 66cbb7bf04..002b4716ca 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/ScalaTypeDump.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -22,18 +22,18 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.codegen.ScalaWriter;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Type;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.*;
+import com.querydsl.codegen.utils.ScalaWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.*;
 
 public class ScalaTypeDump {
-    
+
     @Test
     @Ignore
-    public void test() throws IOException{
+    public void test() throws IOException {
         List<Class<?>> classes = new ArrayList<Class<?>>();
         classes.add(SimpleExpression.class);
         classes.add(ComparableExpression.class);
@@ -45,10 +45,10 @@ public void test() throws IOException{
         classes.add(DateExpression.class);
         classes.add(EnumExpression.class);
         classes.add(NumberExpression.class);
-        
+
         StringWriter w = new StringWriter();
         ScalaWriter writer = new ScalaWriter(w);
-        writer.packageDecl("com.mysema.query.scala");
+        writer.packageDecl("com.querydsl.scala");
         writer.imports(Expression.class.getPackage());
         for (Class<?> cl : classes) {
             Type type = new ClassType(cl);
@@ -57,15 +57,15 @@ public void test() throws IOException{
             for (Method m : cl.getDeclaredMethods()) {
                 List<Parameter> params = new ArrayList<Parameter>();
                 for (Class<?> paramType : m.getParameterTypes()) {
-                    params.add(new Parameter("arg"+params.size(), new ClassType(paramType)));
+                    params.add(new Parameter("arg" + params.size(), new ClassType(paramType)));
                 }
                 Type returnType = new ClassType(m.getReturnType());
-                writer.beginPublicMethod(returnType, ":"+m.getName(), params.toArray(new Parameter[params.size()]));
+                writer.beginPublicMethod(returnType, ":" + m.getName(), params.toArray(new Parameter[0]));
                 writer.end();
             }
             writer.end();
         }
-        
+
         System.out.println(w);
     }
 
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java
new file mode 100644
index 0000000000..ff3d484904
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.StringUtils;
+import com.querydsl.codegen.utils.model.*;
+
+public class SerializerTest {
+
+    private EntityType type;
+
+    private Writer writer = new StringWriter();
+
+    private TypeMappings typeMappings = new JavaTypeMappings();
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() {
+        // type
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false);
+        type = new EntityType(typeModel);
+
+        // property
+        type.addProperty(new Property(type, "entityField", type));
+        type.addProperty(new Property(type, "collection", new ClassType(TypeCategory.COLLECTION, Collection.class, typeModel)));
+        type.addProperty(new Property(type, "listField", new ClassType(TypeCategory.LIST, List.class, typeModel)));
+        type.addProperty(new Property(type, "setField", new ClassType(TypeCategory.SET, Set.class, typeModel)));
+        type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class, typeModel)));
+        type.addProperty(new Property(type, "mapField", new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel)));
+        type.addProperty(new Property(type, "superTypeField", new TypeExtends(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel))));
+        type.addProperty(new Property(type, "extendsTypeField", new TypeSuper(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel))));
+
+        for (Class<?> cl : Arrays.asList(Boolean.class, Comparable.class, Integer.class, Date.class, java.sql.Date.class, java.sql.Time.class)) {
+            Type classType = new ClassType(TypeCategory.get(cl.getName()), cl);
+            type.addProperty(new Property(type, StringUtils.uncapitalize(cl.getSimpleName()), classType));
+        }
+
+        // constructor
+        Parameter firstName = new Parameter("firstName", new ClassType(TypeCategory.STRING, String.class));
+        Parameter lastName = new Parameter("lastName", new ClassType(TypeCategory.STRING, String.class));
+        type.addConstructor(new Constructor(Arrays.asList(firstName, lastName)));
+    }
+
+    @Test
+    public void entitySerializer() throws Exception {
+        new DefaultEntitySerializer(typeMappings, Collections.<String>emptyList())
+            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+    }
+
+    @Test
+    public void entitySerializer2() throws Exception {
+        new DefaultEntitySerializer(typeMappings,Collections.<String>emptyList())
+            .serialize(type, new SimpleSerializerConfig(true,true,true,true,""), new JavaWriter(writer));
+    }
+
+    @Test
+    public void embeddableSerializer() throws Exception {
+        new DefaultEmbeddableSerializer(typeMappings,Collections.<String>emptyList())
+            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+    }
+
+    @Test
+    public void supertypeSerializer() throws IOException {
+        new DefaultSupertypeSerializer(typeMappings,Collections.<String>emptyList())
+            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+    }
+
+    @Test
+    public void projectionSerializer() throws IOException {
+        new DefaultProjectionSerializer(typeMappings)
+            .serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
+    }
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass.java
new file mode 100644
index 0000000000..25ec9e12ad
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass.java
@@ -0,0 +1,10 @@
+package com.querydsl.codegen;
+
+public class SomeOtherClass {
+
+    static {
+      SomeOtherClass2.property = "XXX";
+    }
+
+    public String someProperty;
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass2.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass2.java
new file mode 100644
index 0000000000..853b493910
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/SomeOtherClass2.java
@@ -0,0 +1,9 @@
+package com.querydsl.codegen;
+
+public final class SomeOtherClass2 {
+
+    private SomeOtherClass2() { }
+
+    public static String property;
+
+}
diff --git a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeFactoryTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java
similarity index 78%
rename from querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeFactoryTest.java
rename to querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java
index f93a8e5b89..f530c88b81 100644
--- a/querydsl-codegen/src/test/java/com/mysema/query/codegen/TypeFactoryTest.java
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.codegen;
+package com.querydsl.codegen;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -27,13 +25,9 @@
 
 import org.junit.Test;
 
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.TypeExtends;
-import com.mysema.codegen.model.Types;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.types.Expression;
+import com.querydsl.codegen.utils.model.*;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.types.Expression;
 
 public class TypeFactoryTest {
 
@@ -45,7 +39,7 @@ public class TypeFactoryTest {
 
     List<? extends Expression<?>> field4;
 
-    enum EnumExample { FIRST, SECOND}
+    enum EnumExample { FIRST, SECOND }
 
     static class Entity<A> {
 
@@ -62,23 +56,22 @@ static class ComparableEntity<T extends Comparable<? super T>> implements Serial
     private TypeFactory factory = new TypeFactory();
 
     @Test
-    public void InnerClass_Field() throws SecurityException, NoSuchFieldException{
+    public void innerClass_field() throws SecurityException, NoSuchFieldException {
         Field field = Entity.class.getDeclaredField("field");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
-        System.out.println(type.getParameters().get(0));
         assertEquals(Types.OBJECT, type.getParameters().get(0));
     }
 
     @Test
-    public void Parameters() {
+    public void parameters() {
         EntityType type = factory.getEntityType(Examples.Complex.class);
         assertEquals(1, type.getParameters().size());
         assertEquals(TypeExtends.class, type.getParameters().get(0).getClass());
     }
 
     @Test
-    public void Map_Field_Parameters() throws SecurityException, NoSuchFieldException {
+    public void map_field_parameters() throws SecurityException, NoSuchFieldException {
         Field field = Examples.ComplexCollections.class.getDeclaredField("map2");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(2, type.getParameters().size());
@@ -88,28 +81,28 @@ public void Map_Field_Parameters() throws SecurityException, NoSuchFieldExceptio
     }
 
     @Test
-    public void OrderBys() throws SecurityException, NoSuchFieldException {
+    public void orderBys() throws SecurityException, NoSuchFieldException {
         Field field = Examples.OrderBys.class.getDeclaredField("orderBy");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
     }
 
     @Test
-    public void SubEntity() {
+    public void subEntity() {
         Type type = factory.get(Examples.SubEntity.class);
         assertEquals(0, type.getParameters().size());
     }
 
     @Test
-    public void AbstractEntity_Code() throws SecurityException, NoSuchFieldException {
+    public void abstractEntity_code() throws SecurityException, NoSuchFieldException {
         Field field = EmbeddedTest.AbstractEntity.class.getDeclaredField("code");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertTrue(type instanceof TypeExtends);
-        assertEquals("C", ((TypeExtends)type).getVarName());
+        assertEquals("C", ((TypeExtends) type).getVarName());
     }
 
     @Test
-    public void SimpleTypes_classList5() throws SecurityException, NoSuchFieldException {
+    public void simpleTypes_classList5() throws SecurityException, NoSuchFieldException {
         Field field = Examples.SimpleTypes.class.getDeclaredField("classList5");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(TypeCategory.LIST, type.getCategory());
@@ -119,7 +112,7 @@ public void SimpleTypes_classList5() throws SecurityException, NoSuchFieldExcept
     }
 
     @Test
-    public void Collection_Of_Collection() throws SecurityException, NoSuchFieldException {
+    public void collection_of_collection() throws SecurityException, NoSuchFieldException {
         Field field = Examples.GenericRelations.class.getDeclaredField("col3");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
@@ -128,7 +121,7 @@ public void Collection_Of_Collection() throws SecurityException, NoSuchFieldExce
     }
 
     @Test
-    public void Generics_WildCard() throws SecurityException, NoSuchFieldException{
+    public void generics_wildCard() throws SecurityException, NoSuchFieldException {
         Field field = getClass().getDeclaredField("field");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
@@ -137,7 +130,7 @@ public void Generics_WildCard() throws SecurityException, NoSuchFieldException{
     }
 
     @Test
-    public void Generics_Object() throws SecurityException, NoSuchFieldException{
+    public void generics_object() throws SecurityException, NoSuchFieldException {
         Field field = getClass().getDeclaredField("field2");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
@@ -145,7 +138,7 @@ public void Generics_Object() throws SecurityException, NoSuchFieldException{
     }
 
     @Test
-    public void Generics_TypeVariable() {
+    public void generics_typeVariable() {
         Type type = factory.getEntityType(Generic2Test.AbstractCollectionAttribute.class);
         assertEquals(TypeExtends.class, type.getParameters().get(0).getClass());
         TypeExtends t = (TypeExtends) type.getParameters().get(0);
@@ -153,7 +146,7 @@ public void Generics_TypeVariable() {
     }
 
     @Test
-    public void Generics_Wildcard() throws SecurityException, NoSuchFieldException {
+    public void generics_wildcard() throws SecurityException, NoSuchFieldException {
         Field field = DefaultQueryMetadata.class.getDeclaredField("exprInJoins");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(TypeCategory.SET, type.getCategory());
@@ -161,21 +154,21 @@ public void Generics_Wildcard() throws SecurityException, NoSuchFieldException {
         assertEquals(Expression.class, parameter.getJavaClass());
         parameter = parameter.getParameters().get(0);
         assertEquals(TypeExtends.class, parameter.getClass());
-        assertNull(((TypeExtends)parameter).getVarName());
+        assertNull(((TypeExtends) parameter).getVarName());
     }
 
     @Test
-    public void ComparableEntity() {
+    public void comparableEntity() {
         Type type = factory.getEntityType(ComparableEntity.class);
         //ComparableEntity<T extends Comparable<? super T>> implements Serializable
         assertEquals(1, type.getParameters().size());
-        TypeExtends t = (TypeExtends)type.getParameters().get(0);
+        TypeExtends t = (TypeExtends) type.getParameters().get(0);
         assertEquals("T", t.getVarName());
         assertEquals(1, t.getParameters().size());
     }
 
     @Test
-    public void RawField() throws SecurityException, NoSuchFieldException{
+    public void rawField() throws SecurityException, NoSuchFieldException {
         Field field = getClass().getDeclaredField("field3");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
@@ -183,7 +176,7 @@ public void RawField() throws SecurityException, NoSuchFieldException{
     }
 
     @Test
-    public void Extends() throws SecurityException, NoSuchFieldException{
+    public void extends_() throws SecurityException, NoSuchFieldException {
         Field field = getClass().getDeclaredField("field4");
         Type type = factory.get(field.getType(), field.getGenericType());
         assertEquals(1, type.getParameters().size());
@@ -191,13 +184,13 @@ public void Extends() throws SecurityException, NoSuchFieldException{
     }
 
     @Test
-    public void ClassName() {
+    public void className() {
         Type type = factory.get(EnumExample.class);
-        assertEquals("com.mysema.query.codegen.TypeFactoryTest.EnumExample", type.getFullName());
+        assertEquals("com.querydsl.codegen.TypeFactoryTest.EnumExample", type.getFullName());
     }
 
     @Test
-    public void Blob() {
+    public void blob() {
         Type blob = factory.get(Blob.class);
         assertEquals("Blob", blob.getSimpleName());
         assertEquals("java.sql.Blob", blob.getFullName());
@@ -205,7 +198,7 @@ public void Blob() {
     }
 
     @Test
-    public void Boolean() {
+    public void boolean_() {
         Type bo = factory.get(boolean.class);
         assertEquals(TypeCategory.BOOLEAN, bo.getCategory());
         assertEquals("Boolean", bo.getSimpleName());
@@ -214,26 +207,26 @@ public void Boolean() {
     }
 
     @Test
-    public void SimpleType() {
+    public void simpleType() {
         for (Class<?> cl : Arrays.<Class<?>>asList(Blob.class, Clob.class, Locale.class, Class.class, Serializable.class)) {
             assertEquals("wrong type for " + cl.getName(), TypeCategory.SIMPLE, factory.get(cl).getCategory());
         }
     }
 
     @Test
-    public void NumberType() {
+    public void numberType() {
         for (Class<?> cl : Arrays.<Class<?>>asList(Byte.class, Integer.class)) {
             assertEquals("wrong type for " + cl.getName(), TypeCategory.NUMERIC, factory.get(cl).getCategory());
         }
     }
 
     @Test
-    public void EnumType() {
+    public void enumType() {
         assertEquals(TypeCategory.ENUM, factory.get(EnumExample.class).getCategory());
     }
 
     @Test
-    public void UnknownAsEntity() {
+    public void unknownAsEntity() {
         assertEquals(TypeCategory.SIMPLE, factory.get(TypeFactoryTest.class).getCategory());
 
         factory = new TypeFactory();
@@ -242,7 +235,7 @@ public void UnknownAsEntity() {
     }
 
     @Test
-    public void ArrayType() {
+    public void arrayType() {
         assertEquals(Types.BYTE.asArrayType(), factory.get(Byte[].class));
         assertEquals(Types.BYTE_P.asArrayType(), factory.get(byte[].class));
     }
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java
new file mode 100644
index 0000000000..a73d6db8cc
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Type;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TypeMappingsTest {
+
+    static class Entity { }
+
+    @Test
+    public void getPathType_of_innerClass() {
+        TypeMappings typeMappings = new JavaTypeMappings();
+        EntityType model = new EntityType(new ClassType(TypeMappingsTest.class));
+        EntityType type = new EntityType(new ClassType(Entity.class));
+        typeMappings.register(type, new QueryTypeFactoryImpl("Q","","").create(type));
+
+        Type pathType = typeMappings.getPathType(type, model, false);
+        assertEquals("QTypeMappingsTest_Entity", pathType.getSimpleName());
+    }
+
+    @Test
+    public void isRegistered() {
+        TypeMappings typeMappings = new JavaTypeMappings();
+        typeMappings.register(new ClassType(Double[].class), new ClassType(Point.class));
+        assertTrue(typeMappings.isRegistered(new ClassType(Double[].class)));
+    }
+
+    @Test
+    public void testGenericTypeRegistration() {
+        SimpleType rawListType = new SimpleType(List.class.getName());
+        SimpleType integerListType = new SimpleType(rawListType, Collections.<Type> singletonList(new SimpleType(Integer.class.getName())));
+        SimpleType longListType = new SimpleType(rawListType, Collections.<Type> singletonList(new SimpleType(Long.class.getName())));
+
+        SimpleType integerListTypeExpression = new SimpleType("integerListTypeExpression");
+        SimpleType longListTypeExpression = new SimpleType("longListTypeExpression");
+
+        TypeMappings typeMappings = new JavaTypeMappings();
+        typeMappings.register(integerListType, integerListTypeExpression);
+        typeMappings.register(longListType, longListTypeExpression);
+
+        assertEquals(integerListTypeExpression, typeMappings.getExprType(integerListType, null, false));
+        assertEquals(longListTypeExpression, typeMappings.getExprType(longListType, null, false));
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeResolverTest.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeResolverTest.java
new file mode 100644
index 0000000000..4f03ecc203
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeResolverTest.java
@@ -0,0 +1,7 @@
+package com.querydsl.codegen;
+
+public class TypeResolverTest {
+
+    // generic parameter
+
+}
diff --git a/querydsl-codegen/src/test/java/com/querydsl/codegen/sub/ExampleEntity2.java b/querydsl-codegen/src/test/java/com/querydsl/codegen/sub/ExampleEntity2.java
new file mode 100644
index 0000000000..a9d66276f3
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/querydsl/codegen/sub/ExampleEntity2.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.codegen.sub;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class ExampleEntity2 {
+
+    private int id;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+}
diff --git a/querydsl-codegen/src/test/java/com/suntanning/ShouldBeLoaded.java b/querydsl-codegen/src/test/java/com/suntanning/ShouldBeLoaded.java
new file mode 100644
index 0000000000..91114f6b82
--- /dev/null
+++ b/querydsl-codegen/src/test/java/com/suntanning/ShouldBeLoaded.java
@@ -0,0 +1,4 @@
+package com.suntanning;
+
+public class ShouldBeLoaded {
+}
diff --git a/querydsl-codegen/template.mf b/querydsl-codegen/template.mf
deleted file mode 100644
index 2aec995362..0000000000
--- a/querydsl-codegen/template.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.codegen
-Bundle-Name: Querydsl Codegen
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.codegen.*;version="${codegen.version}";resolution:=optional,
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0", 
-  net.sf.cglib.proxy.*;version="${cglib.version}",
-  com.google.common.*;version="${guava.version}"
\ No newline at end of file
diff --git a/querydsl-collections/README.md b/querydsl-collections/README.md
index f12e0192e2..6a757e759d 100644
--- a/querydsl-collections/README.md
+++ b/querydsl-collections/README.md
@@ -6,55 +6,63 @@ The Collections module provides integration with Java Collections and Beans.
 
  Add the following dependencies to your Maven project :
 
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-apt</artifactId>
-      <version>${querydsl.version}</version>
-      <scope>provided</scope>
-    </dependency>    
-        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-collections</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>   
-
-If you are not using JPA or JDO you can generate Querydsl query types for your domain types by annotating them with the com.mysema.query.annotations.QueryEntity annotation and adding the following plugin configuration into your Maven configuration (pom.xml) :
-
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.6</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-apt</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-collections</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
+
+If you are not using JPA or JDO you can generate Querydsl query types for your domain types by annotating them with the com.querydsl.core.annotations.QueryEntity annotation and adding the following plugin configuration into your Maven configuration (pom.xml) :
+
+```XML
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+```
+
 **Querying**
 
 Querying with Querydsl Collections is as simple as this :
 
-    import static com.mysema.query.collections.CollQueryFactory.*;
-    
-    QCat cat = new QCat("cat");
-    for (String name : from(cat,cats)
-      .where(cat.kittens.size().gt(0))
-      .list(cat.name)){
-        System.out.println(name);
-    }
+```JAVA
+import static com.querydsl.collections.CollQueryFactory.*;
+
+QCat cat = new QCat("cat");
+for (String name : from(cat,cats)
+  .select(cat.name)
+  .where(cat.kittens.size().gt(0))
+  .fetch()){
+    System.out.println(name);
+}
+```
 
-For more information on the Querydsl Collections module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s07.html    
\ No newline at end of file
+For more information on the Querydsl Collections module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s08.html
diff --git a/querydsl-collections/doc/perf-20090313.txt b/querydsl-collections/doc/perf-20090313.txt
deleted file mode 100644
index 4721d154a0..0000000000
--- a/querydsl-collections/doc/perf-20090313.txt
+++ /dev/null
@@ -1,50 +0,0 @@
- #1 order preserved		cat.ne(otherCat),
- #2 order preserved		cat.eq(otherCat),         
- #3 order preserved		cat.name.eq(otherCat.name),   
- #4 inverted			cat.name.ne(otherCat.name).and(otherCat.name.eq("Kate5")),
- #5 inverted			cat.name.ne(otherCat.name).or(otherCat.name.eq("Kate5")),  
- #6 order preserved		cat.bodyWeight.eq(0).and(otherCat.name.eq("Kate5")),
- #7 order preserved		cat.bodyWeight.eq(0).or(otherCat.name.eq("Kate5")),         
- #8 inverted			cat.name.ne(otherCat.name).and(otherCat.name.like("Kate5%")),
- #9 inverted			cat.name.ne(otherCat.name).or(otherCat.name.like("Kate5%")),   
-#10 order preserved		cat.name.like("Bob5%").and(otherCat.name.like("Kate5%")),   
-#11 order preserved		 cat.name.like("Bob5%").or(otherCat.name.like("Kate5%"))
-
-100 * 100 items
- #1                  19 ms        17 ms        20 ms        17 ms
- #2                   8 ms         3 ms         2 ms         3 ms
- #3                   9 ms         3 ms         3 ms         4 ms
- #4                   8 ms         9 ms         5 ms         8 ms
- #5                  14 ms        19 ms        21 ms        18 ms
- #6                  10 ms         8 ms         9 ms         8 ms
- #7                  12 ms        18 ms        19 ms        20 ms
- #8                  11 ms        10 ms         8 ms         6 ms
- #9                  12 ms        20 ms        19 ms        21 ms
-#10                  10 ms         6 ms         4 ms         6 ms
-#11                  10 ms        18 ms        17 ms        19 ms
-
-500 * 500 items
- #1                 225 ms       282 ms       281 ms       284 ms
- #2                 157 ms         2 ms         2 ms         4 ms
- #3                 161 ms         4 ms         2 ms         4 ms
- #4                 169 ms        84 ms         5 ms         8 ms
- #5                 241 ms       311 ms       305 ms       305 ms
- #6                 166 ms        82 ms        81 ms        84 ms
- #7                 238 ms       309 ms       312 ms       314 ms
- #8                 173 ms        94 ms        15 ms        16 ms
- #9                 235 ms       308 ms       306 ms       302 ms
-#10                 163 ms        10 ms         5 ms        10 ms
-#11                 185 ms       258 ms       259 ms       262 ms
-
-1000 * 1000 items
- #1                 882 ms      1108 ms      1109 ms      1107 ms
- #2                 623 ms         3 ms         2 ms         3 ms
- #3                 619 ms         3 ms         4 ms         5 ms
- #4                 658 ms       307 ms         9 ms         5 ms
- #5                 946 ms      1238 ms      1233 ms      1218 ms
- #6                 664 ms       301 ms       302 ms       302 ms
- #7                 921 ms      1196 ms      1206 ms      1194 ms
- #8                 688 ms       423 ms       145 ms       152 ms
- #9                 926 ms      1195 ms      1186 ms      1196 ms
-#10                 658 ms        55 ms        53 ms        55 ms
-#11                 768 ms      1047 ms      1050 ms      1052 ms
diff --git a/querydsl-collections/doc/perf-20090315.txt b/querydsl-collections/doc/perf-20090315.txt
deleted file mode 100644
index 8e273b8a9a..0000000000
--- a/querydsl-collections/doc/perf-20090315.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-#1  order preserved		!cat.equals(otherCat)
-#2  order preserved		cat.equals(otherCat)
-#3  order preserved		cat.getName().equals(otherCat.getName())
-#4  inverted			cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#5  inverted			!cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#6  inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#7  order preserved		cat.getBodyWeight() == a1 && otherCat.getName().equals(a2)
-#8  order preserved		cat.getBodyWeight() == a1 || otherCat.getName().equals(a2)
-#9  inverted			!cat.getName().equals(otherCat.getName()) && otherCat.getName().startsWith(a1, 0)
-#10 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().endsWith(a1)
-#11 order preserved		cat.getName().startsWith(a1, 0) && otherCat.getName().startsWith(a2, 0)
-#12 order preserved		cat.getName().startsWith(a1, 0) || otherCat.getName().endsWith(a2)
-
-								  							
-								  filtered		filtered	filtered
-								  				sorted		sorted
-								  							indexed	
-100 * 100 items
- #1                  20 ms        23 ms        21 ms        21 ms
- #2                   9 ms         5 ms         9 ms         4 ms
- #3                  11 ms        10 ms        10 ms         8 ms
- #4                  12 ms         9 ms         8 ms         8 ms
- #5                  12 ms        11 ms         7 ms         6 ms
- #6                  15 ms        20 ms        26 ms        24 ms
- #7                  12 ms        11 ms        11 ms        11 ms
- #8                  15 ms        22 ms        24 ms        24 ms
- #9                  12 ms        10 ms         6 ms         5 ms
- #10                 16 ms        23 ms        24 ms        21 ms
- #11                 13 ms         5 ms         5 ms         4 ms
- #12                 12 ms        19 ms        22 ms        20 ms
-
-500 * 500 items
- #1                 250 ms       325 ms       328 ms       325 ms
- #2                 170 ms        81 ms        81 ms         5 ms
- #3                 172 ms        86 ms        88 ms         8 ms
- #4                 179 ms       100 ms         5 ms         7 ms
- #5                 186 ms       103 ms         7 ms         6 ms
- #6                 260 ms       351 ms       349 ms       347 ms
- #7                 181 ms        97 ms        98 ms        99 ms
- #8                 257 ms       350 ms       351 ms       348 ms
- #9                 192 ms       113 ms        17 ms        15 ms
- #10                258 ms       352 ms       350 ms       348 ms
- #11                182 ms         6 ms        10 ms         9 ms
- #12                190 ms       285 ms       284 ms       282 ms
-
-1000 * 1000 items
- #1                 965 ms      1273 ms      1276 ms      1275 ms
- #2                 663 ms       306 ms       306 ms         4 ms		
- #3                 657 ms       332 ms       328 ms        13 ms		
- #4                 696 ms       370 ms         5 ms        11 ms		TODO : add constant based index
- #5                 720 ms       388 ms         9 ms         8 ms		TODO : add constant based index
- #6                1014 ms      1391 ms      1358 ms      1361 ms		
- #7                 699 ms       367 ms       366 ms       365 ms		TODO : add constant based index
- #8                1031 ms      1396 ms      1412 ms      1407 ms		
- #9                 729 ms       416 ms        25 ms        27 ms		TODO : tree based index
- #10               1014 ms      1392 ms      1358 ms      1356 ms		
- #11                698 ms        12 ms        12 ms        14 ms		TODO : tree based index
- #12                739 ms      1091 ms      1094 ms      1098 ms		
\ No newline at end of file
diff --git a/querydsl-collections/doc/perf-20090316.txt b/querydsl-collections/doc/perf-20090316.txt
deleted file mode 100644
index 7970de2ff0..0000000000
--- a/querydsl-collections/doc/perf-20090316.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-#1 order preserved		!cat.equals(otherCat)
-#2 order preserved		cat.equals(otherCat)
-#3 order preserved		cat.getName().equals(otherCat.getName())
-#4 inverted				cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#5 inverted				!(cat.getName().equals(otherCat.getName())) && otherCat.getName().equals(a1)
-#6 inverted				cat.getName().equals(otherCat.getName()) && !(otherCat.getName().equals(a1))
-#7 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#8 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().startsWith(a1, 0)
-#9 order preserved		cat.getBodyWeight() == a1 && otherCat.getName().equals(a2)
-#10 order preserved		cat.getName().startsWith(a1, 0) && otherCat.getName().startsWith(a2, 0)
-#11 inverted			cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#12 inverted			cat.getName().equals(otherCat.getName()) || !(otherCat.getName().equals(a1))
-#13 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#14 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().endsWith(a1)
-#15 order preserved		cat.getBodyWeight() == a1 || otherCat.getName().equals(a2)
-#16 order preserved		!(cat.getBodyWeight() == a1) || otherCat.getName().equals(a2)
-#17 order preserved		cat.getBodyWeight() == a1 || !(otherCat.getName().equals(a2))
-#18 order preserved		cat.getName().startsWith(a1, 0) || otherCat.getName().endsWith(a2)
-
-								  filtered		filtered	filtered
-								  				sorted		sorted
-								  							indexed	
-100 * 100 items
- #1                  18 ms        19 ms        18 ms        19 ms
- #2                   7 ms         8 ms         4 ms         4 ms
- #3                  11 ms         8 ms         9 ms         5 ms
- #4                  10 ms         9 ms         4 ms         8 ms
- #5                  10 ms         9 ms         6 ms         7 ms
- #6                  10 ms         9 ms         9 ms         9 ms
- #7                   9 ms        13 ms         2 ms         7 ms
- #8                  14 ms         5 ms        10 ms         2 ms
- #9                  10 ms         9 ms         9 ms         9 ms
- #10                 10 ms         5 ms         3 ms         5 ms
- #11                 10 ms         9 ms        18 ms        18 ms
- #12                 13 ms        22 ms        20 ms        21 ms
- #13                 15 ms        19 ms        18 ms        21 ms
- #14                 12 ms        19 ms        22 ms        20 ms
- #15                 11 ms        20 ms        20 ms        21 ms
- #16                 10 ms        18 ms        16 ms        16 ms
- #17                 12 ms        22 ms        22 ms        20 ms
- #18                 11 ms        17 ms        17 ms        16 ms
-
-500 * 500 items
- #1                 226 ms       296 ms       298 ms       297 ms
- #2                 155 ms        76 ms        75 ms         4 ms
- #3                 161 ms        82 ms        83 ms         7 ms
- #4                 162 ms        92 ms         3 ms        10 ms
- #5                 172 ms        98 ms         5 ms         7 ms
- #6                 164 ms        92 ms        81 ms        10 ms
- #7                 167 ms        93 ms         6 ms         7 ms
- #8                 171 ms       103 ms        14 ms        16 ms
- #9                 162 ms        93 ms        91 ms         9 ms
- #10                165 ms         8 ms         8 ms         8 ms
- #11                169 ms        96 ms       252 ms       252 ms
- #12                239 ms       332 ms       321 ms       320 ms
- #13                234 ms       322 ms       317 ms       315 ms
- #14                238 ms       332 ms       326 ms       321 ms
- #15                237 ms       324 ms       323 ms       324 ms
- #16                165 ms       245 ms       250 ms       246 ms
- #17                235 ms       316 ms       315 ms       316 ms
- #18                171 ms       256 ms       256 ms       257 ms
-
-1000 * 1000 items
- #1                 874 ms      1162 ms      1155 ms      1161 ms
- #2                 615 ms       285 ms       286 ms         3 ms
- #3                 607 ms       308 ms       308 ms        10 ms
- #4                 646 ms       338 ms         7 ms         7 ms
- #5                 648 ms       352 ms         9 ms         6 ms
- #6                 632 ms       339 ms       303 ms        14 ms
- #7                 645 ms       353 ms         6 ms         9 ms
- #8                 665 ms       379 ms        21 ms        25 ms		
- #9                 646 ms       335 ms       333 ms        11 ms		
- #10                643 ms        11 ms        12 ms        10 ms		
- #11                661 ms       358 ms       977 ms       972 ms		UNION used
- #12                952 ms      1318 ms      1268 ms      1277 ms		UNION used
- #13                939 ms      1290 ms      1268 ms      1265 ms		UNION used
- #14                939 ms      1302 ms      1269 ms      1269 ms		UNION used
- #15                925 ms      1245 ms      1248 ms      1245 ms		UNION used
- #16                637 ms       964 ms       963 ms       970 ms		UNION used
- #17                917 ms      1242 ms      1240 ms      1246 ms		UNION used
- #18                665 ms      1001 ms       999 ms      1000 ms		UNION used
- 
\ No newline at end of file
diff --git a/querydsl-collections/doc/perf-20090317-2.txt b/querydsl-collections/doc/perf-20090317-2.txt
deleted file mode 100644
index 9d0ad78cf6..0000000000
--- a/querydsl-collections/doc/perf-20090317-2.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-#1 order preserved		!cat.equals(otherCat)
-#2 order preserved		cat.equals(otherCat)
-#3 order preserved		cat.getName().equals(otherCat.getName())
-
-#4 inverted				cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#5 inverted				!(cat.getName().equals(otherCat.getName())) && otherCat.getName().equals(a1)
-#6 inverted				cat.getName().equals(otherCat.getName()) && !(otherCat.getName().equals(a1))
-#7 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#8 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().startsWith(a1, 0)
-#9 order preserved		cat.getBodyWeight() == a1 && otherCat.getName().equals(a2)
-#10 order preserved		cat.getName().startsWith(a1, 0) && otherCat.getName().startsWith(a2, 0)
-
-#11 inverted			cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#12 inverted			cat.getName().equals(otherCat.getName()) || !(otherCat.getName().equals(a1))
-#13 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#14 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().endsWith(a1)
-#15 order preserved		cat.getBodyWeight() == a1 || otherCat.getName().equals(a2)
-#16 order preserved		!(cat.getBodyWeight() == a1) || otherCat.getName().equals(a2)
-#17 order preserved		cat.getBodyWeight() == a1 || !(otherCat.getName().equals(a2))
-#18 order preserved		cat.getName().startsWith(a1, 0) || otherCat.getName().endsWith(a2)
-
-								  filtered		filtered	filtered	filtered								  
-								  				sorted		sorted		sorted
-								  							indexed		indexed
-								  										serial union
-								  							
- #1                  18 ms        17 ms        17 ms        19 ms        17 ms
- #2                   8 ms         7 ms         5 ms         4 ms         4 ms
- #3                   9 ms         9 ms         8 ms         6 ms         5 ms
- #4                  11 ms         8 ms         5 ms         7 ms         7 ms
- #5                  10 ms        11 ms         5 ms         5 ms         6 ms
- #6                  11 ms         9 ms        13 ms         6 ms         8 ms
- #7                  10 ms        10 ms         5 ms         6 ms         6 ms
- #8                  11 ms         9 ms         5 ms         5 ms         5 ms
- #9                  11 ms        11 ms         7 ms        10 ms         5 ms
- #10                 10 ms         5 ms         3 ms         5 ms         3 ms
- #11                 12 ms         8 ms        19 ms        17 ms        10 ms
- #12                 12 ms        23 ms        21 ms        21 ms        28 ms
- #13                 16 ms        23 ms        24 ms        26 ms        32 ms
- #14                 15 ms        21 ms        24 ms        24 ms        25 ms
- #15                 15 ms        21 ms        21 ms        21 ms        22 ms
- #16                 10 ms        20 ms        17 ms        18 ms        12 ms
- #17                 14 ms        22 ms        20 ms        23 ms        22 ms
- #18                 11 ms        19 ms        19 ms        18 ms        14 ms
-
-500 * 500 items
- #1                 246 ms       320 ms       322 ms       322 ms       321 ms
- #2                 164 ms        81 ms        81 ms         4 ms         4 ms
- #3                 166 ms        89 ms        91 ms         6 ms         8 ms
- #4                 178 ms       101 ms         6 ms         6 ms         8 ms
- #5                 180 ms       106 ms         6 ms         9 ms         8 ms
- #6                 177 ms       101 ms        91 ms        11 ms        10 ms
- #7                 182 ms       102 ms         6 ms         9 ms         7 ms
- #8                 185 ms       111 ms        16 ms        16 ms        15 ms
- #9                 179 ms        97 ms        98 ms         9 ms        12 ms
- #10                180 ms         8 ms         9 ms         8 ms        10 ms
- #11                178 ms       103 ms       271 ms       266 ms        16 ms
- #12                264 ms       363 ms       350 ms       354 ms       385 ms
- #13                259 ms       352 ms       345 ms       346 ms       366 ms
- #14                262 ms       354 ms       340 ms       343 ms       358 ms
- #15                241 ms       326 ms       325 ms       330 ms       264 ms
- #16                167 ms       252 ms       252 ms       254 ms        12 ms
- #17                237 ms       322 ms       322 ms       327 ms       262 ms
- #18                173 ms       258 ms       258 ms       262 ms        97 ms
-
-1000 * 1000 items
- #1                 915 ms      1191 ms      1209 ms      1192 ms      1182 ms
- #2                 601 ms       287 ms       299 ms         4 ms         4 ms
- #3                 606 ms       310 ms       322 ms         9 ms        10 ms
- 
- #4                 641 ms       348 ms         4 ms        12 ms         8 ms
- #5                 647 ms       360 ms         8 ms         8 ms        10 ms
- #6                 639 ms       345 ms       321 ms        11 ms        14 ms
- #7                 644 ms       354 ms         8 ms         9 ms        11 ms
- #8                 651 ms       385 ms        21 ms        26 ms        24 ms
- #9                 651 ms       342 ms       354 ms        11 ms        12 ms
- #10                659 ms        10 ms        14 ms        13 ms        10 ms
- 
- #11                650 ms       354 ms       972 ms       948 ms        20 ms
- #12                963 ms      1306 ms      1283 ms      1263 ms      1366 ms		PENALTY!
- #13                958 ms      1296 ms      1285 ms      1262 ms      1322 ms		PENALTY!
- #14                960 ms      1295 ms      1290 ms      1265 ms      1324 ms		PENALTY!
- #15                986 ms      1334 ms      1350 ms      1338 ms      1073 ms
- #16                694 ms      1039 ms      1058 ms      1037 ms        17 ms
- #17                1020 ms     1365 ms      1391 ms      1370 ms      1091 ms
- #18                734 ms      1074 ms      1101 ms      1081 ms       380 ms
-
diff --git a/querydsl-collections/doc/perf-20090317.txt b/querydsl-collections/doc/perf-20090317.txt
deleted file mode 100644
index 8f267b341a..0000000000
--- a/querydsl-collections/doc/perf-20090317.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-#1 order preserved		!cat.equals(otherCat)
-#2 order preserved		cat.equals(otherCat)
-#3 order preserved		cat.getName().equals(otherCat.getName())
-
-#4 inverted				cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#5 inverted				!(cat.getName().equals(otherCat.getName())) && otherCat.getName().equals(a1)
-#6 inverted				cat.getName().equals(otherCat.getName()) && !(otherCat.getName().equals(a1))
-#7 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#8 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().startsWith(a1, 0)
-#9 order preserved		cat.getBodyWeight() == a1 && otherCat.getName().equals(a2)
-#10 order preserved		cat.getName().startsWith(a1, 0) && otherCat.getName().startsWith(a2, 0)
-
-#11 inverted			cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#12 inverted			cat.getName().equals(otherCat.getName()) || !(otherCat.getName().equals(a1))
-#13 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#14 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().endsWith(a1)
-#15 order preserved		cat.getBodyWeight() == a1 || otherCat.getName().equals(a2)
-#16 order preserved		!(cat.getBodyWeight() == a1) || otherCat.getName().equals(a2)
-#17 order preserved		cat.getBodyWeight() == a1 || !(otherCat.getName().equals(a2))
-#18 order preserved		cat.getName().startsWith(a1, 0) || otherCat.getName().endsWith(a2)
-
-								  filtered		filtered	filtered	filtered								  
-								  				sorted		sorted		sorted
-								  							indexed		indexed
-								  										union optimized
-								  							
- #1                  19 ms        17 ms        16 ms        17 ms        18 ms
- #2                   7 ms         6 ms         5 ms         4 ms         3 ms
- #3                   8 ms         9 ms         6 ms         8 ms         4 ms
- #4                   9 ms        10 ms         4 ms         7 ms         7 ms
- #5                  10 ms        10 ms         6 ms         5 ms         6 ms
- #6                  10 ms         9 ms        10 ms         7 ms         7 ms
- #7                   9 ms        10 ms         5 ms         5 ms         6 ms
- #8                  11 ms         9 ms         5 ms         5 ms         5 ms
- #9                   9 ms        10 ms        10 ms         7 ms         7 ms
- #10                  8 ms         6 ms         5 ms         4 ms         5 ms
- #11                 10 ms         8 ms        17 ms        19 ms        20 ms
- #12                 13 ms        23 ms        22 ms        21 ms        36 ms
- #13                 13 ms        19 ms        21 ms        19 ms        33 ms
- #14                 13 ms        20 ms        20 ms        21 ms        31 ms
- #15                 12 ms        20 ms        21 ms        19 ms        32 ms
- #16                 11 ms        17 ms        18 ms        17 ms        16 ms
- #17                 12 ms        21 ms        20 ms        21 ms        33 ms
- #18                 11 ms        18 ms        17 ms        17 ms        19 ms
-
-500 * 500 items
- #1                 224 ms       295 ms       298 ms       297 ms       296 ms
- #2                 151 ms        75 ms        73 ms         4 ms         3 ms
- #3                 151 ms        84 ms        80 ms         6 ms         8 ms
- #4                 164 ms        94 ms         4 ms         8 ms         9 ms
- #5                 172 ms        98 ms         7 ms         7 ms         6 ms
- #6                 164 ms        93 ms        84 ms         9 ms         9 ms
- #7                 167 ms       100 ms         3 ms         7 ms         7 ms
- #8                 169 ms       106 ms        14 ms        15 ms        14 ms
- #9                 164 ms        93 ms        92 ms         8 ms        10 ms
- #10                164 ms         7 ms         9 ms         9 ms         8 ms
- #11                172 ms        98 ms       249 ms       247 ms        21 ms
- #12                238 ms       335 ms       318 ms       319 ms       365 ms
- #13                237 ms       325 ms       318 ms       316 ms       368 ms
- #14                238 ms       328 ms       328 ms       320 ms       362 ms
- #15                239 ms       324 ms       324 ms       322 ms       371 ms
- #16                172 ms       258 ms       257 ms       256 ms        17 ms
- #17                235 ms       317 ms       320 ms       318 ms       365 ms
- #18                170 ms       253 ms       258 ms       254 ms       113 ms
-
-1000 * 1000 items
- #1                 897 ms      1173 ms      1190 ms      1165 ms      1169 ms
- #2                 586 ms       282 ms       291 ms         6 ms         3 ms
- #3                 591 ms       304 ms       315 ms         9 ms        10 ms
- #4                 629 ms       342 ms         3 ms         9 ms         9 ms
- #5                 639 ms       354 ms         7 ms         8 ms        10 ms
- #6                 630 ms       345 ms       319 ms        14 ms        10 ms
- #7                 640 ms       350 ms         9 ms         9 ms        11 ms
- #8                 648 ms       388 ms        21 ms        24 ms        21 ms
- #9                 639 ms       337 ms       349 ms        12 ms        11 ms
- #10                637 ms        11 ms        12 ms        12 ms        12 ms 
- #11                642 ms       356 ms       961 ms       942 ms        26 ms
- #12                937 ms      1302 ms      1264 ms      1252 ms      1382 ms
- #13                935 ms      1273 ms      1263 ms      1234 ms      1373 ms
- #14                946 ms      1283 ms      1274 ms      1256 ms      1392 ms
- #15                942 ms      1249 ms      1279 ms      1250 ms      1391 ms
- #16                646 ms       964 ms       978 ms       964 ms        18 ms
- #17                954 ms      1263 ms      1299 ms      1270 ms      1416 ms
- #18                681 ms      1010 ms      1033 ms      1012 ms       383 ms
- 
\ No newline at end of file
diff --git a/querydsl-collections/doc/perf-20090319.txt b/querydsl-collections/doc/perf-20090319.txt
deleted file mode 100644
index 30f41899da..0000000000
--- a/querydsl-collections/doc/perf-20090319.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-#1 order preserved		!cat.equals(otherCat)
-#2 order preserved		cat.equals(otherCat)
-#3 order preserved		cat.getName().equals(otherCat.getName())
-#4 inverted				cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#5 inverted				!(cat.getName().equals(otherCat.getName())) && otherCat.getName().equals(a1)
-#6 inverted				cat.getName().equals(otherCat.getName()) && !(otherCat.getName().equals(a1))
-#7 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().equals(a1)
-#8 inverted				!cat.getName().equals(otherCat.getName()) && otherCat.getName().startsWith(a1, 0)
-#9 order preserved		cat.getBodyWeight() == a1 && otherCat.getName().equals(a2)
-#10 order preserved		cat.getName().startsWith(a1, 0) && otherCat.getName().startsWith(a2, 0)
-#11 inverted			cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#12 inverted			cat.getName().equals(otherCat.getName()) || !(otherCat.getName().equals(a1))
-#13 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().equals(a1)
-#14 inverted			!cat.getName().equals(otherCat.getName()) || otherCat.getName().endsWith(a1)
-#15 order preserved		cat.getBodyWeight() == a1 || otherCat.getName().equals(a2)
-#16 order preserved		cat.getBodyWeight() == a1 || cat.getName().equals(a2)
-#17 order preserved		cat.getBodyWeight() > a1 && otherCat.getName().equals(a2) || cat.getName().equals(a3)
-#18 order preserved		cat.getBodyWeight() > a1 && otherCat.getName().equals(cat.getName()) || cat.getName().equals(a2)
-#19 order preserved		cat.getBodyWeight() > a1 || otherCat.getName().equals(cat.getName())
-#20 order preserved		!(cat.getBodyWeight() == a1) || otherCat.getName().equals(a2)
-#21 order preserved		cat.getBodyWeight() == a1 || !(otherCat.getName().equals(a2))
-#22 order preserved		cat.getName().startsWith(a1, 0) || otherCat.getName().endsWith(a2)
-
-								  filtered		filtered	filtered	filtered								  
-								  				sorted		sorted		sorted
-								  							indexed		indexed
-								  										serial union
-
-100 * 100 items
- #1                  21 ms        17 ms        19 ms        17 ms        17 ms
- #2                   9 ms         6 ms         7 ms         5 ms         4 ms
- #3                  10 ms         9 ms         7 ms         6 ms         6 ms
- #4                  11 ms         9 ms         5 ms         7 ms         6 ms
- #5                  10 ms        11 ms         5 ms         7 ms         5 ms
- #6                  13 ms         6 ms        12 ms         9 ms         7 ms
- #7                  11 ms         9 ms         5 ms         6 ms         6 ms
- #8                  11 ms        11 ms         6 ms         6 ms         5 ms
- #9                  10 ms        10 ms        11 ms         6 ms         8 ms
- #10                 11 ms         4 ms         5 ms         5 ms         4 ms
- #11                  9 ms         9 ms        17 ms        19 ms        12 ms
- #12                 13 ms        21 ms        22 ms        22 ms        26 ms
- #13                 13 ms        20 ms        20 ms        19 ms        29 ms
- #14                 14 ms        19 ms        20 ms        24 ms        22 ms
- #15                 14 ms        20 ms        20 ms        19 ms        23 ms
- #16                 13 ms        15 ms        16 ms        16 ms        21 ms
- #17                 10 ms         6 ms         6 ms         5 ms        12 ms
- #18                 11 ms         5 ms         5 ms         5 ms        13 ms
- #19                 10 ms        16 ms        16 ms        16 ms         9 ms
- #20                 10 ms        17 ms        16 ms        18 ms         9 ms
- #21                 12 ms        19 ms        21 ms        20 ms        19 ms
- #22                  9 ms        17 ms        18 ms        19 ms        13 ms
-
-500 * 500 items
- #1                 235 ms       306 ms       300 ms       300 ms       301 ms
- #2                 155 ms        76 ms        78 ms         3 ms         4 ms
- #3                 154 ms        86 ms        83 ms         5 ms         9 ms
- #4                 167 ms        93 ms         3 ms         9 ms         7 ms
- #5                 166 ms        99 ms         5 ms         7 ms         8 ms
- #6                 162 ms        93 ms        83 ms         9 ms        10 ms
- #7                 162 ms        97 ms         6 ms         9 ms         7 ms
- #8                 167 ms       104 ms        14 ms        14 ms        15 ms
- #9                 161 ms        94 ms        90 ms         6 ms        12 ms
- #10                166 ms         7 ms         8 ms         9 ms         8 ms
- #11                163 ms        96 ms       245 ms       245 ms        12 ms
- #12                244 ms       334 ms       324 ms       325 ms       346 ms
- #13                242 ms       326 ms       325 ms       320 ms       332 ms
- #14                240 ms       327 ms       322 ms       323 ms       329 ms
- #15                239 ms       320 ms       320 ms       319 ms       268 ms
- #16                238 ms       240 ms       239 ms       240 ms       258 ms
- #17                166 ms         6 ms         6 ms         7 ms        14 ms
- #18                168 ms         5 ms         7 ms         6 ms        15 ms
- #19                166 ms       239 ms       236 ms       240 ms        12 ms
- #20                166 ms       247 ms       249 ms       248 ms        13 ms
- #21                238 ms       324 ms       318 ms       319 ms       259 ms
- #22                171 ms       254 ms       256 ms       264 ms        98 ms
-
-1000 * 1000 items
- #1                 918 ms      1180 ms      1179 ms      1178 ms      1180 ms
- #2                 598 ms       288 ms       289 ms         4 ms         5 ms
- #3                 607 ms       317 ms       315 ms        13 ms         8 ms
- #4                 641 ms       345 ms         8 ms        10 ms        10 ms
- #5                 650 ms       364 ms         7 ms        10 ms         9 ms
- #6                 642 ms       352 ms       319 ms        16 ms         9 ms
- #7                 650 ms       364 ms         6 ms        11 ms        10 ms
- #8                 664 ms       398 ms        25 ms        25 ms        23 ms
- #9                 643 ms       342 ms       349 ms        10 ms        13 ms
- #10                640 ms        10 ms        14 ms        11 ms        12 ms
- #11                652 ms       363 ms       965 ms       969 ms        21 ms
- #12                960 ms      1318 ms      1273 ms      1275 ms      1344 ms
- #13                975 ms      1311 ms      1298 ms      1294 ms      1334 ms
- #14                953 ms      1290 ms      1265 ms      1267 ms      1288 ms
- #15                955 ms      1266 ms      1267 ms      1274 ms      1020 ms
- #16                951 ms       956 ms       954 ms       952 ms      1018 ms
- #17                654 ms         8 ms         9 ms         7 ms        19 ms
- #18                651 ms         6 ms        10 ms         6 ms        19 ms
- #19                646 ms       939 ms       936 ms       935 ms        14 ms
- #20                644 ms       970 ms       974 ms       968 ms        15 ms
- #21                965 ms      1276 ms      1283 ms      1278 ms      1027 ms
- #22                712 ms      1049 ms      1047 ms      1052 ms       375 ms
\ No newline at end of file
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index 30d54c410d..4bde6aec1c 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-collections</artifactId>
   <name>Querydsl - Collections support</name>
   <description>Collections support for Querydsl</description>
@@ -24,56 +24,98 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-codegen</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-apt</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>    
+    <!-- alias dependencies -->
     
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <artifactId>hamcrest</artifactId>
+      <scope>compile</scope>
       <optional>true</optional>
     </dependency>    
     
     <!-- test -->
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-guava</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cglib.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-generator-annprocess</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
+    </dependency>
     
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>${jodatime.version}</version>
       <scope>test</scope>
     </dependency>    
 
   </dependencies>
 
   <build>
-    <plugins>      
+    <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.collections</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>    
       <plugin>
         <groupId>com.mysema.maven</groupId>
@@ -86,13 +128,59 @@
             </goals>            
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
               <showWarnings>true</showWarnings>
             </configuration>        
           </execution>
         </executions>
-      </plugin>   
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgument>-proc:none</compilerArgument>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
-</project>
+  <profiles>
+    <profile>
+      <id>java-21</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>${cglib.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractCollQuery.java b/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractCollQuery.java
deleted file mode 100644
index d7d9492efa..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/AbstractCollQuery.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.Tuple;
-import com.mysema.query.support.ProjectableQuery;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-
-/**
- * AbstractCollQuery provides a base class for Collection query implementations.
- * Extend it like this
- *
- * <pre>
- * public class MyType extends AbstractColQuery&lt;MyType&gt;{
- *   ...
- * }
- * </pre>
- *
- * @see CollQuery
- *
- * @author tiwe
- */
-public abstract class AbstractCollQuery<Q extends AbstractCollQuery<Q>> extends ProjectableQuery<Q> implements SimpleQuery<Q> {
-
-    private final Map<Expression<?>, Iterable<?>> iterables = new HashMap<Expression<?>, Iterable<?>>();
-
-    private final QueryEngine queryEngine;
-
-    @SuppressWarnings("unchecked")
-    public AbstractCollQuery(QueryMetadata metadata, QueryEngine queryEngine) {
-        super(new CollQueryMixin<Q>(metadata));
-        this.queryMixin.setSelf((Q) this);
-        this.queryEngine = queryEngine;
-    }
-
-    @Override
-    public long count() {
-        try {
-            return queryEngine.count(getMetadata(), iterables);
-        } catch (Exception e) {
-            throw new QueryException(e.getMessage(), e);
-        } finally {
-            reset();
-        }
-    }
-
-    @Override
-    public boolean exists() {
-        try {
-            return queryEngine.exists(getMetadata(), iterables);
-        } catch (Exception e) {
-            throw new QueryException(e.getMessage(), e);
-        } finally {
-            reset();
-        }
-    }
-
-    private <D> Expression<D> createAlias(Path<? extends Collection<D>> target, Path<D> alias) {
-        return OperationImpl.create(alias.getType(), Ops.ALIAS, target, alias);
-    }
-
-    private <D> Expression<D> createAlias(MapExpression<?,D> target, Path<D> alias) {
-        return OperationImpl.create(alias.getType(), Ops.ALIAS, target, alias);
-    }
-
-    /**
-     * Add a query source
-     *
-     * @param <A>
-     * @param entity Path for the source
-     * @param col content of the source
-     * @return
-     */
-    public <A> Q from(Path<A> entity, Iterable<? extends A> col) {
-        iterables.put(entity, col);
-        getMetadata().addJoin(JoinType.DEFAULT, entity);
-        return (Q)this;
-    }
-
-    /**
-     * Bind the given collection to an already existing query source
-     *
-     * @param <A>
-     * @param entity Path for the source
-     * @param col content of the source
-     * @return
-     */
-    public <A> Q bind(Path<A> entity, Iterable<? extends A> col) {
-        iterables.put(entity, col);
-        return (Q)this;
-    }
-
-    public abstract QueryMetadata getMetadata();
-
-    protected QueryEngine getQueryEngine() {
-        return queryEngine;
-    }
-
-    /**
-     * Define an inner join from the Collection typed path to the alias
-     *
-     * @param <P>
-     * @param collectionPath
-     * @param alias
-     * @return
-     */
-    public <P> Q innerJoin(Path<? extends Collection<P>> target, Path<P> alias) {
-        getMetadata().addJoin(JoinType.INNERJOIN, createAlias(target, alias));
-        return (Q)this;
-    }
-
-    /**
-     * Define an inner join from the Map typed path to the alias
-     *
-     * @param <P>
-     * @param mapPath
-     * @param alias
-     * @return
-     */
-    public <P> Q innerJoin(MapExpression<?,P> target, Path<P> alias) {
-        getMetadata().addJoin(JoinType.INNERJOIN, createAlias(target, alias));
-        return (Q)this;
-    }
-
-    /**
-     * Define a left join from the Collection typed path to the alias
-     *
-     * @param <P>
-     * @param collectionPath
-     * @param alias
-     * @return
-     */
-    public <P> Q leftJoin(Path<? extends Collection<P>> target, Path<P> alias) {
-        getMetadata().addJoin(JoinType.LEFTJOIN, createAlias(target, alias));
-        return (Q)this;
-    }
-
-    /**
-     * Define a left join from the Map typed path to the alias
-     *
-     * @param <P>
-     * @param mapPath
-     * @param alias
-     * @return
-     */
-    public <P> Q leftJoin(MapExpression<?,P> target, Path<P> alias) {
-        getMetadata().addJoin(JoinType.LEFTJOIN, createAlias(target, alias));
-        return (Q)this;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        try {
-            projection = queryMixin.addProjection(projection);
-            return new IteratorAdapter<RT>(queryEngine.list(getMetadata(), iterables, projection).iterator());
-        } finally {
-            reset();
-        }
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        try {
-            projection = queryMixin.addProjection(projection);
-            return queryEngine.list(getMetadata(), iterables, projection);
-        } finally {
-            reset();
-        }
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> projection) {
-        projection = queryMixin.addProjection(projection);
-        long count = queryEngine.count(getMetadata(), iterables);
-        if (count > 0l) {
-            List<RT> list = queryEngine.list(getMetadata(), iterables, projection);
-            reset();
-            return new SearchResults<RT>(list, getMetadata().getModifiers(), count);
-        } else {
-            reset();
-            return SearchResults.<RT>emptyResults();
-        }
-
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.setUnique(true);
-        if (queryMixin.getMetadata().getModifiers().getLimit() == null) {
-            limit(2l);
-        }
-        return uniqueResult(iterate(expr));
-    }
-
-    private void reset() {
-        getMetadata().reset();
-    }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollDeleteClause.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollDeleteClause.java
deleted file mode 100644
index 181c8a00ab..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollDeleteClause.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Collection;
-
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * CollDeleteClause is an implementation of the {@link DeleteClause} interface for the Querydsl 
- * Collections module
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class CollDeleteClause<T> implements DeleteClause<CollDeleteClause<T>> {
-
-    private final Collection<? extends T> col;
-
-    private final Path<T> expr;
-
-    private final CollQuery query;
-
-    public CollDeleteClause(QueryEngine qe, Path<T> expr, Collection<? extends T> col) {
-        this.query = new CollQuery(qe).from(expr, col);
-        this.expr = expr;
-        this.col = col;
-    }
-
-    public CollDeleteClause(Path<T> expr, Collection<? extends T> col) {
-        this(DefaultQueryEngine.getDefault(), expr, col);
-    }
-
-    @Override
-    public long execute() {
-        int rv = 0;
-        for (T match : query.list(expr)) {
-            col.remove(match);
-            rv++;
-        }
-        return rv;
-    }
-    
-    @Override
-    public CollDeleteClause<T> where(Predicate... o) {
-        query.where(o);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "delete " + query.toString();
-    }
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java
deleted file mode 100644
index fd88810a2c..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.SimpleQuery;
-
-/**
- * CollQuery is the default implementation of the {@link SimpleQuery} interface for collections
- *
- * @author tiwe
- *
- */
-public final class CollQuery extends AbstractCollQuery<CollQuery> implements Cloneable {
-
-    /**
-     * Create a new CollQuery instance
-     */
-    public CollQuery() {
-        super(new DefaultQueryMetadata(), DefaultQueryEngine.getDefault());
-    }
-
-    /**
-     * Creates a new CollQuery instance
-     * 
-     * @param templates
-     */
-    public CollQuery(CollQueryTemplates templates) {
-        this(new DefaultQueryEngine(new DefaultEvaluatorFactory(templates)));
-    }
-    
-    /**
-     * Create a new CollQuery instance
-     *
-     * @param evaluatorFactory
-     */
-    public CollQuery(QueryEngine queryEngine) {
-        super(new DefaultQueryMetadata(), queryEngine);
-    }
-    
-
-    /**
-     * Create a new CollQuery instance
-     *
-     * @param metadata
-     * @param evaluatorFactory
-     */
-    public CollQuery(QueryMetadata metadata) {
-        super(metadata, DefaultQueryEngine.getDefault());
-    }
-
-    /**
-     * Create a new CollQuery instance
-     *
-     * @param metadata
-     * @param evaluatorFactory
-     */
-    public CollQuery(QueryMetadata metadata, QueryEngine queryEngine) {
-        super(metadata, queryEngine);
-    }
-
-    /**
-     * Clone the state of this query to a new CollQuery instance
-     */
-    @Override
-    public CollQuery clone() {
-        return new CollQuery(queryMixin.getMetadata().clone(), getQueryEngine());
-    }
-
-    /**
-     * @return
-     */
-    @Override
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFactory.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFactory.java
deleted file mode 100644
index e8e87bdd24..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Collection;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.Path;
-
-/**
- * CollQueryFactory provides static convenience methods for query construction
- *
- * @author tiwe
- */
-public final class CollQueryFactory {
-
-    /**
-     * Create a new delete clause 
-     * 
-     * @param path source expression
-     * @param col source collection
-     * @return
-     */
-    public static <A> CollDeleteClause<A> delete(Path<A> path, Collection<A> col) {
-        return new CollDeleteClause<A>(path, col);
-    }
-
-    /**
-     * Create a new query
-     * 
-     * @param alias source alias
-     * @param col source collection
-     * @return
-     */
-    public static <A> CollQuery from(A alias, Iterable<A> col) {
-        return new CollQuery().from(Alias.$(alias), col);
-    }
-
-    /**
-     * Create a new query
-     * 
-     * @param path source expression
-     * @param arr source array
-     * @return
-     */
-    public static <A> CollQuery from(Path<A> path, A... arr) {
-        return new CollQuery().from(path, ImmutableList.copyOf(arr));
-    }
-
-    /**
-     * Create a new query
-     * 
-     * @param path source expression
-     * @param col source collection
-     * @return
-     */
-    public static <A> CollQuery from(Path<A> path, Iterable<A> col) {
-        return new CollQuery().from(path, col);
-    }
-
-    /**
-     * Create a new update clause
-     * 
-     * @param path source expression
-     * @param col source collection
-     * @return
-     */
-    public static <A> CollUpdateClause<A> update(Path<A> path, Iterable<A> col) {
-        return new CollUpdateClause<A>(path, col);
-    }
-
-    private CollQueryFactory() {}
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFunctions.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFunctions.java
deleted file mode 100644
index a90db23d54..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryFunctions.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import javax.annotation.Nullable;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.util.*;
-
-import com.google.common.base.Objects;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.util.MathUtils;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * CollQueryFunctions defines function implementation for use in ColQueryTemplates
- *
- * @author tiwe
- *
- */
-public final class CollQueryFunctions {
-
-    private interface BinaryFunction {
-
-        Number apply(Number num1, Number num2);
-    }
-
-    private static final BinaryFunction SUM = new BinaryFunction() {
-        @Override
-        public Number apply(Number num1, Number num2) {
-            return MathUtils.sum(num1, num2);
-        }
-    };
-
-    private static final BinaryFunction MAX = new BinaryFunction() {
-        @Override
-        public Number apply(Number num1, Number num2) {
-            if (num1.getClass().equals(num2.getClass()) && num1 instanceof Comparable) {
-                return ((Comparable)num1).compareTo((Comparable)num2) < 0 ? num2 : num1;
-            } else {
-                BigDecimal n1 = new BigDecimal(num1.toString());
-                BigDecimal n2 = new BigDecimal(num2.toString());
-                return n1.compareTo(n2) < 0 ? num2 : num1;
-            }
-        }
-    };
-
-    private static final BinaryFunction MIN = new BinaryFunction() {
-        @Override
-        public Number apply(Number num1, Number num2) {
-            if (num1.getClass().equals(num2.getClass()) && num1 instanceof Comparable) {
-                return ((Comparable)num1).compareTo((Comparable)num2) < 0 ? num1 : num2;
-            } else {
-                BigDecimal n1 = new BigDecimal(num1.toString());
-                BigDecimal n2 = new BigDecimal(num2.toString());
-                return n1.compareTo(n2) < 0 ? num1 : num2;
-            }
-        }
-    };
-
-    private static final List<Object> nullList = Arrays.<Object>asList((Object) null);
-
-    public static boolean equals(Object o1, Object o2) {
-        return Objects.equal(o1, o2);
-    }
-
-    public static <T extends Comparable<? super T>> int compareTo(T c1, T c2) {
-        if (c1 == null) {
-            return c2 == null ? 0 : -1;
-        } else if (c2 == null) {
-            return 1;
-        } else {
-            return c1.compareTo(c2);
-        }
-    }
-
-    public static <A extends Comparable<? super A>> boolean between(A a, A b, A c) {
-        return compareTo(a, b) >= 0 && compareTo(a, c) <= 0;
-    }
-
-    public static double cot(double x) {
-        return Math.cos(x) / Math.sin(x);
-    }
-
-    public static double coth(double x) {
-        return Math.cosh(x) / Math.sinh(x);
-    }
-
-    public static double degrees(double x) {
-        return x * 180.0 / Math.PI;
-    }
-
-    public static double radians(double x) {
-        return x * Math.PI / 180.0;
-    }
-
-    public static double log(double x, int y) {
-        return Math.log(x) / Math.log(y);
-    }
-
-    @Nullable
-    public static <T> T coalesce(T... args) {
-        for (T arg : args) {
-            if (arg != null) {
-                return arg;
-            }
-        }
-        return null;
-    }
-
-    public static <T> T nullif(T first, T second) {
-        if (first.equals(second)) {
-            return null;
-        } else {
-            return first;
-        }
-    }
-
-    public static int getYearMonth(Date date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        return cal.get(Calendar.YEAR) * 100 + cal.get(Calendar.MONTH) + 1;
-    }
-
-    public static int getDayOfMonth(Date date) {
-        return getField(date, Calendar.DAY_OF_MONTH);
-    }
-
-    public static int getDayOfWeek(Date date) {
-        return getField(date, Calendar.DAY_OF_WEEK);
-    }
-
-    public static int getDayOfYear(Date date) {
-        return getField(date, Calendar.DAY_OF_YEAR);
-    }
-
-    private static int getField(Date date, int field) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        return cal.get(field);
-    }
-
-    public static int getHour(Date date) {
-        return getField(date, Calendar.HOUR_OF_DAY);
-    }
-
-    public static int getMilliSecond(Date date) {
-        return getField(date, Calendar.MILLISECOND);
-    }
-
-    public static int getMinute(Date date) {
-        return getField(date, Calendar.MINUTE);
-    }
-
-    public static int getMonth(Date date) {
-        return getField(date, Calendar.MONTH) + 1;
-    }
-
-    public static int getSecond(Date date) {
-        return getField(date, Calendar.SECOND);
-    }
-
-    public static int getWeek(Date date) {
-        return getField(date, Calendar.WEEK_OF_YEAR);
-    }
-
-    public static int getYear(Date date) {
-        return getField(date, Calendar.YEAR);
-    }
-
-    public static int getYearWeek(Date date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        return cal.get(Calendar.YEAR) * 100 + cal.get(Calendar.WEEK_OF_YEAR);
-    }
-
-    public static <T> Collection<T> leftJoin(Collection<T> coll) {
-        if (coll.isEmpty()) {
-            return (List) nullList;
-        } else {
-            return coll;
-        }
-    }
-
-    private static Number reduce(Iterable<Number> source, BinaryFunction f) {
-        Iterator<Number> it = source.iterator();
-        Number result = it.next();
-        while (it.hasNext()) {
-            result = f.apply(result, it.next());
-        }
-        return result;
-    }
-
-    public static Number aggregate(Collection<Number> source, Expression<?> expr, Operator<?> aggregator) {
-        if (aggregator == Ops.AggOps.AVG_AGG) {
-            Number sum = reduce(source, SUM);
-            return sum.doubleValue() / source.size();
-        } else if (aggregator == Ops.AggOps.COUNT_AGG) {
-            return Long.valueOf(source.size());
-        } else if (aggregator == Ops.AggOps.COUNT_DISTINCT_AGG) {
-            if (!Set.class.isInstance(source)) {
-                source = new HashSet(source);
-            }
-            return Long.valueOf(source.size());
-        } else if (aggregator == Ops.AggOps.MAX_AGG) {
-            return MathUtils.cast(reduce(source, MAX), (Class) expr.getType());
-        } else if (aggregator == Ops.AggOps.MIN_AGG) {
-            return MathUtils.cast(reduce(source, MIN), (Class)expr.getType());
-        } else if (aggregator == Ops.AggOps.SUM_AGG) {
-            return MathUtils.cast(reduce(source, SUM), (Class)expr.getType());
-        } else {
-            throw new IllegalArgumentException("Unknown operator " + aggregator);
-        }
-    }
-
-    public static boolean like(final String str, String like) {
-        final StringBuilder pattern = new StringBuilder(like.length() + 4);
-        for (int i = 0; i < like.length(); i++) {
-            final char ch = like.charAt(i);
-            if (ch == '%') {
-                pattern.append(".*");
-                continue;
-            } else if (ch == '_') {
-                pattern.append('.');
-                continue;
-            } else if (ch == '.' || ch == '$' || ch == '^') {
-                pattern.append('\\');
-            }
-            pattern.append(ch);
-        }
-        if (pattern.toString().equals(like)) {
-            return str.equals(like);
-        } else {
-            return str.matches(pattern.toString());
-        }
-    }
-
-    public static boolean like(String str, String like, char escape) {
-        return like(str, like);
-    }
-
-    public static <T> T get(Object parent, String f) {
-        try {
-            Field field = ReflectionUtils.getFieldOrNull(parent.getClass(), f);
-            if (field != null) {
-                field.setAccessible(true);
-                return (T)field.get(parent);
-            } else {
-                throw new IllegalArgumentException("No field " + f + " for " + parent.getClass());
-            }
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    private CollQueryFunctions() {}
-
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryMixin.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryMixin.java
deleted file mode 100644
index f52026f0e5..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryMixin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.CollectionAnyVisitor;
-import com.mysema.query.support.Context;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.template.BooleanTemplate;
-
-/**
- * CollQueryMixin extends {@link QueryMixin} to provide normalization logic specific to this module
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class CollQueryMixin<T> extends QueryMixin<T> {
-
-    private static final Predicate ANY = BooleanTemplate.create("any");
-
-    public CollQueryMixin() {}
-
-    public CollQueryMixin(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-    public CollQueryMixin(T self, QueryMetadata metadata) {
-        super(self, metadata);
-    }
-
-    @Override
-    protected Predicate normalize(Predicate predicate, boolean where) {
-        predicate = (Predicate)ExpressionUtils.extract(predicate);
-        if (predicate != null) {
-            Context context = new Context();
-            Predicate transformed = (Predicate) predicate.accept(CollectionAnyVisitor.DEFAULT, context);
-            for (int i = 0; i < context.paths.size(); i++) {
-                leftJoin(
-                    (Path)context.paths.get(i).getMetadata().getParent(),
-                    (Path)context.replacements.get(i));
-                on(ANY);
-            }
-            return transformed;
-        } else {
-            return predicate;
-        }
-    }
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuerySerializer.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuerySerializer.java
deleted file mode 100644
index f24ab2626d..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuerySerializer.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.primitives.Primitives;
-import com.mysema.query.QueryException;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.Template;
-
-/**
- * CollQuerySerializer is a {@link Serializer} implementation for the Java language
- *
- * @author tiwe
- */
-public final class CollQuerySerializer extends SerializerBase<CollQuerySerializer> {
-
-    private static final Set<Class<?>> WRAPPER_TYPES = ImmutableSet.copyOf(Primitives.allWrapperTypes());
-    
-    private static final Map<Operator<?>, String> OPERATOR_SYMBOLS = Maps.newIdentityHashMap();
-    
-    private static final Map<Class<?>, String> CAST_SUFFIXES = Maps.newHashMap();
-    
-    static {
-        OPERATOR_SYMBOLS.put(Ops.EQ, " == ");
-        OPERATOR_SYMBOLS.put(Ops.NE, " != ");
-        OPERATOR_SYMBOLS.put(Ops.GT, " > ");
-        OPERATOR_SYMBOLS.put(Ops.LT, " < ");
-        OPERATOR_SYMBOLS.put(Ops.GOE, " >= ");
-        OPERATOR_SYMBOLS.put(Ops.LOE, " <= ");
-        
-        OPERATOR_SYMBOLS.put(Ops.ADD, " + ");
-        OPERATOR_SYMBOLS.put(Ops.SUB, " - ");
-        OPERATOR_SYMBOLS.put(Ops.MULT, " * ");
-        OPERATOR_SYMBOLS.put(Ops.DIV, " / ");
-        
-        CAST_SUFFIXES.put(Boolean.class, ".booleanValue()");
-        CAST_SUFFIXES.put(Byte.class, ".byteValue()");
-        CAST_SUFFIXES.put(Character.class, ".charValue()");
-        CAST_SUFFIXES.put(Double.class, ".doubleValue()");
-        CAST_SUFFIXES.put(Float.class, ".floatValue()");
-        CAST_SUFFIXES.put(Integer.class, ".intValue()");
-        CAST_SUFFIXES.put(Long.class, ".longValue()");
-        CAST_SUFFIXES.put(Short.class, ".shortValue()");
-        CAST_SUFFIXES.put(String.class, ".toString()");
-    }
-    
-    public CollQuerySerializer(CollQueryTemplates templates) {
-        super(templates);
-    }
-
-    @Override
-    public Void visit(Path<?> path, Void context) {
-        final PathType pathType = path.getMetadata().getPathType();
-        if (pathType == PathType.PROPERTY) {
-            final Path<?> parent = path.getMetadata().getParent();
-            final String property = path.getMetadata().getName();      
-            final Class<?> parentType = parent.getType();
-            try {
-                // getter
-                Method m = getAccessor(parentType, property);
-                if (m != null && Modifier.isPublic(m.getModifiers())) {                    
-                    handle(parent);
-                    append(".").append(m.getName()).append("()");    
-                } else {
-                    // field
-                    Field f = getField(parentType, property);
-                    if (f != null && Modifier.isPublic(f.getModifiers())) {
-                        handle(parent);
-                        append(".").append(property);
-                    } else {
-                        // field access by reflection
-                        append(CollQueryFunctions.class.getName() + ".<");
-                        append(((Class)path.getType()).getName()).append(">get(");
-                        handle(parent);
-                        append(", \""+property+"\")");
-                    }
-                }                
-            } catch (Exception e) {
-                throw new QueryException(e);
-            }
-            
-        } else if (pathType == PathType.DELEGATE) {
-            append("(");
-            append("(").append(path.getType().getName()).append(")");
-            path.getMetadata().getParent().accept(this, context);
-            append(")");
-
-        } else {
-            List<Object> args = new ArrayList<Object>(2);
-            if (path.getMetadata().getParent() != null) {
-                args.add((Expression<?>)path.getMetadata().getParent());
-            }
-            args.add(path.getMetadata().getElement());
-            final Template template = getTemplate(pathType);
-            for (Template.Element element : template.getElements()) {
-                Object rv = element.convert(args);
-                if (rv instanceof Expression) {                    
-                    ((Expression)rv).accept(this, context);
-                } else if (element.isString()) {    
-                    append(rv.toString());
-                } else {
-                    visitConstant(rv);
-                }
-            }
-        }
-        return null;
-
-    }
-    
-    private Method getAccessor(Class<?> owner, String property) {
-        try {
-            BeanInfo beanInfo = Introspector.getBeanInfo(owner);
-            PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
-            for(PropertyDescriptor pd : descriptors) {
-                if(pd.getName().equals(property)) {
-                    return pd.getReadMethod();
-                }
-            }
-            return null;
-        } catch (IntrospectionException e) {
-            return null;
-        }        
-    }
-
-    private Field getField(Class<?> owner, String field) {
-        try {
-            return owner.getField(field);
-        } catch (NoSuchFieldException e) {
-            return null;
-        }
-    }
-    
-    @Override
-    public Void visit(SubQueryExpression<?> expr, Void context) {
-        throw new IllegalArgumentException("Not supported");
-    }
-
-    private void visitCast(Operator<?> operator, Expression<?> source, Class<?> targetType) {
-        if (Number.class.isAssignableFrom(source.getType()) && !Constant.class.isInstance(source)) {
-            append("new ").append(source.getType().getSimpleName()).append("(");
-            handle(source);
-            append(")");
-        } else {
-            handle(source);
-        }
-        
-        if (CAST_SUFFIXES.containsKey(targetType)) {
-            append(CAST_SUFFIXES.get(targetType));
-        } else {
-            throw new IllegalArgumentException("Unsupported cast type " + targetType.getName());
-        }
-    }
-
-    @Override
-    protected void visitOperation(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        if (args.size() == 2 && OPERATOR_SYMBOLS.containsKey(operator) 
-             && isPrimitive(args.get(0).getType()) && isPrimitive(args.get(1).getType())) {
-            handle(args.get(0));
-            append(OPERATOR_SYMBOLS.get(operator));
-            handle(args.get(1));
-            if (args.get(1) instanceof Constant) {
-                append(CAST_SUFFIXES.get(args.get(1).getType()));
-            }
-            return;
-        }
-        
-        if (operator == Ops.STRING_CAST) {
-            visitCast(operator, args.get(0), String.class);
-        } else if (operator == Ops.NUMCAST) {
-            visitCast(operator, args.get(0), (Class<?>) ((Constant<?>) args.get(1)).getConstant());
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-    
-    private static boolean isPrimitive(Class<?> type) {
-        return type.isPrimitive() || WRAPPER_TYPES.contains(type);
-    }
-
-    @Override
-    public Void visit(FactoryExpression<?> expr, Void context) {
-        visitConstant(expr);
-        append(".newInstance(");
-        handle(", ", expr.getArgs());
-        append(")");
-        return null;
-    }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java
deleted file mode 100644
index b00a96682b..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.tools.JavaCompiler;
-
-import com.google.common.primitives.Primitives;
-import com.mysema.codegen.ECJEvaluatorFactory;
-import com.mysema.codegen.Evaluator;
-import com.mysema.codegen.EvaluatorFactory;
-import com.mysema.codegen.JDKEvaluatorFactory;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.codegen.model.Types;
-import com.mysema.codegen.support.ClassUtils;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.CollectionAnyVisitor;
-import com.mysema.query.support.Context;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Predicate;
-
-/**
- * DefaultEvaluatorFactory provides Java source templates for evaluation of ColQuery queries
- *
- * @author tiwe
- *
- */
-public class DefaultEvaluatorFactory {
-
-    private final EvaluatorFactory factory;
-
-    private final CollQueryTemplates templates;
-
-    public DefaultEvaluatorFactory(CollQueryTemplates templates) {
-        this(templates,
-        Thread.currentThread().getContextClassLoader());
-    }
-
-    public DefaultEvaluatorFactory(CollQueryTemplates templates, EvaluatorFactory factory) {
-        this.templates = templates;
-        this.factory = factory;
-    }
-
-    protected DefaultEvaluatorFactory(CollQueryTemplates templates,
-            URLClassLoader classLoader, JavaCompiler compiler) {
-        this.templates = templates;
-        this.factory = new JDKEvaluatorFactory(classLoader, compiler);
-    }
-
-    protected DefaultEvaluatorFactory(CollQueryTemplates templates, ClassLoader classLoader) {
-        this.templates = templates;
-        if (classLoader instanceof URLClassLoader) {
-            this.factory = new JDKEvaluatorFactory((URLClassLoader) classLoader);
-        } else {
-            // for OSGi compatibility
-            this.factory = new ECJEvaluatorFactory(classLoader);
-        }
-    }
-
-    /**
-     * Create an Evaluator for the given query sources and projection
-     *
-     * @param <T>
-     * @param sources
-     * @param projection
-     * @return
-     */
-    public <T> Evaluator<T> create(QueryMetadata metadata, List<? extends Expression<?>> sources,
-            Expression<T> projection) {
-        final CollQuerySerializer serializer = new CollQuerySerializer(templates);
-        serializer.append("return ");
-        if (projection instanceof FactoryExpression<?>) {
-            serializer.append("(");
-            serializer.append(ClassUtils.getName(projection.getType()));
-            serializer.append(")(");
-            serializer.handle(projection);
-            serializer.append(")");
-        } else {
-            serializer.handle(projection);
-        }
-        serializer.append(";");
-
-        Map<Object,String> constantToLabel = serializer.getConstantToLabel();
-        Map<String, Object> constants = getConstants(metadata, constantToLabel);
-        Class<?>[] types = new Class<?>[sources.size()];
-        String[] names = new String[sources.size()];
-        for (int i = 0; i < sources.size(); i++) {
-            types[i] = sources.get(i).getType();
-            names[i] = sources.get(i).toString();
-        }
-
-        // normalize types
-        for (int i = 0; i < types.length; i++) {
-            if (Primitives.isWrapperType(types[i])) {
-                types[i] = Primitives.unwrap(types[i]);
-            }
-        }
-
-        return factory.createEvaluator(serializer.toString(), projection.getType(), names,
-                types, constants);
-    }
-
-    /**
-     * Create an Evaluator for the given source and filter
-     *
-     * @param <T>
-     * @param source
-     * @param filter
-     * @return
-     */
-    public <T> Evaluator<List<T>> createEvaluator(QueryMetadata metadata,
-            Expression<? extends T> source, Predicate filter) {
-        String typeName = ClassUtils.getName(source.getType());
-        CollQuerySerializer ser = new CollQuerySerializer(templates);
-        ser.append("java.util.List<"+typeName+"> rv = new java.util.ArrayList<"+typeName+">();\n");
-        ser.append("for (" + typeName + " "+ source + " : " + source + "_) {\n");
-        ser.append("    try {\n");
-        ser.append("        if (").handle(filter).append(") {\n");
-        ser.append("            rv.add("+source+");\n");
-        ser.append("        }\n");
-        ser.append("    } catch (NullPointerException npe) { }\n");
-        ser.append("}\n");
-        ser.append("return rv;");
-
-        Map<Object,String> constantToLabel = ser.getConstantToLabel();
-        Map<String, Object> constants = getConstants(metadata, constantToLabel);
-
-        Type sourceType = new ClassType(TypeCategory.SIMPLE, source.getType());
-        ClassType sourceListType = new ClassType(TypeCategory.SIMPLE, Iterable.class, sourceType);
-
-        return factory.createEvaluator(
-                ser.toString(),
-                sourceListType,
-                new String[]{source+"_"},
-                new Type[]{sourceListType},
-                new Class[]{Iterable.class},
-                constants);
-    }
-
-    /**
-     * Create an Evaluator for the given sources and the given optional filter
-     *
-     * @param joins
-     * @param filter
-     * @return
-     */
-    public Evaluator<List<Object[]>> createEvaluator(QueryMetadata metadata,
-            List<JoinExpression> joins, @Nullable Predicate filter) {
-        List<String> sourceNames = new ArrayList<String>();
-        List<Type> sourceTypes = new ArrayList<Type>();
-        List<Class<?>> sourceClasses = new ArrayList<Class<?>>();
-        StringBuilder vars = new StringBuilder();
-        CollQuerySerializer ser = new CollQuerySerializer(templates);
-        ser.append("java.util.List<Object[]> rv = new java.util.ArrayList<Object[]>();\n");
-
-        List<String> anyJoinMatchers = new ArrayList<String>();
-
-        // creating context
-        for (JoinExpression join : joins) {
-            Expression<?> target = join.getTarget();
-            String typeName = com.mysema.codegen.support.ClassUtils.getName(target.getType());
-            if (vars.length() > 0) {
-                vars.append(",");
-            }
-            switch (join.getType()) {
-            case DEFAULT:
-                ser.append("for (" + typeName + " "+ target + " : " + target + "_) {\n");
-                vars.append(target);
-                sourceNames.add(target+"_");
-                sourceTypes.add(new SimpleType(Types.ITERABLE, new ClassType(TypeCategory.SIMPLE,target.getType())));
-                sourceClasses.add(Iterable.class);
-                break;
-
-            case INNERJOIN:
-            case LEFTJOIN:
-                Operation<?> alias = (Operation<?>)join.getTarget();
-                boolean colAnyJoin = join.getCondition() != null && join.getCondition().toString().equals("any");
-                boolean leftJoin = join.getType() == JoinType.LEFTJOIN;
-                String matcher = null;
-                if (colAnyJoin) {
-                    matcher = alias.getArg(1).toString() + "_matched";
-                    ser.append("boolean " + matcher + " = false;\n");
-                    anyJoinMatchers.add(matcher);
-                }
-                ser.append("for (" + typeName + " " + alias.getArg(1) + " : ");
-                if (leftJoin) {
-                    ser.append(CollQueryFunctions.class.getName()+".leftJoin(");
-                }
-                if (colAnyJoin) {
-                    Context context = new Context();
-                    Expression<?> replacement = alias.getArg(0)
-                            .accept(CollectionAnyVisitor.DEFAULT, context);
-                    ser.handle(replacement);
-                } else {
-                    ser.handle(alias.getArg(0));
-                }
-                if (alias.getArg(0).getType().equals(Map.class)) {
-                    ser.append(".values()");
-                }
-                if (leftJoin) {
-                    ser.append(")");
-                }
-                ser.append(") {\n");
-                if (matcher != null) {
-                    ser.append("if (!" + matcher + ") {\n");
-                }
-                vars.append(alias.getArg(1));
-                break;
-
-            default:
-                throw new IllegalArgumentException("Illegal join expression " + join);
-            }
-        }
-
-        // filter
-        if (filter != null) {
-            ser.append("try {\n");
-            ser.append("if (");
-            ser.handle(filter).append(") {\n");
-            for (String matcher : anyJoinMatchers) {
-                ser.append("    "+ matcher + " = true;\n");
-            }
-            ser.append("    rv.add(new Object[]{"+vars+"});\n");
-            ser.append("}\n");
-            ser.append("} catch (NullPointerException npe) { }\n");
-        } else {
-            ser.append("rv.add(new Object[]{"+vars+"});\n");
-        }
-
-        // closing context
-        int amount = joins.size() + anyJoinMatchers.size();
-        for (int i = 0; i < amount; i++) {
-            ser.append("}\n");
-        }
-        ser.append("return rv;");
-
-        Map<Object,String> constantToLabel = ser.getConstantToLabel();
-        Map<String, Object> constants = getConstants(metadata, constantToLabel);
-
-        ClassType projectionType = new ClassType(TypeCategory.LIST, List.class, Types.OBJECTS);
-        return factory.createEvaluator(
-                ser.toString(),
-                projectionType,
-                sourceNames.toArray(new String[sourceNames.size()]),
-                sourceTypes.toArray(new Type[sourceTypes.size()]),
-                sourceClasses.toArray(new Class[sourceClasses.size()]),
-                constants);
-    }
-
-    private Map<String, Object> getConstants(QueryMetadata metadata,
-            Map<Object, String> constantToLabel) {
-        Map<String,Object> constants = new HashMap<String,Object>();
-        for (Map.Entry<Object,String> entry : constantToLabel.entrySet()) {
-            if (entry.getKey() instanceof ParamExpression<?>) {
-                Object value = metadata.getParams().get(entry.getKey());
-                if (value == null) {
-                    throw new ParamNotSetException((ParamExpression<?>) entry.getKey());
-                }
-                constants.put(entry.getValue(), value);
-            } else {
-                constants.put(entry.getValue(), entry.getKey());
-            }
-        }
-        return constants;
-    }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/GuavaHelpers.java b/querydsl-collections/src/main/java/com/mysema/query/collections/GuavaHelpers.java
deleted file mode 100644
index 3f04a75ca8..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/GuavaHelpers.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Collections;
-
-import com.google.common.base.Function;
-import com.mysema.codegen.Evaluator;
-import com.mysema.query.EmptyMetadata;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathExtractor;
-import com.mysema.query.types.Predicate;
-
-/**
- * GuavaHelpers provides functionality to wrap Querydsl {@link Predicate} instances to Guava predicates
- * and Querydsl {@link Expression} instances to Guava functions 
- * 
- * @author tiwe
- *
- */
-public final class GuavaHelpers {
-    
-    private static final DefaultEvaluatorFactory evaluatorFactory = 
-            new DefaultEvaluatorFactory(CollQueryTemplates.DEFAULT);
-    
-    /**
-     * Wrap a Querydsl predicate into a Guava predicate
-     * 
-     * @param predicate
-     * @return
-     */
-    public static <T> com.google.common.base.Predicate<T> wrap(Predicate predicate) {        
-        Path<?> path = (Path<?>)predicate.accept(PathExtractor.DEFAULT, null);
-        if (path != null) {
-            final Evaluator<Boolean> ev = createEvaluator(path.getRoot(), predicate);
-            return new com.google.common.base.Predicate<T>() {
-                @Override
-                public boolean apply(T input) {
-                    return ev.evaluate(input);
-                }                
-            };
-        } else {
-            throw new IllegalArgumentException("No path in " + predicate);
-        }
-    }
-    
-    /**
-     * Wrap a Querydsl expression into a Guava function
-     * 
-     * @param projection
-     * @return
-     */
-    public static <F,T> Function<F,T> wrap(Expression<T> projection) {        
-        Path<?> path = (Path<?>)projection.accept(PathExtractor.DEFAULT, null);
-        if (path != null) {
-            final Evaluator<T> ev = createEvaluator(path.getRoot(), projection);
-            return new Function<F,T>() {
-                @Override
-                public T apply(F input) {
-                    return ev.evaluate(input);
-                }                
-            };
-        } else {
-            throw new IllegalArgumentException("No path in " + projection);
-        }
-    }
-    
-    private static <F,T> Evaluator<T> createEvaluator(Path<F> path, Expression<T> projection) {
-        return evaluatorFactory.create(EmptyMetadata.DEFAULT, 
-                Collections.singletonList(path), projection);
-    }
-    
-    private GuavaHelpers() {  }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/MultiComparator.java b/querydsl-collections/src/main/java/com/mysema/query/collections/MultiComparator.java
deleted file mode 100644
index c5662cee87..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/MultiComparator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-import com.mysema.codegen.Evaluator;
-import com.mysema.query.util.NullSafeComparableComparator;
-
-/**
- * MultiComparator compares arrays
- *
- * @author tiwe
- */
-
-public class MultiComparator<T> implements Comparator<T>, Serializable {
-
-    @SuppressWarnings("unchecked")
-    private static final Comparator<Object> naturalOrder = new NullSafeComparableComparator();
-
-    private static final long serialVersionUID = 1121416260773566299L;
-
-    private final boolean[] asc;
-
-    private final transient Evaluator<Object[]> ev;
-
-    public MultiComparator(Evaluator<Object[]> ev, boolean[] directions) {
-        this.ev = ev;
-        this.asc = directions.clone();
-    }
-
-    @Override
-    public int compare(T o1, T o2) {
-        if (o1.getClass().isArray()) {
-            return innerCompare(ev.evaluate((Object[])o1), ev.evaluate((Object[])o2));
-        } else {
-            return innerCompare(ev.evaluate(o1), ev.evaluate(o2));
-        }
-    }
-
-    private int innerCompare(Object[] o1, Object[] o2) {
-        for (int i = 0; i < o1.length; i++) {
-            int res;
-            if (o1[i] == null) {
-                res = o2[i] == null ? 0 : -1;
-            } else if (o2[i] == null) {
-                res = 1;
-            } else {
-                res = naturalOrder.compare(o1[i], o2[i]);
-            }
-            if (res != 0) {
-                return asc[i] ? res : -res;
-            }
-        }
-        return 0;
-    }
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java b/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java
deleted file mode 100644
index 2402c7c46e..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Expression;
-
-/**
- * QueryEngine defines an interface for the evaluation of ColQuery queries
- *
- * @author tiwe
- *
- */
-public interface QueryEngine {
-
-    /**
-     * Evaluate the given query and return the count of matched rows
-     *
-     * @param metadata
-     * @param iterables
-     * @return
-     */
-    long count(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables);
-
-    /**
-     * Evaluate the given query and return the projection as a list
-     *
-     * @param metadata
-     * @param iterables
-     * @return
-     */
-    <T> List<T> list(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables, 
-            Expression<T> projection);
-
-    /**
-     * @param metadata
-     * @param iterables
-     * @return
-     */
-    boolean exists(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables);
-
-}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/package-info.java b/querydsl-collections/src/main/java/com/mysema/query/collections/package-info.java
deleted file mode 100644
index 281a4a0d43..0000000000
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Implementations of Querydsl query interfaces for JavaBean collections
- */
-package com.mysema.query.collections;
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java b/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
new file mode 100644
index 0000000000..80eb51f911
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.*;
+import com.querydsl.core.support.FetchableQueryBase;
+import com.querydsl.core.types.*;
+
+/**
+ * {@code AbstractCollQuery} provides a base class for {@code Collection} query implementations.
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @see CollQuery
+ * @author tiwe
+ */
+public abstract class AbstractCollQuery<T, Q extends AbstractCollQuery<T, Q>> extends FetchableQueryBase<T, Q>
+        implements FetchableQuery<T, Q> {
+
+    private final Map<Expression<?>, Iterable<?>> iterables = new HashMap<Expression<?>, Iterable<?>>();
+
+    private final QueryEngine queryEngine;
+
+    public AbstractCollQuery(QueryMetadata metadata, QueryEngine queryEngine) {
+        super(new CollQueryMixin<Q>(metadata));
+        @SuppressWarnings("unchecked") // Q is this + subtype
+        Q self = (Q) this;
+        this.queryMixin.setSelf(self);
+        this.queryEngine = queryEngine;
+    }
+
+    @Override
+    public long fetchCount() {
+        return queryEngine.count(queryMixin.getMetadata(), iterables);
+    }
+
+    protected QueryMetadata getMetadata() {
+        return queryMixin.getMetadata();
+    }
+
+    private <D> Expression<D> createAlias(Path<? extends Collection<D>> target, Path<D> alias) {
+        return ExpressionUtils.operation(alias.getType(), Ops.ALIAS, target, alias);
+    }
+
+    private <D> Expression<D> createAlias(MapExpression<?,D> target, Path<D> alias) {
+        return ExpressionUtils.operation(alias.getType(), Ops.ALIAS, target, alias);
+    }
+
+    /**
+     * Add a query source
+     *
+     * @param <A> type of expression
+     * @param entity Path for the source
+     * @param col content of the source
+     * @return current object
+     */
+    public <A> Q from(Path<A> entity, Iterable<? extends A> col) {
+        iterables.put(entity, col);
+        getMetadata().addJoin(JoinType.DEFAULT, entity);
+        return queryMixin.getSelf();
+    }
+
+    /**
+     * Bind the given collection to an already existing query source
+     *
+     * @param <A> type of expression
+     * @param entity Path for the source
+     * @param col content of the source
+     * @return current object
+     */
+    public <A> Q bind(Path<A> entity, Iterable<? extends A> col) {
+        iterables.put(entity, col);
+        return queryMixin.getSelf();
+    }
+
+    @Override
+    public Q groupBy(Expression<?> e) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Q groupBy(Expression<?>... o) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Q having(Predicate e) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Q having(Predicate... e) {
+        throw new UnsupportedOperationException();
+    }
+
+    protected QueryEngine getQueryEngine() {
+        return queryEngine;
+    }
+
+    /**
+     * Define an inner join from the Collection typed path to the alias
+     *
+     * @param <P> type of expression
+     * @param target target of the join
+     * @param alias alias for the join target
+     * @return current object
+     */
+    public <P> Q innerJoin(Path<? extends Collection<P>> target, Path<P> alias) {
+        getMetadata().addJoin(JoinType.INNERJOIN, createAlias(target, alias));
+        return queryMixin.getSelf();
+    }
+
+    /**
+     * Define an inner join from the Map typed path to the alias
+     *
+     * @param <P> type of expression
+     * @param target target of the join
+     * @param alias alias for the join target
+     * @return current object
+     */
+    public <P> Q innerJoin(MapExpression<?,P> target, Path<P> alias) {
+        getMetadata().addJoin(JoinType.INNERJOIN, createAlias(target, alias));
+        return queryMixin.getSelf();
+    }
+
+    /**
+     * Define a left join from the Collection typed path to the alias
+     *
+     * @param <P> type of expression
+     * @param target target of the join
+     * @param alias alias for the join target
+     * @return current object
+     */
+    public <P> Q leftJoin(Path<? extends Collection<P>> target, Path<P> alias) {
+        getMetadata().addJoin(JoinType.LEFTJOIN, createAlias(target, alias));
+        return queryMixin.getSelf();
+    }
+
+    /**
+     * Define a left join from the Map typed path to the alias
+     *
+     * @param <P> type of expression
+     * @param target target of the join
+     * @param alias alias for the joint target
+     * @return current object
+     */
+    public <P> Q leftJoin(MapExpression<?,P> target, Path<P> alias) {
+        getMetadata().addJoin(JoinType.LEFTJOIN, createAlias(target, alias));
+        return queryMixin.getSelf();
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        @SuppressWarnings("unchecked") // This is the built type
+        Expression<T> projection = (Expression<T>) queryMixin.getMetadata().getProjection();
+        return new IteratorAdapter<T>(fetch().iterator());
+    }
+
+    @Override
+    public Stream<T> stream() {
+        return fetch().stream();
+    }
+
+    @Override
+    public List<T> fetch() {
+        @SuppressWarnings("unchecked") // This is the built type
+        Expression<T> projection = (Expression<T>) queryMixin.getMetadata().getProjection();
+        return queryEngine.list(getMetadata(), iterables, projection);
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        @SuppressWarnings("unchecked") // This is the built type
+        Expression<T> projection = (Expression<T>) queryMixin.getMetadata().getProjection();
+        long count = queryEngine.count(getMetadata(), iterables);
+        if (count > 0L) {
+            List<T> list = queryEngine.list(getMetadata(), iterables, projection);
+            return new QueryResults<T>(list, getMetadata().getModifiers(), count);
+        } else {
+            return QueryResults.<T>emptyResults();
+        }
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        queryMixin.setUnique(true);
+        if (queryMixin.getMetadata().getModifiers().getLimit() == null) {
+            limit(2L);
+        }
+        return uniqueResult(iterate());
+    }
+
+
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollDeleteClause.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollDeleteClause.java
new file mode 100644
index 0000000000..a7f1bad3f1
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollDeleteClause.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Collection;
+
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code CollDeleteClause} is an implementation of the {@link DeleteClause} interface for the Querydsl
+ * Collections module
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class CollDeleteClause<T> implements DeleteClause<CollDeleteClause<T>> {
+
+    private final Collection<? extends T> col;
+
+    private final CollQuery<T> query;
+
+    public CollDeleteClause(QueryEngine qe, Path<T> expr, Collection<? extends T> col) {
+        this.query = new CollQuery<Void>(qe).from(expr, col).select(expr);
+        this.col = col;
+    }
+
+    public CollDeleteClause(Path<T> expr, Collection<? extends T> col) {
+        this(DefaultQueryEngine.getDefault(), expr, col);
+    }
+
+    @Override
+    public long execute() {
+        int rv = 0;
+        for (T match : query.fetch()) {
+            col.remove(match);
+            rv++;
+        }
+        return rv;
+    }
+
+    @Override
+    public CollDeleteClause<T> where(Predicate... o) {
+        query.where(o);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "delete " + query.toString();
+    }
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollQuery.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQuery.java
new file mode 100644
index 0000000000..016fdaeeca
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQuery.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code CollQuery} is the default implementation of the {@link FetchableQuery} interface for collections
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public class CollQuery<T> extends AbstractCollQuery<T, CollQuery<T>> implements Cloneable {
+
+    /**
+     * Create a new CollQuery instance
+     */
+    public CollQuery() {
+        super(new DefaultQueryMetadata(), DefaultQueryEngine.getDefault());
+    }
+
+    /**
+     * Creates a new CollQuery instance
+     *
+     * @param templates serialization templates
+     */
+    public CollQuery(CollQueryTemplates templates) {
+        this(new DefaultQueryEngine(new DefaultEvaluatorFactory(templates)));
+    }
+
+    /**
+     * Create a new CollQuery instance
+     *
+     * @param queryEngine query engine for query execution
+     */
+    public CollQuery(QueryEngine queryEngine) {
+        super(new DefaultQueryMetadata(), queryEngine);
+    }
+
+
+    /**
+     * Create a new CollQuery instance
+     *
+     * @param metadata query metadata
+     */
+    public CollQuery(QueryMetadata metadata) {
+        super(metadata, DefaultQueryEngine.getDefault());
+    }
+
+    /**
+     * Create a new CollQuery instance
+     *
+     * @param metadata query metadata
+     * @param queryEngine query engine for query execution
+     */
+    public CollQuery(QueryMetadata metadata, QueryEngine queryEngine) {
+        super(metadata, queryEngine);
+    }
+
+    /**
+     * Clone the state of this query to a new CollQuery instance
+     */
+    @Override
+    public CollQuery<T> clone() {
+        return new CollQuery<T>(queryMixin.getMetadata().clone(), getQueryEngine());
+    }
+
+    @Override
+    public <E> CollQuery<E> select(Expression<E> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new projection's type
+        CollQuery<E> newType = (CollQuery<E>) queryMixin.getSelf();
+        return newType;
+    }
+
+    @Override
+    public CollQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new projection's type
+        CollQuery<Tuple> newType = (CollQuery<Tuple>) queryMixin.getSelf();
+        return newType;
+    }
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFactory.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFactory.java
new file mode 100644
index 0000000000..b43aa21463
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFactory.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code CollQueryFactory} provides static convenience methods for query construction
+ *
+ * @author tiwe
+ */
+public final class CollQueryFactory {
+
+    /**
+     * Create a new delete clause
+     *
+     * @param path source expression
+     * @param col source collection
+     * @return delete clause
+     */
+    public static <A> CollDeleteClause<A> delete(Path<A> path, Collection<A> col) {
+        return new CollDeleteClause<A>(path, col);
+    }
+
+    /**
+     * Create a new query
+     *
+     * @param alias source alias
+     * @param col source collection
+     * @return query
+     */
+    public static <A> CollQuery<A> from(A alias, Iterable<A> col) {
+        Path<A> expr = Alias.$(alias);
+        return new CollQuery<Void>().from(expr, col).select(expr);
+    }
+
+    /**
+     * Create a new query
+     *
+     * @param path source expression
+     * @param arr source array
+     * @return query
+     */
+    public static <A> CollQuery<A> from(Path<A> path, A... arr) {
+        return new CollQuery<Void>().from(path, Collections.unmodifiableList(Arrays.asList(arr))).select(path);
+    }
+
+    /**
+     * Create a new query
+     *
+     * @param path source expression
+     * @param col source collection
+     * @return query
+     */
+    public static <A> CollQuery<A> from(Path<A> path, Iterable<A> col) {
+        return new CollQuery<Void>().from(path, col).select(path);
+    }
+
+    /**
+     * Create a new update clause
+     *
+     * @param path source expression
+     * @param col source collection
+     * @return query
+     */
+    public static <A> CollUpdateClause<A> update(Path<A> path, Iterable<A> col) {
+        return new CollUpdateClause<A>(path, col);
+    }
+
+    private CollQueryFactory() { }
+
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFunctions.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFunctions.java
new file mode 100644
index 0000000000..4477a38293
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryFunctions.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.regex.Pattern;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.util.MathUtils;
+import com.querydsl.core.util.ReflectionUtils;
+
+/**
+ * {@code CollQueryFunctions} defines function implementation for use in ColQueryTemplates
+ *
+ * @author tiwe
+ *
+ */
+public final class CollQueryFunctions {
+
+    private interface BinaryFunction {
+
+        Number apply(Number num1, Number num2);
+    }
+
+    private static final BinaryFunction SUM = new BinaryFunction() {
+        @Override
+        public Number apply(Number num1, Number num2) {
+            return MathUtils.sum(num1, num2);
+        }
+    };
+
+    private static final BinaryFunction MAX = new BinaryFunction() {
+        @Override
+        public Number apply(Number num1, Number num2) {
+            if (num1.getClass().equals(num2.getClass()) && num1 instanceof Comparable) {
+                @SuppressWarnings("unchecked") // The types are interchangeable, guarded by previous check
+                Comparable<Number> left = (Comparable<Number>) num1;
+                return left.compareTo(num2) < 0 ? num2 : num1;
+            } else {
+                BigDecimal n1 = new BigDecimal(num1.toString());
+                BigDecimal n2 = new BigDecimal(num2.toString());
+                return n1.compareTo(n2) < 0 ? num2 : num1;
+            }
+        }
+    };
+
+    private static final BinaryFunction MIN = new BinaryFunction() {
+        @Override
+        public Number apply(Number num1, Number num2) {
+            if (num1.getClass().equals(num2.getClass()) && num1 instanceof Comparable) {
+                @SuppressWarnings("unchecked") // The types are interchangeable, guarded by previous check
+                Comparable<Number> left = (Comparable<Number>) num1;
+                return left.compareTo(num2) < 0 ? num1 : num2;
+            } else {
+                BigDecimal n1 = new BigDecimal(num1.toString());
+                BigDecimal n2 = new BigDecimal(num2.toString());
+                return n1.compareTo(n2) < 0 ? num1 : num2;
+            }
+        }
+    };
+
+    private static final List<Object> nullList = Collections.singletonList((Object) null);
+
+    @SuppressWarnings("unused")
+    public static boolean equals(Object o1, Object o2) {
+        return Objects.equals(o1, o2);
+    }
+
+    public static <T extends Comparable<? super T>> int compareTo(T c1, T c2) {
+        if (c1 == null) {
+            return c2 == null ? 0 : -1;
+        } else if (c2 == null) {
+            return 1;
+        } else {
+            return c1.compareTo(c2);
+        }
+    }
+
+    public static <A extends Comparable<? super A>> boolean between(A a, A b, A c) {
+        return compareTo(a, b) >= 0 && compareTo(a, c) <= 0;
+    }
+
+    public static double cot(double x) {
+        return Math.cos(x) / Math.sin(x);
+    }
+
+    public static double coth(double x) {
+        return Math.cosh(x) / Math.sinh(x);
+    }
+
+    public static double degrees(double x) {
+        return x * 180.0 / Math.PI;
+    }
+
+    public static double radians(double x) {
+        return x * Math.PI / 180.0;
+    }
+
+    public static double log(double x, int y) {
+        return Math.log(x) / Math.log(y);
+    }
+
+    @Nullable
+    public static <T> T coalesce(T... args) {
+        for (T arg : args) {
+            if (arg != null) {
+                return arg;
+            }
+        }
+        return null;
+    }
+
+    public static <T> T nullif(T first, T second) {
+        if (first.equals(second)) {
+            return null;
+        } else {
+            return first;
+        }
+    }
+
+    public static int getYearMonth(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.YEAR) * 100 + cal.get(Calendar.MONTH) + 1;
+    }
+
+    public static int getDayOfMonth(Date date) {
+        return getField(date, Calendar.DAY_OF_MONTH);
+    }
+
+    public static int getDayOfWeek(Date date) {
+        return getField(date, Calendar.DAY_OF_WEEK);
+    }
+
+    public static int getDayOfYear(Date date) {
+        return getField(date, Calendar.DAY_OF_YEAR);
+    }
+
+    private static int getField(Date date, int field) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(field);
+    }
+
+    public static int getHour(Date date) {
+        return getField(date, Calendar.HOUR_OF_DAY);
+    }
+
+    public static int getMilliSecond(Date date) {
+        return getField(date, Calendar.MILLISECOND);
+    }
+
+    public static int getMinute(Date date) {
+        return getField(date, Calendar.MINUTE);
+    }
+
+    public static int getMonth(Date date) {
+        return getField(date, Calendar.MONTH) + 1;
+    }
+
+    public static int getSecond(Date date) {
+        return getField(date, Calendar.SECOND);
+    }
+
+    public static int getWeek(Date date) {
+        return getField(date, Calendar.WEEK_OF_YEAR);
+    }
+
+    public static int getYear(Date date) {
+        return getField(date, Calendar.YEAR);
+    }
+
+    public static int getYearWeek(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return cal.get(Calendar.YEAR) * 100 + cal.get(Calendar.WEEK_OF_YEAR);
+    }
+
+    public static <T> Collection<T> leftJoin(Collection<T> coll) {
+        if (coll == null || coll.isEmpty()) {
+            @SuppressWarnings("unchecked") // List only contains null
+            Collection<T> rv = (Collection<T>) nullList;
+            return rv;
+        } else {
+            return coll;
+        }
+    }
+
+    private static Number reduce(Iterable<Number> source, BinaryFunction f) {
+        Iterator<Number> it = source.iterator();
+        Number result = it.next();
+        while (it.hasNext()) {
+            result = f.apply(result, it.next());
+        }
+        return result;
+    }
+
+    public static Number aggregate(Collection<Number> source, Expression<?> expr, Operator aggregator) {
+        @SuppressWarnings("unchecked") // This is a number expression
+        Class<Number> numberType = (Class<Number>) expr.getType();
+        if (aggregator == Ops.AggOps.AVG_AGG) {
+            Number sum = reduce(source, SUM);
+            return sum.doubleValue() / source.size();
+        } else if (aggregator == Ops.AggOps.COUNT_AGG) {
+            return (long) source.size();
+        } else if (aggregator == Ops.AggOps.COUNT_DISTINCT_AGG) {
+            if (!Set.class.isInstance(source)) {
+                source = new HashSet<>(source);
+            }
+            return (long) source.size();
+        } else if (aggregator == Ops.AggOps.MAX_AGG) {
+            return MathUtils.cast(reduce(source, MAX), numberType);
+        } else if (aggregator == Ops.AggOps.MIN_AGG) {
+            return MathUtils.cast(reduce(source, MIN), numberType);
+        } else if (aggregator == Ops.AggOps.SUM_AGG) {
+            return MathUtils.cast(reduce(source, SUM), numberType);
+        } else {
+            throw new IllegalArgumentException("Unknown operator " + aggregator);
+        }
+    }
+
+    public static boolean like(final String str, String like) {
+        final StringBuilder pattern = new StringBuilder(like.length() + 4);
+        for (int i = 0; i < like.length(); i++) {
+            final char ch = like.charAt(i);
+            if (ch == '%') {
+                pattern.append(".*");
+                continue;
+            } else if (ch == '_') {
+                pattern.append('.');
+                continue;
+            } else if (ch == '.' || ch == '$' || ch == '^') {
+                pattern.append('\\');
+            }
+            pattern.append(ch);
+        }
+        if (pattern.toString().equals(like)) {
+            return str.equals(like);
+        } else {
+            return str.matches(pattern.toString());
+        }
+    }
+
+    public static boolean like(String str, String like, char escape) {
+        return like(str, like);
+    }
+
+    public static boolean likeIgnoreCase(String str, String like) {
+        final StringBuilder pattern = new StringBuilder(like.length() + 4);
+        for (int i = 0; i < like.length(); i++) {
+            final char ch = like.charAt(i);
+            if (ch == '%') {
+                pattern.append(".*");
+                continue;
+            } else if (ch == '_') {
+                pattern.append('.');
+                continue;
+            } else if (ch == '.' || ch == '$' || ch == '^') {
+                pattern.append('\\');
+            }
+            pattern.append(ch);
+        }
+        if (pattern.toString().equals(like)) {
+            return str.equalsIgnoreCase(like);
+        } else {
+            return Pattern.compile(pattern.toString(), Pattern.CASE_INSENSITIVE)
+                    .matcher(str).matches();
+        }
+    }
+
+    public static boolean likeIgnoreCase(String str, String like, char escape) {
+        return likeIgnoreCase(str, like);
+    }
+
+    public static <T> T get(Object parent, String f) {
+        try {
+            Field field = ReflectionUtils.getFieldOrNull(parent.getClass(), f);
+            if (field != null) {
+                field.setAccessible(true);
+                @SuppressWarnings("unchecked")
+                T rv = (T) field.get(parent);
+                return rv;
+            } else {
+                throw new IllegalArgumentException("No field " + f + " for " + parent.getClass());
+            }
+        } catch (IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private CollQueryFunctions() { }
+
+
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryMixin.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryMixin.java
new file mode 100644
index 0000000000..2b98f2fbb0
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryMixin.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.Context;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code CollQueryMixin} extends {@link QueryMixin} to provide normalization logic specific to this module
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class CollQueryMixin<T> extends QueryMixin<T> {
+
+    private static final Predicate ANY = Expressions.booleanTemplate("any");
+
+    public CollQueryMixin() { }
+
+    public CollQueryMixin(QueryMetadata metadata) {
+        super(metadata);
+    }
+
+    public CollQueryMixin(T self, QueryMetadata metadata) {
+        super(self, metadata);
+    }
+
+    @Override
+    protected Predicate convert(Predicate predicate, Role role) {
+        predicate = (Predicate) ExpressionUtils.extract(predicate);
+        if (predicate != null) {
+            Context context = new Context();
+            Predicate transformed = (Predicate) predicate.accept(collectionAnyVisitor, context);
+            for (int i = 0; i < context.paths.size(); i++) {
+                leftJoin(
+                    (Path) context.paths.get(i).getMetadata().getParent(),
+                    (Path) context.replacements.get(i));
+                on(ANY);
+            }
+            return transformed;
+        } else {
+            return predicate;
+        }
+    }
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/CollQuerySerializer.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQuerySerializer.java
new file mode 100644
index 0000000000..3a30b0d088
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQuerySerializer.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.codegen.Serializer;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.support.SerializerBase;
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.PrimitiveUtils;
+
+/**
+ * {@code CollQuerySerializer} is a {@link Serializer} implementation for the Java language
+ *
+ * @author tiwe
+ */
+public final class CollQuerySerializer extends SerializerBase<CollQuerySerializer> {
+
+    private static final Map<Operator, String> OPERATOR_SYMBOLS = new IdentityHashMap<>();
+
+    private static final Map<Class<?>, String> CAST_SUFFIXES = new HashMap<>();
+
+    static {
+        OPERATOR_SYMBOLS.put(Ops.EQ, " == ");
+        OPERATOR_SYMBOLS.put(Ops.NE, " != ");
+        OPERATOR_SYMBOLS.put(Ops.GT, " > ");
+        OPERATOR_SYMBOLS.put(Ops.LT, " < ");
+        OPERATOR_SYMBOLS.put(Ops.GOE, " >= ");
+        OPERATOR_SYMBOLS.put(Ops.LOE, " <= ");
+
+        OPERATOR_SYMBOLS.put(Ops.ADD, " + ");
+        OPERATOR_SYMBOLS.put(Ops.SUB, " - ");
+        OPERATOR_SYMBOLS.put(Ops.MULT, " * ");
+        OPERATOR_SYMBOLS.put(Ops.DIV, " / ");
+
+        CAST_SUFFIXES.put(Boolean.class, ".booleanValue()");
+        CAST_SUFFIXES.put(Byte.class, ".byteValue()");
+        CAST_SUFFIXES.put(Character.class, ".charValue()");
+        CAST_SUFFIXES.put(Double.class, ".doubleValue()");
+        CAST_SUFFIXES.put(Float.class, ".floatValue()");
+        CAST_SUFFIXES.put(Integer.class, ".intValue()");
+        CAST_SUFFIXES.put(Long.class, ".longValue()");
+        CAST_SUFFIXES.put(Short.class, ".shortValue()");
+        CAST_SUFFIXES.put(String.class, ".toString()");
+    }
+
+    public CollQuerySerializer(CollQueryTemplates templates) {
+        super(templates);
+    }
+
+    @Override
+    public Void visit(Path<?> path, Void context) {
+        final PathType pathType = path.getMetadata().getPathType();
+        if (pathType == PathType.PROPERTY) {
+            final Path<?> parent = path.getMetadata().getParent();
+            final String property = path.getMetadata().getName();
+            final Class<?> parentType = parent.getType();
+            try {
+                // getter
+                Method m = getAccessor(parentType, property);
+                if (m != null && Modifier.isPublic(m.getModifiers())) {
+                    handle(parent);
+                    append(".").append(m.getName()).append("()");
+                } else {
+                    // field
+                    Field f = getField(parentType, property);
+                    if (f != null && Modifier.isPublic(f.getModifiers())) {
+                        handle(parent);
+                        append(".").append(property);
+                    } else {
+                        // field access by reflection
+                        append(CollQueryFunctions.class.getName() + ".<");
+                        append((path.getType()).getName()).append(">get(");
+                        handle(parent);
+                        append(", \"" + property + "\")");
+                    }
+                }
+            } catch (Exception e) {
+                throw new QueryException(e);
+            }
+
+        } else if (pathType == PathType.DELEGATE) {
+            append("(");
+            append("(").append(path.getType().getName()).append(")");
+            path.getMetadata().getParent().accept(this, context);
+            append(")");
+
+        } else {
+            List<Object> args = new ArrayList<Object>(2);
+            if (path.getMetadata().getParent() != null) {
+                args.add(path.getMetadata().getParent());
+            }
+            args.add(path.getMetadata().getElement());
+            final Template template = getTemplate(pathType);
+            for (Template.Element element : template.getElements()) {
+                Object rv = element.convert(args);
+                if (rv instanceof Expression) {
+                    ((Expression<?>) rv).accept(this, context);
+                } else if (element.isString()) {
+                    append(rv.toString());
+                } else {
+                    visitConstant(rv);
+                }
+            }
+        }
+        return null;
+
+    }
+
+    private Method getAccessor(Class<?> owner, String property) {
+        try {
+            BeanInfo beanInfo = Introspector.getBeanInfo(owner);
+            PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+            for (PropertyDescriptor pd : descriptors) {
+                if (pd.getName().equals(property)) {
+                    return pd.getReadMethod();
+                }
+            }
+            return null;
+        } catch (IntrospectionException e) {
+            return null;
+        }
+    }
+
+    private Field getField(Class<?> owner, String field) {
+        try {
+            return owner.getField(field);
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public Void visit(SubQueryExpression<?> expr, Void context) {
+        throw new IllegalArgumentException("Not supported");
+    }
+
+    private void visitCast(Operator operator, Expression<?> source, Class<?> targetType) {
+        if (Number.class.isAssignableFrom(source.getType()) && !Constant.class.isInstance(source)) {
+            append("new ").append(source.getType().getSimpleName()).append("(");
+            handle(source);
+            append(")");
+        } else {
+            handle(source);
+        }
+
+        if (CAST_SUFFIXES.containsKey(targetType)) {
+            append(CAST_SUFFIXES.get(targetType));
+        } else {
+            throw new IllegalArgumentException("Unsupported cast type " + targetType.getName());
+        }
+    }
+
+    @Override
+    protected void visitOperation(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        if (Ops.aggOps.contains(operator)) {
+            throw new UnsupportedOperationException("Aggregation operators are only supported as single expressions");
+        }
+        if (args.size() == 2 && OPERATOR_SYMBOLS.containsKey(operator)
+             && isPrimitiveOrWrapperType(args.get(0).getType()) && isPrimitiveOrWrapperType(args.get(1).getType())) {
+            handle(args.get(0));
+            append(OPERATOR_SYMBOLS.get(operator));
+            handle(args.get(1));
+            if (args.get(1) instanceof Constant<?>) {
+                append(CAST_SUFFIXES.get(args.get(1).getType()));
+            }
+            return;
+        }
+
+        if (operator == Ops.STRING_CAST) {
+            visitCast(operator, args.get(0), String.class);
+        } else if (operator == Ops.NUMCAST) {
+            @SuppressWarnings("unchecked") //this is the second argument's type
+            Constant<Class<?>> rightArg = (Constant<Class<?>>) args.get(1);
+
+            visitCast(operator, args.get(0), rightArg.getConstant());
+        } else {
+            super.visitOperation(type, operator, args);
+        }
+    }
+
+    private static boolean isPrimitiveOrWrapperType(Class<?> type) {
+        return type.isPrimitive() || PrimitiveUtils.isWrapperType(type);
+    }
+
+    @Override
+    public Void visit(FactoryExpression<?> expr, Void context) {
+        visitConstant(expr);
+        append(".newInstance(");
+        append("new Object[] {");
+        handle(", ", expr.getArgs());
+        append("})");
+        return null;
+    }
+
+}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryTemplates.java
similarity index 87%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/CollQueryTemplates.java
index c3315761ba..8fa66af6de 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollQueryTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.PathType;
+import com.querydsl.core.types.JavaTemplates;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.PathType;
 
 /**
- * CollQueryTemplates extends {@link JavaTemplates} to add module specific operation
+ * {@code CollQueryTemplates} extends {@link JavaTemplates} to add module specific operation
  * templates.
  *
  * @author tiwe
  */
 public class CollQueryTemplates extends JavaTemplates {
 
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //intentional
     public static final CollQueryTemplates DEFAULT = new CollQueryTemplates();
 
     protected CollQueryTemplates() {
@@ -72,7 +73,9 @@ protected CollQueryTemplates() {
 
         // String
         add(Ops.LIKE, functions + ".like({0},{1})");
+        add(Ops.LIKE_IC, functions + ".likeIgnoreCase({0},{1})");
         add(Ops.LIKE_ESCAPE, functions + ".like({0},{1},{2})");
+        add(Ops.LIKE_ESCAPE_IC, functions + ".likeIgnoreCase({0},{1},{2})");
 
         // Path types
         for (PathType type : new PathType[] {
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollUpdateClause.java b/querydsl-collections/src/main/java/com/querydsl/collections/CollUpdateClause.java
similarity index 81%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/CollUpdateClause.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/CollUpdateClause.java
index be42b79b01..55ebb9e36c 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollUpdateClause.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/CollUpdateClause.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,20 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.util.BeanMap;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.util.BeanMap;
 
 /**
- * CollUpdateClause is an implementation of the UpdateClause interface for Querydsl Collections
+ * {@code CollUpdateClause} is an implementation of the {@link UpdateClause} interface for Querydsl Collections
  *
  * @author tiwe
  *
@@ -32,15 +32,12 @@
  */
 public class CollUpdateClause<T> implements UpdateClause<CollUpdateClause<T>> {
 
-    private final Path<T> expr;
-
     private final Map<Path<?>, Object> paths = new HashMap<Path<?>, Object>();
 
-    private final CollQuery query;
+    private final CollQuery<T> query;
 
     public CollUpdateClause(QueryEngine qe, Path<T> expr, Iterable<? extends T> col) {
-        this.query = new CollQuery(qe).from(expr, col);
-        this.expr = expr;
+        this.query = new CollQuery<Void>(qe).from(expr, col).select(expr);
     }
 
     public CollUpdateClause(Path<T> expr, Iterable<? extends T> col) {
@@ -50,7 +47,7 @@ public CollUpdateClause(Path<T> expr, Iterable<? extends T> col) {
     @Override
     public long execute() {
         int rv = 0;
-        for (T match : query.list(expr)) {
+        for (T match : query.fetch()) {
             BeanMap beanMap = new BeanMap(match);
             for (Map.Entry<Path<?>,Object> entry : paths.entrySet()) {
                 // TODO : support deep updates as well
@@ -67,14 +64,14 @@ public <U> CollUpdateClause<T> set(Path<U> path, U value) {
         paths.put(path, value);
         return this;
     }
-    
+
 
     @Override
     public <U> CollUpdateClause<T> set(Path<U> path, Expression<? extends U> expression) {
         // TODO : implement
         throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public <U> CollUpdateClause<T> setNull(Path<U> path) {
         paths.put(path, null);
@@ -94,7 +91,7 @@ public CollUpdateClause<T> where(Predicate... o) {
         query.where(o);
         return this;
     }
-    
+
     @Override
     public String toString() {
         return "update " + query;
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java b/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java
new file mode 100644
index 0000000000..5e460c3ed1
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.codegen.utils.ECJEvaluatorFactory;
+import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.codegen.utils.EvaluatorFactory;
+import com.querydsl.codegen.utils.JDKEvaluatorFactory;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.utils.support.ClassUtils;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.CollectionAnyVisitor;
+import com.querydsl.core.support.Context;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.util.PrimitiveUtils;
+import org.jetbrains.annotations.Nullable;
+
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@code DefaultEvaluatorFactory} provides Java source templates for evaluation of {@link CollQuery} queries
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultEvaluatorFactory {
+
+    private final EvaluatorFactory factory;
+
+    private final CollQueryTemplates templates;
+
+    private final CollectionAnyVisitor collectionAnyVisitor = new CollectionAnyVisitor();
+
+    public DefaultEvaluatorFactory(CollQueryTemplates templates) {
+        this(templates,
+        Thread.currentThread().getContextClassLoader() != null ? Thread.currentThread().getContextClassLoader() : DefaultEvaluatorFactory.class.getClassLoader());
+    }
+
+    public DefaultEvaluatorFactory(CollQueryTemplates templates, EvaluatorFactory factory) {
+        this.templates = templates;
+        this.factory = factory;
+    }
+
+    protected DefaultEvaluatorFactory(CollQueryTemplates templates,
+            URLClassLoader classLoader, JavaCompiler compiler) {
+        this.templates = templates;
+        this.factory = new JDKEvaluatorFactory(classLoader, compiler);
+    }
+
+    protected DefaultEvaluatorFactory(CollQueryTemplates templates, ClassLoader classLoader) {
+        this.templates = templates;
+        final JavaCompiler systemJavaCompiler = ToolProvider.getSystemJavaCompiler();
+        if (classLoader instanceof URLClassLoader && systemJavaCompiler != null) {
+            this.factory = new JDKEvaluatorFactory((URLClassLoader) classLoader, systemJavaCompiler);
+        } else {
+            // for OSGi and JRE compatibility
+            this.factory = new ECJEvaluatorFactory(classLoader);
+        }
+    }
+
+    /**
+     * Create an Evaluator for the given query sources and projection
+     *
+     * @param <T>
+     * @param metadata query metadata
+     * @param sources sources of the query
+     * @param projection projection of the query
+     * @return evaluator
+     */
+    public <T> Evaluator<T> create(QueryMetadata metadata, List<? extends Expression<?>> sources,
+            Expression<T> projection) {
+        final CollQuerySerializer serializer = new CollQuerySerializer(templates);
+        serializer.append("return ");
+        if (projection instanceof FactoryExpression<?>) {
+            serializer.append("(");
+            serializer.append(ClassUtils.getName(projection.getType()));
+            serializer.append(")(");
+            serializer.handle(projection);
+            serializer.append(")");
+        } else {
+            serializer.handle(projection);
+        }
+        serializer.append(";");
+
+        Map<Object,String> constantToLabel = serializer.getConstantToLabel();
+        Map<String, Object> constants = getConstants(metadata, constantToLabel);
+        Class<?>[] types = new Class<?>[sources.size()];
+        String[] names = new String[sources.size()];
+        for (int i = 0; i < sources.size(); i++) {
+            types[i] = sources.get(i).getType();
+            names[i] = sources.get(i).toString();
+        }
+
+        // normalize types
+        for (int i = 0; i < types.length; i++) {
+            if (PrimitiveUtils.isWrapperType(types[i])) {
+                types[i] = PrimitiveUtils.unwrap(types[i]);
+            }
+        }
+
+        return factory.createEvaluator(serializer.toString(), projection.getType(), names,
+                types, constants);
+    }
+
+    /**
+     * Create an Evaluator for the given source and filter
+     *
+     * @param <T>
+     * @param source source of the query
+     * @param filter filter of the query
+     * @return evaluator
+     */
+    public <T> Evaluator<List<T>> createEvaluator(QueryMetadata metadata,
+            Expression<? extends T> source, Predicate filter) {
+        String typeName = ClassUtils.getName(source.getType());
+        CollQuerySerializer ser = new CollQuerySerializer(templates);
+        ser.append("java.util.List<" + typeName + "> rv = new java.util.ArrayList<" + typeName + ">();\n");
+        ser.append("for (" + typeName + " " + source + " : " + source + "_) {\n");
+        ser.append("    try {\n");
+        ser.append("        if (").handle(filter).append(") {\n");
+        ser.append("            rv.add(" + source + ");\n");
+        ser.append("        }\n");
+        ser.append("    } catch (NullPointerException npe) { }\n");
+        ser.append("}\n");
+        ser.append("return rv;");
+
+        Map<Object,String> constantToLabel = ser.getConstantToLabel();
+        Map<String, Object> constants = getConstants(metadata, constantToLabel);
+
+        Type sourceType = new ClassType(TypeCategory.SIMPLE, source.getType());
+        ClassType sourceListType = new ClassType(TypeCategory.SIMPLE, Iterable.class, sourceType);
+
+        return factory.createEvaluator(
+                ser.toString(),
+                sourceListType,
+                new String[]{source + "_"},
+                new Type[]{sourceListType},
+                new Class<?>[]{Iterable.class},
+                constants);
+    }
+
+    /**
+     * Create an Evaluator for the given sources and the given optional filter
+     *
+     * @param metadata query metadata
+     * @param joins joins
+     * @param filter where condition
+     * @return evaluator
+     */
+    public Evaluator<List<Object[]>> createEvaluator(QueryMetadata metadata,
+            List<JoinExpression> joins, @Nullable Predicate filter) {
+        List<String> sourceNames = new ArrayList<String>();
+        List<Type> sourceTypes = new ArrayList<Type>();
+        List<Class<?>> sourceClasses = new ArrayList<Class<?>>();
+        StringBuilder vars = new StringBuilder();
+        CollQuerySerializer ser = new CollQuerySerializer(templates);
+        ser.append("java.util.List<Object[]> rv = new java.util.ArrayList<Object[]>();\n");
+
+        List<String> anyJoinMatchers = new ArrayList<String>();
+
+        // creating context
+        for (JoinExpression join : joins) {
+            Expression<?> target = join.getTarget();
+            String typeName = com.querydsl.codegen.utils.support.ClassUtils.getName(target.getType());
+            if (vars.length() > 0) {
+                vars.append(",");
+            }
+            switch (join.getType()) {
+            case DEFAULT:
+                ser.append("for (" + typeName + " " + target + " : " + target + "_) {\n");
+                vars.append(target);
+                sourceNames.add(target + "_");
+                sourceTypes.add(new SimpleType(Types.ITERABLE, new ClassType(TypeCategory.SIMPLE,target.getType())));
+                sourceClasses.add(Iterable.class);
+                break;
+
+            case INNERJOIN:
+            case LEFTJOIN:
+                Operation<?> alias = (Operation<?>) join.getTarget();
+                boolean colAnyJoin = join.getCondition() != null && join.getCondition().toString().equals("any");
+                boolean leftJoin = join.getType() == JoinType.LEFTJOIN;
+                String matcher = null;
+                if (colAnyJoin) {
+                    matcher = alias.getArg(1).toString() + "_matched";
+                    ser.append("boolean " + matcher + " = false;\n");
+                    anyJoinMatchers.add(matcher);
+                }
+                ser.append("for (" + typeName + " " + alias.getArg(1) + " : ");
+                if (leftJoin) {
+                    ser.append(CollQueryFunctions.class.getName() + ".leftJoin(");
+                }
+                if (colAnyJoin) {
+                    Context context = new Context();
+                    Expression<?> replacement = alias.getArg(0)
+                            .accept(collectionAnyVisitor, context);
+                    ser.handle(replacement);
+                } else {
+                    ser.handle(alias.getArg(0));
+                }
+                if (alias.getArg(0).getType().equals(Map.class)) {
+                    ser.append(".values()");
+                }
+                if (leftJoin) {
+                    ser.append(")");
+                }
+                ser.append(") {\n");
+                if (matcher != null) {
+                    ser.append("if (!" + matcher + ") {\n");
+                }
+                vars.append(alias.getArg(1));
+                break;
+
+            default:
+                throw new IllegalArgumentException("Illegal join expression " + join);
+            }
+        }
+
+        // filter
+        if (filter != null) {
+            ser.append("try {\n");
+            ser.append("if (");
+            ser.handle(filter).append(") {\n");
+            for (String matcher : anyJoinMatchers) {
+                ser.append("    " + matcher + " = true;\n");
+            }
+            ser.append("    rv.add(new Object[]{" + vars + "});\n");
+            ser.append("}\n");
+            ser.append("} catch (NullPointerException npe) { }\n");
+        } else {
+            ser.append("rv.add(new Object[]{" + vars + "});\n");
+        }
+
+        // closing context
+        int amount = joins.size() + anyJoinMatchers.size();
+        for (int i = 0; i < amount; i++) {
+            ser.append("}\n");
+        }
+        ser.append("return rv;");
+
+        Map<Object,String> constantToLabel = ser.getConstantToLabel();
+        Map<String, Object> constants = getConstants(metadata, constantToLabel);
+
+        ClassType projectionType = new ClassType(TypeCategory.LIST, List.class, Types.OBJECTS);
+        return factory.createEvaluator(
+                ser.toString(),
+                projectionType,
+                sourceNames.toArray(new String[0]),
+                sourceTypes.toArray(new Type[0]),
+                sourceClasses.toArray(new Class<?>[0]),
+                constants);
+    }
+
+    private Map<String, Object> getConstants(QueryMetadata metadata,
+            Map<Object, String> constantToLabel) {
+        Map<String,Object> constants = new HashMap<String,Object>();
+        for (Map.Entry<Object,String> entry : constantToLabel.entrySet()) {
+            if (entry.getKey() instanceof ParamExpression<?>) {
+                Object value = metadata.getParams().get(entry.getKey());
+                if (value == null) {
+                    throw new ParamNotSetException((ParamExpression<?>) entry.getKey());
+                }
+                constants.put(entry.getValue(), value);
+            } else {
+                constants.put(entry.getValue(), entry.getKey());
+            }
+        }
+        return constants;
+    }
+
+}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java b/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
similarity index 78%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
index 0934755431..e09247cdf1 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/DefaultQueryEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,30 +11,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
+
+import com.querydsl.codegen.utils.Evaluator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.ArrayConstructorExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Order;
+import com.querydsl.core.types.OrderSpecifier;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterators;
-import com.mysema.codegen.Evaluator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.ArrayConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Order;
-import com.mysema.query.types.OrderSpecifier;
+import java.util.stream.Collectors;
 
 /**
  * Default implementation of the {@link QueryEngine} interface
@@ -45,13 +45,13 @@
 @SuppressWarnings("unchecked")
 public class DefaultQueryEngine implements QueryEngine {
 
-    private static volatile QueryEngine DEFAULT;
+    private static transient volatile QueryEngine defaultQueryEngine;
 
     public static QueryEngine getDefault() {
-        if (DEFAULT == null) {
-            DEFAULT = new DefaultQueryEngine(new DefaultEvaluatorFactory(CollQueryTemplates.DEFAULT));
+        if (defaultQueryEngine == null) {
+            defaultQueryEngine = new DefaultQueryEngine(new DefaultEvaluatorFactory(CollQueryTemplates.DEFAULT));
         }
-        return DEFAULT;
+        return defaultQueryEngine;
     }
 
     private final DefaultEvaluatorFactory evaluatorFactory;
@@ -72,7 +72,7 @@ public long count(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterab
     @Override
     public boolean exists(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables) {
         QueryModifiers modifiers = metadata.getModifiers();
-        metadata.setLimit(1l);
+        metadata.setLimit(1L);
         try {
             if (metadata.getJoins().size() == 1) {
                 return !evaluateSingleSource(metadata, iterables, true).isEmpty();
@@ -99,7 +99,7 @@ private <T> List<T> distinct(List<T> list) {
         if (!list.isEmpty() && list.get(0) != null && list.get(0).getClass().isArray()) {
             Set set = new HashSet(list.size());
             for (T o : list) {
-                if (set.add(ImmutableList.copyOf((Object[])o))) {
+                if (set.add(Collections.unmodifiableList(Arrays.asList((Object[]) o)))) {
                     rv.add(o);
                 }
             }
@@ -166,14 +166,14 @@ private List evaluateSingleSource(QueryMetadata metadata, Map<Expression<?>,
         final Iterable<?> iterable = iterables.values().iterator().next();
         List<?> list;
         if (iterable instanceof List) {
-            list = (List)iterable;
+            list = (List) iterable;
         } else {
             list = IteratorAdapter.asList(iterable.iterator());
         }
 
         // from & where
         if (metadata.getWhere() != null) {
-            Evaluator<List<?>> evaluator = (Evaluator)evaluatorFactory
+            Evaluator<List<?>> evaluator = (Evaluator) evaluatorFactory
                     .createEvaluator(metadata, source, metadata.getWhere());
             list = evaluator.evaluate(list);
         }
@@ -188,7 +188,7 @@ private List evaluateSingleSource(QueryMetadata metadata, Map<Expression<?>,
                 order(metadata, sources, list);
             }
             // projection
-            if (metadata.getProjection().size() > 1 || !metadata.getProjection().get(0).equals(source)) {
+            if (metadata.getProjection() != null && !metadata.getProjection().equals(source)) {
                 list = project(metadata, sources, list);
             }
             // limit + offset
@@ -214,29 +214,30 @@ private void order(QueryMetadata metadata, List<Expression<?>> sources, List<?>
         List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
         Expression<Object>[] orderByExpr = new Expression[orderBy.size()];
         boolean[] directions = new boolean[orderBy.size()];
+        boolean[] nullsLast = new boolean[orderBy.size()];
         for (int i = 0; i < orderBy.size(); i++) {
             orderByExpr[i] = (Expression) orderBy.get(i).getTarget();
             directions[i] = orderBy.get(i).getOrder() == Order.ASC;
+            nullsLast[i] = orderBy.get(i).getNullHandling() == OrderSpecifier.NullHandling.NullsLast;
         }
         Expression<?> expr = new ArrayConstructorExpression<Object>(Object[].class, orderByExpr);
         Evaluator orderEvaluator = evaluatorFactory.create(metadata, sources, expr);
-        Collections.sort(list, new MultiComparator(orderEvaluator, directions));
+        list.sort(new MultiComparator(orderEvaluator, directions, nullsLast));
     }
 
     private List<?> project(QueryMetadata metadata, List<Expression<?>> sources, List<?> list) {
-        Expression<?> projection = metadata.getProjection().get(0);
-        Operator<?> aggregator = null;
-        if (projection instanceof Operation && Ops.aggOps.contains(((Operation)projection).getOperator())) {
-            Operation<?> aggregation = (Operation<?>)projection;
+        Expression<?> projection = metadata.getProjection();
+        Operator aggregator = null;
+        if (projection instanceof Operation && Ops.aggOps.contains(((Operation) projection).getOperator())) {
+            Operation<?> aggregation = (Operation<?>) projection;
             aggregator = aggregation.getOperator();
             projection = aggregation.getArg(0);
         }
         Evaluator projectionEvaluator = evaluatorFactory.create(metadata, sources, projection);
-        EvaluatorFunction transformer = new EvaluatorFunction(projectionEvaluator);
-        List target = new ArrayList();
-        Iterators.addAll(target, Iterators.transform(list.iterator(), transformer));
+        EvaluatorFunction<Object, Object> transformer = new EvaluatorFunction(projectionEvaluator);
+        List target = list.stream().map(transformer).collect(Collectors.toList());
         if (aggregator != null) {
-            return ImmutableList.of(CollQueryFunctions.aggregate(target, projection, aggregator));
+            return Collections.singletonList(CollQueryFunctions.aggregate(target, projection, aggregator));
         } else {
             return target;
         }
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/EvaluatorFunction.java b/querydsl-collections/src/main/java/com/querydsl/collections/EvaluatorFunction.java
similarity index 77%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/EvaluatorFunction.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/EvaluatorFunction.java
index fb4493239c..eab6b0cb03 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/EvaluatorFunction.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/EvaluatorFunction.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import com.google.common.base.Function;
-import com.mysema.codegen.Evaluator;
+import com.querydsl.codegen.utils.Evaluator;
+
+import java.util.function.Function;
 
 /**
  * Function implementation which uses an {@link Evaluator} for transformation
- * 
+ *
+ * @param <S> source type
+ * @param <T> target type
+ *
  * @author tiwe
  */
 public class EvaluatorFunction<S, T> implements Function<S, T> {
@@ -34,7 +38,7 @@ public T apply(S input) {
         if (input.getClass().isArray()) {
             return ev.evaluate((Object[]) input);
         } else {
-            return ev.evaluate(new Object[]{input});
+            return ev.evaluate(input);
         }
     }
 }
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/FunctionalHelpers.java b/querydsl-collections/src/main/java/com/querydsl/collections/FunctionalHelpers.java
new file mode 100644
index 0000000000..3176f7e5f7
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/FunctionalHelpers.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.core.EmptyMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathExtractor;
+import com.querydsl.core.types.Predicate;
+
+import java.util.Collections;
+import java.util.function.Function;
+
+/**
+ * {@code GuavaHelpers} provides functionality to wrap Querydsl {@link Predicate} instances to Guava predicates
+ * and Querydsl {@link Expression} instances to Guava functions
+ *
+ * @author tiwe
+ *
+ */
+public final class FunctionalHelpers {
+
+    private static final DefaultEvaluatorFactory evaluatorFactory =
+            new DefaultEvaluatorFactory(CollQueryTemplates.DEFAULT);
+
+    /**
+     * Wrap a Querydsl predicate into a Guava predicate
+     *
+     * @param predicate predicate to wrapped
+     * @return Guava predicate
+     */
+    public static <T> java.util.function.Predicate<T> wrap(Predicate predicate) {
+        Path<?> path = predicate.accept(PathExtractor.DEFAULT, null);
+        if (path != null) {
+            final Evaluator<Boolean> ev = createEvaluator(path.getRoot(), predicate);
+            return ev::evaluate;
+        } else {
+            throw new IllegalArgumentException("No path in " + predicate);
+        }
+    }
+
+    /**
+     * Wrap a Querydsl expression into a Guava function
+     *
+     * @param projection projection to wrap
+     * @return Guava function
+     */
+    public static <F,T> Function<F,T> wrap(Expression<T> projection) {
+        Path<?> path = projection.accept(PathExtractor.DEFAULT, null);
+        if (path != null) {
+            final Evaluator<T> ev = createEvaluator(path.getRoot(), projection);
+            return ev::evaluate;
+        } else {
+            throw new IllegalArgumentException("No path in " + projection);
+        }
+    }
+
+    private static <F,T> Evaluator<T> createEvaluator(Path<F> path, Expression<T> projection) {
+        return evaluatorFactory.create(EmptyMetadata.DEFAULT,
+                Collections.singletonList(path), projection);
+    }
+
+    private FunctionalHelpers() {  }
+
+}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java b/querydsl-collections/src/main/java/com/querydsl/collections/JodaTimeTemplates.java
similarity index 85%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/JodaTimeTemplates.java
index 4ca3617860..ea53433384 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/JodaTimeTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import com.mysema.query.types.Ops;
+import com.querydsl.core.types.Ops;
 
 
 /**
@@ -24,7 +24,8 @@
  */
 public class JodaTimeTemplates extends CollQueryTemplates {
 
-    public static final CollQueryTemplates DEFAULT = new JodaTimeTemplates();
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final JodaTimeTemplates DEFAULT = new JodaTimeTemplates();
 
     protected JodaTimeTemplates() {
         add(Ops.DateTimeOps.YEAR,         "{0}.getYear()");
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/MultiComparator.java b/querydsl-collections/src/main/java/com/querydsl/collections/MultiComparator.java
new file mode 100644
index 0000000000..a68e3740bf
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/MultiComparator.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.core.util.NullSafeComparableComparator;
+
+/**
+ * {@code MultiComparator} compares arrays
+ *
+ * @param <T> element type
+ * @author tiwe
+ */
+public class MultiComparator<T> implements Comparator<T>, Serializable {
+
+    @SuppressWarnings("unchecked")
+    private static final Comparator<Object> naturalOrder = new NullSafeComparableComparator();
+
+    private static final long serialVersionUID = 1121416260773566299L;
+
+    private final boolean[] asc;
+
+    private final boolean[] nullsLast;
+
+    private final transient Evaluator<Object[]> ev;
+
+    public MultiComparator(Evaluator<Object[]> ev, boolean[] directions, boolean[] nullsLast) {
+        this.ev = ev;
+        this.asc = directions.clone();
+        this.nullsLast = nullsLast.clone();
+    }
+
+    @Override
+    public int compare(T o1, T o2) {
+        if (o1 instanceof Object[]) {
+            return innerCompare(ev.evaluate((Object[]) o1), ev.evaluate((Object[]) o2));
+        } else {
+            return innerCompare(ev.evaluate(o1), ev.evaluate(o2));
+        }
+    }
+
+    private int innerCompare(Object[] o1, Object[] o2) {
+        for (int i = 0; i < o1.length; i++) {
+            if (o1[i] == null) {
+                return o2[i] == null ? 0 : nullsLast[i] ? 1 : -1;
+            } else if (o2[i] == null) {
+                return nullsLast[i] ? -1 : 1;
+            } else {
+                int res;
+                res = naturalOrder.compare(o1[i], o2[i]);
+                if (res != 0) {
+                    return asc[i] ? res : -res;
+                }
+            }
+        }
+        return 0;
+    }
+
+}
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/PathComparator.java b/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java
similarity index 85%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/PathComparator.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java
index 13486f993c..4e1139ecd5 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/PathComparator.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/PathComparator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import java.util.Comparator;
+import com.querydsl.core.types.Path;
 
-import com.google.common.base.Function;
-import com.mysema.query.types.Path;
+import java.util.Comparator;
+import java.util.function.Function;
 
 /**
  * Compares two beans based on the values at a specific path.
@@ -28,25 +28,25 @@
  * @param <V> type of value being matched
  */
 public class PathComparator<T, V extends Comparable<V>> implements Comparator<T> {
-    
+
     private final Function<T,V> accessor;
-    
+
     public PathComparator(Path<V> comparingPath) {
-        this(comparingPath, GuavaHelpers.<T,V>wrap(comparingPath));
+        this(comparingPath, FunctionalHelpers.<T,V>wrap(comparingPath));
     }
-    
+
     public PathComparator(Path<V> comparingPath, Function<T,V> accessor) {
         this.accessor = accessor;
     }
-    
+
     public static <T, V extends Comparable<V>> PathComparator<T, V> pathComparator(Path<V> comparingPath) {
         return new PathComparator<T,V>(comparingPath);
     }
 
     @Override
     public int compare(T leftBean, T rightBean) {
-        if(leftBean == rightBean) {
-            return 0; // Reference to the seme object should always result in '0'
+        if (leftBean == rightBean) {
+            return 0; // Reference to the same object should always result in '0'
         } else if (leftBean == null) {
             return -1; // Whenever the reference varies and left is null, right is not null
         } else if (rightBean == null) {
@@ -56,7 +56,7 @@ public int compare(T leftBean, T rightBean) {
         }
         return comparePathValues(leftBean, rightBean);
     }
-    
+
     private int comparePathValues(T leftBean, T rightBean) {
         V left = accessor.apply(leftBean);
         V right = accessor.apply(rightBean);
diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/PathMatcher.java b/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
similarity index 87%
rename from querydsl-collections/src/main/java/com/mysema/query/collections/PathMatcher.java
rename to querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
index b89d00fbde..03432cbb20 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/PathMatcher.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,55 +11,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
-
-import static org.hamcrest.core.IsNull.notNullValue;
+package com.querydsl.collections;
 
+import com.querydsl.core.types.Path;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
-import com.google.common.base.Function;
-import com.mysema.query.types.Path;
+import java.util.function.Function;
+
+import static org.hamcrest.core.IsNull.notNullValue;
 
 /**
  * Matches based on the current value of a path.
- * 
+ *
  * @author Jeroen van Schagen
  * @author tiwe
  *
  * @param <T> type of the path root
  * @param <V> type of value being matched
  */
-public class PathMatcher<T, V> extends TypeSafeDiagnosingMatcher<T> {   
-    
+public class PathMatcher<T, V> extends TypeSafeDiagnosingMatcher<T> {
+
     private final Function<T, V> accessor;
-    
+
     private final Matcher<? super V> matcher;
-    
+
     private final Path<V> path;
-    
+
     public PathMatcher(Path<V> path, Matcher<? super V> matcher) {
-        this(path, matcher, GuavaHelpers.<T,V>wrap(path));
+        this(path, matcher, FunctionalHelpers.<T,V>wrap(path));
     }
-    
+
     public PathMatcher(Path<V> path, Matcher<? super V> matcher, Function<T, V> accessor) {
         this.path = path;
         this.matcher = matcher;
         this.accessor = accessor;
     }
-    
-    @Factory
+
     public static <T,P> Matcher<T> hasValue(Path<P> path) {
         return new PathMatcher<T,P>(path, notNullValue());
     }
-  
-    @Factory
+
     public static <T,P> Matcher<T> hasValue(Path<P> path, Matcher<? super P> matcher) {
         return new PathMatcher<T,P>(path, matcher);
     }
-    
+
     @Override
     protected boolean matchesSafely(T bean, Description mismatchDescription) {
         V value = accessor.apply(bean);
@@ -79,5 +76,5 @@ public void describeTo(Description description) {
         description.appendDescriptionOf(matcher);
         description.appendText(")");
     }
-    
+
 }
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/QueryEngine.java b/querydsl-collections/src/main/java/com/querydsl/collections/QueryEngine.java
new file mode 100644
index 0000000000..bb61210872
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/QueryEngine.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code QueryEngine} defines an interface for the evaluation of ColQuery queries
+ *
+ * @author tiwe
+ *
+ */
+public interface QueryEngine {
+
+    /**
+     * Evaluate the given query and return the count of matched rows
+     *
+     * @param metadata query metadata
+     * @param iterables source contents
+     * @return matching row count
+     */
+    long count(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables);
+
+    /**
+     * Evaluate the given query and return the projection as a list
+     *
+     * @param metadata query metadata
+     * @param iterables source contents
+     * @return matching rows
+     */
+    <T> List<T> list(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables,
+            Expression<T> projection);
+
+    /**
+     * Evaluate the given query return whether rows where matched
+     *
+     * @param metadata query metadata
+     * @param iterables source contents
+     * @return true, if at least one row was matched
+     */
+    boolean exists(QueryMetadata metadata, Map<Expression<?>, Iterable<?>> iterables);
+
+}
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/package-info.java b/querydsl-collections/src/main/java/com/querydsl/collections/package-info.java
new file mode 100644
index 0000000000..9bde598cf1
--- /dev/null
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Java Bean collections support
+ */
+package com.querydsl.collections;
diff --git a/querydsl-collections/src/test/java/InnerClassTest.java b/querydsl-collections/src/test/java/InnerClassTest.java
deleted file mode 100644
index 4e528913db..0000000000
--- a/querydsl-collections/src/test/java/InnerClassTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.collections.CollQueryFactory;
-
-public class InnerClassTest {
-
-    public static class Example {
-
-        public String getId() {
-            return null;
-        }
-    }
-
-    @Test
-    public void Query() {
-        Example example = alias(Example.class);
-        assertFalse(CollQueryFactory.from($(example), Arrays.asList(new Example()))
-                .where($(example.getId()).isNull())
-                .list($(example)).isEmpty());
-        assertTrue(CollQueryFactory.from($(example), Arrays.asList(new Example()))
-                .where($(example.getId()).isNotNull())
-                .list($(example)).isEmpty());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/CollQueryStandardTest.java b/querydsl-collections/src/test/java/com/mysema/query/CollQueryStandardTest.java
deleted file mode 100644
index 272ec1edff..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/CollQueryStandardTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.collections.Cat;
-import com.mysema.query.collections.CollQueryFactory;
-import com.mysema.query.collections.QCat;
-import com.mysema.query.types.ArrayConstructorExpression;
-import com.mysema.query.types.Concatenation;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.expr.Param;
-
-public class CollQueryStandardTest {
-
-    private final Date birthDate = new Date();
-
-    private final java.sql.Date date = new java.sql.Date(birthDate.getTime());
-
-    private final java.sql.Time time = new java.sql.Time(birthDate.getTime());
-
-    private final QCat cat = new QCat("cat");
-
-    private final QCat otherCat = new QCat("otherCat");
-
-    private final List<Cat> data = Arrays.asList(
-            new Cat("Bob", 1, birthDate),
-            new Cat("Ruth", 2, birthDate),
-            new Cat("Felix", 3, birthDate),
-            new Cat("Allen", 4, birthDate),
-            new Cat("Mary", 5, birthDate)
-    );
-
-    private static final Expression<?>[] NO_EXPRESSIONS = new Expression[0];
-    
-    private QueryExecution standardTest = new QueryExecution(Module.COLLECTIONS, Target.MEM) {
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery() {
-            return Pair.of(
-                    (Projectable)CollQueryFactory.from(cat, data).from(otherCat, data),
-                    NO_EXPRESSIONS);
-        }
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery(Predicate filter) {
-            return Pair.of(
-                    (Projectable)CollQueryFactory.from(cat, data).from(otherCat, data).where(filter),
-                    new Expression<?>[]{cat.name});
-        }
-    };
-
-    @Test
-    public void test() {
-        Cat kitten = data.get(0).getKittens().get(0);
-        standardTest.runArrayTests(cat.kittenArray, otherCat.kittenArray, kitten, new Cat());
-        standardTest.runBooleanTests(cat.name.isNull(), otherCat.kittens.isEmpty());
-        standardTest.runCollectionTests(cat.kittens, otherCat.kittens, kitten, new Cat());
-        standardTest.runDateTests(cat.dateField, otherCat.dateField, date);
-        standardTest.runDateTimeTests(cat.birthdate, otherCat.birthdate, birthDate);
-        standardTest.runListTests(cat.kittens, otherCat.kittens, kitten, new Cat());
-        standardTest.runMapTests(cat.kittensByName, otherCat.kittensByName, "Kitty", kitten, "NoName", new Cat());
-
-        // int
-        standardTest.runNumericCasts(cat.id, otherCat.id, 1);
-        standardTest.runNumericTests(cat.id, otherCat.id, 1);
-
-        standardTest.runStringTests(cat.name, otherCat.name, "Bob");
-        standardTest.runTimeTests(cat.timeField, otherCat.timeField, time);
-        standardTest.report();
-    }
-
-    @Test
-    public void TupleProjection() {
-        List<Tuple> tuples = CollQueryFactory.from(cat, data)
-            .list(new QTuple(cat.name, cat.birthdate));
-        for (Tuple tuple : tuples) {
-            assertNotNull(tuple.get(cat.name));
-            assertNotNull(tuple.get(cat.birthdate));
-        }
-    }
-    
-    @Test
-    public void Nested_TupleProjection() {
-        Concatenation concat = new Concatenation(cat.name, cat.name);
-        List<Tuple> tuples = CollQueryFactory.from(cat, data)
-            .list(new QTuple(concat, cat.name, cat.birthdate));
-        for (Tuple tuple : tuples) {
-            assertNotNull(tuple.get(cat.name));
-            assertNotNull(tuple.get(cat.birthdate));
-            assertEquals(tuple.get(cat.name) + tuple.get(cat.name), tuple.get(concat));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void ArrayProjection() {
-        List<String[]> results =  CollQueryFactory.from(cat, data)
-            .list(new ArrayConstructorExpression<String>(String[].class, cat.name));
-        assertFalse(results.isEmpty());
-        for (String[] result : results) {
-            assertNotNull(result[0]);
-        }
-    }
-
-    @Test
-    public void ConstructorProjection() {
-        List<Projection> projections =  CollQueryFactory.from(cat, data)
-            .list(ConstructorExpression.create(Projection.class, cat.name, cat));
-        assertFalse(projections.isEmpty());
-        for (Projection projection : projections) {
-            assertNotNull(projection);
-        }
-    }
-    
-    @Test
-    public void Params() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).set(name,"Bob").uniqueResult(cat.name));
-    }
-
-    @Test
-    public void Params_anon() {
-        Param<String> name = new Param<String>(String.class);
-        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).set(name,"Bob").uniqueResult(cat.name));
-    }
-
-    @Test(expected=ParamNotSetException.class)
-    public void Params_not_set() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).uniqueResult(cat.name));
-    }
-    
-    @Test
-    public void Limit() {
-        CollQueryFactory.from(cat, data).limit(Long.MAX_VALUE).list(cat);
-    }
-   
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/Projection.java b/querydsl-collections/src/test/java/com/mysema/query/Projection.java
deleted file mode 100644
index 32a6b1e784..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/Projection.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.collections.Cat;
-
-public class Projection {
-
-    public Projection(String str, Cat cat) {
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/QueryPerformanceTest.java b/querydsl-collections/src/test/java/com/mysema/query/QueryPerformanceTest.java
deleted file mode 100644
index a03a2dea53..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/QueryPerformanceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mysema.query;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.collections.Cat;
-import com.mysema.query.collections.CollQueryFactory;
-import com.mysema.query.collections.QCat;
-import com.mysema.testutil.Benchmark;
-import com.mysema.testutil.Performance;
-import com.mysema.testutil.Runner;
-
-@Ignore
-@Category(Performance.class)
-public class QueryPerformanceTest {
-    
-    private static final int size = 1000;
-    
-    private static List<Cat> cats = new ArrayList<Cat>(size);
-    
-    @BeforeClass
-    public static void setUpClass() throws SQLException, ClassNotFoundException {
-        for (int i = 0; i < size; i++) {
-            cats.add(new Cat(String.valueOf(i), i));
-        }
-    }
-    
-    @Test
-    public void ById() throws Exception {
-        // 15857
-        Runner.run("by id", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {
-                    QCat cat = QCat.cat;
-                    CollQueryFactory.from(cat, cats).where(cat.id.eq(i % size)).list(cat);
-                }                
-            }            
-        });                      
-    }
-        
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java
deleted file mode 100644
index db399d3c30..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/AbstractQueryTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Before;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.Expression;
-
-public abstract class AbstractQueryTest {
-
-    protected final Cat c1 = new Cat("Kitty");
-
-    protected final Cat c2 = new Cat("Bob");
-
-    protected final Cat c3 = new Cat("Alex");
-
-    protected final Cat c4 = new Cat("Francis");
-
-    protected final QCat cat = new QCat("cat");
-
-    protected final QCat kitten = new QCat("kitten");
-
-    protected final QCat offspr = new QCat("offspr");
-
-    protected final QCat otherCat = new QCat("otherCat");
-    
-    protected final QCat mate = new QCat("mate");
-    
-    protected List<Cat> cats = Arrays.asList(c1, c2, c3, c4);
-
-    protected List<Integer> ints = new ArrayList<Integer>();
-
-    protected List<Integer> myInts = new ArrayList<Integer>();
-
-    protected TestQuery last;
-
-    
-    @Before
-    public void setUp() {
-        myInts.addAll(Arrays.asList(1, 2, 3, 4));
-        Alias.resetAlias();
-    }
-
-    protected List<Cat> cats(int size) {
-        List<Cat> cats = new ArrayList<Cat>(size);
-        for (int i = 0; i < size / 2; i++) {
-            cats.add(new Cat("Kate" + (i + 1)));
-            cats.add(new Cat("Bob" + (i + 1)));
-        }
-        return cats;
-    }
-
-    protected TestQuery query() {
-        last = new TestQuery();
-        return last;
-    }
-
-    static class TestQuery extends AbstractCollQuery<TestQuery> {
-
-        List<Object> res = new ArrayList<Object>();
-
-        public TestQuery() {
-            super(new DefaultQueryMetadata(), DefaultQueryEngine.getDefault());
-        }
-        
-        @Override
-        public QueryMetadata getMetadata() {
-            return queryMixin.getMetadata();
-        }
-        
-        @Override
-        public <RT> List<RT> list(Expression<RT> projection) {
-            boolean array = projection.getType().isArray();
-            List<RT> rv = super.list(projection);
-            for (Object o : rv) {
-                //System.out.println(array ? Arrays.toString((Object[])o) : o);
-                res.add(o);
-            }
-            //System.out.println();
-            return rv;
-        }
-
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AggregationTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AggregationTest.java
deleted file mode 100644
index 6b92ab8695..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/AggregationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class AggregationTest extends AbstractQueryTest {
-
-    private static final QCat cat = QCat.cat;
-
-    private CollQuery query;
-
-    @Override
-    @Before
-    public void setUp() {
-        Cat cat1 = new Cat();
-        cat1.setWeight(2);
-        Cat cat2 = new Cat();
-        cat2.setWeight(3);
-        Cat cat3 = new Cat();
-        cat3.setWeight(4);
-        Cat cat4 = new Cat();
-        cat4.setWeight(5);
-        query = CollQueryFactory.from(cat, Arrays.asList(cat1, cat2, cat3, cat4));
-    }
-
-    @Test
-    public void Avg() {
-        assertEquals(Double.valueOf(3.5), query.uniqueResult(cat.weight.avg()));
-    }
-
-    @Test
-    public void Count() {
-        assertEquals(Long.valueOf(4l), query.uniqueResult(cat.count()));
-    }
-
-    @Test
-    public void CountDistinct() {
-        assertEquals(Long.valueOf(4l), query.uniqueResult(cat.countDistinct()));
-    }
-
-    @Test
-    public void Max() {
-        assertEquals(Integer.valueOf(5), query.uniqueResult(cat.weight.max()));
-    }
-
-    @Test
-    public void Min() {
-        assertEquals(Integer.valueOf(2), query.uniqueResult(cat.weight.min()));
-    }
-
-    @Test
-    public void Sum() {
-        assertEquals(Integer.valueOf(14), query.uniqueResult(cat.weight.sum()));
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java
deleted file mode 100644
index f78970fd6e..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/AliasTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static com.mysema.query.alias.Alias.var;
-import static com.mysema.query.collections.CollQueryFactory.from;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Date;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class AliasTest extends AbstractQueryTest {
-
-    @Before
-    public void setUp() {
-        myInts.add(1);
-        myInts.add(2);
-        myInts.add(3);
-        myInts.add(4);
-
-        Alias.resetAlias();
-    }
-
-    @Test
-    public void AliasVariations1() {
-        // 1st
-        QCat cat = new QCat("cat");
-        for (String name : from(cat, cats).where(cat.kittens.size().gt(0)).list(cat.name)) {
-            assertNotNull(name);
-            System.out.println(name);
-        }
-
-        // 2nd
-        Cat c = alias(Cat.class, "cat");
-        for (String name : from(c, cats).where($(c.getKittens()).size().gt(0)).list($(c.getName()))) {
-            assertNotNull(name);
-            System.out.println(name);
-        }
-
-        // 2nd - variation 1
-//        for (String name : from(c, cats).where($(c.getKittens().size()).gt(0))
-//                .list(c.getName())) {
-//            System.out.println(name);
-//        }
-
-    }
-
-    @Test
-    public void AliasVariations2() {
-        // 1st
-        QCat cat = new QCat("cat");
-        for (String name : from(cat, cats).where(cat.name.matches("fri.*")).list(cat.name)) {
-            assertNotNull(name);
-            System.out.println(name);
-        }
-
-        // 2nd
-        Cat c = alias(Cat.class, "cat");
-        for (String name : from(c, cats).where($(c.getName()).matches("fri.*")).list($(c.getName()))) {
-            assertNotNull(name);
-            System.out.println(name);
-        }
-    }
-
-    @Test
-    public void Alias3() {
-        QCat cat = new QCat("cat");
-        Cat other = new Cat();
-        Cat c = alias(Cat.class, "cat");
-
-        // 1
-        from(c, cats).where($(c.getBirthdate()).gt(new Date())).list($(c)).iterator();
-
-        // 2
-        try {
-            from(c, cats).where($(c.getMate().getName().toUpperCase()).eq("MOE"));
-            fail("expected NPE");
-        } catch (NullPointerException ne) {
-            // expected
-        }
-
-        // 3
-        assertEquals(cat.name, $(c.getName()));
-
-        // 4
-         from(c,cats)
-             .where($(c.getKittens().get(0).getBodyWeight()).gt(12))
-             .list($(c.getName())).iterator();
-
-        // 5
-        from(c, cats).where($(c).eq(other)).list($(c)).iterator();
-
-        // 6
-        from(c, cats).where($(c.getKittens()).contains(other)).list($(c))
-                .iterator();
-
-        // 7
-        from(c, cats).where($(c.getKittens().isEmpty())).list($(c)).iterator();
-
-        // 8
-        from(c, cats).where($(c.getName()).startsWith("B")).list($(c)).iterator();
-
-        // 9
-        from(c, cats).where($(c.getName()).upper().eq("MOE")).list($(c)).iterator();
-
-        // 10
-        assertNotNull($(c.getKittensByName()));
-        assertNotNull($(c.getKittensByName().get("Kitty")));
-        from(c, cats).where($(c.getKittensByName().get("Kitty")).isNotNull()).list(cat);
-
-        // 11
-//        try {
-//            from(cat, cats).where(cat.mate.alive).list(cat);
-//            fail("expected RuntimeException");
-//        } catch (RuntimeException e) {
-//            System.out.println(e.getMessage());
-//            assertEquals("null in cat.mate.alive", e.getMessage());
-//        }
-
-        // 12
-        // TestQuery query = query().from(cat, c1, c2).from(cat, c1, c2);
-        // assertEquals(1, query.getMetadata().getJoins().size());
-
-    }
-
-    @Test
-    public void Various1() {
-        StringPath str = new StringPath("str");
-        for (String s : from(str, "a", "ab", "cd", "de").where(str.startsWith("a")).list(str)) {
-            assertTrue(s.equals("a") || s.equals("ab"));
-            System.out.println(s);
-        }
-    }
-
-    @Test
-    public void Various2() {
-        for (Object o : from(var(), 1, 2, "abc", 5, 3).where(var().ne("abc")).list(var())) {
-            int i = (Integer) o;
-            assertTrue(i > 0 && i < 6);
-            System.out.println(o);
-        }
-    }
-
-    @Test
-    public void Various3() {
-        NumberPath<Integer> num = new NumberPath<Integer>(Integer.class, "num");
-        for (Integer i : from(num, 1, 2, 3, 4).where(num.lt(4)).list(num)) {
-            System.out.println(i);
-        }
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java
deleted file mode 100644
index eab37fc798..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Animal.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Date;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryType;
-
-@QueryEntity
-public class Animal {
-
-    protected boolean alive;
-
-    protected java.util.Date birthdate = new java.util.Date();
-
-    @QueryType(PropertyType.SIMPLE)
-    private Date dateAsSimple;
-
-    protected int bodyWeight, weight, toes;
-
-    protected Color color;
-
-    protected int id;
-
-    protected String name;
-
-    public java.util.Date getBirthdate() {
-        return birthdate;
-    }
-
-    public int getBodyWeight() {
-        return bodyWeight;
-    }
-
-    public Color getColor() {
-        return color;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getToes() {
-        return toes;
-    }
-
-    public int getWeight() {
-        return weight;
-    }
-
-    public boolean isAlive() {
-        return alive;
-    }
-
-    public void setAlive(boolean alive) {
-        this.alive = alive;
-    }
-
-    public void setBirthdate(java.util.Date birthdate) {
-        this.birthdate = new Date(birthdate.getTime());
-    }
-
-    public void setBodyWeight(int bodyWeight) {
-        this.bodyWeight = bodyWeight;
-    }
-
-    public void setWeight(int weight) {
-        this.weight = weight;
-    }
-
-    public void setToes(int toes) {
-        this.toes = toes;
-    }
-
-    public void setColor(Color color) {
-        this.color = color;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Date getDateAsSimple() {
-        return dateAsSimple;
-    }
-
-    public void setDateAsSimple(Date dateAsSimple) {
-        this.dateAsSimple = new Date(dateAsSimple.getTime());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java
deleted file mode 100644
index bf77148310..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/AnimalTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.SimplePath;
-
-public class AnimalTest {
-
-    @Test
-    public void Cast() {
-        QCat cat = QAnimal.animal.as(QCat.class);
-        assertEquals(QAnimal.animal, cat.getMetadata().getElement());
-        assertEquals("animal", cat.toString());
-    }
-
-    @Test
-    public void Date_As_Simple() {
-        assertTrue(QAnimal.animal.dateAsSimple.getClass().equals(SimplePath.class));
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/BigDecimalTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/BigDecimalTest.java
deleted file mode 100644
index 426d783a91..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/BigDecimalTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mysema.query.collections;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.NumberPath;
-
-public class BigDecimalTest {
-
-    @Test
-    public void Arithmetic() {
-        NumberPath<BigDecimal> num = new NumberPath<BigDecimal>(BigDecimal.class, "num");
-        CollQuery query = CollQueryFactory.from(num, Arrays.asList(BigDecimal.ONE, BigDecimal.ONE));
-        query.list(num.add(BigDecimal.ONE));
-        query.list(num.subtract(BigDecimal.ONE));
-        query.list(num.multiply(BigDecimal.ONE));
-        query.list(num.divide(BigDecimal.ONE));
-    }
-    
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/BooleanTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/BooleanTest.java
deleted file mode 100644
index 6e9b891707..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/BooleanTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mysema.query.collections;
-
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import static com.mysema.query.alias.Alias.*;
-
-public class BooleanTest {
-    
-    public static class Entity {
-        
-        private boolean boolean1 = true;
-        
-        private Boolean boolean2 = Boolean.TRUE;
-
-        public boolean isBoolean1() {
-            return boolean1;
-        }
-
-        public Boolean getBoolean2() {
-            return boolean2;
-        }
-        
-    }
-    
-    @Test
-    public void Primitive_Boolean() {
-        Entity entity = Alias.alias(Entity.class);
-        CollQueryFactory.from(entity, Collections.singleton(new Entity()))
-            .where($(entity.isBoolean1()).eq(Boolean.TRUE))
-            .count();
-    }
-    
-    @Test
-    public void Object_Boolean() {
-        Entity entity = Alias.alias(Entity.class);
-        CollQueryFactory.from(entity, Collections.singleton(new Entity()))
-            .where($(entity.getBoolean2()).eq(Boolean.TRUE))
-            .count();
-        
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CastTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CastTest.java
deleted file mode 100644
index 44b4a1c1ca..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CastTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class CastTest extends AbstractQueryTest {
-    
-    @Test
-    public void Parents() {
-        QCat cat = QAnimal.animal.as(QCat.class);
-        assertEquals(QAnimal.animal, cat.getMetadata().getParent());
-    }
-    
-    @Test
-    public void Cast() {
-        query().from(QAnimal.animal, cats)
-            .where(QAnimal.animal.as(QCat.class).breed.eq(0))
-            .list(QAnimal.animal);
-    }
-
-    @Test
-    public void PropertyDereference() {
-         Cat cat = new Cat();
-         cat.setEyecolor(Color.TABBY);
-         assertEquals(Color.TABBY, 
-             CollQueryFactory.from(QAnimal.animal, cat)
-                 .where(QAnimal.animal.instanceOf(Cat.class))
-                 .singleResult(QAnimal.animal.as(QCat.class).eyecolor));
-    }
-    
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java
deleted file mode 100644
index 7be1a81f19..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Cat.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.annotations.QueryType;
-
-@QueryEntity
-public class Cat extends Animal {
-
-    private int breed;
-
-    private java.sql.Date dateField;
-
-    private Color eyecolor;
-
-    private List<Cat> kittens = Lists.newArrayList();
-
-    private Cat[] kittenArray;
-
-    private Map<String, Cat> kittensByName = Maps.newHashMap();
-
-    private Cat mate;
-
-    @QueryType(PropertyType.NONE)
-    private String skippedField;
-
-    @QueryType(PropertyType.SIMPLE)
-    private String stringAsSimple;
-
-    private java.sql.Time timeField;
-
-    public Cat() {
-        this.kittensByName = Collections.emptyMap();
-    }
-
-    public Cat(String name) {
-        Cat kitten = new Cat();
-        this.kittens = Arrays.asList(kitten);
-        this.kittenArray = new Cat[]{kitten};
-        this.kittensByName = Collections.singletonMap("Kitty", kitten);
-        this.name = name;
-    }
-
-    public Cat(String name, String kittenName) {
-        this(name);
-        kittens.get(0).setName(kittenName);
-    }
-
-    @QueryProjection
-    public Cat(String name, int id) {
-        this(name);
-        this.id = id;
-    }
-
-    public Cat(String name, int id, Date birthdate) {
-        this(name, id);
-        this.birthdate = new Date(birthdate.getTime());
-        this.dateField = new java.sql.Date(birthdate.getTime());
-        this.timeField = new java.sql.Time(birthdate.getTime());
-    }
-
-    public int getBreed() {
-        return breed;
-    }
-
-    public java.sql.Date getDateField() {
-        return dateField;
-    }
-
-    public Color getEyecolor() {
-        return eyecolor;
-    }
-
-    public List<Cat> getKittens() {
-        return kittens;
-    }
-
-    public Map<String, Cat> getKittensByName() {
-        return kittensByName;
-    }
-
-    public Cat getMate() {
-        return mate;
-    }
-
-    public String getSkippedField() {
-        return skippedField;
-    }
-
-    public String getStringAsSimple() {
-        return stringAsSimple;
-    }
-
-    public java.sql.Time getTimeField() {
-        return timeField;
-    }
-
-    public void setBreed(int breed) {
-        this.breed = breed;
-    }
-
-    public void setDateField(java.sql.Date dateField) {
-        this.dateField = new java.sql.Date(dateField.getTime());
-    }
-
-    public void setEyecolor(Color eyecolor) {
-        this.eyecolor = eyecolor;
-    }
-
-    public void setKittens(List<Cat> kittens) {
-        this.kittens = kittens;
-    }
-
-    public void setKittensByName(Map<String, Cat> kittensByName) {
-        this.kittensByName = kittensByName;
-    }
-
-    public void setMate(Cat mate) {
-        this.mate = mate;
-    }
-
-    public void setSkippedField(String skippedField) {
-        this.skippedField = skippedField;
-    }
-
-    public void setStringAsSimple(String stringAsSimple) {
-        this.stringAsSimple = stringAsSimple;
-    }
-
-    public void setTimeField(java.sql.Time timeField) {
-        this.timeField = timeField;
-    }
-
-    public Cat[] getKittenArray() {
-        return kittenArray;
-    }
-
-    public void setKittenArray(Cat[] kittenArray) {
-        this.kittenArray = kittenArray.clone();
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java
deleted file mode 100644
index f49b04fed0..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CatTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.SimplePath;
-
-public class CatTest {
-
-    @Test(expected=NoSuchFieldException.class)
-    public void SkippedField() throws SecurityException, NoSuchFieldException{
-        QCat.class.getField("skippedField");
-    }
-
-    @Test
-    public void StringAsSimple() throws SecurityException, NoSuchFieldException {
-        assertTrue(QCat.cat.stringAsSimple.getClass().equals(SimplePath.class));
-    }
-
-    @Test
-    public void DateAsSimple() {
-        assertTrue(QCat.cat.dateAsSimple.getClass().equals(SimplePath.class));
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryTest.java
deleted file mode 100644
index fabedd4b1c..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static com.mysema.query.collections.CollQueryFactory.from;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class CollQueryTest extends AbstractQueryTest {
-
-    @Test
-    public void CustomTemplates() {
-        CollQueryTemplates templates = new CollQueryTemplates() {{
-            add(Ops.DateTimeOps.MONTH, "{0}.getMonthOfYear()");
-            add(Ops.DateTimeOps.YEAR, "{0}.getYear()");
-        }};
-        new CollQuery(templates);
-    }
-    
-    @Test
-    public void InstanceOf() {
-        assertEquals(
-                Arrays.asList(c1, c2),
-                query().from(cat, Arrays.asList(c1, c2)).where(cat.instanceOf(Cat.class)).list(cat));
-    }
-
-    @Test
-    public void After_And_Before() {
-        query().from(cat, Arrays.asList(c1, c2))
-            .where(
-                cat.birthdate.lt(new Date()),
-                cat.birthdate.loe(new Date()), 
-                cat.birthdate.gt(new Date()),
-                cat.birthdate.goe(new Date()))
-            .list(cat);
-    }
-
-    @Test
-    public void ArrayProjection() {
-        // select pairs of cats with different names
-        query().from(cat, cats).from(otherCat, cats).where(cat.name.ne(otherCat.name)).list(cat.name, otherCat.name);
-        assertEquals(4*3, last.res.size());
-    }
-
-    @Test
-    public void Cast() {
-        NumberExpression<?> num = cat.id;
-        Expression<?>[] expr = new Expression[] { num.byteValue(), num.doubleValue(),
-                num.floatValue(), num.intValue(), num.longValue(),
-                num.shortValue(), num.stringValue() };
-
-        for (Expression<?> e : expr) {
-            query().from(cat, Arrays.asList(c1, c2)).list(e);
-        }
-
-    }
-    
-    @Test
-    public void Clone() {
-        CollQuery query = new CollQuery().from(cat, Collections.<Cat>emptyList()).where(cat.isNotNull()).clone();
-        assertEquals("cat is not null", query.getMetadata().getWhere().toString());
-    }
-
-    @Test
-    public void Primitives() {
-        // select cats with kittens
-        query().from(cat, cats).where(cat.kittens.size().ne(0)).list(cat.name);
-        assertTrue(last.res.size() == 4);
-
-        // select cats without kittens
-        query().from(cat, cats).where(cat.kittens.size().eq(0)).list(cat.name);
-        assertTrue(last.res.size() == 0);
-    }
-
-    @Test
-    public void SimpleCases() {
-        // select all cat names
-        query().from(cat, cats).list(cat.name);
-        assertTrue(last.res.size() == 4);
-
-        // select all kittens
-        query().from(cat, cats).list(cat.kittens);
-        assertTrue(last.res.size() == 4);
-
-        // select cats with kittens
-        query().from(cat, cats).where(cat.kittens.size().gt(0)).list(cat.name);
-        assertTrue(last.res.size() == 4);
-
-        // select cats named Kitty
-        query().from(cat, cats).where(cat.name.eq("Kitty")).list(cat.name);
-        assertTrue(last.res.size() == 1);
-
-        // select cats named Kitt%
-        query().from(cat, cats).where(cat.name.matches("Kitt.*")).list(cat.name);
-        assertTrue(last.res.size() == 1);
-
-        query().from(cat, cats).list(cat.bodyWeight.add(cat.weight));
-    }
-
-    @Test
-    public void Various() {
-        StringPath a = new StringPath("a");
-        StringPath b = new StringPath("b");
-        for (Tuple strs : from(a, "aa", "bb", "cc")
-                .from(b, Arrays.asList("a","b"))
-                .where(a.startsWith(b)).list(a, b)) {
-            System.out.println(strs);
-        }
-
-        query().from(cat, cats).list(cat.mate);
-
-        query().from(cat, cats).list(cat.kittens);
-
-        query().from(cat, cats).where(cat.kittens.isEmpty()).list(cat);
-
-        query().from(cat, cats).where(cat.kittens.isNotEmpty()).list(cat);
-
-        query().from(cat, cats).where(cat.name.matches("fri.*")).list(cat.name);
-
-    }
-
-    @Test
-    public void BigDecimals() {
-        NumberPath<BigDecimal> a = new NumberPath<BigDecimal>(BigDecimal.class, "cost");
-        List<BigDecimal> nums = from(a, new BigDecimal("2.1"), new BigDecimal("20.21"),
-                new BigDecimal("44.4")).where(a.lt(new BigDecimal("35.1"))).list(a);
-
-        for (BigDecimal num : nums) {
-            System.out.println(num);
-        }
-        assertEquals(2, nums.size());
-        for (BigDecimal num : nums) {
-            assertEquals(-1, num.compareTo(new BigDecimal("35")));
-        }
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionAnyTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionAnyTest.java
deleted file mode 100644
index ba4e10c1e6..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionAnyTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class CollectionAnyTest extends AbstractQueryTest {
-
-    @Test
-    public void Any_In_Projection() {
-        Cat a = new Cat("a");
-        Cat aa = new Cat("aa");
-        Cat ab = new Cat("ab");
-        Cat ac = new Cat("ac");
-        a.setKittens(Arrays.asList(aa,ab,ac));
-
-        Cat b = new Cat("b");
-        Cat ba = new Cat("ba");
-        Cat bb = new Cat("bb");
-        b.setKittens(Arrays.asList(ba, bb));
-
-        QCat cat = QCat.cat;
-        List<Cat> kittens = CollQueryFactory.from(cat, Arrays.asList(a,b)).list(cat.kittens.any());
-        assertEquals(Arrays.asList(aa,ab,ac,ba,bb), kittens);
-    }
-
-    @Test
-    public void Any_In_Projection2() {
-        Cat a = new Cat("a");
-        Cat aa = new Cat("aa");
-        Cat ab = new Cat("ab");
-        Cat ac = new Cat("ac");
-        a.setKittens(Arrays.asList(aa,ab,ac));
-
-        Cat b = new Cat("b");
-        Cat ba = new Cat("ba");
-        Cat bb = new Cat("bb");
-        b.setKittens(Arrays.asList(ba, bb));
-
-        QCat cat = QCat.cat;
-        List<String> kittens = CollQueryFactory.from(cat, Arrays.asList(a,b))
-                .list(cat.kittens.any().name);
-        assertEquals(Arrays.asList("aa","ab","ac","ba","bb"), kittens);
-    }
-
-    @Test
-    public void Any_In_Where_And_Projection() {
-        Cat a = new Cat("a");
-        Cat aa = new Cat("aa");
-        Cat ab = new Cat("ab");
-        Cat ac = new Cat("ac");
-        a.setKittens(Arrays.asList(aa,ab,ac));
-
-        Cat b = new Cat("b");
-        Cat ba = new Cat("ba");
-        Cat bb = new Cat("bb");
-        b.setKittens(Arrays.asList(ba, bb));
-
-        QCat cat = QCat.cat;
-        List<Cat> kittens = CollQueryFactory.from(cat, Arrays.asList(a,b))
-                .where(cat.kittens.any().name.startsWith("a"))
-                .list(cat.kittens.any());
-
-        assertEquals(Arrays.asList(aa,ab,ac), kittens);
-    }
-
-    @Test
-    public void Any_In_Where_And_Projection2() {
-        Cat a = new Cat("a");
-        Cat aa = new Cat("aa");
-        Cat ab = new Cat("ab");
-        Cat ac = new Cat("ac");
-        a.setKittens(Arrays.asList(aa,ab,ac));
-
-        Cat b = new Cat("b");
-        Cat ba = new Cat("ba");
-        Cat bb = new Cat("bb");
-        b.setKittens(Arrays.asList(ba, bb));
-
-        QCat cat = QCat.cat;
-        List<String> kittens = CollQueryFactory.from(cat, Arrays.asList(a,b))
-                .where(cat.kittens.any().name.startsWith("a"))
-                .list(cat.kittens.any().name);
-
-        assertEquals(Arrays.asList("aa","ab","ac"), kittens);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionTest.java
deleted file mode 100644
index b8d35b41a4..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollectionTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class CollectionTest {
-    
-    private final QCat cat = new QCat("cat");
-    
-    private final QCat other = new QCat("other");
-    
-    private List<Cat> cats;
-    
-    @Before
-    public void setUp() {
-        Cat cat1 = new Cat("1");
-        cat1.setKittens(Arrays.asList(cat1));
-        Cat cat2 = new Cat("2");
-        cat2.setKittens(Arrays.asList(cat1, cat2));
-        Cat cat3 = new Cat("3");
-        cat3.setKittens(Arrays.asList(cat1, cat2, cat3));
-        Cat cat4 = new Cat("4");
-        cat4.setKittens(Arrays.asList(cat1, cat2, cat3, cat4));
-        
-        cats = Arrays.asList(cat1, cat2, cat3, cat4);
-    }
-    
-    @Test
-    public void Join() {
-        assertEquals("4", CollQueryFactory.from(cat, cats)
-                .innerJoin(cat.kittens, other)
-                .where(other.name.eq("4")).uniqueResult(cat.name));
-    }
-    
-    @Test
-    public void Join_From_Two_Sources() {
-        QCat cat_kittens = new QCat("cat_kittens");
-        QCat other_kittens = new QCat("other_kittens");
-        assertEquals(30, CollQueryFactory
-                .from(cat, cats).from(other, cats)
-                .innerJoin(cat.kittens, cat_kittens)
-                .innerJoin(other.kittens, other_kittens)
-                .where(cat_kittens.eq(other_kittens)).count());
-    }
-    
-    @Test
-    public void Any_UniqueResult() {
-        assertEquals("4", CollQueryFactory.from(cat, cats)
-                .where(cat.kittens.any().name.eq("4")).uniqueResult(cat.name));
-    }
-    
-    @Test
-    public void Any_Count() {
-        assertEquals(4, CollQueryFactory.from(cat, cats)
-                .where(cat.kittens.any().name.isNotNull()).count());
-    }
-    
-    @Test
-    public void Any_Two_Levels() {
-        assertEquals(4, CollQueryFactory.from(cat, cats).where( 
-                cat.kittens.any().kittens.any().isNotNull()).count());
-    }
-    
-    @Test
-    public void Any_Two_Levels2() {
-        assertEquals(4, CollQueryFactory.from(cat, cats).where(
-                cat.kittens.any().name.isNotNull(), 
-                cat.kittens.any().kittens.any().isNotNull()).count());
-    }
-    
-    @Test
-    public void Any_From_Two_Sources() {
-        assertEquals(16, CollQueryFactory.from(cat, cats).from(other, cats).where(
-                cat.kittens.any().name.eq(other.kittens.any().name)).count());
-    }
-    
-    @Test
-    public void List_Size() {
-        assertEquals(4, CollQueryFactory.from(cat, cats).where(cat.kittens.size().gt(0)).count());
-        assertEquals(2, CollQueryFactory.from(cat, cats).where(cat.kittens.size().gt(2)).count());
-    }
-    
-    @Test
-    public void List_Is_Empty() {
-        assertEquals(0, CollQueryFactory.from(cat, cats).where(cat.kittens.isEmpty()).count());
-    }
-    
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Color.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Color.java
deleted file mode 100644
index 045972fcc7..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Color.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-public enum Color {
-    BLACK, TABBY
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Comment.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Comment.java
deleted file mode 100644
index 6d27596a48..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Comment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-
-@QueryEntity
-public class Comment {
-    
-    private int id;
-    
-    private String text;
-    
-    private User user;
-    
-    private Post post;
-
-    public Comment() {}
-    
-    @QueryProjection
-    public Comment(int id, String text) {
-        this.id = id;
-        this.text = text;
-    }
-    
-    @QueryProjection
-    public Comment(int id, String text, User user, Post post) {
-        this.id = id;
-        this.text = text;
-        this.user = user;
-        this.post = post;
-    }
-    
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Post getPost() {
-        return post;
-    }
-
-    public void setPost(Post post) {
-        this.post = post;
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/DistinctTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/DistinctTest.java
deleted file mode 100644
index 823c486734..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/DistinctTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.NumberPath;
-
-public class DistinctTest extends AbstractQueryTest {
-
-    private NumberPath<Integer> intVar1 = new NumberPath<Integer>(Integer.class, "var1");
-    private NumberPath<Integer> intVar2 = new NumberPath<Integer>(Integer.class, "var2");
-    private List<Integer> list1 = Arrays.asList(1, 2, 2, 3, 3, 3, 4, 4, 4, 4);
-    private List<Integer> list2 = Arrays.asList(2, 2, 3, 3, 3, 4, 4, 4, 4, 4);
-
-    @Test
-    public void SingleSource() {
-        assertEquals(list1, CollQueryFactory.from(intVar1, list1).list(intVar1));
-        assertEquals(Arrays.asList(1, 2, 3, 4), CollQueryFactory.from(intVar1, list1).distinct().list(intVar1));
-        assertEquals(Arrays.asList(2, 3, 4), CollQueryFactory.from(intVar2, list2).distinct().list(intVar2));
-
-        assertEquals(Arrays.asList(2, 3, 4), CollQueryFactory.from(intVar2, list2).distinct().list(intVar2));
-    }
-
-    @Test
-    public void BothSources() {
-        assertEquals(100, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).list(intVar1, intVar2).size());
-        assertEquals(12, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).distinct().list(intVar1, intVar2).size());
-
-        assertEquals(12, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).distinct().list(intVar1, intVar2).size());
-    }
-
-    @Test
-    public void CountDistinct() {
-        assertEquals(10, CollQueryFactory.from(intVar1, list1).count());
-        assertEquals(4, CollQueryFactory.from(intVar1, list1).distinct().count());
-        assertEquals(3, CollQueryFactory.from(intVar2, list2).distinct().count());
-
-        assertEquals(3, CollQueryFactory.from(intVar2, list2).distinct().count());
-    }
-
-    @Test
-    public void Null() {
-        CollQueryFactory.from(intVar1, Arrays.asList(null, 1)).distinct().list(intVar1);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Document.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Document.java
deleted file mode 100644
index fc92b8dd9b..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Document.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.collections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Document {
-
-    private Long id;
-
-    private List<String> meshThesaurusTerms = new ArrayList<String>();
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public List<String> getMeshThesaurusTerms() {
-        return meshThesaurusTerms;
-    }
-
-    public void setMeshThesaurusTerms(List<String> meshThesaurusTerms) {
-        this.meshThesaurusTerms = meshThesaurusTerms;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ECJEvaluatorFactoryTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ECJEvaluatorFactoryTest.java
deleted file mode 100644
index 0c0dc90439..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/ECJEvaluatorFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.collections;
-
-import com.mysema.codegen.ECJEvaluatorFactory;
-import org.junit.Test;
-
-public class ECJEvaluatorFactoryTest extends AbstractQueryTest {
-
-    @Test
-    public void Evaluator_Factory() {
-        DefaultEvaluatorFactory evaluatorFactory = new DefaultEvaluatorFactory(
-                CollQueryTemplates.DEFAULT,
-                new ECJEvaluatorFactory(getClass().getClassLoader()));
-        QueryEngine queryEngine = new DefaultQueryEngine(evaluatorFactory);
-        CollQuery query = new CollQuery(queryEngine);
-        query.from(cat, cats).list(cat.name);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongId.java b/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongId.java
deleted file mode 100644
index 89021d4e9a..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongId.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query.collections;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-
-@QueryEntity
-public class EntityWithLongId {
-
-    private Long id;
-
-    @QueryProjection
-    public EntityWithLongId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongIdTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongIdTest.java
deleted file mode 100644
index 35a87d52ca..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/EntityWithLongIdTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class EntityWithLongIdTest {
-
-    private List<EntityWithLongId> entities = Arrays.asList(
-            new EntityWithLongId(999L),
-            new EntityWithLongId(1000L),
-            new EntityWithLongId(1001L),
-            new EntityWithLongId(1003L)
-    );
-
-    @Test
-    public void SimpleEquals() {
-        QEntityWithLongId root = QEntityWithLongId.entityWithLongId;
-        CollQuery query = new CollQuery().from(root, entities);
-        query.where(root.id.eq(1000L));
-
-        Long found = query.singleResult(root.id);
-        assertNotNull(found);
-        assertEquals(found.longValue(), 1000);
-    }
-    
-    @Test
-    public void CartesianEquals() {
-        QEntityWithLongId root = new QEntityWithLongId("root1");
-        QEntityWithLongId root2 = new QEntityWithLongId("root2");
-        assertEquals(entities.size(), new CollQuery()
-            .from(root, entities).from(root2, entities)
-            .where(root2.id.eq(root.id))
-            .count());
-    }
-    
-    @Test
-    public void CartesianPlus1() {
-        QEntityWithLongId root = new QEntityWithLongId("root1");
-        QEntityWithLongId root2 = new QEntityWithLongId("root2");
-        assertEquals(2, new CollQuery()
-            .from(root, entities).from(root2, entities)
-            .where(root2.id.eq(root.id.add(1)))
-            .count());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/ExistsTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/ExistsTest.java
deleted file mode 100644
index 6da5ce4c85..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/ExistsTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class ExistsTest extends AbstractQueryTest{
-
-    @Test
-    public void Exists() {
-        assertTrue(query().from(cat, cats).where(cat.name.eq("Bob")).exists());
-    }
-
-    @Test
-    public void NotExists() {
-        assertTrue(query().from(cat, cats).where(cat.name.eq("Bobby")).notExists());
-    }
-
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy2Test.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy2Test.java
deleted file mode 100644
index 703c02b430..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy2Test.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.mysema.query.collections;
-
-import static com.mysema.query.group.GroupBy.*;
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-import com.mysema.query.group.GroupBy;
-
-public class GroupBy2Test {
-    
-//    select u1.id,u1.name,r1.id,r1.name,s1.name from users u1
-//    join roles r1 on u1.role = r1.id
-//    join security_groups s1 on r1.secgroup = s1.id
-    
-    @QueryEntity
-    public static class User {
-        public Long id;
-        public String name;
-        public List<Role> roles;
-    }
-    
-    @QueryEntity
-    public static class Role {
-        public Long id;
-        public String name;
-        public List<SecurityGroup> groups;
-    }
-    
-    @QueryEntity
-    public static class SecurityGroup {
-        public Long id;
-        public String name;
-        
-        public SecurityGroup(Long id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
-    
-    public static class UserDto {
-        public Long id;
-        public String name;
-        public List<Long> roleIds;
-        public List<String> roleNames;
-        public List<Long> secIds;
-        
-        @QueryProjection
-        public UserDto(Long id, String name, List<Long> roleIds, List<String> roleNames, List<Long> secIds) {
-            this.id = id;
-            this.name = name;
-            this.roleIds = roleIds;
-            this.roleNames = roleNames;
-            this.secIds = secIds;
-        }
-        
-        @QueryProjection
-        public UserDto(Long id, String name, Map<Long, String> roles, Map<Long, String> groups) {
-            this.id = id;
-            this.name = name;
-            this.roleIds = Lists.newArrayList(roles.keySet());
-            this.roleNames = Lists.newArrayList(roles.values());
-            this.secIds = Lists.newArrayList(groups.keySet());
-        }
-    }
-    
-    private List<User> users;
-    
-    @Before
-    public void setUp() {
-        Role r1 = new Role();
-        r1.id = 1l;
-        r1.name = "User";
-        r1.groups = Lists.newArrayList(new SecurityGroup(1l, "User 1"));
-                
-        Role r2 = new Role();
-        r2.id = 2l;
-        r2.name = null; // NOTE this is null on purpose
-        r2.groups = Lists.newArrayList(new SecurityGroup(2l, "Admin 1"),
-                                       new SecurityGroup(3l, "Admin 2"));
-        
-        User u1 = new User();
-        u1.id = 3l;
-        u1.name = "Bob";
-        u1.roles = Lists.newArrayList(r1);
-        
-        User u2 = new User();
-        u2.id = 32l;
-        u2.name = "Ann";
-        u2.roles = Lists.newArrayList(r1, r2);
-        
-        users = Lists.newArrayList(u1, u2);
-    }
-    
-    @Test
-    public void test() {                               
-        QGroupBy2Test_User user = QGroupBy2Test_User.user;
-        QGroupBy2Test_Role role = QGroupBy2Test_Role.role;
-        QGroupBy2Test_SecurityGroup group = QGroupBy2Test_SecurityGroup.securityGroup;
-        
-        Map<Long, UserDto> userDtos = CollQueryFactory.from(user, users)
-                .innerJoin(user.roles, role)
-                .innerJoin(role.groups, group)
-                .transform(GroupBy.groupBy(user.id)
-                    .as(new QGroupBy2Test_UserDto(
-                            user.id, 
-                            user.name,
-                            list(role.id), 
-                            list(role.name), 
-                            list(group.id))));
-        
-        UserDto dto1 = userDtos.get(3l);
-        assertEquals(1, dto1.roleIds.size());
-        assertEquals(1, dto1.roleNames.size());
-        assertEquals(1, dto1.secIds.size());
-        
-        UserDto dto2 = userDtos.get(32l);
-        assertEquals(3, dto2.roleIds.size());
-        assertEquals(1, dto2.roleNames.size());
-        assertEquals(3, dto2.secIds.size());        
-    }
-    
-    @Test
-    public void test2() {
-        QGroupBy2Test_User user = QGroupBy2Test_User.user;
-        QGroupBy2Test_Role role = QGroupBy2Test_Role.role;
-        QGroupBy2Test_SecurityGroup group = QGroupBy2Test_SecurityGroup.securityGroup;
-        
-        Map<Long, UserDto> userDtos = CollQueryFactory.from(user, users)
-                .innerJoin(user.roles, role)
-                .innerJoin(role.groups, group)
-                .transform(GroupBy.groupBy(user.id)
-                    .as(new QGroupBy2Test_UserDto(
-                            user.id,
-                            user.name,
-                            map(role.id, role.name),
-                            map(group.id, group.name))));
-        
-        UserDto dto1 = userDtos.get(3l);
-        assertEquals(1, dto1.roleIds.size());
-        assertEquals(1, dto1.roleNames.size());
-        assertEquals(1, dto1.secIds.size());
-        
-        UserDto dto2 = userDtos.get(32l);
-        assertEquals(2, dto2.roleIds.size());
-        assertEquals(2, dto2.roleNames.size());
-        assertEquals(3, dto2.secIds.size());    
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy3Test.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy3Test.java
deleted file mode 100644
index 7edba0905d..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy3Test.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.mysema.query.collections;
-
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.set;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.EmptyCloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.group.Group;
-import com.mysema.query.types.Projections;
-import com.mysema.query.types.QTuple;
-
-public class GroupBy3Test {
-
-    @QueryEntity
-    public static class RiskAnalysis {
-        public String id;
-        public Set<AssetThreat> assetThreats;
-    }
-
-    @QueryEntity
-    public static class AssetThreat {
-        public String id;
-        public Set<Threat> threats;
-    }
-
-    @QueryEntity
-    public static class Threat {
-        public String id;
-    }
-
-    @Test
-    public void Nested_Expressions() {
-        QGroupBy3Test_RiskAnalysis riskAnalysis = QGroupBy3Test_RiskAnalysis.riskAnalysis;
-        QGroupBy3Test_AssetThreat assetThreat = QGroupBy3Test_AssetThreat.assetThreat;
-        QGroupBy3Test_Threat threat = QGroupBy3Test_Threat.threat;
-
-        ResultTransformer<Map<String,RiskAnalysis>> transformer =
-                groupBy(riskAnalysis.id)
-                  .as(Projections.bean(RiskAnalysis.class,
-                          riskAnalysis.id,
-                          set(Projections.bean(AssetThreat.class,
-                              assetThreat.id,
-                              set(Projections.bean(Threat.class, threat.id)).as("threats")))
-                          .as("assetThreats")));
-
-        Projectable projectable = createMock(Projectable.class);
-        expect(projectable.iterate(new QTuple(
-                riskAnalysis.id,
-                riskAnalysis.id,
-                assetThreat.id,
-                Projections.bean(Threat.class, threat.id))))
-            .andReturn(new EmptyCloseableIterator());
-        replay(projectable);
-
-        transformer.transform(projectable);
-        verify(projectable);
-    }
-
-    @Test
-    public void Alias_Usage() {
-        QGroupBy3Test_RiskAnalysis riskAnalysis = QGroupBy3Test_RiskAnalysis.riskAnalysis;
-        QGroupBy3Test_AssetThreat assetThreat = QGroupBy3Test_AssetThreat.assetThreat;
-        QGroupBy3Test_Threat threat = QGroupBy3Test_Threat.threat;
-
-        ResultTransformer<Map<String,Group>> transformer =
-                groupBy(riskAnalysis.id)
-                  .as(riskAnalysis.id,
-                      set(Projections.bean(AssetThreat.class,
-                          assetThreat.id,
-                           set(Projections.bean(Threat.class, threat.id)).as("threats"))
-                          .as("assetThreats")));
-
-        Projectable projectable = createMock(Projectable.class);
-        expect(projectable.iterate(new QTuple(
-                riskAnalysis.id,
-                riskAnalysis.id,
-                assetThreat.id,
-                Projections.bean(Threat.class, threat.id))))
-            .andReturn(new EmptyCloseableIterator());
-        replay(projectable);
-
-        transformer.transform(projectable);
-        verify(projectable);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy4Test.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy4Test.java
deleted file mode 100644
index 2b7cb9861b..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupBy4Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mysema.query.collections;
-
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.map;
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.mysema.query.annotations.QueryEntity;
-
-
-public class GroupBy4Test {
-
-    @QueryEntity
-    public static class Table {
-        String col1, col2, col3;
-
-        public Table(String c1, String c2, String c3) {
-            col1 = c1;
-            col2 = c2;
-            col3 = c3;
-        }
-    }
-
-    @Test
-    public void test() {
-        List<Table> data = Lists.newArrayList();
-        data.add(new Table("1", "abc", "111"));
-        data.add(new Table("1", "pqr", "222"));
-        data.add(new Table("2", "abc", "333"));
-        data.add(new Table("2", "pqr", "444"));
-        data.add(new Table("3", "abc", "555"));
-        data.add(new Table("3", "pqr", "666"));
-
-        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
-        Map<String, Map<String, String>> grouped = CollQueryFactory
-                .from(table, data)
-                .transform(groupBy(table.col1).as(map(table.col2, table.col3)));
-
-        assertEquals(3, grouped.size());
-        assertEquals(2, grouped.get("1").size());
-        assertEquals(ImmutableSet.of("abc", "pqr"),  grouped.get("1").keySet());
-
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java
deleted file mode 100644
index 337de69143..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-
-import static com.mysema.query.group.GroupBy.avg;
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.list;
-import static com.mysema.query.group.GroupBy.map;
-import static com.mysema.query.group.GroupBy.max;
-import static com.mysema.query.group.GroupBy.min;
-import static com.mysema.query.group.GroupBy.set;
-import static com.mysema.query.group.GroupBy.sum;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.group.Group;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Projections;
-
-public class GroupByTest {
-
-    private static final List<User> users = Arrays.asList(new User("Bob"), new User("Jane"), new User("Jack"));
-
-    private static final List<Post> posts = Arrays.asList(
-            new Post(1, "Post 1", users.get(0)),
-            new Post(2, "Post 2", users.get(0)),
-            new Post(3, "Post 3", users.get(1)));
-
-    private static final List<Comment> comments = Arrays.asList(
-            new Comment(1, "Comment 1", users.get(0), posts.get(0)),
-            new Comment(2, "Comment 2", users.get(1), posts.get(1)),
-            new Comment(3, "Comment 3", users.get(2), posts.get(1)),
-            new Comment(4, "Comment 4", users.get(0), posts.get(2)),
-            new Comment(5, "Comment 5", users.get(1), posts.get(2)),
-            new Comment(6, "Comment 6", users.get(2), posts.get(2)));
-
-    private static final QUser user = QUser.user;
-
-    private static final QComment comment = QComment.comment;
-
-    private static final QPost post = QPost.post;
-
-    private static final ConstructorExpression<Comment> qComment = QComment.create(comment.id, comment.text);
-
-    @Test
-    public void Group_Min() {
-        Map<Integer, String> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(min(comment.text)));
-
-        assertEquals("Comment 1", results.get(1));
-        assertEquals("Comment 2", results.get(2));
-        assertEquals("Comment 4", results.get(3));
-    }
-
-    public void Comments_By_Post() {
-        Map<Integer, List<Comment>> results = CollQueryFactory.from(post, posts).from(comment, comments)
-                .where(comment.post.id.eq(post.id))
-                .transform(groupBy(post.id).as(list(comment)));
-
-        assertEquals(1,  results.get(1).size());
-        assertEquals(2,  results.get(2).size());
-        assertEquals(3, results.get(3).size());
-    }
-
-    @Test
-    public void Group_Max() {
-        Map<Integer, String> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(max(comment.text)));
-
-        assertEquals("Comment 1", results.get(1));
-        assertEquals("Comment 3", results.get(2));
-        assertEquals("Comment 6", results.get(3));
-    }
-
-    @Test
-    public void Group_Sum() {
-        Map<Integer, Integer> results = CollQueryFactory.from(post, posts).from(comment, comments)
-                .where(comment.post.id.eq(post.id))
-                .transform(groupBy(post.id).as(sum(comment.id)));
-
-        assertEquals(1,  results.get(1).intValue());
-        assertEquals(5,  results.get(2).intValue());
-        assertEquals(15, results.get(3).intValue());
-    }
-
-    @Test
-    public void Group_Avg() {
-        Map<Integer, Integer> results = CollQueryFactory.from(post, posts).from(comment, comments)
-                .where(comment.post.id.eq(post.id))
-                .transform(groupBy(post.id).as(avg(comment.id)));
-
-        assertEquals(1,  results.get(1).intValue());
-        assertEquals(2,  results.get(2).intValue());
-        assertEquals(5, results.get(3).intValue());
-    }
-
-    @Test
-    public void Group_Order() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, set(comment.id)));
-
-        assertEquals(3, results.size());
-    }
-
-    @Test
-    public void First_Set_And_List() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
-
-        Group group = results.get(1);
-        assertEquals(toInt(1), group.getOne(post.id));
-        assertEquals("Post 1", group.getOne(post.name));
-        assertEquals(toSet(1), group.getSet(comment.id));
-        assertEquals(Arrays.asList("Comment 1"), group.getList(comment.text));
-    }
-
-    @Test
-    @Ignore
-    public void Group_By_Null() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
-
-        Group group = results.get(null);
-        assertNull(group.getOne(post.id));
-        assertEquals("null post", group.getOne(post.name));
-        assertEquals(toSet(7, 8), group.getSet(comment.id));
-        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(comment.text));
-
-    }
-
-//    @Test(expected=NoSuchElementException.class)
-//    public void NoSuchElementException() {
-//        Map<Integer, Group> results = BASIC_RESULTS.transform(
-//            groupBy(postId, postName, set(commentId), list(commentText)));
-//
-//        Group group = results.get(1);
-//        group.getSet(qComment);
-//    }
-
-    @Test(expected=ClassCastException.class)
-    public void ClassCastException() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
-
-        Group group = results.get(1);
-        group.getList(comment.id);
-    }
-
-    @Test
-    @Ignore
-    public void Map() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, map(comment.id, comment.text)));
-
-        Group group = results.get(1);
-        Map<Integer, String> comments = group.getMap(comment.id, comment.text);
-        assertEquals(1, comments.size());
-//        assertEquals("comment 2", comments.get(2));
-    }
-
-    @Test
-    public void Array_Access() {
-        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
-
-        Group group = results.get(1);
-        Object[] array = group.toArray();
-        assertEquals(toInt(1), array[0]);
-        assertEquals("Post 1", array[1]);
-        assertEquals(toSet(1), array[2]);
-        assertEquals(Arrays.asList("Comment 1"), array[3]);
-    }
-
-    @Test
-    public void Transform_Results() {
-        Map<Integer, Post> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(QPost.create(post.id, post.name, set(qComment))));
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(1, post.getId());
-        assertEquals("Post 1", post.getName());
-        assertEquals(1, post.getComments().size());
-    }
-
-    @Test
-    public void Transform_As_Bean() {
-        Map<Integer, Post> results = CollQueryFactory.from(post, posts).from(comment, comments)
-            .where(comment.post.id.eq(post.id))
-            .transform(groupBy(post.id).as(Projections.bean(Post.class, post.id, post.name, set(qComment).as("comments"))));
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(1, post.getId());
-        assertEquals("Post 1", post.getName());
-        assertEquals(1, post.getComments().size());
-    }
-
-
-    @Test
-    public void OneToOneToMany_Projection() {
-        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
-            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
-            .transform(groupBy(user.name).as(Projections.constructor(User.class, user.name,
-                    QPost.create(post.id, post.name, set(qComment)))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(3, post.getId());
-        assertEquals("Post 3", post.getName());
-        assertEquals(3, post.getComments().size());
-    }
-
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean() {
-        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
-            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
-            .transform(groupBy(user.name).as(Projections.bean(User.class, user.name,
-                    Projections.bean(Post.class, post.id, post.name, set(qComment).as("comments")).as("latestPost"))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(3, post.getId());
-        assertEquals("Post 3", post.getName());
-        assertEquals(3, post.getComments().size());
-    }
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean_And_Constructor() {
-        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
-            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
-            .transform(groupBy(user.name).as(Projections.bean(User.class, user.name,
-                QPost.create(post.id, post.name, set(qComment)).as("latestPost"))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(3, post.getId());
-        assertEquals("Post 3", post.getName());
-        assertEquals(3, post.getComments().size());
-    }
-
-    private Integer toInt(int i) {
-        return Integer.valueOf(i);
-    }
-
-    private <T >Set<T> toSet(T... s) {
-        return new HashSet<T>(Arrays.asList(s));
-    }
-
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GuavaHelpersTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GuavaHelpersTest.java
deleted file mode 100644
index 9cd08794f4..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/GuavaHelpersTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
-public class GuavaHelpersTest {
-    
-    @Test
-    public void Predicate() {
-        Predicate<Cat> predicate = GuavaHelpers.wrap(QCat.cat.name.startsWith("Ann"));
-        assertTrue(predicate.apply(new Cat("Ann")));
-        assertFalse(predicate.apply(new Cat("Bob")));
-    }
-    
-    @Test
-    public void Function() {
-        Function<Cat, String> function = GuavaHelpers.wrap(QCat.cat.name);
-        assertEquals("Ann", function.apply(new Cat("Ann")));
-        assertEquals("Bob", function.apply(new Cat("Bob")));
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerClassTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/InnerClassTest.java
deleted file mode 100644
index e57975ce23..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerClassTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-public class InnerClassTest {
-
-    public static class Example {
-
-        public String getId() {
-            return null;
-        }
-    }
-
-    @Test
-    public void Query() {
-        Example example = alias(Example.class);
-        assertFalse(CollQueryFactory.from($(example), Arrays.asList(new Example()))
-                .where($(example.getId()).isNull())
-                .list($(example)).isEmpty());
-        assertTrue(CollQueryFactory.from($(example), Arrays.asList(new Example()))
-                .where($(example.getId()).isNotNull())
-                .list($(example)).isEmpty());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/IterationTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/IterationTest.java
deleted file mode 100644
index 5c7843c85e..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/IterationTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class IterationTest {
-    
-    public static class Data {
-        
-        private String data = "data";
-
-        public String getData() {
-            return data;
-        }
-        
-    }
-    
-    private List<Data> allData = Arrays.asList(new Data(), new Data());
-    
-    private Data lt = alias(Data.class,"Data");
-    
-    private List<String> expected = Arrays.asList("data","data");
-    
-    @Test
-    public void test() {                
-        assertEquals(expected, CollQueryFactory.from ($(lt), allData).list($(lt.getData())));
-    }
-
-    @Test
-    public void test2() {        
-        assertEquals(expected, CollQueryFactory.from ($(lt), Arrays.asList(allData.toArray())).list($(lt.getData())));
-    }
-    
-    @Test
-    public void test3() {                
-        assertEquals(expected, CollQueryFactory.from (lt, allData).list($(lt.getData())));
-    }
-
-    @Test
-    public void test4() {        
-        assertEquals(expected, CollQueryFactory.from (lt, Arrays.asList(allData.toArray())).list($(lt.getData())));
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/JodaTimeTemplatesTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/JodaTimeTemplatesTest.java
deleted file mode 100644
index d92c09a2c8..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/JodaTimeTemplatesTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.collections;
-
-import java.util.Arrays;
-
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
-import org.junit.Test;
-
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.TimePath;
-
-public class JodaTimeTemplatesTest {
-    
-    private CollQuery query = new CollQuery(JodaTimeTemplates.DEFAULT);
-    
-    @Test
-    public void DateTime() {
-        DateTimePath<DateTime> entity = new DateTimePath<DateTime>(DateTime.class, "entity");
-        query.from(entity, Arrays.asList(new DateTime(), new DateTime(0l)))
-             .list(entity.year(), entity.yearMonth(), entity.month(), entity.week(),
-                   entity.dayOfMonth(), entity.dayOfWeek(), entity.dayOfYear(),
-                   entity.hour(), entity.minute(), entity.second(), entity.milliSecond());        
-    }
-    
-    @Test
-    public void LocalDate() {
-        DatePath<LocalDate> entity = new DatePath<LocalDate>(LocalDate.class, "entity");
-        query.from(entity, Arrays.asList(new LocalDate(), new LocalDate(0l)))
-             .list(entity.year(), entity.yearMonth(), entity.month(), entity.week(),
-                   entity.dayOfMonth(), entity.dayOfWeek(), entity.dayOfYear());
-    }
-    
-    @Test
-    public void LocalTime() {
-        TimePath<LocalTime> entity = new TimePath<LocalTime>(LocalTime.class, "entity");
-        query.from(entity, Arrays.asList(new LocalTime(), new LocalTime(0l)))
-             .list(entity.hour(), entity.minute(), entity.second(), entity.milliSecond());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/MappingProjectionTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/MappingProjectionTest.java
deleted file mode 100644
index 831615e053..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/MappingProjectionTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.MappingProjection;
-
-@SuppressWarnings("serial")
-public class MappingProjectionTest extends AbstractQueryTest {
-    
-    public class ResultPart {
-        
-    }
-    
-    public class ResultObject {
-        
-    }
-    
-    @Test
-    public void test() {
-        final MappingProjection<ResultPart> key = new MappingProjection<ResultPart>(ResultPart.class, 
-                cat.name) {
-
-            @Override
-            protected ResultPart map(Tuple row) {
-                return new ResultPart();
-            }
-
-        };
-        
-        List<ResultObject> list = query().from(cat, cats).list(
-            new MappingProjection<ResultObject>(ResultObject.class, key) {
-
-                @Override
-                protected ResultObject map(Tuple row) {
-                    ResultPart consolidationKey = row.get(key);
-                    return new ResultObject();
-                }
-            });
-        
-        assertEquals(cats.size(), list.size());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/MathTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/MathTest.java
deleted file mode 100644
index f9e64dda28..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/MathTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.MathExpressions;
-import com.mysema.query.types.path.NumberPath;
-
-public class MathTest {
-    
-    private NumberPath<Double> num = new NumberPath<Double>(Double.class, "num");
-    
-    @Test
-    public void Math() {
-        Expression<Double> expr = num;
-        
-        assertEquals(Math.acos(0.5), unique(MathExpressions.acos(expr)), 0.001);
-        assertEquals(Math.asin(0.5), unique(MathExpressions.asin(expr)), 0.001);
-        assertEquals(Math.atan(0.5), unique(MathExpressions.atan(expr)), 0.001);
-        assertEquals(Math.cos(0.5),  unique(MathExpressions.cos(expr)), 0.001);
-        assertEquals(Math.cosh(0.5), unique(MathExpressions.cosh(expr)), 0.001);
-        assertEquals(cot(0.5),       unique(MathExpressions.cot(expr)), 0.001);
-        assertEquals(coth(0.5),      unique(MathExpressions.coth(expr)), 0.001);
-        assertEquals(degrees(0.5),   unique(MathExpressions.degrees(expr)), 0.001);
-        assertEquals(Math.exp(0.5),  unique(MathExpressions.exp(expr)), 0.001);
-        assertEquals(Math.log(0.5),  unique(MathExpressions.ln(expr)), 0.001);
-        assertEquals(log(0.5, 10),   unique(MathExpressions.log(expr, 10)), 0.001);
-        assertEquals(0.25,           unique(MathExpressions.power(expr, 2)), 0.001);
-        assertEquals(radians(0.5),   unique(MathExpressions.radians(expr)), 0.001);
-        assertEquals(Integer.valueOf(1),              
-                                     unique(MathExpressions.sign(expr)));
-        assertEquals(Math.sin(0.5),  unique(MathExpressions.sin(expr)), 0.001);
-        assertEquals(Math.sinh(0.5), unique(MathExpressions.sinh(expr)), 0.001);
-        assertEquals(Math.tan(0.5),  unique(MathExpressions.tan(expr)), 0.001);
-        assertEquals(Math.tanh(0.5), unique(MathExpressions.tanh(expr)), 0.001);
-        
-    }
-    
-    private double cot(double x) {
-        return Math.cos(x) / Math.sin(x);
-    }
-    
-    private double coth(double x) {
-        return Math.cosh(x) / Math.sinh(x);
-    }
-    
-    private double degrees(double x) {
-        return x * 180.0 / Math.PI;
-    }
-    
-    private double radians(double x) {
-        return x * Math.PI / 180.0;
-    }
-    
-    private double log(double x, int y) {
-        return Math.log(x) / Math.log(y);
-    }
-        
-    private <T> T unique(Expression<T> expr) {
-        //return query().uniqueResult(expr);
-        return CollQueryFactory.from(num, Arrays.asList(0.5)).uniqueResult(expr);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/MockTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/MockTest.java
deleted file mode 100644
index c1e02856cd..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/MockTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.easymock.EasyMock;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.types.path.SimplePath;
-
-public class MockTest {
-    
-    @Test
-    public void test() {
-        List<MockTest> tests = Lists.newArrayList(new MockTest(), new MockTest(), new MockTest());
-        SimplePath<MockTest> path = new SimplePath<MockTest>(MockTest.class, "obj");
-        MockTest mock = EasyMock.createMock(MockTest.class);
-        assertTrue(CollQueryFactory.from(path, tests).where(path.eq(mock)).list(path).isEmpty());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/NullSafetyTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/NullSafetyTest.java
deleted file mode 100644
index 3b7f174bbe..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/NullSafetyTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-public class NullSafetyTest extends AbstractQueryTest {
-
-    @Test
-    public void Filters() {
-        QCat cat = QCat.cat;
-        CollQuery query = CollQueryFactory.from(cat, Arrays.asList(new Cat(), new Cat("Bob")));
-        assertEquals(1l, query.where(cat.name.eq("Bob")).count());
-    }
-
-    @Test
-    public void Joins() {
-        Cat kitten1 = new Cat();
-        Cat kitten2 = new Cat("Bob");
-        Cat cat1 = new Cat();
-        cat1.setKittens(Arrays.asList(kitten1, kitten2));
-        Cat cat2 = new Cat();
-
-        QCat cat = QCat.cat;
-        QCat kitten = new QCat("kitten");
-        CollQuery query = CollQueryFactory.from(cat, Arrays.asList(cat1, cat2)).innerJoin(cat.kittens, kitten);
-        assertEquals(1, query.where(kitten.name.eq("Bob")).count());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/NumberTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/NumberTest.java
deleted file mode 100644
index bc189077b4..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/NumberTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query.collections;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-
-import com.mysema.query.types.path.NumberPath;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class NumberTest {
-
-    @Test
-    public void sum() throws Exception {
-        final NumberPath<BigDecimal> num = new NumberPath<BigDecimal>(BigDecimal.class, "num");
-        final CollQuery query = CollQueryFactory.from(num, Arrays.asList(new BigDecimal("1.6"), new BigDecimal("1.3")));
-
-        assertEquals(new BigDecimal("2.9"), query.uniqueResult(num.sum()));
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/OrderTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/OrderTest.java
deleted file mode 100644
index fd79326737..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/OrderTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class OrderTest extends AbstractQueryTest {
-
-    @Test
-    public void test() {
-        query().from(cat, cats).orderBy(cat.name.asc()).list(cat.name);
-        assertArrayEquals(new Object[] { "Alex", "Bob", "Francis", "Kitty" }, last.res.toArray());
-
-        query().from(cat, cats).orderBy(cat.name.desc()).list(cat.name);
-        assertArrayEquals(new Object[] { "Kitty", "Francis", "Bob", "Alex" }, last.res.toArray());
-
-        query().from(cat, cats).orderBy(cat.name.substring(1).asc()).list(cat.name);
-        assertArrayEquals(new Object[] { "Kitty", "Alex", "Bob", "Francis" }, last.res.toArray());
-
-        query().from(cat, cats).from(otherCat, cats).orderBy(cat.name.asc(), otherCat.name.desc()).list(cat.name, otherCat.name);
-
-        // TODO : more tests
-    }
-    
-    @Test
-    public void test2() {
-        List<String> orderedNames = Arrays.asList("Alex","Bob","Francis","Kitty"); 
-        assertEquals(orderedNames, query().from(cat,cats).orderBy(cat.name.asc()).list(cat.name));
-        assertEquals(orderedNames, query().from(cat,cats).orderBy(cat.name.asc()).distinct().list(cat.name));
-    }
-    
-    @Test
-    public void With_count() {
-        CollQuery q = new CollQuery();
-        q.from(cat, cats);
-        long size = q.distinct().count();
-        assertTrue(size > 0);
-        q.offset(0).limit(10);
-        q.orderBy(cat.name.asc());
-        assertEquals(Arrays.asList("Alex","Bob","Francis","Kitty"), q.distinct().list(cat.name));
-    }
-
-    @Test
-    public void With_null() {
-        List<Cat> cats = Arrays.asList(new Cat(), new Cat("Bob"));        
-        assertEquals(cats, query().from(cat, cats).orderBy(cat.name.asc()).list(cat));
-        assertEquals(Arrays.asList(cats.get(1), cats.get(0)), query().from(cat, cats).orderBy(cat.name.desc()).list(cat));
-
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/PagingTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/PagingTest.java
deleted file mode 100644
index 26a10d5340..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/PagingTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.types.path.NumberPath;
-
-public class PagingTest extends AbstractQueryTest {
-
-    private List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9);
-
-    private NumberPath<Integer> var = new NumberPath<Integer>(Integer.class, "var");
-
-    @Test
-    public void test() {
-        assertResultSize(9, 9, QueryModifiers.EMPTY);
-        assertResultSize(9, 2, new QueryModifiers(2l, null));
-        assertResultSize(9, 2, new QueryModifiers(2l, 0l));
-        assertResultSize(9, 2, new QueryModifiers(2l, 3l));
-        assertResultSize(9, 9, new QueryModifiers(20l, null));
-        assertResultSize(9, 9, new QueryModifiers(20l, 0l));
-        assertResultSize(9, 5, new QueryModifiers(20l, 4l));
-        assertResultSize(9, 0, new QueryModifiers(10l, 9l));
-    }
-
-    private void assertResultSize(int total, int size, QueryModifiers modifiers) {
-        // via list
-        assertEquals(size, createQuery(modifiers).list(var).size());
-
-        // via results
-        SearchResults<?> results = createQuery(modifiers).listResults(var);
-        assertEquals(total, results.getTotal());
-        assertEquals(size, results.getResults().size());
-
-        // via count (ignore limit and offset)
-        assertEquals(total, createQuery(modifiers).count());
-
-        // via iterator
-        assertEquals(size, IteratorAdapter.asList(createQuery(modifiers).iterate(var)).size());
-    }
-
-    private CollQuery createQuery(QueryModifiers modifiers) {
-        CollQuery query = new CollQuery().from(var, ints);
-        if (modifiers != null) {
-            query.restrict(modifiers);
-        }
-        return query;
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Person.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Person.java
deleted file mode 100644
index 57b151f00a..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Person.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mysema.query.collections;
-
-public class Person {
-    private String name;
-    
-    public String getName() {
-        return name;
-    }
-    
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Post.java b/querydsl-collections/src/test/java/com/mysema/query/collections/Post.java
deleted file mode 100644
index d7800bc3a9..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Post.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Set;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-
-@QueryEntity
-public class Post {
-    
-    private int id;
-    
-    private String name;
-    
-    private User user;
-    
-    private Set<Comment> comments;
-    
-    public Post() {}
-    
-    @QueryProjection
-    public Post(int id, String name, User user) {
-        this.id = id;
-        this.name = name;
-        this.user = user;
-    }
-    
-    @QueryProjection
-    public Post(int id, String name, Set<Comment> comments) {
-        this.id = id;
-        this.name = name;
-        this.comments = comments;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Set<Comment> getComments() {
-        return comments;
-    }
-
-    public void setComments(Set<Comment> comments) {
-        this.comments = comments;
-    }
-    
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/PropertiesTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/PropertiesTest.java
deleted file mode 100644
index ba4ba9f21b..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/PropertiesTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.collections;
-
-import static org.junit.Assert.*;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-public class PropertiesTest {
-    
-    @Test
-    public void Hidden() {
-        QStateHistory history = QStateHistory.stateHistory;
-        List<StateHistory> histories = Collections.singletonList(new StateHistory());
-        assertEquals(1, CollQueryFactory.from(history, histories)
-                .where(history.changedAt.isNull()).list(history).size());
-    }
-    
-    @Test
-    public void Hidden2() {
-        QStateHistoryOwner historyOwner = QStateHistoryOwner.stateHistoryOwner;
-        List<StateHistoryOwner> historyOwners = Collections.singletonList(new StateHistoryOwner());
-        assertEquals(1, CollQueryFactory.from(historyOwner, historyOwners)
-                .where(historyOwner.stateHistory.isNull()).list(historyOwner).size());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/QCar.java b/querydsl-collections/src/test/java/com/mysema/query/collections/QCar.java
deleted file mode 100644
index 30abe4d47e..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/QCar.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mysema.query.collections;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QCar extends BeanPath<Car> {
-
-    public final StringPath model = createString("model");
-
-    public final NumberPath<Integer> horsePower = createNumber("horsePower", Integer.class);
-
-    public final QPerson owner = new QPerson(new BeanPath<Person>(Person.class, this, "owner"));
-
-    public static QCar car = new QCar(new BeanPath<Car>(Car.class, "car"));
-
-    public QCar(BeanPath<? extends Car> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QCar(PathMetadata<?> metadata) {
-        super(Car.class, metadata);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/QPerson.java b/querydsl-collections/src/test/java/com/mysema/query/collections/QPerson.java
deleted file mode 100644
index 603d2d368b..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/QPerson.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mysema.query.collections;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QPerson extends BeanPath<Person> {
-
-    public final StringPath name = createString("name");
-
-    public static QPerson car = new QPerson(new BeanPath<Person>(Person.class, "person"));
-
-    public QPerson(BeanPath<? extends Person> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QPerson(PathMetadata<?> metadata) {
-        super(Person.class, metadata);
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMetadataTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMetadataTest.java
deleted file mode 100644
index f3d915661f..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMetadataTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-
-public class QueryMetadataTest extends AbstractQueryTest {
-    
-    @Test
-    public void Reusage() {
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        metadata.addJoin(JoinType.DEFAULT, cat);
-        metadata.addWhere(cat.name.startsWith("A"));
-        
-        CollQuery query = new CollQuery(metadata);
-        query.bind(cat, cats);
-        assertEquals(Arrays.asList(c3), query.list(cat));
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java
deleted file mode 100644
index f5da10f275..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/QueryMutabilityTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-
-import org.junit.Test;
-
-import com.mysema.query.QueryMutability;
-
-public class QueryMutabilityTest {
-
-    @Test
-    public void test() throws SecurityException, IllegalArgumentException,
-            NoSuchMethodException, IllegalAccessException,
-            InvocationTargetException, IOException {
-        QCat cat = QCat.cat;
-        CollQuery query = new CollQuery();
-        query.from(cat, Collections.<Cat> emptyList());
-        new QueryMutability<CollQuery>(query).test(cat.id, cat.name);
-
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java
deleted file mode 100644
index cb334d98a4..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/SerializationTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.QTuple;
-
-public class SerializationTest extends AbstractQueryTest{
-
-    // TODO : order
-
-    // TODO : subqueries
-
-    private QTuple tuple = new QTuple(cat, otherCat);
-
-    @Test
-    public void OneSource_list() {
-        query().from(cat, cats).list(cat);
-    }
-
-    public List<Cat> oneSource_list(List<Cat> cat_) {
-        return cat_;
-    }
-
-    @Test
-    public void TwoSources_list() {
-        query().from(cat,cats).from(otherCat, cats).list(cat);
-    }
-
-    public List<Cat> twoSources_list(List<Cat> cat_, List<Cat> otherCat_) {
-        return cat_;
-    }
-
-    @Test
-    public void OneSource_filteredList() {
-        query().from(cat, cats).where(cat.name.eq("Kitty")).list(cat);
-    }
-
-    public List<Cat> oneSource_filteredList(List<Cat> cat_) {
-        List<Cat> rv = new ArrayList<Cat>();
-        for (Cat cat : cats) {                   // from
-            if (cat.getName().equals("Kitty")) { // where
-                rv.add(cat);                    // list
-            }
-        }
-        return rv;
-    }
-
-    @Test
-    public void OneSource_projectedList() {
-        query().from(cat, cats).list(cat.name);
-    }
-
-    public List<String> oneSource_projectedList(List<Cat> cat_) {
-        List<String> rv = new ArrayList<String>();
-        for (Cat cat : cat_) {                   // from
-            rv.add(cat.getName());              // list
-        }
-        return rv;
-    }
-
-    @Test
-    public void OneSource_filtered_projectedList() {
-        query().from(cat, cats).where(cat.name.eq("Kitty")).list(cat.name);
-    }
-
-    public List<String> oneSource_filtered_projectedList(List<Cat> cat_) {
-        List<String> rv = new ArrayList<String>();
-        for (Cat cat : cat_) {                   // from
-            if (cat.getName().equals("Kitty")) { // where
-                rv.add(cat.getName());          // list
-            }
-        }
-        return rv;
-    }
-
-    @Test
-    public void OneSource_filtered_projectedUnique() {
-        query().from(cat, cats).where(cat.name.eq("Kitty")).uniqueResult(cat.name);
-    }
-
-    public String oneSource_filtered_projectedUnique(List<Cat> cat_) {
-        for (Cat cat : cat_) {                   // from
-            if (cat.getName().equals("Kitty")) { // where
-                return cat.getName();           // unique
-            }
-        }
-        throw new IllegalArgumentException();
-    }
-
-    @Test
-    @Ignore
-    public void Join_list() {
-        query().from(cat, cats).innerJoin(cat.kittens, kitten).where(kitten.name.eq("Kitty")).list(cat);
-    }
-
-    public List<Cat> join_list(List<Cat> cat_) {
-        List<Cat> rv = new ArrayList<Cat>();
-        for (Cat cat : cat_) {                          // from
-            for (Cat kitten : cat.getKittens()) {       // inner join
-                if (kitten.getName().equals("Kitty")) { // where
-                    rv.add(cat);                       // list
-                }
-            }
-        }
-        return rv;
-    }
-
-    public List<Object[]> pairs(List<Cat> cat_, List<Cat> otherCat_) {
-        query().from(cat, cats).from(otherCat, cats).where(cat.name.eq(otherCat.name)).list(cat, otherCat);
-
-        List<Object[]> rv = new ArrayList<Object[]>();
-        for (Cat cat : cat_) {                                  // from
-            for (Cat otherCat : otherCat_) {                    // from
-                if (cat.getName().equals(otherCat.getName())) { // where
-                    rv.add(new Object[]{cat,otherCat});        // list
-                }
-            }
-        }
-        return rv;
-    }
-
-    public List<Tuple> pairsAsTuple(List<Cat> cat_, List<Cat> otherCat_) {
-        query().from(cat, cats).from(otherCat, cats).where(cat.name.eq(otherCat.name)).list(new QTuple(cat, otherCat));
-
-        List<Tuple> rv = new ArrayList<Tuple>();
-        for (Cat cat : cat_) {                                  // from
-            for (Cat otherCat : otherCat_) {                    // from
-                if (cat.getName().equals(otherCat.getName())) { // where
-                    rv.add(tuple.newInstance(cat, otherCat));  // list
-                }
-            }
-        }
-        return rv;
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/SingleResultContractTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/SingleResultContractTest.java
deleted file mode 100644
index 9ceae68891..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/SingleResultContractTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class SingleResultContractTest extends AbstractQueryTest{
-
-    @Test
-    public void SingleResult() {
-        assertNotNull(CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).singleResult(cat));
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistory.java b/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistory.java
deleted file mode 100644
index 9e9fa7a5b3..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query.collections;
-
-import java.util.Date;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class StateHistory {
-
-    private Date changedAt;
-
-    protected final Date getChangedAtTime() {
-        return changedAt;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistoryOwner.java b/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistoryOwner.java
deleted file mode 100644
index 8e4e06938b..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/StateHistoryOwner.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.collections;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class StateHistoryOwner {
-
-    private StateHistory stateHistory;
-
-    protected final StateHistory getStateHistory() {
-        return stateHistory;
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/StringHandlingTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/StringHandlingTest.java
deleted file mode 100644
index 9f16fb2371..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/StringHandlingTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.path.StringPath;
-
-public class StringHandlingTest extends AbstractQueryTest {
-
-    private List<String> data1 = Arrays.asList("petER", "THomas", "joHAN");
-
-    private List<String> data2 = Arrays.asList("PETer", "thOMAS", "JOhan");
-
-    private List<String> data = Arrays.asList("abc", "aBC", "def");
-
-    private final StringPath a = new StringPath("a");
-
-    private final StringPath b = new StringPath("b");
-
-    @Test
-    public void EqualsIgnoreCase() {
-        Iterator<String> res = Arrays.asList("petER - PETer",
-                "THomas - thOMAS", "joHAN - JOhan").iterator();
-        for (Tuple arr : query()
-                .from(a, data1)
-                .from(b, data2)
-                .where(a.equalsIgnoreCase(b)).list(a, b)) {
-            assertEquals(res.next(), arr.get(a) + " - " + arr.get(b));
-        }
-    }
-
-    @Test
-    public void StartsWithIgnoreCase() {
-        assertEquals(2, CollQueryFactory.from(a, data).where(a.startsWithIgnoreCase("AB")).count());
-        assertEquals(2, CollQueryFactory.from(a, data).where(a.startsWithIgnoreCase("ab")).count());
-    }
-
-    @Test
-    public void EndsWithIgnoreCase() {
-        assertEquals(2, CollQueryFactory.from(a, data).where(a.endsWithIgnoreCase("BC")).count());
-        assertEquals(2, CollQueryFactory.from(a, data).where(a.endsWithIgnoreCase("bc")).count());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java
deleted file mode 100644
index 9af6ff7573..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/TypeCastTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import java.util.Collections;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.types.path.PathInits;
-
-public class TypeCastTest {
-
-    @Test(expected=IllegalStateException.class)
-    @Ignore
-    public void Cast() {
-        QAnimal animal = QAnimal.animal;
-        QCat cat = new QCat(animal.getMetadata(), new PathInits("*"));
-        System.out.println(cat);
-        CollQueryFactory.from(animal, Collections.<Animal> emptyList()).from(cat, Collections.<Cat> emptyList());
-    }
-
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/UniqueResultContractTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/UniqueResultContractTest.java
deleted file mode 100644
index a7f78d1a86..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/UniqueResultContractTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import org.junit.Test;
-
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.types.Expression;
-
-public class UniqueResultContractTest extends AbstractQueryTest{
-
-    @Test(expected=NonUniqueResultException.class)
-    public void Unique_Result_Throws_Exception_On_Multiple_Results() {
-        CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).uniqueResult(cat);
-    }
-    
-    @Test
-    public void UniqueResult_With_Array() {
-        CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).limit(1).uniqueResult(new Expression[]{cat});
-    }
-    
-}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/User.java b/querydsl-collections/src/test/java/com/mysema/query/collections/User.java
deleted file mode 100644
index e2deec89f8..0000000000
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/User.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.collections;
-
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryProjection;
-
-
-@QueryEntity
-public class User {
-    
-    private String name;
-    
-    private Post latestPost;
-    
-    public User() {}
-    
-    @QueryProjection
-    public User(String name) {
-        this.name = name;
-    }
-    
-    @QueryProjection
-    public User(String name, Post latestPost) {
-        this.name = name;
-        this.latestPost = latestPost;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Post getLatestPost() {
-        return latestPost;
-    }
-
-    public void setLatestPost(Post latestPost) {
-        this.latestPost = latestPost;
-    }
-
-    
-            
-}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java
new file mode 100644
index 0000000000..ec39f83d4e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.Expression;
+
+public abstract class AbstractQueryTest {
+
+    protected final Cat c1 = new Cat("Kitty");
+
+    protected final Cat c2 = new Cat("Bob");
+
+    protected final Cat c3 = new Cat("Alex");
+
+    protected final Cat c4 = new Cat("Francis");
+
+    protected final QCat cat = new QCat("cat");
+
+    protected final QCat kitten = new QCat("kitten");
+
+    protected final QCat offspr = new QCat("offspr");
+
+    protected final QCat otherCat = new QCat("otherCat");
+
+    protected final QCat mate = new QCat("mate");
+
+    protected List<Cat> cats = Arrays.asList(c1, c2, c3, c4);
+
+    protected List<Integer> ints = new ArrayList<Integer>();
+
+    protected List<Integer> myInts = new ArrayList<Integer>();
+
+    protected TestQuery<?> last;
+
+
+    @Before
+    public void setUp() {
+        myInts.addAll(Arrays.asList(1, 2, 3, 4));
+        Alias.resetAlias();
+    }
+
+    protected List<Cat> cats(int size) {
+        List<Cat> cats = new ArrayList<Cat>(size);
+        for (int i = 0; i < size / 2; i++) {
+            cats.add(new Cat("Kate" + (i + 1)));
+            cats.add(new Cat("Bob" + (i + 1)));
+        }
+        return cats;
+    }
+
+    protected TestQuery<?> query() {
+        last = new TestQuery<Void>();
+        return last;
+    }
+
+    static class TestQuery<T> extends AbstractCollQuery<T, TestQuery<T>> {
+
+        List<Object> res = new ArrayList<Object>();
+
+        TestQuery() {
+            super(new DefaultQueryMetadata(), DefaultQueryEngine.getDefault());
+        }
+
+        @Override
+        public List<T> fetch() {
+            List<T> rv = super.fetch();
+            res.addAll(rv);
+            return rv;
+        }
+
+        @Override
+        public <U> TestQuery<U> select(Expression<U> expr) {
+            queryMixin.setProjection(expr);
+            @SuppressWarnings("unchecked") // This is the new projection's type
+            TestQuery<U> newType = (TestQuery<U>) queryMixin.getSelf();
+            return newType;
+        }
+
+        @Override
+        public TestQuery<Tuple> select(Expression<?>... exprs) {
+            queryMixin.setProjection(exprs);
+            @SuppressWarnings("unchecked") // This is the new projection's type
+            TestQuery<Tuple> newType = (TestQuery<Tuple>) queryMixin.getSelf();
+            return newType;
+        }
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java
new file mode 100644
index 0000000000..51033e1221
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java
@@ -0,0 +1,66 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class AggregationTest extends AbstractQueryTest {
+
+    private static final QCat cat = QCat.cat;
+
+    private CollQuery<?> query;
+
+    @Override
+    @Before
+    public void setUp() {
+        Cat cat1 = new Cat();
+        cat1.setWeight(2);
+        Cat cat2 = new Cat();
+        cat2.setWeight(3);
+        Cat cat3 = new Cat();
+        cat3.setWeight(4);
+        Cat cat4 = new Cat();
+        cat4.setWeight(5);
+        query = CollQueryFactory.<Cat> from(cat, Arrays.asList(cat1, cat2, cat3, cat4));
+    }
+
+    @Test
+    public void avg() {
+        assertEquals(3.5, query.select(cat.weight.avg()).fetchOne(), 0.0);
+    }
+
+    @Test
+    public void count() {
+        assertEquals(Long.valueOf(4L), query.select(cat.count()).fetchOne());
+    }
+
+    @Test
+    public void countDistinct() {
+        assertEquals(Long.valueOf(4L), query.select(cat.countDistinct()).fetchOne());
+    }
+
+    @Test
+    public void max() {
+        assertEquals(Integer.valueOf(5), query.select(cat.weight.max()).fetchOne());
+    }
+
+    @Test
+    public void min() {
+        assertEquals(Integer.valueOf(2), query.select(cat.weight.min()).fetchOne());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(expected = UnsupportedOperationException.class)
+    public void min_and_max() {
+        query.select(cat.weight.min(), cat.weight.max()).fetchOne();
+    }
+
+    @Test
+    public void sum() {
+        assertEquals(Integer.valueOf(14), query.select(cat.weight.sum()).fetchOne());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java
new file mode 100644
index 0000000000..ac88bc7d85
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static com.querydsl.collections.CollQueryFactory.from;
+import static com.querydsl.core.alias.Alias.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class AliasTest extends AbstractQueryTest {
+
+    @Before
+    public void setUp() {
+        myInts.add(1);
+        myInts.add(2);
+        myInts.add(3);
+        myInts.add(4);
+
+        Alias.resetAlias();
+    }
+
+    @Test
+    public void aliasVariations1() {
+        // 1st
+        QCat cat = new QCat("cat");
+        assertEquals(Arrays.asList("Kitty", "Bob", "Alex", "Francis"),
+                from(cat, cats).where(cat.kittens.size().gt(0)).select(cat.name).fetch());
+
+        // 2nd
+        Cat c = alias(Cat.class, "cat");
+        assertEquals(Arrays.asList("Kitty", "Bob", "Alex", "Francis"),
+                from(c, cats).where($(c.getKittens()).size().gt(0)).select($(c.getName())).fetch());
+    }
+
+    @Test
+    public void aliasVariations2() {
+        // 1st
+        QCat cat = new QCat("cat");
+        assertEquals(Collections.emptyList(),
+                from(cat, cats).where(cat.name.matches("fri.*")).select(cat.name).fetch());
+
+        // 2nd
+        Cat c = alias(Cat.class, "cat");
+        assertEquals(Collections.emptyList(),
+                from(c, cats).where($(c.getName()).matches("fri.*")).select($(c.getName())).fetch());
+    }
+
+    @Test
+    public void alias3() {
+        QCat cat = new QCat("cat");
+        Cat other = new Cat();
+        Cat c = alias(Cat.class, "cat");
+
+        // 1
+        from(c, cats).where($(c.getBirthdate()).gt(new Date())).select($(c)).iterate();
+
+        // 2
+        try {
+            from(c, cats).where($(c.getMate().getName().toUpperCase()).eq("MOE"));
+            fail("expected NPE");
+        } catch (NullPointerException ne) {
+            // expected
+        }
+
+        // 3
+        assertEquals(cat.name, $(c.getName()));
+
+        // 4
+         from(c,cats)
+             .where($(c.getKittens().get(0).getBodyWeight()).gt(12))
+             .select($(c.getName())).iterate();
+
+        // 5
+        from(c, cats).where($(c).eq(other)).select($(c)).iterate();
+
+        // 6
+        from(c, cats).where($(c.getKittens()).contains(other)).select($(c))
+                .iterate();
+
+        // 7
+        from(c, cats).where($(c.getKittens().isEmpty())).select($(c)).iterate();
+
+        // 8
+        from(c, cats).where($(c.getName()).startsWith("B")).select($(c)).iterate();
+
+        // 9
+        from(c, cats).where($(c.getName()).upper().eq("MOE")).select($(c)).iterate();
+
+        // 10
+        assertNotNull($(c.getKittensByName()));
+        assertNotNull($(c.getKittensByName().get("Kitty")));
+        from(c, cats).where($(c.getKittensByName().get("Kitty")).isNotNull()).select(cat).iterate();
+
+        // 11
+//        try {
+//            from(cat, cats).where(cat.mate.alive).fetch(cat);
+//            fail("expected RuntimeException");
+//        } catch (RuntimeException e) {
+//            System.out.println(e.getMessage());
+//            assertEquals("null in cat.mate.alive", e.getMessage());
+//        }
+
+        // 12
+        // TestQuery query = query().from(cat, c1, c2).from(cat, c1, c2);
+        // assertEquals(1, query.getMetadata().getJoins().size());
+
+    }
+
+    @Test
+    public void various1() {
+        StringPath str = Expressions.stringPath("str");
+        assertEquals(Arrays.asList("a", "ab"),
+                from(str, "a", "ab", "cd", "de").where(str.startsWith("a")).select(str).fetch());
+    }
+
+    @Test
+    public void various2() {
+        assertEquals(Arrays.asList(1, 2, 5, 3),
+                from(var(), 1, 2, "abc", 5, 3).where(var().ne("abc")).select(var()).fetch());
+    }
+
+    @Test
+    public void various3() {
+        NumberPath<Integer> num = Expressions.numberPath(Integer.class, "num");
+        assertEquals(Arrays.asList(1, 2, 3),
+                from(num, 1, 2, 3, 4).where(num.lt(4)).select(num).fetch());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Animal.java b/querydsl-collections/src/test/java/com/querydsl/collections/Animal.java
new file mode 100644
index 0000000000..646f97ff7e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Animal.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Date;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryType;
+
+@QueryEntity
+public class Animal {
+
+    protected boolean alive;
+
+    protected java.util.Date birthdate = new java.util.Date();
+
+    @QueryType(PropertyType.SIMPLE)
+    private Date dateAsSimple;
+
+    protected int bodyWeight, weight, toes;
+
+    protected Color color;
+
+    protected int id;
+
+    protected String name;
+
+    public java.util.Date getBirthdate() {
+        return birthdate;
+    }
+
+    public int getBodyWeight() {
+        return bodyWeight;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getToes() {
+        return toes;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public boolean isAlive() {
+        return alive;
+    }
+
+    public void setAlive(boolean alive) {
+        this.alive = alive;
+    }
+
+    public void setBirthdate(java.util.Date birthdate) {
+        this.birthdate = new Date(birthdate.getTime());
+    }
+
+    public void setBodyWeight(int bodyWeight) {
+        this.bodyWeight = bodyWeight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public void setToes(int toes) {
+        this.toes = toes;
+    }
+
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getDateAsSimple() {
+        return dateAsSimple;
+    }
+
+    public void setDateAsSimple(Date dateAsSimple) {
+        this.dateAsSimple = new Date(dateAsSimple.getTime());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java
new file mode 100644
index 0000000000..c0af354e98
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.SimplePath;
+
+public class AnimalTest {
+
+    @Test
+    public void cast() {
+        QCat cat = QAnimal.animal.as(QCat.class);
+        assertEquals(QAnimal.animal, cat.getMetadata().getElement());
+        assertEquals("animal", cat.toString());
+    }
+
+    @Test
+    public void date_as_simple() {
+        assertTrue(QAnimal.animal.dateAsSimple.getClass().equals(SimplePath.class));
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java
new file mode 100644
index 0000000000..1d492bb29f
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class BigDecimalTest {
+
+    @Test
+    public void arithmetic() {
+        NumberPath<BigDecimal> num = Expressions.numberPath(BigDecimal.class, "num");
+        CollQuery<BigDecimal> query = CollQueryFactory.<BigDecimal> from(num, Arrays.<BigDecimal> asList(BigDecimal.ONE, BigDecimal.valueOf(2)));
+        assertEquals(Arrays.asList(BigDecimal.valueOf(11), BigDecimal.valueOf(12)),
+                query.<BigDecimal> select(num.add(BigDecimal.TEN)).fetch());
+        assertEquals(Arrays.asList(BigDecimal.valueOf(-9), BigDecimal.valueOf(-8)),
+                query.<BigDecimal> select(num.subtract(BigDecimal.TEN)).fetch());
+        assertEquals(Arrays.asList(BigDecimal.valueOf(10), BigDecimal.valueOf(20)),
+                query.<BigDecimal> select(num.multiply(BigDecimal.TEN)).fetch());
+        assertEquals(Arrays.asList(new BigDecimal("0.1"), new BigDecimal("0.2")),
+                query.<BigDecimal> select(num.divide(BigDecimal.TEN)).fetch());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java
new file mode 100644
index 0000000000..495e01ad16
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java
@@ -0,0 +1,47 @@
+package com.querydsl.collections;
+
+import static com.querydsl.core.alias.Alias.$;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.alias.Alias;
+
+public class BooleanTest {
+
+    public static class Entity {
+
+        private boolean boolean1 = true;
+
+        private Boolean boolean2 = Boolean.TRUE;
+
+        public boolean isBoolean1() {
+            return boolean1;
+        }
+
+        public Boolean getBoolean2() {
+            return boolean2;
+        }
+
+    }
+
+    @Test
+    public void primitive_boolean() {
+        Entity entity = Alias.alias(Entity.class);
+        assertEquals(1, CollQueryFactory.from(entity, Collections.singleton(new Entity()))
+                .where($(entity.isBoolean1()).eq(Boolean.TRUE))
+                .fetchCount());
+    }
+
+    @Test
+    public void object_boolean() {
+        Entity entity = Alias.alias(Entity.class);
+        assertEquals(1, CollQueryFactory.from(entity, Collections.singleton(new Entity()))
+                .where($(entity.getBoolean2()).eq(Boolean.TRUE))
+                .fetchCount());
+
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/Car.java b/querydsl-collections/src/test/java/com/querydsl/collections/Car.java
similarity index 93%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/Car.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/Car.java
index 808f5165ee..7e38354427 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/Car.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Car.java
@@ -1,4 +1,4 @@
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 
 public class Car {
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java
new file mode 100644
index 0000000000..bd91972221
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java
@@ -0,0 +1,35 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+public class CastTest extends AbstractQueryTest {
+
+    @Test
+    public void parents() {
+        QCat cat = QAnimal.animal.as(QCat.class);
+        assertEquals(QAnimal.animal, cat.getMetadata().getParent());
+    }
+
+    @Test
+    public void cast() {
+        assertEquals(Arrays.asList(c1, c2, c3, c4),
+            query().from(QAnimal.animal, cats)
+                .where(QAnimal.animal.as(QCat.class).breed.eq(0))
+                .select(QAnimal.animal).fetch());
+    }
+
+    @Test
+    public void property_dereference() {
+         Cat cat = new Cat();
+         cat.setEyecolor(Color.TABBY);
+         assertEquals(Color.TABBY,
+             CollQueryFactory.from(QAnimal.animal, cat)
+                 .where(QAnimal.animal.instanceOf(Cat.class))
+                 .select(QAnimal.animal.as(QCat.class).eyecolor).fetchFirst());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Cat.java b/querydsl-collections/src/test/java/com/querydsl/collections/Cat.java
new file mode 100644
index 0000000000..067f8fa219
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Cat.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.*;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryType;
+
+@QueryEntity
+public class Cat extends Animal {
+
+    private int breed;
+
+    private java.sql.Date dateField;
+
+    private Color eyecolor;
+
+    private List<Cat> kittens = new ArrayList<>();
+
+    private Cat[] kittenArray;
+
+    private Map<String, Cat> kittensByName = new HashMap<>();
+
+    private Cat mate;
+
+    @QueryType(PropertyType.NONE)
+    private String skippedField;
+
+    @QueryType(PropertyType.SIMPLE)
+    private String stringAsSimple;
+
+    private java.sql.Time timeField;
+
+    public Cat() {
+        this.kittensByName = Collections.emptyMap();
+    }
+
+    public Cat(String name) {
+        Cat kitten = new Cat();
+        this.kittens = Collections.singletonList(kitten);
+        this.kittenArray = new Cat[]{kitten};
+        this.kittensByName = Collections.singletonMap("Kitty", kitten);
+        this.name = name;
+    }
+
+    public Cat(String name, String kittenName) {
+        this(name);
+        kittens.get(0).setName(kittenName);
+    }
+
+    @QueryProjection
+    public Cat(String name, int id) {
+        this(name);
+        this.id = id;
+    }
+
+    public Cat(String name, int id, Date birthdate) {
+        this(name, id);
+        this.birthdate = new Date(birthdate.getTime());
+        this.dateField = new java.sql.Date(birthdate.getTime());
+        this.timeField = new java.sql.Time(birthdate.getTime());
+    }
+
+    public int getBreed() {
+        return breed;
+    }
+
+    public java.sql.Date getDateField() {
+        return dateField;
+    }
+
+    public Color getEyecolor() {
+        return eyecolor;
+    }
+
+    public List<Cat> getKittens() {
+        return kittens;
+    }
+
+    public Map<String, Cat> getKittensByName() {
+        return kittensByName;
+    }
+
+    public Cat getMate() {
+        return mate;
+    }
+
+    public String getSkippedField() {
+        return skippedField;
+    }
+
+    public String getStringAsSimple() {
+        return stringAsSimple;
+    }
+
+    public java.sql.Time getTimeField() {
+        return timeField;
+    }
+
+    public void setBreed(int breed) {
+        this.breed = breed;
+    }
+
+    public void setDateField(java.sql.Date dateField) {
+        this.dateField = new java.sql.Date(dateField.getTime());
+    }
+
+    public void setEyecolor(Color eyecolor) {
+        this.eyecolor = eyecolor;
+    }
+
+    public void setKittens(List<Cat> kittens) {
+        this.kittens = kittens;
+    }
+
+    public void setKittensByName(Map<String, Cat> kittensByName) {
+        this.kittensByName = kittensByName;
+    }
+
+    public void setMate(Cat mate) {
+        this.mate = mate;
+    }
+
+    public void setSkippedField(String skippedField) {
+        this.skippedField = skippedField;
+    }
+
+    public void setStringAsSimple(String stringAsSimple) {
+        this.stringAsSimple = stringAsSimple;
+    }
+
+    public void setTimeField(java.sql.Time timeField) {
+        this.timeField = timeField;
+    }
+
+    public Cat[] getKittenArray() {
+        return kittenArray;
+    }
+
+    public void setKittenArray(Cat[] kittenArray) {
+        this.kittenArray = kittenArray.clone();
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java
new file mode 100644
index 0000000000..d3dcaa3a7c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.SimplePath;
+
+public class CatTest {
+
+    @Test(expected = NoSuchFieldException.class)
+    public void skippedField() throws SecurityException, NoSuchFieldException {
+        QCat.class.getField("skippedField");
+    }
+
+    @Test
+    public void stringAsSimple() throws SecurityException, NoSuchFieldException {
+        assertTrue(QCat.cat.stringAsSimple.getClass().equals(SimplePath.class));
+    }
+
+    @Test
+    public void dateAsSimple() {
+        assertTrue(QCat.cat.dateAsSimple.getClass().equals(SimplePath.class));
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollDeleteClauseTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java
similarity index 90%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/CollDeleteClauseTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java
index 13025bea2c..2741ccd83f 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollDeleteClauseTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,7 +24,7 @@
 public class CollDeleteClauseTest {
 
     @Test
-    public void Execute() {
+    public void execute() {
         QCat cat = QCat.cat;
         List<Cat> cats = new ArrayList<Cat>(Arrays.asList(new Cat("Ann"), new Cat("Bob"), new Cat("John"), new Cat("Carl")));
 
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryFunctionsTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java
similarity index 81%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryFunctionsTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java
index 3e24707e62..5c43f8549d 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollQueryFunctionsTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -23,15 +21,15 @@
 public class CollQueryFunctionsTest {
 
     @Test
-    public void Coalesce() {
+    public void coalesce() {
         assertEquals("1", CollQueryFunctions.coalesce("1",null));
         assertEquals("1", CollQueryFunctions.coalesce(null,"1","2"));
         assertNull(CollQueryFunctions.coalesce(null,null));
     }
 
-    @Test 
+    @Test
     @Ignore
-    public void LikeSpeed() {
+    public void likeSpeed() {
         // 3015
         final int iterations = 1000000;
         long start = System.currentTimeMillis();
@@ -43,16 +41,16 @@ public void LikeSpeed() {
         long duration = System.currentTimeMillis() - start;
         System.err.println(duration);
     }
-    
+
     @Test
-    public void Like() {
+    public void like() {
         assertTrue(CollQueryFunctions.like("abcDOG", "%DOG"));
         assertTrue(CollQueryFunctions.like("DOGabc", "DOG%"));
-        assertTrue(CollQueryFunctions.like("abcDOGabc", "%DOG%"));        
+        assertTrue(CollQueryFunctions.like("abcDOGabc", "%DOG%"));
     }
-    
+
     @Test
-    public void Like_With_Special_Chars() {
+    public void like_with_special_chars() {
         assertTrue(CollQueryFunctions.like("$DOG", "$DOG"));
         assertTrue(CollQueryFunctions.like("$DOGabc", "$DOG%"));
     }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java
new file mode 100644
index 0000000000..8a35a7cf9e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.QuerydslModule;
+import com.querydsl.core.QueryExecution;
+import com.querydsl.core.Target;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.ArrayConstructorExpression;
+import com.querydsl.core.types.Concatenation;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+import org.junit.Test;
+
+public class CollQueryStandardTest {
+
+    private final Date birthDate = new Date();
+
+    private final java.sql.Date date = new java.sql.Date(birthDate.getTime());
+
+    private final java.sql.Time time = new java.sql.Time(birthDate.getTime());
+
+    private final QCat cat = new QCat("cat");
+
+    private final QCat otherCat = new QCat("otherCat");
+
+    private final List<Cat> data = Arrays.asList(
+        new Cat("Bob", 1, birthDate),
+        new Cat("Ruth", 2, birthDate),
+        new Cat("Felix", 3, birthDate),
+        new Cat("Allen", 4, birthDate),
+        new Cat("Mary", 5, birthDate)
+    );
+
+    private static final Expression<?>[] NO_EXPRESSIONS = new Expression[0];
+
+    private QueryExecution standardTest = new QueryExecution(QuerydslModule.COLLECTIONS, Target.MEM) {
+        @Override
+        protected Fetchable<?> createQuery() {
+            return CollQueryFactory.from(cat, data).from(otherCat, data);
+        }
+        @Override
+        protected Fetchable<?> createQuery(Predicate filter) {
+            return CollQueryFactory.from(cat, data).from(otherCat, data)
+                .where(filter).select(cat.name);
+        }
+    };
+
+    @Test
+    public void test() {
+        Cat kitten = data.get(0).getKittens().get(0);
+        standardTest.runArrayTests(cat.kittenArray, otherCat.kittenArray, kitten, new Cat());
+        standardTest.runBooleanTests(cat.name.isNull(), otherCat.kittens.isEmpty());
+        standardTest.runCollectionTests(cat.kittens, otherCat.kittens, kitten, new Cat());
+        standardTest.runDateTests(cat.dateField, otherCat.dateField, date);
+        standardTest.runDateTimeTests(cat.birthdate, otherCat.birthdate, birthDate);
+        standardTest.runListTests(cat.kittens, otherCat.kittens, kitten, new Cat());
+        standardTest.runMapTests(cat.kittensByName, otherCat.kittensByName, "Kitty", kitten, "NoName", new Cat());
+
+        // int
+        standardTest.runNumericCasts(cat.id, otherCat.id, 1);
+        standardTest.runNumericTests(cat.id, otherCat.id, 1);
+
+        standardTest.runStringTests(cat.name, otherCat.name, "Bob");
+        standardTest.runTimeTests(cat.timeField, otherCat.timeField, time);
+        standardTest.report();
+    }
+
+    @Test
+    public void tupleMultipleFieldsProjection() {
+        List<Tuple> tuples = CollQueryFactory.from(cat, data)
+            .select(cat.name, cat.birthdate).fetch();
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple.get(cat.name));
+            assertNotNull(tuple.get(cat.birthdate));
+        }
+    }
+
+    @Test
+    public void tupleOneFieldProjection() {
+        List<Tuple> tuples = CollQueryFactory.from(cat, data)
+            .select(new Expression<?>[] {cat.name}).fetch();
+        for (Tuple tuple : tuples) {
+            assertEquals(1, tuple.size());
+            assertNotNull(tuple.get(cat.name));
+        }
+    }
+
+    @Test
+    public void tupleOneNullFieldProjection() {
+        List<Tuple> tuples = CollQueryFactory.from(cat, data)
+            .select(new Expression<?>[] {Expressions.nullExpression()}).fetch();
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple);
+            assertEquals(1, tuple.size()); // THIS FAILS WITH NPE
+            assertNull(tuple.get(Expressions.nullExpression()));
+        }
+    }
+
+    @Test
+    public void nested_tupleProjection() {
+        Concatenation concat = new Concatenation(cat.name, cat.name);
+        List<Tuple> tuples = CollQueryFactory.from(cat, data)
+            .select(concat, cat.name, cat.birthdate).fetch();
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple.get(cat.name));
+            assertNotNull(tuple.get(cat.birthdate));
+            assertEquals(tuple.get(cat.name) + tuple.get(cat.name), tuple.get(concat));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void arrayProjection() {
+        List<String[]> results =  CollQueryFactory.from(cat, data)
+            .select(new ArrayConstructorExpression<String>(String[].class, cat.name)).fetch();
+        assertFalse(results.isEmpty());
+        for (String[] result : results) {
+            assertNotNull(result[0]);
+        }
+    }
+
+    @Test
+    public void constructorProjection() {
+        List<Projection> projections =  CollQueryFactory.from(cat, data)
+            .select(Projections.constructor(Projection.class, cat.name, cat)).fetch();
+        assertFalse(projections.isEmpty());
+        for (Projection projection : projections) {
+            assertNotNull(projection);
+        }
+    }
+
+    @Test
+    public void params() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).set(name,"Bob").select(cat.name).fetchOne());
+    }
+
+    @Test
+    public void params_anon() {
+        Param<String> name = new Param<String>(String.class);
+        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).set(name,"Bob").select(cat.name).fetchOne());
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void params_not_set() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Bob", CollQueryFactory.from(cat, data).where(cat.name.eq(name)).select(cat.name).fetchOne());
+    }
+
+    @Test
+    public void limit() {
+        assertEquals(data, CollQueryFactory.from(cat, data).limit(Long.MAX_VALUE).fetch());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java
new file mode 100644
index 0000000000..981eca2af1
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java
@@ -0,0 +1,28 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.TemplatesTestUtils;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class CollQueryTemplatesTest {
+
+    @Test
+    public void generic_precedence() {
+        TemplatesTestUtils.testPrecedence(CollQueryTemplates.DEFAULT);
+    }
+
+    @Test
+    public void concat() {
+        StringPath a = Expressions.stringPath("a");
+        StringPath b = Expressions.stringPath("b");
+        Expression<?> expr = a.append(b).toLowerCase();
+        String str = new CollQuerySerializer(CollQueryTemplates.DEFAULT).handle(expr).toString();
+        assertEquals("(a + b).toLowerCase()", str);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java
new file mode 100644
index 0000000000..dfef345b29
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static com.querydsl.collections.CollQueryFactory.from;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class CollQueryTest extends AbstractQueryTest {
+
+    @Test
+    public void customTemplates() {
+        CollQueryTemplates templates = new CollQueryTemplates() {
+            {
+                add(Ops.DateTimeOps.MONTH, "{0}.getMonthOfYear()");
+                add(Ops.DateTimeOps.YEAR, "{0}.getYear()");
+            }
+        };
+        new CollQuery(templates);
+    }
+
+    @Test
+    public void instanceOf() {
+        assertEquals(
+                Arrays.asList(c1, c2),
+                query().from(cat, Arrays.asList(c1, c2)).where(cat.instanceOf(Cat.class))
+                       .select(cat).fetch());
+    }
+
+    @Test
+    public void after_and_before() {
+        query().from(cat, Arrays.asList(c1, c2))
+            .where(
+                cat.birthdate.lt(new Date()),
+                cat.birthdate.loe(new Date()),
+                cat.birthdate.gt(new Date()),
+                cat.birthdate.goe(new Date()))
+            .select(cat).fetch();
+    }
+
+    @Test
+    public void arrayProjection() {
+        // select pairs of cats with different names
+        query().from(cat, cats).from(otherCat, cats).where(cat.name.ne(otherCat.name))
+               .select(cat.name, otherCat.name).fetch();
+        assertEquals(4 * 3, last.res.size());
+    }
+
+    @Test
+    public void cast() {
+        NumberExpression<?> num = cat.id;
+        Expression<?>[] expr = new Expression[] {num.byteValue(), num.doubleValue(),
+                num.floatValue(), num.intValue(), num.longValue(),
+                num.shortValue(), num.stringValue()};
+
+        for (Expression<?> e : expr) {
+            query().from(cat, Arrays.asList(c1, c2)).select(e).fetch();
+        }
+
+    }
+
+    @Test
+    public void clone_() {
+        CollQuery<?> query = new CollQuery<Void>().from(cat, Collections.<Cat>emptyList()).where(cat.isNotNull()).clone();
+        assertEquals("cat is not null", query.getMetadata().getWhere().toString());
+    }
+
+    @Test
+    public void primitives() {
+        // select cats with kittens
+        query().from(cat, cats).where(cat.kittens.size().ne(0)).select(cat.name).fetch();
+        assertTrue(last.res.size() == 4);
+
+        // select cats without kittens
+        query().from(cat, cats).where(cat.kittens.size().eq(0)).select(cat.name).fetch();
+        assertTrue(last.res.size() == 0);
+    }
+
+    @Test
+    public void simpleCases() {
+        // select all cat names
+        query().from(cat, cats).select(cat.name).fetch();
+        assertTrue(last.res.size() == 4);
+
+        // select all kittens
+        query().from(cat, cats).select(cat.kittens).fetch();
+        assertTrue(last.res.size() == 4);
+
+        // select cats with kittens
+        query().from(cat, cats).where(cat.kittens.size().gt(0)).select(cat.name).fetch();
+        assertTrue(last.res.size() == 4);
+
+        // select cats named Kitty
+        query().from(cat, cats).where(cat.name.eq("Kitty")).select(cat.name).fetch();
+        assertTrue(last.res.size() == 1);
+
+        // select cats named Kitt%
+        query().from(cat, cats).where(cat.name.matches("Kitt.*")).select(cat.name).fetch();
+        assertTrue(last.res.size() == 1);
+
+        query().from(cat, cats).select(cat.bodyWeight.add(cat.weight)).fetch();
+    }
+
+    @Test
+    public void various() {
+        StringPath a = Expressions.stringPath("a");
+        StringPath b = Expressions.stringPath("b");
+        for (Tuple strs : from(a, "aa", "bb", "cc")
+                .from(b, Arrays.asList("a","b"))
+                .where(a.startsWith(b)).select(a, b).fetch()) {
+            assertEquals(strs.get(a), strs.get(b) + strs.get(b));
+        }
+
+        query().from(cat, cats).select(cat.mate).fetch();
+
+        query().from(cat, cats).select(cat.kittens).fetch();
+
+        query().from(cat, cats).where(cat.kittens.isEmpty()).select(cat).fetch();
+
+        query().from(cat, cats).where(cat.kittens.isNotEmpty()).select(cat).fetch();
+
+        query().from(cat, cats).where(cat.name.matches("fri.*")).select(cat.name).fetch();
+
+    }
+
+    @Test
+    public void bigDecimals() {
+        NumberPath<BigDecimal> a = Expressions.numberPath(BigDecimal.class, "cost");
+        List<BigDecimal> nums = from(a, new BigDecimal("2.1"), new BigDecimal("20.21"),
+                new BigDecimal("44.4")).where(a.lt(new BigDecimal("35.1"))).select(a).fetch();
+        assertEquals(Arrays.asList(new BigDecimal("2.1"), new BigDecimal("20.21")), nums);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void groupBy() {
+        query().from(cat, cats).groupBy(cat.name);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void having() {
+        query().from(cat, cats).having(cat.name.isNull());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CollUpdateClauseTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java
similarity index 89%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/CollUpdateClauseTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java
index a2d2a1c8d2..74f1c0c549 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CollUpdateClauseTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,7 +23,7 @@
 public class CollUpdateClauseTest {
 
     @Test
-    public void Execute() {
+    public void execute() {
         QCat cat = QCat.cat;
         List<Cat> cats = Arrays.asList(new Cat("Ann"), new Cat("Bob"), new Cat("John"), new Cat("Carl"));
 
@@ -34,5 +34,5 @@ public void Execute() {
 
         assertEquals("Bobby", cats.get(1).getName());
     }
-    
+
 }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java
new file mode 100644
index 0000000000..94a4667e09
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java
@@ -0,0 +1,101 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class CollectionAnyTest extends AbstractQueryTest {
+
+    @Test
+    public void any_null() {
+        Cat a = new Cat("a");
+        a.setKittens(null);
+
+        assertEquals(0, CollQueryFactory.<Cat> from(cat, Collections.<Cat>singletonList(a))
+                .where(cat.kittens.any().name.startsWith("a")).fetchCount());
+    }
+
+    @Test
+    public void any_in_projection() {
+        Cat a = new Cat("a");
+        Cat aa = new Cat("aa");
+        Cat ab = new Cat("ab");
+        Cat ac = new Cat("ac");
+        a.setKittens(Arrays.asList(aa,ab,ac));
+
+        Cat b = new Cat("b");
+        Cat ba = new Cat("ba");
+        Cat bb = new Cat("bb");
+        b.setKittens(Arrays.asList(ba, bb));
+
+        QCat cat = QCat.cat;
+        List<Cat> kittens = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(a,b)).<Cat> select(cat.kittens.any()).fetch();
+        assertEquals(Arrays.asList(aa,ab,ac,ba,bb), kittens);
+    }
+
+    @Test
+    public void any_in_projection2() {
+        Cat a = new Cat("a");
+        Cat aa = new Cat("aa");
+        Cat ab = new Cat("ab");
+        Cat ac = new Cat("ac");
+        a.setKittens(Arrays.asList(aa,ab,ac));
+
+        Cat b = new Cat("b");
+        Cat ba = new Cat("ba");
+        Cat bb = new Cat("bb");
+        b.setKittens(Arrays.asList(ba, bb));
+
+        QCat cat = QCat.cat;
+        List<String> kittens = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(a,b))
+                .select(cat.kittens.any().name).fetch();
+        assertEquals(Arrays.asList("aa","ab","ac","ba","bb"), kittens);
+    }
+
+    @Test
+    public void any_in_where_and_projection() {
+        Cat a = new Cat("a");
+        Cat aa = new Cat("aa");
+        Cat ab = new Cat("ab");
+        Cat ac = new Cat("ac");
+        a.setKittens(Arrays.asList(aa,ab,ac));
+
+        Cat b = new Cat("b");
+        Cat ba = new Cat("ba");
+        Cat bb = new Cat("bb");
+        b.setKittens(Arrays.asList(ba, bb));
+
+        QCat cat = QCat.cat;
+        List<Cat> kittens = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(a,b))
+                .where(cat.kittens.any().name.startsWith("a"))
+                .select(cat.kittens.any()).fetch();
+
+        assertEquals(Arrays.asList(aa,ab,ac), kittens);
+    }
+
+    @Test
+    public void any_in_where_and_projection2() {
+        Cat a = new Cat("a");
+        Cat aa = new Cat("aa");
+        Cat ab = new Cat("ab");
+        Cat ac = new Cat("ac");
+        a.setKittens(Arrays.asList(aa,ab,ac));
+
+        Cat b = new Cat("b");
+        Cat ba = new Cat("ba");
+        Cat bb = new Cat("bb");
+        b.setKittens(Arrays.asList(ba, bb));
+
+        QCat cat = QCat.cat;
+        List<String> kittens = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(a,b))
+                .where(cat.kittens.any().name.startsWith("a"))
+                .select(cat.kittens.any().name).fetch();
+
+        assertEquals(Arrays.asList("aa","ab","ac"), kittens);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java
new file mode 100644
index 0000000000..d891088a4e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CollectionTest {
+
+    private final QCat cat = new QCat("cat");
+
+    private final QCat other = new QCat("other");
+
+    private List<Cat> cats;
+
+    @Before
+    public void setUp() {
+        Cat cat1 = new Cat("1");
+        cat1.setKittens(Collections.singletonList(cat1));
+        Cat cat2 = new Cat("2");
+        cat2.setKittens(Arrays.asList(cat1, cat2));
+        Cat cat3 = new Cat("3");
+        cat3.setKittens(Arrays.asList(cat1, cat2, cat3));
+        Cat cat4 = new Cat("4");
+        cat4.setKittens(Arrays.asList(cat1, cat2, cat3, cat4));
+
+        cats = Arrays.asList(cat1, cat2, cat3, cat4);
+    }
+
+    @Test
+    public void join() {
+        assertEquals("4", CollQueryFactory.from(cat, cats)
+                .innerJoin(cat.kittens, other)
+                .where(other.name.eq("4")).select(cat.name).fetchFirst());
+    }
+
+    @Test
+    public void join_from_two_sources() {
+        QCat catKittens = new QCat("cat_kittens");
+        QCat otherKittens = new QCat("other_kittens");
+        assertEquals(30, CollQueryFactory
+                .from(cat, cats).from(other, cats)
+                .innerJoin(cat.kittens, catKittens)
+                .innerJoin(other.kittens, otherKittens)
+                .where(catKittens.eq(otherKittens)).fetchCount());
+    }
+
+    @Test
+    public void any_uniqueResult() {
+        assertEquals("4", CollQueryFactory.from(cat, cats)
+                .where(cat.kittens.any().name.eq("4")).select(cat.name).fetchOne());
+    }
+
+    @Test
+    public void any_count() {
+        assertEquals(4, CollQueryFactory.from(cat, cats)
+                .where(cat.kittens.any().name.isNotNull()).fetchCount());
+    }
+
+    @Test
+    public void any_two_levels() {
+        assertEquals(4, CollQueryFactory.from(cat, cats).where(
+                cat.kittens.any().kittens.any().isNotNull()).fetchCount());
+    }
+
+    @Test
+    public void any_two_levels2() {
+        assertEquals(4, CollQueryFactory.from(cat, cats).where(
+                cat.kittens.any().name.isNotNull(),
+                cat.kittens.any().kittens.any().isNotNull()).fetchCount());
+    }
+
+    @Test
+    public void any_from_two_sources() {
+        assertEquals(16, CollQueryFactory.from(cat, cats).from(other, cats).where(
+                cat.kittens.any().name.eq(other.kittens.any().name)).fetchCount());
+    }
+
+    @Test
+    public void list_size() {
+        assertEquals(4, CollQueryFactory.from(cat, cats).where(cat.kittens.size().gt(0)).fetchCount());
+        assertEquals(2, CollQueryFactory.from(cat, cats).where(cat.kittens.size().gt(2)).fetchCount());
+    }
+
+    @Test
+    public void list_is_empty() {
+        assertEquals(0, CollQueryFactory.from(cat, cats).where(cat.kittens.isEmpty()).fetchCount());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Color.java b/querydsl-collections/src/test/java/com/querydsl/collections/Color.java
new file mode 100644
index 0000000000..1883b51df6
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Color.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+public enum Color {
+    BLACK, TABBY
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Comment.java b/querydsl-collections/src/test/java/com/querydsl/collections/Comment.java
new file mode 100644
index 0000000000..97a838273e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Comment.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+
+@QueryEntity
+public class Comment {
+
+    private int id;
+
+    private String text;
+
+    private User user;
+
+    private Post post;
+
+    public Comment() { }
+
+    @QueryProjection
+    public Comment(int id, String text) {
+        this.id = id;
+        this.text = text;
+    }
+
+    @QueryProjection
+    public Comment(int id, String text, User user, Post post) {
+        this.id = id;
+        this.text = text;
+        this.user = user;
+        this.post = post;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Post getPost() {
+        return post;
+    }
+
+    public void setPost(Post post) {
+        this.post = post;
+    }
+
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java
similarity index 90%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java
index 5ae134e258..34648d4b08 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/CompilationOverheadTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.BooleanExpression;
+import com.querydsl.core.types.dsl.BooleanExpression;
 
 public class CompilationOverheadTest {
 
@@ -40,7 +40,6 @@ public void test() {
         for (BooleanExpression condition : conditions) {
             query(condition);
         }
-        System.err.println();
 
         // 2nd
         for (BooleanExpression condition : conditions) {
@@ -50,7 +49,7 @@ public void test() {
 
     private void query(BooleanExpression condition) {
         long start = System.currentTimeMillis();
-        CollQueryFactory.from(cat, Collections.<Cat>emptyList()).where(condition).list(cat);
+        CollQueryFactory.from(cat, Collections.<Cat>emptyList()).where(condition).fetch();
         long duration = System.currentTimeMillis() - start;
         System.out.println(condition + " : " + duration + "ms");
     }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java
new file mode 100644
index 0000000000..62dd48d5c2
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class DistinctTest extends AbstractQueryTest {
+
+    private NumberPath<Integer> intVar1 = Expressions.numberPath(Integer.class, "var1");
+    private NumberPath<Integer> intVar2 = Expressions.numberPath(Integer.class, "var2");
+    private List<Integer> list1 = Arrays.asList(1, 2, 2, 3, 3, 3, 4, 4, 4, 4);
+    private List<Integer> list2 = Arrays.asList(2, 2, 3, 3, 3, 4, 4, 4, 4, 4);
+
+    @Test
+    public void singleSource() {
+        assertEquals(list1, CollQueryFactory.from(intVar1, list1).fetch());
+        assertEquals(Arrays.asList(1, 2, 3, 4), CollQueryFactory.from(intVar1, list1).distinct().fetch());
+        assertEquals(Arrays.asList(2, 3, 4), CollQueryFactory.from(intVar2, list2).distinct().fetch());
+
+        assertEquals(Arrays.asList(2, 3, 4), CollQueryFactory.from(intVar2, list2).distinct().fetch());
+    }
+
+    @Test
+    public void bothSources() {
+        assertEquals(100, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).select(intVar1, intVar2).fetch().size());
+        assertEquals(12, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).distinct().select(intVar1, intVar2).fetch().size());
+
+        assertEquals(12, CollQueryFactory.from(intVar1, list1).from(intVar2, list2).distinct().select(intVar1, intVar2).fetch().size());
+    }
+
+    @Test
+    public void countDistinct() {
+        assertEquals(10, CollQueryFactory.from(intVar1, list1).fetchCount());
+        assertEquals(4, CollQueryFactory.from(intVar1, list1).distinct().fetchCount());
+        assertEquals(3, CollQueryFactory.from(intVar2, list2).distinct().fetchCount());
+
+        assertEquals(3, CollQueryFactory.from(intVar2, list2).distinct().fetchCount());
+    }
+
+    @Test
+    public void null_() {
+        assertEquals(Arrays.asList(null, 1),
+            CollQueryFactory.<Integer> from(intVar1, Arrays.asList(null, 1)).distinct().fetch());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Document.java b/querydsl-collections/src/test/java/com/querydsl/collections/Document.java
new file mode 100644
index 0000000000..ca00156f36
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Document.java
@@ -0,0 +1,31 @@
+package com.querydsl.collections;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Document {
+
+    private Long id;
+
+    private List<String> meshThesaurusTerms = new ArrayList<String>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public List<String> getMeshThesaurusTerms() {
+        return meshThesaurusTerms;
+    }
+
+    public void setMeshThesaurusTerms(List<String> meshThesaurusTerms) {
+        this.meshThesaurusTerms = meshThesaurusTerms;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/DocumentTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java
similarity index 86%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/DocumentTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java
index cd85280c69..f04c6e9fc5 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/DocumentTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertTrue;
 
@@ -7,7 +7,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.query.types.Predicate;
+import com.querydsl.core.types.Predicate;
 
 public class DocumentTest {
 
@@ -31,21 +31,21 @@ public void setUp() {
     @Test
     public void test1() {
         Predicate crit = qDoc.id.eq(3L);
-        List<Document> expResult = CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).list(qDoc);
+        List<Document> expResult = CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).fetch();
         assertTrue(expResult.contains(doc3)); //ok
     }
 
     @Test
     public void test2() {
         Predicate crit = qDoc.meshThesaurusTerms.any().eq("x");
-        List<Document> expResult = CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).list(qDoc);
+        List<Document> expResult = CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).fetch();
         assertTrue(expResult.contains(doc1)); //ok
     }
 
     @Test
     public void test3() {
         Predicate crit = qDoc.meshThesaurusTerms.any().eq("x").or(qDoc.id.eq(3L));
-        List<Document> expResult =  CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).list(qDoc);
+        List<Document> expResult =  CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).fetch();
         assertTrue(expResult.contains(doc1));
         assertTrue(expResult.contains(doc3)); //fails, expResult contains only doc1, but should contain doc1 and doc3!
     }
@@ -53,7 +53,7 @@ public void test3() {
     @Test
     public void test4() {
         Predicate crit = qDoc.id.eq(3L).or(qDoc.meshThesaurusTerms.any().eq("x"));
-        List<Document> expResult =  CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).list(qDoc);
+        List<Document> expResult =  CollQueryFactory.from(qDoc, doc1, doc2, doc3).where(crit).fetch();
         assertTrue(expResult.contains(doc1));
         assertTrue(expResult.contains(doc3)); //fails, expResult contains only doc1, but should contain doc1 and doc3!
     }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java
new file mode 100644
index 0000000000..f4bc4eae0c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java
@@ -0,0 +1,19 @@
+package com.querydsl.collections;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.ECJEvaluatorFactory;
+
+public class ECJEvaluatorFactoryTest extends AbstractQueryTest {
+
+    @Test
+    public void evaluator_factory() {
+        DefaultEvaluatorFactory evaluatorFactory = new DefaultEvaluatorFactory(
+                CollQueryTemplates.DEFAULT,
+                new ECJEvaluatorFactory(getClass().getClassLoader()));
+        QueryEngine queryEngine = new DefaultQueryEngine(evaluatorFactory);
+        CollQuery<?> query = new CollQuery<Void>(queryEngine);
+        query.from(cat, cats).select(cat.name).fetch();
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongId.java b/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongId.java
new file mode 100644
index 0000000000..6c34fa792a
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongId.java
@@ -0,0 +1,23 @@
+package com.querydsl.collections;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+
+@QueryEntity
+public class EntityWithLongId {
+
+    private Long id;
+
+    @QueryProjection
+    public EntityWithLongId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java
new file mode 100644
index 0000000000..20de545c38
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java
@@ -0,0 +1,51 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class EntityWithLongIdTest {
+
+    private List<EntityWithLongId> entities = Arrays.asList(
+            new EntityWithLongId(999L),
+            new EntityWithLongId(1000L),
+            new EntityWithLongId(1001L),
+            new EntityWithLongId(1003L)
+    );
+
+    @Test
+    public void simpleEquals() {
+        QEntityWithLongId root = QEntityWithLongId.entityWithLongId;
+        CollQuery<?> query = new CollQuery<Void>().from(root, entities);
+        query.where(root.id.eq(1000L));
+
+        Long found = query.select(root.id).fetchFirst();
+        assertNotNull(found);
+        assertEquals(found.longValue(), 1000);
+    }
+
+    @Test
+    public void cartesianEquals() {
+        QEntityWithLongId root = new QEntityWithLongId("root1");
+        QEntityWithLongId root2 = new QEntityWithLongId("root2");
+        assertEquals(entities.size(), new CollQuery<Void>()
+            .from(root, entities).from(root2, entities)
+            .where(root2.id.eq(root.id))
+            .fetchCount());
+    }
+
+    @Test
+    public void cartesianPlus1() {
+        QEntityWithLongId root = new QEntityWithLongId("root1");
+        QEntityWithLongId root2 = new QEntityWithLongId("root2");
+        assertEquals(2, new CollQuery<Void>()
+            .from(root, entities).from(root2, entities)
+            .where(root2.id.eq(root.id.add(1)))
+            .fetchCount());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java
similarity index 84%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java
index be59460b18..e03d10ec9a 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/EvaluatorTransformerTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,9 +19,9 @@
 
 import org.junit.Test;
 
-import com.mysema.codegen.Evaluator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
+import com.querydsl.codegen.utils.Evaluator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
 
 public class EvaluatorTransformerTest {
 
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java
new file mode 100644
index 0000000000..2ca9e8be78
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class FirstResultContractTest extends AbstractQueryTest {
+
+    @Test
+    public void singleResult() {
+        assertNotNull(CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).fetchFirst());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java
new file mode 100644
index 0000000000..d8c8d4434a
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java
@@ -0,0 +1,28 @@
+package com.querydsl.collections;
+
+import org.junit.Test;
+
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class FunctionalHelpersTest {
+
+    @Test
+    public void predicate() {
+        Predicate<Cat> predicate = FunctionalHelpers.wrap(QCat.cat.name.startsWith("Ann"));
+        assertTrue(predicate.test(new Cat("Ann")));
+        assertFalse(predicate.test(new Cat("Bob")));
+    }
+
+    @Test
+    public void function() {
+        Function<Cat, String> function = FunctionalHelpers.wrap(QCat.cat.name);
+        assertEquals("Ann", function.apply(new Cat("Ann")));
+        assertEquals("Bob", function.apply(new Cat("Bob")));
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java
new file mode 100644
index 0000000000..1f9208656c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java
@@ -0,0 +1,159 @@
+package com.querydsl.collections;
+
+import static com.querydsl.core.group.GroupBy.list;
+import static com.querydsl.core.group.GroupBy.map;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+import com.querydsl.core.group.GroupBy;
+
+public class GroupBy2Test {
+
+//    select u1.id,u1.name,r1.id,r1.name,s1.name from users u1
+//    join roles r1 on u1.role = r1.id
+//    join security_groups s1 on r1.secgroup = s1.id
+
+    @QueryEntity
+    public static class User {
+        public Long id;
+        public String name;
+        public List<Role> roles;
+    }
+
+    @QueryEntity
+    public static class Role {
+        public Long id;
+        public String name;
+        public List<SecurityGroup> groups;
+    }
+
+    @QueryEntity
+    public static class SecurityGroup {
+        public Long id;
+        public String name;
+
+        public SecurityGroup(Long id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+    }
+
+    public static class UserDto {
+        public Long id;
+        public String name;
+        public List<Long> roleIds;
+        public List<String> roleNames;
+        public List<Long> secIds;
+
+        @QueryProjection
+        public UserDto(Long id, String name, List<Long> roleIds, List<String> roleNames, List<Long> secIds) {
+            this.id = id;
+            this.name = name;
+            this.roleIds = roleIds;
+            this.roleNames = roleNames;
+            this.secIds = secIds;
+        }
+
+        @QueryProjection
+        public UserDto(Long id, String name, Map<Long, String> roles, Map<Long, String> groups) {
+            this.id = id;
+            this.name = name;
+            this.roleIds = new ArrayList<>(roles.keySet());
+            this.roleNames = new ArrayList<>(roles.values());
+            this.secIds = new ArrayList<>(groups.keySet());
+        }
+    }
+
+    private List<User> users;
+
+    @Before
+    public void setUp() {
+        Role r1 = new Role();
+        r1.id = 1L;
+        r1.name = "User";
+        r1.groups = Arrays.asList(new SecurityGroup(1L, "User 1"));
+
+        Role r2 = new Role();
+        r2.id = 2L;
+        r2.name = null; // NOTE this is null on purpose
+        r2.groups = Arrays.asList(new SecurityGroup(2L, "Admin 1"),
+                                       new SecurityGroup(3L, "Admin 2"));
+
+        User u1 = new User();
+        u1.id = 3L;
+        u1.name = "Bob";
+        u1.roles = Arrays.asList(r1);
+
+        User u2 = new User();
+        u2.id = 32L;
+        u2.name = "Ann";
+        u2.roles = Arrays.asList(r1, r2);
+
+        users = Arrays.asList(u1, u2);
+    }
+
+    @Test
+    public void test() {
+        QGroupBy2Test_User user = QGroupBy2Test_User.user;
+        QGroupBy2Test_Role role = QGroupBy2Test_Role.role;
+        QGroupBy2Test_SecurityGroup group = QGroupBy2Test_SecurityGroup.securityGroup;
+
+        Map<Long, UserDto> userDtos = CollQueryFactory.from(user, users)
+                .innerJoin(user.roles, role)
+                .innerJoin(role.groups, group)
+                .transform(GroupBy.groupBy(user.id)
+                    .as(new QGroupBy2Test_UserDto(
+                            user.id,
+                            user.name,
+                            list(role.id),
+                            list(role.name),
+                            list(group.id))));
+
+        UserDto dto1 = userDtos.get(3L);
+        assertEquals(1, dto1.roleIds.size());
+        assertEquals(1, dto1.roleNames.size());
+        assertEquals(1, dto1.secIds.size());
+
+        UserDto dto2 = userDtos.get(32L);
+        assertEquals(3, dto2.roleIds.size());
+        assertEquals(1, dto2.roleNames.size());
+        assertEquals(3, dto2.secIds.size());
+    }
+
+    @Test
+    public void test2() {
+        QGroupBy2Test_User user = QGroupBy2Test_User.user;
+        QGroupBy2Test_Role role = QGroupBy2Test_Role.role;
+        QGroupBy2Test_SecurityGroup group = QGroupBy2Test_SecurityGroup.securityGroup;
+
+        Map<Long, UserDto> userDtos = CollQueryFactory.from(user, users)
+                .innerJoin(user.roles, role)
+                .innerJoin(role.groups, group)
+                .transform(GroupBy.groupBy(user.id)
+                    .as(new QGroupBy2Test_UserDto(
+                            user.id,
+                            user.name,
+                            map(role.id, role.name),
+                            map(group.id, group.name))));
+
+        UserDto dto1 = userDtos.get(3L);
+        assertEquals(1, dto1.roleIds.size());
+        assertEquals(1, dto1.roleNames.size());
+        assertEquals(1, dto1.secIds.size());
+
+        UserDto dto2 = userDtos.get(32L);
+        assertEquals(2, dto2.roleIds.size());
+        assertEquals(2, dto2.roleNames.size());
+        assertEquals(3, dto2.secIds.size());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java
new file mode 100644
index 0000000000..362c5ffc33
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java
@@ -0,0 +1,101 @@
+package com.querydsl.collections;
+
+import static com.querydsl.core.group.GroupBy.groupBy;
+import static com.querydsl.core.group.GroupBy.set;
+import static org.easymock.EasyMock.*;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.types.Projections;
+
+public class GroupBy3Test {
+
+    @QueryEntity
+    public static class RiskAnalysis {
+        public String id;
+        public Set<AssetThreat> assetThreats;
+    }
+
+    @QueryEntity
+    public static class AssetThreat {
+        public String id;
+        public Set<Threat> threats;
+    }
+
+    @QueryEntity
+    public static class Threat {
+        public String id;
+    }
+
+    @Test
+    public void nested_expressions() {
+        QGroupBy3Test_RiskAnalysis riskAnalysis = QGroupBy3Test_RiskAnalysis.riskAnalysis;
+        QGroupBy3Test_AssetThreat assetThreat = QGroupBy3Test_AssetThreat.assetThreat;
+        QGroupBy3Test_Threat threat = QGroupBy3Test_Threat.threat;
+
+        ResultTransformer<Map<String,RiskAnalysis>> transformer =
+                groupBy(riskAnalysis.id)
+                  .as(Projections.bean(RiskAnalysis.class,
+                          riskAnalysis.id,
+                          set(Projections.bean(AssetThreat.class,
+                              assetThreat.id,
+                              set(Projections.bean(Threat.class, threat.id)).as("threats")))
+                          .as("assetThreats")));
+
+        CloseableIterator iter = createMock(CloseableIterator.class);
+        FetchableQuery projectable = createMock(FetchableQuery.class);
+        expect(projectable.select(Projections.tuple(
+                riskAnalysis.id,
+                riskAnalysis.id,
+                assetThreat.id,
+                Projections.bean(Threat.class, threat.id))))
+            .andReturn(projectable);
+        expect(projectable.iterate()).andReturn(iter);
+        expect(iter.hasNext()).andReturn(false);
+        iter.close();
+        replay(iter, projectable);
+
+        transformer.transform(projectable);
+        verify(projectable);
+    }
+
+    @Test
+    public void alias_usage() {
+        QGroupBy3Test_RiskAnalysis riskAnalysis = QGroupBy3Test_RiskAnalysis.riskAnalysis;
+        QGroupBy3Test_AssetThreat assetThreat = QGroupBy3Test_AssetThreat.assetThreat;
+        QGroupBy3Test_Threat threat = QGroupBy3Test_Threat.threat;
+
+        ResultTransformer<Map<String,Group>> transformer =
+                groupBy(riskAnalysis.id)
+                  .as(riskAnalysis.id,
+                      set(Projections.bean(AssetThreat.class,
+                          assetThreat.id,
+                           set(Projections.bean(Threat.class, threat.id)).as("threats"))
+                          .as("assetThreats")));
+
+        CloseableIterator iter = createMock(CloseableIterator.class);
+        FetchableQuery projectable = createMock(FetchableQuery.class);
+        expect(projectable.select(Projections.tuple(
+                riskAnalysis.id,
+                riskAnalysis.id,
+                assetThreat.id,
+                Projections.bean(Threat.class, threat.id))))
+            .andReturn(projectable);
+        expect(projectable.iterate()).andReturn(iter);
+        expect(iter.hasNext()).andReturn(false);
+        iter.close();
+        replay(iter, projectable);
+
+        transformer.transform(projectable);
+        verify(projectable);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java
new file mode 100644
index 0000000000..16d4f79084
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.collections;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.group.guava.GuavaGroupBy;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import static com.querydsl.core.group.GroupBy.list;
+import static com.querydsl.core.group.guava.GuavaGroupBy.groupBy;
+import static com.querydsl.core.group.guava.GuavaGroupBy.map;
+import static org.junit.Assert.assertEquals;
+
+
+public class GroupBy4Test {
+
+    @QueryEntity
+    public static class Table {
+        String col1, col2, col3;
+
+        public Table(String c1, String c2, String c3) {
+            col1 = c1;
+            col2 = c2;
+            col3 = c3;
+        }
+    }
+
+    @Test
+    public void test() {
+        List<Table> data = new ArrayList<>();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        Map<String, Map<String, String>> grouped = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).as(map(table.col2, table.col3)));
+
+        assertEquals(3, grouped.size());
+        assertEquals(2, grouped.get("1").size());
+        assertEquals(new HashSet<>(Arrays.asList("abc", "pqr")),  grouped.get("1").keySet());
+
+    }
+
+    @Test
+    public void test2() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        Multimap<String, String> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).asMultimap(table.col2));
+
+        Multimap<String, String> expected = HashMultimap.create(
+                ImmutableMultimap.<String, String> builder()
+                        .putAll("1", "abc", "pqr")
+                        .putAll("2", "abc", "pqr")
+                        .putAll("3", "abc", "pqr")
+                        .build());
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test3() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        Multimap<String, Map<String, String>> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).asMultimap(
+                        map(table.col2, table.col3)
+                ));
+
+        HashMultimap<String, Map<String, String>> expected = HashMultimap.create(ImmutableMultimap.<String, Map<String, String>>builder()
+                .putAll("1", ImmutableMap.of("abc", "111"), ImmutableMap.of("pqr", "222"))
+                .putAll("2", ImmutableMap.of("abc", "333"), ImmutableMap.of("pqr", "444"))
+                .putAll("3", ImmutableMap.of("abc", "555"), ImmutableMap.of("pqr", "666"))
+                .build()
+        );
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test4() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        com.google.common.collect.Table<String, String, String> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).asTable(table.col2, table.col3));
+
+        ImmutableTable<String, String, String> expected = ImmutableTable.<String, String, String> builder()
+                .put("1", "abc", "111")
+                .put("1", "pqr", "222")
+                .put("2", "abc", "333")
+                .put("2", "pqr", "444")
+                .put("3", "abc", "555")
+                .put("3", "pqr", "666")
+                .build();
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test5() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+        data.add(new Table("3", "pqr", "777"));
+
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        com.google.common.collect.Table<String, String, List<String>> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).asTable(table.col2, list(table.col3)));
+
+        ImmutableTable<String, String, List<String>> expected = ImmutableTable.<String, String, List<String>> builder()
+                .put("1", "abc", ImmutableList.of("111"))
+                .put("1", "pqr", ImmutableList.of("222"))
+                .put("2", "abc", ImmutableList.of("333"))
+                .put("2", "pqr", ImmutableList.of("444"))
+                .put("3", "abc", ImmutableList.of("555"))
+                .put("3", "pqr", ImmutableList.of("666", "777"))
+                .build();
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test6() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+        data.add(new Table("3", "pqr", "777"));
+
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        Map<String, Multimap<String, String>> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).as(GuavaGroupBy.multimap(table.col2, table.col3)));
+
+        ImmutableMap<String, Multimap<String, String>> expected = ImmutableMap.<String, Multimap<String, String>> builder()
+                .put("1", HashMultimap.create(ImmutableMultimap.<String, String> builder().putAll("abc", "111").putAll("pqr", "222").build()))
+                .put("2", HashMultimap.create(ImmutableMultimap.<String, String> builder().putAll("abc", "333").putAll("pqr", "444").build()))
+                .put("3", HashMultimap.create(ImmutableMultimap.<String, String> builder().putAll("abc", "555").putAll("pqr", "666", "777").build()))
+                .build();
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test7() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+        data.add(new Table("3", "pqr", "777"));
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        Map<String, com.google.common.collect.Table<String, String, Map<String, List<String>>>> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).as(GuavaGroupBy.table(
+                        table.col1, table.col2, map(table.col2, list(table.col3)))));
+
+        ImmutableMap<String, com.google.common.collect.Table<String, String, Map<String, List<String>>>> expected =
+                ImmutableMap.<String, com.google.common.collect.Table<String, String, Map<String, List<String>>>>builder()
+                .put("1", ImmutableTable.<String, String, Map<String, List<String>>>builder()
+                        .put("1", "abc", ImmutableMap.<String, List<String>> of("abc", ImmutableList.of("111")))
+                        .put("1", "pqr", ImmutableMap.<String, List<String>> of("pqr", ImmutableList.of("222")))
+                        .build())
+                .put("2", ImmutableTable.<String, String, Map<String, List<String>>>builder()
+                        .put("2", "abc", ImmutableMap.<String, List<String>> of("abc", ImmutableList.of("333")))
+                        .put("2", "pqr", ImmutableMap.<String, List<String>> of("pqr", ImmutableList.of("444")))
+                        .build())
+                .put("3", ImmutableTable.<String, String, Map<String, List<String>>>builder()
+                        .put("3", "abc", ImmutableMap.<String, List<String>> of("abc", ImmutableList.of("555")))
+                        .put("3", "pqr", ImmutableMap.<String, List<String>> of("pqr", ImmutableList.of("666", "777")))
+                        .build())
+                .build();
+
+        assertEquals(expected, transform);
+    }
+
+    @Test
+    public void test8() {
+        List<Table> data = Lists.newArrayList();
+        data.add(new Table("1", "abc", "111"));
+        data.add(new Table("1", "pqr", "222"));
+        data.add(new Table("2", "abc", "333"));
+        data.add(new Table("2", "pqr", "444"));
+        data.add(new Table("3", "abc", "555"));
+        data.add(new Table("3", "pqr", "666"));
+        data.add(new Table("3", "pqr", "777"));
+
+        QGroupBy4Test_Table table = QGroupBy4Test_Table.table;
+        com.google.common.collect.Table<String, Map<String, String>, List<String>> transform = CollQueryFactory
+                .from(table, data)
+                .transform(groupBy(table.col1).asTable(map(table.col1, table.col2), GuavaGroupBy.list(table.col3)));
+
+        ImmutableTable<String, Map<String, String>, List<String>> expected = ImmutableTable.<String, Map<String, String>, List<String>> builder()
+                .put("1", ImmutableMap.of("1", "abc"), ImmutableList.of("111"))
+                .put("1", ImmutableMap.of("1", "pqr"), ImmutableList.of("222"))
+                .put("2", ImmutableMap.of("2", "abc"), ImmutableList.of("333"))
+                .put("2", ImmutableMap.of("2", "pqr"), ImmutableList.of("444"))
+                .put("3", ImmutableMap.of("3", "abc"), ImmutableList.of("555"))
+                .put("3", ImmutableMap.of("3", "pqr"), ImmutableList.of("666", "777"))
+                .build();
+
+        assertEquals(expected, transform);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java
new file mode 100644
index 0000000000..f88d0d8323
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+
+import static com.querydsl.core.group.GroupBy.*;
+import static org.junit.Assert.*;
+
+import java.util.*;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.group.Group;
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Projections;
+
+public class GroupByTest {
+
+    private static final List<User> users = Arrays.asList(new User("Bob"), new User("Jane"), new User("Jack"));
+
+    private static final List<Post> posts = Arrays.asList(
+            new Post(1, "Post 1", users.get(0)),
+            new Post(2, "Post 2", users.get(0)),
+            new Post(3, "Post 3", users.get(1)));
+
+    private static final List<Comment> comments = Arrays.asList(
+            new Comment(1, "Comment 1", users.get(0), posts.get(0)),
+            new Comment(2, "Comment 2", users.get(1), posts.get(1)),
+            new Comment(3, "Comment 3", users.get(2), posts.get(1)),
+            new Comment(4, "Comment 4", users.get(0), posts.get(2)),
+            new Comment(5, "Comment 5", users.get(1), posts.get(2)),
+            new Comment(6, "Comment 6", users.get(2), posts.get(2)));
+
+    private static final QUser user = QUser.user;
+
+    private static final QComment comment = QComment.comment;
+
+    private static final QPost post = QPost.post;
+
+    private static final ConstructorExpression<Comment> qComment = QComment.create(comment.id, comment.text);
+
+    @Test
+    public void group_min() {
+        Map<Integer, String> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(min(comment.text)));
+
+        assertEquals("Comment 1", results.get(1));
+        assertEquals("Comment 2", results.get(2));
+        assertEquals("Comment 4", results.get(3));
+    }
+
+    public void comments_by_post() {
+        Map<Integer, List<Comment>> results = CollQueryFactory.from(post, posts).from(comment, comments)
+                .where(comment.post.id.eq(post.id))
+                .transform(groupBy(post.id).as(list(comment)));
+
+        assertEquals(1,  results.get(1).size());
+        assertEquals(2,  results.get(2).size());
+        assertEquals(3, results.get(3).size());
+    }
+
+    @Test
+    public void group_max() {
+        Map<Integer, String> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(max(comment.text)));
+
+        assertEquals("Comment 1", results.get(1));
+        assertEquals("Comment 3", results.get(2));
+        assertEquals("Comment 6", results.get(3));
+    }
+
+    @Test
+    public void group_sum() {
+        Map<Integer, Integer> results = CollQueryFactory.from(post, posts).from(comment, comments)
+                .where(comment.post.id.eq(post.id))
+                .transform(groupBy(post.id).as(sum(comment.id)));
+
+        assertEquals(1,  results.get(1).intValue());
+        assertEquals(5,  results.get(2).intValue());
+        assertEquals(15, results.get(3).intValue());
+    }
+
+    @Test
+    public void group_avg() {
+        Map<Integer, Integer> results = CollQueryFactory.from(post, posts).from(comment, comments)
+                .where(comment.post.id.eq(post.id))
+                .transform(groupBy(post.id).as(avg(comment.id)));
+
+        assertEquals(1,  results.get(1).intValue());
+        assertEquals(2,  results.get(2).intValue());
+        assertEquals(5, results.get(3).intValue());
+    }
+
+    @Test
+    public void group_order() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, set(comment.id)));
+
+        assertEquals(3, results.size());
+    }
+
+    @Test
+    public void first_set_and_list() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
+
+        Group group = results.get(1);
+        assertEquals(toInt(1), group.getOne(post.id));
+        assertEquals("Post 1", group.getOne(post.name));
+        assertEquals(toSet(1), group.getSet(comment.id));
+        assertEquals(Collections.singletonList("Comment 1"), group.getList(comment.text));
+    }
+
+    @Test
+    @Ignore
+    public void group_by_null() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
+
+        Group group = results.get(null);
+        assertNull(group.getOne(post.id));
+        assertEquals("null post", group.getOne(post.name));
+        assertEquals(toSet(7, 8), group.getSet(comment.id));
+        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(comment.text));
+
+    }
+
+//    @Test(expected=NoSuchElementException.class)
+//    public void noSuchElementException() {
+//        Map<Integer, Group> results = BASIC_RESULTS.transform(
+//            groupBy(postId, postName, set(commentId), list(commentText)));
+//
+//        Group group = results.get(1);
+//        group.getSet(qComment);
+//    }
+
+    @Test(expected = ClassCastException.class)
+    public void classCastException() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
+
+        Group group = results.get(1);
+        group.getList(comment.id);
+    }
+
+    @Test
+    @Ignore
+    public void map_() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, map(comment.id, comment.text)));
+
+        Group group = results.get(1);
+        Map<Integer, String> comments = group.getMap(comment.id, comment.text);
+        assertEquals(1, comments.size());
+//        assertEquals("comment 2", comments.get(2));
+    }
+
+    @Test
+    public void array_access() {
+        Map<Integer, Group> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text)));
+
+        Group group = results.get(1);
+        Object[] array = group.toArray();
+        assertEquals(toInt(1), array[0]);
+        assertEquals("Post 1", array[1]);
+        assertEquals(toSet(1), array[2]);
+        assertEquals(Collections.singletonList("Comment 1"), array[3]);
+    }
+
+    @Test
+    public void transform_results() {
+        Map<Integer, Post> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(QPost.create(post.id, post.name, set(qComment))));
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(1, post.getId());
+        assertEquals("Post 1", post.getName());
+        assertEquals(1, post.getComments().size());
+    }
+
+    @Test
+    public void transform_as_bean() {
+        Map<Integer, Post> results = CollQueryFactory.from(post, posts).from(comment, comments)
+            .where(comment.post.id.eq(post.id))
+            .transform(groupBy(post.id).as(Projections.bean(Post.class, post.id, post.name, set(qComment).as("comments"))));
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(1, post.getId());
+        assertEquals("Post 1", post.getName());
+        assertEquals(1, post.getComments().size());
+    }
+
+
+    @Test
+    public void oneToOneToMany_projection() {
+        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
+            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
+            .transform(groupBy(user.name).as(Projections.constructor(User.class, user.name,
+                    QPost.create(post.id, post.name, set(qComment)))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(3, post.getId());
+        assertEquals("Post 3", post.getName());
+        assertEquals(3, post.getComments().size());
+    }
+
+
+    @Test
+    public void oneToOneToMany_projection_as_bean() {
+        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
+            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
+            .transform(groupBy(user.name).as(Projections.bean(User.class, user.name,
+                    Projections.bean(Post.class, post.id, post.name, set(qComment).as("comments")).as("latestPost"))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(3, post.getId());
+        assertEquals("Post 3", post.getName());
+        assertEquals(3, post.getComments().size());
+    }
+
+    @Test
+    public void oneToOneToMany_projection_as_bean_and_constructor() {
+        Map<String, User> results = CollQueryFactory.from(user, users).from(post, posts).from(comment, comments)
+            .where(user.name.eq(post.user.name), post.id.eq(comment.post.id))
+            .transform(groupBy(user.name).as(Projections.bean(User.class, user.name,
+                QPost.create(post.id, post.name, set(qComment)).as("latestPost"))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(3, post.getId());
+        assertEquals("Post 3", post.getName());
+        assertEquals(3, post.getComments().size());
+    }
+
+    private Integer toInt(int i) {
+        return i;
+    }
+
+    private <T >Set<T> toSet(T... s) {
+        return new HashSet<T>(Arrays.asList(s));
+    }
+
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java
new file mode 100644
index 0000000000..940313f5fa
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+public class InnerClassTest {
+
+    public static class Example {
+
+        public String getId() {
+            return null;
+        }
+    }
+
+    @Test
+    public void query() {
+        Example example = alias(Example.class);
+        assertFalse(CollQueryFactory.<Example> from($(example), Collections.<Example>singletonList(new Example()))
+                .where($(example.getId()).isNull())
+                .fetch().isEmpty());
+        assertTrue(CollQueryFactory.<Example> from($(example), Collections.<Example>singletonList(new Example()))
+                .where($(example.getId()).isNotNull())
+                .fetch().isEmpty());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java
similarity index 85%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java
index f197d08b93..d47ff18cf0 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/InnerJoinTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -25,7 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class InnerJoinTest extends AbstractQueryTest{
+public class InnerJoinTest extends AbstractQueryTest {
 
     private QCat cat, kitten;
 
@@ -50,36 +50,36 @@ public void setUp() {
     }
 
     @Test
-    public void List() {
+    public void list() {
         List<Cat> rv = CollQueryFactory.from(cat, cats)
             .innerJoin(cat.kittens, kitten)
             .where(cat.name.eq(kitten.name))
             .orderBy(cat.name.asc())
-            .list(cat);
+            .fetch();
         assertEquals("Bob", rv.get(0).getName());
         assertEquals("Kate", rv.get(1).getName());
 
     }
-        
+
     @Test
-    public void Alias() {
+    public void alias_() {
         Cat cc = alias(Cat.class, "cat1");
         Cat ck = alias(Cat.class, "cat2");
         List<Cat> rv =  CollQueryFactory.from($(cc), cats)
                         .innerJoin($(cc.getKittens()), $(ck))
                         .where($(cc.getName()).eq($(ck.getName())))
-                        .list($(cc));
+                        .fetch();
         assertFalse(rv.isEmpty());
     }
 
 
     @Test
-    public void Map() {
+    public void map() {
         List<Cat> rv = CollQueryFactory.from(cat, cats)
             .innerJoin(cat.kittensByName, kitten)
             .where(cat.name.eq(kitten.name))
             .orderBy(cat.name.asc())
-            .list(cat);
+            .fetch();
         assertEquals("Bob", rv.get(0).getName());
         assertEquals("Kate", rv.get(1).getName());
     }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java
new file mode 100644
index 0000000000..a4f924eaa9
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class IterationTest {
+
+    public static class Data {
+
+        private String data = "data";
+
+        public String getData() {
+            return data;
+        }
+
+    }
+
+    private List<Data> allData = Arrays.asList(new Data(), new Data());
+
+    private Data lt = alias(Data.class,"Data");
+
+    private List<String> expected = Arrays.asList("data","data");
+
+    @Test
+    public void test() {
+        assertEquals(expected, CollQueryFactory.from($(lt), allData).select($(lt.getData())).fetch());
+    }
+
+    @Test
+    public void test2() {
+        assertEquals(expected, CollQueryFactory.<Data> from($(lt), Arrays.<Data> asList(allData.toArray(new Data[0]))).select($(lt.getData())).fetch());
+    }
+
+    @Test
+    public void test3() {
+        assertEquals(expected, CollQueryFactory.from(lt, allData).select($(lt.getData())).fetch());
+    }
+
+    @Test
+    public void test4() {
+        assertEquals(expected, CollQueryFactory.<Data> from(lt, Arrays.<Data> asList(allData.toArray(new Data[0]))).select($(lt.getData())).fetch());
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/JacocoTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java
similarity index 78%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/JacocoTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java
index b0e4d9b471..00651842c3 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/JacocoTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java
@@ -1,19 +1,20 @@
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
 
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.path.EntityPathBase;
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.dsl.EntityPathBase;
 
 public class JacocoTest {
-    
-    public static class CloneableVO {}
-    
+
+    public static class CloneableVO { }
+
     public static class CloneableKlasse implements Cloneable {
         private CloneableVO value;
         private Integer otherValue;
@@ -43,9 +44,9 @@ public Object clone() {
             }
         }
     }
-    
+
     @Test
-    public void WithSimpleClass() {
+    public void withSimpleClass() {
         List<CloneableKlasse> vos = new ArrayList<CloneableKlasse>();
         for (int i = 0; i < 5; i++) {
             CloneableKlasse vo = new CloneableKlasse();
@@ -54,12 +55,12 @@ public void WithSimpleClass() {
         }
         CloneableKlasse vo = Alias.alias(CloneableKlasse.class, "vo");
         assertNotNull(vo);
-        CollQuery query = new CollQuery();
+        CollQuery<?> query = new CollQuery<Void>();
         final EntityPathBase<CloneableKlasse> fromVo = Alias.$(vo);
         assertNotNull(fromVo);
         query.from(fromVo, vos);
         query.where(Alias.$(vo.getOtherValue()).eq(1));
-        List<CloneableKlasse> result = query.list(Alias.$(vo));
+        List<CloneableKlasse> result = query.select(Alias.$(vo)).fetch();
 
         assertNotNull(result);
         assertEquals(1, result.size());
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/JodaTimeTemplatesTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/JodaTimeTemplatesTest.java
new file mode 100644
index 0000000000..ccfe4859bc
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/JodaTimeTemplatesTest.java
@@ -0,0 +1,46 @@
+package com.querydsl.collections;
+
+import java.util.Arrays;
+
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.TimePath;
+
+public class JodaTimeTemplatesTest {
+
+    private CollQuery<?> query = new CollQuery<Void>(JodaTimeTemplates.DEFAULT);
+
+    @Test
+    public void dateTime() {
+        DateTimePath<DateTime> entity = Expressions.dateTimePath(DateTime.class, "entity");
+        query.from(entity, Arrays.asList(new DateTime(), new DateTime(0L)))
+             .select(entity.year(), entity.yearMonth(), entity.month(), entity.week(),
+                   entity.dayOfMonth(), entity.dayOfWeek(), entity.dayOfYear(),
+                   entity.hour(), entity.minute(), entity.second(), entity.milliSecond())
+             .fetch();
+    }
+
+    @Test
+    public void localDate() {
+        DatePath<LocalDate> entity = Expressions.datePath(LocalDate.class, "entity");
+        query.from(entity, Arrays.asList(new LocalDate(), new LocalDate(0L)))
+             .select(entity.year(), entity.yearMonth(), entity.month(), entity.week(),
+                   entity.dayOfMonth(), entity.dayOfWeek(), entity.dayOfYear())
+             .fetch();
+    }
+
+    @Test
+    public void localTime() {
+        TimePath<LocalTime> entity = Expressions.timePath(LocalTime.class, "entity");
+        query.from(entity, Arrays.asList(new LocalTime(), new LocalTime(0L)))
+             .select(entity.hour(), entity.minute(), entity.second(), entity.milliSecond())
+             .fetch();
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/LeftJoinTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java
similarity index 87%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/LeftJoinTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java
index 7438207241..5d2b7ecde9 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/LeftJoinTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -50,36 +50,36 @@ public void setUp() {
     }
 
     @Test
-    public void List() {
+    public void list() {
         List<Cat> rv = CollQueryFactory.from(cat, cats)
             .leftJoin(cat.kittens, kitten)
             .where(kitten.isNotNull(), cat.name.eq(kitten.name))
             .orderBy(cat.name.asc())
-            .list(cat);
-        
+            .fetch();
+
         assertEquals(1, rv.size());
         assertEquals("Bob", rv.get(0).getName());
     }
-        
+
     @Test
-    public void Alias() {
+    public void alias_() {
         Cat cc = alias(Cat.class, "cat1");
         Cat ck = alias(Cat.class, "cat2");
         List<Cat> rv =  CollQueryFactory.from($(cc), cats)
                         .leftJoin($(cc.getKittens()), $(ck))
                         .where($(ck).isNotNull(), $(cc.getName()).eq($(ck.getName())))
-                        .list($(cc));
+                        .fetch();
         assertFalse(rv.isEmpty());
     }
 
 
     @Test
-    public void Map() {
+    public void map() {
         List<Cat> rv = CollQueryFactory.from(cat, cats)
             .leftJoin(cat.kittensByName, kitten)
             .where(cat.name.eq(kitten.name))
             .orderBy(cat.name.asc())
-            .list(cat);
+            .fetch();
         assertEquals("Bob", rv.get(0).getName());
         assertEquals("Kate", rv.get(1).getName());
     }
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/LoadTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java
similarity index 79%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/LoadTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java
index 678e1fa083..5e0f63729d 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/LoadTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,10 +21,13 @@
 import java.util.List;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.testutil.Performance;
 
+@Category(Performance.class)
 public class LoadTest {
 
     private QCat cat = QCat.cat;
@@ -34,13 +37,13 @@ public class LoadTest {
     private QueryMetadata metadata = new DefaultQueryMetadata();
 
     @Test
-    public void Creation() {
+    public void creation() {
         System.out.println("Evaluator creation #1");
         for (int i = 0; i < 5; i++) {
             long s = System.currentTimeMillis();
             evaluatorFactory.create(metadata, Collections.singletonList(cat), cat.name.startsWith("Bob"));
             long e = System.currentTimeMillis();
-            System.out.println(" " + (e-s)+"ms");
+            System.out.println(" " + (e - s) + "ms");
         }
         System.out.println();
 
@@ -49,7 +52,7 @@ public void Creation() {
             long s = System.currentTimeMillis();
             evaluatorFactory.create(metadata, Collections.singletonList(cat), cat.name.startsWith("Bob" + i));
             long e = System.currentTimeMillis();
-            System.out.println(" " + (e-s)+"ms");
+            System.out.println(" " + (e - s) + "ms");
         }
         System.out.println();
     }
@@ -71,10 +74,10 @@ public void test() {
         System.out.println("Querydsl iteration");
         for (int i = 0; i < 5; i++) {
             long s1 = System.currentTimeMillis();
-            List<Cat> bobs1 = CollQueryFactory.from(cat, data).where(cat.name.startsWith("Bob")).list(cat);
+            List<Cat> bobs1 = CollQueryFactory.from(cat, data).where(cat.name.startsWith("Bob")).fetch();
             assertEquals(1000, bobs1.size());
             long e1 = System.currentTimeMillis();
-            System.out.println(" " + (e1-s1)+"ms");
+            System.out.println(" " + (e1 - s1) + "ms");
         }
         System.out.println();
 
@@ -84,11 +87,13 @@ public void test() {
             long s2 = System.currentTimeMillis();
             List<Cat> bobs2 = new ArrayList<Cat>();
             for (Cat c : data) {
-                if (c.getName().startsWith("Bob")) bobs2.add(c);
+                if (c.getName().startsWith("Bob")) {
+                    bobs2.add(c);
+                }
             }
             assertEquals(1000, bobs2.size());
             long e2 = System.currentTimeMillis();
-            System.out.println(" " + (e2-s2)+"ms");
+            System.out.println(" " + (e2 - s2) + "ms");
         }
         System.out.println();
     }
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java
new file mode 100644
index 0000000000..f160ac3303
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java
@@ -0,0 +1,48 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.MappingProjection;
+
+@SuppressWarnings("serial")
+public class MappingProjectionTest extends AbstractQueryTest {
+
+    public class ResultPart {
+
+    }
+
+    public class ResultObject {
+
+    }
+
+    @Test
+    public void test() {
+        final MappingProjection<ResultPart> key = new MappingProjection<ResultPart>(ResultPart.class,
+                cat.name) {
+
+            @Override
+            protected ResultPart map(Tuple row) {
+                return new ResultPart();
+            }
+
+        };
+
+        List<ResultObject> list = query().from(cat, cats).select(
+            new MappingProjection<ResultObject>(ResultObject.class, key) {
+
+                @Override
+                protected ResultObject map(Tuple row) {
+                    ResultPart consolidationKey = row.get(key);
+                    return new ResultObject();
+                }
+            }).fetch();
+
+        assertEquals(cats.size(), list.size());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java
new file mode 100644
index 0000000000..c8eeabb825
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java
@@ -0,0 +1,69 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.MathExpressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class MathTest {
+
+    private NumberPath<Double> num = Expressions.numberPath(Double.class, "num");
+
+    @Test
+    public void math() {
+        Expression<Double> expr = num;
+
+        assertEquals(Math.acos(0.5), unique(MathExpressions.acos(expr)), 0.001);
+        assertEquals(Math.asin(0.5), unique(MathExpressions.asin(expr)), 0.001);
+        assertEquals(Math.atan(0.5), unique(MathExpressions.atan(expr)), 0.001);
+        assertEquals(Math.cos(0.5),  unique(MathExpressions.cos(expr)), 0.001);
+        assertEquals(Math.cosh(0.5), unique(MathExpressions.cosh(expr)), 0.001);
+        assertEquals(cot(0.5),       unique(MathExpressions.cot(expr)), 0.001);
+        assertEquals(coth(0.5),      unique(MathExpressions.coth(expr)), 0.001);
+        assertEquals(degrees(0.5),   unique(MathExpressions.degrees(expr)), 0.001);
+        assertEquals(Math.exp(0.5),  unique(MathExpressions.exp(expr)), 0.001);
+        assertEquals(Math.log(0.5),  unique(MathExpressions.ln(expr)), 0.001);
+        assertEquals(log(0.5, 10),   unique(MathExpressions.log(expr, 10)), 0.001);
+        assertEquals(0.25,           unique(MathExpressions.power(expr, 2)), 0.001);
+        assertEquals(radians(0.5),   unique(MathExpressions.radians(expr)), 0.001);
+        assertEquals(Integer.valueOf(1),
+                                     unique(MathExpressions.sign(expr)));
+        assertEquals(Math.sin(0.5),  unique(MathExpressions.sin(expr)), 0.001);
+        assertEquals(Math.sinh(0.5), unique(MathExpressions.sinh(expr)), 0.001);
+        assertEquals(Math.tan(0.5),  unique(MathExpressions.tan(expr)), 0.001);
+        assertEquals(Math.tanh(0.5), unique(MathExpressions.tanh(expr)), 0.001);
+
+    }
+
+    private double cot(double x) {
+        return Math.cos(x) / Math.sin(x);
+    }
+
+    private double coth(double x) {
+        return Math.cosh(x) / Math.sinh(x);
+    }
+
+    private double degrees(double x) {
+        return x * 180.0 / Math.PI;
+    }
+
+    private double radians(double x) {
+        return x * Math.PI / 180.0;
+    }
+
+    private double log(double x, int y) {
+        return Math.log(x) / Math.log(y);
+    }
+
+    private <T> T unique(Expression<T> expr) {
+        //return query().fetchOne(expr);
+        return CollQueryFactory.<Double> from(num, Collections.singletonList(0.5)).select(expr).fetchOne();
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java
new file mode 100644
index 0000000000..64fe6a8d0e
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimplePath;
+
+public class MockTest {
+
+    @Test
+    public void test() {
+        List<MockTest> tests = Arrays.asList(new MockTest(), new MockTest(), new MockTest());
+        SimplePath<MockTest> path = Expressions.path(MockTest.class, "obj");
+        MockTest mock = EasyMock.createMock(MockTest.class);
+        assertTrue(CollQueryFactory.from(path, tests).where(path.eq(mock)).fetch().isEmpty());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/MultiComparatorTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java
similarity index 81%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/MultiComparatorTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java
index 577c680a36..0714878981 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/MultiComparatorTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.mysema.codegen.Evaluator;
-import com.mysema.query.collections.MultiComparator;
+import com.querydsl.codegen.utils.Evaluator;
 
 public class MultiComparatorTest {
-    
+
     private final Evaluator<Object[]> evaluator = new Evaluator<Object[]>() {
         @Override
         public Object[] evaluate(Object... args) {
@@ -30,12 +29,13 @@ public Object[] evaluate(Object... args) {
         @Override
         public Class<? extends Object[]> getType() {
             return Object[].class;
-        }            
+        }
     };
-    
+
     @Test
     public void test() {
-        MultiComparator<Object[]> comparator = new MultiComparator<Object[]>(evaluator, new boolean[]{true, true});
+        MultiComparator<Object[]> comparator = new MultiComparator<Object[]>(evaluator, new boolean[]{true, true},
+                new boolean[]{true, true});
         assertTrue(comparator.compare(new Object[]{"a", "b"}, new Object[]{"a","c"}) < 0);
         assertTrue(comparator.compare(new Object[]{"b", "a"}, new Object[]{"a","b"}) > 0);
         assertTrue(comparator.compare(new Object[]{"b", "b"}, new Object[]{"b","b"}) == 0);
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java
new file mode 100644
index 0000000000..aaaf30dd7c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+public class NullSafetyTest extends AbstractQueryTest {
+
+    @Test
+    public void filters() {
+        QCat cat = QCat.cat;
+        CollQuery<Cat> query = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(new Cat(), new Cat("Bob")));
+        assertEquals(1L, query.where(cat.name.eq("Bob")).fetchCount());
+    }
+
+    @Test
+    public void joins() {
+        Cat kitten1 = new Cat();
+        Cat kitten2 = new Cat("Bob");
+        Cat cat1 = new Cat();
+        cat1.setKittens(Arrays.asList(kitten1, kitten2));
+        Cat cat2 = new Cat();
+
+        QCat cat = QCat.cat;
+        QCat kitten = new QCat("kitten");
+        CollQuery<Cat> query = CollQueryFactory.<Cat> from(cat, Arrays.<Cat> asList(cat1, cat2)).innerJoin(cat.kittens, kitten);
+        assertEquals(1, query.where(kitten.name.eq("Bob")).fetchCount());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java
new file mode 100644
index 0000000000..1c701f79a4
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java
@@ -0,0 +1,22 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class NumberTest {
+
+    @Test
+    public void sum() throws Exception {
+        NumberPath<BigDecimal> num = Expressions.numberPath(BigDecimal.class, "num");
+        CollQuery<BigDecimal> query = CollQueryFactory.<BigDecimal> from(num, Arrays.<BigDecimal> asList(new BigDecimal("1.6"), new BigDecimal("1.3")));
+
+        assertEquals(new BigDecimal("2.9"), query.<BigDecimal> select(num.sum()).fetchOne());
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java
new file mode 100644
index 0000000000..f515888e11
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class OrderTest extends AbstractQueryTest {
+
+    @Test
+    public void test() {
+        query().from(cat, cats).orderBy(cat.name.asc()).select(cat.name).fetch();
+        assertArrayEquals(new Object[] {"Alex", "Bob", "Francis", "Kitty"}, last.res.toArray());
+
+        query().from(cat, cats).orderBy(cat.name.desc()).select(cat.name).fetch();
+        assertArrayEquals(new Object[] {"Kitty", "Francis", "Bob", "Alex"}, last.res.toArray());
+
+        query().from(cat, cats).orderBy(cat.name.substring(1).asc()).select(cat.name).fetch();
+        assertArrayEquals(new Object[] {"Kitty", "Alex", "Bob", "Francis"}, last.res.toArray());
+
+        query().from(cat, cats).from(otherCat, cats)
+               .orderBy(cat.name.asc(), otherCat.name.desc())
+               .select(cat.name, otherCat.name).fetch();
+
+        // TODO : more tests
+    }
+
+    @Test
+    public void test2() {
+        List<String> orderedNames = Arrays.asList("Alex","Bob","Francis","Kitty");
+        assertEquals(orderedNames, query().from(cat,cats).orderBy(cat.name.asc()).select(cat.name).fetch());
+        assertEquals(orderedNames, query().from(cat,cats).orderBy(cat.name.asc()).distinct().select(cat.name).fetch());
+    }
+
+    @Test
+    public void with_count() {
+        CollQuery<?> q = new CollQuery<Void>();
+        q.from(cat, cats);
+        long size = q.distinct().fetchCount();
+        assertTrue(size > 0);
+        q.offset(0).limit(10);
+        q.orderBy(cat.name.asc());
+        assertEquals(Arrays.asList("Alex","Bob","Francis","Kitty"), q.distinct().select(cat.name).fetch());
+    }
+
+    @Test
+    public void with_null() {
+        Cat unknown = new Cat();
+        Cat bob = new Cat("Bob");
+        Cat alex = new Cat("Alex");
+        List<Cat> cats = Arrays.asList(alex, unknown, bob);
+        assertEquals(Arrays.asList(unknown, alex, bob),
+                query().from(cat, cats).orderBy(cat.name.asc()).select(cat).fetch());
+        assertEquals(Arrays.asList(unknown, bob, alex),
+                query().from(cat, cats).orderBy(cat.name.desc()).select(cat).fetch());
+    }
+
+    @Test
+    public void with_nulls_last() {
+        Cat unknown = new Cat();
+        Cat bob = new Cat("Bob");
+        Cat alex = new Cat("Alex");
+        List<Cat> cats = Arrays.asList(alex, unknown, bob);
+        assertEquals(Arrays.asList(bob, alex, unknown),
+                query().from(this.cat, cats).orderBy(this.cat.name.desc().nullsLast()).select(this.cat).fetch());
+        assertEquals(Arrays.asList(alex, bob, unknown),
+                query().from(this.cat, cats).orderBy(this.cat.name.asc().nullsLast()).select(this.cat).fetch());
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java
new file mode 100644
index 0000000000..aaa7754890
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class PagingTest extends AbstractQueryTest {
+
+    private List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+    private NumberPath<Integer> var = Expressions.numberPath(Integer.class, "var");
+
+    @Test
+    public void test() {
+        assertResultSize(9, 9, QueryModifiers.EMPTY);
+        assertResultSize(9, 2, new QueryModifiers(2L, null));
+        assertResultSize(9, 2, new QueryModifiers(2L, 0L));
+        assertResultSize(9, 2, new QueryModifiers(2L, 3L));
+        assertResultSize(9, 9, new QueryModifiers(20L, null));
+        assertResultSize(9, 9, new QueryModifiers(20L, 0L));
+        assertResultSize(9, 5, new QueryModifiers(20L, 4L));
+        assertResultSize(9, 0, new QueryModifiers(10L, 9L));
+    }
+
+    private void assertResultSize(int total, int size, QueryModifiers modifiers) {
+        // via fetch
+        assertEquals(size, createQuery(modifiers).select(var).fetch().size());
+
+        // via results
+        QueryResults<?> results = createQuery(modifiers).select(var).fetchResults();
+        assertEquals(total, results.getTotal());
+        assertEquals(size, results.getResults().size());
+
+        // via fetchCount (ignore limit and offset)
+        assertEquals(total, createQuery(modifiers).fetchCount());
+
+        // via iterator
+        assertEquals(size, IteratorAdapter.asList(createQuery(modifiers).select(var).iterate()).size());
+    }
+
+    private CollQuery<?> createQuery(QueryModifiers modifiers) {
+        CollQuery<?> query = new CollQuery<Void>().from(var, ints);
+        if (modifiers != null) {
+            query.restrict(modifiers);
+        }
+        return query;
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/PathComparatorTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java
similarity index 75%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/PathComparatorTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java
index db7ffbb917..c7f3f24202 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/PathComparatorTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java
@@ -1,6 +1,6 @@
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
-import static com.mysema.query.collections.PathComparator.pathComparator;
+import static com.querydsl.collections.PathComparator.pathComparator;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Comparator;
@@ -11,50 +11,50 @@
 public class PathComparatorTest {
 
     private Comparator<Car> comparator;
-    
+
     @Before
     public void setUpComparator() {
         comparator = pathComparator(QCar.car.horsePower);
     }
 
     @Test
-    public void EqualReference() {
+    public void equalReference() {
         Car car = new Car();
         assertEquals(0, comparator.compare(car, car));
     }
-    
+
     @Test
-    public void SemanticallyEqual() {
+    public void semanticallyEqual() {
         Car car = new Car();
         car.setModel("car");
         car.setHorsePower(50);
-        
+
         Car similarCar = new Car();
         similarCar.setModel("car");
         similarCar.setHorsePower(50);
-        
+
         assertEquals(0, comparator.compare(car, similarCar));
     }
-    
+
     @Test
-    public void LeftIsNull() {
+    public void leftIsNull() {
         assertEquals(-1, comparator.compare(null, new Car()));
     }
-    
+
     @Test
-    public void RightIsNull() {
+    public void rightIsNull() {
         assertEquals(1, comparator.compare(new Car(), null));
     }
-    
+
     @Test
-    public void CompareOnValue() {
+    public void compareOnValue() {
         Car car = new Car();
         car.setHorsePower(50);
-        
+
         Car betterCar = new Car();
         betterCar.setHorsePower(150);
-        
+
         assertEquals(-1, comparator.compare(car, betterCar));
     }
-    
+
 }
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/PathMatcherTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/PathMatcherTest.java
similarity index 82%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/PathMatcherTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/PathMatcherTest.java
index b1849d6278..a7c172f950 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/PathMatcherTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/PathMatcherTest.java
@@ -1,7 +1,7 @@
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
+import static com.querydsl.collections.PathMatcher.hasValue;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static com.mysema.query.collections.PathMatcher.hasValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
@@ -10,33 +10,33 @@
 import org.junit.Test;
 
 public class PathMatcherTest {
-    
+
     private static final QCar $ = QCar.car;
 
     @Test
-    public void Match() {
+    public void match() {
         Car car = new Car();
         car.setHorsePower(123);
-        
+
         assertThat(car, hasValue($.horsePower));
         assertThat(car, hasValue($.horsePower, equalTo(123)));
     }
-    
+
     @Test
-    public void Mismatch() {
+    public void mismatch() {
         Car car = new Car();
         car.setHorsePower(123);
-        
+
         Description mismatchDescription = new StringDescription();
         hasValue($.horsePower, equalTo(321)).describeMismatch(car, mismatchDescription);
         assertEquals("value \"car.horsePower\" was <123>", mismatchDescription.toString());
     }
-    
+
     @Test
-    public void Describe() {
+    public void describe() {
         Description description = new StringDescription();
         hasValue($.horsePower, equalTo(321)).describeTo(description);
         assertEquals("valueOf(\"car.horsePower\", <321>)", description.toString());
     }
-    
+
 }
diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/PatternsTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java
similarity index 87%
rename from querydsl-collections/src/test/java/com/mysema/query/collections/PatternsTest.java
rename to querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java
index 45a1428998..9269f0fe21 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/collections/PatternsTest.java
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.collections;
+package com.querydsl.collections;
 
 import static org.junit.Assert.assertTrue;
 
@@ -22,7 +22,7 @@
 public class PatternsTest {
 
     @Test
-    public void Matches() {
+    public void matches() {
         assertTrue(Pattern.matches("Bob","Bob"));
         assertTrue(Pattern.matches("^Bob$","Bob"));
         assertTrue(Pattern.matches("^Bo.*","Bob"));
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Person.java b/querydsl-collections/src/test/java/com/querydsl/collections/Person.java
new file mode 100644
index 0000000000..9bf494b9a1
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Person.java
@@ -0,0 +1,13 @@
+package com.querydsl.collections;
+
+public class Person {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Post.java b/querydsl-collections/src/test/java/com/querydsl/collections/Post.java
new file mode 100644
index 0000000000..a07ee2e8e6
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Post.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Set;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+
+@QueryEntity
+public class Post {
+
+    private int id;
+
+    private String name;
+
+    private User user;
+
+    private Set<Comment> comments;
+
+    public Post() { }
+
+    @QueryProjection
+    public Post(int id, String name, User user) {
+        this.id = id;
+        this.name = name;
+        this.user = user;
+    }
+
+    @QueryProjection
+    public Post(int id, String name, Set<Comment> comments) {
+        this.id = id;
+        this.name = name;
+        this.comments = comments;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Set<Comment> getComments() {
+        return comments;
+    }
+
+    public void setComments(Set<Comment> comments) {
+        this.comments = comments;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/Projection.java b/querydsl-collections/src/test/java/com/querydsl/collections/Projection.java
new file mode 100644
index 0000000000..c5633fd3a1
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/Projection.java
@@ -0,0 +1,8 @@
+package com.querydsl.collections;
+
+public class Projection {
+
+    public Projection(String str, Cat cat) {
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java
new file mode 100644
index 0000000000..3e6e41ad03
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java
@@ -0,0 +1,28 @@
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class PropertiesTest {
+
+    @Test
+    public void hidden() {
+        QStateHistory history = QStateHistory.stateHistory;
+        List<StateHistory> histories = Collections.singletonList(new StateHistory());
+        assertEquals(1, CollQueryFactory.from(history, histories)
+                .where(history.changedAt.isNull()).fetch().size());
+    }
+
+    @Test
+    public void hidden2() {
+        QStateHistoryOwner historyOwner = QStateHistoryOwner.stateHistoryOwner;
+        List<StateHistoryOwner> historyOwners = Collections.singletonList(new StateHistoryOwner());
+        assertEquals(1, CollQueryFactory.from(historyOwner, historyOwners)
+                .where(historyOwner.stateHistory.isNull()).fetch().size());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/QCar.java b/querydsl-collections/src/test/java/com/querydsl/collections/QCar.java
new file mode 100644
index 0000000000..4f10df5f9f
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/QCar.java
@@ -0,0 +1,26 @@
+package com.querydsl.collections;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QCar extends BeanPath<Car> {
+
+    public final StringPath model = createString("model");
+
+    public final NumberPath<Integer> horsePower = createNumber("horsePower", Integer.class);
+
+    public final QPerson owner = new QPerson(new BeanPath<Person>(Person.class, this, "owner"));
+
+    public static QCar car = new QCar(new BeanPath<Car>(Car.class, "car"));
+
+    public QCar(BeanPath<? extends Car> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCar(PathMetadata metadata) {
+        super(Car.class, metadata);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/QPerson.java b/querydsl-collections/src/test/java/com/querydsl/collections/QPerson.java
new file mode 100644
index 0000000000..767d56ad66
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/QPerson.java
@@ -0,0 +1,21 @@
+package com.querydsl.collections;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QPerson extends BeanPath<Person> {
+
+    public final StringPath name = createString("name");
+
+    public static QPerson car = new QPerson(new BeanPath<Person>(Person.class, "person"));
+
+    public QPerson(BeanPath<? extends Person> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QPerson(PathMetadata metadata) {
+        super(Person.class, metadata);
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java
new file mode 100644
index 0000000000..c5d7a172dd
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+
+public class QueryMetadataTest extends AbstractQueryTest {
+
+    @Test
+    public void reusage() {
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        metadata.addJoin(JoinType.DEFAULT, cat);
+        metadata.addWhere(cat.name.startsWith("A"));
+
+        CollQuery<?> query = new CollQuery<Void>(metadata);
+        query.bind(cat, cats);
+        assertEquals(Collections.singletonList(c3), query.select(cat).fetch());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java
new file mode 100644
index 0000000000..e9bfe8567a
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.QueryMutability;
+
+public class QueryMutabilityTest {
+
+    @Test
+    public void test() throws SecurityException, IllegalArgumentException,
+            NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException, IOException {
+        QCat cat = QCat.cat;
+        CollQuery<?> query = new CollQuery<Void>();
+        query.from(cat, Collections.<Cat> emptyList());
+        new QueryMutability(query).test(cat.id, cat.name);
+
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java
new file mode 100644
index 0000000000..a2dc102f10
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java
@@ -0,0 +1,67 @@
+package com.querydsl.collections;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Performance;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+@Ignore
+@Category(Performance.class)
+public class QueryPerformanceTest {
+
+    private static final int size = 1000;
+
+    private static List<Cat> cats = new ArrayList<Cat>(size);
+
+    @BeforeClass
+    public static void setUpClass() throws SQLException, ClassNotFoundException {
+        for (int i = 0; i < size; i++) {
+            cats.add(new Cat(String.valueOf(i), i));
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void benchmark1() {
+        // 15857
+        QCat cat = QCat.cat;
+        CollQueryFactory.from(cat, cats).where(cat.id.eq(ThreadLocalRandom.current().nextInt(100) % size)).select(cat).fetch();
+    }
+
+    @Test
+    public void launchBenchmark() throws Exception {
+        Options opt = new OptionsBuilder()
+                .include(this.getClass().getName() + ".*")
+                .mode(Mode.AverageTime)
+                .timeUnit(TimeUnit.MICROSECONDS)
+                .warmupTime(TimeValue.seconds(1))
+                .warmupIterations(3)
+                .measurementTime(TimeValue.seconds(1))
+                .measurementIterations(3)
+                .threads(2)
+                .forks(1)
+                .shouldFailOnError(true)
+                .shouldDoGC(true)
+                .build();
+
+        new Runner(opt).run();
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java
new file mode 100644
index 0000000000..74c3469ff4
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QTuple;
+
+public class SerializationTest extends AbstractQueryTest {
+
+    // TODO : order
+
+    // TODO : subqueries
+
+    private QTuple tuple = Projections.tuple(cat, otherCat);
+
+    @Test
+    public void oneSource_list() {
+        query().from(cat, cats).select(cat).fetch();
+    }
+
+    public List<Cat> oneSource_list(List<Cat> cats) {
+        return cats;
+    }
+
+    @Test
+    public void twoSources_list() {
+        query().from(cat,cats).from(otherCat, cats).select(cat).fetch();
+    }
+
+    public List<Cat> twoSources_list(List<Cat> cats, List<Cat> otherCats) {
+        return cats;
+    }
+
+    @Test
+    public void oneSource_filteredList() {
+        query().from(cat, cats).where(cat.name.eq("Kitty")).select(cat).fetch();
+    }
+
+    public List<Cat> oneSource_filteredList(List<Cat> cats) {
+        List<Cat> rv = new ArrayList<Cat>();
+        for (Cat cat : cats) {                   // from
+            if (cat.getName().equals("Kitty")) { // where
+                rv.add(cat);                     // list
+            }
+        }
+        return rv;
+    }
+
+    @Test
+    public void oneSource_projectedList() {
+        query().from(cat, cats).select(cat.name).fetch();
+    }
+
+    public List<String> oneSource_projectedList(List<Cat> cats) {
+        List<String> rv = new ArrayList<String>();
+        for (Cat cat : cats) {                   // from
+            rv.add(cat.getName());               // list
+        }
+        return rv;
+    }
+
+    @Test
+    public void oneSource_filtered_projectedList() {
+        query().from(cat, cats).where(cat.name.eq("Kitty")).select(cat.name).fetch();
+    }
+
+    public List<String> oneSource_filtered_projectedList(List<Cat> cats) {
+        List<String> rv = new ArrayList<String>();
+        for (Cat cat : cats) {                   // from
+            if (cat.getName().equals("Kitty")) { // where
+                rv.add(cat.getName());           // list
+            }
+        }
+        return rv;
+    }
+
+    @Test
+    public void oneSource_filtered_projectedUnique() {
+        query().from(cat, cats).where(cat.name.eq("Kitty")).select(cat.name).fetchOne();
+    }
+
+    public String oneSource_filtered_projectedUnique(List<Cat> cats) {
+        for (Cat cat : cats) {                   // from
+            if (cat.getName().equals("Kitty")) { // where
+                return cat.getName();            // unique
+            }
+        }
+        throw new IllegalArgumentException();
+    }
+
+    @Test
+    @Ignore
+    public void join_list() {
+        query().from(cat, cats)
+               .innerJoin(cat.kittens, kitten).where(kitten.name.eq("Kitty"))
+               .select(cat).fetch();
+    }
+
+    public List<Cat> join_list(List<Cat> cats) {
+        List<Cat> rv = new ArrayList<Cat>();
+        for (Cat cat : cats) {                          // from
+            for (Cat kitten : cat.getKittens()) {       // inner join
+                if (kitten.getName().equals("Kitty")) { // where
+                    rv.add(cat);                        // list
+                }
+            }
+        }
+        return rv;
+    }
+
+    public List<Object[]> pairs(List<Cat> cats, List<Cat> otherCats) {
+        query().from(cat, cats)
+               .from(otherCat, otherCats)
+               .where(cat.name.eq(otherCat.name))
+               .select(cat, otherCat).fetch();
+
+        List<Object[]> rv = new ArrayList<Object[]>();
+        for (Cat cat : cats) {                                  // from
+            for (Cat otherCat : otherCats) {                    // from
+                if (cat.getName().equals(otherCat.getName())) { // where
+                    rv.add(new Object[]{cat,otherCat});         // list
+                }
+            }
+        }
+        return rv;
+    }
+
+    public List<Tuple> pairsAsTuple(List<Cat> cats, List<Cat> otherCats) {
+        query().from(cat, cats).from(otherCat, cats)
+               .where(cat.name.eq(otherCat.name))
+               .select(Projections.tuple(cat, otherCat)).fetch();
+
+        List<Tuple> rv = new ArrayList<Tuple>();
+        for (Cat cat : cats) {                                  // from
+            for (Cat otherCat : otherCats) {                    // from
+                if (cat.getName().equals(otherCat.getName())) { // where
+                    rv.add(tuple.newInstance(cat, otherCat));   // list
+                }
+            }
+        }
+        return rv;
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/StateHistory.java b/querydsl-collections/src/test/java/com/querydsl/collections/StateHistory.java
new file mode 100644
index 0000000000..7bb5eaf131
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/StateHistory.java
@@ -0,0 +1,16 @@
+package com.querydsl.collections;
+
+import java.util.Date;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class StateHistory {
+
+    private Date changedAt;
+
+    protected final Date getChangedAtTime() {
+        return changedAt;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/StateHistoryOwner.java b/querydsl-collections/src/test/java/com/querydsl/collections/StateHistoryOwner.java
new file mode 100644
index 0000000000..18ede574d3
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/StateHistoryOwner.java
@@ -0,0 +1,14 @@
+package com.querydsl.collections;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class StateHistoryOwner {
+
+    private StateHistory stateHistory;
+
+    protected final StateHistory getStateHistory() {
+        return stateHistory;
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java
new file mode 100644
index 0000000000..3ed08e2198
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class StringHandlingTest extends AbstractQueryTest {
+
+    private List<String> data1 = Arrays.asList("petER", "THomas", "joHAN");
+
+    private List<String> data2 = Arrays.asList("PETer", "thOMAS", "JOhan");
+
+    private List<String> data = Arrays.asList("abc", "aBC", "def");
+
+    private final StringPath a = Expressions.stringPath("a");
+
+    private final StringPath b = Expressions.stringPath("b");
+
+    @Test
+    public void equalsIgnoreCase() {
+        Iterator<String> res = Arrays.asList("petER - PETer",
+                "THomas - thOMAS", "joHAN - JOhan").iterator();
+        for (Tuple arr : query()
+                .from(a, data1)
+                .from(b, data2)
+                .where(a.equalsIgnoreCase(b)).select(a, b).fetch()) {
+            assertEquals(res.next(), arr.get(a) + " - " + arr.get(b));
+        }
+    }
+
+    @Test
+    public void startsWithIgnoreCase() {
+        assertEquals(2, CollQueryFactory.from(a, data).where(a.startsWithIgnoreCase("AB")).fetchCount());
+        assertEquals(2, CollQueryFactory.from(a, data).where(a.startsWithIgnoreCase("ab")).fetchCount());
+    }
+
+    @Test
+    public void endsWithIgnoreCase() {
+        assertEquals(2, CollQueryFactory.from(a, data).where(a.endsWithIgnoreCase("BC")).fetchCount());
+        assertEquals(2, CollQueryFactory.from(a, data).where(a.endsWithIgnoreCase("bc")).fetchCount());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/TemplatesTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/TemplatesTest.java
new file mode 100644
index 0000000000..3301c50b4c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/TemplatesTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.core.TemplatesTestBase;
+
+public class TemplatesTest extends TemplatesTestBase {
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java
new file mode 100644
index 0000000000..65921a7562
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import java.util.Collections;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.PathInits;
+
+public class TypeCastTest {
+
+    @Test(expected = IllegalStateException.class)
+    @Ignore
+    public void cast() {
+        QAnimal animal = QAnimal.animal;
+        QCat cat = new QCat(animal.getMetadata(), new PathInits("*"));
+        CollQueryFactory.from(animal, Collections.<Animal> emptyList()).from(cat, Collections.<Cat> emptyList());
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java b/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java
new file mode 100644
index 0000000000..b38d77af3d
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.types.Expression;
+
+public class UniqueResultContractTest extends AbstractQueryTest {
+
+    @Test(expected = NonUniqueResultException.class)
+    public void unique_result_throws_exception_on_multiple_results() {
+        CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).fetchOne();
+    }
+
+    @Test
+    public void uniqueResult_with_array() {
+        CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).limit(1).select(new Expression[]{cat}).fetchOne();
+    }
+
+}
diff --git a/querydsl-collections/src/test/java/com/querydsl/collections/User.java b/querydsl-collections/src/test/java/com/querydsl/collections/User.java
new file mode 100644
index 0000000000..7ce184bc28
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/querydsl/collections/User.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.collections;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryProjection;
+
+
+@QueryEntity
+public class User {
+
+    private String name;
+
+    private Post latestPost;
+
+    public User() { }
+
+    @QueryProjection
+    public User(String name) {
+        this.name = name;
+    }
+
+    @QueryProjection
+    public User(String name, Post latestPost) {
+        this.name = name;
+        this.latestPost = latestPost;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Post getLatestPost() {
+        return latestPost;
+    }
+
+    public void setLatestPost(Post latestPost) {
+        this.latestPost = latestPost;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/querydsl-collections/template.mf b/querydsl-collections/template.mf
deleted file mode 100644
index 1200daf67b..0000000000
--- a/querydsl-collections/template.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.collections
-Bundle-Name: Querydsl Collections
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.codegen.*;version="${codegen.version}",
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",   
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.tools.*;version="1";resolution:=optional,
-  org.eclipse.jdt.*;version="3.7.2",
-  com.google.common.*;version="${guava.version}",
-  org.hamcrest.*;version="1.3";resolution:=optional
diff --git a/querydsl-core/etc/readme.txt b/querydsl-core/etc/readme.txt
deleted file mode 100644
index 2c4776fe1c..0000000000
--- a/querydsl-core/etc/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-REFACTORING
-
-* move types.operation.* and types.expr.* into types
diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index 7f5cb1c160..fc3a422bca 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-core</artifactId>
   <name>Querydsl - Core module</name>
   <description>core module for querydsl</description>
@@ -24,40 +24,30 @@
   
   <dependencies>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>1.3.9</version>
-    </dependency>          
     <dependency>
       <groupId>com.mysema.commons</groupId>
       <artifactId>mysema-commons-lang</artifactId>
       <version>${mysema.lang.version}</version>
-    </dependency>     
+    </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
     
     <!-- alias dependencies -->
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
       <version>${cglib.version}</version>
+      <optional>true</optional>
     </dependency>
     
      <!-- backwards compatibility -->
-    <dependency>
-      <groupId>com.infradna.tool</groupId>
-      <artifactId>bridge-method-annotation</artifactId>
-      <version>${bridge-method.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jenkins-ci</groupId>
-          <artifactId>annotation-indexer</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>annotation-indexer</artifactId>
@@ -71,45 +61,14 @@
       <artifactId>jdepend</artifactId>
       <version>2.9.1</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
   </dependencies>
   
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.infradna.tool</groupId>
-        <artifactId>bridge-method-injector</artifactId>
-        <version>${bridge-method.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${bridge-method.version}</version>
-            <optional>true</optional>
-            <exclusions>
-              <exclusion>
-                <groupId>org.jenkins-ci</groupId>
-                <artifactId>annotation-indexer</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.jvnet.hudson</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>1.2</version>
-          </dependency>
-        </dependencies>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -122,6 +81,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.core</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -136,8 +102,57 @@
       </plugin>
     </plugins>
   </build>
-  
-  <properties>
-    <bridge-method.version>1.11</bridge-method.version>
-  </properties>
-</project>
+
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>java-21</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>${cglib.version}</version>
+          <optional>true</optional>
+          <exclusions>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>${asm.version}</version>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+          <version>${asm.version}</version>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
diff --git a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java b/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java
deleted file mode 100644
index e2cfa97626..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.Objects;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.Visitor;
-
-/**
- * BooleanBuilder is a cascading builder for {@link Predicate} expressions. BooleanBuilder is a mutable
- * Expression implementation.
- * 
- * <p>Usage example:</p>
- * <pre>
- * QEmployee employee = QEmployee.employee;
- * BooleanBuilder builder = new BooleanBuilder();
- * for (String name : names) {
- *     builder.or(employee.name.equalsIgnoreCase(name));      
- * }
- * </pre>
- *
- * @author tiwe
- */
-public final class BooleanBuilder implements Predicate, Cloneable  {
-
-    private static final long serialVersionUID = -4129485177345542519L;
-
-    @Nullable
-    private Predicate predicate;
-
-    /**
-     * Create an empty BooleanBuilder
-     */
-    public BooleanBuilder() {  }
-
-    /**
-     * Create a BooleanBuilder with the given initial value
-     * 
-     * @param initial
-     */
-    public BooleanBuilder(Predicate initial) {
-        predicate = (Predicate)ExpressionUtils.extract(initial);
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        if (predicate != null) {
-            return predicate.accept(v, context);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Create the insertion of this and the given predicate
-     *
-     * @param right
-     * @return
-     */
-    public BooleanBuilder and(@Nullable Predicate right) {
-        if (right != null) {
-            if (predicate == null) {
-                predicate = right;
-            } else {
-                predicate = ExpressionUtils.and(predicate, right);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Create the intersection of this and the union of the given args
-     * <p>(this && (arg1 || arg2 ... || argN))</p>
-     *
-     * @param args
-     * @return
-     */
-    public BooleanBuilder andAnyOf(Predicate... args) {
-        if (args.length > 0) {
-            and(ExpressionUtils.anyOf(args));
-        }
-        return this;
-    }
-
-    /**
-     * Create the insertion of this and the negation of the given predicate
-     *
-     * @param right
-     * @return
-     */
-    public BooleanBuilder andNot(Predicate right) {
-        return and(right.not());
-    }
-
-    @Override
-    public BooleanBuilder clone() throws CloneNotSupportedException{
-        return (BooleanBuilder) super.clone();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof BooleanBuilder) {
-            return Objects.equal(((BooleanBuilder)o).getValue(), predicate);
-        } else {
-            return false;
-        }
-    }
-
-    @Nullable
-    public Predicate getValue() {
-        return predicate;
-    }
-
-    @Override
-    public int hashCode() {
-        return predicate != null ? predicate.hashCode() : 0;
-    }
-
-    /**
-     * Returns true if the value is set, and false, if not
-     *
-     * @return
-     */
-    public boolean hasValue() {
-        return predicate != null;
-    }
-
-    @Override
-    public BooleanBuilder not() {
-        if (predicate != null) {
-            predicate = predicate.not();
-        }
-        return this;
-    }
-
-    /**
-     * Create the union of this and the given predicate
-     *
-     * @param right
-     * @return
-     */
-    public BooleanBuilder or(@Nullable Predicate right) {
-        if (right != null) {
-            if (predicate == null) {
-                predicate = right;
-            } else {
-                predicate = ExpressionUtils.or(predicate, right);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Create the union of this and the intersection of the given args
-     * <p>(this || (arg1 && arg2 ... && argN))</p>
-     *
-     * @param args
-     * @return
-     */
-    public BooleanBuilder orAllOf(Predicate... args) {
-        if (args.length > 0) {
-            or(ExpressionUtils.allOf(args));
-        }
-        return this;
-    }
-
-    /**
-     * Create the union of this and the negation of the given predicate
-     *
-     * @param right
-     * @return
-     */
-    public BooleanBuilder orNot(Predicate right) {
-        return or(right.not());
-    }
-
-    @Override
-    public Class<? extends Boolean> getType() {
-        return Boolean.class;
-    }
-
-    @Override
-    public String toString() {
-        return predicate != null ? predicate.toString() : super.toString();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
deleted file mode 100644
index c8ad7127e9..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.util.CollectionUtils.add;
-import static com.mysema.query.util.CollectionUtils.addSorted;
-import static com.mysema.query.util.CollectionUtils.copyOf;
-import static com.mysema.query.util.CollectionUtils.copyOfSorted;
-import static com.mysema.query.util.CollectionUtils.put;
-import static com.mysema.query.util.CollectionUtils.removeSorted;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamsVisitor;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ValidatingVisitor;
-
-/**
- * DefaultQueryMetadata is the default implementation of the {@link QueryMetadata} interface
- *
- * @author tiwe
- */
-public class DefaultQueryMetadata implements QueryMetadata, Cloneable {
-
-    private static final long serialVersionUID = 317736313966701232L;
-
-    private boolean distinct;
-
-    private Set<Expression<?>> exprInJoins = ImmutableSet.of();
-
-    private List<Expression<?>> groupBy = ImmutableList.of();
-
-    @Nullable
-    private Predicate having;
-
-    private List<JoinExpression> joins = ImmutableList.of();
-
-    private Expression<?> joinTarget;
-
-    private JoinType joinType;
-
-    @Nullable
-    private Predicate joinCondition;
-
-    private Set<JoinFlag> joinFlags = ImmutableSet.of();
-
-    @Nullable
-    private QueryModifiers modifiers = QueryModifiers.EMPTY;
-
-    private List<OrderSpecifier<?>> orderBy = ImmutableList.of();
-
-    private List<Expression<?>> projection = ImmutableList.of();
-
-    // NOTE : this is not necessarily serializable
-    private Map<ParamExpression<?>,Object> params = ImmutableMap.<ParamExpression<?>, Object>of();
-
-    private boolean unique;
-
-    @Nullable
-    private Predicate where;
-
-    private Set<QueryFlag> flags = ImmutableSet.of();
-
-    private boolean extractParams = true;
-
-    private boolean validate = true;
-
-    private ValidatingVisitor validatingVisitor = ValidatingVisitor.DEFAULT;
-
-    private static Predicate and(Predicate lhs, Predicate rhs) {
-        if (lhs == null) {
-            return rhs;
-        } else {
-            return ExpressionUtils.and(lhs, rhs);
-        }
-    }
-
-    /**
-     * Create an empty DefaultQueryMetadata instance
-     */
-    public DefaultQueryMetadata() {}
-
-    /**
-     * Disable validation
-     *
-     * @return
-     */
-    public DefaultQueryMetadata noValidate() {
-        validate = false;
-        return this;
-    }
-
-
-    @Override
-    public void addFlag(QueryFlag flag) {
-        flags = addSorted(flags, flag);
-    }
-
-    @Override
-    public void addJoinFlag(JoinFlag flag) {
-        joinFlags = addSorted(joinFlags, flag);
-    }
-
-    @Override
-    public void addGroupBy(Expression<?> o) {
-        addLastJoin();
-        validate(o);
-        groupBy = add(groupBy, o);
-    }
-
-    @Override
-    public void addHaving(Predicate e) {
-        addLastJoin();
-        if (e == null) {
-            return;
-        }
-        e = (Predicate)ExpressionUtils.extract(e);
-        if (e != null) {
-            validate(e);
-            having = and(having, e);
-        }
-    }
-
-    private void addLastJoin() {
-        if (joinTarget == null) {
-            return;
-        }
-        joins = add(joins, new JoinExpression(joinType, joinTarget, joinCondition, joinFlags));
-
-        joinType = null;
-        joinTarget = null;
-        joinCondition = null;
-        joinFlags = ImmutableSet.of();
-    }
-
-    @Override
-    public void addJoin(JoinType joinType, Expression<?> expr) {
-        addLastJoin();
-        if (!exprInJoins.contains(expr)) {
-            if (expr instanceof Path && ((Path<?>)expr).getMetadata().isRoot()) {
-                exprInJoins = add(exprInJoins, expr);
-            } else {
-                validate(expr);
-            }
-            this.joinType = joinType;
-            this.joinTarget = expr;
-        } else if (validate) {
-            throw new IllegalStateException(expr + " is already used");
-        }
-    }
-
-    @Override
-    public void addJoinCondition(Predicate o) {
-        validate(o);
-        joinCondition = and(joinCondition, o);
-    }
-
-    @Override
-    public void addOrderBy(OrderSpecifier<?> o) {
-        addLastJoin();
-        // order specifiers can't be validated, since they can refer to projection elements
-        // that are declared later
-        orderBy = add(orderBy, o);
-    }
-
-    @Override
-    public void addProjection(Expression<?> o) {
-        addLastJoin();
-        validate(o);
-        projection = add(projection, o);
-    }
-
-    @Override
-    public void addWhere(Predicate e) {
-        if (e == null) {
-            return;
-        }
-        addLastJoin();
-        e = (Predicate)ExpressionUtils.extract(e);
-        if (e != null) {
-            validate(e);
-            where = and(where, e);
-        }
-    }
-
-    @Override
-    public void clearOrderBy() {
-        orderBy = ImmutableList.of();
-    }
-
-    @Override
-    public void clearProjection() {
-        projection = ImmutableList.of();
-    }
-
-    @Override
-    public void clearWhere() {
-        where = new BooleanBuilder();
-    }
-
-    @Override
-    public QueryMetadata clone() {
-        try {
-            DefaultQueryMetadata clone = (DefaultQueryMetadata) super.clone();
-            clone.exprInJoins = copyOf(exprInJoins);
-            clone.groupBy = copyOf(groupBy);
-            clone.having = having;
-            clone.joins = copyOf(joins);
-            clone.modifiers = modifiers;
-            clone.orderBy = copyOf(orderBy);
-            clone.projection = copyOf(projection);
-            clone.params = copyOf(params);
-            clone.where = where;
-            clone.flags = copyOfSorted(flags);
-            return clone;
-        } catch (CloneNotSupportedException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public List<Expression<?>> getGroupBy() {
-        return groupBy;
-    }
-
-    @Override
-    public Predicate getHaving() {
-        return having;
-    }
-
-    @Override
-    public List<JoinExpression> getJoins() {
-        addLastJoin();
-        return joins;
-    }
-
-    @Override
-    @Nullable
-    public QueryModifiers getModifiers() {
-        return modifiers;
-    }
-
-    @Override
-    public Map<ParamExpression<?>,Object> getParams() {
-        return params;
-    }
-
-    @Override
-    public List<OrderSpecifier<?>> getOrderBy() {
-        return orderBy;
-    }
-
-    @Override
-    public List<Expression<?>> getProjection() {
-        return projection;
-    }
-
-    @Override
-    public Predicate getWhere() {
-        return where;
-    }
-
-    @Override
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    @Override
-    public boolean isUnique() {
-        return unique;
-    }
-
-    @Override
-    public void reset() {
-        clearProjection();
-        params = ImmutableMap.of();
-        modifiers = QueryModifiers.EMPTY;
-    }
-
-    @Override
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    @Override
-    public void setLimit(Long limit) {
-        if (modifiers == null || modifiers.getOffset() == null) {
-            modifiers = QueryModifiers.limit(limit);
-        } else {
-            modifiers = new QueryModifiers(limit, modifiers.getOffset());
-        }
-    }
-
-    @Override
-    public void setModifiers(@Nullable QueryModifiers restriction) {
-        this.modifiers = restriction;
-    }
-
-    @Override
-    public void setOffset(Long offset) {
-        if (modifiers == null || modifiers.getLimit() == null) {
-            modifiers = QueryModifiers.offset(offset);
-        } else {
-            modifiers = new QueryModifiers(modifiers.getLimit(), offset);
-        }
-    }
-
-    @Override
-    public void setUnique(boolean unique) {
-        this.unique = unique;
-    }
-
-    @Override
-    public <T> void setParam(ParamExpression<T> param, T value) {
-        params = put(params, param, value);
-    }
-
-    @Override
-    public Set<QueryFlag> getFlags() {
-        return flags;
-    }
-
-    @Override
-    public boolean hasFlag(QueryFlag flag) {
-        return flags.contains(flag);
-    }
-
-    @Override
-    public void removeFlag(QueryFlag flag) {
-        flags = removeSorted(flags, flag);
-    }
-
-    private void validate(Expression<?> expr) {
-        if (extractParams) {
-            expr.accept(ParamsVisitor.DEFAULT, this);
-        }
-        if (validate) {
-            exprInJoins = expr.accept(validatingVisitor, exprInJoins);
-        }
-    }
-
-    @Override
-    public void setValidate(boolean v) {
-        this.validate = v;
-    }
-
-    public void setValidatingVisitor(ValidatingVisitor visitor) {
-        this.validatingVisitor = visitor;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof QueryMetadata) {
-            QueryMetadata q = (QueryMetadata)o;
-            return q.getFlags().equals(flags)
-                && q.getGroupBy().equals(groupBy)
-                && Objects.equal(q.getHaving(), having)
-                && q.isDistinct() == distinct
-                && q.isUnique() == unique
-                && q.getJoins().equals(joins)
-                && Objects.equal(q.getModifiers(), modifiers)
-                && q.getOrderBy().equals(orderBy)
-                && q.getParams().equals(params)
-                && q.getProjection().equals(projection)
-                && Objects.equal(q.getWhere(), where);
-
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(flags, groupBy, having, joins, modifiers,
-                orderBy, params, projection, unique, where);
-    }
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/Detachable.java b/querydsl-core/src/main/java/com/mysema/query/Detachable.java
deleted file mode 100644
index f14bb0586e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/Detachable.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.query.BooleanSubQuery;
-import com.mysema.query.types.query.ComparableSubQuery;
-import com.mysema.query.types.query.DateSubQuery;
-import com.mysema.query.types.query.DateTimeSubQuery;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.query.StringSubQuery;
-import com.mysema.query.types.query.TimeSubQuery;
-
-/**
- * Detachable defines methods for the construction of SubQuery instances
- *
- * @author tiwe
- *
- */
-public interface Detachable {
-
-    /**
-     * Return the count of matched rows as a sub query
-     *
-     * @return
-     */
-    NumberSubQuery<Long> count();
-
-    /**
-     * Create an exists(this) expression
-     *
-     * @return
-     */
-    BooleanExpression exists();
-
-    /**
-     * Create a projection expression for the given projection
-     *
-     * @param args
-     * @return
-     */
-    ListSubQuery<Tuple> list(Expression<?>... args);
-    
-    /**
-     * Create a projection expression for the given projection
-     * Non expression arguments are converted into constant expressions
-     * 
-     * @param args
-     * @return
-     */
-    ListSubQuery<Tuple> list(Object... args);
-
-    /**
-     * Create a projection expression for the given projection
-     *
-     * @param <RT>
-     *            generic type of the List
-     * @param projection
-     * @return a List over the projection
-     */
-    <RT> ListSubQuery<RT> list(Expression<RT> projection);
-    
-
-    /**
-     * Create an not exists(this) expression
-     *
-     * @return
-     */
-    BooleanExpression notExists();
-
-    /**
-     * Create a projection expression for the given projection
-     *
-     * @param args
-     * @return
-     */
-    SimpleSubQuery<Tuple> unique(Expression<?>... args);
-    
-    /**
-     * Create a projection expression for the given projection
-     * Non expression arguments are converted into constant expressions
-     * 
-     * @param args
-     * @return
-     */
-    SimpleSubQuery<Tuple> unique(Object... args);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     *            return type
-     * @param projection
-     * @return the result or null for an empty result
-     */
-    <RT> SimpleSubQuery<RT> unique(Expression<RT> projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param projection
-     * @return
-     */
-    BooleanSubQuery unique(Predicate projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param projection
-     * @return
-     */
-    StringSubQuery unique(StringExpression projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT extends Comparable<?>> ComparableSubQuery<RT> unique(ComparableExpression<RT> projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT extends Comparable<?>> DateSubQuery<RT> unique(DateExpression<RT> projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT extends Comparable<?>> DateTimeSubQuery<RT> unique(DateTimeExpression<RT> projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT extends Comparable<?>> TimeSubQuery<RT> unique(TimeExpression<RT> projection);
-
-    /**
-     * Create a subquery expression for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT extends Number & Comparable<?>> NumberSubQuery<RT> unique(NumberExpression<RT> projection);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java b/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java
deleted file mode 100644
index ed9a391e1b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/JoinExpression.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-
-/**
- * JoinExpression is a join element in a {@link Query} instance.
- *
- * @author tiwe
- */
-@Immutable
-public final class JoinExpression implements Serializable {
-
-    private static final long serialVersionUID = -1131755765747174886L;
-
-    @Nullable
-    private final Predicate condition;
-
-    private final ImmutableSet<JoinFlag> flags;
-
-    private final Expression<?> target;
-
-    private final JoinType type;
-
-    /**
-     * Create a new JoinExpression instance
-     * 
-     * @param type
-     * @param target
-     */
-    public JoinExpression(JoinType type, Expression<?> target) {
-        this(type, target, null, ImmutableSet.<JoinFlag>of());
-    }
-            
-    
-    /**
-     * Create a new JoinExpression instance
-     * 
-     * @param type
-     * @param target
-     * @param condition
-     * @param flags
-     */
-    public JoinExpression(JoinType type, Expression<?> target, @Nullable Predicate condition, 
-            Set<JoinFlag> flags) {
-        this.type = type;
-        this.target = target;
-        this.condition = condition;
-        this.flags = ImmutableSet.copyOf(flags);
-    }
-
-    @Nullable
-    public Predicate getCondition() {
-        return condition;
-    }
-
-    public Expression<?> getTarget() {
-        return target;
-    }
-
-    public JoinType getType() {
-        return type;
-    }
-
-    public boolean hasFlag(JoinFlag flag) {
-        return flags.contains(flag);
-    }
-    
-    public Set<JoinFlag> getFlags() {
-        return flags;
-    }
-
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append(type).append(" ").append(target);
-        if (condition != null) {
-            builder.append(" on ").append(condition);
-        }
-        return builder.toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(condition, target, type);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof JoinExpression) {
-            JoinExpression j = (JoinExpression) o;
-            return Objects.equal(condition, j.condition) &&
-                   Objects.equal(target, j.target) &&
-                   Objects.equal(type, j.type);
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java b/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java
deleted file mode 100644
index 9271477d5e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/JoinFlag.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Serializable;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-/**
- * JoinFlag defines a join related flag using an Expression instance
- * 
- * @author tiwe
- *
- */
-@Immutable
-public class JoinFlag implements Serializable{
-    
-    public enum Position {
-        
-        /**
-         * before the join
-         */
-        START,  
-        
-        /**
-         * as a replacement for the join symbol
-         */
-        OVERRIDE,
-        
-        /**
-         * before the join target
-         */
-        BEFORE_TARGET, 
-
-        /**
-         * before the join condition
-         */
-        BEFORE_CONDITION,
-        
-        /**
-         * after the join 
-         */
-        END
-        
-    }
-    
-    private static final long serialVersionUID = -688265393547206465L;
-    
-    private final Expression<?> flag;
-    
-    private final Position position;
-    
-    public JoinFlag(String flag) {
-        this(TemplateExpressionImpl.create(Object.class, flag), Position.BEFORE_TARGET);
-    }
-    
-    public JoinFlag(String flag, Position position) {
-        this(TemplateExpressionImpl.create(Object.class, flag), position);
-    }
-    
-    
-    public JoinFlag(Expression<?> flag) {
-        this(flag, Position.BEFORE_TARGET);
-    }
-    
-    public JoinFlag(Expression<?> flag, Position position) {
-        this.flag = flag;
-        this.position = position;
-    }
-    
-    @Override
-    public int hashCode() {
-        return flag.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof JoinFlag) {
-            return ((JoinFlag)obj).flag.equals(flag);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return flag.toString();
-    }
-
-    public Expression<?> getFlag() {
-        return flag;
-    }
-
-    public Position getPosition() {
-        return position;
-    }
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/NonUniqueResultException.java b/querydsl-core/src/main/java/com/mysema/query/NonUniqueResultException.java
deleted file mode 100644
index 1e900137fb..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/NonUniqueResultException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-/**
- * NonUniqueResultException is thrown for query results where one result row is expected, but multiple 
- * are retrieved.
- * 
- * @author tiwe
- *
- */
-public class NonUniqueResultException extends QueryException{
-
-    private static final long serialVersionUID = -1757423191400510323L;
-
-    public NonUniqueResultException() {
-        super("Only one result is allowed for uniqueResult calls");
-    }
-    
-    public NonUniqueResultException(String message) {
-        super(message);
-    }
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/Projectable.java b/querydsl-core/src/main/java/com/mysema/query/Projectable.java
deleted file mode 100644
index 927f6d604b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/Projectable.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnegative;
-import javax.annotation.Nullable;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.types.Expression;
-
-/**
- * Projectable defines default projection methods for {@link Query} implementations.
- * All Querydsl query implementations should implement either this interface or
- * {@link SimpleProjectable}.
- *
- * @author tiwe
- * @see SimpleProjectable
- */
-public interface Projectable {
-    /**
-     * return the amount of matched rows
-     */
-    @Nonnegative
-    long count();
-
-    /**
-     * @return true, if rows matching the given criteria exist, otherwise false
-     */
-    boolean exists();
-
-    /**
-     * @return true, if no rows matching the given criteria exist, otherwise false
-     */
-    boolean notExists();
-
-    /**
-     * iterate over the results for the given projection
-     *
-     * @param args
-     * @return
-     */
-    CloseableIterator<Tuple> iterate(Expression<?>... args);
-
-    /**
-     * iterate over the results for the given projection
-     *
-     * @param <RT>
-     *            generic type of the Iterator
-     * @param projection
-     * @return an Iterator over the projection
-     */
-    <RT> CloseableIterator<RT> iterate(Expression<RT> projection);
-
-    /**
-     * list the results for the given projection
-     * 
-     * An empty list is returned for no results.
-     *
-     * @param args
-     * @return
-     */
-    List<Tuple> list(Expression<?>... args);
-
-    /**
-     * list the results for the given projection
-     * 
-     * An empty list is returned for no results.
-     *
-     * @param <RT>
-     *            generic type of the List
-     * @param projection
-     * @return a List over the projection
-     */
-    <RT> List<RT> list(Expression<RT> projection);
-
-    /**
-     * list the results for the given projection
-     *
-     * @param args
-     * @return
-     */
-     SearchResults<Tuple> listResults(Expression<?>... args);
-    
-    /**
-     * list the results for the given projection
-     *
-     * @param <RT>
-     * @param projection
-     * @return
-     */
-    <RT> SearchResults<RT> listResults(Expression<RT> projection);
-
-    /**
-     * return the given projection as a Map instance using key and value for Map population
-     *
-     * An empty map is returned for no results.
-     *
-     * @param <K>
-     * @param <V>
-     * @param key
-     * @param value
-     * @return
-     */
-    <K,V> Map<K,V> map(Expression<K> key, Expression<V> value);
-
-    /**
-     * return a single result for the given projection or null if no result is found
-     * 
-     * <p>There is some ambiguity for missing results and null valued results, for disambiguation 
-     * use the list or iterate methods instead.</p> 
-     *
-     * <p>for multiple results only the first one is returned</p>
-     *
-     * @param args
-     * @return
-     */
-    @Nullable
-    Tuple singleResult(Expression<?>... args);
-
-    /**
-     * return a single result for the given projection or null if no result is found
-     *
-     * <p>There is some ambiguity for missing results and null valued results, for disambiguation 
-     * use the list or iterate methods instead.</p>
-     *
-     * <p>for multiple results only the first one is returned</p>
-     *
-     * @param <RT>
-     *            return type
-     * @param projection
-     * @return the result or null for an empty result
-     */
-    @Nullable
-    <RT> RT singleResult(Expression<RT> projection);
-    
-    /**
-     * Apply the given transformer to this Projectable instance and return the results
-     * 
-     * @param <T>
-     * @param transformer
-     * @return
-     */
-    <T> T transform(ResultTransformer<T> transformer);
-
-    /**
-     * return a unique result for the given projection or null if no result is found
-     *
-     * <p>There is some ambiguity for missing results and null valued results, for disambiguation 
-     * use the list or iterate methods instead.</p>
-     *
-     * @param args
-     * @throws NonUniqueResultException if there is more than one matching result
-     * @return
-     */
-    @Nullable
-    Tuple uniqueResult(Expression<?>... args);
-
-    /**
-     * return a unique result for the given projection or null if no result is found
-     * 
-     * <p>There is some ambiguity for missing results and null valued results, for disambiguation 
-     * use the list or iterate methods instead.</p>
-     *
-     * @param <RT>
-     *            return type
-     * @param projection
-     * @throws NonUniqueResultException if there is more than one matching result
-     * @return the result or null for an empty result
-     */
-    @Nullable
-    <RT> RT uniqueResult(Expression<RT> projection);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/Query.java b/querydsl-core/src/main/java/com/mysema/query/Query.java
deleted file mode 100644
index 254e90591d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/Query.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-
-/**
- * Query defines the main query interface of the fluent query language.
- *
- * <p>Note that the from method has been left out, since there are implementation
- * specific variants of it.</p>
- *
- * @author tiwe
- * @see SimpleQuery
- */
-public interface Query<Q extends Query<Q>> extends SimpleQuery<Q> {
-
-    /**
-     * Add grouping/aggregation expressions
-     *
-     * @param o
-     * @return
-     */
-    Q groupBy(Expression<?>... o);
-
-    /**
-     * Add filters for aggregation
-     *
-     * @param o
-     * @return
-     */
-    Q having(Predicate... o);
-   
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryFactory.java b/querydsl-core/src/main/java/com/mysema/query/QueryFactory.java
deleted file mode 100644
index cde5044657..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/QueryFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-
-/**
- * Common interface for QueryFactory implementations
- * 
- * @author tiwe
- * 
- * @param <Q> Query type
- * @param <SQ> Subquery type
- */
-public interface QueryFactory<Q extends Query<?>, SQ extends Detachable> {
-    /**
-     * Create a new Query
-     * 
-     * @return
-     */
-    Q query();
-
-    /**
-     * Create a new Sub query
-     * 
-     * @return
-     */
-    SQ subQuery();
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java
deleted file mode 100644
index 95574cc4e9..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Predicate;
-
-/**
- * QueryMetadata defines query metadata such as query sources, filtering
- * conditions and the projection
- *
- * @author tiwe
- */
-public interface QueryMetadata extends Serializable {
-
-    /**
-     * Add the given group by expressions
-     *
-     * @param o
-     */
-    void addGroupBy(Expression<?> o);
-
-    /**
-     * Add the given having expressions
-     *
-     * @param o
-     */
-    void addHaving(Predicate o);
-
-    /**
-     * Add the given query join
-     *
-     * @param joinType
-     * @param expr
-     */
-    void addJoin(JoinType joinType, Expression<?> expr);
-
-    /**
-     * Add the given join flag to the last given join
-     *
-     * @param flag
-     */
-    void addJoinFlag(JoinFlag flag);
-
-    /**
-     * Add the given join condition to the last given join
-     *
-     * @param o
-     */
-    void addJoinCondition(Predicate o);
-
-    /**
-     * Add the given order specifiers
-     *
-     * @param o
-     */
-    void addOrderBy(OrderSpecifier<?> o);
-
-    /**
-     * Add the given projections
-     *
-     * @param o
-     */
-    void addProjection(Expression<?> o);
-
-    /**
-     * Add the given where expressions
-     *
-     * @param o
-     */
-    void addWhere(Predicate o);
-
-    /**
-     * Clear the order expressions
-     */
-    void clearOrderBy();
-
-    /**
-     * Clear the projection
-     */
-    void clearProjection();
-
-    /**
-     * Clear the where expressions
-     */
-    void clearWhere();
-
-    /**
-     * Clone this QueryMetadata instance
-     *
-     * @return
-     */
-    QueryMetadata clone();
-
-    /**
-     * Get the group by expressions
-     *
-     * @return
-     */
-    List<Expression<?>> getGroupBy();
-
-    /**
-     * Get the having expressions
-     *
-     * @return
-     */
-    Predicate getHaving();
-
-    /**
-     * Get the query joins
-     *
-     * @return
-     */
-    List<JoinExpression> getJoins();
-
-    /**
-     * Get the QueryModifiers
-     *
-     * @return
-     */
-    QueryModifiers getModifiers();
-
-    /**
-     * Get the OrderSpecifiers
-     *
-     * @return
-     */
-    List<OrderSpecifier<?>> getOrderBy();
-
-    /**
-     * Get the projection
-     *
-     * @return
-     */
-    List<Expression<?>> getProjection();
-
-    /**
-     * Get the parameters
-     *
-     * @return
-     */
-    Map<ParamExpression<?>,Object> getParams();
-
-    /**
-     * Get the expressions aggregated into a single boolean expression or null,
-     * if none where defined
-     *
-     * @return
-     */
-    @Nullable
-    Predicate getWhere();
-
-    /**
-     * Get whether the projection is distinct
-     *
-     * @return
-     */
-    boolean isDistinct();
-
-    /**
-     * Get whether the projection is unique
-     *
-     * @return
-     */
-    boolean isUnique();
-
-    /**
-     * Reset the projection
-     */
-    void reset();
-
-    /**
-     * @param distinct
-     */
-    void setDistinct(boolean distinct);
-
-    /**
-     * @param limit
-     */
-    void setLimit(@Nullable Long limit);
-
-    /**
-     * @param restriction
-     */
-    void setModifiers(QueryModifiers restriction);
-
-    /**
-     * @param offset
-     */
-    void setOffset(@Nullable Long offset);
-
-    /**
-     * @param unique
-     */
-    void setUnique(boolean unique);
-
-    /**
-     * @param <T>
-     * @param param
-     * @param value
-     */
-    <T> void setParam(ParamExpression<T> param, T value);
-
-    /**
-     * @param flag
-     */
-    void addFlag(QueryFlag flag);
-
-    /**
-     * @param flag
-     * @return
-     */
-    boolean hasFlag(QueryFlag flag);
-
-    /**
-     * @param flag
-     */
-    void removeFlag(QueryFlag flag);
-
-    /**
-     * @return
-     */
-    Set<QueryFlag> getFlags();
-
-    /**
-     * @param v
-     */
-    void setValidate(boolean v);
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java b/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java
deleted file mode 100644
index a4f5722d69..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/QueryModifiers.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nonnegative;
-import javax.annotation.Nullable;
-
-import com.google.common.base.Objects;
-
-/**
- * QueryModifiers combines limit and offset info into a single type.
- *
- * @author tiwe
- */
-public final class QueryModifiers implements Serializable{
-
-    private static final long serialVersionUID = 2934344588433680339L;
-
-    public static final QueryModifiers EMPTY = new QueryModifiers();
-
-    private static int toInt(Long l) {
-        if (l.longValue() <= Integer.MAX_VALUE) {
-            return l.intValue();
-        } else {
-            return Integer.MAX_VALUE;
-        }
-    }
-
-    public static QueryModifiers limit(@Nonnegative long limit) {
-        return new QueryModifiers(Long.valueOf(limit), null);
-    }
-
-    public static QueryModifiers offset(@Nonnegative long offset) {
-        return new QueryModifiers(null, Long.valueOf(offset));
-    }
-
-    @Nullable
-    private final Long limit, offset;
-
-    private QueryModifiers() {
-        limit = null;
-        offset = null;
-    }
-
-    public QueryModifiers(@Nullable Long limit, @Nullable Long offset) {
-        this.limit = limit;
-        if (limit != null && limit <= 0) {
-            throw new IllegalArgumentException("Limit must be greater than 0.");
-        }
-        this.offset = offset;
-        if (offset != null && offset < 0) {
-            throw new IllegalArgumentException("Offset must not be negative.");
-        }
-    }
-
-    public QueryModifiers(QueryModifiers modifiers) {
-        this.limit = modifiers.getLimit();
-        this.offset = modifiers.getOffset();
-    }
-
-    @Nullable
-    public Long getLimit() {
-        return limit;
-    }
-
-    @Nullable
-    public Integer getLimitAsInteger() {
-        return limit != null ? toInt(limit) : null;
-    }
-
-    @Nullable
-    public Long getOffset() {
-        return offset;
-    }
-
-    @Nullable
-    public Integer getOffsetAsInteger() {
-        return offset != null ? toInt(offset) : null;
-    }
-
-    /**
-     * Checks if is restricting.
-     *
-     * @return true, if is restricting
-     */
-    public boolean isRestricting() {
-        return limit != null || offset != null;
-    }
-
-    /**
-     * Get a sublist based on the restriction of limit and offset
-     *
-     * @param <T>
-     * @param list
-     * @return
-     */
-    public <T> List<T> subList(List<T> list) {
-        if (!list.isEmpty()) {
-            int from = offset != null ? toInt(offset) : 0;
-            int to = limit != null ? (from + toInt(limit)) : list.size();
-            return list.subList(from, Math.min(to,list.size()));
-        } else {
-            return list;
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof QueryModifiers) {
-            QueryModifiers qm = (QueryModifiers)o;
-            return Objects.equal(qm.getLimit(), limit) && Objects.equal(qm.getOffset(), offset);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(limit, offset);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/ResultTransformer.java b/querydsl-core/src/main/java/com/mysema/query/ResultTransformer.java
deleted file mode 100644
index f079f6bc1e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/ResultTransformer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-
-/**
- * Executes query on a {@link Projectable} and transforms results into T. This can be used for example
- * to group projected columns or to filter out duplicate results.
- * 
- * @see com.mysema.query.group.GroupBy
- * @author sasa
- *
- * @param <T> Transformations target type
- */
-public interface ResultTransformer<T> {
-
-    /**
-     * @param projectable
-     * @return
-     */
-    T transform(Projectable projectable);
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/SearchResults.java b/querydsl-core/src/main/java/com/mysema/query/SearchResults.java
deleted file mode 100644
index a7810d5183..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/SearchResults.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * SearchResults bundles data for paged search results
- *
- * @author tiwe
- */
-public final class SearchResults<T> {
-
-    private static final SearchResults<Object> EMPTY = new SearchResults<Object>(
-            ImmutableList.of(), Long.MAX_VALUE, 0l, 0l); 
-    
-    @SuppressWarnings("unchecked")
-    public static <T> SearchResults<T> emptyResults() {
-        return (SearchResults<T>)EMPTY;
-    };
-
-    private final long limit, offset, total;
-
-    private final List<T> results;
-
-    /**
-     * Create a new SearchResults instance
-     * 
-     * @param results paged results
-     * @param limit used limit
-     * @param offset used offset
-     * @param total total result rows count
-     */
-    public SearchResults(List<T> results, @Nullable Long limit, @Nullable Long offset, long total) {
-        this.limit = limit != null ? limit : Long.MAX_VALUE;
-        this.offset = offset != null ? offset : 0l;
-        this.total = total;
-        this.results = results;
-    }
-
-    /**
-     * Create a new SearchResults instance
-     * 
-     * @param results paged results
-     * @param mod limit and offset
-     * @param total total result rows count
-     */
-    public SearchResults(List<T> results, QueryModifiers mod, long total) {
-        this(results, mod.getLimit(), mod.getOffset(), total);
-    }
-
-    /**
-     * Get the results in List form
-     * 
-     * An empty list is returned for no results.
-     *
-     * @return
-     */
-    public List<T> getResults() {
-        return results;
-    }
-
-    /**
-     * Get the number of total results
-     *
-     * @return
-     */
-    public long getTotal() {
-        return total;
-    }
-
-    /**
-     * @return
-     */
-    public boolean isEmpty() {
-        return results.isEmpty();
-    }
-
-    /**
-     * @return
-     */
-    public long getLimit() {
-        return limit;
-    }
-
-    /**
-     * @return
-     */
-    public long getOffset() {
-        return offset;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/SimpleProjectable.java b/querydsl-core/src/main/java/com/mysema/query/SimpleProjectable.java
deleted file mode 100644
index 5eb1e58abe..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/SimpleProjectable.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.mysema.commons.lang.CloseableIterator;
-
-/**
- * SimpleProjectable defines a simpler projection interface than {@link Projectable}.
- *
- * @author tiwe
- * @see Projectable
- */
-public interface SimpleProjectable<T> {
-
-    /**
-     * @return true, if rows matching the given criteria exist, otherwise false
-     */
-    boolean exists();
-
-    /**
-     * @return true, if no rows matching the given criteria exist, otherwise false
-     */
-    boolean notExists();
-
-    /**
-     * Get the projection as a typed closeable Iterator
-     *
-     * @return
-     */
-    CloseableIterator<T> iterate();
-
-    /**
-     * Get the projection as a typed List
-     *
-     * @return
-     */
-    List<T> list();
-
-    /**
-     * Get the projection as a single result or null if no result is found
-     *
-     * <p>for multiple results only the first one is returned</p>
-     *
-     * @return
-     */
-    @Nullable
-    T singleResult();
-
-    /**
-     * Get the projection as a unique result or null if no result is found
-     *
-     * @throws NonUniqueResultException if there is more than one matching result
-     * @return
-     */
-    @Nullable
-    T uniqueResult();
-
-    /**
-     * Get the projection in {@link SearchResults} form
-     *
-     * @return
-     */
-    SearchResults<T> listResults();
-
-    /**
-     * Get the count of matched elements
-     *
-     * @return
-     */
-    long count();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java b/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java
deleted file mode 100644
index e2041441ce..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import javax.annotation.Nonnegative;
-
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-
-/**
- * SimpleQuery defines a simple querying interface than {@link Query}
- *
- * @author tiwe
- *
- * @param <Q> concrete subtype
- * @see Query
- */
-public interface SimpleQuery<Q extends SimpleQuery<Q>> extends FilteredClause<Q> {
-
-    /**
-     * Set the limit / max results for the query results
-     *
-     * @param limit
-     * @return
-     */
-    Q limit(@Nonnegative long limit);
-
-    /**
-     * Set the offset for the query results
-     *
-     * @param offset
-     * @return
-     */
-    Q offset(@Nonnegative long offset);
-
-    /**
-     * Set both limit and offset of the query results
-     *
-     * @param modifiers
-     * @return
-     */
-    Q restrict(QueryModifiers modifiers);
-
-    /**
-     * Add order expressions
-     *
-     * @param o
-     * @return
-     */
-    Q orderBy(OrderSpecifier<?>... o);
-
-    /**
-     * Set the given parameter to the given value
-     *
-     * @param <T>
-     * @param param
-     * @param value
-     * @return
-     */
-    <T> Q set(ParamExpression<T> param, T value);
-    
-    /**
-     * Set the Query to return distinct results
-     * 
-     * @return
-     */
-    Q distinct();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/Tuple.java b/querydsl-core/src/main/java/com/mysema/query/Tuple.java
deleted file mode 100644
index 2caeff3765..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/Tuple.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-
-/**
- * Tuple defines an interface for generic query result projection
- * 
- * <p>Usage example:</p>
- * <pre>
- * {@code 
- * List<Tuple> result = query.from(employee).list(new QTuple(employee.firstName, employee.lastName));
- * for (Tuple row : result) {
- *     System.out.println("firstName " + row.get(employee.firstName));
- *     System.out.println("lastName " + row.get(employee.lastName)); 
- * }
- * } 
- * </pre>
- *
- * @author tiwe
- *
- */
-public interface Tuple {
-
-    /**
-     * Get a Tuple element by index
-     *
-     * @param <T>
-     * @param index
-     * @param type
-     * @return
-     */
-    @Nullable
-    <T> T get(int index, Class<T> type);
-
-    /**
-     * Get a tuple element by expression
-     *
-     * @param <T>
-     * @param expr
-     * @return
-     */
-    @Nullable
-    <T> T get(Expression<T> expr);
-
-    /**
-     * Get the size of the Tuple
-     * 
-     * @return 
-     */
-    int size();
-    
-    /**
-     * Get the content as an Object array
-     *
-     * @return
-     */
-    Object[] toArray();
-    
-   /**
-    * All Tuples should override equals and hashCode. For compatibility
-    * across different Tuple implementations, equality check should use
-    * {@link java.util.Arrays#equals(Object[], Object[])} with {@link #toArray()} as parameters.
-    *
-    * @see Object#equals(Object)
-    */
-   boolean equals(Object o);
-        
-   /**
-    * All Tuples should override equals and hashCode. For compatibility
-    * across different Tuple implementations, hashCode should use
-    * {@link java.util.Arrays#hashCode(Object[])} with {@link #toArray()} as parameter.
-    *
-    * @see Object#hashCode()
-    */
-   int hashCode();
-    
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java b/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java
deleted file mode 100644
index 7d5108f5c7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.path.ArrayPath;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.CollectionPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.SetPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-/**
- * Alias provides alias factory methods
- *
- * @author tiwe
- */
-@SuppressWarnings("PMD")
-public final class Alias {
-
-    private static final AliasFactory aliasFactory = new AliasFactory(new DefaultPathFactory(), new DefaultTypeSystem());
-
-    private static final SimplePath<Object> it = new SimplePath<Object>(Object.class, PathMetadataFactory.forVariable("it"));
-
-    // exclude $-methods from Checkstyle checks
-    //CHECKSTYLE:OFF
-    /**
-     * Convert the given alias to an expression
-     *
-     * @param <D>
-     * @return
-     */
-    public static <D extends Expression<?>> D $() {
-        return aliasFactory.<D>getCurrentAndReset();
-    }
-
-    public static <D> ArrayPath<D[], D> $(D[] arg) {
-        return aliasFactory.<ArrayPath<D[], D>> getCurrentAndReset();
-    }
-
-    public static NumberPath<BigDecimal> $(BigDecimal arg) {
-        return aliasFactory.<NumberPath<BigDecimal>> getCurrentAndReset();
-    }
-
-    public static NumberPath<BigInteger> $(BigInteger arg) {
-        return aliasFactory.<NumberPath<BigInteger>> getCurrentAndReset();
-    }
-
-    public static BooleanPath $(Boolean arg) {
-        return aliasFactory.<BooleanPath> getCurrentAndReset();
-    }
-
-    public static NumberPath<Byte> $(Byte arg) {
-        return aliasFactory.<NumberPath<Byte>> getCurrentAndReset();
-    }
-    
-    public static <T extends Enum<T>> EnumPath<T> $(T arg) {
-        return aliasFactory.<EnumPath<T>> getCurrentAndReset();
-    }
-
-    public static <D> CollectionPath<D, SimpleExpression<D>> $(Collection<D> args) {
-        return aliasFactory.<CollectionPath<D, SimpleExpression<D>>> getCurrentAndReset();
-    }
-
-    public static <D extends Comparable<?>> ComparablePath<D> $(D arg) {
-//        return aliasFactory.<ComparablePath<D>> getCurrentAndReset();
-        return Alias.<D, ComparablePath<D>>getPath(arg);
-    }
-
-    public static NumberPath<Double> $(Double arg) {
-        return aliasFactory.<NumberPath<Double>> getCurrentAndReset();
-    }
-
-    public static NumberPath<Float> $(Float arg) {
-        return aliasFactory.<NumberPath<Float>> getCurrentAndReset();
-    }
-
-    public static NumberPath<Integer> $(Integer arg) {
-        return aliasFactory.<NumberPath<Integer>> getCurrentAndReset();
-    }
-
-    public static DatePath<java.sql.Date> $(java.sql.Date arg) {
-        return aliasFactory.<DatePath<java.sql.Date>> getCurrentAndReset();
-    }
-
-    public static DateTimePath<java.util.Date> $(java.util.Date arg) {
-        return aliasFactory.<DateTimePath<java.util.Date>> getCurrentAndReset();
-    }
-
-    public static <D> ListPath<D, SimpleExpression<D>> $(List<D> args) {
-        return aliasFactory.<ListPath<D, SimpleExpression<D>>> getCurrentAndReset();
-    }
-
-    public static NumberPath<Long> $(Long arg) {
-        return aliasFactory.<NumberPath<Long>> getCurrentAndReset();
-    }
-
-    public static <K, V> MapPath<K, V, SimpleExpression<V>> $(Map<K, V> args) {
-        return aliasFactory.<MapPath<K, V, SimpleExpression<V>>> getCurrentAndReset();
-    }
-
-    public static <D> SetPath<D, SimpleExpression<D>> $(Set<D> args) {
-        return aliasFactory.<SetPath<D, SimpleExpression<D>>> getCurrentAndReset();
-    }
-
-    public static NumberPath<Short> $(Short arg) {
-        return aliasFactory.<NumberPath<Short>> getCurrentAndReset();
-    }
-
-    public static StringPath $(String arg) {
-        return aliasFactory.<StringPath> getCurrentAndReset();
-    }
-
-    public static TimePath<Time> $(Time arg) {
-        return aliasFactory.<TimePath<Time>> getCurrentAndReset();
-    }
-
-    public static DateTimePath<Timestamp> $(Timestamp arg) {
-        return aliasFactory.<DateTimePath<Timestamp>> getCurrentAndReset();
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public static <D> EntityPathBase<D> $(D arg) {
-        EntityPathBase<D> rv = aliasFactory.<EntityPathBase<D>> getCurrentAndReset();
-        if (rv != null) {
-            return rv;
-        } else if (arg instanceof EntityPath<?>) {    
-            return (EntityPathBase<D>)arg; //NOSONAR
-        } else if (arg instanceof ManagedObject) {
-            return (EntityPathBase<D>) ((ManagedObject) arg).__mappedPath();
-        } else {
-            return null;
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Nullable
-    private static <D, P extends Path<D>> P getPath(D arg) {
-        P rv = aliasFactory.<P>getCurrentAndReset();
-        if (rv != null) {
-            return rv;
-        } else if (arg instanceof Path<?>) {    
-            return (P)arg;
-        } else if (arg instanceof ManagedObject) {
-            return (P) ((ManagedObject) arg).__mappedPath();
-        } else {
-            return null;
-        }
-    }
-    
-    //CHECKSTYLE:ON
-
-    /**
-     * Create a new alias proxy of the given type
-     * 
-     * @param cl
-     * @return
-     */
-    public static <A> A alias(Class<A> cl) {
-        return alias(cl, CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, cl.getSimpleName()));
-    }
-
-    /**
-     * Create a new alias proxy of the given type for the given expression
-     * 
-     * @param cl
-     * @param expr
-     * @return
-     */
-    public static <A> A alias(Class<A> cl, Expression<? extends A> expr) {
-        return aliasFactory.createAliasForExpr(cl, expr);
-    }
-
-    /**
-     * Create a new alias proxy of the given type for the given variable
-     * 
-     * @param cl
-     * @param var
-     * @return
-     */
-    public static <A> A alias(Class<A> cl, String var) {
-        return aliasFactory.createAliasForVariable(cl, var);
-    }
-
-    /**
-     * Convert the given alias to an expression
-     *
-     * @param <D>
-     * @param arg
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <D> Expression<D> getAny(D arg) {
-        Expression<D> current = (Expression<D>) aliasFactory.getCurrentAndReset();
-        if (current != null) {
-            return current;
-        } else if (arg instanceof ManagedObject) {
-            return (Expression<D>) ((ManagedObject) arg).__mappedPath();
-        } else {
-            throw new IllegalArgumentException("No path mapped to " + arg);
-        }
-    }
-
-    public static void resetAlias() {
-        aliasFactory.reset();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D> SimplePath<D> var() {
-        return (SimplePath<D>) it;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D extends Comparable<?>> ComparablePath<D> var(D arg) {
-        return new ComparablePath<D>((Class)arg.getClass(), "var"+arg);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D extends Number & Comparable<D>> NumberPath<D> var(D arg) {
-        return new NumberPath<D>((Class)arg.getClass(), "var" + arg.getClass().getSimpleName()+arg);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D> EntityPathBase<D> var(D arg) {
-        String var = "var"+ arg.getClass().getSimpleName() + "_" + arg.toString().replace(' ', '_');
-        return new PathBuilder<D>((Class)arg.getClass(), var);
-    }
-
-    public static StringPath var(String arg) {
-        return new StringPath(arg.replace(' ', '_'));
-    }
-
-    private Alias() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/AliasFactory.java b/querydsl-core/src/main/java/com/mysema/query/alias/AliasFactory.java
deleted file mode 100644
index 7987a962b8..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/AliasFactory.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.util.concurrent.ExecutionException;
-
-import javax.annotation.Nullable;
-
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryException;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.PathMetadataFactory;
-
-/**
- * AliasFactory is a factory class for alias creation
- *
- * @author tiwe
- */
-public class AliasFactory {
-
-    private final ThreadLocal<Expression<?>> current = new ThreadLocal<Expression<?>>();
-
-    private final PathFactory pathFactory;
-    
-    private final TypeSystem typeSystem;
-    
-    // caches top level paths (class/var as key)
-    private final LoadingCache<Pair<Class<?>,String>, EntityPath<?>> pathCache;
-        
-    private final LoadingCache<Pair<Class<?>,Expression<?>>, ManagedObject> proxyCache =
-        CacheBuilder.newBuilder().build(
-            new CacheLoader<Pair<Class<?>,Expression<?>>,ManagedObject>() {
-                @Override
-                public ManagedObject load(Pair<Class<?>, Expression<?>> input) {
-                    return (ManagedObject) createProxy(input.getFirst(), input.getSecond());
-                }
-            });
-    
-    public AliasFactory(final PathFactory pathFactory, TypeSystem typeSystem) {
-        this.pathFactory = pathFactory; 
-        this.typeSystem = typeSystem;
-        this.pathCache = CacheBuilder.newBuilder().build( 
-            new CacheLoader<Pair<Class<?>, String>, EntityPath<?>>() {
-                @Override
-                public EntityPath<?> load( Pair<Class<?>, String> input) {
-                    return (EntityPath<?>)pathFactory.createEntityPath(
-                            input.getFirst(), 
-                            PathMetadataFactory.forVariable(input.getSecond()));
-                }
-            });
-    }
-    
-    /**
-     * Create an alias instance for the given class and Expression
-     * 
-     * @param <A>
-     * @param cl
-     * @param expr
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A> A createAliasForExpr(Class<A> cl, Expression<? extends A> expr) {
-        try {
-            return (A) proxyCache.get(Pair.<Class<?>, Expression<?>>of(cl, expr));
-        } catch (ExecutionException e) {
-           throw new QueryException(e);
-        }
-    }
-
-    /**
-     * Create an alias instance for the given class, parent and path
-     * 
-     * @param <A>
-     * @param cl
-     * @param parent
-     * @param path
-     * @return
-     */
-    public <A> A createAliasForProperty(Class<A> cl, Object parent, Expression<?> path) {
-        return createProxy(cl, path);
-    }
-
-    /**
-     * Create an alias instance for the given class and variable name
-     * 
-     * @param <A>
-     * @param cl
-     * @param var
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A> A createAliasForVariable(Class<A> cl, String var) {
-        try {
-            Expression<?> path = pathCache.get(Pair.<Class<?>, String>of(cl, var));
-            return (A) proxyCache.get(Pair.<Class<?>, Expression<?>>of(cl, path));
-        } catch (ExecutionException e) {
-            throw new QueryException(e);
-        }        
-    }
-
-    /**
-     * Create a proxy instance for the given class and path
-     * 
-     * @param <A>
-     * @param cl
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A> A createProxy(Class<A> cl, Expression<?> path) {
-        Enhancer enhancer = new Enhancer();
-        enhancer.setClassLoader(AliasFactory.class.getClassLoader());
-        if (cl.isInterface()) {
-            enhancer.setInterfaces(new Class[] { cl, ManagedObject.class });
-        } else {
-            enhancer.setSuperclass(cl);
-            enhancer.setInterfaces(new Class[] { ManagedObject.class });
-        }
-        // creates one handler per proxy
-        MethodInterceptor handler = new PropertyAccessInvocationHandler(path, this, pathFactory, typeSystem);
-        enhancer.setCallback(handler);
-        return (A) enhancer.create();
-    }
-
-    /**
-     * Get the current thread bound expression without reseting it
-     * 
-     * @param <A>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <A extends Expression<?>> A getCurrent() {
-        return (A) current.get();
-    }
-
-    /**
-     * Get the current thread bound expression and reset it
-     * 
-     * @param <A>
-     * @return
-     */
-    @Nullable
-    public <A extends Expression<?>> A getCurrentAndReset() {
-        A rv = this.<A> getCurrent();
-        reset();
-        return rv;
-    }
-
-    /**
-     * Reset the thread bound expression to null
-     */
-    public void reset() {
-        current.set(null);
-    }
-
-    /**
-     * Set the thread bound expression to the given value
-     * 
-     * @param expr
-     */
-    public void setCurrent(Expression<?> expr) {
-        current.set(expr);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/DefaultPathFactory.java b/querydsl-core/src/main/java/com/mysema/query/alias/DefaultPathFactory.java
deleted file mode 100644
index ebd81d309a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/DefaultPathFactory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.ArrayPath;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.CollectionPath;
-import com.mysema.query.types.path.ComparableEntityPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SetPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-/**
- * DefaultPathFactory is the default implementation of the {@link PathFactory} interface
- *
- * @author tiwe
- *
- */
-public class DefaultPathFactory implements PathFactory {
-
-    @Override
-    public <T> Path<T[]> createArrayPath(Class<T[]> arrayType, PathMetadata<?> metadata) {
-        return new ArrayPath<T[], T>(arrayType, metadata);
-    }
-
-    @Override
-    public Path<Boolean> createBooleanPath(PathMetadata<?> metadata) {
-        return new BooleanPath(metadata);
-    }
-
-    @Override
-    public <E> Path<Collection<E>> createCollectionPath(Class<E> elementType, PathMetadata<?> metadata) {
-        return new CollectionPath<E,EntityPathBase<E>>(elementType, (Class)EntityPathBase.class, metadata);
-    }
-
-    @Override
-    public <T extends Comparable<?>> Path<T> createComparablePath( Class<T> type, PathMetadata<?> metadata) {
-        return new ComparablePath<T>(type, metadata);
-    }
-
-    @Override
-    public <T extends Comparable<?>> Path<T> createDatePath(Class<T> type, PathMetadata<?> metadata) {
-        return new DatePath<T>(type, metadata);
-    }
-
-    @Override
-    public <T extends Comparable<?>> Path<T> createDateTimePath(Class<T> type, PathMetadata<?> metadata) {
-        return new DateTimePath<T>(type, metadata);
-    }
-
-    @Override
-    public <T> Path<T> createEntityPath(Class<T> type, PathMetadata<?> metadata) {
-        if (Comparable.class.isAssignableFrom(type)) {
-            return new ComparableEntityPath(type, metadata);
-        } else {
-            return new EntityPathBase<T>(type, metadata);
-        }
-    }
-
-    @Override
-    public <T extends Enum<T>> Path<T> createEnumPath( Class<T> type, PathMetadata<?> metadata) {
-        return new EnumPath<T>(type, metadata);
-    }
-
-    @Override
-    public <E> Path<List<E>> createListPath(Class<E> elementType, PathMetadata<?> metadata) {
-        return new ListPath<E,EntityPathBase<E>>(elementType, (Class)EntityPathBase.class, metadata);
-    }
-
-    @Override
-    public <K, V> Path<Map<K, V>> createMapPath(Class<K> keyType, Class<V> valueType, PathMetadata<?> metadata) {
-        return new MapPath<K,V,EntityPathBase<V>>(keyType, valueType, (Class)EntityPathBase.class, metadata);
-    }
-
-    @Override
-    public <T extends Number & Comparable<T>> Path<T> createNumberPath(Class<T> type, PathMetadata<?> metadata) {
-        return new NumberPath<T>(type, metadata);
-    }
-
-    @Override
-    public <E> Path<Set<E>> createSetPath(Class<E> elementType, PathMetadata<?> metadata) {
-        return new SetPath<E,EntityPathBase<E>>(elementType, (Class)EntityPathBase.class, metadata);
-    }
-
-    @Override
-    public <T> Path<T> createSimplePath(Class<T> type, PathMetadata<?> metadata) {
-        return new SimplePath<T>(type, metadata);
-    }
-    @Override
-    public Path<String> createStringPath(PathMetadata<?> metadata) {
-        return new StringPath(metadata);
-    }
-
-    @Override
-    public <T extends Comparable<?>> Path<T> createTimePath(Class<T> type, PathMetadata<?> metadata) {
-        return new TimePath<T>(type, metadata);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/ManagedObject.java b/querydsl-core/src/main/java/com/mysema/query/alias/ManagedObject.java
deleted file mode 100644
index d29a5794f4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/ManagedObject.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import com.mysema.query.types.EntityPath;
-
-/**
- * MagagedObject is a tagging interface for CGLIB alias proxies
- *
- */
-public interface ManagedObject {
-
-    /**
-     * @return
-     */
-    EntityPath<?> __mappedPath();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/MethodType.java b/querydsl-core/src/main/java/com/mysema/query/alias/MethodType.java
deleted file mode 100644
index 90cb6c5820..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/MethodType.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.EntityPath;
-
-/**
- * MethodType defines the supported method types used in the Alias functionality
- * 
- * @author tiwe
- *
- */
-public enum MethodType{
-    /**
-     *
-     */
-    GET_MAPPED_PATH("__mappedPath", EntityPath.class, ManagedObject.class),
-    /**
-     *
-     */
-    GETTER("(get|is).+", Object.class, Object.class),
-    /**
-     *
-     */
-    HASH_CODE("hashCode", int.class, Object.class),
-    /**
-     *
-     */
-    LIST_ACCESS("get", Object.class, List.class, int.class),
-    /**
-     *
-     */
-    MAP_ACCESS("get", Object.class, Map.class, Object.class),
-    /**
-     *
-     */
-    SIZE("size", int.class, Object.class),
-    /**
-     *
-     */
-    TO_STRING("toString",String.class, Object.class),
-    /**
-     *
-     */
-    SCALA_GETTER(".+", Object.class, Object.class),
-    /**
-     *
-     */
-    SCALA_LIST_ACCESS("apply", Object.class, Object.class, int.class),
-    /**
-     *
-     */
-    SCALA_MAP_ACCESS("apply", Object.class, Object.class, Object.class);
-
-    private final Pattern pattern;
-
-    private final Class<?> returnType;
-
-    private final Class<?> ownerType;
-
-    private final Class<?>[] paramTypes;
-
-    private MethodType(String namePattern, Class<?> returnType, Class<?> ownerType, Class<?>... paramTypes) {
-        this.pattern = Pattern.compile(namePattern);
-        this.returnType = returnType;
-        this.ownerType = ownerType;
-        this.paramTypes = paramTypes;
-    }
-
-    @Nullable
-    public static MethodType get(Method method) {
-        for (MethodType methodType : values()) {
-            if (methodType.pattern.matcher(method.getName()).matches()
-                && (methodType.returnType == Object.class || methodType.returnType.isAssignableFrom(method.getReturnType()))
-                && (methodType.ownerType == Object.class || methodType.ownerType.isAssignableFrom(method.getDeclaringClass()))
-                && Arrays.equals(methodType.paramTypes, method.getParameterTypes())) {
-                return methodType;
-            }
-        }
-        return null;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/PathFactory.java b/querydsl-core/src/main/java/com/mysema/query/alias/PathFactory.java
deleted file mode 100644
index 9cc4188e61..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/PathFactory.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-
-/**
- * PathFactory defines a factory interface for Path creation
- * 
- * @author tiwe
- *
- */
-public interface PathFactory {
-        
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T> Path<T[]> createArrayPath(Class<T[]> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T> Path<T> createEntityPath(Class<T> type, PathMetadata<?> metadata);
-
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T> Path<T> createSimplePath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Comparable<?>> Path<T> createComparablePath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Enum<T>> Path<T> createEnumPath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Comparable<?>> Path<T> createDatePath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Comparable<?>> Path<T> createTimePath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Comparable<?>> Path<T> createDateTimePath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param type
-     * @param metadata
-     * @return
-     */
-    <T extends Number & Comparable<T>> Path<T> createNumberPath(Class<T> type, PathMetadata<?> metadata);
-    
-    /**
-     * @param metadata
-     * @return
-     */
-    Path<Boolean> createBooleanPath(PathMetadata<?> metadata);
-    
-    /**
-     * @param metadata
-     * @return
-     */
-    Path<String> createStringPath(PathMetadata<?> metadata);
-
-    /**
-     * @param elementType
-     * @param metadata
-     * @return
-     */
-    <E> Path<List<E>> createListPath(Class<E> elementType, PathMetadata<?> metadata);
-    
-    /**
-     * @param elementType
-     * @param metadata
-     * @return
-     */
-    <E> Path<Set<E>> createSetPath(Class<E> elementType, PathMetadata<?> metadata);
-    
-    /**
-     * @param elementType
-     * @param metadata
-     * @return
-     */
-    <E> Path<Collection<E>> createCollectionPath(Class<E> elementType, PathMetadata<?> metadata);
-    
-    /**
-     * @param keyType
-     * @param valueType
-     * @param metadata
-     * @return
-     */
-    <K,V> Path<Map<K,V>> createMapPath(Class<K> keyType, Class<V> valueType, PathMetadata<?> metadata);
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java b/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java
deleted file mode 100644
index 82b11a7159..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ParametrizedExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.util.BeanUtils;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * PropertyAccessInvocationHandler is the main InvocationHandler class for the
- * CGLIB alias proxies
- *
- * @author tiwe
- */
-public class PropertyAccessInvocationHandler implements MethodInterceptor {
-
-    private static final int RETURN_VALUE = 42;
-
-    private final Expression<?> hostExpression;
-
-    private final AliasFactory aliasFactory;
-
-    private final Map<Object, Expression<?>> propToExpr = new HashMap<Object, Expression<?>>();
-
-    private final Map<Object, Object> propToObj = new HashMap<Object, Object>();
-
-    private final PathFactory pathFactory;
-
-    private final TypeSystem typeSystem;
-
-    public PropertyAccessInvocationHandler(Expression<?> host, AliasFactory aliasFactory,
-            PathFactory pathFactory, TypeSystem typeSystem) {
-        this.hostExpression = host;
-        this.aliasFactory = aliasFactory;
-        this.pathFactory = pathFactory;
-        this.typeSystem = typeSystem;
-    }
-
-    //CHECKSTYLE:OFF
-    public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
-    //CHECKSTYLE:ON
-        Object rv = null;
-
-        MethodType methodType = MethodType.get(method);
-
-        if (methodType == MethodType.GETTER) {
-            String ptyName = propertyNameForGetter(method);
-            Class<?> ptyClass = method.getReturnType();
-            Type genericType = method.getGenericReturnType();
-
-            if (propToObj.containsKey(ptyName)) {
-                rv = propToObj.get(ptyName);
-            } else {
-                PathMetadata<String> pm = createPropertyPath((Path<?>) hostExpression, ptyName);
-                rv = newInstance(ptyClass, genericType, proxy, ptyName, pm);
-            }
-            aliasFactory.setCurrent(propToExpr.get(ptyName));
-
-        } else if (methodType == MethodType.SCALA_GETTER) {
-            String ptyName = method.getName();
-            Class<?> ptyClass = method.getReturnType();
-            Type genericType = method.getGenericReturnType();
-
-            if (propToObj.containsKey(ptyName)) {
-                rv = propToObj.get(ptyName);
-            } else {
-                PathMetadata<String> pm = createPropertyPath((Path<?>) hostExpression, ptyName);
-                rv = newInstance(ptyClass, genericType, proxy, ptyName, pm);
-            }
-            aliasFactory.setCurrent(propToExpr.get(ptyName));
-
-        } else if (methodType == MethodType.LIST_ACCESS || methodType == MethodType.SCALA_LIST_ACCESS) {
-            // TODO : manage cases where the argument is based on a property invocation
-            Object propKey = ImmutableList.of(MethodType.LIST_ACCESS, args[0]);
-            if (propToObj.containsKey(propKey)) {
-                rv = propToObj.get(propKey);
-            } else {
-                PathMetadata<Integer> pm = createListAccessPath((Path<?>) hostExpression, (Integer) args[0]);
-                Class<?> elementType = ((ParametrizedExpression<?>) hostExpression).getParameter(0);
-                rv = newInstance(elementType, elementType, proxy, propKey, pm);
-            }
-            aliasFactory.setCurrent(propToExpr.get(propKey));
-
-        } else if (methodType == MethodType.MAP_ACCESS || methodType == MethodType.SCALA_MAP_ACCESS) {
-            Object propKey = ImmutableList.of(MethodType.MAP_ACCESS, args[0]);
-            if (propToObj.containsKey(propKey)) {
-                rv = propToObj.get(propKey);
-            } else {
-                PathMetadata<?> pm = createMapAccessPath((Path<?>)hostExpression, args[0]);
-                Class<?> valueType = ((ParametrizedExpression<?>) hostExpression).getParameter(1);
-                rv = newInstance(valueType, valueType, proxy, propKey, pm);
-            }
-            aliasFactory.setCurrent(propToExpr.get(propKey));
-
-        } else if (methodType == MethodType.TO_STRING) {
-            rv = hostExpression.toString();
-
-        } else if (methodType == MethodType.HASH_CODE) {
-            rv = hostExpression.hashCode();
-
-        } else if (methodType == MethodType.GET_MAPPED_PATH) {
-            rv = hostExpression;
-
-        } else {
-            throw new IllegalArgumentException(
-                    "Invocation of " + method.getName() +
-                    " with types " + Arrays.asList(method.getParameterTypes()) + " not supported");
-        }
-        return rv;
-    }
-
-    @SuppressWarnings({ "unchecked"})
-    @Nullable
-    protected <T> T newInstance(Class<T> type, Type genericType, Object parent, Object propKey, 
-            PathMetadata<?> metadata) {
-        Expression<?> path;
-        Object rv;
-
-        if (String.class.equals(type)) {
-            path = pathFactory.createStringPath(metadata);
-            // null is used as a return value to block method invocations on Strings
-            rv = null;
-
-        } else if (Integer.class.equals(type) || int.class.equals(type)) {
-            path = pathFactory.createNumberPath(Integer.class, metadata);
-            rv = Integer.valueOf(RETURN_VALUE);
-
-        } else if (Byte.class.equals(type) || byte.class.equals(type)) {
-            path = pathFactory.createNumberPath(Byte.class, metadata);
-            rv = Byte.valueOf((byte)RETURN_VALUE);
-
-        } else if (java.util.Date.class.equals(type)) {
-            path = pathFactory.createDateTimePath((Class)type, metadata);
-            rv = new Date();
-
-        } else if (java.sql.Timestamp.class.equals(type)) {
-            path = pathFactory.createDateTimePath((Class)type, metadata);
-            rv = new Timestamp(System.currentTimeMillis());
-
-        } else if (java.sql.Date.class.equals(type)) {
-            path = pathFactory.createDatePath((Class)type, metadata);
-            rv = new java.sql.Date(System.currentTimeMillis());
-
-        } else if (java.sql.Time.class.equals(type)) {
-            path = pathFactory.createTimePath((Class)type, metadata);
-            rv = new java.sql.Time(System.currentTimeMillis());
-
-        } else if (Long.class.equals(type) || long.class.equals(type)) {
-            path = pathFactory.createNumberPath(Long.class, metadata);
-            rv = Long.valueOf(RETURN_VALUE);
-
-        } else if (Short.class.equals(type) || short.class.equals(type)) {
-            path = pathFactory.createNumberPath(Short.class, metadata);
-            rv = Short.valueOf((short) RETURN_VALUE);
-
-        } else if (Double.class.equals(type) || double.class.equals(type)) {
-            path = pathFactory.createNumberPath(Double.class, metadata);
-            rv = Double.valueOf(RETURN_VALUE);
-
-        } else if (Float.class.equals(type) || float.class.equals(type)) {
-            path = pathFactory.createNumberPath(Float.class, metadata);
-            rv = Float.valueOf(RETURN_VALUE);
-
-        } else if (BigInteger.class.equals(type)) {
-            path = pathFactory.createNumberPath((Class)type, metadata);
-            rv = BigInteger.valueOf(RETURN_VALUE);
-
-        } else if (BigDecimal.class.equals(type)) {
-            path = pathFactory.createNumberPath((Class)type, metadata);
-            rv = BigDecimal.valueOf(RETURN_VALUE);
-
-        } else if (Boolean.class.equals(type) || boolean.class.equals(type)) {
-            path = pathFactory.createBooleanPath(metadata);
-            rv = Boolean.TRUE;
-
-        } else if (typeSystem.isMapType(type)) {
-            Class<Object> keyType = (Class)ReflectionUtils.getTypeParameter(genericType, 0);
-            Class<Object> valueType = (Class)ReflectionUtils.getTypeParameter(genericType, 1);
-            path = pathFactory.createMapPath(keyType, valueType, metadata);
-            rv = aliasFactory.createAliasForProperty(type, parent, path);
-
-        } else if (typeSystem.isListType(type)) {
-            Class<Object> elementType = (Class)ReflectionUtils.getTypeParameter(genericType, 0);
-            path = pathFactory.createListPath(elementType, metadata);
-            rv = aliasFactory.createAliasForProperty(type, parent, path);
-
-        } else if (typeSystem.isSetType(type)) {
-            Class<?> elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
-            path = pathFactory.createSetPath(elementType, metadata);
-            rv = aliasFactory.createAliasForProperty(type, parent, path);
-
-        } else if (typeSystem.isCollectionType(type)) {
-            Class<?> elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
-            path = pathFactory.createCollectionPath(elementType, metadata);
-            rv = aliasFactory.createAliasForProperty(type, parent, path);
-
-        } else if (Enum.class.isAssignableFrom(type)) {
-            path = pathFactory.createEnumPath((Class)type, metadata);
-            rv = type.getEnumConstants()[0];
-
-        } else if (type.isArray()) {
-            path = pathFactory.createArrayPath((Class)type, metadata);
-            rv = Array.newInstance(type.getComponentType(), 5);
-
-        } else {
-            if (Number.class.isAssignableFrom(type)) {
-                path = pathFactory.createNumberPath((Class)type, metadata);
-            } else if (Comparable.class.isAssignableFrom(type)) {
-                path = pathFactory.createComparablePath((Class)type, metadata);
-            } else {
-                path = pathFactory.createEntityPath(type, metadata);
-            }
-            if (!Modifier.isFinal(type.getModifiers())) {
-                rv = aliasFactory.createAliasForProperty(type, parent, path);
-            } else {
-                rv = null;
-            }
-        }
-        propToObj.put(propKey, rv);
-        propToExpr.put(propKey, path);
-        return (T) rv;
-    }
-
-    protected String propertyNameForGetter(Method method) {
-        String name = method.getName();
-        name = name.startsWith("is") ? name.substring(2) : name.substring(3);
-        return BeanUtils.uncapitalize(name);
-    }
-
-    protected PathMetadata<String> createPropertyPath(Path<?> path, String propertyName) {
-        return PathMetadataFactory.forProperty(path, propertyName);
-    }
-
-    protected PathMetadata<Integer> createListAccessPath(Path<?> path, Integer index) {
-        return PathMetadataFactory.forListAccess(path, index);
-    }
-
-    protected PathMetadata<?> createMapAccessPath(Path<?> path, Object key) {
-        return PathMetadataFactory.forMapAccess(path, key);
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/TypeSystem.java b/querydsl-core/src/main/java/com/mysema/query/alias/TypeSystem.java
deleted file mode 100644
index 5704f3dace..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/TypeSystem.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-/**
- * TypeSystem defines an interface for detecting whether a given class confirms to certain Collection
- * contract
- * 
- * @author tiwe
- *
- */
-public interface TypeSystem {
-    
-    /**
-     * @param cl
-     * @return
-     */
-    boolean isCollectionType(Class<?> cl);
-    
-    /**
-     * @param cl
-     * @return
-     */
-    boolean isSetType(Class<?> cl);
-    
-    /**
-     * @param cl
-     * @return
-     */
-    boolean isListType(Class<?> cl);
-    
-    /**
-     * @param cl
-     * @return
-     */
-    boolean isMapType(Class<?> cl);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/package-info.java b/querydsl-core/src/main/java/com/mysema/query/alias/package-info.java
deleted file mode 100644
index 360946957b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/alias/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Alias functionality
- */
-package com.mysema.query.alias;
-
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/PropertyType.java b/querydsl-core/src/main/java/com/mysema/query/annotations/PropertyType.java
deleted file mode 100644
index ff2126dfcf..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/PropertyType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.annotations;
-
-
-/**
- * PropertyType defines the Path type to be used for a Domain property
- *
- * @author tiwe
- *
- */
-public enum PropertyType {
-    /**
-     * 
-     */    
-    COMPARABLE,
-    
-    /**
-     * 
-     */    
-    ENUM,
-    
-    /**
-     * 
-     */    
-    DATE,
-    
-    /**
-     * 
-     */    
-    DATETIME,
-    
-    /**
-     * 
-     */    
-    NONE,
-    
-    /**
-     * 
-     */
-    NUMERIC,
-    
-    /**
-     * 
-     */    
-    SIMPLE,
-    
-    /**
-     * 
-     */
-    STRING,
-    
-    /**
-     * 
-     */
-    TIME,
-    
-    /**
-     *
-     */
-    ENTITY,
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/package-info.java b/querydsl-core/src/main/java/com/mysema/query/annotations/package-info.java
deleted file mode 100644
index c4ddbaa1f5..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains annotation for Domain and DTO types
- */
-package com.mysema.query.annotations;
-
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java b/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java
deleted file mode 100644
index 5737199528..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/dml/InsertClause.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.dml;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * InsertClause defines a generic interface for Insert clauses
- *
- * @author tiwe
- *
- * @param <C> concrete subtype
- */
-public interface InsertClause<C extends InsertClause<C>> extends StoreClause<C> {
-
-    /**
-     * Define the columns to be populated
-     *
-     * @param columns
-     * @return
-     */
-    C columns(Path<?>... columns);
-
-    /**
-     * Define the populate via subquery
-     *
-     * @param subQuery
-     * @return
-     */
-    C select(SubQueryExpression<?> subQuery);
-
-    /**
-     * Define the value bindings
-     *
-     * @param v
-     * @return
-     */
-    C values(Object... v);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/StoreClause.java b/querydsl-core/src/main/java/com/mysema/query/dml/StoreClause.java
deleted file mode 100644
index 6becdcdcd0..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/dml/StoreClause.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.dml;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-
-/**
- * Parent interface for {@link InsertClause} and {@link UpdateClause}
- * 
- * @author tiwe
- *
- * @param <C> concrete subtype
- */
-public interface StoreClause<C extends StoreClause<C>> extends DMLClause<C> {
-    
-    /**
-     * Add a value binding
-     *
-     * @param <T>
-     * @param path path to be updated
-     * @param value value to set
-     * @return
-     */
-    <T> C set(Path<T> path, @Nullable T value);
-    
-    /**
-     * Add an expression binding
-     * 
-     * @param <T>
-     * @param path
-     * @param expression
-     * @return
-     */
-    <T> C set(Path<T> path, Expression<? extends T> expression);
-    
-    /**
-     * Bind the given path to null
-     * 
-     * @param path
-     * @return
-     */
-    <T> C setNull(Path<T> path);
-    
-    /**
-     * Returns true, if no bindings have been set, otherwise false.
-     * 
-     * @return
-     */
-    boolean isEmpty();
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/UpdateClause.java b/querydsl-core/src/main/java/com/mysema/query/dml/UpdateClause.java
deleted file mode 100644
index 4d7e1bff0b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/dml/UpdateClause.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.dml;
-
-import java.util.List;
-
-import com.mysema.query.FilteredClause;
-import com.mysema.query.types.Path;
-
-/**
- * UpdateClause defines a generic extensible interface for Update clauses
- *
- * @author tiwe
- *
- * @param <C> concrete subtype
- */
-public interface UpdateClause<C extends UpdateClause<C>> extends StoreClause<C>, FilteredClause<C> {
-
-    /**
-     * Set the paths to be updated
-     *
-     * @param paths
-     * @param values
-     * @return
-     */
-    C set(List<? extends Path<?>> paths, List<?> values);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/package-info.java b/querydsl-core/src/main/java/com/mysema/query/dml/package-info.java
deleted file mode 100644
index 3bb0798850..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/dml/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * DML interfaces
- */
-package com.mysema.query.dml;
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupExpression.java b/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupExpression.java
deleted file mode 100644
index 87f122e972..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupExpression.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DslExpression;
-import com.mysema.query.types.expr.DslOperation;
-
-/**
- * A base class for GroupExpressions
- * @author sasa
- *
- * @param <T>
- * @param <R>
- */
-public abstract class AbstractGroupExpression<T, R> implements GroupExpression<T, R> {
-
-    private static final long serialVersionUID = 1509709546966783160L;
-
-    private final Class<? extends R> type;
-
-    private final Expression<T> expr;
-
-    @SuppressWarnings("unchecked")
-    public AbstractGroupExpression(Class<? super R> type, Expression<T> expr) {
-        this.type = (Class)type;
-        this.expr = expr;
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public DslExpression<R> as(Path<R> alias) {
-        return DslOperation.create((Class<R>)getType(), Ops.ALIAS, this, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public DslExpression<R> as(String alias) {
-        return as(new PathImpl<R>(getType(), alias));
-    }
-
-    @Override
-    public Expression<T> getExpression() {
-        return expr;
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return expr.accept(v, context);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o != null && getClass().equals(o.getClass())) {
-            return ((GroupExpression<?,?>)o).getExpression().equals(expr);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public Class<? extends R> getType() {
-        return type;
-    }
-
-    @Override
-    public int hashCode() {
-        return expr.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return expr.toString();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java b/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java
deleted file mode 100644
index e718beab7e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GAvg.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.math.BigDecimal;
-
-import com.mysema.query.types.Expression;
-import com.mysema.util.MathUtils;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-@SuppressWarnings("unchecked")
-public class GAvg<T extends Number & Comparable<T>> extends AbstractGroupExpression<T, T> {
-
-    private static final long serialVersionUID = 3518868612387641383L;
-
-    public GAvg(Expression<T> expr) {
-        super((Class) expr.getType(), expr);
-    }
-
-    @Override
-    public GroupCollector<T, T> createGroupCollector() {
-        return new GroupCollector<T, T>() {
-            private int count = 0;
-            private BigDecimal sum = BigDecimal.ZERO;
-
-            @Override
-            public void add(T t) {
-                count++;
-                if (t != null) {
-                    sum = sum.add(new BigDecimal(t.toString()));
-                }
-            }
-
-            @Override
-            public T get() {
-                BigDecimal avg = sum.divide(BigDecimal.valueOf(count));
-                return MathUtils.cast(avg, (Class<T>) getType());
-            }
-
-        };
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GMap.java b/querydsl-core/src/main/java/com/mysema/query/group/GMap.java
deleted file mode 100644
index 5fe69db0dd..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GMap.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.mysema.commons.lang.Pair;
-
-/**
- * @param <K>
- * @param <V>
- */
-class GMap<K, V> extends AbstractGroupExpression<Pair<K, V>, Map<K, V>> {
-
-    private static final long serialVersionUID = 7106389414200843920L;
-
-    public GMap(QPair<K,V> qpair) {
-        super(Map.class, qpair);
-    }
-
-    @Override
-    public GroupCollector<Pair<K,V>, Map<K, V>> createGroupCollector() {
-        return new GroupCollector<Pair<K,V>, Map<K, V>>() {
-
-            private final Map<K, V> map = new LinkedHashMap<K, V>();
-
-            @Override
-            public void add(Pair<K,V> pair) {
-                map.put(pair.getFirst(), pair.getSecond());
-            }
-
-            @Override
-            public Map<K, V> get() {
-                return map;
-            }
-
-        };
-    }
-
-    static class Mixin<K, V, T, U, R extends Map<? super T, ? super U>> extends AbstractGroupExpression<Pair<K, V>, R> {
-
-        private static final long serialVersionUID = 1939989270493531116L;
-
-        private class GroupCollectorImpl implements GroupCollector<Pair<K, V>, R> {
-
-            private final GroupCollector<Pair<T, U>, R> groupCollector;
-
-            private final Map<K, GroupCollector<K, T>> keyCollectors = new LinkedHashMap<K, GroupCollector<K, T>>();
-
-            private final Map<GroupCollector<K, T>, GroupCollector<V, U>> valueCollectors = new HashMap<GroupCollector<K, T>, GroupCollector<V, U>>();
-
-            public GroupCollectorImpl() {
-                this.groupCollector = mixin.createGroupCollector();
-            }
-
-            @Override
-            public void add(Pair<K, V> pair) {
-                K first = pair.getFirst();
-                GroupCollector<K, T> keyCollector = keyCollectors.get(first);
-                if (keyCollector == null) {
-                    keyCollector = keyExpression.createGroupCollector();
-                    keyCollectors.put(first, keyCollector);
-                }
-                keyCollector.add(first);
-                GroupCollector<V, U> valueCollector = valueCollectors.get(keyCollector);
-                if (valueCollector == null) {
-                    valueCollector = valueExpression.createGroupCollector();
-                    valueCollectors.put(keyCollector, valueCollector);
-                }
-                V second = pair.getSecond();
-                valueCollector.add(second);
-            }
-
-            @Override
-            public R get() {
-                for (GroupCollector<K, T> keyCollector : keyCollectors.values()) {
-                    T key = keyCollector.get();
-                    GroupCollector<V, U> valueCollector = valueCollectors.remove(keyCollector);
-                    U value = valueCollector.get();
-                    groupCollector.add(Pair.of(key, value));
-                }
-                keyCollectors.clear();
-                return groupCollector.get();
-            }
-
-        }
-
-        private final GroupExpression<Pair<T, U>, R> mixin;
-
-        private final GroupExpression<K, T> keyExpression;
-        private final GroupExpression<V, U> valueExpression;
-
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        public Mixin(GroupExpression<K, T> keyExpression, GroupExpression<V, U> valueExpression, AbstractGroupExpression<Pair<T, U>, R> mixin) {
-            super((Class) mixin.getType(), QPair.create(keyExpression.getExpression(), valueExpression.getExpression()));
-            this.keyExpression = keyExpression;
-            this.valueExpression = valueExpression;
-            this.mixin = mixin;
-        }
-
-        @Override
-        public GroupCollector<Pair<K, V>, R> createGroupCollector() {
-            return new GroupCollectorImpl();
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GOne.java b/querydsl-core/src/main/java/com/mysema/query/group/GOne.java
deleted file mode 100644
index a08e56e053..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GOne.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import com.mysema.query.types.Expression;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-class GOne<T> extends AbstractGroupExpression<T, T> {
-
-    private static final long serialVersionUID = 3518868612387641383L;
-
-    @SuppressWarnings("unchecked")
-    public GOne(Expression<T> expr) {
-        super((Class)expr.getType(), expr);
-    }
-
-    @Override
-    public GroupCollector<T,T> createGroupCollector() {
-        return new GroupCollector<T,T>() {
-            private boolean first = true;
-            
-            private T val;
-            
-            @Override
-            public void add(T o) {
-                if (first) {
-                    val = o;
-                    first = false;
-                }
-            }
-    
-            @Override
-            public T get() {
-                return val;
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GSet.java b/querydsl-core/src/main/java/com/mysema/query/group/GSet.java
deleted file mode 100644
index 49dd27df0f..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GSet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import com.mysema.query.types.Expression;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-class GSet<T> extends AbstractGroupExpression<T, Set<T>> { 
-    
-    private static final long serialVersionUID = -1575808026237160843L;
-
-    public GSet(Expression<T> expr) {
-        super(Set.class, expr);
-    }
-
-    @Override
-    public GroupCollector<T,Set<T>> createGroupCollector() {
-        return new GroupCollector<T,Set<T>>() {
-
-            private final Set<T> set = new LinkedHashSet<T>();
-            
-            @Override
-            public void add(T o) {
-                if (o != null) {
-                    set.add(o);    
-                }                
-            }
-
-            @Override
-            public Set<T> get() {
-                return set;
-            }
-            
-        };
-    }
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GSum.java b/querydsl-core/src/main/java/com/mysema/query/group/GSum.java
deleted file mode 100644
index 336a335336..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GSum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.math.BigDecimal;
-
-import com.mysema.query.types.Expression;
-import com.mysema.util.MathUtils;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-@SuppressWarnings("unchecked")
-public class GSum<T extends Number & Comparable<T>> extends AbstractGroupExpression<T, T> {
-
-    private static final long serialVersionUID = 3518868612387641383L;
-
-    public GSum(Expression<T> expr) {
-        super((Class) expr.getType(), expr);
-    }
-
-    @Override
-    public GroupCollector<T, T> createGroupCollector() {
-        return new GroupCollector<T, T>() {
-            private BigDecimal sum = BigDecimal.ZERO;
-
-            @Override
-            public void add(T t) {
-                if (t != null) {
-                    sum = sum.add(new BigDecimal(t.toString()));    
-                }                
-            }
-
-            @Override
-            public T get() {
-                return (T) MathUtils.cast(sum, (Class<T>) getType());
-            }
-
-        };
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/Group.java b/querydsl-core/src/main/java/com/mysema/query/group/Group.java
deleted file mode 100644
index 612aa1d17a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/Group.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import com.mysema.query.types.Expression;
-
-/**
- * A group of rows. Group is build according to GroupDefinitions. 
- * 
- * @author sasa
- *
- */
-public interface Group {
-    
-    /**
-     * @return Groups elements as an array
-     */
-    Object[] toArray();
-    
-    /**
-     * Returns the value of the given group. 
-     * 
-     * @param <T> Type of element in a single ResultSet row, i.e. type of Expression&lt;T>
-     * @param <R> Target type of this group, e.g. List&lt;T>
-     * @param coldef 
-     * @throws NoSuchElementException if group is undefined.
-     * @throws ClassCastException if group is of different type  
-     * @return Value of given group definition in this group
-     */
-    <T, R> R getGroup(GroupExpression<T, R> coldef);
-    
-    /**
-     * Returns the value of the given single valued expression. This is the 
-     * first value of given column within this group of the ResultSet. 
-     * 
-     * @param <T> Value type
-     * @param expr Grouped expression
-     * @throws NoSuchElementException if group is undefined.  
-     * @throws ClassCastException if group is of different type (e.g. Set)
-     * @return Value of given expression in this group
-     */
-    <T> T getOne(Expression<T> expr);
-    
-    /**
-     * Returns a Set of values in this group. 
-     * 
-     * @param <T> Value type of Set
-     * @param expr Grouped expression
-     * @throws NoSuchElementException if group is undefined.  
-     * @throws ClassCastException if group is of different type (e.g. List)
-     * @return Set of values in this group
-     */
-    <T> Set<T> getSet(Expression<T> expr);
-    
-    /**
-     * Returns a List of values in this group. 
-     * 
-     * @param <T> Value type of List
-     * @param expr Grouped expression
-     * @throws NoSuchElementException if group is undefined.  
-     * @throws ClassCastException if group is of different type (e.g. Set)
-     * @return List of values in this group
-     */
-    <T> List<T> getList(Expression<T> expr);
-    
-    /**
-     * Returns a Map of values in this group
-     * 
-     * @param <K> Key type of result Map
-     * @param <V> Value type of result Map
-     * @param key Key expression
-     * @param value Value expression
-     * @throws NoSuchElementException if group is undefined.  
-     * @throws ClassCastException if group is of different type (e.g. List)
-     * @return Map of values in this group
-     */
-    <K, V> Map<K, V> getMap(Expression<K> key, Expression<V> value);
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupBy.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupBy.java
deleted file mode 100644
index 1a86e1d06a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupBy.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.QList;
-
-/**
- * Groups results by the first expression.
- *
- * @author sasa
- * @author tiwe
- *
- */
-public final class GroupBy {
-
-    /**
-     * Create a new GroupByBuilder for the given key expression
-     *
-     * @param key
-     * @return
-     */
-    public static <K> GroupByBuilder<K> groupBy(Expression<K> key) {
-        return new GroupByBuilder<K>(key);
-    }
-
-    /**
-     * Create a new GroupByBuilder for the given key expressions
-     *
-     * @param keys
-     * @return
-     */
-    public static GroupByBuilder<List<?>> groupBy(Expression<?>... keys) {
-        return new GroupByBuilder<List<?>>(new QList(keys));
-    }
-
-    /**
-     * Create a new aggregating min expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E extends Comparable<E>> AbstractGroupExpression<E, E> min(Expression<E> expression) {
-        return new GMin<E>(expression);
-    }
-
-    /**
-     * Create a new aggregating sum expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E extends Number & Comparable<E>> AbstractGroupExpression<E, E> sum(Expression<E> expression) {
-        return new GSum<E>(expression);
-    }
-
-    /**
-     * Create a new aggregating avg expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E extends Number & Comparable<E>> AbstractGroupExpression<E, E> avg(Expression<E> expression) {
-        return new GAvg<E>(expression);
-    }
-
-    /**
-     * Create a new aggregating max expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E extends Comparable<E>> AbstractGroupExpression<E, E> max(Expression<E> expression) {
-        return new GMax<E>(expression);
-    }
-
-    /**
-     * Create a new aggregating list expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E> AbstractGroupExpression<E, List<E>> list(Expression<E> expression) {
-        return new GList<E>(expression);
-    }
-
-    public static <E, F> AbstractGroupExpression<E, List<F>> list(GroupExpression<E, F> groupExpression) {
-        return new MixinGroupExpression<E, F, List<F>>(groupExpression, new GList<F>(groupExpression));
-    }
-
-    /**
-     * Create a new aggregating set expression
-     *
-     * @param expression
-     * @return
-     */
-    public static <E> AbstractGroupExpression<E, Set<E>> set(Expression<E> expression) {
-        return new GSet<E>(expression);
-    }
-
-    public static <E, F> GroupExpression<E, Set<F>> set(GroupExpression<E, F> groupExpression) {
-        return new MixinGroupExpression<E, F, Set<F>>(groupExpression, new GSet<F>(groupExpression));
-    }
-
-    /**
-     * Create a new aggregating map expression
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    @WithBridgeMethods(value=Expression.class,castRequired=true)
-    public static <K, V> AbstractGroupExpression<Pair<K, V>,Map<K, V>> map(Expression<K> key, Expression<V> value) {
-        return new GMap<K, V>(QPair.create(key, value));
-    }
-
-    public static <K, V, T> AbstractGroupExpression<Pair<K, V>, Map<T, V>> map(GroupExpression<K, T> key, Expression<V> value) {
-        return map(key, new GOne<V>(value));
-    }
-
-    public static <K, V, U> AbstractGroupExpression<Pair<K, V>, Map<K, U>> map(Expression<K> key, GroupExpression<V, U> value) {
-        return map(new GOne<K>(key), value);
-    }
-
-    public static <K, V, T, U> AbstractGroupExpression<Pair<K, V>, Map<T, U>> map(GroupExpression<K, T> key, GroupExpression<V, U> value) {
-        return new GMap.Mixin<K, V, T, U, Map<T, U>>(key, value, new GMap<T, U>(QPair.create(key, value)));
-    }
-
-    private GroupBy() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupByBuilder.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupByBuilder.java
deleted file mode 100644
index 67103572e4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupByBuilder.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-
-/**
- * GroupByBuilder is a fluent builder for GroupBy transformer instances. This class is not to be used directly,
- * but via GroupBy.
- *
- * @author tiwe
- *
- * @param <K>
- */
-public class GroupByBuilder<K> {
-
-    private final Expression<K> key;
-
-    /**
-     * Create a new GroupByBuilder for the given key expression
-     *
-     * @param key
-     */
-    public GroupByBuilder(Expression<K> key) {
-        this.key = key;
-    }
-
-    /**
-     * Get the results as a map
-     *
-     * @param expressions
-     * @return
-     */
-    public ResultTransformer<Map<K, Group>> as(Expression<?>... expressions) {
-        return new GroupByMap<K, Group>(key, expressions);
-    }
-
-    /**
-     * Get the results as a closeable iterator
-     *
-     * @param expressions
-     * @return
-     */
-    public ResultTransformer<CloseableIterator<Group>> iterate(Expression<?>... expressions) {
-        return new GroupByIterate<K, Group>(key, expressions);
-    }
-
-    /**
-     * Get the results as a list
-     *
-     * @param expressions
-     * @return
-     */
-    public ResultTransformer<List<Group>> list(Expression<?>... expressions) {
-        return new GroupByList<K, Group>(key, expressions);
-    }
-
-    /**
-     * Get the results as a map
-     *
-     * @param expression
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <V> ResultTransformer<Map<K, V>> as(Expression<V> expression) {
-        final Expression<V> lookup = getLookup(expression);
-        return new GroupByMap<K, V>(key, expression) {
-            @Override
-            protected Map<K, V> transform(Map<K, Group> groups) {
-                Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size()/0.75), 0.75f);
-                for (Map.Entry<K, Group> entry : groups.entrySet()) {
-                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
-                }
-                return results;
-            }
-        };
-    }
-
-    /**
-     * Get the results as a closeable iterator
-     *
-     * @param expression
-     * @return
-     */
-    public <V> ResultTransformer<CloseableIterator<V>> iterate(Expression<V> expression) {
-        final Expression<V> lookup = getLookup(expression);
-        return new GroupByIterate<K, V>(key, expression) {
-            @Override
-            protected V transform(Group group) {
-                return group.getOne(lookup);
-            }
-        };
-    }
-
-    /**
-     * Get the results as a list
-     *
-     * @param expression
-     * @return
-     */
-    public <V> ResultTransformer<List<V>> list(Expression<V> expression) {
-        final Expression<V> lookup = getLookup(expression);
-        return new GroupByList<K, V>(key, expression) {
-            @Override
-            protected V transform(Group group) {
-                return group.getOne(lookup);
-            }
-        };
-    }
-
-    private <V> Expression<V> getLookup(Expression<V> expression) {
-        if (expression instanceof GroupExpression) {
-            return ((GroupExpression)expression).getExpression();
-        } else {
-            return expression;
-        }
-    }
-
-    /**
-     * Get the results as a map
-     *
-     * @param expression
-     * @return
-     */
-    public <V> ResultTransformer<Map<K, V>> as(FactoryExpression<V> expression) {
-        final FactoryExpression<?> transformation = FactoryExpressionUtils.wrap(expression);
-        List<Expression<?>> args = transformation.getArgs();
-        return new GroupByMap<K, V>(key, args.toArray(new Expression<?>[args.size()])) {
-
-            @Override
-            protected Map<K, V> transform(Map<K, Group> groups) {
-                Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size()/0.75), 0.75f);
-                for (Map.Entry<K, Group> entry : groups.entrySet()) {
-                    results.put(entry.getKey(), transform(entry.getValue()));
-                }
-                return results;
-            }
-
-            @SuppressWarnings("unchecked")
-            protected V transform(Group group) {
-                // XXX Isn't group.toArray() suitable here?
-                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
-                for (int i = 1; i < groupExpressions.size(); i++) {
-                    args.add(group.getGroup(groupExpressions.get(i)));
-                }
-                return (V)transformation.newInstance(args.toArray());
-            }
-
-        };
-    }
-
-    /**
-     * Get the results as a closeable iterator
-     *
-     * @param expression
-     * @return
-     */
-    public <V> ResultTransformer<CloseableIterator<V>> iterate(FactoryExpression<V> expression) {
-        final FactoryExpression<?> transformation = FactoryExpressionUtils.wrap(expression);
-        List<Expression<?>> args = transformation.getArgs();
-        return new GroupByIterate<K, V>(key, args.toArray(new Expression<?>[args.size()])) {
-            @Override
-            protected V transform(Group group) {
-                // XXX Isn't group.toArray() suitable here?
-                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
-                for (int i = 1; i < groupExpressions.size(); i++) {
-                    args.add(group.getGroup(groupExpressions.get(i)));
-                }
-                return (V)transformation.newInstance(args.toArray());
-            }
-        };
-    }
-
-    /**
-     * Get the results as a list
-     *
-     * @param expression
-     * @return
-     */
-    public <V> ResultTransformer<List<V>> list(FactoryExpression<V> expression) {
-        final FactoryExpression<?> transformation = FactoryExpressionUtils.wrap(expression);
-        List<Expression<?>> args = transformation.getArgs();
-        return new GroupByList<K, V>(key, args.toArray(new Expression<?>[args.size()])) {
-            @Override
-            protected V transform(Group group) {
-                // XXX Isn't group.toArray() suitable here?
-                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
-                for (int i = 1; i < groupExpressions.size(); i++) {
-                    args.add(group.getGroup(groupExpressions.get(i)));
-                }
-                return (V)transformation.newInstance(args.toArray());
-            }
-        };
-    }
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupByList.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupByList.java
deleted file mode 100644
index bf5b20a598..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupByList.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.List;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.QTuple;
-
-/**
- * Provides aggregated results as a list
- *
- * @author tiwe
- *
- * @param <K>
- * @param <V>
- */
-public class GroupByList<K, V> extends AbstractGroupByTransformer<K, List<V>> {
-
-    GroupByList(Expression<K> key, Expression<?>... expressions) {
-        super(key, expressions);
-    }
-
-    @Override
-    public List<V> transform(Projectable projectable) {
-        // create groups
-        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(new QTuple(expressions));
-        boolean hasGroups = false;
-        for (Expression<?> e : expr.getArgs()) {
-            hasGroups |= e instanceof GroupExpression;
-        }
-        if (hasGroups) {
-            expr = withoutGroupExpressions(expr);
-        }
-        final CloseableIterator<Tuple> iter = projectable.iterate(expr);
-
-        List<V> list = Lists.newArrayList();
-        GroupImpl group = null;
-        K groupId = null;
-        while (iter.hasNext()) {
-            Object[] row = iter.next().toArray();
-            if (group == null) {
-                group = new GroupImpl(groupExpressions, maps);
-                groupId = (K) row[0];
-            } else if (!Objects.equal(groupId, row[0])) {
-                list.add(transform(group));
-                group = new GroupImpl(groupExpressions, maps);
-                groupId = (K) row[0];
-            }
-            group.add(row);
-        }
-        if (group != null) {
-            list.add(transform(group));
-        }
-        iter.close();
-        return list;
-    }
-
-    protected V transform(Group group) {
-        return (V)group;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupByMap.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupByMap.java
deleted file mode 100644
index 0d28484b1a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupByMap.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.QTuple;
-
-/**
- * Provides aggregated results as a map
- *
- * @author tiwe
- *
- * @param <K>
- * @param <V>
- */
-public class GroupByMap<K,V> extends AbstractGroupByTransformer<K, Map<K,V>> {
-
-    GroupByMap(Expression<K> key, Expression<?>... expressions) {
-        super(key, expressions);
-    }
-
-    @Override
-    public Map<K, V> transform(Projectable projectable) {
-        Map<K, Group> groups = new LinkedHashMap<K, Group>();
-
-        // create groups
-        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(new QTuple(expressions));
-        boolean hasGroups = false;
-        for (Expression<?> e : expr.getArgs()) {
-            hasGroups |= e instanceof GroupExpression;
-        }
-        if (hasGroups) {
-            expr = withoutGroupExpressions(expr);
-        }
-        CloseableIterator<Tuple> iter = projectable.iterate(expr);
-        try {
-            while (iter.hasNext()) {
-                Object[] row = iter.next().toArray();
-                K groupId = (K) row[0];
-                GroupImpl group = (GroupImpl)groups.get(groupId);
-                if (group == null) {
-                    group = new GroupImpl(groupExpressions, maps);
-                    groups.put(groupId, group);
-                }
-                group.add(row);
-            }
-        } finally {
-            iter.close();
-        }
-
-        // transform groups
-        return transform(groups);
-
-    }
-
-    protected Map<K, V> transform(Map<K, Group> groups) {
-        return (Map<K,V>)groups;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupExpression.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupExpression.java
deleted file mode 100644
index de732844b7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import com.mysema.query.types.Expression;
-
-/**
- * Defines the way results of a given expression are grouped. GroupExpressions are also used
- * to access values of a given GroupExpression within a Group.  
- * GroupExpressions are stateless wrappers for Expressions that know how to 
- * collect row values into a group.
- * 
- * @author sasa
- * @author tiwe
- *
- * @param <T>
- */
-public interface GroupExpression<T,R> extends Expression<R> {
-
-    /**
-     * @return Expression wrapped by this group definition
-     */
-    Expression<T> getExpression();
-    
-    /**
-     * @return a new GroupCollector to collect values belonging to this group.
-     */
-    GroupCollector<T, R> createGroupCollector();
-    
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupImpl.java b/querydsl-core/src/main/java/com/mysema/query/group/GroupImpl.java
deleted file mode 100644
index 27c9d20326..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Ops;
-
-/**
- * Default implementation of the Group interface
- *
- * @author sasa
- * @author tiwe
- *
- */
-class GroupImpl implements Group {
-
-    private final Map<Expression<?>, GroupCollector<?,?>> groupCollectorMap = new LinkedHashMap<Expression<?>, GroupCollector<?,?>>();
-
-    private final List<GroupExpression<?, ?>> groupExpressions;
-
-    private final List<GroupCollector<?,?>> groupCollectors = new ArrayList<GroupCollector<?,?>>();
-
-    private final List<QPair<?, ?>> maps;
-
-    public GroupImpl(List<GroupExpression<?, ?>> columnDefinitions,  List<QPair<?, ?>> maps) {
-        this.groupExpressions = columnDefinitions;
-        this.maps = maps;
-        for (int i=0; i < columnDefinitions.size(); i++) {
-            GroupExpression<?, ?> coldef = columnDefinitions.get(i);
-            GroupCollector<?,?> collector = groupCollectorMap.get(coldef.getExpression());
-            if (collector == null) {
-                collector = coldef.createGroupCollector();
-                Expression<?> coldefExpr = coldef.getExpression();
-                groupCollectorMap.put(coldefExpr, collector);
-                if (coldefExpr instanceof Operation && ((Operation)coldefExpr).getOperator() == Ops.ALIAS) {
-                    groupCollectorMap.put(((Operation)coldefExpr).getArg(1), collector);
-                }
-            }
-            groupCollectors.add(collector);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    void add(Object[] row) {
-        int i=0;
-        for (GroupCollector groupCollector : groupCollectors) {
-            groupCollector.add(row[i]);
-            i++;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T, R> R get(Expression<T> expr) {
-        GroupCollector<T,R> col = (GroupCollector<T,R>) groupCollectorMap.get(expr);
-        if (col != null) {
-            return col.get();
-        }
-        throw new NoSuchElementException(expr.toString());
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T, R> R getGroup(GroupExpression<T, R> definition) {
-        for (GroupExpression<?, ?> def : groupExpressions) {
-            if (def.equals(definition)) {
-                return (R) groupCollectorMap.get(def.getExpression()).get();
-            }
-        }
-        throw new NoSuchElementException(definition.toString());
-    }
-
-    @Override
-    public <T> List<T> getList(Expression<T> expr) {
-        return this.<T, List<T>>get(expr);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <K, V> Map<K, V> getMap(Expression<K> key, Expression<V> value) {
-        for (QPair<?, ?> pair : maps) {
-            if (pair.equals(key, value)) {
-                return (Map<K, V>) groupCollectorMap.get(pair).get();
-            }
-        }
-        throw new NoSuchElementException("GMap(" + key + ", " + value + ")");
-    }
-
-    @Override
-    public <T> T getOne(Expression<T> expr) {
-        return this.<T, T>get(expr);
-    }
-
-    @Override
-    public <T> Set<T> getSet(Expression<T> expr) {
-        return this.<T, Set<T>>get(expr);
-    }
-
-    @Override
-    public Object[] toArray() {
-        List<Object> arr = new ArrayList<Object>(groupCollectors.size());
-        for (GroupCollector<?,?> col : groupCollectors) {
-            arr.add(col.get());
-        }
-        return arr.toArray();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/package-info.java b/querydsl-core/src/main/java/com/mysema/query/package-info.java
deleted file mode 100644
index 485501103a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains basic Query elements
- */
-package com.mysema.query;
-
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java b/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java
deleted file mode 100644
index ab1e8f5889..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-
-import java.util.UUID;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.BooleanTemplate;
-
-/**
- * CollectionAnyVisitor is an expression visitor which transforms any() path expressions which are
- * often transformed into subqueries
- *
- * @author tiwe
- *
- */
-@SuppressWarnings("unchecked")
-public class CollectionAnyVisitor implements Visitor<Expression<?>,Context> {
-
-    public static final CollectionAnyVisitor DEFAULT = new CollectionAnyVisitor();
-
-    public static final Templates TEMPLATES = new Templates() {
-    {
-        add(PathType.PROPERTY, "{0}_{1}");
-        add(PathType.COLLECTION_ANY, "{0}");
-    }};
-
-
-    @SuppressWarnings("rawtypes")
-    private static <T> Path<T> replaceParent(Path<T> path, Path<?> parent) {
-        PathMetadata<?> metadata = new PathMetadata<Object>(parent, path.getMetadata().getElement(),
-                path.getMetadata().getPathType());
-        if (path instanceof CollectionExpression) {
-            CollectionExpression<?,?> col = (CollectionExpression<?,?>)path;
-            return new ListPath(col.getParameter(0), SimplePath.class, metadata);
-        } else {
-            return new PathImpl<T>(path.getType(), metadata);
-        }
-    }
-
-    @Override
-    public Expression<?> visit(Constant<?> expr, Context context) {
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(TemplateExpression<?> expr, Context context) {
-        Object[] args = new Object[expr.getArgs().size()];
-        for (int i = 0; i < args.length; i++) {
-            Context c = new Context();
-            if (expr.getArg(i) instanceof Expression) {
-                args[i] = ((Expression<?>)expr.getArg(i)).accept(this, c);
-            } else {
-                args[i] = expr.getArg(i);
-            }
-            context.add(c);
-        }
-        if (context.replace) {
-            if (expr.getType().equals(Boolean.class)) {
-                Predicate predicate = BooleanTemplate.create(expr.getTemplate(), args);
-                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;
-            } else {
-                return TemplateExpressionImpl.create(expr.getType(), expr.getTemplate(), args);
-            }
-        } else {
-            return expr;
-        }
-    }
-
-    @Override
-    public Expression<?> visit(FactoryExpression<?> expr, Context context) {
-        return expr;
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public Expression<?> visit(Operation<?> expr, Context context) {
-        Expression<?>[] args = new Expression<?>[expr.getArgs().size()];
-        for (int i = 0; i < args.length; i++) {
-            Context c = new Context();
-            args[i] = expr.getArg(i).accept(this, c);
-            context.add(c);
-        }
-        if (context.replace) {
-            if (expr.getType().equals(Boolean.class)) {
-                Predicate predicate = new PredicateOperation((Operator<Boolean>)expr.getOperator(), ImmutableList.copyOf(args));
-                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;
-            } else {
-                return new OperationImpl(expr.getType(), expr.getOperator(), ImmutableList.copyOf(args));
-            }
-        } else {
-            return expr;
-        }
-    }
-
-    protected Predicate exists(Context c, Predicate condition) {
-        return condition;
-    }
-
-    @Override
-    public Expression<?> visit(Path<?> expr, Context context) {
-        if (expr.getMetadata().getPathType() == PathType.COLLECTION_ANY) {
-            Path<?> parent = (Path<?>) expr.getMetadata().getParent().accept(this, context);
-            expr = new PathImpl<Object>(expr.getType(), PathMetadataFactory.forCollectionAny(parent));
-            String variable = expr.accept(ToStringVisitor.DEFAULT, TEMPLATES).replace('.', '_');
-            String suffix = UUID.randomUUID().toString().replace("-", "").substring(0,5);
-            EntityPath<?> replacement = new EntityPathBase<Object>(expr.getType(), variable + suffix);
-            context.add(expr, replacement);
-            return replacement;
-
-        } else if (expr.getMetadata().getParent() != null) {
-            Context c = new Context();
-            Path<?> parent = (Path<?>) expr.getMetadata().getParent().accept(this, c);
-            if (c.replace) {
-                context.add(c);
-                return replaceParent(expr, parent);
-            }
-        }
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(SubQueryExpression<?> expr, Context context) {
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(ParamExpression<?> expr, Context context) {
-        return expr;
-    }
-
-    protected CollectionAnyVisitor() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Context.java b/querydsl-core/src/main/java/com/mysema/query/support/Context.java
deleted file mode 100644
index ccc862c2bc..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/Context.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-
-/**
- * Context is used in {@link CollectionAnyVisitor} as the visitor context
- *
- * @author tiwe
- *
- */
-public class Context {
-
-    public boolean replace;
-
-    public final List<Path<?>> paths = new ArrayList<Path<?>>();
-
-    public final List<EntityPath<?>> replacements = new ArrayList<EntityPath<?>>();
-
-    public void add(Path<?> anyPath, EntityPath<?> replacement) {
-        replace = true;
-        paths.add(anyPath);
-        replacements.add(replacement);
-    }
-
-    public void add(Context c) {
-        replace |= c.replace;
-        paths.addAll(c.paths);
-        replacements.addAll(c.replacements);
-    }
-
-    public void clear() {
-        paths.clear();
-        replacements.clear();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java
deleted file mode 100644
index c5d200649b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.Detachable;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.query.BooleanSubQuery;
-import com.mysema.query.types.query.ComparableSubQuery;
-import com.mysema.query.types.query.DateSubQuery;
-import com.mysema.query.types.query.DateTimeSubQuery;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.query.StringSubQuery;
-import com.mysema.query.types.query.TimeSubQuery;
-
-/**
- * DetachableAdapter is an apadater implementation for the Detachable interface
- * 
- * @author tiwe
- *
- */
-public class DetachableAdapter implements Detachable{
-
-    @Nullable
-    private Detachable detachable;
-
-    public DetachableAdapter() {}
-    
-    public DetachableAdapter(Detachable detachable) {
-        this.detachable = detachable;
-    }
-    
-    public NumberSubQuery<Long> count() {
-        return detachable.count();
-    }
-
-    public BooleanExpression exists() {
-        return detachable.exists();
-    }
-
-    public Detachable getDetachable() {
-        return detachable;
-    }
-
-    public ListSubQuery<Tuple> list(Expression<?> first, Expression<?> second, 
-            Expression<?>... rest) {
-        return detachable.list(first, second, rest);
-    }
-
-    public ListSubQuery<Tuple> list(Expression<?>... args) {
-        return detachable.list(args);
-    }
-
-    public <RT> ListSubQuery<RT> list(Expression<RT> projection) {
-        return detachable.list(projection);
-    }
-
-    @Override
-    public ListSubQuery<Tuple> list(Object... args) {
-        return detachable.list(args);
-    }
-
-    public BooleanExpression notExists() {
-        return detachable.notExists();
-    }
-
-    protected void setDetachable(Detachable detachable) {
-        this.detachable = detachable;
-    }
-
-    public <RT extends Comparable<?>> ComparableSubQuery<RT> unique(ComparableExpression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    public <RT extends Comparable<?>> DateSubQuery<RT> unique(DateExpression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    public <RT extends Comparable<?>> DateTimeSubQuery<RT> unique(DateTimeExpression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    public SimpleSubQuery<Tuple> unique(Expression<?> first, Expression<?> second, Expression<?>... rest) {
-        return detachable.unique(first, second, rest);
-    }
-
-    public SimpleSubQuery<Tuple> unique(Expression<?>... args) {
-        return detachable.unique(args);
-    }
-
-    public <RT> SimpleSubQuery<RT> unique(Expression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    public <RT extends Number & Comparable<?>> NumberSubQuery<RT> unique(NumberExpression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    public BooleanSubQuery unique(Predicate projection) {
-        return detachable.unique(projection);
-    }
-    
-    public StringSubQuery unique(StringExpression projection) {
-        return detachable.unique(projection);
-    }
-
-    public <RT extends Comparable<?>> TimeSubQuery<RT> unique(TimeExpression<RT> projection) {
-        return detachable.unique(projection);
-    }
-
-    @Override
-    public SimpleSubQuery<Tuple> unique(Object... args) {
-        return detachable.unique(args);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java
deleted file mode 100644
index f3f7bc86cb..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.Detachable;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ProjectionRole;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.query.BooleanSubQuery;
-import com.mysema.query.types.query.ComparableSubQuery;
-import com.mysema.query.types.query.DateSubQuery;
-import com.mysema.query.types.query.DateTimeSubQuery;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.query.StringSubQuery;
-import com.mysema.query.types.query.TimeSubQuery;
-
-/**
- * Mixin style implementation of the Detachable interface
- *
- * @author tiwe
- *
- */
-public class DetachableMixin implements Detachable {
-
-    private final QueryMixin<?> queryMixin;
-
-    public DetachableMixin(QueryMixin<?> queryMixin) {
-        this.queryMixin = queryMixin;
-    }
-
-    @Override
-    public NumberSubQuery<Long> count() {
-        return new NumberSubQuery<Long>(Long.class, projection(Wildcard.count));
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (queryMixin.getMetadata().getJoins().isEmpty()) {
-            throw new IllegalArgumentException("No sources given");
-        }
-        return unique(queryMixin.getMetadata().getJoins().get(0).getTarget()).exists();
-    }
-
-    @Override
-    public ListSubQuery<Tuple> list(Expression<?>... args) {
-        return new ListSubQuery<Tuple>(Tuple.class, projection(args));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> ListSubQuery<RT> list(Expression<RT> projection) {
-        return new ListSubQuery<RT>((Class)projection.getType(), projection(projection));
-    }
-
-    public ListSubQuery<Tuple> list(Object arg) {
-        return list((Expression)convert(arg));
-    }
-
-    @Override
-    public ListSubQuery<Tuple> list(Object... args) {
-        return list(convert(args));
-    }
-
-    @Override
-    public SimpleSubQuery<Tuple> unique(Object... args) {
-        return unique(convert(args));
-    }
-
-    private Expression<?> convert(Object arg) {
-        if (arg instanceof Expression<?>) {
-            return (Expression<?>)arg;
-        } else if (arg instanceof ProjectionRole) {
-            return ((ProjectionRole<?>)arg).getProjection();
-        } else if (arg != null) {
-            return ConstantImpl.create(arg);
-        } else {
-            return NullExpression.DEFAULT;
-        }
-    }
-
-    private Expression<?>[] convert(Object... args) {
-        final Expression<?>[] exprs = new Expression[args.length];
-        for (int i = 0; i < exprs.length; i++) {
-            exprs[i] = convert(args[i]);
-        }
-        return exprs;
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-    private QueryMetadata projection(Expression<?>... projection) {
-        QueryMetadata metadata = queryMixin.getMetadata().clone();
-        for (Expression<?> expr : projection) {
-            expr = queryMixin.convert(expr, false);
-            metadata.addProjection(nullAsTemplate(expr));
-        }
-        return metadata;
-    }
-
-    private Expression<?> nullAsTemplate(@Nullable Expression<?> expr) {
-        return expr != null ? expr : NullExpression.DEFAULT;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT extends Comparable<?>> ComparableSubQuery<RT> unique(ComparableExpression<RT> projection) {
-        return new ComparableSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT extends Comparable<?>> DateSubQuery<RT> unique(DateExpression<RT> projection) {
-        return new DateSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT extends Comparable<?>> DateTimeSubQuery<RT> unique(DateTimeExpression<RT> projection) {
-        return new DateTimeSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    @Override
-    public SimpleSubQuery<Tuple> unique(Expression<?>... args) {
-        return new SimpleSubQuery<Tuple>(Tuple.class, uniqueProjection(args));
-    }
-
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> SimpleSubQuery<RT> unique(Expression<RT> projection) {
-        return new SimpleSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT extends Number & Comparable<?>> NumberSubQuery<RT> unique(NumberExpression<RT> projection) {
-        return new NumberSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    @Override
-    public BooleanSubQuery unique(Predicate projection) {
-        return new BooleanSubQuery(uniqueProjection(projection));
-    }
-
-    @Override
-    public StringSubQuery unique(StringExpression projection) {
-        return new StringSubQuery(uniqueProjection(projection));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT extends Comparable<?>> TimeSubQuery<RT> unique(TimeExpression<RT> projection) {
-        return new TimeSubQuery<RT>((Class)projection.getType(), uniqueProjection(projection));
-    }
-
-    private QueryMetadata uniqueProjection(Expression<?>... projection) {
-        QueryMetadata metadata = projection(projection);
-        metadata.setUnique(true);
-        return metadata;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java
deleted file mode 100644
index 834cd60b1a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import com.mysema.query.Detachable;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.query.BooleanSubQuery;
-import com.mysema.query.types.query.ComparableSubQuery;
-import com.mysema.query.types.query.DateSubQuery;
-import com.mysema.query.types.query.DateTimeSubQuery;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.query.StringSubQuery;
-import com.mysema.query.types.query.TimeSubQuery;
-
-/**
- * DetachableQuery is a base class for queries which implement the Query and Detachable interfaces
- * 
- * @author tiwe
- *
- * @param <Q> concrete subtype
- */
-public class DetachableQuery <Q extends DetachableQuery<Q>> extends QueryBase<Q> implements Detachable {
-
-    private final DetachableMixin detachableMixin;
-
-    public DetachableQuery(QueryMixin<Q> queryMixin) {
-        super(queryMixin);
-        this.detachableMixin = new DetachableMixin(queryMixin);
-    }
-
-    @Override
-    public NumberSubQuery<Long> count() {
-        return detachableMixin.count();
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        return detachableMixin.exists();
-    }
-
-    @Override
-    public ListSubQuery<Tuple> list(Expression<?>... args) {
-        return detachableMixin.list(args);
-    }
-
-    @Override
-    public <RT> ListSubQuery<RT> list(Expression<RT> projection) {
-        return detachableMixin.list(projection);
-    }
-
-    public ListSubQuery<Tuple> list(Object arg) {
-        return detachableMixin.list(arg);
-    }
-    
-    @Override
-    public ListSubQuery<Tuple> list(Object... args) {
-        return detachableMixin.list(args);
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return detachableMixin.notExists();
-    }
-
-    @Override
-    public <RT extends Comparable<?>> ComparableSubQuery<RT> unique(ComparableExpression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public <RT extends Comparable<?>> DateSubQuery<RT> unique(DateExpression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public <RT extends Comparable<?>> DateTimeSubQuery<RT> unique(DateTimeExpression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public SimpleSubQuery<Tuple> unique(Expression<?>... args) {
-        return detachableMixin.unique(args);
-    }
-
-    @Override
-    public <RT> SimpleSubQuery<RT> unique(Expression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public <RT extends Number & Comparable<?>> NumberSubQuery<RT> unique(NumberExpression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public BooleanSubQuery unique(Predicate projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public StringSubQuery unique(StringExpression projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public <RT extends Comparable<?>> TimeSubQuery<RT> unique(TimeExpression<RT> projection) {
-        return detachableMixin.unique(projection);
-    }
-
-    @Override
-    public SimpleSubQuery<Tuple> unique(Object... args) {
-        return detachableMixin.unique(args);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/EnumConversion.java b/querydsl-core/src/main/java/com/mysema/query/support/EnumConversion.java
deleted file mode 100644
index bada8fcf09..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/EnumConversion.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Visitor;
-
-/**
- * EnumConversion ensures that the results of an enum projection confirm to the type of the
- * projection expression
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class EnumConversion<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = 7840412008633901748L;
-
-    private final List<Expression<?>> exprs;
-
-    private final Enum<?>[] values;
-
-    public EnumConversion(Expression<T> expr) {
-        super(expr.getType());
-        exprs = Collections.<Expression<?>>singletonList(expr);
-        try {
-            values = (Enum<?>[]) expr.getType().getMethod("values").invoke(null);
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return exprs;
-    }
-
-    @Override
-    public T newInstance(Object... args) {
-        if (args[0] != null) {
-            if (args[0] instanceof String) {
-                return (T)Enum.valueOf((Class)getType(), (String)args[0]);
-            } else if (args[0] instanceof Number) {
-                return (T)values[((Number)args[0]).intValue()];
-            } else {
-                return (T)args[0];
-            }
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java b/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java
deleted file mode 100644
index d4d9dc188b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.sql.Time;
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.CaseBuilder;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.ComparableOperation;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateOperation;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.DateTimeOperation;
-import com.mysema.query.types.expr.DslExpression;
-import com.mysema.query.types.expr.DslOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.StringOperation;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.expr.TimeOperation;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.DslPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-import com.mysema.query.types.query.ExtendedSubQueryExpression;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.template.BooleanTemplate;
-import com.mysema.query.types.template.ComparableTemplate;
-import com.mysema.query.types.template.DslTemplate;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.query.types.template.SimpleTemplate;
-import com.mysema.query.types.template.StringTemplate;
-
-/**
- * Expression factory class
- *
- * @author tiwe
- *
- */
-public final class Expressions {
-
-    @SuppressWarnings("unchecked")
-    public static <D> SimpleExpression<D> as(Expression<D> source, Path<D> alias) {
-        if (source == null) {
-            return as((Expression)NullExpression.DEFAULT, alias);
-        } else {
-            return SimpleOperation.create((Class<D>)alias.getType(), Ops.ALIAS, source, alias);
-        }
-    }
-
-    /**
-     * Get an expression representing the current date as a DateExpression instance
-     *
-     * @return
-     */
-    public static DateExpression<Date> currentDate() {
-        return DateExpression.currentDate();
-    }
-
-    /**
-     * Get an expression representing the current time instant as a DateTimeExpression instance
-     *
-     * @return
-     */
-    public static DateTimeExpression<Date> currentTimestamp() {
-        return DateTimeExpression.currentTimestamp();
-    }
-
-    /**
-     * Get an expression representing the current time as a TimeExpression instance
-     *
-     * @return
-     */
-    public static TimeExpression<Time> currentTime() {
-        return TimeExpression.currentTime();
-    }
-
-    /**
-     * Create the alias expression source as alias
-     *
-     * @param source
-     * @param alias
-     * @return
-     */
-    public static <D> SimpleExpression<D> as(Expression<D> source, String alias) {
-        return as(source, new PathImpl<D>(source.getType(), alias));
-    }
-
-    /**
-     * Get the intersection of the given Boolean expressions
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static BooleanExpression allOf(BooleanExpression... exprs) {
-        return BooleanExpression.allOf(exprs);
-    }
-
-    /**
-     * Get the union of the given Boolean expressions
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static BooleanExpression anyOf(BooleanExpression... exprs) {
-        return BooleanExpression.anyOf(exprs);
-    }
-
-    /**
-     * Create a Constant expression for the given value
-     *
-     * @param value
-     * @return
-     */
-    public static <T> Expression<T> constant(T value) {
-        return ConstantImpl.create(value);
-    }
-
-    /**
-     * Get the alias expression source as alias
-     *
-     * @param source
-     * @param alias
-     * @return
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <D> SimpleExpression<D> constantAs(D source, Path<D> alias) {
-        if (source == null) {
-            return as((Expression)NullExpression.DEFAULT, alias);
-        } else {
-            return as(ConstantImpl.create(source), alias);
-        }
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param cl
-     * @param template
-     * @param args
-     * @return
-     */
-    public static <T> SimpleExpression<T> template(Class<T> cl, String template, Object... args) {
-        return SimpleTemplate.create(cl, template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param cl
-     * @param template
-     * @param args
-     * @return
-     */
-    public static <T> SimpleExpression<T> template(Class<T> cl, Template template, Object... args) {
-        return SimpleTemplate.create(cl, template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param cl
-     * @param template
-     * @param args
-     * @return
-     */
-    public static <T> DslExpression<T> dslTemplate(Class<T> cl, String template, Object... args) {
-        return DslTemplate.create(cl, template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param cl
-     * @param template
-     * @param args
-     * @return
-     */
-    public static <T extends Comparable<?>> ComparableExpression<T> comparableTemplate(Class<T> cl,
-            String template, Object... args) {
-        return ComparableTemplate.create(cl, template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param cl
-     * @param template
-     * @param args
-     * @return
-     */
-    public static <T extends Number & Comparable<?>> NumberExpression<T> numberTemplate(Class<T> cl,
-            String template, Object... args) {
-        return NumberTemplate.create(cl, template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param template
-     * @param args
-     * @return
-     */
-    public static StringExpression stringTemplate(String template, Object... args) {
-        return StringTemplate.create(template, args);
-    }
-
-    /**
-     * Create a new Template expression
-     *
-     * @param template
-     * @param args
-     * @return
-     */
-    public static BooleanExpression booleanTemplate(String template, Object... args) {
-        return BooleanTemplate.create(template, args);
-    }
-
-    /**
-     * Create a new SubQuery expression
-     *
-     * @param type
-     * @param metadata
-     * @return
-     */
-    public static <T> ExtendedSubQueryExpression<T> subQuery(Class<T> type, QueryMetadata metadata) {
-        return new SimpleSubQuery<T>(type, metadata);
-    }
-
-    /**
-     * Create a new Predicate operation
-     *
-     * @param operation
-     * @param args
-     * @return
-     */
-    public static BooleanExpression predicate(Operator<Boolean> operation, Expression<?>... args) {
-        return BooleanOperation.create(operation, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T> SimpleExpression<T> operation(Class<T> type, Operator<? super T> operator,
-            Expression<?>... args) {
-        return SimpleOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T> DslExpression<T> dslOperation(Class<T> type, Operator<? super T> operator,
-            Expression<?>... args) {
-        return DslOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Boolean operation
-     *
-     * @param operation
-     * @param args
-     * @return
-     */
-    public static BooleanExpression booleanOperation(Operator<Boolean> operation, Expression<?>... args) {
-        return predicate(operation, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T extends Comparable<?>> ComparableExpression<T> comparableOperation(Class<T> type,
-            Operator<? super T> operator, Expression<?>... args) {
-        return ComparableOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T extends Comparable<?>> DateExpression<T> dateOperation(Class<T> type,
-            Operator<? super T> operator, Expression<?>... args) {
-        return DateOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T extends Comparable<?>> DateTimeExpression<T> dateTimeOperation(Class<T> type,
-            Operator<? super T> operator, Expression<?>... args) {
-        return DateTimeOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T extends Comparable<?>> TimeExpression<T> timeOperation(Class<T> type,
-            Operator<? super T> operator, Expression<?>... args) {
-        return TimeOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param type
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static <T extends Number & Comparable<?>> NumberExpression<T> numberOperation(Class<T> type,
-            Operator<? super T> operator, Expression<?>... args) {
-        return NumberOperation.create(type, operator, args);
-    }
-
-    /**
-     * Create a new Operation expression
-     *
-     * @param operator
-     * @param args
-     * @return
-     */
-    public static StringExpression stringOperation(Operator<? super String> operator, Expression<?>... args) {
-        return StringOperation.create(operator, args);
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T> SimplePath<T> path(Class<T> type, String variable) {
-        return new SimplePath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T> SimplePath<T> path(Class<T> type, Path<?> parent, String property) {
-        return new SimplePath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T> DslPath<T> dslPath(Class<T> type, String variable) {
-        return new DslPath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T> DslPath<T> dslPath(Class<T> type, Path<?> parent, String property) {
-        return new DslPath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T extends Comparable<?>> ComparablePath<T> comparablePath(Class<T> type,
-            String variable) {
-        return new ComparablePath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T extends Comparable<?>> ComparablePath<T> comparablePath(Class<T> type,
-            Path<?> parent, String property) {
-        return new ComparablePath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T extends Comparable<?>> DatePath<T> datePath(Class<T> type, String variable) {
-        return new DatePath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T extends Comparable<?>> DatePath<T> datePath(Class<T> type, Path<?> parent,
-            String property) {
-        return new DatePath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T extends Comparable<?>> DateTimePath<T> dateTimePath(Class<T> type, String variable) {
-        return new DateTimePath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T extends Comparable<?>> DateTimePath<T> dateTimePath(Class<T> type, Path<?> parent,
-            String property) {
-        return new DateTimePath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T extends Comparable<?>> TimePath<T> timePath(Class<T> type, String variable) {
-        return new TimePath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T extends Comparable<?>> TimePath<T> timePath(Class<T> type, Path<?> parent,
-            String property) {
-        return new TimePath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param variable
-     * @return
-     */
-    public static <T extends Number & Comparable<?>> NumberPath<T> numberPath(Class<T> type,
-            String variable) {
-        return new NumberPath<T>(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param type
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static <T extends Number & Comparable<?>> NumberPath<T> numberPath(Class<T> type,
-            Path<?> parent, String property) {
-        return new NumberPath<T>(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param variable
-     * @return
-     */
-    public static StringPath stringPath(String variable) {
-        return new StringPath(PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static StringPath stringPath(Path<?> parent, String property) {
-        return new StringPath(PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param variable
-     * @return
-     */
-    public static BooleanPath booleanPath(String variable) {
-        return new BooleanPath(PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * Create a new Path expression
-     *
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static BooleanPath booleanPath(Path<?> parent, String property) {
-        return new BooleanPath(PathMetadataFactory.forProperty(parent, property));
-    }
-
-    /**
-     * Get a builder for a case expression
-     *
-     * @return
-     */
-    public static CaseBuilder cases() {
-        return new CaseBuilder();
-    }
-
-    /**
-     * Combine the given expressions into a list expression
-     *
-     * @param exprs
-     * @return
-     */
-    public static SimpleExpression<Tuple> list(SimpleExpression<?>... exprs) {
-        return list(Tuple.class, exprs);
-    }
-
-    /**
-     * Combine the given expressions into a list expression
-     *
-     * @param clazz
-     * @param exprs
-     * @return
-     */
-    public static <T> SimpleExpression<T> list(Class<T> clazz, SimpleExpression<?>... exprs) {
-        SimpleExpression<T> rv = (SimpleExpression<T>)exprs[0];
-        for (int i = 1; i < exprs.length; i++) {
-            rv = SimpleOperation.create(clazz, Ops.LIST, rv, exprs[i]);
-        }
-        return rv;
-    }
-
-    private Expressions() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java b/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java
deleted file mode 100644
index 5e4e9bc6f1..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-import com.mysema.query.types.PredicateTemplate;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * ListAccessVisitor is expression visitor implementation
- * 
- * @author tiwe
- *
- */
-public class ListAccessVisitor implements Visitor<Expression<?>,Context> {
-    
-    private static final class UnderscoreTemplates extends Templates {
-        {
-            add(PathType.PROPERTY, "{0}_{1}");
-            add(PathType.LISTVALUE, "{0}_{1}");
-            add(PathType.LISTVALUE_CONSTANT, "{0}_{1}");        
-        }
-    }
-
-    public static final ListAccessVisitor DEFAULT = new ListAccessVisitor();
-    
-    public static final Templates TEMPLATE = new UnderscoreTemplates();
-        
-    @SuppressWarnings("unchecked")
-    private static <T> Path<T> replaceParent(Path<T> path, Path<?> parent) {
-        PathMetadata<?> metadata = new PathMetadata(parent, path.getMetadata().getElement(), 
-                path.getMetadata().getPathType());
-        return new PathImpl<T>(path.getType(), metadata);
-    }
-
-    @Override
-    public Expression<?> visit(Constant<?> expr, Context context) {
-        return expr;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Expression<?> visit(TemplateExpression<?> expr, Context context) {
-        final Object[] args = new Object[expr.getArgs().size()];        
-        for (int i = 0; i < args.length; i++) {
-            Context c = new Context();
-            if (expr.getArg(i) instanceof Expression) {
-                args[i] = ((Expression)expr.getArg(i)).accept(this, c);    
-            } else {
-                args[i] = expr.getArg(i);
-            }            
-            context.add(c);
-        }
-        if (context.replace) {             
-            if (expr.getType().equals(Boolean.class)) {
-                Predicate predicate = new PredicateTemplate(expr.getTemplate(), args);
-                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;           
-            } else {
-                return new TemplateExpressionImpl(expr.getType(), expr.getTemplate(), ImmutableList.copyOf(args));    
-            }    
-        } else {
-            return expr;
-        }         
-    }
-
-    @Override
-    public Expression<?> visit(FactoryExpression<?> expr, Context context) {
-        return expr;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Expression<?> visit(Operation<?> expr, Context context) {
-        final Expression<?>[] args = new Expression<?>[expr.getArgs().size()];        
-        for (int i = 0; i < args.length; i++) {
-            Context c = new Context();
-            args[i] = expr.getArg(i).accept(this, c);
-            context.add(c);
-        }
-        if (context.replace) {            
-            if (expr.getType().equals(Boolean.class)) {
-                Predicate predicate = new PredicateOperation((Operator)expr.getOperator(), ImmutableList.copyOf(args));
-                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;           
-            } else {
-                return new OperationImpl(expr.getType(), expr.getOperator(), ImmutableList.copyOf(args));    
-            }    
-        } else {
-            return expr;
-        }        
-    }
-    
-    protected Predicate exists(Context c, Predicate condition) {
-        return condition;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Expression<?> visit(Path<?> expr, Context context) {
-        final PathType pathType = expr.getMetadata().getPathType();
-        if (pathType == PathType.LISTVALUE_CONSTANT || pathType == PathType.LISTVALUE) {
-            final String variable = expr.accept(ToStringVisitor.DEFAULT, TEMPLATE).replace('.', '_');
-            final EntityPath<?> replacement = new EntityPathBase(expr.getType(), variable);
-            context.add(expr, replacement);
-            return replacement;
-            
-        } else if (expr.getMetadata().getParent() != null) {
-            Context c = new Context();
-            final Path<?> parent = (Path<?>) expr.getMetadata().getParent().accept(this, c);
-            if (c.replace) {
-                context.add(c);
-                return replaceParent(expr, parent);
-            }
-        }
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(SubQueryExpression<?> expr, Context context) {
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(ParamExpression<?> expr, Context context) {
-        return expr;
-    }
-        
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java b/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java
deleted file mode 100644
index be8c1c7882..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class Normalization {
-
-    private static final String WS = "\\s*";
-
-    private static final String NUMBER = "([\\+\\-]?\\d+\\.?\\d*)";
-
-    // TODO simplify
-    private static final Pattern FULL_OPERATION = Pattern.compile(
-            "(?<![\\d\\*/\"' ])" + "(\\b|\\(|\\s+)"  +
-            "(" + NUMBER + WS + "[+\\-/*]" + WS + ")+" + NUMBER + WS +
-            "(?![\\d\\*/\"' ])");
-
-    private static final Pattern[] OPERATIONS = {
-            Pattern.compile(NUMBER + WS + "\\*" + WS + NUMBER),
-            Pattern.compile(NUMBER + WS + "/" + WS + NUMBER),
-            Pattern.compile(NUMBER + WS + "\\+" + WS + NUMBER),
-            Pattern.compile(NUMBER + WS + "\\-" + WS + NUMBER)
-    };
-
-    private static String normalizeOperation(String queryString) {
-        for (int i = 0; i < OPERATIONS.length; i++) {
-            Pattern operation = OPERATIONS[i];
-            Matcher matcher;
-            while ((matcher = operation.matcher(queryString)).find()) {
-                BigDecimal first = new BigDecimal(matcher.group(1));
-                BigDecimal second = new BigDecimal(matcher.group(2));
-                BigDecimal result;
-                switch (i) {
-                    case 0: result = first.multiply(second); break;
-                    case 1: result = first.divide(second, 10, RoundingMode.HALF_UP); break;
-                    case 2: result = first.add(second); break;
-                    case 3: result = first.subtract(second); break;
-                    default: throw new IllegalStateException();
-                }
-                StringBuffer buffer = new StringBuffer();
-                matcher.appendReplacement(buffer, result.stripTrailingZeros().toPlainString())
-                        .appendTail(buffer);
-                queryString = buffer.toString();
-            }
-        }
-        return queryString;
-    }
-
-    public static String normalize(String queryString) {
-        if (!hasOperators(queryString)) {
-            return queryString;
-        }
-
-        StringBuffer buffer = new StringBuffer();
-        Matcher m = FULL_OPERATION.matcher(queryString);
-        while (m.find()) {
-            String result = normalizeOperation(queryString.substring(m.start(), m.end()));
-            m.appendReplacement(buffer, result);
-        }
-        m.appendTail(buffer);
-        return buffer.toString();
-    }
-
-    private static boolean hasOperators(String queryString) {
-        for (int i = 0; i < queryString.length(); i++) {
-            char ch = queryString.charAt(i);
-            if (ch == '+' || ch == '-' || ch == '*' || ch == '/') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private Normalization() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/NumberConversion.java b/querydsl-core/src/main/java/com/mysema/query/support/NumberConversion.java
deleted file mode 100644
index a5f1a8729b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/NumberConversion.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Visitor;
-import com.mysema.util.MathUtils;
-
-/**
- * NumberConversion ensures that the results of a numeric projection confirm to the type of the
- * projection expression
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class NumberConversion<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = 7840412008633901748L;
-
-    private final List<Expression<?>> exprs;
-
-    public NumberConversion(Expression<T> expr) {
-        super(expr.getType());
-        exprs = Collections.<Expression<?>>singletonList(expr);
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return exprs;
-    }
-
-    @Override
-    public T newInstance(Object... args) {
-        if (args[0] != null) {
-            if (getType().equals(Boolean.class)) {
-                return (T)Boolean.valueOf(((Number)args[0]).intValue() > 0);
-            } else {
-                return (T)MathUtils.cast((Number)args[0], (Class)getType());
-            }
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/NumberConversions.java b/querydsl-core/src/main/java/com/mysema/query/support/NumberConversions.java
deleted file mode 100644
index 1458a60b35..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/NumberConversions.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Visitor;
-import com.mysema.util.MathUtils;
-
-/**
- * NumberConversions ensures that the results of a projection involving numeric expressions
- * confirm to the types of the numeric expressions
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class NumberConversions<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = -7834053123363933721L;
-
-    private final FactoryExpression<T> expr;
-
-    private final Map<Class<?>, Enum<?>[]> values = Maps.newHashMap();
-
-    public NumberConversions(FactoryExpression<T> expr) {
-        super(expr.getType());
-        this.expr = expr;
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return expr.getArgs();
-    }
-
-    private <E extends Enum<E>> Enum<E>[] getValues(Class<E> enumClass) {
-        Enum<E>[] values = (Enum<E>[]) this.values.get(enumClass);
-        if (values == null) {
-            try {
-                values = (Enum<E>[]) enumClass.getMethod("values").invoke(null);
-                this.values.put(enumClass, values);
-            } catch (Exception e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-        return values;
-    }
-
-    @Override
-    public T newInstance(Object... args) {
-        for (int i = 0; i < args.length; i++) {
-            Class<?> type = expr.getArgs().get(i).getType();
-            if (Enum.class.isAssignableFrom(type) && !type.isInstance(args[i])) {
-                if (args[i] instanceof String) {
-                    args[i] = Enum.valueOf((Class)type, (String)args[i]);
-                } else if (args[i] instanceof Number) {
-                    args[i] = getValues((Class)type)[((Number)args[i]).intValue()];
-                }
-            } else if (args[i] instanceof Number && !type.isInstance(args[i])) {
-                if (type.equals(Boolean.class)) {
-                    args[i] = ((Number)args[i]).intValue() > 0;
-                } else if (Number.class.isAssignableFrom(type)){
-                    args[i] = MathUtils.cast((Number)args[i], (Class)type);
-                }
-            }
-        }
-        return expr.newInstance(args);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/OrderedQueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/support/OrderedQueryMetadata.java
deleted file mode 100644
index 301adc93e6..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/OrderedQueryMetadata.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.types.Expression;
-
-/**
- * OrderedQueryMetadata performs no metadata validation and ensures that FROM elements are before 
- * JOIN elements
- * 
- * @author tiwe
- *
- */
-public class OrderedQueryMetadata extends DefaultQueryMetadata {
-    
-    private static final long serialVersionUID = 6326236143414219377L;
-
-    private List<JoinExpression> joins;
-    
-    public OrderedQueryMetadata() {
-        super();
-        noValidate();
-    }
-    
-    @Override
-    public void addJoin(JoinType joinType, Expression<?> expr) {
-        joins = null;
-        super.addJoin(joinType, expr);
-    }
-    
-    @Override
-    public List<JoinExpression> getJoins() {
-        if (joins == null) {
-            joins = Lists.newArrayList();
-            int separator = 0; 
-            for (JoinExpression j : super.getJoins()) {
-                if (j.getType() == JoinType.DEFAULT) {
-                    joins.add(separator++, j);
-                } else {
-                    joins.add(j);                    
-                }
-            }             
-        }        
-        return joins;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java
deleted file mode 100644
index b3525420be..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-
-/**
- * ProjectableAdapter is an adapter implementation for the Projectable interface
- *
- * @author tiwe
- */
-public class ProjectableAdapter<P extends Projectable> implements Projectable {
-  
-    private final P projectable;
-
-    public ProjectableAdapter(P projectable) {
-        this.projectable = projectable;
-    }
-
-    protected P getProjectable() {
-        return projectable;
-    }
-
-    @Override
-    public long count() {
-        return projectable.count();
-    }
-
-    @Override
-    public boolean exists() {
-        return projectable.exists();
-    }
-
-    @Override
-    public boolean notExists() {
-        return projectable.notExists();
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return projectable.iterate(args);
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return projectable.iterate(projection);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>[] args) {
-        return projectable.list(args);
-    }
-
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        return projectable.list(projection);
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return projectable.listResults(args);
-    }
-    
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        return projectable.listResults(expr);
-    }
-
-    @Override
-    public <K, V> Map<K, V> map(Expression<K> key, Expression<V> value) {
-        return projectable.map(key, value);
-    }
-
-    @Override
-    public String toString() {
-        return projectable.toString();
-    }
-
-    @Override
-    public Tuple singleResult(Expression<?>... args) {
-        return projectable.singleResult(args);
-    }
-
-    @Override
-    public <RT> RT singleResult(Expression<RT> expr) {
-        return projectable.singleResult(expr);
-    }
-
-    @Override
-    public <T> T transform(ResultTransformer<T> transformer) {
-        return projectable.transform(transformer);
-    }
-    
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return projectable.uniqueResult(args);
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        return projectable.uniqueResult(expr);
-    }
-
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java
deleted file mode 100644
index b549adaf7f..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.Projectable;
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-
-/**
- * ProjectableQuery extends the {@link QueryBase} class to provide default
- * implementations of the methods of the {@link Projectable} interface
- *
- * @author tiwe
- */
-public abstract class ProjectableQuery<Q extends ProjectableQuery<Q>>
-        extends QueryBase<Q> implements Projectable {
-
-    public ProjectableQuery(QueryMixin<Q> queryMixin) {
-        super(queryMixin);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return IteratorAdapter.asList(iterate(args));
-    }
-
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        return IteratorAdapter.asList(iterate(projection));
-    }
-
-    @Override
-    public final <K, V> Map<K, V> map(Expression<K> key, Expression<V> value) {
-        List<Tuple> list = list(key, value);
-        Map<K, V> results = new LinkedHashMap<K, V>(list.size());
-        for (Tuple row : list) {
-            results.put(row.get(key), row.get(value));
-        }
-        return results;
-    }
-
-    @Override
-    public final boolean notExists() {
-        return !exists();
-    }
-
-    @Override
-    public final Tuple singleResult(Expression<?>... args) {
-        return limit(1).uniqueResult(args);
-    }
-
-    @Override
-    public final <RT> RT singleResult(Expression<RT> expr) {
-        return limit(1).uniqueResult(expr);
-    }
-
-    @Override
-    public <T> T transform(ResultTransformer<T> transformer) {
-        return transformer.transform(this);
-    }
-    
-    @Nullable
-    protected <T> T uniqueResult(CloseableIterator<T> it) {
-        try{
-            if (it.hasNext()) {
-                T rv = it.next();
-                if (it.hasNext()) {
-                    throw new NonUniqueResultException();
-                }
-                return rv;
-            } else {
-                return null;
-            }
-        }finally{
-            it.close();
-        }
-    }
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java b/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
deleted file mode 100644
index 7ec1a67345..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import javax.annotation.Nonnegative;
-
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Predicate;
-
-/**
- * QueryBase provides a stub for Query implementations
- *
- * @author tiwe
- */
-public abstract class QueryBase<Q extends QueryBase<Q>> {
-
-    protected final QueryMixin<Q> queryMixin;
-
-    public QueryBase(QueryMixin<Q> queryMixin) {
-        this.queryMixin = queryMixin;
-    }
-
-    /**
-     * Set the Query to return distinct results
-     * 
-     * @return
-     */
-    public Q distinct() {
-        return queryMixin.distinct();
-    }
-    
-    /**
-     * Add a single grouping expression
-     *
-     * @param o
-     * @return
-     */
-    public Q groupBy(Expression<?> e) {
-        return queryMixin.groupBy(e);
-    }
-    
-    /**
-     * Add grouping/aggregation expressions
-     *
-     * @param o
-     * @return
-     */
-    public Q groupBy(Expression<?>... o) {
-        return queryMixin.groupBy(o);
-    }
-    
-    /**
-     * Add a single filter for aggregation
-     *
-     * @param o
-     * @return
-     */
-    public Q having(Predicate e) {
-        return queryMixin.having(e);
-    }
-
-    /**
-     * Add filters for aggregation
-     *
-     * @param o
-     * @return
-     */
-    public Q having(Predicate... o) {
-        return queryMixin.having(o);
-    }
-    
-    /**
-     * Add a single order expression
-     * 
-     * @param o
-     * @return
-     */
-    public Q orderBy(OrderSpecifier<?> o) {
-        return queryMixin.orderBy(o);
-    }
-
-    /**
-     * Add order expressions
-     *
-     * @param o
-     * @return
-     */
-    public Q orderBy(OrderSpecifier<?>... o) {
-        return queryMixin.orderBy(o);
-    }
-    
-    /**
-     * Add the given filter condition
-     * 
-     * <p>Skips null arguments</p>
-     *
-     * @param o filter conditions to be added
-     * @return
-     */
-    public Q where(Predicate o) {
-        return queryMixin.where(o);
-    }
-
-    /**
-     * Add the given filter conditions
-     * 
-     * <p>Skips null arguments</p>
-     *
-     * @param o filter conditions to be added
-     * @return
-     */
-    public Q where(Predicate... o) {
-        return queryMixin.where(o);
-    }
-
-    /**
-     * Defines the limit / max results for the query results
-     *
-     * @param limit
-     * @return
-     */
-    public Q limit(@Nonnegative long limit) {
-        return queryMixin.limit(limit);
-    }
-
-    /**
-     * Defines the offset for the query results
-     *
-     * @param offset
-     * @return
-     */
-    public Q offset(long offset) {
-        return queryMixin.offset(offset);
-    }
-
-    /**
-     * Defines both limit and offset of the query results
-     *
-     * @param modifiers
-     * @return
-     */
-    public Q restrict(QueryModifiers modifiers) {
-        return queryMixin.restrict(modifiers);
-    }
-
-    /**
-     * Set the given parameter to the given value
-     *
-     * @param <T>
-     * @param param
-     * @param value
-     * @return
-     */
-    public <P> Q set(ParamExpression<P> param, P value) {
-        return queryMixin.set(param, value);
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof QueryBase) {
-            QueryBase q = (QueryBase)o;
-            return q.queryMixin.equals(queryMixin);
-        } else {
-            return false;
-        }
-    }
-  
-    @Override
-    public int hashCode() {
-        return queryMixin.hashCode();
-    }
-        
-    @Override
-    public String toString() {
-        return queryMixin.toString();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ReplaceVisitor.java b/querydsl-core/src/main/java/com/mysema/query/support/ReplaceVisitor.java
deleted file mode 100644
index 82ea2e915d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/ReplaceVisitor.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.template.BooleanTemplate;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ReplaceVisitor is a deep visitor that can be customized to replace segments of
- * expression trees
- */
-public class ReplaceVisitor implements Visitor<Expression<?>, Void> {
-
-    @Override
-    public Expression<?> visit(Constant<?> expr, @Nullable Void context) {
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(FactoryExpression<?> expr, @Nullable Void context) {
-        List<Expression<?>> args = visit(expr.getArgs());
-        if (args.equals(expr.getArgs())) {
-            return expr;
-        } else {
-            return FactoryExpressionUtils.wrap(expr, args);
-        }
-    }
-
-    @Override
-    public Expression<?> visit(Operation<?> expr, @Nullable Void context) {
-        ImmutableList<Expression<?>> args = visit(expr.getArgs());
-        if (args.equals(expr.getArgs())) {
-            return expr;
-        } else if (expr instanceof Predicate) {
-            return new PredicateOperation((Operator)expr.getOperator(), args);
-        } else {
-            return new OperationImpl(expr.getType(), expr.getOperator(), args);
-        }
-    }
-
-    @Override
-    public Expression<?> visit(ParamExpression<?> expr, @Nullable Void context) {
-        return expr;
-    }
-
-    @Override
-    public Expression<?> visit(Path<?> expr, @Nullable Void context) {
-        if (expr.getMetadata().isRoot()) {
-            return expr;
-        } else {
-            PathMetadata metadata = expr.getMetadata();
-            Path<?> parent = (Path)metadata.getParent().accept(this, null);
-            if (parent.equals(metadata.getParent())) {
-                return expr;
-            } else {
-                metadata = new PathMetadata(parent, metadata.getElement(),
-                        metadata.getPathType());
-                return new PathImpl(expr.getType(), metadata);
-            }
-        }
-    }
-
-    @Override
-    public Expression<?> visit(SubQueryExpression<?> expr, @Nullable Void context) {
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.setDistinct(expr.getMetadata().isDistinct());
-        md.setModifiers(expr.getMetadata().getModifiers());
-        md.setUnique(expr.getMetadata().isUnique());
-        for (QueryFlag flag : expr.getMetadata().getFlags()) {
-            md.addFlag(new QueryFlag(flag.getPosition(), flag.getFlag().accept(this, null)));
-        }
-        for (Expression<?> e : expr.getMetadata().getGroupBy()) {
-            md.addGroupBy(e.accept(this, null));
-        }
-        Predicate having = expr.getMetadata().getHaving();
-        if (having != null) {
-            md.addHaving((Predicate)having.accept(this, null));
-        }
-        for (JoinExpression je : expr.getMetadata().getJoins()) {
-            md.addJoin(je.getType(), je.getTarget().accept(this, null));
-            if (je.getCondition() != null) {
-                md.addJoinCondition((Predicate)je.getCondition().accept(this, null));
-            }
-            for (JoinFlag jf : je.getFlags()) {
-                md.addJoinFlag(new JoinFlag(jf.getFlag().accept(this, null), jf.getPosition()));
-            }
-        }
-        for (OrderSpecifier<?> os : expr.getMetadata().getOrderBy()) {
-            OrderSpecifier<?> os2 = new OrderSpecifier(os.getOrder(), os.getTarget().accept(this,
-                    null));
-            switch (os.getNullHandling()) {
-                case NullsFirst: os2 = os2.nullsFirst(); break;
-                case NullsLast: os2 = os2.nullsLast(); break;
-            }
-            md.addOrderBy(os2);
-        }
-        for (Map.Entry<ParamExpression<?>, Object> entry : expr.getMetadata().getParams()
-                .entrySet()) {
-            md.setParam((ParamExpression)entry.getKey().accept(this, null), entry.getValue());
-        }
-        for (Expression<?> e : expr.getMetadata().getProjection()) {
-            md.addProjection(e.accept(this, null));
-        }
-        Predicate where = expr.getMetadata().getWhere();
-        if (where != null) {
-           md.addWhere((Predicate)where.accept(this, null));
-        }
-        if (expr.getMetadata().equals(md)) {
-            return expr;
-        } else {
-            return new SubQueryExpressionImpl(expr.getType(), md);
-        }
-    }
-
-    @Override
-    public Expression<?> visit(TemplateExpression<?> expr, @Nullable Void context) {
-        ImmutableList.Builder builder = ImmutableList.builder();
-        for (Object arg : expr.getArgs()) {
-            if (arg instanceof Expression) {
-                builder.add(((Expression)arg).accept(this, null));
-            } else {
-                builder.add(arg);
-            }
-        }
-        ImmutableList args = builder.build();
-        if (args.equals(expr.getArgs())) {
-            return expr;
-        } else {
-            if (expr instanceof Predicate) {
-                return BooleanTemplate.create(expr.getTemplate(), args);
-            } else {
-                return new TemplateExpressionImpl(expr.getType(), expr.getTemplate(), args);
-            }
-        }
-    }
-
-    private ImmutableList<Expression<?>> visit(List<Expression<?>> args) {
-        ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        for (Expression<?> arg : args) {
-            builder.add(arg.accept(this, null));
-        }
-        return builder.build();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/SerializerBase.java b/querydsl-core/src/main/java/com/mysema/query/support/SerializerBase.java
deleted file mode 100644
index 4cbb339b2d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/SerializerBase.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.Visitor;
-
-/**
- * SerializerBase is a stub for Serializer implementations which serialize query metadata to Strings
- *
- * @author tiwe
- */
-public abstract class SerializerBase<S extends SerializerBase<S>> implements Visitor<Void,Void> {
-
-    private final StringBuilder builder = new StringBuilder(128);
-           
-    private String constantPrefix = "a";
-
-    private String paramPrefix = "p";
-
-    private String anonParamPrefix = "_";
-
-    private Map<Object,String> constantToLabel;
-
-    @SuppressWarnings("unchecked")
-    private final S self = (S) this;
-
-    private final Templates templates;
-
-    private final char escape;
-
-    private boolean normalize = true;
-    
-    private boolean strict = true;
-    
-    public SerializerBase(Templates templates) {
-        this.templates = templates;
-        this.escape = templates.getEscapeChar();
-    }
-    
-    public final S prepend(final String str) {
-        builder.insert(0, str);
-        return self;
-    }
-    
-    public final S insert(int position, String str) {
-        builder.insert(position, str);
-        return self;
-    }
-
-    public final S append(final String str) {
-        builder.append(str);
-        return self;
-    }
-
-    protected String getConstantPrefix() {
-        return constantPrefix;
-    }
-
-    public Map<Object,String> getConstantToLabel() {
-        if (constantToLabel == null) {
-            constantToLabel = new HashMap<Object,String>(4);   
-        }
-        return constantToLabel;
-    }
-    
-    public int getLength() {
-        return builder.length();
-    }
-
-    protected final Template getTemplate(Operator<?> op) {
-        return templates.getTemplate(op);
-    }
-
-    public final S handle(Expression<?> expr) {
-        expr.accept(this, null);
-        return self;
-    }
-    
-    public final S handle(Object arg) {
-        if (arg instanceof Expression) {
-            ((Expression)arg).accept(this, null);
-        } else {
-            visitConstant(arg);
-        }
-        return self;
-    }
-
-    public final S handle(JoinFlag joinFlag) {
-        return handle(joinFlag.getFlag());
-    }
-
-    public final S handle(final String sep, final Expression<?>[] expressions) {
-        for (int i = 0; i< expressions.length; i++) {
-            if (i != 0) {
-                append(sep);
-            }
-            handle(expressions[i]);
-        }
-        return self;
-    }
-    
-    public final S handle(final String sep, final List<?> expressions) {
-        for (int i = 0; i < expressions.size(); i++) {
-            if (i != 0) {
-                append(sep);
-            }
-            handle((Expression<?>)expressions.get(i));
-        }
-        return self;
-    }
-
-    protected void handleTemplate(final Template template, final List<?> args) {
-        for (final Template.Element element : template.getElements()) {
-            final Object rv = element.convert(args);
-            if (rv instanceof Expression) {                    
-                ((Expression)rv).accept(this, null);
-            } else if (element.isString()) {
-                builder.append(rv.toString());
-            } else {
-                visitConstant(rv);
-            }
-        }
-    }
-
-    public final boolean serialize(final QueryFlag.Position position, final Set<QueryFlag> flags) {
-        boolean handled = false;
-        for (final QueryFlag flag : flags) {
-            if (flag.getPosition() == position) {
-                handle(flag.getFlag());
-                handled = true;
-            }
-        }
-        return handled;
-    }
-    
-    public final boolean serialize(final JoinFlag.Position position, final Set<JoinFlag> flags) {
-        boolean handled = false;
-        for (final JoinFlag flag : flags) {
-            if (flag.getPosition() == position) {
-                handle(flag.getFlag());
-                handled = true;
-            }
-        }
-        return handled;
-    }
-
-    public void setConstantPrefix(String prefix) {
-        this.constantPrefix = prefix;
-    }
-
-    public void setParamPrefix(String prefix) {
-        this.paramPrefix = prefix;
-    }
-
-    public void setAnonParamPrefix(String prefix) {
-        this.anonParamPrefix = prefix;
-    }
-    
-    public void setNormalize(boolean normalize) {
-        this.normalize = normalize;       
-    }
-    
-    public void setStrict(boolean strict) {
-        this.strict = strict;
-    }
-
-    @Override
-    public String toString() {
-        if (normalize) {
-            return Normalization.normalize(builder.toString());    
-        } else {
-            return builder.toString();
-        }        
-    }
-
-    @Override
-    public final Void visit(Constant<?> expr, Void context) {
-        visitConstant(expr.getConstant());
-        return null;
-    }
-    
-    public void visitConstant(Object constant) {
-        if (!getConstantToLabel().containsKey(constant)) {
-            final String constLabel = constantPrefix + (getConstantToLabel().size() + 1);
-            getConstantToLabel().put(constant, constLabel);
-            append(constLabel);
-        } else {
-            append(getConstantToLabel().get(constant));
-        }
-    }
-
-    @Override
-    public Void visit(ParamExpression<?> param, Void context) {
-        String paramLabel;
-        if (param.isAnon()) {
-            paramLabel = anonParamPrefix + param.getName();
-        } else {
-            paramLabel = paramPrefix + param.getName();
-        }
-        getConstantToLabel().put(param, paramLabel);
-        append(paramLabel);
-        return null;
-    }
-
-    @Override
-    public Void visit(TemplateExpression<?> expr, Void context) {
-        handleTemplate(expr.getTemplate(), expr.getArgs());
-        return null;
-    }
-
-    @Override
-    public Void visit(FactoryExpression<?> expr, Void context) {
-        handle(", ", expr.getArgs());
-        return null;
-    }
-
-    @Override
-    public Void visit(Operation<?> expr, Void context) {
-        visitOperation(expr.getType(), expr.getOperator(), expr.getArgs());
-        return null;
-    }
-
-    @Override
-    public Void visit(Path<?> path, Void context) {
-        final PathType pathType = path.getMetadata().getPathType();
-        final Template template = templates.getTemplate(pathType);
-        final Object element = path.getMetadata().getElement();        
-        List<Object> args;
-        if (path.getMetadata().getParent() != null) {
-            args = ImmutableList.of(path.getMetadata().getParent(), element);
-        } else {
-            args = ImmutableList.of(element);
-        }
-        handleTemplate(template, args);
-        return null;
-    }
-    
-    protected void visitOperation(Class<?> type, Operator<?> operator, final List<? extends Expression<?>> args) {
-        final Template template = templates.getTemplate(operator);
-        if (template != null) {
-            final int precedence = templates.getPrecedence(operator);        
-            for (final Template.Element element : template.getElements()) {
-                final Object rv = element.convert(args);
-                if (rv instanceof Expression) {
-                    final Expression<?> expr = (Expression<?>) rv;
-                    if (precedence > -1 && expr instanceof Operation) {
-                        if (precedence < templates.getPrecedence(((Operation<?>) expr).getOperator())) {
-                            append("(").handle(expr).append(")");
-                        } else {
-                            handle(expr);
-                        }
-                    } else {
-                        handle(expr);
-                    }
-                } else if (element.isString()) {
-                    append(rv.toString());
-                } else {
-                    visitConstant(rv);
-                }
-            }    
-        } else if (strict) {
-            throw new IllegalArgumentException("Got no pattern for " + operator);
-        } else {
-            append(operator.toString());
-            append("(");
-            handle(", ", args);
-            append(")");
-        }        
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/SimpleProjectableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/SimpleProjectableAdapter.java
deleted file mode 100644
index edb4140688..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/SimpleProjectableAdapter.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.List;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleProjectable;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Predicate;
-
-/**
- * SimpleQueryAdapter is an adapter implementation for the {@link SimpleQuery} and 
- * {@link SimpleProjectable} interfaces
- *
- * @author tiwe
- *
- * @param <T> type of entity
- */
-public class SimpleProjectableAdapter<T> implements SimpleQuery<SimpleProjectableAdapter<T>>, SimpleProjectable<T> {
-
-    private final Projectable projectable;
-
-    private final Expression<T> projection;
-
-    private final SimpleQuery<?> query;
-
-    @SuppressWarnings("BC_UNCONFIRMED_CAST")
-    public <Q extends SimpleQuery<?> & Projectable> SimpleProjectableAdapter(Q query, Expression<T> projection) {
-        // NOTE : this is a correct cast which is not handled properly by FindBugs
-        this(query, query, projection);
-    }
-
-    public SimpleProjectableAdapter(SimpleQuery<?> query, Projectable projectable, Expression<T> projection) {
-        this.query = query;
-        this.projectable = projectable;
-        this.projection = projection;
-    }
-
-    @Override
-    public boolean exists() {
-        return projectable.exists();
-    }
-
-    @Override
-    public boolean notExists() {
-        return projectable.notExists();
-    }
-
-    @Override
-    public long count() {
-        return projectable.count();
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> distinct() {
-        query.distinct();
-        return this;
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> limit(long limit) {
-        query.limit(limit);
-        return this;
-    }
-
-    @Override
-    public CloseableIterator<T> iterate() {
-        return projectable.iterate(projection);
-    }
-
-    @Override
-    public List<T> list() {
-        return projectable.list(projection);
-    }
-
-    @Override
-    public SearchResults<T> listResults() {
-        return projectable.listResults(projection);
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> offset(long offset) {
-        query.offset(offset);
-        return this;
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> orderBy(OrderSpecifier<?>... o) {
-        query.orderBy(o);
-        return this;
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> restrict(QueryModifiers modifiers) {
-        query.restrict(modifiers);
-        return this;
-    }
-
-    @Override
-    public <P> SimpleProjectableAdapter<T> set(ParamExpression<P> param, P value) {
-        query.set(param, value);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return query.toString();
-    }
-
-    @Override
-    public T singleResult() {
-        return projectable.singleResult(projection);
-    }
-
-    @Override
-    public T uniqueResult() {
-        return projectable.uniqueResult(projection);
-    }
-
-    @Override
-    public SimpleProjectableAdapter<T> where(Predicate... e) {
-        query.where(e);
-        return this;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/package-info.java b/querydsl-core/src/main/java/com/mysema/query/support/package-info.java
deleted file mode 100644
index 7dd0eb7d47..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/support/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Various support classes
- *
- */
-package com.mysema.query.support;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ArrayConstructorExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ArrayConstructorExpression.java
deleted file mode 100644
index 0ed9c8ce77..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ArrayConstructorExpression.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.lang.reflect.Array;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * ArrayConstructorExpression extends {@link ExpressionBase} to represent array initializers
- *
- * @author tiwe
- *
- * @param <T> component type
- */
-@Immutable
-public class ArrayConstructorExpression<T> extends ExpressionBase<T[]> implements FactoryExpression<T[]> {
-
-    private static final long serialVersionUID = 8667880104290226505L;
-
-    private final Class<T> elementType;
-
-    private final ImmutableList<Expression<?>> args;
-
-    @SuppressWarnings("unchecked")
-    public ArrayConstructorExpression(Expression<?>... args) {
-        this((Class)Object[].class, (Expression[])args);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public ArrayConstructorExpression(Class<T[]> type, Expression<T>... args) {
-        super(type);
-        this.elementType = (Class<T>)type.getComponentType();
-        this.args = ImmutableList.<Expression<?>>copyOf(args);
-    }
-
-    public final Class<T> getElementType() {
-        return elementType;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public T[] newInstance(Object... a) {
-        if (a.getClass().getComponentType().equals(elementType)) {
-            return (T[])a;
-        } else {
-            T[] rv = (T[]) Array.newInstance(elementType, a.length);
-            System.arraycopy(a, 0, rv, 0, a.length);
-            return rv;
-        }
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return args;
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof FactoryExpression<?>) {
-            FactoryExpression<?> c = (FactoryExpression<?>)obj;
-            return args.equals(c.getArgs()) && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/CollectionExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/CollectionExpression.java
deleted file mode 100644
index b1ee6247ac..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/CollectionExpression.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Collection;
-
-/**
- * CollectionExpression represents {@link java.util.Collection} typed expressions
- *
- * @author tiwe
- *
- * @param <C> expression type
- * @param <E> element type
- * @see java.util.Collection
- */
-public interface CollectionExpression<T extends Collection<E>, E> extends ParametrizedExpression<T> {
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java
deleted file mode 100644
index cb35a4757e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * ConstantImpl is the default implementation of the Constant interface
- *
- * @author tiwe
- */
-@Immutable
-@SuppressWarnings("unchecked")
-public final class ConstantImpl<T> extends ExpressionBase<T> implements Constant<T> {
-
-    private static final long serialVersionUID = -3898138057967814118L;
-
-    private static final int CACHE_SIZE = 256;
-
-    private static final Constant<Character>[] CHARACTERS = new Constant[CACHE_SIZE];
-
-    private static final Constant<Byte>[] BYTES = new Constant[CACHE_SIZE];
-
-    private static final Constant<Integer>[] INTEGERS = new Constant[CACHE_SIZE];
-
-    private static final Constant<Long>[] LONGS = new Constant[CACHE_SIZE];
-
-    private static final Constant<Short>[] SHORTS = new Constant[CACHE_SIZE];
-
-    private static final Constant<Boolean> FALSE = new ConstantImpl<Boolean>(Boolean.FALSE);
-
-    private static final Constant<Boolean> TRUE = new ConstantImpl<Boolean>(Boolean.TRUE);
-
-    static {
-        for (int i = 0; i < CACHE_SIZE; i++) {
-            INTEGERS[i] = new ConstantImpl<Integer>(Integer.class, Integer.valueOf(i));
-            SHORTS[i] = new ConstantImpl<Short>(Short.class, Short.valueOf((short)i));
-            BYTES[i] = new ConstantImpl<Byte>(Byte.class, Byte.valueOf((byte)i));
-            CHARACTERS[i] = new ConstantImpl<Character>(Character.class, Character.valueOf((char)i));
-            LONGS[i] = new ConstantImpl<Long>(Long.class, Long.valueOf(i));
-        }
-    }
-
-    public static Constant<Boolean> create(boolean b) {
-        return b ? TRUE : FALSE;
-    }
-
-    public static Constant<Byte> create(byte i) {
-        if (i >= 0 && i < CACHE_SIZE) {
-            return BYTES[i];
-        } else {
-            return new ConstantImpl<Byte>(Byte.class, Byte.valueOf(i));
-        }
-    }
-
-    public static Constant<Character> create(char i) {
-        if (i >= 0 && i < CACHE_SIZE) {
-            return CHARACTERS[i];
-        } else {
-            return new ConstantImpl<Character>(Character.class, Character.valueOf(i));
-        }
-    }
-
-    public static Constant<Integer> create(int i) {
-        if (i >= 0 && i < CACHE_SIZE) {
-            return INTEGERS[i];
-        } else {
-            return new ConstantImpl<Integer>(Integer.class, Integer.valueOf(i));
-        }
-    }
-
-    public static Constant<Long> create(long i) {
-        if (i >= 0 && i < CACHE_SIZE) {
-            return LONGS[(int)i];
-        } else {
-            return new ConstantImpl<Long>(Long.class, Long.valueOf(i));
-        }
-    }
-
-    public static Constant<Short> create(short i) {
-        if (i >= 0 && i < CACHE_SIZE) {
-            return SHORTS[i];
-        } else {
-            return new ConstantImpl<Short>(Short.class, Short.valueOf(i));
-        }
-    }
-
-    public static <T> Constant<T> create(T obj) {
-        return new ConstantImpl<T>(obj);
-    }
-
-    private final T constant;
-
-    /**
-     * Create a new Constant for the given object
-     *
-     * @param constant
-     */
-    public ConstantImpl(T constant) {
-        this((Class)constant.getClass(), constant);
-    }
-
-    /**
-     * Create a new Constant of the given type for the given object
-     *
-     * @param type
-     * @param constant
-     */
-    public ConstantImpl(Class<T> type, T constant) {
-        super(type);
-        this.constant = constant;
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Constant<?>) {
-            return ((Constant<?>)o).getConstant().equals(constant);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public T getConstant() {
-        return constant;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ConstructorExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ConstructorExpression.java
deleted file mode 100644
index ee1b5be3a9..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ConstructorExpression.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static com.mysema.query.util.ConstructorUtils.*;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-/**
- * ConstructorExpression represents a constructor invocation
- *
- * <p>Example</p>
- *
- * <pre>
- * {@code
- * QEmployee employee = QEmployee.employee;
- * List<EmployeeInfo> result = query.from(employee)
- *   .where(employee.valid.eq(true))
- *   .list(ConstructorExpression.create(EmployeeInfo.class, employee.firstName, employee.lastName));
- * }
- * </pre>
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@Immutable
-public class ConstructorExpression<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = -602747921848073175L;
-
-    public static <D> ConstructorExpression<D> create(Class<D> type, Expression<?>... args) {
-        Class<?>[] paramTypes = new Class[args.length];
-        for (int i = 0; i < paramTypes.length; i++) {
-            paramTypes[i] = args[i].getType();
-        }
-        return new ConstructorExpression<D>(type, paramTypes, args);
-    }
-
-    private final ImmutableList<Expression<?>> args;
-
-    private final Class<?>[] parameterTypes;
-
-    @Nullable
-    private transient Constructor<?> constructor;
-
-    private transient Iterable<Function<Object[], Object[]>> transformers;
-
-    public ConstructorExpression(Class<T> type, Class<?>[] paramTypes, Expression<?>... args) {
-        this(type, paramTypes, ImmutableList.copyOf(args));
-    }
-
-    public ConstructorExpression(Class<T> type, Class<?>[] paramTypes, ImmutableList<Expression<?>> args) {
-        super(type);
-        this.parameterTypes = getConstructorParameters(type, paramTypes).clone();
-        this.args = args;
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Expression<T> as(Path<T> alias) {
-        return OperationImpl.create(getType(), Ops.ALIAS, this, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public Expression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof ConstructorExpression<?>) {
-            ConstructorExpression<?> c = (ConstructorExpression<?>) obj;
-            return Arrays.equals(parameterTypes, c.parameterTypes)
-                    && args.equals(c.args)
-                    && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public final List<Expression<?>> getArgs() {
-        return args;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public T newInstance(Object... args) {
-        try {
-            if (constructor == null) {
-                constructor = getConstructor(getType(), parameterTypes);
-                transformers = getTransformers(constructor);
-            }
-            for (Function<Object[], Object[]> transformer : transformers) {
-                args = transformer.apply(args);
-            }
-            return (T) constructor.newInstance(args);
-        } catch (SecurityException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (NoSuchMethodException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java b/querydsl-core/src/main/java/com/mysema/query/types/Converters.java
deleted file mode 100644
index cab95273be..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Locale;
-
-import com.google.common.base.Function;
-
-/**
- * Converters provides expression converters for lower case, upper case and prefix/suffix conversions
- *
- * @author tiwe
- *
- */
-@Deprecated
-public final class Converters {
-
-    private static final Constant<String> PERCENT = ConstantImpl.create("%");
-
-    private final char escape;
-
-    /**
-     * Create a new Converters instance
-     *
-     * @param escape escape character to be used
-     */
-    public Converters(char escape) {
-        this.escape = escape;
-    }
-
-    public final Function<Object,Object> toLowerCase =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                return OperationImpl.create(String.class, Ops.LOWER, (Expression)arg);
-            } else {
-                return arg.toString().toLowerCase(Locale.ENGLISH);
-            }
-        }
-    };
-
-    public final Function<Object,Object> toUpperCase =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                return OperationImpl.create(String.class, Ops.UPPER, (Expression)arg);
-            } else {
-                return arg.toString().toUpperCase(Locale.ENGLISH);
-            }
-        }
-    };
-
-    public final Function<Object,Object> toStartsWithViaLike =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                return OperationImpl.create(String.class, Ops.CONCAT, (Expression)arg, PERCENT);
-            } else {
-                return escapeForLike(arg.toString()) + "%";
-            }
-        }
-    };
-
-    public final Function<Object,Object> toStartsWithViaLikeLower =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, (Expression)arg, PERCENT);
-                return OperationImpl.create(String.class, Ops.LOWER, concated);
-            } else {
-                return escapeForLike(arg.toString().toLowerCase(Locale.ENGLISH)) + "%";
-            }
-        }
-    };
-
-    public final Function<Object,Object> toEndsWithViaLike =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                return OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-            } else {
-                return "%" + escapeForLike(arg.toString());
-            }
-        }
-    };
-
-    public final Function<Object,Object> toEndsWithViaLikeLower =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                return OperationImpl.create(String.class, Ops.LOWER, concated);
-            } else {
-                return "%" + escapeForLike(arg.toString().toLowerCase(Locale.ENGLISH));
-            }
-        }
-    };
-
-    public final Function<Object,Object> toContainsViaLike =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                return OperationImpl.create(String.class, Ops.CONCAT, concated, PERCENT);
-            } else {
-                return "%" + escapeForLike(arg.toString()) + "%";
-            }
-        }
-    };
-
-    public final Function<Object,Object> toContainsViaLikeLower =
-        new Function<Object,Object>() {
-        @Override
-        public Object apply(Object arg) {
-            if (arg instanceof Constant) {
-                return ConstantImpl.create(apply(arg.toString()).toString());
-            } else if (arg instanceof Expression) {
-                Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                concated = OperationImpl.create(String.class, Ops.CONCAT, concated, PERCENT);
-                return OperationImpl.create(String.class, Ops.LOWER, concated);
-            } else {
-                return "%" + escapeForLike(arg.toString().toLowerCase(Locale.ENGLISH)) + "%";
-            }
-        }
-    };
-
-    public String escapeForLike(String str) {
-        final StringBuilder rv = new StringBuilder(str.length() + 3);
-        for (int i = 0; i < str.length(); i++) {
-            final char ch = str.charAt(i);
-            if (ch == escape || ch == '%' || ch == '_') {
-                rv.append(escape);
-            }
-            rv.append(ch);
-        }
-        return rv.toString();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Expression.java b/querydsl-core/src/main/java/com/mysema/query/types/Expression.java
deleted file mode 100644
index 6045e3a8ba..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Expression.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-
-/**
- * Expression defines a general typed expression in a Query instance. The generic type parameter
- * is a reference to the type the expression is bound to.
- * 
- * <p>The central Expression subinterfaces are</p>
- * <ul>
- *   <li>{@link Constant} - for constants such as Strings, numbers and entity instances</li>
- *   <li>{@link FactoryExpression} - for row based result processing</li>
- *   <li>{@link Operation} - for common supported operations and function calls</li>
- *   <li>{@link ParamExpression} - for bindable query parameters</li>
- *   <li>{@link Path} - for variables, properties and collection member access</li>
- *   <li>{@link SubQueryExpression} - for subqueries</li>
- *   <li>{@link TemplateExpression} - for custom syntax</li>
- * </ul>
- *
- * @author tiwe
- *
- * @param <T> expression type
- *
- */
-public interface Expression<T> extends Serializable {
-
-    /**
-     * Accept the visitor with the given context
-     *
-     * @param <R> return type
-     * @param <C> context type
-     * @param v visitor
-     * @param context context of visit
-     * @return
-     */
-    @Nullable
-    <R,C> R accept(Visitor<R,C> v, @Nullable C context);
-
-    /**
-     * Get the java type for this expression
-     *
-     * @return
-     */
-    Class<? extends T> getType();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java
deleted file mode 100644
index 035ec70a75..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.QueryException;
-
-
-/**
- * ExpressionUtils provides utilities for constructing common operation instances. This class is
- * used internally in Querydsl and is not suitable to be used in cases where DSL methods are needed,
- * since the Expression implementations used in this class are minimal internal implementations.
- *
- * @author tiwe
- *
- */
-public final class ExpressionUtils {
-
-    /**
-     * @param col
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Expression<T> all(CollectionExpression<?, ? super T> col) {
-        return OperationImpl.create((Class<T>)col.getParameter(0), Ops.QuantOps.ALL, col);
-    }
-
-    /**
-     * @param col
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Expression<T> any(CollectionExpression<?, ? super T> col) {
-        return OperationImpl.create((Class<T>)col.getParameter(0), Ops.QuantOps.ANY, col);
-    }
-
-    /**
-     * Create the intersection of the given arguments
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static Predicate allOf(Collection<Predicate> exprs) {
-        Predicate rv = null;
-        for (Predicate b : exprs) {
-            if (b != null) {
-                rv = rv == null ? b : ExpressionUtils.and(rv,b);
-            }
-        }
-        return rv;
-    }
-
-    /**
-     * Create the intersection of the given arguments
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static Predicate allOf(Predicate... exprs) {
-        Predicate rv = null;
-        for (Predicate b : exprs) {
-            if (b != null) {
-                rv = rv == null ? b : ExpressionUtils.and(rv,b);
-            }
-        }
-        return rv;
-    }
-
-    /**
-     * Create the intersection of the given arguments
-     *
-     * @param left
-     * @param right
-     * @return
-     */
-    public static Predicate and(Predicate left, Predicate right) {
-        left = (Predicate) extract(left);
-        right = (Predicate) extract(right);
-        if (left == null) {
-            return right;
-        } else if (right == null) {
-            return left;
-        } else {
-            return PredicateOperation.create(Ops.AND, left, right);
-        }
-    }
-
-
-    /**
-     * Create the union of the given arguments
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static Predicate anyOf(Collection<Predicate> exprs) {
-        Predicate rv = null;
-        for (Predicate b : exprs) {
-            if (b != null) {
-                rv = rv == null ? b : ExpressionUtils.or(rv,b);
-            }
-        }
-        return rv;
-    }
-
-    /**
-     * Create the union of the given arguments
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static Predicate anyOf(Predicate... exprs) {
-        Predicate rv = null;
-        for (Predicate b : exprs) {
-            if (b != null) {
-                rv = rv == null ? b : ExpressionUtils.or(rv,b);
-            }
-        }
-        return rv;
-    }
-
-    /**
-     * Create an alias expression (source as alias) with the given source and alias
-     *
-     * @param <D>
-     * @param source
-     * @param alias
-     * @return
-     */
-    public static <D> Expression<D> as(Expression<D> source, Path<D> alias) {
-        return OperationImpl.create(alias.getType(), Ops.ALIAS, source, alias);
-    }
-
-    /**
-     * Create an alias expression (source as alias) with the given source and alias
-     *
-     * @param <D>
-     * @param source
-     * @param alias
-     * @return
-     */
-    public static <D> Expression<D> as(Expression<D> source, String alias) {
-        return as(source, new PathImpl<D>(source.getType(), alias));
-    }
-
-    /**
-     * @param source
-     * @return
-     */
-    public static Expression<Long> count(Expression<?> source) {
-        return OperationImpl.create(Long.class, Ops.AggOps.COUNT_AGG, source);
-    }
-
-    /**
-     * Create an left equals constant expression
-     *
-     * @param <D>
-     * @param left
-     * @param constant
-     * @return
-     */
-    public static <D> Predicate eqConst(Expression<D> left, D constant) {
-        return eq(left, ConstantImpl.create(constant));
-    }
-
-    /**
-     * Create an left equals right expression
-     *
-     * @param <D>
-     * @param left
-     * @param right
-     * @return
-     */
-    public static <D> Predicate eq(Expression<D> left, Expression<? extends D> right) {
-        return PredicateOperation.create(Ops.EQ, left, right);
-    }
-
-    /**
-     * Create an left in right expression
-     *
-     * @param <D>
-     * @param left
-     * @param right
-     * @return
-     */
-    public static <D> Predicate in(Expression<D> left, CollectionExpression<?,? extends D> right) {
-        return PredicateOperation.create(Ops.IN, left, right);
-    }
-
-    /**
-     * Create an left in right expression
-     *
-     * @param <D>
-     * @param left
-     * @param right
-     * @return
-     */
-    public static <D> Predicate in(Expression<D> left, Collection<? extends D> right) {
-        if (right.size() == 1) {
-            return eqConst(left, right.iterator().next());
-        } else {
-            return PredicateOperation.create(Ops.IN, left, ConstantImpl.create(right));
-        }
-    }
-
-    /**
-     * Create a left is null expression
-     *
-     * @param left
-     * @return
-     */
-    public static Predicate isNull(Expression<?> left) {
-        return PredicateOperation.create(Ops.IS_NULL, left);
-    }
-
-    /**
-     * Create a left is not null expression
-     *
-     * @param left
-     * @return
-     */
-    public static Predicate isNotNull(Expression<?> left) {
-        return PredicateOperation.create(Ops.IS_NOT_NULL, left);
-    }
-
-    /**
-     * Convert the given like pattern to a regex pattern
-     *
-     * @param expr
-     * @return
-     */
-    public static Expression<String> likeToRegex(Expression<String> expr) {
-        return likeToRegex(expr, true);
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public static Expression<String> likeToRegex(Expression<String> expr, boolean matchStartAndEnd) {
-        // TODO : this should take the escape character into account
-        if (expr instanceof Constant<?>) {
-            final String like = expr.toString();
-            final StringBuilder rv = new StringBuilder(like.length() + 4);
-            if (matchStartAndEnd && !like.startsWith("%")) {
-                rv.append('^');
-            }
-            for (int i = 0; i < like.length(); i++) {
-                char ch = like.charAt(i);
-                if (ch == '.' || ch == '*' || ch == '?') {
-                    rv.append('\\');
-                } else if (ch == '%') {
-                    rv.append(".*");
-                    continue;
-                } else if (ch == '_') {
-                    rv.append('.');
-                    continue;
-                }
-                rv.append(ch);
-            }
-            if (matchStartAndEnd && !like.endsWith("%")) {
-                rv.append('$');
-            }
-            if (!like.equals(rv.toString())) {
-                return ConstantImpl.create(rv.toString());
-            }
-        } else if (expr instanceof Operation<?>) {
-            Operation<?> o = (Operation<?>)expr;
-            if (o.getOperator() == Ops.CONCAT) {
-                Expression<String> lhs = likeToRegex((Expression<String>) o.getArg(0), false);
-                Expression<String> rhs = likeToRegex((Expression<String>) o.getArg(1), false);
-                if (lhs != o.getArg(0) || rhs != o.getArg(1)) {
-                    return OperationImpl.create(String.class, Ops.CONCAT, lhs, rhs);
-                }
-            }
-        }
-        return expr;
-    }
-
-    /**
-     * @param exprs
-     * @return
-     */
-    public static <T> Expression<T> list(Class<T> clazz, Expression<?>... exprs) {
-        return list(clazz, ImmutableList.copyOf(exprs));
-    }
-
-
-    /**
-     * @param exprs
-     * @return
-     */
-    public static <T> Expression<T> list(Class<T> clazz, List<? extends Expression<?>> exprs) {
-        Expression<T> rv = (Expression<T>)exprs.get(0);
-        if (exprs.size() == 1) {
-            rv = OperationImpl.create(clazz, Ops.SINGLETON, rv, exprs.get(0));
-        } else {
-            for (int i = 1; i < exprs.size(); i++) {
-                rv = OperationImpl.create(clazz, Ops.LIST, rv, exprs.get(i));
-            }
-        }
-
-        return rv;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Expression<String> regexToLike(Expression<String> expr) {
-        if (expr instanceof Constant<?>) {
-            final String str = expr.toString();
-            final StringBuilder rv = new StringBuilder(str.length() + 2);
-            boolean escape = false;
-            for (int i = 0; i < str.length(); i++) {
-                final char ch = str.charAt(i);
-                if (!escape && ch == '.') {
-                    if (i < str.length() - 1 && str.charAt(i+1) == '*') {
-                        rv.append('%');
-                        i++;
-                    } else {
-                        rv.append('_');
-                    }
-                    continue;
-                } else if (!escape && ch == '\\') {
-                    escape = true;
-                    continue;
-                } else if (!escape && (ch == '[' || ch == ']' || ch == '^' || ch == '.' || ch == '*')) {
-                    throw new QueryException("'" + str + "' can't be converted to like form");
-                } else if (escape && (ch == 'd' || ch == 'D' || ch == 's' || ch == 'S' || ch == 'w' || ch == 'W')) {
-                    throw new QueryException("'" + str + "' can't be converted to like form");
-                }
-                rv.append(ch);
-                escape = false;
-            }
-            if (!rv.toString().equals(str)) {
-                return ConstantImpl.create(rv.toString());
-            }
-        } else if (expr instanceof Operation<?>) {
-            Operation<?> o = (Operation<?>)expr;
-            if (o.getOperator() == Ops.CONCAT) {
-                Expression<String> lhs = regexToLike((Expression<String>) o.getArg(0));
-                Expression<String> rhs = regexToLike((Expression<String>) o.getArg(1));
-                if (lhs != o.getArg(0) || rhs != o.getArg(1)) {
-                    return OperationImpl.create(String.class, Ops.CONCAT, lhs, rhs);
-                }
-            }
-        }
-        return expr;
-    }
-
-    /**
-     * Create a left not equals constant expression
-     *
-     * @param <D>
-     * @param left
-     * @param constant
-     * @return
-     */
-    public static <D> Predicate neConst(Expression<D> left, D constant) {
-        return ne(left, ConstantImpl.create(constant));
-    }
-
-    /**
-     * Create a left not equals right expression
-     *
-     * @param <D>
-     * @param left
-     * @param right
-     * @return
-     */
-    public static <D> Predicate ne(Expression<D> left, Expression<? super D> right) {
-        return PredicateOperation.create(Ops.NE, left, right);
-    }
-
-    /**
-     * Create a left or right expression
-     *
-     * @param left
-     * @param right
-     * @return
-     */
-    public static Predicate or(Predicate left, Predicate right) {
-        left = (Predicate) extract(left);
-        right = (Predicate) extract(right);
-        if (left == null) {
-            return right;
-        } else if (right == null) {
-            return left;
-        } else {
-            return PredicateOperation.create(Ops.OR, left, right);
-        }
-    }
-
-    /**
-     * Get a distinct list of the given args
-     *
-     * @param args
-     * @return
-     */
-    public static ImmutableList<Expression<?>> distinctList(Expression<?>... args) {
-        final ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        final Set<Expression<?>> set = new HashSet<Expression<?>>(args.length);
-        for (Expression<?> arg : args) {
-            if (set.add(arg)) {
-                builder.add(arg);
-            }
-        }
-        return builder.build();
-    }
-
-    /**
-     * Get a distinct list of the concatenated array contents
-     *
-     * @param args
-     * @return
-     */
-    public static ImmutableList<Expression<?>> distinctList(Expression<?>[]... args) {
-        final ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        final Set<Expression<?>> set = new HashSet<Expression<?>>();
-        for (Expression<?>[] arr : args) {
-            for (Expression<?> arg : arr) {
-                if (set.add(arg)) {
-                    builder.add(arg);
-                }
-            }
-        }
-        return builder.build();
-    }
-
-    /**
-     * Get the potentially wrapped expression
-     *
-     * @param expr
-     * @return
-     */
-    public static <T> Expression<T> extract(Expression<T> expr) {
-        if (expr != null) {
-            final Class<?> clazz = expr.getClass();
-            if (clazz == PathImpl.class || clazz == PredicateOperation.class || clazz == ConstantImpl.class) {
-                return expr;
-            } else {
-                return (Expression<T>) expr.accept(ExtractorVisitor.DEFAULT, null);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    private ExpressionUtils() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/FactoryExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/FactoryExpression.java
deleted file mode 100644
index 153f9b4f5c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/FactoryExpression.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-/**
- * FactoryExpression represents factory expressions such as JavaBean or 
- * Constructor projections
- * 
- * @author tiwe
- *
- * @param <T> type of projection
- */
-public interface FactoryExpression<T> extends Expression<T> {
-    
-    /**
-     * Get the invocation arguments
-     *
-     * @return
-     */
-    List<Expression<?>> getArgs();
-
-    /**
-     * Create a projection with the given arguments
-     *
-     * @param args
-     * @return
-     */
-    @Nullable
-    T newInstance(Object... args);
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/HashCodeVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/HashCodeVisitor.java
deleted file mode 100644
index 4327145564..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/HashCodeVisitor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.mysema.query.types;
-
-
-/**
- * HashCodeVisitor is used for hashCode generation in {@link Expression} implementations.
- *
- * @author tiwe
- */
-public final class HashCodeVisitor implements Visitor<Integer,Void> {
-
-    public static final HashCodeVisitor DEFAULT = new HashCodeVisitor();
-
-    private HashCodeVisitor() {}
-    
-    @Override
-    public Integer visit(Constant<?> expr, Void context) {
-        return expr.getConstant().hashCode();
-    }
-
-    @Override
-    public Integer visit(FactoryExpression<?> expr, Void context) {
-        int result = expr.getType().hashCode();
-        return 31 * result + expr.getArgs().hashCode();
-    }
-
-    @Override
-    public Integer visit(Operation<?> expr, Void context) {
-        int result = expr.getOperator().hashCode();
-        return 31 * result + expr.getArgs().hashCode();
-    }
-
-    @Override
-    public Integer visit(ParamExpression<?> expr, Void context) {
-        return expr.getName().hashCode();
-    }
-
-    @Override
-    public Integer visit(Path<?> expr, Void context) {
-        return expr.getMetadata().hashCode();
-    }
-
-    @Override
-    public Integer visit(SubQueryExpression<?> expr, Void context) {
-        return expr.getMetadata().hashCode();
-    }
-
-    @Override
-    public Integer visit(TemplateExpression<?> expr, Void context) {
-        int result = expr.getTemplate().hashCode();
-        return 31 * result + expr.getArgs().hashCode();        
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java b/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java
deleted file mode 100644
index bdc7fedd5f..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.lang.reflect.Field;
-
-
-/**
- * JavaTemplates extends {@link Templates} to provide Java syntax compliant serialization
- * of Querydsl expressions
- *
- * @author tiwe
- *
- */
-public class JavaTemplates extends Templates {
-
-    public JavaTemplates() {
-        add(Ops.EQ, "{0} == {1}");
-        add(Ops.IS_NULL, "{0} == null");
-        add(Ops.IS_NOT_NULL, "{0} != null");
-        add(Ops.INSTANCE_OF, "{0} instanceof {1}");
-        add(Ops.ORDINAL, "{0}.ordinal()");
-
-        // collection
-        add(Ops.IN, "{1}.contains({0})");
-        add(Ops.NOT_IN, "!{1}.contains({0})");
-        add(Ops.COL_IS_EMPTY, "{0}.isEmpty()");
-        add(Ops.COL_SIZE, "{0}.size()");
-
-        // array
-        add(Ops.ARRAY_SIZE, "{0}.length");
-
-        // map
-        add(Ops.MAP_IS_EMPTY, "{0}.isEmpty()");
-        add(Ops.MAP_SIZE, "{0}.size()");
-        add(Ops.CONTAINS_KEY, "{0}.containsKey({1})");
-        add(Ops.CONTAINS_VALUE, "{0}.containsValue({1})");
-
-        // Comparable
-        add(Ops.BETWEEN, "{1} <= {0} && {0} <= {2}");
-
-        // String
-        add(Ops.CHAR_AT, "{0}.charAt({1})");
-        add(Ops.LOWER, "{0}.toLowerCase()");
-        add(Ops.SUBSTR_1ARG, "{0}.substring({1})");
-        add(Ops.SUBSTR_2ARGS, "{0}.substring({1},{2})");
-        add(Ops.TRIM, "{0}.trim()");
-        add(Ops.UPPER, "{0}.toUpperCase()");
-        add(Ops.MATCHES, "{0}.matches({1})");
-        add(Ops.MATCHES_IC, "{0}.matches({1})");
-        add(Ops.STRING_LENGTH, "{0}.length()");
-        add(Ops.STRING_IS_EMPTY, "{0}.isEmpty()");
-        add(Ops.STRING_CONTAINS, "{0}.contains({1})");
-        add(Ops.STRING_CONTAINS_IC, "{0l}.contains({1l})");
-        add(Ops.STARTS_WITH, "{0}.startsWith({1})");
-        add(Ops.STARTS_WITH_IC, "{0l}.startsWith({1l})");
-        add(Ops.INDEX_OF, "{0}.indexOf({1})");
-        add(Ops.INDEX_OF_2ARGS, "{0}.indexOf({1},{2})");
-        add(Ops.EQ_IGNORE_CASE, "{0}.equalsIgnoreCase({1})");
-        add(Ops.ENDS_WITH, "{0}.endsWith({1})");
-        add(Ops.ENDS_WITH_IC, "{0l}.endsWith({1l})");
-        add(Ops.StringOps.LOCATE, "({1}.indexOf({0})+1)");
-        add(Ops.StringOps.LOCATE2, "({1}.indexOf({0},{2s}-1)+1)");
-
-        // Date and Time
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "{0}.getDayOfMonth()");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "{0}.getDayOfWeek()");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "{0}.getDayOfYear()");
-        add(Ops.DateTimeOps.HOUR, "{0}.getHour()");
-        add(Ops.DateTimeOps.MINUTE, "{0}.getMinute()");
-        add(Ops.DateTimeOps.MONTH, "{0}.getMonth()");
-        add(Ops.DateTimeOps.MILLISECOND, "{0}.getMilliSecond()");
-        add(Ops.DateTimeOps.SECOND, "{0}.getSecond()");
-        add(Ops.DateTimeOps.WEEK, "{0}.getWeek()");
-        add(Ops.DateTimeOps.YEAR, "{0}.getYear()");
-
-        add(Ops.DateTimeOps.YEAR_MONTH, "{0}.getYear() * 100 + {0}.getMonth()");
-
-        // case
-        add(Ops.CASE, "({0})");
-        add(Ops.CASE_WHEN,  "({0}) ? ({1}) : ({2})");
-        add(Ops.CASE_ELSE,  "{0}");
-
-        // case eq
-        add(Ops.CASE_EQ, "({0})");
-        add(Ops.CASE_EQ_WHEN,  "({0} == {1}) ? ({2}) : ({3})");
-        add(Ops.CASE_EQ_ELSE,  "{0}");
-
-        // Math
-        try {
-            for (Field f : Ops.MathOps.class.getFields()) {
-                Operator<?> op = (Operator<?>) f.get(null);
-                add(op, "Math." + getTemplate(op));
-            }
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-        add(Ops.MOD, "{0} % {0}");
-
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/MapExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/MapExpression.java
deleted file mode 100644
index ee7a859196..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/MapExpression.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Map;
-
-/**
- * MapExpression represents {@link java.util.Map} typed expressions
- *
- * @author tiwe
- *
- * @param <K> key type
- * @param <V> value type
- * @see java.util.Map
- */
-public interface MapExpression<K, V> extends ParametrizedExpression<Map<K,V>> {
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/MappingProjection.java b/querydsl-core/src/main/java/com/mysema/query/types/MappingProjection.java
deleted file mode 100644
index 71f30bfae4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/MappingProjection.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.mysema.query.Tuple;
-
-/**
- * Projection template that allows implementing arbitrary mapping of rows to result objects.
- * 
- * <p>Example</p>
- * 
- * <pre>
- * MappingProjection&lt;Pair&lt;String,String&gt;&gt; mapping = new MappingProjection&lt;Pair&lt;String,String&gt;&gt;(Pair.class, str1, str2) {
- *     {@code @Override}
- *     protected Pair&lt;String, String&gt; map(Tuple row) {
- *         return Pair.of(row.get(str1), row.get(str2));
- *     }            
- * }; 
- * </pre>
- *
- * @param <T> expression type
- */
-@Immutable
-public abstract class MappingProjection<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = -948494350919774466L;
-
-    private final QTuple qTuple;
-
-    /**
-     * Create a new MappingProjection instance
-     * 
-     * @param type
-     * @param args
-     */
-    @SuppressWarnings("unchecked")
-    public MappingProjection(Class<? super T> type, Expression<?>... args) {
-        super((Class)type);
-        qTuple = new QTuple(ExpressionUtils.distinctList(args));
-    }
-
-    /**
-     * Create a new MappingProjection instance
-     * 
-     * @param type
-     * @param args
-     */
-    @SuppressWarnings("unchecked")
-    public MappingProjection(Class<? super T> type, Expression<?>[]... args) {
-        super((Class)type);
-        qTuple = new QTuple(ExpressionUtils.distinctList(args));
-    }
-
-    public T newInstance(Object... values) {
-        return map(qTuple.newInstance(values));
-    }
-
-    /**
-     * Creates a result object from the given row.
-     *
-     * @param row The row to map
-     * @return The result object
-     */
-    protected abstract T map(Tuple row);
-
-    public List<Expression<?>> getArgs() {
-        return qTuple.getArgs();
-    }
-
-    public <R, C> R accept(Visitor<R, C> v, @Nullable C context) {
-        return v.visit(this, context);
-    }
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Operation.java b/querydsl-core/src/main/java/com/mysema/query/types/Operation.java
deleted file mode 100644
index 274d3c945e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Operation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.List;
-
-/**
- * Operation represents an operation with operator and arguments
- *
- * @author tiwe
- */
-public interface Operation<T> extends Expression<T> {
-
-    /**
-     * Get the argument with the given index
-     *
-     * @param index
-     * @return
-     */
-    Expression<?> getArg(int index);
-
-    /**
-     * Get the arguments of this operation
-     *
-     * @return
-     */
-    List<Expression<?>> getArgs();
-
-    /**
-     * Get the operator symbol for this operation
-     *
-     * @return
-     */
-    Operator<? super T> getOperator();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java
deleted file mode 100644
index b5ea624fbc..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/OperationImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.lang.reflect.Field;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-
-
-/**
- * OperationImpl is the default implementation of the Operation interface
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@Immutable
-public class OperationImpl<T> extends ExpressionBase<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 4796432056083507588L;
-
-    private final ImmutableList<Expression<?>> args;
-
-    private final Operator<? super T> operator;
-
-    public static <RT> Operation<RT> create(Class<? extends RT> type, Operator<? super RT> operator, Expression<?> one) {
-        return new OperationImpl<RT>(type, operator, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <RT> Operation<RT> create(Class<? extends RT> type, Operator<? super RT> operator, Expression<?> one, Expression<?> two) {
-        return new OperationImpl<RT>(type, operator, ImmutableList.of(one, two));
-    }
-
-    protected OperationImpl(Class<? extends T> type, Operator<? super T> operator, Expression<?>... args) {
-        this(type, operator, ImmutableList.copyOf(args));
-    }
-
-    public OperationImpl(Class<? extends T> type, Operator<? super T> operator, ImmutableList<Expression<?>> args) {
-        super(type);
-        this.operator = operator;
-        this.args = args;
-    }
-
-    @Override
-    public final Expression<?> getArg(int i) {
-        return args.get(i);
-    }
-
-    @Override
-    public final List<Expression<?>> getArgs() {
-        return args;
-    }
-
-    @Override
-    public final Operator<? super T> getOperator() {
-        return operator;
-    }
-
-    @Override
-    public final boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Operation<?>) {
-            Operation<?> op = (Operation<?>)o;
-            return op.getOperator() == operator
-                && op.getArgs().equals(args)
-                && op.getType().equals(getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public final <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    /**
-     * Resets operator field to singleton version
-     *
-     * @param ois
-     * @throws ClassNotFoundException
-     * @throws IOException
-     */
-    private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
-        try {
-            ois.defaultReadObject();
-            Field field = OperationImpl.class.getDeclaredField("operator");
-            field.setAccessible(true);
-            field.set(this, OperatorImpl.OPS.get(operator.getId()));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Operator.java b/querydsl-core/src/main/java/com/mysema/query/types/Operator.java
deleted file mode 100644
index d12e6c68d4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Operator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.Serializable;
-
-/**
- * Operator represents operator symbols
- *
- * @author tiwe
- *
- * @param <T> related expression type
- */
-public interface Operator<T> extends Serializable{
-
-    /**
-     * Get the unique id for this Operator
-     *
-     * @return
-     */
-    String getId();
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/OperatorImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/OperatorImpl.java
deleted file mode 100644
index 808a717675..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/OperatorImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * OperatorImpl is the default implementation of the {@link Operator} interface
- */
-@Immutable
-public final class OperatorImpl<T> implements Operator<T> {
-
-    static final Map<String, Operator<?>> OPS = new HashMap<String, Operator<?>>(150);
-
-    static {
-        try {
-            // initialize all fields of Ops
-            List<Field> fields = new ArrayList<Field>();
-            fields.addAll(Arrays.asList(Ops.class.getFields()));
-            for (Class<?> cl : Ops.class.getClasses()) {
-                fields.addAll(Arrays.asList(cl.getFields()));
-            }
-            for (Field field : fields) {
-                field.get(null);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    private static final long serialVersionUID = -2435035383548549877L;
-
-    private final String id;
-
-    private final int hashCode;
-
-    public OperatorImpl(String ns, String local) {
-        this(ns + "#" + local);
-    }
-
-    private OperatorImpl(String id) {
-        this.id = id;
-        this.hashCode = id.hashCode();
-        OPS.put(id, this);
-    }
-
-    /**
-     * Get the unique id for this Operator
-     *
-     * @return
-     */
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public String toString() {
-        return id;
-    }
-
-    @Override
-    public int hashCode() {
-        return hashCode;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Ops.java b/querydsl-core/src/main/java/com/mysema/query/types/Ops.java
deleted file mode 100644
index 9f5183605e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Ops.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Ops provides the operators for the fluent query grammar.
- *
- * @author tiwe
- */
-public final class Ops {
-
-    private static final String NS = Ops.class.getName();
-
-    // general
-    public static final Operator<Boolean> EQ = new OperatorImpl<Boolean>(NS, "EQ");
-
-    public static final Operator<Boolean> NE = new OperatorImpl<Boolean>(NS, "NE");
-
-    public static final Operator<Boolean> IS_NULL = new OperatorImpl<Boolean>(NS, "IS_NULL");
-
-    public static final Operator<Boolean> IS_NOT_NULL = new OperatorImpl<Boolean>(NS, "IS_NOT_NULL");
-
-    public static final Operator<Boolean> INSTANCE_OF = new OperatorImpl<Boolean>(NS, "INSTANCE_OF");
-
-    public static final Operator<Number>  NUMCAST = new OperatorImpl<Number>(NS, "NUMCAST");
-
-    public static final Operator<String>  STRING_CAST = new OperatorImpl<String>(NS, "STING_CAST");
-
-    public static final Operator<Object>  ALIAS = new OperatorImpl<Object>(NS, "ALIAS");
-
-    public static final Operator<Object>  LIST = new OperatorImpl<Object>(NS, "LIST");
-
-    public static final Operator<Object>  SINGLETON = new OperatorImpl<Object>(NS, "SINGLETON");
-
-    public static final Operator<Integer> ORDINAL = new OperatorImpl<Integer>(NS, "ORDINAL");
-
-    public static final Operator<Object>  WRAPPED = new OperatorImpl<Object>(NS, "WRAPPED");
-
-
-    // collection
-    public static final Operator<Boolean> IN = new OperatorImpl<Boolean>(NS, "IN"); // cmp. contains
-
-    public static final Operator<Boolean> NOT_IN = new OperatorImpl<Boolean>(NS, "NOT_IN");
-
-    public static final Operator<Boolean> COL_IS_EMPTY = new OperatorImpl<Boolean>(NS, "COL_IS_EMPTY");
-
-    public static final Operator<Number>  COL_SIZE = new OperatorImpl<Number>(NS, "COL_SIZE");
-
-
-    // array
-    public static final Operator<Number>  ARRAY_SIZE = new OperatorImpl<Number>(NS, "ARRAY_SIZE");
-
-    // map
-    public static final Operator<Boolean> CONTAINS_KEY = new OperatorImpl<Boolean>(NS, "CONTAINS_KEY");
-
-    public static final Operator<Boolean> CONTAINS_VALUE = new OperatorImpl<Boolean>(NS, "CONTAINS_VALUE");
-
-    public static final Operator<Number>  MAP_SIZE = new OperatorImpl<Number>(NS, "MAP_SIZE");
-
-    public static final Operator<Boolean> MAP_IS_EMPTY = new OperatorImpl<Boolean>(NS, "MAP_IS_EMPTY");
-
-    // Boolean
-    public static final Operator<Boolean> AND = new OperatorImpl<Boolean>(NS, "AND");
-
-    public static final Operator<Boolean> NOT = new OperatorImpl<Boolean>(NS, "NOT");
-
-    public static final Operator<Boolean> OR = new OperatorImpl<Boolean>(NS, "OR");
-
-    public static final Operator<Boolean> XNOR = new OperatorImpl<Boolean>(NS, "XNOR");
-
-    public static final Operator<Boolean> XOR = new OperatorImpl<Boolean>(NS, "XOR");
-
-    // Comparable
-    public static final Operator<Boolean> BETWEEN = new OperatorImpl<Boolean>(NS, "BETWEEN");
-
-    public static final Operator<Boolean> GOE = new OperatorImpl<Boolean>(NS, "GOE");
-
-    public static final Operator<Boolean> GT = new OperatorImpl<Boolean>(NS, "GT");
-
-    public static final Operator<Boolean> LOE = new OperatorImpl<Boolean>(NS, "LOE");
-
-    public static final Operator<Boolean> LT = new OperatorImpl<Boolean>(NS, "LT");
-
-    // Number
-    public static final Operator<Number>  NEGATE = new OperatorImpl<Number>(NS, "NEGATE");
-
-    public static final Operator<Number>  ADD = new OperatorImpl<Number>(NS, "ADD");
-
-    public static final Operator<Number>  DIV = new OperatorImpl<Number>(NS, "DIV");
-
-    public static final Operator<Number>  MULT = new OperatorImpl<Number>(NS, "MULT");
-
-    public static final Operator<Number>  SUB = new OperatorImpl<Number>(NS, "SUB");
-
-    public static final Operator<Number>  MOD = new OperatorImpl<Number>(NS, "MOD");
-
-    // String
-    public static final Operator<Character> CHAR_AT = new OperatorImpl<Character>(NS, "CHAR_AT");
-
-    public static final Operator<String>  CONCAT = new OperatorImpl<String>(NS, "CONCAT");
-
-    public static final Operator<String>  LOWER = new OperatorImpl<String>(NS, "LOWER");
-
-    public static final Operator<String>  SUBSTR_1ARG = new OperatorImpl<String>(NS, "SUBSTR");
-
-    public static final Operator<String>  SUBSTR_2ARGS = new OperatorImpl<String>(NS, "SUBSTR2");
-
-    public static final Operator<String>  TRIM = new OperatorImpl<String>(NS, "TRIM");
-
-    public static final Operator<String>  UPPER = new OperatorImpl<String>(NS, "UPPER");
-
-    public static final Operator<Boolean> MATCHES = new OperatorImpl<Boolean>(NS, "MATCHES");
-
-    public static final Operator<Boolean> MATCHES_IC = new OperatorImpl<Boolean>(NS, "MATCHES_IC");
-
-    public static final Operator<Number>  STRING_LENGTH = new OperatorImpl<Number>(NS, "STRING_LENGTH");
-
-    public static final Operator<Boolean> STRING_IS_EMPTY = new OperatorImpl<Boolean>(NS, "STRING_IS_EMPTY");
-
-    public static final Operator<Boolean> STARTS_WITH = new OperatorImpl<Boolean>(NS, "STARTS_WITH");
-
-    public static final Operator<Boolean> STARTS_WITH_IC = new OperatorImpl<Boolean>(NS, "STATS_WITH_IC");
-
-    public static final Operator<Number>  INDEX_OF_2ARGS = new OperatorImpl<Number>(NS, "INDEX_OF2");
-
-    public static final Operator<Number>  INDEX_OF = new OperatorImpl<Number>(NS, "INDEX_OF");
-
-    public static final Operator<Boolean> EQ_IGNORE_CASE = new OperatorImpl<Boolean>(NS, "EQ_IGNORE_CASE");
-
-    public static final Operator<Boolean> ENDS_WITH = new OperatorImpl<Boolean>(NS, "ENDS_WITH");
-
-    public static final Operator<Boolean> ENDS_WITH_IC = new OperatorImpl<Boolean>(NS, "ENDS_WITH_IC");
-
-    public static final Operator<Boolean> STRING_CONTAINS = new OperatorImpl<Boolean>(NS, "STRING_CONTAINS");
-
-    public static final Operator<Boolean> STRING_CONTAINS_IC = new OperatorImpl<Boolean>(NS, "STRING_CONTAINS_IC");
-
-    public static final Operator<Boolean> LIKE = new OperatorImpl<Boolean>(NS, "LIKE");
-
-    public static final Operator<Boolean> LIKE_ESCAPE = new OperatorImpl<Boolean>(NS, "LIKE_ESCAPE");
-
-    // case
-    public static final Operator<Object>  CASE = new OperatorImpl<Object>(NS, "CASE");
-
-    public static final Operator<Object>  CASE_WHEN = new OperatorImpl<Object>(NS, "CASE_WHEN");
-
-    public static final Operator<Object>  CASE_ELSE = new OperatorImpl<Object>(NS, "CASE_ELSE");
-
-    // case for eq
-    public static final Operator<Object>  CASE_EQ = new OperatorImpl<Object>(NS, "CASE_EQ");
-
-    public static final Operator<Object>  CASE_EQ_WHEN = new OperatorImpl<Object>(NS, "CASE_EQ_WHEN");
-
-    public static final Operator<Object>  CASE_EQ_ELSE = new OperatorImpl<Object>(NS, "CASE_EQ_ELSE");
-
-    // coalesce
-    public static final Operator<Object>  COALESCE = new OperatorImpl<Object>(NS, "COALESCE");
-
-    public static final Operator<Object>  NULLIF = new OperatorImpl<Object>(NS, "NULLIF");
-
-    // subquery operations
-    public static final Operator<Boolean> EXISTS = new OperatorImpl<Boolean>(NS, "EXISTS");
-
-    public static final Set<Operator<?>> equalsOps = ImmutableSet.<Operator<?>>of(EQ);
-
-    public static final Set<Operator<?>> notEqualsOps = ImmutableSet.<Operator<?>>of(NE);
-
-    public static final Set<Operator<?>> compareOps = ImmutableSet.<Operator<?>>of(EQ, NE, LT, GT, GOE, LOE);
-
-    public static final Set<Operator<?>> aggOps = ImmutableSet.of(
-            Ops.AggOps.AVG_AGG,
-            Ops.AggOps.COUNT_AGG,
-            Ops.AggOps.COUNT_DISTINCT_AGG,
-            Ops.AggOps.MAX_AGG,
-            Ops.AggOps.MIN_AGG,
-            Ops.AggOps.SUM_AGG);
-
-    /**
-     * Aggregation operators
-     */
-    @SuppressWarnings("unchecked")
-    public static final class AggOps{
-
-        private static final String NS = AggOps.class.getName();
-
-        public static final Operator<Boolean> BOOLEAN_ALL = new OperatorImpl<Boolean>(NS, "BOOLEAN_ALL");
-
-        public static final Operator<Boolean> BOOLEAN_ANY = new OperatorImpl<Boolean>(NS, "BOOLEAN_ANY");
-
-        public static final Operator<Comparable> MAX_AGG = new OperatorImpl<Comparable>(NS, "MAX_AGG");
-
-        public static final Operator<Comparable> MIN_AGG = new OperatorImpl<Comparable>(NS, "MIN_AGG");
-
-        public static final Operator<Number> AVG_AGG = new OperatorImpl<Number>(NS, "AVG_AGG");
-
-        public static final Operator<Number> SUM_AGG = new OperatorImpl<Number>(NS, "SUM_AGG");
-
-        public static final Operator<Long> COUNT_AGG = new OperatorImpl<Long>(NS, "COUNT_AGG");
-
-        public static final Operator<Long> COUNT_DISTINCT_AGG = new OperatorImpl<Long>(NS, "COUNT_DISTINCT_AGG");
-
-        public static final Operator<Long> COUNT_DISTINCT_ALL_AGG = new OperatorImpl<Long>(NS, "COUNT_DISTINCT_ALL_AGG");
-
-        public static final Operator<Long> COUNT_ALL_AGG = new OperatorImpl<Long>(NS, "COUNT_ALL_AGG");
-
-        private AggOps() {}
-    }
-
-    /**
-     * Quantification operators
-     */
-    @SuppressWarnings("unchecked")
-    public static final class QuantOps {
-
-        private static final String NS = QuantOps.class.getName();
-
-        public static final Operator<Comparable> AVG_IN_COL = new OperatorImpl<Comparable>(NS, "AVG_IN_COL");
-
-        public static final Operator<Comparable> MAX_IN_COL = new OperatorImpl<Comparable>(NS, "MAX_IN_COL");
-
-        public static final Operator<Comparable> MIN_IN_COL = new OperatorImpl<Comparable>(NS, "MIN_IN_COL");
-
-        public static final Operator<Object> ANY = new OperatorImpl<Object>(NS, "ANY");
-
-        public static final Operator<Object> ALL = new OperatorImpl<Object>(NS, "ALL");
-
-        private QuantOps() {}
-    }
-
-    /**
-     * Date and time operators
-     */
-    @SuppressWarnings("unchecked")
-    public static final class DateTimeOps {
-
-        private static final String NS = DateTimeOps.class.getName();
-
-        public static final Operator<Comparable> DATE = new OperatorImpl<Comparable>(NS, "DATE");
-
-        public static final Operator<Comparable> CURRENT_DATE = new OperatorImpl<Comparable>(NS, "CURRENT_DATE");
-
-        public static final Operator<Comparable> CURRENT_TIME = new OperatorImpl<Comparable>(NS, "CURRENT_TIME");
-
-        public static final Operator<Comparable> CURRENT_TIMESTAMP = new OperatorImpl<Comparable>(NS, "CURRENT_TIMESTAMP");
-
-        public static final Operator<Comparable> ADD_YEARS = new OperatorImpl<Comparable>(NS, "ADD_YEARS");
-
-        public static final Operator<Comparable> ADD_MONTHS = new OperatorImpl<Comparable>(NS, "ADD_MONTHS");
-
-        public static final Operator<Comparable> ADD_WEEKS = new OperatorImpl<Comparable>(NS, "ADD_WEEKS");
-
-        public static final Operator<Comparable> ADD_DAYS = new OperatorImpl<Comparable>(NS, "ADD_DAYS");
-
-        public static final Operator<Comparable> ADD_HOURS = new OperatorImpl<Comparable>(NS, "ADD_HOURS");
-
-        public static final Operator<Comparable> ADD_MINUTES = new OperatorImpl<Comparable>(NS, "ADD_MINUTES");
-
-        public static final Operator<Comparable> ADD_SECONDS = new OperatorImpl<Comparable>(NS, "ADD_SECONDS");
-
-        public static final Operator<Comparable> DIFF_YEARS = new OperatorImpl<Comparable>(NS, "DIFF_YEARS");
-
-        public static final Operator<Comparable> DIFF_MONTHS = new OperatorImpl<Comparable>(NS, "DIFF_MONTHS");
-
-        public static final Operator<Comparable> DIFF_WEEKS = new OperatorImpl<Comparable>(NS, "DIFF_WEEKS");
-
-        public static final Operator<Comparable> DIFF_DAYS = new OperatorImpl<Comparable>(NS, "DIFF_DAYS");
-
-        public static final Operator<Comparable> DIFF_HOURS = new OperatorImpl<Comparable>(NS, "DIFF_HOURS");
-
-        public static final Operator<Comparable> DIFF_MINUTES = new OperatorImpl<Comparable>(NS, "DIFF_MINUTES");
-
-        public static final Operator<Comparable> DIFF_SECONDS = new OperatorImpl<Comparable>(NS, "DIFF_SECONDS");
-
-        public static final Operator<Comparable> TRUNC_YEAR = new OperatorImpl<Comparable>(NS, "TRUNC_YEAR");
-
-        public static final Operator<Comparable> TRUNC_MONTH = new OperatorImpl<Comparable>(NS, "TRUNC_MONTH");
-
-        public static final Operator<Comparable> TRUNC_WEEK = new OperatorImpl<Comparable>(NS, "TRUNC_WEEK");
-
-        public static final Operator<Comparable> TRUNC_DAY = new OperatorImpl<Comparable>(NS, "TRUNC_DAY");
-
-        public static final Operator<Comparable> TRUNC_HOUR = new OperatorImpl<Comparable>(NS, "TRUNC_HOUR");
-
-        public static final Operator<Comparable> TRUNC_MINUTE = new OperatorImpl<Comparable>(NS, "TRUNC_MINUTE");
-
-        public static final Operator<Comparable> TRUNC_SECOND = new OperatorImpl<Comparable>(NS, "TRUNC_SECOND");
-
-        public static final Operator<Integer> HOUR = new OperatorImpl<Integer>(NS, "HOUR");
-
-        public static final Operator<Integer> MINUTE = new OperatorImpl<Integer>(NS, "MINUTE");
-
-        public static final Operator<Integer> MONTH = new OperatorImpl<Integer>(NS, "MONTH");
-
-        public static final Operator<Integer> SECOND = new OperatorImpl<Integer>(NS, "SECOND");
-
-        public static final Operator<Integer> MILLISECOND = new OperatorImpl<Integer>(NS, "MILLISECOND");
-
-        public static final Operator<Comparable> SYSDATE = new OperatorImpl<Comparable>(NS, "SYSDATE");
-
-        public static final Operator<Integer> YEAR = new OperatorImpl<Integer>(NS, "YEAR");
-
-        public static final Operator<Integer> WEEK = new OperatorImpl<Integer>(NS, "WEEK");
-
-        public static final Operator<Integer> YEAR_MONTH = new OperatorImpl<Integer>(NS, "YEAR_MONTH");
-
-        public static final Operator<Integer> YEAR_WEEK = new OperatorImpl<Integer>(NS, "YEAR_WEEK");
-
-        public static final Operator<Integer> DAY_OF_WEEK = new OperatorImpl<Integer>(NS, "DAY_OF_WEEK");
-
-        public static final Operator<Integer> DAY_OF_MONTH = new OperatorImpl<Integer>(NS, "DAY_OF_MONTH");
-
-        public static final Operator<Integer> DAY_OF_YEAR = new OperatorImpl<Integer>(NS, "DAY_OF_YEAR");
-
-        private DateTimeOps() {}
-    }
-
-    /**
-     * Math operators
-     *
-     */
-    public static final class MathOps {
-
-        private static final String NS = MathOps.class.getName();
-
-        public static final Operator<Number> ABS = new OperatorImpl<Number>(NS, "ABS");
-
-        public static final Operator<Number> ACOS = new OperatorImpl<Number>(NS, "ACOS");
-
-        public static final Operator<Number> ASIN = new OperatorImpl<Number>(NS, "ASIN");
-
-        public static final Operator<Number> ATAN = new OperatorImpl<Number>(NS, "ATAN");
-
-        public static final Operator<Number> CEIL = new OperatorImpl<Number>(NS, "CEIL");
-
-        public static final Operator<Number> COS = new OperatorImpl<Number>(NS, "COS");
-
-        public static final Operator<Number> TAN = new OperatorImpl<Number>(NS, "TAN");
-
-        public static final Operator<Number> SQRT = new OperatorImpl<Number>(NS, "SQRT");
-
-        public static final Operator<Number> SIN = new OperatorImpl<Number>(NS, "SIN");
-
-        public static final Operator<Number> ROUND = new OperatorImpl<Number>(NS, "ROUND");
-
-        public static final Operator<Number> ROUND2 = new OperatorImpl<Number>(NS, "ROUND");
-
-        public static final Operator<Number> RANDOM = new OperatorImpl<Number>(NS, "RANDOM");
-
-        public static final Operator<Number> RANDOM2 = new OperatorImpl<Number>(NS, "RANDOM2");
-
-        public static final Operator<Number> POWER = new OperatorImpl<Number>(NS, "POWER");
-
-        public static final Operator<Number> MIN = new OperatorImpl<Number>(NS, "MIN");
-
-        public static final Operator<Number> MAX = new OperatorImpl<Number>(NS, "MAX");
-
-        public static final Operator<Number> LOG = new OperatorImpl<Number>(NS, "LOG");
-
-        public static final Operator<Number> FLOOR = new OperatorImpl<Number>(NS, "FLOOR");
-
-        public static final Operator<Number> EXP = new OperatorImpl<Number>(NS, "EXP");
-
-        public static final Operator<Number> COSH = new OperatorImpl<Number>(NS, "COSH");
-
-        public static final Operator<Number> COT = new OperatorImpl<Number>(NS, "COT");
-
-        public static final Operator<Number> COTH = new OperatorImpl<Number>(NS, "COTH");
-
-        public static final Operator<Number> DEG = new OperatorImpl<Number>(NS, "DEG");
-
-        public static final Operator<Number> LN = new OperatorImpl<Number>(NS, "LN");
-
-        public static final Operator<Number> RAD = new OperatorImpl<Number>(NS, "RAD");
-
-        public static final Operator<Number> SIGN = new OperatorImpl<Number>(NS, "SIGN");
-
-        public static final Operator<Number> SINH = new OperatorImpl<Number>(NS, "SINH");
-
-        public static final Operator<Number> TANH = new OperatorImpl<Number>(NS, "TANH");
-
-        private MathOps() {}
-    }
-
-    /**
-     * String operators
-     */
-    public static final class StringOps {
-
-        private static final String NS = StringOps.class.getName();
-
-        public static final Operator<String> LEFT = new OperatorImpl<String>(NS, "LEFT");
-
-        public static final Operator<String> RIGHT = new OperatorImpl<String>(NS, "RIGHT");
-
-        public static final Operator<String> LTRIM = new OperatorImpl<String>(NS, "LTRIM");
-
-        public static final Operator<String> RTRIM = new OperatorImpl<String>(NS, "RTRIM");
-
-        public static final Operator<String> LPAD = new OperatorImpl<String>(NS, "LPAD");
-
-        public static final Operator<String> RPAD = new OperatorImpl<String>(NS, "RPAD");
-
-        public static final Operator<String> LPAD2 = new OperatorImpl<String>(NS, "LPAD2");
-
-        public static final Operator<String> RPAD2 = new OperatorImpl<String>(NS, "RPAD2");
-
-        public static final Operator<Number> LOCATE = new OperatorImpl<Number>(NS, "LOCATE");
-
-        public static final Operator<Number> LOCATE2 = new OperatorImpl<Number>(NS, "LOCATE2");
-
-        private StringOps() {}
-    }
-
-    private Ops() {}
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Order.java b/querydsl-core/src/main/java/com/mysema/query/types/Order.java
deleted file mode 100644
index c659d18a16..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Order.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-/**
- * Order defines ascending and descending order
- *
- * @author tiwe
- */
-public enum Order {
-    /**
-     * Ascending order
-     */
-    ASC,
-    /**
-     * Descending order
-     */
-    DESC;
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java
deleted file mode 100644
index 71e6b943db..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-/**
- * ParamExpression defines named and unnamed parameters in queries
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public interface ParamExpression<T> extends Expression<T> {
-
-    /**
-     * Get the name of the parameter
-     *
-     * @return
-     */
-    String getName();
-
-    /**
-     * @return
-     */
-    boolean isAnon();
-
-    /**
-     * @return
-     */
-    String getNotSetMessage();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java b/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java
deleted file mode 100644
index 2a2e88489c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-
-/**
- * @author tiwe
- *
- */
-public class ParamNotSetException extends RuntimeException{
-
-    private static final long serialVersionUID = 2019016965590576490L;
-
-    public ParamNotSetException(ParamExpression<?> param) {
-        super(param.getNotSetMessage());
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParametrizedExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ParametrizedExpression.java
deleted file mode 100644
index f068492815..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParametrizedExpression.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-/**
- * ParametrizedExpression is a common interface for expressions with generic type parameters
- * 
- * @author tiwe
- *
- * @param <T> expression type
- */
-public interface ParametrizedExpression<T> extends Expression<T> {
-
-    /**
-     * @param index
-     * @return
-     */
-    Class<?> getParameter(int index);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Path.java b/querydsl-core/src/main/java/com/mysema/query/types/Path.java
deleted file mode 100644
index 1801f05672..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Path.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.lang.reflect.AnnotatedElement;
-
-/**
- * Path represents a path expression. Paths refer to variables, properties and collection members access.
- * 
- * @author tiwe
- */
-public interface Path<T> extends Expression<T> {
-
-    /**
-     * Get the metadata for this path
-     *
-     * @return
-     */
-    PathMetadata<?> getMetadata();
-
-    /**
-     * Get the root for this path
-     *
-     * @return
-     */
-    Path<?> getRoot();
-
-    /**
-     * Return the annotated element related to the given path
-     * <p>For property paths the annotated element contains the annotations of the
-     * related field and/or getter method and for all others paths the annotated element
-     * is the expression type.</p>
-     *
-     * @return
-     */
-    AnnotatedElement getAnnotatedElement();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java
deleted file mode 100644
index 8461b245f4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.base.Objects;
-
-/**
- * PathMetadata provides metadata for {@link Path} expressions.
- *
- * @author tiwe
- */
-@Immutable
-public final class PathMetadata<T> implements Serializable{
-
-    private static final long serialVersionUID = -1055994185028970065L;
-
-    private final Object element;
-
-    private final int hashCode;
-
-    @Nullable
-    private final Path<?> parent, root;
-
-    private final PathType pathType;
-
-    public PathMetadata(@Nullable Path<?> parent, Object element, PathType type) {
-        this.parent = parent;
-        this.element = element;
-        this.pathType = type;
-        this.hashCode = 31 * element.hashCode() + pathType.hashCode();
-        this.root = parent != null ? parent.getRoot() : null;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof PathMetadata<?>) {
-            PathMetadata<?> p = (PathMetadata<?>) obj;
-            return element.equals(p.element) &&
-                    pathType == p.pathType &&
-                    Objects.equal(parent, p.parent);
-        } else {
-            return false;
-        }
-
-    }
-
-    public Object getElement() {
-        return element;
-    }
-
-    public String getName() {
-        if (pathType == PathType.VARIABLE || pathType == PathType.PROPERTY) {
-            return (String)element;
-        } else {
-            throw new IllegalStateException("name property not available for path of type " + pathType +
-                    ". Use getElement() to access the generic path element.");
-        }
-    }
-
-    @Nullable
-    public Path<?> getParent() {
-        return parent;
-    }
-
-    public PathType getPathType() {
-        return pathType;
-    }
-
-    @Nullable
-    public Path<?> getRoot() {
-        return root;
-    }
-
-    @Override
-    public int hashCode() {
-        return hashCode;
-    }
-
-    public boolean isRoot() {
-        return parent == null || (pathType == PathType.DELEGATE && parent.getMetadata().isRoot());
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java
deleted file mode 100644
index f42822de36..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nonnegative;
-
-/**
- * PathMetadataFactory is a factory class for {@link Path} construction
- * 
- * @author tiwe
- *
- */
-public final class PathMetadataFactory {
-
-    /**
-     * Create a new PathMetadata for indexed array access
-     * 
-     * @param parent
-     * @param index
-     * @return
-     */
-    public static PathMetadata<Integer> forArrayAccess(Path<?> parent, Expression<Integer> index) {
-        return new PathMetadata<Integer>(parent, index, PathType.ARRAYVALUE);
-    }
-
-    /**
-     * Create a new PathMetadata for indexed array access
-     * 
-     * @param parent
-     * @param index
-     * @return
-     */
-    public static PathMetadata<Integer> forArrayAccess(Path<?> parent, @Nonnegative int index) {
-        return new PathMetadata<Integer>(parent, index, PathType.ARRAYVALUE_CONSTANT);
-    }
-    
-    /**
-     * Create a new PathMetadata for collection any access
-     * 
-     * @param parent
-     * @return
-     */
-    public static PathMetadata<?> forCollectionAny(Path<?> parent) {
-        return new PathMetadata<String>(parent, "", PathType.COLLECTION_ANY);
-    }
-
-    /**
-     * Create a new PathMetadata for delegate access
-     * 
-     * @param delegate
-     * @return
-     */
-    public static <T> PathMetadata<T> forDelegate(Path<T> delegate) {
-        return new PathMetadata<T>(delegate, delegate, PathType.DELEGATE);
-    }
-    
-    /**
-     * Create a new PathMetadata for indexed list access
-     * 
-     * @param parent
-     * @param index
-     * @return
-     */
-    public static PathMetadata<Integer> forListAccess(Path<?> parent, Expression<Integer> index) {
-        return new PathMetadata<Integer>(parent, index, PathType.LISTVALUE);
-    }
-
-    /**
-     * Create a new PathMetadata for indexed list access
-     * 
-     * @param parent
-     * @param index
-     * @return
-     */
-    public static PathMetadata<Integer> forListAccess(Path<?> parent, @Nonnegative int index) {
-        return new PathMetadata<Integer>(parent, index, PathType.LISTVALUE_CONSTANT);
-    }
-
-    /**
-     * Create a new PathMetadata for key based map access
-     * 
-     * @param parent
-     * @param key
-     * @return
-     */
-    public static <KT> PathMetadata<KT> forMapAccess(Path<?> parent, Expression<KT> key) {
-        return new PathMetadata<KT>(parent, key, PathType.MAPVALUE);
-    }
-
-    /**
-     * Create a new PathMetadata for for key based map access
-     * 
-     * @param parent
-     * @param key
-     * @return
-     */
-    public static <KT> PathMetadata<KT> forMapAccess(Path<?> parent, KT key) {
-        return new PathMetadata<KT>(parent, key, PathType.MAPVALUE_CONSTANT);
-    }
-
-    /**
-     * Create a new PathMetadata for property access
-     * 
-     * @param parent
-     * @param property
-     * @return
-     */
-    public static PathMetadata<String> forProperty(Path<?> parent, String property) {
-        return new PathMetadata<String>(parent, property, PathType.PROPERTY);
-    }
-
-    /**
-     * Create a new PathMetadata for a variable
-     * 
-     * @param variable
-     * @return
-     */
-    public static PathMetadata<String> forVariable(String variable) {
-        return new PathMetadata<String>(null, variable, PathType.VARIABLE);
-    }
-
-    private PathMetadataFactory() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java
deleted file mode 100644
index 2374b8d0c3..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/PredicateOperation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * PredicateOperation provides a Boolean typed Operation implementation 
- * 
- * @author tiwe
- *
- */
-@Immutable
-public final class PredicateOperation extends OperationImpl<Boolean> implements Predicate{
-    
-    private static final long serialVersionUID = -5371430939203772072L;
-
-    @Nullable
-    private volatile Predicate not;
-    
-    public static PredicateOperation create(Operator<Boolean> operator, Expression<?> one) {
-        return new PredicateOperation(operator, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static PredicateOperation create(Operator<Boolean> operator, Expression<?> one, Expression<?> two) {
-        return new PredicateOperation(operator, ImmutableList.of(one, two));
-    }
-    
-    public PredicateOperation(Operator<Boolean> operator, ImmutableList<Expression<?>> args) {
-        super(Boolean.class, operator, args);
-    }
-    
-    @Override
-    public Predicate not() {
-        if (not == null) {
-            not = PredicateOperation.create(Ops.NOT, this);
-        }
-        return not;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PredicateTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/PredicateTemplate.java
deleted file mode 100644
index 6593117153..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/PredicateTemplate.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * PredicateTemplate provides a Boolean typed TemplateExpression implementation 
- * 
- * @author tiwe
- *
- */
-@Immutable
-public class PredicateTemplate extends TemplateExpressionImpl<Boolean> implements Predicate{
-    
-    private static final long serialVersionUID = -5371430939203772072L;
-
-    @Nullable
-    private volatile Predicate not;
-    
-    public PredicateTemplate(String template, Object... args) {
-        super(Boolean.class, TemplateFactory.DEFAULT.create(template), args);
-    }
-    
-    public PredicateTemplate(Template template, Object... args) {
-        super(Boolean.class, template, args);
-    }
-
-    public PredicateTemplate(Template template, ImmutableList<?> args) {
-        super(Boolean.class, template, args);
-    }
-    
-    @Override
-    public Predicate not() {
-        if (not == null) {
-            not = PredicateOperation.create(Ops.NOT, this);
-        }
-        return not;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ProjectionRole.java b/querydsl-core/src/main/java/com/mysema/query/types/ProjectionRole.java
deleted file mode 100644
index 573ef870b2..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/ProjectionRole.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-/**
- * Defines a custom projection for an Expression type. This interface can be used for Expressions which 
- * behave in a different way when used as part of the projection.
- * 
- * <p>Usually FactoryExpression instances are used as the custom projection.</p>
- * 
- * @author tiwe
- *
- */
-public interface ProjectionRole<T> {
-
-    /**
-     * Return the custom projection
-     * 
-     * @return
-     */
-    Expression<T> getProjection();
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Projections.java b/querydsl-core/src/main/java/com/mysema/query/types/Projections.java
deleted file mode 100644
index 0ab82db583..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Projections.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-/**
- * Factory class for FactoryExpression instances
- * 
- * @author tiwe
- *
- */
-public final class Projections {
-
-    /**
-     * Create a typed array projection for the given type and expressions
-     * 
-     * @param <T> 
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> ArrayConstructorExpression<T> array(Class<T[]> type, Expression<T>... exprs) {
-        return new ArrayConstructorExpression<T>(type, exprs);
-    }
-    
-    /**
-     * Create a Bean populating projection for the given type and expressions
-     * 
-     * <p>Example</p>
-     * <pre>
-     * UserDTO dto = query.singleResult(
-     *     Projections.bean(UserDTO.class, user.firstName, user.lastName));
-     * </pre>
-     * 
-     * @param <T>
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> QBean<T> bean(Class<T> type, Expression<?>... exprs) {
-        return new QBean<T>(type, exprs);
-    }
-    
-    /**
-     * Create a Bean populating projection for the given type and expressions
-     * 
-     * @param <T>
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> QBean<T> bean(Path<T> type, Expression<?>... exprs) {
-        return new QBean<T>(type, exprs);
-    }
-    
-    /**
-     * Create a constructor invocation projection for the given type and expressions
-     * 
-     * <p>Example</p>
-     * <pre>
-     * UserDTO dto = query.singleResult(
-     *     Projections.constructor(UserDTO.class, user.firstName, user.lastName));
-     * </pre>
-     * 
-     * @param <T>
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> ConstructorExpression<T> constructor(Class<T> type, Expression<?>... exprs) {
-        return ConstructorExpression.create(type, exprs);
-    }
-    
-    /**
-     * Create a field access based Bean populating projection for the given type and expressions
-     * 
-     * <p>Example</p>
-     * <pre>
-     * UserDTO dto = query.singleResult(
-     *     Projections.fields(UserDTO.class, user.firstName, user.lastName));
-     * </pre>
-     * 
-     * @param <T>
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> QBean<T> fields(Class<T> type, Expression<?>... exprs) {
-        return new QBean<T>(type, true, exprs);
-    }
-    
-    /**
-     * Create a field access based Bean populating projection for the given type and expressions
-     * 
-     * @param <T>
-     * @param type type of the projection
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static <T> QBean<T> fields(Path<T> type, Expression<?>... exprs) {
-        return new QBean<T>(type, true, exprs);
-    }
-    
-    /**
-     * Create a Map typed projection for the given expressions
-     * 
-     * <p>Example</p>
-     * <pre>
-     * Map&lt;Expression&lt;?&gt;, ?&gt; map = query.singleResult(
-     *     Projections.map(user.firstName, user.lastName);     
-     * </pre>
-     * 
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static QMap map(Expression<?>... exprs) {
-        return new QMap(exprs);
-    }
-    
-    /**
-     * Create a Tuple typed projection for the given expressions
-     * 
-     * @param exprs arguments for the projection
-     * @return
-     */
-    public static QTuple tuple(Expression<?>... exprs) {
-        return new QTuple(exprs);
-    }
-    
-    private Projections() {}
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/QBean.java b/querydsl-core/src/main/java/com/mysema/query/types/QBean.java
deleted file mode 100644
index 958249023c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/QBean.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.primitives.Primitives;
-
-/**
- * QBean is a JavaBean populating projection type
- *
- * <p>Example</p>
- *
- * <pre>
- * {@code
- * QEmployee employee = QEmployee.employee;
- * List<EmployeeInfo> result = query.from(employee)
- *      .where(employee.valid.eq(true))
- *      .list(new QBean<EmployeeInfo>(EmployeeInfo.class, employee.firstName, employee.lastName));
- * }
- * </pre>
- *
- * @author tiwe
- *
- * @param <T> bean type
- */
-public class QBean<T> extends ExpressionBase<T> implements FactoryExpression<T> {
-
-    private static final long serialVersionUID = -8210214512730989778L;
-
-    private static ImmutableMap<String,Expression<?>> createBindings(Expression<?>... args) {
-        ImmutableMap.Builder<String, Expression<?>> rv = ImmutableMap.builder();
-        for (Expression<?> expr : args) {
-            if (expr instanceof Path<?>) {
-                Path<?> path = (Path<?>)expr;
-                rv.put(path.getMetadata().getName(), expr);
-            } else if (expr instanceof Operation<?>) {
-                Operation<?> operation = (Operation<?>)expr;
-                if (operation.getOperator() == Ops.ALIAS && operation.getArg(1) instanceof Path<?>) {
-                    Path<?> path = (Path<?>)operation.getArg(1);
-                    rv.put(path.getMetadata().getName(), operation.getArg(0));
-                } else {
-                    throw new IllegalArgumentException("Unsupported expression " + expr);
-                }
-
-            } else {
-                throw new IllegalArgumentException("Unsupported expression " + expr);
-            }
-        }
-        return rv.build();
-    }
-
-    private static Class<?> normalize(Class<?> cl) {
-        return cl.isPrimitive() ? Primitives.wrap(cl) : cl;
-    }
-
-    private final ImmutableMap<String, Expression<?>> bindings;
-
-    private final List<Field> fields;
-
-    private final List<Method> setters;
-
-    private final boolean fieldAccess;
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param args
-     */
-    @SuppressWarnings("unchecked")
-    public QBean(Path<T> type, Expression<?>... args) {
-        this((Class)type.getType(), false, args);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param bindings
-     */
-    @SuppressWarnings("unchecked")
-    public QBean(Path<T> type, Map<String, ? extends Expression<?>> bindings) {
-        this((Class)type.getType(), false, bindings);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param fieldAccess
-     * @param args
-     */
-    @SuppressWarnings("unchecked")
-    public QBean(Path<T> type, boolean fieldAccess, Expression<?>... args) {
-        this((Class)type.getType(), fieldAccess, args);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param fieldAccess
-     * @param bindings
-     */
-    @SuppressWarnings("unchecked")
-    public QBean(Path<T> type, boolean fieldAccess, Map<String, ? extends Expression<?>> bindings) {
-        this((Class)type.getType(), fieldAccess, bindings);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param bindings
-     */
-    public QBean(Class<T> type, Map<String, ? extends Expression<?>> bindings) {
-        this(type, false, bindings);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param args
-     */
-    public QBean(Class<T> type, Expression<?>... args) {
-        this(type, false, args);
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param fieldAccess
-     * @param args
-     */
-    public QBean(Class<T> type, boolean fieldAccess, Expression<?>... args) {
-        this(type, fieldAccess, createBindings(args));
-    }
-
-    /**
-     * Create a new QBean instance
-     *
-     * @param type
-     * @param fieldAccess
-     * @param bindings
-     */
-    public QBean(Class<T> type, boolean fieldAccess, Map<String, ? extends Expression<?>> bindings) {
-        super(type);
-        this.bindings = ImmutableMap.copyOf(bindings);
-        this.fieldAccess = fieldAccess;
-        if (fieldAccess) {
-            this.fields = initFields(bindings);
-            this.setters = ImmutableList.of();
-        } else {
-            this.fields = ImmutableList.of();
-            this.setters = initMethods(bindings);
-        }
-    }
-
-    private List<Field> initFields(Map<String, ? extends Expression<?>> args) {
-        List<Field> fields = new ArrayList<Field>(args.size());
-        for (Map.Entry<String,? extends Expression<?>> entry : args.entrySet()) {
-            String property = entry.getKey();
-            Expression<?> expr = entry.getValue();
-            Class<?> beanType = getType();
-            Field field = null;
-            while (!beanType.equals(Object.class)) {
-                try {
-                    field = beanType.getDeclaredField(property);
-                    field.setAccessible(true);
-                    if (!normalize(field.getType()).isAssignableFrom(expr.getType())) {
-                        typeMismatch(field.getType(), expr);
-                    }
-                    beanType = Object.class;
-                } catch (SecurityException e) {
-                    // do nothing
-                } catch (NoSuchFieldException e) {
-                    beanType = beanType.getSuperclass();
-                }
-            }
-            if (field == null) {
-                propertyNotFound(expr, property);
-            }
-            fields.add(field);
-        }
-        return fields;
-    }
-
-    private List<Method> initMethods(Map<String, ? extends Expression<?>> args) {
-        try {
-            List<Method> methods = new ArrayList<Method>(args.size());
-            BeanInfo beanInfo = Introspector.getBeanInfo(getType());
-            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-            for (Map.Entry<String, ? extends Expression<?>> entry : args.entrySet()) {
-                String property = entry.getKey();
-                Expression<?> expr = entry.getValue();
-                Method setter = null;
-                for (PropertyDescriptor prop : propertyDescriptors) {
-                    if (prop.getName().equals(property)) {
-                        setter = prop.getWriteMethod();
-                        if (!normalize(prop.getPropertyType()).isAssignableFrom(expr.getType())) {
-                            typeMismatch(prop.getPropertyType(), expr);
-                        }
-                        break;
-                    }
-                }
-                if (setter == null) {
-                    propertyNotFound(expr, property);
-                }
-                methods.add(setter);
-            }
-            return methods;
-        } catch (IntrospectionException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    protected void propertyNotFound(Expression<?> expr, String property) {
-        // do nothing
-    }
-
-    protected void typeMismatch(Class<?> type, Expression<?> expr) {
-        final String msg = expr.getType().getName() + " is not compatible with " + type.getName();
-        throw new IllegalArgumentException(msg);
-    }
-
-    @Override
-    public T newInstance(Object... a) {
-        try {
-            T rv = create(getType());
-            if (fieldAccess) {
-                for (int i = 0; i < a.length; i++) {
-                    Object value = a[i];
-                    if (value != null) {
-                        Field field = fields.get(i);
-                        if (field != null) field.set(rv, value);
-                    }
-                }
-            } else {
-                for (int i = 0; i < a.length; i++) {
-                    Object value = a[i];
-                    if (value != null) {
-                        Method setter = setters.get(i);
-                        if (setter != null) setter.invoke(rv, value);
-                    }
-                }
-            }
-            return rv;
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        }
-    }
-
-    protected <T> T create(Class<T> type) throws IllegalAccessException, InstantiationException {
-        return type.newInstance();
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Expression<T> as(Path<T> alias) {
-        return OperationImpl.create(getType(),Ops.ALIAS, this, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public Expression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof QBean<?>) {
-            QBean<?> c = (QBean<?>)obj;
-            return getArgs().equals(c.getArgs()) && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return bindings.values().asList();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/QList.java b/querydsl-core/src/main/java/com/mysema/query/types/QList.java
deleted file mode 100644
index 94fd5284b9..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/QList.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * QList represents a projection of type List
- *
- * @author tiwe
- *
- */
-public class QList extends ExpressionBase<List<?>> implements FactoryExpression<List<?>> {
-
-    private static final long serialVersionUID = -7545994090073480810L;
-
-    private final ImmutableList<Expression<?>> args;
-
-    /**
-     * Create a new QList instance
-     *
-     * @param args
-     */
-    public QList(Expression<?>... args) {
-        super((Class)List.class);
-        this.args = ImmutableList.copyOf(args);
-    }
-
-    /**
-     * Create a new QList instance
-     *
-     * @param args
-     */
-    public QList(ImmutableList<Expression<?>> args) {
-        super((Class)List.class);
-        this.args = args;
-    }
-
-    /**
-     * Create a new QMap instance
-     *
-     * @param args
-     */
-    public QList(Expression<?>[]... args) {
-        super((Class)List.class);
-        ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        for (Expression<?>[] exprs: args) {
-            builder.add(exprs);
-        }
-        this.args = builder.build();
-    }
-
-    @Override
-    @Nullable
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return args;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof FactoryExpression) {
-            FactoryExpression<?> c = (FactoryExpression<?>)obj;
-            return args.equals(c.getArgs()) && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    @Nullable
-    public List<?> newInstance(Object... args) {
-        return Collections.unmodifiableList(Arrays.asList(args));
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/QMap.java b/querydsl-core/src/main/java/com/mysema/query/types/QMap.java
deleted file mode 100644
index f5d837f3e2..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/QMap.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-
-/**
- * QMap represents a projection of type Map
- * 
- * <p>Usage example</p>
- * <pre>
- * {@code 
- * List<Map<Expression<?>,?> result = query.from(employee).list(new QMap(employee.firstName, employee.lastName));
- * for (Tuple row : result) {
- *     System.out.println("firstName " + row.get(employee.firstName));
- *     System.out.println("lastName " + row.get(employee.lastName)); 
- * }
- * } 
- * </pre>
- * 
- * @author tiwe
- *
- */
-public class QMap extends ExpressionBase<Map<Expression<?>,?>> implements FactoryExpression<Map<Expression<?>,?>>{
-
-    private static final long serialVersionUID = -7545994090073480810L;
-
-    private final ImmutableList<Expression<?>> args;
-    
-    /**
-     * Create a new QMap instance
-     * 
-     * @param args
-     */
-    public QMap(Expression<?>... args) {
-        super((Class)Map.class);
-        this.args = ImmutableList.copyOf(args);
-    }
-    
-    /**
-     * Create a new QMap instance
-     * 
-     * @param args
-     */
-    public QMap(ImmutableList<Expression<?>> args) {
-        super((Class)Map.class);
-        this.args = args;
-    }
-    
-    /**
-     * Create a new QMap instance
-     * 
-     * @param args
-     */
-    public QMap(Expression<?>[]... args) {
-        super((Class)Map.class);
-        ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        for (Expression<?>[] exprs: args) {
-            builder.add(exprs);
-        }
-        this.args = builder.build();
-    }
-
-    @Override
-    @Nullable
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return args;
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof FactoryExpression) {
-            FactoryExpression<?> c = (FactoryExpression<?>)obj;
-            return args.equals(c.getArgs()) && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    @Nullable
-    public Map<Expression<?>, ?> newInstance(Object... args) {
-        Map<Expression<?>, Object> map = Maps.newHashMap();
-        for (int i = 0; i < args.length; i++) {
-            map.put(this.args.get(i), args[i]);
-        }
-        return map;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/QTuple.java b/querydsl-core/src/main/java/com/mysema/query/types/QTuple.java
deleted file mode 100644
index 6a994fc653..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/QTuple.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.mysema.query.Tuple;
-
-/**
- * QTuple represents a projection of type Tuple
- *
- * <p>Usage example:</p>
- * <pre>
- * {@code
- * List<Tuple> result = query.from(employee).list(new QTuple(employee.firstName, employee.lastName));
- * for (Tuple row : result) {
- *     System.out.println("firstName " + row.get(employee.firstName));
- *     System.out.println("lastName " + row.get(employee.lastName));
- * }}
- * </pre>
- *
- * <p>Since Tuple projection is the default for multi column projections, the above is equivalent to this code</p>
- *
- * <pre>
- * {@code
- * List<Tuple> result = query.from(employee).list(employee.firstName, employee.lastName);
- * for (Tuple row : result) {
- *     System.out.println("firstName " + row.get(employee.firstName));
- *     System.out.println("lastName " + row.get(employee.lastName));
- * }}
- * </pre>
- *
- * @author tiwe
- *
- */
-@Immutable
-public class QTuple extends ExpressionBase<Tuple> implements FactoryExpression<Tuple> {
-
-    private static ImmutableMap<Expression<?>, Integer> createBindings(List<Expression<?>> exprs) {
-        Map<Expression<?>, Integer> map = Maps.newHashMap();
-        for (int i = 0; i < exprs.size(); i++) {
-            Expression<?> e = exprs.get(i);
-            if (e instanceof Operation && ((Operation<?>)e).getOperator() == Ops.ALIAS) {
-                map.put(((Operation<?>)e).getArg(1), i);
-            }
-            map.put(e, i);
-        }
-        return ImmutableMap.copyOf(map);
-    }
-
-    private final class TupleImpl implements Tuple, Serializable {
-
-        private static final long serialVersionUID = 6635924689293325950L;
-
-        private final Object[] a;
-
-        private TupleImpl(Object[] a) {
-            this.a = a;
-        }
-
-        @Override
-        public <T> T get(int index, Class<T> type) {
-            return (T) a[index];
-        }
-
-        @Override
-        public <T> T get(Expression<T> expr) {
-            Integer idx = QTuple.this.bindings.get(expr);
-            if (idx != null) {
-                return (T) a[idx.intValue()];
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public int size() {
-            return a.length;
-        }
-
-        @Override
-        public Object[] toArray() {
-            return a;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            } else if (obj instanceof Tuple) {
-                return Arrays.equals(a, ((Tuple) obj).toArray());
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Arrays.hashCode(a);
-        }
-
-        @Override
-        public String toString() {
-            return Arrays.toString(a);
-        }
-    }
-
-    private static final long serialVersionUID = -2640616030595420465L;
-
-    private final ImmutableList<Expression<?>> args;
-
-    private final ImmutableMap<Expression<?>, Integer> bindings;
-
-    /**
-     * Create a new QTuple instance
-     *
-     * @param args
-     */
-    public QTuple(Expression<?>... args) {
-        super(Tuple.class);
-        this.args = ImmutableList.copyOf(args);
-        this.bindings = createBindings(this.args);
-    }
-
-    /**
-     * Create a new QTuple instance
-     *
-     * @param args
-     */
-    public QTuple(ImmutableList<Expression<?>> args) {
-        super(Tuple.class);
-        this.args = args;
-        this.bindings = createBindings(this.args);
-    }
-
-    /**
-     * Create a new QTuple instance
-     *
-     * @param args
-     */
-    public QTuple(Expression<?>[]... args) {
-        super(Tuple.class);
-        ImmutableList.Builder<Expression<?>> builder = ImmutableList.builder();
-        for (Expression<?>[] exprs: args) {
-            builder.add(exprs);
-        }
-        this.args = builder.build();
-        this.bindings = createBindings(this.args);
-    }
-
-    @Override
-    public Tuple newInstance(Object... a) {
-        return new TupleImpl(a);
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof FactoryExpression) {
-            FactoryExpression<?> c = (FactoryExpression<?>)obj;
-            return args.equals(c.getArgs()) && getType().equals(c.getType());
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return args;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpression.java
deleted file mode 100644
index e21a796486..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpression.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import com.mysema.query.Detachable;
-import com.mysema.query.QueryMetadata;
-
-/**
- *
- * SubQueryExpression represents a sub query. The actual construction of a subquery
- * is done via an {@link Detachable} instance.
- *
- * @author tiwe
- *
- * @param <T> return type of subquery
- */
-public interface SubQueryExpression<T> extends Expression<T> {
-
-    /**
-     * Get the query metadata for the subquery
-     *
-     * @return
-     */
-    QueryMetadata getMetadata();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Template.java b/querydsl-core/src/main/java/com/mysema/query/types/Template.java
deleted file mode 100644
index 6262c31079..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Template.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-
-/**
- * Template for {@link Operation}, {@link TemplateExpression} and {@link Path} serialization
- *
- * @author tiwe
- *
- */
-@Immutable
-public final class Template implements Serializable {
-
-    private static final long serialVersionUID = -1697705745769542204L;
-
-    @Immutable
-    public abstract static class Element implements Serializable {
-
-        private static final long serialVersionUID = 3396877288101929387L;
-
-        public abstract Object convert(List<?> args);
-
-        public abstract boolean isString();
-
-    }
-
-    public static final class AsString extends Element {
-
-        private static final long serialVersionUID = -655362047873616197L;
-
-        private final int index;
-
-        private final String toString;
-
-        public AsString(int index) {
-            this.index = index;
-            this.toString = index + "s";
-        }
-
-        @Override
-        public Object convert(final List<?> args) {
-            final Object arg = args.get(index);
-            return arg instanceof Constant ? arg.toString() : arg;
-        }
-
-        @Override
-        public boolean isString() {
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return toString;
-        }
-
-    }
-
-    public static final class StaticText extends Element {
-
-        private static final long serialVersionUID = -2791869625053368023L;
-
-        private final String text;
-
-        private final String toString;
-
-        public StaticText(String text) {
-            this.text = text;
-            this.toString = "'" + text + "'";
-        }
-
-        @Override
-        public boolean isString() {
-            return true;
-        }
-
-        @Override
-        public Object convert(List<?> args) {
-            return text;
-        }
-
-        @Override
-        public String toString() {
-            return toString;
-        }
-
-    }
-
-    public static final class Transformed extends Element {
-
-        private static final long serialVersionUID = 702677732175745567L;
-
-        private final int index;
-
-        private final transient Function<Object, Object> transformer;
-
-        private final String toString;
-
-        public Transformed(int index, Function<Object, Object> transformer) {
-            this.index = index;
-            this.transformer = transformer;
-            this.toString = String.valueOf(index);
-        }
-
-        @Override
-        public Object convert(final List<?> args) {
-            return transformer.apply(args.get(index));
-        }
-
-        @Override
-        public boolean isString() {
-            return false;
-        }
-
-        @Override
-        public String toString() {
-            return toString;
-        }
-
-    }
-
-    public static final class ByIndex extends Element {
-
-        private static final long serialVersionUID = 4711323946026029998L;
-
-        private final int index;
-
-        private final String toString;
-
-        public ByIndex(int index) {
-            this.index = index;
-            this.toString = String.valueOf(index);
-        }
-
-        @Override
-        public Object convert(final List<?> args) {
-            final Object arg = args.get(index);
-            if (arg instanceof Expression) {
-                return ExpressionUtils.extract((Expression<?>) arg);
-            } else {
-                return arg;
-            }
-        }
-
-        public int getIndex() {
-            return index;
-        }
-
-        @Override
-        public boolean isString() {
-            return false;
-        }
-
-        @Override
-        public String toString() {
-            return toString;
-        }
-
-    }
-
-    private final ImmutableList<Element> elements;
-
-    private final String template;
-
-    Template(String template, ImmutableList<Element> elements) {
-        this.template = template;
-        this.elements = elements;
-    }
-
-    public List<Element> getElements() {
-        return elements;
-    }
-
-    @Override
-    public String toString() {
-        return template;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Template) {
-            return ((Template)o).template.equals(template);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return template.hashCode();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpression.java
deleted file mode 100644
index 8f0e77031a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpression.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.List;
-
-/**
- * TemplateExpression provides base types for custom expressions with integrated
- * serialization templates
- *
- * @author tiwe
- */
-public interface TemplateExpression<T> extends Expression<T> {
-
-    /**
-     * Get the argument with the given index
-     *
-     * @param index
-     * @return
-     */
-    Object getArg(int index);
-
-    /**
-     * Get the arguments of the custom expression
-     *
-     * @return
-     */
-    List<?> getArgs();
-
-    /**
-     * Get the serialization template for this custom expression
-     *
-     * @return
-     */
-    Template getTemplate();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java
deleted file mode 100644
index 2cdf8b65d0..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/TemplateExpressionImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.List;
-
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Default implementation of the {@link TemplateExpression} interface
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@Immutable
-public class TemplateExpressionImpl<T> extends ExpressionBase<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = 6951623726800809083L;
-
-    private final ImmutableList<?> args;
-
-    private final Template template;
-
-    public static <C> Expression<C> create(Class<C> cl, String template) {
-        return new TemplateExpressionImpl<C>(cl, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-
-    public static <C> Expression<C> create(Class<C> cl, String template, Object one) {
-        return new TemplateExpressionImpl<C>(cl, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-
-    public static <C> Expression<C> create(Class<C> cl, String template, Object one, Object two) {
-        return new TemplateExpressionImpl<C>(cl, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-
-    public static <C> Expression<C> create(Class<C> cl, String template, Object... args) {
-        return new TemplateExpressionImpl<C>(cl, TemplateFactory.DEFAULT.create(template), args);
-    }
-
-    public static <C> Expression<C> create(Class<C> cl, Template template, Object... args) {
-        return new TemplateExpressionImpl<C>(cl, template, args);
-    }
-
-    protected TemplateExpressionImpl(Class<? extends T> type, Template template, Object... args) {
-        this(type, template, ImmutableList.copyOf(args));
-    }
-
-    public TemplateExpressionImpl(Class<? extends T> type, Template template, ImmutableList<?> args) {
-        super(type);
-        this.args = args;
-        this.template = template;
-    }
-
-    @Override
-    public final Object getArg(int index) {
-        return getArgs().get(index);
-    }
-
-    @Override
-    public final List<?> getArgs() {
-        return args;
-    }
-
-    @Override
-    public final Template getTemplate() {
-        return template;
-    }
-
-    @Override
-    public final boolean equals(Object o) {
-       if (o == this) {
-           return true;
-       } else if (o instanceof TemplateExpression) {
-           TemplateExpression<?> c = (TemplateExpression<?>)o;
-           return c.getTemplate().equals(template)
-               && c.getType().equals(getType())
-               && c.getArgs().equals(args);
-
-       } else {
-           return false;
-       }
-    }
-
-    @Override
-    public final <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/TemplateFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/TemplateFactory.java
deleted file mode 100644
index 93a280dee0..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/TemplateFactory.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template.Element;
-
-/**
- * TemplateFactory is a factory for {@link Template} instances
- *
- * @author tiwe
- *
- */
-public class TemplateFactory {
-
-    public static final TemplateFactory DEFAULT = new TemplateFactory('\\');
-
-    private static final Constant<String> PERCENT = ConstantImpl.create("%");
-
-    private static final Pattern elementPattern = Pattern.compile("\\{"
-            + "(?<premod>%?%?)"
-            + "(?<index>\\d+)"
-            + "(?<postmod>[slu%]?%?)"
-            + "\\}");
-
-    private final Map<String,Template> cache = new ConcurrentHashMap<String,Template>();
-
-    private final char escape;
-
-    private final Function<Object,Object> toLowerCase =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        return OperationImpl.create(String.class, Ops.LOWER, (Expression)arg);
-                    } else {
-                        return String.valueOf(arg).toLowerCase(Locale.ENGLISH);
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toUpperCase =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        return OperationImpl.create(String.class, Ops.UPPER, (Expression)arg);
-                    } else {
-                        return String.valueOf(arg).toUpperCase(Locale.ENGLISH);
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toStartsWithViaLike =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        return OperationImpl.create(String.class, Ops.CONCAT, (Expression)arg, PERCENT);
-                    } else {
-                        return escapeForLike(String.valueOf(arg)) + "%";
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toStartsWithViaLikeLower =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, (Expression)arg, PERCENT);
-                        return OperationImpl.create(String.class, Ops.LOWER, concated);
-                    } else {
-                        return escapeForLike(String.valueOf(arg).toLowerCase(Locale.ENGLISH)) + "%";
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toEndsWithViaLike =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        return OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                    } else {
-                        return "%" + escapeForLike(String.valueOf(arg));
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toEndsWithViaLikeLower =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                        return OperationImpl.create(String.class, Ops.LOWER, concated);
-                    } else {
-                        return "%" + escapeForLike(String.valueOf(arg).toLowerCase(Locale.ENGLISH));
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toContainsViaLike =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                        return OperationImpl.create(String.class, Ops.CONCAT, concated, PERCENT);
-                    } else {
-                        return "%" + escapeForLike(String.valueOf(arg)) + "%";
-                    }
-                }
-            };
-
-    private final Function<Object,Object> toContainsViaLikeLower =
-            new Function<Object,Object>() {
-                @Override
-                public Object apply(Object arg) {
-                    if (arg instanceof Constant) {
-                        return ConstantImpl.create(apply(arg.toString()).toString());
-                    } else if (arg instanceof Expression) {
-                        Expression<String> concated = OperationImpl.create(String.class, Ops.CONCAT, PERCENT, (Expression)arg);
-                        concated = OperationImpl.create(String.class, Ops.CONCAT, concated, PERCENT);
-                        return OperationImpl.create(String.class, Ops.LOWER, concated);
-                    } else {
-                        return "%" + escapeForLike(String.valueOf(arg).toLowerCase(Locale.ENGLISH)) + "%";
-                    }
-                }
-            };
-
-    public TemplateFactory(char escape) {
-        this.escape = escape;
-    }
-    
-    public Template create(String template) {
-        if (cache.containsKey(template)) {
-            return cache.get(template);
-        } else {
-            Matcher m = elementPattern.matcher(template);
-            final ImmutableList.Builder<Element> elements = ImmutableList.builder();
-            int end = 0;
-            while (m.find()) {
-                if (m.start() > end) {
-                    elements.add(new Template.StaticText(template.substring(end, m.start())));
-                }
-                String premodifiers = m.group("premod").toLowerCase(Locale.ENGLISH);
-                int index = Integer.parseInt(m.group("index"));
-                String postmodifiers = m.group("postmod").toLowerCase(Locale.ENGLISH);
-                boolean asString = false;
-                Function<Object, Object> transformer = null;
-                switch (premodifiers.length()) {
-                    case 1:
-                        transformer = toEndsWithViaLike;
-                        break;
-                    case 2:
-                        transformer = toEndsWithViaLikeLower;
-                        break;
-                }
-                switch (postmodifiers.length()) {
-                    case 1:
-                        switch (postmodifiers.charAt(0)) {
-                            case '%':
-                                if (transformer == null) {
-                                    transformer = toStartsWithViaLike;
-                                } else {
-                                    transformer = toContainsViaLike;
-                                }
-                                break;
-                            case 'l':
-                                transformer = toLowerCase;
-                                break;
-                            case 'u':
-                                transformer = toUpperCase;
-                                break;
-                            case 's':
-                                asString = true;
-                                break;
-                        }
-                        break;
-                    case 2:
-                        if (transformer == null) {
-                            transformer = toStartsWithViaLikeLower;
-                        } else {
-                            transformer = toContainsViaLikeLower;
-                        }
-                        break;
-                }
-                if (asString) {
-                    elements.add(new Template.AsString(index));
-                } else if (transformer != null) {
-                    elements.add(new Template.Transformed(index, transformer));
-                } else {
-                    elements.add(new Template.ByIndex(index));
-                }
-                end = m.end();
-            }
-            if (end < template.length()) {
-                elements.add(new Template.StaticText(template.substring(end)));
-            }
-            Template rv = new Template(template, elements.build());
-            cache.put(template, rv);
-            return rv;
-        }
-    }
-
-    public String escapeForLike(String str) {
-        final StringBuilder rv = new StringBuilder(str.length() + 3);
-        for (int i = 0; i < str.length(); i++) {
-            final char ch = str.charAt(i);
-            if (ch == escape || ch == '%' || ch == '_') {
-                rv.append(escape);
-            }
-            rv.append(ch);
-        }
-        return rv.toString();
-    }
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java b/querydsl-core/src/main/java/com/mysema/query/types/Templates.java
deleted file mode 100644
index fd9b57120e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Templates.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nullable;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-/**
- * Templates provides operator patterns for query expression serialization
- *
- * @author tiwe
- */
-public class Templates {
-
-    public static final Templates DEFAULT = new Templates();
-
-    private final Map<Operator<?>, Template> templates = new IdentityHashMap<Operator<?>, Template>(150);
-
-    private final Map<Operator<?>, Integer> precedence = new IdentityHashMap<Operator<?>, Integer>(150);
-
-    private final TemplateFactory templateFactory;
-
-    private final char escape;
-
-    protected Templates() {
-        this('\\');
-    }
-
-    protected Templates(char escape) {
-        this.escape = escape;
-        templateFactory = new TemplateFactory(escape) {
-            public String escapeForLike(String str) {
-                return Templates.this.escapeForLike(str);
-            }
-        };
-        //CHECKSTYLE:OFF
-
-        add(Ops.LIST, "{0}, {1}", 40);
-        add(Ops.SINGLETON, "{0}", 40);
-        add(Ops.WRAPPED, "({0})");
-
-        // boolean
-        add(Ops.AND, "{0} && {1}", 36);
-        add(Ops.NOT, "!{0}", 3);
-        add(Ops.OR, "{0} || {1}", 38);
-        add(Ops.XNOR, "{0} xnor {1}", 39);
-        add(Ops.XOR, "{0} xor {1}", 39);
-
-        // collection
-        add(Ops.COL_IS_EMPTY, "empty({0})");
-        add(Ops.COL_SIZE, "size({0})");
-
-        // array
-        add(Ops.ARRAY_SIZE, "size({0})");
-
-        // map
-        add(Ops.MAP_SIZE, "size({0})");
-        add(Ops.MAP_IS_EMPTY, "empty({0})");
-        add(Ops.CONTAINS_KEY, "containsKey({0},{1})");
-        add(Ops.CONTAINS_VALUE, "containsValue({0},{1})");
-
-        // comparison
-        add(Ops.BETWEEN, "{0} between {1} and {2}", 30);
-        add(Ops.GOE, "{0} >= {1}", 20);
-        add(Ops.GT, "{0} > {1}", 21);
-        add(Ops.LOE, "{0} <= {1}", 22);
-        add(Ops.LT, "{0} < {1}", 23);
-
-        // numeric
-        add(Ops.NEGATE, "-{0}", 6);
-        add(Ops.ADD, "{0} + {1}", 13);
-        add(Ops.DIV, "{0} / {1}", 8);
-        add(Ops.MOD, "{0} % {1}", 10);
-        add(Ops.MULT, "{0} * {1}", 7);
-        add(Ops.SUB, "{0} - {1}", 12);
-
-        // various
-        add(Ops.EQ, "{0} = {1}", 18);
-        add(Ops.EQ_IGNORE_CASE, "eqIc({0},{1})", 18);
-        add(Ops.INSTANCE_OF, "{0}.class = {1}");
-        add(Ops.NE, "{0} != {1}", 25);
-        add(Ops.IN, "{0} in {1}", 27);
-        add(Ops.NOT_IN, "{0} not in {1}", 27);
-        add(Ops.IS_NULL, "{0} is null", 26);
-        add(Ops.IS_NOT_NULL, "{0} is not null", 26);
-        add(Ops.ALIAS, "{0} as {1}", 0);
-
-        add(Ops.EXISTS, "exists({0})");
-
-        add(Ops.NUMCAST, "cast({0},{1})");
-        add(Ops.STRING_CAST, "str({0})");
-
-        // string
-        add(Ops.CONCAT, "{0} + {1}", 37);
-        add(Ops.LOWER, "lower({0})");
-        add(Ops.SUBSTR_1ARG, "substring({0},{1})");
-        add(Ops.SUBSTR_2ARGS, "substring({0},{1},{2})");
-        add(Ops.TRIM, "trim({0})");
-        add(Ops.UPPER, "upper({0})");
-        add(Ops.MATCHES, "matches({0},{1})");
-        add(Ops.MATCHES_IC, "matchesIgnoreCase({0},{1})");
-        add(Ops.STARTS_WITH, "startsWith({0},{1})");
-        add(Ops.STARTS_WITH_IC, "startsWithIgnoreCase({0},{1})");
-        add(Ops.ENDS_WITH, "endsWith({0},{1})");
-        add(Ops.ENDS_WITH_IC, "endsWithIgnoreCase({0},{1})");
-        add(Ops.STRING_CONTAINS, "contains({0},{1})");
-        add(Ops.STRING_CONTAINS_IC, "containsIc({0},{1})");
-        add(Ops.CHAR_AT, "charAt({0},{1})");
-        add(Ops.STRING_LENGTH, "length({0})");
-        add(Ops.INDEX_OF, "indexOf({0},{1})");
-        add(Ops.INDEX_OF_2ARGS, "indexOf({0},{1},{2})");
-        add(Ops.STRING_IS_EMPTY, "empty({0})");
-        add(Ops.LIKE, "{0} like {1}", 26);
-        add(Ops.LIKE_ESCAPE, "{0} like {1} escape '{2s}'", 26);
-
-        add(Ops.StringOps.LEFT, "left({0},{1})");
-        add(Ops.StringOps.RIGHT, "right({0},{1})");
-        add(Ops.StringOps.LTRIM, "ltrim({0})");
-        add(Ops.StringOps.RTRIM, "rtrim({0})");
-        add(Ops.StringOps.LOCATE, "locate({0},{1})");
-        add(Ops.StringOps.LOCATE2, "locate({0},{1},{2s})");
-        add(Ops.StringOps.LPAD, "lpad({0},{1})");
-        add(Ops.StringOps.RPAD, "rpad({0},{1})");
-        add(Ops.StringOps.LPAD2, "lpad({0},{1},'{2s}')");
-        add(Ops.StringOps.RPAD2, "rpad({0},{1},'{2s}')");
-
-        // date time
-        add(Ops.DateTimeOps.SYSDATE, "sysdate");
-        add(Ops.DateTimeOps.CURRENT_DATE, "current_date()");
-        add(Ops.DateTimeOps.CURRENT_TIME, "current_time()");
-        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp()");
-        add(Ops.DateTimeOps.DATE, "date({0})");
-
-        add(Ops.DateTimeOps.MILLISECOND, "millisecond({0})");
-        add(Ops.DateTimeOps.SECOND, "second({0})");
-        add(Ops.DateTimeOps.MINUTE, "minute({0})");
-        add(Ops.DateTimeOps.HOUR, "hour({0})");
-        add(Ops.DateTimeOps.WEEK, "week({0})");
-        add(Ops.DateTimeOps.MONTH, "month({0})");
-        add(Ops.DateTimeOps.YEAR, "year({0})");
-        add(Ops.DateTimeOps.YEAR_MONTH, "yearMonth({0})");
-        add(Ops.DateTimeOps.YEAR_WEEK, "yearweek({0})");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "dayofmonth({0})");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "add_years({0},{1})");
-        add(Ops.DateTimeOps.ADD_MONTHS, "add_months({0},{1})");
-        add(Ops.DateTimeOps.ADD_WEEKS, "add_weeks({0},{1})");
-        add(Ops.DateTimeOps.ADD_DAYS, "add_days({0},{1})");
-        add(Ops.DateTimeOps.ADD_HOURS, "add_hours({0},{1})");
-        add(Ops.DateTimeOps.ADD_MINUTES, "add_minutes({0},{1})");
-        add(Ops.DateTimeOps.ADD_SECONDS, "add_seconds({0},{1})");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "diff_years({0},{1})");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "diff_months({0},{1})");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "diff_weeks({0},{1})");
-        add(Ops.DateTimeOps.DIFF_DAYS, "diff_days({0},{1})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "diff_hours({0},{1})");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "diff_minutes({0},{1})");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "diff_seconds({0},{1})");
-
-        add(Ops.DateTimeOps.TRUNC_YEAR, "trunc_year({0})");
-        add(Ops.DateTimeOps.TRUNC_MONTH, "trunc_month({0})");
-        add(Ops.DateTimeOps.TRUNC_WEEK, "trunc_week({0})");
-        add(Ops.DateTimeOps.TRUNC_DAY, "trunc_day({0})");
-        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc_hour({0})");
-        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc_minute({0})");
-        add(Ops.DateTimeOps.TRUNC_SECOND, "trunc_second({0})");
-
-        // math
-        add(Ops.MathOps.ABS, "abs({0})");
-        add(Ops.MathOps.ACOS, "acos({0})");
-        add(Ops.MathOps.ASIN, "asin({0})");
-        add(Ops.MathOps.ATAN, "atan({0})");
-        add(Ops.MathOps.CEIL, "ceil({0})");
-        add(Ops.MathOps.COS, "cos({0})");
-        add(Ops.MathOps.COSH, "cosh({0})");
-        add(Ops.MathOps.COT, "cot({0})");
-        add(Ops.MathOps.COTH, "coth({0})");
-        add(Ops.MathOps.DEG, "degrees({0})");
-        add(Ops.MathOps.TAN, "tan({0})");
-        add(Ops.MathOps.TANH, "tanh({0})");
-        add(Ops.MathOps.SQRT, "sqrt({0})");
-        add(Ops.MathOps.SIGN, "sign({0})");
-        add(Ops.MathOps.SIN, "sin({0})");
-        add(Ops.MathOps.SINH, "sinh({0})");
-        add(Ops.MathOps.ROUND, "round({0})");
-        add(Ops.MathOps.ROUND2, "round({0},{1})");
-        add(Ops.MathOps.RAD, "radians({0})");
-        add(Ops.MathOps.RANDOM, "random()");
-        add(Ops.MathOps.RANDOM2, "random({0})");
-        add(Ops.MathOps.POWER, "pow({0},{1})");
-        add(Ops.MathOps.MIN, "min({0},{1})");
-        add(Ops.MathOps.MAX, "max({0},{1})");
-        add(Ops.MathOps.LOG, "log({0},{1})");
-        add(Ops.MathOps.LN, "ln({0})");
-        add(Ops.MathOps.FLOOR, "floor({0})");
-        add(Ops.MathOps.EXP, "exp({0})");
-
-        // path types
-        add(PathType.PROPERTY, "{0}.{1s}");
-        add(PathType.VARIABLE, "{0s}");
-        add(PathType.DELEGATE, "{0}");
-        add(Ops.ORDINAL, "ordinal({0})");
-//        add(Ops.DELEGATE, "{0}");
-
-        for (PathType type : new PathType[] {
-                PathType.LISTVALUE,
-                PathType.MAPVALUE,
-                PathType.MAPVALUE_CONSTANT }) {
-            add(type, "{0}.get({1})");
-        }
-        add(PathType.ARRAYVALUE, "{0}[{1}]");
-        add(PathType.COLLECTION_ANY, "any({0})");
-        add(PathType.LISTVALUE_CONSTANT, "{0}.get({1s})"); // serialized constant
-        add(PathType.ARRAYVALUE_CONSTANT, "{0}[{1s}]");    // serialized constant
-
-        // case
-        add(Ops.CASE, "case {0} end", 30);
-        add(Ops.CASE_WHEN,  "when {0} then {1} {2}", 30);
-        add(Ops.CASE_ELSE,  "else {0}", 30);
-
-        // case for
-        add(Ops.CASE_EQ, "case {0} {1} end", 30);
-        add(Ops.CASE_EQ_WHEN,  "when {1} then {2} {3}", 30);
-        add(Ops.CASE_EQ_ELSE,  "else {0}", 30);
-
-        // coalesce
-        add(Ops.COALESCE, "coalesce({0})");
-
-        add(Ops.NULLIF, "nullif({0},{1})");
-
-        // subquery
-        add(Ops.EXISTS, "exists {0}");
-
-        // numeric aggregates
-        add(Ops.AggOps.BOOLEAN_ALL, "all({0})");
-        add(Ops.AggOps.BOOLEAN_ANY, "any({0})");
-        add(Ops.AggOps.AVG_AGG, "avg({0})");
-        add(Ops.AggOps.MAX_AGG, "max({0})");
-        add(Ops.AggOps.MIN_AGG, "min({0})");
-        add(Ops.AggOps.SUM_AGG, "sum({0})");
-        add(Ops.AggOps.COUNT_AGG, "count({0})");
-        add(Ops.AggOps.COUNT_DISTINCT_AGG, "count(distinct {0})");
-        add(Ops.AggOps.COUNT_DISTINCT_ALL_AGG, "count(distinct *)");
-        add(Ops.AggOps.COUNT_ALL_AGG, "count(*)");
-
-        // quantified expressions
-        add(Ops.QuantOps.AVG_IN_COL, "avg({0})");
-        add(Ops.QuantOps.MAX_IN_COL, "max({0})");
-        add(Ops.QuantOps.MIN_IN_COL, "min({0})");
-
-        add(Ops.QuantOps.ANY, "any {0}");
-        add(Ops.QuantOps.ALL, "all {0}");
-        //CHECKSTYLE:ON
-    }
-
-    protected final void add(Operator<?> op, String pattern) {
-        templates.put(op, templateFactory.create(pattern));
-        if (!precedence.containsKey(op)) {
-            precedence.put(op, -1);
-        }
-    }
-
-    protected final void add(Operator<?> op, String pattern, int pre) {
-        templates.put(op, templateFactory.create(pattern));
-        precedence.put(op, pre);
-    }
-
-    public final char getEscapeChar() {
-        return escape;
-    }
-
-    protected String escapeForLike(String str) {
-        final StringBuilder rv = new StringBuilder(str.length() + 3);
-        for (char ch : str.toCharArray()) {
-            if (ch == escape || ch == '%' || ch == '_') {
-                rv.append(escape);
-            }
-            rv.append(ch);
-        }
-        return rv.toString();
-    }
-
-    @Nullable
-    public final Template getTemplate(Operator<?> op) {
-        return templates.get(op);
-    }
-
-    public final int getPrecedence(Operator<?> op) {
-        return precedence.get(op).intValue();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java b/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java
deleted file mode 100644
index 88a15e0031..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import javax.annotation.Nullable;
-
-/**
- * Visitor defines a Visitor signature for {@link Expression} instances.
- *
- * @author tiwe
- */
-public interface Visitor<R,C> {
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(Constant<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(FactoryExpression<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(Operation<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(ParamExpression<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(Path<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(SubQueryExpression<?> expr, @Nullable C context);
-
-    /**
-     * @param expr
-     */
-    @Nullable
-    R visit(TemplateExpression<?> expr, @Nullable C context);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayExpression.java
deleted file mode 100644
index 6919d66136..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ArrayExpression.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import javax.annotation.Nonnegative;
-
-import com.mysema.query.types.Expression;
-
-/**
- * ArrayExpression defines an interface for array typed expression
- *
- * @author tiwe
- *
- * @param <A> array type
- * @param <T> array element type
- */
-public interface ArrayExpression<A, T> extends Expression<A> {
-
-    /**
-     * Get the size of the array
-     *
-     * @return
-     */
-    NumberExpression<Integer> size();
-
-    /**
-     * Get the element at the given index
-     *
-     * @param index
-     * @return
-     */
-    SimpleExpression<T> get(Expression<Integer> index);
-
-    /**
-     * Get the element at the given index
-     *
-     * @param index
-     * @return
-     */
-    SimpleExpression<T> get(@Nonnegative int index);
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanExpression.java
deleted file mode 100644
index 73723f77ab..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanExpression.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.Predicate;
-
-/**
- * BooleanExpression represents {@link java.lang.Boolean} expressions
- *
- * @author tiwe
- * @see java.lang.Boolean
- *
- */
-public abstract class BooleanExpression extends ComparableExpression<Boolean> implements Predicate{
-
-    private static final long serialVersionUID = 3797956062512074164L;
-
-    @Nullable
-    private volatile BooleanExpression eqTrue, eqFalse;
-
-    /**
-     * Return the intersection of the given Boolean expressions
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static BooleanExpression allOf(BooleanExpression... exprs) {
-        BooleanExpression rv = null;
-        for (BooleanExpression b : exprs) {
-            rv = rv == null ? b : rv.and(b);
-        }
-        return rv;
-    }
-
-    /**
-     * Return the union of the given Boolean expressions
-     *
-     * @param exprs
-     * @return
-     */
-    @Nullable
-    public static BooleanExpression anyOf(BooleanExpression... exprs) {
-        BooleanExpression rv = null;
-        for (BooleanExpression b : exprs) {
-            rv = rv == null ? b : rv.or(b);
-        }
-        return rv;
-    }
-
-    @Nullable
-    private volatile BooleanExpression not;
-
-    public BooleanExpression(Expression<Boolean> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public BooleanExpression as(Path<Boolean> alias) {
-        return BooleanOperation.create(Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public BooleanExpression as(String alias) {
-        return as(new PathImpl<Boolean>(Boolean.class, alias));
-    }
-
-    /**
-     * Get an intersection of this and the given expression
-     *
-     * @param right right hand side of the union
-     * @return this && right
-     */
-    public BooleanExpression and(@Nullable Predicate right) {
-        right = (Predicate) ExpressionUtils.extract(right);
-        if (right != null) {
-            return BooleanOperation.create(Ops.AND, mixin, right);
-        } else {
-            return this;
-        }
-    }
-
-    /**
-     * Get an intersection of this and the union of the given predicates
-     *
-     * @param predicates
-     * @return
-     */
-    public BooleanExpression andAnyOf(Predicate... predicates) {
-        return and(ExpressionUtils.anyOf(predicates));
-    }
-
-    /**
-     * Get a negation of this boolean expression
-     *
-     * @return !this
-     */
-    @Override
-    public BooleanExpression not() {
-        if (not == null) {
-            // uses this, because it makes unwrapping easier
-            not = BooleanOperation.create(Ops.NOT, this);
-        }
-        return not;
-    }
-
-    /**
-     * Get a union of this and the given expression
-     *
-     * @param right right hand side of the union
-     * @return this || right
-     */
-    public BooleanExpression or(@Nullable Predicate right) {
-        right = (Predicate) ExpressionUtils.extract(right);
-        if (right != null) {
-            return BooleanOperation.create(Ops.OR, mixin, right);
-        } else {
-            return this;
-        }
-    }
-
-    /**
-     * Get a union of this and the intersection of the given predicates
-     *
-     * @param predicates
-     * @return
-     */
-    public BooleanExpression orAllOf(Predicate... predicates) {
-        return or(ExpressionUtils.allOf(predicates));
-    }
-
-    /**
-     * Get a this == true expression
-     *
-     * @return
-     */
-    public BooleanExpression isTrue() {
-        return eq(true);
-    }
-
-    /**
-     * Get a this == false expression
-     *
-     * @return
-     */
-    public BooleanExpression isFalse() {
-        return eq(false);
-    }
-
-    @Override
-    public BooleanExpression eq(Boolean right) {
-        if (right.booleanValue()) {
-            if (eqTrue == null) {
-                eqTrue = super.eq(true);
-            }
-            return eqTrue;
-        } else {
-            if (eqFalse == null) {
-                eqFalse = super.eq(false);
-            }
-            return eqFalse;
-        }
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanOperation.java
deleted file mode 100644
index 3d4e19cae6..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/BooleanOperation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.PredicateOperation;
-import com.mysema.query.types.Visitor;
-
-/**
- * BooleanOperation represents boolean operations
- *
- * @author tiwe
- *
- */
-public class BooleanOperation extends BooleanExpression implements Operation<Boolean> {
-
-    private static final long serialVersionUID = 7432281499861357581L;
-
-    public static BooleanExpression create(Operator<? super Boolean> op, Expression<?> one) {
-        return new BooleanOperation(op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static BooleanExpression create(Operator<? super Boolean> op, Expression<?> one, Expression<?> two) {
-        return new BooleanOperation(op, ImmutableList.of(one, two));
-    }
-    
-    public static BooleanExpression create(Operator<? super Boolean> op, Expression<?>... args) {
-        return new BooleanOperation(op, args);
-    }
-    
-    private final PredicateOperation opMixin;
-
-    protected BooleanOperation(Operator<? super Boolean> op, Expression<?>... args) {
-        this(op, ImmutableList.copyOf(args));
-    }
-    
-    protected BooleanOperation(Operator<? super Boolean> op, ImmutableList<Expression<?>> args) {
-        super(new PredicateOperation((Operator)op, args));
-        opMixin = (PredicateOperation)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super Boolean> getOperator() {
-        return opMixin.getOperator();
-    }
-
-    @Override
-    public BooleanExpression not() {
-        if (opMixin.getOperator() == Ops.NOT && opMixin.getArg(0) instanceof BooleanExpression) {
-            return (BooleanExpression) opMixin.getArg(0);
-        } else {
-            return super.not();
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java
deleted file mode 100644
index 6a3827d8e4..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseBuilder.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Ops;
-
-import javax.annotation.Nullable;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * CaseBuilder enables the construction of typesafe case-when-then-else
- * constructs :
- * e.g.
- *
- * <pre>
- * Expression&lt;String&gt; cases = new CaseBuilder()
- *     .when(c.annualSpending.gt(10000)).then("Premier")
- *     .when(c.annualSpending.gt(5000)).then("Gold")
- *     .when(c.annualSpending.gt(2000)).then("Silver")
- *     .otherwise("Bronze");
- * </pre>
- *
- * @author tiwe
- *
- */
-public final class CaseBuilder {
-
-    private static class CaseElement<A> {
-
-        @Nullable
-        private final BooleanExpression condition;
-
-        private final Expression<A> target;
-
-        public CaseElement(@Nullable BooleanExpression condition, Expression<A> target) {
-            this.condition = condition;
-            this.target = target;
-        }
-
-        public BooleanExpression getCondition() {
-            return condition;
-        }
-
-        public Expression<A> getTarget() {
-            return target;
-        }
-
-    }
-
-    /**
-     * Cascading typesafe Case builder
-     *
-     * @author tiwe
-     *
-     * @param <A>
-     */
-    public abstract static class Cases<A, Q extends Expression<A>> {
-
-        private final List<CaseElement<A>> cases = new ArrayList<CaseElement<A>>();
-
-        private final Class<A> type;
-
-        public Cases(Class<A> type) {
-            this.type = type;
-        }
-
-        Cases<A,Q> addCase(BooleanExpression condition, Expression<A> expr) {
-            cases.add(0, new CaseElement<A>(condition, expr));
-            return this;
-        }
-
-        protected abstract Q createResult(Class<A> type, Expression<A> last);
-
-        public Q otherwise(A constant) {
-            if (constant != null) {
-                return otherwise(ConstantImpl.create(constant));
-            } else {
-                return otherwise((Expression)NullExpression.DEFAULT);
-            }
-        }
-
-        public Q otherwise(Expression<A> expr) {
-            if (expr == null) {
-                expr = (Expression)NullExpression.DEFAULT;
-            }
-            cases.add(0, new CaseElement<A>(null, expr));
-            Expression<A> last = null;
-            for (CaseElement<A> element : cases) {
-                if (last == null) {
-                    last = SimpleOperation.create(type, Ops.CASE_ELSE,
-                            element.getTarget());
-                } else {
-                    last = SimpleOperation.create(type, Ops.CASE_WHEN,
-                            element.getCondition(),
-                            element.getTarget(),
-                            last);
-                }
-            }
-            return createResult(type, last);
-        }
-
-        public CaseWhen<A,Q> when(BooleanExpression b) {
-            return new CaseWhen<A,Q>(this, b);
-        }
-
-    }
-
-    /**
-     * Intermediate When state
-     *
-     * @author tiwe
-     *
-     * @param <A>
-     */
-    public static class CaseWhen<A,Q extends Expression<A>> {
-
-        private final BooleanExpression b;
-
-        private final Cases<A,Q> cases;
-
-        public CaseWhen(Cases<A,Q> cases, BooleanExpression b) {
-            this.cases = cases;
-            this.b = b;
-        }
-
-        public Cases<A,Q> then(A constant) {
-            return then(ConstantImpl.create(constant));
-        }
-
-        public Cases<A,Q> then(Expression<A> expr) {
-            return cases.addCase(b, expr);
-        }
-    }
-
-    /**
-     * Initial state of Case construction
-     *
-     * @author tiwe
-     *
-     */
-    public static class Initial {
-
-        private final BooleanExpression when;
-
-        public Initial(BooleanExpression b) {
-            this.when = b;
-        }
-
-        public <A> Cases<A, SimpleExpression<A>> then(Expression<A> expr) {
-            if (expr instanceof BooleanExpression) {
-                return (Cases) then((BooleanExpression) expr);
-            } else if (expr instanceof StringExpression) {
-                return (Cases) then((StringExpression) expr);
-            } else if (expr instanceof NumberExpression) {
-                return then((NumberExpression) expr);
-            } else if (expr instanceof DateExpression) {
-                return then((DateExpression) expr);
-            } else if (expr instanceof DateTimeExpression) {
-                return then((DateTimeExpression) expr);
-            } else if (expr instanceof TimeExpression) {
-                return then((TimeExpression) expr);
-            } else if (expr instanceof ComparableExpression) {
-                return then((ComparableExpression) expr);
-            } else {
-                return thenSimple(expr);
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private <A> Cases<A, SimpleExpression<A>> thenSimple(Expression<A> expr) {
-            return new Cases<A, SimpleExpression<A>>((Class)expr.getType()) {
-                @Override
-                protected SimpleExpression<A> createResult(Class<A> type, Expression<A> last) {
-                    return SimpleOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public <A> Cases<A, SimpleExpression<A>> then(A constant) {
-            return thenSimple(ConstantImpl.create(constant));
-        }
-
-        // Boolean
-
-        public Cases<Boolean, BooleanExpression> then(BooleanExpression expr) {
-            return thenBoolean(expr);
-        }
-
-        private Cases<Boolean, BooleanExpression> thenBoolean(Expression<Boolean> expr) {
-            return new Cases<Boolean,BooleanExpression>(Boolean.class) {
-                @SuppressWarnings("unchecked")
-                @Override
-                protected BooleanExpression createResult(Class<Boolean> type, Expression<Boolean> last) {
-                    return BooleanOperation.create(Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public Cases<Boolean, BooleanExpression> then(boolean b) {
-            return thenBoolean(ConstantImpl.create(b));
-        }
-
-        // Comparable
-
-        public <T extends Comparable> Cases<T, ComparableExpression<T>> then(ComparableExpression<T> expr) {
-            return thenComparable(expr);
-        }
-
-        private <T extends Comparable> Cases<T, ComparableExpression<T>> thenComparable(Expression<T> expr) {
-            return new Cases<T, ComparableExpression<T>>((Class)expr.getType()) {
-                @Override
-                protected ComparableExpression<T> createResult(Class<T> type, Expression<T> last) {
-                    return ComparableOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public <A extends Comparable> Cases<A, ComparableExpression<A>> then(A arg) {
-            return thenComparable(ConstantImpl.create(arg));
-        }
-
-        // Date
-
-        public <T extends Comparable> Cases<T, DateExpression<T>> then(DateExpression<T> expr) {
-            return thenDate(expr);
-        }
-
-        private <T extends Comparable> Cases<T, DateExpression<T>> thenDate(Expression<T> expr) {
-            return new Cases<T, DateExpression<T>>((Class)expr.getType()) {
-                @Override
-                protected DateExpression<T> createResult(Class<T> type, Expression<T> last) {
-                    return DateOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public Cases<java.sql.Date, DateExpression<java.sql.Date>> then(java.sql.Date date) {
-            return thenDate(ConstantImpl.create(date));
-        }
-
-        @Deprecated
-        public Cases<java.sql.Date, DateExpression<java.sql.Date>> thenDate(java.sql.Date date) {
-            return then(date);
-        }
-
-        // DateTime
-
-        public <T extends Comparable> Cases<T, DateTimeExpression<T>> then(DateTimeExpression<T> expr) {
-            return thenDateTime(expr);
-        }
-
-        private <T extends Comparable> Cases<T, DateTimeExpression<T>> thenDateTime(Expression<T> expr) {
-            return new Cases<T, DateTimeExpression<T>>((Class)expr.getType()) {
-                @Override
-                protected DateTimeExpression<T> createResult(Class<T> type, Expression<T> last) {
-                    return DateTimeOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public Cases<Timestamp, DateTimeExpression<Timestamp>> then(Timestamp ts) {
-            return thenDateTime(ConstantImpl.create(ts));
-        }
-
-        @Deprecated
-        public Cases<Timestamp, DateTimeExpression<Timestamp>> thenDateTime(Timestamp ts) {
-            return then(ts);
-        }
-
-        public Cases<java.util.Date, DateTimeExpression<java.util.Date>> then(java.util.Date date) {
-            return thenDateTime(ConstantImpl.create(date));
-        }
-
-        @Deprecated
-        public Cases<java.util.Date, DateTimeExpression<java.util.Date>> thenDateTime(java.util.Date date) {
-            return then(date);
-        }
-
-        // Enum
-
-        public <T extends Enum<T>> Cases<T,EnumExpression<T>> then(EnumExpression<T> expr) {
-            return thenEnum(expr);
-        }
-
-        @SuppressWarnings("unchecked")
-        private <T extends Enum<T>> Cases<T,EnumExpression<T>> thenEnum(Expression<T> expr) {
-            return new Cases<T,EnumExpression<T>>((Class)expr.getType()) {
-                @Override
-                protected EnumExpression<T> createResult(Class<T> type, Expression<T> last) {
-                    return EnumOperation.create(type, Ops.CASE, last);
-                }
-            }.addCase(when, expr);
-        }
-
-        public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(T arg) {
-            return thenEnum(ConstantImpl.create(arg));
-        }
-
-        // Number
-
-        public <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> then(NumberExpression<A> expr) {
-            return thenNumber(expr);
-        }
-
-        @SuppressWarnings("unchecked")
-        private <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> thenNumber(Expression<A> expr) {
-            return new Cases<A, NumberExpression<A>>((Class)expr.getType()) {
-                @Override
-                protected NumberExpression<A> createResult(Class<A> type, Expression<A> last) {
-                    return NumberOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> then(A num) {
-            return thenNumber(ConstantImpl.create(num));
-        }
-
-        // String
-
-        public Cases<String,StringExpression> then(StringExpression expr) {
-            return thenString(expr);
-        }
-
-        private Cases<String,StringExpression> thenString(Expression<String> expr) {
-            return new Cases<String,StringExpression>(String.class) {
-                @SuppressWarnings("unchecked")
-                @Override
-                protected StringExpression createResult(Class<String> type, Expression<String> last) {
-                    return StringOperation.create(Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public Cases<String, StringExpression> then(String str) {
-            return thenString(ConstantImpl.create(str));
-        }
-
-        // Time
-
-        public <T extends Comparable> Cases<T, TimeExpression<T>> then(TimeExpression<T> expr) {
-            return thenTime(expr);
-        }
-
-        private <T extends Comparable> Cases<T, TimeExpression<T>> thenTime(Expression<T> expr) {
-            return new Cases<T, TimeExpression<T>>((Class)expr.getType()) {
-                @Override
-                protected TimeExpression<T> createResult(Class<T> type, Expression<T> last) {
-                    return TimeOperation.create(type, Ops.CASE, last);
-                }
-
-            }.addCase(when, expr);
-        }
-
-        public Cases<Time, TimeExpression<Time>> then(Time time) {
-            return thenTime(ConstantImpl.create(time));
-        }
-
-    }
-
-    public Initial when(BooleanExpression b) {
-        return new Initial(b);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java
deleted file mode 100644
index abe9d152bb..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CaseForEqBuilder.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Ops;
-
-/**
- * CaseForEqBuilder enables the construction of typesafe case-when-then-else constructs
- * for equals-operations :
- * e.g.
- *
- * <pre>
- * QCustomer c = QCustomer.customer;
- * Expression&lt;Integer&gt; cases = c.annualSpending
- *     .when(1000l).then(1)
- *     .when(2000l).then(2)
- *     .when(5000l).then(3)
- *     .otherwise(4);
- * </pre>
- *
- * @author tiwe
- *
- * @param <D>
- */
-public final class CaseForEqBuilder<D> {
-
-    private static class CaseElement<D> {
-
-        @Nullable
-        private final Expression<? extends D> eq;
-
-        private final Expression<?> target;
-
-        public CaseElement(@Nullable Expression<? extends D> eq, Expression<?> target) {
-            this.eq = eq;
-            this.target = target;
-        }
-
-        public Expression<? extends D> getEq() {
-            return eq;
-        }
-
-        public Expression<?> getTarget() {
-            return target;
-        }
-
-    }
-
-    private final Expression<D> base;
-
-    private final Expression<? extends D> other;
-
-    private final List<CaseElement<D>> caseElements = new ArrayList<CaseElement<D>>();
-
-    private Class<?> type;
-
-    public CaseForEqBuilder(Expression<D> base, Expression<? extends D> other) {
-        this.base = base;
-        this.other = other;
-    }
-
-    public <T> Cases<T,Expression<T>> then(Expression<T> then) {
-        type = then.getType();
-        return new Cases<T,Expression<T>>() {
-            @Override
-            protected Expression<T> createResult(Class<T> type, Expression<T> last) {
-                return SimpleOperation.create(type, Ops.CASE_EQ, base, last);
-            }
-        }.when(other).then(then);
-    }
-
-    public <T> Cases<T,Expression<T>> then(T then) {
-        return then(ConstantImpl.create(then));
-    }
-
-    public <T> Cases<T,Expression<T>> thenNull() {
-        return then((Expression<T>)NullExpression.DEFAULT);
-    }
-
-    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> then(T then) {
-        return thenNumber(ConstantImpl.create(then));
-    }
-
-    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> then(NumberExpression<T> then) {
-        return thenNumber(then);
-    }
-
-    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> thenNumber(Expression<T> then) {
-        type = then.getType();
-        return new Cases<T,NumberExpression<T>>() {
-            @SuppressWarnings("unchecked")
-            @Override
-            protected NumberExpression<T> createResult(Class<T> type, Expression<T> last) {
-                return NumberOperation.create(type, Ops.CASE_EQ, base, last);
-            }
-
-        }.when(other).then(then);
-    }
-
-    public Cases<String,StringExpression> then(StringExpression then) {
-        return thenString(then);
-    }
-
-    public Cases<String,StringExpression> then(String then) {
-        return thenString(ConstantImpl.create(then));
-    }
-
-    private Cases<String,StringExpression> thenString(Expression<String> then) {
-        type = then.getType();
-        return new Cases<String,StringExpression>() {
-            @SuppressWarnings("unchecked")
-            @Override
-            protected StringExpression createResult(Class<String> type, Expression<String> last) {
-                return StringOperation.create(Ops.CASE_EQ, base, last);
-            }
-
-        }.when(other).then(then);
-    }
-
-    public abstract class Cases<T, Q extends Expression<T>> {
-
-        public CaseWhen<T,Q> when(Expression<? extends D> when) {
-            return new CaseWhen<T,Q>(this, when);
-        }
-
-        public CaseWhen<T,Q> when(D when) {
-            return when(ConstantImpl.create(when));
-        }
-
-        @SuppressWarnings("unchecked")
-        public Q otherwise(Expression<T> otherwise) {
-            caseElements.add(0, new CaseElement<D>(null, otherwise));
-            Expression<T> last = null;
-            for (CaseElement<D> element : caseElements) {
-                if (last == null) {
-                    last = SimpleOperation.create((Class<T>)type, Ops.CASE_EQ_ELSE,
-                            element.getTarget());
-                } else {
-                    last = SimpleOperation.create((Class<T>)type, Ops.CASE_EQ_WHEN,
-                            base,
-                            element.getEq(),
-                            element.getTarget(),
-                            last);
-                }
-            }
-            return createResult((Class<T>)type, last);
-        }
-
-        protected abstract Q createResult(Class<T> type, Expression<T> last);
-
-        public Q otherwise(T otherwise) {
-            return otherwise(ConstantImpl.create(otherwise));
-        }
-    }
-
-    public class CaseWhen<T, Q extends Expression<T>> {
-
-        private final Cases<T, Q> cases;
-
-        private final Expression<? extends D> when;
-
-        public CaseWhen(Cases<T, Q> cases, Expression<? extends D> when) {
-            this.cases = cases;
-            this.when = when;
-        }
-
-        public Cases<T, Q> then(Expression<T> then) {
-            caseElements.add(0, new CaseElement<D>(when, then));
-            return cases;
-        }
-
-        public Cases<T, Q> then(T then) {
-            return then(ConstantImpl.create(then));
-        }
-
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/Coalesce.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/Coalesce.java
deleted file mode 100644
index 86c77da480..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/Coalesce.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.MutableExpressionBase;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.Visitor;
-
-/**
- * Coalesce defines a coalesce function invocation. The coalesce function
- * returns null if all arguments are null and the first non-null argument
- * otherwise
- *
- * <p>Coalesce doesn't provide the full interface for comparable expressions. To get an immutable
- * copy with the full expressiveness of Comparable expressions, call getValue().</p>
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@SuppressWarnings("unchecked")
-public class Coalesce<T extends Comparable> extends MutableExpressionBase<T> {
-
-    private static final long serialVersionUID = 445439522266250417L;
-
-    private final List<Expression<? extends T>> exprs = new ArrayList<Expression<? extends T>>();
-
-    private volatile ComparableExpression<T> value;
-
-    public Coalesce(Class<? extends T> type, Expression<?>... exprs) {
-        super(type);
-        // NOTE : type parameters for the varargs, would result in compiler warnings
-        for (Expression expr : exprs) {
-            add(expr);
-        }
-    }
-
-    public Coalesce(Expression... exprs) {
-        // NOTE : type parameters for the varargs, would result in compiler warnings
-        this((exprs.length > 0 ? exprs[0].getType() : Object.class), exprs);
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return getValue().accept(v, context);
-    }
-
-    public ComparableExpression<T> getValue() {
-        if (value == null) {
-            value = (ComparableExpression<T>)ComparableOperation.create(getType(), Ops.COALESCE, getExpressionList());
-        }
-        return value;
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public DslExpression<T> as(Path<T> alias) {
-        return DslOperation.create((Class<T>)getType(),Ops.ALIAS, this, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public DslExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    public final Coalesce<T> add(Expression<T> expr) {
-        value = null;
-        this.exprs.add(expr);
-        return this;
-    }
-
-    public OrderSpecifier<T> asc() {
-        return getValue().asc();
-    }
-
-    public OrderSpecifier<T> desc() {
-        return getValue().desc();
-    }
-
-    public final Coalesce<T> add(T constant) {
-        return add(ConstantImpl.create(constant));
-    }
-
-    public BooleanExpression asBoolean() {
-        return BooleanOperation.create(Ops.COALESCE, getExpressionList());
-    }
-
-    public DateExpression<T> asDate() {
-        return (DateExpression<T>) DateOperation.create(getType(), Ops.COALESCE, getExpressionList());
-    }
-
-    public DateTimeExpression<T> asDateTime() {
-        return (DateTimeExpression<T>) DateTimeOperation.create(getType(), Ops.COALESCE, getExpressionList());
-    }
-
-    public EnumExpression<?> asEnum() {
-        return EnumOperation.create((Class)getType(), Ops.COALESCE, getExpressionList());
-    }
-
-    public NumberExpression<?> asNumber() {
-        return NumberOperation.create((Class)getType(), Ops.COALESCE, getExpressionList());
-    }
-
-    public StringExpression asString() {
-        return StringOperation.create(Ops.COALESCE, getExpressionList());
-    }
-
-    public TimeExpression<T> asTime() {
-        return (TimeExpression<T>) TimeOperation.create(getType(), Ops.COALESCE, getExpressionList());
-    }
-
-    private Expression<?> getExpressionList() {
-        return ExpressionUtils.list(getType(), exprs);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Coalesce<?>) {
-            Coalesce<?> c = (Coalesce<?>)o;
-            return c.exprs.equals(exprs);
-        } else {
-            return false;
-        }
-    }
-
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionExpressionBase.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionExpressionBase.java
deleted file mode 100644
index f20e0a2433..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionExpressionBase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-
-/**
- * CollectionExpressionBase is an abstract base class for {@link CollectionExpression} implementations
- *
- * @author tiwe
- *
- * @param <T> expression type
- * @param <E> collection element type
- */
-public abstract class CollectionExpressionBase<T extends Collection<E>, E> extends DslExpression<T> implements CollectionExpression<T, E> {
-
-    private static final long serialVersionUID = 691230660037162054L;
-
-    @Nullable
-    private volatile BooleanExpression empty;
-
-    @Nullable
-    private volatile NumberExpression<Integer> size;
-
-    public CollectionExpressionBase(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    public DslExpression<E> as(EntityPath<E> alias) {
-        return DslOperation.create(getElementType(), Ops.ALIAS, mixin, alias);
-    }
-
-    public final BooleanExpression contains(E child) {
-        return contains(ConstantImpl.create(child));
-    }
-
-    public final BooleanExpression contains(Expression<E> child) {
-        return BooleanOperation.create(Ops.IN, child, mixin);
-    }
-
-    public abstract Class<E> getElementType();
-
-    public final BooleanExpression isEmpty() {
-        if (empty == null) {
-            empty = BooleanOperation.create(Ops.COL_IS_EMPTY, mixin);
-        }
-        return empty;
-    }
-
-    public final BooleanExpression isNotEmpty() {
-        return isEmpty().not();
-    }
-
-    public final NumberExpression<Integer> size() {
-        if (size == null) {
-            size = NumberOperation.create(Integer.class, Ops.COL_SIZE, mixin);
-        }
-        return size;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionOperation.java
deleted file mode 100644
index 486d712c0e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/CollectionOperation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- */
-public class CollectionOperation<E> extends CollectionExpressionBase<Collection<E>, E> {
-
-    private static final long serialVersionUID = 3154315192589335574L;
-
-    private final Class<E> elementType;
-
-    private final OperationImpl<Collection<E>> opMixin;
-
-    public static <E> CollectionOperation<E> create(Operator<?> op, Class<E> type, Expression<?> one) {
-        return new CollectionOperation<E>(op, type, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <E> CollectionOperation<E> create(Operator<?> op, Class<E> type, Expression<?> one, Expression<?> two) {
-        return new CollectionOperation<E>(op, type, ImmutableList.of(one, two));
-    }
-
-    public static <E> CollectionOperation<E> create(Operator<?> op, Class<E> type, Expression<?>... args) {
-        return new CollectionOperation<E>(op, type, args);
-    }
-
-    public CollectionOperation(Operator<?> op, Class<? super E> type, Expression<?>... args) {
-        this(op, type, ImmutableList.copyOf(args));
-    }
-
-    public CollectionOperation(Operator<?> op, Class<? super E> type, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl(Collection.class, op, args));
-        this.opMixin = (OperationImpl)super.mixin;
-        this.elementType = (Class<E>)type;
-    }
-
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return elementType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-
-    @Override
-    @Nullable
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return opMixin.accept(v, context);
-    }
-
-    @Override
-    public Class<E> getElementType() {
-        return elementType;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java
deleted file mode 100644
index 4624830a57..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpression.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * ComparableExpression extends {@link ComparableExpressionBase} to provide comparison methods.
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@SuppressWarnings({"unchecked"})
-public abstract class ComparableExpression<T extends Comparable> extends ComparableExpressionBase<T> {
-
-    private static final long serialVersionUID = 5761359576767404270L;
-
-    public ComparableExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-    
-    @Override
-    public ComparableExpression<T> as(Path<T> alias) {
-        return ComparableOperation.create(getType(),(Operator)Ops.ALIAS, mixin, alias);
-    }
-    
-    @Override
-    public ComparableExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    /**
-     * Get a <code>from &lt;= this &lt;= to</code> expression
-     *
-     * @param from
-     * @param to
-     * @return
-     */
-    public final BooleanExpression between(@Nullable T from, @Nullable T to) {
-        if (from == null) {
-            if (to != null) {
-                return BooleanOperation.create(Ops.LOE, mixin, ConstantImpl.create(to));
-            } else {
-                throw new IllegalArgumentException("Either from or to needs to be non-null");
-            }
-        } else if (to == null) {
-            return BooleanOperation.create(Ops.GOE, mixin, ConstantImpl.create(from));
-        } else {
-            return BooleanOperation.create(Ops.BETWEEN, mixin, ConstantImpl.create(from), ConstantImpl.create(to));    
-        }        
-    }
-
-    /**
-     * Get a <code>first &lt;= this &lt;= second</code> expression
-     *
-     * @param from
-     * @param to
-     * @return
-     */
-    public final BooleanExpression between(@Nullable Expression<T> from, @Nullable Expression<T> to) {
-        if (from == null) {
-            if (to != null) {
-                return BooleanOperation.create(Ops.LOE, mixin, to);
-            } else {
-                throw new IllegalArgumentException("Either from or to needs to be non-null");
-            }
-        } else if (to == null) {
-            return BooleanOperation.create(Ops.GOE, mixin, from);
-        } else {
-            return BooleanOperation.create(Ops.BETWEEN, mixin, from, to);    
-        }
-        
-    }
-
-    /**
-     * Get a <code>this not between from and to</code> expression
-     *
-     * @param from
-     * @param to
-     * @return
-     */
-    public final BooleanExpression notBetween(T from, T to) {
-        return between(from, to).not();
-    }
-
-    /**
-     * Get a <code>this not between from and to</code> expression
-     *
-     * @param from
-     * @param to
-     * @return
-     */
-    public final BooleanExpression notBetween(Expression<T> from, Expression<T> to) {
-        return between(from, to).not();
-    }
-
-    /**
-     * Get a <code>this &gt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public BooleanExpression gt(T right) {
-        return gt(ConstantImpl.create(right));
-    }
-
-    /**
-     * Get a <code>this &gt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public BooleanExpression gt(Expression<T> right) {
-        return BooleanOperation.create(Ops.GT, mixin, right);
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression gtAll(CollectionExpression<?, ? super T> right) {
-        return gt(ExpressionUtils.<T>all(right));
-    }
-
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression gtAny(CollectionExpression<?, ? super T> right) {
-        return gt(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Get a <code>this &gt;= right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public BooleanExpression goe(T right) {
-        return goe(ConstantImpl.create(right));
-    }
-
-    /**
-     * Get a <code>this &gt;= right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public BooleanExpression goe(Expression<T> right) {
-        return BooleanOperation.create(Ops.GOE, mixin, right);
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression goeAll(CollectionExpression<?, ? super T> right) {
-        return goe(ExpressionUtils.<T>all(right));
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression goeAny(CollectionExpression<?, ? super T> right) {
-        return goe(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Get a <code>this &lt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final BooleanExpression lt(T right) {
-        return lt(ConstantImpl.create(right));
-    }
-
-    /**
-     * Get a <code>this &lt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final BooleanExpression lt(Expression<T> right) {
-        return BooleanOperation.create(Ops.LT, mixin, right);
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression ltAll(CollectionExpression<?, ? super T> right) {
-        return lt(ExpressionUtils.<T>all(right));
-    }
-
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression ltAny(CollectionExpression<?, ? super T> right) {
-        return lt(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Get a <code>this &lt;= right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final BooleanExpression loe(T right) {
-        return BooleanOperation.create(Ops.LOE, mixin, ConstantImpl.create(right));
-    }
-
-    /**
-     * Get a <code>this &lt;= right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final BooleanExpression loe(Expression<T> right) {
-        return BooleanOperation.create(Ops.LOE, mixin, right);
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression loeAll(CollectionExpression<?, ? super T> right) {
-        return loe(ExpressionUtils.<T>all(right));
-    }
-    
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression loeAny(CollectionExpression<?, ? super T> right) {
-        return loe(ExpressionUtils.<T>any(right));
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpressionBase.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpressionBase.java
deleted file mode 100644
index 74df226a85..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableExpressionBase.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Order;
-import com.mysema.query.types.OrderSpecifier;
-
-/**
- * ComparableExpressionBase represents comparable expressions
- *
- * @author tiwe
- *
- * @param <T> Java type
- * @see java.lang.Comparable
- */
-@SuppressWarnings({"unchecked"})
-public abstract class ComparableExpressionBase<T extends Comparable> extends SimpleExpression<T> {
-
-    private static final long serialVersionUID = 1460921109546656911L;
-
-    @Nullable
-    private volatile OrderSpecifier<T> asc, desc;
-
-    @Nullable
-    private volatile StringExpression stringCast;
-
-    public ComparableExpressionBase(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Get an OrderSpecifier for ascending order of this expression
-     *
-     * @return
-     */
-    public final OrderSpecifier<T> asc() {
-        if (asc == null) {
-            asc = new OrderSpecifier<T>(Order.ASC, mixin);
-        }
-        return asc;
-    }
-
-    public final Coalesce<T> coalesce(Expression<?>...exprs) {
-        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
-            coalesce.add(expr);
-        }
-        return coalesce;
-    }
-
-    public final Coalesce<T> coalesce(T... args) {
-        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (T arg : args) {
-            coalesce.add(arg);
-        }
-        return coalesce;
-    }
-
-    /**
-     * Create a cast expression to the given numeric type
-     *
-     * @param <A>
-     * @param type
-     * @return
-     */
-    public <A extends Number & Comparable<? super A>> NumberExpression<A> castToNum(Class<A> type) {
-        return NumberOperation.create(type, Ops.NUMCAST, mixin, ConstantImpl.create(type));
-    }
-
-    /**
-     * Get an OrderSpecifier for descending order of this expression
-     *
-     * @return
-     */
-    public final OrderSpecifier<T> desc() {
-        if (desc == null) {
-            desc = new OrderSpecifier<T>(Order.DESC, mixin);
-        }
-        return desc;
-    }
-
-    /**
-     * Get a cast to String expression
-     *
-     * @see     java.lang.Object#toString()
-     * @return
-     */
-    public StringExpression stringValue() {
-        if (stringCast == null) {
-            stringCast = StringOperation.create(Ops.STRING_CAST, mixin);
-        }
-        return stringCast;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableOperation.java
deleted file mode 100644
index 2e4b7964d7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ComparableOperation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * ComparableOperation represents Comparable operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class ComparableOperation<T extends Comparable<?>> extends
-        ComparableExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 1129243977606098865L;
-
-    public static <D extends Comparable<?>> ComparableExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new ComparableOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected ComparableOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-    
-    protected ComparableOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DateExpression.java
deleted file mode 100644
index d15c4c914a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateExpression.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * DateExpression represents Date expressions
- * The date representation is compatible with the Gregorian calendar.
- *
- * @param <T> expression type
- *
- * @author tiwe
- * @see <a href="http://en.wikipedia.org/wiki/Gregorian_calendar">Gregorian calendar</a>
- */
-@SuppressWarnings({"unchecked"})
-public abstract class DateExpression<T extends Comparable> extends TemporalExpression<T> {
-
-    private static final DateExpression<Date> CURRENT_DATE = currentDate(Date.class);
-
-    private static final long serialVersionUID = 6054664454254721302L;
-
-    /**
-     * Get an expression representing the current date as a DateExpression instance
-     *
-     * @return
-     */
-    public static DateExpression<Date> currentDate() {
-        return CURRENT_DATE;
-    }
-
-    /**
-     * Get an expression representing the current date as a DateExpression instance
-     *
-     * @return
-     */
-    public static <T extends Comparable> DateExpression<T> currentDate(Class<T> cl) {
-        return DateOperation.create(cl, Ops.DateTimeOps.CURRENT_DATE);
-    }
-
-    @Nullable
-    private volatile NumberExpression<Integer> dayOfMonth, dayOfWeek, dayOfYear;
-
-    @Nullable
-    private volatile DateExpression min, max;
-
-    @Nullable
-    private volatile NumberExpression<Integer> week, month, year, yearMonth, yearWeek;
-
-    public DateExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public DateExpression<T> as(Path<T> alias) {
-        return DateOperation.create((Class<T>)getType(), Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public DateExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    /**
-     * Get a day of month expression (range 1-31)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfMonth() {
-        if (dayOfMonth == null) {
-            dayOfMonth = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_MONTH, mixin);
-        }
-        return dayOfMonth;
-    }
-
-    /**
-     * Get a day of week expression (range 1-7 / SUN-SAT)
-     * <p>NOT supported in JDOQL and not in Derby</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfWeek() {
-        if (dayOfWeek == null) {
-            dayOfWeek = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_WEEK, mixin);
-        }
-        return dayOfWeek;
-    }
-
-    /**
-     * Get a day of year expression (range 1-356)
-     * <p>NOT supported in JDOQL and not in Derby</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfYear() {
-        if (dayOfYear == null) {
-            dayOfYear = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_YEAR, mixin);
-        }
-        return dayOfYear;
-    }
-
-    /**
-     * Get the maximum value of this expression (aggregation)
-     *
-     * @return max(this)
-     */
-    public DateExpression<T> max() {
-        if (max == null) {
-            max = DateOperation.create(getType(), Ops.AggOps.MAX_AGG, mixin);
-        }
-        return max;
-    }
-
-    /**
-     * Get the minimum value of this expression (aggregation)
-     *
-     * @return min(this)
-     */
-    public DateExpression<T> min() {
-        if (min == null) {
-            min = DateOperation.create(getType(), Ops.AggOps.MIN_AGG, mixin);
-        }
-        return min;
-    }
-
-    /**
-     * Get a month expression (range 1-12 / JAN-DEC)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> month() {
-        if (month == null) {
-            month = NumberOperation.create(Integer.class, Ops.DateTimeOps.MONTH, mixin);
-        }
-        return month;
-    }
-
-    /**
-     * Get a week expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> week() {
-        if (week == null) {
-            week = NumberOperation.create(Integer.class, Ops.DateTimeOps.WEEK,  mixin);
-        }
-        return week;
-    }
-
-    /**
-     * Get a year expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> year() {
-        if (year == null) {
-            year = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR, mixin);
-        }
-        return year;
-    }
-
-    /**
-     * Get a year / month expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> yearMonth() {
-        if (yearMonth == null) {
-            yearMonth = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR_MONTH, mixin);
-        }
-        return yearMonth;
-    }
-
-    /**
-     * Get a ISO yearweek expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> yearWeek() {
-        if (yearWeek == null) {
-            yearWeek = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR_WEEK, mixin);
-        }
-        return yearWeek;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DateOperation.java
deleted file mode 100644
index 1af6d2ec5a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateOperation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * DateOperation represents Date operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DateOperation<T extends Comparable<?>> extends
-    DateExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = -7859020164194396995L;
-
-    public static <D extends Comparable<?>> DateExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new DateOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D extends Comparable<?>> DateExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new DateOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-    
-    public static <D extends Comparable<?>> DateExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new DateOperation<D>(type, op, args);
-    }
-    
-    private final OperationImpl<T> opMixin;
-
-    protected DateOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-    
-    protected DateOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeExpression.java
deleted file mode 100644
index 9c4712c95b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeExpression.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * DateTimeExpression represents Date / Time expressions
- * The date representation is compatible with the Gregorian calendar.
- *
- * @param <T> expression type
- *
- * @author tiwe
- * @see <a href="http://en.wikipedia.org/wiki/Gregorian_calendar">Gregorian calendar</a>
- */
-@SuppressWarnings({"unchecked"})
-public abstract class DateTimeExpression<T extends Comparable> extends TemporalExpression<T> {
-
-    private static final DateTimeExpression<Date> CURRENT_DATE = currentDate(Date.class);
-
-    private static final DateTimeExpression<Date> CURRENT_TIMESTAMP = currentTimestamp(Date.class);
-
-    private static final long serialVersionUID = -6879277113694148047L;
-
-    /**
-     * Get an expression representing the current date as a DateTimeExpression instance
-     *
-     * @return
-     */
-    public static DateTimeExpression<Date> currentDate() {
-        return CURRENT_DATE;
-    }
-
-    /**
-     * Get an expression representing the current date as a DateTimeExpression instance
-     *
-     * @return
-     */
-    public static <T extends Comparable> DateTimeExpression<T> currentDate(Class<T> cl) {
-        return DateTimeOperation.<T>create(cl, Ops.DateTimeOps.CURRENT_DATE);
-    }
-
-    /**
-     * Get an expression representing the current time instant as a DateTimeExpression instance
-     *
-     * @return
-     */
-    public static DateTimeExpression<Date> currentTimestamp() {
-        return CURRENT_TIMESTAMP;
-    }
-
-    /**
-     * Get an expression representing the current time instant as a DateTimeExpression instance
-     *
-     * @return
-     */
-    public static <T extends Comparable> DateTimeExpression<T> currentTimestamp(Class<T> cl) {
-        return DateTimeOperation.create(cl, Ops.DateTimeOps.CURRENT_TIMESTAMP);
-    }
-
-
-    @Nullable
-    private volatile NumberExpression<Integer> dayOfMonth, dayOfWeek, dayOfYear;
-
-    @Nullable
-    private volatile NumberExpression<Integer> hours, minutes, seconds, milliseconds;
-
-
-    @Nullable
-    private volatile DateTimeExpression<T> min, max;
-
-    @Nullable
-    private volatile NumberExpression<Integer> week, month, year, yearMonth, yearWeek;
-
-    public DateTimeExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public DateTimeExpression<T> as(Path<T> alias) {
-        return DateTimeOperation.create((Class<T>)getType(), Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public DateTimeExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    /**
-     * Get a day of month expression (range 1-31)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfMonth() {
-        if (dayOfMonth == null) {
-            dayOfMonth = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_MONTH, mixin);
-        }
-        return dayOfMonth;
-    }
-
-    /**
-     * Get a day of week expression (range 1-7 / SUN-SAT)
-     * <p>NOT supported in JDOQL and not in Derby</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfWeek() {
-        if (dayOfWeek == null) {
-            dayOfWeek = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_WEEK, mixin);
-        }
-        return dayOfWeek;
-    }
-
-    /**
-     * Get a day of year expression (range 1-356)
-     * <p>NOT supported in JDOQL and not in Derby</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dayOfYear() {
-        if (dayOfYear == null) {
-            dayOfYear = NumberOperation.create(Integer.class, Ops.DateTimeOps.DAY_OF_YEAR, mixin);
-        }
-        return dayOfYear;
-    }
-
-    /**
-     * Get a hours expression (range 0-23)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> hour() {
-        if (hours == null) {
-            hours = NumberOperation.create(Integer.class, Ops.DateTimeOps.HOUR, mixin);
-        }
-        return hours;
-    }
-
-    /**
-     * Get the maximum value of this expression (aggregation)
-     *
-     * @return max(this)
-     */
-    public DateTimeExpression<T> max() {
-        if (max == null) {
-            max = DateTimeOperation.create((Class<T>)getType(), Ops.AggOps.MAX_AGG, mixin);
-        }
-        return max;
-    }
-
-    /**
-     * Get a milliseconds expression (range 0-999)
-     * <p>Is always 0 in HQL and JDOQL modules</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> milliSecond() {
-        if (milliseconds == null) {
-            milliseconds = NumberOperation.create(Integer.class, Ops.DateTimeOps.MILLISECOND, mixin);
-        }
-        return milliseconds;
-    }
-
-    /**
-     * Get the minimum value of this expression (aggregation)
-     *
-     * @return min(this)
-     */
-    public DateTimeExpression<T> min() {
-        if (min == null) {
-            min = DateTimeOperation.create((Class<T>)getType(), Ops.AggOps.MIN_AGG, mixin);
-        }
-        return min;
-    }
-
-    /**
-     * Get a minutes expression (range 0-59)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> minute() {
-        if (minutes == null) {
-            minutes = NumberOperation.create(Integer.class, Ops.DateTimeOps.MINUTE, mixin);
-        }
-        return minutes;
-    }
-
-    /**
-     * Get a month expression (range 1-12 / JAN-DEC)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> month() {
-        if (month == null) {
-            month = NumberOperation.create(Integer.class, Ops.DateTimeOps.MONTH, mixin);
-        }
-        return month;
-    }
-
-    /**
-     * Get a seconds expression (range 0-59)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> second() {
-        if (seconds == null) {
-            seconds = NumberOperation.create(Integer.class, Ops.DateTimeOps.SECOND, mixin);
-        }
-        return seconds;
-    }
-
-    /**
-     * Get a week expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> week() {
-        if (week == null) {
-            week = NumberOperation.create(Integer.class, Ops.DateTimeOps.WEEK,  mixin);
-        }
-        return week;
-    }
-
-    /**
-     * Get a year expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> year() {
-        if (year == null) {
-            year = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR, mixin);
-        }
-        return year;
-    }
-
-    /**
-     * Get a year / month expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> yearMonth() {
-        if (yearMonth == null) {
-            yearMonth = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR_MONTH, mixin);
-        }
-        return yearMonth;
-    }
-
-    /**
-     * Get a ISO yearweek expression
-     *
-     * @return
-     */
-    public NumberExpression<Integer> yearWeek() {
-        if (yearWeek == null) {
-            yearWeek = NumberOperation.create(Integer.class, Ops.DateTimeOps.YEAR_WEEK, mixin);
-        }
-        return yearWeek;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeOperation.java
deleted file mode 100644
index 0bc2242d04..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DateTimeOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * DateTimeOperation represents DateTime operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DateTimeOperation<T extends Comparable<?>> extends DateTimeExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 6523293814317168556L;
-
-    public static <D extends Comparable<?>> DateTimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new DateTimeOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D extends Comparable<?>> DateTimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new DateTimeOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-    
-    public static <D extends Comparable<?>> DateTimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new DateTimeOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected DateTimeOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected DateTimeOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-    
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DslExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DslExpression.java
deleted file mode 100644
index 8541475f8b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DslExpression.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * DslExpression is the base class for DSL expressions, but {@link SimpleExpression} is the base class
- * for scalar Expressions
- *
- * @author tiwe
- *
- */
-public abstract class DslExpression<T> implements Expression<T> {
-
-    private static final long serialVersionUID = -3383063447710753290L;
-
-    protected final Expression<T> mixin;
-
-    protected final int hashCode;
-
-    public DslExpression(Expression<T> mixin) {
-        this.mixin = mixin;
-        this.hashCode = mixin.hashCode();
-    }
-
-    @Override
-    public final Class<? extends T> getType() {
-        return mixin.getType();
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public DslExpression<T> as(Path<T> alias) {
-        return DslOperation.create((Class<T>)getType(),Ops.ALIAS, mixin, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    public DslExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    @Override
-    public boolean equals(Object o) { // can be overwritten
-        return mixin.equals(o);
-    }
-
-    @Override
-    public final int hashCode() {
-        return hashCode;
-    }
-
-    @Override
-    public final String toString() {
-        return mixin.toString();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/DslOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/DslOperation.java
deleted file mode 100644
index 634a39c564..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/DslOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * DslOperation represents a simple operation expression
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DslOperation<T> extends DslExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = -285668548371034230L;
-
-    public static <D> DslExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new DslOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D> DslExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new DslOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-    
-    public static <D> DslExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new DslOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected DslOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected DslOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java
deleted file mode 100644
index 7aae8dc731..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumExpression.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * EnumExpression represents Enum typed expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public abstract class EnumExpression<T extends Enum<T>> extends ComparableExpression<T> {
-
-    private static final long serialVersionUID = 8819222316513862829L;
-
-    public EnumExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public EnumExpression<T> as(Path<T> alias) {
-        return EnumOperation.create(getType(),Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public EnumExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-    
-    /**
-     * @return
-     */
-    public NumberExpression<Integer> ordinal() {
-        return NumberOperation.create(Integer.class, Ops.ORDINAL, mixin);
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumOperation.java
deleted file mode 100644
index eabfd2e363..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/EnumOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * EnumOperation represents enum operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class EnumOperation<T extends Enum<T>> extends EnumExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = -3593040852095778453L;
-
-    public static <D extends Enum<D>> EnumExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?> one) {
-        return new EnumOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D extends Enum<D>> EnumExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new EnumOperation<D>(type, op, ImmutableList.<Expression<?>>of(one, two));
-    }
-    
-    public static <D extends Enum<D>> EnumExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?>... args) {
-        return new EnumOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected EnumOperation(Class<? extends T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected EnumOperation(Class<? extends T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ListExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ListExpression.java
deleted file mode 100644
index 7be75c121b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ListExpression.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import javax.annotation.Nonnegative;
-
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Expression;
-
-/**
- * ListExpression represents {@link java.util.List} typed expressions
- *
- * @author tiwe
- *
- * @param <E> component type
- * @see java.util.List
- */
-public interface ListExpression<E, Q extends SimpleExpression<? super E>> extends CollectionExpression<List<E>, E> {
-
-    /**
-     * Indexed access
-     *
-     * @param index
-     * @return this.get(index)
-     * @see java.util.List#get(int)
-     */
-    Q get(Expression<Integer> index);
-
-    /**
-     * Indexed access
-     *
-     * @param index
-     * @return this.get(index)
-     * @see java.util.List#get(int)
-     */
-    Q get(@Nonnegative int index);
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/MapExpressionBase.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/MapExpressionBase.java
deleted file mode 100644
index b4fef3d5e7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/MapExpressionBase.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Ops;
-
-/**
- * MapExpressionBase is an abstract base class for {@link MapExpression} implementations
- *
- * @author tiwe
- *
- * @param <K> key type
- * @param <V> value type
- */
-public abstract class MapExpressionBase<K, V, Q extends SimpleExpression<? super V>> extends DslExpression<Map<K,V>> implements MapExpression<K,V> {
-
-    private static final long serialVersionUID = 2856001983312366841L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> size;
-
-    @Nullable
-    private volatile BooleanExpression empty;
-
-    public MapExpressionBase(Expression<Map<K, V>> mixin) {
-        super(mixin);
-    }
-
-    public final BooleanExpression contains(K key, V value) {
-        return get(key).eq(value);
-    }
-
-    @SuppressWarnings("unchecked")
-    public final BooleanExpression contains(Expression<K> key, Expression<V> value) {
-        return get(key).eq((Expression)value);
-    }
-
-    public final BooleanExpression containsKey(Expression<K> key) {
-        return BooleanOperation.create(Ops.CONTAINS_KEY, mixin, key);
-    }
-
-    public final BooleanExpression containsKey(K key) {
-        return BooleanOperation.create(Ops.CONTAINS_KEY, mixin, ConstantImpl.create(key));
-    }
-
-    public final BooleanExpression containsValue(Expression<V> value) {
-        return BooleanOperation.create(Ops.CONTAINS_VALUE, mixin, value);
-    }
-
-    public final BooleanExpression containsValue(V value) {
-        return BooleanOperation.create(Ops.CONTAINS_VALUE, mixin, ConstantImpl.create(value));
-    }
-
-    public abstract Q get(Expression<K> key);
-
-    public abstract Q get(K key);
-
-    public final BooleanExpression isEmpty() {
-        if (empty == null) {
-            empty = BooleanOperation.create(Ops.MAP_IS_EMPTY, mixin);
-        }
-        return empty;
-    }
-
-    public final BooleanExpression isNotEmpty() {
-        return isEmpty().not();
-    }
-
-    public final NumberExpression<Integer> size() {
-        if (size == null) {
-            size = NumberOperation.create(Integer.class, Ops.MAP_SIZE, mixin);
-        }
-        return size;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/MathExpressions.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/MathExpressions.java
deleted file mode 100644
index 6e4d5ea64c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/MathExpressions.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Ops.MathOps;
-
-/**
- * Extended Math expressions, supported by the SQL module
- *
- * @author tiwe
- *
- */
-public final class MathExpressions {
-
-    /**
-     * @param num
-     * @return acos(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> acos(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.ACOS, num);
-    }
-
-    /**
-     * @param num
-     * @return asin(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> asin(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.ASIN, num);
-    }
-
-    /**
-     * @param num
-     * @return atan(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> atan(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.ATAN, num);
-    }
-
-    /**
-     * @param num
-     * @return cos(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> cos(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.COS, num);
-    }
-
-    /**
-     * @param num
-     * @return cosh(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> cosh(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.COSH, num);
-    }
-
-    /**
-     * @param num
-     * @return cot(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> cot(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.COT, num);
-    }
-
-    /**
-     * @param num
-     * @return coth(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> coth(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.COTH, num);
-    }
-
-    /**
-     * @param num
-     * @return deg(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> degrees(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.DEG, num);
-    }
-
-    /**
-     * @param num
-     * @return exp(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> exp(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.EXP, num);
-    }
-
-    /**
-     * @param num
-     * @return ln(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> ln(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.LN, num);
-    }
-
-    /**
-     * @param num
-     * @param base
-     * @return log(num, base)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> log(Expression<A> num, int base) {
-        return NumberOperation.create(Double.class, Ops.MathOps.LOG, num, ConstantImpl.create(base));
-    }
-
-    /**
-     * Return the greater of the given values
-     *
-     * @return max(left, right)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> max(Expression<A> left, Expression<A> right) {
-        return NumberExpression.max(left, right);
-    }
-
-    /**
-     * Return the smaller of the given values
-     *
-     * @return min(left, right)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> min(Expression<A> left, Expression<A> right) {
-        return NumberExpression.min(left, right);
-    }
-
-    /**
-     * @param num
-     * @param exponent
-     * @return power(num, exponent)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> power(Expression<A> num, int exponent) {
-        return NumberOperation.create(Double.class, Ops.MathOps.POWER, num, ConstantImpl.create(exponent));
-    }
-
-    /**
-     * @param num
-     * @return rad(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> radians(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.RAD, num);
-    }
-
-    /**
-     * Returns the random expression
-     * @return random()
-     */
-    public static NumberExpression<Double> random() {
-        return NumberExpression.random();
-    }
-
-    /**
-     * Return a random number expression with the given seed
-     *
-     * @param seed
-     * @return
-     */
-    public static NumberExpression<Double> random(int seed) {
-        return NumberOperation.create(Double.class, MathOps.RANDOM2, ConstantImpl.create(seed));
-    }
-
-    /**
-     * Round to nearest integer
-     *
-     * @param num
-     * @return
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> round(Expression<A> num) {
-        return NumberOperation.create(num.getType(), MathOps.ROUND, num);
-    }
-
-    /**
-     * Round to s decimal places
-     *
-     * @param num
-     * @params s
-     * @return
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> round(Expression<A> num, int s) {
-        return NumberOperation.create(num.getType(), MathOps.ROUND2, num, ConstantImpl.create(s));
-    }
-
-    /**
-     * @param num
-     * @return sign(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Integer> sign(Expression<A> num) {
-        return NumberOperation.create(Integer.class, Ops.MathOps.SIGN, num);
-    }
-
-    /**
-     * @param num
-     * @return sin(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> sin(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.SIN, num);
-    }
-
-    /**
-     * @param num
-     * @return sinh(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> sinh(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.SINH, num);
-    }
-
-    /**
-     * @param num
-     * @return tan(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> tan(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.TAN, num);
-    }
-
-    /**
-     * @param num
-     * @return tanh(num)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<Double> tanh(Expression<A> num) {
-        return NumberOperation.create(Double.class, Ops.MathOps.TANH, num);
-    }
-
-    private MathExpressions() {}
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberExpression.java
deleted file mode 100644
index 396db0b7b0..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberExpression.java
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Ops.MathOps;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.util.MathUtils;
-
-/**
- * NumberExpression represents a numeric expression
- *
- * @author tiwe
- *
- * @param <T> expression type
- * @see java.lang.Number
- */
-public abstract class NumberExpression<T extends Number & Comparable<?>> extends ComparableExpressionBase<T> {
-
-    private static final long serialVersionUID = -5485902768703364888L;
-
-    @Nullable
-    private static final NumberExpression<Double> random = NumberOperation.create(Double.class, MathOps.RANDOM);
-
-    /**
-     * Return the greater of the given values
-     *
-     * @return max(left, right)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> max(Expression<A> left, Expression<A> right) {
-        return NumberOperation.create(left.getType(), MathOps.MAX, left, right);
-    }
-
-    /**
-     * Return the smaller of the given values
-     *
-     * @return min(left, right)
-     */
-    public static <A extends Number & Comparable<?>> NumberExpression<A> min(Expression<A> left, Expression<A> right) {
-        return NumberOperation.create(left.getType(), MathOps.MIN, left, right);
-    }
-
-    /**
-     * Returns the random expression
-     * @return random()
-     */
-    public static NumberExpression<Double> random() {
-        return random;
-    }
-
-    @Nullable
-    private volatile NumberExpression<T> abs, sum, min, max, floor, ceil, round;
-
-    @Nullable
-    private volatile NumberExpression<Double> avg, sqrt;
-
-    @Nullable
-    private volatile NumberExpression<T> negation;
-
-    public NumberExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public NumberExpression<T> as(Path<T> alias) {
-        return NumberOperation.create(getType(),Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public NumberExpression<T> as(String alias) {
-        return NumberOperation.create(getType(),Ops.ALIAS, mixin, new PathImpl<T>(getType(), alias));
-    }
-
-    /**
-     * Get the absolute value of this expression
-     *
-     * @return abs(this)
-     */
-    public NumberExpression<T> abs() {
-        if (abs == null) {
-            abs = NumberOperation.create(getType(), MathOps.ABS, mixin);
-        }
-        return abs;
-    }
-
-    /**
-     * Get the sum of this and right
-     *
-     * @param right
-     * @return this + right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> add(Expression<N> right) {
-        return NumberOperation.create(getType(), Ops.ADD, mixin, right);
-    }
-
-    /**
-     * Get the sum of this and right
-     *
-     * @param right
-     * @return this + right
-     */
-    public <N extends Number & Comparable<N>> NumberExpression<T> add(N right) {
-        return NumberOperation.create(getType(), Ops.ADD, mixin, ConstantImpl.create(right));
-    }
-
-    /**
-     * Get the average value of this expression (aggregation)
-     *
-     *  @return avg(this)
-     */
-    public NumberExpression<Double> avg() {
-        if (avg == null) {
-            avg = NumberOperation.create(Double.class, Ops.AggOps.AVG_AGG, mixin);
-        }
-        return avg;
-    }
-
-    /**
-     * Get the byte expression of this numeric expression
-     *
-     * @return this.byteValue()
-     * @see java.lang.Number#byteValue()
-     */
-    public NumberExpression<Byte> byteValue() {
-        return castToNum(Byte.class);
-    }
-
-    @SuppressWarnings("unchecked")
-    private T cast(Number number) {
-        Class<T> type = (Class<T>) getType();
-        if (type.equals(number.getClass())) {
-            return (T) number;
-        } else if (Byte.class.equals(type)) {
-            return (T) Byte.valueOf(number.byteValue());
-        } else if (Double.class.equals(type)) {
-            return (T) Double.valueOf(number.doubleValue());
-        } else if (Float.class.equals(type)) {
-            return (T) Float.valueOf(number.floatValue());
-        } else if (Integer.class.equals(type)) {
-            return (T) Integer.valueOf(number.intValue());
-        } else if (Long.class.equals(type)) {
-            return (T) Long.valueOf(number.longValue());
-        } else if (Short.class.equals(type)) {
-            return (T) Short.valueOf(number.shortValue());
-        } else if (BigInteger.class.equals(type)) {
-            return (T) new BigInteger(String.valueOf(number.longValue()));
-        } else if (BigDecimal.class.equals(type)) {
-            return (T) new BigDecimal(number.toString());
-        } else {
-            throw new IllegalArgumentException("Unsupported target type : " + type.getName());
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <A extends Number & Comparable<? super A>> NumberExpression<A> castToNum(Class<A> type) {
-        if (type.equals(getType())) {
-            return (NumberExpression<A>) this;
-        } else {
-            return NumberOperation.create(type, Ops.NUMCAST, mixin, ConstantImpl.create(type));
-        }
-    }
-
-    /**
-     * Returns the smallest (closest to negative infinity)
-     * <code>double</code> value that is greater than or equal to the
-     * argument and is equal to a mathematical integer
-     *
-     * @return ceil(this)
-     * @see java.lang.Math#ceil(double)
-     */
-    public NumberExpression<T> ceil() {
-        if (ceil == null) {
-            ceil = NumberOperation.create(getType(), MathOps.CEIL, mixin);
-        }
-        return ceil;
-    }
-
-    private Class<?> getDivisionType(Class<?> left, Class<?> right) {
-        if (!left.equals(right)) {
-            return Double.class;
-        } else {
-            return left;
-        }
-    }
-
-    /**
-     * Get the result of the operation this / right
-     *
-     * @param right
-     * @return this / right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> divide(Expression<N> right) {
-        Class<?> type = getDivisionType(getType(), right.getType());
-        return NumberOperation.create((Class<T>)type, Ops.DIV, mixin, right);
-    }
-
-    /**
-     * Get the result of the operation this / right
-     *
-     * @param right
-     * @return this / right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> divide(N right) {
-        Class<?> type = getDivisionType(getType(), right.getClass());
-        return NumberOperation.create((Class<T>)type, Ops.DIV, mixin, ConstantImpl.create(right));
-    }
-
-    /**
-     * Get the double expression of this numeric expression
-     *
-     * @return this.doubleValue()
-     * @see java.lang.Number#doubleValue()
-     */
-    public NumberExpression<Double> doubleValue() {
-        return castToNum(Double.class);
-    }
-
-    /**
-     * Get the float expression of this numeric expression
-     *
-     * @return this.floatValue()
-     * @see java.lang.Number#floatValue()
-     */
-    public NumberExpression<Float> floatValue() {
-        return castToNum(Float.class);
-    }
-
-    /**
-     * Returns the largest (closest to positive infinity)
-     * <code>double</code> value that is less than or equal to the
-     * argument and is equal to a mathematical integer.
-     *
-     * @return floor(this)
-     * @see java.lang.Math#floor(double)
-     */
-    public NumberExpression<T> floor() {
-        if (floor == null) {
-            floor = NumberOperation.create(getType(), MathOps.FLOOR, mixin);
-        }
-        return floor;
-    }
-
-    /**
-     * Create a <code>this &gt;= right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this >= right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression goe(A right) {
-        return goe(ConstantImpl.create(cast(right)));
-    }
-
-    /**
-     * Create a <code>this &gt;= right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this >= right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression goe(Expression<A> right) {
-        return BooleanOperation.create(Ops.GOE, mixin, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression goeAll(CollectionExpression<?, ? super T> right) {
-        return goe(ExpressionUtils.<T>all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression goeAny(CollectionExpression<?, ? super T> right) {
-        return goe(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Create a <code>this &gt; right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this > right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression gt(A right) {
-        return gt(ConstantImpl.create(cast(right)));
-    }
-
-    /**
-     * Create a <code>this &gt; right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this > right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression gt(Expression<A> right) {
-        return BooleanOperation.create(Ops.GT, mixin, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression gtAll(CollectionExpression<?, ? super T> right) {
-        return gt(ExpressionUtils.<T>all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression gtAny(CollectionExpression<?, ? super T> right) {
-        return gt(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Create a <code>from &lt; this &lt; to</code> expression
-     *
-     * @param <A>
-     * @param from
-     * @param to
-     * @return
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression between(@Nullable A from, @Nullable A to) {
-        if (from == null) {
-            if (to != null) {
-                return BooleanOperation.create(Ops.LOE, mixin, ConstantImpl.create(to));
-            } else {
-                throw new IllegalArgumentException("Either from or to needs to be non-null");
-            }
-        } else if (to == null) {
-            return BooleanOperation.create(Ops.GOE, mixin, ConstantImpl.create(from));
-        } else {
-            return BooleanOperation.create(Ops.BETWEEN, mixin, ConstantImpl.create(from), ConstantImpl.create(to));
-        }
-    }
-
-    /**
-     * Create a <code>from &lt; this &lt; to</code> expression
-     *
-     * @param <A>
-     * @param from
-     * @param to
-     * @return
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression between(@Nullable Expression<A> from, @Nullable Expression<A> to) {
-        if (from == null) {
-            if (to != null) {
-                return BooleanOperation.create(Ops.LOE, mixin, to);
-            } else {
-                throw new IllegalArgumentException("Either from or to needs to be non-null");
-            }
-        } else if (to == null) {
-            return BooleanOperation.create(Ops.GOE, mixin, from);
-        } else {
-            return BooleanOperation.create(Ops.BETWEEN, mixin, from, to);
-        }
-    }
-
-    /**
-     * @param from
-     * @param to
-     * @return
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression notBetween(A from, A to) {
-        return between(from, to).not();
-    }
-
-    /**
-     * @param from
-     * @param to
-     * @return
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression notBetween(Expression<A> from, Expression<A> to) {
-        return between(from, to).not();
-    }
-
-    /**
-     * Get the int expression of this numeric expression
-     *
-     * @return this.intValue()
-     * @see java.lang.Number#intValue()
-     */
-    public NumberExpression<Integer> intValue() {
-        return castToNum(Integer.class);
-    }
-
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(String str) {
-        return BooleanOperation.create(Ops.LIKE, stringValue(), ConstantImpl.create(str));
-    }
-
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(Expression<String> str) {
-        return BooleanOperation.create(Ops.LIKE, stringValue(), str);
-    }
-
-    /**
-     * Create a <code>this &lt;= right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this <= right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression loe(A right) {
-        return loe(ConstantImpl.create(cast(right)));
-    }
-
-    /**
-     * Create a <code>this &lt;= right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this <= right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression loe(Expression<A> right) {
-        return BooleanOperation.create(Ops.LOE, mixin, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression loeAll(CollectionExpression<?, ? super T> right) {
-        return loe(ExpressionUtils.<T>all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression loeAny(CollectionExpression<?, ? super T> right) {
-        return loe(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Get the long expression of this numeric expression
-     *
-     * @return this.longValue()
-     * @see java.lang.Number#longValue()
-     */
-    public NumberExpression<Long> longValue() {
-        return castToNum(Long.class);
-    }
-
-    /**
-     * Create a <code>this &lt; right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this < right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression lt(A right) {
-        return lt(ConstantImpl.create(cast(right)));
-    }
-
-    /**
-     * Create a <code>this &lt; right</code> expression
-     *
-     * @param <A>
-     * @param right rhs of the comparison
-     * @return this < right
-     * @see java.lang.Comparable#compareTo(Object)
-     */
-    public final <A extends Number & Comparable<?>> BooleanExpression lt(Expression<A> right) {
-        return BooleanOperation.create(Ops.LT, this, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression ltAll(CollectionExpression<?, ? super T> right) {
-        return lt(ExpressionUtils.<T>all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression ltAny(CollectionExpression<?, ? super T> right) {
-        return lt(ExpressionUtils.<T>any(right));
-    }
-
-    /**
-     * Get the maximum value of this expression (aggregation)
-     *
-     * @return max(this)
-     */
-    @SuppressWarnings("unchecked")
-    public NumberExpression<T> max() {
-        if (max == null) {
-            max = NumberOperation.create(getType(), Ops.AggOps.MAX_AGG, mixin);
-        }
-        return max;
-    }
-
-    /**
-     * Get the minimum value of this expression (aggregation)
-     *
-     * @return min(this)
-     */
-    @SuppressWarnings("unchecked")
-    public NumberExpression<T> min() {
-        if (min == null) {
-            min = NumberOperation.create(getType(), Ops.AggOps.MIN_AGG, mixin);
-        }
-        return min;
-    }
-
-    /**
-     * @param num
-     * @return
-     */
-    public NumberExpression<T> mod(Expression<T> num) {
-        return NumberOperation.create(getType(), Ops.MOD, mixin, num);
-    }
-
-    /**
-     * @param num
-     * @return
-     */
-    public NumberExpression<T> mod(T num) {
-        return NumberOperation.create(getType(), Ops.MOD, mixin, ConstantImpl.create(num));
-    }
-
-    /**
-     * Get the result of the operation this * right
-     *
-     * @param right
-     * @return this * right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> multiply(Expression<N> right) {
-        return NumberOperation.create(getType(), Ops.MULT, mixin, right);
-    }
-
-    /**
-     * Get the result of the operation this * right
-     *
-     * @param right
-     * @return this * right
-     */
-    public <N extends Number & Comparable<N>> NumberExpression<T> multiply(N right) {
-        return NumberOperation.create(getType(), Ops.MULT, mixin, ConstantImpl.create(right));
-    }
-
-    /**
-     * Get the negation of this expression
-     *
-     * @return this * -1
-     */
-    public NumberExpression<T> negate() {
-        if (negation == null) {
-            negation = NumberOperation.create(getType(), Ops.NEGATE, mixin);
-        }
-        return negation;
-    }
-
-    /**
-     * Returns the closest <code>int</code> to the argument.
-     *
-     * @return round(this)
-     * @see java.lang.Math#round(double)
-     * @see java.lang.Math#round(float)
-     */
-    public NumberExpression<T> round() {
-        if (round == null) {
-            round = NumberOperation.create(getType(), MathOps.ROUND, mixin);
-        }
-        return round;
-    }
-
-    /**
-     * Get the short expression of this numeric expression
-     *
-     * @return this.shortValue()
-     * @see java.lang.Number#shortValue()
-     */
-    public NumberExpression<Short> shortValue() {
-        return castToNum(Short.class);
-    }
-
-    /**
-     * Get the square root of this numeric expressions
-     *
-     * @return sqrt(this)
-     */
-    public NumberExpression<Double> sqrt() {
-        if (sqrt == null) {
-            sqrt = NumberOperation.create(Double.class, MathOps.SQRT, mixin);
-        }
-        return sqrt;
-    }
-
-    /**
-     * Get the difference of this and right
-     *
-     * @param right
-     * @return this - right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> subtract(Expression<N> right) {
-        return NumberOperation.create(getType(), Ops.SUB, mixin, right);
-    }
-
-    /**
-     * Get the difference of this and right
-     *
-     * @param right
-     * @return this - right
-     */
-    public <N extends Number & Comparable<?>> NumberExpression<T> subtract(N right) {
-        return NumberOperation.create(getType(), Ops.SUB, mixin, ConstantImpl.create(right));
-    }
-
-    /**
-     * Get the sum of this expression (aggregation)
-     *
-     * @return sum(this)
-     */
-    public NumberExpression<T> sum() {
-        if (sum == null) {
-            sum = NumberOperation.create(getType(), Ops.AggOps.SUM_AGG, mixin);
-        }
-        return sum;
-    }
-
-    @Override
-    public BooleanExpression in(Number... numbers) {
-        return super.in(convert(numbers));
-    }
-
-    @Override
-    public BooleanExpression notIn(Number... numbers) {
-        return super.notIn(convert(numbers));
-    }
-
-    private List<T> convert(Number... numbers) {
-        List<T> list = new ArrayList<T>(numbers.length);
-        for (int i = 0; i < numbers.length; i++) {
-            list.add(MathUtils.cast(numbers[i], getType()));
-        }
-        return list;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberOperation.java
deleted file mode 100644
index 51e5b5c7a2..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/NumberOperation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Visitor;
-
-/**
- * NumberOperation represents numeric operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class NumberOperation<T extends Number & Comparable<?>>
-        extends NumberExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = -3593040852095778453L;
-
-    public static <D extends Number & Comparable<?>> NumberExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?> one) {
-        return new NumberOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D extends Number & Comparable<?>> NumberExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new NumberOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-    
-    public static <D extends Number & Comparable<?>> NumberExpression<D> create(Class<? extends D> type, Operator<? super D> op, Expression<?>... args) {
-        return new NumberOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected NumberOperation(Class<? extends T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected NumberOperation(Class<? extends T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public NumberExpression<T> negate() {
-        if (opMixin.getOperator() == Ops.NEGATE) {
-            return (NumberExpression<T>) opMixin.getArg(0);
-        } else {
-            return super.negate();
-        }
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-    
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java
deleted file mode 100644
index af30fd30fe..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamExpressionImpl;
-import com.mysema.query.types.Visitor;
-
-/**
- * Param defines a parameter in a query with an optional name
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class Param<T> extends SimpleExpression<T> implements ParamExpression<T> {
-
-    private static final long serialVersionUID = -6872502615009012503L;
-
-    private final ParamExpression<T> paramMixin;
-    
-    public Param(Class<? extends T> type, String name) {
-        super(new ParamExpressionImpl<T>(type, name));
-        this.paramMixin = (ParamExpression<T>)mixin;
-    }
-
-    public Param(Class<? extends T> type) {
-        super(new ParamExpressionImpl<T>(type));
-        this.paramMixin = (ParamExpression<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    public String getName() {
-        return paramMixin.getName();
-    }
-
-    public boolean isAnon() {
-        return paramMixin.isAnon();
-    }
-
-    public String getNotSetMessage() {
-        return paramMixin.getNotSetMessage();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java
deleted file mode 100644
index f61afb457e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleExpression.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * SimpleExpression is the base class for Expression implementations.
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public abstract class SimpleExpression<T> extends DslExpression<T> {
-
-    private static final long serialVersionUID = -4405387187738167105L;
-
-    @Nullable
-    private volatile NumberExpression<Long> count;
-
-    @Nullable
-    private volatile NumberExpression<Long> countDistinct;
-
-    @Nullable
-    private volatile BooleanExpression isnull, isnotnull;
-
-    public SimpleExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public SimpleExpression<T> as(Path<T> alias) {
-        return SimpleOperation.create((Class<T>)getType(),Ops.ALIAS, mixin, alias);
-    }
-
-    /**
-     * Create an alias for the expression
-     *
-     * @return
-     */
-    @Override
-    public SimpleExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-
-    /**
-     * Create a <code>this is not null</code> expression
-     *
-     * @return
-     */
-    public BooleanExpression isNotNull() {
-        if (isnotnull == null) {
-            isnotnull = BooleanOperation.create(Ops.IS_NOT_NULL, mixin);
-        }
-        return isnotnull;
-    }
-
-    /**
-     * Create a <code>this is null</code> expression
-     *
-     * @return
-     */
-    public BooleanExpression isNull() {
-        if (isnull == null) {
-            isnull = BooleanOperation.create(Ops.IS_NULL, mixin);
-        }
-        return isnull;
-    }
-
-    /**
-     * Get the <code>count(this)</code> expression
-     *
-     * @return count(this)
-     */
-    public NumberExpression<Long> count() {
-        if (count == null) {
-            count = NumberOperation.create(Long.class, Ops.AggOps.COUNT_AGG, mixin);
-        }
-        return count;
-    }
-
-
-    /**
-     * Get the <code>count(distinct this)</code> expression
-     *
-     * @return count(distinct this)
-     */
-    public NumberExpression<Long> countDistinct() {
-        if (countDistinct == null) {
-            countDistinct = NumberOperation.create(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG, mixin);
-        }
-        return countDistinct;
-    }
-
-    /**
-     * Get a <code>this == right</code> expression
-     *
-     * <p>Use expr.isNull() instead of expr.eq(null)</p>
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression eq(T right) {
-        if (right == null) {
-            throw new IllegalArgumentException("eq(null) is not allowed. Use isNull() instead");
-        } else {
-            return eq(ConstantImpl.create(right));
-        }
-    }
-
-    /**
-     * Get a <code>this == right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression eq(Expression<? super T> right) {
-        return BooleanOperation.create(Ops.EQ, mixin, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression eqAll(CollectionExpression<?, ? super T> right) {
-        return eq(ExpressionUtils.all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression eqAny(CollectionExpression<?, ? super T> right) {
-        return eq(ExpressionUtils.any(right));
-    }
-
-    /**
-     * Get a <code>this in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression in(Collection<? extends T> right) {
-        if (right.size() == 1) {
-            return eq(right.iterator().next());
-        } else {
-            return BooleanOperation.create(Ops.IN, mixin, ConstantImpl.create(right));
-        }
-    }
-
-    /**
-     * Get a <code>this in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression in(T... right) {
-        if (right.length == 1) {
-            return eq(right[0]);
-        } else {
-            return BooleanOperation.create(Ops.IN, mixin, ConstantImpl.create(ImmutableList.copyOf(right)));
-        }
-    }
-
-
-    /**
-     * Get a <code>this in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression in(CollectionExpression<?,? extends T> right) {
-        return BooleanOperation.create(Ops.IN, mixin, right);
-    }
-
-    /**
-     * Get a <code>this &lt;&gt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression ne(T right) {
-        return ne(ConstantImpl.create(right));
-    }
-
-    /**
-     * Get a <code>this &lt;&gt; right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression ne(Expression<? super T> right) {
-        return BooleanOperation.create(Ops.NE, mixin, right);
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression neAll(CollectionExpression<?, ? super T> right) {
-        return ne(ExpressionUtils.all(right));
-    }
-
-    /**
-     * @param right
-     * @return
-     */
-    public BooleanExpression neAny(CollectionExpression<?, ? super T> right) {
-        return ne(ExpressionUtils.any(right));
-    }
-
-    /**
-     * Get a <code>this not in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression notIn(Collection<? extends T> right) {
-        if (right.size() == 1) {
-            return ne(right.iterator().next());
-        } else {
-            return BooleanOperation.create(Ops.NOT_IN, mixin, ConstantImpl.create(right));
-        }
-    }
-
-    /**
-     * Get a <code>this not in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public BooleanExpression notIn(T... right) {
-        if (right.length == 1) {
-            return ne(right[0]);
-        } else {
-            return BooleanOperation.create(Ops.NOT_IN, mixin, ConstantImpl.create(ImmutableList.copyOf(right)));
-        }
-    }
-
-    /**
-     * Get a <code>this not in right</code> expression
-     *
-     * @param right rhs of the comparison
-     * @return
-     */
-    public final BooleanExpression notIn(CollectionExpression<?,? extends T> right) {
-        return BooleanOperation.create(Ops.NOT_IN, mixin, right);
-    }
-
-
-    /**
-     * Get a <code>nullif(this, other)</code> expression
-     *
-     * @param expr
-     * @param other
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public SimpleExpression<T> nullif(Expression<T> other) {
-        return SimpleOperation.create((Class<T>)this.getType(), Ops.NULLIF, this, other);
-    }
-
-    /**
-     * Get a <code>nullif(this, other)</code> expression
-     *
-     * @param expr
-     * @param other
-     * @return
-     */
-    public SimpleExpression<T> nullif(T other) {
-        return nullif(ConstantImpl.create(other));
-    }
-
-    /**
-     * Get a case expression builder
-     *
-     * @param other
-     * @return
-     */
-    public CaseForEqBuilder<T> when(T other) {
-        return new CaseForEqBuilder<T>(mixin, ConstantImpl.create(other));
-    }
-
-    /**
-     * Get a case expression builder
-     *
-     * @param other
-     * @return
-     */
-    public CaseForEqBuilder<T> when(Expression<? extends T> other) {
-        return new CaseForEqBuilder<T>(mixin, other);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleOperation.java
deleted file mode 100644
index d0c756430e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/SimpleOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * SimpleOperation represents a simple operation expression
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class SimpleOperation<T> extends SimpleExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = -285668548371034230L;
-
-    public static <D> SimpleExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new SimpleOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D> SimpleExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new SimpleOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-    
-    public static <D> SimpleExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new SimpleOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl< T> opMixin;
-
-    protected SimpleOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected SimpleOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java
deleted file mode 100644
index 82cf44cb7d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpression.java
+++ /dev/null
@@ -1,693 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * StringExpression represents {@link java.lang.String} expressions
- *
- * @author tiwe
- * @see java.lang.String
- */
-public abstract class StringExpression extends ComparableExpression<String> {
-
-    private static final long serialVersionUID = 1536955079961023361L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> length;
-
-    @Nullable
-    private volatile StringExpression lower, trim, upper;
-
-    @Nullable
-    private volatile StringExpression min, max;
-
-    @Nullable
-    private volatile BooleanExpression isempty;
-
-    public StringExpression(Expression<String> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public StringExpression as(Path<String> alias) {
-        return StringOperation.create(Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public StringExpression as(String alias) {
-        return as(new PathImpl<String>(String.class, alias));
-    }
-
-    /**
-     * Get the concatenation of this and str
-     *
-     * @param str
-     * @return this + str
-     */
-    public StringExpression append(Expression<String> str) {
-        return StringOperation.create(Ops.CONCAT, mixin, str);
-    }
-
-    /**
-     * Get the concatenation of this and str
-     *
-     * @param str
-     * @return this + str
-     */
-    public StringExpression append(String str) {
-        return append(ConstantImpl.create(str));
-    }
-
-    /**
-     * Get the character at the given index
-     *
-     * @param i
-     * @return this.charAt(i)
-     * @see java.lang.String#charAt(int)
-     */
-    public SimpleExpression<Character> charAt(Expression<Integer> i) {
-        return ComparableOperation.create(Character.class, Ops.CHAR_AT, mixin, i);
-    }
-
-    /**
-     * Get the character at the given index
-     *
-     * @param i
-     * @return this.charAt(i)
-     * @see java.lang.String#charAt(int)
-     */
-    public SimpleExpression<Character> charAt(int i) {
-        return charAt(ConstantImpl.create(i));
-    }
-    
-    /**
-     * Get the concatenation of this and str
-     *
-     * @param str
-     * @return this + str
-     */
-    public StringExpression concat(Expression<String> str) {
-        return append(str);
-    }
-
-    /**
-     * Get the concatenation of this and str
-     *
-     * @param str
-     * @return this + str
-     */
-    public StringExpression concat(String str) {
-        return append(str);
-    }
-
-    /**
-     * Returns true if the given String is contained
-     *
-     * @param str
-     * @return this.contains(str)
-     * @see java.lang.String#contains(CharSequence)
-     */
-    public BooleanExpression contains(Expression<String> str) {
-        return BooleanOperation.create(Ops.STRING_CONTAINS, mixin, str);
-    }
-
-    /**
-     * Returns true if the given String is contained
-     *
-     * @param str
-     * @return this.contains(str)
-     * @see java.lang.String#contains(CharSequence)
-     */
-    public BooleanExpression contains(String str) {
-        return contains(ConstantImpl.create(str));
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression containsIgnoreCase(Expression<String> str) {
-        return BooleanOperation.create(Ops.STRING_CONTAINS_IC, mixin, str);
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression containsIgnoreCase(String str) {
-        return containsIgnoreCase(ConstantImpl.create(str));
-    }
-
-    /**
-     * Returns true if this ends with str
-     *
-     * @param str
-     * @return this.endsWith(str)
-     * @see java.lang.String#endsWith(String)
-     */
-    public BooleanExpression endsWith(Expression<String> str) {
-        return BooleanOperation.create(Ops.ENDS_WITH, mixin, str);
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression endsWithIgnoreCase(Expression<String> str) {
-        return BooleanOperation.create(Ops.ENDS_WITH_IC, mixin, str);
-    }
-
-    /**
-     * Returns true if this ends with str
-     *
-     * @param str
-     * @return this.endsWith(str)
-     * @see java.lang.String#endsWith(String)
-     */
-    public BooleanExpression endsWith(String str) {
-        return endsWith(ConstantImpl.create(str));
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression endsWithIgnoreCase(String str) {
-        return endsWithIgnoreCase(ConstantImpl.create(str));
-    }
-
-    /**
-     * Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
-     * considerations.
-     *
-     * @param str
-     * @return this.equalsIgnoreCase(str)
-     * @see java.lang.String#equalsIgnoreCase(String)
-     */
-    public BooleanExpression equalsIgnoreCase(Expression<String> str) {
-        return BooleanOperation.create(Ops.EQ_IGNORE_CASE, mixin, str);
-    }
-
-    /**
-     * Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
-     * considerations.
-     *
-     * @param str
-     * @return this.equalsIgnoreCase(str)
-     * @see java.lang.String#equalsIgnoreCase(String)
-     */
-    public BooleanExpression equalsIgnoreCase(String str) {
-        return equalsIgnoreCase(ConstantImpl.create(str));
-    }
-
-    /**
-     * Get the index of the given substring in this String
-     *
-     * @param str
-     * @return this.indexOf(str)
-     * @see java.lang.String#indexOf(String)
-     */
-    public NumberExpression<Integer> indexOf(Expression<String> str) {
-        return NumberOperation.create(Integer.class, Ops.INDEX_OF, mixin, str);
-    }
-
-    /**
-     * Get the index of the given substring in this String
-     *
-     * @param str
-     * @return this.indexOf(str)
-     * @see java.lang.String#indexOf(String)
-     */
-    public NumberExpression<Integer> indexOf(String str) {
-        return indexOf(ConstantImpl.create(str));
-    }
-
-    /**
-     * Get the index of the given substring in this String, starting from the given index
-     *
-     * @param str
-     * @param i
-     * @return this.indexOf(str, i)
-     * @see java.lang.String#indexOf(String, int)
-     */
-    public NumberExpression<Integer> indexOf(String str, int i) {
-        return indexOf(ConstantImpl.create(str), i);
-    }
-
-    /**
-     * Get the index of the given substring in this String, starting from the given index
-     *
-     * @param str
-     * @param i
-     * @return
-     */
-    public NumberExpression<Integer> indexOf(Expression<String> str, int i) {
-        return NumberOperation.create(Integer.class, Ops.INDEX_OF_2ARGS, mixin, str, ConstantImpl.create(i));
-    }
-
-    /**
-     * Return true if this String is empty
-     *
-     * @return this.isEmpty()
-     * @see java.lang.String#isEmpty()
-     */
-    public BooleanExpression isEmpty() {
-        if (isempty == null) {
-            isempty = BooleanOperation.create(Ops.STRING_IS_EMPTY, mixin);
-        }
-        return isempty;
-    }
-
-    /**
-     * Return true if this String is not empty
-     *
-     * @return !this.isEmpty()
-     * @see java.lang.String#isEmpty()
-     */
-    public BooleanExpression isNotEmpty() {
-        return isEmpty().not();
-    }
-
-    /**
-     * Return the length of this String
-     *
-     * @return this.length()
-     * @see java.lang.String#length()
-     */
-    public NumberExpression<Integer> length() {
-        if (length == null) {
-            length = NumberOperation.create(Integer.class, Ops.STRING_LENGTH, mixin);
-        }
-        return length;
-    }
-
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(String str) {
-        return BooleanOperation.create(Ops.LIKE, this, ConstantImpl.create(str));
-    }
-
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(Expression<String> str) {
-        return BooleanOperation.create(Ops.LIKE, mixin, str);
-    }
-    
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(String str, char escape) {
-        return BooleanOperation.create(Ops.LIKE_ESCAPE, mixin, ConstantImpl.create(str), ConstantImpl.create(escape));
-    }
-
-    /**
-     * Expr: <code>this like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression like(Expression<String> str, char escape) {
-        return BooleanOperation.create(Ops.LIKE_ESCAPE, mixin, str, ConstantImpl.create(escape));
-    }
-
-    /**
-     * Get the position of the given String in this String, the first position is 1
-     * 
-     * @param str
-     * @return locate(str, this)
-     */
-    public NumberExpression<Integer> locate(Expression<String> str) {
-        return NumberOperation.create(Integer.class, Ops.StringOps.LOCATE, str, mixin);
-    }
-    
-    /**
-     * Get the position of the given String in this String, the first position is 1
-     * 
-     * @param str
-     * @return locate(str, this)
-     */
-    public NumberExpression<Integer> locate(String str) {
-        return NumberOperation.create(Integer.class, Ops.StringOps.LOCATE, ConstantImpl.create(str), mixin);
-    }
-    
-    /**
-     * Get the position of the given String in this String, the first position is 1
-     * 
-     * @param str
-     * @return locate(str, this, start)
-     */
-    public NumberExpression<Integer> locate(Expression<String> str, NumberExpression<Integer> start) {
-        return NumberOperation.create(Integer.class, Ops.StringOps.LOCATE2, str, mixin, start);
-    }
-    
-    /**
-     * Get the position of the given String in this String, the first position is 1
-     * 
-     * @param str
-     * @return locate(str, this, start)
-     */
-    public NumberExpression<Integer> locate(String str, int start) {
-        return NumberOperation.create(Integer.class, Ops.StringOps.LOCATE2, ConstantImpl.create(str), mixin, ConstantImpl.create(start));
-    }
-    
-    /**
-     * Get the lower case form
-     *
-     * @return this.toLowerCase()
-     * @see java.lang.String#toLowerCase()
-     */
-    public StringExpression lower() {
-        if (lower == null) {
-            lower = StringOperation.create(Ops.LOWER, mixin);
-        }
-        return lower;
-    }
-
-    /**
-     * Return true if this String matches the given regular expression
-     * 
-     * <p>Some implementations such as Querydsl JPA will try to convert a regex expression into like 
-     * form and will throw an Exception when this fails</p>
-     *
-     * @param regex
-     * @return this.matches(right)
-     * @see java.lang.String#matches(String)
-     */
-    public BooleanExpression matches(Expression<String> regex) {
-        return BooleanOperation.create(Ops.MATCHES, mixin, regex);
-    }
-
-    /**
-     * Return true if this String matches the given regular expression
-     * 
-     * <p>Some implementations such as Querydsl JPA will try to convert a regex expression into like 
-     * form and will throw an Exception when this fails</p>
-     *
-     * @param regex
-     * @return this.matches(regex)
-     * @see java.lang.String#matches(String)
-     */
-    public BooleanExpression matches(String regex) {
-        return matches(ConstantImpl.create(regex));
-    }
-
-    /**
-     * Get the maximum value of this expression (aggregation)
-     *
-     * @return max(this)
-     */
-    public StringExpression max() {
-        if (max == null) {
-            max = StringOperation.create(Ops.AggOps.MAX_AGG, mixin);
-        }
-        return max;
-    }
-
-    /**
-     * Get the minimum value of this expression (aggregation)
-     *
-     * @return min(this)
-     */
-    public StringExpression min() {
-        if (min == null) {
-            min = StringOperation.create(Ops.AggOps.MIN_AGG, mixin);
-        }
-        return min;
-    }
-    
-    /**
-     * Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
-     * considerations.
-     *
-     * @param str
-     * @return !this.equalsIgnoreCase(str)
-     * @see java.lang.String#equalsIgnoreCase(String)
-     */
-    public BooleanExpression notEqualsIgnoreCase(Expression<String> str) {
-        return equalsIgnoreCase(str).not();
-    }
-
-
-    /**
-     * Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
-     * considerations.
-     *
-     * @param str
-     * @return !this.equalsIgnoreCase(str)
-     * @see java.lang.String#equalsIgnoreCase(String)
-     */
-    public BooleanExpression notEqualsIgnoreCase(String str) {
-        return equalsIgnoreCase(str).not();
-    }
-    
-    /**
-     * Expr: <code>this not like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression notLike(String str) {
-        return like(str).not();
-    }
-
-    /**
-     * Expr: <code>this not like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression notLike(Expression<String> str) {
-        return like(str).not();
-    }
-        
-    /**
-     * Expr: <code>this not like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression notLike(String str, char escape) {
-        return like(str, escape).not();
-    }
-
-    /**
-     * Expr: <code>this not like str</code>
-     *
-     * @param str
-     * @return
-     */
-    public BooleanExpression notLike(Expression<String> str, char escape) {
-        return like(str, escape).not();
-    }
-    
-    /**
-     * Prepend the given String and return the result
-     *
-     * @param str
-     * @return str + this
-     */
-    public StringExpression prepend(Expression<String> str) {
-        return StringOperation.create(Ops.CONCAT, str, mixin);
-    }
-
-    /**
-     * Prepend the given String and return the result
-     *
-     * @param str
-     * @return str + this
-     */
-    public StringExpression prepend(String str) {
-        return prepend(ConstantImpl.create(str));
-    }
-
-    /**
-     * Return true if this starts with str
-     *
-     * @param str
-     * @return this.startsWith(str)
-     * @see java.lang.String#startsWith(String)
-     */
-    public BooleanExpression startsWith(Expression<String> str) {
-        return BooleanOperation.create(Ops.STARTS_WITH, mixin, str);
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression startsWithIgnoreCase(Expression<String> str) {
-        return BooleanOperation.create(Ops.STARTS_WITH_IC, mixin, str);
-    }
-
-    /**
-     * Return true if this starts with str
-     *
-     * @param str
-     * @return this.startsWith(str)
-     * @see java.lang.String#startsWith(String)
-     */
-    public BooleanExpression startsWith(String str) {
-        return startsWith(ConstantImpl.create(str));
-    }
-
-    /**
-     * @param str
-     * @return
-     */
-    public BooleanExpression startsWithIgnoreCase(String str) {
-        return startsWithIgnoreCase(ConstantImpl.create(str));
-    }
-
-    @Override
-    public StringExpression stringValue() {
-        return this;
-    }
-
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @return this.substring(beginIndex)
-     * @see java.lang.String#substring(int)
-     */
-    public StringExpression substring(int beginIndex) {
-        return StringOperation.create(Ops.SUBSTR_1ARG, mixin, ConstantImpl.create(beginIndex));
-    }
-
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @param endIndex
-     * @return this.substring(beginIndex, endIndex)
-     * @see java.lang.String#substring(int, int)
-     */
-    public StringExpression substring(int beginIndex, int endIndex) {
-        return StringOperation.create(Ops.SUBSTR_2ARGS, mixin, ConstantImpl.create(beginIndex), ConstantImpl.create(endIndex));
-    }
-    
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @param endIndex
-     * @return this.substring(beginIndex, endIndex)
-     * @see java.lang.String#substring(int, int)
-     */
-    public StringExpression substring(Expression<Integer> beginIndex, int endIndex) {
-        return StringOperation.create(Ops.SUBSTR_2ARGS, mixin, beginIndex, ConstantImpl.create(endIndex));
-    }
-    
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @param endIndex
-     * @return this.substring(beginIndex, endIndex)
-     * @see java.lang.String#substring(int, int)
-     */
-    public StringExpression substring(int beginIndex, Expression<Integer> endIndex) {
-        return StringOperation.create(Ops.SUBSTR_2ARGS, mixin, ConstantImpl.create(beginIndex), endIndex);
-    }
-
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @return this.substring(beginIndex)
-     * @see java.lang.String#substring(int)
-     */
-    public StringExpression substring(Expression<Integer> beginIndex) {
-        return StringOperation.create(Ops.SUBSTR_1ARG, mixin, beginIndex);
-    }
-
-    /**
-     * Get the given substring
-     *
-     * @param beginIndex
-     * @param endIndex
-     * @return this.substring(beginIndex, endIndex)
-     * @see java.lang.String#substring(int, int)
-     */
-    public StringExpression substring(Expression<Integer> beginIndex, Expression<Integer> endIndex) {
-        return StringOperation.create(Ops.SUBSTR_2ARGS, mixin, beginIndex, endIndex);
-    }
-    
-    /**
-     * Get the lower case form
-     *
-     * @return this.toLowerCase()
-     * @see java.lang.String#toLowerCase()
-     */
-    public StringExpression toLowerCase() {
-        return lower();
-    }
-
-    /**
-     * Get the upper case form
-     *
-     * @return
-     * @see java.lang.String#toUpperCase()
-     */
-    public StringExpression toUpperCase() {
-        return upper();
-    }
-
-    /**
-     * Get a copy of the string, with leading and trailing whitespace
-     * omitted.
-     *
-     * @return
-     * @see java.lang.String#trim()
-     */
-    public StringExpression trim() {
-        if (trim == null) {
-            trim = StringOperation.create(Ops.TRIM, mixin);
-        }
-        return trim;
-    }
-
-    /**
-     * Get the upper case form
-     *
-     * @return
-     * @see java.lang.String#toUpperCase()
-     */
-    public StringExpression upper() {
-        if (upper == null) {
-            upper = StringOperation.create(Ops.UPPER, mixin);
-        }
-        return upper;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpressions.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpressions.java
deleted file mode 100644
index b9eb8dc78a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringExpressions.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-
-/**
- * Extended String expressions, supported by the SQL module
- * 
- * @author tiwe
- *
- */
-public final class StringExpressions {
-
-    /**
-     * @param str
-     * @return ltrim(str)
-     */
-    public static StringExpression ltrim(Expression<String> str) {
-        return StringOperation.create(Ops.StringOps.LTRIM, str);
-    }
-
-    /**
-     * @param str
-     * @return rtrim(str)
-     */
-    public static StringExpression rtrim(Expression<String> str) {
-        return StringOperation.create(Ops.StringOps.RTRIM, str);
-    }
-    
-    /**
-     * @param in
-     * @param length
-     * @return
-     */
-    public static StringExpression lpad(Expression<String> in, int length) {
-        return StringOperation.create(Ops.StringOps.LPAD, in, ConstantImpl.create(length));
-    }
-    
-    /**
-     * @param in
-     * @param length
-     * @return
-     */
-    public static StringExpression lpad(Expression<String> in, Expression<Integer> length) {
-        return StringOperation.create(Ops.StringOps.LPAD, in, length);
-    }
-    
-    /**
-     * @param in
-     * @param length
-     * @return
-     */
-    public static StringExpression rpad(Expression<String> in, int length) {
-        return StringOperation.create(Ops.StringOps.RPAD, in, ConstantImpl.create(length));
-    }
-    
-    /**
-     * @param in
-     * @param length
-     * @return
-     */
-    public static StringExpression rpad(Expression<String> in, Expression<Integer> length) {
-        return StringOperation.create(Ops.StringOps.RPAD, in, length);
-    }
-    
-    /**
-     * @param in
-     * @param length
-     * @param c
-     * @return
-     */
-    public static StringExpression lpad(Expression<String> in, NumberExpression<Integer> length, char c) {
-        return StringOperation.create(Ops.StringOps.LPAD2, in, length, ConstantImpl.create(c));        
-    }
-
-    /**
-     * @param in
-     * @param length
-     * @param c
-     * @return
-     */
-    public static StringExpression lpad(Expression<String> in, int length, char c) {
-        return StringOperation.create(Ops.StringOps.LPAD2, in, ConstantImpl.create(length), ConstantImpl.create(c));        
-    }
-
-    /**
-     * @param in
-     * @param length
-     * @param c
-     * @return
-     */
-    public static StringExpression rpad(Expression<String> in, NumberExpression<Integer> length, char c) {
-        return StringOperation.create(Ops.StringOps.RPAD2, in, length, ConstantImpl.create(c));        
-    }
-
-    /**
-     * @param in
-     * @param length
-     * @param c
-     * @return
-     */
-    public static StringExpression rpad(Expression<String> in, int length, char c) {
-        return StringOperation.create(Ops.StringOps.RPAD2, in, ConstantImpl.create(length), ConstantImpl.create(c));        
-    }
-    
-    private StringExpressions() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/StringOperation.java
deleted file mode 100644
index 4a9591cd09..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/StringOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * StringOperation represents a String typed operation
- *
- * @author tiwe
- *
- */
-public class StringOperation extends StringExpression implements Operation<String> {
-
-    private static final long serialVersionUID = 6846556373847139549L;
-
-    public static StringExpression create(Operator<? super String> op, Expression<?> one) {
-        return new StringOperation(op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static StringExpression create(Operator<? super String> op, Expression<?> one, Expression<?> two) {
-        return new StringOperation(op, ImmutableList.of(one, two));
-    }
-    
-    public static StringExpression create(Operator<? super String> op, Expression<?>... args) {
-        return new StringOperation(op, args);
-    }
-
-    private final OperationImpl<String> opMixin;
-
-    protected StringOperation(Operator<? super String> op, Expression<?>... args) {
-        this(op, ImmutableList.copyOf(args));
-    }
-
-    protected StringOperation(Operator<? super String> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<String>(String.class, op, args));
-        this.opMixin = (OperationImpl<String>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super String> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/TemporalExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/TemporalExpression.java
deleted file mode 100644
index 05c1798285..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/TemporalExpression.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.Expression;
-
-/**
- * TemporalExpression is a supertype for Date/Time related types
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@SuppressWarnings({"unchecked"})
-public abstract class TemporalExpression<T extends Comparable> extends ComparableExpression<T> {
-
-    private static final long serialVersionUID = 1137918766051524298L;
-
-    public TemporalExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Get a <code>this &gt; right</code> expression
-     *
-     * @param right
-     * @return
-     */
-    public BooleanExpression after(T right) {
-        return gt(right);
-    }
-
-    /**
-     * Get a <code>this &gt; right</code> expression
-     *
-     * @param right
-     * @return
-     */
-    public BooleanExpression after(Expression<T> right) {
-        return gt(right);
-    }
-
-    /**
-     * Get a <code>this &lt; right</code> expression
-     *
-     * @param right
-     * @return
-     */
-    public BooleanExpression before(T right) {
-        return lt(right);
-    }
-
-    /**
-     * Get a <code>this &lt; right</code> expression
-     *
-     * @param right
-     * @return
-     */
-    public BooleanExpression before(Expression<T> right) {
-        return lt(right);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeExpression.java
deleted file mode 100644
index 797247de4b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeExpression.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.sql.Time;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-
-/**
- * TimeExpression represents Time expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@SuppressWarnings({"unchecked"})
-public abstract class TimeExpression<T extends Comparable> extends TemporalExpression<T> {
-
-    private static final long serialVersionUID = 7360552308332457990L;
-
-    private static final TimeExpression<Time> CURRENT_TIME = currentTime(Time.class);
-
-    @Nullable
-    private volatile NumberExpression<Integer> hours, minutes, seconds, milliseconds;
-
-    public TimeExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    @Override
-    public TimeExpression<T> as(Path<T> alias) {
-        return TimeOperation.create((Class<T>)getType(),Ops.ALIAS, mixin, alias);
-    }
-
-    @Override
-    public TimeExpression<T> as(String alias) {
-        return as(new PathImpl<T>(getType(), alias));
-    }
-    
-    /**
-     * Get a hours expression (range 0-23)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> hour() {
-        if (hours == null) {
-            hours = NumberOperation.create(Integer.class, Ops.DateTimeOps.HOUR, mixin);
-        }
-        return hours;
-    }
-
-    /**
-     * Get a minutes expression (range 0-59)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> minute() {
-        if (minutes == null) {
-            minutes = NumberOperation.create(Integer.class, Ops.DateTimeOps.MINUTE, mixin);
-        }
-        return minutes;
-    }
-
-    /**
-     * Get a seconds expression (range 0-59)
-     *
-     * @return
-     */
-    public NumberExpression<Integer> second() {
-        if (seconds == null) {
-            seconds = NumberOperation.create(Integer.class, Ops.DateTimeOps.SECOND, mixin);
-        }
-        return seconds;
-    }
-
-    /**
-     * Get a milliseconds expression (range 0-999)
-     * <p>Is always 0 in JPA and JDO modules</p>
-     *
-     * @return
-     */
-    public NumberExpression<Integer> milliSecond() {
-        if (milliseconds == null) { 
-            milliseconds = NumberOperation.create(Integer.class, Ops.DateTimeOps.MILLISECOND, mixin);
-        }
-        return milliseconds;
-    }
-
-    /**
-     * Get an expression representing the current time as a TimeExpression instance
-     *
-     * @return
-     */
-    public static TimeExpression<Time> currentTime() {
-        return CURRENT_TIME;
-    }
-
-    /**
-     * Get an expression representing the current time as a TimeExpression instance
-     *
-     * @return
-     */
-    public static <T extends Comparable> TimeExpression<T> currentTime(Class<T> cl) {
-        return TimeOperation.create(cl, Ops.DateTimeOps.CURRENT_TIME);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java
deleted file mode 100644
index 97b1be91ef..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/TimeOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * TimeOperation represents Time operations
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class TimeOperation<T extends Comparable<?>> extends TimeExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 9051606798649239240L;
-
-    public static <D extends Comparable<?>> TimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new TimeOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-    
-    public static <D extends Comparable<?>> TimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new TimeOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-        
-    public static <D extends Comparable<?>> TimeExpression<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new TimeOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl<T> opMixin;
-
-    protected TimeOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected TimeOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/Wildcard.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/Wildcard.java
deleted file mode 100644
index b803599433..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/Wildcard.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-/**
- * Wildcard provides constant Expressions for general wildcard expressions
- * 
- * @author tiwe
- *
- */
-public final class Wildcard {
-    
-    /**
-     * Wilcard expression (*) for all columns
-     */
-    public static final Expression<Object[]> all = TemplateExpressionImpl.create(Object[].class, "*");
-
-    /**
-     * Wildcard count expression (count(*))
-     */
-    public static final NumberExpression<Long> count = NumberOperation.create(Long.class, Ops.AggOps.COUNT_ALL_AGG);
-    
-    /**
-     * Wilcard count distinct expression ((count(distinct *))
-     */
-    public static final NumberExpression<Long> countDistinct = NumberOperation.create(Long.class, Ops.AggOps.COUNT_DISTINCT_ALL_AGG);
-
-    /**
-     * Wilcard count distinct expression ((count(distinct *))
-     */
-    public static final NumberExpression<Integer> countAsInt = NumberOperation.create(Integer.class, (Operator)Ops.AggOps.COUNT_ALL_AGG);
-
-    private Wildcard() {}
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/package-info.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/package-info.java
deleted file mode 100644
index d43eab0f68..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Operations represent typed operations with operator and arguments
- */
-package com.mysema.query.types.expr;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/package-info.java b/querydsl-core/src/main/java/com/mysema/query/types/package-info.java
deleted file mode 100644
index 9ea857a637..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains Querydsl grammar types
- */
-package com.mysema.query.types;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/ArrayPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/ArrayPath.java
deleted file mode 100644
index 789b48948a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/ArrayPath.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import javax.annotation.Nonnegative;
-import javax.annotation.Nullable;
-
-import com.google.common.primitives.Primitives;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ArrayExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * ArrayPath represents an array typed path
- *
- * @author tiwe
- * 
- * @param <A> array type
- * @param <E> component type
- */
-public class ArrayPath<A, E> extends SimpleExpression<A> implements Path<A>, ArrayExpression<A, E> {
-
-    private static final long serialVersionUID = 7795049264874048226L;
-
-    private final Class<E> componentType;
-
-    private final PathImpl<A> pathMixin;
-
-    @Nullable
-    private volatile NumberExpression<Integer> size;
-
-    public ArrayPath(Class<? super A> type, String variable) {
-        this(type, PathMetadataFactory.forVariable(variable));
-    }
-    
-    public ArrayPath(Class<? super A> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-    
-    @SuppressWarnings("unchecked")
-    public ArrayPath(Class<? super A> type, PathMetadata<?> metadata) {
-        super(new PathImpl<A>((Class)type, metadata));
-        this.pathMixin = (PathImpl<A>)mixin;
-        this.componentType = Primitives.wrap((Class<E>)type.getComponentType());
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    /**
-     * Create a expression for indexed access
-     *
-     * @param index
-     * @return
-     */
-    public SimplePath<E> get(Expression<Integer> index) {
-        PathMetadata<Integer> md = PathMetadataFactory.forArrayAccess(pathMixin, index);
-        return new SimplePath<E>(componentType, md);
-    }
-
-    /**
-     * Create a expression for indexed access
-     *
-     * @param index
-     * @return
-     */
-    public SimplePath<E> get(@Nonnegative int index) {
-        PathMetadata<Integer> md = PathMetadataFactory.forArrayAccess(pathMixin, index);
-        return new SimplePath<E>(componentType, md);
-    }
-
-    public Class<E> getElementType() {
-        return componentType;
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-    /**
-     * Create an expression for the array size
-     *
-     * @return
-     */
-    public NumberExpression<Integer> size() {
-        if (size == null) {
-            size = NumberOperation.create(Integer.class, Ops.ARRAY_SIZE, pathMixin);
-        }
-        return size;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/BeanPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/BeanPath.java
deleted file mode 100644
index 4f3c3d0513..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/BeanPath.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.ExpressionException;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * BeanPath represents bean paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class BeanPath<T> extends SimpleExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = -1845524024957822731L;
-
-    private final Map<Class<?>, Object> casts = new HashMap<Class<?>, Object>();
-
-    @Nullable
-    private final PathInits inits;
-
-    private final PathImpl<T> pathMixin;
-
-    public BeanPath(Class<? extends T> type, String variable) {
-        this(type, PathMetadataFactory.forVariable(variable), null);
-    }
-
-    public BeanPath(Class<? extends T> type, Path<?> parent,  String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property), null);
-    }
-
-    public BeanPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        this(type, metadata, null);
-    }
-
-    public BeanPath(Class<? extends T> type, PathMetadata<?> metadata, @Nullable PathInits inits) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-        this.inits = inits;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        // mixin is not used here, because subtype instances may have data that needs to be made available
-        return v.visit(this, context);
-    }
-
-    /**
-     * Cast the path to a subtype querytype
-     *
-     * @param <T>
-     * @param clazz
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <U extends BeanPath<? extends T>> U as(Class<U> clazz) {
-        try {
-            if (!casts.containsKey(clazz)) {
-                PathMetadata<T> metadata;
-                if (pathMixin.getMetadata().getPathType() != PathType.COLLECTION_ANY) {
-                    metadata = PathMetadataFactory.forDelegate(pathMixin);
-                } else {
-                    metadata = (PathMetadata)pathMixin.getMetadata();
-                }
-                U rv;
-                // the inits for the subtype will be wider, if it's a variable path
-                if (inits != null && pathMixin.getMetadata().getPathType() != PathType.VARIABLE) {
-                    rv = clazz.getConstructor(PathMetadata.class, PathInits.class).newInstance(metadata, inits);
-                } else {
-                    rv = clazz.getConstructor(PathMetadata.class).newInstance(metadata);
-                }
-                casts.put(clazz, rv);
-                return rv;
-            } else {
-                return (U) casts.get(clazz);
-            }
-
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        } catch (NoSuchMethodException e) {
-            throw new ExpressionException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Template method for tracking child path creation
-     *
-     * @param <P>
-     * @param path
-     * @return
-     */
-    protected <P extends Path<?>> P add(P path) {
-        return path;
-    }
-
-    /**
-     * Create a new array path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    protected <A, E> ArrayPath<A, E> createArray(String property, Class<? super A> type) {
-        return add(new ArrayPath<A, E>(type, forProperty(property)));
-    }
-
-    /**
-     * Create a new Boolean path
-     *
-     * @param property
-     * @return
-     */
-    protected BooleanPath createBoolean(String property) {
-        return add(new BooleanPath(forProperty(property)));
-    }
-
-    /**
-     * Create a new Collection typed path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A, Q extends SimpleExpression<? super A>> CollectionPath<A, Q> createCollection(String property, Class<? super A> type, Class<? super Q> queryType, PathInits inits) {
-        return add(new CollectionPath<A, Q>(type, (Class) queryType, forProperty(property), inits));
-    }
-
-    /**
-     * Create a new Comparable typed path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A extends Comparable> ComparablePath<A> createComparable(String property, Class<? super A> type) {
-        return add(new ComparablePath<A>((Class) type, forProperty(property)));
-    }
-
-    /**
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    protected <A extends Enum<A>> EnumPath<A> createEnum(String property, Class<A> type) {
-        return add(new EnumPath<A>(type, forProperty(property)));
-    }
-
-
-    /**
-     * Create a new Date path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A extends Comparable> DatePath<A> createDate(String property, Class<? super A> type) {
-        return add(new DatePath<A>((Class) type, forProperty(property)));
-    }
-
-    /**
-     * Create a new DateTime path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A extends Comparable> DateTimePath<A> createDateTime(String property, Class<? super A> type) {
-        return add(new DateTimePath<A>((Class) type, forProperty(property)));
-    }
-
-    /**
-     * Create a new List typed path
-     *
-     * @param <A>
-     * @param <E>
-     * @param property
-     * @param type
-     * @param queryType
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A, E extends SimpleExpression<? super A>> ListPath<A, E> createList(String property, Class<? super A> type, Class<? super E> queryType, PathInits inits) {
-        return add(new ListPath<A, E>(type, (Class) queryType, forProperty(property), inits));
-    }
-
-    /**
-     * Create a new Map typed path
-     *
-     * @param <K>
-     * @param <V>
-     * @param <E>
-     * @param property
-     * @param key
-     * @param value
-     * @param queryType
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <K, V, E extends SimpleExpression<? super V>> MapPath<K, V, E> createMap(String property, Class<? super K> key, Class<? super V> value, Class<? super E> queryType) {
-        return add(new MapPath<K, V, E>(key, value, (Class) queryType, forProperty(property)));
-    }
-
-    /**
-     * Create a new Number path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A extends Number & Comparable<?>> NumberPath<A> createNumber(String property, Class<? super A> type) {
-        return add(new NumberPath<A>((Class) type, forProperty(property)));
-    }
-
-    /**
-     * Create a new Set typed path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A, E extends SimpleExpression<? super A>> SetPath<A, E> createSet(String property, Class<? super A> type, Class<? super E> queryType, PathInits inits) {
-        return add(new SetPath<A, E>(type, (Class) queryType, forProperty(property), inits));
-    }
-
-    /**
-     * Create a new Simpe path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A> SimplePath<A> createSimple(String property, Class<? super A> type) {
-        return add(new SimplePath<A>((Class<A>) type, forProperty(property)));
-    }
-
-    /**
-     * Create a new String path
-     *
-     * @param property
-     * @return
-     */
-    protected StringPath createString(String property) {
-        return add(new StringPath(forProperty(property)));
-    }
-
-    /**
-     * Create a new Time path
-     *
-     * @param <A>
-     * @param property
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    protected <A extends Comparable> TimePath<A> createTime(String property, Class<? super A> type) {
-        return add(new TimePath<A>((Class) type, forProperty(property)));
-    }
-
-    protected PathMetadata<?> forProperty(String property) {
-        return PathMetadataFactory.forProperty(this, property);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    /**
-     * Create an <code>this instanceOf type</code> expression
-     *
-     * @param <B>
-     * @param type
-     * @return
-     */
-    public <B extends T> BooleanExpression instanceOf(Class<B> type) {
-        return BooleanOperation.create(Ops.INSTANCE_OF, pathMixin, ConstantImpl.create(type));
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public BooleanExpression instanceOfAny(Class... types) {
-        BooleanExpression[] exprs = new BooleanExpression[types.length];
-        for (int i = 0; i < types.length; i++) {
-            exprs[i] = this.instanceOf(types[i]);
-        }
-        return BooleanExpression.anyOf(exprs);
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/BooleanPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/BooleanPath.java
deleted file mode 100644
index 78403f4f4a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/BooleanPath.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * BooleanPath represents boolean path expressions
- *
- * @author tiwe
- * @see java.lang.Boolean
- *
- */
-public class BooleanPath extends BooleanExpression implements Path<Boolean> {
-
-    private static final long serialVersionUID = 6590516706769430565L;
-
-    private final PathImpl<Boolean> pathMixin;
-
-    public BooleanPath(Path<?> parent, String property) {
-        this(PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public BooleanPath(PathMetadata<?> metadata) {
-        super(new PathImpl<Boolean>(Boolean.class, metadata));
-        this.pathMixin = (PathImpl<Boolean>)mixin;
-    }
-
-    public BooleanPath(String var) {
-        this(PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPath.java
deleted file mode 100644
index adc783af00..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPath.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * CollectionPath represents collection paths
- *
- * @author tiwe
- *
- * @param <E> component type
- * @param <Q> component query type
- */
-public class CollectionPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<Collection<E>, E, Q> {    
-
-    private static final long serialVersionUID = -4982311799113762600L;
-
-    private final Class<E> elementType;
-
-    private final PathImpl<Collection<E>> pathMixin;
-
-    @Nullable
-    private transient Q any;
-    
-    private final Class<Q> queryType;
-    
-    public CollectionPath(Class<? super E> type, Class<Q> queryType, String variable) {
-        this(type, queryType, PathMetadataFactory.forVariable(variable));
-    }
-    
-    public CollectionPath(Class<? super E> type, Class<Q> queryType, Path<?> parent, String property) {
-        this(type, queryType, PathMetadataFactory.forProperty(parent, property));
-    }
-    
-    public CollectionPath(Class<? super E> type, Class<Q> queryType, PathMetadata<?> metadata) {
-        this(type, queryType, metadata, PathInits.DIRECT);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public CollectionPath(Class<? super E> type, Class<Q> queryType, PathMetadata<?> metadata, PathInits inits) {
-        super(new PathImpl<Collection<E>>((Class)Collection.class, metadata), inits);
-        this.elementType = (Class<E>)type;
-        this.queryType = queryType;
-        this.pathMixin = (PathImpl<Collection<E>>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    @Override
-    public Q any() {
-        if (any == null) {
-            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(pathMixin));
-        }
-        return any;
-    }
-
-    public Class<E> getElementType() {
-        return elementType;
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return elementType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPathBase.java b/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPathBase.java
deleted file mode 100644
index 26c4be09b2..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/CollectionPathBase.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.ExpressionException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * CollectionPath is a base class for collection typed paths
- * 
- * @author tiwe
- *
- * @param <E> component type
- * @param <Q> component query type
- */
-public abstract class CollectionPathBase<C extends Collection<E>, E, Q extends SimpleExpression<? super E>> 
-    extends CollectionExpressionBase<C, E> implements Path<C> {
-
-    private static final long serialVersionUID = -9004995667633601298L;
-   
-    @Nullable
-    private transient volatile Constructor<?> constructor;
-    
-    private volatile boolean usePathInits = false;
-
-    private final PathInits inits;
-    
-    public CollectionPathBase(PathImpl<C> mixin, PathInits inits) {
-        super(mixin);
-        this.inits = inits;
-    }
-    
-    public abstract Q any();
-    
-    @SuppressWarnings("unchecked")
-    protected Q newInstance(Class<Q> queryType, PathMetadata<?> pm) {
-        try{
-            if (constructor == null) {
-                if (Constants.isTyped(queryType)) {
-                    try {
-                        constructor = queryType.getConstructor(Class.class, PathMetadata.class, PathInits.class);    
-                        usePathInits = true;
-                    } catch (NoSuchMethodException e) {
-                        constructor = queryType.getConstructor(Class.class, PathMetadata.class);
-                    }                    
-                } else {
-                    try {
-                        constructor = queryType.getConstructor(PathMetadata.class, PathInits.class);
-                        usePathInits = true;
-                    } catch (NoSuchMethodException e) {
-                        constructor = queryType.getConstructor(PathMetadata.class);
-                    }    
-                }
-            }
-            if (Constants.isTyped(queryType)) {
-                if (usePathInits) {
-                    return (Q)constructor.newInstance(getElementType(), pm, inits);
-                } else {
-                    return (Q)constructor.newInstance(getElementType(), pm);    
-                }
-                
-            } else {
-                if (usePathInits) {
-                    return (Q)constructor.newInstance(pm, inits);    
-                } else {
-                    return (Q)constructor.newInstance(pm);
-                }                
-            }
-        } catch (NoSuchMethodException e) {
-            throw new ExpressionException(e);
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e);
-        }
-        
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/ComparableEntityPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/ComparableEntityPath.java
deleted file mode 100644
index 472584d571..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/ComparableEntityPath.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-
-/**
- * ComparableEntityPath extends the ComparablePath class to implement the EntityPath interface
- *
- * @author tiwe
- *
- * @param <T>
- */
-@SuppressWarnings("unchecked")
-public class ComparableEntityPath<T extends Comparable> extends ComparablePath<T> implements EntityPath<T> {
-
-    private static final long serialVersionUID = -7115848171352092315L;
-
-    public ComparableEntityPath(Class<? extends T> type, Path<?> parent, String property) {
-        super(type, parent, property);
-    }
-
-    public ComparableEntityPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(type, metadata);
-    }
-
-    public ComparableEntityPath(Class<? extends T> type, String var) {
-        super(type, var);
-    }
-
-    @Override
-    public Object getMetadata(Path<?> property) {
-        return null;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/ComparablePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/ComparablePath.java
deleted file mode 100644
index acef67f2d0..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/ComparablePath.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ComparableExpression;
-
-/**
- * ComparablePath represents Comparable paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- * @see java.util.ComparableType
- */
-@SuppressWarnings({"unchecked"})
-public class ComparablePath<T extends Comparable> extends ComparableExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = -7434767743611671666L;
-
-    private final PathImpl<T> pathMixin;
-
-    public ComparablePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public ComparablePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public ComparablePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/Constants.java b/querydsl-core/src/main/java/com/mysema/query/types/path/Constants.java
deleted file mode 100644
index 8f22ac4013..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/Constants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author tiwe
- *
- */
-final class Constants {
-    
-    private static final Set<Class<?>> typedClasses = new HashSet<Class<?>>(Arrays.<Class<?>>asList(
-            ArrayPath.class,
-            PathBuilder.class,
-            ComparablePath.class,
-            EnumPath.class,
-            DatePath.class,
-            DateTimePath.class,
-            BeanPath.class,
-            EntityPathBase.class,
-            NumberPath.class,
-            SimplePath.class,
-            TimePath.class
-            ));
-    
-    public static boolean isTyped(Class<?> cl) {
-        return typedClasses.contains(cl);
-    }
-    
-    private Constants() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java
deleted file mode 100644
index c5896ddabd..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/DatePath.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateExpression;
-
-/**
- * DatePath presents Date paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-@SuppressWarnings({"unchecked"})
-public class DatePath<T extends Comparable> extends DateExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = -6030609920388740246L;
-
-    private final PathImpl<T> pathMixin;
-
-    public DatePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public DatePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public DatePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java
deleted file mode 100644
index 28012ebc55..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/DateTimePath.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateTimeExpression;
-
-/**
- * DateTimePath presents DateTime typed paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DateTimePath<T extends Comparable> extends DateTimeExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = -2807916228198184631L;
-
-    private final PathImpl<T> pathMixin;
-
-    public DateTimePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public DateTimePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public DateTimePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/DslPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/DslPath.java
deleted file mode 100644
index ae53d585c7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/DslPath.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DslExpression;
-
-/**
- * DslPath represents simple paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DslPath<T> extends DslExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 3088836955328191852L;
-
-    private final PathImpl<T> pathMixin;
-
-    public DslPath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public DslPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public DslPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java b/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java
deleted file mode 100644
index 4d385b8b05..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/EntityPathBase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-
-/**
- * EntityPathBase provides a base class for EntityPath implementations
- *
- * @author tiwe
- *
- * @param <T> entity type
- */
-public class EntityPathBase<T> extends BeanPath<T> implements EntityPath<T> {
-
-    private static final long serialVersionUID = -8610055828414880996L;
-
-    public EntityPathBase(Class<? extends T> type, String variable) {
-        super(type, variable);
-    }
-
-    public EntityPathBase(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(type, metadata);
-    }
-
-    public EntityPathBase(Class<? extends T> type, PathMetadata<?> metadata, @Nullable PathInits inits) {
-        super(type, metadata, inits);
-    }
-
-    @Override
-    public Object getMetadata(Path<?> property) {
-        return null;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/EnumPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/EnumPath.java
deleted file mode 100644
index 930b4d3521..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/EnumPath.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.EnumExpression;
-
-/**
- * EnumPath represents enum paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class EnumPath<T extends Enum<T>> extends EnumExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 338191992784020563L;
-
-    private final PathImpl<T> pathMixin;
-
-    public EnumPath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public EnumPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public EnumPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/ListPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/ListPath.java
deleted file mode 100644
index e453b5a970..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/ListPath.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ListExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * ListPath represents list paths
- *
- * @author tiwe
- *
- * @param <E> component type
- * @param <Q> component query type
- */
-public class ListPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<List<E>, E, Q> implements ListExpression<E, Q> {
-
-    private static final long serialVersionUID = 3302301599074388860L;
-
-    private final Map<Integer,Q> cache = new HashMap<Integer,Q>();
-
-    private final Class<E> elementType;
-
-    private final PathImpl<List<E>> pathMixin;
-
-    private final Class<Q> queryType;
-
-    @Nullable
-    private transient Q any;    
-
-    public ListPath(Class<? super E> elementType, Class<Q> queryType, String variable) {
-        this(elementType, queryType, PathMetadataFactory.forVariable(variable));
-    }
-    
-    public ListPath(Class<? super E> elementType, Class<Q> queryType, Path<?> parent, String property) {
-        this(elementType, queryType, PathMetadataFactory.forProperty(parent, property));   
-    }
-    
-    public ListPath(Class<? super E> elementType, Class<Q> queryType, PathMetadata<?> metadata) {
-        this(elementType, queryType, metadata, PathInits.DIRECT);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public ListPath(Class<? super E> elementType, Class<Q> queryType, PathMetadata<?> metadata, PathInits inits) {
-        super(new PathImpl<List<E>>((Class)List.class, metadata), inits);
-        this.elementType = (Class<E>)elementType;
-        this.queryType = queryType;
-        this.pathMixin = (PathImpl<List<E>>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    @Override
-    public Q any() {
-        if (any == null) {
-            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(this));
-        }
-        return any;
-    }
-
-    protected PathMetadata<Integer> forListAccess(int index) {
-        return PathMetadataFactory.forListAccess(this, index);
-    }
-
-    protected PathMetadata<Integer> forListAccess(Expression<Integer> index) {
-        return PathMetadataFactory.forListAccess(this, index);
-    }
-
-    private Q create(int index) {
-        PathMetadata<Integer> md = forListAccess(index);
-        return newInstance(queryType, md);
-    }
-
-    @Override
-    public Q get(Expression<Integer> index) {
-        PathMetadata<Integer> md = forListAccess(index);
-        return newInstance(queryType, md);
-    }
-
-
-    @Override
-    public Q get(int index) {
-        if (cache.containsKey(index)) {
-            return cache.get(index);
-        } else {
-            Q rv = create(index);
-            cache.put(index, rv);
-            return rv;
-        }
-    }
-
-    public Class<E> getElementType() {
-        return elementType;
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return elementType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/MapPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/MapPath.java
deleted file mode 100644
index f41fc919c6..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/MapPath.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.MapExpressionBase;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * MapPath represents map paths
- *
- * @author tiwe
- *
- * @param <K> key type
- * @param <V> value type
- */
-public class MapPath<K, V, E extends SimpleExpression<? super V>> extends MapExpressionBase<K, V, E> implements Path<Map<K, V>> {
-
-    private static final long serialVersionUID = -9113333728412016832L;
-
-    private final Class<K> keyType;
-
-    private final PathImpl<Map<K,V>> pathMixin;
-
-    private final Class<E> queryType;
-
-    @Nullable
-    private transient Constructor<E> constructor;
-
-    private final Class<V> valueType;
-
-    public MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, String variable) {
-        this(keyType, valueType, queryType, PathMetadataFactory.forVariable(variable));
-    }
-    
-    public MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, Path<?> parent, String property) {
-        this(keyType, valueType, queryType, PathMetadataFactory.forProperty(parent, property));   
-    }
-    
-    @SuppressWarnings("unchecked")
-    public MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, PathMetadata<?> metadata) {
-        super(new PathImpl<Map<K,V>>((Class)Map.class, metadata));
-        this.keyType = (Class<K>) keyType;
-        this.valueType = (Class<V>) valueType;
-        this.queryType = queryType;
-        this.pathMixin = (PathImpl<Map<K,V>>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    protected PathMetadata<K> forMapAccess(K key) {
-        return PathMetadataFactory.forMapAccess(this, key);
-    }
-
-    protected PathMetadata<K> forMapAccess(Expression<K> key) {
-        return PathMetadataFactory.forMapAccess(this, key);
-    }
-
-    @Override
-    public E get(Expression<K> key) {
-        try {
-            PathMetadata<K> md =  forMapAccess(key);
-            return newInstance(md);
-        } catch (NoSuchMethodException e) {
-            throw new ExpressionException(e);
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e);
-        }
-    }
-
-    @Override
-    public E get(K key) {
-        try {
-            PathMetadata<K> md =  forMapAccess(key);
-            return newInstance(md);
-        } catch (NoSuchMethodException e) {
-            throw new ExpressionException(e);
-        } catch (InstantiationException e) {
-            throw new ExpressionException(e);
-        } catch (IllegalAccessException e) {
-            throw new ExpressionException(e);
-        } catch (InvocationTargetException e) {
-            throw new ExpressionException(e);
-        }
-    }
-
-    public Class<K> getKeyType() {
-        return keyType;
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    public Class<V> getValueType() {
-        return valueType;
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-    private E newInstance(PathMetadata<?> pm) throws NoSuchMethodException,
-        InstantiationException, IllegalAccessException,
-        InvocationTargetException {
-        if (constructor == null) {
-            if (Constants.isTyped(queryType)) {
-                constructor = queryType.getConstructor(Class.class, PathMetadata.class);
-            } else {
-                constructor = queryType.getConstructor(PathMetadata.class);
-            }
-        }
-        if (Constants.isTyped(queryType)) {
-            return constructor.newInstance(getValueType(), pm);
-        } else {
-            return constructor.newInstance(pm);
-        }
-    }
-    
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return keyType;
-        } else if (index == 1) {    
-            return valueType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/NumberPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/NumberPath.java
deleted file mode 100644
index cb870bbb8d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/NumberPath.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.NumberExpression;
-
-/**
- * NumberPath represents numeric paths
- *
- * @author tiwe
- *
- * @param <T> Java type
- */
-public class NumberPath<T extends Number & Comparable<?>> extends NumberExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 338191992784020563L;
-
-    private final PathImpl<T> pathMixin;
-
-    public NumberPath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public NumberPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public NumberPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java
deleted file mode 100644
index 4d414fc3ce..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilder.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * PathBuilder is an extension to EntityPathBase for dynamic path construction
- *
- * <p>Usage example:</p>
- * <pre>
- * PathBuilder&lt;User&gt; user = new PathBuilder&lt;User&gt;(User.class, "user");
- * Predicate filter = user.getString("firstName").eq("Bob");
- * List&lt;User&gt; users = query.from(user).where(filter).list(user);
- * </pre>
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class PathBuilder<T> extends EntityPathBase<T> {
-
-    private static final long serialVersionUID = -1666357914232685088L;
-
-    private final Map<String, PathBuilder<?>> properties = Maps.newHashMap();
-
-    private final Map<Path<?>, Object> propertyMetadata = Maps.newHashMap();
-
-    /**
-     * Creates a new PathBuilder instance
-     *
-     * @param type
-     * @param pathMetadata
-     */
-    public PathBuilder(Class<? extends T> type, PathMetadata<?> pathMetadata) {
-        super(type, pathMetadata);
-    }
-
-    /**
-     * Creates a new PathBuilder instance
-     *
-     * @param type
-     * @param variable
-     */
-    public PathBuilder(Class<? extends T> type, String variable) {
-        super(type, PathMetadataFactory.forVariable(variable));
-    }
-
-    /**
-     * @param newPath
-     * @param path
-     * @return
-     */
-    private <P extends Path<?>> P  addMetadataOf(P newPath, Path<?> path) {
-        if (path.getMetadata().getParent() instanceof EntityPath) {
-            EntityPath<?> parent = (EntityPath)path.getMetadata().getParent();
-            propertyMetadata.put(newPath, parent.getMetadata(path));
-        }
-        return newPath;
-    }
-
-    /**
-     * Override this method to do some validation of the properties created
-     *
-     * @param property
-     */
-    protected void validate(String property) {
-        // do nothing
-    }
-
-    @Override
-    public Object getMetadata(Path<?> property) {
-        return propertyMetadata.get(property);
-    }
-
-    /**
-     * Get a PathBuilder instance for the given property
-     *
-     * @param property property name
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public PathBuilder<Object> get(String property) {
-        PathBuilder<Object> path = (PathBuilder) properties.get(property);
-        if (path == null) {
-            validate(property);
-            path = new PathBuilder<Object>(Object.class, forProperty(property));
-            properties.put(property, path);
-        }
-        return path;
-    }
-
-    /**
-     * Get a PathBuilder for the given property with the given type
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A> PathBuilder<A> get(String property, Class<A> type) {
-        PathBuilder<A> path = (PathBuilder<A>) properties.get(property);
-        if (path == null || !type.isAssignableFrom(path.getType())) {
-            validate(property);
-            path = new PathBuilder<A>(type, forProperty(property));
-            properties.put(property, path);
-        }
-        return path;
-    }
-
-    /**
-     * Get a PArray instance for the given property and the given array type
-     *
-     * @param <A>
-     * @param <E>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A, E> ArrayPath<A, E> getArray(String property, Class<A> type) {
-        validate(property);
-        return super.createArray(property, type);
-    }
-
-    /**
-     * @param path
-     * @return
-     */
-    public BooleanPath get(BooleanPath path) {
-        BooleanPath newPath = getBoolean(toString(path));
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Boolean typed path
-     *
-     * @param propertyName property name
-     * @return
-     */
-    public BooleanPath getBoolean(String propertyName) {
-        validate(propertyName);
-        return super.createBoolean(propertyName);
-    }
-
-    /**
-     * Get a new Collection typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A> CollectionPath<A, PathBuilder<A>> getCollection(String property, Class<A> type) {
-        validate(property);
-        return super.<A, PathBuilder<A>>createCollection(property, type, PathBuilder.class, PathInits.DIRECT);
-    }
-
-    /**
-     * Get a new Collection typed path
-     *
-     * @param <A>
-     * @param <E>
-     * @param property property name
-     * @param type
-     * @param queryType
-     * @return
-     */
-    public <A, E extends SimpleExpression<A>> CollectionPath<A, E> getCollection(String property, Class<A> type, Class<E> queryType) {
-        validate(property);
-        return super.<A, E>createCollection(property, type, queryType, PathInits.DIRECT);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable<?>> ComparablePath<A> get(ComparablePath<A> path) {
-        ComparablePath<A> newPath = getComparable(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Comparable typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Comparable<?>> ComparablePath<A> getComparable(String property, Class<A> type) {
-        validate(property);
-        return super.createComparable(property, type);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable<?>> DatePath<A> get(DatePath<A> path) {
-        DatePath<A> newPath = getDate(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Date path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Comparable<?>> DatePath<A> getDate(String property, Class<A> type) {
-        validate(property);
-        return super.createDate(property, type);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable<?>> DateTimePath<A> get(DateTimePath<A> path) {
-        DateTimePath<A> newPath = getDateTime(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new DateTime path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Comparable<?>> DateTimePath<A> getDateTime(String property, Class<A> type) {
-        validate(property);
-        return super.createDateTime(property, type);
-    }
-
-    /**
-     * Get a new Enum path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Enum<A>> EnumPath<A> getEnum(String property, Class<A> type) {
-        validate(property);
-        return super.createEnum(property, type);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Enum<A>> EnumPath<A> get(EnumPath<A> path) {
-        EnumPath<A> newPath = getEnum(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new List typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A> ListPath<A, PathBuilder<A>> getList(String property, Class<A> type) {
-        validate(property);
-        return super.<A, PathBuilder<A>>createList(property, type, PathBuilder.class, PathInits.DIRECT);
-    }
-
-    /**
-     * Get a new List typed path
-     *
-     * @param <A>
-     * @param <E>
-     * @param property property name
-     * @param type
-     * @param queryType
-     * @return
-     */
-    public <A, E extends SimpleExpression<A>> ListPath<A, E> getList(String property, Class<A> type, Class<E> queryType) {
-        validate(property);
-        return super.<A, E>createList(property, type, queryType, PathInits.DIRECT);
-    }
-
-    /**
-     * Get a new Map typed path
-     *
-     * @param <K>
-     * @param <V>
-     * @param property property name
-     * @param key
-     * @param value
-     * @return
-     */
-    public <K, V> MapPath<K, V, PathBuilder<V>> getMap(String property, Class<K> key, Class<V> value) {
-        validate(property);
-        return super.<K,V,PathBuilder<V>>createMap(property, key, value, PathBuilder.class);
-    }
-
-    /**
-     * Get a new Map typed path
-     *
-     * @param <K>
-     * @param <V>
-     * @param <E>
-     * @param property property name
-     * @param key
-     * @param value
-     * @param queryType
-     * @return
-     */
-    public <K, V, E extends SimpleExpression<V>> MapPath<K, V, E> getMap(String property, Class<K> key, Class<V> value, Class<E> queryType) {
-        validate(property);
-        return super.<K,V,E>createMap(property, key, value, queryType);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Number & Comparable<?>> NumberPath<A> get(NumberPath<A> path) {
-        NumberPath<A> newPath = getNumber(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Number typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Number & Comparable<?>> NumberPath<A> getNumber(String property, Class<A> type) {
-        validate(property);
-        return super.createNumber(property, type);
-    }
-
-    /**
-     * Get a new Set typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A> SetPath<A, PathBuilder<A>> getSet(String property, Class<A> type) {
-        validate(property);
-        return super.<A, PathBuilder<A>>createSet(property, type, PathBuilder.class, PathInits.DIRECT);
-    }
-
-    /**
-     * Get a new Set typed path
-     *
-     * @param <A>
-     * @param <E>
-     * @param property property name
-     * @param type
-     * @param queryType
-     * @return
-     */
-    public <A, E extends SimpleExpression<A>> SetPath<A, E> getSet(String property, Class<A> type, Class<E> queryType) {
-        validate(property);
-        return super.<A, E>createSet(property, type, queryType, PathInits.DIRECT);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <A> SimplePath<A> get(Path<A> path) {
-        SimplePath<A> newPath = getSimple(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Simple path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A> SimplePath<A> getSimple(String property, Class<A> type) {
-        validate(property);
-        return super.createSimple(property, type);
-    }
-
-    /**
-     * @param path
-     * @return
-     */
-    public StringPath get(StringPath path) {
-        StringPath newPath = getString(toString(path));
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new String typed path
-     *
-     * @param property property name
-     * @return
-     */
-    public StringPath getString(String property) {
-        validate(property);
-        return super.createString(property);
-    }
-
-    /**
-     * @param <A>
-     * @param path
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable<?>> TimePath<A> get(TimePath<A> path) {
-        TimePath<A> newPath = getTime(toString(path), (Class<A>)path.getType());
-        return addMetadataOf(newPath, path);
-    }
-
-    /**
-     * Get a new Time typed path
-     *
-     * @param <A>
-     * @param property property name
-     * @param type
-     * @return
-     */
-    public <A extends Comparable<?>> TimePath<A> getTime(String property, Class<A> type) {
-        validate(property);
-        return super.createTime(property, type);
-    }
-
-    /**
-     * @param path
-     * @return
-     */
-    private String toString(Path<?> path) {
-        return path.getMetadata().getElement().toString();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilderFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilderFactory.java
deleted file mode 100644
index f4632471c1..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathBuilderFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * PathBuilderFactory is a factory class for PathBuilder creation
- *
- * @author tiwe
- *
- */
-public final class PathBuilderFactory {
-
-    private final Map<Class<?>, PathBuilder<?>> paths = new HashMap<Class<?>, PathBuilder<?>>();
-
-    /**
-     * Create a new PathBuilder instance for the given type
-     * 
-     * @param clazz
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <T> PathBuilder<T> create(Class<T> clazz) {
-        PathBuilder<T> rv = (PathBuilder<T>) paths.get(clazz);
-        if (rv == null) {
-            rv = new PathBuilder<T>(clazz, CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, clazz.getSimpleName()));
-            paths.put(clazz, rv);
-        }
-        return rv;
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathInits.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathInits.java
deleted file mode 100644
index 4f1632383d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathInits.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
-/**
- * PathInits defines path initializations that can be attached to
- * properties via QueryInit annotations
- *
- * @author tiwe
- *
- */
-public class PathInits implements Serializable {
-
-    private static final long serialVersionUID = -2173980858324141095L;
-
-    public static final PathInits DEFAULT = new PathInits();
-
-    public static final PathInits DIRECT  = new PathInits("*");
-    
-    public static final PathInits DIRECT2  = new PathInits("*.*");
-    
-    private final boolean initAllProps;
-    
-    private final PathInits defaultValue;
-    
-    private final Map<String,PathInits> propertyToInits = new HashMap<String,PathInits>();
-
-    public PathInits(String... initStrs) {
-        boolean _initAllProps = false;
-        PathInits _defaultValue = DEFAULT;
-        
-        Map<String, Collection<String>> properties = Maps.newHashMap();
-        for (String initStr : initStrs) {
-            if (initStr.equals("*")) {
-                _initAllProps = true;
-            } else if (initStr.startsWith("*.")) {
-                _initAllProps = true;
-                _defaultValue = new PathInits(initStr.substring(2));
-            } else {
-                String key = initStr;
-                List<String> inits = Collections.emptyList();
-                if (initStr.contains(".")) {
-                    key = initStr.substring(0, initStr.indexOf('.'));
-                    inits = ImmutableList.of(initStr.substring(key.length()+1));
-                }
-                Collection<String> values = properties.get(key);
-                if (values == null) {
-                    values = new ArrayList<String>();
-                    properties.put(key, values);
-                }
-                values.addAll(inits);
-            }
-        }
-        
-        for (Map.Entry<String, Collection<String>> entry : properties.entrySet()) {
-            PathInits inits = new PathInits(Iterables.toArray(entry.getValue(), String.class));
-            propertyToInits.put(entry.getKey(), inits);
-        }
-        
-        initAllProps = _initAllProps;
-        defaultValue = _defaultValue;
-    }
-    
-    public PathInits get(String property) {
-        if (propertyToInits.containsKey(property)) {
-            return propertyToInits.get(property);
-        } else if (initAllProps) {
-            return defaultValue;
-        } else {
-            throw new IllegalArgumentException(property + " is not initialized");
-        }
-    }
-
-    public boolean isInitialized(String property) {
-        return initAllProps || propertyToInits.containsKey(property);
-    }
-    
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/SetPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/SetPath.java
deleted file mode 100644
index 2d755d90fb..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/SetPath.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * SetPath represents set paths
- *
- * @author tiwe
- *
- * @param <E> component type
- * @param <Q> component query type
- */
-public class SetPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<Set<E>, E, Q> {
-
-    private static final long serialVersionUID = 4145848445507037373L;
-
-    private final Class<E> elementType;
-
-    private final PathImpl<Set<E>> pathMixin;
-    
-    @Nullable
-    private transient Q any;
-    
-    private final Class<Q> queryType;
-
-    public SetPath(Class<? super E> type, Class<Q> queryType, String variable) {
-        this(type, queryType, PathMetadataFactory.forVariable(variable));
-    }
-    
-    public SetPath(Class<? super E> type, Class<Q> queryType, Path<?> parent, String property) {
-        this(type, queryType, PathMetadataFactory.forProperty(parent, property));
-    }
-    
-    public SetPath(Class<? super E> type, Class<Q> queryType, PathMetadata<?> metadata) {
-        this(type, queryType, metadata, PathInits.DIRECT);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public SetPath(Class<? super E> type, Class<Q> queryType, PathMetadata<?> metadata, PathInits inits) {
-        super(new PathImpl<Set<E>>((Class)Set.class, metadata), inits);
-        this.elementType = (Class<E>)type;
-        this.queryType = queryType;
-        this.pathMixin = (PathImpl<Set<E>>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-    
-    @Override
-    public Q any() {
-        if (any == null) {
-            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(this));
-        }
-        return any;
-    }
-
-    public Class<E> getElementType() {
-        return elementType;
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-    
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return elementType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/SimplePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/SimplePath.java
deleted file mode 100644
index 2bffb124d8..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/SimplePath.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * SimplePath represents simple paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class SimplePath<T> extends SimpleExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 3088836955328191852L;
-
-    private final PathImpl<T> pathMixin;
-
-    public SimplePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public SimplePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    public SimplePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/StringPath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/StringPath.java
deleted file mode 100644
index 65dda89bea..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/StringPath.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.StringExpression;
-
-/**
- * StringPath represents String typed paths
- *
- * @author tiwe
- *
- */
-public class StringPath extends StringExpression implements Path<String> {
-
-    private static final long serialVersionUID = 7983490925756833429L;
-
-    private final PathImpl<String> pathMixin;
-
-    public StringPath(Path<?> parent, String property) {
-        this(PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public StringPath(PathMetadata<?> metadata) {
-        super(new PathImpl<String>(String.class, metadata));
-        this.pathMixin = (PathImpl<String>)mixin;
-    }
-
-    public StringPath(String var) {
-        this(PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-    
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java b/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java
deleted file mode 100644
index dc672f401b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/TimePath.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.TimeExpression;
-
-/**
- * TimePath represented Time paths
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class TimePath<T extends Comparable> extends TimeExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = -1432775001949467763L;
-
-    private final PathImpl<T> pathMixin;
-
-    public TimePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public TimePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public TimePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/package-info.java b/querydsl-core/src/main/java/com/mysema/query/types/path/package-info.java
deleted file mode 100644
index fcd59b846e..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Paths represent typed property paths, variables and list-map-array access
- */
-package com.mysema.query.types.path;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java
deleted file mode 100644
index 56f7212bfc..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/BooleanSubQuery.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * Boolean typed single result subquery
- *
- * @author tiwe
- */
-public final class BooleanSubQuery extends BooleanExpression implements ExtendedSubQueryExpression<Boolean> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<Boolean> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public BooleanSubQuery(QueryMetadata md) {
-        super(new SubQueryExpressionImpl<Boolean>(Boolean.class, md));
-        subQueryMixin = (SubQueryExpressionImpl<Boolean>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java
deleted file mode 100644
index 5cc29ca16c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/ComparableSubQuery.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.ComparableExpression;
-
-/**
- * Comparable typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- *
- */
-public final class ComparableSubQuery<T extends Comparable<?>> extends ComparableExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public ComparableSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java
deleted file mode 100644
index 7576d1d9e7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateSubQuery.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.DateExpression;
-
-/**
- * Date typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class DateSubQuery<T extends Comparable<?>> extends DateExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public DateSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java
deleted file mode 100644
index 496f529445..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/DateTimeSubQuery.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.DateTimeExpression;
-
-/**
- * DateTime typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class DateTimeSubQuery<T extends Comparable<?>> extends DateTimeExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public DateTimeSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ExtendedSubQueryExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ExtendedSubQueryExpression.java
deleted file mode 100644
index 82b7c1ae5d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/ExtendedSubQueryExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * Extensions to the SubQueryExpression interface
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public interface ExtendedSubQueryExpression<T> extends SubQueryExpression<T> {
-
-    /**
-     * Get an exists(this) expression for the subquery
-     *
-     * @return
-     */
-    BooleanExpression exists();
-
-    /**
-     * Get a not exists(this) expression for the subquery
-     *
-     * @return
-     */
-    BooleanExpression notExists();
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java
deleted file mode 100644
index d806a2de0b..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/ListSubQuery.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.expr.Wildcard;
-
-/**
- * List result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class ListSubQuery<T> extends CollectionExpressionBase<List<T>,T> implements ExtendedSubQueryExpression<List<T>> {
-
-    private static final long serialVersionUID = 3399354334765602960L;
-
-    private final Class<T> elementType;
-
-    private final SubQueryExpressionImpl<List<T>> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    @Nullable
-    private volatile NumberExpression<Long> count;
-
-    @Nullable
-    private volatile NumberExpression<Long> countDistinct;
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public ListSubQuery(Class<T> elementType, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<List<T>>((Class)List.class, md));
-        this.elementType = elementType;
-        this.subQueryMixin = (SubQueryExpressionImpl<List<T>>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    public NumberExpression<Long> count() {
-        if (count == null) {
-            count = count(Ops.AggOps.COUNT_AGG);
-        }
-        return count;
-    }
-
-    public NumberExpression<Long> countDistinct() {
-        if (countDistinct == null) {
-            countDistinct = count(Ops.AggOps.COUNT_DISTINCT_AGG);
-        }
-        return countDistinct;
-    }
-
-    private NumberExpression<Long> count(Operator<Long> operator) {
-        QueryMetadata md = subQueryMixin.getMetadata().clone();
-        Expression<?> e = null;
-        if (md.getProjection().size() == 1) {
-            e = md.getProjection().get(0);
-        } else if (!md.getProjection().isEmpty()) {
-            e = ExpressionUtils.list(Object.class, md.getProjection());
-        }
-        md.clearProjection();
-        if (e != null) {
-            md.addProjection(OperationImpl.create(Long.class, operator, e));
-        } else if (operator == Ops.AggOps.COUNT_AGG) {
-            md.addProjection(Wildcard.count);
-        } else {
-            md.addProjection(Wildcard.countDistinct);
-        }
-
-        return new NumberSubQuery<Long>(Long.class, md);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public Class<T> getElementType() {
-        return elementType;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-    public SimpleExpression<?> as(Expression<?> alias) {
-        return SimpleOperation.create(alias.getType(),Ops.ALIAS, this, alias);
-    }
-
-    @Override
-    public Class<?> getParameter(int index) {
-        if (index == 0) {
-            return elementType;
-        } else {
-            throw new IndexOutOfBoundsException(String.valueOf(index));
-        }
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java
deleted file mode 100644
index 1647519216..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/NumberSubQuery.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.NumberExpression;
-
-/**
- * Number typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class NumberSubQuery<T extends Number & Comparable<?>> extends NumberExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public NumberSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/SimpleSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/SimpleSubQuery.java
deleted file mode 100644
index 0b11b881e3..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/SimpleSubQuery.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.DslExpression;
-
-/**
- * Object typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class SimpleSubQuery<T> extends DslExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public SimpleSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java
deleted file mode 100644
index 0953a3f6d5..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/StringSubQuery.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.StringExpression;
-
-/**
- * String typed single result subquery
- *
- * @author tiwe
- */
-public final class StringSubQuery extends StringExpression implements ExtendedSubQueryExpression<String> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<String> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public StringSubQuery(QueryMetadata md) {
-        super(new SubQueryExpressionImpl<String>(String.class, md));
-        this.subQueryMixin = (SubQueryExpressionImpl<String>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java b/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java
deleted file mode 100644
index 04dff8e050..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/TimeSubQuery.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.SubQueryExpressionImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.TimeExpression;
-
-/**
- * Time typed single result subquery
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public final class TimeSubQuery<T extends Comparable<?>> extends TimeExpression<T> implements ExtendedSubQueryExpression<T> {
-
-    private static final long serialVersionUID = -64156984110154969L;
-
-    private final SubQueryExpressionImpl<T> subQueryMixin;
-
-    @Nullable
-    private volatile BooleanExpression exists;
-
-    public TimeSubQuery(Class<T> type, QueryMetadata md) {
-        super(new SubQueryExpressionImpl<T>(type, md));
-        subQueryMixin = (SubQueryExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(subQueryMixin, context);
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        if (exists == null) {
-            exists = BooleanOperation.create(Ops.EXISTS, mixin);
-        }
-        return exists;
-    }
-    @Override
-    public QueryMetadata getMetadata() {
-        return subQueryMixin.getMetadata();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/query/package-info.java b/querydsl-core/src/main/java/com/mysema/query/types/query/package-info.java
deleted file mode 100644
index cdb5071568..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/query/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Subquery implementations
- *
- */
-package com.mysema.query.types.query;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/BooleanTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/BooleanTemplate.java
deleted file mode 100644
index 0c6ad2f183..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/BooleanTemplate.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.PredicateTemplate;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * BooleanTemplate is a custom boolean expression
- *
- * @author tiwe
- *
- */
-public class BooleanTemplate extends BooleanExpression implements TemplateExpression<Boolean> {
-
-    private static final long serialVersionUID = 5749369427497731719L;
-
-    public static BooleanExpression create(String template) {
-        return new BooleanTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static BooleanExpression create(String template, Object one) {
-        return new BooleanTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static BooleanExpression create(String template, Object one, Object two) {
-        return new BooleanTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static BooleanExpression create(String template, Object... args) {
-        return new BooleanTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static BooleanExpression create(Template template, Object... args) {
-        return new BooleanTemplate(template, ImmutableList.copyOf(args));
-    }
-    
-    public static final BooleanExpression TRUE = create("true");
-    
-    public static final BooleanExpression FALSE = create("false");
-
-    private final PredicateTemplate templateMixin;
-
-    public BooleanTemplate(Template template, ImmutableList<?> args) {
-        super(new PredicateTemplate(template, args));
-        this.templateMixin = (PredicateTemplate)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/ComparableTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/ComparableTemplate.java
deleted file mode 100644
index 6cce90b84c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/ComparableTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ComparableExpression;
-
-/**
- * ComparableTemplate defines custom comparable expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class ComparableTemplate<T extends Comparable<?>> extends ComparableExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = -6292853402028813007L;
-
-    public static <T extends Comparable<?>> ComparableExpression<T> create(Class<T> type, String template) {
-        return new ComparableTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Comparable<?>> ComparableExpression<T> create(Class<T> type, String template, Object one) {
-        return new ComparableTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Comparable<?>> ComparableExpression<T> create(Class<T> type, String template, Object one, Object two) {
-        return new ComparableTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Comparable<?>> ComparableExpression<T> create(Class<T> type, String template, Object... args) {
-        return new ComparableTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Comparable<?>> ComparableExpression<T> create(Class<T> type, Template template, Object... args) {
-        return new ComparableTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public ComparableTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java
deleted file mode 100644
index b7c28a2950..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateExpression;
-
-/**
- * DateTemplate defines custom date expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DateTemplate<T extends Comparable<?>> extends DateExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = 4975559746071238026L;
-
-    public static <T extends Comparable<?>> DateExpression<T> create(Class<T> type, String template) {
-        return new DateTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Comparable<?>> DateExpression<T> create(Class<T> type, String template, Object one) {
-        return new DateTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Comparable<?>> DateExpression<T> create(Class<T> type, String template, Object one, Object two) {
-        return new DateTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Comparable<?>> DateExpression<T> create(Class<T> type, String template, Object... args) {
-        return new DateTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Comparable<?>> DateExpression<T> create(Class<T> type, Template template, Object... args) {
-        return new DateTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public DateTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java
deleted file mode 100644
index e1608ada7a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/DateTimeTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateTimeExpression;
-
-/**
- * DateTimeTemplate defines custom dateTime expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DateTimeTemplate<T extends Comparable<?>> extends DateTimeExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = -2289699666347576749L;
-
-    public static <T extends Comparable<?>> DateTimeExpression<T> create(Class<T> type, String template) {
-        return new DateTimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Comparable<?>> DateTimeExpression<T> create(Class<T> type, String template, Object one) {
-        return new DateTimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Comparable<?>> DateTimeExpression<T> create(Class<T> type, String template, Object one, Object two) {
-        return new DateTimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Comparable<?>> DateTimeExpression<T> create(Class<T> type, String template, Object... args) {
-        return new DateTimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Comparable<?>> DateTimeExpression<T> create(Class<T> type, Template template, Object... args) {
-        return new DateTimeTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public DateTimeTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/DslTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/DslTemplate.java
deleted file mode 100644
index 20419a71fe..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/DslTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DslExpression;
-
-/**
- * DslTemplate defines custom simple expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class DslTemplate<T> extends DslExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = -4697578522909045745L;
-
-    public static <T> DslExpression<T> create(Class<? extends T> type, String template) {
-        return new DslTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T> DslExpression<T> create(Class<? extends T> type, String template, Object one) {
-        return new DslTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T> DslExpression<T> create(Class<? extends T> type, String template, Object one, Object two) {
-        return new DslTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T> DslExpression<T> create(Class<? extends T> type, String template, Object... args) {
-        return new DslTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T> DslExpression<T> create(Class<? extends T> type, Template template, Object... args) {
-        return new DslTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public DslTemplate(Class<? extends T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/EnumTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/EnumTemplate.java
deleted file mode 100644
index ac2d420539..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/EnumTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.EnumExpression;
-
-/**
- * EnumTemplate defines custom enum expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class EnumTemplate<T extends Enum<T>> extends EnumExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = 351057421752203377L;
-
-    public static <T extends Enum<T>> EnumExpression<T> create(Class<T> type, String template) {
-        return new EnumTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Enum<T>> EnumExpression<T> create(Class<T> type, String template, Object one) {
-        return new EnumTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Enum<T>> EnumExpression<T> create(Class<T> type, String template, Object one, Object two) {
-        return new EnumTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Enum<T>> EnumExpression<T> create(Class<T> type, String template, Object... args) {
-        return new EnumTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Enum<T>> EnumExpression<T> create(Class<T> type, Template template, Object... args) {
-        return new EnumTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public EnumTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/NumberTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/NumberTemplate.java
deleted file mode 100644
index b9e85d0d95..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/NumberTemplate.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.NumberExpression;
-
-/**
- * NumberTemplate defines custom numeric expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class NumberTemplate<T extends Number & Comparable<?>> extends NumberExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = 351057421752203377L;
-
-    public static <T extends Number & Comparable<?>> NumberExpression<T> create(Class<T> type, String template) {
-        return new NumberTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Number & Comparable<?>> NumberExpression<T> create(Class<T> type, String template, Object one) {
-        return new NumberTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Number & Comparable<?>> NumberExpression<T> create(Class<T> type, String template, Object one, Object two) {
-        return new NumberTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Number & Comparable<?>> NumberExpression<T> create(Class<T> type, String template, Object... args) {
-        return new NumberTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Number & Comparable<?>> NumberExpression<T> create(Class<T> type, Template template, Object... args) {
-        return new NumberTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    public static final NumberExpression<Integer> ONE = create(Integer.class, "1");
-    
-    public static final NumberExpression<Integer> TWO = create(Integer.class, "2");
-    
-    public static final NumberExpression<Integer> THREE = create(Integer.class, "3");
-
-    public static final NumberExpression<Integer> ZERO = create(Integer.class, "0");
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public NumberTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/SimpleTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/SimpleTemplate.java
deleted file mode 100644
index 49ae004512..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/SimpleTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * SimpleTemplate defines custom simple expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class SimpleTemplate<T> extends SimpleExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = -4697578522909045745L;
-
-    public static <T> SimpleExpression<T> create(Class<? extends T> type, String template) {
-        return new SimpleTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T> SimpleExpression<T> create(Class<? extends T> type, String template, Object one) {
-        return new SimpleTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T> SimpleExpression<T> create(Class<? extends T> type, String template, Object one, Object two) {
-        return new SimpleTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T> SimpleExpression<T> create(Class<? extends T> type, String template, Object... args) {
-        return new SimpleTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T> SimpleExpression<T> create(Class<? extends T> type, Template template, Object... args) {
-        return new SimpleTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public SimpleTemplate(Class<? extends T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-     
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/StringTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/StringTemplate.java
deleted file mode 100644
index eb5aaef76d..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/StringTemplate.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.StringExpression;
-
-/**
- * StringTemplate defines custom String expressions
- *
- * @author tiwe
- *
- */
-public class StringTemplate extends StringExpression implements TemplateExpression<String> {
-
-    private static final long serialVersionUID = 3181686132439356614L;
-
-    public static StringExpression create(String template) {
-        return new StringTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static StringExpression create(String template, Object one) {
-        return new StringTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static StringExpression create(String template, Object one, Object two) {
-        return new StringTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static StringExpression create(String template, Object... args) {
-        return new StringTemplate(TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static StringExpression create(Template template, Object... args) {
-        return new StringTemplate(template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<String> templateMixin;
-
-    public StringTemplate(Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<String>(String.class, template, args));
-        this.templateMixin = (TemplateExpressionImpl<String>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-    
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java b/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java
deleted file mode 100644
index cbae55a026..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/TimeTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.TimeExpression;
-
-/**
- * TimeTemplate defines custom time expressions
- *
- * @author tiwe
- *
- * @param <T> expression type
- */
-public class TimeTemplate<T extends Comparable<?>> extends TimeExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = -7684306954555037051L;
-
-    public static <T extends Comparable<?>> TimeTemplate<T> create(Class<T> type, String template) {
-        return new TimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of());
-    }
-    
-    public static <T extends Comparable<?>> TimeTemplate<T> create(Class<T> type, String template, Object one) {
-        return new TimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one));
-    }
-    
-    public static <T extends Comparable<?>> TimeTemplate<T> create(Class<T> type, String template, Object one, Object two) {
-        return new TimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.of(one, two));
-    }
-    
-    public static <T extends Comparable<?>> TimeTemplate<T> create(Class<T> type, String template, Object... args) {
-        return new TimeTemplate<T>(type, TemplateFactory.DEFAULT.create(template), ImmutableList.copyOf(args));
-    }
-
-    public static <T extends Comparable<?>> TimeTemplate<T> create(Class<T> type, Template template, Object... args) {
-        return new TimeTemplate<T>(type, template, ImmutableList.copyOf(args));
-    }
-
-    private final TemplateExpressionImpl<T> templateMixin;
-
-    public TimeTemplate(Class<T> type, Template template, ImmutableList<?> args) {
-        super(new TemplateExpressionImpl<T>(type, template, args));
-        templateMixin = (TemplateExpressionImpl<T>)mixin;
-    }
-    
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(templateMixin, context);
-    }
-
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/template/package-info.java b/querydsl-core/src/main/java/com/mysema/query/types/template/package-info.java
deleted file mode 100644
index 8e414aa9e6..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/types/template/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Custom types are comparable to operations but contain the serialization
- * templates instead of operator patterns. Custom types are always implementation specific.
- */
-package com.mysema.query.types.template;
diff --git a/querydsl-core/src/main/java/com/mysema/query/util/CollectionUtils.java b/querydsl-core/src/main/java/com/mysema/query/util/CollectionUtils.java
deleted file mode 100644
index e6d359f741..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/util/CollectionUtils.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.util;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * CollectionUtils provides addition operations for Collection types that provide an immutable type
- * for single item collections and after that mutable instances
- *
- * @author tiwe
- *
- */
-public final class CollectionUtils {
-
-    public static <T> List<T> add(List<T> list, T element) {
-        final int size = list.size();
-        if (size == 0) {
-            return ImmutableList.of(element);
-        } else if (list instanceof ImmutableList) {
-            if (size == 1) {
-                final T val = list.get(0);
-                list = Lists.newArrayList();
-                list.add(val);
-            } else {
-                list = Lists.newArrayList(list);
-            }
-        }
-        list.add(element);
-        return list;
-    }
-
-    public static <T> List<T> copyOf(List<T> list) {
-        if (list instanceof ImmutableList) {
-            return list;
-        } else {
-            return Lists.newArrayList(list);
-        }
-    }
-
-    public static <T> Set<T> add(Set<T> set, T element) {
-        final int size = set.size();
-        if (size == 0) {
-            return ImmutableSet.of(element);
-        } else if (set instanceof ImmutableSet) {
-            if (size == 1) {
-                final T val = set.iterator().next();
-                set = Sets.newHashSet();
-                set.add(val);
-            } else {
-                set = Sets.newHashSet(set);
-            }
-        }
-        set.add(element);
-        return set;
-    }
-
-    public static <T> Set<T> copyOf(Set<T> set) {
-        if (set instanceof ImmutableSet) {
-            return set;
-        } else {
-            return Sets.newHashSet(set);
-        }
-    }
-
-    public static <T> Set<T> addSorted(Set<T> set, T element) {
-        final int size = set.size();
-        if (size == 0) {
-            return ImmutableSet.of(element);
-        } else if (set instanceof ImmutableSet) {
-            if (size == 1) {
-                final T val = set.iterator().next();
-                set = Sets.newLinkedHashSet();
-                set.add(val);
-            } else {
-                set = Sets.newLinkedHashSet(set);
-            }
-        }
-        set.add(element);
-        return set;
-    }
-
-    public static <T> Set<T> removeSorted(Set<T> set, T element) {
-        final int size = set.size();
-        if (size == 0 || (size == 1 && set.contains(element))) {
-            return ImmutableSet.of();
-        } else {
-            set.remove(element);
-        }
-        return set;
-    }
-
-    public static <T> Set<T> copyOfSorted(Set<T> set) {
-        if (set instanceof ImmutableSet) {
-            return set;
-        } else {
-            return Sets.newLinkedHashSet(set);
-        }
-    }
-
-    public static <K,V> Map<K,V> put(Map<K,V> map, K key, V value) {
-        final int size = map.size();
-        if (size == 0) {
-            return ImmutableMap.of(key, value);
-        } else if (map instanceof ImmutableMap) {
-            map = Maps.newHashMap(map);
-        }
-        map.put(key, value);
-        return map;
-    }
-
-    public static <K,V> Map<K,V> copyOf(Map<K,V> map) {
-        if (map instanceof ImmutableMap) {
-            return map;
-        } else {
-            return Maps.newHashMap(map);
-        }
-    }
-
-    private CollectionUtils() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/query/util/ConstructorUtils.java b/querydsl-core/src/main/java/com/mysema/query/util/ConstructorUtils.java
deleted file mode 100644
index bdc94254e7..0000000000
--- a/querydsl-core/src/main/java/com/mysema/query/util/ConstructorUtils.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.util;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.mysema.util.ArrayUtils.isEmpty;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.primitives.Primitives;
-import com.mysema.query.types.ExpressionException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-import javax.annotation.Nullable;
-
-/**
- *
- * @author Shredder121
- */
-public class ConstructorUtils {
-
-    /**
-     * The parameter list for the default constructor;
-     */
-    private static final Class<?>[] NO_ARGS = {};
-
-    private static final ClassToInstanceMap<Object> defaultPrimitives
-            = ImmutableClassToInstanceMap.builder()
-            .put(Boolean.TYPE, false)
-            .put(Byte.TYPE, (byte) 0)
-            .put(Character.TYPE, (char) 0)
-            .put(Short.TYPE, (short) 0)
-            .put(Integer.TYPE, 0)
-            .put(Long.TYPE, 0L)
-            .put(Float.TYPE, 0.0F)
-            .put(Double.TYPE, 0.0)
-            .build();
-
-    /**
-     * Returns the constructor where the formal parameter list matches the
-     * givenTypes argument.
-     *
-     * It is advisable to first call
-     * {@link #getConstructorParameters(java.lang.Class, java.lang.Class[])}
-     * to get the parameters.
-     *
-     * @param type
-     * @param givenTypes
-     * @return
-     * @throws NoSuchMethodException
-     */
-    public static <C> Constructor<C> getConstructor(Class<C> type, Class<?>[] givenTypes) throws NoSuchMethodException {
-        return type.getConstructor(givenTypes);
-    }
-
-    /**
-     * Returns the parameters for the constructor that matches the given types.
-     *
-     * @param type
-     * @param givenTypes
-     * @return
-     */
-    public static Class<?>[] getConstructorParameters(Class<?> type, Class<?>[] givenTypes) {
-        next_constructor:
-        for (Constructor<?> constructor : type.getConstructors()) {
-            int matches = 0;
-            Class<?>[] parameters = constructor.getParameterTypes();
-            Iterator<Class<?>> parameterIterator = Arrays
-                    .asList(parameters)
-                    .iterator();
-            if (!isEmpty(givenTypes)
-                    && !isEmpty(parameters)) {
-                Class<?> parameter = null;
-                for (Class<?> argument : givenTypes) {
-
-                    if (parameterIterator.hasNext()) {
-                        parameter = parameterIterator.next();
-                        if (!compatible(parameter, argument)) {
-                            continue next_constructor;
-                        }
-                        matches++;
-                    } else if (constructor.isVarArgs()) {
-                        if (!compatible(parameter, argument)) {
-                            continue next_constructor;
-                        }
-                    } else {
-                        continue next_constructor; //default
-                    }
-                }
-                if (matches == parameters.length) {
-                    return parameters;
-                }
-            } else if (isEmpty(givenTypes)
-                    && isEmpty(parameters)) {
-                return NO_ARGS;
-            }
-        }
-        throw new ExpressionException("No constructor found for " + type.toString()
-                + " with parameters: " + Arrays.deepToString(givenTypes));
-    }
-
-    /**
-     * Returns a list of transformers applicable to the given constructor.
-     *
-     * @param constructor
-     * @return
-     */
-    public static Iterable<Function<Object[], Object[]>> getTransformers(Constructor<?> constructor) {
-        Iterable<ArgumentTransformer> transformers = Lists.newArrayList(
-                new PrimitiveAwareVarArgsTransformer(constructor),
-                new PrimitiveTransformer(constructor),
-                new VarArgsTransformer(constructor));
-
-        return ImmutableList
-                .<Function<Object[], Object[]>>copyOf(filter(transformers, applicableFilter));
-    }
-
-    private static Class<?> normalize(Class<?> clazz) {
-        if (clazz.isArray()) {
-            clazz = clazz.getComponentType();
-        }
-        return Primitives.wrap(clazz);
-    }
-
-    private static boolean compatible(Class<?> parameter, Class<?> argument) {
-        return normalize(parameter)
-                .isAssignableFrom(normalize(argument));
-    }
-
-    private static final Predicate<ArgumentTransformer> applicableFilter
-            = new Predicate<ArgumentTransformer>() {
-
-                @Override
-                public boolean apply(ArgumentTransformer transformer) {
-                    return transformer != null ? transformer.isApplicable() : false;
-                }
-            };
-
-    protected static abstract class ArgumentTransformer implements Function<Object[], Object[]> {
-
-        @Nullable
-        protected Constructor<?> constructor;
-        protected final Class<?>[] paramTypes;
-
-        public ArgumentTransformer(Constructor<?> constructor) {
-            this(constructor.getParameterTypes());
-            this.constructor = constructor;
-        }
-
-        public ArgumentTransformer(Class<?>[] paramTypes) {
-            this.paramTypes = paramTypes;
-        }
-
-        public abstract boolean isApplicable();
-    }
-
-    private static class VarArgsTransformer extends ArgumentTransformer {
-
-        protected final Class<?> componentType;
-
-        private VarArgsTransformer(Constructor<?> constructor) {
-            super(constructor);
-
-            if (paramTypes.length > 0) {
-                componentType = paramTypes[paramTypes.length - 1].getComponentType();
-            } else {
-                componentType = null;
-            }
-        }
-
-        @Override
-        public boolean isApplicable() {
-            return constructor != null ? constructor.isVarArgs() : false;
-        }
-
-        @Override
-        public Object[] apply(Object[] args) {
-            if (isEmpty(args)) {
-                return args;
-            }
-            int current = 0;
-
-            // constructor args
-            Object[] cargs = new Object[paramTypes.length];
-            for (int i = 0; i < cargs.length - 1; i++) {
-                set(cargs, i, args[current++]);
-            }
-            // array with vargs
-            int size = args.length - cargs.length + 1;
-            Object vargs = Array.newInstance(
-                    componentType, size);
-            cargs[cargs.length - 1] = vargs;
-            for (int i = 0; i < Array.getLength(vargs); i++) {
-                set(vargs, i, args[current++]);
-            }
-            return cargs;
-        }
-
-        private void set(Object array, int index, Object value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-            Array.set(array, index, value);
-        }
-
-    }
-
-    private static class PrimitiveTransformer extends ArgumentTransformer {
-
-        private final Set<Integer> primitiveLocations;
-
-        private PrimitiveTransformer(Constructor<?> constructor) {
-            super(constructor);
-            ImmutableSet.Builder<Integer> builder = ImmutableSet.builder();
-            Class<?>[] parameterTypes = constructor.getParameterTypes();
-            for (int location = 0; location < parameterTypes.length; location++) {
-                Class<?> parameterType = parameterTypes[location];
-
-                if (parameterType.isPrimitive()) {
-                    builder.add(location);
-                }
-            }
-            primitiveLocations = builder.build();
-        }
-
-        @Override
-        public boolean isApplicable() {
-            return !primitiveLocations.isEmpty();
-        }
-
-        @Override
-        public Object[] apply(Object[] args) {
-            if (isEmpty(args)) {
-                return args;
-            }
-            for (Integer location : primitiveLocations) {
-                if (args[location] == null) {
-                    Class<?> primitiveClass = paramTypes[location];
-                    args[location] = defaultPrimitives.getInstance(primitiveClass);
-                }
-            }
-            return args;
-        }
-
-    }
-
-    private static class PrimitiveAwareVarArgsTransformer extends VarArgsTransformer {
-
-        private final Object defaultInstance;
-
-        public PrimitiveAwareVarArgsTransformer(Constructor<?> constructor) {
-            super(constructor);
-            defaultInstance = (componentType != null) ? defaultPrimitives.getInstance(componentType) : null;
-        }
-
-        @Override
-        public boolean isApplicable() {
-            return super.isApplicable()
-                    && (componentType != null ? componentType.isPrimitive() : false);
-        }
-
-        @Override
-        public Object[] apply(Object[] args) {
-            if (isEmpty(args)) {
-                return args;
-            }
-            for (int i = paramTypes.length - 1; i < args.length; i++) {
-                if (args[i] == null) {
-                    args[i] = defaultInstance;
-                }
-            }
-            return args;
-        }
-
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/ArrayUtils.java b/querydsl-core/src/main/java/com/mysema/util/ArrayUtils.java
deleted file mode 100644
index 08d53b4930..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/ArrayUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import java.lang.reflect.Array;
-
-/**
- * ArrayUtils provides array related utility functionality
- * 
- * @author tiwe
- *
- */
-public final class ArrayUtils {
-
-    public static Object[] combine(int size, Object[]... arrays) {
-        int offset = 0;
-        Object[] target = new Object[size];
-        for (Object[] arr : arrays) {
-            System.arraycopy(arr, 0, target, offset, arr.length);
-            offset += arr.length;
-        }
-        return target;
-    }    
-    
-    // copied and modified from commons-lang-2.3
-    // originally licensed under ASL 2.0
-    public static Object[] subarray(Object[] array, int startIndexInclusive, int endIndexExclusive) {
-        int newSize = endIndexExclusive - startIndexInclusive;
-        Class<?> type = array.getClass().getComponentType();
-        if (newSize <= 0) {
-            return (Object[]) Array.newInstance(type, 0);
-        }
-        Object[] subarray = (Object[]) Array.newInstance(type, newSize);
-        System.arraycopy(array, startIndexInclusive, subarray, 0, newSize);
-        return subarray;
-    }
-    
-    public static boolean isEmpty(Object[] array) {
-        return array == null || array.length == 0;
-    }
-
-    private ArrayUtils() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/BeanUtils.java b/querydsl-core/src/main/java/com/mysema/util/BeanUtils.java
deleted file mode 100644
index a75497a31a..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/BeanUtils.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import java.beans.Introspector;
-
-/**
- * BeanUtils provides JavaBean compliant property de/capitalization functionality
- * 
- * @author tiwe
- *
- */
-public final class BeanUtils {
-
-    public static String capitalize(String name) {
-        if (name.length() > 1 && Character.isUpperCase(name.charAt(1))) {
-            return name;
-        } else if (name.length() > 1) {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        } else {
-            return name.toUpperCase();
-        }
-    }
-
-    public static String uncapitalize(String name) {
-        return Introspector.decapitalize(name);
-    }
-
-    private BeanUtils() {}
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/ClassPathUtils.java b/querydsl-core/src/main/java/com/mysema/util/ClassPathUtils.java
deleted file mode 100644
index 18118eace1..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/ClassPathUtils.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.JarURLConnection;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * ClassPathUtils provides classpath scanning functionality
- *
- * @author tiwe
- *
- */
-public final class ClassPathUtils {
-
-    public static Set<Class<?>> scanPackage(ClassLoader classLoader, Package pkg) throws IOException {
-        return scanPackage(classLoader, pkg.getName());
-    }
-
-    public static Set<Class<?>> scanPackage(ClassLoader classLoader, String pkg) throws IOException {
-        String packagePath = pkg.replace('.', '/');
-        Enumeration<URL> urls = classLoader.getResources(packagePath);
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        while (urls.hasMoreElements()) {
-            URL url = urls.nextElement();
-            if (url.getProtocol().equals("jar")) {
-                scanJar(classLoader, classes, url, packagePath);
-
-            } else if (url.getProtocol().equals("file")) {
-                scanDirectory(classLoader, pkg, classes, url, pkg);
-
-            } else {
-                throw new IllegalArgumentException("Illegal url : " + url);
-            }
-        }
-        return classes;
-    }
-
-    private static void scanDirectory(ClassLoader classLoader, String pkg, Set<Class<?>> classes,
-            URL url, String packageName) throws IOException {
-        Deque<File> files = new ArrayDeque<File>();
-        String packagePath;
-        try {
-            File packageAsFile = new File(url.toURI());
-            packagePath = packageAsFile.getPath();
-            files.add(packageAsFile);
-        } catch (URISyntaxException e) {
-            throw new IOException(e);
-        }
-        while (!files.isEmpty()) {
-            File file = files.pop();
-            for (File child : file.listFiles()) {
-                if (child.getName().endsWith(".class")) {
-                    String fileName = child.getPath().substring(packagePath.length()+1).replace(File.separatorChar, '.');
-                    String className = pkg + "." + fileName.substring(0, fileName.length()-6);
-                    if (className.startsWith(packageName)) {
-                        Class<?> cl = safeClassForName(classLoader, className);
-                        if (cl != null) {
-                            classes.add(cl);
-                        }
-                    }
-                } else if (child.isDirectory()) {
-                    files.add(child);
-                }
-            }
-        }
-    }
-
-    private static void scanJar(ClassLoader classLoader, Set<Class<?>> classes, URL url,
-            String packagePath) throws IOException {
-        // See http://stackoverflow.com/a/402771/14731
-        JarURLConnection connection = (JarURLConnection) url.openConnection();
-        JarFile jarFile = connection.getJarFile();
-        try {
-            Enumeration<JarEntry> entries = jarFile.entries();
-            while (entries.hasMoreElements()) {
-                JarEntry entry = entries.nextElement();
-                if (entry.getName().endsWith(".class") && entry.getName().startsWith(packagePath)
-                        && entry.getName().startsWith(connection.getEntryName())) {
-                    String className = entry.getName().substring(0, entry.getName().length()-6).replace('/', '.');
-                    Class<?> cl = safeClassForName(classLoader, className);
-                    if (cl != null) {
-                        classes.add(cl);
-                    }
-                }
-            }
-        } finally {
-            jarFile.close();
-        }
-    }
-
-    public static Class<?> safeClassForName(ClassLoader classLoader, String className) {
-        try {
-            if (className.startsWith("com.sun") || className.startsWith("com.apple")) {
-                return null;
-            } else {
-                return Class.forName(className, true, classLoader);
-            }
-        } catch (ClassNotFoundException e) {
-            return null;
-        } catch (NoClassDefFoundError e) {
-            return null;
-        }
-    }
-
-    private ClassPathUtils() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/FileUtils.java b/querydsl-core/src/main/java/com/mysema/util/FileUtils.java
deleted file mode 100644
index 648937bf9c..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/FileUtils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.util;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * FileUtils provides File handling functionality
- * 
- * @author tiwe
- *
- */
-public final class FileUtils {
-
-    public static void delete(File file) throws IOException {
-        if (file.isDirectory()) {
-            for (File f : file.listFiles()) {
-                delete(f);
-            }
-        }
-        if (file.isDirectory() || file.isFile()) {
-            if (!file.delete()) {
-                throw new IllegalStateException("Deletion of " + file.getPath() + " failed");
-            }
-        }
-    }
-    
-    private FileUtils() {}
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/JavaSyntaxUtils.java b/querydsl-core/src/main/java/com/mysema/util/JavaSyntaxUtils.java
deleted file mode 100644
index c8d7b34e97..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/JavaSyntaxUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * JavaSyntaxUtils defines reserved keywords for Java
- * 
- * @author tiwe
- *
- */
-public final class JavaSyntaxUtils {
-
-    private JavaSyntaxUtils() {}
-
-    private static final Set<String> reserved = ImmutableSet.of(
-    "abstract",
-    "assert",
-    "boolean",
-    "break",
-    "byte",
-    "case",
-    "catch",
-    "char",
-    "class",
-    "const",
-    "continue",
-    "default",
-    "double",
-    "do",
-    "else",
-    "enum",
-    "extends",
-    "false",
-    "final",
-    "finally",
-    "float",
-    "for",
-    "goto",
-    "if",
-    "implements",
-    "import",
-    "instanceof",
-    "int",
-    "interface",
-    "long",
-    "native",
-    "new",
-    "null",
-    "package",
-    "private",
-    "protected",
-    "public",
-    "return",
-    "short",
-    "static",
-    "strictfp",
-    "super",
-    "switch",
-    "synchronized",
-    "this",
-    "throw",
-    "throws",
-    "transient",
-    "true",
-    "try",
-    "void",
-    "volatile",
-    "while");
-
-    public static boolean isReserved(String str) {
-        return reserved.contains(str);
-    }
-
-}
diff --git a/querydsl-core/src/main/java/com/mysema/util/MathUtils.java b/querydsl-core/src/main/java/com/mysema/util/MathUtils.java
deleted file mode 100644
index 223a80ca61..0000000000
--- a/querydsl-core/src/main/java/com/mysema/util/MathUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * MathUtils provides Math related functionality
- *
- * @author tiwe
- *
- */
-public final class MathUtils {
-
-    private MathUtils() {}
-
-    @SuppressWarnings("unchecked")
-    public static <D extends Number> D sum(D num1, Number num2) {
-        BigDecimal res = new BigDecimal(num1.toString()).add(new BigDecimal(num2.toString()));
-        return MathUtils.<D>cast(res, (Class<D>)num1.getClass());
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D extends Number> D difference(D num1, Number num2) {
-        BigDecimal res = new BigDecimal(num1.toString()).subtract(new BigDecimal(num2.toString()));
-        return MathUtils.<D>cast(res, (Class<D>)num1.getClass());
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <D extends Number> D cast(Number num, Class<D> type) {
-        Number rv;
-        if (type.equals(Byte.class)) {
-            rv = num.byteValue();
-        } else if (type.equals(Double.class)) {
-            rv = num.doubleValue();
-        } else if (type.equals(Float.class)) {
-            rv = num.floatValue();
-        } else if (type.equals(Integer.class)) {
-            rv = num.intValue();
-        } else if (type.equals(Long.class)) {
-            rv = num.longValue();
-        } else if (type.equals(Short.class)) {
-            rv = num.shortValue();
-        } else if (type.equals(BigDecimal.class)) {
-            if (num instanceof BigDecimal) {
-                rv = num;
-            } else {
-                rv = new BigDecimal(num.toString());
-            }
-        } else if (type.equals(BigInteger.class)) {
-            if (num instanceof BigInteger) {
-                rv = num;
-            } else if (num instanceof BigDecimal) {
-                rv = ((BigDecimal)num).toBigInteger();
-            } else {
-                rv = new BigInteger(num.toString());
-            }
-        } else {
-            throw new IllegalArgumentException(String.format("Illegal type : %s", type.getSimpleName()));
-        }
-        return (D) rv;
-    }
-}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/BooleanBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/BooleanBuilder.java
new file mode 100644
index 0000000000..b0ecede3be
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/BooleanBuilder.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.Visitor;
+
+import java.util.Objects;
+
+/**
+ * {@code BooleanBuilder} is a cascading builder for {@link Predicate} expressions.
+ * {@code BooleanBuilder} is a mutable {@link Expression} implementation.
+ *
+ * <p>Usage example:</p>
+ *
+ * <pre>
+ * QEmployee employee = QEmployee.employee;
+ * BooleanBuilder builder = new BooleanBuilder();
+ * for (String name : names) {
+ *     builder.or(employee.name.equalsIgnoreCase(name));
+ * }
+ * </pre>
+ *
+ * @author tiwe
+ */
+public final class BooleanBuilder implements Predicate, Cloneable  {
+
+    private static final long serialVersionUID = -4129485177345542519L;
+
+    @Nullable
+    private Predicate predicate;
+
+    /**
+     * Create an empty BooleanBuilder
+     */
+    public BooleanBuilder() {  }
+
+    /**
+     * Create a BooleanBuilder with the given initial value
+     *
+     * @param initial initial value
+     */
+    public BooleanBuilder(Predicate initial) {
+        predicate = (Predicate) ExpressionUtils.extract(initial);
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        if (predicate != null) {
+            return predicate.accept(v, context);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create the intersection of this and the given predicate
+     *
+     * @param right right hand side of {@code and} operation
+     * @return the current object
+     */
+    public BooleanBuilder and(@Nullable Predicate right) {
+        if (right != null) {
+            if (predicate == null) {
+                predicate = right;
+            } else {
+                predicate = ExpressionUtils.and(predicate, right);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Create the intersection of this and the union of the given args
+     * {@code (this && (arg1 || arg2 ... || argN))}
+     *
+     * @param args union of predicates
+     * @return the current object
+     */
+    public BooleanBuilder andAnyOf(Predicate... args) {
+        if (args.length > 0) {
+            and(ExpressionUtils.anyOf(args));
+        }
+        return this;
+    }
+
+    /**
+     * Create the insertion of this and the negation of the given predicate
+     *
+     * @param right predicate to be negated
+     * @return the current object
+     */
+    public BooleanBuilder andNot(Predicate right) {
+        return and(right.not());
+    }
+
+    @Override
+    public BooleanBuilder clone() throws CloneNotSupportedException {
+        return (BooleanBuilder) super.clone();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof BooleanBuilder) {
+            return Objects.equals(((BooleanBuilder) o).getValue(), predicate);
+        } else {
+            return false;
+        }
+    }
+
+    @Nullable
+    public Predicate getValue() {
+        return predicate;
+    }
+
+    @Override
+    public int hashCode() {
+        return predicate != null ? predicate.hashCode() : 0;
+    }
+
+    /**
+     * Returns true if the value is set, and false, if not
+     *
+     * @return true if initialized and false if not
+     */
+    public boolean hasValue() {
+        return predicate != null;
+    }
+
+    @Override
+    public BooleanBuilder not() {
+        if (predicate != null) {
+            predicate = predicate.not();
+        }
+        return this;
+    }
+
+    /**
+     * Create the union of this and the given predicate
+     *
+     * @param right right hand side of {@code or} operation
+     * @return the current object
+     */
+    public BooleanBuilder or(@Nullable Predicate right) {
+        if (right != null) {
+            if (predicate == null) {
+                predicate = right;
+            } else {
+                predicate = ExpressionUtils.or(predicate, right);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Create the union of this and the intersection of the given args
+     * {@code (this || (arg1 && arg2 ... && argN))}
+     *
+     * @param args intersection of predicates
+     * @return the current object
+     */
+    public BooleanBuilder orAllOf(Predicate... args) {
+        if (args.length > 0) {
+            or(ExpressionUtils.allOf(args));
+        }
+        return this;
+    }
+
+    /**
+     * Create the union of this and the negation of the given predicate
+     *
+     * @param right predicate to be negated
+     * @return the current object
+     */
+    public BooleanBuilder orNot(Predicate right) {
+        return or(right.not());
+    }
+
+    @Override
+    public Class<? extends Boolean> getType() {
+        return Boolean.class;
+    }
+
+    @Override
+    public String toString() {
+        return predicate != null ? predicate.toString() : super.toString();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/DefaultQueryMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/DefaultQueryMetadata.java
new file mode 100644
index 0000000000..712db90e59
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/DefaultQueryMetadata.java
@@ -0,0 +1,397 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static com.querydsl.core.util.CollectionUtils.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code DefaultQueryMetadata} is the default implementation of the {@link QueryMetadata} interface.
+ *
+ * <p>{@code DefaultQueryMetadata} is mutable, but {@link DefaultQueryMetadata#clone()} can be used to
+ * created deep copies to refine the state without modifying the initial instance.</p>
+ *
+ * @author tiwe
+ */
+public class DefaultQueryMetadata implements QueryMetadata, Cloneable {
+
+    private static final long serialVersionUID = 317736313966701232L;
+
+    private boolean distinct;
+
+    private Set<Expression<?>> exprInJoins = new LinkedHashSet<>();
+
+    private List<Expression<?>> groupBy = new ArrayList<>();
+
+    @Nullable
+    private Predicate having;
+
+    private List<JoinExpression> joins = new ArrayList<>();
+
+    private Expression<?> joinTarget;
+
+    private JoinType joinType;
+
+    @Nullable
+    private Predicate joinCondition;
+
+    private Set<JoinFlag> joinFlags = new LinkedHashSet<>();
+
+    private QueryModifiers modifiers = QueryModifiers.EMPTY;
+
+    private List<OrderSpecifier<?>> orderBy = new ArrayList<>();
+
+    @Nullable
+    private Expression<?> projection;
+
+    // NOTE : this is not necessarily serializable
+    private Map<ParamExpression<?>, Object> params = new LinkedHashMap<>();
+
+    private boolean unique;
+
+    @Nullable
+    private Predicate where;
+
+    private Set<QueryFlag> flags = new LinkedHashSet<>();
+
+    private boolean extractParams = true;
+
+    private boolean validate = false;
+
+    private ValidatingVisitor validatingVisitor = ValidatingVisitor.DEFAULT;
+
+    private static Predicate and(Predicate lhs, Predicate rhs) {
+        if (lhs == null) {
+            return rhs;
+        } else {
+            return ExpressionUtils.and(lhs, rhs);
+        }
+    }
+
+    /**
+     * Create an empty DefaultQueryMetadata instance
+     */
+    public DefaultQueryMetadata() { }
+
+    /**
+     * Disable validation
+     *
+     * @return the current object
+     */
+    public DefaultQueryMetadata noValidate() {
+        validate = false;
+        return this;
+    }
+
+
+    @Override
+    public void addFlag(QueryFlag flag) {
+        flags = addSorted(flags, flag);
+    }
+
+    @Override
+    public void addJoinFlag(JoinFlag flag) {
+        joinFlags.add(flag);
+    }
+
+    @Override
+    public void addGroupBy(Expression<?> o) {
+        // group by elements can't be validated, since they can refer to projection elements
+        // that are declared later
+        groupBy.add(o);
+    }
+
+    @Override
+    public void addHaving(Predicate e) {
+        if (e == null) {
+            return;
+        }
+        e = (Predicate) ExpressionUtils.extract(e);
+        if (e != null) {
+            // having elements can't be validated, since they can refer to projection elements
+            // that are declared later
+            having = and(having, e);
+        }
+    }
+
+    private void addLastJoin() {
+        if (joinTarget != null) {
+            joins.add(new JoinExpression(joinType, joinTarget, joinCondition, CollectionUtils.unmodifiableSet(joinFlags)));
+            joinType = null;
+            joinTarget = null;
+            joinCondition = null;
+            joinFlags.clear();
+        }
+    }
+
+    @Override
+    public void addJoin(JoinType joinType, Expression<?> expr) {
+        addLastJoin();
+        if (!exprInJoins.contains(expr)) {
+            if (expr instanceof Path && ((Path<?>) expr).getMetadata().isRoot()) {
+                exprInJoins.add(expr);
+            } else {
+                validate(expr);
+            }
+            this.joinType = joinType;
+            this.joinTarget = expr;
+        } else if (validate) {
+            throw new IllegalStateException(expr + " is already used");
+        }
+    }
+
+    @Override
+    public void addJoinCondition(Predicate o) {
+        validate(o);
+        joinCondition = and(joinCondition, o);
+    }
+
+    @Override
+    public void addOrderBy(OrderSpecifier<?> o) {
+        // order specifiers can't be validated, since they can refer to projection elements
+        // that are declared later
+        orderBy.add(o);
+    }
+
+    @Override
+    public void setProjection(Expression<?> o) {
+        validate(o);
+        projection = o;
+    }
+
+    @Override
+    public void addWhere(Predicate e) {
+        if (e == null) {
+            return;
+        }
+        e = (Predicate) ExpressionUtils.extract(e);
+        if (e != null) {
+            validate(e);
+            where = and(where, e);
+        }
+    }
+
+    @Override
+    public void clearOrderBy() {
+        orderBy.clear();
+    }
+
+    @Override
+    public void clearWhere() {
+        where = new BooleanBuilder();
+    }
+
+    @Override
+    public QueryMetadata clone() {
+        try {
+            DefaultQueryMetadata clone = (DefaultQueryMetadata) super.clone();
+            clone.exprInJoins = copyOf(exprInJoins);
+            clone.groupBy = copyOf(groupBy);
+            clone.having = having;
+            clone.joins = copyOf(joins);
+            clone.joinTarget = joinTarget;
+            clone.joinCondition = joinCondition;
+            clone.joinFlags = copyOf(joinFlags);
+            clone.joinType = joinType;
+            clone.modifiers = modifiers;
+            clone.orderBy = copyOf(orderBy);
+            clone.projection = projection;
+            clone.params = copyOf(params);
+            clone.where = where;
+            clone.flags = copyOfSorted(flags);
+            return clone;
+        } catch (CloneNotSupportedException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public List<Expression<?>> getGroupBy() {
+        return Collections.unmodifiableList(groupBy);
+    }
+
+    @Override
+    public Predicate getHaving() {
+        return having;
+    }
+
+    @Override
+    public List<JoinExpression> getJoins() {
+        if (joinTarget == null) {
+            return Collections.unmodifiableList(joins);
+        } else {
+            List<JoinExpression> j = new ArrayList<>(joins);
+            j.add(new JoinExpression(joinType, joinTarget, joinCondition, Collections.unmodifiableSet(new HashSet<>(joinFlags))));
+            return j;
+        }
+    }
+
+    @Override
+    public QueryModifiers getModifiers() {
+        return modifiers;
+    }
+
+    @Override
+    public Map<ParamExpression<?>,Object> getParams() {
+        return Collections.unmodifiableMap(params);
+    }
+
+    @Override
+    public List<OrderSpecifier<?>> getOrderBy() {
+        return Collections.unmodifiableList(orderBy);
+    }
+
+    @Override
+    public Expression<?> getProjection() {
+        return projection;
+    }
+
+    @Override
+    public Predicate getWhere() {
+        return where;
+    }
+
+    @Override
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    @Override
+    public boolean isUnique() {
+        return unique;
+    }
+
+    @Override
+    public void reset() {
+        params = new LinkedHashMap<>();
+        modifiers = QueryModifiers.EMPTY;
+    }
+
+    @Override
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    @Override
+    public void setLimit(Long limit) {
+        if (modifiers == null || modifiers.getOffset() == null) {
+            modifiers = QueryModifiers.limit(limit);
+        } else {
+            modifiers = new QueryModifiers(limit, modifiers.getOffset());
+        }
+    }
+
+    @Override
+    public void setModifiers(QueryModifiers restriction) {
+        if (restriction == null) {
+            throw new NullPointerException();
+        }
+        this.modifiers = restriction;
+    }
+
+    @Override
+    public void setOffset(Long offset) {
+        if (modifiers == null || modifiers.getLimit() == null) {
+            modifiers = QueryModifiers.offset(offset);
+        } else {
+            modifiers = new QueryModifiers(modifiers.getLimit(), offset);
+        }
+    }
+
+    @Override
+    public void setUnique(boolean unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public <T> void setParam(ParamExpression<T> param, T value) {
+        params = put(params, param, value);
+    }
+
+    @Override
+    public Set<QueryFlag> getFlags() {
+        return flags;
+    }
+
+    @Override
+    public boolean hasFlag(QueryFlag flag) {
+        return flags.contains(flag);
+    }
+
+    @Override
+    public void removeFlag(QueryFlag flag) {
+        flags = removeSorted(flags, flag);
+    }
+
+    private void validate(Expression<?> expr) {
+        if (extractParams) {
+            expr.accept(ParamsVisitor.DEFAULT, this);
+        }
+        if (validate) {
+            exprInJoins = expr.accept(validatingVisitor, exprInJoins);
+        }
+    }
+
+    @Override
+    public void setValidate(boolean v) {
+        this.validate = v;
+    }
+
+    public void setValidatingVisitor(ValidatingVisitor visitor) {
+        this.validatingVisitor = visitor;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof QueryMetadata) {
+            QueryMetadata q = (QueryMetadata) o;
+            return q.getFlags().equals(flags)
+                && q.getGroupBy().equals(groupBy)
+                && Objects.equals(q.getHaving(), having)
+                && q.isDistinct() == distinct
+                && q.isUnique() == unique
+                && q.getJoins().equals(getJoins())
+                && q.getModifiers().equals(modifiers)
+                && q.getOrderBy().equals(orderBy)
+                && q.getParams().equals(params)
+                && Objects.equals(q.getProjection(), projection)
+                && Objects.equals(q.getWhere(), where);
+
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(flags, groupBy, having, getJoins(), modifiers,
+                orderBy, params, projection, unique, where);
+    }
+
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/EmptyMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/query/EmptyMetadata.java
rename to querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java
index f5e7f6a2fd..f67a588f41 100644
--- a/querydsl-core/src/main/java/com/mysema/query/EmptyMetadata.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/EmptyMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Predicate;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Predicate;
 
 /**
- * EmptyMetadata provides a immutable empty QueryMetadata instace
+ * {@code EmptyMetadata} provides an immutable empty {@link QueryMetadata} instance.
+ *
+ * <p>Modification methods throw {@link UnsupportedOperationException}.</p>
  *
  * @author tiwe
  *
@@ -61,7 +63,7 @@ public void addOrderBy(OrderSpecifier<?> o) {
     }
 
     @Override
-    public void addProjection(Expression<?> o) {
+    public void setProjection(Expression<?> o) {
         throw new UnsupportedOperationException();
     }
 
@@ -75,11 +77,6 @@ public void clearOrderBy() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public void clearProjection() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public void clearWhere() {
         throw new UnsupportedOperationException();
@@ -116,8 +113,8 @@ public List<OrderSpecifier<?>> getOrderBy() {
     }
 
     @Override
-    public List<Expression<?>> getProjection() {
-        return Collections.emptyList();
+    public Expression<?> getProjection() {
+        return null;
     }
 
     @Override
diff --git a/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java b/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
new file mode 100644
index 0000000000..30ff23a32a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import com.mysema.commons.lang.CloseableIterator;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code Fetchable} defines default projection methods for {@link Query} implementations.
+ * All Querydsl query implementations should implement this interface.
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public interface Fetchable<T> {
+    /**
+     * Get the projection as a typed List
+     *
+     * @return results in list form
+     */
+    List<T> fetch();
+
+    /**
+     * Get the first result of Get the projection or null if no result is found
+     *
+     * @return first result or null
+     */
+    @Nullable
+    T fetchFirst();
+
+    /**
+     * Get the projection as a unique result or null if no result is found
+     *
+     * @throws NonUniqueResultException if there is more than one matching result
+     * @return first result or null
+     */
+    @Nullable
+    T fetchOne() throws NonUniqueResultException;
+
+    /**
+     * Get the projection as a typed closeable Iterator
+     *
+     * @return closeable iterator
+     */
+    CloseableIterator<T> iterate();
+
+    /**
+     * Get the projection as a typed closeable Stream.
+     *
+     * @return closeable stream
+     */
+    default Stream<T> stream() {
+        final CloseableIterator<T> iterator = iterate();
+        final Spliterator<T> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED);
+        return StreamSupport.stream(spliterator, false)
+                .onClose(iterator::close);
+    }
+
+    /**
+     * Get the projection in {@link QueryResults} form.
+     *
+     * Make sure to use {@link #fetch()} instead if you do not rely on the {@link QueryResults#getOffset()} or
+     * {@link QueryResults#getLimit()}, because it will be more performant. Also, count queries cannot be
+     * properly generated for all dialects. For example: in JPA count queries can't be generated for queries
+     * that have multiple group by expressions or a having clause.
+     * Get the projection in {@link QueryResults} form.
+     *
+     * Use {@link #fetch()} instead if you do not need the total count of rows in the query result.
+     *
+     * @return results
+     * @see #fetch()
+     */
+    QueryResults<T> fetchResults();
+
+    /**
+     * Get the count of matched elements
+     *
+     * Note: not all QueryDSL modules might optimize fetchCount using a count query.
+     * An implementation is allowed to fall back to {@code fetch().size()}.
+     *
+     * @return row count
+     */
+    long fetchCount();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/FetchableQuery.java b/querydsl-core/src/main/java/com/querydsl/core/FetchableQuery.java
new file mode 100644
index 0000000000..dcfe6d369a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/FetchableQuery.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code FetchableQuery} extends {@link Fetchable} and {@link SimpleQuery} with projection changing
+ * methods and result aggregation functionality using {@link ResultTransformer} instances.
+ *
+ * @param <T> element type
+ * @param <Q> concrete subtype
+ */
+public interface FetchableQuery<T, Q extends FetchableQuery<T, Q>> extends SimpleQuery<Q>, Fetchable<T> {
+
+    /**
+     * Change the projection of this query
+     *
+     * @param <U>
+     * @param expr new projection
+     *
+     * @return the current object
+     */
+    <U> FetchableQuery<U, ?> select(Expression<U> expr);
+
+    /**
+     * Change the projection of this query
+     *
+     * @param exprs new projection
+     * @return the current object
+     */
+    FetchableQuery<Tuple, ?> select(Expression<?>... exprs);
+
+    /**
+     * Apply the given transformer to this {@code FetchableQuery} instance and return the results
+     *
+     * @param <S>
+     * @param transformer result transformer
+     * @return transformed result
+     */
+    <S> S transform(ResultTransformer<S> transformer);
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java b/querydsl-core/src/main/java/com/querydsl/core/FilteredClause.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/FilteredClause.java
rename to querydsl-core/src/main/java/com/querydsl/core/FilteredClause.java
index e8b8d989a2..6a11a85a98 100644
--- a/querydsl-core/src/main/java/com/mysema/query/FilteredClause.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/FilteredClause.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,26 +11,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import com.mysema.query.types.Predicate;
+import com.querydsl.core.types.Predicate;
 
 /**
- * FilteredClause is an interface for clauses with a filter condition
+ * {@code FilteredClause} is an interface for clauses with a filter condition
  *
  * @author tiwe
  *
  * @param <C> concrete subtype
  */
 public interface FilteredClause<C extends FilteredClause<C>> {
-    
+
     /**
      * Adds the given filter conditions
-     * 
+     *
      * <p>Skips null arguments</p>
      *
      * @param o filter conditions to be added
-     * @return
+     * @return the current object
      */
     C where(Predicate... o);
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/JoinExpression.java b/querydsl-core/src/main/java/com/querydsl/core/JoinExpression.java
new file mode 100644
index 0000000000..1397da51cf
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/JoinExpression.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code JoinExpression} is a join element in a {@link Query} instance.
+ *
+ * @author tiwe
+ */
+@Immutable
+public final class JoinExpression implements Serializable {
+
+    private static final long serialVersionUID = -1131755765747174886L;
+
+    @Nullable
+    private final Predicate condition;
+
+    private final Set<JoinFlag> flags;
+
+    private final Expression<?> target;
+
+    private final JoinType type;
+
+    /**
+     * Create a new JoinExpression instance
+     *
+     * @param type type of join
+     * @param target target of join
+     */
+    public JoinExpression(JoinType type, Expression<?> target) {
+        this(type, target, null, Collections.emptySet());
+    }
+
+
+    /**
+     * Create a new JoinExpression instance
+     *
+     * @param type type of join
+     * @param target target of join
+     * @param condition join condition or null, if none is used
+     * @param flags join flags
+     */
+    public JoinExpression(JoinType type, Expression<?> target, @Nullable Predicate condition,
+            Set<JoinFlag> flags) {
+        this.type = type;
+        this.target = target;
+        this.condition = condition;
+        this.flags = CollectionUtils.unmodifiableSet(flags);
+    }
+
+    @Nullable
+    public Predicate getCondition() {
+        return condition;
+    }
+
+    public Expression<?> getTarget() {
+        return target;
+    }
+
+    public JoinType getType() {
+        return type;
+    }
+
+    public boolean hasFlag(JoinFlag flag) {
+        return flags.contains(flag);
+    }
+
+    public Set<JoinFlag> getFlags() {
+        return flags;
+    }
+
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append(type).append(" ").append(target);
+        if (condition != null) {
+            builder.append(" on ").append(condition);
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(condition, target, type);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof JoinExpression) {
+            JoinExpression j = (JoinExpression) o;
+            return Objects.equals(condition, j.condition) &&
+                   Objects.equals(target, j.target) &&
+                   Objects.equals(type, j.type);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/JoinFlag.java b/querydsl-core/src/main/java/com/querydsl/core/JoinFlag.java
new file mode 100644
index 0000000000..d1d59cd42b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/JoinFlag.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Serializable;
+
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+
+/**
+ * {@code JoinFlag} defines a join related flag using an Expression instance
+ *
+ * <p>{@code JoinFlag} instances can be used in Querydsl modules which serialize queries to String form.</p>
+ *
+ * @author tiwe
+ */
+@Immutable
+public class JoinFlag implements Serializable {
+
+    /**
+     * The different {@code JoinFlag} positions
+     */
+    public enum Position {
+
+        /**
+         * before the join
+         */
+        START,
+
+        /**
+         * as a replacement for the join symbol
+         */
+        OVERRIDE,
+
+        /**
+         * before the join target
+         */
+        BEFORE_TARGET,
+
+        /**
+         * before the join condition
+         */
+        BEFORE_CONDITION,
+
+        /**
+         * after the join
+         */
+        END
+
+    }
+
+    private static final long serialVersionUID = -688265393547206465L;
+
+    private final Expression<?> flag;
+
+    private final Position position;
+
+    /**
+     * Create a new instance using the given flag
+     * <p>The used position is before the target.</p>
+     *
+     * @param flag flag in String form
+     */
+    public JoinFlag(String flag) {
+        this(ExpressionUtils.template(Object.class, flag), Position.BEFORE_TARGET);
+    }
+
+    /**
+     * Create a new instance using the given flag and position.
+     *
+     * @param flag flag in String form
+     * @param position position of the flag in the join
+     */
+    public JoinFlag(String flag, Position position) {
+        this(ExpressionUtils.template(Object.class, flag), position);
+    }
+
+    /**
+     * Create a new instance using the given flag
+     * <p>The used position is before the target.</p>
+     *
+     * @param flag flag in Expression form
+     */
+    public JoinFlag(Expression<?> flag) {
+        this(flag, Position.BEFORE_TARGET);
+    }
+
+    /**
+     * Create a new instance using the given flag and position
+     *
+     * @param flag flag in Expression form
+     * @param position position of the flag in the join
+     */
+    public JoinFlag(Expression<?> flag, Position position) {
+        this.flag = flag;
+        this.position = position;
+    }
+
+    @Override
+    public int hashCode() {
+        return flag.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof JoinFlag) {
+            return ((JoinFlag) obj).flag.equals(flag);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return flag.toString();
+    }
+
+    public Expression<?> getFlag() {
+        return flag;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/JoinType.java b/querydsl-core/src/main/java/com/querydsl/core/JoinType.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/query/JoinType.java
rename to querydsl-core/src/main/java/com/querydsl/core/JoinType.java
index 2eb63d7d9a..dee248ecd3 100644
--- a/querydsl-core/src/main/java/com/mysema/query/JoinType.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/JoinType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 /**
- * JoinType defines the supported join types
+ * {@code JoinType} defines the supported join types
  *
  * @author tiwe
  */
@@ -45,18 +45,18 @@ public enum JoinType {
     FULLJOIN(false, true);
 
     private final boolean inner, outer;
-    
+
     JoinType(boolean inner, boolean outer) {
         this.inner = inner;
         this.outer = outer;
     }
-    
+
     public boolean isInner() {
         return inner;
     }
-    
+
     public boolean isOuter() {
         return outer;
     }
-    
+
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/NonUniqueResultException.java b/querydsl-core/src/main/java/com/querydsl/core/NonUniqueResultException.java
new file mode 100644
index 0000000000..39156f7142
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/NonUniqueResultException.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+/**
+ * {@code NonUniqueResultException} is thrown for query results where one result row is expected, but multiple
+ * are retrieved.
+ *
+ * @author tiwe
+ *
+ */
+public class NonUniqueResultException extends QueryException {
+
+    private static final long serialVersionUID = -1757423191400510323L;
+
+    public NonUniqueResultException() {
+        super("Only one result is allowed for fetchOne calls");
+    }
+
+    public NonUniqueResultException(String message) {
+        super(message);
+    }
+
+    public NonUniqueResultException(Exception e) {
+        super(e);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/Query.java b/querydsl-core/src/main/java/com/querydsl/core/Query.java
new file mode 100644
index 0000000000..b709a150e8
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/Query.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code Query} defines the main query interface of the fluent query language.
+ *
+ * <p>Note that the from method has been left out, since there are implementation
+ * specific variants of it.</p>
+ *
+ * @author tiwe
+ * @see SimpleQuery
+ *
+ * @param <Q> concrete subtype
+ */
+public interface Query<Q extends Query<Q>> extends SimpleQuery<Q> {
+
+    /**
+     * Add grouping/aggregation expressions
+     *
+     * @param o group by expressions
+     * @return the current object
+     */
+    Q groupBy(Expression<?>... o);
+
+    /**
+     * Add filters for aggregation
+     *
+     * @param o having conditions
+     * @return the current object
+     */
+    Q having(Predicate... o);
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryException.java b/querydsl-core/src/main/java/com/querydsl/core/QueryException.java
similarity index 78%
rename from querydsl-core/src/main/java/com/mysema/query/QueryException.java
rename to querydsl-core/src/main/java/com/querydsl/core/QueryException.java
index d8e54cf0e0..9f47b014cb 100644
--- a/querydsl-core/src/main/java/com/mysema/query/QueryException.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 /**
+ * {@code QueryException} is thrown for exceptional query construction issues
+ *
  * @author tiwe
  *
  */
-public class QueryException extends RuntimeException{
+public class QueryException extends RuntimeException {
 
     private static final long serialVersionUID = 2345665389612058703L;
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/QueryFactory.java b/querydsl-core/src/main/java/com/querydsl/core/QueryFactory.java
new file mode 100644
index 0000000000..21d56ba1e6
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+
+/**
+ * Common interface for QueryFactory implementations
+ *
+ * @author tiwe
+ *
+ * @param <Q> Query type
+ */
+public interface QueryFactory<Q extends Query<?>> {
+    /**
+     * Create a new Query
+     *
+     * @return new query
+     */
+    Q query();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java b/querydsl-core/src/main/java/com/querydsl/core/QueryFlag.java
similarity index 84%
rename from querydsl-core/src/main/java/com/mysema/query/QueryFlag.java
rename to querydsl-core/src/main/java/com/querydsl/core/QueryFlag.java
index ec0f53c978..a07b1d0525 100644
--- a/querydsl-core/src/main/java/com/mysema/query/QueryFlag.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import java.io.Serializable;
+import java.util.Objects;
 
-import com.google.common.base.Objects;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.TemplateExpressionImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
 
 /**
  * Defines a positioned flag in a Query for customization of query serialization
@@ -25,14 +25,17 @@
  * @author tiwe
  *
  */
-public class QueryFlag implements Serializable{
+public class QueryFlag implements Serializable {
 
     private static final long serialVersionUID = -7131081607441961628L;
 
+    /**
+     * The different {@code QueryFlag} positions
+     */
     public enum Position {
 
         /**
-         *
+         * WITH part (used in SQL)
          */
         WITH,
 
@@ -108,7 +111,7 @@ public enum Position {
     private final Expression<?> flag;
 
     public QueryFlag(Position position, String flag) {
-        this(position, TemplateExpressionImpl.create(Object.class, flag));
+        this(position, ExpressionUtils.template(Object.class, flag));
     }
 
     public QueryFlag(Position position, Expression<?> flag) {
@@ -126,7 +129,7 @@ public Expression<?> getFlag() {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(position, flag);
+        return Objects.hash(position, flag);
     }
 
     @Override
@@ -134,7 +137,7 @@ public boolean equals(Object obj) {
         if (obj == this) {
             return true;
         } else if (obj instanceof QueryFlag) {
-            QueryFlag other = (QueryFlag)obj;
+            QueryFlag other = (QueryFlag) obj;
             return other.position.equals(position) && other.flag.equals(flag);
         } else {
             return false;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java
new file mode 100644
index 0000000000..936416f9fd
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryMetadata.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Predicate;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code QueryMetadata} defines query metadata such as query sources, filtering
+ * conditions and the projection
+ *
+ * @author tiwe
+ */
+public interface QueryMetadata extends Serializable {
+
+    /**
+     * Add the given group by expressions
+     *
+     * @param o group by expressions
+     */
+    void addGroupBy(Expression<?> o);
+
+    /**
+     * Add the given having expressions
+     *
+     * @param o having conditions
+     */
+    void addHaving(Predicate o);
+
+    /**
+     * Add the given query join
+     *
+     * @param joinType type of join
+     * @param expr join target
+     */
+    void addJoin(JoinType joinType, Expression<?> expr);
+
+    /**
+     * Add the given join flag to the last given join
+     *
+     * @param flag join flag
+     */
+    void addJoinFlag(JoinFlag flag);
+
+    /**
+     * Add the given join condition to the last given join
+     *
+     * @param o join condition
+     */
+    void addJoinCondition(Predicate o);
+
+    /**
+     * Add the given order specifiers
+     *
+     * @param o order
+     */
+    void addOrderBy(OrderSpecifier<?> o);
+
+    /**
+     * Add the given where expressions
+     *
+     * @param o where condition
+     */
+    void addWhere(Predicate o);
+
+    /**
+     * Clear the order expressions
+     */
+    void clearOrderBy();
+
+    /**
+     * Clear the where expressions
+     */
+    void clearWhere();
+
+    /**
+     * Clone this QueryMetadata instance
+     *
+     * @return new QueryMetadata instance with cloned state
+     */
+    QueryMetadata clone();
+
+    /**
+     * Get the group by expressions
+     *
+     * @return group by
+     */
+    @Unmodifiable
+    List<Expression<?>> getGroupBy();
+
+    /**
+     * Get the having expressions
+     *
+     * @return having condition, or null if none set
+     */
+    @Nullable
+    Predicate getHaving();
+
+    /**
+     * Get the query joins
+     *
+     * @return joins
+     */
+    @Unmodifiable
+    List<JoinExpression> getJoins();
+
+    /**
+     * Get the QueryModifiers
+     *
+     * @return modifiers
+     */
+    QueryModifiers getModifiers();
+
+    /**
+     * Get the OrderSpecifiers
+     *
+     * @return order by
+     */
+    @Unmodifiable
+    List<OrderSpecifier<?>> getOrderBy();
+
+    /**
+     * Get the projection
+     *
+     * @return projection
+     */
+    @Nullable
+    Expression<?> getProjection();
+
+    /**
+     * Get the parameter bindings
+     *
+     * @return parameter bindings
+     */
+    @Unmodifiable
+    Map<ParamExpression<?>,Object> getParams();
+
+    /**
+     * Get the expressions aggregated into a single boolean expression or null,
+     * if none where defined
+     *
+     * @return where condition or null, if none set
+     */
+    @Nullable
+    Predicate getWhere();
+
+    /**
+     * Get whether the projection is distinct
+     *
+     * @return distinct
+     */
+    boolean isDistinct();
+
+    /**
+     * Get whether the projection is unique
+     *
+     * @return unique
+     */
+    boolean isUnique();
+
+    /**
+     * Reset the projection
+     */
+    void reset();
+
+    /**
+     * Set the distinct flag
+     *
+     * @param distinct distinct
+     */
+    void setDistinct(boolean distinct);
+
+    /**
+     * Set the maximum number of rows
+     *
+     * @param limit limit
+     */
+    void setLimit(@Nullable Long limit);
+
+    /**
+     * Set the query modifiers limit and offset
+     *
+     * @param restriction restriction
+     */
+    void setModifiers(QueryModifiers restriction);
+
+    /**
+     * Set the number of skipped rows
+     *
+     * @param offset offset
+     */
+    void setOffset(@Nullable Long offset);
+
+    /**
+     * Set the unique flag
+     *
+     * @param unique unique
+     */
+    void setUnique(boolean unique);
+
+    /**
+     * Bind the value for the given parameter expression
+     *
+     * @param <T> binding type
+     * @param param parameter
+     * @param value binding
+     */
+    <T> void setParam(ParamExpression<T> param, T value);
+
+    /**
+     * Set the projection
+     *
+     * @param o projection
+     */
+    void setProjection(Expression<?> o);
+
+    /**
+     * Add the given query flag
+     *
+     * @param flag query flag
+     */
+    void addFlag(QueryFlag flag);
+
+    /**
+     * Return whether the given query flag is applied
+     *
+     * @param flag query flag
+     * @return true, if present, false, if not
+     */
+    boolean hasFlag(QueryFlag flag);
+
+    /**
+     * Remove the given query flag
+     *
+     * @param flag query flag
+     */
+    void removeFlag(QueryFlag flag);
+
+    /**
+     * Get all query flags
+     *
+     * @return all used query flags
+     */
+    @Unmodifiable
+    Set<QueryFlag> getFlags();
+
+    /**
+     * Set the validate flag
+     *
+     * @param v validate
+     */
+    void setValidate(boolean v);
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/QueryModifiers.java b/querydsl-core/src/main/java/com/querydsl/core/QueryModifiers.java
new file mode 100644
index 0000000000..1bcd54a027
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryModifiers.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+import org.jetbrains.annotations.Range;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code QueryModifiers} combines limit and offset info into a single immutable value type.
+ *
+ * @author tiwe
+ */
+public final class QueryModifiers implements Serializable {
+
+    private static final long serialVersionUID = 2934344588433680339L;
+
+    /**
+     * No limit and not offset restriction
+     */
+    public static final QueryModifiers EMPTY = new QueryModifiers();
+
+    private static int toInt(Long l) {
+        if (l <= Integer.MAX_VALUE) {
+            return l.intValue();
+        } else {
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    public static QueryModifiers limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit) {
+        return new QueryModifiers(limit, null);
+    }
+
+    public static QueryModifiers offset(@Range(from = 0, to = Integer.MAX_VALUE) long offset) {
+        return new QueryModifiers(null, offset);
+    }
+
+    @Nullable
+    private final Long limit, offset;
+
+    private QueryModifiers() {
+        limit = null;
+        offset = null;
+    }
+
+    public QueryModifiers(@Nullable Long limit, @Nullable Long offset) {
+        this.limit = limit;
+        if (limit != null && limit <= 0) {
+            throw new IllegalArgumentException("Limit must be greater than 0.");
+        }
+        this.offset = offset;
+        if (offset != null && offset < 0) {
+            throw new IllegalArgumentException("Offset must not be negative.");
+        }
+    }
+
+    public QueryModifiers(QueryModifiers modifiers) {
+        this.limit = modifiers.getLimit();
+        this.offset = modifiers.getOffset();
+    }
+
+    @Nullable
+    public Long getLimit() {
+        return limit;
+    }
+
+    @Nullable
+    public Integer getLimitAsInteger() {
+        return limit != null ? toInt(limit) : null;
+    }
+
+    @Nullable
+    public Long getOffset() {
+        return offset;
+    }
+
+    @Nullable
+    public Integer getOffsetAsInteger() {
+        return offset != null ? toInt(offset) : null;
+    }
+
+    /**
+     * Checks if is restricting.
+     *
+     * @return true, if is restricting
+     */
+    public boolean isRestricting() {
+        return limit != null || offset != null;
+    }
+
+    /**
+     * Get a sublist based on the restriction of limit and offset
+     *
+     * @param <T>
+     * @param list list to be handled
+     * @return sublist with limit and offset applied
+     */
+    public <T> List<T> subList(List<T> list) {
+        if (!list.isEmpty()) {
+            int from = offset != null ? toInt(offset) : 0;
+            int to = limit != null ? (from + toInt(limit)) : list.size();
+            return list.subList(from, Math.min(to,list.size()));
+        } else {
+            return list;
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof QueryModifiers) {
+            QueryModifiers qm = (QueryModifiers) o;
+            return Objects.equals(qm.getLimit(), limit) && Objects.equals(qm.getOffset(), offset);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(limit, offset);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/QueryResults.java b/querydsl-core/src/main/java/com/querydsl/core/QueryResults.java
new file mode 100644
index 0000000000..e7de11978f
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/QueryResults.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code QueryResults} bundles data for paged query results
+ *
+ * @param <T> type of result elements
+ *
+ * @author tiwe
+ */
+public final class QueryResults<T> implements Serializable {
+
+    private static final long serialVersionUID = -4591506147471300909L;
+
+    private static final QueryResults<Object> EMPTY = new QueryResults<Object>(
+            Collections.emptyList(), Long.MAX_VALUE, 0L, 0L);
+
+    @SuppressWarnings("unchecked")
+    public static <T> QueryResults<T> emptyResults() {
+        return (QueryResults<T>) EMPTY;
+    };
+
+    private final long limit, offset, total;
+
+    private final List<T> results;
+
+    /**
+     * Create a new {@link QueryResults} instance
+     *
+     * @param results paged results
+     * @param limit used limit
+     * @param offset used offset
+     * @param total total result rows count
+     */
+    public QueryResults(List<T> results, @Nullable Long limit, @Nullable Long offset, long total) {
+        this.limit = limit != null ? limit : Long.MAX_VALUE;
+        this.offset = offset != null ? offset : 0L;
+        this.total = total;
+        this.results = results;
+    }
+
+    /**
+     * Create a new {@link QueryResults} instance
+     *
+     * @param results paged results
+     * @param mod limit and offset
+     * @param total total result rows count
+     */
+    public QueryResults(List<T> results, QueryModifiers mod, long total) {
+        this(results, mod.getLimit(), mod.getOffset(), total);
+    }
+
+    /**
+     * Get the results in List form
+     *
+     * An empty list is returned for no results.
+     *
+     * @return results
+     */
+    public List<T> getResults() {
+        return results;
+    }
+
+    /**
+     * Get the total number of results
+     *
+     * @return total rows
+     */
+    public long getTotal() {
+        return total;
+    }
+
+    /**
+     * Return whether there are results in the current query window
+     *
+     * @return true, if no results where found
+     */
+    public boolean isEmpty() {
+        return results.isEmpty();
+    }
+
+    /**
+     * Get the limit value used for the query
+     *
+     * @return applied limit
+     */
+    public long getLimit() {
+        return limit;
+    }
+
+    /**
+     * Get the offset value used for the query
+     *
+     * @return applied offset
+     */
+    public long getOffset() {
+        return offset;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/ResultTransformer.java b/querydsl-core/src/main/java/com/querydsl/core/ResultTransformer.java
new file mode 100644
index 0000000000..6e1ac6d49d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/ResultTransformer.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+
+/**
+ * Executes query on a {@link FetchableQuery} and transforms results into T. This can be used for example
+ * to group projected columns or to filter out duplicate results.
+ *
+ * @see com.querydsl.core.group.GroupBy
+ * @author sasa
+ *
+ * @param <T> Transformations target type
+ */
+public interface ResultTransformer<T> {
+
+    /**
+     * Execute the given query and transform the results
+     *
+     * @param query query to be used for execution
+     * @return transformed results
+     */
+    T transform(FetchableQuery<?, ?> query);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/SimpleQuery.java b/querydsl-core/src/main/java/com/querydsl/core/SimpleQuery.java
new file mode 100644
index 0000000000..e74d14137d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/SimpleQuery.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+
+/**
+ * {@code SimpleQuery} defines a simple querying interface than {@link Query}
+ *
+ * @author tiwe
+ *
+ * @param <Q> concrete subtype
+ * @see Query
+ */
+public interface SimpleQuery<Q extends SimpleQuery<Q>> extends FilteredClause<Q> {
+
+    /**
+     * Set the limit / max results for the query results
+     *
+     * @param limit max rows
+     * @return the current object
+     */
+    Q limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit);
+
+    /**
+     * Set the offset for the query results
+     *
+     * @param offset row offset
+     * @return the current object
+     */
+    Q offset(@Range(from = 0, to = Integer.MAX_VALUE) long offset);
+
+    /**
+     * Set both limit and offset of the query results
+     *
+     * @param modifiers query modifiers
+     * @return the current object
+     */
+    Q restrict(QueryModifiers modifiers);
+
+    /**
+     * Add order expressions
+     *
+     * @param o order
+     * @return the current object
+     */
+    Q orderBy(OrderSpecifier<?>... o);
+
+    /**
+     * Set the given parameter to the given value
+     *
+     * @param <T>
+     * @param param param
+     * @param value binding
+     * @return the current object
+     */
+    <T> Q set(ParamExpression<T> param, T value);
+
+    /**
+     * Set the Query to return distinct results
+     *
+     * @return the current object
+     */
+    Q distinct();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/Tuple.java b/querydsl-core/src/main/java/com/querydsl/core/Tuple.java
new file mode 100644
index 0000000000..e1afa43ae9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/Tuple.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code Tuple} defines an interface for generic query result projection
+ *
+ * <p>Usage example:</p>
+ * <pre>
+ * {@code
+ * List<Tuple> result = query.from(employee).select(employee.firstName, employee.lastName).fetch();
+ * for (Tuple row : result) {
+ *     System.out.println("firstName " + row.get(employee.firstName));
+ *     System.out.println("lastName " + row.get(employee.lastName));
+ * }
+ * }
+ * </pre>
+ *
+ * @author tiwe
+ *
+ */
+public interface Tuple {
+
+    /**
+     * Get a Tuple element by index
+     *
+     * @param <T> type of element
+     * @param index zero based index
+     * @param type type of element
+     * @return element in array
+     */
+    @Nullable
+    <T> T get(int index, Class<T> type);
+
+    /**
+     * Get a tuple element by expression
+     *
+     * @param <T> type of element
+     * @param expr expression key
+     * @return result element that matches the expression
+     */
+    @Nullable
+    <T> T get(Expression<T> expr);
+
+    /**
+     * Get the size of the Tuple
+     *
+     * @return row element count
+     */
+    int size();
+
+    /**
+     * Get the content as an Object array
+     *
+     * @return tuple in array form
+     */
+    Object[] toArray();
+
+   /**
+    * All Tuples should override equals and hashCode. For compatibility
+    * across different Tuple implementations, equality check should use
+    * {@code java.util.Arrays#equals(Object[], Object[])} with {@code #toArray()} as parameters.
+    */
+   boolean equals(Object o);
+
+   /**
+    * All Tuples should override equals and hashCode. For compatibility
+    * across different Tuple implementations, hashCode should use
+    * {@code java.util.Arrays#hashCode(Object[])} with {@code #toArray()} as parameter.
+    */
+   int hashCode();
+
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java b/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java
new file mode 100644
index 0000000000..6d12ae58d1
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/Alias.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.util.StringUtils;
+
+/**
+ * {@code Alias} provides alias factory methods
+ *
+ * <p>Example:</p>
+ *
+ * <pre>{@code
+ * Employee e = alias(Employee.class, "e");
+ * for (String name : query.from($(e),employees)
+ *     .where($(e.getDepartment().getId()).eq(1001))
+ *     .list($(e.getName()))) {
+ *     System.out.println(name);
+ * }}</pre>
+ *
+ * <p>using the following static imports</p>
+ *
+ * <pre>{@code
+ * import static com.mysema.query.alias.Alias.$;
+ * import static com.mysema.query.alias.Alias.alias;
+ * }</pre>
+ *
+ * @author tiwe
+ */
+@SuppressWarnings("PMD")
+public final class Alias {
+
+    private static final AliasFactory aliasFactory = new AliasFactory(new DefaultPathFactory(), new DefaultTypeSystem());
+
+    private static final SimplePath<Object> it = Expressions.path(Object.class, "it");
+
+    // exclude $-methods from Checkstyle checks
+    //CHECKSTYLE:OFF
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param <D>
+     * @return expression
+     */
+    public static <D extends Expression<?>> D $() {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    public static <D> ArrayPath<D[], D> $(D[] arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<BigDecimal> $(BigDecimal arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<BigInteger> $(BigInteger arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static BooleanPath $(Boolean arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Byte> $(Byte arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <T>
+     * @return expression
+     */
+    public static <T extends Enum<T>> EnumPath<T> $(T arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> CollectionPath<D, SimpleExpression<D>> $(Collection<D> arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof CollectionPath) {
+            return (CollectionPath<D, SimpleExpression<D>>) arg; //NOSONAR
+        } else if (arg instanceof ManagedObject) {
+            return (CollectionPath<D, SimpleExpression<D>>) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (CollectionPath<D, SimpleExpression<D>>) current;
+        }
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    public static <D extends Comparable<?>> ComparablePath<D> $(D arg) {
+        return Alias.getPath(arg);
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Double> $(Double arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Float> $(Float arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Integer> $(Integer arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static DatePath<java.sql.Date> $(java.sql.Date arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static DateTimePath<java.util.Date> $(java.util.Date arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> ListPath<D, SimpleExpression<D>> $(List<D> arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof ListPath) {
+            return (ListPath<D, SimpleExpression<D>>) arg; //NOSONAR
+        } else if (arg instanceof ManagedObject) {
+            return (ListPath<D, SimpleExpression<D>>) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (ListPath<D, SimpleExpression<D>>) current;
+        }
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Long> $(Long arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <K>
+     * @param <V>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <K, V> MapPath<K, V, SimpleExpression<V>> $(Map<K, V> arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof MapPath) {
+            return (MapPath<K, V, SimpleExpression<V>>) arg; //NOSONAR
+        } else if (arg instanceof ManagedObject) {
+            return (MapPath<K, V, SimpleExpression<V>>) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (MapPath<K, V, SimpleExpression<V>>) current;
+        }
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> SetPath<D, SimpleExpression<D>> $(Set<D> arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof SetPath) {
+            return (SetPath<D, SimpleExpression<D>>) arg; //NOSONAR
+        } else if (arg instanceof ManagedObject) {
+            return (SetPath<D, SimpleExpression<D>>) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (SetPath<D, SimpleExpression<D>>) current;
+        }
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static NumberPath<Short> $(Short arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static StringPath $(String arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static TimePath<Time> $(Time arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static DateTimePath<Timestamp> $(Timestamp arg) {
+        return aliasFactory.getCurrentAndReset();
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <D> EntityPathBase<D> $(D arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof EntityPath<?>) {
+            return (EntityPathBase<D>) arg; //NOSONAR
+        } else if (arg instanceof ManagedObject) {
+            return (EntityPathBase<D>) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (EntityPathBase<D>) current;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    private static <D, P extends Path<D>> P getPath(D arg) {
+        final Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof Path<?>) {
+            return (P) arg;
+        } else if (arg instanceof ManagedObject) {
+            return (P) ((ManagedObject) arg).__mappedPath();
+        } else {
+            return (P) current;
+        }
+    }
+
+    //CHECKSTYLE:ON
+
+    /**
+     * Create a new alias proxy of the given type
+     *
+     * @param cl type of the alias
+     * @return alias instance
+     */
+    public static <A> A alias(Class<A> cl) {
+        return alias(cl, StringUtils.uncapitalize(cl.getSimpleName()));
+    }
+
+    /**
+     * Create a new alias proxy of the given type for the given expression
+     *
+     * @param cl type of the alias
+     * @param expr underlying expression
+     * @return alias instance
+     */
+    public static <A> A alias(Class<A> cl, Expression<? extends A> expr) {
+        return aliasFactory.createAliasForExpr(cl, expr);
+    }
+
+    /**
+     * Create a new alias proxy of the given type for the given variable
+     *
+     * @param cl type of the alias
+     * @param var variable name for the underlying expression
+     * @return alias instance
+     */
+    public static <A> A alias(Class<A> cl, String var) {
+        return aliasFactory.createAliasForVariable(cl, var);
+    }
+
+    /**
+     * Convert the given alias to an expression
+     *
+     * @param <D>
+     * @param arg alias instance
+     * @return underlying expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> Expression<D> getAny(D arg) {
+        Object current = aliasFactory.getCurrentAndReset();
+        if (arg instanceof ManagedObject) {
+            return (Expression<D>) ((ManagedObject) arg).__mappedPath();
+        } else if (current != null) {
+            return (Expression<D>) current;
+        } else {
+            throw new IllegalArgumentException("No path mapped to " + arg);
+        }
+    }
+
+    /**
+     * Reset the alias
+     */
+    public static void resetAlias() {
+        aliasFactory.reset();
+    }
+
+    /**
+     * Return the default variable
+     *
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> SimplePath<D> var() {
+        return (SimplePath<D>) it;
+    }
+
+    /**
+     * Create a new variable path
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D extends Comparable<?>> ComparablePath<D> var(D arg) {
+        return Expressions.comparablePath((Class<D>) arg.getClass(), "var" + arg);
+    }
+
+    /**
+     * Create a new variable path
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D extends Number & Comparable<D>> NumberPath<D> var(D arg) {
+        return Expressions.numberPath((Class<D>) arg.getClass(), "var" + arg.getClass().getSimpleName() + arg);
+    }
+
+    /**
+     * Create a new variable path
+     *
+     * @param arg alias
+     * @param <D>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <D> EntityPathBase<D> var(D arg) {
+        String var = "var" + arg.getClass().getSimpleName() + "_" + arg.toString().replace(' ', '_');
+        return new PathBuilder<D>((Class) arg.getClass(), var);
+    }
+
+    /**
+     * Create a new variable path
+     *
+     * @param arg alias
+     * @return expression
+     */
+    public static StringPath var(String arg) {
+        return Expressions.stringPath(arg.replace(' ', '_'));
+    }
+
+    private Alias() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java
new file mode 100644
index 0000000000..41cff0838e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadataFactory;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.MethodInterceptor;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * {@code AliasFactory} is a factory class for alias creation
+ *
+ * @author tiwe
+ */
+class AliasFactory {
+
+    private final ThreadLocal<Expression<?>> current = new ThreadLocal<Expression<?>>();
+
+    private final PathFactory pathFactory;
+
+    private final TypeSystem typeSystem;
+
+    private final ConcurrentHashMap<Class<?>, Map<Expression<?>, ManagedObject>> proxyCache = new ConcurrentHashMap<>();
+
+    AliasFactory(final PathFactory pathFactory, TypeSystem typeSystem) {
+        this.pathFactory = pathFactory;
+        this.typeSystem = typeSystem;
+    }
+
+    /**
+     * Create an alias instance for the given class and Expression
+     *
+     * @param <A>
+     * @param cl type for alias
+     * @param expr underlying expression
+     * @return alias instance
+     */
+    @SuppressWarnings("unchecked")
+    public <A> A createAliasForExpr(Class<A> cl, Expression<? extends A> expr) {
+        try {
+            final Map<Expression<?>, ManagedObject> expressionCache = proxyCache.computeIfAbsent(cl, a -> Collections.synchronizedMap(new WeakHashMap<>()));
+            return (A) expressionCache.computeIfAbsent(expr, e -> (ManagedObject) createProxy(cl, expr));
+        } catch (ClassCastException e) {
+           throw new QueryException(e);
+        }
+    }
+
+    /**
+     * Create an alias instance for the given class, parent and path
+     *
+     * @param <A>
+     * @param cl type for alias
+     * @param path underlying expression
+     * @return alias instance
+     */
+    public <A> A createAliasForProperty(Class<A> cl, Expression<?> path) {
+        return createProxy(cl, path);
+    }
+
+    /**
+     * Create an alias instance for the given class and variable name
+     *
+     * @param <A>
+     * @param cl type for alias
+     * @param var variable name for the underlying expression
+     * @return alias instance
+     */
+    public <A> A createAliasForVariable(Class<A> cl, String var) {
+        final Path<A> expr = pathFactory.createEntityPath(cl, PathMetadataFactory.forVariable(var));
+        return createAliasForExpr(cl, expr);
+    }
+
+    /**
+     * Create a proxy instance for the given class and path
+     *
+     * @param <A>
+     * @param cl type of the proxy
+     * @param path underlying expression
+     * @return proxy instance
+     */
+    @SuppressWarnings("unchecked")
+    protected <A> A createProxy(Class<A> cl, Expression<?> path) {
+        Enhancer enhancer = new Enhancer();
+        enhancer.setClassLoader(AliasFactory.class.getClassLoader());
+        if (cl.isInterface()) {
+            enhancer.setInterfaces(new Class<?>[] {cl, ManagedObject.class});
+        } else {
+            enhancer.setSuperclass(cl);
+            enhancer.setInterfaces(new Class<?>[] {ManagedObject.class});
+        }
+        // creates one handler per proxy
+        MethodInterceptor handler = new PropertyAccessInvocationHandler(path, this, pathFactory, typeSystem);
+        enhancer.setCallback(handler);
+        return (A) enhancer.create();
+    }
+
+    /**
+     * Get the current thread bound expression without resetting it
+     *
+     * @param <A>
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public <A extends Expression<?>> A getCurrent() {
+        return (A) current.get();
+    }
+
+    /**
+     * Get the current thread bound expression and reset it
+     *
+     * @param <A>
+     * @return expression
+     */
+    @Nullable
+    public <A extends Expression<?>> A getCurrentAndReset() {
+        A rv = this.getCurrent();
+        reset();
+        return rv;
+    }
+
+    /**
+     * Reset the thread bound expression to null
+     */
+    public void reset() {
+        current.set(null);
+    }
+
+    /**
+     * Set the thread bound expression to the given value
+     *
+     * @param expr expression to be set to current
+     */
+    public void setCurrent(Expression<?> expr) {
+        current.set(expr);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/DefaultPathFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/DefaultPathFactory.java
new file mode 100644
index 0000000000..97948ac4d9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/DefaultPathFactory.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code DefaultPathFactory} is the default implementation of the {@link PathFactory} interface
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultPathFactory implements PathFactory {
+
+    @Override
+    public <T> Path<T[]> createArrayPath(Class<T[]> arrayType, PathMetadata metadata) {
+        return Expressions.arrayPath(arrayType, metadata);
+    }
+
+    @Override
+    public Path<Boolean> createBooleanPath(PathMetadata metadata) {
+        return Expressions.booleanPath(metadata);
+    }
+
+    @Override
+    public <E> Path<Collection<E>> createCollectionPath(Class<E> elementType, PathMetadata metadata) {
+        return Expressions.collectionPath(elementType, EntityPathBase.class, metadata);
+    }
+
+    @Override
+    public <T extends Comparable<?>> Path<T> createComparablePath(Class<T> type, PathMetadata metadata) {
+        return Expressions.comparablePath(type, metadata);
+    }
+
+    @Override
+    public <T extends Comparable<?>> Path<T> createDatePath(Class<T> type, PathMetadata metadata) {
+        return Expressions.datePath(type, metadata);
+    }
+
+    @Override
+    public <T extends Comparable<?>> Path<T> createDateTimePath(Class<T> type, PathMetadata metadata) {
+        return Expressions.dateTimePath(type, metadata);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> Path<T> createEntityPath(Class<T> type, PathMetadata metadata) {
+        if (Comparable.class.isAssignableFrom(type)) {
+            return Expressions.comparableEntityPath((Class) type, metadata);
+        } else {
+            return new EntityPathBase<T>(type, metadata);
+        }
+    }
+
+    @Override
+    public <T extends Enum<T>> Path<T> createEnumPath(Class<T> type, PathMetadata metadata) {
+        return Expressions.enumPath(type, metadata);
+    }
+
+    @Override
+    public <E> Path<List<E>> createListPath(Class<E> elementType, PathMetadata metadata) {
+        return Expressions.listPath(elementType, EntityPathBase.class, metadata);
+    }
+
+    @Override
+    public <K, V> Path<Map<K, V>> createMapPath(Class<K> keyType, Class<V> valueType, PathMetadata metadata) {
+        return Expressions.mapPath(keyType, valueType, EntityPathBase.class, metadata);
+    }
+
+    @Override
+    public <T extends Number & Comparable<T>> Path<T> createNumberPath(Class<T> type, PathMetadata metadata) {
+        return Expressions.numberPath(type, metadata);
+    }
+
+    @Override
+    public <E> Path<Set<E>> createSetPath(Class<E> elementType, PathMetadata metadata) {
+        return Expressions.setPath(elementType, EntityPathBase.class, metadata);
+    }
+
+    @Override
+    public <T> Path<T> createSimplePath(Class<T> type, PathMetadata metadata) {
+        return Expressions.path(type, metadata);
+    }
+    @Override
+    public Path<String> createStringPath(PathMetadata metadata) {
+        return Expressions.stringPath(metadata);
+    }
+
+    @Override
+    public <T extends Comparable<?>> Path<T> createTimePath(Class<T> type, PathMetadata metadata) {
+        return Expressions.timePath(type, metadata);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/DefaultTypeSystem.java b/querydsl-core/src/main/java/com/querydsl/core/alias/DefaultTypeSystem.java
similarity index 81%
rename from querydsl-core/src/main/java/com/mysema/query/alias/DefaultTypeSystem.java
rename to querydsl-core/src/main/java/com/querydsl/core/alias/DefaultTypeSystem.java
index 859f79ed95..66eda3b30f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/alias/DefaultTypeSystem.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/DefaultTypeSystem.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import java.util.Collection;
 import java.util.List;
@@ -19,13 +19,13 @@
 import java.util.Set;
 
 /**
- * DefaultTypeSystem is the default implementation of the {@link TypeSystem} interface
- * 
+ * {@code DefaultTypeSystem} is the default implementation of the {@link TypeSystem} interface
+ *
  * @author tiwe
  *
  */
-public class DefaultTypeSystem implements TypeSystem{
-    
+public class DefaultTypeSystem implements TypeSystem {
+
     @Override
     public boolean isCollectionType(Class<?> cl) {
         return Collection.class.isAssignableFrom(cl);
@@ -35,7 +35,7 @@ public boolean isCollectionType(Class<?> cl) {
     public boolean isListType(Class<?> cl) {
         return List.class.isAssignableFrom(cl);
     }
-    
+
     @Override
     public boolean isSetType(Class<?> cl) {
         return Set.class.isAssignableFrom(cl);
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java b/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java
new file mode 100644
index 0000000000..7497299350
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/ManagedObject.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code ManagedObject} is a tagging interface for CGLIB alias proxies
+ *
+ */
+public interface ManagedObject {
+
+    /**
+     * Returns the underlying {@link Path} instance of this proxy
+     *
+     * @return underlying {@link Path} instance
+     */
+    Path<?> __mappedPath();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java b/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java
new file mode 100644
index 0000000000..4611f756a6
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/MethodType.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code MethodType} defines the supported method types used in the Alias functionality
+ *
+ * @author tiwe
+ *
+ */
+public enum MethodType {
+    /**
+     * __mappedPath invocation
+     */
+    GET_MAPPED_PATH("__mappedPath", Path.class, ManagedObject.class),
+    /**
+     * getter invocation
+     */
+    GETTER("(get|is).+", Object.class, Object.class),
+    /**
+     * hashCode invocation
+     */
+    HASH_CODE("hashCode", int.class, Object.class),
+    /**
+     * List#get(int) invocation
+     */
+    LIST_ACCESS("get", Object.class, List.class, int.class),
+    /**
+     * Map#get(Object) invocation
+     */
+    MAP_ACCESS("get", Object.class, Map.class, Object.class),
+    /**
+     * Collection#size() invocation
+     */
+    SIZE("size", int.class, Object.class),
+    /**
+     * toString invocation
+     */
+    TO_STRING("toString",String.class, Object.class),
+    /**
+     * Scala getter invocation
+     */
+    SCALA_GETTER(".+", Object.class, Object.class),
+    /**
+     * Scala list apply invocation
+     */
+    SCALA_LIST_ACCESS("apply", Object.class, Object.class, int.class),
+    /**
+     * Scala map apply invocation
+     */
+    SCALA_MAP_ACCESS("apply", Object.class, Object.class, Object.class);
+
+    private final Pattern pattern;
+
+    private final Class<?> returnType;
+
+    private final Class<?> ownerType;
+
+    private final Class<?>[] paramTypes;
+
+    MethodType(String namePattern, Class<?> returnType, Class<?> ownerType, Class<?>... paramTypes) {
+        this.pattern = Pattern.compile(namePattern);
+        this.returnType = returnType;
+        this.ownerType = ownerType;
+        this.paramTypes = paramTypes;
+    }
+
+    @Nullable
+    public static MethodType get(Method method) {
+        for (MethodType methodType : values()) {
+            if (methodType.pattern.matcher(method.getName()).matches()
+                && (methodType.returnType == Object.class || methodType.returnType.isAssignableFrom(method.getReturnType()))
+                && (methodType.ownerType == Object.class || methodType.ownerType.isAssignableFrom(method.getDeclaringClass()))
+                && Arrays.equals(methodType.paramTypes, method.getParameterTypes())) {
+                return methodType;
+            }
+        }
+        return null;
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/PathFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/PathFactory.java
new file mode 100644
index 0000000000..ddd4276c00
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/PathFactory.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+
+/**
+ * {@code PathFactory} defines a factory interface for {@link Path} creation
+ *
+ * @author tiwe
+ *
+ */
+public interface PathFactory {
+
+    /**
+     * Create an array path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T> Path<T[]> createArrayPath(Class<T[]> type, PathMetadata metadata);
+
+    /**
+     * Create an entity path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T> Path<T> createEntityPath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a simple path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T> Path<T> createSimplePath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a comparable path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Comparable<?>> Path<T> createComparablePath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create an enum path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Enum<T>> Path<T> createEnumPath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a date path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Comparable<?>> Path<T> createDatePath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a time path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Comparable<?>> Path<T> createTimePath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a datetime path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Comparable<?>> Path<T> createDateTimePath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a number path
+     *
+     * @param type type of the path
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <T extends Number & Comparable<T>> Path<T> createNumberPath(Class<T> type, PathMetadata metadata);
+
+    /**
+     * Create a boolean path
+     *
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    Path<Boolean> createBooleanPath(PathMetadata metadata);
+
+    /**
+     * Create a string path
+     *
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    Path<String> createStringPath(PathMetadata metadata);
+
+    /**
+     * Create a list path
+     *
+     * @param elementType element type
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <E> Path<List<E>> createListPath(Class<E> elementType, PathMetadata metadata);
+
+    /**
+     * Create a set path
+     *
+     * @param elementType element type
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <E> Path<Set<E>> createSetPath(Class<E> elementType, PathMetadata metadata);
+
+    /**
+     * Create a collection path
+     *
+     * @param elementType element type
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <E> Path<Collection<E>> createCollectionPath(Class<E> elementType, PathMetadata metadata);
+
+    /**
+     * Create a map path
+     *
+     * @param keyType key type
+     * @param valueType value type
+     * @param metadata metadata of the path
+     * @return new path instance
+     */
+    <K,V> Path<Map<K,V>> createMapPath(Class<K> keyType, Class<V> valueType, PathMetadata metadata);
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java
new file mode 100644
index 0000000000..a96307cdae
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.BeanUtils;
+import com.querydsl.core.util.ReflectionUtils;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+/**
+ * {@code PropertyAccessInvocationHandler} is the main InvocationHandler class for the
+ * CGLIB alias proxies
+ *
+ * @author tiwe
+ */
+class PropertyAccessInvocationHandler implements MethodInterceptor {
+
+    private static final int RETURN_VALUE = 42;
+
+    private final Expression<?> hostExpression;
+
+    private final AliasFactory aliasFactory;
+
+    private final Map<Object, Expression<?>> propToExpr = new ConcurrentHashMap<>();
+
+    private final Map<Object, Object> propToObj = new ConcurrentHashMap<>();
+
+    private final PathFactory pathFactory;
+
+    private final TypeSystem typeSystem;
+
+    PropertyAccessInvocationHandler(Expression<?> host, AliasFactory aliasFactory,
+            PathFactory pathFactory, TypeSystem typeSystem) {
+        this.hostExpression = host;
+        this.aliasFactory = aliasFactory;
+        this.pathFactory = pathFactory;
+        this.typeSystem = typeSystem;
+    }
+
+    //CHECKSTYLE:OFF
+    @Override
+    public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
+    //CHECKSTYLE:ON
+        Object rv = null;
+
+        MethodType methodType = MethodType.get(method);
+
+        if (methodType == MethodType.GETTER) {
+            String ptyName = propertyNameForGetter(method);
+            Class<?> ptyClass = method.getReturnType();
+            Type genericType = method.getGenericReturnType();
+
+            if (propToObj.containsKey(ptyName)) {
+                rv = propToObj.get(ptyName);
+            } else {
+                PathMetadata pm = createPropertyPath((Path<?>) hostExpression, ptyName);
+                rv = newInstance(ptyClass, genericType, proxy, ptyName, pm);
+            }
+            aliasFactory.setCurrent(propToExpr.get(ptyName));
+
+        } else if (methodType == MethodType.SCALA_GETTER) {
+            String ptyName = method.getName();
+            Class<?> ptyClass = method.getReturnType();
+            Type genericType = method.getGenericReturnType();
+
+            if (propToObj.containsKey(ptyName)) {
+                rv = propToObj.get(ptyName);
+            } else {
+                PathMetadata pm = createPropertyPath((Path<?>) hostExpression, ptyName);
+                rv = newInstance(ptyClass, genericType, proxy, ptyName, pm);
+            }
+            aliasFactory.setCurrent(propToExpr.get(ptyName));
+
+        } else if (methodType == MethodType.LIST_ACCESS || methodType == MethodType.SCALA_LIST_ACCESS) {
+            // TODO : manage cases where the argument is based on a property invocation
+            Object propKey = Arrays.asList(MethodType.LIST_ACCESS, args[0]);
+            if (propToObj.containsKey(propKey)) {
+                rv = propToObj.get(propKey);
+            } else {
+                PathMetadata pm = createListAccessPath((Path<?>) hostExpression, (Integer) args[0]);
+                Class<?> elementType = ((ParameterizedExpression<?>) hostExpression).getParameter(0);
+                rv = newInstance(elementType, elementType, proxy, propKey, pm);
+            }
+            aliasFactory.setCurrent(propToExpr.get(propKey));
+
+        } else if (methodType == MethodType.MAP_ACCESS || methodType == MethodType.SCALA_MAP_ACCESS) {
+            Object propKey = Arrays.asList(MethodType.MAP_ACCESS, args[0]);
+            if (propToObj.containsKey(propKey)) {
+                rv = propToObj.get(propKey);
+            } else {
+                PathMetadata pm = createMapAccessPath((Path<?>) hostExpression, args[0]);
+                Class<?> valueType = ((ParameterizedExpression<?>) hostExpression).getParameter(1);
+                rv = newInstance(valueType, valueType, proxy, propKey, pm);
+            }
+            aliasFactory.setCurrent(propToExpr.get(propKey));
+
+        } else if (methodType == MethodType.TO_STRING) {
+            rv = hostExpression.toString();
+
+        } else if (methodType == MethodType.HASH_CODE) {
+            rv = hostExpression.hashCode();
+
+        } else if (methodType == MethodType.GET_MAPPED_PATH) {
+            rv = hostExpression;
+
+        } else {
+            throw new IllegalArgumentException(
+                    "Invocation of " + method.getName() +
+                    " with types " + Arrays.asList(method.getParameterTypes()) + " not supported");
+        }
+        return rv;
+    }
+
+    @SuppressWarnings({ "unchecked"})
+    @Nullable
+    protected <T> T newInstance(Class<T> type, Type genericType, Object parent, Object propKey,
+            PathMetadata metadata) {
+        Expression<?> path;
+        Object rv;
+
+        if (String.class.equals(type)) {
+            path = pathFactory.createStringPath(metadata);
+            // null is used as a return value to block method invocations on Strings
+            rv = null;
+
+        } else if (Integer.class.equals(type) || int.class.equals(type)) {
+            path = pathFactory.createNumberPath(Integer.class, metadata);
+            rv = RETURN_VALUE;
+
+        } else if (Byte.class.equals(type) || byte.class.equals(type)) {
+            path = pathFactory.createNumberPath(Byte.class, metadata);
+            rv = (byte) RETURN_VALUE;
+
+        } else if (java.util.Date.class.equals(type)) {
+            path = pathFactory.createDateTimePath((Class) type, metadata);
+            rv = new Date();
+
+        } else if (java.sql.Timestamp.class.equals(type)) {
+            path = pathFactory.createDateTimePath((Class) type, metadata);
+            rv = new Timestamp(System.currentTimeMillis());
+
+        } else if (java.sql.Date.class.equals(type)) {
+            path = pathFactory.createDatePath((Class) type, metadata);
+            rv = new java.sql.Date(System.currentTimeMillis());
+
+        } else if (java.sql.Time.class.equals(type)) {
+            path = pathFactory.createTimePath((Class) type, metadata);
+            rv = new java.sql.Time(System.currentTimeMillis());
+
+        } else if (Long.class.equals(type) || long.class.equals(type)) {
+            path = pathFactory.createNumberPath(Long.class, metadata);
+            rv = (long) RETURN_VALUE;
+
+        } else if (Short.class.equals(type) || short.class.equals(type)) {
+            path = pathFactory.createNumberPath(Short.class, metadata);
+            rv = (short) RETURN_VALUE;
+
+        } else if (Double.class.equals(type) || double.class.equals(type)) {
+            path = pathFactory.createNumberPath(Double.class, metadata);
+            rv = (double) RETURN_VALUE;
+
+        } else if (Float.class.equals(type) || float.class.equals(type)) {
+            path = pathFactory.createNumberPath(Float.class, metadata);
+            rv = (float) RETURN_VALUE;
+
+        } else if (BigInteger.class.equals(type)) {
+            path = pathFactory.createNumberPath((Class) type, metadata);
+            rv = BigInteger.valueOf(RETURN_VALUE);
+
+        } else if (BigDecimal.class.equals(type)) {
+            path = pathFactory.createNumberPath((Class) type, metadata);
+            rv = BigDecimal.valueOf(RETURN_VALUE);
+
+        } else if (Boolean.class.equals(type) || boolean.class.equals(type)) {
+            path = pathFactory.createBooleanPath(metadata);
+            rv = Boolean.TRUE;
+
+        } else if (typeSystem.isMapType(type)) {
+            Class<Object> keyType = (Class) ReflectionUtils.getTypeParameter(genericType, 0);
+            Class<Object> valueType = (Class) ReflectionUtils.getTypeParameter(genericType, 1);
+            path = pathFactory.createMapPath(keyType, valueType, metadata);
+            rv = aliasFactory.createAliasForProperty(type, path);
+
+        } else if (typeSystem.isListType(type)) {
+            Class<Object> elementType = (Class) ReflectionUtils.getTypeParameter(genericType, 0);
+            path = pathFactory.createListPath(elementType, metadata);
+            rv = aliasFactory.createAliasForProperty(type, path);
+
+        } else if (typeSystem.isSetType(type)) {
+            Class<?> elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
+            path = pathFactory.createSetPath(elementType, metadata);
+            rv = aliasFactory.createAliasForProperty(type, path);
+
+        } else if (typeSystem.isCollectionType(type)) {
+            Class<?> elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0);
+            path = pathFactory.createCollectionPath(elementType, metadata);
+            rv = aliasFactory.createAliasForProperty(type, path);
+
+        } else if (Enum.class.isAssignableFrom(type)) {
+            path = pathFactory.createEnumPath((Class) type, metadata);
+            rv = type.getEnumConstants()[0];
+
+        } else if (type.isArray()) {
+            path = pathFactory.createArrayPath((Class) type, metadata);
+            rv = Array.newInstance(type.getComponentType(), 5);
+
+        } else {
+            if (Number.class.isAssignableFrom(type)) {
+                path = pathFactory.createNumberPath((Class) type, metadata);
+            } else if (Comparable.class.isAssignableFrom(type)) {
+                path = pathFactory.createComparablePath((Class) type, metadata);
+            } else {
+                path = pathFactory.createEntityPath(type, metadata);
+            }
+            if (!Modifier.isFinal(type.getModifiers())) {
+                rv = aliasFactory.createAliasForProperty(type, path);
+            } else {
+                rv = null;
+            }
+        }
+
+        if (rv == null) {
+            propToObj.remove(propKey);
+        } else {
+            propToObj.put(propKey, rv);
+        }
+        propToExpr.put(propKey, path);
+        return (T) rv;
+    }
+
+    protected String propertyNameForGetter(Method method) {
+        String name = method.getName();
+        name = name.startsWith("is") ? name.substring(2) : name.substring(3);
+        return BeanUtils.uncapitalize(name);
+    }
+
+    protected PathMetadata createPropertyPath(Path<?> path, String propertyName) {
+        return PathMetadataFactory.forProperty(path, propertyName);
+    }
+
+    protected PathMetadata createListAccessPath(Path<?> path, Integer index) {
+        return PathMetadataFactory.forListAccess(path, index);
+    }
+
+    protected PathMetadata createMapAccessPath(Path<?> path, Object key) {
+        return PathMetadataFactory.forMapAccess(path, key);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/TypeSystem.java b/querydsl-core/src/main/java/com/querydsl/core/alias/TypeSystem.java
new file mode 100644
index 0000000000..33c417cb09
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/TypeSystem.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+/**
+ * {@code TypeSystem} defines an interface for detecting whether a given class conforms to a certain Collection
+ * contract
+ *
+ * @author tiwe
+ *
+ */
+public interface TypeSystem {
+
+    /**
+     * Return whether the given class is a collection class
+     *
+     * @param cl class to check
+     * @return true, if argument is a collection type
+     */
+    boolean isCollectionType(Class<?> cl);
+
+    /**
+     * Return whether the given class is a set class
+     *
+     * @param cl class to check
+     * @return true, if argument is a set type
+     */
+    boolean isSetType(Class<?> cl);
+
+    /**
+     * Return whether the given class is a list class
+     *
+     * @param cl class to check
+     * @return true, if argument is a list type
+     */
+    boolean isListType(Class<?> cl);
+
+    /**
+     * Return whether the given class is a map class
+     *
+     * @param cl class to check
+     * @return true, if argument is a map type
+     */
+    boolean isMapType(Class<?> cl);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/alias/package-info.java
new file mode 100644
index 0000000000..5f66ae51c8
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/alias/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Alias functionality
+ */
+package com.querydsl.core.alias;
+
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/Config.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/Config.java
similarity index 82%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/Config.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/Config.java
index 37eef296c3..aca4863d7d 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/Config.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/Config.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Config defines serialization flags for annotated domain types and packages
+ * {@code Config} defines serialization flags for annotated domain types and packages
  *
  * @author tiwe
  *
@@ -33,37 +33,27 @@
 public @interface Config {
 
     /**
-     * Created entity field initialization accessors
-     *
-     * @return
+     * Create entity field initialization accessors     *
      */
     boolean entityAccessors() default false;
 
     /**
      * Create accessors for indexed list access
-     *
-     * @return
      */
     boolean listAccessors() default false;
 
     /**
      * Create accessors for keyed map access
-     *
-     * @return
      */
     boolean mapAccessors() default false;
 
     /**
      * Create default variable in query type
-     *
-     * @return
      */
     boolean createDefaultVariable() default true;
 
     /**
      * The name of the default variable in query type
-     *
-     * @return
      */
     String defaultVariableName() default "";
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/annotations/Generated.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/Generated.java
new file mode 100644
index 0000000000..1dbd49079a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/Generated.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.annotations;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * The Generated annotation is used to mark source code that has been generated.
+ * It uses <code>CLASS</code> retention to allow byte code analysis tools like
+ * Jacoco detect this code as being generated.
+ */
+
+@Documented
+@Retention(CLASS)
+@Target(TYPE)
+public @interface Generated {
+    /**
+     * The value element MUST have the name of the code generator.
+     * The recommended convention is to use the fully qualified name of the
+     * code generator.
+     */
+    String[] value();
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/annotations/Immutable.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/Immutable.java
new file mode 100644
index 0000000000..f6c92cf544
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/Immutable.java
@@ -0,0 +1,18 @@
+package com.querydsl.core.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@code Immutable} marks a class as immutable
+ *
+ * @author Jan-Willem Gmelig Meyling
+ */
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.CLASS)
+public @interface Immutable {
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/annotations/PropertyType.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/PropertyType.java
new file mode 100644
index 0000000000..ab41797800
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/PropertyType.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.annotations;
+
+
+/**
+ * {@code PropertyType} defines the Path type to be used for a Domain property
+ *
+ * @author tiwe
+ *
+ */
+public enum PropertyType {
+    /**
+     * Comparable
+     */
+    COMPARABLE,
+
+    /**
+     * Enum
+     */
+    ENUM,
+
+    /**
+     * Date
+     */
+    DATE,
+
+    /**
+     * Datetime
+     */
+    DATETIME,
+
+    /**
+     * None
+     */
+    NONE,
+
+    /**
+     * Numeric
+     */
+    NUMERIC,
+
+    /**
+     * Simple
+     */
+    SIMPLE,
+
+    /**
+     * String
+     */
+    STRING,
+
+    /**
+     * Time
+     */
+    TIME,
+
+    /**
+     * Entity
+     */
+    ENTITY,
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryDelegate.java
similarity index 86%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryDelegate.java
index d3905b6846..ed16db6ede 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryDelegate.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryDelegate.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -22,13 +22,13 @@
 
 /**
  * Declaration of a static delegate method
- * 
+ *
  * <p>Example :</p>
- * 
+ *
  * <pre>
  * {@code @QueryDelegate(User.class)}
  * public static Predicate like(QUser entity, User user) {
- *     BooleanBuilder builder = new BooleanBuilder(); 
+ *     BooleanBuilder builder = new BooleanBuilder();
  *     if (user.getFirstName() != null) {
  *         builder.and(entity.firstName.eq(user.getFirstName()));
  *     }
@@ -38,10 +38,10 @@
  *     return builder.getValue();
  * }
  * </pre>
- * 
- * <p>This will be then available in the QUser type as an instance method without the first 
+ *
+ * <p>This will be then available in the QUser type as an instance method without the first
  * argument:</p>
- * 
+ *
  * <pre>
  * User user = new User();
  * user.setFirstName("John");
@@ -58,7 +58,7 @@
 public @interface QueryDelegate {
 
     /**
-     * @return
+     * Target type for delegate expansion
      */
     Class<?> value();
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbeddable.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbeddable.java
similarity index 89%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbeddable.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbeddable.java
index 3394aeb146..a4238d9b97 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbeddable.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbeddable.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbedded.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbedded.java
similarity index 90%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbedded.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbedded.java
index 58af116967..56d4ee6e4c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEmbedded.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEmbedded.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntities.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntities.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntities.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntities.java
index be3834829d..0eec5cd79d 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntities.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntities.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -22,7 +22,7 @@
 
 /**
  * Annotation for APT based Domain query type generation. Annotate Domain packages with this annotation.
- * 
+ *
  * @author tiwe
  *
  */
@@ -32,7 +32,7 @@
 public @interface QueryEntities {
 
     /**
-     * @return
+     * Entities to process
      */
     Class<?>[] value();
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntity.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntity.java
similarity index 89%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntity.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntity.java
index 5cf91ecf0d..cb4b379bc4 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryEntity.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryEntity.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryExclude.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryExclude.java
similarity index 90%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryExclude.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryExclude.java
index a4b9296ee1..0c42eb8b73 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryExclude.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryExclude.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.PACKAGE;
 import static java.lang.annotation.ElementType.TYPE;
@@ -23,7 +23,7 @@
 
 /**
  * Marks the annotated classes and packages to be excluded from source generation
- * 
+ *
  * @author tiwe
  *
  */
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryInit.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryInit.java
similarity index 90%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryInit.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryInit.java
index 4cdc85e5b1..a5adb5ab13 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryInit.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryInit.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -34,8 +34,6 @@
 
     /**
      * Initialized paths
-     *
-     * @return
      */
     String[] value();
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryProjection.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryProjection.java
similarity index 84%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryProjection.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryProjection.java
index 549672ef05..72f78027e7 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryProjection.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryProjection.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -22,33 +22,34 @@
 
 /**
  * Annotation for APT based query type generation. Annotate constructors with this annotation.
- * 
+ *
  * <p>Example</p>
- * 
+ *
  * <pre>
  * class UserInfo {
- * 
+ *
  *     private String firstName, lastName;
- *     
+ *
  *     {@code @QueryProjection}
  *     public UserInfo(String firstName, String lastName) {
  *         this.firstName = firstName;
  *         this.lastName = lastName;
  *     }
- *     
+ *
  *     // getters and setters
- * }  
+ * }
  * </pre>
- * 
+ *
  * <p>The projection can then be used like this</p>
- * 
+ *
  * <pre>
  * {@code
  * QUser user = QUser.user;
- * List <UserInfo> result = query.from(user)
+ * List <UserInfo> result = querydsl.from(user)
  *     .where(user.valid.eq(true))
- *     .list(new QUserInfo(user.firstName, user.lastName));
- * }    
+ *     .select(new QUserInfo(user.firstName, user.lastName))
+ *     .fetch();
+ * }
  * </pre>
  */
 @Documented
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerySupertype.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QuerySupertype.java
similarity index 89%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QuerySupertype.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QuerySupertype.java
index 0de1350d42..dce0c8d314 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QuerySupertype.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QuerySupertype.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryTransient.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryTransient.java
similarity index 90%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryTransient.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryTransient.java
index d81d48d0f5..f091b554b3 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryTransient.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryTransient.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryType.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryType.java
similarity index 79%
rename from querydsl-core/src/main/java/com/mysema/query/annotations/QueryType.java
rename to querydsl-core/src/main/java/com/querydsl/core/annotations/QueryType.java
index 3ddda8758e..2fe0074714 100644
--- a/querydsl-core/src/main/java/com/mysema/query/annotations/QueryType.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/QueryType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.annotations;
+package com.querydsl.core.annotations;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
@@ -34,7 +32,7 @@
 public @interface QueryType {
 
     /**
-     * @return
+     * property type override
      */
     PropertyType value();
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/annotations/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/annotations/package-info.java
new file mode 100644
index 0000000000..5a8e020780
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/annotations/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Annotations for Domain and DTO types
+ */
+package com.querydsl.core.annotations;
+
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/DMLClause.java b/querydsl-core/src/main/java/com/querydsl/core/dml/DMLClause.java
similarity index 84%
rename from querydsl-core/src/main/java/com/mysema/query/dml/DMLClause.java
rename to querydsl-core/src/main/java/com/querydsl/core/dml/DMLClause.java
index 49c80502b8..994a4a9091 100644
--- a/querydsl-core/src/main/java/com/mysema/query/dml/DMLClause.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/DMLClause.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.dml;
+package com.querydsl.core.dml;
 
 /**
  * Parent interface for DML clauses
- * 
+ *
  * @author tiwe
  *
  * @param <C> concrete subtype
@@ -25,7 +25,7 @@ public interface DMLClause<C extends DMLClause<C>> {
     /**
      * Execute the clause and return the amount of affected rows
      *
-     * @return
+     * @return amount of affected rows
      */
     long execute();
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java b/querydsl-core/src/main/java/com/querydsl/core/dml/DeleteClause.java
similarity index 77%
rename from querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java
rename to querydsl-core/src/main/java/com/querydsl/core/dml/DeleteClause.java
index 719f030a3c..6efc8c370c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/dml/DeleteClause.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/DeleteClause.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.dml;
+package com.querydsl.core.dml;
 
-import com.mysema.query.FilteredClause;
+import com.querydsl.core.FilteredClause;
 
 
 /**
- * DeleteClause defines a generic interface for Delete clauses
+ * {@code DeleteClause} defines a generic interface for Delete clauses
  *
  * @author tiwe
  *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/dml/InsertClause.java b/querydsl-core/src/main/java/com/querydsl/core/dml/InsertClause.java
new file mode 100644
index 0000000000..1b616d6fcc
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/InsertClause.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.dml;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+
+/**
+ * {@code InsertClause} defines a generic interface for Insert clauses
+ *
+ * @author tiwe
+ *
+ * @param <C> concrete subtype
+ */
+public interface InsertClause<C extends InsertClause<C>> extends StoreClause<C> {
+
+    /**
+     * Define the columns to be populated
+     *
+     * @param columns columns to be populated
+     * @return the current object
+     */
+    C columns(Path<?>... columns);
+
+    /**
+     * Define the populate via subquery
+     *
+     * @param subQuery sub query to be used for population
+     * @return the current object
+     */
+    C select(SubQueryExpression<?> subQuery);
+
+    /**
+     * Define the value bindings
+     *
+     * @param v values to be inserted
+     * @return the current object
+     */
+    C values(Object... v);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/dml/StoreClause.java b/querydsl-core/src/main/java/com/querydsl/core/dml/StoreClause.java
new file mode 100644
index 0000000000..d8ba955c2b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/StoreClause.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.dml;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+
+/**
+ * Parent interface for {@link InsertClause} and {@link UpdateClause}
+ *
+ * @author tiwe
+ *
+ * @param <C> concrete subtype
+ */
+public interface StoreClause<C extends StoreClause<C>> extends DMLClause<C> {
+
+    /**
+     * Add a value binding
+     *
+     * @param <T>
+     * @param path path to be updated
+     * @param value value to set
+     * @return the current object
+     */
+    <T> C set(Path<T> path, @Nullable T value);
+
+    /**
+     * Add an expression binding
+     *
+     * @param <T>
+     * @param path path to be updated
+     * @param expression binding
+     * @return the current object
+     */
+    <T> C set(Path<T> path, Expression<? extends T> expression);
+
+    /**
+     * Bind the given path to null
+     *
+     * @param path path to be updated
+     * @return the current object
+     */
+    <T> C setNull(Path<T> path);
+
+    /**
+     * Returns true, if no bindings have been set, otherwise false.
+     *
+     * @return true, if empty, false, if not
+     */
+    boolean isEmpty();
+
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/dml/UpdateClause.java b/querydsl-core/src/main/java/com/querydsl/core/dml/UpdateClause.java
new file mode 100644
index 0000000000..4c09c86d0d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/UpdateClause.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.dml;
+
+import java.util.List;
+
+import com.querydsl.core.FilteredClause;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code UpdateClause} defines a generic extensible interface for Update clauses
+ *
+ * @author tiwe
+ *
+ * @param <C> concrete subtype
+ */
+public interface UpdateClause<C extends UpdateClause<C>> extends StoreClause<C>, FilteredClause<C> {
+
+    /**
+     * Set the paths to be updated
+     *
+     * @param paths paths to be updated
+     * @param values values to be set
+     * @return the current object
+     */
+    C set(List<? extends Path<?>> paths, List<?> values);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/dml/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/dml/package-info.java
new file mode 100644
index 0000000000..8ed83fb776
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/dml/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * DML interfaces
+ */
+package com.querydsl.core.dml;
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java b/querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupByTransformer.java
similarity index 78%
rename from querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupByTransformer.java
index bb12fb489c..81158f50cc 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/AbstractGroupByTransformer.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupByTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.*;
 
 /**
  * Base class for GroupBy result transformers
@@ -33,7 +28,7 @@
  * @param <K>
  * @param <T>
  */
-abstract class AbstractGroupByTransformer<K, T> implements ResultTransformer<T> {
+public abstract class AbstractGroupByTransformer<K, T> implements ResultTransformer<T> {
 
     private static final class FactoryExpressionAdapter<T> extends ExpressionBase<T> implements FactoryExpression<T> {
         private final FactoryExpression<T> expr;
@@ -68,18 +63,19 @@ public T newInstance(Object... args) {
 
     protected final Expression<?>[] expressions;
 
-    AbstractGroupByTransformer(Expression<K> key, Expression<?>... expressions) {
+    @SuppressWarnings("unchecked")
+    protected AbstractGroupByTransformer(Expression<K> key, Expression<?>... expressions) {
         List<Expression<?>> projection = new ArrayList<Expression<?>>(expressions.length);
         groupExpressions.add(new GOne<K>(key));
         projection.add(key);
 
         for (Expression<?> expr : expressions) {
             if (expr instanceof GroupExpression<?,?>) {
-                GroupExpression<?,?> groupExpr = (GroupExpression<?,?>)expr;
+                GroupExpression<?,?> groupExpr = (GroupExpression<?,?>) expr;
                 groupExpressions.add(groupExpr);
                 Expression<?> colExpression = groupExpr.getExpression();
-                if (colExpression instanceof Operation && ((Operation)colExpression).getOperator() == Ops.ALIAS) {
-                    projection.add(((Operation)colExpression).getArg(0));
+                if (colExpression instanceof Operation && ((Operation) colExpression).getOperator() == Ops.ALIAS) {
+                    projection.add(((Operation) colExpression).getArg(0));
                 } else {
                     projection.add(colExpression);
                 }
@@ -92,14 +88,14 @@ public T newInstance(Object... args) {
             }
         }
 
-        this.expressions = projection.toArray(new Expression[projection.size()]);
+        this.expressions = projection.toArray(new Expression[0]);
     }
 
     protected static FactoryExpression<Tuple> withoutGroupExpressions(final FactoryExpression<Tuple> expr) {
         List<Expression<?>> args = new ArrayList<Expression<?>>(expr.getArgs().size());
         for (Expression<?> arg : expr.getArgs()) {
             if (arg instanceof GroupExpression) {
-                args.add(((GroupExpression)arg).getExpression());
+                args.add(((GroupExpression) arg).getExpression());
             } else {
                 args.add(arg);
             }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupExpression.java b/querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupExpression.java
new file mode 100644
index 0000000000..21330be73c
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/AbstractGroupExpression.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.DslExpression;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * A base class for GroupExpressions
+ * @author sasa
+ *
+ * @param <T>
+ * @param <R>
+ */
+public abstract class AbstractGroupExpression<T, R> implements GroupExpression<T, R> {
+
+    private static final long serialVersionUID = 1509709546966783160L;
+
+    private final Class<? extends R> type;
+
+    private final Expression<T> expr;
+
+    @SuppressWarnings("unchecked")
+    public AbstractGroupExpression(Class<? super R> type, Expression<T> expr) {
+        this.type = (Class) type;
+        this.expr = expr;
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    public DslExpression<R> as(Path<R> alias) {
+        return Expressions.dslOperation(getType(), Ops.ALIAS, this, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    public DslExpression<R> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    @Override
+    public Expression<T> getExpression() {
+        return expr;
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return expr.accept(v, context);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o != null && getClass().equals(o.getClass())) {
+            return ((GroupExpression<?,?>) o).getExpression().equals(expr);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public Class<? extends R> getType() {
+        return type;
+    }
+
+    @Override
+    public int hashCode() {
+        return expr.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return expr.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GAvg.java b/querydsl-core/src/main/java/com/querydsl/core/group/GAvg.java
new file mode 100644
index 0000000000..74b40b8212
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GAvg.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.util.MathUtils;
+
+@SuppressWarnings("unchecked")
+class GAvg<T extends Number> extends AbstractGroupExpression<T, T> {
+
+    private static final long serialVersionUID = 3518868612387641383L;
+
+    private final MathContext mathContext;
+
+    GAvg(Expression<T> expr) {
+        this(expr, MathContext.DECIMAL128);
+    }
+
+    GAvg(Expression<T> expr, MathContext mathContext) {
+        super((Class) expr.getType(), expr);
+        this.mathContext = mathContext;
+    }
+
+    @Override
+    public GroupCollector<T, T> createGroupCollector() {
+        return new GroupCollector<T, T>() {
+            private int count = 0;
+            private BigDecimal sum = BigDecimal.ZERO;
+
+            @Override
+            public void add(T t) {
+                count++;
+                if (t != null) {
+                    sum = sum.add(new BigDecimal(t.toString()));
+                }
+            }
+
+            @Override
+            public T get() {
+                BigDecimal avg = sum.divide(BigDecimal.valueOf(count), mathContext);
+                return MathUtils.cast(avg, getType());
+            }
+
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GList.java b/querydsl-core/src/main/java/com/querydsl/core/group/GList.java
similarity index 80%
rename from querydsl-core/src/main/java/com/mysema/query/group/GList.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GList.java
index bada969528..3db7708fb1 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GList.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GList.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,23 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
-/**
- * @author tiwe
- *
- * @param <T>
- */
 class GList<T> extends AbstractGroupExpression<T, List<T>> {
-    
+
     private static final long serialVersionUID = -5613861506383727078L;
 
-    public GList(Expression<T> expr) {
+    GList(Expression<T> expr) {
         super(List.class, expr);
     }
 
@@ -36,19 +31,19 @@ public GroupCollector<T, List<T>> createGroupCollector() {
         return new GroupCollector<T, List<T>>() {
 
             private final List<T> list = new ArrayList<T>();
-            
+
             @Override
             public void add(T o) {
                 if (o != null) {
-                    list.add(o);    
-                }                
+                    list.add(o);
+                }
             }
 
             @Override
             public List<T> get() {
                 return list;
             }
-            
+
         };
     }
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java b/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java
new file mode 100644
index 0000000000..c57ab02c08
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GMap.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.*;
+
+import com.mysema.commons.lang.Pair;
+
+abstract class GMap<K, V, M extends Map<K,V>> extends AbstractGroupExpression<Pair<K, V>, M> {
+
+    private static final long serialVersionUID = 7106389414200843920L;
+
+    GMap(QPair<K,V> qpair) {
+        super(Map.class, qpair);
+    }
+
+    protected abstract M createMap();
+
+    public static <T, U> GMap<T, U, Map<T,U>> createLinked(QPair<T, U> expr) {
+        return new GMap<T, U, Map<T, U>>(expr) {
+            @Override
+            protected Map<T, U> createMap() {
+                return new LinkedHashMap<T, U>();
+            }
+        };
+    }
+
+    public static <T extends Comparable<? super T>, U> GMap<T, U, SortedMap<T, U>> createSorted(QPair<T, U> expr) {
+        return new GMap<T, U, SortedMap<T, U>>(expr) {
+            @Override
+            protected SortedMap<T, U> createMap() {
+                return new TreeMap<T, U>();
+            }
+        };
+    }
+
+    public static <T, U> GMap<T, U, SortedMap<T, U>> createSorted(QPair<T, U> expr, final Comparator<? super T> comparator) {
+        return new GMap<T, U, SortedMap<T, U>>(expr) {
+            @Override
+            protected SortedMap<T, U> createMap() {
+                return new TreeMap<T, U>(comparator);
+            }
+        };
+    }
+
+    @Override
+    public GroupCollector<Pair<K,V>, M> createGroupCollector() {
+        return new GroupCollector<Pair<K,V>, M>() {
+
+            private final M map = createMap();
+
+            @Override
+            public void add(Pair<K,V> pair) {
+                map.put(pair.getFirst(), pair.getSecond());
+            }
+
+            @Override
+            public M get() {
+                return map;
+            }
+
+        };
+    }
+
+    static class Mixin<K, V, T, U, R extends Map<? super T, ? super U>> extends AbstractGroupExpression<Pair<K, V>, R> {
+
+        private static final long serialVersionUID = 1939989270493531116L;
+
+        private class GroupCollectorImpl implements GroupCollector<Pair<K, V>, R> {
+
+            private final GroupCollector<Pair<T, U>, R> groupCollector;
+
+            private final Map<K, GroupCollector<K, T>> keyCollectors = new LinkedHashMap<K, GroupCollector<K, T>>();
+
+            private final Map<GroupCollector<K, T>, GroupCollector<V, U>> valueCollectors = new HashMap<GroupCollector<K, T>, GroupCollector<V, U>>();
+
+            GroupCollectorImpl() {
+                this.groupCollector = mixin.createGroupCollector();
+            }
+
+            @Override
+            public void add(Pair<K, V> pair) {
+                K first = pair.getFirst();
+                GroupCollector<K, T> keyCollector = keyCollectors.get(first);
+                if (keyCollector == null) {
+                    keyCollector = keyExpression.createGroupCollector();
+                    keyCollectors.put(first, keyCollector);
+                }
+                keyCollector.add(first);
+                GroupCollector<V, U> valueCollector = valueCollectors.get(keyCollector);
+                if (valueCollector == null) {
+                    valueCollector = valueExpression.createGroupCollector();
+                    valueCollectors.put(keyCollector, valueCollector);
+                }
+                V second = pair.getSecond();
+                valueCollector.add(second);
+            }
+
+            @Override
+            public R get() {
+                for (GroupCollector<K, T> keyCollector : keyCollectors.values()) {
+                    T key = keyCollector.get();
+                    GroupCollector<V, U> valueCollector = valueCollectors.remove(keyCollector);
+                    U value = valueCollector.get();
+                    groupCollector.add(Pair.of(key, value));
+                }
+                keyCollectors.clear();
+                return groupCollector.get();
+            }
+
+        }
+
+        private final GroupExpression<Pair<T, U>, R> mixin;
+
+        private final GroupExpression<K, T> keyExpression;
+        private final GroupExpression<V, U> valueExpression;
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        Mixin(GroupExpression<K, T> keyExpression, GroupExpression<V, U> valueExpression, AbstractGroupExpression<Pair<T, U>, R> mixin) {
+            super((Class) mixin.getType(), QPair.create(keyExpression.getExpression(), valueExpression.getExpression()));
+            this.keyExpression = keyExpression;
+            this.valueExpression = valueExpression;
+            this.mixin = mixin;
+        }
+
+        @Override
+        public GroupCollector<Pair<K, V>, R> createGroupCollector() {
+            return new GroupCollectorImpl();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GMax.java b/querydsl-core/src/main/java/com/querydsl/core/group/GMax.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/group/GMax.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GMax.java
index 00fdccbe47..30906d9e8a 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GMax.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GMax.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,29 +11,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
-/**
- * @author tiwe
- *
- * @param <T>
- */
-class GMax<T extends Comparable<T>> extends AbstractGroupExpression<T, T> {
+class GMax<T extends Comparable<? super T>> extends AbstractGroupExpression<T, T> {
 
     private static final long serialVersionUID = 3815394663181131511L;
 
     @SuppressWarnings("unchecked")
-    public GMax(Expression<T> expr) {
-        super((Class)expr.getType(), expr);
+    GMax(Expression<T> expr) {
+        super((Class) expr.getType(), expr);
     }
 
     @Override
     public GroupCollector<T,T> createGroupCollector() {
         return new GroupCollector<T,T>() {
             private T max;
-            
+
             @Override
             public void add(T o) {
                 if (max != null) {
@@ -45,7 +40,7 @@ public void add(T o) {
             @Override
             public T get() {
                 return max;
-            }                
+            }
         };
-    }        
+    }
 }
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GMin.java b/querydsl-core/src/main/java/com/querydsl/core/group/GMin.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/group/GMin.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GMin.java
index 988bd47467..2920b9c268 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GMin.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GMin.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,21 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
-/**
- * @author tiwe
- *
- * @param <T>
- */
-class GMin<T extends Comparable<T>> extends AbstractGroupExpression<T, T> {
+class GMin<T extends Comparable<? super T>> extends AbstractGroupExpression<T, T> {
 
     private static final long serialVersionUID = 8312168556148122576L;
 
     @SuppressWarnings("unchecked")
-    public GMin(Expression<T> expr) {
+    GMin(Expression<T> expr) {
         super((Class) expr.getType(), expr);
     }
 
@@ -33,19 +28,19 @@ public GMin(Expression<T> expr) {
     public GroupCollector<T,T> createGroupCollector() {
         return new GroupCollector<T,T>() {
             private T min;
-            
+
             @Override
             public void add(T o) {
                 if (min != null) {
                     min = o.compareTo(min) < 0 ? o : min;
                 } else {
-                    min = (T)o;
+                    min = o;
                 }
             }
             @Override
             public T get() {
                 return min;
-            }                
+            }
         };
-    }        
+    }
 }
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GOne.java b/querydsl-core/src/main/java/com/querydsl/core/group/GOne.java
new file mode 100644
index 0000000000..734968211d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GOne.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import com.querydsl.core.types.Expression;
+
+class GOne<T> extends AbstractGroupExpression<T, T> {
+
+    private static final long serialVersionUID = 3518868612387641383L;
+
+    @SuppressWarnings("unchecked")
+    GOne(Expression<T> expr) {
+        super((Class) expr.getType(), expr);
+    }
+
+    @Override
+    public GroupCollector<T,T> createGroupCollector() {
+        return new GroupCollector<T,T>() {
+            private boolean first = true;
+
+            private T val;
+
+            @Override
+            public void add(T o) {
+                if (first) {
+                    val = o;
+                    first = false;
+                }
+            }
+
+            @Override
+            public T get() {
+                return val;
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GSet.java b/querydsl-core/src/main/java/com/querydsl/core/group/GSet.java
new file mode 100644
index 0000000000..dc35bdc59d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GSet.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.*;
+
+import com.querydsl.core.types.Expression;
+
+abstract class GSet<T, S extends Set<T>> extends AbstractGroupExpression<T, S> {
+
+    private static final long serialVersionUID = -1575808026237160843L;
+
+    public static <U> GSet<U, Set<U>> createLinked(Expression<U> expr) {
+        return new GSet<U, Set<U>>(expr) {
+            @Override
+            protected Set<U> createSet() {
+                return new LinkedHashSet<U>();
+            }
+        };
+    }
+
+    public static <U extends Comparable<? super U>> GSet<U, SortedSet<U>> createSorted(Expression<U> expr) {
+        return new GSet<U, SortedSet<U>>(expr) {
+            @Override
+            protected SortedSet<U> createSet() {
+                return new TreeSet<U>();
+            }
+        };
+    }
+
+    public static <U> GSet<U, SortedSet<U>> createSorted(Expression<U> expr, final Comparator<? super U> comparator) {
+        return new GSet<U, SortedSet<U>>(expr) {
+            @Override
+            protected SortedSet<U> createSet() {
+                return new TreeSet<U>(comparator);
+            }
+        };
+    }
+
+    GSet(Expression<T> expr) {
+        super(Set.class, expr);
+    }
+
+    protected abstract S createSet();
+
+    @Override
+    public GroupCollector<T, S> createGroupCollector() {
+        return new GroupCollector<T, S>() {
+
+            private final S set = createSet();
+
+            @Override
+            public void add(T o) {
+                if (o != null) {
+                    set.add(o);
+                }
+            }
+
+            @Override
+            public S get() {
+                return set;
+            }
+
+        };
+    }
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GSum.java b/querydsl-core/src/main/java/com/querydsl/core/group/GSum.java
new file mode 100644
index 0000000000..5ac3b0ec16
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GSum.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.math.BigDecimal;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.util.MathUtils;
+
+class GSum<T extends Number> extends AbstractGroupExpression<T, T> {
+
+    private static final long serialVersionUID = 3518868612387641383L;
+
+    @SuppressWarnings("unchecked")
+    GSum(Expression<T> expr) {
+        super((Class) expr.getType(), expr);
+    }
+
+    @Override
+    public GroupCollector<T, T> createGroupCollector() {
+        return new GroupCollector<T, T>() {
+            private BigDecimal sum = BigDecimal.ZERO;
+
+            @Override
+            public void add(T t) {
+                if (t != null) {
+                    sum = sum.add(new BigDecimal(t.toString()));
+                }
+            }
+
+            @Override
+            public T get() {
+                return MathUtils.cast(sum, getType());
+            }
+
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/Group.java b/querydsl-core/src/main/java/com/querydsl/core/group/Group.java
new file mode 100644
index 0000000000..7b9e37efcd
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/Group.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.*;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * A group of rows. Group is build according to GroupDefinitions.
+ *
+ * @author sasa
+ *
+ */
+public interface Group {
+
+    /**
+     * Groups elements as an array
+     *
+     * @return elements as an array
+     */
+    Object[] toArray();
+
+    /**
+     * Returns the value of the given group.
+     *
+     * @param <T> Type of element in a single ResultSet row, i.e. type of {@code Expression<T>}
+     * @param <R> Target type of this group, e.g. {@code List<T>}
+     * @param coldef
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type
+     * @return Value of given group definition in this group
+     */
+    <T, R> R getGroup(GroupExpression<T, R> coldef);
+
+    /**
+     * Returns the value of the given single valued expression. This is the
+     * first value of given column within this group of the ResultSet.
+     *
+     * @param <T> Value type
+     * @param expr Grouped expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. Set)
+     * @return Value of given expression in this group
+     */
+    <T> T getOne(Expression<T> expr);
+
+    /**
+     * Returns a Set of values in this group.
+     *
+     * @param <T> Value type of Set
+     * @param expr Grouped expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. List)
+     * @return Set of values in this group
+     */
+    <T> Set<T> getSet(Expression<T> expr);
+
+    /**
+     * Returns a SortedSet of values in this group.
+     *
+     * @param <T> Value type of Set
+     * @param expr Grouped expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. List)
+     * @return Set of values in this group
+     */
+    <T> SortedSet<T> getSortedSet(Expression<T> expr);
+
+    /**
+     * Returns a List of values in this group.
+     *
+     * @param <T> Value type of List
+     * @param expr Grouped expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. Set)
+     * @return List of values in this group
+     */
+    <T> List<T> getList(Expression<T> expr);
+
+    /**
+     * Returns a Map of values in this group
+     *
+     * @param <K> Key type of result Map
+     * @param <V> Value type of result Map
+     * @param key Key expression
+     * @param value Value expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. List)
+     * @return Map of values in this group
+     */
+    <K, V> Map<K, V> getMap(Expression<K> key, Expression<V> value);
+
+    /**
+     * Returns a SortedMap of values in this group
+     *
+     * @param <K> Key type of result Map
+     * @param <V> Value type of result Map
+     * @param key Key expression
+     * @param value Value expression
+     * @throws NoSuchElementException if group is undefined.
+     * @throws ClassCastException if group is of different type (e.g. List)
+     * @return Map of values in this group
+     */
+    <K, V> SortedMap<K, V> getSortedMap(Expression<K> key, Expression<V> value);
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
new file mode 100644
index 0000000000..dfd21ea9bb
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.math.MathContext;
+import java.util.*;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+
+/**
+ * {@code GroupBy} provides factory methods for {@link ResultTransformer} and {@link GroupExpression} creation
+ *
+ * <p>Example: Group employees by department</p>
+ *
+ * <pre>{@code
+ * query.transform(
+ *     GroupBy.groupBy(employee.department)
+ *            .as(GroupBy.list(Projections.tuple(employee.id, employee.firstName, employee.lastName))))
+ * }</pre>
+ *
+ *
+ * @author sasa
+ * @author tiwe
+ *
+ */
+public class GroupBy {
+
+    /**
+     * Create a new GroupByBuilder for the given key expression
+     *
+     * @param key key for aggregation
+     * @return builder for further specification
+     */
+    public static <K> GroupByBuilder<K> groupBy(Expression<K> key) {
+        return new GroupByBuilder<K>(key);
+    }
+
+    /**
+     * Create a new GroupByBuilder for the given key expressions
+     *
+     * @param keys keys for aggregation
+     * @return builder for further specification
+     */
+    public static GroupByBuilder<List<?>> groupBy(Expression<?>... keys) {
+        return new GroupByBuilder<List<?>>(Projections.list(keys));
+    }
+
+    /**
+     * Create a new aggregating min expression
+     *
+     * @param expression expression for which the minimum value will be used in the group by projection
+     * @return wrapper expression
+     */
+    public static <E extends Comparable<? super E>> AbstractGroupExpression<E, E> min(Expression<E> expression) {
+        return new GMin<E>(expression);
+    }
+
+    /**
+     * Create a new aggregating sum expression
+     *
+     * @param expression expression a for which the accumulated sum will be used in the group by projection
+     * @return wrapper expression
+     */
+    public static <E extends Number> AbstractGroupExpression<E, E> sum(Expression<E> expression) {
+        return new GSum<E>(expression);
+    }
+
+    /**
+     * Create a new aggregating avg expression, uses default MathContext.DECIMAL128 for average calculation
+     *
+     * @param expression expression for which the accumulated average value will be used in the group by projection
+     * @return wrapper expression
+     */
+    public static <E extends Number> AbstractGroupExpression<E, E> avg(Expression<E> expression) {
+        return new GAvg<E>(expression);
+    }
+
+    /**
+     * Create a new aggregating avg expression with a user-provided MathContext
+     *
+     * @param expression expression for which the accumulated average value will be used in the group by projection
+     * @param mathContext mathContext for average calculation
+     * @return wrapper expression
+     */
+    public static <E extends Number> AbstractGroupExpression<E, E> avg(Expression<E> expression, MathContext mathContext) {
+        return new GAvg<E>(expression, mathContext);
+    }
+
+    /**
+     * Create a new aggregating max expression
+     *
+     * @param expression expression for which the maximum value will be used in the group by projection
+     * @return wrapper expression
+     */
+    public static <E extends Comparable<? super E>> AbstractGroupExpression<E, E> max(Expression<E> expression) {
+        return new GMax<E>(expression);
+    }
+
+    /**
+     * Create a new aggregating list expression
+     *
+     * @param expression values for this expression will be accumulated into a list
+     * @return wrapper expression
+     */
+    public static <E> AbstractGroupExpression<E, List<E>> list(Expression<E> expression) {
+        return new GList<E>(expression);
+    }
+
+    /**
+     * Create a new aggregating list expression
+     *
+     * @param groupExpression values for this expression will be accumulated into a list
+     * @param <E>
+     * @param <F>
+     * @return wrapper expression
+     */
+    public static <E, F> AbstractGroupExpression<E, List<F>> list(GroupExpression<E, F> groupExpression) {
+        return new MixinGroupExpression<E, F, List<F>>(groupExpression, new GList<F>(groupExpression));
+    }
+
+    /**
+     * Create a new aggregating set expression using a backing LinkedHashSet
+     *
+     * @param expression values for this expression will be accumulated into a set
+     * @return wrapper expression
+     */
+    public static <E> AbstractGroupExpression<E, Set<E>> set(Expression<E> expression) {
+        return GSet.createLinked(expression);
+    }
+
+    /**
+     * Create a new aggregating set expression using a backing LinkedHashSet
+     *
+     * @param groupExpression values for this expression will be accumulated into a set
+     * @param <E>
+     * @param <F>
+     * @return wrapper expression
+     */
+    public static <E, F> GroupExpression<E, Set<F>> set(GroupExpression<E, F> groupExpression) {
+        return new MixinGroupExpression<E, F, Set<F>>(groupExpression, GSet.createLinked(groupExpression));
+    }
+
+    /**
+     * Create a new aggregating set expression using a backing TreeSet
+     *
+     * @param expression values for this expression will be accumulated into a set
+     * @return wrapper expression
+     */
+    public static <E extends Comparable<? super E>> AbstractGroupExpression<E, SortedSet<E>> sortedSet(Expression<E> expression) {
+        return GSet.createSorted(expression);
+    }
+
+    /**
+     * Create a new aggregating set expression using a backing TreeSet
+     *
+     * @param groupExpression values for this expression will be accumulated into a set
+     * @return wrapper expression
+     */
+    public static <E, F extends Comparable<? super F>> GroupExpression<E, SortedSet<F>> sortedSet(GroupExpression<E, F> groupExpression) {
+        return new MixinGroupExpression<E, F, SortedSet<F>>(groupExpression, GSet.createSorted(groupExpression));
+    }
+
+
+    /**
+     * Create a new aggregating set expression using a backing TreeSet using the given comparator
+     *
+     * @param expression values for this expression will be accumulated into a set
+     * @param comparator comparator of the created TreeSet instance
+     * @return wrapper expression
+     */
+    public static <E> AbstractGroupExpression<E, SortedSet<E>> sortedSet(Expression<E> expression,
+                                                                         Comparator<? super E> comparator) {
+        return GSet.createSorted(expression, comparator);
+    }
+
+    /**
+     * Create a new aggregating set expression using a backing TreeSet using the given comparator
+     *
+     * @param groupExpression values for this expression will be accumulated into a set
+     * @param comparator comparator of the created TreeSet instance
+     * @return wrapper expression
+     */
+    public static <E, F> GroupExpression<E, SortedSet<F>> sortedSet(GroupExpression<E, F> groupExpression,
+                                                                    Comparator<? super F> comparator) {
+        return new MixinGroupExpression<E, F, SortedSet<F>>(groupExpression, GSet.createSorted(groupExpression, comparator));
+    }
+
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V> AbstractGroupExpression<Pair<K, V>,Map<K, V>> map(Expression<K> key,
+                                                                           Expression<V> value) {
+        return GMap.createLinked(QPair.create(key, value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T> AbstractGroupExpression<Pair<K, V>, Map<T, V>> map(GroupExpression<K, T> key,
+                                                                               Expression<V> value) {
+        return map(key, new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, U> AbstractGroupExpression<Pair<K, V>, Map<K, U>> map(Expression<K> key,
+                                                                               GroupExpression<V, U> value) {
+        return map(new GOne<K>(key), value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T, U> AbstractGroupExpression<Pair<K, V>, Map<T, U>> map(GroupExpression<K, T> key,
+                                                                                  GroupExpression<V, U> value) {
+        return new GMap.Mixin<K, V, T, U, Map<T, U>>(key, value, GMap.createLinked(QPair.create(key, value)));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K extends Comparable<? super K>, V> AbstractGroupExpression<Pair<K, V>, SortedMap<K, V>> sortedMap(Expression<K> key,
+                                                                                                                      Expression<V> value) {
+        return GMap.createSorted(QPair.create(key, value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T extends Comparable<? super T>> AbstractGroupExpression<Pair<K, V>, SortedMap<T, V>> sortedMap(GroupExpression<K, T> key,
+                                                                                                                         Expression<V> value) {
+        return sortedMap(key, new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K extends Comparable<? super K>, V, U> AbstractGroupExpression<Pair<K, V>, SortedMap<K, U>> sortedMap(Expression<K> key,
+                                                                                                                         GroupExpression<V, U> value) {
+        return sortedMap(new GOne<K>(key), value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T extends Comparable<? super T>, U> AbstractGroupExpression<Pair<K, V>, SortedMap<T, U>> sortedMap(GroupExpression<K, T> key,
+                                                                                                                            GroupExpression<V, U> value) {
+        return new GMap.Mixin<K, V, T, U, SortedMap<T, U>>(key, value, GMap.createSorted(QPair.create(key, value)));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param comparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V> AbstractGroupExpression<Pair<K, V>, SortedMap<K, V>> sortedMap(Expression<K> key,
+                                                                                        Expression<V> value,
+                                                                                        Comparator<? super K> comparator) {
+        return GMap.createSorted(QPair.create(key, value), comparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param comparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, T> AbstractGroupExpression<Pair<K, V>, SortedMap<T, V>> sortedMap(GroupExpression<K, T> key,
+                                                                                           Expression<V> value,
+                                                                                           Comparator<? super T> comparator) {
+        return sortedMap(key, new GOne<V>(value), comparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param comparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, U> AbstractGroupExpression<Pair<K, V>, SortedMap<K, U>> sortedMap(Expression<K> key,
+                                                                                           GroupExpression<V, U> value,
+                                                                                           Comparator<? super K> comparator) {
+        return sortedMap(new GOne<K>(key), value, comparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param comparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, T, U> AbstractGroupExpression<Pair<K, V>, SortedMap<T, U>> sortedMap(GroupExpression<K, T> key,
+                                                                                              GroupExpression<V, U> value,
+                                                                                              Comparator<? super T> comparator) {
+        return new GMap.Mixin<K, V, T, U, SortedMap<T, U>>(key, value, GMap.createSorted(QPair.create(key, value), comparator));
+    }
+
+    protected GroupBy() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java
new file mode 100644
index 0000000000..2910943e2e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByBuilder.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+
+/**
+ * GroupByBuilder is a fluent builder for GroupBy transformer instances. This class is not to be used directly,
+ * but via GroupBy.
+ *
+ * @author tiwe
+ *
+ * @param <K>
+ */
+public class GroupByBuilder<K> {
+
+    protected final Expression<K> key;
+
+    /**
+     * Create a new GroupByBuilder for the given key expression
+     *
+     * @param key key for aggregating
+     */
+    public GroupByBuilder(Expression<K> key) {
+        this.key = key;
+    }
+
+    /**
+     * Get the results as a map
+     *
+     * @param expressions projection
+     * @return new result transformer
+     */
+    public ResultTransformer<Map<K, Group>> as(Expression<?>... expressions) {
+        return new GroupByMap<K, Group>(key, expressions);
+    }
+
+    /**
+     * Get the results as a map
+     *
+     * @param mapFactory the map factory to use, i.e. {@code HashMap::new}.
+     * @param expressions projection
+     * @return new result transformer
+     */
+    public <RES extends Map<K, Group>> ResultTransformer<RES> as(Supplier<RES> mapFactory, Expression<?>... expressions) {
+        return new GroupByGenericMap<K, Group, RES>(mapFactory, key, expressions);
+    }
+
+    /**
+     * Get the results as a closeable iterator
+     *
+     * @param expressions projection
+     * @return new result transformer
+     */
+    public ResultTransformer<CloseableIterator<Group>> iterate(Expression<?>... expressions) {
+        return new GroupByIterate<K, Group>(key, expressions);
+    }
+
+    /**
+     * Get the results as a list
+     *
+     * @param expressions projection
+     * @return new result transformer
+     */
+    public ResultTransformer<List<Group>> list(Expression<?>... expressions) {
+        return new GroupByList<K, Group>(key, expressions);
+    }
+
+    /**
+     * Get the results as a collection.
+     *
+     * @param resultFactory The collection factory to use, i.e. {@code HashSet::new}.
+     * @param expressions projection
+     * @return new result transformer
+     */
+    public <RES extends Collection<Group>> ResultTransformer<RES> collection(Supplier<RES> resultFactory, Expression<?>... expressions) {
+        return new GroupByGenericCollection<K, Group, RES>(resultFactory, key, expressions);
+    }
+
+    /**
+     * Get the results as a map
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    @SuppressWarnings("unchecked")
+    public <V> ResultTransformer<Map<K, V>> as(Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByMap<K, V>(key, expression) {
+            @Override
+            protected Map<K, V> transform(Map<K, Group> groups) {
+                Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size() / 0.75), 0.75f);
+                for (Map.Entry<K, Group> entry : groups.entrySet()) {
+                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as a map
+     *
+     * @param mapFactory The map factory to use, i.e. {@code HashMap::new}.
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V, RES extends Map<K, V>> ResultTransformer<RES> as(final Supplier<RES> mapFactory, Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByGenericMap<K, V, RES>(mapFactory, key, expression) {
+            @Override
+            protected RES transform(Map<K, Group> groups) {
+                RES results = mapFactory.get();
+                for (Map.Entry<K, Group> entry : groups.entrySet()) {
+                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as a closeable iterator
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<CloseableIterator<V>> iterate(Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByIterate<K, V>(key, expression) {
+            @Override
+            protected V transform(Group group) {
+                return group.getOne(lookup);
+            }
+        };
+    }
+
+    /**
+     * Get the results as a list
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<List<V>> list(Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByList<K, V>(key, expression) {
+            @Override
+            protected V transform(Group group) {
+                return group.getOne(lookup);
+            }
+        };
+    }
+
+    /**
+     * Get the results as a set
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V, RES extends Collection<V>> ResultTransformer<RES> collection(Supplier<RES> resultFactory, Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByGenericCollection<K, V, RES>(resultFactory, key, expression) {
+            @Override
+            protected V transform(Group group) {
+                return group.getOne(lookup);
+            }
+        };
+    }
+
+
+    protected  <V> Expression<V> getLookup(Expression<V> expression) {
+        if (expression instanceof GroupExpression) {
+            @SuppressWarnings("unchecked") // This is the underlying type
+            GroupExpression<V, ?> groupExpression = (GroupExpression<V, ?>) expression;
+            return groupExpression.getExpression();
+        } else {
+            return expression;
+        }
+    }
+
+    /**
+     * Get the results as a map
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<Map<K, V>> as(FactoryExpression<V> expression) {
+        final FactoryExpression<?> transformation = FactoryExpressionUtils.wrap(expression);
+        List<Expression<?>> args = transformation.getArgs();
+        return new GroupByMap<K, V>(key, args.toArray(new Expression<?>[0])) {
+
+            @Override
+            protected Map<K, V> transform(Map<K, Group> groups) {
+                Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size() / 0.75), 0.75f);
+                for (Map.Entry<K, Group> entry : groups.entrySet()) {
+                    results.put(entry.getKey(), transform(entry.getValue()));
+                }
+                return results;
+            }
+
+            @SuppressWarnings("unchecked")
+            protected V transform(Group group) {
+                // XXX Isn't group.toArray() suitable here?
+                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
+                for (int i = 1; i < groupExpressions.size(); i++) {
+                    args.add(group.getGroup(groupExpressions.get(i)));
+                }
+                return (V) transformation.newInstance(args.toArray());
+            }
+
+        };
+    }
+
+    /**
+     * Get the results as a closeable iterator
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<CloseableIterator<V>> iterate(FactoryExpression<V> expression) {
+        final FactoryExpression<V> transformation = FactoryExpressionUtils.wrap(expression);
+        List<Expression<?>> args = transformation.getArgs();
+        return new GroupByIterate<K, V>(key, args.toArray(new Expression<?>[0])) {
+            @Override
+            protected V transform(Group group) {
+                // XXX Isn't group.toArray() suitable here?
+                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
+                for (int i = 1; i < groupExpressions.size(); i++) {
+                    args.add(group.getGroup(groupExpressions.get(i)));
+                }
+                return transformation.newInstance(args.toArray());
+            }
+        };
+    }
+
+    /**
+     * Get the results as a list
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<List<V>> list(FactoryExpression<V> expression) {
+        final FactoryExpression<V> transformation = FactoryExpressionUtils.wrap(expression);
+        List<Expression<?>> args = transformation.getArgs();
+        return new GroupByList<K, V>(key, args.toArray(new Expression<?>[0])) {
+            @Override
+            protected V transform(Group group) {
+                // XXX Isn't group.toArray() suitable here?
+                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
+                for (int i = 1; i < groupExpressions.size(); i++) {
+                    args.add(group.getGroup(groupExpressions.get(i)));
+                }
+                return transformation.newInstance(args.toArray());
+            }
+        };
+    }
+
+    /**
+     * Get the results as a list
+     *
+     * @param expression projection
+     * @return new result transformer
+     */
+    public <V, RES extends Collection<V>> ResultTransformer<RES> collection(Supplier<RES> resultFactory, FactoryExpression<V> expression) {
+        final FactoryExpression<V> transformation = FactoryExpressionUtils.wrap(expression);
+        List<Expression<?>> args = transformation.getArgs();
+        return new GroupByGenericCollection<K, V, RES>(resultFactory, key, args.toArray(new Expression<?>[args.size()])) {
+            @Override
+            protected V transform(Group group) {
+                // XXX Isn't group.toArray() suitable here?
+                List<Object> args = new ArrayList<Object>(groupExpressions.size() - 1);
+                for (int i = 1; i < groupExpressions.size(); i++) {
+                    args.add(group.getGroup(groupExpressions.get(i)));
+                }
+                return transformation.newInstance(args.toArray());
+            }
+        };
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericCollection.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericCollection.java
new file mode 100644
index 0000000000..2ea5210552
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericCollection.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * Provides aggregated results as a collection
+ *
+ * @param <K> Key type
+ * @param <V> Value type
+ * @param <RES> Concrete collection type
+ * @author Jan-Willem Gmelig Meyling
+ */
+public class GroupByGenericCollection<K, V, RES extends Collection<V>> extends AbstractGroupByTransformer<K, RES> {
+
+    private final Supplier<RES> resultFactory;
+
+    GroupByGenericCollection(Supplier<RES> resultFactory, Expression<K> key, Expression<?>... expressions) {
+        super(key, expressions);
+        this.resultFactory = resultFactory;
+    }
+
+    @Override
+    public RES transform(FetchableQuery<?, ?> query) {
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        final CloseableIterator<Tuple> iter = query.select(expr).iterate();
+
+        RES list = resultFactory.get();
+        GroupImpl group = null;
+        K groupId = null;
+        while (iter.hasNext()) {
+            @SuppressWarnings("unchecked") //This type is mandated by the key type
+                    K[] row = (K[]) iter.next().toArray();
+            if (group == null) {
+                group = new GroupImpl(groupExpressions, maps);
+                groupId = row[0];
+            } else if (!Objects.equals(groupId, row[0])) {
+                list.add(transform(group));
+                group = new GroupImpl(groupExpressions, maps);
+                groupId = row[0];
+            }
+            group.add(row);
+        }
+        if (group != null) {
+            list.add(transform(group));
+        }
+        iter.close();
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected V transform(Group group) {
+        return (V) group;
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericMap.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericMap.java
new file mode 100644
index 0000000000..a81fb99777
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByGenericMap.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * Provides aggregated results as a map
+ *
+ * @param <K> Map key type
+ * @param <V> Map value type
+ * @param <RES> Resulting map type
+ * @author Jan-Willem Gmelig Meyling
+ */
+public class GroupByGenericMap<K, V, RES extends Map<K, V>> extends AbstractGroupByTransformer<K, RES> {
+
+    private final Supplier<RES> mapFactory;
+
+    GroupByGenericMap(Supplier<RES> mapFactory, Expression<K> key, Expression<?>... expressions) {
+        super(key, expressions);
+        this.mapFactory = mapFactory;
+    }
+
+    @Override
+    public RES transform(FetchableQuery<?, ?> query) {
+        Map<K, Group> groups = (Map) mapFactory.get();
+
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        CloseableIterator<Tuple> iter = query.select(expr).iterate();
+        try {
+            while (iter.hasNext()) {
+                @SuppressWarnings("unchecked") //This type is mandated by the key type
+                        K[] row = (K[]) iter.next().toArray();
+                K groupId = row[0];
+                GroupImpl group = (GroupImpl) groups.get(groupId);
+                if (group == null) {
+                    group = new GroupImpl(groupExpressions, maps);
+                    groups.put(groupId, group);
+                }
+                group.add(row);
+            }
+        } finally {
+            iter.close();
+        }
+
+        // transform groups
+        return transform(groups);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    protected RES transform(Map<K, Group> groups) {
+        return (RES) groups;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupByIterate.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/group/GroupByIterate.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
index bd92cfdad2..7f910296b5 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupByIterate.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByIterate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
-import com.google.common.base.Objects;
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.QTuple;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
 
 /**
  * Provides aggregated results as an iterator
@@ -39,9 +39,9 @@ public class GroupByIterate<K, V> extends AbstractGroupByTransformer<K, Closeabl
     }
 
     @Override
-    public CloseableIterator<V> transform(Projectable projectable) {
+    public CloseableIterator<V> transform(FetchableQuery<?,?> query) {
         // create groups
-        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(new QTuple(expressions));
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
         boolean hasGroups = false;
         for (Expression<?> e : expr.getArgs()) {
             hasGroups |= e instanceof GroupExpression;
@@ -49,7 +49,7 @@ public CloseableIterator<V> transform(Projectable projectable) {
         if (hasGroups) {
             expr = withoutGroupExpressions(expr);
         }
-        final CloseableIterator<Tuple> iter = projectable.iterate(expr);
+        final CloseableIterator<Tuple> iter = query.select(expr).iterate();
 
         return new CloseableIterator<V>() {
 
@@ -75,17 +75,18 @@ public V next() {
                 }
 
                 while (iter.hasNext()) {
-                    Object[] row = iter.next().toArray();
+                    @SuppressWarnings("unchecked") //This type is mandated by the key type
+                    K[] row = (K[]) iter.next().toArray();
                     if (group == null) {
                         group = new GroupImpl(groupExpressions, maps);
-                        groupId = (K) row[0];
+                        groupId = row[0];
                         group.add(row);
-                    } else if (Objects.equal(groupId, row[0])) {
+                    } else if (Objects.equals(groupId, row[0])) {
                         group.add(row);
                     } else {
                         Group current = group;
                         group = new GroupImpl(groupExpressions, maps);
-                        groupId = (K) row[0];
+                        groupId = row[0];
                         group.add(row);
                         return transform(current);
                     }
@@ -108,7 +109,8 @@ public void close() {
         };
     }
 
+    @SuppressWarnings("unchecked")
     protected V transform(Group group) {
-        return (V)group;
+        return (V) group;
     }
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupByList.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByList.java
new file mode 100644
index 0000000000..a151c9fd10
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByList.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+
+/**
+ * Provides aggregated results as a list
+ *
+ * @author tiwe
+ *
+ * @param <K>
+ * @param <V>
+ */
+public class GroupByList<K, V> extends AbstractGroupByTransformer<K, List<V>> {
+
+    GroupByList(Expression<K> key, Expression<?>... expressions) {
+        super(key, expressions);
+    }
+
+    @Override
+    public List<V> transform(FetchableQuery<?,?> query) {
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        final CloseableIterator<Tuple> iter = query.select(expr).iterate();
+
+        List<V> list = new ArrayList<>();
+        GroupImpl group = null;
+        K groupId = null;
+        while (iter.hasNext()) {
+            @SuppressWarnings("unchecked") //This type is mandated by the key type
+            K[] row = (K[]) iter.next().toArray();
+            if (group == null) {
+                group = new GroupImpl(groupExpressions, maps);
+                groupId = row[0];
+            } else if (!Objects.equals(groupId, row[0])) {
+                list.add(transform(group));
+                group = new GroupImpl(groupExpressions, maps);
+                groupId = row[0];
+            }
+            group.add(row);
+        }
+        if (group != null) {
+            list.add(transform(group));
+        }
+        iter.close();
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected V transform(Group group) {
+        return (V) group;
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupByMap.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByMap.java
new file mode 100644
index 0000000000..8ceacc3b42
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByMap.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+
+/**
+ * Provides aggregated results as a map
+ *
+ * @author tiwe
+ *
+ * @param <K>
+ * @param <V>
+ */
+public class GroupByMap<K,V> extends AbstractGroupByTransformer<K, Map<K,V>> {
+
+    GroupByMap(Expression<K> key, Expression<?>... expressions) {
+        super(key, expressions);
+    }
+
+    @Override
+    public Map<K, V> transform(FetchableQuery<?,?> query) {
+        Map<K, Group> groups = new LinkedHashMap<K, Group>();
+
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        try (CloseableIterator<Tuple> iter = query.select(expr).iterate()) {
+            while (iter.hasNext()) {
+                @SuppressWarnings("unchecked") //This type is mandated by the key type
+                K[] row = (K[]) iter.next().toArray();
+                K groupId = row[0];
+                GroupImpl group = (GroupImpl) groups.get(groupId);
+                if (group == null) {
+                    group = new GroupImpl(groupExpressions, maps);
+                    groups.put(groupId, group);
+                }
+                group.add(row);
+            }
+        }
+
+        // transform groups
+        return transform(groups);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    protected Map<K, V> transform(Map<K, Group> groups) {
+        return (Map<K,V>) groups;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupByProjection.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByProjection.java
similarity index 84%
rename from querydsl-core/src/main/java/com/mysema/query/group/GroupByProjection.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GroupByProjection.java
index 92a8425616..f321acdb82 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupByProjection.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupByProjection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * GroupByProjection provides projection of the Group results via the transform template method
@@ -34,7 +34,7 @@ public GroupByProjection(Expression<K> key, Expression<?>... expressions) {
 
     @Override
     protected Map<K, V> transform(Map<K, Group> groups) {
-        Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size()/0.75), 0.75f);
+        Map<K, V> results = new LinkedHashMap<K, V>((int) Math.ceil(groups.size() / 0.75), 0.75f);
         for (Map.Entry<K, Group> entry : groups.entrySet()) {
             results.put(entry.getKey(), transform(entry.getValue()));
         }
@@ -44,8 +44,8 @@ protected Map<K, V> transform(Map<K, Group> groups) {
     /**
      * Creates a result object from the given group
      *
-     * @param group
-     * @return
+     * @param group group instance to transform
+     * @return transformed group
      */
     protected abstract V transform(Group group);
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/GroupCollector.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupCollector.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/group/GroupCollector.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/GroupCollector.java
index dcd8ac5922..ff06733e32 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/GroupCollector.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupCollector.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,26 +11,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 /**
  * A stateful collector of column values for a group.
- * 
- * @author sasa
+ *
+ * @param <T> Element type
  * @param <R> Target type (e.g. List, Set)
+ *
+ * @author sasa
  */
 public interface GroupCollector<T, R> {
-    
+
     /**
      * Add given value to this group
-     * 
-     * @param o
+     *
+     * @param o value to add
      */
     void add(T o);
 
     /**
-     * @return Value of this group.
+     * Get the value for this group
+     *
+     * @return value of this group.
      */
     R get();
-    
+
 }
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupExpression.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupExpression.java
new file mode 100644
index 0000000000..b17ce1640a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupExpression.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * Defines the way results of a given expression are grouped. GroupExpressions are also used
+ * to access values of a given GroupExpression within a Group.
+ * GroupExpressions are stateless wrappers for Expressions that know how to
+ * collect row values into a group.
+ *
+ * @param <T> Element type
+ * @param <R> Target type (e.g. List, Set)
+ *
+ * @author sasa
+ * @author tiwe
+ */
+public interface GroupExpression<T, R> extends Expression<R> {
+
+    /**
+     * Get the expression wrapped by this group definition
+     *
+     * @return wrapped expression
+     */
+    Expression<T> getExpression();
+
+    /**
+     * Create a new GroupCollector to collect values belonging to this group.
+     *
+     * @return new GroupCollector
+     */
+    GroupCollector<T, R> createGroupCollector();
+
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/GroupImpl.java b/querydsl-core/src/main/java/com/querydsl/core/group/GroupImpl.java
new file mode 100644
index 0000000000..7e74b93e64
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/GroupImpl.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.*;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Ops;
+
+/**
+ * Default implementation of the Group interface
+ *
+ * @author sasa
+ * @author tiwe
+ *
+ */
+public class GroupImpl implements Group {
+
+    private final Map<Expression<?>, GroupCollector<?,?>> groupCollectorMap = new LinkedHashMap<Expression<?>, GroupCollector<?,?>>();
+
+    private final List<GroupExpression<?, ?>> groupExpressions;
+
+    private final List<GroupCollector<?,?>> groupCollectors = new ArrayList<GroupCollector<?,?>>();
+
+    private final List<QPair<?, ?>> maps;
+
+    public GroupImpl(List<GroupExpression<?, ?>> columnDefinitions,  List<QPair<?, ?>> maps) {
+        this.groupExpressions = columnDefinitions;
+        this.maps = maps;
+        for (GroupExpression<?, ?> coldef : columnDefinitions) {
+            GroupCollector<?, ?> collector = groupCollectorMap.get(coldef.getExpression());
+            if (collector == null) {
+                collector = coldef.createGroupCollector();
+                Expression<?> coldefExpr = coldef.getExpression();
+                groupCollectorMap.put(coldefExpr, collector);
+                if (coldefExpr instanceof Operation && ((Operation) coldefExpr).getOperator() == Ops.ALIAS) {
+                    groupCollectorMap.put(((Operation) coldefExpr).getArg(1), collector);
+                }
+            }
+            groupCollectors.add(collector);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public void add(Object[] row) {
+        int i = 0;
+        for (GroupCollector groupCollector : groupCollectors) {
+            groupCollector.add(row[i]);
+            i++;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T, R> R get(Expression<T> expr) {
+        GroupCollector<T,R> col = (GroupCollector<T,R>) groupCollectorMap.get(expr);
+        if (col != null) {
+            return col.get();
+        }
+        throw new NoSuchElementException(expr.toString());
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T, R> R getGroup(GroupExpression<T, R> definition) {
+        for (GroupExpression<?, ?> def : groupExpressions) {
+            if (def.equals(definition)) {
+                return (R) groupCollectorMap.get(def.getExpression()).get();
+            }
+        }
+        throw new NoSuchElementException(definition.toString());
+    }
+
+    @Override
+    public <T> List<T> getList(Expression<T> expr) {
+        return this.get(expr);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <K, V> Map<K, V> getMap(Expression<K> key, Expression<V> value) {
+        for (QPair<?, ?> pair : maps) {
+            if (pair.equals(key, value)) {
+                return (Map<K, V>) groupCollectorMap.get(pair).get();
+            }
+        }
+        throw new NoSuchElementException("GMap(" + key + ", " + value + ")");
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <K, V> SortedMap<K, V> getSortedMap(Expression<K> key, Expression<V> value) {
+        for (QPair<?, ?> pair : maps) {
+            if (pair.equals(key, value)) {
+                return (SortedMap<K, V>) groupCollectorMap.get(pair).get();
+            }
+        }
+        throw new NoSuchElementException("GMap(" + key + ", " + value + ")");
+    }
+
+    @Override
+    public <T> T getOne(Expression<T> expr) {
+        return this.get(expr);
+    }
+
+    @Override
+    public <T> Set<T> getSet(Expression<T> expr) {
+        return this.get(expr);
+    }
+
+    @Override
+    public <T> SortedSet<T> getSortedSet(Expression<T> expr) {
+        return this.get(expr);
+    }
+
+    @Override
+    public Object[] toArray() {
+        List<Object> arr = new ArrayList<Object>(groupCollectors.size());
+        for (GroupCollector<?,?> col : groupCollectors) {
+            arr.add(col.get());
+        }
+        return arr.toArray();
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java b/querydsl-core/src/main/java/com/querydsl/core/group/MixinGroupExpression.java
similarity index 90%
rename from querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/MixinGroupExpression.java
index 327e269e4b..f3c64fba4e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/MixinGroupExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/MixinGroupExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,9 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 /**
+ * {@code MixinGroupExpression} provides nesting support for {@link GroupExpression} instances
+ *
  * @param <E>
  * @param <F>
  * @param <R>
@@ -28,7 +30,7 @@ private class GroupCollectorImpl implements GroupCollector<E, R> {
 
         private GroupCollector<E, F> groupCollector;
 
-        public GroupCollectorImpl() {
+        GroupCollectorImpl() {
             mixinGroupCollector = mixin.createGroupCollector();
         }
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/group/QPair.java b/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
similarity index 80%
rename from querydsl-core/src/main/java/com/mysema/query/group/QPair.java
rename to querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
index 23be5257dd..b7dde6d367 100644
--- a/querydsl-core/src/main/java/com/mysema/query/group/QPair.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/QPair.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import com.mysema.commons.lang.Pair;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Expression;
 
 /**
- * A pair of (Map) key and value 
- * 
+ * A pair of (Map) key and value
+ *
  * @author sasa
  * @param <K> Map key type
  * @param <V> Map value type
@@ -31,18 +31,18 @@ public final class QPair<K, V> extends ConstructorExpression<Pair<K, V>> {
     public static <K, V> QPair<K, V> create(Expression<K> key, Expression<V> value) {
         return new QPair<K, V>(key, value);
     }
-    
+
     @SuppressWarnings({"unchecked" })
     public QPair(Expression<K> key, Expression<V> value) {
-        super((Class) Pair.class, new Class[]{Object.class, Object.class}, key, value);
+        super((Class) Pair.class, new Class<?>[]{Object.class, Object.class}, key, value);
     }
-    
+
     public boolean equals(Expression<?> keyExpr, Expression<?> valueExpr) {
         return getArgs().get(0).equals(keyExpr) && getArgs().get(1).equals(valueExpr);
     }
-    
+
     public boolean equals(Expression<?> keyExpr, Class<?> valueType) {
         return getArgs().get(0).equals(keyExpr) && valueType.isAssignableFrom(getArgs().get(1).getType());
     }
-    
+
 }
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/group/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/group/package-info.java
new file mode 100644
index 0000000000..1436bd9e90
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/group/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Aggregating post processing functionality
+ */
+package com.querydsl.core.group;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/package-info.java
new file mode 100644
index 0000000000..e06286e273
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Basic Query elements
+ */
+package com.querydsl.core;
+
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/CollectionAnyVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/support/CollectionAnyVisitor.java
new file mode 100644
index 0000000000..f760fb4c6b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/CollectionAnyVisitor.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimplePath;
+
+/**
+ * {@code CollectionAnyVisitor} is an expression visitor which transforms any() path expressions which are
+ * often transformed into subqueries
+ *
+ * @author tiwe
+ *
+ */
+@SuppressWarnings("unchecked")
+public class CollectionAnyVisitor implements Visitor<Expression<?>,Context> {
+
+    private int replacedCounter;
+
+    @SuppressWarnings("rawtypes")
+    private static <T> Path<T> replaceParent(Path<T> path, Path<?> parent) {
+        PathMetadata metadata = new PathMetadata(parent, path.getMetadata().getElement(),
+                path.getMetadata().getPathType());
+        if (path instanceof CollectionExpression) {
+            CollectionExpression<?,?> col = (CollectionExpression<?,?>) path;
+            return (Path<T>) Expressions.listPath(col.getParameter(0), SimplePath.class, metadata);
+        } else {
+            return ExpressionUtils.path(path.getType(), metadata);
+        }
+    }
+
+    @Override
+    public Expression<?> visit(Constant<?> expr, Context context) {
+        return expr;
+    }
+
+    @Override
+    public Expression<?> visit(TemplateExpression<?> expr, Context context) {
+        Object[] args = new Object[expr.getArgs().size()];
+        for (int i = 0; i < args.length; i++) {
+            Context c = new Context();
+            if (expr.getArg(i) instanceof Expression) {
+                args[i] = ((Expression<?>) expr.getArg(i)).accept(this, c);
+            } else {
+                args[i] = expr.getArg(i);
+            }
+            context.add(c);
+        }
+        if (context.replace) {
+            if (expr.getType().equals(Boolean.class)) {
+                Predicate predicate = Expressions.booleanTemplate(expr.getTemplate(), args);
+                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;
+            } else {
+                return ExpressionUtils.template(expr.getType(), expr.getTemplate(), args);
+            }
+        } else {
+            return expr;
+        }
+    }
+
+    @Override
+    public Expression<?> visit(FactoryExpression<?> expr, Context context) {
+        return expr;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Expression<?> visit(Operation<?> expr, Context context) {
+        Expression<?>[] args = new Expression<?>[expr.getArgs().size()];
+        for (int i = 0; i < args.length; i++) {
+            Context c = new Context();
+            args[i] = expr.getArg(i).accept(this, c);
+            context.add(c);
+        }
+        if (context.replace) {
+            if (expr.getType().equals(Boolean.class)) {
+                Predicate predicate = ExpressionUtils.predicate(expr.getOperator(), args);
+                return !context.paths.isEmpty() ? exists(context, predicate) : predicate;
+            } else {
+                return ExpressionUtils.operation(expr.getType(), expr.getOperator(), args);
+            }
+        } else {
+            return expr;
+        }
+    }
+
+    protected Predicate exists(Context c, Predicate condition) {
+        return condition;
+    }
+
+    @Override
+    public Expression<?> visit(Path<?> expr, Context context) {
+        if (expr.getMetadata().getPathType() == PathType.COLLECTION_ANY) {
+            Path<?> parent = (Path<?>) expr.getMetadata().getParent().accept(this, context);
+            expr = ExpressionUtils.path(expr.getType(), PathMetadataFactory.forCollectionAny(parent));
+            EntityPath<?> replacement = new EntityPathBase<Object>(expr.getType(),
+                    ExpressionUtils.createRootVariable(expr, replacedCounter++));
+            context.add(expr, replacement);
+            return replacement;
+
+        } else if (expr.getMetadata().getParent() != null) {
+            Context c = new Context();
+            Path<?> parent = (Path<?>) expr.getMetadata().getParent().accept(this, c);
+            if (c.replace) {
+                context.add(c);
+                return replaceParent(expr, parent);
+            }
+        }
+        return expr;
+    }
+
+    @Override
+    public Expression<?> visit(SubQueryExpression<?> expr, Context context) {
+        return expr;
+    }
+
+    @Override
+    public Expression<?> visit(ParamExpression<?> expr, Context context) {
+        return expr;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/ConstantHidingExpression.java b/querydsl-core/src/main/java/com/querydsl/core/support/ConstantHidingExpression.java
new file mode 100644
index 0000000000..e6aab56f0d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/ConstantHidingExpression.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code ConstantHidingExpression} removes constants from the argument list and injects them back into the result chain
+ * @param <T>
+ */
+public class ConstantHidingExpression<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -7834053123363933721L;
+
+    private final FactoryExpression<T> expr;
+
+    private final List<Expression<?>> args;
+
+    private final Object[] template;
+
+    public ConstantHidingExpression(FactoryExpression<T> expr) {
+        super(expr.getType());
+        this.expr = expr;
+        this.args = new ArrayList<>();
+        this.template = new Object[expr.getArgs().size()];
+        for (int i = 0; i < template.length; i++) {
+            Expression<?> arg = expr.getArgs().get(i);
+            Expression<?> unwrapped = unwrap(arg);
+            if (unwrapped instanceof Constant) {
+                template[i] = ((Constant<?>) unwrapped).getConstant();
+            } else if (unwrapped.equals(Expressions.TRUE)) {
+                template[i] = Boolean.TRUE;
+            } else if (unwrapped.equals(Expressions.FALSE)) {
+                template[i] = Boolean.FALSE;
+            } else {
+                args.add(arg);
+            }
+        }
+    }
+
+    private static Expression<?> unwrap(Expression<?> expr) {
+        expr = ExpressionUtils.extract(expr);
+        if (expr instanceof Operation && ((Operation<?>) expr).getOperator() == Ops.ALIAS) {
+            return ((Operation<?>) expr).getArg(0);
+        }
+        return expr;
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Nullable
+    @Override
+    public T newInstance(Object... args) {
+        Object[] expanded = new Object[template.length];
+        System.arraycopy(template, 0, expanded, 0, template.length);
+        int j = 0;
+        for (int i = 0; i < expanded.length; i++) {
+            if (expanded[i] == null) {
+                expanded[i] = args[j++];
+            }
+        }
+        return expr.newInstance(expanded);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/Context.java b/querydsl-core/src/main/java/com/querydsl/core/support/Context.java
new file mode 100644
index 0000000000..a760dbf9f4
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/Context.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code Context} is used in {@link CollectionAnyVisitor} as the visitor context
+ *
+ * @author tiwe
+ *
+ */
+public class Context {
+
+    public boolean replace;
+
+    public final List<Path<?>> paths = new ArrayList<Path<?>>();
+
+    public final List<EntityPath<?>> replacements = new ArrayList<EntityPath<?>>();
+
+    public void add(Path<?> anyPath, EntityPath<?> replacement) {
+        replace = true;
+        paths.add(anyPath);
+        replacements.add(replacement);
+    }
+
+    public void add(Context c) {
+        replace |= c.replace;
+        paths.addAll(c.paths);
+        replacements.addAll(c.replacements);
+    }
+
+    public void clear() {
+        paths.clear();
+        replacements.clear();
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/EnumConversion.java b/querydsl-core/src/main/java/com/querydsl/core/support/EnumConversion.java
new file mode 100644
index 0000000000..ea530e9a67
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/EnumConversion.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpressionBase;
+import com.querydsl.core.types.Visitor;
+
+/**
+ * {@code EnumConversion} ensures that the results of an enum projection conform to the type of the
+ * projection expression
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class EnumConversion<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = 7840412008633901748L;
+
+    private final List<Expression<?>> exprs;
+
+    private final T[] values;
+
+    public EnumConversion(Expression<T> expr) {
+        super(expr.getType());
+        Class<? extends T> type = getType();
+        if (!type.isEnum()) {
+            throw new IllegalArgumentException(type + " is not an enum");
+        }
+        exprs = Collections.<Expression<?>>singletonList(expr);
+        values = type.getEnumConstants();
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return exprs;
+    }
+
+    @Override
+    public T newInstance(Object... args) {
+        if (args[0] != null) {
+            if (args[0] instanceof String || args[0] instanceof Character) {
+                @SuppressWarnings("unchecked") //The expression type is an enum
+                T rv = (T) Enum.valueOf(getType().asSubclass(Enum.class), (String) args[0].toString());
+                return rv;
+            } else if (args[0] instanceof Number) {
+                return values[((Number) args[0]).intValue()];
+            } else {
+                @SuppressWarnings("unchecked")
+                T rv = (T) args[0];
+                return rv;
+            }
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/ExtendedSubQuery.java b/querydsl-core/src/main/java/com/querydsl/core/support/ExtendedSubQuery.java
new file mode 100644
index 0000000000..14ad12c503
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/ExtendedSubQuery.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.Collection;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.BooleanOperation;
+
+/**
+ * {@code ExtendedSubQuery} extends the {@link com.querydsl.core.types.SubQueryExpression} interface to provide fluent
+ * expression creation functionality
+ *
+ * @param <T>
+ */
+public interface ExtendedSubQuery<T> extends SubQueryExpression<T> {
+
+    /**
+     * Create a {@code this == right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this == right
+     */
+    BooleanExpression eq(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this == right} expression
+     *
+     * @param constant rhs of the comparison
+     * @return this == right
+     */
+    BooleanExpression eq(T constant);
+
+    /**
+     * Create a {@code this != right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this != right
+     */
+    BooleanExpression ne(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this != right} expression
+     *
+     * @param constant rhs of the comparison
+     * @return this != right
+     */
+    BooleanExpression ne(T constant);
+
+    /**
+     * Create a {@code right in this} expression
+     *
+     * @param right rhs of the comparison
+     * @return right in this
+     */
+    BooleanExpression contains(Expression<? extends T> right);
+
+    /**
+     * Create a {@code right in this} expression
+     *
+     * @param constant rhs of the comparison
+     * @return right in this
+     */
+    BooleanExpression contains(T constant);
+
+    /**
+     * Create a {@code exists(this)} expression
+     *
+     * @return exists(this)
+     */
+    BooleanExpression exists();
+
+    /**
+     * Create a {@code not exists(this)} expression
+     *
+     * @return not exists(this)
+     */
+    BooleanExpression notExists();
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this &lt; right
+     */
+    BooleanExpression lt(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this < right} BooleanExpression
+     *
+     * @param constant rhs of the comparison
+     * @return this &lt; right
+     */
+    BooleanExpression lt(T constant);
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this &gt; right
+     */
+    BooleanExpression gt(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param constant rhs of the comparison
+     * @return this &gt; right
+     */
+    BooleanExpression gt(T constant);
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this &lt;= right
+     */
+    BooleanExpression loe(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param constant rhs of the comparison
+     * @return this &lt;= right
+     */
+    BooleanExpression loe(T constant);
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param expr rhs of the comparison
+     * @return this &gt;= right
+     */
+    BooleanExpression goe(Expression<? extends T> expr);
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param constant rhs of the comparison
+     * @return this &gt;= right
+     */
+    BooleanExpression goe(T constant);
+
+    /**
+     * Create a {@code this is null} expression
+     *
+     * @return this is null
+     */
+     BooleanOperation isNull();
+
+    /**
+     * Create a {@code this is not null} expression
+     *
+     * @return this is not null
+     */
+     BooleanOperation isNotNull();
+
+    /**
+     * Create a {@code this in (a, b, c)} expression
+     * @param right
+     * @return this in (a, b, c)
+     */
+     BooleanExpression in(Collection<? extends T> right);
+
+     /**
+     * Create a {@code this in (a, b, c)} expression
+     * @param right
+     * @return this in (a, b, c)
+     */
+     BooleanExpression in(T... right);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java b/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java
new file mode 100644
index 0000000000..4f8b8ac9e5
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/FetchableQueryBase.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.types.SubQueryExpression;
+
+/**
+ * {@code FetchableQueryBase} extends the {@link QueryBase} class to provide default
+ * implementations of the methods of the {@link com.querydsl.core.Fetchable} interface
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class FetchableQueryBase<T, Q extends FetchableQueryBase<T, Q>>
+        extends QueryBase<Q> implements Fetchable<T> {
+
+    public FetchableQueryBase(QueryMixin<Q> queryMixin) {
+        super(queryMixin);
+    }
+
+    @Override
+    public List<T> fetch() {
+        return IteratorAdapter.asList(iterate());
+    }
+
+    @Override
+    public final T fetchFirst() {
+        return limit(1).fetchOne();
+    }
+
+    public <T> T transform(ResultTransformer<T> transformer) {
+        return transformer.transform((FetchableQuery<?,?>) this);
+    }
+
+    @Nullable
+    protected <T> T uniqueResult(CloseableIterator<T> it) {
+        try {
+            if (it.hasNext()) {
+                T rv = it.next();
+                if (it.hasNext()) {
+                    throw new NonUniqueResultException();
+                }
+                return rv;
+            } else {
+                return null;
+            }
+        } finally {
+            it.close();
+        }
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof SubQueryExpression) {
+            SubQueryExpression<?> s = (SubQueryExpression<?>) o;
+            return s.getMetadata().equals(queryMixin.getMetadata());
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/FetchableSubQueryBase.java b/querydsl-core/src/main/java/com/querydsl/core/support/FetchableSubQueryBase.java
new file mode 100644
index 0000000000..d42b4adedb
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/FetchableSubQueryBase.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.BooleanOperation;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code FetchableSubQueryBase} extends {@link com.querydsl.core.support.FetchableQueryBase} to provide fluent Expression creation functionality
+ *
+ * @param <T>
+ * @param <Q>
+ */
+public abstract class FetchableSubQueryBase<T, Q extends FetchableSubQueryBase<T, Q>> extends FetchableQueryBase<T, Q>
+        implements ExtendedSubQuery<T> {
+
+
+    private final SubQueryExpression<T> mixin;
+
+    @SuppressWarnings("unchecked")
+    public FetchableSubQueryBase(QueryMixin<Q> queryMixin) {
+        super(queryMixin);
+        mixin = new SubQueryExpressionImpl<T>((Class) Object.class, queryMixin.getMetadata());
+    }
+
+    @Override
+    public BooleanExpression contains(Expression<? extends T> right) {
+        return Expressions.predicate(Ops.IN, right, this);
+    }
+
+    @Override
+    public BooleanExpression contains(T constant) {
+        return contains(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanExpression exists() {
+        QueryMetadata metadata = getMetadata();
+        if (metadata.getProjection() == null) {
+            queryMixin.setProjection(Expressions.ONE);
+        }
+        return Expressions.predicate(Ops.EXISTS, this);
+    }
+
+    @Override
+    public BooleanExpression eq(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.EQ, this, expr);
+    }
+
+    @Override
+    public BooleanExpression eq(T constant) {
+        return eq(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanExpression ne(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.NE, this, expr);
+    }
+
+    @Override
+    public BooleanExpression ne(T constant) {
+        return ne(Expressions.constant(constant));
+    }
+
+
+    @Override
+    public BooleanExpression notExists() {
+        return exists().not();
+    }
+
+    @Override
+    public BooleanExpression lt(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.LT, this, expr);
+    }
+
+    @Override
+    public BooleanExpression lt(T constant) {
+        return lt(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanExpression gt(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.GT, this, expr);
+    }
+
+    @Override
+    public BooleanExpression gt(T constant) {
+        return gt(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanExpression loe(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.LOE, this, expr);
+    }
+
+    @Override
+    public BooleanExpression loe(T constant) {
+        return loe(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanExpression goe(Expression<? extends T> expr) {
+        return Expressions.predicate(Ops.GOE, this, expr);
+    }
+
+    @Override
+    public BooleanExpression goe(T constant) {
+        return goe(Expressions.constant(constant));
+    }
+
+    @Override
+    public BooleanOperation isNull() {
+        return Expressions.booleanOperation(Ops.IS_NULL, mixin);
+    }
+
+    @Override
+    public BooleanOperation isNotNull() {
+        return Expressions.booleanOperation(Ops.IS_NOT_NULL, mixin);
+    }
+
+    @Override
+    public final int hashCode() {
+        return mixin.hashCode();
+    }
+
+    @Override
+    public final QueryMetadata getMetadata() {
+        return queryMixin.getMetadata();
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return mixin.accept(v, context);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Class<T> getType() {
+        Expression<?> projection = queryMixin.getMetadata().getProjection();
+        return (Class) (projection != null ? projection.getType() : Void.class);
+    }
+
+    @Override
+    public BooleanExpression in(Collection<? extends T> right) {
+        if (right.size() == 1) {
+            return eq(right.iterator().next());
+        } else {
+            return Expressions.booleanOperation(Ops.IN, mixin, ConstantImpl.create(right));
+        }
+    }
+
+    @Override
+    public BooleanExpression in(T... right) {
+        return this.in(Arrays.asList(right));
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversion.java b/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversion.java
new file mode 100644
index 0000000000..c7a99af3ea
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversion.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpressionBase;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.util.MathUtils;
+
+/**
+ * {@code NumberConversion} ensures that the results of a numeric projection conform to the type of the
+ * projection expression
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class NumberConversion<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = 7840412008633901748L;
+
+    private final List<Expression<?>> exprs;
+
+    public NumberConversion(Expression<T> expr) {
+        super(expr.getType());
+        exprs = Collections.<Expression<?>>singletonList(expr);
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return exprs;
+    }
+
+    @Override
+    public T newInstance(Object... args) {
+        if (args[0] != null) {
+            if (getType().equals(Boolean.class)) {
+                return (T) Boolean.valueOf(((Number) args[0]).intValue() > 0);
+            } else {
+                return (T) MathUtils.cast((Number) args[0], (Class) getType());
+            }
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversions.java b/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversions.java
new file mode 100644
index 0000000000..7d5099c725
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/NumberConversions.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionBase;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.util.MathUtils;
+
+/**
+ * {@code NumberConversions} ensures that the results of a projection involving numeric expressions
+ * conform to the types of the numeric expressions
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class NumberConversions<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -7834053123363933721L;
+
+    private final FactoryExpression<T> expr;
+
+    private final Map<Class<?>, Enum<?>[]> values = new HashMap<>();
+
+    public NumberConversions(FactoryExpression<T> expr) {
+        super(expr.getType());
+        this.expr = expr;
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return expr.getArgs();
+    }
+
+    private <E extends Enum<E>> Enum<E>[] getValues(Class<E> enumClass) {
+        @SuppressWarnings("unchecked") // Class<E> -> E[]
+        Enum<E>[] values = (Enum<E>[]) this.values.get(enumClass);
+        if (values == null) {
+            values = enumClass.getEnumConstants();
+            this.values.put(enumClass, values);
+        }
+        return values;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T newInstance(Object... args) {
+        for (int i = 0; i < args.length; i++) {
+            Class<?> type = expr.getArgs().get(i).getType();
+            if (Enum.class.isAssignableFrom(type) && !type.isInstance(args[i])) {
+                if (args[i] instanceof String) {
+                    args[i] = Enum.valueOf((Class) type, (String) args[i]);
+                } else if (args[i] instanceof Number) {
+                    args[i] = getValues((Class) type)[((Number) args[i]).intValue()];
+                }
+            } else if (args[i] instanceof Number && !type.isInstance(args[i])) {
+                if (type.equals(Boolean.class)) {
+                    args[i] = ((Number) args[i]).intValue() > 0;
+                } else if (Number.class.isAssignableFrom(type)) {
+                    args[i] = MathUtils.cast((Number) args[i], (Class) type);
+                }
+            }
+        }
+        return expr.newInstance(args);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/OrderedQueryMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/support/OrderedQueryMetadata.java
new file mode 100644
index 0000000000..15e9a10355
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/OrderedQueryMetadata.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code OrderedQueryMetadata} performs no metadata validation and ensures that FROM elements are before
+ * JOIN elements
+ *
+ * @author tiwe
+ *
+ */
+public class OrderedQueryMetadata extends DefaultQueryMetadata {
+
+    private static final long serialVersionUID = 6326236143414219377L;
+
+    private List<JoinExpression> joins;
+
+    public OrderedQueryMetadata() {
+        super();
+        noValidate();
+    }
+
+    @Override
+    public void addJoin(JoinType joinType, Expression<?> expr) {
+        joins = null;
+        super.addJoin(joinType, expr);
+    }
+
+    @Override
+    public List<JoinExpression> getJoins() {
+        if (joins == null) {
+            joins = new ArrayList<>();
+            int separator = 0;
+            for (JoinExpression j : super.getJoins()) {
+                if (j.getType() == JoinType.DEFAULT) {
+                    joins.add(separator++, j);
+                } else {
+                    joins.add(j);
+                }
+            }
+        }
+        return joins;
+    }
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/PathsExtractor.java b/querydsl-core/src/main/java/com/querydsl/core/support/PathsExtractor.java
similarity index 89%
rename from querydsl-core/src/main/java/com/mysema/query/support/PathsExtractor.java
rename to querydsl-core/src/main/java/com/querydsl/core/support/PathsExtractor.java
index aa79989ab2..ced8478d0e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/PathsExtractor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/PathsExtractor.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,24 +11,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.support;
+package com.querydsl.core.support;
 
 import java.util.Collection;
 import java.util.List;
 
-import com.mysema.query.types.*;
+import com.querydsl.core.types.*;
 
 /**
  * Extracts the paths that occurs in an expression via breadth first search
- * 
+ *
  * @author tiwe
  *
  */
 public final class PathsExtractor implements Visitor<Void, List<Path<?>>> {
-      
+
     public static final PathsExtractor DEFAULT = new PathsExtractor();
-    
-    private PathsExtractor() {}
+
+    private PathsExtractor() { }
 
     @Override
     public Void visit(Constant<?> expr, List<Path<?>> paths) {
@@ -72,7 +72,7 @@ public Void visit(TemplateExpression<?> expr, List<Path<?>> paths) {
     public Path<?> visit(Collection<?> exprs, List<Path<?>> paths) {
         for (Object e : exprs) {
             if (e instanceof Expression) {
-                ((Expression) e).accept(this, paths);
+                ((Expression<?>) e).accept(this, paths);
             }
         }
         return null;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/QueryBase.java b/querydsl-core/src/main/java/com/querydsl/core/support/QueryBase.java
new file mode 100644
index 0000000000..a0d683c9f5
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/QueryBase.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code QueryBase} provides a stub for Query implementations
+ *
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class QueryBase<Q extends QueryBase<Q>> {
+
+    public static final String MDC_QUERY = "querydsl_query";
+
+    public static final String MDC_PARAMETERS = "querydsl_parameters";
+
+    protected final QueryMixin<Q> queryMixin;
+
+    public QueryBase(QueryMixin<Q> queryMixin) {
+        this.queryMixin = queryMixin;
+    }
+
+    /**
+     * Set the Query to return distinct results
+     *
+     * @return the current object
+     */
+    public Q distinct() {
+        return queryMixin.distinct();
+    }
+
+    /**
+     * Add a single grouping expression
+     *
+     * @param e group by expression
+     * @return the current object
+     */
+    public Q groupBy(Expression<?> e) {
+        return queryMixin.groupBy(e);
+    }
+
+    /**
+     * Add grouping/aggregation expressions
+     *
+     * @param o group by expressions
+     * @return the current object
+     */
+    public Q groupBy(Expression<?>... o) {
+        return queryMixin.groupBy(o);
+    }
+
+    /**
+     * Add a single filter for aggregation
+     *
+     * @param e having condition
+     * @return the current object
+     */
+    public Q having(Predicate e) {
+        return queryMixin.having(e);
+    }
+
+    /**
+     * Add filters for aggregation
+     *
+     * @param o having conditions
+     * @return the current object
+     */
+    public Q having(Predicate... o) {
+        return queryMixin.having(o);
+    }
+
+    /**
+     * Add a single order expression
+     *
+     * @param o order
+     * @return the current object
+     */
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    /**
+     * Add order expressions
+     *
+     * @param o order
+     * @return the current object
+     */
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    /**
+     * Add the given filter condition
+     *
+     * <p>Skips null arguments</p>
+     *
+     * @param o filter conditions to be added
+     * @return the current object
+     */
+    public Q where(Predicate o) {
+        return queryMixin.where(o);
+    }
+
+    /**
+     * Add the given filter conditions
+     *
+     * <p>Skips null arguments</p>
+     *
+     * @param o filter conditions to be added
+     * @return the current object
+     */
+    public Q where(Predicate... o) {
+        return queryMixin.where(o);
+    }
+
+    /**
+     * Defines the limit / max results for the query results
+     *
+     * @param limit max rows
+     * @return the current object
+     */
+    public Q limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    /**
+     * Defines the offset for the query results
+     *
+     * @param offset row offset
+     * @return the current object
+     */
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    /**
+     * Defines both limit and offset of the query results,
+     * use {@link QueryModifiers#EMPTY} to apply no paging.
+     *
+     * @param modifiers query modifiers
+     * @return the current object
+     */
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    /**
+     * Set the given parameter to the given value
+     *
+     * @param <P>
+     * @param param param
+     * @param value binding
+     * @return the current object
+     */
+    public <P> Q set(ParamExpression<P> param, P value) {
+        return queryMixin.set(param, value);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof QueryBase) {
+            QueryBase q = (QueryBase) o;
+            return q.queryMixin.equals(queryMixin);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return queryMixin.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return queryMixin.toString();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java b/querydsl-core/src/main/java/com/querydsl/core/support/QueryMixin.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
rename to querydsl-core/src/main/java/com/querydsl/core/support/QueryMixin.java
index b53ad8597e..4e77ffb644 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/QueryMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,68 +11,61 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.support;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.FactoryExpressionUtils.FactoryExpressionAdapter;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ProjectionRole;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.SubQueryExpression;
+package com.querydsl.core.support;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.*;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.FactoryExpressionUtils.FactoryExpressionAdapter;
 
 /**
  * Mixin style Query implementation
  *
- * @author tiwe
- *
  * @param <T> type of wrapped query
+ *
+ * @author tiwe
  */
 public class QueryMixin<T> {
 
+    /**
+     * Role of expression in conversion
+     */
+    public enum Role { SELECT, FROM, WHERE, GROUP_BY, HAVING, ORDER_BY }
+
     private final QueryMetadata metadata;
 
     private final boolean expandAnyPaths;
 
+    private final ReplaceVisitor<Void> replaceVisitor = new ReplaceVisitor<Void>() {
+        @Override
+        public Expression<?> visit(Path<?> expr, @Nullable Void context) {
+            return normalizePath(expr);
+        }
+    };
+
+    protected final CollectionAnyVisitor collectionAnyVisitor = new CollectionAnyVisitor();
+
     private T self;
 
     public QueryMixin() {
-        this.metadata = new DefaultQueryMetadata();
-        this.expandAnyPaths = true;
+        this(null, new DefaultQueryMetadata(), true);
     }
 
     public QueryMixin(QueryMetadata metadata) {
-        this.metadata = metadata;
-        this.expandAnyPaths = true;
+        this(null, metadata, true);
     }
 
     public QueryMixin(QueryMetadata metadata, boolean expandAnyPaths) {
-        this.metadata = metadata;
-        this.expandAnyPaths = expandAnyPaths;
+        this(null, metadata, expandAnyPaths);
     }
 
     public QueryMixin(T self) {
-        this(self, new DefaultQueryMetadata());
+        this(self, new DefaultQueryMetadata(), true);
     }
 
     public QueryMixin(T self, QueryMetadata metadata) {
-        this.self = self;
-        this.metadata = metadata;
-        this.expandAnyPaths = true;
+        this(self, metadata, true);
     }
 
     public QueryMixin(T self, QueryMetadata metadata, boolean expandAnyPaths) {
@@ -101,17 +94,14 @@ public T removeFlag(QueryFlag queryFlag) {
         return self;
     }
 
-    public <E> Expression<E> addProjection(Expression<E> e) {
-        e = convert(e, false);
-        metadata.addProjection(e);
+    public <E> Expression<E> setProjection(Expression<E> e) {
+        e = convert(e, Role.SELECT);
+        metadata.setProjection(e);
         return e;
     }
 
-    public T addProjection(Expression<?>... o) {
-        for (Expression<?> e : o) {
-            metadata.addProjection(convert(e, false));
-        }
-        return self;
+    public Expression<?> setProjection(Expression<?>... o) {
+        return setProjection(Projections.tuple(o));
     }
 
     private <P extends Path<?>> P assertRoot(P p) {
@@ -121,36 +111,47 @@ private <P extends Path<?>> P assertRoot(P p) {
         return p;
     }
 
-    @SuppressWarnings("rawtypes")
-    public <RT> Expression<RT> convert(Expression<RT> expr, boolean forOrder) {
-        if (expandAnyPaths && expr instanceof Path) {
-            Context context = new Context();
-            Expression replaced = expr.accept(CollectionAnyVisitor.DEFAULT, context);
-            if (!replaced.equals(expr)) {
-                for (int i = 0; i < context.paths.size(); i++) {
-                    Path path = context.paths.get(i).getMetadata().getParent();
-                    Path replacement = context.replacements.get(i);
-                    this.innerJoin(path, replacement);
-                }
-                return replaced;
+    private Path<?> normalizePath(Path<?> expr) {
+        Context context = new Context();
+        Path<?> replaced = (Path<?>) expr.accept(collectionAnyVisitor, context);
+        if (!replaced.equals(expr)) {
+            for (int i = 0; i < context.paths.size(); i++) {
+                Path path = context.paths.get(i).getMetadata().getParent();
+                Path replacement = context.replacements.get(i);
+                this.innerJoin(path, replacement);
+            }
+            return replaced;
+        } else {
+            return expr;
+        }
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public <RT> Expression<RT> convert(Expression<RT> expr, Role role) {
+        if (expandAnyPaths) {
+            if (expr instanceof Path) {
+                expr = (Expression) normalizePath((Path) expr);
+            } else if (expr != null) {
+                expr = (Expression) expr.accept(replaceVisitor, null);
             }
         }
         if (expr instanceof ProjectionRole<?>) {
-            return convert(((ProjectionRole) expr).getProjection(), forOrder);
+            return convert(((ProjectionRole) expr).getProjection(), role);
         } else if (expr instanceof FactoryExpression<?> && !(expr instanceof FactoryExpressionAdapter<?>)) {
-            return FactoryExpressionUtils.wrap((FactoryExpression<RT>)expr);
+            return FactoryExpressionUtils.wrap((FactoryExpression<RT>) expr);
         } else {
             return expr;
         }
     }
 
-    public Expression<Tuple> createProjection(Expression<?>[] args) {
-        return new QTuple(args);
+    protected Predicate convert(Predicate condition, Role role) {
+        return condition;
     }
 
-    protected <D> Expression<D> createAlias(Expression<?> expr, Path<?> alias) {
+    @SuppressWarnings("unchecked")
+    protected <D> Expression<D> createAlias(Expression<?> expr, Path<D> alias) {
         assertRoot(alias);
-        return ExpressionUtils.as((Expression)expr, alias);
+        return ExpressionUtils.as((Expression) expr, alias);
     }
 
     public final T distinct() {
@@ -203,25 +204,26 @@ public final T getSelf() {
     }
 
     public final T groupBy(Expression<?> e) {
+        e = convert(e, Role.GROUP_BY);
         metadata.addGroupBy(e);
         return self;
     }
 
     public final T groupBy(Expression<?>... o) {
         for (Expression<?> e : o) {
-            metadata.addGroupBy(e);
+            groupBy(e);
         }
         return self;
     }
 
     public final T having(Predicate e) {
-        metadata.addHaving(normalize(e, false));
+        metadata.addHaving(convert(e, Role.HAVING));
         return self;
     }
 
     public final T having(Predicate... o) {
         for (Predicate e : o) {
-            metadata.addHaving(normalize(e, false));
+            metadata.addHaving(convert(e, Role.HAVING));
         }
         return self;
     }
@@ -320,21 +322,22 @@ public final T offset(long offset) {
     }
 
     public final T on(Predicate condition) {
-        metadata.addJoinCondition(normalize(condition, false));
+        metadata.addJoinCondition(convert(condition, Role.FROM));
         return self;
     }
 
     public final T on(Predicate... conditions) {
         for (Predicate condition : conditions) {
-            metadata.addJoinCondition(normalize(condition, false));
+            metadata.addJoinCondition(convert(condition, Role.FROM));
         }
         return self;
     }
 
+    @SuppressWarnings("unchecked")
     public final T orderBy(OrderSpecifier<?> spec) {
-        Expression<?> e = convert(spec.getTarget(), true);
+        Expression<?> e = convert(spec.getTarget(), Role.ORDER_BY);
         if (!spec.getTarget().equals(e)) {
-            metadata.addOrderBy(new OrderSpecifier(spec.getOrder(), e));
+            metadata.addOrderBy(new OrderSpecifier(spec.getOrder(), e, spec.getNullHandling()));
         } else {
             metadata.addOrderBy(spec);
         }
@@ -396,27 +399,23 @@ public final void setUnique(boolean unique) {
     }
 
     public final T where(Predicate e) {
-        metadata.addWhere(normalize(e, true));
+        metadata.addWhere(convert(e, Role.WHERE));
         return self;
     }
 
     public final T where(Predicate... o) {
         for (Predicate e : o) {
-            metadata.addWhere(normalize(e, true));
+            metadata.addWhere(convert(e, Role.WHERE));
         }
         return self;
     }
 
-    protected Predicate normalize(Predicate condition, boolean where) {
-        return condition;
-    }
-
     @Override
     public final boolean equals(Object o) {
         if (o == this) {
             return true;
-        } else if (o instanceof QueryMixin) {
-            QueryMixin q = (QueryMixin)o;
+        } else if (o instanceof QueryMixin<?>) {
+            QueryMixin<?> q = (QueryMixin<?>) o;
             return q.metadata.equals(metadata);
         } else {
             return false;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
new file mode 100644
index 0000000000..3add2626e1
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/ReplaceVisitor.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.querydsl.core.*;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code ReplaceVisitor} is a deep visitor that can be customized to replace segments of
+ * expression trees
+ *
+ * @param <C> context type
+ */
+public class ReplaceVisitor<C> implements Visitor<Expression<?>, C> {
+
+    @Override
+    public Expression<?> visit(Constant<?> expr, C context) {
+        return expr;
+    }
+
+    @Override
+    public Expression<?> visit(FactoryExpression<?> expr, C context) {
+        List<Expression<?>> args = visit(expr.getArgs(), context);
+        if (args.equals(expr.getArgs())) {
+            return expr;
+        } else {
+            return FactoryExpressionUtils.wrap(expr, args);
+        }
+    }
+
+    @Override
+    public Expression<?> visit(Operation<?> expr, C context) {
+        List<Expression<?>> args = visit(expr.getArgs(), context);
+        if (args.equals(expr.getArgs())) {
+            return expr;
+        } else if (expr instanceof Predicate) {
+            return ExpressionUtils.predicate(expr.getOperator(), args);
+        } else {
+            return ExpressionUtils.operation(expr.getType(), expr.getOperator(), args);
+        }
+    }
+
+    @Override
+    public Expression<?> visit(ParamExpression<?> expr, C context) {
+        return expr;
+    }
+
+    @Override
+    public Expression<?> visit(Path<?> expr, C context) {
+        if (expr.getMetadata().isRoot()) {
+            return expr;
+        } else {
+            PathMetadata metadata = expr.getMetadata();
+            Path<?> parent = (Path) metadata.getParent().accept(this, context);
+            Object element = metadata.getElement();
+            if (element instanceof Expression<?>) {
+                element = ((Expression<?>) element).accept(this, context);
+            }
+            if (parent.equals(metadata.getParent()) && Objects.equals(element, metadata.getElement())) {
+                return expr;
+            } else {
+                metadata = new PathMetadata(parent, element, metadata.getPathType());
+                return ExpressionUtils.path(expr.getType(), metadata);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Expression<?> visit(SubQueryExpression<?> expr, C context) {
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.setValidate(false);
+        md.setDistinct(expr.getMetadata().isDistinct());
+        md.setModifiers(expr.getMetadata().getModifiers());
+        md.setUnique(expr.getMetadata().isUnique());
+        for (QueryFlag flag : expr.getMetadata().getFlags()) {
+            md.addFlag(new QueryFlag(flag.getPosition(), flag.getFlag().accept(this, context)));
+        }
+        for (Expression<?> e : expr.getMetadata().getGroupBy()) {
+            md.addGroupBy(e.accept(this, context));
+        }
+        Predicate having = expr.getMetadata().getHaving();
+        if (having != null) {
+            md.addHaving((Predicate) having.accept(this, context));
+        }
+        for (JoinExpression je : expr.getMetadata().getJoins()) {
+            md.addJoin(je.getType(), je.getTarget().accept(this, context));
+            if (je.getCondition() != null) {
+                md.addJoinCondition((Predicate) je.getCondition().accept(this, context));
+            }
+            for (JoinFlag jf : je.getFlags()) {
+                md.addJoinFlag(new JoinFlag(jf.getFlag().accept(this, context), jf.getPosition()));
+            }
+        }
+        for (OrderSpecifier<?> os : expr.getMetadata().getOrderBy()) {
+            OrderSpecifier<?> os2 = new OrderSpecifier(os.getOrder(), os.getTarget().accept(this,
+                    context), os.getNullHandling());
+            md.addOrderBy(os2);
+        }
+        for (Map.Entry<ParamExpression<?>, Object> entry : expr.getMetadata().getParams()
+                .entrySet()) {
+            md.setParam((ParamExpression) entry.getKey().accept(this, context), entry.getValue());
+        }
+        if (expr.getMetadata().getProjection() != null) {
+            md.setProjection(expr.getMetadata().getProjection().accept(this, context));
+        }
+        Predicate where = expr.getMetadata().getWhere();
+        if (where != null) {
+           md.addWhere((Predicate) where.accept(this, context));
+        }
+        if (expr.getMetadata().equals(md)) {
+            return expr;
+        } else {
+            return new SubQueryExpressionImpl(expr.getType(), md);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Expression<?> visit(TemplateExpression<?> expr, C context) {
+        ArrayList args = new ArrayList<>();
+        for (Object arg : expr.getArgs()) {
+            if (arg instanceof Expression) {
+                args.add(((Expression<?>) arg).accept(this, context));
+            } else {
+                args.add(arg);
+            }
+        }
+        if (args.equals(expr.getArgs())) {
+            return expr;
+        } else {
+            if (expr instanceof Predicate) {
+                return Expressions.booleanTemplate(expr.getTemplate(), args);
+            } else {
+                return ExpressionUtils.template(expr.getType(), expr.getTemplate(), args);
+            }
+        }
+    }
+
+    private List<Expression<?>> visit(List<Expression<?>> args, C context) {
+        List<Expression<?>> result = new ArrayList<>();
+        for (Expression<?> arg : args) {
+            result.add(arg.accept(this, context));
+        }
+        return CollectionUtils.unmodifiableList(result);
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/SerializerBase.java b/querydsl-core/src/main/java/com/querydsl/core/support/SerializerBase.java
new file mode 100644
index 0000000000..d9d04e6ef2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/SerializerBase.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathType;
+import com.querydsl.core.types.Template;
+import com.querydsl.core.types.TemplateExpression;
+import com.querydsl.core.types.Templates;
+import com.querydsl.core.types.Visitor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.IdentityHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * {@code SerializerBase} is a stub for Serializer implementations which serialize query metadata to Strings
+ *
+ * @param <S> concrete subtype
+ * @author tiwe
+ */
+public abstract class SerializerBase<S extends SerializerBase<S>> implements Visitor<Void, Void> {
+
+    private static final Set<? extends Operator> SAME_PRECEDENCE = Collections.unmodifiableSet(EnumSet.of(Ops.CASE,
+            Ops.CASE_WHEN, Ops.CASE_ELSE, Ops.CASE_EQ, Ops.CASE_EQ_WHEN, Ops.CASE_EQ_ELSE));
+
+    private final StringBuilder builder = new StringBuilder(128);
+
+    private String constantPrefix = "a";
+
+    private String paramPrefix = "p";
+
+    private String anonParamPrefix = "_";
+
+    protected final List<Object> constants = new LinkedList<>();
+
+    protected final Map<Object, String> constantToLabel = new IdentityHashMap<>();
+
+    @SuppressWarnings("unchecked")
+    private final S self = (S) this;
+
+    private final Templates templates;
+
+    private boolean strict = true;
+
+    public SerializerBase(Templates templates) {
+        this.templates = templates;
+    }
+
+    public final S prepend(final String str) {
+        builder.insert(0, str);
+        return self;
+    }
+
+    public final S insert(int position, String str) {
+        builder.insert(position, str);
+        return self;
+    }
+
+    public final S append(final String str) {
+        builder.append(str);
+        return self;
+    }
+
+    protected String getConstantPrefix() {
+        return constantPrefix;
+    }
+
+    public Map<Object, String> getConstantToLabel() {
+        return constantToLabel;
+    }
+
+    protected int getLength() {
+        return builder.length();
+    }
+
+    protected final Template getTemplate(Operator op) {
+        return templates.getTemplate(op);
+    }
+
+    public final S handle(Expression<?> expr) {
+        expr.accept(this, null);
+        return self;
+    }
+
+    public final S handle(Object arg) {
+        if (arg instanceof Expression) {
+            ((Expression<?>) arg).accept(this, null);
+        } else {
+            visitConstant(arg);
+        }
+        return self;
+    }
+
+    public final S handle(JoinFlag joinFlag) {
+        return handle(joinFlag.getFlag());
+    }
+
+    public final S handle(final String sep, final Expression<?>[] expressions) {
+        handle(sep, Arrays.asList(expressions));
+        return self;
+    }
+
+    public final S handle(final String sep, final List<? extends Expression<?>> expressions) {
+        for (int i = 0; i < expressions.size(); i++) {
+            if (i != 0) {
+                append(sep);
+            }
+            handle(expressions.get(i));
+        }
+        return self;
+    }
+
+    protected void handleTemplate(final Template template, final List<?> args) {
+        for (final Template.Element element : template.getElements()) {
+            final Object rv = element.convert(args);
+            if (rv instanceof Expression) {
+                ((Expression<?>) rv).accept(this, null);
+            } else if (element.isString()) {
+                builder.append(rv.toString());
+            } else {
+                visitConstant(rv);
+            }
+        }
+    }
+
+    public final boolean serialize(final QueryFlag.Position position, final Set<QueryFlag> flags) {
+        boolean handled = false;
+        for (final QueryFlag flag : flags) {
+            if (flag.getPosition() == position) {
+                handle(flag.getFlag());
+                handled = true;
+            }
+        }
+        return handled;
+    }
+
+    public final boolean serialize(final JoinFlag.Position position, final Set<JoinFlag> flags) {
+        boolean handled = false;
+        for (final JoinFlag flag : flags) {
+            if (flag.getPosition() == position) {
+                handle(flag.getFlag());
+                handled = true;
+            }
+        }
+        return handled;
+    }
+
+    public void setConstantPrefix(String prefix) {
+        this.constantPrefix = prefix;
+    }
+
+    public void setParamPrefix(String prefix) {
+        this.paramPrefix = prefix;
+    }
+
+    public void setAnonParamPrefix(String prefix) {
+        this.anonParamPrefix = prefix;
+    }
+
+    /**
+     * Not used anymore
+     *
+     * @deprecated normalization happens now at template level
+     */
+    @Deprecated
+    public void setNormalize(boolean normalize) {
+    }
+
+    public void setStrict(boolean strict) {
+        this.strict = strict;
+    }
+
+    @Override
+    public String toString() {
+        return builder.toString();
+    }
+
+    @Override
+    public final Void visit(Constant<?> expr, Void context) {
+        visitConstant(expr.getConstant());
+        return null;
+    }
+
+    public void visitConstant(Object constant) {
+        final String constantLabel = getConstantToLabel().computeIfAbsent(constant, this::getConstantLabel);
+        constants.add(constant);
+        serializeConstant(constants.size(), constantLabel);
+    }
+
+    /**
+     * Serialize the constant as parameter to the query. The default implementation writes the
+     * label name for the constants. Some dialects may replace this by indexed based or
+     * positional parameterization.
+     * Dialects may also use this to prefix the parameter with for example ":" or "?".
+     *
+     * @param parameterIndex index at which this constant occurs in {@link #getConstants()}
+     * @param constantLabel label under which this constant occurs in {@link #getConstantToLabel()}
+     */
+    protected void serializeConstant(int parameterIndex, String constantLabel) {
+        append(constantLabel);
+    }
+
+    /**
+     * Generate a constant value under which to register a new constant in {@link #getConstantToLabel()}.
+     *
+     * @param value the constant value or parameter to create a constant for
+     * @return the generated label
+     */
+    @NotNull
+    protected String getConstantLabel(Object value) {
+        return constantPrefix + (getConstantToLabel().size() + 1);
+    }
+
+    public List<Object> getConstants() {
+        return constants;
+    }
+
+    @Override
+    public Void visit(ParamExpression<?> param, Void context) {
+        String paramLabel;
+        if (param.isAnon()) {
+            paramLabel = anonParamPrefix + param.getName();
+        } else {
+            paramLabel = paramPrefix + param.getName();
+        }
+        getConstantToLabel().put(param, paramLabel);
+        constants.add(param);
+        serializeConstant(constants.size(), paramLabel);
+        return null;
+    }
+
+    @Override
+    public Void visit(TemplateExpression<?> expr, Void context) {
+        handleTemplate(expr.getTemplate(), expr.getArgs());
+        return null;
+    }
+
+    @Override
+    public Void visit(FactoryExpression<?> expr, Void context) {
+        handle(", ", expr.getArgs());
+        return null;
+    }
+
+    @Override
+    public Void visit(Operation<?> expr, Void context) {
+        visitOperation(expr.getType(), expr.getOperator(), expr.getArgs());
+        return null;
+    }
+
+    @Override
+    public Void visit(Path<?> path, Void context) {
+        final PathType pathType = path.getMetadata().getPathType();
+        final Template template = templates.getTemplate(pathType);
+        final Object element = path.getMetadata().getElement();
+        List<Object> args;
+        if (path.getMetadata().getParent() != null) {
+            args = Arrays.asList(path.getMetadata().getParent(), element);
+        } else {
+            args = Collections.singletonList(element);
+        }
+        handleTemplate(template, args);
+        return null;
+    }
+
+    protected void visitOperation(Class<?> type, Operator operator, final List<? extends Expression<?>> args) {
+        final Template template = templates.getTemplate(operator);
+        if (template != null) {
+            final int precedence = templates.getPrecedence(operator);
+            boolean first = true;
+            for (final Template.Element element : template.getElements()) {
+                final Object rv = element.convert(args);
+                if (rv instanceof Expression) {
+                    final Expression<?> expr = (Expression<?>) rv;
+                    if (precedence > -1 && expr instanceof Operation) {
+                        Operator op = ((Operation<?>) expr).getOperator();
+                        int opPrecedence = templates.getPrecedence(op);
+                        if (precedence < opPrecedence) {
+                            append("(").handle(expr).append(")");
+                        } else if (!first && precedence == opPrecedence && !SAME_PRECEDENCE.contains(op)) {
+                            append("(").handle(expr).append(")");
+                        } else {
+                            handle(expr);
+                        }
+                    } else {
+                        handle(expr);
+                    }
+                    first = false;
+                } else if (element.isString()) {
+                    append(rv.toString());
+                } else {
+                    visitConstant(rv);
+                }
+            }
+        } else if (strict) {
+            throw new IllegalArgumentException(String.format("No pattern found for %s. Make sure to register any custom functions with %s.", operator, templates.getClass()));
+        } else {
+            append(operator.toString());
+            append("(");
+            handle(", ", args);
+            append(")");
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/support/package-info.java
new file mode 100644
index 0000000000..e7645203af
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Various support classes
+ */
+package com.querydsl.core.support;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/AppendingFactoryExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/AppendingFactoryExpression.java
new file mode 100644
index 0000000000..ead414f038
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/AppendingFactoryExpression.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+class AppendingFactoryExpression<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -1337452521648394353L;
+
+    private final Expression<T> base;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    protected AppendingFactoryExpression(Expression<T> base, Expression<?>... rest) {
+        super(base.getType());
+        this.base = base;
+        List<Expression<?>> builder = new ArrayList<>();
+        builder.add(base);
+        Collections.addAll(builder, rest);
+        this.args = Collections.unmodifiableList(builder);
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    @Override
+    public T newInstance(Object... args) {
+        return (T) args[0];
+    }
+
+    @Nullable
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, @Nullable C context) {
+        return base.accept(v, context);
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ArrayConstructorExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/ArrayConstructorExpression.java
new file mode 100644
index 0000000000..8514f9b6b6
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ArrayConstructorExpression.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.util.CollectionUtils;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.annotations.Immutable;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code ArrayConstructorExpression} extends {@link FactoryExpressionBase} to represent array initializers
+ *
+ * @author tiwe
+ *
+ * @param <T> component type
+ */
+@Immutable
+public class ArrayConstructorExpression<T> extends FactoryExpressionBase<T[]> {
+
+    private static final long serialVersionUID = 8667880104290226505L;
+
+    private final Class<T> elementType;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    @SuppressWarnings("unchecked")
+    public ArrayConstructorExpression(Expression<?>... args) {
+        this((Class) Object[].class, (Expression[]) args);
+    }
+
+    @SuppressWarnings("unchecked")
+    public ArrayConstructorExpression(Class<T[]> type, Expression<T>... args) {
+        super(type);
+        this.elementType = (Class<T>) type.getComponentType();
+        this.args = CollectionUtils.unmodifiableList(Arrays.asList(args));
+    }
+
+    public final Class<T> getElementType() {
+        return elementType;
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T[] newInstance(Object... a) {
+        if (a.getClass().getComponentType().equals(elementType)) {
+            return (T[]) a;
+        } else {
+            T[] rv = (T[]) Array.newInstance(elementType, a.length);
+            System.arraycopy(a, 0, rv, 0, a.length);
+            return rv;
+        }
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof FactoryExpression<?>) {
+            FactoryExpression<?> c = (FactoryExpression<?>) obj;
+            return args.equals(c.getArgs()) && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java
new file mode 100644
index 0000000000..99abfc92e5
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/CollectionExpression.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Collection;
+
+/**
+ * {@code CollectionExpression} represents {@code java.util.Collection} typed expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ * @param <E> element type
+ * @see java.util.Collection
+ */
+public interface CollectionExpression<T extends Collection<E>, E> extends ParameterizedExpression<T> {
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Constant.java b/querydsl-core/src/main/java/com/querydsl/core/types/Constant.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/types/Constant.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/Constant.java
index 4adb7b69c4..6e5ec1be91 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/Constant.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Constant.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 /**
- * Constant represents a general constant expression.
+ * {@code Constant} represents a general constant expression.
  *
  * @author tiwe
  *
@@ -23,9 +23,9 @@
 public interface Constant<T> extends Expression<T> {
 
     /**
-     * Get the constant
+     * Get the wrapped constant
      *
-     * @return
+     * @return wrapped constant
      */
     T getConstant();
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ConstantImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/ConstantImpl.java
new file mode 100644
index 0000000000..3b2df7a6b7
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ConstantImpl.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.annotations.Immutable;
+
+/**
+ * {@code ConstantImpl} is the default implementation of the {@link Constant} interface
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+@Immutable
+public final class ConstantImpl<T> extends ExpressionBase<T> implements Constant<T> {
+
+    private static final long serialVersionUID = -3898138057967814118L;
+
+    private static final int CACHE_SIZE = 256;
+
+    private static class Constants {
+
+        @SuppressWarnings({"rawtypes", "unchecked"}) //generic array creation not possible
+        private static final Constant<Character>[] CHARACTERS = new Constant[CACHE_SIZE];
+
+        @SuppressWarnings({"rawtypes", "unchecked"}) //generic array creation not possible
+        private static final Constant<Byte>[] BYTES = new Constant[CACHE_SIZE];
+
+        @SuppressWarnings({"rawtypes", "unchecked"}) //generic array creation not possible
+        private static final Constant<Integer>[] INTEGERS = new Constant[CACHE_SIZE];
+
+        @SuppressWarnings({"rawtypes", "unchecked"}) //generic array creation not possible
+        private static final Constant<Long>[] LONGS = new Constant[CACHE_SIZE];
+
+        @SuppressWarnings({"rawtypes", "unchecked"}) //generic array creation not possible
+        private static final Constant<Short>[] SHORTS = new Constant[CACHE_SIZE];
+
+        private static final Constant<Boolean> FALSE = new ConstantImpl<Boolean>(Boolean.FALSE);
+
+        private static final Constant<Boolean> TRUE = new ConstantImpl<Boolean>(Boolean.TRUE);
+
+        static {
+            for (int i = 0; i < CACHE_SIZE; i++) {
+                INTEGERS[i] = new ConstantImpl<Integer>(Integer.class, i);
+                SHORTS[i] = new ConstantImpl<Short>(Short.class, (short) i);
+                BYTES[i] = new ConstantImpl<Byte>(Byte.class, (byte) i);
+                CHARACTERS[i] = new ConstantImpl<Character>(Character.class, (char) i);
+                LONGS[i] = new ConstantImpl<Long>(Long.class, (long) i);
+            }
+        }
+    }
+
+    public static Constant<Boolean> create(boolean b) {
+        return b ? Constants.TRUE : Constants.FALSE;
+    }
+
+    public static Constant<Byte> create(byte i) {
+        if (i >= 0) {
+            return Constants.BYTES[i];
+        } else {
+            return new ConstantImpl<Byte>(Byte.class, i);
+        }
+    }
+
+    public static Constant<Character> create(char i) {
+        if (i < CACHE_SIZE) {
+            return Constants.CHARACTERS[i];
+        } else {
+            return new ConstantImpl<Character>(Character.class, i);
+        }
+    }
+
+    public static Constant<Integer> create(int i) {
+        if (i >= 0 && i < CACHE_SIZE) {
+            return Constants.INTEGERS[i];
+        } else {
+            return new ConstantImpl<Integer>(Integer.class, i);
+        }
+    }
+
+    public static Constant<Long> create(long i) {
+        if (i >= 0 && i < CACHE_SIZE) {
+            return Constants.LONGS[(int) i];
+        } else {
+            return new ConstantImpl<Long>(Long.class, i);
+        }
+    }
+
+    public static Constant<Short> create(short i) {
+        if (i >= 0 && i < CACHE_SIZE) {
+            return Constants.SHORTS[i];
+        } else {
+            return new ConstantImpl<Short>(Short.class, i);
+        }
+    }
+
+    public static <T> Constant<T> create(T obj) {
+        return new ConstantImpl<T>(obj);
+    }
+
+    public static <T> Constant<T> create(Class<T> type, T constant) {
+        return new ConstantImpl<T>(type, constant);
+    }
+
+    private final T constant;
+
+    /**
+     * Create a new Constant for the given object
+     *
+     * @param constant constant
+     */
+    @SuppressWarnings("unchecked") //The class of the constant will mandate the type
+    private ConstantImpl(T constant) {
+        this((Class) constant.getClass(), constant);
+    }
+
+    /**
+     * Create a new Constant of the given type for the given object
+     *
+     * @param type type of the expression
+     * @param constant constant
+     */
+    private ConstantImpl(Class<T> type, T constant) {
+        super(type);
+        this.constant = constant;
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Constant<?>) {
+            return ((Constant<?>) o).getConstant().equals(constant);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public T getConstant() {
+        return constant;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ConstructorExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/ConstructorExpression.java
new file mode 100644
index 0000000000..ee5111826f
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ConstructorExpression.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+import static com.querydsl.core.util.ConstructorUtils.getConstructor;
+import static com.querydsl.core.util.ConstructorUtils.getConstructorParameters;
+import static com.querydsl.core.util.ConstructorUtils.getTransformers;
+import com.querydsl.core.annotations.Immutable;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code ConstructorExpression} represents a constructor invocation
+ *
+ * <p>Example</p>
+ *
+ * <pre>
+ * {@code
+ * QEmployee employee = QEmployee.employee;
+ * List<EmployeeInfo> result = query.from(employee)
+ *   .where(employee.valid.eq(true))
+ *   .select(Projections.constructor(EmployeeInfo.class, employee.firstName, employee.lastName))
+ *   .fetch();
+ * }
+ * </pre>
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@Immutable
+public class ConstructorExpression<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -602747921848073175L;
+
+    private static Class<?>[] getParameterTypes(Expression<?>... args) {
+        Class<?>[] paramTypes = new Class[args.length];
+        for (int i = 0; i < paramTypes.length; i++) {
+            paramTypes[i] = args[i].getType();
+        }
+        return paramTypes;
+    }
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    private final Class<?>[] parameterTypes;
+
+    private final transient Constructor<?> constructor;
+
+    private final transient Iterable<Function<Object[], Object[]>> transformers;
+
+    protected ConstructorExpression(Class<? extends T> type, Expression<?>... args) {
+        this(type, getParameterTypes(args), Arrays.asList(args));
+    }
+
+    protected ConstructorExpression(Class<? extends T> type, Class<?>[] paramTypes, Expression<?>... args) {
+        this(type, paramTypes, Arrays.asList(args));
+    }
+
+    protected ConstructorExpression(Class<? extends T> type, Class<?>[] paramTypes, List<Expression<?>> args) {
+        super(type);
+        try {
+            this.parameterTypes = getConstructorParameters(type, paramTypes).clone();
+            this.args = Collections.unmodifiableList(args);
+            this.constructor = getConstructor(getType(), parameterTypes);
+            this.transformers = getTransformers(constructor);
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    @SuppressWarnings("unchecked")
+    public Expression<T> as(Path<T> alias) {
+        return ExpressionUtils.operation(getType(), Ops.ALIAS, this, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    public Expression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof ConstructorExpression<?>) {
+            ConstructorExpression<?> c = (ConstructorExpression<?>) obj;
+            return Arrays.equals(parameterTypes, c.parameterTypes)
+                    && args.equals(c.args)
+                    && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @Unmodifiable
+    public final List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T newInstance(Object... args) {
+        try {
+            for (Function<Object[], Object[]> transformer : transformers) {
+                args = transformer.apply(args);
+            }
+            return (T) constructor.newInstance(args);
+        } catch (SecurityException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        }
+    }
+
+    private void readObject(ObjectInputStream ois)
+            throws ClassNotFoundException, IOException {
+        ois.readObject();
+        try {
+            Field constructor = ConstructorExpression.class.getDeclaredField("constructor");
+            constructor.setAccessible(true);
+            constructor.set(this, getConstructor(getType(), parameterTypes));
+            Field transformers = ConstructorExpression.class.getDeclaredField("transformers");
+            transformers.setAccessible(true);
+            transformers.set(this, getTransformers(this.constructor));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/EntityPath.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/EntityPath.java
index f6fff41b83..09aeb0700f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/EntityPath.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/EntityPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 /**
- * EntityPath is the common interface for entity path expressions
+ * {@code EntityPath} is the common interface for entity path expressions
  *
  * @author tiwe
  *
@@ -25,8 +25,8 @@ public interface EntityPath<T> extends Path<T> {
     /**
      * Returns additional metadata for the given property path or null if none is available
      *
-     * @param property
-     * @return
+     * @param property property path
+     * @return metadata for property or null
      */
     Object getMetadata(Path<?> property);
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Expression.java b/querydsl-core/src/main/java/com/querydsl/core/types/Expression.java
new file mode 100644
index 0000000000..9eec165633
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Expression.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.io.Serializable;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code Expression} defines a general typed expression in a Query instance. The generic type parameter
+ * is a reference to the type the expression is bound to.
+ *
+ * <p>The central Expression subinterfaces are</p>
+ * <ul>
+ *   <li>{@link Constant} - for constants such as Strings, numbers and entity instances</li>
+ *   <li>{@link FactoryExpression} - for row based result processing</li>
+ *   <li>{@link Operation} - for common supported operations and function calls</li>
+ *   <li>{@link ParamExpression} - for bindable query parameters</li>
+ *   <li>{@link Path} - for variables, properties and collection member access</li>
+ *   <li>{@link SubQueryExpression} - for subqueries</li>
+ *   <li>{@link TemplateExpression} - for custom syntax</li>
+ * </ul>
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ *
+ */
+public interface Expression<T> extends Serializable {
+
+    /**
+     * Accept the visitor with the given context
+     *
+     * @param <R> return type
+     * @param <C> context type
+     * @param v visitor
+     * @param context context of visit
+     * @return result of visit
+     */
+    @Nullable
+    <R,C> R accept(Visitor<R,C> v, @Nullable C context);
+
+    /**
+     * Get the java type for this expression
+     *
+     * @return type of expression
+     */
+    Class<? extends T> getType();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionBase.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ExpressionBase.java
index 7a0a589a9d..d872eb6d08 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionBase.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * ExpressionBase is the base class for immutable {@link Expression} implementations
- * 
+ * {@code ExpressionBase} is the base class for immutable {@link Expression} implementations
+ *
  * @author tiwe
  *
  * @param <T> expression type
@@ -27,34 +27,36 @@ public abstract class ExpressionBase<T> implements Expression<T> {
     private static final long serialVersionUID = -8862014178653364345L;
 
     private final Class<? extends T> type;
-    
+
     @Nullable
-    private volatile String toString;
+    private transient volatile String toString;
 
     @Nullable
-    private volatile Integer hashCode;
-    
+    private transient volatile Integer hashCode;
+
     public ExpressionBase(Class<? extends T> type) {
         this.type = type;
     }
-    
+
+    @Override
     public final Class<? extends T> getType() {
         return type;
     }
-    
+
+    @Override
     public final int hashCode() {
         if (hashCode == null) {
             hashCode = accept(HashCodeVisitor.DEFAULT, null);
         }
-        return hashCode.intValue();
+        return hashCode;
     }
-    
+
     @Override
     public final String toString() {
-        if (toString == null) {            
+        if (toString == null) {
             toString = accept(ToStringVisitor.DEFAULT, Templates.DEFAULT);
         }
         return toString;
     }
-    
+
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionException.java b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionException.java
similarity index 77%
rename from querydsl-core/src/main/java/com/mysema/query/types/ExpressionException.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ExpressionException.java
index def3553d16..ca5f478bf6 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionException.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionException.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 /**
+ * {@code ExpressionException} is thrown for {@link Expression} construction issues
+ *
  * @author tiwe
  *
  */
-public class ExpressionException extends RuntimeException{
+public class ExpressionException extends RuntimeException {
 
     private static final long serialVersionUID = 6031724386976562965L;
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java
new file mode 100644
index 0000000000..6ceaff3d18
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ExpressionUtils.java
@@ -0,0 +1,847 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code ExpressionUtils} provides utilities for constructing common operation instances. This class is
+ * used internally in Querydsl and is not suitable to be used in cases where DSL methods are needed,
+ * since the Expression implementations used in this class are minimal internal implementations.
+ *
+ * @author tiwe
+ *
+ */
+public final class ExpressionUtils {
+
+    private static final class UnderscoreTemplates extends Templates {
+        private UnderscoreTemplates() {
+            add(PathType.PROPERTY, "{0}_{1}");
+            add(PathType.COLLECTION_ANY, "{0}");
+            add(PathType.LISTVALUE, "{0}_{1}");
+            add(PathType.LISTVALUE_CONSTANT, "{0}_{1}");
+        }
+    }
+
+    private static final Templates TEMPLATES = new UnderscoreTemplates();
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T> Operation<T> operation(Class<? extends T> type, Operator operator,
+                                             Expression<?>... args) {
+        return operation(type, operator, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Operation<T> operation(Class<? extends T> type, Operator operator,
+                                             List<Expression<?>> args) {
+        if (type.equals(Boolean.class)) {
+            return (Operation<T>) new PredicateOperation(operator, args);
+        } else {
+            return new OperationImpl<T>(type, operator, args);
+        }
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static PredicateOperation predicate(Operator operator, Expression<?>... args) {
+        return predicate(operator, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static PredicateOperation predicate(Operator operator, List<Expression<?>> args) {
+        return new PredicateOperation(operator, args);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T> Path<T> path(Class<? extends T> type, String variable) {
+        return new PathImpl<T>(type, variable);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T> Path<T> path(Class<? extends T> type, Path<?> parent, String property) {
+        return new PathImpl<T>(type, parent, property);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T> Path<T> path(Class<? extends T> type, PathMetadata metadata) {
+        return new PathImpl<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static PredicateTemplate predicateTemplate(String template, Object... args) {
+        return predicateTemplate(TemplateFactory.DEFAULT.create(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static PredicateTemplate predicateTemplate(String template, List<?> args) {
+        return predicateTemplate(TemplateFactory.DEFAULT.create(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static PredicateTemplate predicateTemplate(Template template, Object... args) {
+        return predicateTemplate(template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static PredicateTemplate predicateTemplate(Template template, List<?> args) {
+        return new PredicateTemplate(template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> TemplateExpression<T> template(Class<? extends T> cl, String template, Object... args) {
+        return template(cl, TemplateFactory.DEFAULT.create(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> TemplateExpression<T> template(Class<? extends T> cl, String template, List<?> args) {
+        return template(cl, TemplateFactory.DEFAULT.create(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> TemplateExpression<T> template(Class<? extends T> cl, Template template, Object... args) {
+        return template(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> TemplateExpression<T> template(Class<? extends T> cl, Template template, List<?> args) {
+        if (cl.equals(Boolean.class)) {
+            return (TemplateExpression<T>) new PredicateTemplate(template, args);
+        } else {
+            return new TemplateExpressionImpl<T>(cl, template, args);
+        }
+    }
+
+    /**
+     * Create a {@code all col} expression
+     *
+     * @param col collection expression
+     * @return all col
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> all(CollectionExpression<?, ? super T> col) {
+        return new OperationImpl<T>((Class<T>) col.getParameter(0), Ops.QuantOps.ALL,
+                Collections.singletonList(col));
+    }
+
+    /**
+     * Create a {@code any col} expression
+     *
+     * @param col collection expression
+     * @return any col
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> any(CollectionExpression<?, ? super T> col) {
+        return new OperationImpl<T>((Class<T>) col.getParameter(0), Ops.QuantOps.ANY,
+                Collections.singletonList(col));
+    }
+
+    /**
+     * Create a {@code all col} expression
+     *
+     * @param col subquery expression
+     * @return all col
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> all(SubQueryExpression<? extends T> col) {
+        return new OperationImpl<T>(col.getType(), Ops.QuantOps.ALL, Collections.singletonList(col));
+    }
+
+    /**
+     * Create a {@code any col} expression
+     *
+     * @param col subquery expression
+     * @return any col
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> any(SubQueryExpression<? extends T> col) {
+        return new OperationImpl<T>(col.getType(), Ops.QuantOps.ANY, Collections.singletonList(col));
+    }
+
+    /**
+     * Create the intersection of the given arguments
+     *
+     * @param exprs predicates
+     * @return intersection
+     */
+    @Nullable
+    public static Predicate allOf(Collection<Predicate> exprs) {
+        Predicate rv = null;
+        for (Predicate b : exprs) {
+            if (b != null) {
+                rv = rv == null ? b : ExpressionUtils.and(rv,b);
+            }
+        }
+        return rv;
+    }
+
+    /**
+     * Create the intersection of the given arguments
+     *
+     * @param exprs predicates
+     * @return intersection
+     */
+    @Nullable
+    public static Predicate allOf(Predicate... exprs) {
+        Predicate rv = null;
+        for (Predicate b : exprs) {
+            if (b != null) {
+                rv = rv == null ? b : ExpressionUtils.and(rv,b);
+            }
+        }
+        return rv;
+    }
+
+    /**
+     * Create the intersection of the given arguments
+     *
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left and right
+     */
+    public static Predicate and(Predicate left, Predicate right) {
+        left = (Predicate) extract(left);
+        right = (Predicate) extract(right);
+        if (left == null) {
+            return right;
+        } else if (right == null) {
+            return left;
+        } else {
+            return predicate(Ops.AND, left, right);
+        }
+    }
+
+
+    /**
+     * Create the union of the given arguments
+     *
+     * @param exprs predicate
+     * @return union
+     */
+    @Nullable
+    public static Predicate anyOf(Collection<Predicate> exprs) {
+        Predicate rv = null;
+        for (Predicate b : exprs) {
+            if (b != null) {
+                rv = rv == null ? b : ExpressionUtils.or(rv,b);
+            }
+        }
+        return rv;
+    }
+
+    /**
+     * Create the union of the given arguments
+     *
+     * @param exprs predicates
+     * @return union
+     */
+    @Nullable
+    public static Predicate anyOf(Predicate... exprs) {
+        Predicate rv = null;
+        for (Predicate b : exprs) {
+            if (b != null) {
+                rv = rv == null ? b : ExpressionUtils.or(rv,b);
+            }
+        }
+        return rv;
+    }
+
+    /**
+     * Create an alias expression with the given source and alias
+     *
+     * @param <D> type of expression
+     * @param source source
+     * @param alias alias
+     * @return source as alias
+     */
+    public static <D> Expression<D> as(Expression<D> source, Path<D> alias) {
+        return operation(alias.getType(), Ops.ALIAS, source, alias);
+    }
+
+    /**
+     * Create an alias expression with the given source and alias
+     *
+     * @param <D> type of expression
+     * @param source source
+     * @param alias alias
+     * @return source as alias
+     */
+    public static <D> Expression<D> as(Expression<D> source, String alias) {
+        return as(source, path(source.getType(), alias));
+    }
+
+    /**
+     * Create a {@code count(source)} expression
+     *
+     * @param source source
+     * @return count(source)
+     */
+    public static Expression<Long> count(Expression<?> source) {
+        return operation(Long.class, Ops.AggOps.COUNT_AGG, source);
+    }
+
+    /**
+     * Create a {@code left == constant} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param constant rhs of expression
+     * @return left == constant
+     */
+    public static <D> Predicate eqConst(Expression<D> left, D constant) {
+        return eq(left, ConstantImpl.create(constant));
+    }
+
+    /**
+     * Create a {@code left == right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left == right
+     */
+    public static <D> Predicate eq(Expression<D> left, Expression<? extends D> right) {
+        return predicate(Ops.EQ, left, right);
+    }
+
+    /**
+     * Create a {@code left in right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left in right
+     */
+    public static <D> Predicate in(Expression<D> left, CollectionExpression<?,? extends D> right) {
+        return predicate(Ops.IN, left, right);
+    }
+
+    /**
+     * Create a {@code left in right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left in right
+     */
+    public static <D> Predicate in(Expression<D> left, SubQueryExpression<? extends D> right) {
+        return predicate(Ops.IN, left, right);
+    }
+
+    /**
+     * Create a {@code left in right} expression
+     *
+     * @param <D> element type
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left in right
+     */
+    public static <D> Predicate in(Expression<D> left, Collection<? extends D> right) {
+        if (right.size() == 1) {
+            return eqConst(left, right.iterator().next());
+        } else {
+            return predicate(Ops.IN, left, ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code left in right or...} expression for each list
+     *
+     * @param <D> element type
+     * @param left
+     * @param lists
+     * @return a {@code left in right or...} expression
+     */
+    public static <D> Predicate inAny(Expression<D> left, Iterable<? extends Collection<? extends D>> lists) {
+        BooleanBuilder rv = new BooleanBuilder();
+        for (Collection<? extends D> list : lists) {
+            rv.or(in(left, list));
+        }
+        return rv;
+    }
+
+    /**
+     * Create a {@code left is null} expression
+     *
+     * @param left operation argument
+     * @return left is null
+     */
+    public static Predicate isNull(Expression<?> left) {
+        return predicate(Ops.IS_NULL, left);
+    }
+
+    /**
+     * Create a {@code left is not null} expression
+     *
+     * @param left operation argument
+     * @return left is null
+     */
+    public static Predicate isNotNull(Expression<?> left) {
+        return predicate(Ops.IS_NOT_NULL, left);
+    }
+
+    /**
+     * Convert the given like pattern to a regex pattern
+     *
+     * @param expr expression to convert
+     * @return converted expression
+     */
+    public static Expression<String> likeToRegex(Expression<String> expr) {
+        return likeToRegex(expr, true);
+    }
+
+    /**
+     * Convert the given like pattern to a regex pattern
+     *
+     * @param expr expression to be converted
+     * @param matchStartAndEnd if start and end should be matched as well
+     * @return converted expression
+     */
+    @SuppressWarnings("unchecked")
+    public static Expression<String> likeToRegex(Expression<String> expr, boolean matchStartAndEnd) {
+        // TODO : this should take the escape character into account
+        if (expr instanceof Constant<?>) {
+            final String like = expr.toString();
+            final StringBuilder rv = new StringBuilder(like.length() + 4);
+            if (matchStartAndEnd && !like.startsWith("%")) {
+                rv.append('^');
+            }
+            for (int i = 0; i < like.length(); i++) {
+                char ch = like.charAt(i);
+                if (ch == '.' || ch == '*' || ch == '?') {
+                    rv.append('\\');
+                } else if (ch == '%') {
+                    rv.append(".*");
+                    continue;
+                } else if (ch == '_') {
+                    rv.append('.');
+                    continue;
+                }
+                rv.append(ch);
+            }
+            if (matchStartAndEnd && !like.endsWith("%")) {
+                rv.append('$');
+            }
+            if (!like.equals(rv.toString())) {
+                return ConstantImpl.create(rv.toString());
+            }
+        } else if (expr instanceof Operation<?>) {
+            Operation<?> o = (Operation<?>) expr;
+            if (o.getOperator() == Ops.CONCAT) {
+                Expression<String> lhs = likeToRegex((Expression<String>) o.getArg(0), false);
+                Expression<String> rhs = likeToRegex((Expression<String>) o.getArg(1), false);
+                if (lhs != o.getArg(0) || rhs != o.getArg(1)) {
+                    return operation(String.class, Ops.CONCAT, lhs, rhs);
+                }
+            }
+        }
+        return expr;
+    }
+
+    /**
+     * Create a list expression for the given arguments
+     *
+     * @param exprs list elements
+     * @return list expression
+     */
+    public static <T> Expression<T> list(Class<T> clazz, Expression<?>... exprs) {
+        return list(clazz, Arrays.asList(exprs));
+    }
+
+
+    /**
+     * Create a list expression for the given arguments
+     *
+     * @param exprs list elements
+     * @return list expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> list(Class<T> clazz, List<? extends Expression<?>> exprs) {
+        Expression<T> rv = (Expression<T>) exprs.get(0);
+        if (exprs.size() == 1) {
+            rv = operation(clazz, Ops.SINGLETON, rv, exprs.get(0));
+        } else {
+            for (int i = 1; i < exprs.size(); i++) {
+                rv = operation(clazz, Ops.LIST, rv, exprs.get(i));
+            }
+        }
+
+        return rv;
+    }
+
+    /**
+     * Convert the given expression from regex form to like
+     *
+     * @param expr expression to convert
+     * @return converted expression
+     */
+    @SuppressWarnings("unchecked")
+    public static Expression<String> regexToLike(Expression<String> expr) {
+        if (expr instanceof Constant<?>) {
+            final String str = expr.toString();
+            final StringBuilder rv = new StringBuilder(str.length() + 2);
+            boolean escape = false;
+            for (int i = 0; i < str.length(); i++) {
+                final char ch = str.charAt(i);
+                if (!escape && ch == '.') {
+                    if (i < str.length() - 1 && str.charAt(i + 1) == '*') {
+                        rv.append('%');
+                        i++;
+                    } else {
+                        rv.append('_');
+                    }
+                    continue;
+                } else if (!escape && ch == '\\') {
+                    escape = true;
+                    continue;
+                } else if (!escape && (ch == '[' || ch == ']' || ch == '^' || ch == '.' || ch == '*')) {
+                    throw new QueryException("'" + str + "' can't be converted to like form");
+                } else if (escape && (ch == 'd' || ch == 'D' || ch == 's' || ch == 'S' || ch == 'w' || ch == 'W')) {
+                    throw new QueryException("'" + str + "' can't be converted to like form");
+                }
+                rv.append(ch);
+                escape = false;
+            }
+            if (!rv.toString().equals(str)) {
+                return ConstantImpl.create(rv.toString());
+            }
+        } else if (expr instanceof Operation<?>) {
+            Operation<?> o = (Operation<?>) expr;
+            if (o.getOperator() == Ops.CONCAT) {
+                Expression<String> lhs = regexToLike((Expression<String>) o.getArg(0));
+                Expression<String> rhs = regexToLike((Expression<String>) o.getArg(1));
+                if (lhs != o.getArg(0) || rhs != o.getArg(1)) {
+                    return operation(String.class, Ops.CONCAT, lhs, rhs);
+                }
+            }
+        }
+        return expr;
+    }
+
+    /**
+     * Create a {@code left != constant} expression
+     *
+     * @param <D> type of expression
+     * @param left lhs of expression
+     * @param constant rhs of expression
+     * @return left != constant
+     */
+    public static <D> Predicate neConst(Expression<D> left, D constant) {
+        return ne(left, ConstantImpl.create(constant));
+    }
+
+    /**
+     * Create a {@code left != right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left != right
+     */
+    public static <D> Predicate ne(Expression<D> left, Expression<? super D> right) {
+        return predicate(Ops.NE, left, right);
+    }
+
+    /**
+     * Create a {@code left not in right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left not in right
+     */
+    public static <D> Predicate notIn(Expression<D> left, CollectionExpression<?,? extends D> right) {
+        return predicate(Ops.NOT_IN, left, right);
+    }
+
+    /**
+     * Create a {@code left not in right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left not in right
+     */
+    public static <D> Predicate notIn(Expression<D> left, SubQueryExpression<? extends D> right) {
+        return predicate(Ops.NOT_IN, left, right);
+    }
+
+    /**
+     * Create a {@code left not in right} expression
+     *
+     * @param <D> type of expressions
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left not in right
+     */
+    public static <D> Predicate notIn(Expression<D> left, Collection<? extends D> right) {
+        if (right.size() == 1) {
+            return neConst(left, right.iterator().next());
+        } else {
+            return predicate(Ops.NOT_IN, left, ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code left not in right and...} expression for each list
+     *
+     * @param <D>
+     * @param left
+     * @param lists
+     * @return a {@code left not in right and...} expression
+     */
+    public static <D> Predicate notInAny(Expression<D> left, Iterable<? extends Collection<? extends D>> lists) {
+        BooleanBuilder rv = new BooleanBuilder();
+        for (Collection<? extends D> list : lists) {
+            rv.and(notIn(left, list));
+        }
+        return rv;
+    }
+
+    /**
+     * Create a {@code left or right} expression
+     *
+     * @param left lhs of expression
+     * @param right rhs of expression
+     * @return left or right
+     */
+    public static Predicate or(Predicate left, Predicate right) {
+        left = (Predicate) extract(left);
+        right = (Predicate) extract(right);
+        if (left == null) {
+            return right;
+        } else if (right == null) {
+            return left;
+        } else {
+            return predicate(Ops.OR, left, right);
+        }
+    }
+
+    /**
+     * Create a distinct list of the given args
+     *
+     * @param args elements
+     * @return list with distinct elements
+     */
+    public static List<Expression<?>> distinctList(Expression<?>... args) {
+        final Set<Expression<?>> set = new LinkedHashSet<>(Arrays.asList(args));
+        return CollectionUtils.unmodifiableList(new ArrayList<>(set));
+    }
+
+    /**
+     * Create a distinct list of the concatenated array contents
+     *
+     * @param args elements
+     * @return list with distinct elements
+     */
+    public static List<Expression<?>> distinctList(Expression<?>[]... args) {
+        final Set<Expression<?>> set = new LinkedHashSet<>();
+        for (Expression<?>[] arr : args) {
+            Collections.addAll(set, arr);
+        }
+        return CollectionUtils.unmodifiableList(new ArrayList<>(set));
+    }
+
+    /**
+     * Get the potentially wrapped expression
+     *
+     * @param expr expression to analyze
+     * @return inner expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> extract(Expression<T> expr) {
+        if (expr != null) {
+            final Class<?> clazz = expr.getClass();
+            if (clazz == PathImpl.class || clazz == PredicateOperation.class || clazz == ConstantImpl.class) {
+                return expr;
+            } else {
+                return (Expression<T>) expr.accept(ExtractorVisitor.DEFAULT, null);
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Create a new root variable based on the given path and suffix
+     *
+     * @param path base path
+     * @param suffix suffix for variable name
+     * @return path expression
+     */
+    public static String createRootVariable(Path<?> path, int suffix) {
+        String variable = path.accept(ToStringVisitor.DEFAULT, TEMPLATES);
+        return variable + "_" + suffix;
+    }
+
+    /**
+     * Create a new root variable based on the given path
+     *
+     * @param path base path
+     * @return variable name
+     */
+    public static String createRootVariable(Path<?> path) {
+        return path.accept(ToStringVisitor.DEFAULT, TEMPLATES);
+    }
+
+    /**
+     * Converts the given object to an Expression
+     *
+     * <p>Casts expressions and wraps everything else into co</p>
+     *
+     * @param o object to convert
+     * @return converted argument
+     */
+    public static Expression<?> toExpression(Object o) {
+        if (o instanceof Expression) {
+            return (Expression<?>) o;
+        } else {
+            return ConstantImpl.create(o);
+        }
+    }
+
+    /**
+     * Converts the given expression to lower(expression)
+     *
+     * <p>Constants are lower()ed at creation time</p>
+     *
+     * @param stringExpression the string to lower()
+     * @return lower(stringExpression)
+     */
+    public static Expression<String> toLower(Expression<String> stringExpression) {
+        if (stringExpression instanceof Constant) {
+            Constant<String> constantExpression = (Constant<String>) stringExpression;
+            return ConstantImpl.create(constantExpression.getConstant().toLowerCase());
+        } else {
+            return operation(String.class, Ops.LOWER, stringExpression);
+        }
+    }
+
+    /**
+     * Create an expression out of the given order specifiers
+     *
+     * @param args order
+     * @return expression for order
+     */
+    public static Expression<?> orderBy(List<OrderSpecifier<?>> args) {
+        return operation(Object.class, Ops.ORDER, ConstantImpl.create(args));
+    }
+
+    private ExpressionUtils() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/ExtractorVisitor.java
similarity index 86%
rename from querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ExtractorVisitor.java
index 655d359dde..9d60aacc0b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ExtractorVisitor.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 
 /**
- * ExtractorVisitor is a Visitor implementation for Expression extraction
- * 
+ * {@code ExtractorVisitor} is a {@link Visitor} implementation for {@link Expression} extraction
+ *
  * @author tiwe
  *
  */
 final class ExtractorVisitor implements Visitor<Expression<?>,Void> {
-    
+
     public static final ExtractorVisitor DEFAULT = new ExtractorVisitor();
-    
-    private ExtractorVisitor() {}
-    
+
+    private ExtractorVisitor() { }
+
     @Override
     public Expression<?> visit(Constant<?> expr, Void context) {
         return expr;
@@ -60,5 +60,5 @@ public Expression<?> visit(SubQueryExpression<?> expr, Void context) {
     public Expression<?> visit(TemplateExpression<?> expr, Void context) {
         return expr;
     }
-    
+
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpression.java
new file mode 100644
index 0000000000..537346c09e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpression.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code FactoryExpression} represents factory expressions such as JavaBean or
+ * Constructor projections
+ *
+ * @author tiwe
+ *
+ * @param <T> type of projection
+ */
+public interface FactoryExpression<T> extends Expression<T> {
+
+    /**
+     * Get the invocation arguments
+     *
+     * @return argument expressions
+     */
+    List<Expression<?>> getArgs();
+
+    /**
+     * Create a projection with the given arguments
+     *
+     * @param args row arguments
+     * @return constructed value
+     */
+    @Nullable
+    T newInstance(Object... args);
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionBase.java
new file mode 100644
index 0000000000..5ef934c2f2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionBase.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Common superclass for {@link FactoryExpression} implementations
+ *
+ * @param <T>
+ */
+public abstract class FactoryExpressionBase<T> extends ExpressionBase<T> implements FactoryExpression<T> {
+
+    private static class FactoryExpressionWrapper<T> extends ExpressionBase<T> implements FactoryExpression<T> {
+        private final FactoryExpression<T> expr;
+
+        FactoryExpressionWrapper(FactoryExpression<T> expr) {
+            super(expr.getType());
+            this.expr = expr;
+        }
+
+        @Override
+        public List<Expression<?>> getArgs() {
+            return expr.getArgs();
+        }
+
+        @Nullable
+        @Override
+        public T newInstance(Object... args) {
+            if (args != null) {
+                for (Object arg : args) {
+                    if (arg != null) {
+                        return expr.newInstance(args);
+                    }
+                }
+            }
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public <R, C> R accept(Visitor<R, C> v, @Nullable C context) {
+            return expr.accept(v, context);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == this) {
+                return true;
+            } else if (o instanceof FactoryExpressionWrapper) {
+                return expr.equals(((FactoryExpressionWrapper) o).expr);
+            } else {
+                return false;
+            }
+        }
+
+    }
+
+    public FactoryExpressionBase(Class<? extends T> type) {
+        super(type);
+    }
+
+    /**
+     * Returns a wrapper expression which returns null if all arguments to newInstance are null
+     *
+     * @return new factory expression with {@code skip nulls} applied
+     */
+    public FactoryExpression<T> skipNulls() {
+        return new FactoryExpressionWrapper<T>(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof FactoryExpression) {
+            return getClass().equals(o.getClass())
+                    && getArgs().equals(((FactoryExpression) o).getArgs());
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/FactoryExpressionUtils.java b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionUtils.java
similarity index 85%
rename from querydsl-core/src/main/java/com/mysema/query/types/FactoryExpressionUtils.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionUtils.java
index a6b1ab54d1..aefef07fc3 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/FactoryExpressionUtils.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/FactoryExpressionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mysema.util.ArrayUtils;
+import com.querydsl.core.util.ArrayUtils;
 
 /**
- * Utility class to expand FactoryExpression constructor arguments and compress {@link FactoryExpression}
+ * Utility class to expand {@link FactoryExpression} constructor arguments and compress {@link FactoryExpression}
  * invocation arguments
  *
  * @author tiwe
@@ -27,6 +27,11 @@
  */
 public final class FactoryExpressionUtils {
 
+    /**
+     * {@code FactoryExpressionAdapter} provides an adapter implementation of the {@link FactoryExpression} interface
+     *
+     * @param <T>
+     */
     public static class FactoryExpressionAdapter<T> extends ExpressionBase<T> implements FactoryExpression<T> {
 
         private static final long serialVersionUID = -2742333128230913512L;
@@ -41,11 +46,10 @@ public static class FactoryExpressionAdapter<T> extends ExpressionBase<T> implem
             this.args = expand(inner.getArgs());
         }
 
-
         FactoryExpressionAdapter(FactoryExpression<T> inner, List<Expression<?>> args) {
             super(inner.getType());
             this.inner = inner;
-            this.args = args;
+            this.args = expand(args);
         }
 
         @Override
@@ -68,7 +72,7 @@ public boolean equals(Object o) {
             if (o == this) {
                 return true;
             } else if (o instanceof FactoryExpression) {
-                FactoryExpression<?> e = (FactoryExpression<?>)o;
+                FactoryExpression<?> e = (FactoryExpression<?>) o;
                 return args.equals(e.getArgs()) && getType().equals(e.getType());
             } else {
                 return false;
@@ -77,18 +81,14 @@ public boolean equals(Object o) {
 
     }
 
-    /**
-     * @param exprs
-     * @return
-     */
     public static FactoryExpression<?> wrap(List<? extends Expression<?>> projection) {
         boolean usesFactoryExpressions = false;
         for (Expression<?> e : projection) {
             usesFactoryExpressions |= e instanceof FactoryExpression;
         }
         if (usesFactoryExpressions) {
-            return wrap(new ArrayConstructorExpression(
-                    projection.toArray(new Expression[projection.size()])));
+            return wrap(new ArrayConstructorExpression<Object>(
+                    projection.toArray(new Expression<?>[0])));
         } else {
             return null;
         }
@@ -117,7 +117,7 @@ private static List<Expression<?>> expand(List<Expression<?>> exprs) {
                 expr = ((ProjectionRole) expr).getProjection();
             }
             if (expr instanceof FactoryExpression<?>) {
-                rv.addAll(expand(((FactoryExpression<?>)expr).getArgs()));
+                rv.addAll(expand(((FactoryExpression<?>) expr).getArgs()));
             } else {
                 rv.add(expr);
             }
@@ -129,10 +129,10 @@ private static int countArguments(FactoryExpression<?> expr) {
         int counter = 0;
         for (Expression<?> arg : expr.getArgs()) {
             if (arg instanceof ProjectionRole) {
-                arg = ((ProjectionRole)arg).getProjection();
+                arg = ((ProjectionRole) arg).getProjection();
             }
             if (arg instanceof FactoryExpression<?>) {
-                counter += countArguments((FactoryExpression<?>)arg);
+                counter += countArguments((FactoryExpression<?>) arg);
             } else {
                 counter++;
             }
@@ -149,7 +149,7 @@ private static Object[] compress(List<Expression<?>> exprs, Object[] args) {
                 expr = ((ProjectionRole) expr).getProjection();
             }
             if (expr instanceof FactoryExpression<?>) {
-                FactoryExpression<?> fe = (FactoryExpression<?>)expr;
+                FactoryExpression<?> fe = (FactoryExpression<?>) expr;
                 int fullArgsLength = countArguments(fe);
                 Object[] compressed = compress(fe.getArgs(), ArrayUtils.subarray(args, offset, offset + fullArgsLength));
                 rv[i] = fe.newInstance(compressed);
@@ -162,6 +162,6 @@ private static Object[] compress(List<Expression<?>> exprs, Object[] args) {
         return rv;
     }
 
-    private FactoryExpressionUtils() {}
+    private FactoryExpressionUtils() { }
 
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/HashCodeVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/HashCodeVisitor.java
new file mode 100644
index 0000000000..78a115a891
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/HashCodeVisitor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+
+/**
+ * {@code HashCodeVisitor} is used for hashCode generation in {@link Expression} implementations.
+ *
+ * @author tiwe
+ */
+public final class HashCodeVisitor implements Visitor<Integer,Void> {
+
+    public static final HashCodeVisitor DEFAULT = new HashCodeVisitor();
+
+    private HashCodeVisitor() { }
+
+    @Override
+    public Integer visit(Constant<?> expr, Void context) {
+        return expr.getConstant().hashCode();
+    }
+
+    @Override
+    public Integer visit(FactoryExpression<?> expr, Void context) {
+        int result = expr.getType().hashCode();
+        return 31 * result + expr.getArgs().hashCode();
+    }
+
+    @Override
+    public Integer visit(Operation<?> expr, Void context) {
+        int result = expr.getOperator().name().hashCode();
+        return 31 * result + expr.getArgs().hashCode();
+    }
+
+    @Override
+    public Integer visit(ParamExpression<?> expr, Void context) {
+        return expr.getName().hashCode();
+    }
+
+    @Override
+    public Integer visit(Path<?> expr, Void context) {
+        return expr.getMetadata().hashCode();
+    }
+
+    @Override
+    public Integer visit(SubQueryExpression<?> expr, Void context) {
+        return expr.getMetadata().hashCode();
+    }
+
+    @Override
+    public Integer visit(TemplateExpression<?> expr, Void context) {
+        int result = expr.getTemplate().hashCode();
+        return 31 * result + expr.getArgs().hashCode();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java b/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
new file mode 100644
index 0000000000..0a0f907792
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code JavaTemplates} extends {@link Templates} to provide Java syntax compliant serialization
+ * of Querydsl expressions
+ *
+ * @author tiwe
+ *
+ */
+public class JavaTemplates extends Templates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final JavaTemplates DEFAULT = new JavaTemplates();
+
+    public JavaTemplates() {
+        add(Ops.EQ, "{0} == {1}");
+        add(Ops.IS_NULL, "{0} == null");
+        add(Ops.IS_NOT_NULL, "{0} != null");
+        add(Ops.INSTANCE_OF, "{0} instanceof {1}");
+        add(Ops.ORDINAL, "{0}.ordinal()", Precedence.DOT);
+
+        // collection
+        add(Ops.IN, "{1}.contains({0})");
+        add(Ops.NOT_IN, "!{1}.contains({0})");
+        add(Ops.COL_IS_EMPTY, "{0}.isEmpty()", Precedence.DOT);
+        add(Ops.COL_SIZE, "{0}.size()", Precedence.DOT);
+
+        // array
+        add(Ops.ARRAY_SIZE, "{0}.length", Precedence.DOT);
+
+        // map
+        add(Ops.MAP_IS_EMPTY, "{0}.isEmpty()", Precedence.DOT);
+        add(Ops.MAP_SIZE, "{0}.size()", Precedence.DOT);
+        add(Ops.CONTAINS_KEY, "{0}.containsKey({1})");
+        add(Ops.CONTAINS_VALUE, "{0}.containsValue({1})");
+
+        // Comparable
+        add(Ops.BETWEEN, "{1} <= {0} && {0} <= {2}");
+
+        // String
+        add(Ops.CHAR_AT, "{0}.charAt({1})");
+        add(Ops.LOWER, "{0}.toLowerCase()", Precedence.DOT);
+        add(Ops.SUBSTR_1ARG, "{0}.substring({1})");
+        add(Ops.SUBSTR_2ARGS, "{0}.substring({1},{2})");
+        add(Ops.TRIM, "{0}.trim()", Precedence.DOT);
+        add(Ops.UPPER, "{0}.toUpperCase()", Precedence.DOT);
+        add(Ops.MATCHES, "{0}.matches({1})");
+        add(Ops.MATCHES_IC, "{0l}.matches({1l})");
+        add(Ops.STRING_LENGTH, "{0}.length()", Precedence.DOT);
+        add(Ops.STRING_IS_EMPTY, "{0}.isEmpty()", Precedence.DOT);
+        add(Ops.STRING_CONTAINS, "{0}.contains({1})");
+        add(Ops.STRING_CONTAINS_IC, "{0l}.contains({1l})");
+        add(Ops.STARTS_WITH, "{0}.startsWith({1})");
+        add(Ops.STARTS_WITH_IC, "{0l}.startsWith({1l})");
+        add(Ops.INDEX_OF, "{0}.indexOf({1})");
+        add(Ops.INDEX_OF_2ARGS, "{0}.indexOf({1},{2})");
+        add(Ops.EQ_IGNORE_CASE, "{0}.equalsIgnoreCase({1})");
+        add(Ops.ENDS_WITH, "{0}.endsWith({1})");
+        add(Ops.ENDS_WITH_IC, "{0l}.endsWith({1l})");
+        add(Ops.StringOps.LOCATE, "({1}.indexOf({0})+1)");
+        add(Ops.StringOps.LOCATE2, "({1}.indexOf({0},{2s}-1)+1)");
+
+        // Date and Time
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "{0}.getDayOfMonth()", Precedence.DOT);
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "{0}.getDayOfWeek()", Precedence.DOT);
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "{0}.getDayOfYear()", Precedence.DOT);
+        add(Ops.DateTimeOps.HOUR, "{0}.getHour()", Precedence.DOT);
+        add(Ops.DateTimeOps.MINUTE, "{0}.getMinute()", Precedence.DOT);
+        add(Ops.DateTimeOps.MONTH, "{0}.getMonth()", Precedence.DOT);
+        add(Ops.DateTimeOps.MILLISECOND, "{0}.getMilliSecond()", Precedence.DOT);
+        add(Ops.DateTimeOps.SECOND, "{0}.getSecond()", Precedence.DOT);
+        add(Ops.DateTimeOps.WEEK, "{0}.getWeek()", Precedence.DOT);
+        add(Ops.DateTimeOps.YEAR, "{0}.getYear()", Precedence.DOT);
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "{0}.getYear() * 100 + {0}.getMonth()");
+
+        // case
+        add(Ops.CASE, "({0})");
+        add(Ops.CASE_WHEN,  "({0}) ? ({1}) : ({2})");
+        add(Ops.CASE_ELSE,  "{0}");
+
+        // case eq
+        add(Ops.CASE_EQ, "({0})");
+        add(Ops.CASE_EQ_WHEN,  "({0} == {1}) ? ({2}) : ({3})");
+        add(Ops.CASE_EQ_ELSE,  "{0}");
+
+        // Math
+        for (Operator op : Ops.MathOps.values()) {
+            add(op, "Math." + getTemplate(op));
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java
new file mode 100644
index 0000000000..4dc0392296
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/MapExpression.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Map;
+
+/**
+ * {@code MapExpression} represents {@code java.util.Map} typed expressions
+ *
+ * @author tiwe
+ *
+ * @param <K> key type
+ * @param <V> value type
+ * @see java.util.Map
+ */
+public interface MapExpression<K, V> extends ParameterizedExpression<Map<K,V>> {
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/MappingProjection.java b/querydsl-core/src/main/java/com/querydsl/core/types/MappingProjection.java
new file mode 100644
index 0000000000..f2fd89e7ff
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/MappingProjection.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.Tuple;
+
+/**
+ * Projection template that allows implementing arbitrary mapping of rows to result objects.
+ *
+ * <p>Example</p>
+ *
+ * <pre><code>
+ * {@code MappingProjection<Pair<String, String>>} mapping = new {@code MappingProjection<Pair<String, String>>}(Pair.class, str1, str2) {
+ *     {@code @Override}
+ *     {@code protected Pair<String, String>} map(Tuple row) {
+ *          return Pair.of(row.get(str1), row.get(str2));
+ *     }
+ * };
+ * </code></pre>
+ *
+ * @param <T> expression type
+ */
+@Immutable
+public abstract class MappingProjection<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -948494350919774466L;
+
+    private final QTuple qTuple;
+
+    /**
+     * Create a new MappingProjection instance
+     *
+     * @param type
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    public MappingProjection(Class<? super T> type, Expression<?>... args) {
+        super((Class) type);
+        qTuple = new QTuple(ExpressionUtils.distinctList(args));
+    }
+
+    /**
+     * Create a new MappingProjection instance
+     *
+     * @param type
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    public MappingProjection(Class<? super T> type, Expression<?>[]... args) {
+        super((Class) type);
+        qTuple = new QTuple(ExpressionUtils.distinctList(args));
+    }
+
+    @Override
+    public T newInstance(Object... values) {
+        return map(qTuple.newInstance(values));
+    }
+
+    /**
+     * Creates a result object from the given row.
+     *
+     * @param row The row to map
+     * @return The result object
+     */
+    protected abstract T map(Tuple row);
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return qTuple.getArgs();
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, @Nullable C context) {
+        return v.visit(this, context);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/MutableExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/MutableExpressionBase.java
similarity index 83%
rename from querydsl-core/src/main/java/com/mysema/query/types/MutableExpressionBase.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/MutableExpressionBase.java
index 4481a51d07..77cb1ed8bc 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/MutableExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/MutableExpressionBase.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 
 /**
- * MutableExpressionBase is the base class for mutable Expression implementations
- * 
+ * {@code MutableExpressionBase} is the base class for mutable Expression implementations
+ *
  * @author tiwe
  *
  * @param <T>
@@ -30,15 +30,17 @@ public abstract class MutableExpressionBase<T> implements Expression<T> {
     public MutableExpressionBase(Class<? extends T> type) {
         this.type = type;
     }
-    
+
+    @Override
     public final Class<? extends T> getType() {
         return type;
     }
-    
+
+    @Override
     public final int hashCode() {
         return accept(HashCodeVisitor.DEFAULT, null);
     }
-    
+
     @Override
     public final String toString() {
         return accept(ToStringVisitor.DEFAULT, Templates.DEFAULT);
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/NullExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/NullExpression.java
similarity index 78%
rename from querydsl-core/src/main/java/com/mysema/query/types/NullExpression.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/NullExpression.java
index 8c89e884da..7908a7beec 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/NullExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/NullExpression.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.Collections;
 
 /**
- * NullExpression defines a general null expression
+ * {@code NullExpression} defines a general null expression
  *
  * @author tiwe
  *
  * @param <T> expression type
  */
-public class NullExpression<T> extends TemplateExpressionImpl<T> {
+public final class NullExpression<T> extends TemplateExpressionImpl<T> {
 
     private static final Template NULL_TEMPLATE = TemplateFactory.DEFAULT.create("null");
 
@@ -34,7 +34,7 @@ public class NullExpression<T> extends TemplateExpressionImpl<T> {
     public static final NullExpression<Object> DEFAULT = new NullExpression<Object>(Object.class);
 
     public NullExpression(Class<? extends T> type) {
-        super(type, NULL_TEMPLATE, Collections.<Expression<?>>emptyList());
+        super(type, NULL_TEMPLATE, Collections.emptyList());
     }
 
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Operation.java b/querydsl-core/src/main/java/com/querydsl/core/types/Operation.java
new file mode 100644
index 0000000000..81fd2aa18d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Operation.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.List;
+
+/**
+ * {@code Operation} represents an operation with operator and arguments
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+public interface Operation<T> extends Expression<T> {
+
+    /**
+     * Get the argument with the given index
+     *
+     * @param index zero based index of expression
+     * @return expression at index
+     */
+    Expression<?> getArg(int index);
+
+    /**
+     * Get the arguments of this operation
+     *
+     * @return arguments
+     */
+    @Unmodifiable
+    List<Expression<?>> getArgs();
+
+    /**
+     * Get the operator symbol for this operation
+     *
+     * @return operator
+     */
+    Operator getOperator();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/OperationImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/OperationImpl.java
new file mode 100644
index 0000000000..fae9d62790
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/OperationImpl.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.util.CollectionUtils;
+import com.querydsl.core.util.PrimitiveUtils;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code OperationImpl} is the default implementation of the {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@Immutable
+public class OperationImpl<T> extends ExpressionBase<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 4796432056083507588L;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    private final Operator operator;
+
+    protected OperationImpl(Class<? extends T> type, Operator operator, Expression<?>... args) {
+        this(type, operator, Arrays.asList(args));
+    }
+
+    protected OperationImpl(Class<? extends T> type, Operator operator, List<Expression<?>> args) {
+        super(type);
+        Class<?> wrapped = PrimitiveUtils.wrap(type);
+        if (!operator.getType().isAssignableFrom(wrapped)) {
+            throw new IllegalArgumentException(operator.name());
+        }
+        this.operator = operator;
+        this.args = CollectionUtils.unmodifiableList(args);
+    }
+
+    @Override
+    public final Expression<?> getArg(int i) {
+        return args.get(i);
+    }
+
+    @Override
+    @Unmodifiable
+    public final List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    public final Operator getOperator() {
+        return operator;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Operation<?>) {
+            Operation<?> op = (Operation<?>) o;
+            return op.getOperator() == operator
+                && op.getArgs().equals(args)
+                && op.getType().equals(getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public final <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Operator.java b/querydsl-core/src/main/java/com/querydsl/core/types/Operator.java
new file mode 100644
index 0000000000..b0ceb63e9a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Operator.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.io.Serializable;
+
+/**
+ * {@code Operator} represents operator symbols.
+ * <p>Implementations should be enums for automatic instance management.</p>
+ *
+ * @author tiwe
+ */
+public interface Operator extends Serializable {
+
+    /**
+     * Get the unique id for this Operator
+     *
+     * @return name
+     */
+    String name();
+
+    /**
+     * Get the result type of the operator
+     *
+     * @return type
+     */
+    Class<?> getType();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Ops.java b/querydsl-core/src/main/java/com/querydsl/core/types/Ops.java
new file mode 100644
index 0000000000..a4934f1896
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Ops.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * {@code Ops} provides the operators for the fluent query grammar.
+ *
+ * @author tiwe
+ */
+public enum Ops implements Operator {
+
+    // general
+    EQ(Boolean.class),
+    NE(Boolean.class),
+    IS_NULL(Boolean.class),
+    IS_NOT_NULL(Boolean.class),
+    INSTANCE_OF(Boolean.class),
+    NUMCAST(Number.class),
+    STRING_CAST(String.class),
+    ALIAS(Object.class),
+    LIST(Object.class),
+    SET(Object.class),
+    SINGLETON(Object.class),
+    ORDINAL(Integer.class),
+    WRAPPED(Object.class),
+    ORDER(Object.class),
+
+    // collection
+    IN(Boolean.class), // cmp. contains
+    NOT_IN(Boolean.class),
+    COL_IS_EMPTY(Boolean.class),
+    COL_SIZE(Integer.class),
+
+    // array
+    ARRAY_SIZE(Number.class),
+
+    // map
+    CONTAINS_KEY(Boolean.class),
+    CONTAINS_VALUE(Boolean.class),
+    MAP_SIZE(Integer.class),
+    MAP_IS_EMPTY(Boolean.class),
+
+    // Boolean
+    AND(Boolean.class),
+    NOT(Boolean.class),
+    OR(Boolean.class),
+    XNOR(Boolean.class),
+    XOR(Boolean.class),
+
+    // Comparable
+    BETWEEN(Boolean.class),
+    GOE(Boolean.class),
+    GT(Boolean.class),
+    LOE(Boolean.class),
+    LT(Boolean.class),
+
+    // Number
+    NEGATE(Number.class),
+    ADD(Number.class),
+    DIV(Number.class),
+    MULT(Number.class),
+    SUB(Number.class),
+    MOD(Number.class),
+
+    // String
+    CHAR_AT(Character.class),
+    CONCAT(String.class),
+    LOWER(String.class),
+    SUBSTR_1ARG(String.class),
+    SUBSTR_2ARGS(String.class),
+    TRIM(String.class),
+    UPPER(String.class),
+    MATCHES(Boolean.class),
+    MATCHES_IC(Boolean.class),
+    STRING_LENGTH(Integer.class),
+    STRING_IS_EMPTY(Boolean.class),
+    STARTS_WITH(Boolean.class),
+    STARTS_WITH_IC(Boolean.class),
+    INDEX_OF_2ARGS(Integer.class),
+    INDEX_OF(Integer.class),
+    EQ_IGNORE_CASE(Boolean.class),
+    ENDS_WITH(Boolean.class),
+    ENDS_WITH_IC(Boolean.class),
+    STRING_CONTAINS(Boolean.class),
+    STRING_CONTAINS_IC(Boolean.class),
+    LIKE(Boolean.class),
+    LIKE_IC(Boolean.class),
+    LIKE_ESCAPE(Boolean.class),
+    LIKE_ESCAPE_IC(Boolean.class),
+
+    // case
+    CASE(Object.class),
+    CASE_WHEN(Object.class),
+    CASE_ELSE(Object.class),
+
+    // case for eq
+    CASE_EQ(Object.class),
+    CASE_EQ_WHEN(Object.class),
+    CASE_EQ_ELSE(Object.class),
+
+    // coalesce
+    COALESCE(Object.class),
+    NULLIF(Object.class),
+
+    // subquery operations
+    EXISTS(Boolean.class);
+
+    private final Class<?> type;
+
+    Ops(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+
+    public static final Set<Ops> equalsOps = Collections.unmodifiableSet(EnumSet.of(EQ));
+
+    public static final Set<Ops> notEqualsOps = Collections.unmodifiableSet(EnumSet.of(NE));
+
+    public static final Set<Ops> compareOps = Collections.unmodifiableSet(EnumSet.of(EQ, NE, LT, GT, GOE, LOE));
+
+    public static final Set<Ops.AggOps> aggOps = Collections.unmodifiableSet(EnumSet.of(
+            Ops.AggOps.AVG_AGG,
+            Ops.AggOps.COUNT_AGG,
+            Ops.AggOps.COUNT_DISTINCT_AGG,
+            Ops.AggOps.MAX_AGG,
+            Ops.AggOps.MIN_AGG,
+            Ops.AggOps.SUM_AGG));
+
+    /**
+     * Aggregation operators
+     */
+    public enum AggOps implements Operator {
+        BOOLEAN_ALL(Boolean.class),
+        BOOLEAN_ANY(Boolean.class),
+        MAX_AGG(Comparable.class),
+        MIN_AGG(Comparable.class),
+        AVG_AGG(Number.class),
+        SUM_AGG(Number.class),
+        COUNT_AGG(Number.class),
+        COUNT_DISTINCT_AGG(Number.class),
+        COUNT_DISTINCT_ALL_AGG(Number.class),
+        COUNT_ALL_AGG(Number.class);
+
+        private final Class<?> type;
+
+        AggOps(Class<?> type) {
+            this.type = type;
+        }
+
+        @Override
+        public Class<?> getType() {
+            return type;
+        }
+    }
+
+    /**
+     * Quantification operators
+     */
+    public enum QuantOps implements Operator {
+        AVG_IN_COL(Number.class),
+        MAX_IN_COL(Comparable.class),
+        MIN_IN_COL(Comparable.class),
+        ANY(Object.class),
+        ALL(Object.class);
+
+        private final Class<?> type;
+
+        QuantOps(Class<?> type) {
+            this.type = type;
+        }
+
+        @Override
+        public Class<?> getType() {
+            return type;
+        }
+    }
+
+    /**
+     * Date and time operators
+     */
+    public enum DateTimeOps implements Operator {
+        DATE(Comparable.class),
+        CURRENT_DATE(Comparable.class),
+        CURRENT_TIME(Comparable.class),
+        CURRENT_TIMESTAMP(Comparable.class),
+        ADD_YEARS(Comparable.class),
+        ADD_MONTHS(Comparable.class),
+        ADD_WEEKS(Comparable.class),
+        ADD_DAYS(Comparable.class),
+        ADD_HOURS(Comparable.class),
+        ADD_MINUTES(Comparable.class),
+        ADD_SECONDS(Comparable.class),
+        DIFF_YEARS(Comparable.class),
+        DIFF_MONTHS(Comparable.class),
+        DIFF_WEEKS(Comparable.class),
+        DIFF_DAYS(Comparable.class),
+        DIFF_HOURS(Comparable.class),
+        DIFF_MINUTES(Comparable.class),
+        DIFF_SECONDS(Comparable.class),
+        TRUNC_YEAR(Comparable.class),
+        TRUNC_MONTH(Comparable.class),
+        TRUNC_WEEK(Comparable.class),
+        TRUNC_DAY(Comparable.class),
+        TRUNC_HOUR(Comparable.class),
+        TRUNC_MINUTE(Comparable.class),
+        TRUNC_SECOND(Comparable.class),
+        HOUR(Integer.class),
+        MINUTE(Integer.class),
+        MONTH(Integer.class),
+        SECOND(Integer.class),
+        MILLISECOND(Integer.class),
+        SYSDATE(Comparable.class),
+        YEAR(Integer.class),
+        WEEK(Integer.class),
+        YEAR_MONTH(Integer.class),
+        YEAR_WEEK(Integer.class),
+        DAY_OF_WEEK(Integer.class),
+        DAY_OF_MONTH(Integer.class),
+        DAY_OF_YEAR(Integer.class);
+
+        private final Class<?> type;
+
+        DateTimeOps(Class<?> type) {
+            this.type = type;
+        }
+
+        @Override
+        public Class<?> getType() {
+            return type;
+        }
+    }
+
+    /**
+     * Math operators
+     *
+     */
+    public enum MathOps implements Operator {
+        ABS(Number.class),
+        ACOS(Number.class),
+        ASIN(Number.class),
+        ATAN(Number.class),
+        CEIL(Number.class),
+        COS(Number.class),
+        TAN(Number.class),
+        SQRT(Number.class),
+        SIN(Number.class),
+        ROUND(Number.class),
+        ROUND2(Number.class),
+        RANDOM(Number.class),
+        RANDOM2(Number.class),
+        POWER(Number.class),
+        MIN(Number.class),
+        MAX(Number.class),
+        LOG(Number.class),
+        FLOOR(Number.class),
+        EXP(Number.class),
+        COSH(Number.class),
+        COT(Number.class),
+        COTH(Number.class),
+        DEG(Number.class),
+        LN(Number.class),
+        RAD(Number.class),
+        SIGN(Number.class),
+        SINH(Number.class),
+        TANH(Number.class);
+
+        private final Class<?> type;
+
+        MathOps(Class<?> type) {
+            this.type = type;
+        }
+
+        @Override
+        public Class<?> getType() {
+            return type;
+        }
+    }
+
+    /**
+     * String operators
+     */
+    public enum StringOps implements Operator {
+        LEFT(String.class),
+        RIGHT(String.class),
+        LTRIM(String.class),
+        RTRIM(String.class),
+        LPAD(String.class),
+        RPAD(String.class),
+        LPAD2(String.class),
+        RPAD2(String.class),
+        LOCATE(Number.class),
+        LOCATE2(Number.class);
+
+        private final Class<?> type;
+
+        StringOps(Class<?> type) {
+            this.type = type;
+        }
+
+        @Override
+        public Class<?> getType() {
+            return type;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Order.java b/querydsl-core/src/main/java/com/querydsl/core/types/Order.java
new file mode 100644
index 0000000000..bc41df6470
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Order.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code Order} defines ascending and descending order
+ *
+ * @author tiwe
+ */
+public enum Order {
+    /**
+     * Ascending order
+     */
+    ASC,
+    /**
+     * Descending order
+     */
+    DESC;
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/OrderSpecifier.java b/querydsl-core/src/main/java/com/querydsl/core/types/OrderSpecifier.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/types/OrderSpecifier.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/OrderSpecifier.java
index ffb1fdf1ab..ee36b912b2 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/OrderSpecifier.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/OrderSpecifier.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.io.Serializable;
 
-import javax.annotation.concurrent.Immutable;
+import com.querydsl.core.annotations.Immutable;
 
 /**
- * OrderSpecifier represents an order-by-element in a Query instance
+ * {@code OrderSpecifier} represents an order-by-element in a Query instance
  *
  * @param <T> related expression type
  * @author tiwe
@@ -28,12 +28,15 @@ public class OrderSpecifier<T extends Comparable> implements Serializable {
 
     private static final long serialVersionUID = 3427652988262514678L;
 
+    /**
+     * Behaviour for order of null values
+     */
     public enum NullHandling { Default, NullsFirst, NullsLast }
-    
+
     private final Order order;
 
     private final Expression<T> target;
-    
+
     private final NullHandling nullHandling;
 
     public OrderSpecifier(Order order, Expression<T> target, NullHandling nullhandling) {
@@ -41,15 +44,15 @@ public OrderSpecifier(Order order, Expression<T> target, NullHandling nullhandli
         this.target = target;
         this.nullHandling = nullhandling;
     }
-    
+
     public OrderSpecifier(Order order, Expression<T> target) {
-        this(order, target, NullHandling.Default);        
+        this(order, target, NullHandling.Default);
     }
 
     /**
      * Get the order of this specifier
      *
-     * @return
+     * @return order
      */
     public Order getOrder() {
         return order;
@@ -58,7 +61,7 @@ public Order getOrder() {
     /**
      * Get whether the order is ascending or not
      *
-     * @return
+     * @return ascending order
      */
     public boolean isAscending() {
         return order == Order.ASC;
@@ -67,28 +70,34 @@ public boolean isAscending() {
     /**
      * Get the target expression of this OrderSpecifier
      *
-     * @return
+     * @return target expression
      */
     public Expression<T> getTarget() {
         return target;
     }
 
     /**
-     * @return
+     * Get the null handling
+     *
+     * @return null handling
      */
     public NullHandling getNullHandling() {
         return nullHandling;
     }
-    
+
     /**
-     * @return
+     * Create a new OrderSpecifier instance with null first enabled
+     *
+     * @return new instance with null first enabled
      */
     public OrderSpecifier<T> nullsFirst() {
         return new OrderSpecifier<T>(order, target, NullHandling.NullsFirst);
     }
-    
+
     /**
-     * @return
+     * Create a new OrderSpecifier instance with nulls last enabled
+     *
+     * @return new instance with nulls last enabled
      */
     public OrderSpecifier<T> nullsLast() {
         return new OrderSpecifier<T>(order, target, NullHandling.NullsLast);
@@ -104,7 +113,7 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof OrderSpecifier) {
-            OrderSpecifier<?> os = (OrderSpecifier)o;
+            OrderSpecifier<?> os = (OrderSpecifier) o;
             return os.order.equals(order) && os.target.equals(target)
                     && os.nullHandling.equals(nullHandling);
         } else {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ParamExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParamExpression.java
new file mode 100644
index 0000000000..270d017801
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParamExpression.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code ParamExpression} defines named and unnamed parameters in queries
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public interface ParamExpression<T> extends Expression<T> {
+
+    /**
+     * Get the name of the parameter
+     *
+     * @return name
+     */
+    String getName();
+
+    /**
+     * Get whether the parameter is anonymous
+     *
+     * @return true, if anonymous
+     */
+    boolean isAnon();
+
+    /**
+     * Get the message for the not set case
+     *
+     * @return not set message
+     */
+    String getNotSetMessage();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpressionImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParamExpressionImpl.java
similarity index 85%
rename from querydsl-core/src/main/java/com/mysema/query/types/ParamExpressionImpl.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ParamExpressionImpl.java
index a467b844c0..e5e920cc4b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpressionImpl.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParamExpressionImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.UUID;
 
-import javax.annotation.concurrent.Immutable;
+import com.querydsl.core.annotations.Immutable;
 
 /**
- * ParamExpressionImpl defines a parameter in a query with an optional name
+ * {@code ParamExpressionImpl} defines a parameter in a query with an optional name
  *
  * @author tiwe
  *
@@ -38,7 +38,7 @@ public ParamExpressionImpl(Class<? extends T> type, String name) {
         this.name = name;
         this.anon = false;
     }
-    
+
     public ParamExpressionImpl(Class<? extends T> type) {
         super(type);
         this.name = UUID.randomUUID().toString().replace("-", "").substring(0, 10);
@@ -55,7 +55,7 @@ public final boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof ParamExpression<?>) {
-            ParamExpression<?> other = (ParamExpression<?>)o;
+            ParamExpression<?> other = (ParamExpression<?>) o;
             return other.getType().equals(getType())
                 && other.getName().equals(name)
                 && other.isAnon() == anon;
@@ -64,14 +64,17 @@ public final boolean equals(Object o) {
         }
     }
 
+    @Override
     public final String getName() {
         return name;
     }
 
+    @Override
     public final boolean isAnon() {
         return anon;
     }
 
+    @Override
     public final String getNotSetMessage() {
         if (!anon) {
             return "The parameter " + name + " needs to be set";
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ParamNotSetException.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParamNotSetException.java
new file mode 100644
index 0000000000..84b2710b6c
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParamNotSetException.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code ParamNotSetException} is thrown when unbound parameters are found before query execution
+ *
+ * @author tiwe
+ *
+ */
+public class ParamNotSetException extends RuntimeException {
+
+    private static final long serialVersionUID = 2019016965590576490L;
+
+    public ParamNotSetException(ParamExpression<?> param) {
+        super(param.getNotSetMessage());
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java
new file mode 100644
index 0000000000..a8414a1226
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedExpression.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code ParameterizedExpression} is a common interface for expressions with generic type parameters
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public interface ParameterizedExpression<T> extends Expression<T> {
+
+    /**
+     * Get the type parameter at the given index
+     *
+     * @param index zero based index of type parameter
+     * @return type parameter at index
+     */
+    Class<?> getParameter(int index);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedPathImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedPathImpl.java
new file mode 100644
index 0000000000..1c24a0b616
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParameterizedPathImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * {@code ParameterizedPathImpl} represents {@link Path} instances with a parameterized generic type
+ *
+ * @param <T>
+ */
+public class ParameterizedPathImpl<T> extends PathImpl<T> implements ParameterizedExpression<T> {
+
+    private static final long serialVersionUID = -498707460985111265L;
+
+    private final Class<?>[] parameterTypes;
+
+    public ParameterizedPathImpl(Class<? extends T> type, PathMetadata metadata, Class<?>... parameterTypes) {
+        super(type, metadata);
+        this.parameterTypes = parameterTypes;
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        return parameterTypes[index];
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamsVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/ParamsVisitor.java
similarity index 82%
rename from querydsl-core/src/main/java/com/mysema/query/types/ParamsVisitor.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ParamsVisitor.java
index 15d87aae41..00772dd1dc 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParamsVisitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ParamsVisitor.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2013, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,25 +11,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.List;
 import java.util.Map;
 
-import com.mysema.query.JoinExpression;
-import com.mysema.query.QueryMetadata;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
 
 /**
- * Copies ParameterExpression bindings from subexpressions to QueryMetadata in the context
- * 
+ * Copies {@code ParameterExpression} bindings from subexpressions to {@link QueryMetadata} in the context
+ *
  * @author tiwe
  *
  */
 public final class ParamsVisitor implements Visitor<Void, QueryMetadata> {
-    
+
     public static final ParamsVisitor DEFAULT = new ParamsVisitor();
-    
-    private ParamsVisitor() {}
+
+    private ParamsVisitor() { }
 
     @Override
     public Void visit(Constant<?> expr, QueryMetadata context) {
@@ -62,9 +62,9 @@ public Void visit(Path<?> expr, QueryMetadata context) {
     public Void visit(SubQueryExpression<?> expr, QueryMetadata context) {
         QueryMetadata md = expr.getMetadata();
         for (Map.Entry<ParamExpression<?>, Object> entry : md.getParams().entrySet()) {
-            context.setParam((ParamExpression)entry.getKey(), entry.getValue());
+            context.setParam((ParamExpression) entry.getKey(), entry.getValue());
         }
-        visit(md.getGroupBy(), context);        
+        visit(md.getGroupBy(), context);
         visit(md.getHaving(), context);
         for (JoinExpression join : md.getJoins()) {
             visit(join.getTarget(), context);
@@ -72,7 +72,7 @@ public Void visit(SubQueryExpression<?> expr, QueryMetadata context) {
         }
         visit(md.getProjection(), context);
         visit(md.getWhere(), context);
-        
+
         return null;
     }
 
@@ -80,18 +80,18 @@ public Void visit(SubQueryExpression<?> expr, QueryMetadata context) {
     public Void visit(TemplateExpression<?> expr, QueryMetadata context) {
         for (Object arg : expr.getArgs()) {
             if (arg instanceof Expression<?>) {
-                ((Expression<?>)arg).accept(this, context);
+                ((Expression<?>) arg).accept(this, context);
             }
         }
         return null;
     }
-    
+
     private void visit(Expression<?> expr, QueryMetadata context) {
         if (expr != null) {
             expr.accept(this, context);
         }
     }
-    
+
     private void visit(List<Expression<?>> exprs, QueryMetadata context) {
         for (Expression<?> arg : exprs) {
             arg.accept(this, context);
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Path.java b/querydsl-core/src/main/java/com/querydsl/core/types/Path.java
new file mode 100644
index 0000000000..de72c7b666
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Path.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code Path} represents a path expression. Paths refer to variables, properties and collection members access.
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+public interface Path<T> extends Expression<T> {
+
+    /**
+     * Get the metadata for this path
+     *
+     * @return path metadata
+     */
+    PathMetadata getMetadata();
+
+    /**
+     * Get the root for this path
+     *
+     * @return root of path
+     */
+    Path<?> getRoot();
+
+    /**
+     * Return the annotated element related to the given path
+     * <p>For property paths the annotated element contains the annotations of the
+     * related field and/or getter method and for all others paths the annotated element
+     * is the expression type.</p>
+     *
+     * @return annotated element
+     */
+    AnnotatedElement getAnnotatedElement();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathExtractor.java b/querydsl-core/src/main/java/com/querydsl/core/types/PathExtractor.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/query/types/PathExtractor.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/PathExtractor.java
index 3c08309b9a..82422a6ea1 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathExtractor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PathExtractor.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.List;
 
 /**
  * Extracts the first path that occurs in an expression via breadth first search
- * 
+ *
  * @author tiwe
  *
  */
 public final class PathExtractor implements Visitor<Path<?>,Void> {
-      
+
     public static final PathExtractor DEFAULT = new PathExtractor();
-    
-    private PathExtractor() {}
+
+    private PathExtractor() { }
 
     @Override
     public Path<?> visit(Constant<?> expr, Void context) {
@@ -65,11 +65,11 @@ public Path<?> visit(TemplateExpression<?> expr, Void context) {
     private Path<?> visit(List<?> exprs) {
         for (Object e : exprs) {
             if (e instanceof Expression) {
-                Path<?> path = ((Expression<?>)e).accept(this, null);
+                Path<?> path = ((Expression<?>) e).accept(this, null);
                 if (path != null) {
                     return path;
-                }    
-            }            
+                }
+            }
         }
         return null;
     }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/PathImpl.java
similarity index 75%
rename from querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/PathImpl.java
index d74b045be7..3c14b3e5e9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathImpl.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PathImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.lang.reflect.AnnotatedElement;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
 
-import com.mysema.util.ReflectionUtils;
+import com.querydsl.core.util.ReflectionUtils;
 
 /**
- * PathImpl defines a default implementation of the {@link Path} interface
+ * {@code PathImpl} defines a default implementation of the {@link Path} interface
  *
  * @author tiwe
  *
@@ -32,24 +32,24 @@ public class PathImpl<T> extends ExpressionBase<T> implements Path<T> {
 
     private static final long serialVersionUID = -2498447742798348162L;
 
-    private final PathMetadata<?> metadata;
+    private final PathMetadata metadata;
 
     private final Path<?> root;
 
     @Nullable
     private transient AnnotatedElement annotatedElement;
-    
-    public PathImpl(Class<? extends T> type, String variable) {
+
+    protected PathImpl(Class<? extends T> type, String variable) {
         this(type, PathMetadataFactory.forVariable(variable));
     }
 
-    public PathImpl(Class<? extends T> type, PathMetadata<?> metadata) {
+    protected PathImpl(Class<? extends T> type, PathMetadata metadata) {
         super(type);
         this.metadata = metadata;
-        this.root = metadata.getRoot() != null ? metadata.getRoot() : this;
+        this.root = metadata.getRootPath() != null ? metadata.getRootPath() : this;
     }
 
-    public PathImpl(Class<? extends T> type, Path<?> parent, String property) {
+    protected PathImpl(Class<? extends T> type, Path<?> parent, String property) {
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
@@ -65,7 +65,7 @@ public final boolean equals(Object o) {
     }
 
     @Override
-    public final PathMetadata<?> getMetadata() {
+    public final PathMetadata getMetadata() {
         return metadata;
     }
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadata.java b/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadata.java
new file mode 100644
index 0000000000..b1d56b715f
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadata.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+/**
+ * {@code PathMetadata} provides metadata for {@link Path} expressions.
+ *
+ * @author tiwe
+ */
+@Immutable
+public final class PathMetadata implements Serializable {
+
+    private static final long serialVersionUID = -1055994185028970065L;
+
+    private final Object element;
+
+    private final int hashCode;
+
+    @Nullable
+    private final Path<?> parent, rootPath;
+
+    private final PathType pathType;
+
+    public PathMetadata(@Nullable Path<?> parent, Object element, PathType type) {
+        this.parent = parent;
+        this.element = element;
+        this.pathType = type;
+        this.rootPath = parent != null ? parent.getRoot() : null;
+        this.hashCode = 31 * element.hashCode() + pathType.name().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof PathMetadata) {
+            PathMetadata p = (PathMetadata) obj;
+            return element.equals(p.element) &&
+                    pathType == p.pathType &&
+                    Objects.equals(parent, p.parent);
+        } else {
+            return false;
+        }
+
+    }
+
+    public Object getElement() {
+        return element;
+    }
+
+    public String getName() {
+        if (pathType == PathType.VARIABLE || pathType == PathType.PROPERTY) {
+            return (String) element;
+        } else {
+            throw new IllegalStateException("name property not available for path of type " + pathType +
+                    ". Use getElement() to access the generic path element.");
+        }
+    }
+
+    @Nullable
+    public Path<?> getParent() {
+        return parent;
+    }
+
+    public PathType getPathType() {
+        return pathType;
+    }
+
+    @Nullable
+    public Path<?> getRootPath() {
+        return rootPath;
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    public boolean isRoot() {
+        return parent == null || (pathType == PathType.DELEGATE && parent.getMetadata().isRoot());
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadataFactory.java b/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadataFactory.java
new file mode 100644
index 0000000000..f76bb56576
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PathMetadataFactory.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Range;
+
+/**
+ * {@code PathMetadataFactory} is a factory class for {@link Path} construction
+ *
+ * @author tiwe
+ *
+ */
+public final class PathMetadataFactory {
+
+    /**
+     * Create a new PathMetadata instance for indexed array access
+     *
+     * @param parent parent path
+     * @param index index of element
+     * @return array access path
+     */
+    public static PathMetadata forArrayAccess(Path<?> parent, Expression<Integer> index) {
+        return new PathMetadata(parent, index, PathType.ARRAYVALUE);
+    }
+
+    /**
+     * Create a new PathMetadata instance for indexed array access
+     *
+     * @param parent parent path
+     * @param index index of element
+     * @return array access path
+     */
+    public static PathMetadata forArrayAccess(Path<?> parent, @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+        return new PathMetadata(parent, index, PathType.ARRAYVALUE_CONSTANT);
+    }
+
+    /**
+     * Create a new PathMetadata instance for collection any access
+     *
+     * @param parent parent path
+     * @return collection any path
+     */
+    public static PathMetadata forCollectionAny(Path<?> parent) {
+        return new PathMetadata(parent, "", PathType.COLLECTION_ANY);
+    }
+
+    /**
+     * Create a new PathMetadata instance for delegate access
+     *
+     * @param delegate delegate path
+     * @return wrapped path
+     */
+    public static <T> PathMetadata forDelegate(Path<T> delegate) {
+        return new PathMetadata(delegate, delegate, PathType.DELEGATE);
+    }
+
+    /**
+     * Create a new PathMetadata instance for indexed list access
+     *
+     * @param parent parent path
+     * @param index index of element
+     * @return list access path
+     */
+    public static PathMetadata forListAccess(Path<?> parent, Expression<Integer> index) {
+        return new PathMetadata(parent, index, PathType.LISTVALUE);
+    }
+
+    /**
+     * Create a new PathMetadata instance for indexed list access
+     *
+     * @param parent parent path
+     * @param index index of element
+     * @return list access path
+     */
+    public static PathMetadata forListAccess(Path<?> parent, @Range(from = 0, to = Integer.MAX_VALUE) int index) {
+        return new PathMetadata(parent, index, PathType.LISTVALUE_CONSTANT);
+    }
+
+    /**
+     * Create a new PathMetadata instance for key based map access
+     *
+     * @param parent parent path
+     * @param key key for map access
+     * @return map access path
+     */
+    public static <KT> PathMetadata forMapAccess(Path<?> parent, Expression<KT> key) {
+        return new PathMetadata(parent, key, PathType.MAPVALUE);
+    }
+
+    /**
+     * Create a new PathMetadata instance for for key based map access
+     *
+     * @param parent parent path
+     * @param key key for map access
+     * @return map access path
+     */
+    public static <KT> PathMetadata forMapAccess(Path<?> parent, KT key) {
+        return new PathMetadata(parent, key, PathType.MAPVALUE_CONSTANT);
+    }
+
+    /**
+     * Create a new PathMetadata instance for property access
+     *
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static PathMetadata forProperty(Path<?> parent, String property) {
+        return new PathMetadata(parent, property, PathType.PROPERTY);
+    }
+
+    /**
+     * Create a new PathMetadata instance for a variable
+     *
+     * @param variable variable name
+     * @return variable path
+     */
+    public static PathMetadata forVariable(String variable) {
+        return new PathMetadata(null, variable, PathType.VARIABLE);
+    }
+
+    private PathMetadataFactory() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathType.java b/querydsl-core/src/main/java/com/querydsl/core/types/PathType.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/query/types/PathType.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/PathType.java
index c391213427..14d7bf7310 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathType.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PathType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,65 +11,70 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 /**
- * PathType represents the relation of a {@link Path} to its parent
+ * {@code PathType} represents the relation of a {@link Path} to its parent
  */
-public enum PathType implements Operator<Object> {
+public enum PathType implements Operator {
     /**
      * Indexed array access (array[i])
      */
     ARRAYVALUE,
-    
+
     /**
      * Indexed array access with constant (array[i])
      */
-    ARRAYVALUE_CONSTANT,    
-        
+    ARRAYVALUE_CONSTANT,
+
     /**
      * Access of any element in a collection
      */
     COLLECTION_ANY,
-    
+
     /**
      * Delegate to an expression
      */
     DELEGATE,
-    
+
     /**
      * Indexed list access (list.get(index))
      */
     LISTVALUE,
-    
+
     /**
      * Indexed list access with constant (list.get(index))
      */
     LISTVALUE_CONSTANT,
-    
+
     /**
      * Map value access (map.get(key))
      */
     MAPVALUE,
-    
+
     /**
      * Map value access with constant (map.get(key))
      */
     MAPVALUE_CONSTANT,
-    
+
     /**
      * Property of the parent
      */
     PROPERTY,
-    
+
     /**
      * Root path
      */
-    VARIABLE;
-    
+    VARIABLE,
+
+    /**
+     * Treated path
+     */
+    TREATED_PATH;
+
     @Override
-    public String getId() {
-        return name();
+    public Class<?> getType() {
+        return Object.class;
     }
-    
+
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java b/querydsl-core/src/main/java/com/querydsl/core/types/Predicate.java
similarity index 77%
rename from querydsl-core/src/main/java/com/mysema/query/types/Predicate.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/Predicate.java
index 95452bbc20..9ab75d73da 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/Predicate.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Predicate.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,20 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 /**
- * Predicate is the common interface for Boolean typed expressions
- * 
+ * {@code Predicate} is the common interface for Boolean typed expressions
+ *
  * @author tiwe
  *
  */
 public interface Predicate extends Expression<Boolean> {
-    
+
     /**
      * Get the negation of the expression
-     * 
-     * @return
+     *
+     * @return negation
      */
     Predicate not();
 
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/PredicateOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/PredicateOperation.java
new file mode 100644
index 0000000000..6d5be6b1ee
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PredicateOperation.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import java.util.List;
+
+/**
+ * {@code PredicateOperation} provides a Boolean typed {@link Operation} implementation
+ *
+ * @author tiwe
+ *
+ */
+@Immutable
+public final class PredicateOperation extends OperationImpl<Boolean> implements Predicate {
+
+    private static final long serialVersionUID = -5371430939203772072L;
+
+    @Nullable
+    private transient volatile Predicate not;
+
+    protected PredicateOperation(Operator operator, List<Expression<?>> args) {
+        super(Boolean.class, operator, args);
+    }
+
+    @Override
+    public Predicate not() {
+        if (not == null) {
+            not = ExpressionUtils.predicate(Ops.NOT, this);
+        }
+        return not;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/PredicateTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/PredicateTemplate.java
new file mode 100644
index 0000000000..58cd356337
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/PredicateTemplate.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import java.util.List;
+
+/**
+ * {@code PredicateTemplate} provides a Boolean typed {@link TemplateExpression} implementation
+ *
+ * @author tiwe
+ *
+ */
+@Immutable
+public class PredicateTemplate extends TemplateExpressionImpl<Boolean> implements Predicate {
+
+    private static final long serialVersionUID = -5371430939203772072L;
+
+    @Nullable
+    private transient volatile Predicate not;
+
+    protected PredicateTemplate(Template template, List<?> args) {
+        super(Boolean.class, template, args);
+    }
+
+    @Override
+    public Predicate not() {
+        if (not == null) {
+            not = ExpressionUtils.predicate(Ops.NOT, this);
+        }
+        return not;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/ProjectionRole.java b/querydsl-core/src/main/java/com/querydsl/core/types/ProjectionRole.java
new file mode 100644
index 0000000000..bc32f14fbf
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ProjectionRole.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+/**
+ * Defines a custom projection for an {@link Expression} type. This interface can be used for Expressions which
+ * behave in a different way when used as part of the projection.
+ *
+ * <p>Usually FactoryExpression instances are used as the custom projection.</p>
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+public interface ProjectionRole<T> {
+
+    /**
+     * Return the custom projection
+     *
+     * @return custom projection
+     */
+    Expression<T> getProjection();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Projections.java b/querydsl-core/src/main/java/com/querydsl/core/types/Projections.java
new file mode 100644
index 0000000000..c828b689fc
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Projections.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Factory class for {@link FactoryExpression} instances
+ *
+ * @author tiwe
+ *
+ */
+public final class Projections {
+
+    /**
+     * Create a typed array projection for the given type and expressions
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> ArrayConstructorExpression<T> array(Class<T[]> type, Expression<T>... exprs) {
+        return new ArrayConstructorExpression<T>(type, exprs);
+    }
+
+    /**
+     * Create an appending factory expression which serializes all the arguments but the uses
+     * the base value as the return value
+     *
+     * @param base first argument
+     * @param rest additional arguments
+     * @param <T> type of projection
+     * @return factory expression
+     */
+    public static <T> AppendingFactoryExpression<T> appending(Expression<T> base, Expression<?>... rest) {
+        return new AppendingFactoryExpression<T>(base, rest);
+    }
+
+    /**
+     * Create a Bean populating projection for the given type and expressions
+     *
+     * <p>Example</p>
+     * <pre>
+     * UserDTO dto = query.select(
+     *     Projections.bean(UserDTO.class, user.firstName, user.lastName));
+     * </pre>
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> QBean<T> bean(Class<? extends T> type, Expression<?>... exprs) {
+        return new QBean<T>(type, exprs);
+    }
+
+    /**
+     * Create a Bean populating projection for the given type and expressions
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> QBean<T> bean(Path<? extends T> type, Expression<?>... exprs) {
+        return new QBean<T>(type.getType(), exprs);
+    }
+
+    /**
+     * Create a Bean populating projection for the given type and bindings
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param bindings property bindings
+     * @return factory expression
+     */
+    public static <T> QBean<T> bean(Path<? extends T> type, Map<String, ? extends Expression<?>> bindings) {
+        return new QBean<T>(type.getType(), bindings);
+    }
+
+    /**
+     * Create a Bean populating projection for the given type and bindings
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param bindings property bindings
+     * @return factory expression
+     */
+    public static <T> QBean<T> bean(Class<? extends T> type, Map<String, ? extends Expression<?>> bindings) {
+        return new QBean<T>(type, bindings);
+    }
+
+    /**
+     * Create a constructor invocation projection for the given type and expressions
+     *
+     * <p>Example</p>
+     * <pre>
+     * UserDTO dto = query.singleResult(
+     *     Projections.constructor(UserDTO.class, user.firstName, user.lastName));
+     * </pre>
+     *
+     * @param <T> type projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> ConstructorExpression<T> constructor(Class<? extends T> type, Expression<?>... exprs) {
+        return new ConstructorExpression<T>(type, exprs);
+    }
+
+    /**
+     * Create a constructor invocation projection for given type, parameter types and expressions
+     *
+     * @param type type of the projection
+     * @param paramTypes constructor parameter types
+     * @param exprs constructor parameters
+     * @param <T> type of projection
+     * @return factory expression
+     */
+    public static <T> ConstructorExpression<T> constructor(Class<? extends T> type, Class<?>[] paramTypes, Expression<?>... exprs) {
+        return new ConstructorExpression<T>(type, paramTypes, exprs);
+    }
+
+    /**
+     * Create a constructor invocation projection for given type, parameter types and expressions
+     *
+     * @param type type of the projection
+     * @param paramTypes constructor parameter types
+     * @param exprs constructor parameters
+     * @param <T> type of projection
+     * @return factory expression
+     */
+    public static <T> ConstructorExpression<T> constructor(Class<? extends T> type, Class<?>[] paramTypes, List<Expression<?>> exprs) {
+        return new ConstructorExpression<T>(type, paramTypes, exprs);
+    }
+
+    /**
+     * Create a field access based Bean populating projection for the given type and expressions
+     *
+     * <p>Example</p>
+     * <pre>
+     * UserDTO dto = query.singleResult(
+     *     Projections.fields(UserDTO.class, user.firstName, user.lastName));
+     * </pre>
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> QBean<T> fields(Class<? extends T> type, Expression<?>... exprs) {
+        return new QBean<T>(type, true, exprs);
+    }
+
+    /**
+     * Create a field access based Bean populating projection for the given type and expressions
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static <T> QBean<T> fields(Path<? extends T> type, Expression<?>... exprs) {
+        return new QBean<T>(type.getType(), true, exprs);
+    }
+
+    /**
+     * Create a field access based  Bean populating projection for the given type and bindings
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param bindings field bindings
+     * @return factory expression
+     */
+    public static <T> QBean<T> fields(Path<? extends T> type, Map<String, ? extends Expression<?>> bindings) {
+        return new QBean<T>(type.getType(), true, bindings);
+    }
+
+    /**
+     * Create a field access based Bean populating projection for the given type and bindings
+     *
+     * @param <T> type of projection
+     * @param type type of the projection
+     * @param bindings field bindings
+     * @return factory expression
+     */
+    public static <T> QBean<T> fields(Class<? extends T> type, Map<String, ? extends Expression<?>> bindings) {
+        return new QBean<T>(type, true, bindings);
+    }
+
+    /**
+     * Create a new List typed projection for the given expressions
+     *
+     * @param args list elements
+     * @return factory expression
+     */
+    public static QList list(Expression<?>... args) {
+        return new QList(args);
+    }
+
+    /**
+     * Create a new List typed projection for the given expressions
+     *
+     * @param args list elements
+     * @return factory expression
+     */
+    public static QList list(List<Expression<?>> args) {
+        return new QList(args);
+    }
+
+    /**
+     * Create a new List typed projection for the given expressions
+     *
+     * @param args list elements
+     * @return factory expression
+     */
+    public static QList list(Expression<?>[]... args) {
+        return new QList(args);
+    }
+
+    /**
+     * Create a Map typed projection for the given expressions
+     *
+     * <p>Example</p>
+     * <pre>{@code
+     * Map<Expression<?>, ?> map = query.select(
+     *      Projections.map(user.firstName, user.lastName));
+     * }</pre>
+     *
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static QMap map(Expression<?>... exprs) {
+        return new QMap(exprs);
+    }
+
+    /**
+     * Create a Tuple typed projection for the given expressions
+     *
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static QTuple tuple(Expression<?>... exprs) {
+        return new QTuple(exprs);
+    }
+
+    /**
+     * Create a Tuple typed projection for the given expressions
+     *
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static QTuple tuple(List<Expression<?>> exprs) {
+        return new QTuple(exprs);
+    }
+
+    /**
+     * Create a Tuple typed projection for the given expressions
+     *
+     * @param exprs arguments for the projection
+     * @return factory expression
+     */
+    public static QTuple tuple(Expression<?>[]... exprs) {
+        return new QTuple(exprs);
+    }
+
+    private Projections() { }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java b/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
new file mode 100644
index 0000000000..339b8b0485
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.util.PrimitiveUtils;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@code QBean} is a JavaBean populating projection type
+ *
+ * <p>Example</p>
+ *
+ * <pre>
+ * {@code
+ * QEmployee employee = QEmployee.employee;
+ * List<EmployeeInfo> result = query.from(employee)
+ *      .where(employee.valid.eq(true))
+ *      .select(Projections.bean(EmployeeInfo.class, employee.firstName, employee.lastName))
+ *      .fetch();
+ * }
+ * </pre>
+ *
+ * @author tiwe
+ *
+ * @param <T> bean type
+ */
+public class QBean<T> extends FactoryExpressionBase<T> {
+
+    private static final long serialVersionUID = -8210214512730989778L;
+
+    private static Map<String,Expression<?>> createBindings(Expression<?>... args) {
+        Map<String, Expression<?>> rv = new LinkedHashMap<>();
+        for (Expression<?> expr : args) {
+            if (expr instanceof Path<?>) {
+                Path<?> path = (Path<?>) expr;
+                rv.put(path.getMetadata().getName(), expr);
+            } else if (expr instanceof Operation<?>) {
+                Operation<?> operation = (Operation<?>) expr;
+                if (operation.getOperator() == Ops.ALIAS && operation.getArg(1) instanceof Path<?>) {
+                    Path<?> path = (Path<?>) operation.getArg(1);
+                    if (isCompoundExpression(operation.getArg(0))) {
+                        rv.put(path.getMetadata().getName(), operation.getArg(0));
+                    } else {
+                        rv.put(path.getMetadata().getName(), operation);
+                    }
+                } else {
+                    throw new IllegalArgumentException("Unsupported expression " + expr);
+                }
+
+            } else {
+                throw new IllegalArgumentException("Unsupported expression " + expr);
+            }
+        }
+        return Collections.unmodifiableMap(rv);
+    }
+
+    private static boolean isCompoundExpression(Expression<?> expr) {
+        return expr instanceof FactoryExpression || expr instanceof GroupExpression;
+    }
+
+    private static Class<?> normalize(Class<?> cl) {
+        return cl.isPrimitive() ? PrimitiveUtils.wrap(cl) : cl;
+    }
+
+    private static boolean isAssignableFrom(Class<?> cl1, Class<?> cl2) {
+        return normalize(cl1).isAssignableFrom(normalize(cl2));
+    }
+
+    private final Map<String, Expression<?>> bindings;
+
+    private final List<Field> fields;
+
+    private final List<Method> setters;
+
+    private final boolean fieldAccess;
+
+    /**
+     * Create a new QBean instance
+     *
+     * @param type type of bean
+     * @param bindings bindings
+     */
+    protected QBean(Class<? extends T> type, Map<String, ? extends Expression<?>> bindings) {
+        this(type, false, bindings);
+    }
+
+    /**
+     * Create a new QBean instance
+     *
+     * @param type type of bean
+     * @param args properties to be populated
+     */
+    protected QBean(Class<? extends T> type, Expression<?>... args) {
+        this(type, false, args);
+    }
+
+    /**
+     * Create a new QBean instance
+     *
+     * @param type type of bean
+     * @param fieldAccess true, for field access and false, for property access
+     * @param args fields or properties to be populated
+     */
+    protected QBean(Class<? extends T> type, boolean fieldAccess, Expression<?>... args) {
+        this(type, fieldAccess, createBindings(args));
+    }
+
+    /**
+     * Create a new QBean instance
+     *
+     * @param type type of bean
+     * @param fieldAccess true, for field access and false, for property access
+     * @param bindings bindings
+     */
+    protected QBean(Class<? extends T> type, boolean fieldAccess, Map<String, ? extends Expression<?>> bindings) {
+        super(type);
+        this.bindings = Collections.unmodifiableMap(new LinkedHashMap<>(bindings));
+        this.fieldAccess = fieldAccess;
+        if (fieldAccess) {
+            this.fields = initFields(bindings);
+            this.setters = Collections.emptyList();
+        } else {
+            this.fields = Collections.emptyList();
+            this.setters = initMethods(bindings);
+        }
+    }
+
+    private List<Field> initFields(Map<String, ? extends Expression<?>> args) {
+        List<Field> fields = new ArrayList<Field>(args.size());
+        for (Map.Entry<String,? extends Expression<?>> entry : args.entrySet()) {
+            String property = entry.getKey();
+            Expression<?> expr = entry.getValue();
+            Class<?> beanType = getType();
+            Field field = null;
+            while (!beanType.equals(Object.class)) {
+                try {
+                    field = beanType.getDeclaredField(property);
+                    field.setAccessible(true);
+                    if (!isAssignableFrom(field.getType(), expr.getType())) {
+                        typeMismatch(field.getType(), expr);
+                    }
+                    beanType = Object.class;
+                } catch (SecurityException e) {
+                    // do nothing
+                } catch (NoSuchFieldException e) {
+                    beanType = beanType.getSuperclass();
+                }
+            }
+            if (field == null) {
+                propertyNotFound(expr, property);
+            }
+            fields.add(field);
+        }
+        return fields;
+    }
+
+    private List<Method> initMethods(Map<String, ? extends Expression<?>> args) {
+        try {
+            List<Method> methods = new ArrayList<Method>(args.size());
+            BeanInfo beanInfo = Introspector.getBeanInfo(getType());
+            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+            for (Map.Entry<String, ? extends Expression<?>> entry : args.entrySet()) {
+                String property = entry.getKey();
+                Expression<?> expr = entry.getValue();
+                Method setter = null;
+                for (PropertyDescriptor prop : propertyDescriptors) {
+                    if (prop.getName().equals(property)) {
+                        setter = prop.getWriteMethod();
+                        if (!isAssignableFrom(prop.getPropertyType(), expr.getType())) {
+                            typeMismatch(prop.getPropertyType(), expr);
+                        }
+                        break;
+                    }
+                }
+                if (setter == null) {
+                    propertyNotFound(expr, property);
+                }
+                methods.add(setter);
+            }
+            return methods;
+        } catch (IntrospectionException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    protected void propertyNotFound(Expression<?> expr, String property) {
+        // do nothing
+    }
+
+    protected void typeMismatch(Class<?> type, Expression<?> expr) {
+        final String msg = expr.getType().getName() + " is not compatible with " + type.getName();
+        throw new IllegalArgumentException(msg);
+    }
+
+    @Override
+    public T newInstance(Object... a) {
+        try {
+            T rv = create(getType());
+            if (fieldAccess) {
+                for (int i = 0; i < a.length; i++) {
+                    Object value = a[i];
+                    if (value != null) {
+                        Field field = fields.get(i);
+                        if (field != null) {
+                            field.set(rv, value);
+                        }
+                    }
+                }
+            } else {
+                for (int i = 0; i < a.length; i++) {
+                    Object value = a[i];
+                    if (value != null) {
+                        Method setter = setters.get(i);
+                        if (setter != null) {
+                            setter.invoke(rv, value);
+                        }
+                    }
+                }
+            }
+            return rv;
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        }
+    }
+
+    protected <T> T create(Class<T> type) throws IllegalAccessException, InstantiationException {
+        return type.newInstance();
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    @SuppressWarnings("unchecked")
+    public Expression<T> as(Path<T> alias) {
+        return ExpressionUtils.operation(getType(),Ops.ALIAS, this, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    public Expression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof QBean<?>) {
+            QBean<?> c = (QBean<?>) obj;
+            return getArgs().equals(c.getArgs()) && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return new ArrayList<>(bindings.values());
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QList.java b/querydsl-core/src/main/java/com/querydsl/core/types/QList.java
new file mode 100644
index 0000000000..18521b64a0
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/QList.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.CollectionUtils;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code QList} represents a projection of type List
+ *
+ * @author tiwe
+ *
+ */
+public class QList extends FactoryExpressionBase<List<?>> {
+
+    private static final long serialVersionUID = -7545994090073480810L;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    /**
+     * Create a new QList instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QList(Expression<?>... args) {
+        super((Class) List.class);
+        this.args = CollectionUtils.unmodifiableList(Arrays.asList(args));
+    }
+
+    /**
+     * Create a new QList instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QList(List<Expression<?>> args) {
+        super((Class) List.class);
+        this.args = CollectionUtils.unmodifiableList(args);
+    }
+
+    /**
+     * Create a new QMap instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QList(Expression<?>[]... args) {
+        super((Class) List.class);
+        List<Expression<?>> builder = new ArrayList<>();
+        for (Expression<?>[] exprs: args) {
+            Collections.addAll(builder, exprs);
+        }
+        this.args = CollectionUtils.unmodifiableList(builder);
+    }
+
+    @Override
+    @Nullable
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof FactoryExpression) {
+            FactoryExpression<?> c = (FactoryExpression<?>) obj;
+            return args.equals(c.getArgs()) && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @Nullable
+    public List<?> newInstance(Object... args) {
+        return Collections.unmodifiableList(Arrays.asList(args));
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QMap.java b/querydsl-core/src/main/java/com/querydsl/core/types/QMap.java
new file mode 100644
index 0000000000..87898816d9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/QMap.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code QMap} represents a projection of type Map
+ *
+ * <p>Usage example</p>
+ * <pre>
+ * {@code
+ * List<Map<Expression<?>,?> result = query.from(employee).select(Projections.map(employee.firstName, employee.lastName)).fetch();
+ * for (Tuple row : result) {
+ *     System.out.println("firstName " + row.get(employee.firstName));
+ *     System.out.println("lastName " + row.get(employee.lastName));
+ * }
+ * }
+ * </pre>
+ *
+ * @author tiwe
+ *
+ */
+public class QMap extends FactoryExpressionBase<Map<Expression<?>,?>> {
+
+    private static final long serialVersionUID = -7545994090073480810L;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    /**
+     * Create a new QMap instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QMap(Expression<?>... args) {
+        super((Class) Map.class);
+        this.args = CollectionUtils.unmodifiableList(Arrays.asList(args));
+    }
+
+    /**
+     * Create a new QMap instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QMap(List<Expression<?>> args) {
+        super((Class) Map.class);
+        this.args = CollectionUtils.unmodifiableList(args);
+    }
+
+    /**
+     * Create a new QMap instance
+     *
+     * @param args
+     */
+    @SuppressWarnings("unchecked")
+    protected QMap(Expression<?>[]... args) {
+        super((Class) Map.class);
+        List<Expression<?>> builder = new ArrayList<>();
+        for (Expression<?>[] exprs: args) {
+            Collections.addAll(builder, exprs);
+        }
+        this.args = CollectionUtils.unmodifiableList(builder);
+    }
+
+    @Override
+    @Nullable
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof FactoryExpression) {
+            FactoryExpression<?> c = (FactoryExpression<?>) obj;
+            return args.equals(c.getArgs()) && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @Nullable
+    public Map<Expression<?>, ?> newInstance(Object... args) {
+        Map<Expression<?>, Object> map = new HashMap<>();
+        for (int i = 0; i < args.length; i++) {
+            map.put(this.args.get(i), args[i]);
+        }
+        return map;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QTuple.java b/querydsl-core/src/main/java/com/querydsl/core/types/QTuple.java
new file mode 100644
index 0000000000..22629bc7e2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/QTuple.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.util.CollectionUtils;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * {@code QTuple} represents a projection of type {@link Tuple}
+ *
+ * <p>Usage example:</p>
+ * <pre>
+ * {@code
+ * List<Tuple> result = query.from(employee).select(Projections.tuple(employee.firstName, employee.lastName)).fetch();
+ * for (Tuple row : result) {
+ *     System.out.println("firstName " + row.get(employee.firstName));
+ *     System.out.println("lastName " + row.get(employee.lastName));
+ * }}
+ * </pre>
+ *
+ * <p>Since Tuple projection is the default for multi column projections, the above is equivalent to this code</p>
+ *
+ * <pre>
+ * {@code
+ * List<Tuple> result = query.from(employee).select(employee.firstName, employee.lastName).fetch();
+ * for (Tuple row : result) {
+ *     System.out.println("firstName " + row.get(employee.firstName));
+ *     System.out.println("lastName " + row.get(employee.lastName));
+ * }}
+ * </pre>
+ *
+ * @author tiwe
+ *
+ */
+@Immutable
+public class QTuple extends FactoryExpressionBase<Tuple> {
+
+    private static Map<Expression<?>, Integer> createBindings(List<Expression<?>> exprs) {
+        Map<Expression<?>, Integer> map = new LinkedHashMap<>();
+        for (int i = 0; i < exprs.size(); i++) {
+            Expression<?> e = exprs.get(i);
+            if (e instanceof Operation && ((Operation<?>) e).getOperator() == Ops.ALIAS) {
+                map.put(((Operation<?>) e).getArg(1), i);
+            }
+            map.put(e, i);
+        }
+        return Collections.unmodifiableMap(map);
+    }
+
+    private final class TupleImpl implements Tuple, Serializable {
+
+        private static final long serialVersionUID = 6635924689293325950L;
+
+        private final Object[] a;
+
+        private TupleImpl(Object[] a) {
+            this.a = a;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T get(int index, Class<T> type) {
+            return (T) a[index];
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T get(Expression<T> expr) {
+            Integer idx = QTuple.this.bindings.get(expr);
+            if (idx != null) {
+                return (T) a[idx];
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public int size() {
+            return a.length;
+        }
+
+        @Override
+        public Object[] toArray() {
+            return a;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) {
+                return true;
+            } else if (obj instanceof Tuple) {
+                return Arrays.equals(a, ((Tuple) obj).toArray());
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(a);
+        }
+
+        @Override
+        public String toString() {
+            return Arrays.toString(a);
+        }
+    }
+
+    private static final long serialVersionUID = -2640616030595420465L;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    private final Map<Expression<?>, Integer> bindings;
+
+    /**
+     * Create a new QTuple instance
+     *
+     * @param args
+     */
+    protected QTuple(Expression<?>... args) {
+        this(Arrays.asList(args));
+    }
+
+    /**
+     * Create a new QTuple instance
+     *
+     * @param args
+     */
+    protected QTuple(List<Expression<?>> args) {
+        super(Tuple.class);
+        this.args = CollectionUtils.unmodifiableList(args);
+        this.bindings = createBindings(this.args);
+    }
+
+    /**
+     * Create a new QTuple instance
+     *
+     * @param args
+     */
+    protected QTuple(Expression<?>[]... args) {
+        super(Tuple.class);
+        ArrayList<Expression<?>> builder = new ArrayList<>();
+        for (Expression<?>[] exprs: args) {
+            Collections.addAll(builder, exprs);
+        }
+        this.args = CollectionUtils.unmodifiableList(builder);
+        this.bindings = createBindings(this.args);
+    }
+
+    @Override
+    public Tuple newInstance(Object... a) {
+        return new TupleImpl(a);
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof FactoryExpression) {
+            FactoryExpression<?> c = (FactoryExpression<?>) obj;
+            return args.equals(c.getArgs()) && getType().equals(c.getType());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpression.java
new file mode 100644
index 0000000000..bda49b658d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.QueryMetadata;
+
+/**
+ * {@code SubQueryExpression} represents a sub query.
+ *
+ * @author tiwe
+ *
+ * @param <T> return type of subquery
+ */
+public interface SubQueryExpression<T> extends Expression<T> {
+
+    /**
+     * Get the query metadata for the subquery
+     *
+     * @return metadata
+     */
+    QueryMetadata getMetadata();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpressionImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpressionImpl.java
similarity index 79%
rename from querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpressionImpl.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpressionImpl.java
index e82e471494..92de908573 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/SubQueryExpressionImpl.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/SubQueryExpressionImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
-import javax.annotation.concurrent.Immutable;
+import com.querydsl.core.annotations.Immutable;
 
-import com.mysema.query.QueryMetadata;
+import com.querydsl.core.QueryMetadata;
 
 /**
- * SubQueryExpressionImpl is the default implementation of the {@link SubQueryExpression} interface
+ * {@code SubQueryExpressionImpl} is the default implementation of the {@link SubQueryExpression} interface
  *
  * @author tiwe
- *
+ * @param <T> Result type
  */
 @Immutable
 public class SubQueryExpressionImpl<T> extends ExpressionBase<T> implements SubQueryExpression<T> {
@@ -40,7 +40,7 @@ public final boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof SubQueryExpression) {
-            SubQueryExpression<T> s = (SubQueryExpression<T>)o;
+            SubQueryExpression<T> s = (SubQueryExpression<T>) o;
             return s.getMetadata().equals(metadata);
         } else {
             return false;
@@ -51,10 +51,10 @@ public final boolean equals(Object o) {
     public final QueryMetadata getMetadata() {
         return metadata;
     }
-    
+
     @Override
     public final <R, C> R accept(Visitor<R, C> v, C context) {
         return v.visit(this, context);
     }
-    
+
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Template.java b/querydsl-core/src/main/java/com/querydsl/core/types/Template.java
new file mode 100644
index 0000000000..88bdc06fe8
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Template.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.CollectionUtils;
+import com.querydsl.core.util.MathUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+import com.querydsl.core.annotations.Immutable;
+
+/**
+ * {@code Template} provides serialization templates for {@link Operation},
+ * {@link TemplateExpression} and {@link Path} serialization
+ *
+ * @author tiwe
+ *
+ */
+@Immutable
+public final class Template implements Serializable {
+
+    private static final long serialVersionUID = -1697705745769542204L;
+
+    private static final Set<? extends Operator> CONVERTIBLES = Collections.unmodifiableSet(EnumSet.of(Ops.ADD, Ops.SUB));
+
+    /**
+     * General template element
+     */
+    @Immutable
+    public abstract static class Element implements Serializable {
+
+        private static final long serialVersionUID = 3396877288101929387L;
+
+        public abstract Object convert(List<?> args);
+
+        public abstract boolean isString();
+
+    }
+
+    /**
+     * Expression as string
+     */
+    public static final class AsString extends Element {
+
+        private static final long serialVersionUID = -655362047873616197L;
+
+        private final int index;
+
+        private final String toString;
+
+        public AsString(int index) {
+            this.index = index;
+            this.toString = index + "s";
+        }
+
+        @Override
+        public Object convert(final List<?> args) {
+            final Object arg = args.get(index);
+            return arg instanceof Constant<?> ? arg.toString() : arg;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        @Override
+        public boolean isString() {
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return toString;
+        }
+
+    }
+
+    /**
+     * Static text element
+     */
+    public static final class StaticText extends Element {
+
+        private static final long serialVersionUID = -2791869625053368023L;
+
+        private final String text;
+
+        private final String toString;
+
+        public StaticText(String text) {
+            this.text = text;
+            this.toString = "'" + text + "'";
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        @Override
+        public boolean isString() {
+            return true;
+        }
+
+        @Override
+        public Object convert(List<?> args) {
+            return text;
+        }
+
+        @Override
+        public String toString() {
+            return toString;
+        }
+
+    }
+
+    /**
+     * Transformed expression
+     */
+    public static final class Transformed extends Element {
+
+        private static final long serialVersionUID = 702677732175745567L;
+
+        private final int index;
+
+        private final transient Function<Object, Object> transformer;
+
+        private final String toString;
+
+        public Transformed(int index, Function<Object, Object> transformer) {
+            this.index = index;
+            this.transformer = transformer;
+            this.toString = String.valueOf(index);
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        @Override
+        public Object convert(final List<?> args) {
+            return transformer.apply(args.get(index));
+        }
+
+        @Override
+        public boolean isString() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return toString;
+        }
+
+    }
+
+    /**
+     * Argument by index
+     */
+    public static final class ByIndex extends Element {
+
+        private static final long serialVersionUID = 4711323946026029998L;
+
+        private final int index;
+
+        private final String toString;
+
+        public ByIndex(int index) {
+            this.index = index;
+            this.toString = String.valueOf(index);
+        }
+
+        @Override
+        public Object convert(final List<?> args) {
+            final Object arg = args.get(index);
+            if (arg instanceof Expression) {
+                return ExpressionUtils.extract((Expression<?>) arg);
+            } else {
+                return arg;
+            }
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        @Override
+        public boolean isString() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return toString;
+        }
+
+    }
+
+    /**
+     * Math operation
+     */
+    public static final class Operation extends Element {
+
+        private static final long serialVersionUID = 1400801176778801584L;
+
+        private final int index1, index2;
+
+        private final Operator operator;
+
+        private final boolean asString;
+
+        public Operation(int index1, int index2, Operator operator, boolean asString) {
+            this.index1 = index1;
+            this.index2 = index2;
+            this.operator = operator;
+            this.asString = asString;
+        }
+
+        @Override
+        public Object convert(List<?> args) {
+            Object arg1 = args.get(index1);
+            Object arg2 = args.get(index2);
+            if (isNumber(arg1) && isNumber(arg2)) {
+                return MathUtils.result(asNumber(arg1), asNumber(arg2), operator);
+            } else {
+                Expression<?> expr1 = asExpression(arg1);
+                Expression<?> expr2 = asExpression(arg2);
+
+                if (arg2 instanceof Number) {
+                    if (CONVERTIBLES.contains(operator) && expr1 instanceof com.querydsl.core.types.Operation) {
+                        com.querydsl.core.types.Operation operation = (com.querydsl.core.types.Operation) expr1;
+                        if (CONVERTIBLES.contains(operation.getOperator()) && operation.getArg(1) instanceof Constant) {
+                            Number num1 = ((Constant<Number>) operation.getArg(1)).getConstant();
+                            Number num2;
+                            if (operator == operation.getOperator()) {
+                                num2 = MathUtils.result(num1, (Number) arg2, Ops.ADD);
+                            } else if (operator == Ops.ADD) {
+                                num2 = MathUtils.result((Number) arg2, num1, Ops.SUB);
+                            } else {
+                                num2 = MathUtils.result(num1, (Number) arg2, Ops.SUB);
+                            }
+                            return ExpressionUtils.operation(expr1.getType(), operator,
+                                    operation.getArg(0), Expressions.constant(num2));
+                        }
+                    }
+                }
+
+                return ExpressionUtils.operation(expr1.getType(), operator, expr1, expr2);
+            }
+        }
+
+        @Override
+        public boolean isString() {
+            return asString;
+        }
+
+        @Override
+        public String toString() {
+            return index1 + " " + operator + " " + index2;
+        }
+    }
+
+    /**
+     * Math operation with constant
+     */
+    public static final class OperationConst extends Element {
+
+        private static final long serialVersionUID = 1400801176778801584L;
+
+        private final int index1;
+
+        private final Number arg2;
+
+        private final Expression<Number> expr2;
+
+        private final Operator operator;
+
+        private final boolean asString;
+
+        @Deprecated
+        public OperationConst(int index1, BigDecimal arg2, Operator operator, boolean asString) {
+            this(index1, (Number) arg2, operator, asString);
+        }
+
+        public OperationConst(int index1, Number arg2, Operator operator, boolean asString) {
+            this.index1 = index1;
+            this.arg2 = arg2;
+            this.expr2 = Expressions.constant(arg2);
+            this.operator = operator;
+            this.asString = asString;
+        }
+
+        @Override
+        public Object convert(List<?> args) {
+            Object arg1 = args.get(index1);
+            if (isNumber(arg1)) {
+                return MathUtils.result(asNumber(arg1), arg2, operator);
+            } else {
+                Expression<?> expr1 = asExpression(arg1);
+
+                if (CONVERTIBLES.contains(operator) && expr1 instanceof com.querydsl.core.types.Operation) {
+                    com.querydsl.core.types.Operation operation = (com.querydsl.core.types.Operation) expr1;
+                    if (CONVERTIBLES.contains(operation.getOperator()) && operation.getArg(1) instanceof Constant) {
+                        Number num1 = ((Constant<Number>) operation.getArg(1)).getConstant();
+                        Number num2;
+                        if (operator == operation.getOperator()) {
+                            num2 = MathUtils.result(num1, arg2, Ops.ADD);
+                        } else if (operator == Ops.ADD) {
+                            num2 = MathUtils.result(arg2, num1, Ops.SUB);
+                        } else {
+                            num2 = MathUtils.result(num1, arg2, Ops.SUB);
+                        }
+                        return ExpressionUtils.operation(expr1.getType(), operator,
+                                operation.getArg(0), Expressions.constant(num2));
+                    }
+                }
+
+                return ExpressionUtils.operation(expr1.getType(), operator, expr1, expr2);
+            }
+        }
+
+        @Override
+        public boolean isString() {
+            return asString;
+        }
+
+        @Override
+        public String toString() {
+            return index1 + " " + operator + " " + arg2;
+        }
+    }
+
+    private final List<Element> elements;
+
+    private final String template;
+
+    Template(String template, List<Element> elements) {
+        this.template = template;
+        this.elements = CollectionUtils.unmodifiableList(elements);
+    }
+
+    public List<Element> getElements() {
+        return elements;
+    }
+
+    @Override
+    public String toString() {
+        return template;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Template) {
+            return ((Template) o).template.equals(template);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return template.hashCode();
+    }
+
+    private static Number asNumber(Object arg) {
+        if (arg instanceof Number) {
+            return (Number) arg;
+        } else if (arg instanceof Constant) {
+            return (Number) ((Constant) arg).getConstant();
+        } else {
+            throw new IllegalArgumentException(arg.toString());
+        }
+    }
+
+    private static boolean isNumber(Object o) {
+        return o instanceof Number || o instanceof Constant
+                && ((Constant<?>) o).getConstant() instanceof Number;
+    }
+
+    private static Expression<?> asExpression(Object arg) {
+        if (arg instanceof Expression) {
+            return ExpressionUtils.extract((Expression<?>) arg);
+        } else {
+            return Expressions.constant(arg);
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpression.java
new file mode 100644
index 0000000000..20003705cf
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpression.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.List;
+
+/**
+ * {@code TemplateExpression} provides base types for custom expressions with integrated
+ * serialization templates
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+public interface TemplateExpression<T> extends Expression<T> {
+
+    /**
+     * Get the argument with the given index
+     *
+     * @param index zero based index of element
+     * @return element at index
+     */
+    Object getArg(int index);
+
+    /**
+     * Get the arguments of the custom expression
+     *
+     * @return expression argument
+     */
+    List<?> getArgs();
+
+    /**
+     * Get the serialization template for this custom expression
+     *
+     * @return template
+     */
+    Template getTemplate();
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpressionImpl.java b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpressionImpl.java
new file mode 100644
index 0000000000..ecdd925c58
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateExpressionImpl.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.util.CollectionUtils;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * Default implementation of the {@link TemplateExpression} interface
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@Immutable
+public class TemplateExpressionImpl<T> extends ExpressionBase<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = 6951623726800809083L;
+
+    @Unmodifiable
+    private final List<?> args;
+
+    private final Template template;
+
+    protected TemplateExpressionImpl(Class<? extends T> type, Template template, Object... args) {
+        this(type, template, Arrays.asList(args));
+    }
+
+    protected TemplateExpressionImpl(Class<? extends T> type, Template template, List<?> args) {
+        super(type);
+        this.args = CollectionUtils.unmodifiableList(args);
+        this.template = template;
+    }
+
+    @Override
+    public final Object getArg(int index) {
+        return getArgs().get(index);
+    }
+
+    @Override
+    @Unmodifiable
+    public final List<?> getArgs() {
+        return args;
+    }
+
+    @Override
+    public final Template getTemplate() {
+        return template;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+       if (o == this) {
+           return true;
+       } else if (o instanceof TemplateExpression) {
+           TemplateExpression<?> c = (TemplateExpression<?>) o;
+           return c.getTemplate().equals(template)
+               && c.getType().equals(getType())
+               && c.getArgs().equals(args);
+
+       } else {
+           return false;
+       }
+    }
+
+    @Override
+    public final <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java
new file mode 100644
index 0000000000..4fec91ca47
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/TemplateFactory.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import com.querydsl.core.types.Template.Element;
+import com.querydsl.core.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * {@code TemplateFactory} is a factory for {@link Template} instances
+ *
+ * @author tiwe
+ *
+ */
+public class TemplateFactory {
+
+    private static final Map<String, Operator> OPERATORS;
+
+    static {
+        HashMap<String, Operator> operators = new HashMap<>();
+        operators.put("+", Ops.ADD);
+        operators.put("-", Ops.SUB);
+        operators.put("*", Ops.MULT);
+        operators.put("/", Ops.DIV);
+        OPERATORS = Collections.unmodifiableMap(operators);
+    }
+
+    public static final TemplateFactory DEFAULT = new TemplateFactory('\\');
+
+    private static final Constant<String> PERCENT = ConstantImpl.create("%");
+
+    private static final Pattern elementPattern = Pattern.compile("\\{"
+            + "(%?%?)"
+            + "(\\d+)"
+            + "(?:([+-/*])(?:(\\d+)|'(-?\\d+(?:\\.\\d+)?)'))?"
+            + "([slu%]?%?)"
+            + "\\}");
+
+    private final Map<String, Template> cache = Collections.synchronizedMap(new WeakHashMap<>());;
+
+    private final char escape;
+
+    private final Function<Object,Object> toLowerCase =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        return ExpressionUtils.operation(String.class, Ops.LOWER, (Expression) arg);
+                    } else {
+                        return String.valueOf(arg).toLowerCase();
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toUpperCase =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        return ExpressionUtils.operation(String.class, Ops.UPPER, (Expression) arg);
+                    } else {
+                        return String.valueOf(arg).toUpperCase();
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toStartsWithViaLike =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        return ExpressionUtils.operation(String.class, Ops.CONCAT, (Expression) arg, PERCENT);
+                    } else {
+                        return escapeForLike(String.valueOf(arg)) + "%";
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toStartsWithViaLikeLower =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        Expression<String> concatenated = ExpressionUtils.operation(String.class, Ops.CONCAT, (Expression) arg, PERCENT);
+                        return ExpressionUtils.operation(String.class, Ops.LOWER, concatenated);
+                    } else {
+                        return escapeForLike(String.valueOf(arg).toLowerCase()) + "%";
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toEndsWithViaLike =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        return ExpressionUtils.operation(String.class, Ops.CONCAT, PERCENT, (Expression) arg);
+                    } else {
+                        return "%" + escapeForLike(String.valueOf(arg));
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toEndsWithViaLikeLower =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        Expression<String> concatenated = ExpressionUtils.operation(String.class, Ops.CONCAT, PERCENT, (Expression) arg);
+                        return ExpressionUtils.operation(String.class, Ops.LOWER, concatenated);
+                    } else {
+                        return "%" + escapeForLike(String.valueOf(arg).toLowerCase());
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toContainsViaLike =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        Expression<String> concatenated = ExpressionUtils.operation(String.class, Ops.CONCAT, PERCENT, (Expression) arg);
+                        return ExpressionUtils.operation(String.class, Ops.CONCAT, concatenated, PERCENT);
+                    } else {
+                        return "%" + escapeForLike(String.valueOf(arg)) + "%";
+                    }
+                }
+            };
+
+    private final Function<Object,Object> toContainsViaLikeLower =
+            new Function<Object,Object>() {
+                @Override
+                public Object apply(Object arg) {
+                    if (arg instanceof Constant<?>) {
+                        return ConstantImpl.create(apply(arg.toString()).toString());
+                    } else if (arg instanceof Expression) {
+                        Expression<String> concatenated = ExpressionUtils.operation(String.class, Ops.CONCAT, PERCENT, (Expression) arg);
+                        concatenated = ExpressionUtils.operation(String.class, Ops.CONCAT, concatenated, PERCENT);
+                        return ExpressionUtils.operation(String.class, Ops.LOWER, concatenated);
+                    } else {
+                        return "%" + escapeForLike(String.valueOf(arg).toLowerCase()) + "%";
+                    }
+                }
+            };
+
+    public TemplateFactory(char escape) {
+        this.escape = escape;
+    }
+
+    public Template create(String template) {
+        if (cache.containsKey(template)) {
+            return cache.get(template);
+        } else {
+            Matcher m = elementPattern.matcher(template);
+            final List<Element> elements = new ArrayList<>();
+            int end = 0;
+            while (m.find()) {
+                if (m.start() > end) {
+                    elements.add(new Template.StaticText(template.substring(end, m.start())));
+                }
+                String premodifiers = m.group(1).toLowerCase(Locale.ENGLISH);
+                int index = Integer.parseInt(m.group(2));
+                String postmodifiers = m.group(6).toLowerCase(Locale.ENGLISH);
+                boolean asString = false;
+                Function<Object, Object> transformer = null;
+                switch (premodifiers.length()) {
+                    case 1:
+                        transformer = toEndsWithViaLike;
+                        break;
+                    case 2:
+                        transformer = toEndsWithViaLikeLower;
+                        break;
+                }
+                switch (postmodifiers.length()) {
+                    case 1:
+                        switch (postmodifiers.charAt(0)) {
+                            case '%':
+                                if (transformer == null) {
+                                    transformer = toStartsWithViaLike;
+                                } else {
+                                    transformer = toContainsViaLike;
+                                }
+                                break;
+                            case 'l':
+                                transformer = toLowerCase;
+                                break;
+                            case 'u':
+                                transformer = toUpperCase;
+                                break;
+                            case 's':
+                                asString = true;
+                                break;
+                        }
+                        break;
+                    case 2:
+                        if (transformer == null) {
+                            transformer = toStartsWithViaLikeLower;
+                        } else {
+                            transformer = toContainsViaLikeLower;
+                        }
+                        break;
+                }
+                if (m.group(4) != null) {
+                    Operator operator = OPERATORS.get(m.group(3));
+                    int index2 = Integer.parseInt(m.group(4));
+                    elements.add(new Template.Operation(index, index2, operator, asString));
+                } else if (m.group(5) != null) {
+                    Operator operator = OPERATORS.get(m.group(3));
+                    Number number;
+                    if (m.group(5).contains(".")) {
+                        number = new BigDecimal(m.group(5));
+                    } else {
+                        number = Integer.valueOf(m.group(5));
+                    }
+                    elements.add(new Template.OperationConst(index, number, operator, asString));
+                } else if (asString) {
+                    elements.add(new Template.AsString(index));
+                } else if (transformer != null) {
+                    elements.add(new Template.Transformed(index, transformer));
+                } else {
+                    elements.add(new Template.ByIndex(index));
+                }
+                end = m.end();
+            }
+            if (end < template.length()) {
+                elements.add(new Template.StaticText(template.substring(end)));
+            }
+            Template rv = new Template(template, CollectionUtils.unmodifiableList(elements));
+            cache.put(template, rv);
+            return rv;
+        }
+    }
+
+    public String escapeForLike(String str) {
+        final StringBuilder rv = new StringBuilder(str.length() + 3);
+        for (int i = 0; i < str.length(); i++) {
+            final char ch = str.charAt(i);
+            if (ch == escape || ch == '%' || ch == '_') {
+                rv.append(escape);
+            }
+            rv.append(ch);
+        }
+        return rv.toString();
+    }
+
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Templates.java b/querydsl-core/src/main/java/com/querydsl/core/types/Templates.java
new file mode 100644
index 0000000000..d75b0886a2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Templates.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.Arrays;
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code Templates} provides operator patterns for query expression serialization
+ *
+ * @author tiwe
+ */
+public class Templates {
+
+    /**
+     * Precedence order based on Java language operator precedence
+     */
+    protected static class Precedence {
+        public static final int HIGHEST = -1;
+        public static final int DOT = 5;
+        public static final int NOT_HIGH = 10;
+        public static final int NEGATE = 20;
+        public static final int ARITH_HIGH = 30;
+        public static final int ARITH_LOW = 40;
+        public static final int COMPARISON = 50;
+        public static final int EQUALITY = 60;
+        public static final int CASE = 70, LIST = 70;
+        public static final int NOT = 80;
+        public static final int AND = 90;
+        public static final int XOR = 100, XNOR = 100;
+        public static final int OR = 110;
+    }
+
+    public static final Templates DEFAULT = new Templates();
+
+    private final Map<Operator, Template> templates = new IdentityHashMap<Operator, Template>(150);
+
+    private final Map<Operator, Integer> precedence = new IdentityHashMap<Operator, Integer>(150);
+
+    private final TemplateFactory templateFactory;
+
+    private final char escape;
+
+    protected Templates() {
+        this('\\');
+    }
+
+    protected Templates(char escape) {
+        this.escape = escape;
+        templateFactory = new TemplateFactory(escape) {
+            @Override
+            public String escapeForLike(String str) {
+                return Templates.this.escapeForLike(str);
+            }
+        };
+        //CHECKSTYLE:OFF
+
+        add(Ops.LIST, "{0}, {1}", Precedence.LIST);
+        add(Ops.SET, "{0}, {1}", Precedence.LIST);
+        add(Ops.SINGLETON, "{0}", Precedence.LIST);
+        add(Ops.WRAPPED, "({0})");
+        add(Ops.ORDER, "order()");
+
+        // boolean
+        add(Ops.AND, "{0} && {1}", Precedence.AND);
+        add(Ops.NOT, "!{0}", Precedence.NOT_HIGH);
+        add(Ops.OR, "{0} || {1}", Precedence.OR);
+        add(Ops.XNOR, "{0} xnor {1}", Precedence.XNOR);
+        add(Ops.XOR, "{0} xor {1}", Precedence.XOR);
+
+        // collection
+        add(Ops.COL_IS_EMPTY, "empty({0})");
+        add(Ops.COL_SIZE, "size({0})");
+
+        // array
+        add(Ops.ARRAY_SIZE, "size({0})");
+
+        // map
+        add(Ops.MAP_SIZE, "size({0})");
+        add(Ops.MAP_IS_EMPTY, "empty({0})");
+        add(Ops.CONTAINS_KEY, "containsKey({0},{1})");
+        add(Ops.CONTAINS_VALUE, "containsValue({0},{1})");
+
+        // comparison
+        add(Ops.BETWEEN, "{0} between {1} and {2}", Precedence.COMPARISON);
+        add(Ops.GOE, "{0} >= {1}", Precedence.COMPARISON);
+        add(Ops.GT, "{0} > {1}", Precedence.COMPARISON);
+        add(Ops.LOE, "{0} <= {1}", Precedence.COMPARISON);
+        add(Ops.LT, "{0} < {1}", Precedence.COMPARISON);
+
+        // numeric
+        add(Ops.NEGATE, "-{0}", Precedence.NEGATE);
+        add(Ops.ADD, "{0} + {1}", Precedence.ARITH_LOW);
+        add(Ops.DIV, "{0} / {1}", Precedence.ARITH_HIGH);
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+        add(Ops.MULT, "{0} * {1}", Precedence.ARITH_HIGH);
+        add(Ops.SUB, "{0} - {1}", Precedence.ARITH_LOW);
+
+        // various
+        add(Ops.EQ, "{0} = {1}", Precedence.EQUALITY);
+        add(Ops.EQ_IGNORE_CASE, "eqIc({0},{1})", Precedence.EQUALITY);
+        add(Ops.INSTANCE_OF, "{0} instanceof {1}", Precedence.COMPARISON);
+        add(Ops.NE, "{0} != {1}", Precedence.EQUALITY);
+
+        add(Ops.IN, "{0} in {1}", Precedence.COMPARISON);
+        add(Ops.NOT_IN, "{0} not in {1}", Precedence.COMPARISON);
+        add(Ops.IS_NULL, "{0} is null", Precedence.COMPARISON);
+        add(Ops.IS_NOT_NULL, "{0} is not null", Precedence.COMPARISON);
+        add(Ops.ALIAS, "{0} as {1}", 0);
+
+        add(Ops.NUMCAST, "cast({0},{1})");
+        add(Ops.STRING_CAST, "str({0})");
+
+        // string
+        add(Ops.CONCAT, "{0} + {1}", Precedence.ARITH_LOW);
+        add(Ops.LOWER, "lower({0})");
+        add(Ops.SUBSTR_1ARG, "substring({0},{1})");
+        add(Ops.SUBSTR_2ARGS, "substring({0},{1},{2})");
+        add(Ops.TRIM, "trim({0})");
+        add(Ops.UPPER, "upper({0})");
+        add(Ops.MATCHES, "matches({0},{1})");
+        add(Ops.MATCHES_IC, "matchesIgnoreCase({0},{1})");
+        add(Ops.STARTS_WITH, "startsWith({0},{1})");
+        add(Ops.STARTS_WITH_IC, "startsWithIgnoreCase({0},{1})");
+        add(Ops.ENDS_WITH, "endsWith({0},{1})");
+        add(Ops.ENDS_WITH_IC, "endsWithIgnoreCase({0},{1})");
+        add(Ops.STRING_CONTAINS, "contains({0},{1})");
+        add(Ops.STRING_CONTAINS_IC, "containsIc({0},{1})");
+        add(Ops.CHAR_AT, "charAt({0},{1})");
+        add(Ops.STRING_LENGTH, "length({0})");
+        add(Ops.INDEX_OF, "indexOf({0},{1})");
+        add(Ops.INDEX_OF_2ARGS, "indexOf({0},{1},{2})");
+        add(Ops.STRING_IS_EMPTY, "empty({0})");
+        add(Ops.LIKE, "{0} like {1}", Precedence.COMPARISON);
+        add(Ops.LIKE_IC, "{0l} like {1l}", Precedence.COMPARISON);
+        add(Ops.LIKE_ESCAPE, "{0} like {1} escape '{2s}'", Precedence.COMPARISON);
+        add(Ops.LIKE_ESCAPE_IC, "{0l} like {1l} escape '{2s}'", Precedence.COMPARISON);
+
+        add(Ops.StringOps.LEFT, "left({0},{1})");
+        add(Ops.StringOps.RIGHT, "right({0},{1})");
+        add(Ops.StringOps.LTRIM, "ltrim({0})");
+        add(Ops.StringOps.RTRIM, "rtrim({0})");
+        add(Ops.StringOps.LOCATE, "locate({0},{1})");
+        add(Ops.StringOps.LOCATE2, "locate({0},{1},{2s})");
+        add(Ops.StringOps.LPAD, "lpad({0},{1})");
+        add(Ops.StringOps.RPAD, "rpad({0},{1})");
+        add(Ops.StringOps.LPAD2, "lpad({0},{1},'{2s}')");
+        add(Ops.StringOps.RPAD2, "rpad({0},{1},'{2s}')");
+
+        // date time
+        add(Ops.DateTimeOps.SYSDATE, "sysdate");
+        add(Ops.DateTimeOps.CURRENT_DATE, "current_date()");
+        add(Ops.DateTimeOps.CURRENT_TIME, "current_time()");
+        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp()");
+        add(Ops.DateTimeOps.DATE, "date({0})");
+
+        add(Ops.DateTimeOps.MILLISECOND, "millisecond({0})");
+        add(Ops.DateTimeOps.SECOND, "second({0})");
+        add(Ops.DateTimeOps.MINUTE, "minute({0})");
+        add(Ops.DateTimeOps.HOUR, "hour({0})");
+        add(Ops.DateTimeOps.WEEK, "week({0})");
+        add(Ops.DateTimeOps.MONTH, "month({0})");
+        add(Ops.DateTimeOps.YEAR, "year({0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "yearMonth({0})");
+        add(Ops.DateTimeOps.YEAR_WEEK, "yearweek({0})");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "dayofmonth({0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "add_years({0},{1})");
+        add(Ops.DateTimeOps.ADD_MONTHS, "add_months({0},{1})");
+        add(Ops.DateTimeOps.ADD_WEEKS, "add_weeks({0},{1})");
+        add(Ops.DateTimeOps.ADD_DAYS, "add_days({0},{1})");
+        add(Ops.DateTimeOps.ADD_HOURS, "add_hours({0},{1})");
+        add(Ops.DateTimeOps.ADD_MINUTES, "add_minutes({0},{1})");
+        add(Ops.DateTimeOps.ADD_SECONDS, "add_seconds({0},{1})");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "diff_years({0},{1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "diff_months({0},{1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "diff_weeks({0},{1})");
+        add(Ops.DateTimeOps.DIFF_DAYS, "diff_days({0},{1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "diff_hours({0},{1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "diff_minutes({0},{1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "diff_seconds({0},{1})");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR, "trunc_year({0})");
+        add(Ops.DateTimeOps.TRUNC_MONTH, "trunc_month({0})");
+        add(Ops.DateTimeOps.TRUNC_WEEK, "trunc_week({0})");
+        add(Ops.DateTimeOps.TRUNC_DAY, "trunc_day({0})");
+        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc_hour({0})");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc_minute({0})");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "trunc_second({0})");
+
+        // math
+        add(Ops.MathOps.ABS, "abs({0})");
+        add(Ops.MathOps.ACOS, "acos({0})");
+        add(Ops.MathOps.ASIN, "asin({0})");
+        add(Ops.MathOps.ATAN, "atan({0})");
+        add(Ops.MathOps.CEIL, "ceil({0})");
+        add(Ops.MathOps.COS, "cos({0})");
+        add(Ops.MathOps.COSH, "cosh({0})");
+        add(Ops.MathOps.COT, "cot({0})");
+        add(Ops.MathOps.COTH, "coth({0})");
+        add(Ops.MathOps.DEG, "degrees({0})");
+        add(Ops.MathOps.TAN, "tan({0})");
+        add(Ops.MathOps.TANH, "tanh({0})");
+        add(Ops.MathOps.SQRT, "sqrt({0})");
+        add(Ops.MathOps.SIGN, "sign({0})");
+        add(Ops.MathOps.SIN, "sin({0})");
+        add(Ops.MathOps.SINH, "sinh({0})");
+        add(Ops.MathOps.ROUND, "round({0})");
+        add(Ops.MathOps.ROUND2, "round({0},{1})");
+        add(Ops.MathOps.RAD, "radians({0})");
+        add(Ops.MathOps.RANDOM, "random()");
+        add(Ops.MathOps.RANDOM2, "random({0})");
+        add(Ops.MathOps.POWER, "pow({0},{1})");
+        add(Ops.MathOps.MIN, "min({0},{1})");
+        add(Ops.MathOps.MAX, "max({0},{1})");
+        add(Ops.MathOps.LOG, "log({0},{1})");
+        add(Ops.MathOps.LN, "ln({0})");
+        add(Ops.MathOps.FLOOR, "floor({0})");
+        add(Ops.MathOps.EXP, "exp({0})");
+
+        // path types
+        add(PathType.PROPERTY, "{0}.{1s}");
+        add(PathType.VARIABLE, "{0s}");
+        add(PathType.DELEGATE, "{0}");
+        add(Ops.ORDINAL, "ordinal({0})");
+//        add(Ops.DELEGATE, "{0}");
+
+        for (PathType type : new PathType[] {
+                PathType.LISTVALUE,
+                PathType.MAPVALUE,
+                PathType.MAPVALUE_CONSTANT }) {
+            add(type, "{0}.get({1})");
+        }
+        add(PathType.ARRAYVALUE, "{0}[{1}]");
+        add(PathType.COLLECTION_ANY, "any({0})");
+        add(PathType.LISTVALUE_CONSTANT, "{0}.get({1s})"); // serialized constant
+        add(PathType.ARRAYVALUE_CONSTANT, "{0}[{1s}]");    // serialized constant
+
+        // case
+        add(Ops.CASE, "case {0} end", Precedence.CASE);
+        add(Ops.CASE_WHEN,  "when {0} then {1} {2}", Precedence.CASE);
+        add(Ops.CASE_ELSE,  "else {0}", Precedence.CASE);
+
+        // case for
+        add(Ops.CASE_EQ, "case {0} {1} end", Precedence.CASE);
+        add(Ops.CASE_EQ_WHEN,  "when {1} then {2} {3}", Precedence.CASE);
+        add(Ops.CASE_EQ_ELSE,  "else {0}", Precedence.CASE);
+
+        // coalesce
+        add(Ops.COALESCE, "coalesce({0})");
+
+        add(Ops.NULLIF, "nullif({0},{1})");
+
+        // subquery
+        add(Ops.EXISTS, "exists {0}", 0);
+
+        // numeric aggregates
+        add(Ops.AggOps.BOOLEAN_ALL, "all({0})");
+        add(Ops.AggOps.BOOLEAN_ANY, "any({0})");
+        add(Ops.AggOps.AVG_AGG, "avg({0})");
+        add(Ops.AggOps.MAX_AGG, "max({0})");
+        add(Ops.AggOps.MIN_AGG, "min({0})");
+        add(Ops.AggOps.SUM_AGG, "sum({0})");
+        add(Ops.AggOps.COUNT_AGG, "count({0})");
+        add(Ops.AggOps.COUNT_DISTINCT_AGG, "count(distinct {0})");
+        add(Ops.AggOps.COUNT_DISTINCT_ALL_AGG, "count(distinct *)");
+        add(Ops.AggOps.COUNT_ALL_AGG, "count(*)");
+
+        // quantified expressions
+        add(Ops.QuantOps.AVG_IN_COL, "avg({0})");
+        add(Ops.QuantOps.MAX_IN_COL, "max({0})");
+        add(Ops.QuantOps.MIN_IN_COL, "min({0})");
+
+        add(Ops.QuantOps.ANY, "any {0}");
+        add(Ops.QuantOps.ALL, "all {0}");
+        //CHECKSTYLE:ON
+    }
+
+    protected final void add(Operator op, String pattern) {
+        templates.put(op, templateFactory.create(pattern));
+        if (!precedence.containsKey(op)) {
+            precedence.put(op, -1);
+        }
+    }
+
+    protected final void add(Operator op, String pattern, int pre) {
+        templates.put(op, templateFactory.create(pattern));
+        precedence.put(op, pre);
+    }
+
+    protected final void add(Map<Operator, String> ops) {
+        for (Map.Entry<Operator, String> entry : ops.entrySet()) {
+            add(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public final char getEscapeChar() {
+        return escape;
+    }
+
+    protected String escapeForLike(String str) {
+        final StringBuilder rv = new StringBuilder(str.length() + 3);
+        for (char ch : str.toCharArray()) {
+            if (ch == escape || ch == '%' || ch == '_') {
+                rv.append(escape);
+            }
+            rv.append(ch);
+        }
+        return rv.toString();
+    }
+
+    @Nullable
+    public final Template getTemplate(Operator op) {
+        return templates.get(op);
+    }
+
+    public final int getPrecedence(Operator op) {
+        return precedence.get(op);
+    }
+
+    protected void setPrecedence(int p, Operator... ops) {
+        setPrecedence(p, Arrays.asList(ops));
+    }
+
+    protected void setPrecedence(int p, Iterable<? extends Operator> ops) {
+        for (Operator op : ops) {
+            precedence.put(op, p);
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/ToStringVisitor.java
similarity index 87%
rename from querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ToStringVisitor.java
index b34cfc1d59..053ca6e72e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ToStringVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.Arrays;
 import java.util.List;
 
 /**
- * ToStringVisitor is used for toString() serialization in {@link Expression} implementations.
+ * {@code ToStringVisitor} is used for toString() serialization in {@link Expression} implementations.
  *
  * @author tiwe
  */
@@ -25,7 +25,7 @@ public final class ToStringVisitor implements Visitor<String,Templates> {
 
     public static final ToStringVisitor DEFAULT = new ToStringVisitor();
 
-    private ToStringVisitor() {}
+    private ToStringVisitor() { }
 
     @Override
     public String visit(Constant<?> e, Templates templates) {
@@ -58,21 +58,21 @@ public String visit(Operation<?> o, Templates templates) {
                 final Object rv = element.convert(o.getArgs());
                 if (rv instanceof Expression) {
                     if (precedence > -1 && rv instanceof Operation) {
-                        if (precedence < templates.getPrecedence(((Operation<?>)rv).getOperator())) {
+                        if (precedence < templates.getPrecedence(((Operation<?>) rv).getOperator())) {
                             builder.append("(");
-                            builder.append(((Expression)rv).accept(this, templates));
+                            builder.append(((Expression<?>) rv).accept(this, templates));
                             builder.append(")");
                             continue;
                         }
                     }
-                    builder.append(((Expression)rv).accept(this, templates));
+                    builder.append(((Expression<?>) rv).accept(this, templates));
                 } else {
                     builder.append(rv.toString());
                 }
             }
             return builder.toString();
         } else {
-            return "unknown operation with operator " + o.getOperator().getId() + " and args " + o.getArgs();
+            return "unknown operation with operator " + o.getOperator().name() + " and args " + o.getArgs();
         }
     }
 
@@ -93,7 +93,7 @@ public String visit(Path<?> p, Templates templates) {
                 for (Template.Element element : pattern.getElements()) {
                     Object rv = element.convert(args);
                     if (rv instanceof Expression) {
-                        builder.append(((Expression)rv).accept(this, templates));
+                        builder.append(((Expression<?>) rv).accept(this, templates));
                     } else {
                         builder.append(rv.toString());
                     }
@@ -118,7 +118,7 @@ public String visit(TemplateExpression<?> expr, Templates templates) {
         for (Template.Element element : expr.getTemplate().getElements()) {
             Object rv = element.convert(expr.getArgs());
             if (rv instanceof Expression) {
-                builder.append(((Expression)rv).accept(this, templates));
+                builder.append(((Expression<?>) rv).accept(this, templates));
             } else {
                 builder.append(rv.toString());
             }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/ValidatingVisitor.java
similarity index 86%
rename from querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java
rename to querydsl-core/src/main/java/com/querydsl/core/types/ValidatingVisitor.java
index a390fb99b9..819fd62f3c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/ValidatingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
-import static com.mysema.query.util.CollectionUtils.add;
+import static com.querydsl.core.util.CollectionUtils.add;
 
 import java.io.Serializable;
 import java.util.Set;
 
-import com.mysema.query.JoinExpression;
-import com.mysema.query.QueryMetadata;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
 
 /**
- * ValidatingVisitor visits expressions and ensures that only known path instances are used
+ * {@code ValidatingVisitor} visits expressions and ensures that only known path instances are used
  *
  * @author tiwe
  *
@@ -85,8 +85,8 @@ public Set<Expression<?>> visit(SubQueryExpression<?> expr, Set<Expression<?>> k
         Set<Expression<?>> old = known;
         final QueryMetadata md = expr.getMetadata();
         known = visitJoins(md.getJoins(), known);
-        for (Expression<?> p : md.getProjection()) {
-            known = p.accept(this, known);
+        if (md.getProjection() != null) {
+            known = md.getProjection().accept(this, known);
         }
         for (OrderSpecifier<?> o : md.getOrderBy()) {
             known = o.getTarget().accept(this, known);
@@ -108,7 +108,7 @@ public Set<Expression<?>> visit(SubQueryExpression<?> expr, Set<Expression<?>> k
     public Set<Expression<?>> visit(TemplateExpression<?> expr, Set<Expression<?>> known) {
         for (Object arg : expr.getArgs()) {
             if (arg instanceof Expression<?>) {
-                known = ((Expression<?>)arg).accept(this, known);
+                known = ((Expression<?>) arg).accept(this, known);
             }
         }
         return known;
@@ -117,7 +117,7 @@ public Set<Expression<?>> visit(TemplateExpression<?> expr, Set<Expression<?>> k
     private Set<Expression<?>> visitJoins(Iterable<JoinExpression> joins, Set<Expression<?>> known) {
         for (JoinExpression j : joins) {
             final Expression<?> expr = j.getTarget();
-            if (expr instanceof Path && ((Path)expr).getMetadata().isRoot()) {
+            if (expr instanceof Path && ((Path) expr).getMetadata().isRoot()) {
                 known = add(known, expr);
             } else {
                 known = expr.accept(this, known);
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java b/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java
new file mode 100644
index 0000000000..2a61313b09
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/Visitor.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code Visitor} defines a visitor signature for {@link Expression} instances.
+ *
+ * @author tiwe
+ *
+ * @param <R> Return type
+ * @param <C> Context type
+ */
+public interface Visitor<R, C> {
+
+    /**
+     * Visit a Constant instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(Constant<?> expr, @Nullable C context);
+
+    /**
+     * Visit a FactoryExpression instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(FactoryExpression<?> expr, @Nullable C context);
+
+    /**
+     * Visit an Operation instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(Operation<?> expr, @Nullable C context);
+
+    /**
+     * Visit a ParamExpression instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(ParamExpression<?> expr, @Nullable C context);
+
+    /**
+     * Visit a Path instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(Path<?> expr, @Nullable C context);
+
+    /**
+     * Visit a SubQueryExpression instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(SubQueryExpression<?> expr, @Nullable C context);
+
+    /**
+     * Visit a TemplateExpression instance with the given context
+     *
+     * @param expr expression to visit
+     * @param context context of the visit or null, if not used
+     * @return visit result
+     */
+    R visit(TemplateExpression<?> expr, @Nullable C context);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayExpression.java
new file mode 100644
index 0000000000..66c1d2e071
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayExpression.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code ArrayExpression} defines an interface for array typed expression
+ *
+ * @author tiwe
+ *
+ * @param <A> array type
+ * @param <T> array element type
+ */
+public interface ArrayExpression<A, T> extends Expression<A> {
+
+    /**
+     * Create a {@code this.size()} expression
+     *
+     * <p>Returns the size of the array as an expression</p>
+     *
+     * @return size of array
+     */
+    NumberExpression<Integer> size();
+
+    /**
+     * Create a {@code this[index]} expression
+     *
+     * <p>Returns the element at the given index</p>
+     *
+     * @param index zero based index
+     * @return element at index
+     */
+    SimpleExpression<T> get(Expression<Integer> index);
+
+    /**
+     * Create a {@code this[index]} expression
+     *
+     * <p>Returns the element at the given index</p>
+     *
+     * @param index zero based index
+     * @return element at index
+     */
+    SimpleExpression<T> get(@Range(from = 0, to = Integer.MAX_VALUE) int index);
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayPath.java
new file mode 100644
index 0000000000..4fed33a8e9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ArrayPath.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.util.PrimitiveUtils;
+
+import java.lang.reflect.AnnotatedElement;
+
+import org.jetbrains.annotations.Range;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code ArrayPath} represents an array typed path
+ *
+ * @author tiwe
+ *
+ * @param <A> array type
+ * @param <E> array element type
+ */
+public class ArrayPath<A, E> extends SimpleExpression<A> implements Path<A>, ArrayExpression<A, E> {
+
+    private static final long serialVersionUID = 7795049264874048226L;
+
+    private final Class<E> componentType;
+
+    private final PathImpl<A> pathMixin;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> size;
+
+    protected ArrayPath(Class<? super A> type, String variable) {
+        this(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    protected ArrayPath(Class<? super A> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    protected ArrayPath(Class<? super A> type, PathMetadata metadata) {
+        super(ExpressionUtils.path((Class) type, metadata));
+        this.pathMixin = (PathImpl<A>) mixin;
+        this.componentType = PrimitiveUtils.wrap((Class<E>) type.getComponentType());
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public SimplePath<E> get(Expression<Integer> index) {
+        PathMetadata md = PathMetadataFactory.forArrayAccess(pathMixin, index);
+        return Expressions.path(componentType, md);
+    }
+
+    @Override
+    public SimplePath<E> get(@Range(from = 0, to = Integer.MAX_VALUE) int index) {
+        PathMetadata md = PathMetadataFactory.forArrayAccess(pathMixin, index);
+        return Expressions.path(componentType, md);
+    }
+
+    public Class<E> getElementType() {
+        return componentType;
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+    @Override
+    public NumberExpression<Integer> size() {
+        if (size == null) {
+            size = Expressions.numberOperation(Integer.class, Ops.ARRAY_SIZE, pathMixin);
+        }
+        return size;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java
new file mode 100644
index 0000000000..41deb1ade0
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BeanPath.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code BeanPath} represents bean paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class BeanPath<T> extends SimpleExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = -1845524024957822731L;
+
+    private final Map<Class<?>, Object> casts = new ConcurrentHashMap<Class<?>, Object>();
+
+    @Nullable
+    private final PathInits inits;
+
+    private final PathImpl<T> pathMixin;
+
+    public BeanPath(Class<? extends T> type, String variable) {
+        this(type, PathMetadataFactory.forVariable(variable), null);
+    }
+
+    public BeanPath(Class<? extends T> type, Path<?> parent,  String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property), null);
+    }
+
+    public BeanPath(Class<? extends T> type, PathMetadata metadata) {
+        this(type, metadata, null);
+    }
+
+    public BeanPath(Class<? extends T> type, PathMetadata metadata, @Nullable PathInits inits) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+        this.inits = inits;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        // mixin is not used here, because subtype instances may have data that needs to be made available
+        return v.visit(this, context);
+    }
+
+    /**
+     * Cast the path to a subtype querytype
+     *
+     * @param <U>
+     * @param clazz subtype class
+     * @return subtype instance with the same identity
+     */
+    @SuppressWarnings("unchecked")
+    public <U extends BeanPath<? extends T>> U as(Class<U> clazz) {
+        try {
+            if (!casts.containsKey(clazz)) {
+                PathMetadata metadata;
+                if (pathMixin.getMetadata().getPathType() != PathType.COLLECTION_ANY) {
+                    metadata = PathMetadataFactory.forDelegate(pathMixin);
+                } else {
+                    metadata = pathMixin.getMetadata();
+                }
+                U rv;
+                // the inits for the subtype will be wider, if it's a variable path
+                if (inits != null && pathMixin.getMetadata().getPathType() != PathType.VARIABLE) {
+                    rv = clazz.getConstructor(PathMetadata.class, PathInits.class).newInstance(metadata, inits);
+                } else {
+                    rv = clazz.getConstructor(PathMetadata.class).newInstance(metadata);
+                }
+                casts.put(clazz, rv);
+                return rv;
+            } else {
+                return (U) casts.get(clazz);
+            }
+
+        } catch (InstantiationException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Template method for tracking child path creation
+     *
+     * @param <P>
+     * @param path path to be tracked
+     * @return path
+     */
+    protected <P extends Path<?>> P add(P path) {
+        return path;
+    }
+
+    /**
+     * Create a new array path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    protected <A, E> ArrayPath<A, E> createArray(String property, Class<? super A> type) {
+        return add(new ArrayPath<A, E>(type, forProperty(property)));
+    }
+
+    /**
+     * Create a new Boolean path
+     *
+     * @param property property name
+     * @return property path
+     */
+    protected BooleanPath createBoolean(String property) {
+        return add(new BooleanPath(forProperty(property)));
+    }
+
+    /**
+     * Create a new Collection typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A, Q extends SimpleExpression<? super A>> CollectionPath<A, Q> createCollection(String property, Class<? super A> type, Class<? super Q> queryType, PathInits inits) {
+        return add(new CollectionPath<A, Q>(type, (Class) queryType, forProperty(property), inits));
+    }
+
+    /**
+     * Create a new Comparable typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A extends Comparable> ComparablePath<A> createComparable(String property, Class<? super A> type) {
+        return add(new ComparablePath<A>((Class) type, forProperty(property)));
+    }
+
+    /**
+     * Create a new Enum path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    protected <A extends Enum<A>> EnumPath<A> createEnum(String property, Class<A> type) {
+        return add(new EnumPath<A>(type, forProperty(property)));
+    }
+
+
+    /**
+     * Create a new Date path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A extends Comparable> DatePath<A> createDate(String property, Class<? super A> type) {
+        return add(new DatePath<A>((Class) type, forProperty(property)));
+    }
+
+    /**
+     * Create a new DateTime path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A extends Comparable> DateTimePath<A> createDateTime(String property, Class<? super A> type) {
+        return add(new DateTimePath<A>((Class) type, forProperty(property)));
+    }
+
+    /**
+     * Create a new List typed path
+     *
+     * @param <A>
+     * @param <E>
+     * @param property property name
+     * @param type property type
+     * @param queryType expression type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A, E extends SimpleExpression<? super A>> ListPath<A, E> createList(String property, Class<? super A> type, Class<? super E> queryType, PathInits inits) {
+        return add(new ListPath<A, E>(type, (Class) queryType, forProperty(property), inits));
+    }
+
+    /**
+     * Create a new Map typed path
+     *
+     * @param <K>
+     * @param <V>
+     * @param <E>
+     * @param property property name
+     * @param key key type
+     * @param value value type
+     * @param queryType expression type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <K, V, E extends SimpleExpression<? super V>> MapPath<K, V, E> createMap(String property, Class<? super K> key, Class<? super V> value, Class<? super E> queryType) {
+        return add(new MapPath<K, V, E>(key, value, (Class) queryType, forProperty(property)));
+    }
+
+    /**
+     * Create a new Number path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A extends Number & Comparable<?>> NumberPath<A> createNumber(String property, Class<? super A> type) {
+        return add(new NumberPath<A>((Class) type, forProperty(property)));
+    }
+
+    /**
+     * Create a new Set typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A, E extends SimpleExpression<? super A>> SetPath<A, E> createSet(String property, Class<? super A> type, Class<? super E> queryType, PathInits inits) {
+        return add(new SetPath<A, E>(type, (Class) queryType, forProperty(property), inits));
+    }
+
+    /**
+     * Create a new Simple path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A> SimplePath<A> createSimple(String property, Class<? super A> type) {
+        return add(new SimplePath<A>((Class<A>) type, forProperty(property)));
+    }
+
+    /**
+     * Create a new String path
+     *
+     * @param property property name
+     * @return property path
+     */
+    protected StringPath createString(String property) {
+        return add(new StringPath(forProperty(property)));
+    }
+
+    /**
+     * Create a new Time path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    protected <A extends Comparable> TimePath<A> createTime(String property, Class<? super A> type) {
+        return add(new TimePath<A>((Class) type, forProperty(property)));
+    }
+
+    protected PathMetadata forProperty(String property) {
+        return PathMetadataFactory.forProperty(this, property);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    /**
+     * Create an {@code this instanceOf type} expression
+     *
+     * @param <B>
+     * @param type rhs of the expression
+     * @return instanceof expression
+     */
+    public <B extends T> BooleanExpression instanceOf(Class<B> type) {
+        return Expressions.booleanOperation(Ops.INSTANCE_OF, pathMixin, ConstantImpl.create(type));
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public BooleanExpression instanceOfAny(Class... types) {
+        BooleanExpression[] exprs = new BooleanExpression[types.length];
+        for (int i = 0; i < types.length; i++) {
+            exprs[i] = this.instanceOf(types[i]);
+        }
+        return Expressions.anyOf(exprs);
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
new file mode 100644
index 0000000000..afa05af128
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code BooleanExpression} represents {@link java.lang.Boolean} expressions
+ *
+ * @author tiwe
+ * @see java.lang.Boolean
+ *
+ */
+public abstract class BooleanExpression extends LiteralExpression<Boolean> implements Predicate {
+
+    private static final long serialVersionUID = 3797956062512074164L;
+
+    @Nullable
+    private transient volatile BooleanExpression eqTrue, eqFalse;
+
+    @Nullable
+    private transient volatile BooleanExpression not;
+
+    public BooleanExpression(Expression<Boolean> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public BooleanExpression as(Path<Boolean> alias) {
+        return Expressions.booleanOperation(Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public BooleanExpression as(String alias) {
+        return as(ExpressionUtils.path(Boolean.class, alias));
+    }
+
+    /**
+     * Create a {@code this && right} expression
+     *
+     * <p>Returns an intersection of this and the given expression</p>
+     *
+     * @param right right hand side of the union
+     * @return {@code this &amp;&amp; right}
+     */
+    public BooleanExpression and(@Nullable Predicate right) {
+        right = (Predicate) ExpressionUtils.extract(right);
+        if (right != null) {
+            return Expressions.booleanOperation(Ops.AND, mixin, right);
+        } else {
+            return this;
+        }
+    }
+
+    /**
+     * Create a {@code this && any(predicates)} expression
+     *
+     * <p>Returns an intersection of this and the union of the given predicates</p>
+     *
+     * @param predicates union of predicates
+     * @return this &amp;&amp; any(predicates)
+     */
+    public BooleanExpression andAnyOf(Predicate... predicates) {
+        return and(ExpressionUtils.anyOf(predicates));
+    }
+
+    /**
+     * Create a {@code !this} expression
+     *
+     * <p>Returns a negation of this boolean expression</p>
+     *
+     * @return !this
+     */
+    @Override
+    public BooleanExpression not() {
+        if (not == null) {
+            // uses this, because it makes unwrapping easier
+            not = Expressions.booleanOperation(Ops.NOT, this);
+        }
+        return not;
+    }
+
+    /**
+     * Create a {@code this || right} expression
+     *
+     * <p>Returns a union of this and the given expression</p>
+     *
+     * @param right right hand side of the union
+     * @return this || right
+     */
+    public BooleanExpression or(@Nullable Predicate right) {
+        right = (Predicate) ExpressionUtils.extract(right);
+        if (right != null) {
+            return Expressions.booleanOperation(Ops.OR, mixin, right);
+        } else {
+            return this;
+        }
+    }
+
+    /**
+     * Create a {@code this or all(predicates)} expression
+     *
+     * <p>Return a union of this and the intersection of the given predicates</p>
+     *
+     * @param predicates intersection of predicates
+     * @return this or all(predicates)
+     */
+    public BooleanExpression orAllOf(Predicate... predicates) {
+        return or(ExpressionUtils.allOf(predicates));
+    }
+
+    /**
+     * Create a {@code this == true} expression
+     *
+     * @return this == true
+     */
+    public BooleanExpression isTrue() {
+        return eq(true);
+    }
+
+    /**
+     * Create a {@code this == false} expression
+     *
+     * @return this == false
+     */
+    public BooleanExpression isFalse() {
+        return eq(false);
+    }
+
+    @Override
+    public BooleanExpression eq(Boolean right) {
+        if (right) {
+            if (eqTrue == null) {
+                eqTrue = super.eq(true);
+            }
+            return eqTrue;
+        } else {
+            if (eqFalse == null) {
+                eqFalse = super.eq(false);
+            }
+            return eqFalse;
+        }
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public BooleanExpression nullif(Expression<Boolean> other) {
+        return Expressions.booleanOperation(Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public BooleanExpression nullif(Boolean other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public BooleanExpression coalesce(Expression<Boolean> expr) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asBoolean();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public BooleanExpression coalesce(Expression<?>... exprs) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.asBoolean();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public BooleanExpression coalesce(Boolean arg) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asBoolean();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    public BooleanExpression coalesce(Boolean... args) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        for (Boolean arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.asBoolean();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanOperation.java
new file mode 100644
index 0000000000..a6aff67202
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanOperation.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code BooleanOperation} represents boolean operations
+ *
+ * @author tiwe
+ *
+ */
+public class BooleanOperation extends BooleanExpression implements Operation<Boolean> {
+
+    private static final long serialVersionUID = 7432281499861357581L;
+
+    private final PredicateOperation opMixin;
+
+    protected BooleanOperation(PredicateOperation mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected BooleanOperation(Operator op, Expression<?>... args) {
+        this(op, Arrays.asList(args));
+    }
+
+    protected BooleanOperation(Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.predicate(op, args));
+        opMixin = (PredicateOperation) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+    @Override
+    public BooleanExpression not() {
+        if (opMixin.getOperator() == Ops.NOT && opMixin.getArg(0) instanceof BooleanExpression) {
+            return (BooleanExpression) opMixin.getArg(0);
+        } else {
+            return super.not();
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanPath.java
new file mode 100644
index 0000000000..1b53538e21
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanPath.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code BooleanPath} represents boolean path expressions
+ *
+ * @author tiwe
+ * @see java.lang.Boolean
+ *
+ */
+public class BooleanPath extends BooleanExpression implements Path<Boolean> {
+
+    private static final long serialVersionUID = 6590516706769430565L;
+
+    private final PathImpl<Boolean> pathMixin;
+
+    protected BooleanPath(PathImpl<Boolean> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected BooleanPath(Path<?> parent, String property) {
+        this(PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected BooleanPath(PathMetadata metadata) {
+        super(ExpressionUtils.path(Boolean.class, metadata));
+        this.pathMixin = (PathImpl<Boolean>) mixin;
+    }
+
+    protected BooleanPath(String var) {
+        this(PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanTemplate.java
new file mode 100644
index 0000000000..5af9904eea
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanTemplate.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code BooleanTemplate} is a custom boolean expression
+ *
+ * @author tiwe
+ *
+ */
+public class BooleanTemplate extends BooleanExpression implements TemplateExpression<Boolean> {
+
+    private static final long serialVersionUID = 5749369427497731719L;
+
+    private final PredicateTemplate templateMixin;
+
+    protected BooleanTemplate(PredicateTemplate mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected BooleanTemplate(Template template, List<?> args) {
+        super(ExpressionUtils.predicateTemplate(template, args));
+        this.templateMixin = (PredicateTemplate) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseBuilder.java
new file mode 100644
index 0000000000..d2af510fe5
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseBuilder.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code CaseBuilder} enables the construction of typesafe case-when-then-else
+ * constructs :
+ * e.g.
+ *
+ * <pre>{@code
+ * Expression<String> cases = new CaseBuilder()
+ *     .when(c.annualSpending.gt(10000)).then("Premier")
+ *     .when(c.annualSpending.gt(5000)).then("Gold")
+ *     .when(c.annualSpending.gt(2000)).then("Silver")
+ *     .otherwise("Bronze");
+ * }</pre>
+ *
+ * @author tiwe
+ *
+ */
+public final class CaseBuilder {
+
+    private static class CaseElement<A> {
+
+        @Nullable
+        private final Predicate condition;
+
+        private final Expression<A> target;
+
+        CaseElement(@Nullable Predicate condition, Expression<A> target) {
+            this.condition = condition;
+            this.target = target;
+        }
+
+        public Predicate getCondition() {
+            return condition;
+        }
+
+        public Expression<A> getTarget() {
+            return target;
+        }
+
+    }
+
+    /**
+     * Cascading typesafe Case builder
+     *
+     * @author tiwe
+     *
+     * @param <A>
+     * @param <Q>
+     */
+    public abstract static class Cases<A, Q extends Expression<A>> {
+
+        private final List<CaseElement<A>> cases = new ArrayList<CaseElement<A>>();
+
+        private final Class<? extends A> type;
+
+        public Cases(Class<? extends A> type) {
+            this.type = type;
+        }
+
+        Cases<A,Q> addCase(Predicate condition, Expression<A> expr) {
+            cases.add(0, new CaseElement<A>(condition, expr));
+            return this;
+        }
+
+        protected abstract Q createResult(Class<? extends A> type, Expression<A> last);
+
+        @SuppressWarnings("unchecked")
+        public Q otherwise(A constant) {
+            if (constant != null) {
+                return otherwise(ConstantImpl.create(constant));
+            } else {
+                return otherwise((Q) NullExpression.DEFAULT);
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        public Q otherwise(Expression<A> expr) {
+            if (expr == null) {
+                expr = (Expression) NullExpression.DEFAULT;
+            }
+            cases.add(0, new CaseElement<A>(null, expr));
+            Expression<A> last = null;
+            for (CaseElement<A> element : cases) {
+                if (last == null) {
+                    last = Expressions.operation(type, Ops.CASE_ELSE,
+                            element.getTarget());
+                } else {
+                    last = Expressions.operation(type, Ops.CASE_WHEN,
+                            element.getCondition(),
+                            element.getTarget(),
+                            last);
+                }
+            }
+            return createResult(type, last);
+        }
+
+        public CaseWhen<A,Q> when(Predicate b) {
+            return new CaseWhen<A,Q>(this, b);
+        }
+
+    }
+
+    /**
+     * Intermediate When state
+     *
+     * @author tiwe
+     *
+     * @param <A>
+     * @param <Q>
+     */
+    public static class CaseWhen<A,Q extends Expression<A>> {
+
+        private final Predicate b;
+
+        private final Cases<A,Q> cases;
+
+        public CaseWhen(Cases<A,Q> cases, Predicate b) {
+            this.cases = cases;
+            this.b = b;
+        }
+
+        public Cases<A,Q> then(A constant) {
+            return then(ConstantImpl.create(constant));
+        }
+
+        public Cases<A,Q> then(Expression<A> expr) {
+            return cases.addCase(b, expr);
+        }
+    }
+
+    /**
+     * Initial state of Case construction
+     *
+     * @author tiwe
+     *
+     */
+    public static class Initial {
+
+        private final Predicate when;
+
+        public Initial(Predicate b) {
+            this.when = b;
+        }
+
+        @SuppressWarnings("unchecked")
+        public <A> Cases<A, SimpleExpression<A>> then(Expression<A> expr) {
+            if (expr instanceof Predicate) {
+                return (Cases) then((Predicate) expr);
+            } else if (expr instanceof StringExpression) {
+                return (Cases) then((StringExpression) expr);
+            } else if (expr instanceof NumberExpression) {
+                return then((NumberExpression) expr);
+            } else if (expr instanceof DateExpression) {
+                return then((DateExpression) expr);
+            } else if (expr instanceof DateTimeExpression) {
+                return then((DateTimeExpression) expr);
+            } else if (expr instanceof TimeExpression) {
+                return then((TimeExpression) expr);
+            } else if (expr instanceof ComparableExpression) {
+                return then((ComparableExpression) expr);
+            } else {
+                return thenSimple(expr);
+            }
+        }
+
+        private <A> Cases<A, SimpleExpression<A>> thenSimple(Expression<A> expr) {
+            return new Cases<A, SimpleExpression<A>>(expr.getType()) {
+                @Override
+                protected SimpleExpression<A> createResult(Class<? extends A> type, Expression<A> last) {
+                    return Expressions.operation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public <A> Cases<A, SimpleExpression<A>> then(A constant) {
+            return thenSimple(ConstantImpl.create(constant));
+        }
+
+        // Boolean
+
+        public Cases<Boolean, BooleanExpression> then(Predicate expr) {
+            return thenBoolean(expr);
+        }
+
+        private Cases<Boolean, BooleanExpression> thenBoolean(Expression<Boolean> expr) {
+            return new Cases<Boolean,BooleanExpression>(Boolean.class) {
+                @Override
+                protected BooleanExpression createResult(Class<? extends Boolean> type, Expression<Boolean> last) {
+                    return Expressions.booleanOperation(Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public Cases<Boolean, BooleanExpression> then(boolean b) {
+            return thenBoolean(ConstantImpl.create(b));
+        }
+
+        // Comparable
+
+        public <T extends Comparable> Cases<T, ComparableExpression<T>> then(ComparableExpression<T> expr) {
+            return thenComparable(expr);
+        }
+
+        private <T extends Comparable> Cases<T, ComparableExpression<T>> thenComparable(Expression<T> expr) {
+            return new Cases<T, ComparableExpression<T>>(expr.getType()) {
+                @Override
+                protected ComparableExpression<T> createResult(Class<? extends T> type, Expression<T> last) {
+                    return Expressions.comparableOperation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public <A extends Comparable> Cases<A, ComparableExpression<A>> then(A arg) {
+            return thenComparable(ConstantImpl.create(arg));
+        }
+
+        // Date
+
+        public <T extends Comparable> Cases<T, DateExpression<T>> then(DateExpression<T> expr) {
+            return thenDate(expr);
+        }
+
+        private <T extends Comparable> Cases<T, DateExpression<T>> thenDate(Expression<T> expr) {
+            return new Cases<T, DateExpression<T>>(expr.getType()) {
+                @Override
+                protected DateExpression<T> createResult(Class<? extends T> type, Expression<T> last) {
+                    return Expressions.dateOperation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public Cases<java.sql.Date, DateExpression<java.sql.Date>> then(java.sql.Date date) {
+            return thenDate(ConstantImpl.create(date));
+        }
+
+        // DateTime
+
+        public <T extends Comparable> Cases<T, DateTimeExpression<T>> then(DateTimeExpression<T> expr) {
+            return thenDateTime(expr);
+        }
+
+        private <T extends Comparable> Cases<T, DateTimeExpression<T>> thenDateTime(Expression<T> expr) {
+            return new Cases<T, DateTimeExpression<T>>(expr.getType()) {
+                @Override
+                protected DateTimeExpression<T> createResult(Class<? extends T> type, Expression<T> last) {
+                    return Expressions.dateTimeOperation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public Cases<Timestamp, DateTimeExpression<Timestamp>> then(Timestamp ts) {
+            return thenDateTime(ConstantImpl.create(ts));
+        }
+
+        public Cases<java.util.Date, DateTimeExpression<java.util.Date>> then(java.util.Date date) {
+            return thenDateTime(ConstantImpl.create(date));
+        }
+
+        // Enum
+
+        public <T extends Enum<T>> Cases<T,EnumExpression<T>> then(EnumExpression<T> expr) {
+            return thenEnum(expr);
+        }
+
+        @SuppressWarnings("unchecked")
+        private <T extends Enum<T>> Cases<T,EnumExpression<T>> thenEnum(Expression<T> expr) {
+            return new Cases<T,EnumExpression<T>>(expr.getType()) {
+                @Override
+                protected EnumExpression<T> createResult(Class<? extends T> type, Expression<T> last) {
+                    return Expressions.enumOperation(type, Ops.CASE, last);
+                }
+            }.addCase(when, expr);
+        }
+
+        public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(T arg) {
+            return thenEnum(ConstantImpl.create(arg));
+        }
+
+        // Number
+
+        public <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> then(NumberExpression<A> expr) {
+            return thenNumber(expr);
+        }
+
+        @SuppressWarnings("unchecked")
+        private <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> thenNumber(Expression<A> expr) {
+            return new Cases<A, NumberExpression<A>>(expr.getType()) {
+                @Override
+                protected NumberExpression<A> createResult(Class<? extends A> type, Expression<A> last) {
+                    return Expressions.numberOperation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public <A extends Number & Comparable<?>> Cases<A, NumberExpression<A>> then(A num) {
+            return thenNumber(ConstantImpl.create(num));
+        }
+
+        // String
+
+        public Cases<String,StringExpression> then(StringExpression expr) {
+            return thenString(expr);
+        }
+
+        private Cases<String,StringExpression> thenString(Expression<String> expr) {
+            return new Cases<String,StringExpression>(String.class) {
+                @SuppressWarnings("unchecked")
+                @Override
+                protected StringExpression createResult(Class<? extends String> type, Expression<String> last) {
+                    return Expressions.stringOperation(Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public Cases<String, StringExpression> then(String str) {
+            return thenString(ConstantImpl.create(str));
+        }
+
+        // Time
+
+        public <T extends Comparable> Cases<T, TimeExpression<T>> then(TimeExpression<T> expr) {
+            return thenTime(expr);
+        }
+
+        private <T extends Comparable> Cases<T, TimeExpression<T>> thenTime(Expression<T> expr) {
+            return new Cases<T, TimeExpression<T>>(expr.getType()) {
+                @Override
+                protected TimeExpression<T> createResult(Class<? extends T> type, Expression<T> last) {
+                    return Expressions.timeOperation(type, Ops.CASE, last);
+                }
+
+            }.addCase(when, expr);
+        }
+
+        public Cases<Time, TimeExpression<Time>> then(Time time) {
+            return thenTime(ConstantImpl.create(time));
+        }
+
+    }
+
+    public Initial when(Predicate b) {
+        return new Initial(b);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
new file mode 100644
index 0000000000..dcf2f974cd
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CaseForEqBuilder.java
@@ -0,0 +1,363 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code CaseForEqBuilder} enables the construction of typesafe case-when-then-else constructs
+ * for equals-operations :
+ * e.g.
+ *
+ * <pre>{@code
+ * QCustomer c = QCustomer.customer;
+ * Expression<Integer> cases = c.annualSpending
+ *     .when(1000l).then(1)
+ *     .when(2000l).then(2)
+ *     .when(5000l).then(3)
+ *     .otherwise(4);
+ * }</pre>
+ *
+ * @author tiwe
+ *
+ * @param <D>
+ */
+public final class CaseForEqBuilder<D> {
+
+    private static class CaseElement<D> {
+
+        @Nullable
+        private final Expression<? extends D> eq;
+
+        private final Expression<?> target;
+
+        CaseElement(@Nullable Expression<? extends D> eq, Expression<?> target) {
+            this.eq = eq;
+            this.target = target;
+        }
+
+        public Expression<? extends D> getEq() {
+            return eq;
+        }
+
+        public Expression<?> getTarget() {
+            return target;
+        }
+
+    }
+
+    private final Expression<D> base;
+
+    private final Expression<? extends D> other;
+
+    private final List<CaseElement<D>> caseElements = new ArrayList<CaseElement<D>>();
+
+    private Class<?> type;
+
+    public CaseForEqBuilder(Expression<D> base, Expression<? extends D> other) {
+        this.base = base;
+        this.other = other;
+    }
+
+    public <T> Cases<T,Expression<T>> then(Expression<T> expr) {
+        if (expr instanceof Predicate) {
+            return (Cases) then((Predicate) expr);
+        } else if (expr instanceof StringExpression) {
+            return (Cases) then((StringExpression) expr);
+        } else if (expr instanceof NumberExpression) {
+            return then((NumberExpression) expr);
+        } else if (expr instanceof DateExpression) {
+            return then((DateExpression) expr);
+        } else if (expr instanceof DateTimeExpression) {
+            return then((DateTimeExpression) expr);
+        } else if (expr instanceof TimeExpression) {
+            return then((TimeExpression) expr);
+        } else if (expr instanceof ComparableExpression) {
+            return then((ComparableExpression) expr);
+        } else {
+            return thenSimple(expr);
+        }
+    }
+
+    private <T> Cases<T, Expression<T>> thenSimple(Expression<T> expr) {
+        type = expr.getType();
+        return new Cases<T,Expression<T>>() {
+            @Override
+            protected Expression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.operation(type, Ops.CASE_EQ, base, last);
+            }
+        }.when(other).then(expr);
+    }
+
+    public <T> Cases<T,Expression<T>> then(T then) {
+        return then(ConstantImpl.create(then));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Cases<T,Expression<T>> thenNull() {
+        return then((Expression<T>) NullExpression.DEFAULT);
+    }
+
+    // Boolean
+
+    public Cases<Boolean, BooleanExpression> then(Boolean then) {
+        return thenBoolean(ConstantImpl.create(then));
+    }
+
+    public Cases<Boolean, BooleanExpression> then(BooleanExpression then) {
+        return thenBoolean(then);
+    }
+
+    private Cases<Boolean, BooleanExpression> thenBoolean(Expression<Boolean> then) {
+        type = then.getType();
+        return new Cases<Boolean, BooleanExpression>() {
+            @Override
+            protected BooleanExpression createResult(Class<Boolean> type, Expression<Boolean> last) {
+                return Expressions.booleanOperation(Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Comparable
+
+    public <T extends Comparable> Cases<T, ComparableExpression<T>> then(T then) {
+        return thenComparable(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, ComparableExpression<T>> then(ComparableExpression<T> then) {
+        return thenComparable(then);
+    }
+
+    private <T extends Comparable> Cases<T, ComparableExpression<T>> thenComparable(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, ComparableExpression<T>>() {
+            @Override
+            protected ComparableExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.comparableOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Date
+
+    public Cases<java.sql.Date, DateExpression<java.sql.Date>> then(java.sql.Date then) {
+        return thenDate(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, DateExpression<T>> then(DateExpression<T> then) {
+        return thenDate(then);
+    }
+
+    private <T extends Comparable> Cases<T, DateExpression<T>> thenDate(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, DateExpression<T>>() {
+            @Override
+            protected DateExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.dateOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // DateTime
+
+    public Cases<Date, DateTimeExpression<Date>> then(Date then) {
+        return thenDateTime(ConstantImpl.create(then));
+    }
+
+    public Cases<Timestamp, DateTimeExpression<Timestamp>> then(Timestamp then) {
+        return thenDateTime(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, DateTimeExpression<T>> then(DateTimeExpression<T> then) {
+        return thenDateTime(then);
+    }
+
+    private <T extends Comparable> Cases<T, DateTimeExpression<T>> thenDateTime(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, DateTimeExpression<T>>() {
+            @Override
+            protected DateTimeExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.dateTimeOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Enum
+
+    public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(T then) {
+        return thenEnum(ConstantImpl.create(then));
+    }
+
+    public <T extends Enum<T>> Cases<T, EnumExpression<T>> then(EnumExpression<T> then) {
+        return thenEnum(then);
+    }
+
+    private <T extends Enum<T>> Cases<T, EnumExpression<T>> thenEnum(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, EnumExpression<T>>() {
+            @Override
+            protected EnumExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.enumOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Number
+
+    public <T extends Number & Comparable<?>> Cases<T, NumberExpression<T>> then(T then) {
+        return thenNumber(ConstantImpl.create(then));
+    }
+
+    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> then(NumberExpression<T> then) {
+        return thenNumber(then);
+    }
+
+    public <T extends Number & Comparable<?>> Cases<T,NumberExpression<T>> thenNumber(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T,NumberExpression<T>>() {
+            @SuppressWarnings("unchecked")
+            @Override
+            protected NumberExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.numberOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // String
+
+    public Cases<String,StringExpression> then(String then) {
+        return thenString(ConstantImpl.create(then));
+    }
+
+    public Cases<String,StringExpression> then(StringExpression then) {
+        return thenString(then);
+    }
+
+    private Cases<String,StringExpression> thenString(Expression<String> then) {
+        type = then.getType();
+        return new Cases<String,StringExpression>() {
+            @SuppressWarnings("unchecked")
+            @Override
+            protected StringExpression createResult(Class<String> type, Expression<String> last) {
+                return Expressions.stringOperation(Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    // Time
+
+    public Cases<java.sql.Time, TimeExpression<java.sql.Time>> then(java.sql.Time then) {
+        return thenTime(ConstantImpl.create(then));
+    }
+
+    public <T extends Comparable> Cases<T, TimeExpression<T>> then(TimeExpression<T> then) {
+        return thenTime(then);
+    }
+
+    private <T extends Comparable> Cases<T, TimeExpression<T>> thenTime(Expression<T> then) {
+        type = then.getType();
+        return new Cases<T, TimeExpression<T>>() {
+            @Override
+            protected TimeExpression<T> createResult(Class<T> type, Expression<T> last) {
+                return Expressions.timeOperation(type, Ops.CASE_EQ, base, last);
+            }
+
+        }.when(other).then(then);
+    }
+
+    /**
+     * Intermediate step
+     *
+     * @param <T> Result type
+     * @param <Q> Parent expression type
+     */
+    public abstract class Cases<T, Q extends Expression<T>> {
+
+        public CaseWhen<T, Q> when(Expression<? extends D> when) {
+            return new CaseWhen<T,Q>(this, when);
+        }
+
+        public CaseWhen<T, Q> when(D when) {
+            return when(ConstantImpl.create(when));
+        }
+
+        @SuppressWarnings("unchecked")
+        public Q otherwise(Expression<T> otherwise) {
+            caseElements.add(0, new CaseElement<D>(null, otherwise));
+            Expression<T> last = null;
+            for (CaseElement<D> element : caseElements) {
+                if (last == null) {
+                    last = Expressions.operation((Class<T>) type, Ops.CASE_EQ_ELSE,
+                            element.getTarget());
+                } else {
+                    last = Expressions.operation((Class<T>) type, Ops.CASE_EQ_WHEN,
+                            base,
+                            element.getEq(),
+                            element.getTarget(),
+                            last);
+                }
+            }
+            return createResult((Class<T>) type, last);
+        }
+
+        protected abstract Q createResult(Class<T> type, Expression<T> last);
+
+        public Q otherwise(T otherwise) {
+            return otherwise(ConstantImpl.create(otherwise));
+        }
+    }
+
+    /**
+     * Intermediate step
+     *
+     * @param <T> Result type
+     * @param <Q> Parent expression type
+     */
+    public class CaseWhen<T, Q extends Expression<T>> {
+
+        private final Cases<T, Q> cases;
+
+        private final Expression<? extends D> when;
+
+        public CaseWhen(Cases<T, Q> cases, Expression<? extends D> when) {
+            this.cases = cases;
+            this.when = when;
+        }
+
+        public Cases<T, Q> then(Expression<T> then) {
+            caseElements.add(0, new CaseElement<D>(when, then));
+            return cases;
+        }
+
+        public Cases<T, Q> then(T then) {
+            return then(ConstantImpl.create(then));
+        }
+
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java
new file mode 100644
index 0000000000..60296ce42c
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code Coalesce} defines a coalesce function invocation. The coalesce function
+ * returns null if all arguments are null and the first non-null argument
+ * otherwise
+ *
+ * <p>Coalesce doesn't provide the full interface for comparable expressions. To get an immutable
+ * copy with the full expressiveness of Comparable expressions, call getValue().</p>
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@SuppressWarnings("unchecked")
+public class Coalesce<T extends Comparable> extends MutableExpressionBase<T> {
+
+    private static final long serialVersionUID = 445439522266250417L;
+
+    private final List<Expression<? extends T>> exprs = new ArrayList<Expression<? extends T>>();
+
+    private transient volatile ComparableExpression<T> value;
+
+    public Coalesce(Class<? extends T> type, Expression<T> expr) {
+        super(type);
+        add(expr);
+    }
+
+    public Coalesce(Class<? extends T> type, Expression<?>... exprs) {
+        super(type);
+        // NOTE : type parameters for the varargs, would result in compiler warnings
+        for (Expression expr : exprs) {
+            add(expr);
+        }
+    }
+
+    public Coalesce(Expression... exprs) {
+        // NOTE : type parameters for the varargs, would result in compiler warnings
+        this((Class) (exprs.length > 0 ? exprs[0].getType() : Object.class), exprs);
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return getValue().accept(v, context);
+    }
+
+    public ComparableExpression<T> getValue() {
+        if (value == null) {
+            value = Expressions.comparableOperation(getType(), Ops.COALESCE, getExpressionList());
+        }
+        return value;
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    public DslExpression<T> as(Path<T> alias) {
+        return Expressions.dslOperation(getType(),Ops.ALIAS, this, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    public DslExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    public final Coalesce<T> add(Expression<T> expr) {
+        value = null;
+        this.exprs.add(expr);
+        return this;
+    }
+
+    public OrderSpecifier<T> asc() {
+        return getValue().asc();
+    }
+
+    public OrderSpecifier<T> desc() {
+        return getValue().desc();
+    }
+
+    public final Coalesce<T> add(T constant) {
+        return add(ConstantImpl.create(constant));
+    }
+
+    public BooleanExpression asBoolean() {
+        return Expressions.booleanOperation(Ops.COALESCE, getExpressionList());
+    }
+
+    public DateExpression<T> asDate() {
+        return Expressions.dateOperation(getType(), Ops.COALESCE, getExpressionList());
+    }
+
+    public DateTimeExpression<T> asDateTime() {
+        return Expressions.dateTimeOperation(getType(), Ops.COALESCE, getExpressionList());
+    }
+
+    public EnumExpression<?> asEnum() {
+        return Expressions.enumOperation((Class) getType(), Ops.COALESCE, getExpressionList());
+    }
+
+    public NumberExpression<?> asNumber() {
+        return Expressions.numberOperation((Class) getType(), Ops.COALESCE, getExpressionList());
+    }
+
+    public StringExpression asString() {
+        return Expressions.stringOperation(Ops.COALESCE, getExpressionList());
+    }
+
+    public TimeExpression<T> asTime() {
+        return Expressions.timeOperation(getType(), Ops.COALESCE, getExpressionList());
+    }
+
+    private Expression<?> getExpressionList() {
+        return ExpressionUtils.list(getType(), exprs);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Coalesce<?>) {
+            Coalesce<?> c = (Coalesce<?>) o;
+            return c.exprs.equals(exprs);
+        } else {
+            return false;
+        }
+    }
+
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java
new file mode 100644
index 0000000000..17a130f899
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionExpressionBase.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Collection;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code CollectionExpressionBase} is an abstract base class for {@link CollectionExpression} implementations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ * @param <E> collection element type
+ */
+public abstract class CollectionExpressionBase<T extends Collection<E>, E> extends DslExpression<T> implements CollectionExpression<T, E> {
+
+    private static final long serialVersionUID = 691230660037162054L;
+
+    @Nullable
+    private transient volatile BooleanExpression empty;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> size;
+
+    public CollectionExpressionBase(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    public DslExpression<E> as(EntityPath<E> alias) {
+        return Expressions.dslOperation(getElementType(), Ops.ALIAS, mixin, alias);
+    }
+
+    /**
+     * Create a {@code this.contains(child)} expression
+     *
+     * <p>Evaluates to true, if child is contained in this</p>
+     *
+     * @param child element to check
+     * @return this.contains(child)
+     */
+    public final BooleanExpression contains(E child) {
+        return contains(ConstantImpl.create(child));
+    }
+
+    /**
+     * Create a {@code this.contains(child)} expression
+     *
+     * <p>Evaluates to true, if child is contained in this</p>
+     *
+     * @param child element to check
+     * @return this.contains(child)
+     */
+    public final BooleanExpression contains(Expression<E> child) {
+        return Expressions.booleanOperation(Ops.IN, child, mixin);
+    }
+
+    /**
+     * Get the element type
+     *
+     * @return element type
+     */
+    public abstract Class<E> getElementType();
+
+    /**
+     * Create a {@code this.isEmpty()} expression
+     *
+     * <p>Evaluates to true, if this has no elements.</p>
+     *
+     * @return this.isEmpty()
+     */
+    public final BooleanExpression isEmpty() {
+        if (empty == null) {
+            empty = Expressions.booleanOperation(Ops.COL_IS_EMPTY, mixin);
+        }
+        return empty;
+    }
+
+    /**
+     * Create a {@code !this.isEmpty()} expression
+     *
+     * <p>Evaluates to true, if this has elements</p>
+     *
+     * @return !this.isEmpty()
+     */
+    public final BooleanExpression isNotEmpty() {
+        return isEmpty().not();
+    }
+
+    /**
+     * Create a {@code this.size()} expression
+     *
+     * <p>Gets the number of elements in this collection</p>
+     *
+     * @return this.size()
+     */
+    public final NumberExpression<Integer> size() {
+        if (size == null) {
+            size = Expressions.numberOperation(Integer.class, Ops.COL_SIZE, mixin);
+        }
+        return size;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionOperation.java
new file mode 100644
index 0000000000..8ff4f17d83
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code CollectionOperation} is a collection typed operation
+ *
+ * @author tiwe
+ * @param <E> element type
+ */
+public class CollectionOperation<E> extends CollectionExpressionBase<Collection<E>, E> {
+
+    private static final long serialVersionUID = 3154315192589335574L;
+
+    private final Class<E> elementType;
+
+    private final OperationImpl<Collection<E>> opMixin;
+
+    protected CollectionOperation(Class<? super E> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    @SuppressWarnings("unchecked")
+    protected CollectionOperation(Class<? super E> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation((Class) Collection.class, op, args));
+        this.opMixin = (OperationImpl) super.mixin;
+        this.elementType = (Class<E>) type;
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        if (index == 0) {
+            return elementType;
+        } else {
+            throw new IndexOutOfBoundsException(String.valueOf(index));
+        }
+    }
+
+    @Override
+    @Nullable
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return opMixin.accept(v, context);
+    }
+
+    @Override
+    public Class<E> getElementType() {
+        return elementType;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPath.java
new file mode 100644
index 0000000000..5917bc9708
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPath.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.Collection;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code CollectionPath} represents collection paths
+ *
+ * @author tiwe
+ *
+ * @param <E> component type
+ * @param <Q> component query type
+ */
+public class CollectionPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<Collection<E>, E, Q> {
+
+    private static final long serialVersionUID = -4982311799113762600L;
+
+    private final Class<E> elementType;
+
+    private final PathImpl<Collection<E>> pathMixin;
+
+    @Nullable
+    private transient Q any;
+
+    private final Class<Q> queryType;
+
+    protected CollectionPath(Class<? super E> type, Class<Q> queryType, String variable) {
+        this(type, queryType, PathMetadataFactory.forVariable(variable));
+    }
+
+    protected CollectionPath(Class<? super E> type, Class<Q> queryType, Path<?> parent, String property) {
+        this(type, queryType, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected CollectionPath(Class<? super E> type, Class<Q> queryType, PathMetadata metadata) {
+        this(type, queryType, metadata, PathInits.DIRECT);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected CollectionPath(Class<? super E> type, Class<Q> queryType, PathMetadata metadata, PathInits inits) {
+        super(new ParameterizedPathImpl<Collection<E>>((Class) Collection.class, metadata, type), inits);
+        this.elementType = (Class<E>) type;
+        this.queryType = queryType;
+        this.pathMixin = (PathImpl<Collection<E>>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public Q any() {
+        if (any == null) {
+            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(pathMixin));
+        }
+        return any;
+    }
+
+    @Override
+    public Class<E> getElementType() {
+        return elementType;
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        if (index == 0) {
+            return elementType;
+        } else {
+            throw new IndexOutOfBoundsException(String.valueOf(index));
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPathBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPathBase.java
new file mode 100644
index 0000000000..648670b145
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/CollectionPathBase.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ExpressionException;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+
+/**
+ * {@code CollectionPath} is a base class for collection typed paths
+ *
+ * @author tiwe
+ *
+ * @param <C> collection type
+ * @param <E> component type
+ * @param <Q> expression type for {@code any()} results
+ */
+public abstract class CollectionPathBase<C extends Collection<E>, E, Q extends SimpleExpression<? super E>>
+    extends CollectionExpressionBase<C, E> implements Path<C> {
+
+    private static final long serialVersionUID = -9004995667633601298L;
+
+    @Nullable
+    private transient volatile Constructor<?> constructor;
+
+    private transient volatile boolean usePathInits = false;
+
+    private final PathInits inits;
+
+    public CollectionPathBase(PathImpl<C> mixin, PathInits inits) {
+        super(mixin);
+        this.inits = inits;
+    }
+
+    /**
+     * Create a path that matches any element in this collection
+     *
+     * @return path expression
+     */
+    public abstract Q any();
+
+    @SuppressWarnings("unchecked")
+    protected Q newInstance(Class<Q> queryType, PathMetadata pm) {
+        try {
+            if (constructor == null) {
+                if (Constants.isTyped(queryType)) {
+                    try {
+                        constructor = queryType.getDeclaredConstructor(Class.class, PathMetadata.class, PathInits.class);
+                        usePathInits = true;
+                    } catch (NoSuchMethodException e) {
+                        constructor = queryType.getDeclaredConstructor(Class.class, PathMetadata.class);
+                    }
+                } else {
+                    try {
+                        constructor = queryType.getDeclaredConstructor(PathMetadata.class, PathInits.class);
+                        usePathInits = true;
+                    } catch (NoSuchMethodException e) {
+                        constructor = queryType.getDeclaredConstructor(PathMetadata.class);
+                    }
+                }
+                constructor.setAccessible(true);
+            }
+            if (Constants.isTyped(queryType)) {
+                if (usePathInits) {
+                    return (Q) constructor.newInstance(getElementType(), pm, inits);
+                } else {
+                    return (Q) constructor.newInstance(getElementType(), pm);
+                }
+
+            } else {
+                if (usePathInits) {
+                    return (Q) constructor.newInstance(pm, inits);
+                } else {
+                    return (Q) constructor.newInstance(pm);
+                }
+            }
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
+            throw new ExpressionException(e);
+        }
+
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableEntityPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableEntityPath.java
new file mode 100644
index 0000000000..5e33cd35b0
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableEntityPath.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+
+/**
+ * {@code ComparableEntityPath} extends the {@link ComparablePath} class to implement the EntityPath interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+@SuppressWarnings("unchecked")
+public class ComparableEntityPath<T extends Comparable> extends ComparablePath<T> implements EntityPath<T> {
+
+    private static final long serialVersionUID = -7115848171352092315L;
+
+    protected ComparableEntityPath(Class<? extends T> type, Path<?> parent, String property) {
+        super(type, parent, property);
+    }
+
+    protected ComparableEntityPath(Class<? extends T> type, PathMetadata metadata) {
+        super(type, metadata);
+    }
+
+    protected ComparableEntityPath(Class<? extends T> type, String var) {
+        super(type, var);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
new file mode 100644
index 0000000000..4286834303
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code ComparableExpression} extends {@link ComparableExpressionBase} to provide comparison methods.
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public abstract class ComparableExpression<T extends Comparable> extends ComparableExpressionBase<T> {
+
+    private static final long serialVersionUID = 5761359576767404270L;
+
+    public ComparableExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public ComparableExpression<T> as(Path<T> alias) {
+        return Expressions.comparableOperation(getType(), Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public ComparableExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a {@code this between from and to} expression
+     *
+     * <p>Is equivalent to {@code from <= this <= to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this between from and to
+     */
+    public BooleanExpression between(@Nullable T from, @Nullable T to) {
+        if (from == null) {
+            if (to != null) {
+                return Expressions.booleanOperation(Ops.LOE, mixin, ConstantImpl.create(to));
+            } else {
+                throw new IllegalArgumentException("Either from or to needs to be non-null");
+            }
+        } else if (to == null) {
+            return Expressions.booleanOperation(Ops.GOE, mixin, ConstantImpl.create(from));
+        } else {
+            return Expressions.booleanOperation(Ops.BETWEEN, mixin, ConstantImpl.create(from), ConstantImpl.create(to));
+        }
+    }
+
+    /**
+     * Create a {@code this between from and to} expression
+     *
+     * <p>Is equivalent to {@code from <= this <= to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this between from and to
+     */
+    public BooleanExpression between(@Nullable Expression<T> from, @Nullable Expression<T> to) {
+        if (from == null) {
+            if (to != null) {
+                return Expressions.booleanOperation(Ops.LOE, mixin, to);
+            } else {
+                throw new IllegalArgumentException("Either from or to needs to be non-null");
+            }
+        } else if (to == null) {
+            return Expressions.booleanOperation(Ops.GOE, mixin, from);
+        } else {
+            return Expressions.booleanOperation(Ops.BETWEEN, mixin, from, to);
+        }
+
+    }
+
+    /**
+     * Create a {@code this not between from and to} expression
+     *
+     * <p>Is equivalent to {@code this < from || this > to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this not between from and to
+     */
+    public BooleanExpression notBetween(T from, T to) {
+        return between(from, to).not();
+    }
+
+    /**
+     * Create a {@code this not between from and to} expression
+     *
+     * <p>Is equivalent to {@code this < from || this > to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this not between from and to
+     */
+    public BooleanExpression notBetween(Expression<T> from, Expression<T> to) {
+        return between(from, to).not();
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression gt(T right) {
+        return gt(ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression gt(Expression<T> right) {
+        return Expressions.booleanOperation(Ops.GT, mixin, right);
+    }
+
+    /**
+     * Create a {@code this > all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; all right
+     */
+    public BooleanExpression gtAll(CollectionExpression<?, ? super T> right) {
+        return gt(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this > any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; any right
+     */
+    public BooleanExpression gtAny(CollectionExpression<?, ? super T> right) {
+        return gt(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this > all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; all right
+     */
+    public BooleanExpression gtAll(SubQueryExpression<? extends T> right) {
+        return gt(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this > any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; any right
+     */
+    public BooleanExpression gtAny(SubQueryExpression<? extends T> right) {
+        return gt(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression goe(T right) {
+        return goe(ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression goe(Expression<T> right) {
+        return Expressions.booleanOperation(Ops.GOE, mixin, right);
+    }
+
+    /**
+     * Create a {@code this >= all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= all right
+     */
+    public BooleanExpression goeAll(CollectionExpression<?, ? super T> right) {
+        return goe(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this >= any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= any right
+     */
+    public BooleanExpression goeAny(CollectionExpression<?, ? super T> right) {
+        return goe(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this >= all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= all right
+     */
+    public BooleanExpression goeAll(SubQueryExpression<? extends T> right) {
+        return goe(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this >= any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt;= any right
+     */
+    public BooleanExpression goeAny(SubQueryExpression<? extends T> right) {
+        return goe(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression lt(T right) {
+        return lt(ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression lt(Expression<T> right) {
+        return Expressions.booleanOperation(Ops.LT, mixin, right);
+    }
+
+    /**
+     * Create a {@code this < all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; all right
+     */
+    public BooleanExpression ltAll(CollectionExpression<?, ? super T> right) {
+        return lt(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this < any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; any right
+     */
+    public BooleanExpression ltAny(CollectionExpression<?, ? super T> right) {
+        return lt(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this < all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; all right
+     */
+    public BooleanExpression ltAll(SubQueryExpression<? extends T> right) {
+        return lt(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this < any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; any right
+     */
+    public BooleanExpression ltAny(SubQueryExpression<? extends T> right) {
+        return lt(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression loe(T right) {
+        return Expressions.booleanOperation(Ops.LOE, mixin, ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= right
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public BooleanExpression loe(Expression<T> right) {
+        return Expressions.booleanOperation(Ops.LOE, mixin, right);
+    }
+
+    /**
+     * Create a {@code this <= all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= all right
+     */
+    public BooleanExpression loeAll(CollectionExpression<?, ? super T> right) {
+        return loe(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this <= any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= any right
+     */
+    public BooleanExpression loeAny(CollectionExpression<?, ? super T> right) {
+        return loe(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this <= all right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= all right
+     */
+    public BooleanExpression loeAll(SubQueryExpression<? extends T> right) {
+        return loe(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this <= any right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt;= any right
+     */
+    public BooleanExpression loeAny(SubQueryExpression<? extends T> right) {
+        return loe(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code min(this)} expression
+     *
+     * <p>Get the minimum value of this expression (aggregation)</p>
+     *
+     * @return min(this)
+     */
+    @Override
+    public ComparableExpression<T> min() {
+        return Expressions.comparableOperation(getType(), Ops.AggOps.MIN_AGG, mixin);
+    }
+
+    /**
+     * Create a {@code max(this)} expression
+     *
+     * <p>Get the maximum value of this expression (aggregation)</p>
+     *
+     * @return max(this)
+     */
+    @Override
+    public ComparableExpression<T> max() {
+        return Expressions.comparableOperation(getType(), Ops.AggOps.MAX_AGG, mixin);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public ComparableExpression<T> nullif(Expression<T> other) {
+        return Expressions.comparableOperation(this.getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public ComparableExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public ComparableExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public ComparableExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public ComparableExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public ComparableExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.getValue();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
new file mode 100644
index 0000000000..7830a527b6
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Ops;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Order;
+import com.querydsl.core.types.OrderSpecifier;
+
+/**
+ * {@code ComparableExpressionBase} represents comparable expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> Java type
+ * @see java.lang.Comparable
+ */
+public abstract class ComparableExpressionBase<T extends Comparable> extends SimpleExpression<T> {
+
+    private static final long serialVersionUID = 1460921109546656911L;
+
+    @Nullable
+    private transient volatile OrderSpecifier<T> asc, desc;
+
+    public ComparableExpressionBase(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Create an OrderSpecifier for ascending order of this expression
+     *
+     * @return ascending order by this
+     */
+    public OrderSpecifier<T> asc() {
+        if (asc == null) {
+            asc = new OrderSpecifier<T>(Order.ASC, mixin);
+        }
+        return asc;
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    public ComparableExpressionBase<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public ComparableExpressionBase<T> coalesce(Expression<?>...exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    public ComparableExpressionBase<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @SuppressWarnings("unchecked")
+    public ComparableExpressionBase<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.getValue();
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public ComparableExpressionBase<T> nullif(Expression<T> other) {
+        return Expressions.comparableOperation(this.getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public ComparableExpressionBase<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create an OrderSpecifier for descending order of this expression
+     *
+     * @return descending order by this
+     */
+    public OrderSpecifier<T> desc() {
+        if (desc == null) {
+            desc = new OrderSpecifier<T>(Order.DESC, mixin);
+        }
+        return desc;
+    }
+
+    /**
+     * Create a {@code min(this)} expression
+     *
+     * <p>Get the minimum value of this expression (aggregation)</p>
+     *
+     * @return min(this)
+     */
+    public ComparableExpressionBase<T> min() {
+        return Expressions.comparableOperation(getType(), Ops.AggOps.MIN_AGG, mixin);
+    }
+
+    /**
+     * Create a {@code max(this)} expression
+     *
+     * <p>Get the maximum value of this expression (aggregation)</p>
+     *
+     * @return max(this)
+     */
+    public ComparableExpressionBase<T> max() {
+        return Expressions.comparableOperation(getType(), Ops.AggOps.MAX_AGG, mixin);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableOperation.java
new file mode 100644
index 0000000000..7be471f26e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code ComparableOperation} represents Comparable operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class ComparableOperation<T extends Comparable<?>> extends
+        ComparableExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 1129243977606098865L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected ComparableOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected ComparableOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected ComparableOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparablePath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparablePath.java
new file mode 100644
index 0000000000..ecbb918d73
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparablePath.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code ComparablePath} represents comparable paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ * @see Comparable
+ */
+@SuppressWarnings({"unchecked"})
+public class ComparablePath<T extends Comparable> extends ComparableExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = -7434767743611671666L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected ComparablePath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected ComparablePath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected ComparablePath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected ComparablePath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableTemplate.java
new file mode 100644
index 0000000000..8e71744e0e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code ComparableTemplate} defines custom comparable expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class ComparableTemplate<T extends Comparable<?>> extends ComparableExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = -6292853402028813007L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected ComparableTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected ComparableTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Constants.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Constants.java
new file mode 100644
index 0000000000..88ff71675c
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Constants.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+final class Constants {
+
+    private static final Set<Class<?>> typedClasses = new HashSet<Class<?>>(Arrays.<Class<?>>asList(
+            ArrayPath.class,
+            PathBuilder.class,
+            ComparablePath.class,
+            EnumPath.class,
+            DatePath.class,
+            DateTimePath.class,
+            BeanPath.class,
+            EntityPathBase.class,
+            NumberPath.class,
+            SimplePath.class,
+            TimePath.class
+            ));
+
+    public static boolean isTyped(Class<?> cl) {
+        return typedClasses.contains(cl);
+    }
+
+    private Constants() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
new file mode 100644
index 0000000000..3af2c237ba
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Date;
+
+import com.querydsl.core.types.ConstantImpl;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code DateExpression} represents Date expressions
+ * The date representation is compatible with the Gregorian calendar.
+ *
+ * @param <T> expression type
+ *
+ * @author tiwe
+ * @see <a href="http://en.wikipedia.org/wiki/Gregorian_calendar">Gregorian calendar</a>
+ */
+public abstract class DateExpression<T extends Comparable> extends TemporalExpression<T> {
+
+    private static class Constants {
+        private static final DateExpression<Date> CURRENT_DATE = currentDate(Date.class);
+    }
+
+    private static final long serialVersionUID = 6054664454254721302L;
+
+    /**
+     * Create an expression representing the current date as a {@code DateExpression} instance
+     *
+     * @return current date
+     */
+    public static DateExpression<Date> currentDate() {
+        return Constants.CURRENT_DATE;
+    }
+
+    /**
+     * Create an expression representing the current date as a {@code DateExpression} instance
+     *
+     * @param cl type of expression
+     * @return current date
+     */
+    public static <T extends Comparable> DateExpression<T> currentDate(Class<T> cl) {
+        return Expressions.dateOperation(cl, Ops.DateTimeOps.CURRENT_DATE);
+    }
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> dayOfMonth, dayOfWeek, dayOfYear;
+
+    @Nullable
+    private transient volatile DateExpression<T> min, max;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> week, month, year, yearMonth, yearWeek;
+
+    public DateExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public DateExpression<T> as(Path<T> alias) {
+        return Expressions.dateOperation(getType(), Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public DateExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a day of month expression (range 1-31)
+     *
+     * @return day of month
+     */
+    public NumberExpression<Integer> dayOfMonth() {
+        if (dayOfMonth == null) {
+            dayOfMonth = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_MONTH, mixin);
+        }
+        return dayOfMonth;
+    }
+
+    /**
+     * Create a day of week expression (range 1-7 / SUN-SAT)
+     * <p>NOT supported in JDOQL and not in Derby</p>
+     *
+     * @return day of week
+     */
+    public NumberExpression<Integer> dayOfWeek() {
+        if (dayOfWeek == null) {
+            dayOfWeek = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_WEEK, mixin);
+        }
+        return dayOfWeek;
+    }
+
+    /**
+     * Create a day of year expression (range 1-356)
+     * <p>NOT supported in JDOQL and not in Derby</p>
+     *
+     * @return day of year
+     */
+    public NumberExpression<Integer> dayOfYear() {
+        if (dayOfYear == null) {
+            dayOfYear = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_YEAR, mixin);
+        }
+        return dayOfYear;
+    }
+
+    /**
+     * Get the maximum value of this expression (aggregation)
+     *
+     * @return max(this)
+     */
+    @Override
+    public DateExpression<T> max() {
+        if (max == null) {
+            max = Expressions.dateOperation(getType(), Ops.AggOps.MAX_AGG, mixin);
+        }
+        return max;
+    }
+
+    /**
+     * Get the minimum value of this expression (aggregation)
+     *
+     * @return min(this)
+     */
+    @Override
+    public DateExpression<T> min() {
+        if (min == null) {
+            min = Expressions.dateOperation(getType(), Ops.AggOps.MIN_AGG, mixin);
+        }
+        return min;
+    }
+
+    /**
+     * Create a month expression (range 1-12 / JAN-DEC)
+     *
+     * @return month
+     */
+    public NumberExpression<Integer> month() {
+        if (month == null) {
+            month = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MONTH, mixin);
+        }
+        return month;
+    }
+
+    /**
+     * Create a week expression
+     *
+     * @return week
+     */
+    public NumberExpression<Integer> week() {
+        if (week == null) {
+            week = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.WEEK,  mixin);
+        }
+        return week;
+    }
+
+    /**
+     * Create a year expression
+     *
+     * @return year
+     */
+    public NumberExpression<Integer> year() {
+        if (year == null) {
+            year = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR, mixin);
+        }
+        return year;
+    }
+
+    /**
+     * Create a year / month expression
+     *
+     * @return year month
+     */
+    public NumberExpression<Integer> yearMonth() {
+        if (yearMonth == null) {
+            yearMonth = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR_MONTH, mixin);
+        }
+        return yearMonth;
+    }
+
+    /**
+     * Create a ISO yearweek expression
+     *
+     * @return year week
+     */
+    public NumberExpression<Integer> yearWeek() {
+        if (yearWeek == null) {
+            yearWeek = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR_WEEK, mixin);
+        }
+        return yearWeek;
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public DateExpression<T> nullif(Expression<T> other) {
+        return Expressions.dateOperation(getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public DateExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asDate();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public DateExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.asDate();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asDate();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public DateExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.asDate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateOperation.java
new file mode 100644
index 0000000000..5345416574
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DateOperation} represents Date operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DateOperation<T extends Comparable<?>> extends
+    DateExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = -7859020164194396995L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected DateOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected DateOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected DateOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DatePath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DatePath.java
new file mode 100644
index 0000000000..9d7fa0e006
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DatePath.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DatePath} presents Date paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@SuppressWarnings({"unchecked"})
+public class DatePath<T extends Comparable> extends DateExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = -6030609920388740246L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected DatePath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected DatePath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected DatePath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected DatePath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTemplate.java
new file mode 100644
index 0000000000..1efb9754b2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DateTemplate} defines custom date expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DateTemplate<T extends Comparable<?>> extends DateExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = 4975559746071238026L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected DateTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected DateTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
new file mode 100644
index 0000000000..59c320bef1
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Date;
+
+import com.querydsl.core.types.ConstantImpl;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code DateTimeExpression} represents Date / Time expressions
+ * The date representation is compatible with the Gregorian calendar.
+ *
+ * @param <T> expression type
+ *
+ * @author tiwe
+ * @see <a href="http://en.wikipedia.org/wiki/Gregorian_calendar">Gregorian calendar</a>
+ */
+public abstract class DateTimeExpression<T extends Comparable> extends TemporalExpression<T> {
+
+    private static class Constants {
+        private static final DateTimeExpression<Date> CURRENT_DATE = currentDate(Date.class);
+        private static final DateTimeExpression<Date> CURRENT_TIMESTAMP = currentTimestamp(Date.class);
+    }
+
+    private static final long serialVersionUID = -6879277113694148047L;
+
+    /**
+     * Create an expression representing the current date as a DateTimeExpression instance
+     *
+     * @return current date
+     */
+    public static DateTimeExpression<Date> currentDate() {
+        return Constants.CURRENT_DATE;
+    }
+
+    /**
+     * Create an expression representing the current date as a DateTimeExpression instance
+     *
+     * @return current date
+     */
+    public static <T extends Comparable> DateTimeExpression<T> currentDate(Class<T> cl) {
+        return Expressions.dateTimeOperation(cl, Ops.DateTimeOps.CURRENT_DATE);
+    }
+
+    /**
+     * Create an expression representing the current time instant as a DateTimeExpression instance
+     *
+     * @return current timestamp
+     */
+    public static DateTimeExpression<Date> currentTimestamp() {
+        return Constants.CURRENT_TIMESTAMP;
+    }
+
+    /**
+     * Create an expression representing the current time instant as a DateTimeExpression instance
+     *
+     * @return current timestamp
+     */
+    public static <T extends Comparable> DateTimeExpression<T> currentTimestamp(Class<T> cl) {
+        return Expressions.dateTimeOperation(cl, Ops.DateTimeOps.CURRENT_TIMESTAMP);
+    }
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> dayOfMonth, dayOfWeek, dayOfYear;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> hours, minutes, seconds, milliseconds;
+
+    @Nullable
+    private transient volatile DateTimeExpression<T> min, max;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> week, month, year, yearMonth, yearWeek;
+
+    public DateTimeExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public DateTimeExpression<T> as(Path<T> alias) {
+        return Expressions.dateTimeOperation(getType(), Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public DateTimeExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a day of month expression (range 1-31)
+     *
+     * @return day of month
+     */
+    public NumberExpression<Integer> dayOfMonth() {
+        if (dayOfMonth == null) {
+            dayOfMonth = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_MONTH, mixin);
+        }
+        return dayOfMonth;
+    }
+
+    /**
+     * Create a day of week expression (range 1-7 / SUN-SAT)
+     * <p>NOT supported in JDOQL and not in Derby</p>
+     *
+     * @return day of week
+     */
+    public NumberExpression<Integer> dayOfWeek() {
+        if (dayOfWeek == null) {
+            dayOfWeek = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_WEEK, mixin);
+        }
+        return dayOfWeek;
+    }
+
+    /**
+     * Create a day of year expression (range 1-356)
+     * <p>NOT supported in JDOQL and not in Derby</p>
+     *
+     * @return day of year
+     */
+    public NumberExpression<Integer> dayOfYear() {
+        if (dayOfYear == null) {
+            dayOfYear = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.DAY_OF_YEAR, mixin);
+        }
+        return dayOfYear;
+    }
+
+    /**
+     * Create a hours expression (range 0-23)
+     *
+     * @return hour
+     */
+    public NumberExpression<Integer> hour() {
+        if (hours == null) {
+            hours = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.HOUR, mixin);
+        }
+        return hours;
+    }
+
+    /**
+     * Get the maximum value of this expression (aggregation)
+     *
+     * @return max(this)
+     */
+    @Override
+    public DateTimeExpression<T> max() {
+        if (max == null) {
+            max = Expressions.dateTimeOperation(getType(), Ops.AggOps.MAX_AGG, mixin);
+        }
+        return max;
+    }
+
+    /**
+     * Create a milliseconds expression (range 0-999)
+     * <p>Is always 0 in HQL and JDOQL modules</p>
+     *
+     * @return milli seconds
+     */
+    public NumberExpression<Integer> milliSecond() {
+        if (milliseconds == null) {
+            milliseconds = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MILLISECOND, mixin);
+        }
+        return milliseconds;
+    }
+
+    /**
+     * Get the minimum value of this expression (aggregation)
+     *
+     * @return min(this)
+     */
+    @Override
+    public DateTimeExpression<T> min() {
+        if (min == null) {
+            min = Expressions.dateTimeOperation(getType(), Ops.AggOps.MIN_AGG, mixin);
+        }
+        return min;
+    }
+
+    /**
+     * Create a minutes expression (range 0-59)
+     *
+     * @return minute
+     */
+    public NumberExpression<Integer> minute() {
+        if (minutes == null) {
+            minutes = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MINUTE, mixin);
+        }
+        return minutes;
+    }
+
+    /**
+     * Create a month expression (range 1-12 / JAN-DEC)
+     *
+     * @return month
+     */
+    public NumberExpression<Integer> month() {
+        if (month == null) {
+            month = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MONTH, mixin);
+        }
+        return month;
+    }
+
+    /**
+     * Create a seconds expression (range 0-59)
+     *
+     * @return second
+     */
+    public NumberExpression<Integer> second() {
+        if (seconds == null) {
+            seconds = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.SECOND, mixin);
+        }
+        return seconds;
+    }
+
+    /**
+     * Create a week expression
+     *
+     * @return week
+     */
+    public NumberExpression<Integer> week() {
+        if (week == null) {
+            week = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.WEEK,  mixin);
+        }
+        return week;
+    }
+
+    /**
+     * Create a year expression
+     *
+     * @return year
+     */
+    public NumberExpression<Integer> year() {
+        if (year == null) {
+            year = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR, mixin);
+        }
+        return year;
+    }
+
+    /**
+     * Create a year / month expression
+     *
+     * @return year month
+     */
+    public NumberExpression<Integer> yearMonth() {
+        if (yearMonth == null) {
+            yearMonth = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR_MONTH, mixin);
+        }
+        return yearMonth;
+    }
+
+    /**
+     * Create a ISO yearweek expression
+     *
+     * @return year week
+     */
+    public NumberExpression<Integer> yearWeek() {
+        if (yearWeek == null) {
+            yearWeek = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.YEAR_WEEK, mixin);
+        }
+        return yearWeek;
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public DateTimeExpression<T> nullif(Expression<T> other) {
+        return Expressions.dateTimeOperation(getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public DateTimeExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateTimeExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asDateTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public DateTimeExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.asDateTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateTimeExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asDateTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public DateTimeExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.asDateTime();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeOperation.java
new file mode 100644
index 0000000000..9d26caf087
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DateTimeOperation} represents DateTime operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DateTimeOperation<T extends Comparable<?>> extends DateTimeExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 6523293814317168556L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected DateTimeOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected DateTimeOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected DateTimeOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimePath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimePath.java
new file mode 100644
index 0000000000..02eca63656
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimePath.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DateTimePath} presents DateTime typed paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DateTimePath<T extends Comparable> extends DateTimeExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = -2807916228198184631L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected DateTimePath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected DateTimePath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected DateTimePath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected DateTimePath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeTemplate.java
new file mode 100644
index 0000000000..bf3d8aeeeb
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DateTimeTemplate} defines custom dateTime expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DateTimeTemplate<T extends Comparable<?>> extends DateTimeExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = -2289699666347576749L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected DateTimeTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected DateTimeTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslExpression.java
new file mode 100644
index 0000000000..d3bb445274
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslExpression.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code DslExpression} is the base class for DSL expressions, but {@link SimpleExpression} is the base class
+ * for scalar Expressions
+ *
+ * @author tiwe
+ * @param <T> expression type
+ */
+public abstract class DslExpression<T> implements Expression<T> {
+
+    private static final long serialVersionUID = -3383063447710753290L;
+
+    protected final Expression<T> mixin;
+
+    protected final int hashCode;
+
+    public DslExpression(Expression<T> mixin) {
+        this.mixin = mixin;
+        this.hashCode = mixin.hashCode();
+    }
+
+    @Override
+    public final Class<? extends T> getType() {
+        return mixin.getType();
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    @SuppressWarnings("unchecked")
+    public DslExpression<T> as(Path<T> alias) {
+        return Expressions.dslOperation(getType(),Ops.ALIAS, mixin, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return this as alias
+     */
+    public DslExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    @Override
+    public boolean equals(Object o) { // can be overwritten
+        return mixin.equals(o);
+    }
+
+    @Override
+    public final int hashCode() {
+        return hashCode;
+    }
+
+    @Override
+    public final String toString() {
+        return mixin.toString();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslOperation.java
new file mode 100644
index 0000000000..e6a775a259
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslOperation.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DslOperation} represents a simple operation expression
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DslOperation<T> extends DslExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = -285668548371034230L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected DslOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected DslOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslPath.java
new file mode 100644
index 0000000000..292d264f6d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslPath.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DslPath} represents simple paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DslPath<T> extends DslExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 3088836955328191852L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected DslPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected DslPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected DslPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslTemplate.java
new file mode 100644
index 0000000000..f98596401b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DslTemplate.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DslTemplate} defines custom simple expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class DslTemplate<T> extends DslExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = -4697578522909045745L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected DslTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EntityPathBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EntityPathBase.java
new file mode 100644
index 0000000000..fe5507fe63
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EntityPathBase.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+
+/**
+ * {@code EntityPathBase} provides a base class for {@link EntityPath} implementations
+ *
+ * @author tiwe
+ *
+ * @param <T> entity type
+ */
+public class EntityPathBase<T> extends BeanPath<T> implements EntityPath<T> {
+
+    private static final long serialVersionUID = -8610055828414880996L;
+
+    public EntityPathBase(Class<? extends T> type, String variable) {
+        super(type, variable);
+    }
+
+    public EntityPathBase(Class<? extends T> type, PathMetadata metadata) {
+        super(type, metadata);
+    }
+
+    public EntityPathBase(Class<? extends T> type, PathMetadata metadata, @Nullable PathInits inits) {
+        super(type, metadata, inits);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
new file mode 100644
index 0000000000..799c0d3035
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code EnumExpression} represents Enum typed expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpression<T> {
+
+    private static final long serialVersionUID = 8819222316513862829L;
+
+    private transient volatile NumberExpression<Integer> ordinal;
+
+    public EnumExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public EnumExpression<T> as(Path<T> alias) {
+        return Expressions.enumOperation(getType(),Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public EnumExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Get the ordinal of this enum
+     *
+     * @return ordinal number
+     */
+    public NumberExpression<Integer> ordinal() {
+        if (ordinal == null) {
+            ordinal = Expressions.numberOperation(Integer.class, Ops.ORDINAL, mixin);
+        }
+        return ordinal;
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public EnumExpression<T> nullif(Expression<T> other) {
+        return Expressions.enumOperation(getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public EnumExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public EnumExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public EnumExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public EnumExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public EnumExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumOperation.java
new file mode 100644
index 0000000000..f2233462f4
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code EnumOperation} represents enum operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class EnumOperation<T extends Enum<T>> extends EnumExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = -3593040852095778453L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected EnumOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected EnumOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected EnumOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumPath.java
new file mode 100644
index 0000000000..8e8636b4c9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumPath.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code EnumPath} represents enum paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class EnumPath<T extends Enum<T>> extends EnumExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 338191992784020563L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected EnumPath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected EnumPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected EnumPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected EnumPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumTemplate.java
new file mode 100644
index 0000000000..28a3d724b8
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code EnumTemplate} defines custom enum expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class EnumTemplate<T extends Enum<T>> extends EnumExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = 351057421752203377L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected EnumTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected EnumTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Expressions.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Expressions.java
new file mode 100644
index 0000000000..45c21c5465
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Expressions.java
@@ -0,0 +1,1945 @@
+//CHECKSTYLERULE:OFF: FileLength
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.sql.Time;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.NullExpression;
+import com.querydsl.core.types.OperationImpl;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.PredicateOperation;
+import com.querydsl.core.types.PredicateTemplate;
+import com.querydsl.core.types.Template;
+import com.querydsl.core.types.TemplateExpressionImpl;
+import com.querydsl.core.types.TemplateFactory;
+import com.querydsl.core.types.Visitor;
+
+/**
+ * Factory class for {@link Expression} creation.
+ *
+ * @author tiwe
+ *
+ */
+@SuppressWarnings("FileLength")
+public final class Expressions {
+
+    public static final NumberExpression<Integer> ONE = numberTemplate(Integer.class, "1");
+
+    public static final NumberExpression<Integer> TWO = numberTemplate(Integer.class, "2");
+
+    public static final NumberExpression<Integer> THREE = numberTemplate(Integer.class, "3");
+
+    public static final NumberExpression<Integer> FOUR = numberTemplate(Integer.class, "4");
+
+    public static final NumberExpression<Integer> ZERO = numberTemplate(Integer.class, "0");
+
+    public static final BooleanExpression TRUE = booleanTemplate("true");
+
+    public static final BooleanExpression FALSE = booleanTemplate("false");
+
+    private Expressions() { }
+
+    /**
+     * Create a {@code source as alias} expression
+     *
+     * @param source source
+     * @param alias alias
+     * @param <D>
+     * @return source as alias
+     */
+    public static <D> SimpleExpression<D> as(Expression<D> source, Path<D> alias) {
+        if (source == null) {
+            return as(Expressions.<D>nullExpression(), alias);
+        } else {
+            return operation(alias.getType(), Ops.ALIAS, source, alias);
+        }
+    }
+
+    /**
+     * Create an expression representing the current date as a DateExpression instance
+     *
+     * @return current date
+     */
+    public static DateExpression<Date> currentDate() {
+        return DateExpression.currentDate();
+    }
+
+    /**
+     * Create an expression representing the current time instant as a DateTimeExpression instance
+     *
+     * @return current timestamp
+     */
+    public static DateTimeExpression<Date> currentTimestamp() {
+        return DateTimeExpression.currentTimestamp();
+    }
+
+    /**
+     * Create an expression representing the current time as a TimeExpression instance
+     *
+     * @return current time
+     */
+    public static TimeExpression<Time> currentTime() {
+        return TimeExpression.currentTime();
+    }
+
+    /**
+     * Create a {@code source as alias} expression
+     *
+     * @param source source
+     * @param alias alias
+     * @return source as alias
+     */
+    public static <D> SimpleExpression<D> as(Expression<D> source, String alias) {
+        return as(source, ExpressionUtils.path(source.getType(), alias));
+    }
+
+    /**
+     * Get the intersection of the given Boolean expressions
+     *
+     * @param exprs predicates
+     * @return intersection of predicates
+     */
+    public static BooleanExpression allOf(BooleanExpression... exprs) {
+        BooleanExpression rv = null;
+        for (BooleanExpression b : exprs) {
+            rv = rv == null ? b : rv.and(b);
+        }
+        return rv;
+    }
+
+    /**
+     * Get the union of the given Boolean expressions
+     *
+     * @param exprs predicates
+     * @return union of predicates
+     */
+    public static BooleanExpression anyOf(BooleanExpression... exprs) {
+        BooleanExpression rv = null;
+        for (BooleanExpression b : exprs) {
+            rv = rv == null ? b : rv.or(b);
+        }
+        return rv;
+    }
+
+    /**
+     * Create a Constant expression for the given value
+     *
+     * @param value constant
+     * @return constant expression
+     */
+    public static <T> Expression<T> constant(T value) {
+        return ConstantImpl.create(value);
+    }
+
+    /**
+     * Create a {@code source as alias} expression
+     *
+     * @param source source
+     * @param alias alias
+     * @return source as alias
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static <D> SimpleExpression<D> constantAs(D source, Path<D> alias) {
+        if (source == null) {
+            return as((Expression) nullExpression(), alias);
+        } else {
+            return as(ConstantImpl.create(source), alias);
+        }
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> template(Class<? extends T> cl, String template, Object... args) {
+        return simpleTemplate(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> template(Class<? extends T> cl, String template, List<?> args) {
+        return simpleTemplate(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> template(Class<? extends T> cl, Template template, Object... args) {
+        return simpleTemplate(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> template(Class<? extends T> cl, Template template, List<?> args) {
+        return simpleTemplate(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> simpleTemplate(Class<? extends T> cl, String template, Object... args) {
+        return simpleTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> simpleTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return simpleTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> simpleTemplate(Class<? extends T> cl, Template template, Object... args) {
+        return simpleTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> SimpleTemplate<T> simpleTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new SimpleTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> DslTemplate<T> dslTemplate(Class<? extends T> cl, String template, Object... args) {
+        return dslTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> DslTemplate<T> dslTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return dslTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> DslTemplate<T> dslTemplate(Class<? extends T> cl, Template template, Object... args) {
+        return dslTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T> DslTemplate<T> dslTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new DslTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> ComparableTemplate<T> comparableTemplate(Class<? extends T> cl,
+            String template, Object... args) {
+        return comparableTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> ComparableTemplate<T> comparableTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return comparableTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> ComparableTemplate<T> comparableTemplate(Class<? extends T> cl,
+                                                                                     Template template, Object... args) {
+        return comparableTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> ComparableTemplate<T> comparableTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new ComparableTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTemplate<T> dateTemplate(Class<? extends T> cl,
+                                                                         String template, Object... args) {
+        return dateTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTemplate<T> dateTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return dateTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTemplate<T> dateTemplate(Class<? extends T> cl,
+                                                                         Template template, Object... args) {
+        return dateTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTemplate<T> dateTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new DateTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTimeTemplate<T> dateTimeTemplate(Class<? extends T> cl,
+                                                                                 String template, Object... args) {
+        return dateTimeTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTimeTemplate<T> dateTimeTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return dateTimeTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTimeTemplate<T> dateTimeTemplate(Class<? extends T> cl,
+                                                                                   Template template, Object... args) {
+        return dateTimeTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> DateTimeTemplate<T> dateTimeTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new DateTimeTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> TimeTemplate<T> timeTemplate(Class<? extends T> cl,
+                                                                           String template, Object... args) {
+        return timeTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> TimeTemplate<T> timeTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return timeTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> TimeTemplate<T> timeTemplate(Class<? extends T> cl,
+                                                                         Template template, Object... args) {
+        return timeTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Comparable<?>> TimeTemplate<T> timeTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new TimeTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Enum<T>> EnumTemplate<T> enumTemplate(Class<? extends T> cl,
+                                                                     String template, Object... args) {
+        return enumTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Enum<T>> EnumTemplate<T> enumTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return enumTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Enum<T>> EnumTemplate<T> enumTemplate(Class<? extends T> cl,
+                                                                     Template template, Object... args) {
+        return enumTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Enum<T>> EnumTemplate<T> enumTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new EnumTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Number & Comparable<?>> NumberTemplate<T> numberTemplate(Class<? extends T> cl,
+            String template, Object... args) {
+        return numberTemplate(cl, createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Number & Comparable<?>> NumberTemplate<T> numberTemplate(Class<? extends T> cl, String template, List<?> args) {
+        return numberTemplate(cl, createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Number & Comparable<?>> NumberTemplate<T> numberTemplate(Class<? extends T> cl,
+                                                                                        Template template, Object... args) {
+        return numberTemplate(cl, template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param cl type of expression
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static <T extends Number & Comparable<?>> NumberTemplate<T> numberTemplate(Class<? extends T> cl, Template template, List<?> args) {
+        return new NumberTemplate<T>(cl, template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static StringTemplate stringTemplate(String template, Object... args) {
+        return stringTemplate(createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static StringTemplate stringTemplate(String template, List<?> args) {
+        return stringTemplate(createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static StringTemplate stringTemplate(Template template, Object... args) {
+        return stringTemplate(template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static StringTemplate stringTemplate(Template template, List<?> args) {
+        return new StringTemplate(template, args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static BooleanTemplate booleanTemplate(String template, Object... args) {
+        return booleanTemplate(createTemplate(template), Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static BooleanTemplate booleanTemplate(String template, List<?> args) {
+        return booleanTemplate(createTemplate(template), args);
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static BooleanTemplate booleanTemplate(Template template, Object... args) {
+        return booleanTemplate(template, Arrays.asList(args));
+    }
+
+    /**
+     * Create a new Template expression
+     *
+     * @param template template
+     * @param args template parameters
+     * @return template expression
+     */
+    public static BooleanTemplate booleanTemplate(Template template, List<?> args) {
+        return new BooleanTemplate(template, args);
+    }
+
+    /**
+     * Create a new Predicate operation
+     *
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static BooleanOperation predicate(Operator operator, Expression<?>... args) {
+        return new BooleanOperation(operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T> SimpleOperation<T> operation(Class<? extends T> type, Operator operator,
+            Expression<?>... args) {
+        return simpleOperation(type, operator, args);
+
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T> SimpleOperation<T> simpleOperation(Class<? extends T> type, Operator operator,
+                                                         Expression<?>... args) {
+        return new SimpleOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T> DslOperation<T> dslOperation(Class<? extends T> type, Operator operator,
+            Expression<?>... args) {
+        return new DslOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Boolean operation
+     *
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static BooleanOperation booleanOperation(Operator operator, Expression<?>... args) {
+        return predicate(operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T extends Comparable<?>> ComparableOperation<T> comparableOperation(Class<? extends T> type,
+            Operator operator, Expression<?>... args) {
+        return new ComparableOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T extends Comparable<?>> DateOperation<T> dateOperation(Class<? extends T> type,
+            Operator operator, Expression<?>... args) {
+        return new DateOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T extends Comparable<?>> DateTimeOperation<T> dateTimeOperation(Class<? extends T> type,
+            Operator operator, Expression<?>... args) {
+        return new DateTimeOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T extends Comparable<?>> TimeOperation<T> timeOperation(Class<? extends T> type,
+            Operator operator, Expression<?>... args) {
+        return new TimeOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static <T extends Number & Comparable<?>> NumberOperation<T> numberOperation(Class<? extends T> type,
+            Operator operator, Expression<?>... args) {
+        return new NumberOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Operation expression
+     *
+     * @param operator operator
+     * @param args operation arguments
+     * @return operation expression
+     */
+    public static StringOperation stringOperation(Operator operator, Expression<?>... args) {
+        return new StringOperation(operator, args);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T> SimplePath<T> path(Class<? extends T> type, String variable) {
+        return simplePath(type, variable);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T> SimplePath<T> path(Class<? extends T> type, Path<?> parent, String property) {
+        return simplePath(type, parent, property);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T> SimplePath<T> path(Class<? extends T> type, PathMetadata metadata) {
+        return simplePath(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T> SimplePath<T> simplePath(Class<? extends T> type, String variable) {
+        return new SimplePath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T> SimplePath<T> simplePath(Class<? extends T> type, Path<?> parent, String property) {
+        return new SimplePath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T> SimplePath<T> simplePath(Class<? extends T> type, PathMetadata metadata) {
+        return new SimplePath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T> DslPath<T> dslPath(Class<? extends T> type, String variable) {
+        return new DslPath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T> DslPath<T> dslPath(Class<? extends T> type, Path<?> parent, String property) {
+        return new DslPath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T> DslPath<T> dslPath(Class<? extends T> type, PathMetadata metadata) {
+        return new DslPath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparablePath<T> comparablePath(Class<? extends T> type,
+            String variable) {
+        return new ComparablePath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property path
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparablePath<T> comparablePath(Class<? extends T> type,
+            Path<?> parent, String property) {
+        return new ComparablePath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparablePath<T> comparablePath(Class<? extends T> type,
+                                                                             PathMetadata metadata) {
+        return new ComparablePath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparableEntityPath<T> comparableEntityPath(Class<? extends T> type,
+                                                                             String variable) {
+        return new ComparableEntityPath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparableEntityPath<T> comparableEntityPath(Class<? extends T> type,
+                                                                             Path<?> parent, String property) {
+        return new ComparableEntityPath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> ComparableEntityPath<T> comparableEntityPath(Class<? extends T> type,
+                                                                             PathMetadata metadata) {
+        return new ComparableEntityPath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> DatePath<T> datePath(Class<? extends T> type, String variable) {
+        return new DatePath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> DatePath<T> datePath(Class<? extends T> type, Path<?> parent,
+            String property) {
+        return new DatePath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return new path instance
+     */
+    public static <T extends Comparable<?>> DatePath<T> datePath(Class<? extends T> type, PathMetadata metadata) {
+        return new DatePath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> DateTimePath<T> dateTimePath(Class<? extends T> type, String variable) {
+        return new DateTimePath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> DateTimePath<T> dateTimePath(Class<? extends T> type, Path<?> parent,
+            String property) {
+        return new DateTimePath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> DateTimePath<T> dateTimePath(Class<? extends T> type, PathMetadata metadata) {
+        return new DateTimePath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> TimePath<T> timePath(Class<? extends T> type, String variable) {
+        return new TimePath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T extends Comparable<?>> TimePath<T> timePath(Class<? extends T> type, Path<?> parent,
+            String property) {
+        return new TimePath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Comparable<?>> TimePath<T> timePath(Class<? extends T> type, PathMetadata metadata) {
+        return new TimePath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Number & Comparable<?>> NumberPath<T> numberPath(Class<? extends T> type,
+            String variable) {
+        return new NumberPath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return path expression
+     */
+    public static <T extends Number & Comparable<?>> NumberPath<T> numberPath(Class<? extends T> type,
+            Path<?> parent, String property) {
+        return new NumberPath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Number & Comparable<?>> NumberPath<T> numberPath(Class<? extends T> type, PathMetadata metadata) {
+        return new NumberPath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param variable variable name
+     * @return path expression
+     */
+    public static StringPath stringPath(String variable) {
+        return new StringPath(PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static StringPath stringPath(Path<?> parent, String property) {
+        return new StringPath(PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param metadata path metadata
+     * @return path expression
+     */
+    public static StringPath stringPath(PathMetadata metadata) {
+        return new StringPath(metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param variable variable name
+     * @return path expression
+     */
+    public static BooleanPath booleanPath(String variable) {
+        return new BooleanPath(PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static BooleanPath booleanPath(Path<?> parent, String property) {
+        return new BooleanPath(PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param metadata path metadata
+     * @return path expression
+     */
+    public static BooleanPath booleanPath(PathMetadata metadata) {
+        return new BooleanPath(metadata);
+    }
+
+    /**
+     * Create a builder for a case expression
+     *
+     * @return case builder
+     */
+    public static CaseBuilder cases() {
+        return new CaseBuilder();
+    }
+
+    /**
+     * Combine the given expressions into a list expression
+     *
+     * @param exprs list elements
+     * @return list expression
+     */
+    public static SimpleExpression<Tuple> list(SimpleExpression<?>... exprs) {
+        return list(Tuple.class, exprs);
+    }
+
+    /**
+     * Combine the given expressions into a list expression
+     *
+     * @param clazz type of list expression
+     * @param exprs list elements
+     * @return list expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> SimpleExpression<T> list(Class<T> clazz, SimpleExpression<?>... exprs) {
+        SimpleExpression<T> rv = (SimpleExpression<T>) exprs[0];
+        for (int i = 1; i < exprs.length; i++) {
+            rv = new SimpleOperation<T>(clazz, Ops.LIST, rv, exprs[i]);
+        }
+        return rv;
+    }
+
+
+    /**
+     * Combine the given expressions into a list expression
+     *
+     * @param clazz type of list expression
+     * @param exprs list elements
+     * @return list expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> list(Class<T> clazz, Expression<?>... exprs) {
+        Expression<T> rv = (Expression<T>) exprs[0];
+        for (int i = 1; i < exprs.length; i++) {
+            rv = new SimpleOperation<T>(clazz, Ops.LIST, rv, exprs[i]);
+        }
+        return rv;
+    }
+
+    /**
+     * Combine the given expressions into a set expression
+     *
+     * @param clazz type of list expression
+     * @param exprs list elements
+     * @return list expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> SimpleExpression<T> set(Class<T> clazz, SimpleExpression<?>... exprs) {
+        SimpleExpression<T> rv = (SimpleExpression<T>) exprs[0];
+        for (int i = 1; i < exprs.length; i++) {
+            rv = new SimpleOperation<T>(clazz, Ops.SET, rv, exprs[i]);
+        }
+        return rv;
+    }
+
+    /**
+     * Combine the given expressions into a set expression
+     *
+     * @param clazz type of list expression
+     * @param exprs list elements
+     * @return list expression
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Expression<T> set(Class<T> clazz, Expression<?>... exprs) {
+        Expression<T> rv = (Expression<T>) exprs[0];
+        for (int i = 1; i < exprs.length; i++) {
+            rv = new SimpleOperation<T>(clazz, Ops.SET, rv, exprs[i]);
+        }
+        return rv;
+    }
+
+    /**
+     * Combine the given expressions into a list expression
+     *
+     * @param exprs list elements
+     * @return list expression
+     */
+    public static Expression<Tuple> list(Expression<?>... exprs) {
+        return list(Tuple.class, exprs);
+    }
+
+    /**
+     * Combine the given expressions into a set expression
+     *
+     * @param exprs list elements
+     * @return list expression
+     */
+    public static Expression<Tuple> set(Expression<?>... exprs) {
+        return set(Tuple.class, exprs);
+    }
+
+    /**
+     * Create a null expression for the specified type
+     *
+     * @return null expression
+     */
+    @SuppressWarnings("unchecked")//does not produce non-null instances of T
+    public static <T> NullExpression<T> nullExpression() {
+        return (NullExpression<T>) NullExpression.DEFAULT;
+    }
+
+    /**
+     * Create a null expression for the specified type
+     *
+     * @param type type of expression
+     * @param <T> type of expression
+     * @return null expression
+     */
+    public static <T> NullExpression<T> nullExpression(Class<T> type) {
+        return new NullExpression<T>(type);
+    }
+
+    /**
+     * Create a null expression for the specified path
+     *
+     * @param path path for type cast
+     * @param <T> type of expression
+     * @return null expression
+     */
+    public static <T> NullExpression<T> nullExpression(Path<T> path) {
+        return nullExpression();
+    }
+
+    /**
+     * Create a new Enum operation expression
+     *
+     * @param type type of expression
+     * @param operator operator
+     * @param args operation arguments
+     * @param <T> type of expression
+     * @return operation expression
+     */
+    public static <T extends Enum<T>> EnumOperation<T> enumOperation(Class<? extends T> type, Operator operator,
+                                                                     Expression<?>... args) {
+        return new EnumOperation<T>(type, operator, args);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param variable variable name
+     * @return path expression
+     */
+    public static <T extends Enum<T>> EnumPath<T> enumPath(Class<? extends T> type, String variable) {
+        return new EnumPath<T>(type, PathMetadataFactory.forVariable(variable));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param parent parent path
+     * @param property property name
+     * @return property path
+     */
+    public static <T extends Enum<T>> EnumPath<T> enumPath(Class<? extends T> type, Path<?> parent, String property) {
+        return new EnumPath<T>(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type type of expression
+     * @param metadata path metadata
+     * @param <T> type of expression
+     * @return path expression
+     */
+    public static <T extends Enum<T>> EnumPath<T> enumPath(Class<? extends T> type, PathMetadata metadata) {
+        return new EnumPath<T>(type, metadata);
+    }
+
+    /**
+     * Create a new Collection operation expression
+     *
+     * @param elementType element type
+     * @param operator operator
+     * @param args operation arguments
+     * @param <T> type of expression
+     * @return operation expression
+     */
+    public static <T> CollectionExpression<Collection<T>, T> collectionOperation(Class<T> elementType, Operator operator,
+                                                                  Expression<?>... args) {
+        return new CollectionOperation<T>(elementType, operator, args);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type element type
+     * @param queryType element expression type
+     * @param metadata path metadata
+     * @param <E> element type
+     * @param <Q> element expression type
+     * @return path expression
+     */
+    public static <E, Q extends SimpleExpression<? super E>> CollectionPath<E, Q> collectionPath(Class<E> type, Class<Q> queryType, PathMetadata metadata) {
+        return new CollectionPath<E, Q>(type, queryType, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type element type
+     * @param queryType element expression type
+     * @param metadata path metadata
+     * @param <E> element type
+     * @param <Q> element expression type
+     * @return path expression
+     */
+    public static <E, Q extends SimpleExpression<? super E>> ListPath<E, Q> listPath(Class<E> type, Class<Q> queryType, PathMetadata metadata) {
+        return new ListPath<E, Q>(type, queryType, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param type element type
+     * @param queryType element expression type
+     * @param metadata path metadata
+     * @param <E> element type
+     * @param <Q> element expression type
+     * @return path expression
+     */
+    public static <E, Q extends SimpleExpression<? super E>> SetPath<E, Q> setPath(Class<E> type, Class<Q> queryType, PathMetadata metadata) {
+        return new SetPath<E, Q>(type, queryType, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param keyType key type
+     * @param valueType value type
+     * @param queryType value expression type
+     * @param metadata path metadata
+     * @param <K> key type
+     * @param <V> value type
+     * @param <E> value expression type
+     * @return path expression
+     */
+    public static <K, V, E extends SimpleExpression<? super V>> MapPath<K,V,E> mapPath(Class<? super K> keyType,
+                                                                                       Class<? super V> valueType,
+                                                                                       Class<E> queryType,
+                                                                                       PathMetadata metadata) {
+        return new MapPath<K,V,E>(keyType, valueType, queryType, metadata);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param arrayType array type
+     * @param variable variable name
+     * @param <A> array type
+     * @param <E> element type
+     * @return path expression
+     */
+    public static <A, E> ArrayPath<A, E> arrayPath(Class<A> arrayType, String variable) {
+        return new ArrayPath<A, E>(arrayType, variable);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param arrayType array type
+     * @param parent path metadata
+     * @param property property name
+     * @param <A> array type
+     * @param <E> element type
+     * @return path expression
+     */
+    public static <A, E> ArrayPath<A, E> arrayPath(Class<A> arrayType, Path<?> parent, String property) {
+        return new ArrayPath<A, E>(arrayType, parent, property);
+    }
+
+    /**
+     * Create a new Path expression
+     *
+     * @param arrayType array type
+     * @param metadata path metadata
+     * @param <A> array type
+     * @param <E> element type
+     * @return path expression
+     */
+    public static <A, E> ArrayPath<A, E> arrayPath(Class<A> arrayType, PathMetadata metadata) {
+        return new ArrayPath<A, E>(arrayType, metadata);
+    }
+
+    private static Template createTemplate(String template) {
+        return TemplateFactory.DEFAULT.create(template);
+    }
+
+    /**
+     * Create a new BooleanExpression
+     *
+     * @param expr Expression of type Boolean
+     * @return new BooleanExpression
+     */
+    public static BooleanExpression asBoolean(Expression<Boolean> expr) {
+        Expression<Boolean> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new BooleanPath((PathImpl<Boolean>) underlyingMixin);
+        } else if (underlyingMixin instanceof PredicateOperation) {
+            return new BooleanOperation((PredicateOperation) underlyingMixin);
+        } else if (underlyingMixin instanceof PredicateTemplate) {
+            return new BooleanTemplate((PredicateTemplate) underlyingMixin);
+        } else {
+            return new BooleanExpression(underlyingMixin) {
+
+                private static final long serialVersionUID = -8712299418891960222L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+                @Override
+                public boolean equals(Object o) {
+                    if (o == this) {
+                        return true;
+                    } else if (o instanceof BooleanExpression) {
+                        BooleanExpression other = (BooleanExpression) o;
+                        return (other.mixin.equals(this.mixin));
+                    } else {
+                        return false;
+                    }
+                }
+
+            };
+        }
+    }
+
+    /**
+     * Create a new BooleanExpression
+     *
+     * @param value boolean
+     * @return new BooleanExpression
+     */
+    public static BooleanExpression asBoolean(boolean value) {
+        return asBoolean(constant(value));
+    }
+
+    /**
+     * Create a new ComparableExpression
+     *
+     * @param expr Expression of type Comparable
+     * @return new ComparableExpression
+     */
+    public static <T extends Comparable<?>> ComparableExpression<T> asComparable(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new ComparablePath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new ComparableOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new ComparableTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new ComparableExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = 389920618099394430L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+                @Override
+                public boolean equals(Object o) {
+                    if (o == this) {
+                        return true;
+                    } else if (o instanceof ComparableExpression) {
+                        ComparableExpression other = (ComparableExpression) o;
+                        return (other.mixin.equals(this.mixin));
+                    } else {
+                        return false;
+                    }
+                }
+
+            };
+        }
+
+    }
+
+    /**
+     * Create a new ComparableExpression
+     *
+     * @param value Comparable
+     * @return new ComparableExpression
+     */
+    public static <T extends Comparable<?>> ComparableExpression<T> asComparable(T value) {
+        return asComparable(constant(value));
+    }
+
+    /**
+     * Create a new DateExpression
+     *
+     * @param expr the date Expression
+     * @return new DateExpression
+     */
+    public static <T extends Comparable<?>> DateExpression<T> asDate(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new DatePath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new DateOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new DateTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new DateExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = 389920618099394430L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+            };
+        }
+
+    }
+
+    /**
+     * Create a new DateExpression
+     *
+     * @param value the date
+     * @return new DateExpression
+     */
+    public static <T extends Comparable<?>> DateExpression<T> asDate(T value) {
+        return asDate(constant(value));
+    }
+
+    /**
+     * Create a new DateTimeExpression
+     *
+     * @param expr the date time Expression
+     * @return new DateTimeExpression
+     */
+    public static <T extends Comparable<?>> DateTimeExpression<T> asDateTime(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new DateTimePath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new DateTimeOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new DateTimeTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new DateTimeExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = 8007203530480765244L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+            };
+        }
+
+    }
+
+    /**
+     * Create a new DateTimeExpression
+     *
+     * @param value the date time
+     * @return new DateTimeExpression
+     */
+    public static <T extends Comparable<?>> DateTimeExpression<T> asDateTime(T value) {
+        return asDateTime(constant(value));
+    }
+
+    /**
+     * Create a new TimeExpression
+     *
+     * @param expr the time Expression
+     * @return new TimeExpression
+     */
+    public static <T extends Comparable<?>> TimeExpression<T> asTime(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new TimePath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new TimeOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new TimeTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new TimeExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = -2402288239000668173L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+            };
+        }
+    }
+
+    /**
+     * Create a new TimeExpression
+     *
+     * @param value the time
+     * @return new TimeExpression
+     */
+    public static <T extends Comparable<?>> TimeExpression<T> asTime(T value) {
+        return asTime(constant(value));
+    }
+
+    /**
+     * Create a new EnumExpression
+     *
+     * @param expr Expression of type Enum
+     * @return new EnumExpression
+     */
+    public static <T extends Enum<T>> EnumExpression<T> asEnum(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new EnumPath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new EnumOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new EnumTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new EnumExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = 949681836002045152L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+                @Override
+                public boolean equals(Object o) {
+                    if (o == this) {
+                        return true;
+                    } else if (o instanceof EnumExpression) {
+                        EnumExpression other = (EnumExpression) o;
+                        return (other.mixin.equals(this.mixin));
+                    } else {
+                        return false;
+                    }
+                }
+
+            };
+        }
+
+    }
+
+    /**
+     * Create a new EnumExpression
+     *
+     * @param value enum
+     * @return new EnumExpression
+     */
+    public static <T extends Enum<T>> EnumExpression<T> asEnum(T value) {
+        return asEnum(constant(value));
+    }
+
+    /**
+     * Create a new NumberExpression
+     *
+     * @param expr Expression of type Number
+     * @return new NumberExpression
+     */
+    public static <T extends Number & Comparable<?>> NumberExpression<T> asNumber(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new NumberPath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new NumberOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new NumberTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new NumberExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = -8712299418891960222L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+                @Override
+                public boolean equals(Object o) {
+                    if (o == this) {
+                        return true;
+                    } else if (o instanceof NumberExpression) {
+                        NumberExpression other = (NumberExpression) o;
+                        return (other.mixin.equals(this.mixin));
+                    } else {
+                        return false;
+                    }
+                }
+
+            };
+        }
+    }
+
+    /**
+     * Create a new NumberExpression
+     *
+     * @param value Number
+     * @return new NumberExpression
+     */
+    public static <T extends Number & Comparable<?>> NumberExpression<T> asNumber(T value) {
+        return asNumber(constant(value));
+    }
+
+    /**
+     * Create a new StringExpression
+     *
+     * @param expr Expression of type String
+     * @return new StringExpression
+     */
+    public static StringExpression asString(Expression<String> expr) {
+        Expression<String> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new StringPath((PathImpl<String>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new StringOperation((OperationImpl<String>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new StringTemplate((TemplateExpressionImpl<String>) underlyingMixin);
+        } else {
+            return new StringExpression(underlyingMixin) {
+
+                private static final long serialVersionUID = 8007203530480765244L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+                @Override
+                public boolean equals(Object o) {
+                    if (o == this) {
+                        return true;
+                    } else if (o instanceof StringExpression) {
+                        StringExpression other = (StringExpression) o;
+                        return (other.mixin.equals(this.mixin));
+                    } else {
+                        return false;
+                    }
+                }
+            };
+        }
+    }
+
+    /**
+     * Create a new StringExpression
+     *
+     * @param value String
+     * @return new StringExpression
+     */
+    public static StringExpression asString(String value) {
+        return asString(constant(value));
+    }
+
+    /**
+     * Create a new SimpleExpression
+     *
+     * @param expr expression
+     * @return new SimpleExpression
+     */
+    public static <T> SimpleExpression<T> asSimple(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new SimplePath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new SimpleOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof TemplateExpressionImpl) {
+            return new SimpleTemplate<T>((TemplateExpressionImpl<T>) underlyingMixin);
+        } else {
+            return new SimpleExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = -8712299418891960222L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+            };
+        }
+    }
+
+    /**
+     * Create a new SimpleExpression
+     *
+     * @param value constant
+     * @return new SimpleExpression
+     */
+    public static <T> SimpleExpression<T> asSimple(T value) {
+        return asSimple(constant(value));
+    }
+
+}
+//CHECKSTYLERULE:ON: FileLength
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListExpression.java
new file mode 100644
index 0000000000..427b3bc926
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListExpression.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.Expression;
+import org.jetbrains.annotations.Range;
+
+/**
+ * {@code ListExpression} represents {@code java.util.List} typed expressions
+ *
+ * @author tiwe
+ *
+ * @param <E> component type
+ * @param <Q> result type for {@code any()} and {@code get(int)} results
+ * @see java.util.List
+ */
+public interface ListExpression<E, Q extends SimpleExpression<? super E>> extends CollectionExpression<List<E>, E> {
+
+    /**
+     * Indexed access, gets the element at the given index
+     *
+     * @param index zero based index
+     * @return this.get(index)
+     * @see java.util.List#get(int)
+     */
+    Q get(Expression<Integer> index);
+
+    /**
+     * Indexed access, gets the element at the given index
+     *
+     * @param index zero based index
+     * @return this.get(index)
+     * @see java.util.List#get(int)
+     */
+    Q get(@Range(from = 0, to = Integer.MAX_VALUE) int index);
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListPath.java
new file mode 100644
index 0000000000..6892243531
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ListPath.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code ListPath} represents list paths
+ *
+ * @author tiwe
+ *
+ * @param <E> component type
+ * @param <Q> result type for {@code get(int)} and {@code any()} results
+ */
+public class ListPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<List<E>, E, Q> implements ListExpression<E, Q> {
+
+    private static final long serialVersionUID = 3302301599074388860L;
+
+    private final Map<Integer,Q> cache = new HashMap<Integer,Q>();
+
+    private final Class<E> elementType;
+
+    private final PathImpl<List<E>> pathMixin;
+
+    private final Class<Q> queryType;
+
+    @Nullable
+    private transient Q any;
+
+    protected ListPath(Class<? super E> elementType, Class<Q> queryType, String variable) {
+        this(elementType, queryType, PathMetadataFactory.forVariable(variable));
+    }
+
+    protected ListPath(Class<? super E> elementType, Class<Q> queryType, Path<?> parent, String property) {
+        this(elementType, queryType, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected ListPath(Class<? super E> elementType, Class<Q> queryType, PathMetadata metadata) {
+        this(elementType, queryType, metadata, PathInits.DIRECT);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected ListPath(Class<? super E> elementType, Class<Q> queryType, PathMetadata metadata, PathInits inits) {
+        super(new ParameterizedPathImpl<List<E>>((Class) List.class, metadata, elementType), inits);
+        this.elementType = (Class<E>) elementType;
+        this.queryType = queryType;
+        this.pathMixin = (PathImpl<List<E>>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public Q any() {
+        if (any == null) {
+            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(this));
+        }
+        return any;
+    }
+
+    protected PathMetadata forListAccess(int index) {
+        return PathMetadataFactory.forListAccess(this, index);
+    }
+
+    protected PathMetadata forListAccess(Expression<Integer> index) {
+        return PathMetadataFactory.forListAccess(this, index);
+    }
+
+    private Q create(int index) {
+        PathMetadata md = forListAccess(index);
+        return newInstance(queryType, md);
+    }
+
+    @Override
+    public Q get(Expression<Integer> index) {
+        PathMetadata md = forListAccess(index);
+        return newInstance(queryType, md);
+    }
+
+
+    @Override
+    public Q get(int index) {
+        if (cache.containsKey(index)) {
+            return cache.get(index);
+        } else {
+            Q rv = create(index);
+            cache.put(index, rv);
+            return rv;
+        }
+    }
+
+    @Override
+    public Class<E> getElementType() {
+        return elementType;
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        if (index == 0) {
+            return elementType;
+        } else {
+            throw new IndexOutOfBoundsException(String.valueOf(index));
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/LiteralExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/LiteralExpression.java
new file mode 100644
index 0000000000..a4c2e3c25e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/LiteralExpression.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code LiteralExpression} represents literal expressions
+ *
+ * @param <T>
+ */
+public abstract class LiteralExpression<T extends Comparable> extends ComparableExpression<T> {
+
+    @Nullable
+    private transient volatile StringExpression stringCast;
+
+    public LiteralExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Create a cast expression to the given numeric type
+     *
+     * @param <A> numeric type
+     * @param type numeric type
+     * @return cast expression
+     */
+    public <A extends Number & Comparable<? super A>> NumberExpression<A> castToNum(Class<A> type) {
+        return Expressions.numberOperation(type, Ops.NUMCAST, mixin, ConstantImpl.create(type));
+    }
+
+    /**
+     * Create a cast to String expression
+     *
+     * @see java.lang.Object#toString()
+     * @return cast expression
+     */
+    public StringExpression stringValue() {
+        if (stringCast == null) {
+            stringCast = Expressions.stringOperation(Ops.STRING_CAST, mixin);
+        }
+        return stringCast;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapExpressionBase.java
new file mode 100644
index 0000000000..ee6d22f7a2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapExpressionBase.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.MapExpression;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code MapExpressionBase} is an abstract base class for {@link MapExpression} implementations
+ *
+ * @author tiwe
+ *
+ * @param <K> key type
+ * @param <V> value type
+ * @param <Q> result type for {@code get(K)} invocations
+ */
+public abstract class MapExpressionBase<K, V, Q extends SimpleExpression<? super V>> extends DslExpression<Map<K,V>> implements MapExpression<K,V> {
+
+    private static final long serialVersionUID = 2856001983312366841L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> size;
+
+    @Nullable
+    private transient volatile BooleanExpression empty;
+
+    public MapExpressionBase(Expression<Map<K, V>> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Create a {@code (key, value) in this} expression
+     *
+     * @param key key of entry
+     * @param value value of entry
+     * @return expression
+     */
+    public final BooleanExpression contains(K key, V value) {
+        return get(key).eq(value);
+    }
+
+    /**
+     * Create a {@code (key, value) in this} expression
+     *
+     * @param key key of entry
+     * @param value value of entry
+     * @return expression
+     */
+    @SuppressWarnings("unchecked")
+    public final BooleanExpression contains(Expression<K> key, Expression<V> value) {
+        return get(key).eq((Expression) value);
+    }
+
+    /**
+     * Create a {@code key in keys(this)} expression
+     *
+     * @param key key
+     * @return expression
+     */
+    public final BooleanExpression containsKey(Expression<K> key) {
+        return Expressions.booleanOperation(Ops.CONTAINS_KEY, mixin, key);
+    }
+
+    /**
+     * Create a {@code key in keys(this)} expression
+     *
+     * @param key key
+     * @return expression
+     */
+    public final BooleanExpression containsKey(K key) {
+        return Expressions.booleanOperation(Ops.CONTAINS_KEY, mixin, ConstantImpl.create(key));
+    }
+
+    /**
+     * Create a {@code value in values(this)} expression
+     *
+     * @param value value
+     * @return expression
+     */
+    public final BooleanExpression containsValue(Expression<V> value) {
+        return Expressions.booleanOperation(Ops.CONTAINS_VALUE, mixin, value);
+    }
+
+    /**
+     * Create a {@code value in values(this)} expression
+     *
+     * @param value value
+     * @return expression
+     */
+    public final BooleanExpression containsValue(V value) {
+        return Expressions.booleanOperation(Ops.CONTAINS_VALUE, mixin, ConstantImpl.create(value));
+    }
+
+    /**
+     * Create a {@code this.get(key)} expression
+     *
+     * @param key key
+     * @return this.get(key)
+     */
+    public abstract Q get(Expression<K> key);
+
+    /**
+     * Create a {@code this.get(key)} expression
+     *
+     * @param key key
+     * @return this.get(key)
+     */
+    public abstract Q get(K key);
+
+    /**
+     * Create a {@code this.isEmpty()} expression
+     *
+     * @return this.isEmpty()
+     */
+    public final BooleanExpression isEmpty() {
+        if (empty == null) {
+            empty = Expressions.booleanOperation(Ops.MAP_IS_EMPTY, mixin);
+        }
+        return empty;
+    }
+
+    /**
+     * Create a {@code !this,isEmpty()} expression
+     *
+     * @return !this.isEmpty()
+     */
+    public final BooleanExpression isNotEmpty() {
+        return isEmpty().not();
+    }
+
+    /**
+     * Create a {@code this.size()} expression
+     *
+     * @return this.size()
+     */
+    public final NumberExpression<Integer> size() {
+        if (size == null) {
+            size = Expressions.numberOperation(Integer.class, Ops.MAP_SIZE, mixin);
+        }
+        return size;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapPath.java
new file mode 100644
index 0000000000..80b483c8ca
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MapPath.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code MapPath} represents map paths
+ *
+ * @author tiwe
+ *
+ * @param <K> key type
+ * @param <V> value type
+ * @param <E> result type for {@code get(K)} results
+ */
+public class MapPath<K, V, E extends SimpleExpression<? super V>> extends MapExpressionBase<K, V, E> implements Path<Map<K, V>> {
+
+    private static final long serialVersionUID = -9113333728412016832L;
+
+    private final Class<K> keyType;
+
+    private final PathImpl<Map<K,V>> pathMixin;
+
+    private final Class<E> queryType;
+
+    @Nullable
+    private transient Constructor<E> constructor;
+
+    private final Class<V> valueType;
+
+    protected MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, String variable) {
+        this(keyType, valueType, queryType, PathMetadataFactory.forVariable(variable));
+    }
+
+    protected MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, Path<?> parent, String property) {
+        this(keyType, valueType, queryType, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    protected MapPath(Class<? super K> keyType, Class<? super V> valueType, Class<E> queryType, PathMetadata metadata) {
+        super(new ParameterizedPathImpl<Map<K,V>>((Class) Map.class, metadata, keyType, valueType));
+        this.keyType = (Class<K>) keyType;
+        this.valueType = (Class<V>) valueType;
+        this.queryType = queryType;
+        this.pathMixin = (PathImpl<Map<K,V>>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    protected PathMetadata forMapAccess(K key) {
+        return PathMetadataFactory.forMapAccess(this, key);
+    }
+
+    protected PathMetadata forMapAccess(Expression<K> key) {
+        return PathMetadataFactory.forMapAccess(this, key);
+    }
+
+    @Override
+    public E get(Expression<K> key) {
+        try {
+            PathMetadata md =  forMapAccess(key);
+            return newInstance(md);
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
+            throw new ExpressionException(e);
+        }
+    }
+
+    @Override
+    public E get(K key) {
+        try {
+            PathMetadata md =  forMapAccess(key);
+            return newInstance(md);
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
+            throw new ExpressionException(e);
+        }
+    }
+
+    /**
+     * Get the key type
+     *
+     * @return key type
+     */
+    public Class<K> getKeyType() {
+        return keyType;
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    /**
+     * Get the value type
+     *
+     * @return value type
+     */
+    public Class<V> getValueType() {
+        return valueType;
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+    private E newInstance(PathMetadata pm) throws NoSuchMethodException,
+        InstantiationException, IllegalAccessException,
+        InvocationTargetException {
+        if (constructor == null) {
+            if (Constants.isTyped(queryType)) {
+                constructor = queryType.getDeclaredConstructor(Class.class, PathMetadata.class);
+            } else {
+                constructor = queryType.getDeclaredConstructor(PathMetadata.class);
+            }
+            constructor.setAccessible(true);
+        }
+        if (Constants.isTyped(queryType)) {
+            return constructor.newInstance(getValueType(), pm);
+        } else {
+            return constructor.newInstance(pm);
+        }
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        if (index == 0) {
+            return keyType;
+        } else if (index == 1) {
+            return valueType;
+        } else {
+            throw new IndexOutOfBoundsException(String.valueOf(index));
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MathExpressions.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MathExpressions.java
new file mode 100644
index 0000000000..e52b59c401
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/MathExpressions.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Ops.MathOps;
+
+/**
+ * Extended Math expressions, supported by the SQL module
+ *
+ * @author tiwe
+ *
+ */
+public final class MathExpressions {
+
+    /**
+     * Create a {@code acos(num)} expression
+     *
+     * <p>Returns the principal value of the arc cosine of num, expressed in radians.</p>
+     *
+     * @param num numeric expression
+     * @return acos(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> acos(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.ACOS, num);
+    }
+
+    /**
+     * Create a {@code asin(num)} expression
+     *
+     * <p>Returns the principal value of the arc sine of num, expressed in radians.</p>
+     *
+     * @param num numeric expression
+     * @return asin(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> asin(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.ASIN, num);
+    }
+
+    /**
+     * Create a {@code atan(num)} expression
+     *
+     * <p>Returns the principal value of the arc tangent of num, expressed in radians.</p>
+     *
+     * @param num numeric expression
+     * @return atan(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> atan(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.ATAN, num);
+    }
+
+    /**
+     * Create a {@code cos(num)} expression
+     *
+     * <p>Returns the cosine of an angle of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return cos(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> cos(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.COS, num);
+    }
+
+    /**
+     * Create a {@code cosh(num)} expression
+     *
+     * <p>Returns the hyperbolic cosine of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return cosh(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> cosh(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.COSH, num);
+    }
+
+    /**
+     * Create a {@code cot(num)} expression
+     *
+     * <p>Returns the cotangent of num.</p>
+     *
+     * @param num numeric expression
+     * @return cot(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> cot(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.COT, num);
+    }
+
+    /**
+     * Create a {@code coth(num)} expression
+     *
+     * <p>Returns the hyperbolic cotangent of num.</p>
+     *
+     * @param num numeric expression
+     * @return coth(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> coth(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.COTH, num);
+    }
+
+    /**
+     * Create a {@code deg(num)} expression
+     *
+     * <p>Convert radians to degrees.</p>
+     *
+     * @param num numeric expression
+     * @return deg(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> degrees(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.DEG, num);
+    }
+
+    /**
+     * Create a {@code exp(num)} expression
+     *
+     * <p>Returns the base-e exponential function of num, which is e raised to the power num.</p>
+     *
+     * @param num numeric expression
+     * @return exp(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> exp(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.EXP, num);
+    }
+
+    /**
+     * Create a {@code ln(num)} expression
+     *
+     * <p>Returns the natural logarithm of num.</p>
+     *
+     * @param num numeric expression
+     * @return ln(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> ln(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.LN, num);
+    }
+
+    /**
+     * Create a {@code log(num, base)} expression
+     *
+     * @param num numeric expression
+     * @param base base
+     * @return log(num, base)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> log(Expression<A> num, int base) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.LOG, num, ConstantImpl.create(base));
+    }
+
+    /**
+     * Create a {@code max(left, right)} expression
+     *
+     * <p>Return the greater of the given values</p>
+     *
+     * @return max(left, right)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> max(Expression<A> left, Expression<A> right) {
+        return NumberExpression.max(left, right);
+    }
+
+    /**
+     * Create a {@code min(left, right)} expression
+     *
+     * <p>Return the smaller of the given values</p>
+     *
+     * @return min(left, right)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> min(Expression<A> left, Expression<A> right) {
+        return NumberExpression.min(left, right);
+    }
+
+    /**
+     * Create a {@code power(num, exponent)} expression
+     *
+     * <p>Returns num raised to the power exponent</p>
+     *
+     * @param num  numeric expression
+     * @param exponent exponent
+     * @return power(num, exponent)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> power(Expression<A> num, int exponent) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.POWER, num, ConstantImpl.create(exponent));
+    }
+
+    /**
+     * Create a {@code rad(num)} expression
+     *
+     * <p>Converts degrees to radians</p>
+     *
+     * @param num numeric expression
+     * @return rad(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> radians(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.RAD, num);
+    }
+
+    /**
+     * Returns the random expression
+     *
+     * @return random()
+     */
+    public static NumberExpression<Double> random() {
+        return NumberExpression.random();
+    }
+
+    /**
+     * Return a random number expression with the given seed
+     *
+     * @param seed seed
+     * @return random(seed)
+     */
+    public static NumberExpression<Double> random(int seed) {
+        return Expressions.numberOperation(Double.class, MathOps.RANDOM2, ConstantImpl.create(seed));
+    }
+
+    /**
+     * Round to nearest integer
+     *
+     * @param num numeric expression
+     * @return round(this)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> round(Expression<A> num) {
+        return Expressions.numberOperation(num.getType(), MathOps.ROUND, num);
+    }
+
+    /**
+     * Round to s decimal places
+     *
+     * @param num numeric expression
+     * @param s decimal places
+     * @return round(num, s)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> round(Expression<A> num, int s) {
+        return Expressions.numberOperation(num.getType(), MathOps.ROUND2, num, ConstantImpl.create(s));
+    }
+
+    /**
+     * Create a {@code sign(num)} expression
+     *
+     * <p>Returns the positive (+1), zero (0), or negative (-1) sign of num.</p>
+     *
+     * @param num numeric expression
+     * @return sign(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Integer> sign(Expression<A> num) {
+        return Expressions.numberOperation(Integer.class, Ops.MathOps.SIGN, num);
+    }
+
+    /**
+     * Create a {@code sin(num)} expression
+     *
+     * <p>Returns the sine of an angle of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return sin(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> sin(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.SIN, num);
+    }
+
+    /**
+     * Create a {@code sinh(num)} expression
+     *
+     * <p>Returns the hyperbolic sine of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return sinh(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> sinh(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.SINH, num);
+    }
+
+    /**
+     * Create a {@code tan(num)} expression
+     *
+     * <p>Returns the tangent of an angle of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return tan(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> tan(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.TAN, num);
+    }
+
+    /**
+     * Create a {@code tanh(num)} expression
+     *
+     * <p>Returns the hyperbolic tangent of num radians.</p>
+     *
+     * @param num numeric expression
+     * @return tanh(num)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<Double> tanh(Expression<A> num) {
+        return Expressions.numberOperation(Double.class, Ops.MathOps.TANH, num);
+    }
+
+    private MathExpressions() { }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
new file mode 100644
index 0000000000..701ad26f1f
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
@@ -0,0 +1,867 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.Ops.MathOps;
+import com.querydsl.core.util.MathUtils;
+
+/**
+ * {@code NumberExpression} represents a numeric expression
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ * @see java.lang.Number
+ */
+public abstract class NumberExpression<T extends Number & Comparable<?>> extends ComparableExpressionBase<T> {
+
+    private static final long serialVersionUID = -5485902768703364888L;
+
+    private static class Constants {
+        private static final NumberExpression<Double> RANDOM = Expressions.numberOperation(Double.class, MathOps.RANDOM);
+    }
+
+    /**
+     * Create a {@code max(left, right)} expression
+     *
+     * <p>Return the greater of the given values</p>
+     *
+     * @return max(left, right)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> max(Expression<A> left, Expression<A> right) {
+        return Expressions.numberOperation(left.getType(), MathOps.MAX, left, right);
+    }
+
+    /**
+     * Create a {@code min(left, right)} expression
+     *
+     * <p>Returns the smaller of the given values</p>
+     *
+     * @return min(left, right)
+     */
+    public static <A extends Number & Comparable<?>> NumberExpression<A> min(Expression<A> left, Expression<A> right) {
+        return Expressions.numberOperation(left.getType(), MathOps.MIN, left, right);
+    }
+
+    /**
+     * Create a {@code random()} expression
+     *
+     * <p>Returns the random number</p>
+     *
+     * @return random()
+     */
+    public static NumberExpression<Double> random() {
+        return Constants.RANDOM;
+    }
+
+    @Nullable
+    private transient volatile NumberExpression<T> abs, sum, min, max, floor, ceil, round;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> avg, sqrt;
+
+    @Nullable
+    private transient volatile NumberExpression<T> negation;
+
+    @Nullable
+    private transient volatile StringExpression stringCast;
+
+    public NumberExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public NumberExpression<T> as(Path<T> alias) {
+        return Expressions.numberOperation(getType(), Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public NumberExpression<T> as(String alias) {
+        return Expressions.numberOperation(getType(), Ops.ALIAS, mixin, ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a cast to String expression
+     *
+     * @see     java.lang.Object#toString()
+     * @return string representation
+     */
+    public StringExpression stringValue() {
+        if (stringCast == null) {
+            stringCast = Expressions.stringOperation(Ops.STRING_CAST, mixin);
+        }
+        return stringCast;
+    }
+
+    /**
+     * Create a {@code abs(this)} expression
+     *
+     * <p>Returns the absolute value of this expression</p>
+     *
+     * @return abs(this)
+     */
+    public NumberExpression<T> abs() {
+        if (abs == null) {
+            abs = Expressions.numberOperation(getType(), MathOps.ABS, mixin);
+        }
+        return abs;
+    }
+
+    /**
+     * Create a {@code this + right} expression
+     *
+     * <p>Returns the sum of this and right</p>
+     *
+     * @param right rhs of expression
+     * @return this + right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> add(Expression<N> right) {
+        return Expressions.numberOperation(getType(), Ops.ADD, mixin, right);
+    }
+
+    /**
+     * Create a {@code this + right} expression
+     *
+     * <p>Get the sum of this and right</p>
+     *
+     * @param right rhs of expression
+     * @return this + right
+     */
+    public <N extends Number & Comparable<N>> NumberExpression<T> add(N right) {
+        return Expressions.numberOperation(getType(), Ops.ADD, mixin, ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code avg(this)} expression
+     *
+     * <p>Get the average value of this expression (aggregation)</p>
+     *
+     *  @return avg(this)
+     */
+    public NumberExpression<Double> avg() {
+        if (avg == null) {
+            avg = Expressions.numberOperation(Double.class, Ops.AggOps.AVG_AGG, mixin);
+        }
+        return avg;
+    }
+
+    /**
+     * Create a {@code cast(this as byte)} expression
+     *
+     * <p>Get the byte expression of this numeric expression</p>
+     *
+     * @return this.byteValue()
+     * @see java.lang.Number#byteValue()
+     */
+    public NumberExpression<Byte> byteValue() {
+        return castToNum(Byte.class);
+    }
+
+    private T cast(Number number) {
+        return MathUtils.cast(number, getType());
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Number & Comparable<? super A>> NumberExpression<A> castToNum(Class<A> type) {
+        if (type.equals(getType())) {
+            return (NumberExpression<A>) this;
+        } else {
+            return Expressions.numberOperation(type, Ops.NUMCAST, mixin, ConstantImpl.create(type));
+        }
+    }
+
+    /**
+     * Create a {@code ceil(this)} expression
+     *
+     * <p>Returns the smallest (closest to negative infinity)
+     * {@code double} value that is greater than or equal to the
+     * argument and is equal to a mathematical integer</p>
+     *
+     * @return ceil(this)
+     * @see java.lang.Math#ceil(double)
+     */
+    public NumberExpression<T> ceil() {
+        if (ceil == null) {
+            ceil = Expressions.numberOperation(getType(), MathOps.CEIL, mixin);
+        }
+        return ceil;
+    }
+
+    private Class<?> getDivisionType(Class<?> left, Class<?> right) {
+        if (!left.equals(right)) {
+            return Double.class;
+        } else {
+            return left;
+        }
+    }
+
+    /**
+     * Create a {@code this / right} expression
+     *
+     * <p>Get the result of the operation this / right</p>
+     *
+     * @param right
+     * @return this / right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> divide(Expression<N> right) {
+        @SuppressWarnings("unchecked")
+        Class<T> type = (Class<T>) getDivisionType(getType(), right.getType());
+        return Expressions.numberOperation(type, Ops.DIV, mixin, right);
+    }
+
+    /**
+     * Create a {@code this / right} expression
+     *
+     * <p>Get the result of the operation this / right</p>
+     *
+     * @param right
+     * @return this / right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> divide(N right) {
+        @SuppressWarnings("unchecked")
+        Class<T> type = (Class< T>) getDivisionType(getType(), right.getClass());
+        return Expressions.numberOperation(type, Ops.DIV, mixin, ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code cast(this as double)} expression
+     *
+     * <p>Get the double expression of this numeric expression</p>
+     *
+     * @return this.doubleValue()
+     * @see java.lang.Number#doubleValue()
+     */
+    public NumberExpression<Double> doubleValue() {
+        return castToNum(Double.class);
+    }
+
+    /**
+     * Create a {@code cast(this as double)} expression
+     *
+     * <p>Get the float expression of this numeric expression</p>
+     *
+     * @return this.floatValue()
+     * @see java.lang.Number#floatValue()
+     */
+    public NumberExpression<Float> floatValue() {
+        return castToNum(Float.class);
+    }
+
+    /**
+     * Create a {@code floor(this)} expression
+     *
+     * <p>Returns the largest (closest to positive infinity)
+     * {@code double} value that is less than or equal to the
+     * argument and is equal to a mathematical integer.</p>
+     *
+     * @return floor(this)
+     * @see java.lang.Math#floor(double)
+     */
+    public NumberExpression<T> floor() {
+        if (floor == null) {
+            floor = Expressions.numberOperation(getType(), MathOps.FLOOR, mixin);
+        }
+        return floor;
+    }
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this >= right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression goe(A right) {
+        return goe(ConstantImpl.create(cast(right)));
+    }
+
+    /**
+     * Create a {@code this >= right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this >= right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression goe(Expression<A> right) {
+        return Expressions.booleanOperation(Ops.GOE, mixin, right);
+    }
+
+    /**
+     * Create a {@code this >= all right} expression
+     *
+     * @param right
+     * @return this &gt;= all right
+     */
+    public BooleanExpression goeAll(CollectionExpression<?, ? super T> right) {
+        return goe(ExpressionUtils.<T> all(right));
+    }
+
+    /**
+     * Create a {@code this >= any right} expression
+     *
+     * @param right
+     * @return this &gt;= any right
+     */
+    public BooleanExpression goeAny(CollectionExpression<?, ? super T> right) {
+        return goe(ExpressionUtils.<T> any(right));
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this > right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression gt(A right) {
+        return gt(ConstantImpl.create(cast(right)));
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this > right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression gt(Expression<A> right) {
+        return Expressions.booleanOperation(Ops.GT, mixin, right);
+    }
+
+    /**
+     * Create a {@code this > all right} expression
+     *
+     * @param right
+     * @return this &gt; all right
+     */
+    public BooleanExpression gtAll(CollectionExpression<?, ? super T> right) {
+        return gt(ExpressionUtils.<T> all(right));
+    }
+
+    /**
+     * Create a {@code this > any right} expression
+     *
+     * @param right
+     * @return this &gt; any right
+     */
+    public BooleanExpression gtAny(CollectionExpression<?, ? super T> right) {
+        return gt(ExpressionUtils.<T> any(right));
+    }
+
+    /**
+     * Create a {@code this > all right} expression
+     *
+     * @param right
+     * @return this &gt; all right
+     */
+    public BooleanExpression gtAll(SubQueryExpression<? extends T> right) {
+        return gt(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this > any right} expression
+     *
+     * @param right
+     * @return this &gt; any right
+     */
+    public BooleanExpression gtAny(SubQueryExpression<? extends T> right) {
+        return gt(ExpressionUtils.any(right));
+    }
+
+
+    /**
+     * Create a {@code this between from and to} expression
+     *
+     * <p>Is equivalent to {@code from <= this <= to}</p>
+     *
+     * @param <A>
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this between from and to
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression between(@Nullable A from, @Nullable A to) {
+        if (from == null) {
+            if (to != null) {
+                return loe(to);
+            } else {
+                throw new IllegalArgumentException("Either from or to needs to be non-null");
+            }
+        } else if (to == null) {
+            return goe(from);
+        } else {
+            return between(ConstantImpl.create(cast(from)), ConstantImpl.create(cast(to)));
+        }
+    }
+
+    /**
+     * Create a {@code this between from and to} expression
+     *
+     * <p>Is equivalent to {@code from <= this <= to}</p>
+     *
+     * @param <A>
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this between from and to
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression between(@Nullable Expression<A> from, @Nullable Expression<A> to) {
+        if (from == null) {
+            if (to != null) {
+                return Expressions.booleanOperation(Ops.LOE, mixin, to);
+            } else {
+                throw new IllegalArgumentException("Either from or to needs to be non-null");
+            }
+        } else if (to == null) {
+            return Expressions.booleanOperation(Ops.GOE, mixin, from);
+        } else {
+            return Expressions.booleanOperation(Ops.BETWEEN, mixin, from, to);
+        }
+    }
+
+    /**
+     * Create a {@code this not between from and to} expression
+     *
+     * <p>Is equivalent to {@code this < from || this > to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this not between from and to
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression notBetween(A from, A to) {
+        return between(from, to).not();
+    }
+
+    /**
+     * Create a {@code this not between from and to} expression
+     *
+     * <p>Is equivalent to {@code this < from || this > to}</p>
+     *
+     * @param from inclusive start of range
+     * @param to inclusive end of range
+     * @return this not between from and to
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression notBetween(Expression<A> from, Expression<A> to) {
+        return between(from, to).not();
+    }
+
+    /**
+     * Create a {@code this.intValue()} expression
+     *
+     * <p>Get the int expression of this numeric expression</p>
+     *
+     * @return this.intValue()
+     * @see java.lang.Number#intValue()
+     */
+    public NumberExpression<Integer> intValue() {
+        return castToNum(Integer.class);
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str rhs
+     * @return this like str
+     */
+    public BooleanExpression like(String str) {
+        return Expressions.booleanOperation(Ops.LIKE, stringValue(), ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str
+     * @return this like str
+     */
+    public BooleanExpression like(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.LIKE, stringValue(), str);
+    }
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this <= right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression loe(A right) {
+        return loe(ConstantImpl.create(cast(right)));
+    }
+
+    /**
+     * Create a {@code this <= right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this <= right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression loe(Expression<A> right) {
+        return Expressions.booleanOperation(Ops.LOE, mixin, right);
+    }
+
+    /**
+     * Create a {@code this <= all right} expression
+     *
+     * @param right rhs
+     * @return this &lt;= all right
+     */
+    public BooleanExpression loeAll(CollectionExpression<?, ? super T> right) {
+        return loe(ExpressionUtils.<T> all(right));
+    }
+
+    /**
+     * Create a {@code this <= any right} expression
+     *
+     * @param right rhs
+     * @return this &lt;= any right
+     */
+    public BooleanExpression loeAny(CollectionExpression<?, ? super T> right) {
+        return loe(ExpressionUtils.<T> any(right));
+    }
+
+    /**
+     * Create a {@code this.longValue()} expression
+     *
+     * <p>Get the long expression of this numeric expression</p>
+     *
+     * @return this.longValue()
+     * @see java.lang.Number#longValue()
+     */
+    public NumberExpression<Long> longValue() {
+        return castToNum(Long.class);
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this < right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression lt(A right) {
+        return lt(ConstantImpl.create(cast(right)));
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param <A>
+     * @param right rhs of the comparison
+     * @return {@code this < right}
+     * @see java.lang.Comparable#compareTo(Object)
+     */
+    public final <A extends Number & Comparable<?>> BooleanExpression lt(Expression<A> right) {
+        return Expressions.booleanOperation(Ops.LT, this, right);
+    }
+
+    /**
+     * Create a {@code this < all right} expression
+     *
+     * @param right rhs
+     * @return this &lt; all right
+     */
+    public BooleanExpression ltAll(CollectionExpression<?, ? super T> right) {
+        return lt(ExpressionUtils.<T> all(right));
+    }
+
+    /**
+     * Create a {@code this < any right} expression
+     *
+     * @param right rhs
+     * @return this &lt; any right
+     */
+    public BooleanExpression ltAny(CollectionExpression<?, ? super T> right) {
+        return lt(ExpressionUtils.<T> any(right));
+    }
+
+    /**
+     * Create a {@code max(this)} expression
+     *
+     * <p>Get the maximum value of this expression (aggregation)</p>
+     *
+     * @return max(this)
+     */
+    @Override
+    public NumberExpression<T> max() {
+        if (max == null) {
+            max = Expressions.numberOperation(getType(), Ops.AggOps.MAX_AGG, mixin);
+        }
+        return max;
+    }
+
+    /**
+     * Create a {@code min(this)} expression
+     *
+     * <p>Get the minimum value of this expression (aggregation)</p>
+     *
+     * @return min(this)
+     */
+    @Override
+    public NumberExpression<T> min() {
+        if (min == null) {
+            min = Expressions.numberOperation(getType(), Ops.AggOps.MIN_AGG, mixin);
+        }
+        return min;
+    }
+
+    /**
+     * Create a {@code mod(this, num)} expression
+     *
+     * @param num
+     * @return mod(this, num)
+     */
+    public NumberExpression<T> mod(Expression<T> num) {
+        return Expressions.numberOperation(getType(), Ops.MOD, mixin, num);
+    }
+
+    /**
+     * Create a {@code mod(this, num)} expression
+     *
+     * @param num
+     * @return mod(this, num)
+     */
+    public NumberExpression<T> mod(T num) {
+        return Expressions.numberOperation(getType(), Ops.MOD, mixin, ConstantImpl.create(num));
+    }
+
+    /**
+     * Create a {@code this * right} expression
+     *
+     * <p>Get the result of the operation this * right</p>
+     *
+     * @param right
+     * @return this * right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> multiply(Expression<N> right) {
+        return Expressions.numberOperation(getType(), Ops.MULT, mixin, right);
+    }
+
+    /**
+     * Create a {@code this * right} expression
+     *
+     * <p>Get the result of the operation this * right</p>
+     *
+     * @param right
+     * @return this * right
+     */
+    public <N extends Number & Comparable<N>> NumberExpression<T> multiply(N right) {
+        return Expressions.numberOperation(getType(), Ops.MULT, mixin, ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code this * -1} expression
+     *
+     * <p>Get the negation of this expression</p>
+     *
+     * @return this * -1
+     */
+    public NumberExpression<T> negate() {
+        if (negation == null) {
+            negation = Expressions.numberOperation(getType(), Ops.NEGATE, mixin);
+        }
+        return negation;
+    }
+
+    /**
+     * Create a {@code round(this)} expression
+     *
+     * <p>Returns the closest {@code int} to this.</p>
+     *
+     * @return round(this)
+     * @see java.lang.Math#round(double)
+     * @see java.lang.Math#round(float)
+     */
+    public NumberExpression<T> round() {
+        if (round == null) {
+            round = Expressions.numberOperation(getType(), MathOps.ROUND, mixin);
+        }
+        return round;
+    }
+
+    /**
+     * Create a {@code this.shortValue()} expression
+     *
+     * <p>Get the short expression of this numeric expression</p>
+     *
+     * @return this.shortValue()
+     * @see java.lang.Number#shortValue()
+     */
+    public NumberExpression<Short> shortValue() {
+        return castToNum(Short.class);
+    }
+
+    /**
+     * Create a {@code sqrt(this)} expression
+     *
+     * <p>Get the square root of this numeric expressions</p>
+     *
+     * @return sqrt(this)
+     */
+    public NumberExpression<Double> sqrt() {
+        if (sqrt == null) {
+            sqrt = Expressions.numberOperation(Double.class, MathOps.SQRT, mixin);
+        }
+        return sqrt;
+    }
+
+    /**
+     * Create a {@code this - right} expression
+     *
+     * <p>Get the difference of this and right</p>
+     *
+     * @param right
+     * @return this - right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> subtract(Expression<N> right) {
+        return Expressions.numberOperation(getType(), Ops.SUB, mixin, right);
+    }
+
+    /**
+     * Create a {@code this - right} expression
+     *
+     * <p>Get the difference of this and right</p>
+     *
+     * @param right
+     * @return this - right
+     */
+    public <N extends Number & Comparable<?>> NumberExpression<T> subtract(N right) {
+        return Expressions.numberOperation(getType(), Ops.SUB, mixin, ConstantImpl.create(right));
+    }
+
+    /**
+     * Create a {@code sum(this)} expression
+     *
+     * <p>Get the sum of this expression (aggregation)</p>
+     *
+     * @return sum(this)
+     */
+    public NumberExpression<T> sum() {
+        if (sum == null) {
+            sum = Expressions.numberOperation(getType(), Ops.AggOps.SUM_AGG, mixin);
+        }
+        return sum;
+    }
+
+    @Override
+    public BooleanExpression in(Number... numbers) {
+        return super.in(convert(numbers));
+    }
+
+    @Override
+    public BooleanExpression notIn(Number... numbers) {
+        return super.notIn(convert(numbers));
+    }
+
+    private List<T> convert(Number... numbers) {
+        List<T> list = new ArrayList<T>(numbers.length);
+        for (Number number : numbers) {
+            list.add(MathUtils.cast(number, getType()));
+        }
+        return list;
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public NumberExpression<T> nullif(Expression<T> other) {
+        return Expressions.numberOperation(getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public NumberExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public NumberExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberOperation.java
new file mode 100644
index 0000000000..073e7b1309
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberOperation.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code NumberOperation} represents numeric operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class NumberOperation<T extends Number & Comparable<?>>
+        extends NumberExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = -3593040852095778453L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected NumberOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected NumberOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected NumberOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public NumberExpression<T> negate() {
+        if (opMixin.getOperator() == Ops.NEGATE) {
+            return (NumberExpression<T>) opMixin.getArg(0);
+        } else {
+            return super.negate();
+        }
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberPath.java
new file mode 100644
index 0000000000..acdde896f3
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberPath.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code NumberPath} represents numeric paths
+ *
+ * @author tiwe
+ *
+ * @param <T> Java type
+ */
+public class NumberPath<T extends Number & Comparable<?>> extends NumberExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 338191992784020563L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected NumberPath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected NumberPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected NumberPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected NumberPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberTemplate.java
new file mode 100644
index 0000000000..5b0023e9f7
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code NumberTemplate} defines custom numeric expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class NumberTemplate<T extends Number & Comparable<?>> extends NumberExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = 351057421752203377L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected NumberTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected NumberTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Param.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Param.java
new file mode 100644
index 0000000000..0c04f38cce
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Param.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamExpressionImpl;
+import com.querydsl.core.types.Visitor;
+
+/**
+ * {@code Param} defines a parameter in a query with an optional name
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class Param<T> extends SimpleExpression<T> implements ParamExpression<T> {
+
+    private static final long serialVersionUID = -6872502615009012503L;
+
+    private final ParamExpression<T> paramMixin;
+
+    public Param(Class<? extends T> type, String name) {
+        super(new ParamExpressionImpl<T>(type, name));
+        this.paramMixin = (ParamExpression<T>) mixin;
+    }
+
+    public Param(Class<? extends T> type) {
+        super(new ParamExpressionImpl<T>(type));
+        this.paramMixin = (ParamExpression<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public String getName() {
+        return paramMixin.getName();
+    }
+
+    @Override
+    public boolean isAnon() {
+        return paramMixin.isAnon();
+    }
+
+    @Override
+    public String getNotSetMessage() {
+        return paramMixin.getNotSetMessage();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilder.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilder.java
new file mode 100644
index 0000000000..931cce2ca9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilder.java
@@ -0,0 +1,531 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.Array;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+
+/**
+ * {@code PathBuilder} is an extension to {@link EntityPathBase} for dynamic path construction
+ *
+ * <p>Usage example:</p>
+ *
+ * <pre>{@code
+ * PathBuilder<User> user = new PathBuilder<User>(User.class, "user");
+ * Predicate filter = user.getString("firstName").eq("Bob");
+ * List<User> users = query.from(user).where(filter).select(user).fetch();
+ * }</pre>
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class PathBuilder<T> extends EntityPathBase<T> {
+
+    private static final long serialVersionUID = -1666357914232685088L;
+
+    private final ConcurrentHashMap<SimpleEntry<String, Class<?>>, PathBuilder<?>> properties = new ConcurrentHashMap<SimpleEntry<String, Class<?>>, PathBuilder<?>>();
+
+    private final ConcurrentHashMap<Path<?>, Object> propertyMetadata = new ConcurrentHashMap<Path<?>, Object>();
+
+    private final PathBuilderValidator validator;
+
+    /**
+     * Creates a new PathBuilder instance
+     *
+     * @param type type of the expression
+     * @param pathMetadata path metadata
+     * @param validator validator for property creation
+     */
+    public PathBuilder(Class<? extends T> type, PathMetadata pathMetadata, PathBuilderValidator validator) {
+        super(type, pathMetadata);
+        this.validator = validator;
+    }
+
+    /**
+     * Creates a new PathBuilder instance
+     *
+     * @param type type of the expression
+     * @param pathMetadata path metadata
+     */
+    public PathBuilder(Class<? extends T> type, PathMetadata pathMetadata) {
+        this(type, pathMetadata, PathBuilderValidator.DEFAULT);
+    }
+
+
+    /**
+     * Creates a new PathBuilder instance
+     *
+     * @param type type of the expression
+     * @param variable variable name
+     * @param validator validator for property creation
+     */
+    public PathBuilder(Class<? extends T> type, String variable, PathBuilderValidator validator) {
+        this(type, PathMetadataFactory.forVariable(variable), validator);
+    }
+
+    /**
+     * Creates a new PathBuilder instance
+     *
+     * @param type type of the expression
+     * @param variable variable name
+     */
+    public PathBuilder(Class<? extends T> type, String variable) {
+        this(type, PathMetadataFactory.forVariable(variable), PathBuilderValidator.DEFAULT);
+    }
+
+    private <P extends Path<?>> P  addMetadataOf(P newPath, Path<?> path) {
+        if (path.getMetadata().getParent() instanceof EntityPath) {
+            EntityPath<?> parent = (EntityPath<?>) path.getMetadata().getParent();
+            if (parent.getMetadata(path) != null) {
+                propertyMetadata.putIfAbsent(newPath, parent.getMetadata(path));
+            }
+        }
+        return newPath;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <A> Class<? extends A> validate(String property, Class<A> propertyType) {
+        Class<A> validatedType = (Class<A>) validator.validate(getType(), property, propertyType);
+        if (validatedType != null) {
+            return validatedType;
+        } else {
+            throw new IllegalArgumentException("Illegal property " + property);
+        }
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return propertyMetadata.get(property);
+    }
+
+    /**
+     * Create a PathBuilder instance for the given property
+     *
+     * @param property property name
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public PathBuilder<Object> get(String property) {
+        SimpleEntry<String, Class<?>> entry = new SimpleEntry<String, Class<?>>(property, Object.class);
+        PathBuilder<Object> path = (PathBuilder<Object>) properties.get(entry);
+        PathBuilder<?> existingPath = null;
+        if (path == null) {
+            Class<?> vtype = validate(property, Object.class);
+            path = new PathBuilder<Object>(vtype, forProperty(property), validator);
+            existingPath = properties.putIfAbsent(entry, path);
+        }
+        return existingPath == null ? path : (PathBuilder<Object>) existingPath;
+    }
+
+    /**
+     * Create a PathBuilder for the given property with the given type
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A> PathBuilder<A> get(String property, Class<A> type) {
+        SimpleEntry<String, Class<?>> entry = new SimpleEntry<String, Class<?>>(property, type);
+        PathBuilder<A> path = (PathBuilder<A>) properties.get(entry);
+        PathBuilder<?> existingPath = null;
+        if (path == null) {
+            Class<? extends A> vtype = validate(property, type);
+            path = new PathBuilder<A>(vtype, forProperty(property), validator);
+            existingPath = properties.putIfAbsent(entry, path);
+        }
+        return existingPath == null ? path : (PathBuilder<A>) existingPath;
+    }
+
+    /**
+     * Create a ArrayPath instance for the given property and the given array type
+     *
+     * @param <A>
+     * @param <E>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    public <A, E> ArrayPath<A, E> getArray(String property, Class<A> type) {
+        validate(property, Array.newInstance(type, 0).getClass());
+        return super.createArray(property, type);
+    }
+
+    /**
+     * Create a new Boolean typed path
+     *
+     * @param path existing path
+     * @return property path
+     */
+    public BooleanPath get(BooleanPath path) {
+        BooleanPath newPath = getBoolean(toString(path));
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Boolean typed path
+     *
+     * @param propertyName property name
+     * @return property path
+     */
+    public BooleanPath getBoolean(String propertyName) {
+        validate(propertyName, Boolean.class);
+        return super.createBoolean(propertyName);
+    }
+
+    /**
+     * Create a new Collection typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    public <A> CollectionPath<A, PathBuilder<A>> getCollection(String property, Class<A> type) {
+        return this.<A, PathBuilder<A>>getCollection(property, type, PathBuilder.class);
+    }
+
+    /**
+     * Create a new Collection typed path
+     *
+     * @param <A>
+     * @param <E>
+     * @param property property name
+     * @param type property type
+     * @param queryType expression type
+     * @return property path
+     */
+    public <A, E extends SimpleExpression<A>> CollectionPath<A, E> getCollection(String property, Class<A> type, Class<? super E> queryType) {
+        validate(property, Collection.class);
+        return super.createCollection(property, type, queryType, PathInits.DIRECT);
+    }
+
+    /**
+     * Create a new Comparable typed path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> ComparablePath<A> get(ComparablePath<A> path) {
+        ComparablePath<A> newPath = getComparable(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Comparable typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> ComparablePath<A> getComparable(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createComparable(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Create a new Date path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> DatePath<A> get(DatePath<A> path) {
+        DatePath<A> newPath = getDate(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Date path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> DatePath<A> getDate(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createDate(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Create a new DateTime path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> DateTimePath<A> get(DateTimePath<A> path) {
+        DateTimePath<A> newPath = getDateTime(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new DateTime path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> DateTimePath<A> getDateTime(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createDateTime(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Create a new Enum path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    public <A extends Enum<A>> EnumPath<A> getEnum(String property, Class<A> type) {
+        validate(property, type);
+        return super.createEnum(property, type);
+    }
+
+    /**
+     * Create a new Enum path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Enum<A>> EnumPath<A> get(EnumPath<A> path) {
+        EnumPath<A> newPath = getEnum(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new List typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    public <A> ListPath<A, PathBuilder<A>> getList(String property, Class<A> type) {
+        return this.<A, PathBuilder<A>>getList(property, type, PathBuilder.class);
+    }
+
+    /**
+     * Create a new List typed path
+     *
+     * @param <A>
+     * @param <E>
+     * @param property property name
+     * @param type property type
+     * @param queryType expression type
+     * @return property path
+     */
+    public <A, E extends SimpleExpression<A>> ListPath<A, E> getList(String property, Class<A> type, Class<? super E> queryType) {
+        validate(property, List.class);
+        return super.createList(property, type, queryType, PathInits.DIRECT);
+    }
+
+    /**
+     * Create a new Map typed path
+     *
+     * @param <K>
+     * @param <V>
+     * @param property property name
+     * @param key key type
+     * @param value value type
+     * @return property path
+     */
+    public <K, V> MapPath<K, V, PathBuilder<V>> getMap(String property, Class<K> key, Class<V> value) {
+        return this.<K, V, PathBuilder<V>>getMap(property, key, value, PathBuilder.class);
+    }
+
+    /**
+     * Create a new Map typed path
+     *
+     * @param <K>
+     * @param <V>
+     * @param <E>
+     * @param property property name
+     * @param key key type
+     * @param value value type
+     * @param queryType vaue expression type
+     * @return property path
+     */
+    public <K, V, E extends SimpleExpression<V>> MapPath<K, V, E> getMap(String property, Class<K> key, Class<V> value, Class<? super E> queryType) {
+        validate(property, Map.class);
+        return super.createMap(property, key, value, queryType);
+    }
+
+    /**
+     * Create a new Number typed path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Number & Comparable<?>> NumberPath<A> get(NumberPath<A> path) {
+        NumberPath<A> newPath = getNumber(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Number typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Number & Comparable<?>> NumberPath<A> getNumber(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createNumber(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Create a new Set typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    public <A> SetPath<A, PathBuilder<A>> getSet(String property, Class<A> type) {
+        return this.<A, PathBuilder<A>>getSet(property, type, PathBuilder.class);
+    }
+
+    /**
+     * Create a new Set typed path
+     *
+     * @param <A>
+     * @param <E>
+     * @param property property name
+     * @param type property type
+     * @param queryType expression type
+     * @return property path
+     */
+    public <A, E extends SimpleExpression<A>> SetPath<A, E> getSet(String property, Class<A> type, Class<? super E> queryType) {
+        validate(property, Set.class);
+        return super.createSet(property, type, queryType, PathInits.DIRECT);
+    }
+
+    /**
+     * Create a new Simple path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A> SimplePath<A> get(Path<A> path) {
+        SimplePath<A> newPath = getSimple(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Simple path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A> SimplePath<A> getSimple(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createSimple(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Create a new String typed path
+     *
+     * @param path existing path
+     * @return property path
+     */
+    public StringPath get(StringPath path) {
+        StringPath newPath = getString(toString(path));
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new String typed path
+     *
+     * @param property property name
+     * @return property path
+     */
+    public StringPath getString(String property) {
+        validate(property, String.class);
+        return super.createString(property);
+    }
+
+    /**
+     * Create a new Time typed path
+     *
+     * @param <A>
+     * @param path existing path
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> TimePath<A> get(TimePath<A> path) {
+        TimePath<A> newPath = getTime(toString(path), (Class<A>) path.getType());
+        return addMetadataOf(newPath, path);
+    }
+
+    /**
+     * Create a new Time typed path
+     *
+     * @param <A>
+     * @param property property name
+     * @param type property type
+     * @return property path
+     */
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable<?>> TimePath<A> getTime(String property, Class<A> type) {
+        Class<? extends A> vtype = validate(property, type);
+        return super.createTime(property, (Class<? super A>) vtype);
+    }
+
+    /**
+     * Get the String representation of the last path element
+     *
+     * @param path path
+     * @return String representation
+     */
+    private String toString(Path<?> path) {
+        return path.getMetadata().getElement().toString();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderFactory.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderFactory.java
new file mode 100644
index 0000000000..c2e0d7264b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderFactory.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.querydsl.core.util.StringUtils;
+
+/**
+ * {@code PathBuilderFactory} is a factory class for PathBuilder creation
+ *
+ * @author tiwe
+ *
+ */
+public final class PathBuilderFactory {
+
+    private final Map<Class<?>, PathBuilder<?>> paths = new ConcurrentHashMap<>();
+
+    private final String suffix;
+
+    public PathBuilderFactory() {
+        this("");
+    }
+
+    public PathBuilderFactory(String suffix) {
+        this.suffix = suffix;
+    }
+
+    /**
+     * Create a new PathBuilder instance for the given type
+     *
+     * @param type type of expression
+     * @return new PathBuilder instance
+     */
+    @SuppressWarnings("unchecked")
+    public <T> PathBuilder<T> create(Class<T> type) {
+        PathBuilder<T> rv = (PathBuilder<T>) paths.get(type);
+        if (rv == null) {
+            rv = new PathBuilder<T>(type, variableName(type));
+            paths.put(type, rv);
+        }
+        return rv;
+    }
+
+    private String variableName(Class<?> type) {
+        return StringUtils.uncapitalize(type.getSimpleName()) + suffix;
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderValidator.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderValidator.java
new file mode 100644
index 0000000000..ab35ee0f02
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathBuilderValidator.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import com.querydsl.core.util.BeanUtils;
+import com.querydsl.core.util.PrimitiveUtils;
+import com.querydsl.core.util.ReflectionUtils;
+
+/**
+ * {@code PathBuilderValidator} validates {@link PathBuilder} properties at creation time
+ */
+public interface PathBuilderValidator extends Serializable {
+
+    /**
+     * Validates the given property of given class
+     *
+     * @param parent type of the parent object
+     * @param property property name
+     * @param propertyType property type
+     * @return propertyType or subtype of it
+     */
+    Class<?> validate(Class<?> parent, String property, Class<?> propertyType);
+
+    PathBuilderValidator DEFAULT = new PathBuilderValidator() {
+        @Override
+        public Class<?> validate(Class<?> parent, String property, Class<?> propertyType) {
+            return propertyType;
+        }
+    };
+
+    PathBuilderValidator FIELDS = new PathBuilderValidator() {
+        @Override
+        public Class<?> validate(Class<?> parent, String property, Class<?> propertyType) {
+            while (!parent.equals(Object.class)) {
+                try {
+                    Field field = parent.getDeclaredField(property);
+                    if (Map.class.isAssignableFrom(field.getType())) {
+                        return (Class) ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 1);
+                    } else if (Collection.class.isAssignableFrom(field.getType())) {
+                        return (Class) ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 0);
+                    } else {
+                        return (Class) PrimitiveUtils.wrap(field.getType());
+                    }
+                } catch (NoSuchFieldException e) {
+                    parent = parent.getSuperclass();
+                }
+            }
+            return null;
+        }
+    };
+
+    PathBuilderValidator PROPERTIES = new PathBuilderValidator() {
+        @Override
+        public Class<?> validate(Class<?> parent, String property, Class<?> propertyType) {
+            Method getter = BeanUtils.getAccessor("get", property, parent);
+            if (getter == null && PrimitiveUtils.wrap(propertyType).equals(Boolean.class)) {
+                getter = BeanUtils.getAccessor("is", property, parent);
+            }
+            if (getter != null) {
+                if (Map.class.isAssignableFrom(getter.getReturnType())) {
+                    return (Class) ReflectionUtils.getTypeParameterAsClass(getter.getGenericReturnType(), 1);
+                } else if (Collection.class.isAssignableFrom(getter.getReturnType())) {
+                    return (Class) ReflectionUtils.getTypeParameterAsClass(getter.getGenericReturnType(), 0);
+                } else {
+                    return (Class) PrimitiveUtils.wrap(getter.getReturnType());
+                }
+            } else {
+                return null;
+            }
+        }
+    };
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathInits.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathInits.java
new file mode 100644
index 0000000000..af76756c62
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/PathInits.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.io.Serializable;
+import java.util.*;
+
+import com.querydsl.core.types.PathMetadata;
+
+/**
+ * {@code PathInits} defines path initializations that can be attached to
+ * properties via QueryInit annotations
+ *
+ * @author tiwe
+ *
+ */
+public class PathInits implements Serializable {
+
+    private static final long serialVersionUID = -2173980858324141095L;
+
+    public static final PathInits DEFAULT = new PathInits();
+
+    public static final PathInits DIRECT  = new PathInits("*");
+
+    public static final PathInits DIRECT2  = new PathInits("*.*");
+
+    private final boolean initAllProps;
+
+    private final PathInits defaultValue;
+
+    private final Map<String,PathInits> propertyToInits = new HashMap<String,PathInits>();
+
+    public PathInits(String... initStrs) {
+        boolean initAllProps = false;
+        PathInits defaultValue = DEFAULT;
+
+        Map<String, Collection<String>> properties = new HashMap<>();
+        for (String initStr : initStrs) {
+            if (initStr.equals("*")) {
+                initAllProps = true;
+            } else if (initStr.startsWith("*.")) {
+                initAllProps = true;
+                defaultValue = new PathInits(initStr.substring(2));
+            } else {
+                String key = initStr;
+                List<String> inits = Collections.emptyList();
+                if (initStr.contains(".")) {
+                    key = initStr.substring(0, initStr.indexOf('.'));
+                    inits = Collections.singletonList(initStr.substring(key.length() + 1));
+                }
+                Collection<String> values = properties.computeIfAbsent(key, k -> new ArrayList<String>());
+                values.addAll(inits);
+            }
+        }
+
+        for (Map.Entry<String, Collection<String>> entry : properties.entrySet()) {
+            PathInits inits = new PathInits(entry.getValue().toArray(new String[0]));
+            propertyToInits.put(entry.getKey(), inits);
+        }
+
+        this.initAllProps = initAllProps;
+        this.defaultValue = defaultValue;
+    }
+
+    public PathInits get(String property) {
+        if (propertyToInits.containsKey(property)) {
+            return propertyToInits.get(property);
+        } else if (initAllProps) {
+            return defaultValue;
+        } else {
+            throw new IllegalArgumentException(property + " is not initialized");
+        }
+    }
+
+    public boolean isInitialized(String property) {
+        return initAllProps || propertyToInits.containsKey(property);
+    }
+
+    public static PathInits getFor(PathMetadata metadata, PathInits root) {
+        if (metadata.isRoot()) {
+            return root;
+        } else if (metadata.getParent().getMetadata().isRoot()) {
+            return DIRECT;
+        } else {
+            return DEFAULT;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SetPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SetPath.java
new file mode 100644
index 0000000000..118f24adf1
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SetPath.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code SetPath} represents set paths
+ *
+ * @author tiwe
+ *
+ * @param <E> component type
+ * @param <Q> component query type
+ */
+public class SetPath<E, Q extends SimpleExpression<? super E>> extends CollectionPathBase<Set<E>, E, Q> {
+
+    private static final long serialVersionUID = 4145848445507037373L;
+
+    private final Class<E> elementType;
+
+    private final PathImpl<Set<E>> pathMixin;
+
+    @Nullable
+    private transient Q any;
+
+    private final Class<Q> queryType;
+
+    protected SetPath(Class<? super E> type, Class<Q> queryType, String variable) {
+        this(type, queryType, PathMetadataFactory.forVariable(variable));
+    }
+
+    protected SetPath(Class<? super E> type, Class<Q> queryType, Path<?> parent, String property) {
+        this(type, queryType, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected SetPath(Class<? super E> type, Class<Q> queryType, PathMetadata metadata) {
+        this(type, queryType, metadata, PathInits.DIRECT);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected SetPath(Class<? super E> type, Class<Q> queryType, PathMetadata metadata, PathInits inits) {
+        super(new ParameterizedPathImpl<Set<E>>((Class) Set.class, metadata, type), inits);
+        this.elementType = (Class<E>) type;
+        this.queryType = queryType;
+        this.pathMixin = (PathImpl<Set<E>>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public Q any() {
+        if (any == null) {
+            any = newInstance(queryType, PathMetadataFactory.forCollectionAny(this));
+        }
+        return any;
+    }
+
+    @Override
+    public Class<E> getElementType() {
+        return elementType;
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+    @Override
+    public Class<?> getParameter(int index) {
+        if (index == 0) {
+            return elementType;
+        } else {
+            throw new IndexOutOfBoundsException(String.valueOf(index));
+        }
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java
new file mode 100644
index 0000000000..3e742aeca8
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleExpression.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code SimpleExpression} is the base class for {@link Expression} implementations.
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public abstract class SimpleExpression<T> extends DslExpression<T> {
+
+    private static final long serialVersionUID = -4405387187738167105L;
+
+    @Nullable
+    private transient volatile NumberExpression<Long> count;
+
+    @Nullable
+    private transient volatile NumberExpression<Long> countDistinct;
+
+    @Nullable
+    private transient volatile BooleanExpression isnull, isnotnull;
+
+    public SimpleExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    @Override
+    public SimpleExpression<T> as(Path<T> alias) {
+        return Expressions.operation(getType(),Ops.ALIAS, mixin, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @return alias expression
+     */
+    @Override
+    public SimpleExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a {@code this is not null} expression
+     *
+     * @return this is not null
+     */
+    public BooleanExpression isNotNull() {
+        if (isnotnull == null) {
+            isnotnull = Expressions.booleanOperation(Ops.IS_NOT_NULL, mixin);
+        }
+        return isnotnull;
+    }
+
+    /**
+     * Create a {@code this is null} expression
+     *
+     * @return this is null
+     */
+    public BooleanExpression isNull() {
+        if (isnull == null) {
+            isnull = Expressions.booleanOperation(Ops.IS_NULL, mixin);
+        }
+        return isnull;
+    }
+
+    /**
+     * Get the {@code count(this)} expression
+     *
+     * @return count(this)
+     */
+    public NumberExpression<Long> count() {
+        if (count == null) {
+            count = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_AGG, mixin);
+        }
+        return count;
+    }
+
+
+    /**
+     * Get the {@code count(distinct this)} expression
+     *
+     * @return count(distinct this)
+     */
+    public NumberExpression<Long> countDistinct() {
+        if (countDistinct == null) {
+            countDistinct = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG, mixin);
+        }
+        return countDistinct;
+    }
+
+    /**
+     * Create a {@code this == right} expression
+     *
+     * <p>Use expr.isNull() instead of expr.eq(null)</p>
+     *
+     * @param right rhs of the comparison
+     * @return this == right
+     */
+    public BooleanExpression eq(T right) {
+        if (right == null) {
+            throw new IllegalArgumentException("eq(null) is not allowed. Use isNull() instead");
+        } else {
+            return eq(ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code this == right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this == right
+     */
+    public BooleanExpression eq(Expression<? super T> right) {
+        return Expressions.booleanOperation(Ops.EQ, mixin, right);
+    }
+
+    /**
+     * Create a {@code this == all right} expression
+     *
+     * @param right
+     * @return this == all right
+     */
+    public BooleanExpression eqAll(CollectionExpression<?, ? super T> right) {
+        return eq(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this == < right} expression
+     *
+     * @param right
+     * @return this == any right
+     */
+    public BooleanExpression eqAny(CollectionExpression<?, ? super T> right) {
+        return eq(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this == all right} expression
+     *
+     * @param right
+     * @return this == all right
+     */
+    public BooleanExpression eqAll(SubQueryExpression<? extends T> right) {
+        return eq(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this == any right} expression
+     *
+     * @param right
+     * @return this == any right
+     */
+    public BooleanExpression eqAny(SubQueryExpression<? extends T> right) {
+        return eq(ExpressionUtils.any(right));
+    }
+
+
+    /**
+     * Create a {@code this in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this in right
+     */
+    public BooleanExpression in(Collection<? extends T> right) {
+        if (right.size() == 1) {
+            return eq(right.iterator().next());
+        } else {
+            return Expressions.booleanOperation(Ops.IN, mixin, ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code this in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this in right
+     */
+    public BooleanExpression in(T... right) {
+        if (right.length == 1) {
+            return eq(right[0]);
+        } else {
+            return Expressions.booleanOperation(Ops.IN, mixin, ConstantImpl.create(CollectionUtils.unmodifiableList(Arrays.asList(right))));
+        }
+    }
+
+    /**
+     * Create a {@code this in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this in right
+     */
+    public BooleanExpression in(CollectionExpression<?,? extends T> right) {
+        return Expressions.booleanOperation(Ops.IN, mixin, right);
+    }
+
+    /**
+     * Create a {@code this in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this in right
+     */
+    public BooleanExpression in(SubQueryExpression<? extends T> right) {
+        return Expressions.booleanOperation(Ops.IN, mixin, right);
+    }
+
+    /**
+     * Create a {@code this in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this in right
+     */
+    public BooleanExpression in(Expression<? extends T>... right) {
+        return Expressions.booleanOperation(Ops.IN, mixin, Expressions.set(right));
+    }
+
+    /**
+     * Create a {@code this <> right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this != right
+     */
+    public BooleanExpression ne(T right) {
+        if (right == null) {
+            throw new IllegalArgumentException("ne(null) is not allowed. Use isNotNull() instead");
+        } else {
+            return ne(ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code this <> right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this != right
+     */
+    public BooleanExpression ne(Expression<? super T> right) {
+        return Expressions.booleanOperation(Ops.NE, mixin, right);
+    }
+
+    /**
+     * Create a {@code this != all right} expression
+     *
+     * @param right
+     * @return this != all right
+     */
+    public BooleanExpression neAll(CollectionExpression<?, ? super T> right) {
+        return ne(ExpressionUtils.all(right));
+    }
+
+    /**
+     * Create a {@code this != any right} expression
+     *
+     * @param right
+     * @return this != any right
+     */
+    public BooleanExpression neAny(CollectionExpression<?, ? super T> right) {
+        return ne(ExpressionUtils.any(right));
+    }
+
+    /**
+     * Create a {@code this not in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this not in right
+     */
+    public BooleanExpression notIn(Collection<? extends T> right) {
+        if (right.size() == 1) {
+            return ne(right.iterator().next());
+        } else {
+            return Expressions.booleanOperation(Ops.NOT_IN, mixin, ConstantImpl.create(right));
+        }
+    }
+
+    /**
+     * Create a {@code this not in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this not in right
+     */
+    public BooleanExpression notIn(T... right) {
+        if (right.length == 1) {
+            return ne(right[0]);
+        } else {
+            return Expressions.booleanOperation(Ops.NOT_IN, mixin, ConstantImpl.create(Arrays.asList(right)));
+        }
+    }
+
+    /**
+     * Create a {@code this not in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this not in right
+     */
+    public BooleanExpression notIn(CollectionExpression<?,? extends T> right) {
+        return Expressions.booleanOperation(Ops.NOT_IN, mixin, right);
+    }
+
+    /**
+     * Create a {@code this not in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this not in right
+     */
+    public BooleanExpression notIn(SubQueryExpression<? extends T> right) {
+        return Expressions.booleanOperation(Ops.NOT_IN, mixin, right);
+    }
+
+    /**
+     * Create a {@code this not in right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this not in right
+     */
+    public BooleanExpression notIn(Expression<? extends T>... right) {
+        return Expressions.booleanOperation(Ops.NOT_IN, mixin, Expressions.list(right));
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    public SimpleExpression<T> nullif(Expression<T> other) {
+        return Expressions.operation(this.getType(), Ops.NULLIF, this, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    public SimpleExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a case expression builder
+     *
+     * @param other
+     * @return case expression builder
+     */
+    public CaseForEqBuilder<T> when(T other) {
+        return new CaseForEqBuilder<T>(mixin, ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a case expression builder
+     *
+     * @param other
+     * @return case expression builder
+     */
+    public CaseForEqBuilder<T> when(Expression<? extends T> other) {
+        return new CaseForEqBuilder<T>(mixin, other);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleOperation.java
new file mode 100644
index 0000000000..1cdc03310f
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code SimpleOperation} represents a simple operation expression
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class SimpleOperation<T> extends SimpleExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = -285668548371034230L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected SimpleOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected SimpleOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected SimpleOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimplePath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimplePath.java
new file mode 100644
index 0000000000..ce080ae40e
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimplePath.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code SimplePath} represents simple paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class SimplePath<T> extends SimpleExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 3088836955328191852L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected SimplePath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected SimplePath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected SimplePath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected SimplePath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleTemplate.java
new file mode 100644
index 0000000000..be69b14e05
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/SimpleTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code SimpleTemplate} defines custom simple expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class SimpleTemplate<T> extends SimpleExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = -4697578522909045745L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected SimpleTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected SimpleTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
new file mode 100644
index 0000000000..bbb7f6d8bf
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
@@ -0,0 +1,923 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code StringExpression} represents {@link java.lang.String} expressions
+ *
+ * @author tiwe
+ * @see java.lang.String
+ */
+public abstract class StringExpression extends LiteralExpression<String> {
+
+    private static final long serialVersionUID = 1536955079961023361L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> length;
+
+    @Nullable
+    private transient volatile StringExpression lower, trim, upper;
+
+    @Nullable
+    private transient volatile StringExpression min, max;
+
+    @Nullable
+    private transient volatile BooleanExpression isempty;
+
+    public StringExpression(Expression<String> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public StringExpression as(Path<String> alias) {
+        return Expressions.stringOperation(Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public StringExpression as(String alias) {
+        return as(ExpressionUtils.path(String.class, alias));
+    }
+
+    /**
+     * Create a {@code concat(this, str)} expression
+     *
+     * <p>Get the concatenation of this and str</p>
+     *
+     * @param str string to append
+     * @return this + str
+     */
+    public StringExpression append(Expression<String> str) {
+        return Expressions.stringOperation(Ops.CONCAT, mixin, str);
+    }
+
+    /**
+     * Create a {@code concat(this, str)} expression
+     *
+     * <p>Get the concatenation of this and str</p>
+     *
+     * @param str string to append
+     * @return this + str
+     */
+    public StringExpression append(String str) {
+        return append(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.charAt(i)} expression
+     *
+     * <p>Get the character at the given index</p>
+     *
+     * @param i zero based index
+     * @return this.charAt(i)
+     * @see java.lang.String#charAt(int)
+     */
+    public SimpleExpression<Character> charAt(Expression<Integer> i) {
+        return Expressions.comparableOperation(Character.class, Ops.CHAR_AT, mixin, i);
+    }
+
+    /**
+     * Create a {@code this.charAt(i)} expression
+     *
+     * <p>Get the character at the given index</p>
+     *
+     * @param i zero based index
+     * @return this.charAt(i)
+     * @see java.lang.String#charAt(int)
+     */
+    public SimpleExpression<Character> charAt(int i) {
+        return charAt(ConstantImpl.create(i));
+    }
+
+    /**
+     * Create a {@code concat(this, str)} expression
+     *
+     * <p>Get the concatenation of this and str</p>
+     *
+     * @param str string to append
+     * @return this + str
+     */
+    public StringExpression concat(Expression<String> str) {
+        return append(str);
+    }
+
+    /**
+     * Create a {@code concat(this, str)} expression
+     *
+     * <p>Get the concatenation of this and str</p>
+     *
+     * @param str string to append
+     * @return this + str
+     */
+    public StringExpression concat(String str) {
+        return append(str);
+    }
+
+    /**
+     * Create a {@code this.contains(str)} expression
+     *
+     * <p>Returns true if the given String is contained</p>
+     *
+     * @param str string
+     * @return this.contains(str)
+     * @see java.lang.String#contains(CharSequence)
+     */
+    public BooleanExpression contains(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.STRING_CONTAINS, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.contains(str)} expression
+     *
+     * <p>Returns true if the given String is contained</p>
+     *
+     * @param str string
+     * @return this.contains(str)
+     * @see java.lang.String#contains(CharSequence)
+     */
+    public BooleanExpression contains(String str) {
+        return contains(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.containsIgnoreCase(str)} expression
+     *
+     * <p>Returns true if the given String is contained, compare case insensitively</p>
+     *
+     * @param str string
+     * @return this.containsIgnoreCase(str) expression
+     */
+    public BooleanExpression containsIgnoreCase(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.STRING_CONTAINS_IC, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.containsIgnoreCase(str)} expression
+     *
+     * <p>Returns true if the given String is contained, compare case insensitively</p>
+     *
+     * @param str string
+     * @return this.containsIgnoreCase(str)
+     */
+    public BooleanExpression containsIgnoreCase(String str) {
+        return containsIgnoreCase(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.endsWith(str)} expression
+     *
+     * <p>Returns true if this ends with str</p>
+     *
+     * @param str string
+     * @return this.endsWith(str)
+     * @see java.lang.String#endsWith(String)
+     */
+    public BooleanExpression endsWith(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.ENDS_WITH, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.endsWithIgnoreCase(str)} expression
+     *
+     * <p>Returns true if this ends with str, compares case insensitively</p>
+     *
+     * @param str string
+     * @return this.endsWithIgnoreCase(str)
+     */
+    public BooleanExpression endsWithIgnoreCase(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.ENDS_WITH_IC, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.endsWith(str)} expression
+     *
+     * <p>Returns true if this ends with str</p>
+     *
+     * @param str string
+     * @return this.endsWith(str)
+     * @see java.lang.String#endsWith(String)
+     */
+    public BooleanExpression endsWith(String str) {
+        return endsWith(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.endsWithIgnoreCase(str)} expression
+     *
+     * <p>Returns true if this ends with str, compares case insensitively</p>
+     *
+     * @param str string
+     * @return this.endsWithIgnoreCase(str)
+     */
+    public BooleanExpression endsWithIgnoreCase(String str) {
+        return endsWithIgnoreCase(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.equalsIgnoreCase(str)} expression
+     *
+     * <p>Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
+     * considerations.</p>
+     *
+     * @param str string
+     * @return this.equalsIgnoreCase(str)
+     * @see java.lang.String#equalsIgnoreCase(String)
+     */
+    public BooleanExpression equalsIgnoreCase(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.EQ_IGNORE_CASE, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.equalsIgnoreCase(str)} expression
+     *
+     * <p>Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
+     * considerations.</p>
+     *
+     * @param str string
+     * @return this.equalsIgnoreCase(str)
+     * @see java.lang.String#equalsIgnoreCase(String)
+     */
+    public BooleanExpression equalsIgnoreCase(String str) {
+        return equalsIgnoreCase(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.indexOf(str)} expression
+     *
+     * <p>Get the index of the given substring in this String</p>
+     *
+     * @param str string
+     * @return this.indexOf(str)
+     * @see java.lang.String#indexOf(String)
+     */
+    public NumberExpression<Integer> indexOf(Expression<String> str) {
+        return Expressions.numberOperation(Integer.class, Ops.INDEX_OF, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.indexOf(str)} expression
+     *
+     * <p>Get the index of the given substring in this String</p>
+     *
+     * @param str string
+     * @return this.indexOf(str)
+     * @see java.lang.String#indexOf(String)
+     */
+    public NumberExpression<Integer> indexOf(String str) {
+        return indexOf(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.indexOf(str, i)} expression
+     *
+     * <p>Get the index of the given substring in this String, starting from the given index</p>
+     *
+     * @param str string
+     * @param i zero based index
+     * @return this.indexOf(str, i)
+     * @see java.lang.String#indexOf(String, int)
+     */
+    public NumberExpression<Integer> indexOf(String str, int i) {
+        return indexOf(ConstantImpl.create(str), i);
+    }
+
+    /**
+     * Create a {@code this.indexOf(str)} expression
+     *
+     * <p>Get the index of the given substring in this String, starting from the given index</p>
+     *
+     * @param str string
+     * @param i zero based index
+     * @return this.indexOf(str)
+     */
+    public NumberExpression<Integer> indexOf(Expression<String> str, int i) {
+        return Expressions.numberOperation(Integer.class, Ops.INDEX_OF_2ARGS, mixin, str, ConstantImpl.create(i));
+    }
+
+    /**
+     * Create a {@code this.isEmpty()} expression
+     *
+     * <p>Return true if this String is empty</p>
+     *
+     * @return this.isEmpty()
+     * @see java.lang.String#isEmpty()
+     */
+    public BooleanExpression isEmpty() {
+        if (isempty == null) {
+            isempty = Expressions.booleanOperation(Ops.STRING_IS_EMPTY, mixin);
+        }
+        return isempty;
+    }
+
+    /**
+     * Create a {@code !this.isEmpty()} expression
+     *
+     * <p>Return true if this String is not empty</p>
+     *
+     * @return !this.isEmpty()
+     * @see java.lang.String#isEmpty()
+     */
+    public BooleanExpression isNotEmpty() {
+        return isEmpty().not();
+    }
+
+    /**
+     * Create a {@code this.length()} expression
+     *
+     * <p>Return the length of this String</p>
+     *
+     * @return this.length()
+     * @see java.lang.String#length()
+     */
+    public NumberExpression<Integer> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Integer.class, Ops.STRING_LENGTH, mixin);
+        }
+        return length;
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression like(String str) {
+        return Expressions.booleanOperation(Ops.LIKE, this, ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression like(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.LIKE, mixin, str);
+    }
+
+    /**
+     * Create a {@code this like str} expression ignoring case
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression likeIgnoreCase(String str) {
+        return Expressions.booleanOperation(Ops.LIKE_IC, mixin, ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this like str} expression ignoring case
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression likeIgnoreCase(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.LIKE_IC, mixin, str);
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression like(String str, char escape) {
+        return Expressions.booleanOperation(Ops.LIKE_ESCAPE, mixin, ConstantImpl.create(str), ConstantImpl.create(escape));
+    }
+
+    /**
+     * Create a {@code this like str} expression
+     *
+     * @param str string
+     * @return this like str
+     */
+    public BooleanExpression like(Expression<String> str, char escape) {
+        return Expressions.booleanOperation(Ops.LIKE_ESCAPE, mixin, str, ConstantImpl.create(escape));
+    }
+
+    /**
+     * Create a {@code this like str} expression ignoring case
+     *
+     * @param str string
+     * @param escape escape character
+     * @return this like string
+     */
+    public BooleanExpression likeIgnoreCase(String str, char escape) {
+        return Expressions.booleanOperation(Ops.LIKE_ESCAPE_IC, mixin, ConstantImpl.create(str), ConstantImpl.create(escape));
+    }
+
+    /**
+     * Create a {@code this like str} expression ignoring case
+     *
+     * @param str string
+     * @param escape escape character
+     * @return this like string
+     */
+    public BooleanExpression likeIgnoreCase(Expression<String> str, char escape) {
+        return Expressions.booleanOperation(Ops.LIKE_ESCAPE_IC, mixin, str, ConstantImpl.create(escape));
+    }
+
+    /**
+     * Create a {@code locate(str, this)} expression
+     *
+     * <p>Get the position of the given String in this String, the first position is 1</p>
+     *
+     * @param str string
+     * @return locate(str, this)
+     */
+    public NumberExpression<Integer> locate(Expression<String> str) {
+        return Expressions.numberOperation(Integer.class, Ops.StringOps.LOCATE, str, mixin);
+    }
+
+    /**
+     * Create a {@code locate(str, this)} expression
+     *
+     * <p>Get the position of the given String in this String, the first position is 1</p>
+     *
+     * @param str string
+     * @return locate(str, this)
+     */
+    public NumberExpression<Integer> locate(String str) {
+        return Expressions.numberOperation(Integer.class, Ops.StringOps.LOCATE, ConstantImpl.create(str), mixin);
+    }
+
+    /**
+     * Create a {@code locate(str, this, start)} expression
+     *
+     * <p>Get the position of the given String in this String, the first position is 1</p>
+     *
+     * @param str string
+     * @param start start
+     * @return locate(str, this, start)
+     */
+    public NumberExpression<Integer> locate(Expression<String> str, NumberExpression<Integer> start) {
+        return Expressions.numberOperation(Integer.class, Ops.StringOps.LOCATE2, str, mixin, start);
+    }
+
+    /**
+     * Create a {@code locate(str, this, start)} expression
+     *
+     * <p>Get the position of the given String in this String, the first position is 1</p>
+     *
+     * @param str string
+     * @param start start
+     * @return locate(str, this, start)
+     */
+    public NumberExpression<Integer> locate(String str, int start) {
+        return Expressions.numberOperation(Integer.class, Ops.StringOps.LOCATE2, ConstantImpl.create(str), mixin, ConstantImpl.create(start));
+    }
+
+    /**
+     * Create a {@code locate(str, this, start)} expression
+     *
+     * <p>Get the position of the given String in this String, the first position is 1</p>
+     *
+     * @param str string
+     * @param start start
+     * @return locate(str, this, start)
+     */
+    public NumberExpression<Integer> locate(String str, Expression<Integer> start) {
+        return Expressions.numberOperation(Integer.class, Ops.StringOps.LOCATE2, ConstantImpl.create(str), mixin, start);
+    }
+
+    /**
+     * Create a {@code this.toLowerCase()} expression
+     *
+     * <p>Get the lower case form</p>
+     *
+     * @return this.toLowerCase()
+     * @see java.lang.String#toLowerCase()
+     */
+    public StringExpression lower() {
+        if (lower == null) {
+            lower = Expressions.stringOperation(Ops.LOWER, mixin);
+        }
+        return lower;
+    }
+
+    /**
+     * Create a {@code this.matches(regex)} expression
+     *
+     * <p>Return true if this String matches the given regular expression</p>
+     *
+     * <p>Some implementations such as Querydsl JPA will try to convert a regex expression into like
+     * form and will throw an Exception when this fails</p>
+     *
+     * @param regex regular expression
+     * @return this.matches(right)
+     * @see java.lang.String#matches(String)
+     */
+    public BooleanExpression matches(Expression<String> regex) {
+        return Expressions.booleanOperation(Ops.MATCHES, mixin, regex);
+    }
+
+    /**
+     * Create a {@code this.matches(regex)} expression
+     *
+     * <p>Return true if this String matches the given regular expression</p>
+     *
+     * <p>Some implementations such as Querydsl JPA will try to convert a regex expression into like
+     * form and will throw an Exception when this fails</p>
+     *
+     * @param regex regular expression
+     * @return this.matches(regex)
+     * @see java.lang.String#matches(String)
+     */
+    public BooleanExpression matches(String regex) {
+        return matches(ConstantImpl.create(regex));
+    }
+
+    /**
+     * Create a {@code max(this)} expression
+     *
+     * <p>Get the maximum value of this expression (aggregation)</p>
+     *
+     * @return max(this)
+     */
+    public StringExpression max() {
+        if (max == null) {
+            max = Expressions.stringOperation(Ops.AggOps.MAX_AGG, mixin);
+        }
+        return max;
+    }
+
+    /**
+     * Create a {@code min(this)} expression
+     *
+     * <p>Get the minimum value of this expression (aggregation)</p>
+     *
+     * @return min(this)
+     */
+    @Override
+    public StringExpression min() {
+        if (min == null) {
+            min = Expressions.stringOperation(Ops.AggOps.MIN_AGG, mixin);
+        }
+        return min;
+    }
+
+    /**
+     * Create a {@code !this.equalsIgnoreCase(str)} expression
+     *
+     * <p>Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
+     * considerations.</p>
+     *
+     * @param str string
+     * @return !this.equalsIgnoreCase(str)
+     * @see java.lang.String#equalsIgnoreCase(String)
+     */
+    public BooleanExpression notEqualsIgnoreCase(Expression<String> str) {
+        return equalsIgnoreCase(str).not();
+    }
+
+
+    /**
+     * Create a {@code !this.equalsIgnoreCase(str)} expression
+     *
+     * <p>Compares this {@code StringExpression} to another {@code StringExpression}, ignoring case
+     * considerations.</p>
+     *
+     * @param str string
+     * @return !this.equalsIgnoreCase(str)
+     * @see java.lang.String#equalsIgnoreCase(String)
+     */
+    public BooleanExpression notEqualsIgnoreCase(String str) {
+        return equalsIgnoreCase(str).not();
+    }
+
+    /**
+     * Create a {@code this not like str} expression
+     *
+     * @param str string
+     * @return this not like str
+     */
+    public BooleanExpression notLike(String str) {
+        return like(str).not();
+    }
+
+    /**
+     * Create a {@code this not like str} expression
+     *
+     * @param str string
+     * @return this not like str
+     */
+    public BooleanExpression notLike(Expression<String> str) {
+        return like(str).not();
+    }
+
+    /**
+     * Create a {@code this not like str} expression
+     *
+     * @param str string
+     * @return this not like str
+     */
+    public BooleanExpression notLike(String str, char escape) {
+        return like(str, escape).not();
+    }
+
+    /**
+     * Create a {@code this not like str} expression
+     *
+     * @param str string
+     * @return this not like str
+     */
+    public BooleanExpression notLike(Expression<String> str, char escape) {
+        return like(str, escape).not();
+    }
+
+    /**
+     * Create a {@code concat(str, this)} expression
+     *
+     * <p>Prepend the given String and return the result</p>
+     *
+     * @param str string
+     * @return str + this
+     */
+    public StringExpression prepend(Expression<String> str) {
+        return Expressions.stringOperation(Ops.CONCAT, str, mixin);
+    }
+
+    /**
+     * Create a {@code concat(str, this)} expression
+     *
+     * <p>Prepend the given String and return the result</p>
+     *
+     * @param str string
+     * @return str + this
+     */
+    public StringExpression prepend(String str) {
+        return prepend(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.startsWith(str)} expression
+     *
+     * <p>Return true if this starts with str</p>
+     *
+     * @param str string
+     * @return this.startsWith(str)
+     * @see java.lang.String#startsWith(String)
+     */
+    public BooleanExpression startsWith(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.STARTS_WITH, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.startsWithIgnoreCase(str)} expression
+     *
+     * @param str string
+     * @return this.startsWithIgnoreCase(str)
+     */
+    public BooleanExpression startsWithIgnoreCase(Expression<String> str) {
+        return Expressions.booleanOperation(Ops.STARTS_WITH_IC, mixin, str);
+    }
+
+    /**
+     * Create a {@code this.startsWith(str)} expression
+     *
+     * <p>Return true if this starts with str</p>
+     *
+     * @param str string
+     * @return this.startsWith(str)
+     * @see java.lang.String#startsWith(String)
+     */
+    public BooleanExpression startsWith(String str) {
+        return startsWith(ConstantImpl.create(str));
+    }
+
+    /**
+     * Create a {@code this.startsWithIgnoreCase(str)} expression
+     *
+     * @param str string
+     * @return this.startsWithIgnoreCase(str)
+     */
+    public BooleanExpression startsWithIgnoreCase(String str) {
+        return startsWithIgnoreCase(ConstantImpl.create(str));
+    }
+
+    @Override
+    public StringExpression stringValue() {
+        return this;
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @return this.substring(beginIndex)
+     * @see java.lang.String#substring(int)
+     */
+    public StringExpression substring(int beginIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_1ARG, mixin, ConstantImpl.create(beginIndex));
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex, endIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @param endIndex exclusive end index
+     * @return this.substring(beginIndex, endIndex)
+     * @see java.lang.String#substring(int, int)
+     */
+    public StringExpression substring(int beginIndex, int endIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_2ARGS, mixin, ConstantImpl.create(beginIndex), ConstantImpl.create(endIndex));
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex, endIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @param endIndex exclusive end index
+     * @return this.substring(beginIndex, endIndex)
+     * @see java.lang.String#substring(int, int)
+     */
+    public StringExpression substring(Expression<Integer> beginIndex, int endIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_2ARGS, mixin, beginIndex, ConstantImpl.create(endIndex));
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex, endIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @param endIndex exclusive end index
+     * @return this.substring(beginIndex, endIndex)
+     * @see java.lang.String#substring(int, int)
+     */
+    public StringExpression substring(int beginIndex, Expression<Integer> endIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_2ARGS, mixin, ConstantImpl.create(beginIndex), endIndex);
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @return this.substring(beginIndex)
+     * @see java.lang.String#substring(int)
+     */
+    public StringExpression substring(Expression<Integer> beginIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_1ARG, mixin, beginIndex);
+    }
+
+    /**
+     * Create a {@code this.substring(beginIndex, endIndex)} expression
+     *
+     * @param beginIndex inclusive start index
+     * @param endIndex exclusive end index
+     * @return this.substring(beginIndex, endIndex)
+     * @see java.lang.String#substring(int, int)
+     */
+    public StringExpression substring(Expression<Integer> beginIndex, Expression<Integer> endIndex) {
+        return Expressions.stringOperation(Ops.SUBSTR_2ARGS, mixin, beginIndex, endIndex);
+    }
+
+    /**
+     * Create a {@code this.toLowerCase()} expression
+     *
+     * <p>Get the lower case form</p>
+     *
+     * @return this.toLowerCase()
+     * @see java.lang.String#toLowerCase()
+     */
+    public StringExpression toLowerCase() {
+        return lower();
+    }
+
+    /**
+     * Create a {@code this.toUpperCase()} expression
+     *
+     * <p>Get the upper case form</p>
+     *
+     * @return this.toUpperCase()
+     * @see java.lang.String#toUpperCase()
+     */
+    public StringExpression toUpperCase() {
+        return upper();
+    }
+
+    /**
+     * Create a {@code this.trim()} expression
+     *
+     * <p>Create a copy of the string, with leading and trailing whitespace
+     * omitted.</p>
+     *
+     * @return this.trim()
+     * @see java.lang.String#trim()
+     */
+    public StringExpression trim() {
+        if (trim == null) {
+            trim = Expressions.stringOperation(Ops.TRIM, mixin);
+        }
+        return trim;
+    }
+
+    /**
+     * Create a {@code this.toUpperCase()} expression
+     *
+     * <p>Get the upper case form</p>
+     *
+     * @return this.toUpperCase()
+     * @see java.lang.String#toUpperCase()
+     */
+    public StringExpression upper() {
+        if (upper == null) {
+            upper = Expressions.stringOperation(Ops.UPPER, mixin);
+        }
+        return upper;
+    }
+
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public StringExpression nullif(Expression<String> other) {
+        return Expressions.stringOperation(Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public StringExpression nullif(String other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public StringExpression coalesce(Expression<String> expr) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asString();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public StringExpression coalesce(Expression<?>... exprs) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.asString();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public StringExpression coalesce(String arg) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asString();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    public StringExpression coalesce(String... args) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        for (String arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.asString();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpressions.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpressions.java
new file mode 100644
index 0000000000..26af20efa9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpressions.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+
+/**
+ * Extended String expressions, supported by the SQL module
+ *
+ * @author tiwe
+ *
+ */
+public final class StringExpressions {
+
+    /**
+     * Create a {@code ltrim(str)} expression
+     *
+     * <p>Returns a character expression after it removes leading blanks.</p>
+     *
+     * @param str string
+     * @return ltrim(str)
+     */
+    public static StringExpression ltrim(Expression<String> str) {
+        return Expressions.stringOperation(Ops.StringOps.LTRIM, str);
+    }
+
+    /**
+     * Create a {@code rtrim(str)} expression
+     *
+     * <p>Returns a character string after truncating all trailing blanks.</p>
+     *
+     * @param str string
+     * @return rtrim(str)
+     */
+    public static StringExpression rtrim(Expression<String> str) {
+        return Expressions.stringOperation(Ops.StringOps.RTRIM, str);
+    }
+
+    /**
+     * Create a {@code lpad(in, length)} expression
+     *
+     * <p>Returns in left-padded to length characters</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @return lpad(in, length)
+     */
+    public static StringExpression lpad(Expression<String> in, int length) {
+        return Expressions.stringOperation(Ops.StringOps.LPAD, in, ConstantImpl.create(length));
+    }
+
+    /**
+     * Create a {@code lpad(in, length)} expression
+     *
+     * <p>Returns in left-padded to length characters</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @return lpad(in, length)
+     */
+    public static StringExpression lpad(Expression<String> in, Expression<Integer> length) {
+        return Expressions.stringOperation(Ops.StringOps.LPAD, in, length);
+    }
+
+    /**
+     * Create a {@code rpad(in, length)} expression
+     *
+     * <p>Returns in right-padded to length characters</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @return rpad(in, length)
+     */
+    public static StringExpression rpad(Expression<String> in, int length) {
+        return Expressions.stringOperation(Ops.StringOps.RPAD, in, ConstantImpl.create(length));
+    }
+
+    /**
+     * Create a {@code rpad(in, length)} expression
+     *
+     * <p>Returns in right-padded to length characters</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @return rpad(in, length)
+     */
+    public static StringExpression rpad(Expression<String> in, Expression<Integer> length) {
+        return Expressions.stringOperation(Ops.StringOps.RPAD, in, length);
+    }
+
+    /**
+     * Create a {@code lpad(in, length, c)} expression
+     *
+     * <p>Returns in left-padded to length characters with c</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @param c padding char
+     * @return lpad(in, length, c)
+     */
+    public static StringExpression lpad(Expression<String> in, NumberExpression<Integer> length, char c) {
+        return Expressions.stringOperation(Ops.StringOps.LPAD2, in, length, ConstantImpl.create(c));
+    }
+
+    /**
+     * Create a {@code lpad(in, length, c)} expression
+     *
+     * <p>Returns in left-padded to length characters with c</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @param c padding char
+     * @return lpad(in, length, c)
+     */
+    public static StringExpression lpad(Expression<String> in, int length, char c) {
+        return Expressions.stringOperation(Ops.StringOps.LPAD2, in, ConstantImpl.create(length), ConstantImpl.create(c));
+    }
+
+    /**
+     * Create a {@code rpad(in, length, c)} expression
+     *
+     * <p>Returns in right-padded to length characters with c</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @param c padding char
+     * @return rpad(in, length, c)
+     */
+    public static StringExpression rpad(Expression<String> in, NumberExpression<Integer> length, char c) {
+        return Expressions.stringOperation(Ops.StringOps.RPAD2, in, length, ConstantImpl.create(c));
+    }
+
+    /**
+     * Create a {@code rpad(in, length, c)} expression
+     *
+     * <p>Returns in right-padded to length characters with c</p>
+     *
+     * @param in string to be padded
+     * @param length target length
+     * @param c padding char
+     * @return rpad(in, length, c)
+     */
+    public static StringExpression rpad(Expression<String> in, int length, char c) {
+        return Expressions.stringOperation(Ops.StringOps.RPAD2, in, ConstantImpl.create(length), ConstantImpl.create(c));
+    }
+
+    private StringExpressions() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringOperation.java
new file mode 100644
index 0000000000..2b9a843e1a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringOperation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code StringOperation} represents a String typed operation
+ *
+ * @author tiwe
+ *
+ */
+public class StringOperation extends StringExpression implements Operation<String> {
+
+    private static final long serialVersionUID = 6846556373847139549L;
+
+    private final OperationImpl<String> opMixin;
+
+    protected StringOperation(OperationImpl<String> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected StringOperation(Operator op, Expression<?>... args) {
+        this(op, Arrays.asList(args));
+    }
+
+    protected StringOperation(Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(String.class, op, args));
+        this.opMixin = (OperationImpl<String>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringPath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringPath.java
new file mode 100644
index 0000000000..19f43884d7
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringPath.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code StringPath} represents String typed paths
+ *
+ * @author tiwe
+ *
+ */
+public class StringPath extends StringExpression implements Path<String> {
+
+    private static final long serialVersionUID = 7983490925756833429L;
+
+    private final PathImpl<String> pathMixin;
+
+    protected StringPath(PathImpl<String> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected StringPath(Path<?> parent, String property) {
+        this(PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected StringPath(PathMetadata metadata) {
+        super(ExpressionUtils.path(String.class, metadata));
+        this.pathMixin = (PathImpl<String>) mixin;
+    }
+
+    protected StringPath(String var) {
+        this(PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringTemplate.java
new file mode 100644
index 0000000000..fb66ced1c2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringTemplate.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code StringTemplate} defines custom String expressions
+ *
+ * @author tiwe
+ *
+ */
+public class StringTemplate extends StringExpression implements TemplateExpression<String> {
+
+    private static final long serialVersionUID = 3181686132439356614L;
+
+    private final TemplateExpressionImpl<String> templateMixin;
+
+    protected StringTemplate(TemplateExpressionImpl<String> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected StringTemplate(Template template, List<?> args) {
+        super(ExpressionUtils.template(String.class, template, args));
+        this.templateMixin = (TemplateExpressionImpl<String>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TemporalExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TemporalExpression.java
new file mode 100644
index 0000000000..23e262ffa2
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TemporalExpression.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code TemporalExpression} is a supertype for Date/Time related types
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+@SuppressWarnings({"unchecked"})
+public abstract class TemporalExpression<T extends Comparable> extends LiteralExpression<T> {
+
+    private static final long serialVersionUID = 1137918766051524298L;
+
+    public TemporalExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; right
+     */
+    public BooleanExpression after(T right) {
+        return gt(right);
+    }
+
+    /**
+     * Create a {@code this > right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &gt; right
+     */
+    public BooleanExpression after(Expression<T> right) {
+        return gt(right);
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; right
+     */
+    public BooleanExpression before(T right) {
+        return lt(right);
+    }
+
+    /**
+     * Create a {@code this < right} expression
+     *
+     * @param right rhs of the comparison
+     * @return this &lt; right
+     */
+    public BooleanExpression before(Expression<T> right) {
+        return lt(right);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
new file mode 100644
index 0000000000..4760c214fe
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.sql.Time;
+
+import com.querydsl.core.types.ConstantImpl;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code TimeExpression} represents Time expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public abstract class TimeExpression<T extends Comparable> extends TemporalExpression<T> {
+
+    private static final long serialVersionUID = 7360552308332457990L;
+
+    private static class Constants {
+        private static final TimeExpression<Time> CURRENT_TIME = currentTime(Time.class);
+    }
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> hours, minutes, seconds, milliseconds;
+
+    public TimeExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    @Override
+    public TimeExpression<T> as(Path<T> alias) {
+        return Expressions.timeOperation(getType(),Ops.ALIAS, mixin, alias);
+    }
+
+    @Override
+    public TimeExpression<T> as(String alias) {
+        return as(ExpressionUtils.path(getType(), alias));
+    }
+
+    /**
+     * Create a hours expression (range 0-23)
+     *
+     * @return hour
+     */
+    public NumberExpression<Integer> hour() {
+        if (hours == null) {
+            hours = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.HOUR, mixin);
+        }
+        return hours;
+    }
+
+    /**
+     * Create a minutes expression (range 0-59)
+     *
+     * @return minute
+     */
+    public NumberExpression<Integer> minute() {
+        if (minutes == null) {
+            minutes = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MINUTE, mixin);
+        }
+        return minutes;
+    }
+
+    /**
+     * Create a seconds expression (range 0-59)
+     *
+     * @return second
+     */
+    public NumberExpression<Integer> second() {
+        if (seconds == null) {
+            seconds = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.SECOND, mixin);
+        }
+        return seconds;
+    }
+
+    /**
+     * Create a milliseconds expression (range 0-999)
+     * <p>Is always 0 in JPA and JDO modules</p>
+     *
+     * @return milli second
+     */
+    public NumberExpression<Integer> milliSecond() {
+        if (milliseconds == null) {
+            milliseconds = Expressions.numberOperation(Integer.class, Ops.DateTimeOps.MILLISECOND, mixin);
+        }
+        return milliseconds;
+    }
+
+    /**
+     * Create an expression representing the current time as a TimeExpression instance
+     *
+     * @return current time
+     */
+    public static TimeExpression<Time> currentTime() {
+        return Constants.CURRENT_TIME;
+    }
+
+    /**
+     * Create an expression representing the current time as a TimeExpression instance
+     *
+     * @return current time
+     */
+    public static <T extends Comparable> TimeExpression<T> currentTime(Class<T> cl) {
+        return Expressions.timeOperation(cl, Ops.DateTimeOps.CURRENT_TIME);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public TimeExpression<T> nullif(Expression<T> other) {
+        return Expressions.timeOperation(getType(), Ops.NULLIF, mixin, other);
+    }
+
+    /**
+     * Create a {@code nullif(this, other)} expression
+     *
+     * @param other
+     * @return nullif(this, other)
+     */
+    @Override
+    public TimeExpression<T> nullif(T other) {
+        return nullif(ConstantImpl.create(other));
+    }
+
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public TimeExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, exprs...)} expression
+     *
+     * @param exprs additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public TimeExpression<T> coalesce(Expression<?>... exprs) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (Expression expr : exprs) {
+            coalesce.add(expr);
+        }
+        return coalesce.asTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public TimeExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asTime();
+    }
+
+    /**
+     * Create a {@code coalesce(this, args...)} expression
+     *
+     * @param args additional arguments
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public TimeExpression<T> coalesce(T... args) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        for (T arg : args) {
+            coalesce.add(arg);
+        }
+        return coalesce.asTime();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeOperation.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeOperation.java
new file mode 100644
index 0000000000..3c5255d9be
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code TimeOperation} represents Time operations
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class TimeOperation<T extends Comparable<?>> extends TimeExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 9051606798649239240L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected TimeOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected TimeOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected TimeOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimePath.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimePath.java
new file mode 100644
index 0000000000..799d10a9f3
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimePath.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code TimePath} represented Time paths
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class TimePath<T extends Comparable> extends TimeExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = -1432775001949467763L;
+
+    private final PathImpl<T> pathMixin;
+
+    protected TimePath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    protected TimePath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    protected TimePath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    protected TimePath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeTemplate.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeTemplate.java
new file mode 100644
index 0000000000..a2508799c3
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeTemplate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code TimeTemplate} defines custom time expressions
+ *
+ * @author tiwe
+ *
+ * @param <T> expression type
+ */
+public class TimeTemplate<T extends Comparable<?>> extends TimeExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = -7684306954555037051L;
+
+    private final TemplateExpressionImpl<T> templateMixin;
+
+    protected TimeTemplate(TemplateExpressionImpl<T> mixin) {
+        super(mixin);
+        this.templateMixin = mixin;
+    }
+
+    protected TimeTemplate(Class<? extends T> type, Template template, List<?> args) {
+        super(ExpressionUtils.template(type, template, args));
+        templateMixin = (TemplateExpressionImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(templateMixin, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Wildcard.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Wildcard.java
new file mode 100644
index 0000000000..8f5e006f9c
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Wildcard.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code Wildcard} provides constant Expressions for general wildcard expressions
+ *
+ * @author tiwe
+ *
+ */
+public final class Wildcard {
+
+    /**
+     * Wildcard expression (*) for all columns
+     */
+    public static final Expression<Object[]> all = ExpressionUtils.template(Object[].class, "*");
+
+    /**
+     * Wildcard count expression (count(*))
+     */
+    public static final NumberExpression<Long> count = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_ALL_AGG);
+
+    /**
+     * Wildcard count distinct expression (count(distinct *))
+     */
+    public static final NumberExpression<Long> countDistinct = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_DISTINCT_ALL_AGG);
+
+    /**
+     * Wildcard count expression (count(*))
+     */
+    public static final NumberExpression<Integer> countAsInt = Expressions.numberOperation(Integer.class, Ops.AggOps.COUNT_ALL_AGG);
+
+    private Wildcard() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/package-info.java
new file mode 100644
index 0000000000..26e24a2787
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * DSL expression types
+ */
+package com.querydsl.core.types.dsl;
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/types/package-info.java
new file mode 100644
index 0000000000..72505ad882
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Expression types
+ */
+package com.querydsl.core.types;
diff --git a/querydsl-core/src/main/java/com/mysema/util/Annotations.java b/querydsl-core/src/main/java/com/querydsl/core/util/Annotations.java
similarity index 76%
rename from querydsl-core/src/main/java/com/mysema/util/Annotations.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/Annotations.java
index bcfcd9e9f6..076fb4ddbd 100644
--- a/querydsl-core/src/main/java/com/mysema/util/Annotations.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/Annotations.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Annotations is a merging apapter for the {@link AnnotatedElement} interface
- * 
+ * Annotations is a merging adapter for the {@link AnnotatedElement} interface
+ *
  * @author tiwe
  *
  */
@@ -32,11 +32,9 @@ public class Annotations implements AnnotatedElement {
 
     public Annotations(AnnotatedElement... elements) {
         for (AnnotatedElement element : elements) {
-            for (Annotation annotation : element.getAnnotations()) {
-                annotations.put(annotation.annotationType(), annotation);
-            }
+            addAnnotations(element);
         }
-    } 
+    }
 
     @SuppressWarnings("unchecked")
     @Override
@@ -46,7 +44,7 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
 
     @Override
     public Annotation[] getAnnotations() {
-        return annotations.values().toArray(new Annotation[annotations.values().size()]);
+        return annotations.values().toArray(new Annotation[0]);
     }
 
     @Override
@@ -58,12 +56,17 @@ public Annotation[] getDeclaredAnnotations() {
     public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
         return annotations.containsKey(annotationClass);
     }
-    
+
     public void addAnnotation(@Nullable Annotation annotation) {
         if (annotation != null) {
-            annotations.put(annotation.annotationType(), annotation);    
+            annotations.put(annotation.annotationType(), annotation);
         }
-        
+
     }
 
+    public void addAnnotations(AnnotatedElement element) {
+        for (Annotation annotation : element.getAnnotations()) {
+            annotations.put(annotation.annotationType(), annotation);
+        }
+    }
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/ArrayUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/ArrayUtils.java
new file mode 100644
index 0000000000..7990764dc9
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/ArrayUtils.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.lang.reflect.Array;
+
+/**
+ * ArrayUtils provides array related utility functionality
+ *
+ * @author tiwe
+ *
+ */
+public final class ArrayUtils {
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] combine(Class<T> type, T first, T second, T... rest) {
+        T[] array = (T[]) Array.newInstance(type, rest.length + 2);
+        array[0] = first;
+        array[1] = second;
+        System.arraycopy(rest, 0, array, 2, rest.length);
+        return array;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] combine(Class<T> type, T first, T... rest) {
+        T[] array = (T[]) Array.newInstance(type, rest.length + 1);
+        array[0] = first;
+        System.arraycopy(rest, 0, array, 1, rest.length);
+        return array;
+    }
+
+    public static Object[] combine(int size, Object[]... arrays) {
+        int offset = 0;
+        Object[] target = new Object[size];
+        for (Object[] arr : arrays) {
+            System.arraycopy(arr, 0, target, offset, arr.length);
+            offset += arr.length;
+        }
+        return target;
+    }
+
+    // copied and modified from commons-lang-2.3
+    // originally licensed under ASL 2.0
+    public static Object[] subarray(Object[] array, int startIndexInclusive, int endIndexExclusive) {
+        int newSize = endIndexExclusive - startIndexInclusive;
+        Class<?> type = array.getClass().getComponentType();
+        if (newSize <= 0) {
+            return (Object[]) Array.newInstance(type, 0);
+        }
+        Object[] subarray = (Object[]) Array.newInstance(type, newSize);
+        System.arraycopy(array, startIndexInclusive, subarray, 0, newSize);
+        return subarray;
+    }
+
+    public static boolean isEmpty(Object[] array) {
+        return array == null || array.length == 0;
+    }
+
+    private ArrayUtils() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/util/BeanMap.java b/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/util/BeanMap.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java
index 08ace542bf..757e1adb5c 100644
--- a/querydsl-core/src/main/java/com/mysema/util/BeanMap.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java
@@ -1,737 +1,723 @@
-/*
- *  Copyright 2001-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package com.mysema.util;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.base.Function;
-import com.google.common.primitives.Primitives;
-
-/**
- * An implementation of Map for JavaBeans which uses introspection to
- * get and put properties in the bean.
- * <p/>
- * If an exception occurs during attempts to get or set a property then the
- * property is considered non existent in the Map
- * <p/>
- *
- * @author James Strachan
- * @author Matt Hall, John Watkinson, Stephen Colebourne
- * @version $Revision: 1.1 $ $Date: 2005/10/11 17:05:19 $
- * @since Commons Collections 1.0
- */
-@SuppressWarnings("rawtypes")
-public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
-
-    private transient Object bean;
-
-    private transient Map<String, Method> readMethods = new HashMap<String, Method>();
-    private transient Map<String, Method> writeMethods = new HashMap<String, Method>();
-    private transient Map<String, Class<?>> types = new HashMap<String, Class<?>>();
-
-    /**
-     * An empty array.  Used to invoke accessors via reflection.
-     */
-    private static final Object[] NULL_ARGUMENTS = {};
-
-    /**
-     * Maps primitive Class types to transformers.  The transformer
-     * transform strings into the appropriate primitive wrapper.
-     */
-    private static final Map<Class<?>, Function<?,?>> defaultFunctions = new HashMap<Class<?>, Function<?,?>>();
-
-    static {
-        defaultFunctions.put(Boolean.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Boolean.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Character.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Character.valueOf(input.toString().charAt(0));
-            }
-        });
-        defaultFunctions.put(Byte.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Byte.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Short.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Short.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Integer.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Integer.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Long.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Long.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Float.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Float.valueOf(input.toString());
-            }
-        });
-        defaultFunctions.put(Double.TYPE, new Function() {
-            @Override
-            public Object apply(Object input) {
-                return Double.valueOf(input.toString());
-            }
-        });
-    }
-
-
-    // Constructors
-    //-------------------------------------------------------------------------
-
-    /**
-     * Constructs a new empty <code>BeanMap</code>.
-     */
-    public BeanMap() {
-    }
-
-    /**
-     * Constructs a new <code>BeanMap</code> that operates on the
-     * specified bean.  If the given bean is <code>null</code>, then
-     * this map will be empty.
-     *
-     * @param bean the bean for this map to operate on
-     */
-    public BeanMap(Object bean) {
-        this.bean = bean;
-        initialise();
-    }
-
-    // Map interface
-    //-------------------------------------------------------------------------
-
-    @Override
-    public String toString() {
-        return "BeanMap<" + bean + ">";
-    }
-
-    /**
-     * Clone this bean map using the following process:
-     * <p/>
-     * <ul>
-     * <li>If there is no underlying bean, return a cloned BeanMap without a
-     * bean.
-     * <p/>
-     * <li>Since there is an underlying bean, try to instantiate a new bean of
-     * the same type using Class.newInstance().
-     * <p/>
-     * <li>If the instantiation fails, throw a CloneNotSupportedException
-     * <p/>
-     * <li>Clone the bean map and set the newly instantiated bean as the
-     * underlying bean for the bean map.
-     * <p/>
-     * <li>Copy each property that is both readable and writable from the
-     * existing object to a cloned bean map.
-     * <p/>
-     * <li>If anything fails along the way, throw a
-     * CloneNotSupportedException.
-     * <p/>
-     * <ul>
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        BeanMap newMap = (BeanMap) super.clone();
-
-        if (bean == null) {
-            // no bean, just an empty bean map at the moment.  return a newly
-            // cloned and empty bean map.
-            return newMap;
-        }
-
-        Object newBean = null;
-        Class<?> beanClass = null;
-        try {
-            beanClass = bean.getClass();
-            newBean = beanClass.newInstance();
-        } catch (Exception e) {
-            // unable to instantiate
-            throw new CloneNotSupportedException("Unable to instantiate the underlying bean \"" + beanClass.getName() + "\": " + e);
-        }
-
-        try {
-            newMap.setBean(newBean);
-        } catch (Exception exception) {
-            throw new CloneNotSupportedException("Unable to set bean in the cloned bean map: " + exception);
-        }
-
-        try {
-            // copy only properties that are readable and writable.  If its
-            // not readable, we can't get the value from the old map.  If
-            // its not writable, we can't write a value into the new map.
-            Iterator<String> readableKeys = readMethods.keySet().iterator();
-            while (readableKeys.hasNext()) {
-                String key = readableKeys.next();
-                if (getWriteMethod(key) != null) {
-                    newMap.put(key, get(key));
-                }
-            }
-        } catch (Exception exception) {
-            throw new CloneNotSupportedException("Unable to copy bean values to cloned bean map: " + exception);
-        }
-
-        return newMap;
-    }
-
-    /**
-     * Puts all of the writable properties from the given BeanMap into this
-     * BeanMap. Read-only and Write-only properties will be ignored.
-     *
-     * @param map the BeanMap whose properties to put
-     */
-    public void putAllWriteable(BeanMap map) {
-        Iterator<String> readableKeys = map.readMethods.keySet().iterator();
-        while (readableKeys.hasNext()) {
-            String key = readableKeys.next();
-            if (getWriteMethod(key) != null) {
-                this.put(key, map.get(key));
-            }
-        }
-    }
-
-
-    /**
-     * This method reinitializes the bean map to have default values for the
-     * bean's properties.  This is accomplished by constructing a new instance
-     * of the bean which the map uses as its underlying data source.  This
-     * behavior for <code>clear()</code> differs from the Map contract in that
-     * the mappings are not actually removed from the map (the mappings for a
-     * BeanMap are fixed).
-     */
-    @Override
-    public void clear() {
-        if (bean == null) {
-            return;
-        }
-        Class<?> beanClass = null;
-        try {
-            beanClass = bean.getClass();
-            bean = beanClass.newInstance();
-        } catch (Exception e) {
-            throw new UnsupportedOperationException("Could not create new instance of class: " + beanClass);
-        }
-    }
-
-    /**
-     * Returns true if the bean defines a property with the given name.
-     * <p/>
-     * The given name must be a <code>String</code>; if not, this method
-     * returns false. This method will also return false if the bean
-     * does not define a property with that name.
-     * <p/>
-     * Write-only properties will not be matched as the test operates against
-     * property read methods.
-     *
-     * @param name the name of the property to check
-     * @return false if the given name is null or is not a <code>String</code>;
-     *         false if the bean does not define a property with that name; or
-     *         true if the bean does define a property with that name
-     */
-    public boolean containsKey(String name) {
-        Method method = getReadMethod(name);
-        return method != null;
-    }
-
-    /**
-     * Returns the value of the bean's property with the given name.
-     * <p/>
-     * The given name must be a {@link String} and must not be
-     * null; otherwise, this method returns <code>null</code>.
-     * If the bean defines a property with the given name, the value of
-     * that property is returned.  Otherwise, <code>null</code> is
-     * returned.
-     * <p/>
-     * Write-only properties will not be matched as the test operates against
-     * property read methods.
-     *
-     * @param name the name of the property whose value to return
-     * @return the value of the property with that name
-     */
-    public Object get(String name) {
-        if (bean != null) {
-            Method method = getReadMethod(name);
-            if (method != null) {
-                try {
-                    return method.invoke(bean, NULL_ARGUMENTS);
-                } catch (IllegalAccessException e) {
-                } catch (IllegalArgumentException e) {
-                } catch (InvocationTargetException e) {
-                } catch (NullPointerException e) {
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets the bean property with the given name to the given value.
-     *
-     * @param name  the name of the property to set
-     * @param value the value to set that property to
-     * @return the previous value of that property
-     */
-    @Override
-    public Object put(String name, Object value) {
-        if (bean != null) {
-            Object oldValue = get(name);
-            Method method = getWriteMethod(name);
-            if (method == null) {
-                throw new IllegalArgumentException("The bean of type: " + bean.getClass().getName() + " has no property called: " + name);
-            }
-            try {
-                Object[] arguments = createWriteMethodArguments(method, value);
-                method.invoke(bean, arguments);
-
-                Object newValue = get(name);
-                firePropertyChange(name, oldValue, newValue);
-            } catch (InvocationTargetException e) {
-                throw new IllegalArgumentException(e.getMessage());
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e.getMessage());
-            }
-            return oldValue;
-        }
-        return null;
-    }
-
-    /**
-     * Returns the number of properties defined by the bean.
-     *
-     * @return the number of properties defined by the bean
-     */
-    @Override
-    public int size() {
-        return readMethods.size();
-    }
-
-
-    /**
-     * Get the keys for this BeanMap.
-     * <p/>
-     * Write-only properties are <b>not</b> included in the returned set of
-     * property names, although it is possible to set their value and to get
-     * their type.
-     *
-     * @return BeanMap keys.  The Set returned by this method is not
-     *         modifiable.
-     */
-    @Override
-    public Set<String> keySet() {
-        return readMethods.keySet();
-    }
-
-    /**
-     * Gets a Set of MapEntry objects that are the mappings for this BeanMap.
-     * <p/>
-     * Each MapEntry can be set but not removed.
-     *
-     * @return the unmodifiable set of mappings
-     */
-    @Override
-    public Set<Entry<String, Object>> entrySet() {
-        return new AbstractSet<Entry<String, Object>>() {
-            @Override
-            public Iterator<Entry<String, Object>> iterator() {
-                return entryIterator();
-            }
-
-            @Override
-            public int size() {
-                return BeanMap.this.readMethods.size();
-            }
-        };
-    }
-
-    /**
-     * Returns the values for the BeanMap.
-     *
-     * @return values for the BeanMap.  The returned collection is not
-     *         modifiable.
-     */
-    @Override
-    public Collection<Object> values() {
-        List<Object> answer = new ArrayList<Object>(readMethods.size());
-        for (Iterator<Object> iter = valueIterator(); iter.hasNext();) {
-            answer.add(iter.next());
-        }
-        return answer;
-    }
-
-
-    // Helper methods
-    //-------------------------------------------------------------------------
-
-    /**
-     * Returns the type of the property with the given name.
-     *
-     * @param name the name of the property
-     * @return the type of the property, or <code>null</code> if no such
-     *         property exists
-     */
-    public Class<?> getType(String name) {
-        return types.get(name);
-    }
-
-    /**
-     * Convenience method for getting an iterator over the keys.
-     * <p/>
-     * Write-only properties will not be returned in the iterator.
-     *
-     * @return an iterator over the keys
-     */
-    public Iterator<String> keyIterator() {
-        return readMethods.keySet().iterator();
-    }
-
-    /**
-     * Convenience method for getting an iterator over the values.
-     *
-     * @return an iterator over the values
-     */
-    public Iterator<Object> valueIterator() {
-        final Iterator<String> iter = keyIterator();
-        return new Iterator<Object>() {
-            @Override
-            public boolean hasNext() {
-                return iter.hasNext();
-            }
-
-            @Override
-            public Object next() {
-                Object key = iter.next();
-                return get(key);
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException("remove() not supported for BeanMap");
-            }
-        };
-    }
-
-    /**
-     * Convenience method for getting an iterator over the entries.
-     *
-     * @return an iterator over the entries
-     */
-    public Iterator<Entry<String, Object>> entryIterator() {
-        final Iterator<String> iter = keyIterator();
-        return new Iterator<Entry<String, Object>>() {
-            @Override
-            public boolean hasNext() {
-                return iter.hasNext();
-            }
-
-            @Override
-            public Entry<String, Object> next() {
-                String key = iter.next();
-                Object value = get(key);
-                return new MyMapEntry(BeanMap.this, key, value);
-            }
-
-            @Override
-            public void remove() {
-                throw new UnsupportedOperationException("remove() not supported for BeanMap");
-            }
-        };
-    }
-
-
-    // Properties
-    //-------------------------------------------------------------------------
-
-    /**
-     * Returns the bean currently being operated on.  The return value may
-     * be null if this map is empty.
-     *
-     * @return the bean being operated on by this map
-     */
-    public Object getBean() {
-        return bean;
-    }
-
-    /**
-     * Sets the bean to be operated on by this map.  The given value may
-     * be null, in which case this map will be empty.
-     *
-     * @param newBean the new bean to operate on
-     */
-    public void setBean(Object newBean) {
-        bean = newBean;
-        reinitialise();
-    }
-
-    /**
-     * Returns the accessor for the property with the given name.
-     *
-     * @param name the name of the property
-     * @return the accessor method for the property, or null
-     */
-    public Method getReadMethod(String name) {
-        return readMethods.get(name);
-    }
-
-    /**
-     * Returns the mutator for the property with the given name.
-     *
-     * @param name the name of the property
-     * @return the mutator method for the property, or null
-     */
-    public Method getWriteMethod(String name) {
-        return writeMethods.get(name);
-    }
-
-
-    // Implementation methods
-    //-------------------------------------------------------------------------
-
-    /**
-     * Reinitializes this bean.  Called during {@link #setBean(Object)}.
-     * Does introspection to find properties.
-     */
-    protected void reinitialise() {
-        readMethods.clear();
-        writeMethods.clear();
-        types.clear();
-        initialise();
-    }
-
-    private void initialise() {
-        if (getBean() == null) {
-            return;
-        }
-
-        Class<?> beanClass = getBean().getClass();
-        try {
-            //BeanInfo beanInfo = Introspector.getBeanInfo( bean, null );
-            BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
-            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-            if (propertyDescriptors != null) {
-                for (int i = 0; i < propertyDescriptors.length; i++) {
-                    PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
-                    if (propertyDescriptor != null) {
-                        String name = propertyDescriptor.getName();
-                        Method readMethod = propertyDescriptor.getReadMethod();
-                        Method writeMethod = propertyDescriptor.getWriteMethod();
-                        Class<?> aType = propertyDescriptor.getPropertyType();
-
-                        if (readMethod != null) {
-                            readMethods.put(name, readMethod);
-                        }
-                        if (writeMethods != null) {
-                            writeMethods.put(name, writeMethod);
-                        }
-                        types.put(name, aType);
-                    }
-                }
-            }
-        } catch (IntrospectionException e) {
-
-        }
-    }
-
-    /**
-     * Called during a successful {@link #put(Object,Object)} operation.
-     * Default implementation does nothing.  Override to be notified of
-     * property changes in the bean caused by this map.
-     *
-     * @param key      the name of the property that changed
-     * @param oldValue the old value for that property
-     * @param newValue the new value for that property
-     */
-    protected void firePropertyChange(String key, Object oldValue, Object newValue) {
-    }
-
-    // Implementation classes
-    //-------------------------------------------------------------------------
-
-    /**
-     * Map entry used by {@link BeanMap}.
-     */
-    protected static class MyMapEntry implements Map.Entry<String, Object> {
-        private final BeanMap owner;
-
-        private String key;
-
-        private Object value;
-
-        /**
-         * Constructs a new <code>MyMapEntry</code>.
-         *
-         * @param owner the BeanMap this entry belongs to
-         * @param key   the key for this entry
-         * @param value the value for this entry
-         */
-        protected MyMapEntry(BeanMap owner, String key, Object value) {
-            this.key = key;
-            this.value = value;
-            this.owner = owner;
-        }
-
-        /**
-         * Sets the value.
-         *
-         * @param value the new value for the entry
-         * @return the old value for the entry
-         */
-        @Override
-        public Object setValue(Object value) {
-            String key = getKey();
-            Object oldValue = owner.get(key);
-
-            owner.put(key, value);
-            Object newValue = owner.get(key);
-            this.value = newValue;
-            return oldValue;
-        }
-
-        @Override
-        public String getKey() {
-            return key;
-        }
-
-        @Override
-        public Object getValue() {
-            return value;
-        }
-    }
-
-    /**
-     * Creates an array of parameters to pass to the given mutator method.
-     * If the given object is not the right type to pass to the method
-     * directly, it will be converted using {@link #convertType(Class,Object)}.
-     *
-     * @param method the mutator method
-     * @param value  the value to pass to the mutator method
-     * @return an array containing one object that is either the given value
-     *         or a transformed value
-     * @throws IllegalAccessException   if {@link #convertType(Class,Object)}
-     *                                  raises it
-     * @throws IllegalArgumentException if any other exception is raised
-     *                                  by {@link #convertType(Class,Object)}
-     */
-    protected Object[] createWriteMethodArguments(Method method, Object value) throws IllegalAccessException {
-        try {
-            if (value != null) {
-                Class<?>[] types = method.getParameterTypes();
-                if (types != null && types.length > 0) {
-                    Class<?> paramType = types[0];
-                    if (paramType.isPrimitive()) {
-                        paramType = Primitives.wrap(paramType);
-                    }
-                    if (!paramType.isAssignableFrom(value.getClass())) {
-                        value = convertType(paramType, value);
-                    }
-                }
-            }
-            return new Object[]{value};
-        } catch (InvocationTargetException e) {
-            throw new IllegalArgumentException(e.getMessage());
-        } catch (InstantiationException e) {
-            throw new IllegalArgumentException(e.getMessage());
-        }
-    }
-
-    /**
-     * Converts the given value to the given type.  First, reflection is
-     * is used to find a public constructor declared by the given class
-     * that takes one argument, which must be the precise type of the
-     * given value.  If such a constructor is found, a new object is
-     * created by passing the given value to that constructor, and the
-     * newly constructed object is returned.<P>
-     * <p/>
-     * If no such constructor exists, and the given type is a primitive
-     * type, then the given value is converted to a string using its
-     * {@link Object#toString() toString()} method, and that string is
-     * parsed into the correct primitive type using, for instance,
-     * {@link Integer#valueOf(String)} to convert the string into an
-     * <code>int</code>.<P>
-     * <p/>
-     * If no special constructor exists and the given type is not a
-     * primitive type, this method returns the original value.
-     *
-     * @param newType the type to convert the value to
-     * @param value   the value to convert
-     * @return the converted value
-     * @throws NumberFormatException     if newType is a primitive type, and
-     *                                   the string representation of the given value cannot be converted
-     *                                   to that type
-     * @throws InstantiationException    if the constructor found with
-     *                                   reflection raises it
-     * @throws InvocationTargetException if the constructor found with
-     *                                   reflection raises it
-     * @throws IllegalAccessException    never
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    protected Object convertType(Class<?> newType, Object value) throws InstantiationException, IllegalAccessException, InvocationTargetException {
-        // try call constructor
-        Class<?>[] types = {value.getClass()};
-        try {
-            Constructor<?> constructor = newType.getConstructor(types);
-            Object[] arguments = {value};
-            return constructor.newInstance(arguments);
-        } catch (NoSuchMethodException e) {
-            // try using the transformers
-            Function function = getTypeFunction(newType);
-            if (function != null) {
-                return function.apply(value);
-            }
-            return value;
-        }
-    }
-
-    /**
-     * Returns a transformer for the given primitive type.
-     *
-     * @param aType the primitive type whose transformer to return
-     * @return a transformer that will convert strings into that type,
-     *         or null if the given type is not a primitive type
-     */
-    protected Function<?,?> getTypeFunction(Class<?> aType) {
-        return defaultFunctions.get(aType);
-    }
-
-}
+/*
+ *  Copyright 2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * An implementation of Map for JavaBeans which uses introspection to
+ * get and put properties in the bean.
+ * <p>
+ * If an exception occurs during attempts to get or set a property then the
+ * property is considered non existent in the Map
+ * <p>
+ *
+ * @author James Strachan
+ * @author Matt Hall, John Watkinson, Stephen Colebourne
+ * @version $Revision: 1.1 $ $Date: 2005/10/11 17:05:19 $
+ * @since Commons Collections 1.0
+ */
+@SuppressWarnings("rawtypes")
+public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
+
+    private transient Object bean;
+
+    private transient Map<String, Method> readMethods = new HashMap<String, Method>();
+    private transient Map<String, Method> writeMethods = new HashMap<String, Method>();
+    private transient Map<String, Class<?>> types = new HashMap<String, Class<?>>();
+
+    /**
+     * An empty array.  Used to invoke accessors via reflection.
+     */
+    private static final Object[] NULL_ARGUMENTS = {};
+
+    /**
+     * Maps primitive Class types to transformers.  The transformer
+     * transform strings into the appropriate primitive wrapper.
+     */
+    private static final Map<Class<?>, Function<?,?>> defaultFunctions = new HashMap<Class<?>, Function<?,?>>();
+
+    static {
+        defaultFunctions.put(Boolean.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Boolean.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Character.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return input.toString().charAt(0);
+            }
+        });
+        defaultFunctions.put(Byte.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Byte.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Short.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Short.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Integer.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Integer.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Long.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Long.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Float.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Float.valueOf(input.toString());
+            }
+        });
+        defaultFunctions.put(Double.TYPE, new Function() {
+            @Override
+            public Object apply(Object input) {
+                return Double.valueOf(input.toString());
+            }
+        });
+    }
+
+
+    // Constructors
+    //-------------------------------------------------------------------------
+
+    /**
+     * Constructs a new empty {@code BeanMap}.
+     */
+    public BeanMap() {
+    }
+
+    /**
+     * Constructs a new {@code BeanMap} that operates on the
+     * specified bean.  If the given bean is {@code null}, then
+     * this map will be empty.
+     *
+     * @param bean the bean for this map to operate on
+     */
+    public BeanMap(Object bean) {
+        this.bean = bean;
+        initialise();
+    }
+
+    // Map interface
+    //-------------------------------------------------------------------------
+
+    @Override
+    public String toString() {
+        return "BeanMap<" + bean + ">";
+    }
+
+    /**
+     * Clone this bean map using the following process:
+     * <p>
+     * <ul>
+     * <li>If there is no underlying bean, return a cloned BeanMap without a
+     * bean.
+     * <p>
+     * <li>Since there is an underlying bean, try to instantiate a new bean of
+     * the same type using Class.newInstance().
+     * <p>
+     * <li>If the instantiation fails, throw a CloneNotSupportedException
+     * <p>
+     * <li>Clone the bean map and set the newly instantiated bean as the
+     * underlying bean for the bean map.
+     * <p>
+     * <li>Copy each property that is both readable and writable from the
+     * existing object to a cloned bean map.
+     * <p>
+     * <li>If anything fails along the way, throw a
+     * CloneNotSupportedException.
+     * <p>
+     * </ul>
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        BeanMap newMap = (BeanMap) super.clone();
+
+        if (bean == null) {
+            // no bean, just an empty bean map at the moment.  return a newly
+            // cloned and empty bean map.
+            return newMap;
+        }
+
+        Object newBean = null;
+        Class<?> beanClass = null;
+        try {
+            beanClass = bean.getClass();
+            newBean = beanClass.newInstance();
+        } catch (Exception e) {
+            // unable to instantiate
+            throw new CloneNotSupportedException("Unable to instantiate the underlying bean \"" + beanClass.getName() + "\": " + e);
+        }
+
+        try {
+            newMap.setBean(newBean);
+        } catch (Exception exception) {
+            throw new CloneNotSupportedException("Unable to set bean in the cloned bean map: " + exception);
+        }
+
+        try {
+            // copy only properties that are readable and writable.  If its
+            // not readable, we can't get the value from the old map.  If
+            // its not writable, we can't write a value into the new map.
+            for (String key : readMethods.keySet()) {
+                if (getWriteMethod(key) != null) {
+                    newMap.put(key, get(key));
+                }
+            }
+        } catch (Exception exception) {
+            throw new CloneNotSupportedException("Unable to copy bean values to cloned bean map: " + exception);
+        }
+
+        return newMap;
+    }
+
+    /**
+     * Puts all of the writable properties from the given BeanMap into this
+     * BeanMap. Read-only and Write-only properties will be ignored.
+     *
+     * @param map the BeanMap whose properties to put
+     */
+    public void putAllWriteable(BeanMap map) {
+        for (String key : map.readMethods.keySet()) {
+            if (getWriteMethod(key) != null) {
+                this.put(key, map.get(key));
+            }
+        }
+    }
+
+
+    /**
+     * This method reinitializes the bean map to have default values for the
+     * bean's properties.  This is accomplished by constructing a new instance
+     * of the bean which the map uses as its underlying data source.  This
+     * behavior for {@code Map#clear()} differs from the Map contract in that
+     * the mappings are not actually removed from the map (the mappings for a
+     * BeanMap are fixed).
+     */
+    @Override
+    public void clear() {
+        if (bean == null) {
+            return;
+        }
+        Class<?> beanClass = null;
+        try {
+            beanClass = bean.getClass();
+            bean = beanClass.newInstance();
+        } catch (Exception e) {
+            throw new UnsupportedOperationException("Could not create new instance of class: " + beanClass);
+        }
+    }
+
+    /**
+     * Returns true if the bean defines a property with the given name.
+     * <p>
+     * The given name must be a {@code String}; if not, this method
+     * returns false. This method will also return false if the bean
+     * does not define a property with that name.
+     * <p>
+     * Write-only properties will not be matched as the test operates against
+     * property read methods.
+     *
+     * @param name the name of the property to check
+     * @return false if the given name is null or is not a {@code String};
+     *         false if the bean does not define a property with that name; or
+     *         true if the bean does define a property with that name
+     */
+    public boolean containsKey(String name) {
+        Method method = getReadMethod(name);
+        return method != null;
+    }
+
+    /**
+     * Returns the value of the bean's property with the given name.
+     * <p>
+     * The given name must be a {@code String} and must not be
+     * null; otherwise, this method returns {@code null}.
+     * If the bean defines a property with the given name, the value of
+     * that property is returned. Otherwise, {@code null} is
+     * returned.
+     * <p>
+     * Write-only properties will not be matched as the test operates against
+     * property read methods.
+     *
+     * @param name the name of the property whose value to return
+     * @return the value of the property with that name
+     */
+    public Object get(String name) {
+        if (bean != null) {
+            Method method = getReadMethod(name);
+            if (method != null) {
+                try {
+                    return method.invoke(bean, NULL_ARGUMENTS);
+                } catch (IllegalAccessException | NullPointerException | InvocationTargetException | IllegalArgumentException e) {
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Sets the bean property with the given name to the given value.
+     *
+     * @param name  the name of the property to set
+     * @param value the value to set that property to
+     * @return the previous value of that property
+     */
+    @Override
+    public Object put(String name, Object value) {
+        if (bean != null) {
+            Object oldValue = get(name);
+            Method method = getWriteMethod(name);
+            if (method == null) {
+                throw new IllegalArgumentException("The bean of type: " + bean.getClass().getName() + " has no property called: " + name);
+            }
+            try {
+                Object[] arguments = createWriteMethodArguments(method, value);
+                method.invoke(bean, arguments);
+
+                Object newValue = get(name);
+                firePropertyChange(name, oldValue, newValue);
+            } catch (InvocationTargetException | IllegalAccessException e) {
+                throw new IllegalArgumentException(e.getMessage());
+            }
+            return oldValue;
+        }
+        return null;
+    }
+
+    /**
+     * Returns the number of properties defined by the bean.
+     *
+     * @return the number of properties defined by the bean
+     */
+    @Override
+    public int size() {
+        return readMethods.size();
+    }
+
+
+    /**
+     * Get the keys for this BeanMap.
+     * <p>
+     * Write-only properties are <b>not</b> included in the returned set of
+     * property names, although it is possible to set their value and to get
+     * their type.
+     *
+     * @return BeanMap keys.  The Set returned by this method is not
+     *         modifiable.
+     */
+    @Override
+    public Set<String> keySet() {
+        return readMethods.keySet();
+    }
+
+    /**
+     * Gets a Set of MapEntry objects that are the mappings for this BeanMap.
+     * <p>
+     * Each MapEntry can be set but not removed.
+     *
+     * @return the unmodifiable set of mappings
+     */
+    @Override
+    public Set<Entry<String, Object>> entrySet() {
+        return new AbstractSet<Entry<String, Object>>() {
+            @Override
+            public Iterator<Entry<String, Object>> iterator() {
+                return entryIterator();
+            }
+
+            @Override
+            public int size() {
+                return BeanMap.this.readMethods.size();
+            }
+        };
+    }
+
+    /**
+     * Returns the values for the BeanMap.
+     *
+     * @return values for the BeanMap.  The returned collection is not
+     *         modifiable.
+     */
+    @Override
+    public Collection<Object> values() {
+        List<Object> answer = new ArrayList<Object>(readMethods.size());
+        for (Iterator<Object> iter = valueIterator(); iter.hasNext();) {
+            answer.add(iter.next());
+        }
+        return answer;
+    }
+
+
+    // Helper methods
+    //-------------------------------------------------------------------------
+
+    /**
+     * Returns the type of the property with the given name.
+     *
+     * @param name the name of the property
+     * @return the type of the property, or {@code null} if no such
+     *         property exists
+     */
+    public Class<?> getType(String name) {
+        return types.get(name);
+    }
+
+    /**
+     * Convenience method for getting an iterator over the keys.
+     * <p>
+     * Write-only properties will not be returned in the iterator.
+     *
+     * @return an iterator over the keys
+     */
+    public Iterator<String> keyIterator() {
+        return readMethods.keySet().iterator();
+    }
+
+    /**
+     * Convenience method for getting an iterator over the values.
+     *
+     * @return an iterator over the values
+     */
+    public Iterator<Object> valueIterator() {
+        final Iterator<String> iter = keyIterator();
+        return new Iterator<Object>() {
+            @Override
+            public boolean hasNext() {
+                return iter.hasNext();
+            }
+
+            @Override
+            public Object next() {
+                Object key = iter.next();
+                return get(key);
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException("remove() not supported for BeanMap");
+            }
+        };
+    }
+
+    /**
+     * Convenience method for getting an iterator over the entries.
+     *
+     * @return an iterator over the entries
+     */
+    public Iterator<Entry<String, Object>> entryIterator() {
+        final Iterator<String> iter = keyIterator();
+        return new Iterator<Entry<String, Object>>() {
+            @Override
+            public boolean hasNext() {
+                return iter.hasNext();
+            }
+
+            @Override
+            public Entry<String, Object> next() {
+                String key = iter.next();
+                Object value = get(key);
+                return new MyMapEntry(BeanMap.this, key, value);
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException("remove() not supported for BeanMap");
+            }
+        };
+    }
+
+
+    // Properties
+    //-------------------------------------------------------------------------
+
+    /**
+     * Returns the bean currently being operated on.  The return value may
+     * be null if this map is empty.
+     *
+     * @return the bean being operated on by this map
+     */
+    public Object getBean() {
+        return bean;
+    }
+
+    /**
+     * Sets the bean to be operated on by this map.  The given value may
+     * be null, in which case this map will be empty.
+     *
+     * @param newBean the new bean to operate on
+     */
+    public void setBean(Object newBean) {
+        bean = newBean;
+        reinitialise();
+    }
+
+    /**
+     * Returns the accessor for the property with the given name.
+     *
+     * @param name the name of the property
+     * @return the accessor method for the property, or null
+     */
+    public Method getReadMethod(String name) {
+        return readMethods.get(name);
+    }
+
+    /**
+     * Returns the mutator for the property with the given name.
+     *
+     * @param name the name of the property
+     * @return the mutator method for the property, or null
+     */
+    public Method getWriteMethod(String name) {
+        return writeMethods.get(name);
+    }
+
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+
+    /**
+     * Reinitializes this bean.  Called during {@link #setBean(Object)}.
+     * Does introspection to find properties.
+     */
+    protected void reinitialise() {
+        readMethods.clear();
+        writeMethods.clear();
+        types.clear();
+        initialise();
+    }
+
+    private void initialise() {
+        if (getBean() == null) {
+            return;
+        }
+
+        Class<?> beanClass = getBean().getClass();
+        try {
+            //BeanInfo beanInfo = Introspector.getBeanInfo( bean, null );
+            BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
+            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+            if (propertyDescriptors != null) {
+                for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+                    if (propertyDescriptor != null) {
+                        String name = propertyDescriptor.getName();
+                        Method readMethod = propertyDescriptor.getReadMethod();
+                        Method writeMethod = propertyDescriptor.getWriteMethod();
+                        Class<?> aType = propertyDescriptor.getPropertyType();
+
+                        if (readMethod != null) {
+                            readMethods.put(name, readMethod);
+                        }
+                        if (writeMethods != null) {
+                            writeMethods.put(name, writeMethod);
+                        }
+                        types.put(name, aType);
+                    }
+                }
+            }
+        } catch (IntrospectionException e) {
+
+        }
+    }
+
+    /**
+     * Called during a successful {@link #put(Object,Object)} operation.
+     * Default implementation does nothing.  Override to be notified of
+     * property changes in the bean caused by this map.
+     *
+     * @param key      the name of the property that changed
+     * @param oldValue the old value for that property
+     * @param newValue the new value for that property
+     */
+    protected void firePropertyChange(String key, Object oldValue, Object newValue) {
+    }
+
+    // Implementation classes
+    //-------------------------------------------------------------------------
+
+    /**
+     * Map entry used by {@link BeanMap}.
+     */
+    protected static class MyMapEntry implements Map.Entry<String, Object> {
+        private final BeanMap owner;
+
+        private String key;
+
+        private Object value;
+
+        /**
+         * Constructs a new <code>MyMapEntry</code>.
+         *
+         * @param owner the BeanMap this entry belongs to
+         * @param key   the key for this entry
+         * @param value the value for this entry
+         */
+        protected MyMapEntry(BeanMap owner, String key, Object value) {
+            this.key = key;
+            this.value = value;
+            this.owner = owner;
+        }
+
+        /**
+         * Sets the value.
+         *
+         * @param value the new value for the entry
+         * @return the old value for the entry
+         */
+        @Override
+        public Object setValue(Object value) {
+            String key = getKey();
+            Object oldValue = owner.get(key);
+
+            owner.put(key, value);
+            Object newValue = owner.get(key);
+            this.value = newValue;
+            return oldValue;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+
+        @Override
+        public Object getValue() {
+            return value;
+        }
+    }
+
+    /**
+     * Creates an array of parameters to pass to the given mutator method.
+     * If the given object is not the right type to pass to the method
+     * directly, it will be converted using {@link #convertType(Class,Object)}.
+     *
+     * @param method the mutator method
+     * @param value  the value to pass to the mutator method
+     * @return an array containing one object that is either the given value
+     *         or a transformed value
+     * @throws IllegalAccessException   if {@link #convertType(Class,Object)}
+     *                                  raises it
+     * @throws IllegalArgumentException if any other exception is raised
+     *                                  by {@link #convertType(Class,Object)}
+     */
+    protected Object[] createWriteMethodArguments(Method method, Object value) throws IllegalAccessException {
+        try {
+            if (value != null) {
+                Class<?>[] types = method.getParameterTypes();
+                if (types != null && types.length > 0) {
+                    Class<?> paramType = types[0];
+                    if (paramType.isPrimitive()) {
+                        paramType = PrimitiveUtils.wrap(paramType);
+                    }
+                    if (!paramType.isAssignableFrom(value.getClass())) {
+                        value = convertType(paramType, value);
+                    }
+                }
+            }
+            return new Object[]{value};
+        } catch (InvocationTargetException | InstantiationException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+
+    /**
+     * Converts the given value to the given type.  First, reflection is
+     * is used to find a public constructor declared by the given class
+     * that takes one argument, which must be the precise type of the
+     * given value.  If such a constructor is found, a new object is
+     * created by passing the given value to that constructor, and the
+     * newly constructed object is returned.<P>
+     * <p>
+     * If no such constructor exists, and the given type is a primitive
+     * type, then the given value is converted to a string using its
+     * {@link Object#toString() toString()} method, and that string is
+     * parsed into the correct primitive type using, for instance,
+     * {@link Integer#valueOf(String)} to convert the string into an
+     * {@code int}.<P>
+     * <p>
+     * If no special constructor exists and the given type is not a
+     * primitive type, this method returns the original value.
+     *
+     * @param newType the type to convert the value to
+     * @param value   the value to convert
+     * @return the converted value
+     * @throws NumberFormatException     if newType is a primitive type, and
+     *                                   the string representation of the given value cannot be converted
+     *                                   to that type
+     * @throws InstantiationException    if the constructor found with
+     *                                   reflection raises it
+     * @throws InvocationTargetException if the constructor found with
+     *                                   reflection raises it
+     * @throws IllegalAccessException    never
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected Object convertType(Class<?> newType, Object value) throws InstantiationException, IllegalAccessException, InvocationTargetException {
+        // try call constructor
+        Class<?>[] types = {value.getClass()};
+        try {
+            Constructor<?> constructor = newType.getConstructor(types);
+            Object[] arguments = {value};
+            return constructor.newInstance(arguments);
+        } catch (NoSuchMethodException e) {
+            // try using the transformers
+            Function function = getTypeFunction(newType);
+            if (function != null) {
+                return function.apply(value);
+            }
+            return value;
+        }
+    }
+
+    /**
+     * Returns a transformer for the given primitive type.
+     *
+     * @param aType the primitive type whose transformer to return
+     * @return a transformer that will convert strings into that type,
+     *         or null if the given type is not a primitive type
+     */
+    protected Function<?,?> getTypeFunction(Class<?> aType) {
+        return defaultFunctions.get(aType);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/BeanUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/BeanUtils.java
new file mode 100644
index 0000000000..b348285d3a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/BeanUtils.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.beans.Introspector;
+import java.lang.reflect.Method;
+
+/**
+ * BeanUtils provides JavaBean compliant property de/capitalization functionality
+ *
+ * @author tiwe
+ *
+ */
+public final class BeanUtils {
+
+    public static String capitalize(String name) {
+        if (name.length() > 1 && Character.isUpperCase(name.charAt(1))) {
+            return name;
+        } else if (name.length() > 1) {
+            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+        } else {
+            return name.toUpperCase();
+        }
+    }
+
+    public static String uncapitalize(String name) {
+        return Introspector.decapitalize(name);
+    }
+
+    public static boolean isAccessorPresent(String prefix, String property, Class<?> bean) {
+        try {
+            bean.getMethod(prefix + capitalize(property));
+            return true;
+        } catch (NoSuchMethodException ex) {
+            return false;
+        }
+    }
+
+    public static Method getAccessor(String prefix, String property, Class<?> bean) {
+        try {
+            return bean.getMethod(prefix + capitalize(property));
+        } catch (NoSuchMethodException e) {
+            return null;
+        }
+    }
+
+    private BeanUtils() { }
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/CollectionUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/CollectionUtils.java
new file mode 100644
index 0000000000..415b5c3a33
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/CollectionUtils.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * CollectionUtils provides addition operations for Collection types that provide an immutable type
+ * for single item collections and after that mutable instances
+ *
+ * @author tiwe
+ *
+ */
+public final class CollectionUtils {
+
+    private static final Set<Class<?>> UNMODIFIABLE_TYPES;
+
+    static {
+        Set<Class<?>> unmodifiableTypes = new HashSet<>();
+        unmodifiableTypes.add(Collections.emptyList().getClass());
+        unmodifiableTypes.add(Collections.emptySet().getClass());
+        unmodifiableTypes.add(Collections.emptyNavigableSet().getClass());
+        unmodifiableTypes.add(Collections.emptySortedSet().getClass());
+        unmodifiableTypes.add(Collections.emptyMap().getClass());
+        unmodifiableTypes.add(Collections.emptySortedMap().getClass());
+        unmodifiableTypes.add(Collections.emptyNavigableMap().getClass());
+        unmodifiableTypes.add(Collections.singleton(1).getClass());
+        unmodifiableTypes.add(Collections.singletonList(1).getClass());
+        unmodifiableTypes.add(Collections.singletonMap(1, 1).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableList(Collections.emptyList()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableCollection(Collections.emptyList()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableSet(Collections.emptySet()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableNavigableSet(Collections.emptyNavigableSet()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableSortedSet(Collections.emptySortedSet()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableMap(Collections.emptyMap()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableSortedMap(Collections.emptySortedMap()).getClass());
+        unmodifiableTypes.add(Collections.unmodifiableNavigableMap(Collections.emptyNavigableMap()).getClass());
+
+        try {
+            unmodifiableTypes.add(Class.forName("com.google.common.collect.ImmutableSet"));
+            unmodifiableTypes.add(Class.forName("com.google.common.collect.ImmutableList"));
+            unmodifiableTypes.add(Class.forName("com.google.common.collect.ImmutableMap"));
+        } catch (ClassNotFoundException e) {
+            // Nothing happens
+        }
+
+        try {
+            unmodifiableTypes.add(Class.forName("java.util.ImmutableCollections$AbstractImmutableCollection"));
+            unmodifiableTypes.add(Class.forName("java.util.ImmutableCollections$AbstractImmutableMap"));
+        } catch (ClassNotFoundException e) {
+            // Nothing happens
+        }
+
+        UNMODIFIABLE_TYPES = Collections.unmodifiableSet(unmodifiableTypes);
+    }
+
+    /**
+     * Returns true if the type is a known unmodifiable type.
+     *
+     * @param clazz the type
+     * @return true if the type is a known unmodifiable type
+     */
+    public static boolean isUnmodifiableType(Class<?> clazz) {
+        for (; clazz != null; clazz = clazz.getSuperclass()) {
+            if (UNMODIFIABLE_TYPES.contains(clazz)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return an unmodifiable copy of a list, or the same list if its already an unmodifiable type.
+     *
+     * @param list the list
+     * @param <T> element type
+     * @return unmodifiable copy of a list, or the same list if its already an unmodifiable type
+     */
+    public static <T> List<T> unmodifiableList(List<T> list) {
+        if (isUnmodifiableType(list.getClass())) {
+            return list;
+        }
+        switch (list.size()) {
+            case 0:
+                return Collections.emptyList();
+            case 1:
+                return Collections.singletonList(list.get(0));
+            default:
+                return Collections.unmodifiableList(new ArrayList<>(list));
+        }
+    }
+
+    /**
+     * Return an unmodifiable copy of a set, or the same set if its already an unmodifiable type.
+     *
+     * @param set the set
+     * @param <T> element type
+     * @return unmodifiable copy of a set, or the same set if its already an unmodifiable type
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Set<T> unmodifiableSet(Set<T> set) {
+        if (isUnmodifiableType(set.getClass())) {
+            return set;
+        }
+        switch (set.size()) {
+            case 0:
+                return Collections.emptySet();
+            case 1:
+                return Collections.singleton(set.iterator().next());
+            default:
+                return Collections.unmodifiableSet((Set<T>) (
+                        set instanceof LinkedHashSet ? ((LinkedHashSet<T>) set).clone() :
+                        set instanceof TreeSet ? ((TreeSet<T>) set).clone() :
+                        set instanceof HashSet ? ((HashSet<T>) set).clone() :
+                        new LinkedHashSet<>(set)));
+        }
+    }
+
+    public static <T> List<List<T>> partition(List<T> list, int batchSize) {
+        return IntStream.range(0, list.size() / batchSize + 1)
+                .mapToObj(i -> list.subList(i * batchSize,
+                        Math.min(i * batchSize + batchSize, list.size())))
+                .filter(s -> !s.isEmpty()).collect(Collectors.toList());
+    }
+
+    public static <T> List<T> add(List<T> list, T element) {
+        final int size = list.size();
+        if (size == 0) {
+            return Collections.singletonList(element);
+        } else if (isUnmodifiableType(list.getClass())) {
+            if (size == 1) {
+                final T val = list.get(0);
+                list = new ArrayList<>();
+                list.add(val);
+            } else {
+                list = new ArrayList<>(list);
+            }
+        }
+        list.add(element);
+        return list;
+    }
+
+    public static <T> List<T> copyOf(List<T> list) {
+        if (isUnmodifiableType(list.getClass())) {
+            return list;
+        } else {
+            return new ArrayList<>(list);
+        }
+    }
+
+    public static <T> Set<T> add(Set<T> set, T element) {
+        final int size = set.size();
+        if (size == 0) {
+            return Collections.singleton(element);
+        } else if (isUnmodifiableType(set.getClass())) {
+            if (size == 1) {
+                final T val = set.iterator().next();
+                set = new HashSet<>();
+                set.add(val);
+            } else {
+                set = new HashSet<>(set);
+            }
+        }
+        set.add(element);
+        return set;
+    }
+
+    public static <T> Set<T> copyOf(Set<T> set) {
+        if (isUnmodifiableType(set.getClass())) {
+            return set;
+        } else {
+            return new HashSet<>(set);
+        }
+    }
+
+    public static <T> Set<T> addSorted(Set<T> set, T element) {
+        final int size = set.size();
+        if (size == 0) {
+            return Collections.singleton(element);
+        } else if (isUnmodifiableType(set.getClass())) {
+            if (size == 1) {
+                final T val = set.iterator().next();
+                set = new LinkedHashSet<>();
+                set.add(val);
+            } else {
+                set = new LinkedHashSet<>(set);
+            }
+        }
+        set.add(element);
+        return set;
+    }
+
+    public static <T> Set<T> removeSorted(Set<T> set, T element) {
+        final int size = set.size();
+        if (size == 0 || (size == 1 && set.contains(element))) {
+            return Collections.emptySet();
+        } else {
+            set.remove(element);
+        }
+        return set;
+    }
+
+    public static <T> Set<T> copyOfSorted(Set<T> set) {
+        if (isUnmodifiableType(set.getClass())) {
+            return set;
+        } else {
+            return new LinkedHashSet<>(set);
+        }
+    }
+
+    public static <K,V> Map<K,V> put(Map<K,V> map, K key, V value) {
+        final int size = map.size();
+        if (size == 0) {
+            return Collections.singletonMap(key, value);
+        } else if (isUnmodifiableType(map.getClass())) {
+            map = new HashMap<>(map);
+        }
+        map.put(key, value);
+        return map;
+    }
+
+    public static <K,V> Map<K,V> copyOf(Map<K,V> map) {
+        if (isUnmodifiableType(map.getClass())) {
+            return map;
+        } else {
+            return new HashMap<>(map);
+        }
+    }
+
+    private CollectionUtils() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/ConstructorUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/ConstructorUtils.java
new file mode 100644
index 0000000000..11a66b490d
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/ConstructorUtils.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import com.querydsl.core.types.ExpressionException;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+import static com.querydsl.core.util.ArrayUtils.isEmpty;
+
+/**
+ * ConstructorUtils provides constructor resolving functionality
+ *
+ * @author Shredder121
+ */
+public final class ConstructorUtils {
+
+    private ConstructorUtils() { }
+
+    /**
+     * The parameter list for the default constructor;
+     */
+    private static final Class<?>[] NO_ARGS = {};
+
+    private static final Map<Class<?>, Object> defaultPrimitives = new HashMap<>();
+
+    static {
+        defaultPrimitives.put(Boolean.TYPE, false);
+        defaultPrimitives.put(Byte.TYPE, (byte) 0);
+        defaultPrimitives.put(Character.TYPE, (char) 0);
+        defaultPrimitives.put(Short.TYPE, (short) 0);
+        defaultPrimitives.put(Integer.TYPE, 0);
+        defaultPrimitives.put(Long.TYPE, 0L);
+        defaultPrimitives.put(Float.TYPE, 0.0F);
+        defaultPrimitives.put(Double.TYPE, 0.0);
+    }
+
+    /**
+     * Returns the constructor where the formal parameter list matches the
+     * givenTypes argument.
+     *
+     * It is advisable to first call
+     * {@link #getConstructorParameters(java.lang.Class, java.lang.Class[])}
+     * to get the parameters.
+     *
+     * @param type type
+     * @param givenTypes parameter types
+     * @return matching constructor
+     * @throws NoSuchMethodException
+     */
+    public static <C> Constructor<C> getConstructor(Class<C> type, Class<?>[] givenTypes) throws NoSuchMethodException {
+        return type.getConstructor(givenTypes);
+    }
+
+    /**
+     * Returns the parameters for the constructor that matches the given types.
+     *
+     * @param type type
+     * @param givenTypes parameter types
+     * @return constructor parameters
+     */
+    public static Class<?>[] getConstructorParameters(Class<?> type, Class<?>[] givenTypes) {
+        next_constructor:
+        for (Constructor<?> constructor : type.getConstructors()) {
+            int matches = 0;
+            Class<?>[] parameters = constructor.getParameterTypes();
+            Iterator<Class<?>> parameterIterator = Arrays
+                    .asList(parameters)
+                    .iterator();
+            if (!isEmpty(givenTypes)
+                    && !isEmpty(parameters)) {
+                Class<?> parameter = null;
+                for (Class<?> argument : givenTypes) {
+
+                    if (parameterIterator.hasNext()) {
+                        parameter = parameterIterator.next();
+                        if (!compatible(parameter, argument)) {
+                            continue next_constructor;
+                        }
+                        matches++;
+                    } else if (constructor.isVarArgs()) {
+                        if (!compatible(parameter, argument)) {
+                            continue next_constructor;
+                        }
+                    } else {
+                        continue next_constructor; //default
+                    }
+                }
+                if (matches == parameters.length) {
+                    return parameters;
+                }
+            } else if (isEmpty(givenTypes)
+                    && isEmpty(parameters)) {
+                return NO_ARGS;
+            }
+        }
+        throw new ExpressionException("No constructor found for " + type.toString()
+                + " with parameters: " + Arrays.deepToString(givenTypes));
+    }
+
+    /**
+     * Returns a fetch of transformers applicable to the given constructor.
+     *
+     * @param constructor constructor
+     * @return transformers
+     */
+    public static Iterable<Function<Object[], Object[]>> getTransformers(Constructor<?> constructor) {
+        return Stream.of(
+                new PrimitiveAwareVarArgsTransformer(constructor),
+                new PrimitiveTransformer(constructor),
+                new VarArgsTransformer(constructor))
+                .filter(ArgumentTransformer::isApplicable)
+                .collect(Collectors.toList());
+    }
+
+    private static Class<?> normalize(Class<?> clazz) {
+        if (clazz.isArray()) {
+            clazz = clazz.getComponentType();
+        }
+        return PrimitiveUtils.wrap(clazz);
+    }
+
+    private static boolean compatible(Class<?> parameter, Class<?> argument) {
+        return normalize(parameter)
+                .isAssignableFrom(normalize(argument));
+    }
+
+    protected abstract static class ArgumentTransformer implements Function<Object[], Object[]> {
+
+        @Nullable
+        protected Constructor<?> constructor;
+        protected final Class<?>[] paramTypes;
+
+        public ArgumentTransformer(Constructor<?> constructor) {
+            this(constructor.getParameterTypes());
+            this.constructor = constructor;
+        }
+
+        public ArgumentTransformer(Class<?>[] paramTypes) {
+            this.paramTypes = paramTypes;
+        }
+
+        public abstract boolean isApplicable();
+    }
+
+    private static class VarArgsTransformer extends ArgumentTransformer {
+
+        protected final Class<?> componentType;
+
+        VarArgsTransformer(Constructor<?> constructor) {
+            super(constructor);
+
+            if (paramTypes.length > 0) {
+                componentType = paramTypes[paramTypes.length - 1].getComponentType();
+            } else {
+                componentType = null;
+            }
+        }
+
+        @Override
+        public boolean isApplicable() {
+            return constructor != null && constructor.isVarArgs();
+        }
+
+        @Override
+        public Object[] apply(Object[] args) {
+            if (isEmpty(args)) {
+                return args;
+            }
+            int current = 0;
+
+            // constructor args
+            Object[] cargs = new Object[paramTypes.length];
+            for (int i = 0; i < cargs.length - 1; i++) {
+                set(cargs, i, args[current++]);
+            }
+            // array with vargs
+            int size = args.length - cargs.length + 1;
+            Object vargs = Array.newInstance(
+                    componentType, size);
+            cargs[cargs.length - 1] = vargs;
+            for (int i = 0; i < Array.getLength(vargs); i++) {
+                set(vargs, i, args[current++]);
+            }
+            return cargs;
+        }
+
+        private void set(Object array, int index, Object value) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+            Array.set(array, index, value);
+        }
+
+    }
+
+    private static class PrimitiveTransformer extends ArgumentTransformer {
+
+        private final Set<Integer> primitiveLocations;
+
+        PrimitiveTransformer(Constructor<?> constructor) {
+            super(constructor);
+            Set<Integer> builder = new TreeSet<>();
+            Class<?>[] parameterTypes = constructor.getParameterTypes();
+            for (int location = 0; location < parameterTypes.length; location++) {
+                Class<?> parameterType = parameterTypes[location];
+
+                if (parameterType.isPrimitive()) {
+                    builder.add(location);
+                }
+            }
+            primitiveLocations = Collections.unmodifiableSet(builder);
+        }
+
+        @Override
+        public boolean isApplicable() {
+            return !primitiveLocations.isEmpty();
+        }
+
+        @Override
+        public Object[] apply(Object[] args) {
+            if (isEmpty(args)) {
+                return args;
+            }
+            for (Integer location : primitiveLocations) {
+                if (args[location] == null) {
+                    Class<?> primitiveClass = paramTypes[location];
+                    args[location] = defaultPrimitives.get(primitiveClass);
+                }
+            }
+            return args;
+        }
+
+    }
+
+    private static class PrimitiveAwareVarArgsTransformer extends VarArgsTransformer {
+
+        private final Object defaultInstance;
+
+        PrimitiveAwareVarArgsTransformer(Constructor<?> constructor) {
+            super(constructor);
+            defaultInstance = (componentType != null) ? defaultPrimitives.get(componentType) : null;
+        }
+
+        @Override
+        public boolean isApplicable() {
+            return super.isApplicable()
+                    && (componentType != null && componentType.isPrimitive());
+        }
+
+        @Override
+        public Object[] apply(Object[] args) {
+            if (isEmpty(args)) {
+                return args;
+            }
+            for (int i = paramTypes.length - 1; i < args.length; i++) {
+                if (args[i] == null) {
+                    args[i] = defaultInstance;
+                }
+            }
+            return args;
+        }
+
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/FileUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/FileUtils.java
new file mode 100644
index 0000000000..471e4c8768
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/FileUtils.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * FileUtils provides File handling functionality
+ *
+ * @author tiwe
+ *
+ */
+public final class FileUtils {
+
+    public static void delete(File file) throws IOException {
+        if (file.isDirectory()) {
+            for (File f : file.listFiles()) {
+                delete(f);
+            }
+        }
+        if (file.isDirectory() || file.isFile()) {
+            if (!file.delete()) {
+                throw new IllegalStateException("Deletion of " + file.getPath() + " failed");
+            }
+        }
+    }
+
+    private FileUtils() { }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
new file mode 100644
index 0000000000..51e0dbb45a
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import javax.lang.model.SourceVersion;
+
+/**
+ * JavaSyntaxUtils defines reserved keywords for Java
+ *
+ * @author tiwe
+ * @deprecated use the built-in {@link SourceVersion#isKeyword(CharSequence) keyword list} instead.
+ *
+ */
+@Deprecated
+public final class JavaSyntaxUtils {
+
+    private JavaSyntaxUtils() { }
+
+    public static boolean isReserved(String str) {
+        return SourceVersion.isKeyword(str);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/MathUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/MathUtils.java
new file mode 100644
index 0000000000..4d4f79c860
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/MathUtils.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+
+/**
+ * MathUtils provides Math related functionality
+ *
+ * @author tiwe
+ *
+ */
+public final class MathUtils {
+
+    private MathUtils() { }
+
+    @SuppressWarnings("unchecked")
+    public static <D extends Number> D result(D num1, Number num2, Operator operator) {
+        BigDecimal d1 = toBigDecimal(num1);
+        BigDecimal d2 = toBigDecimal(num2);
+        if (operator == Ops.ADD) {
+            return MathUtils.cast(d1.add(d2), (Class<D>) num1.getClass());
+        } else if (operator == Ops.SUB) {
+            return MathUtils.cast(d1.subtract(d2), (Class<D>) num1.getClass());
+        } else if (operator == Ops.MULT) {
+            return MathUtils.cast(d1.multiply(d2), (Class<D>) num1.getClass());
+        } else if (operator == Ops.DIV) {
+            return MathUtils.cast(d1.divide(d2), (Class<D>) num1.getClass());
+        } else {
+            throw new IllegalArgumentException(operator.toString());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <D extends Number> D sum(D num1, Number num2) {
+        BigDecimal res = toBigDecimal(num1).add(toBigDecimal(num2));
+        return MathUtils.cast(res, (Class<D>) num1.getClass());
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <D extends Number> D difference(D num1, Number num2) {
+        BigDecimal res = toBigDecimal(num1).subtract(toBigDecimal(num2));
+        return MathUtils.cast(res, (Class<D>) num1.getClass());
+    }
+
+    public static <D extends Number> D cast(Number num, Class<D> type) {
+        D rv;
+        if (num == null || type.isInstance(num)) {
+            rv = type.cast(num);
+        } else if (type.equals(Byte.class)) {
+            rv = type.cast(num.byteValue());
+        } else if (type.equals(Double.class)) {
+            rv = type.cast(num.doubleValue());
+        } else if (type.equals(Float.class)) {
+            rv = type.cast(num.floatValue());
+        } else if (type.equals(Integer.class)) {
+            rv = type.cast(num.intValue());
+        } else if (type.equals(Long.class)) {
+            rv = type.cast(num.longValue());
+        } else if (type.equals(Short.class)) {
+            rv = type.cast(num.shortValue());
+        } else if (type.equals(BigDecimal.class)) {
+            rv = type.cast(new BigDecimal(num.toString()));
+        } else if (type.equals(BigInteger.class)) {
+            if (num instanceof BigDecimal) {
+                rv = type.cast(((BigDecimal) num).toBigInteger());
+            } else {
+                rv = type.cast(new BigInteger(num.toString()));
+            }
+        } else {
+            throw new IllegalArgumentException(String.format("Unsupported target type : %s", type.getSimpleName()));
+        }
+        return rv;
+    }
+
+    private static BigDecimal toBigDecimal(Number num) {
+        if (num instanceof BigDecimal) {
+            return (BigDecimal) num;
+        } else {
+            return new BigDecimal(num.toString());
+        }
+    }
+}
diff --git a/querydsl-core/src/main/java/com/mysema/util/MultiIterator.java b/querydsl-core/src/main/java/com/querydsl/core/util/MultiIterator.java
similarity index 92%
rename from querydsl-core/src/main/java/com/mysema/util/MultiIterator.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/MultiIterator.java
index 02dedc9aac..2f40297986 100644
--- a/querydsl-core/src/main/java/com/mysema/util/MultiIterator.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/MultiIterator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * MultiIterator provides a cartesian view on the given iterators
@@ -29,6 +29,7 @@
  * </pre>
  *
  * @author tiwe
+ * @param <T> element type
  */
 public class MultiIterator<T> implements Iterator<Object[]> {
 
@@ -60,7 +61,7 @@ public boolean hasNext() {
         while (hasNext == null) {
             produceNext();
         }
-        return hasNext.booleanValue();
+        return hasNext;
     }
 
     @Override
@@ -69,7 +70,7 @@ public T[] next() {
         while (hasNext == null) {
             produceNext();
         }
-        if (hasNext.booleanValue()) {
+        if (hasNext) {
             hasNext = null;
             return (T[]) values.clone();
         } else {
diff --git a/querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java b/querydsl-core/src/main/java/com/querydsl/core/util/NullSafeComparableComparator.java
similarity index 87%
rename from querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/NullSafeComparableComparator.java
index 75065658c3..4f3439a7a2 100644
--- a/querydsl-core/src/main/java/com/mysema/query/util/NullSafeComparableComparator.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/NullSafeComparableComparator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,20 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.util;
+package com.querydsl.core.util;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
 /**
  * NullSafeComparableComparator is a null safe comparator for Comparable objects
- * 
+ *
  * @author tiwe
  *
  * @param <T>
  */
-public class NullSafeComparableComparator<T extends Comparable<T>> implements Comparator<T>, Serializable{
-    
+public class NullSafeComparableComparator<T extends Comparable<T>> implements Comparator<T>, Serializable {
+
     private static final long serialVersionUID = 5681808684776488757L;
 
     @Override
@@ -35,7 +35,7 @@ public int compare(T obj1, T obj2) {
             return 1;
         } else {
             return obj1.compareTo(obj2);
-        }           
+        }
     }
 
 }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/PrimitiveUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/PrimitiveUtils.java
new file mode 100644
index 0000000000..5278d24c6b
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/PrimitiveUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2007 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Primitive utility methods. Adjusted from Guavas {@code Primitives}.
+ *
+ * @author Kevin Bourrillion
+ * @author Jan-Willem Gmelig Meyling
+ */
+public final class PrimitiveUtils {
+
+    private PrimitiveUtils() {
+    }
+
+    private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER_TYPE;
+
+    private static final Map<Class<?>, Class<?>> WRAPPER_TO_PRIMITIVE_TYPE;
+
+    static {
+        Map<Class<?>, Class<?>> primToWrap = new HashMap<>(16);
+        Map<Class<?>, Class<?>> wrapToPrim = new HashMap<>(16);
+
+        add(primToWrap, wrapToPrim, boolean.class, Boolean.class);
+        add(primToWrap, wrapToPrim, byte.class, Byte.class);
+        add(primToWrap, wrapToPrim, char.class, Character.class);
+        add(primToWrap, wrapToPrim, double.class, Double.class);
+        add(primToWrap, wrapToPrim, float.class, Float.class);
+        add(primToWrap, wrapToPrim, int.class, Integer.class);
+        add(primToWrap, wrapToPrim, long.class, Long.class);
+        add(primToWrap, wrapToPrim, short.class, Short.class);
+        add(primToWrap, wrapToPrim, void.class, Void.class);
+
+        PRIMITIVE_TO_WRAPPER_TYPE = Collections.unmodifiableMap(primToWrap);
+        WRAPPER_TO_PRIMITIVE_TYPE = Collections.unmodifiableMap(wrapToPrim);
+    }
+
+    private static void add(Map<Class<?>, Class<?>> forward, Map<Class<?>, Class<?>> backward, Class<?> key, Class<?> value) {
+        forward.put(key, value);
+        backward.put(value, key);
+    }
+
+    public static boolean isWrapperType(Class<?> clazz) {
+        return WRAPPER_TO_PRIMITIVE_TYPE.containsKey(clazz);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> wrap(Class<T> type) {
+        return (Class<T>) PRIMITIVE_TO_WRAPPER_TYPE.getOrDefault(type, type);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> unwrap(Class<T> type) {
+        return (Class<T>) WRAPPER_TO_PRIMITIVE_TYPE.getOrDefault(type, type);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/ReflectionUtils.java
similarity index 81%
rename from querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/ReflectionUtils.java
index d4450ecaeb..749092a93d 100644
--- a/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/ReflectionUtils.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,29 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.annotation.Nullable;
+package com.querydsl.core.util;
+
+import java.lang.reflect.*;
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
 
 
 /**
  * ReflectionUtils provides Reflection related functionality
- * 
+ *
  * @author tiwe
  *
  */
@@ -41,7 +29,7 @@ public final class ReflectionUtils {
 
     private static final AnnotatedElement EMPTY = new Annotations();
 
-    private ReflectionUtils() {}
+    private ReflectionUtils() { }
 
     public static AnnotatedElement getAnnotatedElement(Class<?> beanClass, String propertyName, Class<?> propertyClass) {
         Field field = getFieldOrNull(beanClass, propertyName);
@@ -60,9 +48,7 @@ public static Field getFieldOrNull(Class<?> beanClass, String propertyName) {
         while (beanClass != null && !beanClass.equals(Object.class)) {
             try {
                 return beanClass.getDeclaredField(propertyName);
-            } catch (SecurityException e) {
-                // skip
-            } catch (NoSuchFieldException e) {
+            } catch (SecurityException | NoSuchFieldException e) {
                 // skip
             }
             beanClass = beanClass.getSuperclass();
@@ -79,15 +65,14 @@ public static Method getGetterOrNull(Class<?> beanClass, String name) {
             return getGetterOrNull(beanClass, name, Boolean.class);
         }
     }
-    
+
     @Nullable
     public static Method getGetterOrNull(Class<?> beanClass, String name, Class<?> type) {
         String methodName = ((type.equals(Boolean.class) || type.equals(boolean.class)) ? "is" : "get") + BeanUtils.capitalize(name);
         while (beanClass != null && !beanClass.equals(Object.class)) {
             try {
                 return beanClass.getDeclaredMethod(methodName);
-            } catch (SecurityException e) { // skip
-            } catch (NoSuchMethodException e) { // skip
+            } catch (SecurityException | NoSuchMethodException e) { // skip
             }
             beanClass = beanClass.getSuperclass();
         }
@@ -99,7 +84,7 @@ public static int getTypeParameterCount(java.lang.reflect.Type type) {
         if (type instanceof ParameterizedType) {
             return ((ParameterizedType) type).getActualTypeArguments().length;
         } else if (type instanceof TypeVariable) {
-            return getTypeParameterCount(((TypeVariable) type).getBounds()[0]);            
+            return getTypeParameterCount(((TypeVariable) type).getBounds()[0]);
         } else {
             return 0;
         }
@@ -113,18 +98,18 @@ public static Class<?> getTypeParameterAsClass(java.lang.reflect.Type type, int
             return null;
         }
     }
-    
+
     @Nullable
     public static Type getTypeParameter(java.lang.reflect.Type type, int index) {
         if (type instanceof ParameterizedType) {
             return ((ParameterizedType) type).getActualTypeArguments()[index];
-        } else if (type instanceof TypeVariable) {    
+        } else if (type instanceof TypeVariable) {
             return getTypeParameter(((TypeVariable) type).getBounds()[0], index);
         } else {
-            return null;    
-        }        
+            return null;
+        }
     }
-    
+
     private static Class<?> asClass(Type type) {
         if (type instanceof WildcardType) {
             WildcardType wildcardType = (WildcardType) type;
@@ -136,11 +121,11 @@ private static Class<?> asClass(Type type) {
                 return Object.class;
             }
         } else if (type instanceof TypeVariable) {
-            return asClass(((TypeVariable)type).getBounds()[0]);
+            return asClass(((TypeVariable) type).getBounds()[0]);
         } else if (type instanceof ParameterizedType) {
             return (Class<?>) ((ParameterizedType) type).getRawType();
-        } else if (type instanceof GenericArrayType) {    
-            Type component = ((GenericArrayType)type).getGenericComponentType();
+        } else if (type instanceof GenericArrayType) {
+            Type component = ((GenericArrayType) type).getGenericComponentType();
             return Array.newInstance(asClass(component), 0).getClass();
         } else if (type instanceof Class) {
             return (Class<?>) type;
@@ -148,7 +133,7 @@ private static Class<?> asClass(Type type) {
             throw new IllegalArgumentException(type.getClass().toString());
         }
     }
-    
+
     public static Set<Class<?>> getSuperClasses(Class<?> cl) {
         Set<Class<?>> classes = new HashSet<Class<?>>();
         Class<?> c = cl;
@@ -158,19 +143,17 @@ public static Set<Class<?>> getSuperClasses(Class<?> cl) {
         }
         return classes;
     }
-    
+
     public static Set<Field> getFields(Class<?> cl) {
         Set<Field> fields = new HashSet<Field>();
         Class<?> c = cl;
         while (c != null) {
-            for (Field field : c.getDeclaredFields()) {
-                fields.add(field);
-            }
+            fields.addAll(Arrays.asList(c.getDeclaredFields()));
             c = c.getSuperclass();
         }
         return fields;
     }
-    
+
     public static Set<Class<?>> getImplementedInterfaces(Class<?> cl) {
         Set<Class<?>> interfaces = new HashSet<Class<?>>();
         Deque<Class<?>> classes = new ArrayDeque<Class<?>>();
diff --git a/querydsl-core/src/main/java/com/mysema/util/ResultSetAdapter.java b/querydsl-core/src/main/java/com/querydsl/core/util/ResultSetAdapter.java
similarity index 89%
rename from querydsl-core/src/main/java/com/mysema/util/ResultSetAdapter.java
rename to querydsl-core/src/main/java/com/querydsl/core/util/ResultSetAdapter.java
index ffc4a172e7..97c533262a 100644
--- a/querydsl-core/src/main/java/com/mysema/util/ResultSetAdapter.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/ResultSetAdapter.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,35 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Calendar;
 import java.util.Map;
 
 /**
+ * {@code ResultSetAdapter} is an adapter implementation of the {@link ResultSet} interface
+ *
  * @author tiwe
  *
  */
-public class ResultSetAdapter implements ResultSet{
+public class ResultSetAdapter implements ResultSet {
 
     private final ResultSet rs;
 
@@ -47,820 +35,1013 @@ public ResultSetAdapter(ResultSet rs) {
         this.rs = rs;
     }
 
+    @Override
     public boolean absolute(int row) throws SQLException {
         return rs.absolute(row);
     }
 
+    @Override
     public void afterLast() throws SQLException {
         rs.afterLast();
     }
 
+    @Override
     public void beforeFirst() throws SQLException {
         rs.beforeFirst();
     }
 
+    @Override
     public void cancelRowUpdates() throws SQLException {
         rs.cancelRowUpdates();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         rs.clearWarnings();
     }
 
+    @Override
     public void close() throws SQLException {
         rs.close();
     }
 
+    @Override
     public void deleteRow() throws SQLException {
         rs.deleteRow();
     }
 
+    @Override
     public int findColumn(String columnLabel) throws SQLException {
         return rs.findColumn(columnLabel);
     }
 
+    @Override
     public boolean first() throws SQLException {
         return rs.first();
     }
 
+    @Override
     public Array getArray(int columnIndex) throws SQLException {
         return rs.getArray(columnIndex);
     }
 
+    @Override
     public Array getArray(String columnLabel) throws SQLException {
         return rs.getArray(columnLabel);
     }
 
+    @Override
     public InputStream getAsciiStream(int columnIndex) throws SQLException {
         return rs.getAsciiStream(columnIndex);
     }
 
+    @Override
     public InputStream getAsciiStream(String columnLabel) throws SQLException {
         return rs.getAsciiStream(columnLabel);
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
         return rs.getBigDecimal(columnIndex, scale);
     }
 
+    @Override
     public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
         return rs.getBigDecimal(columnIndex);
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
         return rs.getBigDecimal(columnLabel, scale);
     }
 
+    @Override
     public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
         return rs.getBigDecimal(columnLabel);
     }
 
+    @Override
     public InputStream getBinaryStream(int columnIndex) throws SQLException {
         return rs.getBinaryStream(columnIndex);
     }
 
+    @Override
     public InputStream getBinaryStream(String columnLabel) throws SQLException {
         return rs.getBinaryStream(columnLabel);
     }
 
+    @Override
     public Blob getBlob(int columnIndex) throws SQLException {
         return rs.getBlob(columnIndex);
     }
 
+    @Override
     public Blob getBlob(String columnLabel) throws SQLException {
         return rs.getBlob(columnLabel);
     }
 
+    @Override
     public boolean getBoolean(int columnIndex) throws SQLException {
         return rs.getBoolean(columnIndex);
     }
 
+    @Override
     public boolean getBoolean(String columnLabel) throws SQLException {
         return rs.getBoolean(columnLabel);
     }
 
+    @Override
     public byte getByte(int columnIndex) throws SQLException {
         return rs.getByte(columnIndex);
     }
 
+    @Override
     public byte getByte(String columnLabel) throws SQLException {
         return rs.getByte(columnLabel);
     }
 
+    @Override
     public byte[] getBytes(int columnIndex) throws SQLException {
         return rs.getBytes(columnIndex);
     }
 
+    @Override
     public byte[] getBytes(String columnLabel) throws SQLException {
         return rs.getBytes(columnLabel);
     }
 
+    @Override
     public Reader getCharacterStream(int columnIndex) throws SQLException {
         return rs.getCharacterStream(columnIndex);
     }
 
+    @Override
     public Reader getCharacterStream(String columnLabel) throws SQLException {
         return rs.getCharacterStream(columnLabel);
     }
 
+    @Override
     public Clob getClob(int columnIndex) throws SQLException {
         return rs.getClob(columnIndex);
     }
 
+    @Override
     public Clob getClob(String columnLabel) throws SQLException {
         return rs.getClob(columnLabel);
     }
 
+    @Override
     public int getConcurrency() throws SQLException {
         return rs.getConcurrency();
     }
 
+    @Override
     public String getCursorName() throws SQLException {
         return rs.getCursorName();
     }
 
+    @Override
     public Date getDate(int columnIndex, Calendar cal) throws SQLException {
         return rs.getDate(columnIndex, cal);
     }
 
+    @Override
     public Date getDate(int columnIndex) throws SQLException {
         return rs.getDate(columnIndex);
     }
 
+    @Override
     public Date getDate(String columnLabel, Calendar cal) throws SQLException {
         return rs.getDate(columnLabel, cal);
     }
 
+    @Override
     public Date getDate(String columnLabel) throws SQLException {
         return rs.getDate(columnLabel);
     }
 
+    @Override
     public double getDouble(int columnIndex) throws SQLException {
         return rs.getDouble(columnIndex);
     }
 
+    @Override
     public double getDouble(String columnLabel) throws SQLException {
         return rs.getDouble(columnLabel);
     }
 
+    @Override
     public int getFetchDirection() throws SQLException {
         return rs.getFetchDirection();
     }
 
+    @Override
     public int getFetchSize() throws SQLException {
         return rs.getFetchSize();
     }
 
+    @Override
     public float getFloat(int columnIndex) throws SQLException {
         return rs.getFloat(columnIndex);
     }
 
+    @Override
     public float getFloat(String columnLabel) throws SQLException {
         return rs.getFloat(columnLabel);
     }
 
+    @Override
     public int getHoldability() throws SQLException {
         return rs.getHoldability();
     }
 
+    @Override
     public int getInt(int columnIndex) throws SQLException {
         return rs.getInt(columnIndex);
     }
 
+    @Override
     public int getInt(String columnLabel) throws SQLException {
         return rs.getInt(columnLabel);
     }
 
+    @Override
     public long getLong(int columnIndex) throws SQLException {
         return rs.getLong(columnIndex);
     }
 
+    @Override
     public long getLong(String columnLabel) throws SQLException {
         return rs.getLong(columnLabel);
     }
 
+    @Override
     public ResultSetMetaData getMetaData() throws SQLException {
         return rs.getMetaData();
     }
 
+    @Override
     public Reader getNCharacterStream(int columnIndex) throws SQLException {
         return rs.getNCharacterStream(columnIndex);
     }
 
+    @Override
     public Reader getNCharacterStream(String columnLabel) throws SQLException {
         return rs.getNCharacterStream(columnLabel);
     }
 
+    @Override
     public NClob getNClob(int columnIndex) throws SQLException {
         return rs.getNClob(columnIndex);
     }
 
+    @Override
     public NClob getNClob(String columnLabel) throws SQLException {
         return rs.getNClob(columnLabel);
     }
 
+    @Override
     public String getNString(int columnIndex) throws SQLException {
         return rs.getNString(columnIndex);
     }
 
+    @Override
     public String getNString(String columnLabel) throws SQLException {
         return rs.getNString(columnLabel);
     }
 
+    @Override
     public Object getObject(int columnIndex, Map<String, Class<?>> map)
             throws SQLException {
         return rs.getObject(columnIndex, map);
     }
 
+    @Override
     public Object getObject(int columnIndex) throws SQLException {
         return rs.getObject(columnIndex);
     }
-    
+
+    @SuppressWarnings("unchecked")
+    @Override
     public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
         // this getObject(int, Class) is available in JDK 7
-        return (T)rs.getObject(columnIndex);
+        return (T) rs.getObject(columnIndex);
     }
 
+    @Override
     public Object getObject(String columnLabel, Map<String, Class<?>> map)
             throws SQLException {
         return rs.getObject(columnLabel, map);
     }
 
+    @Override
     public Object getObject(String columnLabel) throws SQLException {
         return rs.getObject(columnLabel);
     }
-    
+
+    @SuppressWarnings("unchecked")
+    @Override
     public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
         // this getObject(String, Class) is available in JDK 7
-        return (T)rs.getObject(columnLabel);
+        return (T) rs.getObject(columnLabel);
     }
 
+    @Override
     public Ref getRef(int columnIndex) throws SQLException {
         return rs.getRef(columnIndex);
     }
 
+    @Override
     public Ref getRef(String columnLabel) throws SQLException {
         return rs.getRef(columnLabel);
     }
 
+    @Override
     public int getRow() throws SQLException {
         return rs.getRow();
     }
 
+    @Override
     public RowId getRowId(int columnIndex) throws SQLException {
         return rs.getRowId(columnIndex);
     }
 
+    @Override
     public RowId getRowId(String columnLabel) throws SQLException {
         return rs.getRowId(columnLabel);
     }
 
+    @Override
     public short getShort(int columnIndex) throws SQLException {
         return rs.getShort(columnIndex);
     }
 
+    @Override
     public short getShort(String columnLabel) throws SQLException {
         return rs.getShort(columnLabel);
     }
 
+    @Override
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         return rs.getSQLXML(columnIndex);
     }
 
+    @Override
     public SQLXML getSQLXML(String columnLabel) throws SQLException {
         return rs.getSQLXML(columnLabel);
     }
 
+    @Override
     public Statement getStatement() throws SQLException {
         return rs.getStatement();
     }
 
+    @Override
     public String getString(int columnIndex) throws SQLException {
         return rs.getString(columnIndex);
     }
 
+    @Override
     public String getString(String columnLabel) throws SQLException {
         return rs.getString(columnLabel);
     }
 
+    @Override
     public Time getTime(int columnIndex, Calendar cal) throws SQLException {
         return rs.getTime(columnIndex, cal);
     }
 
+    @Override
     public Time getTime(int columnIndex) throws SQLException {
         return rs.getTime(columnIndex);
     }
 
+    @Override
     public Time getTime(String columnLabel, Calendar cal) throws SQLException {
         return rs.getTime(columnLabel, cal);
     }
 
+    @Override
     public Time getTime(String columnLabel) throws SQLException {
         return rs.getTime(columnLabel);
     }
 
+    @Override
     public Timestamp getTimestamp(int columnIndex, Calendar cal)
             throws SQLException {
         return rs.getTimestamp(columnIndex, cal);
     }
 
+    @Override
     public Timestamp getTimestamp(int columnIndex) throws SQLException {
         return rs.getTimestamp(columnIndex);
     }
 
+    @Override
     public Timestamp getTimestamp(String columnLabel, Calendar cal)
             throws SQLException {
         return rs.getTimestamp(columnLabel, cal);
     }
 
+    @Override
     public Timestamp getTimestamp(String columnLabel) throws SQLException {
         return rs.getTimestamp(columnLabel);
     }
 
+    @Override
     public int getType() throws SQLException {
         return rs.getType();
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public InputStream getUnicodeStream(int columnIndex) throws SQLException {
         return rs.getUnicodeStream(columnIndex);
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public InputStream getUnicodeStream(String columnLabel) throws SQLException {
         return rs.getUnicodeStream(columnLabel);
     }
 
+    @Override
     public URL getURL(int columnIndex) throws SQLException {
         return rs.getURL(columnIndex);
     }
 
+    @Override
     public URL getURL(String columnLabel) throws SQLException {
         return rs.getURL(columnLabel);
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return rs.getWarnings();
     }
 
+    @Override
     public void insertRow() throws SQLException {
         rs.insertRow();
     }
 
+    @Override
     public boolean isAfterLast() throws SQLException {
         return rs.isAfterLast();
     }
 
+    @Override
     public boolean isBeforeFirst() throws SQLException {
         return rs.isBeforeFirst();
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return rs.isClosed();
     }
 
+    @Override
     public boolean isFirst() throws SQLException {
         return rs.isFirst();
     }
 
+    @Override
     public boolean isLast() throws SQLException {
         return rs.isLast();
     }
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return rs.isWrapperFor(iface);
     }
 
+    @Override
     public boolean last() throws SQLException {
         return rs.last();
     }
 
+    @Override
     public void moveToCurrentRow() throws SQLException {
         rs.moveToCurrentRow();
     }
 
+    @Override
     public void moveToInsertRow() throws SQLException {
         rs.moveToInsertRow();
     }
 
+    @Override
     public boolean next() throws SQLException {
         return rs.next();
     }
 
+    @Override
     public boolean previous() throws SQLException {
         return rs.previous();
     }
 
+    @Override
     public void refreshRow() throws SQLException {
         rs.refreshRow();
     }
 
+    @Override
     public boolean relative(int rows) throws SQLException {
         return rs.relative(rows);
     }
 
+    @Override
     public boolean rowDeleted() throws SQLException {
         return rs.rowDeleted();
     }
 
+    @Override
     public boolean rowInserted() throws SQLException {
         return rs.rowInserted();
     }
 
+    @Override
     public boolean rowUpdated() throws SQLException {
         return rs.rowUpdated();
     }
 
+    @Override
     public void setFetchDirection(int direction) throws SQLException {
         rs.setFetchDirection(direction);
     }
 
+    @Override
     public void setFetchSize(int rows) throws SQLException {
         rs.setFetchSize(rows);
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         return rs.unwrap(iface);
     }
 
+    @Override
     public void updateArray(int columnIndex, Array x) throws SQLException {
         rs.updateArray(columnIndex, x);
     }
 
+    @Override
     public void updateArray(String columnLabel, Array x) throws SQLException {
         rs.updateArray(columnLabel, x);
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream x, int length)
             throws SQLException {
         rs.updateAsciiStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream x, long length)
             throws SQLException {
         rs.updateAsciiStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream x)
             throws SQLException {
         rs.updateAsciiStream(columnIndex, x);
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream x, int length)
             throws SQLException {
         rs.updateAsciiStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream x, long length)
             throws SQLException {
         rs.updateAsciiStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream x)
             throws SQLException {
         rs.updateAsciiStream(columnLabel, x);
     }
 
+    @Override
     public void updateBigDecimal(int columnIndex, BigDecimal x)
             throws SQLException {
         rs.updateBigDecimal(columnIndex, x);
     }
 
+    @Override
     public void updateBigDecimal(String columnLabel, BigDecimal x)
             throws SQLException {
         rs.updateBigDecimal(columnLabel, x);
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream x, int length)
             throws SQLException {
         rs.updateBinaryStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream x, long length)
             throws SQLException {
         rs.updateBinaryStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream x)
             throws SQLException {
         rs.updateBinaryStream(columnIndex, x);
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream x, int length)
             throws SQLException {
         rs.updateBinaryStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream x,
             long length) throws SQLException {
         rs.updateBinaryStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream x)
             throws SQLException {
         rs.updateBinaryStream(columnLabel, x);
     }
 
+    @Override
     public void updateBlob(int columnIndex, Blob x) throws SQLException {
         rs.updateBlob(columnIndex, x);
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream, long length)
             throws SQLException {
         rs.updateBlob(columnIndex, inputStream, length);
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream)
             throws SQLException {
         rs.updateBlob(columnIndex, inputStream);
     }
 
+    @Override
     public void updateBlob(String columnLabel, Blob x) throws SQLException {
         rs.updateBlob(columnLabel, x);
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream,
             long length) throws SQLException {
         rs.updateBlob(columnLabel, inputStream, length);
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream)
             throws SQLException {
         rs.updateBlob(columnLabel, inputStream);
     }
 
+    @Override
     public void updateBoolean(int columnIndex, boolean x) throws SQLException {
         rs.updateBoolean(columnIndex, x);
     }
 
+    @Override
     public void updateBoolean(String columnLabel, boolean x)
             throws SQLException {
         rs.updateBoolean(columnLabel, x);
     }
 
+    @Override
     public void updateByte(int columnIndex, byte x) throws SQLException {
         rs.updateByte(columnIndex, x);
     }
 
+    @Override
     public void updateByte(String columnLabel, byte x) throws SQLException {
         rs.updateByte(columnLabel, x);
     }
 
+    @Override
     public void updateBytes(int columnIndex, byte[] x) throws SQLException {
         rs.updateBytes(columnIndex, x);
     }
 
+    @Override
     public void updateBytes(String columnLabel, byte[] x) throws SQLException {
         rs.updateBytes(columnLabel, x);
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader x, int length)
             throws SQLException {
         rs.updateCharacterStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader x, long length)
             throws SQLException {
         rs.updateCharacterStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader x)
             throws SQLException {
         rs.updateCharacterStream(columnIndex, x);
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader,
             int length) throws SQLException {
         rs.updateCharacterStream(columnLabel, reader, length);
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader,
             long length) throws SQLException {
         rs.updateCharacterStream(columnLabel, reader, length);
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader)
             throws SQLException {
         rs.updateCharacterStream(columnLabel, reader);
     }
 
+    @Override
     public void updateClob(int columnIndex, Clob x) throws SQLException {
         rs.updateClob(columnIndex, x);
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader, long length)
             throws SQLException {
         rs.updateClob(columnIndex, reader, length);
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader) throws SQLException {
         rs.updateClob(columnIndex, reader);
     }
 
+    @Override
     public void updateClob(String columnLabel, Clob x) throws SQLException {
         rs.updateClob(columnLabel, x);
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader, long length)
             throws SQLException {
         rs.updateClob(columnLabel, reader, length);
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader)
             throws SQLException {
         rs.updateClob(columnLabel, reader);
     }
 
+    @Override
     public void updateDate(int columnIndex, Date x) throws SQLException {
         rs.updateDate(columnIndex, x);
     }
 
+    @Override
     public void updateDate(String columnLabel, Date x) throws SQLException {
         rs.updateDate(columnLabel, x);
     }
 
+    @Override
     public void updateDouble(int columnIndex, double x) throws SQLException {
         rs.updateDouble(columnIndex, x);
     }
 
+    @Override
     public void updateDouble(String columnLabel, double x) throws SQLException {
         rs.updateDouble(columnLabel, x);
     }
 
+    @Override
     public void updateFloat(int columnIndex, float x) throws SQLException {
         rs.updateFloat(columnIndex, x);
     }
 
+    @Override
     public void updateFloat(String columnLabel, float x) throws SQLException {
         rs.updateFloat(columnLabel, x);
     }
 
+    @Override
     public void updateInt(int columnIndex, int x) throws SQLException {
         rs.updateInt(columnIndex, x);
     }
 
+    @Override
     public void updateInt(String columnLabel, int x) throws SQLException {
         rs.updateInt(columnLabel, x);
     }
 
+    @Override
     public void updateLong(int columnIndex, long x) throws SQLException {
         rs.updateLong(columnIndex, x);
     }
 
+    @Override
     public void updateLong(String columnLabel, long x) throws SQLException {
         rs.updateLong(columnLabel, x);
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader x, long length)
             throws SQLException {
         rs.updateNCharacterStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader x)
             throws SQLException {
         rs.updateNCharacterStream(columnIndex, x);
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader,
             long length) throws SQLException {
         rs.updateNCharacterStream(columnLabel, reader, length);
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader)
             throws SQLException {
         rs.updateNCharacterStream(columnLabel, reader);
     }
 
+    @Override
     public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
         rs.updateNClob(columnIndex, nClob);
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader, long length)
             throws SQLException {
         rs.updateNClob(columnIndex, reader, length);
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader) throws SQLException {
         rs.updateNClob(columnIndex, reader);
     }
 
+    @Override
     public void updateNClob(String columnLabel, NClob nClob)
             throws SQLException {
         rs.updateNClob(columnLabel, nClob);
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader, long length)
             throws SQLException {
         rs.updateNClob(columnLabel, reader, length);
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader)
             throws SQLException {
         rs.updateNClob(columnLabel, reader);
     }
 
+    @Override
     public void updateNString(int columnIndex, String nString)
             throws SQLException {
         rs.updateNString(columnIndex, nString);
     }
 
+    @Override
     public void updateNString(String columnLabel, String nString)
             throws SQLException {
         rs.updateNString(columnLabel, nString);
     }
 
+    @Override
     public void updateNull(int columnIndex) throws SQLException {
         rs.updateNull(columnIndex);
     }
 
+    @Override
     public void updateNull(String columnLabel) throws SQLException {
         rs.updateNull(columnLabel);
     }
 
+    @Override
     public void updateObject(int columnIndex, Object x, int scaleOrLength)
             throws SQLException {
         rs.updateObject(columnIndex, x, scaleOrLength);
     }
 
+    @Override
     public void updateObject(int columnIndex, Object x) throws SQLException {
         rs.updateObject(columnIndex, x);
     }
 
+    @Override
     public void updateObject(String columnLabel, Object x, int scaleOrLength)
             throws SQLException {
         rs.updateObject(columnLabel, x, scaleOrLength);
     }
 
+    @Override
     public void updateObject(String columnLabel, Object x) throws SQLException {
         rs.updateObject(columnLabel, x);
     }
 
+    @Override
     public void updateRef(int columnIndex, Ref x) throws SQLException {
         rs.updateRef(columnIndex, x);
     }
 
+    @Override
     public void updateRef(String columnLabel, Ref x) throws SQLException {
         rs.updateRef(columnLabel, x);
     }
 
+    @Override
     public void updateRow() throws SQLException {
         rs.updateRow();
     }
 
+    @Override
     public void updateRowId(int columnIndex, RowId x) throws SQLException {
         rs.updateRowId(columnIndex, x);
     }
 
+    @Override
     public void updateRowId(String columnLabel, RowId x) throws SQLException {
         rs.updateRowId(columnLabel, x);
     }
 
+    @Override
     public void updateShort(int columnIndex, short x) throws SQLException {
         rs.updateShort(columnIndex, x);
     }
 
+    @Override
     public void updateShort(String columnLabel, short x) throws SQLException {
         rs.updateShort(columnLabel, x);
     }
 
+    @Override
     public void updateSQLXML(int columnIndex, SQLXML xmlObject)
             throws SQLException {
         rs.updateSQLXML(columnIndex, xmlObject);
     }
 
+    @Override
     public void updateSQLXML(String columnLabel, SQLXML xmlObject)
             throws SQLException {
         rs.updateSQLXML(columnLabel, xmlObject);
     }
 
+    @Override
     public void updateString(int columnIndex, String x) throws SQLException {
         rs.updateString(columnIndex, x);
     }
 
+    @Override
     public void updateString(String columnLabel, String x) throws SQLException {
         rs.updateString(columnLabel, x);
     }
 
+    @Override
     public void updateTime(int columnIndex, Time x) throws SQLException {
         rs.updateTime(columnIndex, x);
     }
 
+    @Override
     public void updateTime(String columnLabel, Time x) throws SQLException {
         rs.updateTime(columnLabel, x);
     }
 
+    @Override
     public void updateTimestamp(int columnIndex, Timestamp x)
             throws SQLException {
         rs.updateTimestamp(columnIndex, x);
     }
 
+    @Override
     public void updateTimestamp(String columnLabel, Timestamp x)
             throws SQLException {
         rs.updateTimestamp(columnLabel, x);
     }
 
+    @Override
     public boolean wasNull() throws SQLException {
         return rs.wasNull();
     }
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/StringUtils.java b/querydsl-core/src/main/java/com/querydsl/core/util/StringUtils.java
new file mode 100644
index 0000000000..a8f00e2964
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/StringUtils.java
@@ -0,0 +1,29 @@
+package com.querydsl.core.util;
+
+/**
+ * String utilities
+ *
+ * @author Jan-Willem Gmelig Meyling
+ */
+public final class StringUtils {
+
+    private StringUtils() {
+    }
+
+    public static String nullToEmpty(String value) {
+        return value == null ? "" : value;
+    }
+
+    public static boolean isNullOrEmpty(String value) {
+        return value == null || value.isEmpty();
+    }
+
+    public static String capitalize(String str) {
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+
+    public static String uncapitalize(String str) {
+        return str.substring(0, 1).toLowerCase() + str.substring(1);
+    }
+
+}
diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/package-info.java b/querydsl-core/src/main/java/com/querydsl/core/util/package-info.java
new file mode 100644
index 0000000000..c60404c581
--- /dev/null
+++ b/querydsl-core/src/main/java/com/querydsl/core/util/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * General utility classes
+ */
+package com.querydsl.core.util;
diff --git a/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java b/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java
deleted file mode 100644
index 64533b5135..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * BooleanConstant provides constants for Boolean.TRUE and Boolean.FALSE
- *
- * @author tiwe
- *
- */
-final class BooleanConstant extends BooleanExpression implements Constant<Boolean> { 
-
-    public static final BooleanExpression FALSE = new BooleanConstant(Boolean.FALSE);
-
-    private static final long serialVersionUID = -4106376704553234781L;
-
-    public static final BooleanExpression TRUE = new BooleanConstant(Boolean.TRUE);
-
-    public static BooleanExpression create(Boolean b) {
-        return b.booleanValue() ? TRUE : FALSE;
-    }
-
-    private final Boolean constant;
-
-    private BooleanConstant(Boolean b) {
-        super(ConstantImpl.create(b.booleanValue()));
-        this.constant = b;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-    
-    @Override
-    public BooleanExpression eq(Boolean b) {
-        return constant.equals(b) ? TRUE : FALSE;
-    }
-
-    @Override
-    public Boolean getConstant() {
-        return constant;
-    }
-
-    @Override
-    public BooleanExpression ne(Boolean b) {
-        return constant.equals(b) ? FALSE : TRUE;
-    }
-
-    @Override
-    public BooleanExpression not() {
-        return constant.booleanValue() ? FALSE : TRUE;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java b/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java
deleted file mode 100644
index 497a641148..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/DefaultQueryMetadataTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.Param;
-import com.mysema.query.types.path.StringPath;
-
-public class DefaultQueryMetadataTest {
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final StringPath str = new StringPath("str");
-    
-    private final StringPath str2 = new StringPath("str2");
-
-    @Test
-    public void AddWhere_With_Null() {
-        metadata.addWhere((Predicate)null);
-    }
-    
-    @Test
-    public void AddWhere_With_BooleanBuilder() {
-        metadata.addWhere(new BooleanBuilder());
-    }
-    
-    @Test
-    public void AddHaving_With_Null() {
-        metadata.addWhere((Predicate)null);
-    }
-    
-    @Test
-    public void AddHaving_With_BooleanBuilder() {
-        metadata.addWhere(new BooleanBuilder());
-    }
-    
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void Validation() {
-        metadata.addGroupBy(str);
-    }
-    
-    @Test
-    public void GetGroupBy() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addGroupBy(str);
-        assertEquals(Arrays.asList(str), metadata.getGroupBy());
-    }
-
-    @Test
-    public void GetHaving() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addHaving(str.isNotNull());
-        assertEquals(str.isNotNull(), metadata.getHaving());
-    }
-
-    @Test
-    public void GetJoins() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, str)), metadata.getJoins());
-    }
-    
-    @Test
-    public void GetJoins2() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, str)), metadata.getJoins());
-    }
-
-    @Test
-    public void GetModifiers() {
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        metadata.setModifiers(modifiers);
-        assertEquals(modifiers, metadata.getModifiers());
-    }
-
-    @Test
-    public void setLimit() {
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        metadata.setModifiers(modifiers);
-        metadata.setLimit(3l);
-
-        assertEquals(Long.valueOf(3l), metadata.getModifiers().getLimit());
-        assertEquals(Long.valueOf(2l), metadata.getModifiers().getOffset());
-    }
-
-    @Test
-    public void setOffset() {
-        QueryModifiers modifiers = new QueryModifiers(1l,1l);
-        metadata.setModifiers(modifiers);
-        metadata.setOffset(2l);
-
-        assertEquals(Long.valueOf(1l), metadata.getModifiers().getLimit());
-        assertEquals(Long.valueOf(2l), metadata.getModifiers().getOffset());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void GetOrderBy() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addOrderBy(str.asc());
-        metadata.addOrderBy(str.desc());
-        assertEquals(Arrays.asList(str.asc(),str.desc()), metadata.getOrderBy());
-    }
-
-    @Test
-    public void GetProjection() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addProjection(str);
-        metadata.addProjection(str.append("abc"));
-        assertEquals(Arrays.asList(str, str.append("abc")), metadata.getProjection());
-    }
-
-    @Test
-    public void GetWhere() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addWhere(str.eq("b"));
-        metadata.addWhere(str.isNotEmpty());
-        assertEquals(str.eq("b").and(str.isNotEmpty()), metadata.getWhere());
-    }
-
-    @Test
-    public void IsDistinct() {
-        assertFalse(metadata.isDistinct());
-        metadata.setDistinct(true);
-        assertTrue(metadata.isDistinct());
-    }
-
-    @Test
-    public void IsUnique() {
-        assertFalse(metadata.isUnique());
-        metadata.setUnique(true);
-        assertTrue(metadata.isUnique());
-    }
-
-    @Test
-    public void Clone() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addGroupBy(str);
-        metadata.addHaving(str.isNotNull());
-        metadata.addJoin(JoinType.DEFAULT, str2);
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        metadata.setModifiers(modifiers);
-        metadata.addOrderBy(str.asc());
-        metadata.addProjection(str);
-        metadata.addProjection(str.append("abc"));
-        metadata.addWhere(str.eq("b"));
-        metadata.addWhere(str.isNotEmpty());
-
-        QueryMetadata clone = metadata.clone();
-        assertEquals(metadata.getGroupBy(), clone.getGroupBy());
-        assertEquals(metadata.getHaving(), clone.getHaving());
-        assertEquals(metadata.getJoins(), clone.getJoins());
-        assertEquals(metadata.getModifiers(), clone.getModifiers());
-        assertEquals(metadata.getOrderBy(), clone.getOrderBy());
-        assertEquals(metadata.getProjection(), clone.getProjection());
-        assertEquals(metadata.getWhere(), clone.getWhere());
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Test
-    public void SetParam() {
-        metadata.setParam(new Param(String.class, "str"), ConstantImpl.create("X"));
-        assertEquals(1, metadata.getParams().size());
-        assertTrue(metadata.getParams().get(new Param(String.class, "str")).equals(ConstantImpl.create("X")));
-    }
-    
-    @Test
-    public void AddFlag() {
-        QueryFlag flag = new QueryFlag(Position.START, "X");
-        metadata.addFlag(flag);
-        assertTrue(metadata.hasFlag(flag));
-    }
-    
-    @Test
-    public void Equals() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addGroupBy(str);
-        metadata.addHaving(str.isNotNull());
-        metadata.addJoin(JoinType.DEFAULT, str2);
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        metadata.setModifiers(modifiers);
-        metadata.addOrderBy(str.asc());
-        metadata.addProjection(str);
-        metadata.addProjection(str.append("abc"));
-        metadata.addWhere(str.eq("b"));
-        metadata.addWhere(str.isNotEmpty());
-        
-        QueryMetadata metadata2 = new DefaultQueryMetadata();
-        assertFalse(metadata.equals(metadata2));        
-        metadata2.addJoin(JoinType.DEFAULT, str);
-        assertFalse(metadata.equals(metadata2));        
-        metadata2.addGroupBy(str);
-        assertFalse(metadata.equals(metadata2));
-        metadata2.addHaving(str.isNotNull());
-        assertFalse(metadata.equals(metadata2));
-        metadata2.addJoin(JoinType.DEFAULT, str2);
-        assertFalse(metadata.equals(metadata2));
-        metadata2.setModifiers(modifiers);
-        assertFalse(metadata.equals(metadata2));
-        metadata2.addOrderBy(str.asc());
-        assertFalse(metadata.equals(metadata2));
-        metadata2.addProjection(str);
-        metadata2.addProjection(str.append("abc"));
-        assertFalse(metadata.equals(metadata2));
-        metadata2.addWhere(str.eq("b"));
-        metadata2.addWhere(str.isNotEmpty());
-        assertTrue(metadata.equals(metadata2));
-    }
-    
-    @Test
-    public void HashCode() {
-        metadata.addJoin(JoinType.DEFAULT, str);
-        metadata.addGroupBy(str);
-        metadata.addHaving(str.isNotNull());
-        metadata.addJoin(JoinType.DEFAULT, str2);
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        metadata.setModifiers(modifiers);
-        metadata.addOrderBy(str.asc());
-        metadata.addProjection(str);
-        metadata.addProjection(str.append("abc"));
-        metadata.addWhere(str.eq("b"));
-        metadata.addWhere(str.isNotEmpty());
-        metadata.hashCode();        
-    }
-    
-    @Test
-    public void HashCode_Empty_Metadata() {
-        metadata.hashCode();
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/DependenciesTest.java b/querydsl-core/src/test/java/com/mysema/query/DependenciesTest.java
deleted file mode 100644
index 857d9dda28..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/DependenciesTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-
-import jdepend.framework.JDepend;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class DependenciesTest {
-    
-    @Test
-    @Ignore
-    public void test() throws IOException{
-        // FIXME
-        JDepend jdepend = new JDepend();        
-        jdepend.addDirectory("target/classes/com/mysema/query/alias");
-        jdepend.addDirectory("target/classes/com/mysema/query/codegen");
-        jdepend.addDirectory("target/classes/com/mysema/query/dml");
-        jdepend.addDirectory("target/classes/com/mysema/query/support");
-        jdepend.addDirectory("target/classes/com/mysema/query/types");
-        jdepend.addDirectory("target/classes/com/mysema/query/types/expr");
-        jdepend.addDirectory("target/classes/com/mysema/query/types/path");
-        jdepend.addDirectory("target/classes/com/mysema/query/types/query");
-        jdepend.addDirectory("target/classes/com/mysema/query/types/template");
-
-        jdepend.analyze();    
-        assertFalse(jdepend.containsCycles());
-
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/Entity.java b/querydsl-core/src/test/java/com/mysema/query/Entity.java
deleted file mode 100644
index e0e508f303..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/Entity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface Entity{
-
-    int getNum();
-
-    String getStr();
-
-    boolean isBool();
-
-    List<String> getList();
-
-    Set<String> getSet();
-
-    Map<String, String> getMap();
-
-    java.util.Date getDateTime();
-
-    java.sql.Date getDate();
-
-    java.sql.Time getTime();
-
-    String[] getArray();
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/FilterFactory.java b/querydsl-core/src/test/java/com/mysema/query/FilterFactory.java
deleted file mode 100644
index e2de7b01d0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/FilterFactory.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.ArrayExpression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.Coalesce;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.ListExpression;
-import com.mysema.query.types.expr.MapExpressionBase;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TemporalExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.path.ListPath;
-
-/**
- * @author tiwe
- *
- */
-public class FilterFactory {
-
-    private final ProjectionsFactory projections;
-
-    private final Module module;
-
-    private final Target target;
-
-    public FilterFactory(ProjectionsFactory projections, Module module, Target target) {
-        this.projections = projections;
-        this.module = module;
-        this.target = target;
-    }
-
-    public Collection<Predicate> booleanFilters(BooleanExpression expr, BooleanExpression other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.and(other));
-        rv.add(expr.or(other));
-        rv.add(expr.not().and(other.not()));
-        rv.add(expr.not());
-        rv.add(other.not());
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A> Collection<Predicate> collection(CollectionExpressionBase<?,A> expr,
-            CollectionExpression<?,A> other, A knownElement) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.contains(knownElement));
-        rv.add(expr.isEmpty());
-        rv.add(expr.isNotEmpty());
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size().gt(0));
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A> Collection<Predicate> array(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other,
-            A knownElement) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size().gt(0));
-        }
-        rv.add(expr.get(0).eq(knownElement));
-        return ImmutableList.copyOf(rv);
-    }
-
-    private <A extends Comparable<A>> Collection<Predicate> comparable(ComparableExpression<A> expr,
-            ComparableExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.addAll(exprFilters(expr, other, knownValue));
-        rv.add(expr.gt(other));
-        rv.add(expr.gt(knownValue));
-        rv.add(expr.goe(other));
-        rv.add(expr.goe(knownValue));
-        rv.add(expr.lt(other));
-        rv.add(expr.lt(knownValue));
-        rv.add(expr.loe(other));
-        rv.add(expr.loe(knownValue));
-
-//        rv.add(expr.in(IntervalImpl.create(knownValue, null)));
-//        rv.add(expr.in(IntervalImpl.create(null, knownValue)));
-
-        return ImmutableList.copyOf(rv);
-
-    }
-
-    private <A extends Comparable<A>> Collection<Predicate> dateOrTime(TemporalExpression<A> expr,
-            TemporalExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.add(expr.after(other));
-        rv.add(expr.after(knownValue));
-        rv.add(expr.before(other));
-        rv.add(expr.before(knownValue));
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Predicate> date(DateExpression<A> expr,
-            DateExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.addAll(comparable(expr, other, knownValue));
-        rv.addAll(dateOrTime(expr, other, knownValue));
-        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
-        rv.add(expr.month().eq(other.month()));
-        rv.add(expr.year().eq(other.year()));
-        rv.add(expr.yearMonth().eq(other.yearMonth()));
-        if (module.equals(Module.SQL) || module.equals(Module.COLLECTIONS)) {
-            if (target != Target.DERBY) {
-                rv.add(expr.yearWeek().eq(other.yearWeek()));
-            }
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Predicate> dateTime(DateTimeExpression<A> expr,
-            DateTimeExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.addAll(comparable(expr, other, knownValue));
-        rv.addAll(dateOrTime(expr, other, knownValue));
-        rv.add(expr.dayOfMonth().eq(1));
-        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
-
-        rv.add(expr.month().eq(1));
-        rv.add(expr.month().eq(other.month()));
-
-        rv.add(expr.year().eq(2000));
-        rv.add(expr.year().eq(other.year()));
-
-        rv.add(expr.yearMonth().eq(other.yearMonth()));
-
-        if (module.equals(Module.SQL) || module.equals(Module.COLLECTIONS)) {
-            if (target != Target.DERBY) {
-                rv.add(expr.yearWeek().eq(other.yearWeek()));
-            }
-        }
-
-        rv.add(expr.hour().eq(1));
-        rv.add(expr.hour().eq(other.hour()));
-
-        rv.add(expr.minute().eq(1));
-        rv.add(expr.minute().eq(other.minute()));
-
-        rv.add(expr.second().eq(1));
-        rv.add(expr.second().eq(other.second()));
-        return ImmutableList.copyOf(rv);
-    }
-
-    private <A> Collection<BooleanExpression> exprFilters(SimpleExpression<A> expr,
-            SimpleExpression<A> other, A knownValue) {
-        HashSet<BooleanExpression> rv = new HashSet<BooleanExpression>();
-        rv.add(expr.eq(other));
-        rv.add(expr.eq(knownValue));
-
-        rv.add(expr.ne(other));
-        rv.add(expr.ne(knownValue));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A, Q extends SimpleExpression<A>> Collection<Predicate> list(ListPath<A, Q> expr,
-            ListExpression<A, Q> other, A knownElement) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.addAll(collection(expr, other, knownElement));
-        rv.add(expr.get(0).eq(knownElement));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <K,V> Collection<Predicate> map(MapExpressionBase<K,V,?> expr,
-            MapExpression<K,V> other, K knownKey, V knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.containsKey(knownKey));
-        rv.add(expr.containsValue(knownValue));
-        rv.add(expr.get(knownKey).eq(knownValue));
-        rv.add(expr.get(knownKey).ne(knownValue));
-        rv.add(expr.isEmpty());
-        rv.add(expr.isNotEmpty());
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size().gt(0));
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Number & Comparable<A>> Collection<Predicate> numeric(NumberExpression<A> expr,
-            NumberExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        for (NumberExpression<?> num : projections.numeric(expr, other, knownValue, true)) {
-            rv.add(num.lt(expr));
-        }
-        rv.add(expr.ne(other));
-        rv.add(expr.ne(knownValue));
-        rv.add(expr.goe(other));
-        rv.add(expr.goe(knownValue));
-        rv.add(expr.gt(other));
-        rv.add(expr.gt(knownValue));
-        rv.add(expr.loe(other));
-        rv.add(expr.loe(knownValue));
-        rv.add(expr.lt(other));
-        rv.add(expr.lt(knownValue));
-
-        rv.add(expr.in(1,2,3));
-        rv.add(expr.in(1l,2l,3l));
-
-        if (expr.getType().equals(Integer.class)) {
-            NumberExpression<Integer> eint = (NumberExpression)expr;
-            rv.add(eint.between(1, 2));
-            rv.add(eint.notBetween(1, 2));
-            rv.add(eint.mod(5).eq(0));
-        } else if (expr.getType().equals(Double.class)) {
-            NumberExpression<Double> edouble = (NumberExpression)expr;
-            rv.add(edouble.between(1.0, 2.0));
-            rv.add(edouble.notBetween(1.0, 2.0));
-        } else if (expr.getType().equals(Long.class)) {
-            NumberExpression<Long> elong = (NumberExpression)expr;
-            rv.add(elong.mod(5l).eq(0l));
-        }
-
-//        rv.add(expr.in(IntervalImpl.create(0, 100)));
-
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A> Collection<Predicate> pathFilters(SimpleExpression<A> expr,
-            SimpleExpression<A> other, A knownValue) {
-        return Arrays.<Predicate>asList(
-             expr.isNull(),
-             expr.isNotNull()
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    public Collection<Predicate> string(StringExpression expr, StringExpression other,
-            String knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        if (expr instanceof Path && other instanceof Path) {
-            rv.addAll(pathFilters(expr, other, knownValue));
-        }
-        rv.addAll(comparable(expr, other, knownValue));
-        for (SimpleExpression<String> eq : projections.string(expr, other, knownValue)) {
-            rv.add(eq.eq(other));
-        }
-        rv.add(expr.between("A", "Z"));
-
-        rv.add(expr.charAt(0).eq(knownValue.charAt(0)));
-
-        rv.add(expr.notBetween("A", "Z"));
-
-        rv.add(expr.contains(other));
-        rv.add(expr.contains(knownValue.substring(0,1)));
-        rv.add(expr.contains(knownValue.substring(1,2)));
-
-        rv.add(expr.containsIgnoreCase(other));
-        rv.add(expr.containsIgnoreCase(knownValue.substring(0,1)));
-        rv.add(expr.containsIgnoreCase(knownValue.substring(1,2)));
-
-        rv.add(expr.endsWith(other));
-        rv.add(expr.endsWith(knownValue.substring(1)));
-        rv.add(expr.endsWith(knownValue.substring(2)));
-
-        rv.add(expr.equalsIgnoreCase(other));
-        rv.add(expr.equalsIgnoreCase(knownValue));
-
-        rv.add(expr.in(Arrays.asList(knownValue)));
-
-        rv.add(expr.indexOf(other).gt(0));
-        rv.add(expr.indexOf("X", 1).gt(0));
-        rv.add(expr.indexOf(knownValue).gt(0));
-
-        rv.add(expr.locate(other).gt(1));
-        rv.add(expr.locate("X", 2).gt(1));
-        rv.add(expr.locate(knownValue).gt(1));
-
-//        if (!module.equals(Module.HQL) && !module.equals(Module.JDOQL) && !module.equals(Module.SQL)) {
-//            rv.add(expr.lastIndexOf(other).gt(0));
-//            rv.add(expr.lastIndexOf(knownValue).gt(0));
-//        }
-
-        rv.add(expr.in("A","B","C"));
-
-        rv.add(expr.isEmpty());
-        rv.add(expr.isNotEmpty());
-
-        rv.add(expr.length().gt(0));
-
-        rv.add(expr.like(knownValue.substring(0,1)+"%"));
-        rv.add(expr.like("%"+knownValue.substring(1)));
-        rv.add(expr.like("%"+knownValue.substring(1,2)+"%"));
-
-        rv.add(expr.like(knownValue.substring(0,1)+"%", '!'));
-        rv.add(expr.like("%"+knownValue.substring(1), '!'));
-        rv.add(expr.like("%"+knownValue.substring(1,2)+"%", '!'));
-
-        rv.add(expr.notLike(knownValue.substring(0,1)+"%"));
-        rv.add(expr.notLike("%"+knownValue.substring(1)));
-        rv.add(expr.notLike("%"+knownValue.substring(1,2)+"%"));
-
-        if (!target.equals(Target.DERBY)
-         && !target.equals(Target.HSQLDB)
-         && !target.equals(Target.H2)
-         && !target.equals(Target.SQLITE)
-         && !target.equals(Target.SQLSERVER)) {
-            rv.add(expr.matches(knownValue.substring(0,1)+".*"));
-            rv.add(expr.matches(".*"+knownValue.substring(1)));
-            rv.add(expr.matches(".*"+knownValue.substring(1,2)+".*"));
-        }
-
-        rv.add(expr.notIn("A","B","C"));
-
-        rv.add(expr.notBetween("A", "Z"));
-        rv.add(expr.notBetween(other, other));
-
-        if (!target.equals(Target.DERBY) && !module.equals(Module.JDO)) {
-            // https://issues.apache.org/jira/browse/DERBY-4389
-            rv.add(new Coalesce<String>(String.class, expr, other).getValue().eq("xxx"));
-        }
-
-//        rv.add(expr.in(IntervalImpl.create("A", "Z")));
-
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Predicate> time(TimeExpression<A> expr,
-            TimeExpression<A> other, A knownValue) {
-        List<Predicate> rv = new ArrayList<Predicate>();
-        rv.addAll(comparable(expr, other, knownValue));
-        rv.addAll(dateOrTime(expr, other, knownValue));
-        rv.add(expr.hour().eq(other.hour()));
-        rv.add(expr.minute().eq(other.minute()));
-        rv.add(expr.second().eq(other.second()));
-        return ImmutableList.copyOf(rv);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/MatchingFiltersFactory.java b/querydsl-core/src/test/java/com/mysema/query/MatchingFiltersFactory.java
deleted file mode 100644
index 1cba70b4cc..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/MatchingFiltersFactory.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.ArrayExpression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.ListExpression;
-import com.mysema.query.types.expr.MapExpressionBase;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.path.ListPath;
-
-/**
- * @author tiwe
- *
- */
-public class MatchingFiltersFactory {
-
-    private final Module module;
-
-    private final Target target;
-
-    public MatchingFiltersFactory(Module module, Target target) {
-        this.module = module;
-        this.target = target;
-    }
-
-    public <A> Collection<Predicate> array(ArrayExpression<A[], A> expr,  
-            ArrayExpression<A[], A> other, A knownElement, A missingElement) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-//        rv.add(expr.isEmpty().not());
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size().gt(0));
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A> Collection<Predicate> collection(CollectionExpressionBase<?,A> expr,  
-            CollectionExpression<?,A> other, A knownElement, A missingElement) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.contains(knownElement));
-            rv.add(expr.contains(missingElement).not());
-        }
-        rv.add(expr.isEmpty().not());
-        rv.add(expr.isNotEmpty());
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <A extends Comparable> Collection<Predicate> comparable(ComparableExpression<A> expr,  
-            Expression<A> other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.eq(other));
-        rv.add(expr.goe(other));
-        rv.add(expr.loe(other));
-        rv.add(expr.ne(other).not());
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> date(DateExpression<java.sql.Date> expr, 
-            DateExpression<java.sql.Date> other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(comparable(expr, other));
-        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
-
-        if (!target.equals(Target.DERBY) && !module.equals(Module.JDO) && !target.equals(Target.ORACLE)
-                && (!target.equals(Target.POSTGRES) || !module.equals(Module.JPA))) {
-            rv.add(expr.dayOfWeek().eq(other.dayOfWeek ()));
-            rv.add(expr.dayOfYear().eq(other.dayOfYear()));
-            
-            if (!target.equals(Target.SQLSERVER) && !target.equals(Target.MYSQL) 
-                    && !target.equals(Target.CUBRID)
-                    && !target.equals(Target.POSTGRES) && !target.equals(Target.HSQLDB)) {
-                rv.add(expr.week().eq(other.week()));
-            }
-        }
-
-        rv.add(expr.month().eq(other.month()));
-        rv.add(expr.year().eq(other.year()));
-        rv.add(expr.yearMonth().eq(other.yearMonth()));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> date(DateExpression<java.sql.Date> expr, 
-            DateExpression<java.sql.Date> other, java.sql.Date knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(date(expr, other));
-        rv.addAll(date(expr, DateConstant.create(knownValue)));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> dateTime(DateTimeExpression<java.util.Date> expr, 
-            DateTimeExpression<java.util.Date> other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(comparable(expr, other));
-        rv.add(expr.milliSecond().eq(other.milliSecond()));
-        rv.add(expr.second().eq(other.second()));
-        rv.add(expr.minute().eq(other.minute()));
-        rv.add(expr.hour().eq(other.hour()));
-        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
-
-        if (!target.equals(Target.DERBY) && !module.equals(Module.JDO) && !target.equals(Target.ORACLE)
-                && (!target.equals(Target.POSTGRES) || !module.equals(Module.JPA))) {
-            rv.add(expr.dayOfWeek().eq(other.dayOfWeek ()));
-            rv.add(expr.dayOfYear().eq(other.dayOfYear()));
-            
-            if (!target.equals(Target.SQLSERVER) && !target.equals(Target.MYSQL) 
-                    && !target.equals(Target.CUBRID)
-                    && !target.equals(Target.POSTGRES) && !target.equals(Target.HSQLDB)) {
-                rv.add(expr.week().eq(other.week()));
-            }
-        }
-
-        rv.add(expr.month().eq(other.month()));
-        rv.add(expr.year().eq(other.year()));
-        rv.add(expr.yearMonth().eq(other.yearMonth()));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> dateTime(DateTimeExpression<java.util.Date> expr, 
-            DateTimeExpression<java.util.Date> other, java.util.Date knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(dateTime(expr, other));
-        rv.addAll(dateTime(expr, DateTimeConstant.create(knownValue)));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A,Q extends SimpleExpression<A>> Collection<Predicate> list(ListPath<A,Q> expr, 
-            ListExpression<A,Q> other, A knownElement, A missingElement) {
-        return collection(expr, other, knownElement, missingElement);
-    }
-
-    public <K,V> Collection<Predicate> map(MapExpressionBase<K,V,?> expr, 
-            MapExpression<K,V> other,  K knownKey, V knownValue, K missingKey, V missingValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.containsKey(knownKey));
-        rv.add(expr.containsKey(missingKey).not());
-        rv.add(expr.containsValue(knownValue));
-        rv.add(expr.containsValue(missingValue).not());
-        rv.add(expr.get(knownKey).eq(knownValue));
-        rv.add(expr.isEmpty().not());
-        rv.add(expr.isNotEmpty());
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A extends Number & Comparable<A>> Collection<Predicate> numeric( 
-            NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(numeric(expr, other));
-        rv.addAll(numeric(expr, NumberConstant.create(knownValue)));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A extends Number & Comparable<A>> Collection<Predicate> numeric( 
-            NumberExpression<A> expr, NumberExpression<A> other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.add(expr.eq(other));
-        rv.add(expr.goe(other));
-        rv.add(expr.gt(other.subtract(1)));
-        rv.add(expr.gt(other.subtract(2)));
-        rv.add(expr.loe(other));
-        rv.add(expr.lt(other.add(1)));
-        rv.add(expr.lt(other.add(2)));
-        rv.add(expr.ne(other).not());
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> string(StringExpression expr, StringExpression other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        if (module != Module.LUCENE) {
-            rv.addAll(comparable(expr, other));
-
-            rv.add(expr.charAt(0).eq(other.charAt(0)));
-            rv.add(expr.charAt(1).eq(other.charAt(1)));
-        }
-
-        rv.add(expr.contains(other));
-        rv.add(expr.contains(other.substring(0,1)));
-        rv.add(expr.contains(other.substring(0,2)));
-        rv.add(expr.contains(other.substring(1,2)));
-        rv.add(expr.contains(other.substring(1)));
-        rv.add(expr.contains(other.substring(2)));
-
-        rv.add(expr.containsIgnoreCase(other));
-        rv.add(expr.containsIgnoreCase(other.lower()));
-        rv.add(expr.containsIgnoreCase(other.upper()));
-        rv.add(expr.containsIgnoreCase(other.substring(0,1)));
-        rv.add(expr.containsIgnoreCase(other.substring(0,2).lower()));
-        rv.add(expr.containsIgnoreCase(other.substring(1,2).upper()));
-        rv.add(expr.containsIgnoreCase(other.substring(1).lower()));
-        rv.add(expr.containsIgnoreCase(other.substring(2).upper()));
-
-        rv.add(expr.endsWith(other));
-        rv.add(expr.endsWith(other.substring(1)));
-        rv.add(expr.endsWith(other.substring(2)));
-        
-        rv.add(expr.endsWithIgnoreCase(other));        
-        rv.add(expr.endsWithIgnoreCase(other.substring(1)));
-        rv.add(expr.endsWithIgnoreCase(other.substring(2)));
-
-        rv.add(expr.eq(other));
-        rv.add(expr.equalsIgnoreCase(other));
-
-        if (module != Module.LUCENE) {
-            rv.add(expr.indexOf(other).eq(0));            
-            rv.add(expr.locate(other).eq(1));
-        }
-
-        if (target != Target.DERBY && module != Module.LUCENE) {
-            rv.add(expr.indexOf(other.substring(1)).eq(1));
-            rv.add(expr.indexOf(other.substring(2)).eq(2));
-        }
-
-        if (module != Module.LUCENE) {
-            rv.add(expr.isEmpty().not());
-            rv.add(expr.isNotEmpty());
-        }
-
-        if (module != Module.LUCENE) {
-            rv.add(expr.length().eq(other.length()));
-            rv.add(expr.like(other));
-            
-            if (module != Module.JDO || other instanceof Constant<?>) {
-                rv.add(expr.like(other.substring(0,1).append("%")));
-                rv.add(expr.like(other.substring(0,1).append("%").append(other.substring(2))));
-                rv.add(expr.like(other.substring(1).prepend("%")));
-                rv.add(expr.like(other.substring(1,2).append("%").prepend("%")));    
-            }            
-        }
-
-        rv.add(expr.lower().eq(other.lower()));
-
-        if (module != Module.LUCENE) {
-            if (!module.equals(Module.SQL)
-            || (!target.equals(Target.HSQLDB)
-            && !target.equals(Target.H2)
-            && !target.equals(Target.DERBY)
-            && !target.equals(Target.SQLITE)
-            && !target.equals(Target.SQLSERVER))) {
-                
-                rv.add(expr.matches(other));
-                
-                if (module != Module.JDO || other instanceof Constant<?>) {
-                    rv.add(expr.matches(other.substring(0,1).append(".*")));
-                    rv.add(expr.matches(other.substring(0,1).append(".").append(other.substring(2))));
-                    rv.add(expr.matches(other.substring(1).prepend(".*")));
-                    rv.add(expr.matches(other.substring(1,2).prepend(".*").append(".*")));    
-                }                
-            }
-
-            rv.add(expr.ne(other));
-        }
-
-        rv.add(expr.startsWith(other));        
-        rv.add(expr.startsWith(other.substring(0,1)));        
-        rv.add(expr.startsWith(other.substring(0,2)));
-        
-        rv.add(expr.startsWithIgnoreCase(other));
-        rv.add(expr.startsWithIgnoreCase(other.substring(0,1)));
-        rv.add(expr.startsWithIgnoreCase(other.substring(0,2)));
-
-        if (module != Module.LUCENE) {
-            rv.add(expr.substring(0,1).eq(other.substring(0,1)));
-            rv.add(expr.substring(1,2).eq(other.substring(1,2)));
-            rv.add(expr.substring(1).eq(other.substring(1)));
-
-            rv.add(expr.trim().eq(other.trim()));
-        }
-
-        rv.add(expr.upper().eq(other.upper()));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> string(StringExpression expr, StringExpression other,  
-            String knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(string(expr, other));
-        rv.addAll(string(expr, StringConstant.create(knownValue)));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> time(TimeExpression<java.sql.Time> expr,  
-            TimeExpression<java.sql.Time> other) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(comparable(expr, other));
-        rv.add(expr.milliSecond().eq(other.milliSecond()));
-        rv.add(expr.second().eq(other.second()));
-        rv.add(expr.minute().eq(other.minute()));
-        rv.add(expr.hour().eq(other.hour()));
-        return ImmutableList.copyOf(rv);
-    }
-
-    public Collection<Predicate> time(TimeExpression<java.sql.Time> expr,  
-            TimeExpression<java.sql.Time> other, java.sql.Time knownValue) {
-        HashSet<Predicate> rv = new HashSet<Predicate>();
-        rv.addAll(time(expr, other));
-        rv.addAll(time(expr, TimeConstant.create(knownValue)));
-        return ImmutableList.copyOf(rv);
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/Module.java b/querydsl-core/src/test/java/com/mysema/query/Module.java
deleted file mode 100644
index 3d82da79ec..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/Module.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-/**
- * @author tiwe
- *
- */
-public enum Module{
-    /**
-     *
-     */
-    COLLECTIONS,
-    /**
-     *
-     */
-    JPA,
-    /**
-     *
-     */
-    JDO,
-    /**
-     *
-     */
-    RDFBEAN,
-    /**
-     *
-     */
-    SQL,
-    /**
-     *
-     */
-    LUCENE;
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/ProjectionsFactory.java b/querydsl-core/src/test/java/com/mysema/query/ProjectionsFactory.java
deleted file mode 100644
index 24cdfd973a..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/ProjectionsFactory.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.expr.ArrayExpression;
-import com.mysema.query.types.expr.CaseBuilder;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.ListExpression;
-import com.mysema.query.types.expr.MapExpressionBase;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.path.ListPath;
-
-/**
- * @author tiwe
- *
- */
-public class ProjectionsFactory {
-
-    private final Module module;
-
-    private final Target target;
-
-    public ProjectionsFactory(Module module, Target target) {
-        this.module = module;
-        this.target = target;
-    }
-
-    public <A> Collection<Expression<?>> array(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other, A knownElement) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size());
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A> Collection<Expression<?>> collection(CollectionExpressionBase<?,A> expr, CollectionExpression<?,A> other, A knownElement) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size());
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Expression<?>> date(DateExpression<A> expr, DateExpression<A> other, A knownValue) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        rv.add(expr.dayOfMonth());
-        rv.add(expr.month());
-        rv.add(expr.year());
-        rv.add(expr.yearMonth());
-
-        if (module != Module.COLLECTIONS && module != Module.RDFBEAN) {
-            rv.add(expr.min());
-            rv.add(expr.max());
-        }
-
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Expression<?>> dateTime(DateTimeExpression<A> expr, DateTimeExpression<A> other, A knownValue) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        rv.add(expr.dayOfMonth());
-        rv.add(expr.month());
-        rv.add(expr.year());
-        rv.add(expr.yearMonth());
-        rv.add(expr.hour());
-        rv.add(expr.minute());
-        rv.add(expr.second());
-
-        if (module != Module.COLLECTIONS && module != Module.RDFBEAN) {
-            rv.add(expr.min());
-            rv.add(expr.max());
-        }
-
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A,Q extends SimpleExpression<A>> Collection<Expression<?>> list(ListPath<A,Q> expr, ListExpression<A,Q> other, A knownElement) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        rv.add(expr.get(0));
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size());
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <K,V> Collection<Expression<?>> map(MapExpressionBase<K,V,?> expr, MapExpression<K,V> other, K knownKey, V knownValue) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        rv.add(expr.get(knownKey));
-        if (!module.equals(Module.RDFBEAN)) {
-            rv.add(expr.size());
-        }
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numeric(NumberExpression<A> expr, NumberExpression<A> other, A knownValue, boolean forFilter) {
-        HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
-        rv.addAll(numeric(expr, other, forFilter));
-        rv.addAll(numeric(expr, NumberConstant.create(knownValue), forFilter));
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numeric(NumberExpression<A> expr, NumberExpression<?> other, boolean forFilter) {
-        HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
-        rv.add(expr.abs());
-        rv.add(expr.add(other));
-        rv.add(expr.divide(other));     
-        
-        if (target != Target.HSQLDB) {
-            rv.add(expr.negate());    
-        }        
-        
-        rv.add(expr.multiply(other));
-        rv.add(expr.sqrt());
-        rv.add(expr.subtract(other));
-
-        if (!forFilter && module != Module.COLLECTIONS && module != Module.RDFBEAN) {
-            rv.add(expr.min());
-            rv.add(expr.max());
-            rv.add(expr.avg());
-            rv.add(expr.count());
-            rv.add(expr.countDistinct());
-        }
-
-        if (!(other instanceof Constant || module == Module.JDO || module == Module.RDFBEAN)) {
-            CaseBuilder cases = new CaseBuilder();
-            rv.add(NumberConstant.create(1).add(cases
-                .when(expr.gt(10)).then(expr)
-                .when(expr.between(0, 10)).then((NumberExpression)other)
-                .otherwise((NumberExpression)other)));
-
-            rv.add(expr
-                    .when((NumberExpression)other).then(expr)
-                    .otherwise((NumberExpression)other));
-        }
-        
-        return ImmutableList.copyOf(rv);
-    }
-
-    public <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numericCasts(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
-        if (!target.equals(Target.MYSQL)) {
-            HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
-            rv.add(expr.byteValue());
-            rv.add(expr.doubleValue());
-            rv.add(expr.floatValue());
-            rv.add(expr.intValue());
-            rv.add(expr.longValue());
-            rv.add(expr.shortValue());
-            return ImmutableList.copyOf(rv);
-        } else {
-            return Collections.emptySet();
-        }
-    }
-
-    public Collection<SimpleExpression<String>> string(StringExpression expr, StringExpression other, String knownValue) {
-        HashSet<SimpleExpression<String>> rv = new HashSet<SimpleExpression<String>>();
-        rv.addAll(stringProjections(expr, other));
-        rv.addAll(stringProjections(expr, StringConstant.create(knownValue)));
-        return rv;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Collection<SimpleExpression<String>> stringProjections(StringExpression expr, StringExpression other) {
-        HashSet<SimpleExpression<String>> rv = new HashSet<SimpleExpression<String>>();
-
-        rv.add(expr.append("Hello"));
-        rv.add(expr.append(other));
-
-        rv.add(expr.concat(other));
-        rv.add(expr.concat("Hello"));
-
-        rv.add(expr.lower());
-
-        rv.add(expr.prepend("Hello"));
-        rv.add(expr.prepend(other));
-
-        rv.add(expr.stringValue());
-
-        rv.add(expr.substring(1));
-        rv.add(expr.substring(0, 1));
-
-        if (!(other instanceof Constant || module == Module.JDO || module == Module.RDFBEAN)) {
-            CaseBuilder cases = new CaseBuilder();
-            rv.add(cases.when(expr.eq("A")).then(other)
-                        .when(expr.eq("B")).then(expr)
-                        .otherwise(other));
-
-            rv.add(expr.when("A").then(other)
-                       .when("B").then(expr)
-                       .otherwise(other));
-        }
-
-        rv.add(expr.trim());
-
-        rv.add(expr.upper());
-        
-        if (module != Module.JDO) {
-            rv.add(expr.nullif("xxx"));    
-        }        
-        
-        return ImmutableList.copyOf(rv);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <A extends Comparable> Collection<Expression<?>> time(TimeExpression<A> expr, TimeExpression<A> other, A knownValue) {
-        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
-        rv.add(expr.hour());
-        rv.add(expr.minute());
-        rv.add(expr.second());
-        return ImmutableList.copyOf(rv);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java b/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java
deleted file mode 100644
index 0870248e72..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.support.QueryBase;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.ArrayExpression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.ListExpression;
-import com.mysema.query.types.expr.MapExpressionBase;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.path.ListPath;
-
-/**
- * The Class StandardTest.
- *
- * @author tiwe
- */
-public abstract class QueryExecution {
-
-    private final List<String> errors = new ArrayList<String>();
-
-    private final List<String> failures = new ArrayList<String>();
-
-    private final MatchingFiltersFactory matchers;
-
-    private final ProjectionsFactory projections;
-
-    private final FilterFactory filters;
-
-    private boolean runFilters = true;
-
-    private boolean runProjections = true;
-
-    private boolean counts = true;
-
-    private int total;
-
-    public QueryExecution(Module module, Target target) {
-        projections = new ProjectionsFactory(module, target);
-        filters = new FilterFactory(projections, module, target);
-        matchers = new MatchingFiltersFactory(module, target);
-    }
-
-    public QueryExecution(ProjectionsFactory p, FilterFactory f, MatchingFiltersFactory m) {
-        projections = p;
-        filters = f;
-        matchers = m;
-    }
-
-    public void reset() {
-        errors.clear();
-        failures.clear();
-        total = 0;
-    }
-
-    private void runProjectionQueries(Collection<? extends Expression<?>> projections) {
-        if (this.runProjections) {
-            for (Expression<?> pr : projections) {
-                total++;
-                try{
-                    // projection
-                    runProjection(pr);
-
-                    // projection distinct
-                    runProjectionDistinct(pr);
-                } catch(Throwable t) {
-                    t.printStackTrace();
-                    t = addError(pr, t);
-                }
-            }
-        }
-    }
-
-    private Throwable addError(Expression<?> expr, Throwable throwable) {
-        StringBuilder error = new StringBuilder();
-        error.append(expr + " failed : \n");
-        error.append(" " + throwable.getClass().getName() + " : " + throwable.getMessage() + "\n");
-        if (throwable.getCause() != null) {
-            throwable = throwable.getCause();
-            error.append(" " + throwable.getClass().getName() + " : " + throwable.getMessage() + "\n");
-        }
-        errors.add(error.toString());
-        return throwable;
-    }
-
-    private void runFilterQueries(Collection<Predicate> filters, boolean matching) {
-        if (this.runFilters) {
-            for (Predicate f : filters) {
-                total++;
-                try{
-                    // filter
-                    int results = runFilter(f);
-
-                    // filter distinct
-                    runFilterDistinct(f);
-
-                    if (counts) {
-                        // count
-                        runCount(f);
-
-                        // count distinct
-                        runCountDistinct(f);
-                    }
-
-                    if (matching && results == 0) {
-                        failures.add(f + " failed");
-                    }
-
-                }catch(Throwable t) {
-                    t.printStackTrace();
-                    t = addError(f, t);
-                }
-            }
-        }
-    }
-
-    protected abstract Pair<Projectable, Expression<?>[]> createQuery();
-
-    protected abstract Pair<Projectable, Expression<?>[]> createQuery(Predicate filter);
-
-    private long runCount(Predicate f) {
-        Pair<Projectable, Expression<?>[]> p = createQuery(f);
-        try{
-            return p.getFirst().count();
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private long runCountDistinct(Predicate f) {
-        Pair<Projectable, Expression<?>[]> p = createQuery(f);
-        try{
-            ((QueryBase)p.getFirst()).distinct();
-            return p.getFirst().count();
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private int runFilter(Predicate f) {
-        Pair<Projectable, Expression<?>[]> p = createQuery(f);
-        try{
-            return p.getFirst().list(p.getSecond()).size();
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private int runFilterDistinct(Predicate f) {
-        Pair<Projectable, Expression<?>[]> p = createQuery(f);
-        try{
-            ((QueryBase)p.getFirst()).distinct();
-            return p.getFirst().list(p.getSecond()).size();
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private int runProjection(Expression<?> pr) {
-        Pair<Projectable, Expression<?>[]> p = createQuery();
-        try{
-            if (p.getSecond().length == 0) {
-                return p.getFirst().list(pr).size();
-            } else {
-                Expression<?>[] projection = new Expression[p.getSecond().length + 1];
-                projection[0] = pr;
-                System.arraycopy(p.getSecond(), 0, projection, 1, p.getSecond().length);
-                return p.getFirst().list(projection).size();
-            }
-
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private int runProjectionDistinct(Expression<?> pr) {
-        Pair<Projectable, Expression<?>[]> p = createQuery();
-        try{
-            ((QueryBase)p.getFirst()).distinct();
-            if (p.getSecond().length == 0) {
-                return p.getFirst().list(pr).size();
-            } else {
-                Expression<?>[] projection = new Expression[p.getSecond().length + 1];
-                projection[0] = pr;
-                System.arraycopy(p.getSecond(), 0, projection, 1, p.getSecond().length);
-                return p.getFirst().list(projection).size();
-            }
-
-        }finally{
-            close(p.getFirst());
-        }
-    }
-
-    private void close(Projectable p) {
-        if (p instanceof Closeable) {
-            try {
-                ((Closeable)p).close();
-            } catch (IOException e) {
-                throw new QueryException(e);
-            }
-        }
-    }
-
-    public final void report() {
-        if (!failures.isEmpty() || !errors.isEmpty()) {
-            // System.err logging
-            System.err.println(failures.size() + " failures");
-            for (String f : failures) {
-                System.err.println(f);
-            }
-            System.err.println();
-            System.err.println(errors.size() + " errors");
-            for (String e : errors) {
-                System.err.println(e);
-            }
-
-            // construct String for Assert.fail()
-            StringBuffer buffer = new StringBuffer("Failed with ");
-            if (!failures.isEmpty()) {
-                buffer.append(failures.size()).append(" failure(s) ");
-                if (!errors.isEmpty()) {
-                    buffer.append("and ");
-                }
-            }
-            if (!errors.isEmpty()) {
-                buffer.append(errors.size()).append(" error(s) ");
-            }
-            buffer.append("of ").append(total).append(" tests\n");
-            for (String f : failures) {
-                buffer.append(f + "\n");
-            }
-            for (String e : errors) {
-                buffer.append(e + "\n");
-            }
-            Assert.fail(buffer.toString());
-        } else {
-            System.out.println("Success with " + total + " tests");
-        }
-    }
-
-    public final QueryExecution noFilters() {
-        runFilters = false;
-        return this;
-    }
-
-    public final QueryExecution noProjections() {
-        runProjections = false;
-        return this;
-    }
-
-    public final QueryExecution noCounts() {
-        counts = false;
-        return this;
-    }
-
-    public final <A> void runArrayTests(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other, A knownElement, A missingElement) {
-        runFilterQueries(matchers.array(expr, other, knownElement, missingElement), true);
-        runFilterQueries(filters.array(expr, other, knownElement), false);
-        runProjectionQueries(projections.array(expr, other, knownElement));
-    }
-
-    public final void runBooleanTests(BooleanExpression expr, BooleanExpression other) {
-        runFilterQueries(filters.booleanFilters(expr, other), false);
-    }
-
-    public final <A> void runCollectionTests(CollectionExpressionBase<?,A> expr, CollectionExpression<?,A> other, A knownElement, A missingElement) {
-        runFilterQueries(matchers.collection(expr, other, knownElement, missingElement), true);
-        runFilterQueries(filters.collection(expr, other, knownElement), false);
-        runProjectionQueries(projections.collection(expr, other, knownElement));
-    }
-
-    public final void runDateTests(DateExpression<java.sql.Date> expr, DateExpression<java.sql.Date> other, java.sql.Date knownValue) {
-        runFilterQueries(matchers.date(expr, other, knownValue), true);
-        runFilterQueries(filters.date(expr, other, knownValue), false);
-        runProjectionQueries(projections.date(expr, other, knownValue));
-    }
-
-    public final void runDateTimeTests(DateTimeExpression<java.util.Date> expr, DateTimeExpression<java.util.Date> other, java.util.Date knownValue) {
-        runFilterQueries(matchers.dateTime(expr, other, knownValue), true);
-        runFilterQueries(filters.dateTime(expr, other, knownValue), false);
-        runProjectionQueries(projections.dateTime(expr, other, knownValue));
-    }
-
-    public final <A, Q extends SimpleExpression<A>> void runListTests(ListPath<A,Q> expr, ListExpression<A,Q> other, A knownElement, A missingElement) {
-        runFilterQueries(matchers.list(expr, other, knownElement, missingElement), true);
-        runFilterQueries(filters.list(expr, other, knownElement), false);
-        runProjectionQueries(projections.list(expr, other, knownElement));
-    }
-
-    public final <K,V> void runMapTests(MapExpressionBase<K,V,?> expr, MapExpression<K,V> other, K knownKey, V knownValue, K missingKey, V missingValue) {
-        runFilterQueries(matchers.map(expr, other, knownKey, knownValue, missingKey, missingValue), true);
-        runFilterQueries(filters.map(expr, other, knownKey, knownValue), false);
-        runProjectionQueries(projections.map(expr, other, knownKey, knownValue));
-    }
-
-    public final <A extends Number & Comparable<A>> void runNumericCasts(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
-        runProjectionQueries(projections.numericCasts(expr, other, knownValue));
-    }
-
-    public final <A extends Number & Comparable<A>> void runNumericTests(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
-        runFilterQueries(matchers.numeric(expr, other, knownValue), true);
-        runFilterQueries(filters.numeric(expr, other, knownValue), false);
-        runProjectionQueries(projections.numeric(expr, other, knownValue, false));
-    }
-
-    public final void runStringTests(StringExpression expr, StringExpression other, String knownValue) {
-        runFilterQueries(matchers.string(expr, other, knownValue), true);
-        runFilterQueries(filters.string(expr, other, knownValue), false);
-        runProjectionQueries(projections.string(expr, other, knownValue));
-    }
-
-    public final void runTimeTests(TimeExpression<java.sql.Time> expr, TimeExpression<java.sql.Time> other, java.sql.Time knownValue) {
-        runFilterQueries(matchers.time(expr, other, knownValue), true);
-        runFilterQueries(filters.time(expr, other, knownValue), false);
-        runProjectionQueries(projections.time(expr, other, knownValue));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryMetadaSerializationTest.java b/querydsl-core/src/test/java/com/mysema/query/QueryMetadaSerializationTest.java
deleted file mode 100644
index 02974354cf..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/QueryMetadaSerializationTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import org.junit.Test;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.util.ReflectionUtils;
-
-public class QueryMetadaSerializationTest {
-
-    private QueryMetadata metadata = new DefaultQueryMetadata();
-
-    @Test
-    public void Serialization() throws IOException, ClassNotFoundException{
-        StringPath expr = new StringPath("str");
-        metadata.addJoin(JoinType.DEFAULT, expr);
-        metadata.addFlag(new QueryFlag(Position.AFTER_FILTERS, ""));
-        metadata.addGroupBy(expr);
-        metadata.addHaving(expr.isEmpty());        
-//        metadata.getJoins().get(0).addFlag(new JoinFlag(""));
-        metadata.addJoinCondition(expr.isEmpty());
-        metadata.addOrderBy(expr.asc());
-        metadata.addProjection(expr);
-        metadata.addWhere(expr.isEmpty());
-        
-        // serialize metadata
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(baos);
-        out.writeObject(metadata);
-        out.close();
-        
-        // deserialize metadata
-        ByteArrayInputStream bain = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bain);
-        QueryMetadata  metadata2 = (QueryMetadata) in.readObject();
-        in.close();
-        
-        assertEquals(metadata.getFlags(), metadata2.getFlags());
-        assertEquals(metadata.getGroupBy().get(0), metadata2.getGroupBy().get(0));
-        assertEquals(metadata.getGroupBy(), metadata2.getGroupBy());
-        assertEquals(metadata.getHaving(), metadata2.getHaving());
-        assertEquals(metadata.getJoins(), metadata2.getJoins());
-        assertEquals(metadata.getModifiers(), metadata2.getModifiers());
-        assertEquals(metadata.getOrderBy(), metadata2.getOrderBy());
-        assertEquals(metadata.getParams(), metadata2.getParams());
-        assertEquals(metadata.getProjection(), metadata2.getProjection());
-        assertEquals(metadata.getWhere(), metadata2.getWhere());
-    }
-    
-    @Test
-    public void FullySerizable() {
-        Set<Class<?>> checked = new HashSet<Class<?>>();
-        checked.addAll(Arrays.<Class<?>>asList(Collection.class, List.class, Set.class, Map.class, 
-                Object.class, String.class, Class.class));
-        Stack<Class<?>> classes = new Stack<Class<?>>();
-        classes.addAll(Arrays.<Class<?>>asList(NumberPath.class, NumberOperation.class, 
-                NumberTemplate.class, BeanPath.class, DefaultQueryMetadata.class));
-        while (!classes.isEmpty()) {            
-            Class<?> clazz = classes.pop();
-            checked.add(clazz);
-            if (!Serializable.class.isAssignableFrom(clazz) && !clazz.isPrimitive()) {     
-                System.out.println(clazz.getName());
-                fail(clazz.getName() + " is not serializable");
-            }            
-            for (Field field : clazz.getDeclaredFields()) {
-                if (Modifier.isTransient(field.getModifiers())) {
-                    continue;
-                }
-                Set<Class<?>> types = new HashSet<Class<?>>(3);
-                types.add(field.getType());
-                if (field.getType().getSuperclass() != null) {
-                    types.add(field.getType().getSuperclass());    
-                }                
-                if (field.getType().getComponentType() != null) {
-                    types.add(field.getType().getComponentType());
-                }
-                if (Collection.class.isAssignableFrom(field.getType())) {
-                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 0)); 
-                } else if (Map.class.isAssignableFrom(field.getType())) {
-                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 0));
-                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 1));
-                }
-                types.removeAll(checked);
-                classes.addAll(types);
-            }
-        }
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java b/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java
deleted file mode 100644
index c9d47d2aad..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-public class QueryModifiersTest {
-
-    @Test
-    public void Limit() {
-        QueryModifiers modifiers = QueryModifiers.limit(12l);
-        assertEquals(Long.valueOf(12), modifiers.getLimit());
-        assertNull(modifiers.getOffset());
-        assertTrue(modifiers.isRestricting());
-    }
-
-    @Test
-    public void Offset() {
-        QueryModifiers modifiers = QueryModifiers.offset(12l);
-        assertEquals(Long.valueOf(12), modifiers.getOffset());
-        assertNull(modifiers.getLimit());
-        assertTrue(modifiers.isRestricting());
-    }
-
-    @Test
-    public void Both() {
-        QueryModifiers modifiers = new QueryModifiers(1l,2l);
-        assertEquals(Long.valueOf(1), modifiers.getLimit());
-        assertEquals(Long.valueOf(2), modifiers.getOffset());
-        assertTrue(modifiers.isRestricting());
-    }
-
-    @Test
-    public void Empty() {
-        QueryModifiers modifiers = new QueryModifiers(null, null);
-        assertNull(modifiers.getLimit());
-        assertNull(modifiers.getOffset());
-        assertFalse(modifiers.isRestricting());
-    }
-
-    @Test
-    public void HashCode() {
-        QueryModifiers modifiers1 = new QueryModifiers(null, null);
-        QueryModifiers modifiers2 = new QueryModifiers(1l, null);
-        QueryModifiers modifiers3 = new QueryModifiers(null, 1l);
-
-        assertEquals(modifiers1.hashCode(), QueryModifiers.EMPTY.hashCode());
-        assertEquals(modifiers2.hashCode(), QueryModifiers.limit(1l).hashCode());
-        assertEquals(modifiers3.hashCode(), QueryModifiers.offset(1l).hashCode());
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void illegalLimit() {
-        QueryModifiers.limit(-1);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void illegalOffset() {
-        QueryModifiers.offset(-1);
-    }
-    
-    @Test
-    public void SubList() {
-        List<Integer> ints = Arrays.asList(1,2,3,4,5);
-        assertEquals(Arrays.asList(3,4,5), QueryModifiers.offset(2).subList(ints));
-        assertEquals(Arrays.asList(1,2,3), QueryModifiers.limit(3).subList(ints));
-        assertEquals(Arrays.asList(2,3,4), new QueryModifiers(3l, 1l).subList(ints));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryMutability.java b/querydsl-core/src/test/java/com/mysema/query/QueryMutability.java
deleted file mode 100644
index c7d3675c95..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/QueryMutability.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import com.mysema.query.support.QueryBase;
-import com.mysema.query.types.Expression;
-import static org.junit.Assert.assertTrue;
-
-public final class QueryMutability<T extends QueryBase<T> & Projectable> {
-
-    private final T query;
-
-    private final QueryMetadata metadata;
-
-    public QueryMutability(T query) throws SecurityException,
-            NoSuchMethodException, IllegalArgumentException,
-            IllegalAccessException, InvocationTargetException {
-        this.query = query;
-        this.metadata = (QueryMetadata) query.getClass().getMethod("getMetadata").invoke(query);
-    }
-
-    public void test(Expression<?> p1, Expression<?> p2) throws IOException {
-        System.err.println("count");
-        query.count();
-        assertProjectionEmpty();
-
-        System.err.println("countDistinct");
-        query.distinct().count();
-        assertProjectionEmpty();
-
-        System.err.println("iterate");
-        query.iterate(p1);
-        assertProjectionEmpty();
-
-        query.iterate(p1, p2);
-        assertProjectionEmpty();
-
-        System.err.println("iterateDistinct");
-        query.distinct().iterate(p1);
-        assertProjectionEmpty();
-
-        query.distinct().iterate(p1, p2);
-        assertProjectionEmpty();
-
-        System.err.println("list");
-        query.list(p1);
-        assertProjectionEmpty();
-
-        query.list(p1, p2);
-        assertProjectionEmpty();
-
-        System.err.println("distinct list");
-        query.distinct().list(p1);
-        assertProjectionEmpty();
-
-        query.distinct().list(p1, p2);
-        assertProjectionEmpty();
-
-        System.err.println("listResults");
-        query.listResults(p1);
-        assertProjectionEmpty();
-
-        System.err.println("distinct listResults");
-        query.distinct().listResults(p1);
-        assertProjectionEmpty();
-
-        System.err.println("map");
-        query.map(p1, p2);
-        assertProjectionEmpty();
-
-        System.err.println("uniqueResult");
-        query.uniqueResult(p1);
-        assertProjectionEmpty();
-
-        query.uniqueResult(p1, p2);
-        assertProjectionEmpty();
-    }
-
-    private void assertProjectionEmpty() throws IOException{
-        assertTrue(metadata.getProjection().isEmpty());
-        if (query instanceof Closeable) {
-            ((Closeable)query).close();
-        }
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/SearchResultsTest.java b/querydsl-core/src/test/java/com/mysema/query/SearchResultsTest.java
deleted file mode 100644
index 1a9428bf04..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/SearchResultsTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Test;
-
-public class SearchResultsTest {
-
-    private List<Integer> list = Arrays.<Integer>asList(0,1,2,3,4,5,6,7,8,9);
-
-    private SearchResults<Integer> results = new SearchResults<Integer>(list,10l,0l,20);
-
-    @Test
-    public void GetResults() {
-        assertEquals(list, results.getResults());
-    }
-
-    @Test
-    public void GetTotal() {
-        assertEquals(20l , results.getTotal());
-    }
-
-    @Test
-    public void IsEmpty() {
-        assertFalse(results.isEmpty());
-    }
-
-    @Test
-    public void GetLimit() {
-        assertEquals(10l, results.getLimit());
-    }
-
-    @Test
-    public void GetOffset() {
-        assertEquals(0l, results.getOffset());
-    }
-
-    @Test
-    public void EmptyResults() {
-        SearchResults<Object> empty = SearchResults.emptyResults();
-        assertTrue(empty.isEmpty());
-        assertEquals(Long.MAX_VALUE, empty.getLimit());
-        assertEquals(0l, empty.getOffset());
-        assertEquals(0l, empty.getTotal());
-        assertEquals(Collections.emptyList(), empty.getResults());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java b/querydsl-core/src/test/java/com/mysema/query/StringConstant.java
deleted file mode 100644
index e16c52903d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.Locale;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-
-/**
- * StringConstant represents String constants
- *
- * @author tiwe
- *
- */
-final class StringConstant extends StringExpression implements Constant<String>{
-
-    private static final long serialVersionUID = 5182804405789674556L;
-    
-    public static StringExpression create(String str) {
-        return new StringConstant(str);
-    }
-
-    private final String constant;
-
-    @Nullable
-    private volatile NumberExpression<Integer> length;
-
-    @Nullable
-    private volatile StringExpression lower, trim, upper;
-
-    StringConstant(String constant) {
-        super(ConstantImpl.create(constant));
-        this.constant = constant;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public StringExpression append(Expression<String> s) {
-        if (s instanceof Constant) {
-            return append(((Constant<String>)s).getConstant());
-        } else {
-            return super.append(s);
-        }
-    }
-
-    @Override
-    public StringExpression append(String s) {
-        return new StringConstant(constant + s);
-    }
-
-    @Override
-    public SimpleExpression<Character> charAt(int i) {
-        return SimpleConstant.create(constant.charAt(i));
-    }
-
-    @Override
-    public StringExpression concat(String s) {
-        return append(s);
-    }
-
-    @Override
-    public BooleanExpression eq(String s) {
-        return BooleanConstant.create(constant.equals(s));
-    }
-
-    @Override
-    public BooleanExpression equalsIgnoreCase(String str) {
-        return BooleanConstant.create(constant.equalsIgnoreCase(str));
-    }
-
-    @Override
-    public String getConstant() {
-        return constant;
-    }
-
-    @Override
-    public BooleanExpression isEmpty() {
-        return BooleanConstant.create(constant.isEmpty());
-    }
-
-    @Override
-    public BooleanExpression isNotEmpty() {
-        return BooleanConstant.create(!constant.isEmpty());
-    }
-
-    @Override
-    public NumberExpression<Integer> length() {
-        if (length == null) {
-            length = NumberConstant.create(Integer.valueOf(constant.length()));
-        }
-        return length;
-    }
-
-    @Override
-    public StringExpression lower() {
-        if (lower == null) {
-            lower = new StringConstant(constant.toLowerCase(Locale.ENGLISH));
-        }
-        return lower;
-    }
-
-    @Override
-    public BooleanExpression matches(String pattern) {
-        return BooleanConstant.create(constant.matches(pattern));
-    }
-
-    @Override
-    public BooleanExpression ne(String s) {
-        return BooleanConstant.create(!constant.equals(s));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public StringExpression prepend(Expression<String> s) {
-        if (s instanceof Constant) {
-            return prepend(((Constant<String>)s).getConstant());
-        } else {
-            return super.prepend(s);
-        }
-    }
-
-    @Override
-    public StringExpression prepend(String s) {
-        return new StringConstant(s + constant);
-    }
-
-    @Override
-    public StringExpression substring(int beginIndex) {
-        return new StringConstant(constant.substring(beginIndex));
-    }
-
-    @Override
-    public StringExpression substring(int beginIndex, int endIndex) {
-        return new StringConstant(constant.substring(beginIndex, endIndex));
-    }
-
-    @Override
-    public StringExpression toLowerCase() {
-        return lower();
-    }
-
-    @Override
-    public StringExpression toUpperCase() {
-        return upper();
-    }
-
-    @Override
-    public StringExpression trim() {
-        if (trim == null) {
-            trim = new StringConstant(constant.trim());
-        }
-        return trim;
-    }
-
-    @Override
-    public StringExpression upper() {
-        if (upper == null) {
-            upper = new StringConstant(constant.toUpperCase(Locale.ENGLISH));
-        }
-        return upper;
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java b/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java
deleted file mode 100644
index af9bad35ac..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/alias/AliasTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Path;
-
-public class AliasTest {
-
-    @Test
-    public void Alias() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        Alias.alias(DomainType.class, $(domainType.getCollection()).any());
-    }
-    
-    @Test
-    public void ComparableEntity() {
-       ComparableEntity entity = Alias.alias(ComparableEntity.class);
-       Path<ComparableEntity> path = $(entity);
-       assertEquals(ComparableEntity.class, path.getType());
-    }
-        
-    @Test
-    public void ComparableEntity_Property() {
-       ComparableEntity entity = Alias.alias(ComparableEntity.class);
-       Path<String> propertyPath = $(entity.getProperty());
-       assertEquals(String.class, propertyPath.getType());
-       assertEquals("property", propertyPath.getMetadata().getName());
-    }
-    
-    @Test
-    public void BasicUsage() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals("lower(domainType.firstName)", $(domainType.getFirstName()).lower().toString());
-        assertEquals("domainType.age", $(domainType.getAge()).toString());
-        assertEquals("domainType.map.get(a)", $(domainType.getMap().get("a")).toString());
-        assertEquals("domainType.list.get(0)", $(domainType.getList().get(0)).toString());
-
-        assertEquals("domainType.bigDecimal", $(domainType.getBigDecimal()).toString());
-        assertEquals("domainType.bigInteger", $(domainType.getBigInteger()).toString());
-        assertEquals("domainType.byte", $(domainType.getByte()).toString());
-        assertEquals("domainType.collection", $(domainType.getCollection()).toString());
-        assertEquals("domainType.double", $(domainType.getDouble()).toString());
-        assertEquals("domainType.float", $(domainType.getFloat()).toString());
-        assertEquals("domainType.date", $(domainType.getDate()).toString());
-        assertEquals("domainType.date2", $(domainType.getDate2()).toString());
-        assertEquals("domainType.set", $(domainType.getSet()).toString());
-        assertEquals("domainType.short", $(domainType.getShort()).toString());
-        assertEquals("domainType.time", $(domainType.getTime()).toString());
-        assertEquals("domainType.timestamp", $(domainType.getTimestamp()).toString());
-        assertEquals("domainType.gender", $(domainType.getGender()).toString());
-    }
-    
-    @Test
-    public void GetAny() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals(DomainType.class, Alias.getAny(domainType).getType());
-        assertEquals(String.class, Alias.getAny(domainType.getFirstName()).getType());
-    }
-
-    @Test
-    public void OtherMethods() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals("domainType", domainType.toString());
-    }
-
-    @Test
-    public void Var() {
-        assertEquals("it", Alias.var().toString());
-        assertEquals("varInteger1", Alias.var(1).toString());
-        assertEquals("X", Alias.var("X").toString());
-        assertEquals("varMALE", Alias.var(Gender.MALE).toString());
-        assertEquals("varAliasTest_XXX", Alias.var(new AliasTest()).toString());
-    }
-    
-    @Override
-    public String toString() {
-        return "XXX";
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java b/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java
deleted file mode 100644
index bf33378a87..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/alias/CollectionTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.EntityPath;
-
-public class CollectionTest {
-    
-    @Test
-    public void CollectionUsage() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals("any(domainType.collection) = domainType", $(domainType.getCollection()).any().eq(domainType).toString());
-        assertEquals("any(domainType.set) = domainType", $(domainType.getSet()).any().eq(domainType).toString());
-        assertEquals("any(domainType.list) = domainType", $(domainType.getList()).any().eq(domainType).toString());
-        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList().get(0)).eq(domainType).toString());
-        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList()).get(0).eq(domainType).toString());
-        assertEquals("domainType.map.get(key) = domainType", $(domainType.getMap()).get("key").eq(domainType).toString());
-        
-        EntityPath<DomainType> domainTypePath = $(domainType);
-        assertEquals("domainType in domainType.collection", $(domainType.getCollection()).contains(domainTypePath).toString());
-    }
-    
-    @Test
-    public void CollectionUsage_Types() {
-        DomainType domainType = Alias.alias(DomainType.class);
-        assertEquals(DomainType.class, $(domainType.getCollection()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getSet()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getList()).any().getType());
-        assertEquals(DomainType.class, $(domainType.getMap()).get("key").getType());
-    }
-    
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/Gender.java b/querydsl-core/src/test/java/com/mysema/query/alias/Gender.java
deleted file mode 100644
index 179bbfca40..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/alias/Gender.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.alias;
-
-public enum Gender{
-    MALE,
-    FEMALE
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/A.java b/querydsl-core/src/test/java/com/mysema/query/domain/A.java
deleted file mode 100644
index 45308ff466..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/A.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class A {
-
-    public Tenant tenant;
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/AbstractEntity.java b/querydsl-core/src/test/java/com/mysema/query/domain/AbstractEntity.java
deleted file mode 100644
index d14bd55011..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/AbstractEntity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class AbstractEntity<T> extends GenericEntity<Integer, T>{
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/Animal.java b/querydsl-core/src/test/java/com/mysema/query/domain/Animal.java
deleted file mode 100644
index 297f37a89c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/Animal.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-
-/**
- * The Class Animal.
- */
-public class Animal {
-    private boolean alive;
-
-    private java.util.Date birthdate;
-
-    private int weight, toes;
-
-    private double bodyWeight;
-
-    private java.sql.Date dateField;
-
-    private int id;
-
-    private String name;
-
-    private java.sql.Time timeField;
-
-    public java.util.Date getBirthdate() {
-        return new java.util.Date(birthdate.getTime());
-    }
-
-    public double getBodyWeight() {
-        return bodyWeight;
-    }
-
-
-    public java.sql.Date getDateField() {
-        return new java.sql.Date(dateField.getTime());
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public java.sql.Time getTimeField() {
-        return timeField;
-    }
-
-    public int getToes() {
-        return toes;
-    }
-
-    public int getWeight() {
-        return weight;
-    }
-
-    public boolean isAlive() {
-        return alive;
-    }
-
-    public void setAlive(boolean alive) {
-        this.alive = alive;
-    }
-
-    public void setBirthdate(java.util.Date birthdate) {
-        this.birthdate = new java.util.Date(birthdate.getTime());
-    }
-
-    public void setBodyWeight(double bodyWeight) {
-        this.bodyWeight = bodyWeight;
-    }
-
-    public void setDateField(java.sql.Date dateField) {
-        this.dateField = new java.sql.Date(dateField.getTime());
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setTimeField(java.sql.Time timeField) {
-        this.timeField = timeField;
-    }
-
-    public void setToes(int toes) {
-        this.toes = toes;
-    }
-
-    public void setWeight(int weight) {
-        this.weight = weight;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/Cat.java b/querydsl-core/src/test/java/com/mysema/query/domain/Cat.java
deleted file mode 100644
index d76c1c351b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/Cat.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * The Class Cat.
- */
-public class Cat extends Animal {
-
-    private int breed;
-
-    private List<Cat> kittens = new ArrayList<Cat>();
-
-    private Set<Cat> kittensSet;
-
-    private Cat mate;
-
-    public Cat() {}
-
-    public Cat(String name, int id) {
-        this.setId(id);
-        this.setName( name);
-    }
-
-    public Cat(String name, int id, double bodyWeight) {
-        this(name, id);
-        this.setBodyWeight(bodyWeight);
-    }
-
-    public int getBreed() {
-        return breed;
-    }
-
-    public List<Cat> getKittens() {
-        return kittens;
-    }
-
-    public Cat getMate() {
-        return mate;
-    }
-
-    public void addKitten(Cat kitten) {
-        kittens.add(kitten);
-    }
-
-    public Set<Cat> getKittensSet() {
-        return kittensSet;
-    }
-
-    public void setKittensSet(Set<Cat> kittensSet) {
-        this.kittensSet = kittensSet;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/Company.java b/querydsl-core/src/test/java/com/mysema/query/domain/Company.java
deleted file mode 100644
index 093c8a56a0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/Company.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Company {
-    
-    private CompanyPK key;
-
-    public CompanyPK getKey() {
-        return key;
-    }
-
-    public void setKey(final CompanyPK aKey) {
-        this.key = aKey;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyPK.java b/querydsl-core/src/test/java/com/mysema/query/domain/CompanyPK.java
deleted file mode 100644
index 73846fcc2e..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyPK.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEmbeddable;
-
-@QueryEmbeddable
-public class CompanyPK {
-
-    private String id;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QAbstractEntity.java b/querydsl-core/src/test/java/com/mysema/query/domain/QAbstractEntity.java
deleted file mode 100644
index b16c859603..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QAbstractEntity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-
-
-/**
- * QAnimal is a Querydsl query type for Animal
- */
-@SuppressWarnings("unchecked")
-public class QAbstractEntity extends EntityPathBase<AbstractEntity> {
-
-    private static final long serialVersionUID = 781156670;
-
-    public static final QAbstractEntity animal = new QAbstractEntity("abstractEntity");
-    
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public QAbstractEntity(String variable) {
-        super(AbstractEntity.class, forVariable(variable));
-    }
-
-    public QAbstractEntity(BeanPath<? extends AbstractEntity<?>> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QAbstractEntity(PathMetadata<?> metadata) {
-        super(AbstractEntity.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QAnimal.java b/querydsl-core/src/test/java/com/mysema/query/domain/QAnimal.java
deleted file mode 100644
index 355acb797c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QAnimal.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-
-/**
- * QAnimal is a Querydsl query type for Animal
- */
-public class QAnimal extends EntityPathBase<Animal> {
-
-    private static final long serialVersionUID = 781156670;
-
-    public static final QAnimal animal = new QAnimal("animal");
-
-    public final BooleanPath alive = createBoolean("alive");
-
-    public final DateTimePath<java.util.Date> birthdate = createDateTime("birthdate", java.util.Date.class);
-
-    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
-
-    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
-
-    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
-
-    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
-
-    public QAnimal(String variable) {
-        super(Animal.class, forVariable(variable));
-    }
-
-    public QAnimal(BeanPath<? extends Animal> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QAnimal(PathMetadata<?> metadata) {
-        super(Animal.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCat.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCat.java
deleted file mode 100644
index 93d1526de2..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCat.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-
-/**
- * QCat is a Querydsl query type for Cat
- */
-public class QCat extends EntityPathBase<Cat> {
-
-    private static final long serialVersionUID = -528210988;
-
-    private static final PathInits INITS = PathInits.DIRECT;
-
-    public static final QCat cat = new QCat("cat");
-
-    public final QAnimal _super = new QAnimal(this);
-
-    //inherited
-    public final BooleanPath alive = _super.alive;
-
-    //inherited
-    public final DateTimePath<java.util.Date> birthdate = _super.birthdate;
-
-    //inherited
-    public final NumberPath<Double> bodyWeight = _super.bodyWeight;
-
-    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
-
-    //inherited
-    public final DatePath<java.sql.Date> dateField = _super.dateField;
-
-    //inherited
-    public final NumberPath<Integer> id = _super.id;
-
-    public final ListPath<Cat, QCat> kittens = this.<Cat,QCat>createList("kittens", Cat.class, QCat.class, PathInits.DIRECT);
-
-    public final SetPath<Cat, QCat> kittensSet = this.<Cat,QCat>createSet("kittensSet", Cat.class, QCat.class, PathInits.DIRECT);
-
-    public final QCat mate;
-
-    //inherited
-    public final StringPath name = _super.name;
-
-    //inherited
-    public final TimePath<java.sql.Time> timeField = _super.timeField;
-
-    //inherited
-    public final NumberPath<Integer> toes = _super.toes;
-
-    //inherited
-    public final NumberPath<Integer> weight = _super.weight;
-
-    public QCat(String variable) {
-        this(Cat.class, forVariable(variable), INITS);
-    }
-
-    public QCat(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QCat(PathMetadata<?> metadata, PathInits inits) {
-        this(Cat.class, metadata, inits);
-    }
-
-    public QCat(Class<? extends Cat> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.mate = inits.isInitialized("mate") ? new QCat(forProperty("mate"), inits.get("mate")) : null;
-    }
-
-    public QCat kittens(int index) {
-        return kittens.get(index);
-    }
-
-    public QCat kittens(Expression<Integer> index) {
-        return kittens.get(index);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCommonIdentifiable.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCommonIdentifiable.java
deleted file mode 100644
index 3476f26f13..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCommonIdentifiable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-
-/**
- * QCommonIdentifiable is a Querydsl query type for CommonIdentifiable
- */
-public class QCommonIdentifiable extends EntityPathBase<CommonIdentifiable<? extends java.io.Serializable>> {
-
-    private static final long serialVersionUID = 1818647030;
-
-    public static final QCommonIdentifiable commonIdentifiable = new QCommonIdentifiable("commonIdentifiable");
-
-    public final QCommonPersistence _super = new QCommonPersistence(this);
-
-    public final SimplePath<java.io.Serializable> id = createSimple("id", java.io.Serializable.class);
-
-    //inherited
-    public final NumberPath<Long> version = _super.version;
-
-    @SuppressWarnings("unchecked")
-    public QCommonIdentifiable(String variable) {
-        super((Class)CommonIdentifiable.class, forVariable(variable));
-    }
-
-    public QCommonIdentifiable(BeanPath<? extends CommonIdentifiable<? extends java.io.Serializable>> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    @SuppressWarnings("unchecked")
-    public QCommonIdentifiable(PathMetadata<?> metadata) {
-        super((Class)CommonIdentifiable.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCommonPersistence.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCommonPersistence.java
deleted file mode 100644
index 00963b2c7b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCommonPersistence.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-
-/**
- * QCommonPersistence is a Querydsl query type for CommonPersistence
- */
-public class QCommonPersistence extends BeanPath<CommonPersistence> implements EntityPath<CommonPersistence> {
-
-    private static final long serialVersionUID = -1494672641;
-
-    public final NumberPath<Long> version = createNumber("version", Long.class);
-
-    public QCommonPersistence(BeanPath<? extends CommonPersistence> entity) {
-        super(entity.getType(),entity.getMetadata());
-    }
-
-    public QCommonPersistence(PathMetadata<?> metadata) {
-        super(CommonPersistence.class, metadata);
-    }
-
-    @Override
-    public Object getMetadata(Path<?> property) {
-        return null;
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCompany.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCompany.java
deleted file mode 100644
index 16e5e973d6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCompany.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QCompany is a Querydsl query type for Company
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QCompany extends EntityPathBase<Company> {
-
-    private static final long serialVersionUID = 616888712;
-
-    private static final PathInits INITS = PathInits.DIRECT;
-
-    public static final QCompany company = new QCompany("company");
-
-    public final QCompanyPK key;
-
-    public QCompany(String variable) {
-        this(Company.class, forVariable(variable), INITS);
-    }
-
-    public QCompany(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QCompany(PathMetadata<?> metadata, PathInits inits) {
-        this(Company.class, metadata, inits);
-    }
-
-    public QCompany(Class<? extends Company> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.key = inits.isInitialized("key") ? new QCompanyPK(forProperty("key")) : null;
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroup.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroup.java
deleted file mode 100644
index d344fa9046..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroup.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QCompanyGroup is a Querydsl query type for CompanyGroup
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QCompanyGroup extends EntityPathBase<CompanyGroup> {
-
-    private static final long serialVersionUID = 144687575;
-
-    private static final PathInits INITS = PathInits.DIRECT;
-
-    public static final QCompanyGroup companyGroup = new QCompanyGroup("companyGroup");
-
-    public final QCompanyGroupPK key;
-
-    public final QCompany mainCompany;
-
-    public QCompanyGroup(String variable) {
-        this(CompanyGroup.class, forVariable(variable), INITS);
-    }
-
-    public QCompanyGroup(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QCompanyGroup(PathMetadata<?> metadata, PathInits inits) {
-        this(CompanyGroup.class, metadata, inits);
-    }
-
-    public QCompanyGroup(Class<? extends CompanyGroup> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.key = inits.isInitialized("key") ? new QCompanyGroupPK(forProperty("key")) : null;
-        this.mainCompany = inits.isInitialized("mainCompany") ? new QCompany(forProperty("mainCompany"), inits.get("mainCompany")) : null;
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroupPK.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroupPK.java
deleted file mode 100644
index 0292ffbad8..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyGroupPK.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QCompanyGroupPK is a Querydsl query type for CompanyGroupPK
- */
-@Generated("com.mysema.query.codegen.EmbeddableSerializer")
-public class QCompanyGroupPK extends BeanPath<CompanyGroupPK> {
-
-    private static final long serialVersionUID = 1605808658;
-
-    public static final QCompanyGroupPK companyGroupPK = new QCompanyGroupPK("companyGroupPK");
-
-    public final StringPath companyNumber = createString("companyNumber");
-
-    public final NumberPath<Long> companyType = createNumber("companyType", Long.class);
-
-    public QCompanyGroupPK(String variable) {
-        super(CompanyGroupPK.class, forVariable(variable));
-    }
-
-    public QCompanyGroupPK(Path<? extends CompanyGroupPK> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QCompanyGroupPK(PathMetadata<?> metadata) {
-        super(CompanyGroupPK.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyPK.java b/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyPK.java
deleted file mode 100644
index b4df1eac04..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QCompanyPK.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QCompanyPK is a Querydsl query type for CompanyPK
- */
-@Generated("com.mysema.query.codegen.EmbeddableSerializer")
-public class QCompanyPK extends BeanPath<CompanyPK> {
-
-    private static final long serialVersionUID = 124567939;
-
-    public static final QCompanyPK companyPK = new QCompanyPK("companyPK");
-
-    public final StringPath id = createString("id");
-
-    public QCompanyPK(String variable) {
-        super(CompanyPK.class, forVariable(variable));
-    }
-
-    public QCompanyPK(Path<? extends CompanyPK> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QCompanyPK(PathMetadata<?> metadata) {
-        super(CompanyPK.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QIdNamePair.java b/querydsl-core/src/test/java/com/mysema/query/domain/QIdNamePair.java
deleted file mode 100644
index 709d9f8b07..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QIdNamePair.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QIdNamePair is a Querydsl query type for IdNamePair
- */
-@Generated("com.mysema.query.codegen.EmbeddableSerializer")
-public class QIdNamePair extends BeanPath<IdNamePair<?>> {
-
-    private static final long serialVersionUID = -1491444395;
-
-    public static final QIdNamePair idNamePair = new QIdNamePair("idNamePair");
-
-    public final StringPath id = createString("id");
-
-    public final SimplePath<Object> name = createSimple("name", Object.class);
-
-    @SuppressWarnings("unchecked")
-    public QIdNamePair(String variable) {
-        super((Class)IdNamePair.class, forVariable(variable));
-    }
-
-    public QIdNamePair(Path<? extends IdNamePair<?>> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    @SuppressWarnings("unchecked")
-    public QIdNamePair(PathMetadata<?> metadata) {
-        super((Class)IdNamePair.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QMyEmbeddable.java b/querydsl-core/src/test/java/com/mysema/query/domain/QMyEmbeddable.java
deleted file mode 100644
index 4d58911fb6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QMyEmbeddable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QMyEmbeddable is a Querydsl query type for MyEmbeddable
- */
-@Generated("com.mysema.query.codegen.EmbeddableSerializer")
-public class QMyEmbeddable extends BeanPath<MyEmbeddable> {
-
-    private static final long serialVersionUID = -968265626;
-
-    public static final QMyEmbeddable myEmbeddable = new QMyEmbeddable("myEmbeddable");
-
-    public final NumberPath<Integer> foo = createNumber("foo", Integer.class);
-
-    public QMyEmbeddable(String variable) {
-        super(MyEmbeddable.class, forVariable(variable));
-    }
-
-    public QMyEmbeddable(BeanPath<? extends MyEmbeddable> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QMyEmbeddable(PathMetadata<?> metadata) {
-        super(MyEmbeddable.class, metadata);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QSuperSupertype.java b/querydsl-core/src/test/java/com/mysema/query/domain/QSuperSupertype.java
deleted file mode 100644
index b384f0579f..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QSuperSupertype.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-
-/**
- * QSuperSupertype is a Querydsl query type for SuperSupertype
- */
-public class QSuperSupertype extends EntityPathBase<SuperSupertype> {
-
-    private static final long serialVersionUID = 518341775;
-
-    public static final QSuperSupertype superSupertype = new QSuperSupertype("superSupertype");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<Long> version = createNumber("version", Long.class);
-
-    public QSuperSupertype(String variable) {
-        super(SuperSupertype.class, forVariable(variable));
-    }
-
-    public QSuperSupertype(BeanPath<? extends SuperSupertype> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QSuperSupertype(PathMetadata<?> metadata) {
-        super(SuperSupertype.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/QSuperclass.java b/querydsl-core/src/test/java/com/mysema/query/domain/QSuperclass.java
deleted file mode 100644
index 857d115aaa..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/QSuperclass.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mysema.query.domain;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QSuperclass is a Querydsl query type for Superclass
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QSuperclass extends EntityPathBase<Superclass> {
-
-    private static final long serialVersionUID = -1300377102;
-
-    public static final QSuperclass superclass = new QSuperclass("superclass");
-
-    public final ListPath<IdNamePair<String>, QIdNamePair> fooOfSuperclass = this.<IdNamePair<String>, QIdNamePair>createList("fooOfSuperclass", IdNamePair.class, QIdNamePair.class, PathInits.DIRECT);
-
-    public QSuperclass(String variable) {
-        super(Superclass.class, forVariable(variable));
-    }
-
-    public QSuperclass(Path<? extends Superclass> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QSuperclass(PathMetadata<?> metadata) {
-        super(Superclass.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/Superclass.java b/querydsl-core/src/test/java/com/mysema/query/domain/Superclass.java
deleted file mode 100644
index 71d2c8d4dc..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/Superclass.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mysema.query.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mysema.query.annotations.QueryEmbedded;
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Superclass {
-    
-    @QueryEmbedded
-    private List<IdNamePair<String>> fooOfSuperclass = new ArrayList<IdNamePair<String>>();
-
-    public List<IdNamePair<String>> getFooOfSuperclass() {
-        return fooOfSuperclass;
-    }
-
-    public void setFooOfSuperclass(List<IdNamePair<String>> fooOfSuperclass) {
-        this.fooOfSuperclass = fooOfSuperclass;
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/Tenant.java b/querydsl-core/src/test/java/com/mysema/query/domain/Tenant.java
deleted file mode 100644
index a02e5278d9..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain/Tenant.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Tenant {
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/AImpl.java b/querydsl-core/src/test/java/com/mysema/query/domain2/AImpl.java
deleted file mode 100644
index 0c5c6bf08c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/AImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain2;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class AImpl extends ABase {
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/QABase.java b/querydsl-core/src/test/java/com/mysema/query/domain2/QABase.java
deleted file mode 100644
index 3595a9631c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/QABase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mysema.query.domain2;
-
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QABase is a Querydsl query type for ABase
- */
-@Generated("com.mysema.query.codegen.SupertypeSerializer")
-public class QABase extends EntityPathBase<ABase> {
-
-    private static final long serialVersionUID = -261663299;
-
-    private static final PathInits INITS = PathInits.DIRECT;
-
-    public static final QABase aBase = new QABase("aBase");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final QTenantImpl tenant;
-
-    public QABase(String variable) {
-        this(ABase.class, forVariable(variable), INITS);
-    }
-
-    public QABase(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QABase(PathMetadata<?> metadata, PathInits inits) {
-        this(ABase.class, metadata, inits);
-    }
-
-    public QABase(Class<? extends ABase> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.tenant = inits.isInitialized("tenant") ? new QTenantImpl(forProperty("tenant")) : null;
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/QAImpl.java b/querydsl-core/src/test/java/com/mysema/query/domain2/QAImpl.java
deleted file mode 100644
index 18942e6813..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/QAImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.domain2;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QAImpl is a Querydsl query type for AImpl
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QAImpl extends EntityPathBase<AImpl> {
-
-    private static final long serialVersionUID = -261443316;
-
-    private static final PathInits INITS = PathInits.DIRECT;
-
-    public static final QAImpl aImpl = new QAImpl("aImpl");
-
-    public final QABase _super;
-
-    //inherited
-    public final NumberPath<Long> id;
-
-    // inherited
-    public final QTenantImpl tenant;
-
-    public QAImpl(String variable) {
-        this(AImpl.class, forVariable(variable), INITS);
-    }
-
-    public QAImpl(Path<? extends AImpl> entity) {
-        this(entity.getType(), entity.getMetadata(), INITS);
-    }
-    
-    public QAImpl(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QAImpl(PathMetadata<?> metadata, PathInits inits) {
-        this(AImpl.class, metadata, inits);
-    }
-
-    public QAImpl(Class<? extends AImpl> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this._super = new QABase(type, metadata, inits);
-        this.id = _super.id;
-        this.tenant = _super.tenant;
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/QTenantImpl.java b/querydsl-core/src/test/java/com/mysema/query/domain2/QTenantImpl.java
deleted file mode 100644
index 6d0317117a..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/QTenantImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mysema.query.domain2;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.*;
-
-import javax.annotation.Generated;
-
-
-/**
- * QTenantImpl is a Querydsl query type for TenantImpl
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QTenantImpl extends EntityPathBase<TenantImpl> {
-
-    private static final long serialVersionUID = -1856470561;
-
-    public static final QTenantImpl tenantImpl = new QTenantImpl("tenantImpl");
-
-    public QTenantImpl(String variable) {
-        super(TenantImpl.class, forVariable(variable));
-    }
-
-    public QTenantImpl(Path<? extends TenantImpl> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QTenantImpl(PathMetadata<?> metadata) {
-        super(TenantImpl.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/Tenant.java b/querydsl-core/src/test/java/com/mysema/query/domain2/Tenant.java
deleted file mode 100644
index 9b780280d1..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/Tenant.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.domain2;
-
-public interface Tenant {
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/TenantImpl.java b/querydsl-core/src/test/java/com/mysema/query/domain2/TenantImpl.java
deleted file mode 100644
index 85e81d9fe9..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/TenantImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.domain2;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class TenantImpl implements Tenant {
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/AbstractGroupByTest.java b/querydsl-core/src/test/java/com/mysema/query/group/AbstractGroupByTest.java
deleted file mode 100644
index 69af300270..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/AbstractGroupByTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.mysema.query.group;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.Projectable;
-import com.mysema.query.Tuple;
-import com.mysema.query.support.AbstractProjectable;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Projections;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-
-public abstract class AbstractGroupByTest {
-
-    protected static final Projectable BASIC_RESULTS = projectable(
-            row(null, "null post", 7, "comment 7"),
-            row(null, "null post", 8, "comment 8"),
-            row(1, "post 1", 1, "comment 1"),
-            row(1, "post 1", 2, "comment 2"),
-            row(1, "post 1", 3, "comment 3"),
-            row(2, "post 2", 4, "comment 4"),
-            row(2, "post 2", 5, "comment 5"),
-            row(3, "post 3", 6, "comment 6")
-    );
-
-    protected static final Projectable MAP_RESULTS = projectable(
-            row(null, "null post", pair(7, "comment 7")),
-            row(null, "null post", pair(8, "comment 8")),
-            row(1, "post 1", pair(1, "comment 1")),
-            row(1, "post 1", pair(2, "comment 2")),
-            row(1, "post 1", pair(3, "comment 3")),
-            row(2, "post 2", pair(5, "comment 5")),
-            row(3, "post 3", pair(6, "comment 6"))
-    );
-
-    protected static final Projectable MAP2_RESULTS = projectable(
-            row(null, pair(7, "comment 7")),
-            row(null,  pair(8, "comment 8")),
-            row(1, pair(1, "comment 1")),
-            row(1, pair(2, "comment 2")),
-            row(1, pair(3, "comment 3")),
-            row(2, pair(5, "comment 5")),
-            row(3, pair(6, "comment 6"))
-    );
-
-    protected static final Projectable MAP3_RESULTS = projectable(
-        row(1, pair(1, pair(1, "comment 1"))),
-        row(1, pair(1, pair(2, "comment 2"))),
-        row(2, pair(2, pair(5, "comment 5"))),
-        row(3, pair(3, pair(6, "comment 6"))),
-        row(null, pair(null, pair(7, "comment 7"))),
-        row(null, pair(null,  pair(8, "comment 8"))),
-        row(1, pair(1, pair(3, "comment 3")))
-    );
-
-    protected static final Projectable MAP4_RESULTS = projectable(
-        row(1, pair(pair(1, "comment 1"), "post 1")),
-        row(1, pair(pair(1, "comment 2"), "post 1")),
-        row(2, pair(pair(2, "comment 5"), "post 2")),
-        row(3, pair(pair(3, "comment 6"), "post 3")),
-        row(null, pair(pair(null, "comment 7"), "null post")),
-        row(null, pair(pair(null, "comment 8"), "null post")),
-        row(1, pair(pair(1, "comment 3"), "post 1"))
-    );
-
-    protected static final Projectable POST_W_COMMENTS = projectable(
-            row(null, null, "null post", comment(7)),
-            row(null, null, "null post", comment(8)),
-            row(1, 1, "post 1", comment(1)),
-            row(1, 1, "post 1", comment(2)),
-            row(1, 1, "post 1", comment(3)),
-            row(2, 2, "post 2", comment(5)),
-            row(3, 3, "post 3", comment(6))
-    );
-
-    protected static final Projectable POST_W_COMMENTS2 = projectable(
-            row(null, "null post", comment(7)),
-            row(null, "null post", comment(8)),
-            row(1, "post 1", comment(1)),
-            row(1, "post 1", comment(2)),
-            row(1, "post 1", comment(3)),
-            row(2, "post 2", comment(5)),
-            row(3, "post 3", comment(6))
-    );
-
-    // [ user.name, latestPost(post.id, post.name), latestPost.comments() ]
-    protected static final Projectable USERS_W_LATEST_POST_AND_COMMENTS = projectable(
-            row("Jane", "Jane", 2, "post 2", comment(4)),
-            row("Jane", "Jane", 2, "post 2", comment(5)),
-            row("John", "John", 1, "post 1", comment(1)),
-            row("John", "John", 1, "post 1", comment(2)),
-            row("John", "John", 1, "post 1", comment(3))
-    );
-
-//    protected static final Projectable USERS_W_LATEST_POST_AND_COMMENTS2 = projectable(
-//            row("John", 1, "post 1", comment(1)),
-//            row("Jane", 2, "post 2", comment(4)),
-//            row("John", 1, "post 1", comment(2)),
-//            row("Jane", 2, "post 2", comment(5)),
-//            row("John", 1, "post 1", comment(3))
-//    );
-
-    protected static final SimplePath<Post> post = new SimplePath<Post>(Post.class, "post");
-
-    protected static final SimplePath<User> user = new SimplePath<User>(User.class, "user");
-
-    protected static final SimplePath<Comment> comment = new SimplePath<Comment>(Comment.class, "comment");
-
-    protected static final NumberExpression<Integer> postId = new NumberPath<Integer>(Integer.class, post, "id");
-
-    protected static final StringExpression userName = new StringPath(user, "name");
-
-    protected static final StringExpression postName = new StringPath(post, "name");
-
-    protected static final NumberPath<Integer> commentId = new NumberPath<Integer>(Integer.class, comment, "id");
-
-    protected static final StringExpression commentText = new StringPath(comment, "text");
-
-    protected static final ConstructorExpression<Comment> qComment = Projections.constructor(Comment.class, commentId, commentText);
-
-    protected static <K, V> Pair<K, V> pair(K key, V value) {
-        return new Pair<K, V>(key, value);
-    }
-
-    protected Integer toInt(int i) {
-        return Integer.valueOf(i);
-    }
-
-    protected <T >Set<T> toSet(T... s) {
-        return new HashSet<T>(Arrays.asList(s));
-    }
-
-    protected static Comment comment(Integer id) {
-        return new Comment(id, "comment " + id);
-    }
-
-    protected static Projectable projectable(final Object[]... rows) {
-        return new AbstractProjectable() {
-            @Override
-            public <T> CloseableIterator<T> iterate(Expression<T> arg) {
-                return (CloseableIterator)iterator(rows);
-            }
-
-            @Override
-            public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-                return iterator(rows);
-            }
-            
-        };
-    }
-
-    protected static Object[] row(Object... row) {
-        return row;
-    }
-
-    protected static CloseableIterator<Tuple> iterator(Object[]... rows) {
-        List<Tuple> tuples = Lists.newArrayList();
-        for (Object[] row : rows) {
-            tuples.add(new MockTuple(row));
-        }
-        return new IteratorAdapter<Tuple>(tuples.iterator());
-    }
-
-    public abstract void Group_Order();
-
-    public abstract void First_Set_And_List();
-
-    public abstract void Group_By_Null();
-
-    public abstract void NoSuchElementException();
-
-    public abstract void ClassCastException();
-
-    public abstract void Map();
-
-    public abstract void Map2();
-    
-    public abstract void Map3();
-
-    public abstract void Map4();
-
-    public abstract void Array_Access();
-
-    public abstract void Transform_Results();
-
-    public abstract void Transform_As_Bean();
-
-    public abstract void OneToOneToMany_Projection();
-    
-    public abstract void OneToOneToMany_Projection_As_Bean();
-
-    public abstract void OneToOneToMany_Projection_As_Bean_And_Constructor();
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/Comment.java b/querydsl-core/src/test/java/com/mysema/query/group/Comment.java
deleted file mode 100644
index 3df1aa440b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/Comment.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-public class Comment {
-    
-    private  Integer id;
-    
-    private String text;
-
-    public Comment() {}
-    
-    public Comment(Integer id, String text) {
-        this.id = id;
-        this.text = text;
-    }
-    
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @Override
-    public int hashCode() {
-        return 31 * id.hashCode() + text.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof Comment) {
-            Comment other = (Comment) o;
-            return this.id.equals(other.id) && this.text.equals(other.text);
-        } else {
-            return false;
-        }
-    }
-    
-    @Override
-    public String toString() {
-        return id + ": " + text;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java b/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java
deleted file mode 100644
index e99ecfaf04..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.list;
-import static com.mysema.query.group.GroupBy.map;
-import static com.mysema.query.group.GroupBy.set;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Projections;
-
-public class GroupByIterateTest extends AbstractGroupByTest {
-
-    @Test
-    public void Group_Order() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS
-            .transform(groupBy(postId).iterate(postName, set(commentId)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-    }
-
-    @Test
-    public void First_Set_And_List() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS.transform(
-            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(1);
-        assertEquals(toInt(1), group.getOne(postId));
-        assertEquals("post 1", group.getOne(postName));
-        assertEquals(toSet(1, 2, 3), group.getSet(commentId));
-        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), group.getList(commentText));
-    }
-
-    @Test
-    public void Group_By_Null() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS.transform(
-            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(0);
-        assertNull(group.getOne(postId));
-        assertEquals("null post", group.getOne(postName));
-        assertEquals(toSet(7, 8), group.getSet(commentId));
-        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(commentText));
-
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void NoSuchElementException() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS.transform(
-            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(1);
-        group.getSet(qComment);
-    }
-
-    @Test(expected=ClassCastException.class)
-    public void ClassCastException() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS.transform(
-            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(1);
-        group.getList(commentId);
-    }
-
-    @Test
-    public void Map() {
-        CloseableIterator<Group> results_ = MAP_RESULTS.transform(
-            groupBy(postId).iterate(postName, map(commentId, commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(1);
-        Map<Integer, String> comments = group.getMap(commentId, commentText);
-        assertEquals(3, comments.size());
-        assertEquals("comment 2", comments.get(2));
-    }
-
-    @Test
-    public void Map2() {
-        CloseableIterator<Map<Integer, String>> results_ = MAP2_RESULTS.transform(
-            groupBy(postId).iterate(map(commentId, commentText)));
-        List<Map<Integer, String>> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Map<Integer, String> comments = results.get(1);
-        assertEquals(3, comments.size());
-        assertEquals("comment 2", comments.get(2));
-    }
-
-    @Test
-    public void Map22() {
-        CloseableIterator<Map<Integer, String>> results = MAP2_RESULTS.transform(
-            groupBy(postId).iterate(map(commentId, commentText)));
-        List<Map<Integer, String>> actual = IteratorAdapter.asList(results);
-
-        Object commentId = null;
-        Map<Integer, String> comments = null;
-        List<Map<Integer, String>> expected = new LinkedList<Map<Integer, String>>();
-        for (Iterator<Tuple> iterator = MAP2_RESULTS.iterate(); iterator.hasNext();) {
-            Tuple tuple = iterator.next();
-            Object[] array = tuple.toArray();
-
-            if (comments == null || !(commentId == array[0] || commentId != null && commentId.equals(array[0]))) {
-                comments = new LinkedHashMap<Integer,String>();
-                expected.add(comments);
-            }
-            commentId = array[0];
-            @SuppressWarnings("unchecked")
-            Pair<Integer, String> pair = (Pair<Integer, String>) array[1];
-
-            comments.put(pair.getFirst(), pair.getSecond());
-        }
-        assertEquals(expected.toString(), actual.toString());
-    }
-
-    @Test
-    public void Map3() {        
-        CloseableIterator<Map<Integer, Map<Integer, String>>> results = MAP3_RESULTS.transform(
-            groupBy(postId).iterate(map(postId, map(commentId, commentText))));
-        List<Map<Integer, Map<Integer, String>>> actual = IteratorAdapter.asList(results);
-        
-        Object postId = null;
-        Map<Integer, Map<Integer, String>> posts = null;
-        List<Map<Integer, Map<Integer, String>>> expected = new LinkedList<Map<Integer, Map<Integer, String>>>();
-        for (Iterator<Tuple> iterator = MAP3_RESULTS.iterate(); iterator.hasNext();) {
-            Tuple tuple = iterator.next();
-            Object[] array = tuple.toArray();
-            
-            if (posts == null || !(postId == array[0] || postId != null && postId.equals(array[0]))) {
-                posts = new LinkedHashMap<Integer, Map<Integer,String>>();
-                expected.add(posts);
-            }
-            postId = array[0];
-            @SuppressWarnings("unchecked")
-            Pair<Integer, Pair<Integer, String>> pair = (Pair<Integer, Pair<Integer, String>>) array[1];
-            Integer first = pair.getFirst();
-            Map<Integer, String> comments = posts.get(first);
-            if (comments == null) {
-                comments = new LinkedHashMap<Integer, String>();
-                posts.put(first, comments);
-            }
-            Pair<Integer, String> second = pair.getSecond();
-            comments.put(second.getFirst(), second.getSecond());
-        }      
-        assertEquals(expected.toString(), actual.toString());
-    }
-
-    @Test
-    public void Map4() {    
-        CloseableIterator<Map<Map<Integer, String>, String>> results = MAP4_RESULTS.transform(
-            groupBy(postId).iterate(map(map(postId, commentText), postName)));
-        List<Map<Map<Integer, String>, String>> actual = IteratorAdapter.asList(results);
-        
-        Object commentId = null;
-        Map<Map<Integer, String>, String> comments = null;
-        List<Map<Map<Integer, String>, String>> expected = new LinkedList<Map<Map<Integer, String>, String>>();
-        for (Iterator<Tuple> iterator = MAP4_RESULTS.iterate(); iterator.hasNext();) {
-            Tuple tuple = iterator.next();
-            Object[] array = tuple.toArray();
- 
-            if (comments == null || !(commentId == array[0] || commentId != null && commentId.equals(array[0]))) {
-                comments = new LinkedHashMap<Map<Integer, String>, String>();
-                expected.add(comments);
-            }
-            commentId = array[0];
-            @SuppressWarnings("unchecked")
-            Pair<Pair<Integer, String>, String> pair = (Pair<Pair<Integer, String>, String>) array[1];
-            Pair<Integer, String> first = pair.getFirst(); 
-            Map<Integer, String> posts = Collections.singletonMap(first.getFirst(), first.getSecond());
-            comments.put(posts, pair.getSecond());
-        }      
-        assertEquals(expected.toString(), actual.toString());
-    }
-
-    @Test
-    public void Array_Access() {
-        CloseableIterator<Group> results_ = BASIC_RESULTS.transform(
-            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
-        List<Group> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Group group = results.get(1);
-        Object[] array = group.toArray();
-        assertEquals(toInt(1), array[0]);
-        assertEquals("post 1", array[1]);
-        assertEquals(toSet(1, 2, 3), array[2]);
-        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), array[3]);
-    }
-
-    @Test
-    public void Transform_Results() {
-        CloseableIterator<Post> results_ = POST_W_COMMENTS.transform(
-                groupBy(postId).iterate(Projections.constructor(Post.class, postId, postName, set(qComment))));
-        List<Post> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(toInt(1), post.getId());
-        assertEquals("post 1", post.getName());
-        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
-    }
-
-    @Test
-    public void Transform_As_Bean() {
-        CloseableIterator<Post> results_ = POST_W_COMMENTS.transform(
-                groupBy(postId).iterate(Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
-        List<Post> results = IteratorAdapter.asList(results_);
-
-        assertEquals(4, results.size());
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(toInt(1), post.getId());
-        assertEquals("post 1", post.getName());
-        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
-    }
-
-
-    @Test
-    public void OneToOneToMany_Projection() {
-        CloseableIterator<User> results_ = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).iterate(Projections.constructor(User.class, userName,
-                Projections.constructor(Post.class, postId, postName, set(qComment)))));
-        List<User> results = IteratorAdapter.asList(results_);
-
-        assertEquals(2, results.size());
-
-        User user = results.get(0);
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean() {
-        CloseableIterator<User> results_ = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).iterate(Projections.bean(User.class, userName,
-                Projections.bean(Post.class, postId, postName, set(qComment).as("comments")).as("latestPost"))));
-        List<User> results = IteratorAdapter.asList(results_);
-
-        assertEquals(2, results.size());
-
-        User user = results.get(0);
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean_And_Constructor() {
-        CloseableIterator<User> results_ = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).iterate(Projections.bean(User.class, userName,
-                Projections.constructor(Post.class, postId, postName, set(qComment)).as("latestPost"))));
-        List<User> results = IteratorAdapter.asList(results_);
-
-        assertEquals(2, results.size());
-
-        User user = results.get(0);
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java b/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java
deleted file mode 100644
index ba970b3535..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.list;
-import static com.mysema.query.group.GroupBy.map;
-import static com.mysema.query.group.GroupBy.set;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Projections;
-
-public class GroupByMapTest extends AbstractGroupByTest {
-
-    @Test
-    public void Group_Order() {
-        Map<Integer, Group> results = BASIC_RESULTS
-            .transform(groupBy(postId).as(postName, set(commentId)));
-        assertEquals(4, results.size());
-    }
-
-    @Test
-    public void First_Set_And_List() {
-        Map<Integer, Group> results = BASIC_RESULTS.transform(
-            groupBy(postId).as(postName, set(commentId), list(commentText)));
-
-        Group group = results.get(1);
-        assertEquals(toInt(1), group.getOne(postId));
-        assertEquals("post 1", group.getOne(postName));
-        assertEquals(toSet(1, 2, 3), group.getSet(commentId));
-        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), group.getList(commentText));
-    }
-
-    @Test
-    public void Group_By_Null() {
-        Map<Integer, Group> results = BASIC_RESULTS.transform(
-            groupBy(postId).as(postName, set(commentId), list(commentText)));
-
-        Group group = results.get(null);
-        assertNull(group.getOne(postId));
-        assertEquals("null post", group.getOne(postName));
-        assertEquals(toSet(7, 8), group.getSet(commentId));
-        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(commentText));
-
-    }
-
-    @Test(expected=NoSuchElementException.class)
-    public void NoSuchElementException() {
-        Map<Integer, Group> results = BASIC_RESULTS.transform(
-            groupBy(postId).as(postName, set(commentId), list(commentText)));
-
-        Group group = results.get(1);
-        group.getSet(qComment);
-    }
-
-    @Test(expected=ClassCastException.class)
-    public void ClassCastException() {
-        Map<Integer, Group> results = BASIC_RESULTS.transform(
-            groupBy(postId).as(postName, set(commentId), list(commentText)));
-
-        Group group = results.get(1);
-        group.getList(commentId);
-    }
-
-    @Test
-    public void Map() {
-        Map<Integer, Group> results = MAP_RESULTS.transform(
-            groupBy(postId).as(postName, map(commentId, commentText)));
-
-        Group group = results.get(1);
-
-        Map<Integer, String> comments = group.getMap(commentId, commentText);
-        assertEquals(3, comments.size());
-        assertEquals("comment 2", comments.get(2));
-    }
-
-    @Test
-    public void Map2() {
-        Map<Integer, Map<Integer, String>> results = MAP2_RESULTS.transform(
-            groupBy(postId).as(map(commentId, commentText)));
-
-        Map<Integer, String> comments = results.get(1);
-        assertEquals(3, comments.size());
-        assertEquals("comment 2", comments.get(2));
-    }
-    
-    @Test
-    public void Map3() {        
-        Map<Integer, Map<Integer, Map<Integer, String>>> actual = MAP3_RESULTS.transform(
-            groupBy(postId).as(map(postId, map(commentId, commentText))));
-        
-        Map<Integer, Map<Integer, Map<Integer, String>>> expected = new LinkedHashMap<Integer, Map<Integer, Map<Integer, String>>>();
-        for (Iterator<Tuple> iterator = MAP3_RESULTS.iterate(); iterator.hasNext();) {
-            Tuple tuple = iterator.next();
-            Object[] array = tuple.toArray();
-            
-            Map<Integer, Map<Integer, String>> posts = expected.get(array[0]);
-            if (posts == null) {
-                posts = new LinkedHashMap<Integer, Map<Integer,String>>();
-                expected.put((Integer) array[0], posts);
-            }
-            @SuppressWarnings("unchecked")
-            Pair<Integer, Pair<Integer, String>> pair = (Pair<Integer, Pair<Integer, String>>) array[1];
-            Integer first = pair.getFirst();
-            Map<Integer, String> comments = posts.get(first);
-            if (comments == null) {
-                comments = new LinkedHashMap<Integer, String>();
-                posts.put(first, comments);
-            }
-            Pair<Integer, String> second = pair.getSecond();
-            comments.put(second.getFirst(), second.getSecond());
-        }      
-        assertEquals(expected.toString(), actual.toString());
-    }
-
-    @Test
-    public void Map4() {    
-        Map<Integer, Map<Map<Integer, String>, String>> actual = MAP4_RESULTS.transform(
-            groupBy(postId).as(map(map(postId, commentText), postName)));
-        
-        Map<Integer, Map<Map<Integer, String>, String>> expected = new LinkedHashMap<Integer, Map<Map<Integer, String>, String>>();
-        for (Iterator<Tuple> iterator = MAP4_RESULTS.iterate(); iterator.hasNext();) {
-            Tuple tuple = iterator.next();
-            Object[] array = tuple.toArray();
- 
-            Map<Map<Integer, String>, String> comments = expected.get(array[0]);
-            if (comments == null) {
-                comments = new LinkedHashMap<Map<Integer, String>, String>();
-                expected.put((Integer) array[0], comments);
-            }
-            @SuppressWarnings("unchecked")
-            Pair<Pair<Integer, String>, String> pair = (Pair<Pair<Integer, String>, String>) array[1];
-            Pair<Integer, String> first = pair.getFirst(); 
-            Map<Integer, String> posts = Collections.singletonMap(first.getFirst(), first.getSecond());
-            comments.put(posts, pair.getSecond());
-        }      
-        assertEquals(expected.toString(), actual.toString());
-    }
-
-    @Test
-    public void Array_Access() {
-        Map<Integer, Group> results = BASIC_RESULTS.transform(
-            groupBy(postId).as(postName, set(commentId), list(commentText)));
-
-        Group group = results.get(1);
-        Object[] array = group.toArray();
-        assertEquals(toInt(1), array[0]);
-        assertEquals("post 1", array[1]);
-        assertEquals(toSet(1, 2, 3), array[2]);
-        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), array[3]);
-    }
-
-    @Test
-    public void Transform_Results() {
-        Map<Integer, Post> results = POST_W_COMMENTS.transform(
-                groupBy(postId).as(Projections.constructor(Post.class, postId, postName, set(qComment))));
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(toInt(1), post.getId());
-        assertEquals("post 1", post.getName());
-        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
-    }
-
-    @Test
-    public void Transform_Via_GroupByProjection() {
-        Map<Integer, Post> results = POST_W_COMMENTS2.transform(
-                new GroupByProjection<Integer, Post>(postId, postName, set(qComment)) {
-                    @Override
-                    protected Post transform(Group group) {
-                        return new Post(
-                                group.getOne(postId),
-                                group.getOne(postName),
-                                group.getSet(qComment));
-
-                    }
-                });
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(toInt(1), post.getId());
-        assertEquals("post 1", post.getName());
-        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
-    }
-
-    @Test
-    public void Transform_As_Bean() {
-        Map<Integer, Post> results = POST_W_COMMENTS.transform(
-                groupBy(postId).as(Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
-
-        Post post = results.get(1);
-        assertNotNull(post);
-        assertEquals(toInt(1), post.getId());
-        assertEquals("post 1", post.getName());
-        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
-    }
-
-
-    @Test
-    public void OneToOneToMany_Projection() {
-        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).as(Projections.constructor(User.class, userName,
-                Projections.constructor(Post.class, postId, postName, set(qComment)))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean() {
-        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).as(Projections.bean(User.class, userName,
-                Projections.bean(Post.class, postId, postName, set(qComment).as("comments")).as("latestPost"))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-    @Test
-    public void OneToOneToMany_Projection_As_Bean_And_Constructor() {
-        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
-            groupBy(userName).as(Projections.bean(User.class, userName,
-                Projections.constructor(Post.class, postId, postName, set(qComment)).as("latestPost"))));
-
-        assertEquals(2, results.size());
-
-        User user = results.get("Jane");
-        Post post = user.getLatestPost();
-        assertEquals(toInt(2), post.getId());
-        assertEquals("post 2", post.getName());
-        assertEquals(toSet(comment(4), comment(5)), post.getComments());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/Post.java b/querydsl-core/src/test/java/com/mysema/query/group/Post.java
deleted file mode 100644
index 7c916fc2d9..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/Post.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-import java.util.Set;
-
-public class Post {
-    
-    private Integer id;
-    
-    private String name;
-    
-    private Set<Comment> comments;
-
-    public Post() {
-        
-    }
-    
-    public Post(Integer id, String name, Set<Comment> comments) {
-        this.id = id;
-        this.name = name;
-        this.comments = comments;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Set<Comment> getComments() {
-        return comments;
-    }
-
-    public void setComments(Set<Comment> comments) {
-        this.comments = comments;
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/User.java b/querydsl-core/src/test/java/com/mysema/query/group/User.java
deleted file mode 100644
index 2f73accf01..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/group/User.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.group;
-
-
-/**
- * TODO: How to project an inner group, i.e. [User] 1->1 [Post] 1->N [Comment]
- */
-public class User {
-    
-    private String name;
-    
-    private Post latestPost;
-
-    public User() {
-        
-    }
-    
-    public User(String name, Post latestPost) {
-        this.name = name;
-        this.latestPost = latestPost;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Post getLatestPost() {
-        return latestPost;
-    }
-
-    public void setLatestPost(Post latestPost) {
-        this.latestPost = latestPost;
-    }
-    
-    
-    
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java b/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java
deleted file mode 100644
index bd52a5b79c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.serialization;
-
-import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.Templates;
-
-public class DummySerializer extends SerializerBase<DummySerializer>{
-
-    public DummySerializer(Templates templates) {
-        super(templates);
-    }
-
-    @Override
-    public Void visit(SubQueryExpression<?> query, Void context) {
-        return null;
-    }
-
-    @Override
-    public Void visit(FactoryExpression<?> expr, Void context) {
-        return null;
-    }
-
-    @Override
-    public Void visit(ParamExpression<?> expr, Void context) {
-        return null;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java b/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java
deleted file mode 100644
index 6b0084a401..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.serialization;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.Field;
-
-import org.junit.Test;
-
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-
-public class JavaTemplatesTest {
-
-    @Test
-    public void Mappings() throws IllegalArgumentException, IllegalAccessException {
-        JavaTemplates templates = new JavaTemplates();
-        int matched = 0;
-        for (Field field : Ops.class.getFields()) {
-            if (Operator.class.isAssignableFrom(field.getType())) {
-                matched++;
-                Operator<?> operator = (Operator<?>) field.get(null);
-                assertNotNull(field.getName() + " missing", templates.getTemplate(operator));
-            }
-        }
-        assertTrue(matched > 0);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java b/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java
deleted file mode 100644
index f425cfb934..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.serialization;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-
-public class SerializerBaseTest {
-
-    @Test
-    public void test() {
-        DummySerializer serializer = new DummySerializer(new JavaTemplates());
-        StringPath strPath = new StringPath("str");
-        // path
-        serializer.handle(strPath);
-        // operation
-        serializer.handle(strPath.isNotNull());
-        // long path
-        serializer.handle(new PathBuilder<Object>(Object.class,"p").getList("l",Map.class).get(0));
-        // constant
-        serializer.handle(ConstantImpl.create(""));
-        //  custom
-        serializer.handle(TemplateExpressionImpl.create(Object.class, "xxx", ConstantImpl.create("")));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/AbstractProjectable.java b/querydsl-core/src/test/java/com/mysema/query/support/AbstractProjectable.java
deleted file mode 100644
index b850cdec13..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/AbstractProjectable.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.EmptyCloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.ResultTransformer;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-
-/**
- * @author tiwe
- *
- */
-public class AbstractProjectable implements Projectable {
-
-    @Override
-    public long count() {
-        return 0;
-    }
-
-    @Override
-    public boolean exists() {
-        return 0 < count();
-    }
-
-    @Override
-    public boolean notExists() {
-        return !exists();
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return new EmptyCloseableIterator<Tuple>();
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return new EmptyCloseableIterator<RT>();
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return null;
-    }
-    
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> projection) {
-        return new SearchResults<RT>(Collections.<RT>emptyList(), null, null, 0l);
-    }
-
-    @Override
-    public <K, V> Map<K, V> map(Expression<K> key, Expression<V> value) {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public Tuple singleResult(Expression<?>... args) {
-        return null;
-    }
-
-    @Override
-    public <RT> RT singleResult(Expression<RT> projection) {
-        return null;
-    }    
-
-    @Override
-    public <T> T transform(ResultTransformer<T> transformer) {
-        return transformer.transform(this);
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return null;
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> projection) {
-        return null;
-    }
-
-
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/CollectionAnyVisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/support/CollectionAnyVisitorTest.java
deleted file mode 100644
index 8d5a05a6cf..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/CollectionAnyVisitorTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.domain.QCat;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-
-public class CollectionAnyVisitorTest {
-
-    private QCat cat = QCat.cat;
-        
-    @Test
-    public void Path() {
-        assertMatches("cat_kittens.*", serialize(cat.kittens.any()));
-    }
-    
-    @Test
-    public void Longer_Path() {
-        assertMatches("cat_kittens.*\\.name", serialize(cat.kittens.any().name));
-    }
-    
-    @Test
-    public void Very_Long_Path() {
-        assertMatches("cat_kittens.*_kittens.*\\.name", serialize(cat.kittens.any().kittens.any().name));
-    }
-    
-    @Test
-    public void Simple_BooleanOperation() {        
-        Predicate predicate = cat.kittens.any().name.eq("Ruth123");        
-        assertMatches("cat_kittens.*\\.name = Ruth123", serialize(predicate));
-    }
-    
-    @Test
-    public void Simple_StringOperation() {        
-        Predicate predicate = cat.kittens.any().name.substring(1).eq("uth123");        
-        assertMatches("substring\\(cat_kittens.*\\.name,1\\) = uth123", serialize(predicate));
-    }
-    
-    @Test
-    public void And_Operation() {
-        Predicate predicate = cat.kittens.any().name.eq("Ruth123").and(cat.kittens.any().bodyWeight.gt(10.0));
-        assertMatches("cat_kittens.*\\.name = Ruth123 && cat_kittens.*\\.bodyWeight > 10.0", serialize(predicate));
-    }
-    
-    @Test
-    public void Template() {
-        Expression<Boolean> templateExpr = TemplateExpressionImpl.create(Boolean.class, "{0} = {1}", 
-                cat.kittens.any().name, ConstantImpl.create("Ruth123"));
-        assertMatches("cat_kittens.*\\.name = Ruth123", serialize(templateExpr));
-    }
-    
-    private String serialize(Expression<?> expression) {
-        CollectionAnyVisitor visitor = new CollectionAnyVisitor() {
-            @Override
-            protected Predicate exists(Context c, Predicate condition) {
-                return condition;
-            }            
-        };
-        Expression<?> transformed = expression.accept(visitor, new Context());
-        return transformed.toString();
-    }
-    
-    private static void assertMatches(String str1, String str2) {
-        assertTrue(str2, str2.matches(str1));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DetachableAdapterTest.java b/querydsl-core/src/test/java/com/mysema/query/support/DetachableAdapterTest.java
deleted file mode 100644
index 8c19cb1192..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DetachableAdapterTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.Detachable;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.EntityPath;
-
-
-@SuppressWarnings("unchecked")
-public class DetachableAdapterTest {
-    
-    private QueryMixin queryMixin;
-    
-    private Detachable detachable;
-    
-    @Before
-    public void setUp() {
-        queryMixin = new QueryMixin();
-        detachable = new DetachableAdapter(new DetachableMixin(queryMixin));
-    }
-    
-    @Test
-    public void Projections() {
-        DummyEntity e = Alias.alias(DummyEntity.class);
-        queryMixin.from((EntityPath)$(e));
-        assertNotNull(detachable.exists());
-        assertNotNull(detachable.notExists());
-        assertNotNull(detachable.list($(e)));
-        assertNotNull(detachable.unique($(e)));
-        assertNotNull(detachable.list($(e), $(e.getOther())));
-        assertNotNull(detachable.unique($(e), $(e.getOther())));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DetachableMixinTest.java b/querydsl-core/src/test/java/com/mysema/query/support/DetachableMixinTest.java
deleted file mode 100644
index 00dc28e1d3..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DetachableMixinTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.query.ListSubQuery;
-
-
-@SuppressWarnings("unchecked")
-public class DetachableMixinTest {
-
-    private QueryMixin query;
-
-    private DetachableMixin detachable;
-
-    @Before
-    public void setUp() {
-        query = new QueryMixin();
-        detachable = new DetachableMixin(query);
-    }
-
-    @Test
-    public void Projections() {
-        DummyEntity e = Alias.alias(DummyEntity.class);
-        query.from($(e));
-        assertNotNull(detachable.exists());
-        assertNotNull(detachable.notExists());
-        assertNotNull(detachable.list($(e)));
-        assertNotNull(detachable.unique($(e)));
-        assertNotNull(detachable.list($(e), $(e.getOther())));
-        assertNotNull(detachable.unique($(e), $(e.getOther())));
-    }
-
-    @Test
-    public void List_Objects() {
-        query.from(new PathImpl(Object.class, "x"));
-        ListSubQuery subQuery = detachable.list(new PathImpl(Object.class, "x"), "XXX");
-        List<? extends Expression<?>> exprs = subQuery.getMetadata().getProjection();
-        assertEquals(new PathImpl(Object.class, "x"), exprs.get(0));
-        assertEquals(ConstantImpl.create("XXX"), exprs.get(1));
-    }
-
-    @Test
-    public void Unique_Objects() {
-        query.from(new PathImpl(Object.class, "x"));
-        SubQueryExpression<?> subQuery = detachable.unique(new PathImpl(Object.class, "x"), "XXX");
-        List<? extends Expression<?>> exprs = subQuery.getMetadata().getProjection();
-        assertEquals(new PathImpl(Object.class, "x"), exprs.get(0));
-        assertEquals(ConstantImpl.create("XXX"), exprs.get(1));
-    }
-
-    @Test
-    public void Null_As_Template() {
-        query.from(new PathImpl(Object.class, "x"));
-        SubQueryExpression<?> subQuery = detachable.unique(new PathImpl(Object.class, "x"), null);
-        List<? extends Expression<?>> exprs = subQuery.getMetadata().getProjection();
-        assertEquals(new PathImpl(Object.class, "x"), exprs.get(0));
-        assertEquals(NullExpression.DEFAULT, exprs.get(1));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DetachableQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/support/DetachableQueryTest.java
deleted file mode 100644
index f7efd5bee0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DetachableQueryTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.EntityPath;
-
-@SuppressWarnings("unchecked")
-public class DetachableQueryTest {
-    
-    private QueryMixin query;
-    
-    private DetachableQuery detachable;
-    
-    @Before
-    public void setUp() {
-        query = new QueryMixin();
-        detachable = new DetachableQuery(query);
-    }
-    
-    @Test
-    public void Projections() {
-        DummyEntity e = Alias.alias(DummyEntity.class);
-        query.from((EntityPath)$(e));
-        assertNotNull(detachable.exists());
-        assertNotNull(detachable.notExists());
-        assertNotNull(detachable.list($(e)));
-        assertNotNull(detachable.unique($(e)));
-        assertNotNull(detachable.list($(e), $(e.getOther())));
-        assertNotNull(detachable.unique($(e), $(e.getOther())));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DummyEntity.java b/querydsl-core/src/test/java/com/mysema/query/support/DummyEntity.java
deleted file mode 100644
index 5b92827924..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DummyEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class DummyEntity {
-
-    private DummyEntity other;
-    
-    private List<DummyEntity> list;
-    
-    private Set<DummyEntity> set;
-    
-    private Map<String,DummyEntity> map;
-
-    public List<DummyEntity> getList() {
-        return list;
-    }
-
-    public Set<DummyEntity> getSet() {
-        return set;
-    }
-
-    public Map<String, DummyEntity> getMap() {
-        return map;
-    }
-
-    public DummyEntity getOther() {
-        return other;
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DummyProjectable.java b/querydsl-core/src/test/java/com/mysema/query/support/DummyProjectable.java
deleted file mode 100644
index 61b911ab69..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DummyProjectable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.EmptyCloseableIterator;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-
-public class DummyProjectable extends ProjectableQuery<DummyProjectable>{
-
-    public DummyProjectable(QueryMixin<DummyProjectable> queryMixin) {
-        super(queryMixin);
-    }
-
-    public DummyProjectable() {
-        super(new QueryMixin<DummyProjectable>());
-    }
-
-    @Override
-    public long count() {
-        return 0;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return new EmptyCloseableIterator<Tuple>();
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return new EmptyCloseableIterator<RT>();
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return SearchResults.emptyResults();
-    }
-    
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> projection) {
-        return SearchResults.emptyResults();
-    }
-
-    @Override
-    public boolean exists() {
-        return false;
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        if (queryMixin.getMetadata().getModifiers().getLimit() == null) {
-            limit(2);
-        }
-        return null;
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> projection) {
-        if (queryMixin.getMetadata().getModifiers().getLimit() == null) {
-            limit(2);
-        }
-        return null;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/DummyQuery.java b/querydsl-core/src/test/java/com/mysema/query/support/DummyQuery.java
deleted file mode 100644
index 4f77b3466e..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/DummyQuery.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import com.mysema.query.Query;
-
-public class DummyQuery extends QueryBase<DummyQuery> implements Query<DummyQuery>{
-
-    public DummyQuery() {
-        super(new QueryMixin<DummyQuery>());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/EnumConversionTest.java b/querydsl-core/src/test/java/com/mysema/query/support/EnumConversionTest.java
deleted file mode 100644
index b82f5c00a1..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/EnumConversionTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mysema.query.support;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.EnumPath;
-
-public class EnumConversionTest {
-
-    public enum Color {GREEN, BLUE, RED, YELLOW, BLACK, WHITE}
-
-    @Test
-    public void Name() {
-        EnumPath<Color> color = new EnumPath<Color>(Color.class, "path");
-        EnumConversion<Color> conv = new EnumConversion<Color>(color);
-        assertEquals(Color.BLUE, conv.newInstance("BLUE"));
-    }
-
-    @Test
-    public void Ordinal() {
-        EnumPath<Color> color = new EnumPath<Color>(Color.class, "path");
-        EnumConversion<Color> conv = new EnumConversion<Color>(color);
-        assertEquals(Color.RED, conv.newInstance(2));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/ExpressionsTest.java b/querydsl-core/src/test/java/com/mysema/query/support/ExpressionsTest.java
deleted file mode 100644
index 8cbf8fe5ff..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/ExpressionsTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static org.junit.Assert.assertEquals;
-
-import java.sql.Time;
-import java.util.Date;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.StringPath;
-
-public class ExpressionsTest {
-
-    private static final StringPath str = new StringPath("str");
-    
-    private static final BooleanExpression a = new BooleanPath("a"), b = new BooleanPath("b");
-    
-    @Test
-    public void As() {
-        assertEquals("null as str", Expressions.as(null, str).toString());
-        assertEquals("s as str", Expressions.as(new StringPath("s"), str).toString());
-    }
-    
-    @Test
-    public void AllOf() {
-        assertEquals("a && b", Expressions.allOf(a, b).toString());
-    }
-    
-    @Test
-    public void AllOf_With_Nulls() {
-        assertEquals("a && b", Expressions.allOf(a, b, null).toString());        
-        assertEquals("a", Expressions.allOf(a, null).toString());
-        assertEquals("a", Expressions.allOf(null, a).toString());
-    }
-
-    @Test
-    public void AnyOf() {
-        assertEquals("a || b", Expressions.anyOf(a, b).toString());
-    }
-    
-    @Test
-    public void AnyOf_With_Nulls() {
-        assertEquals("a || b", Expressions.anyOf(a, b, null).toString());       
-        assertEquals("a", Expressions.anyOf(a, null).toString());
-        assertEquals("a", Expressions.anyOf(null, a).toString());
-    }
-
-    @Test
-    public void Constant() {
-        assertEquals("X", Expressions.constant("X").toString());
-    }
-
-    @Test
-    public void Constant_As() {
-        assertEquals("str as str", Expressions.constantAs("str", str).toString());
-    }
-    
-    @Test
-    public void Template() {
-        assertEquals("a && b", Expressions.template(Object.class, "{0} && {1}", a, b).toString());
-    }
-
-    @Test
-    public void ComparableTemplate() {
-        assertEquals("a && b", 
-                Expressions.comparableTemplate(Boolean.class, "{0} && {1}", a, b).toString());
-    }
-
-    @Test
-    public void NumberTemplate() {
-        assertEquals("1", Expressions.numberTemplate(Integer.class, "1").toString());
-    }
-
-    @Test
-    public void StringTemplate() {
-        assertEquals("X", Expressions.stringTemplate("X").toString());
-    }
-
-    @Test
-    public void BooleanTemplate() {
-        assertEquals("a && b", Expressions.booleanTemplate("{0} && {1}", a, b).toString());
-    }
-
-    @Test
-    public void SubQuery() {
-        // TODO
-    }
-
-    @Test
-    public void Operation() {
-        assertEquals("a && b", Expressions.operation(Boolean.class, Ops.AND, a, b).toString());
-    }
-
-    @Test
-    public void Predicate() {
-        assertEquals("a && b", Expressions.predicate(Ops.AND, a, b).toString());
-    }
-    
-    @Test
-    public void PathClassOfTString() {
-        assertEquals("variable", Expressions.path(String.class, "variable").toString());
-    }
-
-    @Test
-    public void PathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.path(String.class, 
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void ComparablePathClassOfTString() {
-        assertEquals("variable", Expressions.comparablePath(String.class, "variable").toString());
-    }
-
-    @Test
-    public void ComparablePathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.comparablePath(String.class, 
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void DatePathClassOfTString() {
-        assertEquals("variable", Expressions.datePath(Date.class, "variable").toString());   
-    }
-
-    @Test
-    public void DatePathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.datePath(Date.class, 
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void DateTimePathClassOfTString() {
-        assertEquals("variable", Expressions.dateTimePath(Date.class, "variable").toString());
-    }
-
-    @Test
-    public void DateTimePathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.dateTimePath(Date.class,
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void TimePathClassOfTString() {
-        assertEquals("variable", Expressions.timePath(Date.class, "variable").toString());
-    }
-
-    @Test
-    public void TimePathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.timePath(Date.class, 
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void NumberPathClassOfTString() {
-        assertEquals("variable", Expressions.numberPath(Integer.class, "variable").toString());
-    }
-
-    @Test
-    public void NumberPathClassOfTPathOfQString() {
-        assertEquals("variable.property", Expressions.numberPath(Integer.class, 
-                Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void StringPathString() {
-        assertEquals("variable", Expressions.stringPath("variable").toString());
-    }
-
-    @Test
-    public void StringPathPathOfQString() {
-        assertEquals("variable.property", 
-                Expressions.stringPath(Expressions.path(Object.class, "variable"), "property").toString());
-    }
-
-    @Test
-    public void StringOperation() {
-        assertEquals("substring(str,2)", 
-                Expressions.stringOperation(Ops.SUBSTR_1ARG, str, ConstantImpl.create(2)).toString());
-    }
-    
-    @Test
-    public void BooleanPathString() {
-        assertEquals("variable", Expressions.booleanPath("variable").toString());
-    }
-
-    @Test
-    public void BooleanPathPathOfQString() {
-        assertEquals("variable.property", 
-                Expressions.booleanPath(Expressions.path(Object.class, "variable"), "property").toString());
-    }
-    
-    @Test
-    public void BooleanOperation() {
-        assertEquals("a && b", Expressions.booleanOperation(Ops.AND, a, b).toString());
-    }
-    
-    @Test
-    public void ComparableOperation() {
-        assertEquals("a && b", Expressions.comparableOperation(Boolean.class, Ops.AND, a, b).toString());
-    }
-    
-    @Test
-    public void DateOperation() {
-        assertEquals("current_date()", 
-                Expressions.dateOperation(Date.class, Ops.DateTimeOps.CURRENT_DATE).toString());
-    }
-    
-    @Test
-    public void DateTimeOperation() {
-        assertEquals("current_timestamp()", 
-                Expressions.dateTimeOperation(Date.class, Ops.DateTimeOps.CURRENT_TIMESTAMP).toString());
-    }
-    
-    @Test
-    public void TimeOperation() {
-        assertEquals("current_time()", 
-                Expressions.timeOperation(Time.class, Ops.DateTimeOps.CURRENT_TIME).toString());
-    }
-    
-    @Test
-    public void Cases() {
-        // TODO
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/ListAccessVisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/support/ListAccessVisitorTest.java
deleted file mode 100644
index 0f3c16c445..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/ListAccessVisitorTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.domain.QCat;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-
-public class ListAccessVisitorTest {
-
-    private final QCat cat = QCat.cat;
-    
-    @Test
-    public void Path() {
-        assertEquals("cat_kittens_0", serialize(cat.kittens.get(0)));
-    }
-    
-    @Test
-    public void Longer_Path() {
-        assertEquals("cat_kittens_0.name", serialize(cat.kittens.get(0).name));
-    }
-    
-    @Test
-    public void Very_Long_Path() {
-        assertEquals("cat_kittens_0_kittens_1.name", serialize(cat.kittens.get(0).kittens.get(1).name));
-    }
-    
-    @Test
-    public void Simple_BooleanOperation() {        
-        Predicate predicate = cat.kittens.get(0).name.eq("Ruth123");        
-        assertEquals("cat_kittens_0.name = Ruth123", serialize(predicate));
-    }
-    
-    @Test
-    public void Simple_StringOperation() {        
-        Predicate predicate = cat.kittens.get(0).name.substring(1).eq("uth123");        
-        assertEquals("substring(cat_kittens_0.name,1) = uth123", serialize(predicate));
-    }
-    
-    @Test
-    public void And_Operation() {
-        Predicate predicate = cat.kittens.get(0).name.eq("Ruth123").and(cat.kittens.get(1).bodyWeight.gt(10.0));
-        assertEquals("cat_kittens_0.name = Ruth123 && cat_kittens_1.bodyWeight > 10.0", serialize(predicate));
-    }
-    
-    @Test
-    public void Template() {
-        Expression<Boolean> templateExpr = TemplateExpressionImpl.create(Boolean.class, "{0} = {1}", 
-                cat.kittens.get(0).name, ConstantImpl.create("Ruth123"));
-        assertEquals("cat_kittens_0.name = Ruth123", serialize(templateExpr));
-    }
-    
-    private String serialize(Expression<?> expression) {
-        ListAccessVisitor visitor = new ListAccessVisitor() {
-            @Override
-            protected Predicate exists(Context c, Predicate condition) {
-                return condition;
-            }            
-        };
-        Expression<?> transformed = expression.accept(visitor, new Context());
-        return transformed.toString();
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java b/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java
deleted file mode 100644
index 76d1f3011f..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mysema.query.support;
-
-import com.mysema.testutil.Benchmark;
-import com.mysema.testutil.Runner;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class NormalizationTest {
-
-    @Test
-    public void Performance() throws Exception {
-        Runner.run("NormalizationTest Performance", new Benchmark() {
-
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {
-                    Normalization.normalize("select name from companies where id = ?");
-                }
-            }
-        });
-    }
-
-    @Test
-    public void Variables() {
-        assertEquals("var1 + 3", Normalization.normalize("var1 + 3"));
-    }
-
-    @Test
-    public void Normalize_Addition() {
-        assertEquals("3", Normalization.normalize("1+2"));
-        assertEquals("where 3 = 3", Normalization.normalize("where 1+2 = 3"));
-        assertEquals("where 3.3 = 3.3", Normalization.normalize("where 1.1+2.2 = 3.3"));
-        assertEquals("where 3.3 = 3.3", Normalization.normalize("where 1.1 + 2.2 = 3.3"));
-    }
-
-    @Test
-    public void Normalize_Subtraction() {
-        assertEquals("3", Normalization.normalize("5-2"));
-        assertEquals("where 3 = 3", Normalization.normalize("where 5-2 = 3"));
-        assertEquals("where 3.3 = 3.3", Normalization.normalize("where 5.5-2.2 = 3.3"));
-        assertEquals("where 3.3 = 3.3", Normalization.normalize("where 5.5 - 2.2 = 3.3"));
-    }
-
-    @Test
-    public void Normalize_Multiplication() {
-        assertEquals("10", Normalization.normalize("5*2"));
-        assertEquals("where 10 = 10", Normalization.normalize("where 5*2 = 10"));
-        assertEquals("where 11 = 11", Normalization.normalize("where 5.5*2 = 11"));
-        assertEquals("where 10.8 = 10.8", Normalization.normalize("where 5.4 * 2 = 10.8"));
-        assertEquals("where 9 = 9 and 13 = 13", Normalization.normalize("where 2 * 3 + 3 = 9 and 5 + 4 * 2 = 13"));
-    }
-
-    @Test
-    public void Normalize_Division() {
-        assertEquals("2.5", Normalization.normalize("5/2"));
-        assertEquals("where 2.5 = 2.5", Normalization.normalize("where 5/2 = 2.5"));
-        assertEquals("where 2.6 = 2.6", Normalization.normalize("where 5.2/2 = 2.6"));
-        assertEquals("where 2.6 = 2.6", Normalization.normalize("where 5.2 / 2 = 2.6"));
-    }
-
-    @Test
-    public void Mixed() {
-        assertEquals("13", Normalization.normalize("2 * 5 + 3"));
-        assertEquals("17", Normalization.normalize("2 + 5 * 3"));
-        assertEquals("-2.5", Normalization.normalize("2.5 * -1"));
-        assertEquals("hours * 2 + 3", Normalization.normalize("hours * 2 + 3"));
-        assertEquals("2 + 3 * hours", Normalization.normalize("2 + 3 * hours"));
-    }
-
-    @Test
-    public void PI() {
-        assertEquals("0.1591549431", Normalization.normalize("0.5 / " + Math.PI));
-    }
-
-    @Test
-    public void DateTimeLiterals() {
-        assertEquals("'1980-10-10'", Normalization.normalize("'1980-10-10'"));
-    }
-
-    @Test
-    public void DateTimeLiterals2() {
-        assertEquals("\"1980-10-10\"", Normalization.normalize("\"1980-10-10\""));
-    }
-
-    @Test
-    public void Math1() {
-        assertEquals("fn(1)", Normalization.normalize("fn(-1+2)"));
-        assertEquals("fn(3)", Normalization.normalize("fn(1--2)"));
-    }
-
-    @Test
-    public void Substring() {
-        assertEquals("substring(cat.name,1,locate(?1,cat.name)-1)",
-                Normalization.normalize("substring(cat.name,0+1,locate(?1,cat.name)-1-0)"));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/NumberConversionsTest.java b/querydsl-core/src/test/java/com/mysema/query/support/NumberConversionsTest.java
deleted file mode 100644
index 5a3197ab51..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/NumberConversionsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.support;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class NumberConversionsTest {
-
-
-    public enum Color {GREEN, BLUE, RED, YELLOW, BLACK, WHITE}
-
-    @Test
-    public void Name() {
-        EnumPath<Color> color = new EnumPath<Color>(Color.class, "path");
-        QTuple qTuple = new QTuple(color);
-        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
-        assertEquals(Color.BLUE, conversions.newInstance("BLUE").get(color));
-    }
-
-    @Test
-    public void Ordinal() {
-        EnumPath<Color> color = new EnumPath<Color>(Color.class, "path");
-        QTuple qTuple = new QTuple(color);
-        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
-        assertEquals(Color.RED, conversions.newInstance(2).get(color));
-    }
-
-    @Test
-    public void Safe_Number_Conversion() {
-        StringPath strPath = new StringPath("strPath");
-        NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "intPath");
-        QTuple qTuple = new QTuple(strPath, intPath);
-        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
-        assertNotNull(conversions.newInstance(1, 2));
-    }
-
-    @Test
-    public void Number_Conversion() {
-        StringPath strPath = new StringPath("strPath");
-        NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "intPath");
-        QTuple qTuple = new QTuple(strPath, intPath);
-        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
-        Tuple tuple = conversions.newInstance("a", Long.valueOf(3));
-        assertEquals("a", tuple.get(strPath));
-        assertEquals(Integer.valueOf(3), tuple.get(intPath));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/ProjectableQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/support/ProjectableQueryTest.java
deleted file mode 100644
index b5dc51e678..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/ProjectableQueryTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.QBean;
-
-@SuppressWarnings("unchecked")
-public class ProjectableQueryTest {
-        
-    @Test
-    public void UniqueResult_Of_Array() {
-       QueryMixin queryMixin = new QueryMixin();
-       DummyProjectable projectable = new DummyProjectable(queryMixin);
-       projectable.uniqueResult(new Expression[0]);
-       assertEquals(Long.valueOf(2), queryMixin.getMetadata().getModifiers().getLimit());
-    }
-    
-    @Test
-    public void UniqueResult() {
-       QueryMixin queryMixin = new QueryMixin();
-       DummyProjectable projectable = new DummyProjectable(queryMixin);
-       projectable.uniqueResult(new QBean(Object.class));
-       assertEquals(Long.valueOf(2), queryMixin.getMetadata().getModifiers().getLimit());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/QueryMixinPerformanceTest.java b/querydsl-core/src/test/java/com/mysema/query/support/QueryMixinPerformanceTest.java
deleted file mode 100644
index eb7502ac6f..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/QueryMixinPerformanceTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mysema.query.support;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-
-@Ignore
-public class QueryMixinPerformanceTest {
-
-    public static final int iterations = 2000000;
-    
-    @Test 
-    public void Normal() { // 1791
-        EntityPath<DummyEntity> entity = new EntityPathBase<DummyEntity>(DummyEntity.class, "entity");
-        EntityPathBase<DummyEntity> other = new EntityPathBase<DummyEntity>(DummyEntity.class, 
-                PathMetadataFactory.forProperty(entity, "other"));
-        
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            QueryMixin mixin = new QueryMixin();
-            mixin.from(entity);
-            mixin.where(other.eq(new DummyEntity()));
-            mixin.addProjection(entity);
-        }
-        System.err.println(System.currentTimeMillis() - start);
-    }
-    
-    @Test
-    public void Array_Arguments() { // 2260
-        EntityPath<DummyEntity> entity = new EntityPathBase<DummyEntity>(DummyEntity.class, "entity");
-        EntityPath[] entities = new EntityPath[]{entity};
-        EntityPathBase<DummyEntity> other = new EntityPathBase<DummyEntity>(DummyEntity.class, 
-                PathMetadataFactory.forProperty(entity, "other"));
-        
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            QueryMixin mixin = new QueryMixin();
-            mixin.from(entities);
-            mixin.where(other.eq(new DummyEntity()));
-            mixin.addProjection(entity);
-        }
-        System.err.println(System.currentTimeMillis() - start);
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/ReplaceVisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/support/ReplaceVisitorTest.java
deleted file mode 100644
index 1574b40f1e..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/ReplaceVisitorTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mysema.query.support;
-
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-
-import javax.annotation.Nullable;
-
-import static org.junit.Assert.assertEquals;
-
-public class ReplaceVisitorTest {
-
-    private static final ReplaceVisitor visitor = new ReplaceVisitor() {
-        public Expression<?> visit(Path<?> expr, @Nullable Void context) {
-            if (expr.getMetadata().isRoot()) {
-                return new PathImpl(expr.getType(), expr.getMetadata().getName() + "_");
-            } else {
-                return super.visit(expr, context);
-            }
-        }
-    };
-
-    @Test
-    public void Operation() {
-        Expression<String> str = new StringPath(new PathImpl(Object.class, "customer"), "name");
-        Expression<String> str2 = new StringPath("str");
-        Expression<String> concat = Expressions.stringOperation(Ops.CONCAT, str, str2);
-        assertEquals("customer.name + str", concat.toString());
-        assertEquals("customer_.name + str_", concat.accept(visitor, null).toString());
-    }
-
-    @Test
-    public void TemplateExpression() {
-        Expression<String> str = new StringPath(new PathImpl(Object.class, "customer"), "name");
-        Expression<String> str2 = new StringPath("str");
-        Expression<String> concat = Expressions.stringTemplate("{0} + {1}", str, str2);
-        assertEquals("customer.name + str", concat.toString());
-        assertEquals("customer_.name + str_", concat.accept(visitor, null).toString());
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/SimpleProjectableAdapterTest.java b/querydsl-core/src/test/java/com/mysema/query/support/SimpleProjectableAdapterTest.java
deleted file mode 100644
index 5ddc33a2d6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/support/SimpleProjectableAdapterTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.support;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-
-public class SimpleProjectableAdapterTest {
-    
-    @Test
-    @SuppressWarnings("unchecked")
-    public void test() {
-        DummyQuery query = new DummyQuery();
-        DummyProjectable projectable = new DummyProjectable();
-        SimpleProjectableAdapter simpleQuery = new SimpleProjectableAdapter(query, projectable, new StringPath("a"));
-        
-        simpleQuery.count();
-        simpleQuery.distinct().count();
-        assertNotNull(simpleQuery.list());
-        assertNotNull(simpleQuery.distinct().list());
-        assertNotNull(simpleQuery.distinct().listResults());
-        assertNotNull(simpleQuery.listResults());
-        assertNull(simpleQuery.uniqueResult());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/CaseForEqBuilderTest.java b/querydsl-core/src/test/java/com/mysema/query/types/CaseForEqBuilderTest.java
deleted file mode 100644
index fe388f3f02..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/CaseForEqBuilderTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-
-public class CaseForEqBuilderTest {
-
-    public static class Customer{
-        private long annualSpending;
-        public long getAnnualSpending() {
-            return annualSpending;
-        }
-    }
-
-    @Test
-    public void NumberTyped() {
-        Customer c = alias(Customer.class, "customer");
-
-        NumberExpression<Integer> cases = $(c.getAnnualSpending())
-            .when(1000l).then(1)
-            .when(2000l).then(2)
-            .when(5000l).then(3)
-            .otherwise(4);
-
-        assertEquals(
-                "case customer.annualSpending " +
-                "when 1000 then 1 " +
-                "when 2000 then 2 " +
-                "when 5000 then 3 " +
-                "else 4 " +
-                "end", cases.toString());
-    }
-
-    @Test
-    public void StringTyped() {
-        Customer c = alias(Customer.class, "customer");
-
-        StringExpression cases = $(c.getAnnualSpending())
-            .when(1000l).then("bronze")
-            .when(2000l).then("silver")
-            .when(5000l).then("gold")
-            .otherwise("platinum");
-
-        assertNotNull(cases);
-
-    }
-
-    @Test
-    public void BooleanTyped() {
-        Customer c = alias(Customer.class, "customer");
-
-        Expression<Boolean> cases = $(c.getAnnualSpending())
-            .when(1000l).then(true)
-            .otherwise(false);
-
-        assertNotNull(cases);
-
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ConstantImplTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ConstantImplTest.java
deleted file mode 100644
index 020715cd07..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ConstantImplTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class ConstantImplTest {
-    
-    @Test
-    public void Create() {
-        assertNotNull(ConstantImpl.create(true));
-        assertNotNull(ConstantImpl.create((byte)1));
-        assertNotNull(ConstantImpl.create(ConstantImplTest.class));
-        assertNotNull(ConstantImpl.create(1));
-        assertNotNull(ConstantImpl.create(1l));
-        assertNotNull(ConstantImpl.create((short)1));
-        assertNotNull(ConstantImpl.create("x"));
-//        assertNotNull(ConstantImpl.create("x",true));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java
deleted file mode 100644
index 1bd197bbcd..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-import static org.junit.Assert.assertTrue;
-
-public class ConstructorExpressionTest {
-
-    StringPath str1 = new StringPath("str1");
-    StringPath str2 = new StringPath("str2");
-    StringPath str3 = new StringPath("str3");
-    Concatenation concat = new Concatenation(str1, str2);
-
-    @Test
-    public void Constructor() {
-        Expression<Long> longVal = ConstantImpl.create(1l);
-        Expression<String> stringVal = ConstantImpl.create("");
-        ProjectionExample instance = new ConstructorExpression<ProjectionExample>(ProjectionExample.class,
-                new Class[]{long.class, String.class}, longVal, stringVal).newInstance(0l, "");
-        assertNotNull(instance);
-        assertEquals((Long) 0L, instance.id);
-        assertTrue(instance.text.isEmpty());
-    }
-
-    @Test
-    public void Create() {
-        Expression<Long> longVal = ConstantImpl.create(1l);
-        Expression<String> stringVal = ConstantImpl.create("");
-        assertNotNull(ConstructorExpression.create(ProjectionExample.class, longVal, stringVal).newInstance(0l, ""));
-    }
-
-    @Test
-    public void Create2() {
-        Expression<Long> longVal = ConstantImpl.create(1l);
-        assertNotNull(ConstructorExpression.create(ProjectionExample.class, longVal).newInstance(0l));
-    }
-
-    @Test
-    public void Create3() {
-        assertNotNull(ConstructorExpression.create(ProjectionExample.class).newInstance());
-    }
-
-    @Test
-    public void Create4() {
-        Expression<String> stringVal = ConstantImpl.create("");
-        assertNotNull(ConstructorExpression.create(ProjectionExample.class, stringVal).newInstance(""));
-    }
-
-    @Test
-    public void CreateNullPrimitive() {
-        Expression<Boolean> booleanVal = ConstantImpl.create(false);
-        Expression<Byte> byteVal = ConstantImpl.create((byte) 0);
-        Expression<Character> charVal = ConstantImpl.create('\0');
-        Expression<Short> shortVal = ConstantImpl.create((short) 0);
-        Expression<Integer> intVal = ConstantImpl.create(0);
-        Expression<Long> longVal = ConstantImpl.create(0L);
-        Expression<Float> floatVal = ConstantImpl.create(0.0F);
-        Expression<Double> doubleVal = ConstantImpl.create(0.0);
-        ProjectionExample instance = ConstructorExpression.create(ProjectionExample.class,
-                booleanVal, byteVal,
-                charVal, shortVal,
-                intVal, longVal,
-                floatVal, doubleVal)
-                .newInstance(null, null,
-                        null, null,
-                        null, null,
-                        null, null);
-        assertNotNull(instance);
-    }
-
-    @Test
-    public void FactoryExpression_has_right_args() {
-        FactoryExpression<ProjectionExample> constructor = ConstructorExpression.create(ProjectionExample.class, concat);
-        constructor = FactoryExpressionUtils.wrap(constructor);
-        assertEquals(Arrays.asList(str1, str2), constructor.getArgs());
-    }
-
-    @Test
-    public void FactoryExpression_newInstance() {
-        FactoryExpression<ProjectionExample> constructor = ConstructorExpression.create(ProjectionExample.class, concat);
-        constructor = FactoryExpressionUtils.wrap(constructor);
-        ProjectionExample projection = constructor.newInstance("12", "34");
-        assertEquals("1234", projection.text);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ConvertersTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ConvertersTest.java
deleted file mode 100644
index cad9b699a8..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ConvertersTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-
-public class ConvertersTest {
-
-    private static final Converters converters = new Converters('\\');
-    
-    private static String constant = "abcDEF";
-    
-    private static StringPath path = new StringPath("string");
-    
-    @Test
-    public void EscapeForLikeSpeed() {
-        final int iterations = 1000000;
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            converters.escapeForLike("ab%cd_");
-        }
-        long duration = System.currentTimeMillis() - start;
-        System.err.println(duration);
-    }
-    
-    @Test
-    public void ToLowerCase() {
-        assertEquals("abcdef", converters.toLowerCase.apply(constant).toString());
-        assertEquals("lower(string)", converters.toLowerCase.apply(path).toString());
-    }
-    
-    @Test
-    public void ToUpperCase() {
-        assertEquals("ABCDEF", converters.toUpperCase.apply(constant).toString());
-        assertEquals("upper(string)", converters.toUpperCase.apply(path).toString());
-    }
-    
-    @Test
-    public void ToStartsWithViaLike() {
-        assertEquals("abcDEF%", converters.toStartsWithViaLike.apply(constant).toString());
-        assertEquals("string + %", converters.toStartsWithViaLike.apply(path).toString());
-    }
-    
-    @Test
-    public void ToStartsWithViaLikeLower() {
-        assertEquals("abcdef%", converters.toStartsWithViaLikeLower.apply(constant).toString());
-        assertEquals("lower(string + %)", converters.toStartsWithViaLikeLower.apply(path).toString());
-    }
-    
-    @Test
-    public void ToEndsWithViaLike() {
-        assertEquals("%abcDEF", converters.toEndsWithViaLike.apply(constant).toString());
-        assertEquals("% + string", converters.toEndsWithViaLike.apply(path).toString());
-    }
-    
-    @Test
-    public void ToEndsWithViaLikeLower() {
-        assertEquals("%abcdef", converters.toEndsWithViaLikeLower.apply(constant).toString());
-        assertEquals("lower(% + string)", converters.toEndsWithViaLikeLower.apply(path).toString());
-    }
-    
-    @Test
-    public void ToContainsViaLike() {
-        assertEquals("%abcDEF%", converters.toContainsViaLike.apply(constant).toString());
-        assertEquals("% + string + %", converters.toContainsViaLike.apply(path).toString());
-    }
-    
-    @Test
-    public void ToContainsViaLikeLower() {
-        assertEquals("%abcdef%", converters.toContainsViaLikeLower.apply(constant).toString());
-        assertEquals("lower(% + string + %)", converters.toContainsViaLikeLower.apply(path).toString());
-    }
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ExpressionSerializationTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ExpressionSerializationTest.java
deleted file mode 100644
index 338856834d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ExpressionSerializationTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mysema.query.types;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class ExpressionSerializationTest {
-
-    @Test
-    public void Serialize() throws ClassNotFoundException, IOException {
-        QTuple e = new QTuple(new StringPath("x"), new NumberPath(Integer.class, "y"));
-        serialize(e);
-        serialize(e.newInstance("a",1));
-    }
-
-    private void serialize(Object obj) throws IOException, ClassNotFoundException{
-        ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(bytesOut);
-        out.writeObject(obj);
-        out.close();
-        bytesOut.close();
-
-        ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bytesIn);
-        Object obj2 = in.readObject();
-        obj2.hashCode();
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ExpressionUtilsTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ExpressionUtilsTest.java
deleted file mode 100644
index 40364e9b8f..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ExpressionUtilsTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.QueryException;
-import com.mysema.query.types.path.StringPath;
-
-public class ExpressionUtilsTest {
-
-    private static final StringPath str = new StringPath("str");
-    
-    private static final StringPath str2 = new StringPath("str2");
-    
-    @Test
-    public void LikeToRegex() {
-        assertEquals(".*", regex(ConstantImpl.create("%")));
-        assertEquals("^abc.*", regex(ConstantImpl.create("abc%")));
-        assertEquals(".*abc$", regex(ConstantImpl.create("%abc")));
-        assertEquals("^.$",  regex(ConstantImpl.create("_")));
-        
-        StringPath path = new StringPath("path");
-        assertEquals("path + .*", regex(path.append("%")));
-        assertEquals(".* + path", regex(path.prepend("%")));
-        assertEquals("path + .", regex(path.append("_")));
-        assertEquals(". + path", regex(path.prepend("_")));               
-    }
-    
-    @Test
-    @Ignore
-    public void LikeToRegexSpeed() {
-        // 4570
-        StringPath path = new StringPath("path");
-        final int iterations = 1000000;
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            regex(ConstantImpl.create("%"));
-            regex(ConstantImpl.create("abc%"));
-            regex(ConstantImpl.create("%abc"));
-            regex(ConstantImpl.create("_"));
-            regex(path.append("%"));
-            regex(path.prepend("%"));
-            regex(path.append("_"));
-            regex(path.prepend("_"));    
-        }
-        long duration = System.currentTimeMillis() - start;
-        System.err.println(duration);
-    }
-    
-    @Test
-    public void LikeToRegex_Escape() {        
-        assertEquals("^\\.$",  regex(ConstantImpl.create(".")));
-    }
-    
-    @Test
-    public void RegexToLike() {
-        assertEquals("%", like(ConstantImpl.create(".*")));
-        assertEquals("_",  like(ConstantImpl.create(".")));
-        assertEquals(".", like(ConstantImpl.create("\\.")));
-        
-        StringPath path = new StringPath("path");
-        assertEquals("path + %", like(path.append(".*")));
-        assertEquals("% + path", like(path.prepend(".*")));
-        assertEquals("path + _", like(path.append(".")));
-        assertEquals("_ + path", like(path.prepend(".")));
-    }
-    
-    @Test(expected=QueryException.class)
-    public void RegexToLike_Fail() {
-        like(ConstantImpl.create("a*"));
-    }
-    
-    @Test(expected=QueryException.class)
-    public void RegexToLike_Fail2() {
-        like(ConstantImpl.create("\\d"));
-    }
-    
-    @Test(expected=QueryException.class)
-    public void RegexToLike_Fail3() {
-        like(ConstantImpl.create("[ab]"));
-    }
-    
-    @Test
-    @Ignore
-    public void RegexToLikeSpeed() {
-        // 3255
-        StringPath path = new StringPath("path");        
-        final int iterations = 1000000;
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            like(ConstantImpl.create(".*"));
-            like(ConstantImpl.create("."));                
-            like(path.append(".*"));
-            like(path.prepend(".*"));
-            like(path.append("."));
-            like(path.prepend("."));    
-        }
-        long duration = System.currentTimeMillis() - start;
-        System.err.println(duration);
-    }
-    
-    private String regex(Expression<String> expr) {
-        return ExpressionUtils.likeToRegex(expr).toString();
-    }
-    
-    private String like(Expression<String> expr) {
-        return ExpressionUtils.regexToLike(expr).toString();
-    }
-    
-    @Test
-    public void Count() {
-        assertEquals("count(str)", ExpressionUtils.count(str).toString());
-    }
-    
-    @Test
-    public void EqConst() {
-        assertEquals("str = X", ExpressionUtils.eqConst(str, "X").toString());
-    }
-    
-    @Test
-    public void Eq() {
-        assertEquals("str = str2", ExpressionUtils.eq(str, str2).toString());    
-    }
-    
-    @Test
-    public void In() {
-        assertEquals("str in [a, b, c]", ExpressionUtils.in(str, Arrays.asList("a","b","c")).toString());
-    }
-    
-    @Test
-    public void IsNull() {
-        assertEquals("str is null", ExpressionUtils.isNull(str).toString());
-    }
-    
-    @Test
-    public void IsNotNull() {
-        assertEquals("str is not null", ExpressionUtils.isNotNull(str).toString());
-    }
-    
-    @Test
-    public void NeConst() {
-        assertEquals("str != X", ExpressionUtils.neConst(str, "X").toString());
-    }
-    
-    @Test
-    public void Ne() {
-        assertEquals("str != str2", ExpressionUtils.ne(str, str2).toString());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/MappingProjectionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/MappingProjectionTest.java
deleted file mode 100644
index f168f74f72..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/MappingProjectionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.path.StringPath;
-
-public class MappingProjectionTest {
-    
-    StringPath str1 = new StringPath("str1");
-    StringPath str2 = new StringPath("str2");
-    
-    @SuppressWarnings("serial")
-    @Test
-    public void Two_Args() {                
-        MappingProjection<Pair<String,String>> mapping = new MappingProjection<Pair<String,String>>(Pair.class, str1, str2) {
-            @Override
-            protected Pair<String, String> map(Tuple row) {
-                return Pair.of(row.get(str1), row.get(str2));
-            }            
-        };
-        
-        Pair<String, String> pair = mapping.newInstance("1", "2");
-        assertEquals("1", pair.getFirst());
-        assertEquals("2", pair.getSecond());
-    }
-    
-    @SuppressWarnings("serial")
-    @Test
-    public void Single_Arg() {                
-        MappingProjection<String> mapping = new MappingProjection<String>(String.class, str1) {
-            @Override
-            protected String map(Tuple row) {
-                return row.get(str1);
-            }            
-        };
-        
-        assertEquals("1", mapping.newInstance("1"));
-    }
-    
-    @Test
-    public void Distinct_Expressions() {
-        MappingProjection<Pair<String,String>> mapping = new MappingProjection<Pair<String,String>>(Pair.class, str1, str1) {
-            @Override
-            protected Pair<String, String> map(Tuple row) {
-                return Pair.of(row.get(str1), row.get(str1));
-            }            
-        };
-        
-        assertEquals(1, mapping.getArgs().size());
-        assertEquals(Pair.of("1", "1"), mapping.newInstance("1"));
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/NestedExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/NestedExpressionTest.java
deleted file mode 100644
index 23cec68f1d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/NestedExpressionTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-public class NestedExpressionTest {
-
-    StringPath str1 = new StringPath("str1");
-    StringPath str2 = new StringPath("str2");
-    StringPath str3 = new StringPath("str3");
-    StringPath str4 = new StringPath("str3");
-
-    Concatenation concat1 = new Concatenation(new Concatenation(str1, str2), str3);
-    Concatenation concat2 = new Concatenation(new Concatenation(str1, new Concatenation(str2, str3)), str4);
-
-    @Test
-    public void Wrapped_Projection_Has_Right_Arguments() {
-        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat1);
-        assertEquals(Arrays.asList(str1, str2, str3), wrapped.getArgs());
-    }
-
-    @Test
-    public void Wrapped_Projection_Compresses_Projection() {
-        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat1);
-        assertEquals("123", wrapped.newInstance("1","2","3"));
-    }
-
-    @Test
-    public void Deeply_Wrapped_Projection_Has_Right_Arguments() {
-        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat2);
-        assertEquals(Arrays.asList(str1, str2, str3, str4), wrapped.getArgs());
-    }
-
-    @Test
-    public void Deeply_Wrapped_Projection_Compresses_Projection() {
-        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat2);
-        assertEquals("1234", wrapped.newInstance("1","2","3","4"));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/NullExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/NullExpressionTest.java
deleted file mode 100644
index 523f9c788b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/NullExpressionTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class NullExpressionTest {
-
-    @Test
-    public void test() {
-        assertNotNull(new NullExpression<Object>(Object.class));
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/OperatorImplTest.java b/querydsl-core/src/test/java/com/mysema/query/types/OperatorImplTest.java
deleted file mode 100644
index 2aefdb3812..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/OperatorImplTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class OperatorImplTest {
-
-    @Test
-    public void Cache_Isnt_Empty() throws Exception {
-        Field field = OperatorImpl.class.getDeclaredField("OPS");
-        field.setAccessible(true);
-        Map map = (Map) field.get(null);
-        assertFalse(map.isEmpty());
-    }
-
-    @Test
-    public void GetId() {
-        assertEquals("com.mysema.query.types.Ops#ALIAS", Ops.ALIAS.getId());
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/PredicateOperationTest.java b/querydsl-core/src/test/java/com/mysema/query/types/PredicateOperationTest.java
deleted file mode 100644
index e7d5927127..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/PredicateOperationTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class PredicateOperationTest {
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Not() {
-        Path o1 = new PathImpl(Object.class, "o1");
-        Path o2 = new PathImpl(Object.class, "o2");
-        PredicateOperation template = PredicateOperation.create(Ops.EQ, o1, o2);
-        assertEquals("!(o1 = o2)", template.not().toString());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ProjectionsTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ProjectionsTest.java
deleted file mode 100644
index a35207dd07..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ProjectionsTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.mysema.query.types.QBeanPropertyTest.Entity;
-import com.mysema.query.types.path.PathBuilder;
-
-public class ProjectionsTest {
-
-    public static class VarArgs {
-
-        String[] args;
-
-        public VarArgs(String... strs) {
-            args = strs;
-        }
-    }
-
-    public static class VarArgs2 {
-
-        String arg;
-        String[] args;
-
-        public VarArgs2(String s, String... strs) {
-            arg = s;
-            args = strs;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Array() {
-        FactoryExpression<String[]> expr = Projections.array(String[].class,
-                new PathImpl(String.class, "p1"), new PathImpl(String.class, "p2"));
-        assertEquals(String[].class, expr.newInstance("1", "2").getClass());
-    }
-
-    @Test
-    public void BeanClassOfTExpressionOfQArray() {
-        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
-        QBean<Entity> beanProjection = Projections.bean(Entity.class,
-                entity.getNumber("cId", Integer.class),
-                entity.getNumber("eId", Integer.class));
-
-        assertEquals(Entity.class, beanProjection.newInstance(1, 2).getClass());
-    }
-
-    @Test
-    public void Constructor() {
-        Expression<Long> longVal = ConstantImpl.create(1l);
-        Expression<String> stringVal = ConstantImpl.create("");
-        assertEquals(ProjectionExample.class, Projections.constructor(ProjectionExample.class, longVal, stringVal)
-                .newInstance(0l, "").getClass());
-    }
-
-    @Test
-    public void Constructor_VarArgs() {
-        Expression<String> stringVal = ConstantImpl.create("");
-        VarArgs instance = Projections.constructor(VarArgs.class, stringVal, stringVal).newInstance("X", "Y");
-        assertArrayEquals(new String[]{"X", "Y"}, instance.args);
-    }
-
-    @Test
-    public void Constructor_VarArgs2() {
-        Expression<String> stringVal = ConstantImpl.create("");
-        VarArgs2 instance = Projections.constructor(VarArgs2.class, stringVal, stringVal, stringVal).newInstance("X", "Y", "Z");
-        assertEquals("X", instance.arg);
-        assertArrayEquals(new String[]{"Y", "Z"}, instance.args);
-    }
-
-    @Test
-    public void Constructor_VarArgs3() {
-        Constant<Long> longVal = ConstantImpl.create(1L);
-        Constant<Character> charVal = ConstantImpl.create('\0');
-        ProjectionExample instance = Projections
-                .constructor(ProjectionExample.class,
-                        longVal, charVal,
-                        charVal, charVal,
-                        charVal, charVal,
-                        charVal, charVal,
-                        charVal, charVal,
-                        charVal)
-                .newInstance(null, 'm',
-                        'y', 's',
-                        'e', 'm',
-                        'a', null,
-                        'l', 't',
-                        'd');
-        assertEquals(0L, (long) instance.id);
-        // null character cannot be inserted, so a literal String can't be used.
-        String expectedText = String.valueOf(new char[]{'m', 'y', 's', 'e', 'm', 'a',
-            '\0', 'l', 't', 'd'});
-        assertEquals(expectedText, instance.text);
-    }
-
-    @Test
-    public void FieldsClassOfTExpressionOfQArray() {
-        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
-        QBean<Entity> beanProjection = Projections.fields(Entity.class,
-                entity.getNumber("cId", Integer.class),
-                entity.getNumber("eId", Integer.class));
-
-        assertEquals(Entity.class, beanProjection.newInstance(1, 2).getClass());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QBeanTest.java b/querydsl-core/src/test/java/com/mysema/query/types/QBeanTest.java
deleted file mode 100644
index ca2d5c7ed6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/QBeanTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.path.*;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-
-public class QBeanTest {
-
-    public static class Entity {
-
-        private String name;
-
-        private String name2;
-
-        private int age;
-
-        private boolean married;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public int getAge() {
-            return age;
-        }
-
-        public void setAge(int age) {
-            this.age = age;
-        }
-
-        public boolean isMarried() {
-            return married;
-        }
-
-        public void setMarried(boolean married) {
-            this.married = married;
-        }
-
-        public String getName2() {
-            return name2;
-        }
-
-        public void setName2(String name2) {
-            this.name2 = name2;
-        }
-
-    }
-    
-    public static class SubEntity extends Entity{
-        
-    }
-
-    private PathBuilder<Entity> entity;
-
-    private StringPath name, name2;
-
-    private NumberPath<Integer> age;
-
-    private BooleanPath married;
-
-    @Before
-    public void setUp() {
-        entity = new PathBuilderFactory().create(Entity.class);
-        name = entity.getString("name");
-        name2 = entity.getString("name2");
-        age = entity.getNumber("age", Integer.class);
-        married = entity.getBoolean("married");
-    }
-
-    @Test
-    public void with_Class_and_Exprs() {
-        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name, age, married);
-        Entity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertEquals("Fritz", bean.getName());
-        assertEquals(30, bean.getAge());
-        assertEquals(true, bean.isMarried());
-    }
-
-    @Test
-    public void with_Path_and_Exprs() {
-        QBean<Entity> beanProjection = new QBean<Entity>(entity, name, age, married);
-        Entity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertEquals("Fritz", bean.getName());
-        assertEquals(30, bean.getAge());
-        assertEquals(true, bean.isMarried());
-    }
-
-    @Test
-    public void with_unknown_properties() {
-        QBean<Entity> beanProjection = new QBean<Entity>(entity, name, age, Expressions.booleanPath("unknown"));
-        Entity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertEquals("Fritz", bean.getName());
-        assertEquals(30, bean.getAge());
-    }
-
-    @Test
-    public void with_Class_and_Map() {
-        Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
-        bindings.put("name", name);
-        bindings.put("age", age);
-        bindings.put("married", married);
-        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, bindings);
-        Entity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertEquals("Fritz", bean.getName());
-        assertEquals(30, bean.getAge());
-        assertEquals(true, bean.isMarried());
-    }
-
-    @Test
-    public void with_Class_and_Alias() {
-        StringPath name2 = new StringPath("name2");
-        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name.as(name2), age, married);
-        Entity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertNull(bean.getName());
-        assertEquals("Fritz", bean.getName2());
-        assertEquals(30, bean.getAge());
-        assertEquals(true, bean.isMarried());
-    }
-
-    @Test
-    public void with_Nested_FactoryExpression() {
-        Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
-        bindings.put("age", age);
-        bindings.put("name", new Concatenation(name, name2));
-        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, bindings);
-        FactoryExpression<Entity> wrappedProjection = FactoryExpressionUtils.wrap(beanProjection);
-        Entity bean = wrappedProjection.newInstance(30, "Fri","tz");
-        assertEquals("Fritz", bean.getName());
-
-    }
-
-    @Test
-    public void with_Nested_FactoryExpression2() {
-        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class,
-                age, ExpressionUtils.as(new Concatenation(name, name2), "name"));
-        FactoryExpression<Entity> wrappedProjection = FactoryExpressionUtils.wrap(beanProjection);
-        Entity bean = wrappedProjection.newInstance(30, "Fri","tz");
-        assertEquals("Fritz", bean.getName());
-    }
-    
-    @Test
-    public void Supertype_Population() {
-        QBean<SubEntity> beanProjection = new QBean<SubEntity>(SubEntity.class, true, name, age, married);
-        SubEntity bean = beanProjection.newInstance("Fritz", 30, true);
-        assertEquals("Fritz", bean.getName());
-        assertEquals(30, bean.getAge());
-        assertEquals(true, bean.isMarried());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QListTest.java b/querydsl-core/src/test/java/com/mysema/query/types/QListTest.java
deleted file mode 100644
index 425391b953..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/QListTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-public class QListTest {
-
-    @Test
-    public void NewInstance() {
-        QList qList = new QList(new StringPath("a"), new StringPath("b"));
-        List<?> list = qList.newInstance("a", null);
-        assertEquals(2, list.size());
-        assertEquals("a", list.get(0));
-        assertNull(list.get(1));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java b/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java
deleted file mode 100644
index 56d0cf363b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/QMapTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.Arrays;
-
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class QMapTest {
-
-    StringPath str1 = new StringPath("str1");
-    StringPath str2 = new StringPath("str2");
-    StringPath str3 = new StringPath("str3");
-    StringPath str4 = new StringPath("str4");
-    Expression<?>[] exprs1 = new Expression[]{str1, str2};
-    Expression<?>[] exprs2 = new Expression[]{str3, str4};
-
-    Concatenation concat = new Concatenation(str1, str2);
-
-    @Test
-    public void TwoExpressions_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), new QMap(str1, str2).getArgs());
-    }
-
-    @Test
-    public void OneArray_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), new QMap(exprs1).getArgs());
-    }
-
-    @Test
-    public void TwoExpressionArrays_getArgs() {
-        assertEquals(Arrays.asList(str1, str2, str3, str4), new QMap(exprs1, exprs2).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), FactoryExpressionUtils.wrap(new QMap(concat)).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_getArgs2() {
-        assertEquals(Arrays.asList(str1, str2, str3), FactoryExpressionUtils.wrap(new QMap(concat, str3)).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_newInstance() {
-        QMap expr = new QMap(concat);
-        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("12", "34").get(concat));
-    }
-
-    @Test
-    public void NestedProjection_newInstance2() {
-        QMap expr = new QMap(str1, str2, concat);
-        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("1", "2", "12", "34").get(concat));
-    }
-
-    @Test
-    public void Tuple_Equals() {
-        QMap expr = new QMap(str1, str2);
-        assertEquals(expr.newInstance("str1", "str2"), expr.newInstance("str1", "str2"));
-    }
-    
-    @Test
-    public void Tuple_hashCode() {
-        QMap expr = new QMap(str1, str2);
-        assertEquals(expr.newInstance("str1", "str2").hashCode(), expr.newInstance("str1", "str2").hashCode());
-    }
-
-    @Test
-    public void Null_Value() {
-        QMap expr = new QMap(str1, str2);
-        assertNotNull(expr.newInstance("str1", null));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QTupleTest.java b/querydsl-core/src/test/java/com/mysema/query/types/QTupleTest.java
deleted file mode 100644
index 7266e3898c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/QTupleTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.path.StringPath;
-
-public class QTupleTest {
-
-    StringPath str1 = new StringPath("str1");
-    StringPath str2 = new StringPath("str2");
-    StringPath str3 = new StringPath("str3");
-    StringPath str4 = new StringPath("str4");
-    Expression<?>[] exprs1 = new Expression[]{str1, str2};
-    Expression<?>[] exprs2 = new Expression[]{str3, str4};
-
-    Concatenation concat = new Concatenation(str1, str2);
-
-    @Test
-    public void Alias() {
-        Expression<?> expr = str1.as("s");
-        QTuple qTuple = new QTuple(expr);
-        Tuple tuple = qTuple.newInstance("arg");
-        assertEquals("arg", tuple.get(expr));
-        assertEquals("arg", tuple.get(new StringPath("s")));
-    }
-
-    @Test
-    public void TwoExpressions_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), new QTuple(str1, str2).getArgs());
-    }
-
-    @Test
-    public void OneArray_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), new QTuple(exprs1).getArgs());
-    }
-
-    @Test
-    public void TwoExpressionArrays_getArgs() {
-        assertEquals(Arrays.asList(str1, str2, str3, str4), new QTuple(exprs1, exprs2).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_getArgs() {
-        assertEquals(Arrays.asList(str1, str2), FactoryExpressionUtils.wrap(new QTuple(concat)).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_getArgs2() {
-        assertEquals(Arrays.asList(str1, str2, str3), FactoryExpressionUtils.wrap(new QTuple(concat, str3)).getArgs());
-    }
-
-    @Test
-    public void NestedProjection_newInstance() {
-        QTuple expr = new QTuple(concat);
-        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("12", "34").get(concat));
-    }
-
-    @Test
-    public void NestedProjection_newInstance2() {
-        QTuple expr = new QTuple(str1, str2, concat);
-        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("1", "2", "12", "34").get(concat));
-    }
-
-    @Test
-    public void Tuple_Equals() {
-        QTuple expr = new QTuple(str1, str2);
-        assertEquals(expr.newInstance("str1", "str2"), expr.newInstance("str1", "str2"));
-    }
-
-    @Test
-    public void Tuple_hashCode() {
-        QTuple expr = new QTuple(str1, str2);
-        assertEquals(expr.newInstance("str1", "str2").hashCode(), expr.newInstance("str1", "str2").hashCode());
-    }
-
-    @Test
-    @Ignore
-    public void Duplicates() {
-        QTuple expr = new QTuple(str1, str1);
-        assertEquals(1, expr.getArgs().size());
-        assertEquals(str1, expr.getArgs().get(0));
-    }
-
-    @Test
-    @Ignore
-    public void Duplicates2() {
-        QTuple expr = new QTuple(ImmutableList.<Expression<?>>of(str1, str1));
-        assertEquals(1, expr.getArgs().size());
-        assertEquals(str1, expr.getArgs().get(0));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/SignatureTest.java b/querydsl-core/src/test/java/com/mysema/query/types/SignatureTest.java
deleted file mode 100644
index 5c547aabe0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/SignatureTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.types.expr.Coalesce;
-import com.mysema.query.types.expr.DslExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-
-public class SignatureTest {
-    
-    private List<Class<?>> classes = new ArrayList<Class<?>>();
-    
-    @Before
-    public void setUp() throws ClassNotFoundException{
-        for (String folder : Arrays.asList(
-                "com/mysema/query/types/expr",
-                "com/mysema/query/types/path",
-                "com/mysema/query/types/query",
-                "com/mysema/query/types/template")) {
-            for (String file : new File("src/main/java",folder).list()) {
-                if (file.endsWith(".java") && !file.equals("package-info.java")) {
-                    String className = (folder+"."+file.substring(0, file.length()-5)).replace('/', '.');
-                    classes.add(Class.forName(className));
-                }                
-            }
-        }
-    }
-    
-    @Test
-    public void ReturnType_extends_SimpleExpression() {
-        assertFalse(classes.isEmpty());
-        Set<String> skippedMethods = new HashSet<String>(Arrays.asList("getArg","getRoot","not"));
-        List<String> errors = new ArrayList<String>();
-        for (Class<?> cl : classes) {
-            for (Method m : cl.getDeclaredMethods()) {
-                if (!skippedMethods.contains(m.getName())
-                 && Modifier.isPublic(m.getModifiers())
-                 && Expression.class.isAssignableFrom(m.getReturnType())
-                 && !Coalesce.class.isAssignableFrom(m.getReturnType())
-                 && !DslExpression.class.isAssignableFrom(m.getReturnType())
-                 && !SimpleExpression.class.isAssignableFrom(m.getReturnType())) {
-                    errors.add(cl.getSimpleName()+"."+m.getName() + " has illegal return type");
-                }
-            }
-        }        
-        for (String error : errors) {
-            System.err.println(error);            
-        }
-        if (!errors.isEmpty()) {
-            Assert.fail("Got " + errors.size() +" errors");
-        }
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/StringEscapeTest.java b/querydsl-core/src/test/java/com/mysema/query/types/StringEscapeTest.java
deleted file mode 100644
index 30a85ab1da..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/StringEscapeTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class StringEscapeTest {
-
-    @Test
-    public void EscapeForLike() {
-        Converters converters = new Converters('\\');
-        assertEquals("a\\%b\\_c", converters.escapeForLike("a%b_c"));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/StringTest.java b/querydsl-core/src/test/java/com/mysema/query/types/StringTest.java
deleted file mode 100644
index c9fd68b666..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/StringTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Test;
-
-
-public class StringTest {
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void PatternAvailability() throws IllegalArgumentException, IllegalAccessException{
-        Templates ops = new Templates() {{
-            // TODO
-        }};
-        Set<Field> missing = new HashSet<Field>();
-        for (Field field : Ops.class.getFields()) {
-            if (field.getType().equals(Operator.class)) {
-                Operator op = (Operator)field.get(null);
-                if (ops.getTemplate(op) == null) missing.add(field);
-            }
-        }
-        for (Class<?> cl : Ops.class.getClasses()) {
-            for (Field field : cl.getFields()) {
-                if (field.getType().equals(Operator.class)) {
-                    Operator op = (Operator)field.get(null);
-                    if (ops.getTemplate(op) == null) missing.add(field);
-                }
-            }
-        }
-
-        if (!missing.isEmpty()) {
-            for (Field field : missing) {
-                System.err.println(field.getName());
-            }
-            fail();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void ToString() {
-        SomeType alias = alias(SomeType.class, "alias");
-
-        // Path toString
-        assertEquals("alias.name", $(alias.getName()).toString());
-        assertEquals("alias.ref.name", $(alias.getRef().getName()).toString());
-        assertEquals("alias.refs.get(0)", $(alias.getRefs().get(0)).toString());
-
-        // Operation toString
-        assertEquals("lower(alias.name)", $(alias.getName()).lower().toString());
-
-        // ConstructorExpression
-        ConstructorExpression<SomeType> someType = new ConstructorExpression<SomeType>(SomeType.class, new Class[]{SomeType.class}, $(alias));
-        assertEquals("new SomeType(alias)", someType.toString());
-
-        // ArrayConstructorExpression
-        ArrayConstructorExpression<SomeType> someTypeArray = new ArrayConstructorExpression<SomeType>(SomeType[].class,$(alias));
-        assertEquals("new SomeType[](alias)", someTypeArray.toString());
-    }
-
-
-    public static class SomeType{
-
-        public SomeType() {}
-        
-        public SomeType(SomeType st) {}
-        
-        public String getName() {return ""; };
-
-        public SomeType getRef() { return null; };
-
-        public List<SomeType> getRefs() { return null; };
-
-        public int getAmount() { return 0; };
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/TemplateExpressionImplTest.java b/querydsl-core/src/test/java/com/mysema/query/types/TemplateExpressionImplTest.java
deleted file mode 100644
index acc5c4407e..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/TemplateExpressionImplTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertFalse;
-
-import org.junit.Test;
-
-public class TemplateExpressionImplTest {
-
-    @Test
-    public void Equals() {
-        Expression<?> expr1 = TemplateExpressionImpl.create(String.class, "abc", "abc");
-        Expression<?> expr2 = TemplateExpressionImpl.create(String.class, "abc", "def");
-        assertFalse(expr1.equals(expr2));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/TemplateTest.java b/querydsl-core/src/test/java/com/mysema/query/types/TemplateTest.java
deleted file mode 100644
index e246a74325..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/TemplateTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class TemplateTest {
-
-    @Test
-    public void test() {
-        TemplateFactory factory = new TemplateFactory('\\');
-        match("[0, ' + ', 1, ' + ', 2]", factory.create("{0} + {1} + {2}"));
-        match("['blah ', 0, ' + ', 1, ' + ', 2, ' XXX']", factory.create("blah {0} + {1} + {2} XXX"));
-        match("['+', 1]",                factory.create("+{1}"));
-        match("[1, '.method()']",        factory.create("{1}.method()"));
-        match("[0, '.get(', 1, ')']",    factory.create("{0}.get({1})"));
-        match("[0, '.', 1s]",            factory.create("{0}.{1s}"));
-    }
-
-    @Test
-    public void like() {
-        TemplateFactory factory = new TemplateFactory('\\');
-        match("[0]",                     factory.create("{0%}"));
-        match("[0]",                     factory.create("{%0}"));
-        match("[0]",                     factory.create("{%0%}"));
-
-        match("[0]",                     factory.create("{0%%}"));
-        match("[0]",                     factory.create("{%%0}"));
-        match("[0]",                     factory.create("{%%0%%}"));
-    }
-
-    private void match(String string, Template template) {
-        assertEquals(string, template.getElements().toString());
-    }
-
-}
-
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/TermplateInfiniteLoop.java b/querydsl-core/src/test/java/com/mysema/query/types/TermplateInfiniteLoop.java
deleted file mode 100644
index dd0fac7301..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/TermplateInfiniteLoop.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mysema.query.types;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class TermplateInfiniteLoop {
-
-    static String templates[] = createTemplates();
-
-    public static void main(String[] args) {
-        ExecutorService executorService = Executors.newFixedThreadPool(3);
-        executorService.execute(new Runner());
-        executorService.execute(new Runner());
-        executorService.execute(new Runner());
-        executorService.shutdown();
-    }
-
-    private static class Runner implements Runnable {
-        public void run() {
-            for (int i = 0; i < 100000; i++) {
-                TemplateFactory.DEFAULT.create(templates[i % templates.length]);
-            }
-        }
-    }
-
-    /**
-     * Generates array of strings: "\0a", "\0\0a", "\0\0\0a" etc. all with the
-     * same hashCode
-     * 
-     * @return
-     */
-    private static String[] createTemplates() {
-        String tab[] = new String[10000];
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < tab.length; i++) {
-            builder.append('\0');
-            tab[i] = builder.toString() + 'a';
-        }
-        return tab;
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ToStringVisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ToStringVisitorTest.java
deleted file mode 100644
index 3c7a9e2ee1..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ToStringVisitorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import com.mysema.query.domain.QCat;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.path.BooleanPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-
-public class ToStringVisitorTest {
-    
-    private Templates templates = new Templates() {
-        {
-            add(PathType.PROPERTY, "{0}_{1}");
-            add(PathType.COLLECTION_ANY, "{0}");
-        }};
-    
-    @Test
-    public void Operation() {
-        assertEquals("cat_name is not null", 
-                QCat.cat.name.isNotNull().accept(ToStringVisitor.DEFAULT, templates));
-    }
-        
-    @Test
-    public void Template() {
-        Expression<Boolean> template = TemplateExpressionImpl.create(Boolean.class, "{0} is not null", QCat.cat.name);
-        assertEquals("cat_name is not null", 
-                template.accept(ToStringVisitor.DEFAULT, templates));
-    }
-    
-    @Test
-    public void Path() {
-        assertEquals("cat_kittens_kittens_name", 
-                QCat.cat.kittens.any().kittens.any().name.accept(ToStringVisitor.DEFAULT, templates));
-    }
-
-    @Test
-    public void Complex() {
-        BooleanPath a = Expressions.booleanPath("a");
-        BooleanPath b = Expressions.booleanPath("d");
-        BooleanPath c = Expressions.booleanPath("c");
-        BooleanPath d = Expressions.booleanPath("d");
-        Predicate complex = a.or(b).and(c.or(d));
-        assertEquals("(a || d) && (c || d)", complex.accept(ToStringVisitor.DEFAULT, templates));
-
-
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ValidatingVisitorTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ValidatingVisitorTest.java
deleted file mode 100644
index d6bd4bb3cd..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/ValidatingVisitorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.types.expr.Param;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.SimpleTemplate;
-
-@SuppressWarnings("unchecked")
-public class ValidatingVisitorTest {
-
-    private final Set<Expression<?>> known = new HashSet<Expression<?>>();
-
-    private final ValidatingVisitor validator = ValidatingVisitor.DEFAULT;
-
-    @Before
-    public void setUp() {
-        known.add(new PathImpl(Object.class, "path"));
-    }
-
-    @Test
-    public void VisitConstantOfQVoid() {
-        validator.visit(ConstantImpl.create("XXX"), known);
-    }
-
-    @Test
-    public void VisitFactoryExpressionOfQVoid() {
-        validator.visit(new QBean(Object.class, new PathImpl(String.class, "path")), known);
-    }
-
-    @Test
-    public void VisitOperationOfQVoid() {
-        validator.visit((Operation)new SimplePath(Object.class, "path").isNull(), known);
-    }
-
-    @Test
-    public void VisitParamExpressionOfQVoid() {
-        validator.visit(new Param(Object.class, "prop"), known);
-    }
-
-    @Test
-    public void VisitPathOfQVoid() {
-        validator.visit(new PathImpl(Object.class, "path"), known);
-    }
-
-    @Test
-    public void VisitSubQueryExpressionOfQVoid() {
-        validator.visit(new SubQueryExpressionImpl(Object.class, new DefaultQueryMetadata()), known);
-    }
-
-    @Test
-    public void VisitTemplateExpressionOfQVoid() {
-        validator.visit((TemplateExpression)SimpleTemplate.create(Object.class, "XXX"), known);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/BooleanExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/BooleanExpressionTest.java
deleted file mode 100644
index 1ea3d18ce5..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/BooleanExpressionTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.BooleanPath;
-
-public class BooleanExpressionTest {
-
-    private final BooleanExpression a = new BooleanPath("a");
-    private final BooleanExpression b = new BooleanPath("b");
-    private final BooleanExpression c = new BooleanPath("c");
-
-    @Test
-    public void AnyOf() {
-        assertEquals(a.or(b).or(c), BooleanExpression.anyOf(a, b, c));
-    }
-
-    @Test
-    public void AllOf() {
-        assertEquals(a.and(b).and(c), BooleanExpression.allOf(a, b, c));
-    }
-    
-    @Test
-    public void AllOf_With_Nulls() {
-        assertEquals("a && b", BooleanExpression.allOf(a, b, null).toString());        
-        assertEquals("a", BooleanExpression.allOf(a, null).toString());
-        assertEquals("a", BooleanExpression.allOf(null, a).toString());
-    }
-    
-    @Test
-    public void AnyOf_With_Nulls() {
-        assertEquals("a || b", BooleanExpression.anyOf(a, b, null).toString());       
-        assertEquals("a", BooleanExpression.anyOf(a, null).toString());
-        assertEquals("a", BooleanExpression.anyOf(null, a).toString());
-    }
-
-    @Test
-    public void AndAnyOf() {
-        assertEquals(a.and(b.or(c)), a.andAnyOf(b, c));
-    }
-
-    @Test
-    public void OrAllOf() {
-        assertEquals(a.or(b.and(c)), a.orAllOf(b, c));
-    }
-
-    @Test
-    public void Not() {
-        assertEquals(a, a.not().not());
-    }
-
-    @Test
-    public void IsTrue() {
-        assertEquals(a.eq(true), a.isTrue());
-    }
-
-    @Test
-    public void IsFalse() {
-        assertEquals(a.eq(false), a.isFalse());
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/CoalesceTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/CoalesceTest.java
deleted file mode 100644
index ba98e4509e..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/CoalesceTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.StringPath;
-
-public class CoalesceTest {
-
-    private final StringPath firstname = new StringPath("firstname");
-
-    private final StringPath lastname = new StringPath("lastname");
-
-    @Test
-    public void Mutable() {
-        Coalesce<String> c = new Coalesce<String>(firstname, lastname).add("xxx");
-        assertEquals("coalesce(firstname, lastname, xxx)", c.toString());
-        assertEquals("coalesce(firstname, lastname, xxx, yyy)", c.add("yyy").toString());
-    }
-    
-    @Test
-    public void WithList() {
-        Coalesce<String> c = new Coalesce<String>(firstname, lastname).add("xxx");
-        assertEquals("coalesce(firstname, lastname, xxx)", c.toString());
-    }
-
-    @Test
-    public void WithSingleArg() {
-        Coalesce<String> c = new Coalesce<String>().add("xxx");
-        assertEquals("coalesce(xxx)", c.toString());
-    }
-
-    @Test
-    public void AsComparable() {
-        Coalesce<String> c = new Coalesce<String>(firstname, lastname);
-        c.getValue().asc();
-    }
-
-    @Test
-    public void AsString() {
-        Coalesce<String> c = new Coalesce<String>(firstname, lastname);
-        c.asString().lower();
-    }
-
-    @Test
-    public void WithoutWarnings() {
-        Coalesce<String> c = new Coalesce<String>(String.class).add(firstname).add(lastname);
-        assertEquals("coalesce(firstname, lastname)", c.toString());
-    }
-    
-    @Test
-    public void Dsl() {
-        assertEquals("coalesce(firstname, lastname)", firstname.coalesce(lastname).toString());
-    }
-    
-    @Test
-    public void Dsl2() {
-        assertEquals("coalesce(firstname, lastname, xxx)", firstname.coalesce(lastname).add("xxx").toString());
-    }
-    
-    @Test
-    public void Dsl3() {
-        assertEquals("coalesce(firstname, xxx)", firstname.coalesce("xxx").toString());   
-    }
-    
-    @Test
-    public void Asc() {
-        assertEquals("coalesce(firstname, xxx) ASC", firstname.coalesce("xxx").asc().toString());
-    }
-    
-    @Test
-    public void Desc() {
-        assertEquals("coalesce(firstname, xxx) DESC", firstname.coalesce("xxx").desc().toString());
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/NumberExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/NumberExpressionTest.java
deleted file mode 100644
index e3f086dc2b..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/NumberExpressionTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.path.NumberPath;
-
-public class NumberExpressionTest {
-    
-    private NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "int");
-    
-    @Test
-    public void Between_Start_Given() {
-        assertEquals(intPath.goe(1), intPath.between(1, null));        
-    }
-    
-    @Test
-    public void Between_End_Given() {
-        assertEquals(intPath.loe(3), intPath.between(null, 3));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/OperationTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/OperationTest.java
deleted file mode 100644
index c7a51a70b9..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/OperationTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.*;
-
-import java.sql.Time;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.path.StringPath;
-
-public class OperationTest {
-    
-    enum ExampleEnum {A,B}
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Various() {
-        Expression[] args = new Expression[]{new StringPath("x"), new StringPath("y")};
-        List<Operation<?>> operations = new ArrayList<Operation<?>>();
-//        paths.add(new ArrayOperation(String[].class, "p"));
-        operations.add(new BooleanOperation(Ops.EQ, args));
-        operations.add(new ComparableOperation(String.class, Ops.SUBSTR_1ARG, args));
-        operations.add(new DateOperation(Date.class, Ops.DateTimeOps.CURRENT_DATE, args));
-        operations.add(new DateTimeOperation(Date.class,Ops.DateTimeOps.CURRENT_TIMESTAMP, args));
-        operations.add(new EnumOperation(ExampleEnum.class,Ops.IS_NOT_NULL, args));
-        operations.add(new NumberOperation(Integer.class,Ops.ADD, args));
-        operations.add(new SimpleOperation(String.class,Ops.EQ, args));
-        operations.add(new StringOperation(Ops.CONCAT, args));
-        operations.add(new TimeOperation(Time.class,Ops.DateTimeOps.CURRENT_TIME, args));
-        
-        for (Operation<?> operation : operations) {
-            Operation<?> other = new OperationImpl(operation.getType(), operation.getOperator(), 
-                    ImmutableList.copyOf(operation.getArgs()));
-            assertEquals(operation.toString(), operation.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT));
-            assertEquals(operation.hashCode(), other.hashCode());
-            assertEquals(operation, other);
-            assertNotNull(operation.getOperator());
-            assertNotNull(operation.getArgs());
-            assertNotNull(operation.getType());            
-        }
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java
deleted file mode 100644
index a164e83a61..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.Tuple;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QTupleTest {
-
-    private StringPath first = new StringPath("x");
-
-    private NumberPath<Integer> second = new NumberPath<Integer>(Integer.class,"y");
-
-    private BooleanPath third = new BooleanPath("z");
-
-    private QTuple tupleExpression = new QTuple(first, second, third);
-
-    @Test
-    public void NewInstanceObjectArray() {
-        Tuple tuple = tupleExpression.newInstance("1", 42, true);
-        assertEquals(3, tuple.size());
-        assertEquals("1", tuple.get(0, String.class));
-        assertEquals(Integer.valueOf(42), tuple.get(1, Integer.class));
-        assertEquals(Boolean.TRUE, tuple.get(2, Boolean.class));
-        assertEquals("1", tuple.get(first));
-        assertEquals(Integer.valueOf(42), tuple.get(second));
-        assertEquals(Boolean.TRUE, tuple.get(third));
-
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/SimpleExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/SimpleExpressionTest.java
deleted file mode 100644
index 7fcc1171a8..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/SimpleExpressionTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.expr;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.sql.Time;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.path.ArrayPath;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.CollectionPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SetPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-public class SimpleExpressionTest {
-
-    enum ExampleEnum {A,B}
-
-    @Test
-    public void As_usage() {
-        SimpleExpression<String> str = new StringPath("str");
-        assertEquals("str as alias", str.as("alias").toString());
-        assertEquals("str as alias", str.as(new StringPath("alias")).toString());
-    }
-    
-    @Test
-    public void Case() {
-        SimpleExpression<String> str = new StringPath("str");
-        // nullif(str, 'xxx')
-        str.when("xxx").thenNull().otherwise(str);
-    }
-
-    @Test
-    public void Subclasses_Override_As() throws SecurityException, NoSuchMethodException{
-        List<Class<?>> classes = Arrays.<Class<?>>asList(
-                BooleanExpression.class,
-                ComparableExpression.class,
-                DateExpression.class,
-                DateTimeExpression.class,
-                EnumExpression.class,
-                NumberExpression.class,
-                SimpleExpression.class,
-                StringExpression.class,
-                TimeExpression.class);
-
-        for (Class<?> cl : classes) {
-            Method asPath = cl.getDeclaredMethod("as", Path.class);
-            assertEquals(cl, asPath.getReturnType());
-
-            Method asString = cl.getDeclaredMethod("as", String.class);
-            assertEquals(cl, asString.getReturnType());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Various() {
-        List<DslExpression<?>> paths = new ArrayList<DslExpression<?>>();
-        paths.add(new ArrayPath(String[].class, "p"));
-        paths.add(new BeanPath(Object.class, "p"));
-        paths.add(new BooleanPath("p"));
-        paths.add(new CollectionPath(String.class, StringPath.class, "p"));
-        paths.add(new ComparablePath(String.class,"p"));
-        paths.add(new DatePath(Date.class,"p"));
-        paths.add(new DateTimePath(Date.class,"p"));
-        paths.add(new EnumPath(ExampleEnum.class,"p"));
-        paths.add(new ListPath(String.class, StringPath.class, "p"));
-        paths.add(new MapPath(String.class, String.class, StringPath.class, "p"));
-        paths.add(new NumberPath(Integer.class,"p"));
-        paths.add(new SetPath(String.class, StringPath.class, "p"));
-        paths.add(new SimplePath(String.class,"p"));
-        paths.add(new StringPath("p"));
-        paths.add(new TimePath(Time.class,"p"));
-
-        for (DslExpression<?> expr : paths) {
-            Path o = new PathImpl(expr.getType(), "o");
-            assertEquals(OperationImpl.create(expr.getType(), Ops.ALIAS, expr, o), expr.as("o"));
-            Path p = new PathImpl(expr.getType(), "p");
-            assertEquals(OperationImpl.create(expr.getType(), Ops.ALIAS, expr, p), expr.as(p));
-        }
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void Eq_Null() {
-        new SimplePath<Object>(Object.class, "path").eq((Object)null);
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/BeanPathTest.java b/querydsl-core/src/test/java/com/mysema/query/types/path/BeanPathTest.java
deleted file mode 100644
index 275304868c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/BeanPathTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import javax.annotation.Nullable;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.expr.BooleanExpression;
-
-public class BeanPathTest {
-    
-    public static class SubClass extends BeanPathTest {
-        
-    }
-    
-    public static class MyBeanPath extends BeanPath<BeanPathTest>{
-
-        private static final long serialVersionUID = 6225684967115368814L;
-
-        public MyBeanPath(PathMetadata<?> metadata) {
-            super(BeanPathTest.class, metadata);
-        }
-        
-        public MyBeanPath(PathMetadata<?> metadata, @Nullable PathInits inits) {
-            super(BeanPathTest.class, metadata);
-        }
-        
-    }
-    
-    private BeanPath<BeanPathTest> beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class, "p");
-    
-    @Test
-    public void As_Path() {        
-        SimplePath<BeanPathTest> simplePath = new SimplePath<BeanPathTest>(BeanPathTest.class, "p");
-        assertNotNull(beanPath.as(simplePath));
-    }
-    
-    @Test
-    @Ignore
-    public void As_Class() {       
-        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
-        assertEquals(beanPath, otherPath);
-        assertTrue(otherPath.getMetadata().isRoot());
-    }
-    
-    @Test
-    public void As_Class_Cached() {       
-        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
-//        assertEquals(beanPath, otherPath);
-        assertTrue(otherPath == beanPath.as(MyBeanPath.class));
-    }
-    
-    @Test
-    @Ignore
-    public void As_Class_with_Inits() {       
-        beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class, 
-                PathMetadataFactory.forVariable("p"), PathInits.DEFAULT);
-        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
-        assertEquals(beanPath, otherPath);
-    }
-    
-    @Test
-    public void As_Class_with_Inits_Cached() {       
-        beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class, 
-                PathMetadataFactory.forVariable("p"), PathInits.DEFAULT);
-        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
-//        assertEquals(beanPath, otherPath);
-        assertTrue(otherPath == beanPath.as(MyBeanPath.class));
-    }
-    
-    @Test
-    public void CreateEnum() {
-        assertNotNull(beanPath.createEnum("property", PropertyType.class));
-    }
-    
-    @Test
-    public void InstanceOf() {
-        assertNotNull(beanPath.instanceOf(BeanPathTest.class));
-    }
-    
-    @Test
-    public void InstanceOfAny() {
-        BooleanExpression pred1 = beanPath.instanceOf(BeanPathTest.class).or(beanPath.instanceOf(SubClass.class));
-        BooleanExpression pred2 = beanPath.instanceOfAny(BeanPathTest.class, SubClass.class);
-        assertEquals(pred1, pred2);
-        assertEquals("p.class = class com.mysema.query.types.path.BeanPathTest || " +
-        	     "p.class = class com.mysema.query.types.path.BeanPathTest$SubClass", pred2.toString());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/Gender.java b/querydsl-core/src/test/java/com/mysema/query/types/path/Gender.java
deleted file mode 100644
index 569b4069d6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/Gender.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.types.path;
-
-enum Gender {
-    MALE, FEMALE
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/NumberPathTest.java b/querydsl-core/src/test/java/com/mysema/query/types/path/NumberPathTest.java
deleted file mode 100644
index a9a1da1730..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/NumberPathTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Operation;
-
-public class NumberPathTest {
-
-    private NumberPath<Byte> bytePath = new NumberPath<Byte>(Byte.class, "bytePath");
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void BytePath_in() {
-        Operation<?> operation = (Operation<?>) bytePath.in(1, 2, 3);
-
-        List<Byte> numbers = (List<Byte>) ((Constant)operation.getArg(1)).getConstant();
-        assertEquals(Byte.valueOf((byte)1), numbers.get(0));
-        assertEquals(Byte.valueOf((byte)2), numbers.get(1));
-        assertEquals(Byte.valueOf((byte)3), numbers.get(2));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void BytePath_notIn() {
-        Operation<?> operation = (Operation<?>) bytePath.notIn(1, 2, 3);
-
-        List<Byte> numbers = (List<Byte>) ((Constant)operation.getArg(1)).getConstant();
-        assertEquals(Byte.valueOf((byte)1), numbers.get(0));
-        assertEquals(Byte.valueOf((byte)2), numbers.get(1));
-        assertEquals(Byte.valueOf((byte)3), numbers.get(2));
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderFactoryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderFactoryTest.java
deleted file mode 100644
index cf21d12c54..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderFactoryTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class PathBuilderFactoryTest {
-
-    @Test
-    public void Create() {
-        PathBuilderFactory factory = new PathBuilderFactory();
-        PathBuilder<Object> pathBuilder = factory.create(Object.class);
-        assertEquals("object", pathBuilder.toString());
-        assertEquals(Object.class, pathBuilder.getType());
-
-        pathBuilder.get("prop", Object.class);
-        pathBuilder.get("prop", String.class);
-        pathBuilder.get("prop", Object.class);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderTest.java b/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderTest.java
deleted file mode 100644
index efcec531cb..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/PathBuilderTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Time;
-import java.util.Date;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.util.BeanMap;
-
-public class PathBuilderTest {
-
-    @Test
-    public void getEnum() {
-        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
-        EnumPath<Gender> enumPath = entityPath.getEnum("gender", Gender.class);
-        assertNotNull(enumPath.ordinal());
-        assertEquals(enumPath, entityPath.get(enumPath));
-    }
-
-    @Test
-    public void getByExample() {
-        User user = new User();
-        user.setFirstName("firstName");
-        user.setLastName("lastName");
-        assertEquals("entity.lastName = lastName && entity.firstName = firstName", 
-                getByExample(user).toString());
-    }
-
-    @Test
-    public void getArray() {
-        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
-        ArrayPath<String[], String> array = entityPath.getArray("array", String[].class);
-        assertEquals(String[].class, array.getType());
-        assertEquals(String.class, array.getElementType());
-    }
-
-    @Test
-    public void getList() {
-        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
-        entityPath.getList("list", String.class, StringPath.class).get(0).lower();
-        entityPath.getList("list", String.class).get(0);
-    }
-
-    @Test
-    public void getMap() {
-        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
-        entityPath.getMap("map", String.class, String.class, StringPath.class).get("").lower();
-        entityPath.getMap("map", String.class, String.class).get("");
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> BooleanBuilder getByExample(T entity) {
-        PathBuilder<T> entityPath = new PathBuilder<T>((Class<T>)entity.getClass(), "entity");
-        BooleanBuilder conditions = new BooleanBuilder();
-        Map<String, Object> beanMap = new BeanMap(entity);
-        for (Map.Entry<String,Object> entry : beanMap.entrySet()) {
-            if (!entry.getKey().equals("class")) {
-                if (entry.getValue() != null) {
-                    conditions.and(entityPath.get(entry.getKey()).eq(entry.getValue()));
-                }
-            }
-        }
-        return conditions;
-    }
-
-    @Test
-    public void Get() {
-        PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity");
-        NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "int");
-        StringPath strPath = new StringPath("str");
-        BooleanPath booleanPath = new BooleanPath("boolean");
-
-        assertEquals("entity.int", entity.get(intPath).toString());
-        assertEquals("entity.str", entity.get(strPath).toString());
-        assertEquals("entity.boolean", entity.get(booleanPath).toString());
-
-        assertEquals("entity.int", entity.get(entity.get(intPath)).toString());
-    }
-
-    @Test
-    public void Various() {
-        PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity");
-        entity.getBoolean("boolean");
-        entity.getCollection("col", User.class);
-        entity.getComparable("comparable", Comparable.class);
-        entity.getDate("date", Date.class);
-        entity.getDateTime("dateTime", Date.class);
-        entity.getList("list", User.class);
-        entity.getMap("map", String.class, User.class);
-        entity.getNumber("number", Integer.class);
-        entity.getSet("set", User.class);
-        entity.getSimple("simple", Object.class);
-        entity.getString("string");
-        entity.getTime("time", Time.class);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/PathTest.java b/querydsl-core/src/test/java/com/mysema/query/types/path/PathTest.java
deleted file mode 100644
index 7ac142130d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/PathTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.path;
-
-import static com.mysema.query.alias.Alias.$;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.sql.Time;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.annotations.QueryEntity;
-import com.mysema.query.annotations.QueryTransient;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.util.Annotations;
-
-public class PathTest {
-
-    enum ExampleEnum {A,B}
-
-    public static class Superclass {
-
-        @Nullable
-        public String getProperty4() {
-            return null;
-        }
-    }
-
-    @QueryEntity
-    public static class Entity extends Superclass{
-
-        @Nullable
-        private String property1;
-
-        private String property2;
-
-        @QueryTransient
-        private String property3;
-
-        public String getProperty1() {
-            return property1;
-        }
-
-        @Nonnull
-        public String getProperty2() {
-            return property2;
-        }
-
-        @Nonnull
-        public String getProperty3() {
-            return property3;
-        }
-
-    }
-
-    @Test
-    public void GetAnnotatedElement() {
-        Entity entity = Alias.alias(Entity.class);
-        AnnotatedElement element = $(entity).getAnnotatedElement();
-
-        // type
-        assertEquals(Entity.class, element);
-    }
-
-    @Test
-    public void GetAnnotatedElement_for_property() {
-        Entity entity = Alias.alias(Entity.class);
-        AnnotatedElement property1 = $(entity.getProperty1()).getAnnotatedElement();
-        AnnotatedElement property2 = $(entity.getProperty2()).getAnnotatedElement();
-        AnnotatedElement property3 = $(entity.getProperty3()).getAnnotatedElement();
-        AnnotatedElement property4 = $(entity.getProperty4()).getAnnotatedElement();
-
-        // property (field)
-        assertEquals(Field.class, property1.getClass());
-        assertTrue(property1.isAnnotationPresent(Nullable.class));
-        assertNotNull(property1.getAnnotation(Nullable.class));
-        assertFalse(property1.isAnnotationPresent(Nonnull.class));
-        assertNull(property1.getAnnotation(Nonnull.class));
-
-        // property2 (method)
-        assertEquals(Method.class, property2.getClass());
-        assertTrue(property2.isAnnotationPresent(Nonnull.class));
-        assertNotNull(property2.getAnnotation(Nonnull.class));
-        assertFalse(property2.isAnnotationPresent(Nullable.class));
-        assertNull(property2.getAnnotation(Nullable.class));
-
-        // property3 (both)
-        assertEquals(Annotations.class, property3.getClass());
-        assertTrue(property3.isAnnotationPresent(QueryTransient.class));
-        assertNotNull(property3.getAnnotation(QueryTransient.class));
-        assertTrue(property3.isAnnotationPresent(Nonnull.class));
-        assertNotNull(property3.getAnnotation(Nonnull.class));
-        assertFalse(property3.isAnnotationPresent(Nullable.class));
-        assertNull(property3.getAnnotation(Nullable.class));
-
-        // property 4 (superclass)
-        assertEquals(Method.class, property4.getClass());
-        assertTrue(property4.isAnnotationPresent(Nullable.class));
-        assertNotNull(property4.getAnnotation(Nullable.class));
-
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Equals() {
-        assertEquals(new StringPath("s"),  new StringPath("s"));
-        assertEquals(new BooleanPath("b"), new BooleanPath("b"));
-        assertEquals(new NumberPath<Integer>(Integer.class,"n"), new NumberPath<Integer>(Integer.class,"n"));
-
-        assertEquals(new ArrayPath(String[].class, "p"), new PathImpl(String.class, "p"));
-        assertEquals(new BooleanPath("p"), new PathImpl(Boolean.class, "p"));
-        assertEquals(new ComparablePath(String.class,"p"), new PathImpl(String.class, "p"));
-        assertEquals(new DatePath(Date.class,"p"), new PathImpl(Date.class, "p"));
-        assertEquals(new DateTimePath(Date.class,"p"), new PathImpl(Date.class, "p"));
-        assertEquals(new EnumPath(ExampleEnum.class,"p"), new PathImpl(ExampleEnum.class, "p"));
-        assertEquals(new NumberPath(Integer.class,"p"), new PathImpl(Integer.class, "p"));
-        assertEquals(new StringPath("p"), new PathImpl(String.class, "p"));
-        assertEquals(new TimePath(Time.class,"p"), new PathImpl(Time.class, "p"));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Various_Properties() {
-        Path<?> parent = new PathImpl(Object.class, "parent");
-        List<Path<?>> paths = new ArrayList<Path<?>>();
-        paths.add(new ArrayPath(String[].class, parent, "p"));
-        paths.add(new BeanPath(Object.class, parent, "p"));
-        paths.add(new BooleanPath(parent, "p"));
-        paths.add(new CollectionPath(String.class, StringPath.class, parent, "p"));
-        paths.add(new ComparablePath(String.class, parent, "p"));
-        paths.add(new DatePath(Date.class, parent, "p"));
-        paths.add(new DateTimePath(Date.class, parent, "p"));
-        paths.add(new EnumPath(ExampleEnum.class, parent, "p"));
-        paths.add(new ListPath(String.class, StringPath.class, parent, "p"));
-        paths.add(new MapPath(String.class, String.class, StringPath.class, parent, "p"));
-        paths.add(new NumberPath(Integer.class, parent, "p"));
-        paths.add(new SetPath(String.class, StringPath.class, parent, "p"));
-        paths.add(new SimplePath(String.class, parent, "p"));
-        paths.add(new StringPath(parent, "p"));
-        paths.add(new TimePath(Time.class, parent, "p"));
-
-        for (Path<?> path : paths) {
-            Path other = new PathImpl(path.getType(), PathMetadataFactory.forProperty(parent, "p"));
-            assertEquals(path.toString(), path.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT));
-            assertEquals(path.hashCode(), other.hashCode());
-            assertEquals(path, other);
-            assertNotNull(path.getMetadata());
-            assertNotNull(path.getType());
-            assertEquals(parent, path.getRoot());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Various() {
-        List<Path<?>> paths = new ArrayList<Path<?>>();
-        paths.add(new ArrayPath(String[].class, "p"));
-        paths.add(new BeanPath(Object.class, "p"));
-        paths.add(new BooleanPath("p"));
-        paths.add(new CollectionPath(String.class, StringPath.class, "p"));
-        paths.add(new ComparablePath(String.class,"p"));
-        paths.add(new DatePath(Date.class,"p"));
-        paths.add(new DateTimePath(Date.class,"p"));
-        paths.add(new EnumPath(ExampleEnum.class,"p"));
-        paths.add(new ListPath(String.class, StringPath.class, "p"));
-        paths.add(new MapPath(String.class, String.class, StringPath.class, "p"));
-        paths.add(new NumberPath(Integer.class,"p"));
-        paths.add(new SetPath(String.class, StringPath.class, "p"));
-        paths.add(new SimplePath(String.class,"p"));
-        paths.add(new StringPath("p"));
-        paths.add(new TimePath(Time.class,"p"));
-
-        for (Path<?> path : paths) {
-            Path other = new PathImpl(path.getType(), "p");
-            assertEquals(path.toString(), path.accept(ToStringVisitor.DEFAULT, null));
-            assertEquals(path.hashCode(), other.hashCode());
-            assertEquals(path, other);
-            assertNotNull(path.getMetadata());
-            assertNotNull(path.getType());
-            assertEquals(path, path.getRoot());
-        }
-    }
-
-    @Test
-    public void Parent_Path() {
-        Path<Object> person = new PathImpl<Object>(Object.class, "person");
-        Path<String> name = new PathImpl<String>(String.class, person, "name");
-        assertEquals("person.name", name.toString());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/User.java b/querydsl-core/src/test/java/com/mysema/query/types/path/User.java
deleted file mode 100644
index ab2dd190e6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/User.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mysema.query.types.path;
-
-public class User {
-
-    private String firstName, lastName, username;
-
-    private Gender gender;
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public Gender getGender() {
-        return gender;
-    }
-
-    public void setGender(Gender gender) {
-        this.gender = gender;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java
deleted file mode 100644
index 4d7f78a9c5..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/query/ListSubQueryTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Date;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.types.PathImpl;
-
-public class ListSubQueryTest {
-
-    @Test
-    public void As() {
-        ListSubQuery<Date> subQuery = new ListSubQuery<Date>(Date.class,new DefaultQueryMetadata()); 
-        assertNotNull(subQuery.as(new PathImpl<Date>(Date.class,"a")));
-        assertNotNull(subQuery.as(new PathImpl<Date>(Date.class,"a")));
-    }
- 
-    @Test
-    public void Count() {
-        DefaultQueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, new PathImpl<Object>(Object.class, "path"));
-        ListSubQuery<Date> subQuery = new ListSubQuery<Date>(Date.class, md);
-        assertNotNull(subQuery.count().toString());
-    }
-    
-    @Test
-    public void Count_Distinct() {
-        DefaultQueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, new PathImpl<Object>(Object.class, "path"));
-        ListSubQuery<Date> subQuery = new ListSubQuery<Date>(Date.class, md);
-        assertNotNull(subQuery.count().toString());
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java
deleted file mode 100644
index 719dd27118..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-
-public class SubQueryTest {
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void test() {
-        Templates templates = new JavaTemplates();
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        List<ExtendedSubQueryExpression> subQueries = Arrays.<ExtendedSubQueryExpression>asList(
-                new BooleanSubQuery(metadata),
-                new ComparableSubQuery(Date.class,metadata),
-                new DateSubQuery(Date.class,metadata),
-                new DateTimeSubQuery(Date.class,metadata),
-                new ListSubQuery(Date.class,metadata),
-                new NumberSubQuery(Integer.class,metadata),
-                new SimpleSubQuery(String.class,metadata),
-                new StringSubQuery(metadata),
-                new TimeSubQuery(Date.class,metadata)
-        );
-        ExtendedSubQueryExpression prev = null;
-        for (ExtendedSubQueryExpression sq : subQueries) {
-            assertNotNull(sq);
-            assertNotNull(sq.exists());
-            assertNotNull(sq.getMetadata());
-            assertNotNull(sq.notExists());
-            assertEquals(sq, sq);
-            if (prev != null) {
-                assertEquals(sq, prev);
-            }
-            //assertEquals(sq.getType().hashCode(), sq.hashCode());
-            sq.accept(ToStringVisitor.DEFAULT, templates);
-            prev = sq;
-        }
-    }
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/template/BooleanTemplateTest.java b/querydsl-core/src/test/java/com/mysema/query/types/template/BooleanTemplateTest.java
deleted file mode 100644
index 41061a644c..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/template/BooleanTemplateTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class BooleanTemplateTest {
-    
-    @Test
-    public void True() {
-        assertEquals("true", BooleanTemplate.TRUE.toString());
-    }
-    
-    @Test
-    public void False() {
-        assertEquals("false", BooleanTemplate.FALSE.toString());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java
deleted file mode 100644
index f27ad465c0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/types/template/TemplateExpressionTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.types.template;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Time;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.path.StringPath;
-
-public class TemplateExpressionTest {
-
-    @Test
-    public void Constructors() {
-        Templates templates = new JavaTemplates();
-        Template template = TemplateFactory.DEFAULT.create("{0}");
-        ImmutableList<Expression<?>> args = ImmutableList.<Expression<?>>of(new StringPath("a"));
-        List<TemplateExpression<?>> customs = Arrays.<TemplateExpression<?>>asList(
-            new BooleanTemplate(template, args),
-            new ComparableTemplate<String>(String.class, template, args),
-            new DateTemplate<java.sql.Date>(java.sql.Date.class, template, args),
-            new DateTimeTemplate<Date>(Date.class, template, args),
-            new EnumTemplate<PropertyType>(PropertyType.class, template, args),
-            new NumberTemplate<Integer>(Integer.class, template, args),
-            new SimpleTemplate<Object>(Object.class, template, args),
-            new StringTemplate(template, args),
-            new TimeTemplate<Time>(Time.class, template, args)
-        );
-        TemplateExpression<?> prev = null;
-        for (TemplateExpression<?> custom : customs) {
-            assertNotNull(custom);
-            assertNotNull(custom.getTemplate());
-            assertNotNull(custom.getType());
-            assertNotNull(custom.getArgs());
-            assertEquals(custom, custom);
-            if (prev != null) {
-                assertFalse(custom.equals(prev));
-            }
-            //assertEquals(custom.getType().hashCode(), custom.hashCode());
-            custom.accept(ToStringVisitor.DEFAULT, templates);
-            prev = custom;
-        }
-    }
-
-    @Test
-    public void FactoryMethods() {
-        String template = "";
-        Expression<Boolean> arg = ConstantImpl.create(true);
-
-        BooleanTemplate.create(template, arg);
-        ComparableTemplate.create(String.class, template, arg);
-        DateTemplate.create(Date.class, template, arg);
-        DateTimeTemplate.create(Date.class, template, arg);
-        EnumTemplate.create(PropertyType.class, template, arg);
-        NumberTemplate.create(Integer.class, template, arg);
-        SimpleTemplate.create(Object.class, template, arg);
-        StringTemplate.create(template, arg);
-        TimeTemplate.create(Time.class, template, arg);
-    }
-
-    @Test
-    public void FactoryMethods2() {
-        Template template = TemplateFactory.DEFAULT.create("");
-        Expression<Boolean> arg = ConstantImpl.create(true);
-
-        BooleanTemplate.create(template, arg);
-        ComparableTemplate.create(String.class, template, arg);
-        DateTemplate.create(Date.class, template, arg);
-        DateTimeTemplate.create(Date.class, template, arg);
-        EnumTemplate.create(PropertyType.class, template, arg);
-        NumberTemplate.create(Integer.class, template, arg);
-        SimpleTemplate.create(Object.class, template, arg);
-        StringTemplate.create(template, arg);
-        TimeTemplate.create(Time.class, template, arg);
-    }
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java b/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java
deleted file mode 100644
index 79cc496e26..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/util/MathUtilsTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.util;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.util.MathUtils;
-
-public class MathUtilsTest {
-
-    @Test
-    public void Sum() {
-        assertEquals(Integer.valueOf(5), MathUtils.sum(2, 3.0));
-    }
-
-    @Test
-    public void Difference() {
-        assertEquals(Integer.valueOf(2), MathUtils.difference(5, 3.0));
-    }
-
-    @Test
-    public void Cast_Integer_To_Long() {
-        assertEquals(Long.valueOf(2), MathUtils.cast(2, Long.class));
-    }
-
-    @Test
-    public void Cast_Double_To_Long() {
-        assertEquals(Long.valueOf(3), MathUtils.cast(3.2, Long.class));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/util/ReflectionUtilsTest.java b/querydsl-core/src/test/java/com/mysema/query/util/ReflectionUtilsTest.java
deleted file mode 100644
index 1a9a5e1d33..0000000000
--- a/querydsl-core/src/test/java/com/mysema/query/util/ReflectionUtilsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.Serializable;
-import java.lang.reflect.AnnotatedElement;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.util.ReflectionUtils;
-
-public class ReflectionUtilsTest {
-
-    @Nullable
-    String property;
-
-    @Test
-    public void GetAnnotatedElement() {
-        AnnotatedElement annotatedElement = ReflectionUtils.getAnnotatedElement(ReflectionUtilsTest.class, "property", String.class);
-        assertNotNull(annotatedElement.getAnnotation(Nullable.class));
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void GetImplementedInterfaces() {
-        Set<Class<?>> ifaces = ReflectionUtils.getImplementedInterfaces(SimpleExpression.class);
-        assertEquals(new HashSet<Class<?>>(Arrays.asList(Serializable.class, Expression.class)), ifaces);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Benchmark.java b/querydsl-core/src/test/java/com/mysema/testutil/Benchmark.java
deleted file mode 100644
index 2419c1aa0d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/Benchmark.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-public interface Benchmark {
-    
-    void run(int times) throws Exception;
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/CustomSuite.java b/querydsl-core/src/test/java/com/mysema/testutil/CustomSuite.java
deleted file mode 100644
index 1a92db3c57..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/CustomSuite.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mysema.testutil;
-
-import org.junit.runners.Suite;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.RunnerBuilder;
-
-public class CustomSuite extends Suite {
-
-    public CustomSuite(Class<?> klass, RunnerBuilder builder) throws InitializationError {
-        super(builder, klass, klass.getClasses());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/DummyInterface.java b/querydsl-core/src/test/java/com/mysema/testutil/DummyInterface.java
deleted file mode 100644
index 2d73a7baa7..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/DummyInterface.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.testutil;
-
-public interface DummyInterface {
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/ExcludeIn.java b/querydsl-core/src/test/java/com/mysema/testutil/ExcludeIn.java
deleted file mode 100644
index c302cd2093..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/ExcludeIn.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface ExcludeIn {
-    /**
-     * @return
-     */
-    com.mysema.query.Target[] value();
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/ExternalDB.java b/querydsl-core/src/test/java/com/mysema/testutil/ExternalDB.java
deleted file mode 100644
index 666ea4abe1..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/ExternalDB.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.testutil;
-
-/**
- * ExternalDB is used as a test category
- */
-public interface ExternalDB {
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/FilteringTestRunner.java b/querydsl-core/src/test/java/com/mysema/testutil/FilteringTestRunner.java
deleted file mode 100644
index de99d8e6be..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/FilteringTestRunner.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-
-public class FilteringTestRunner extends BlockJUnit4ClassRunner {
-
-    private boolean run = true;
-
-    public FilteringTestRunner(Class<?> klass) throws InitializationError {
-        super(klass);
-        ResourceCheck rc = klass.getAnnotation(ResourceCheck.class);
-        if (rc != null) {
-            run = klass.getResourceAsStream(rc.value()) != null;
-        }
-    }
-
-    @Override
-    public void run(RunNotifier notifier) {
-        if (run) {
-            super.run(notifier);
-        }
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/IncludeIn.java b/querydsl-core/src/test/java/com/mysema/testutil/IncludeIn.java
deleted file mode 100644
index 0ac56a9b58..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/IncludeIn.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface IncludeIn {
-    /**
-     * @return
-     */
-    com.mysema.query.Target[] value();
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Label.java b/querydsl-core/src/test/java/com/mysema/testutil/Label.java
deleted file mode 100644
index 4265475592..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/Label.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface Label {
-    /**
-     * @return
-     */
-    com.mysema.query.Target value();
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/LabelRule.java b/querydsl-core/src/test/java/com/mysema/testutil/LabelRule.java
deleted file mode 100644
index 8555d27be0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/LabelRule.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.query.Target;
-
-public class LabelRule implements MethodRule{
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        Label label = target.getClass().getAnnotation(Label.class);
-        boolean run = true;
-        if (label != null) {
-            run = isExecuted(method.getMethod(), label.value()); 
-        }
-        return run ? base : EmptyStatement.DEFAULT;
-    }
-    
-    private boolean isExecuted(Method method, Target target) {
-        ExcludeIn ex = method.getAnnotation(ExcludeIn.class);
-        // excluded in given targets
-        if (ex != null && Arrays.asList(ex.value()).contains(target)) {
-            return false;
-        }
-        // included only in given targets
-        IncludeIn in = method.getAnnotation(IncludeIn.class);
-        if (in != null && !Arrays.asList(in.value()).contains(target)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Performance.java b/querydsl-core/src/test/java/com/mysema/testutil/Performance.java
deleted file mode 100644
index fbd3948d07..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/Performance.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.testutil;
-
-/**
- * Performance is used as a test category
- */
-public interface Performance {
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheck.java b/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheck.java
deleted file mode 100644
index 0daa4fd8a9..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheck.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface ResourceCheck {
-    /**
-     * @return
-     */
-    public String value();
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheckRule.java b/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheckRule.java
deleted file mode 100644
index 2d5699d482..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/ResourceCheckRule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-public class ResourceCheckRule implements MethodRule{
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        Class<?> testClass = target.getClass();
-        ResourceCheck rc = testClass.getAnnotation(ResourceCheck.class);
-        boolean run = true;
-        if (rc != null) {
-            run = testClass.getResourceAsStream(rc.value()) != null;
-        }
-        return run ? base : EmptyStatement.DEFAULT;
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java b/querydsl-core/src/test/java/com/mysema/testutil/Runner.java
deleted file mode 100644
index fb0b05fbdf..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import com.google.common.base.Stopwatch;
-
-public final class Runner {
-
-    private static final int WARMUP = 50000;
-    private static final int BENCHMARK = 1000000;
-
-    public static void run(String label, Benchmark benchmark) throws Exception {
-        // warmup
-        benchmark.run(WARMUP);
-        System.err.print("- ");
-
-        // run garbage collection
-        System.gc();
-        System.err.print("- ");
-
-        // perform timing
-        Stopwatch stopwatch = new Stopwatch().start();
-        benchmark.run(BENCHMARK);
-        System.err.println(label + " " + stopwatch.stop().toString());
-    }
-
-    private Runner() {}
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/SkipForAnnotationRule.java b/querydsl-core/src/test/java/com/mysema/testutil/SkipForAnnotationRule.java
deleted file mode 100644
index 53ab66ba48..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/SkipForAnnotationRule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import java.lang.annotation.Annotation;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.testutil.EmptyStatement;
-
-public class SkipForAnnotationRule implements MethodRule {
-    
-    private final Class<? extends Annotation> classAnnotation;
-    
-    private final Class<? extends Annotation> methodAnnotation;
-    
-    public SkipForAnnotationRule(Class<? extends Annotation> classAnnotation, Class<? extends Annotation> methodAnnotation) {
-        this.classAnnotation = classAnnotation;
-        this.methodAnnotation = methodAnnotation;
-    }
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        if (target.getClass().getAnnotation(classAnnotation) != null
-          && method.getMethod().getAnnotation(methodAnnotation) != null) {
-            return EmptyStatement.DEFAULT;
-        } else {
-            return base;
-        }
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/StatementTest.java b/querydsl-core/src/test/java/com/mysema/testutil/StatementTest.java
deleted file mode 100644
index e5cfca2ef0..0000000000
--- a/querydsl-core/src/test/java/com/mysema/testutil/StatementTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.testutil;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-public class StatementTest {
-    
-    @Rule
-    public MethodRule rule = new MethodRule() {
-        @Override
-        public Statement apply(final Statement base, FrameworkMethod method, Object target) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    System.err.println("in rule");
-                    base.evaluate();
-                    System.err.println("out of rule");
-                }
-                
-            };
-        }
-        
-    };
-    
-    @BeforeClass
-    public static void beforeClass() {
-        System.err.println("before class");
-    }
-    
-    @Before
-    public void before() {
-        System.err.println("before");
-    }    
-    
-    @AfterClass
-    public static void afterClass() {
-        System.err.println("after class");
-    }
-    
-    @After
-    public void after() {
-        System.err.println("after");
-    }
-    
-    @Test
-    public void test() {
-        System.err.println("test");
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/BeanMapTest.java b/querydsl-core/src/test/java/com/mysema/util/BeanMapTest.java
deleted file mode 100644
index 7003c13477..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/BeanMapTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.mysema.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-public class BeanMapTest {
-
-    private BeanMap beanMap;
-
-    @Before
-    public void setUp() {
-        beanMap = new BeanMap(new Entity());
-    }
-
-    @Test
-    public void Size() {
-        assertEquals(4, beanMap.size());
-    }
-
-    @Test
-    public void Clear() {
-        beanMap.clear();
-        assertEquals(4, beanMap.size());
-    }
-
-    @Test
-    public void Primitives() {
-        beanMap.put("id", 5);
-        assertEquals(5, ((Entity)beanMap.getBean()).getId());
-    }
-
-    @Test
-    public void BeanMap() {
-        assertEquals(0, new BeanMap().size());
-    }
-
-    @Test
-    public void BeanMapObject() {
-        assertEquals(4, new BeanMap(new Entity()).size());
-    }
-
-    @Test
-    public void ToString() {
-        assertEquals("BeanMap<null>", new BeanMap().toString());
-    }
-
-    @Test
-    public void Clone() throws CloneNotSupportedException {
-        assertEquals(beanMap, beanMap.clone());
-    }
-
-    @Test
-    public void PutAllWriteable() {
-
-    }
-
-    @Test
-    public void ContainsKeyString() {
-        assertTrue(beanMap.containsKey("id"));
-    }
-
-    @Test
-    public void ContainsValueObject() {
-
-    }
-
-    @Test
-    public void GetString() {
-        beanMap.put("firstName", "John");
-        assertEquals("John", beanMap.get("firstName"));
-    }
-
-    @Test
-    public void KeySet() {
-        assertEquals(Sets.newHashSet("id", "class", "firstName", "lastName"), beanMap.keySet());
-    }
-
-    @Test
-    public void EntrySet() {
-        beanMap.put("firstName", "John");
-        assertFalse(beanMap.entrySet().isEmpty());
-    }
-
-    @Test
-    public void Values() {
-        beanMap.put("firstName", "John");
-        assertEquals(Lists.newArrayList(0, null, Entity.class, "John"), beanMap.values());
-    }
-
-    @Test
-    public void GetType() {
-
-    }
-
-    @Test
-    public void GetBean() {
-        assertEquals(Entity.class, beanMap.getBean().getClass());
-    }
-
-    @Test
-    public void SetBean() {
-        Entity entity = new Entity();
-        beanMap.setBean(entity);
-        assertTrue(entity == beanMap.getBean());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/ClassPathUtilsTest.java b/querydsl-core/src/test/java/com/mysema/util/ClassPathUtilsTest.java
deleted file mode 100644
index 1ed55b489d..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/ClassPathUtilsTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.SomeClass;
-
-
-public class ClassPathUtilsTest {
-    
-    @Test
-    public void ScanPackage() throws IOException {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        Set<Class<?>> classes = ClassPathUtils.scanPackage(classLoader, SomeClass.class.getPackage());
-        assertFalse(classes.isEmpty());
-    }
-    
-    @Test
-    public void ScanPackage_Check_Initialized() throws IOException {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        Set<Class<?>> classes = ClassPathUtils.scanPackage(classLoader, getClass().getPackage());
-        assertFalse(classes.isEmpty());
-        assertEquals("XXX", SomeOtherClass2.property);
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/Entity.java b/querydsl-core/src/test/java/com/mysema/util/Entity.java
deleted file mode 100644
index 5fbd22e395..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/Entity.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.mysema.util;
-
-public class Entity {
-
-    private int id;
-    
-    private String firstName, lastName;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    
-    
-    
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java b/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java
deleted file mode 100644
index 06b4cdd8f5..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/MathUtilsTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.junit.Test;
-
-public class MathUtilsTest {
-
-    @Test
-    public void Cast() {
-        Integer value = Integer.valueOf(1);
-        assertEquals(BigDecimal.class, MathUtils.cast(value, BigDecimal.class).getClass());
-        assertEquals(BigInteger.class, MathUtils.cast(value, BigInteger.class).getClass());
-        assertEquals(Double.class, MathUtils.cast(value, Double.class).getClass());
-        assertEquals(Float.class, MathUtils.cast(value, Float.class).getClass());
-        assertEquals(Integer.class, MathUtils.cast(value, Integer.class).getClass());
-        assertEquals(Long.class, MathUtils.cast(value, Long.class).getClass());
-        assertEquals(Short.class, MathUtils.cast(value, Short.class).getClass());
-        assertEquals(Byte.class, MathUtils.cast(value, Byte.class).getClass());
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/ReflectionUtilsTest.java b/querydsl-core/src/test/java/com/mysema/util/ReflectionUtilsTest.java
deleted file mode 100644
index 92618a6174..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/ReflectionUtilsTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.util;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.junit.Test;
-
-
-public class ReflectionUtilsTest {
-    
-    @Test
-    public void getImplementedInterfaces() {
-        assertEquals(
-            new HashSet<Class<?>>(Arrays.<Class<?>>asList(Appendable.class, CharSequence.class, Serializable.class)), 
-            ReflectionUtils.getImplementedInterfaces(StringBuilder.class));
-        
-        assertEquals(
-            new HashSet<Class<?>>(Arrays.<Class<?>>asList(Collection.class, Iterable.class)), 
-            ReflectionUtils.getImplementedInterfaces(List.class));
-    }
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass.java b/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass.java
deleted file mode 100644
index 74d95b8aa6..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mysema.util;
-
-public class SomeOtherClass {
-
-    static {
-        SomeOtherClass2.property = "XXX";
-    }
-    
-    public String someProperty;
-}
diff --git a/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass2.java b/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass2.java
deleted file mode 100644
index c4ce9d5849..0000000000
--- a/querydsl-core/src/test/java/com/mysema/util/SomeOtherClass2.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.util;
-
-public class SomeOtherClass2 {
-    
-    public static String property;
-
-}
diff --git a/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java
similarity index 75%
rename from querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java
index b8dd10f46f..c4f15ed4fe 100644
--- a/querydsl-core/src/test/java/com/mysema/query/BooleanBuilderTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Templates;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.BooleanPath;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Templates;
+import com.querydsl.core.types.ToStringVisitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
 
 public class BooleanBuilderTest {
 
@@ -33,26 +31,26 @@ public class BooleanBuilderTest {
     private final BooleanExpression second = BooleanConstant.FALSE;
 
     @Test
-    public void Null_In_Constructor() {
+    public void null_in_constructor() {
         assertNull(new BooleanBuilder(null).getValue());
     }
 
     @Test
-    public void And_Empty() {
+    public void and_empty() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(new BooleanBuilder());
         assertNull(ExpressionUtils.extract(builder));
     }
 
     @Test
-    public void AndAnyOf() {
+    public void and_any_of() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.andAnyOf(first, null);
         assertEquals(first, builder.getValue());
     }
 
     @Test
-    public void AndAnyOf2() {
+    public void and_any_of2() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.andAnyOf(null, first);
         assertEquals(first, builder.getValue());
@@ -60,34 +58,34 @@ public void AndAnyOf2() {
 
 
     @Test
-    public void OrAllOf() {
+    public void or_all_of() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.orAllOf(first, null);
         assertEquals(first, builder.getValue());
     }
 
     @Test
-    public void OrAllOf2() {
+    public void or_all_of2() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.orAllOf(null, first);
         assertEquals(first, builder.getValue());
     }
 
-    @Test(expected=QueryException.class)
+    @Test(expected = QueryException.class)
     @Ignore
-    public void WrappedBooleanBuilder() {
+    public void wrapped_booleanBuilder() {
         new BooleanBuilder(new BooleanBuilder());
     }
 
     @Test
-    public void Basic() {
+    public void basic() {
 //        new BooleanBuilder().and(first).or(second);
         assertEquals(first.or(second).toString(),
             new BooleanBuilder().and(first).or(second).toString());
     }
 
     @Test
-    public void Advanced() {
+    public void advanced() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.andAnyOf(first, second, first);
         builder.orAllOf(first, second, first);
@@ -95,7 +93,7 @@ public void Advanced() {
     }
 
     @Test
-    public void If_Then_Else() {
+    public void if_then_else() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(null);
         builder.or(null);
@@ -104,82 +102,82 @@ public void If_Then_Else() {
     }
 
     @Test
-    public void And_null_Supported() {
+    public void and_null_supported() {
         assertEquals(first, first.and(null));
     }
 
     @Test
-    public void Or_null_Supported() {
+    public void or_null_supported() {
         assertEquals(first, first.or(null));
     }
 
     @Test
-    public void And_Not() {
+    public void and_not() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(first).andNot(second);
         assertEquals(first.and(second.not()), builder.getValue());
     }
 
     @Test
-    public void Or_Not() {
+    public void or_not() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(first).orNot(second);
         assertEquals(first.or(second.not()), builder.getValue());
     }
 
     @Test
-    public void Not() {
+    public void not() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(first).not();
         assertEquals(first.not(), builder.getValue());
     }
 
     @Test
-    public void BooleanBuilder_Equals_BooleanBuilder() {
+    public void booleanBuilder_equals_booleanBuilder() {
         assertEquals(new BooleanBuilder(first), new BooleanBuilder(first));
     }
 
     @Test
-    public void Constant_Equals_BooleanBuilder() {
+    public void constant_equals_booleanBuilder() {
         assertFalse(first.equals(new BooleanBuilder(first)));
     }
 
     @Test
-    public void BooleanBuilder_Equals_Constant() {
+    public void booleanBuilder_equals_constant() {
         assertFalse(new BooleanBuilder(first).equals(first));
     }
 
     @Test
-    public void HashCode() {
+    public void hashCode_() {
         assertEquals(new BooleanBuilder(first).hashCode(), new BooleanBuilder(first).hashCode());
         assertEquals(new BooleanBuilder().hashCode(), new BooleanBuilder().hashCode());
     }
 
     @Test
-    public void ToString() {
+    public void toString_() {
         BooleanBuilder builder = new BooleanBuilder().and(first);
         assertEquals("true", builder.toString());
-        builder.or(new BooleanPath("condition"));
+        builder.or(Expressions.booleanPath("condition"));
         assertEquals("true || condition", builder.toString());
     }
 
 //    @Test
-//    public void GetArg() {
+//    public void getArg() {
 //        BooleanBuilder builder = new BooleanBuilder().and(first);
 //        assertEquals(first, builder.getArg(0));
 //    }
 //
 //    @Test
-//    public void GetArgs() {
+//    public void getArgs() {
 //        BooleanBuilder builder = new BooleanBuilder().and(first);
 //        assertEquals(Arrays.asList(first), builder.getArgs());
 //    }
 
     @Test
-    public void Accept() {
+    public void accept() {
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(first);
-        builder.or(new BooleanPath("condition"));
+        builder.or(Expressions.booleanPath("condition"));
         assertEquals("true || condition", builder.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT));
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/BooleanConstant.java b/querydsl-core/src/test/java/com/querydsl/core/BooleanConstant.java
new file mode 100644
index 0000000000..505b1df331
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/BooleanConstant.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+/**
+ * BooleanConstant provides constants for Boolean.TRUE and Boolean.FALSE
+ *
+ * @author tiwe
+ *
+ */
+public final class BooleanConstant extends BooleanExpression implements Constant<Boolean> {
+
+    public static final BooleanExpression FALSE = new BooleanConstant(Boolean.FALSE);
+
+    private static final long serialVersionUID = -4106376704553234781L;
+
+    public static final BooleanExpression TRUE = new BooleanConstant(Boolean.TRUE);
+
+    public static BooleanExpression create(Boolean b) {
+        return b ? TRUE : FALSE;
+    }
+
+    private final Boolean constant;
+
+    private BooleanConstant(Boolean b) {
+        super(ConstantImpl.create(b));
+        this.constant = b;
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public BooleanExpression eq(Boolean b) {
+        return constant.equals(b) ? TRUE : FALSE;
+    }
+
+    @Override
+    public Boolean getConstant() {
+        return constant;
+    }
+
+    @Override
+    public BooleanExpression ne(Boolean b) {
+        return constant.equals(b) ? FALSE : TRUE;
+    }
+
+    @Override
+    public BooleanExpression not() {
+        return constant ? FALSE : TRUE;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/CoverageTest.java b/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java
similarity index 83%
rename from querydsl-core/src/test/java/com/mysema/query/CoverageTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java
index 79941d3feb..7639eb7538 100644
--- a/querydsl-core/src/test/java/com/mysema/query/CoverageTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,42 +11,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import static com.mysema.query.alias.Alias.$;
 import static org.junit.Assert.assertTrue;
+import static com.querydsl.core.alias.Alias.$;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.junit.Test;
 
-import com.mysema.query.alias.Alias;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
 
 /**
  * The Class CoverageTest.
  */
 public class CoverageTest {
 
-    private MatchingFiltersFactory matchers = new MatchingFiltersFactory(Module.COLLECTIONS, Target.MEM);
+    private MatchingFiltersFactory matchers = new MatchingFiltersFactory(QuerydslModule.COLLECTIONS, Target.MEM);
 
-    private ProjectionsFactory projections = new ProjectionsFactory(Module.COLLECTIONS, Target.MEM);
+    private ProjectionsFactory projections = new ProjectionsFactory(QuerydslModule.COLLECTIONS, Target.MEM);
 
-    private FilterFactory filters = new FilterFactory(projections, Module.COLLECTIONS, Target.MEM);
+    private FilterFactory filters = new FilterFactory(projections, QuerydslModule.COLLECTIONS, Target.MEM);
 
     @SuppressWarnings("unchecked")
     @Test
-    public void test() throws IllegalArgumentException, IllegalAccessException{
+    public void test() throws IllegalArgumentException, IllegalAccessException {
         // make sure all Operators are covered in expression factory methods
-        Set<Operator<?>> usedOperators = new HashSet<Operator<?>>();
+        Set<Operator> usedOperators = new HashSet<Operator>();
         List<Expression<?>> exprs = new ArrayList<Expression<?>>();
 
         Entity entity = Alias.alias(Entity.class, "entity");
@@ -87,11 +83,11 @@ public void test() throws IllegalArgumentException, IllegalAccessException{
 
         for (Expression<?> e : exprs) {
             if (e instanceof Operation) {
-                Operation<?> op = (Operation<?>)e;
+                Operation<?> op = (Operation<?>) e;
                 if (op.getArg(0) instanceof Operation) {
-                    usedOperators.add(((Operation<?>)op.getArg(0)).getOperator());
+                    usedOperators.add(((Operation<?>) op.getArg(0)).getOperator());
                 } else if (op.getArgs().size() > 1 && op.getArg(1) instanceof Operation) {
-                    usedOperators.add(((Operation<?>)op.getArg(1)).getOperator());
+                    usedOperators.add(((Operation<?>) op.getArg(1)).getOperator());
                 }
                 usedOperators.add(op.getOperator());
             }
@@ -99,7 +95,7 @@ public void test() throws IllegalArgumentException, IllegalAccessException{
         }
 
         // missing mappings
-        usedOperators.addAll(Arrays.<Operator<?>>asList(
+        usedOperators.addAll(Arrays.<Operator>asList(
             Ops.INSTANCE_OF,
             Ops.ALIAS,
             Ops.ARRAY_SIZE,
@@ -107,6 +103,7 @@ public void test() throws IllegalArgumentException, IllegalAccessException{
             Ops.STRING_CAST,
 //            Ops.DELEGATE,
             Ops.WRAPPED,
+            Ops.ORDER,
 
             Ops.XOR,
             Ops.XNOR,
@@ -118,6 +115,7 @@ public void test() throws IllegalArgumentException, IllegalAccessException{
             Ops.CASE_EQ_ELSE,
 
             Ops.LIST,
+            Ops.SET,
             Ops.SINGLETON,
             Ops.COALESCE,
             Ops.ORDINAL, // TODO: add support
@@ -133,10 +131,10 @@ public void test() throws IllegalArgumentException, IllegalAccessException{
             Ops.EXISTS
          ));
 
-        List<Operator<?>> notContained = new ArrayList<Operator<?>>();
+        List<Operator> notContained = new ArrayList<Operator>();
         for (Field field : Ops.class.getFields()) {
             if (Operator.class.isAssignableFrom(field.getType())) {
-                Operator<?> val = (Operator<?>) field.get(null);
+                Operator val = (Operator) field.get(null);
                 if (!usedOperators.contains(val)) {
                     System.err.println(field.getName() + " was not contained");
                     notContained.add(val);
diff --git a/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java b/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java
new file mode 100644
index 0000000000..b0bb423172
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java
@@ -0,0 +1,58 @@
+package com.querydsl.core;
+
+import com.querydsl.core.testutil.ThreadSafety;
+import io.github.classgraph.ClassGraph;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Collection;
+
+public class CycleClassInitDependencyTest {
+
+    private static ClassLoader loader;
+
+    @BeforeClass
+    public static void overrideClassLoader() {
+        loader = Thread.currentThread().getContextClassLoader();
+        Collection<URL> urls = new ClassGraph().getClasspathURLs();
+        ClassLoader cl = URLClassLoader.newInstance(urls.toArray(new URL[0]), null/*no delegation*/);
+        Thread.currentThread().setContextClassLoader(cl);
+    }
+
+    @AfterClass
+    public static void resetClassLoader() {
+        Thread.currentThread().setContextClassLoader(loader);
+    }
+
+    @Test(timeout = 2000)
+    public void test() {
+
+        // each thread wants to load one part of the dependency circle
+        ThreadSafety.check(
+                new LoadClassRunnable("com.querydsl.core.types.dsl.NumberExpression"),
+                new LoadClassRunnable("com.querydsl.core.types.dsl.Expressions"));
+    }
+
+    private static class LoadClassRunnable implements Runnable {
+
+        private final String classToLoad;
+
+        LoadClassRunnable(String classToLoad) {
+            this.classToLoad = classToLoad;
+        }
+
+        @Override
+        public void run() {
+            try {
+                Class.forName(classToLoad, true, Thread.currentThread().getContextClassLoader());
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/DateConstant.java b/querydsl-core/src/test/java/com/querydsl/core/DateConstant.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/DateConstant.java
rename to querydsl-core/src/test/java/com/querydsl/core/DateConstant.java
index 631c98d065..a99c445021 100644
--- a/querydsl-core/src/test/java/com/mysema/query/DateConstant.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/DateConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import java.util.Calendar;
 
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.NumberExpression;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
 
 /**
  * @author tiwe
  *
  */
-final class DateConstant<D extends java.util.Date> extends DateExpression<D> implements Constant<D>{
+public final class DateConstant<D extends java.util.Date> extends DateExpression<D> implements Constant<D> {
 
     private static final long serialVersionUID = -5745611667058255826L;
 
@@ -46,7 +46,7 @@ public DateConstant(D date) {
     }
 
     @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
+    public <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(this, context);
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java b/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java
similarity index 89%
rename from querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java
index d53ee76265..6d88c59d50 100644
--- a/querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.DateExpression;
+import com.querydsl.core.types.dsl.DateExpression;
 
 public class DateConstantTest {
 
@@ -31,7 +31,6 @@ public void test() {
         cal.set(Calendar.DAY_OF_MONTH, 1);
         cal.set(Calendar.MONTH, 0);
         cal.set(Calendar.YEAR,  2000);
-        System.out.println(cal.getTime());
 
         DateExpression<Date> date = DateConstant.create(new Date(cal.getTimeInMillis()));
         assertEquals("1",   date.dayOfMonth().toString());
diff --git a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java b/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstant.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java
rename to querydsl-core/src/test/java/com/querydsl/core/DateTimeConstant.java
index c788cb5ccd..e4ed7e0b78 100644
--- a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.NumberExpression;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.DateTimeExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
 
 /**
  * @author tiwe
  *
  */
-final class DateTimeConstant<D extends java.util.Date> extends DateTimeExpression<D> implements Constant<D>{
+public final class DateTimeConstant<D extends java.util.Date> extends DateTimeExpression<D> implements Constant<D> {
 
     private static final long serialVersionUID = 4578416585568476532L;
 
@@ -43,7 +43,7 @@ public DateTimeConstant(D date) {
     }
 
     @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
+    public <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(this, context);
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java b/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java
similarity index 91%
rename from querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java
index 8e4ce96030..a72c747eb3 100644
--- a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.DateTimeExpression;
+import com.querydsl.core.types.dsl.DateTimeExpression;
 
 public class DateTimeConstantTest {
 
@@ -34,7 +34,6 @@ public void test() {
         cal.set(Calendar.MINUTE,      30);
         cal.set(Calendar.SECOND,      12);
         cal.set(Calendar.MILLISECOND,  3);
-        System.out.println(cal.getTime());
 
         DateTimeExpression<Date> date = DateTimeConstant.create(cal.getTime());
         assertEquals("1",    date.dayOfMonth().toString());
diff --git a/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java b/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java
new file mode 100644
index 0000000000..0bedba393c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class DefaultQueryMetadataTest {
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    public DefaultQueryMetadataTest() {
+        metadata.setValidate(true);
+    }
+
+    private final StringPath str = Expressions.stringPath("str");
+
+    private final StringPath str2 = Expressions.stringPath("str2");
+
+    @Test
+    public void addWhere_with_null() {
+        metadata.addWhere(null);
+    }
+
+    @Test
+    public void addWhere_with_booleanBuilder() {
+        metadata.addWhere(new BooleanBuilder());
+    }
+
+    @Test
+    public void addHaving_with_null() {
+        metadata.addHaving(null);
+    }
+
+    @Test
+    public void addHaving_with_booleanBuilder() {
+        metadata.addHaving(new BooleanBuilder());
+    }
+
+
+    @Test(expected = IllegalArgumentException.class)
+    public void validation() {
+        metadata.addWhere(str.isNull());
+    }
+
+    @Test
+    public void validation_no_error_for_groupBy() {
+        metadata.addGroupBy(str);
+    }
+
+    @Test
+    public void validation_no_error_for_having() {
+        metadata.addHaving(str.isNull());
+    }
+
+    @Test
+    public void getGroupBy() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addGroupBy(str);
+        assertEquals(Collections.singletonList(str), metadata.getGroupBy());
+    }
+
+    @Test
+    public void getHaving() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addHaving(str.isNotNull());
+        assertEquals(str.isNotNull(), metadata.getHaving());
+    }
+
+    @Test
+    public void getJoins() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str)), metadata.getJoins());
+    }
+
+    @Test
+    public void getJoins2() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str)), metadata.getJoins());
+    }
+
+    @Test
+    public void getJoins3() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str)), metadata.getJoins());
+        metadata.addJoinCondition(str.isNull());
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str, str.isNull(), Collections.emptySet())),
+                metadata.getJoins());
+        metadata.addJoin(JoinType.DEFAULT, str2);
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, str, str.isNull(), Collections.emptySet()),
+                new JoinExpression(JoinType.DEFAULT, str2)),
+                metadata.getJoins());
+    }
+
+    @Test
+    public void getModifiers() {
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        metadata.setModifiers(modifiers);
+        assertEquals(modifiers, metadata.getModifiers());
+    }
+
+    @Test
+    public void setLimit() {
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        metadata.setModifiers(modifiers);
+        metadata.setLimit(3L);
+
+        assertEquals(Long.valueOf(3L), metadata.getModifiers().getLimit());
+        assertEquals(Long.valueOf(2L), metadata.getModifiers().getOffset());
+    }
+
+    @Test
+    public void setOffset() {
+        QueryModifiers modifiers = new QueryModifiers(1L,1L);
+        metadata.setModifiers(modifiers);
+        metadata.setOffset(2L);
+
+        assertEquals(Long.valueOf(1L), metadata.getModifiers().getLimit());
+        assertEquals(Long.valueOf(2L), metadata.getModifiers().getOffset());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void getOrderBy() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addOrderBy(str.asc());
+        metadata.addOrderBy(str.desc());
+        assertEquals(Arrays.asList(str.asc(),str.desc()), metadata.getOrderBy());
+    }
+
+    @Test
+    public void getProjection() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.setProjection(str.append("abc"));
+        assertEquals(str.append("abc"), metadata.getProjection());
+    }
+
+    @Test
+    public void getWhere() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addWhere(str.eq("b"));
+        metadata.addWhere(str.isNotEmpty());
+        assertEquals(str.eq("b").and(str.isNotEmpty()), metadata.getWhere());
+    }
+
+    @Test
+    public void isDistinct() {
+        assertFalse(metadata.isDistinct());
+        metadata.setDistinct(true);
+        assertTrue(metadata.isDistinct());
+    }
+
+    @Test
+    public void isUnique() {
+        assertFalse(metadata.isUnique());
+        metadata.setUnique(true);
+        assertTrue(metadata.isUnique());
+    }
+
+    @Test
+    public void joinShouldBeCommitted() {
+        DefaultQueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, str);
+        DefaultQueryMetadata emptyMetadata = new DefaultQueryMetadata();
+        assertFalse(md.equals(emptyMetadata));
+    }
+
+    @Test
+    public void clone_() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addGroupBy(str);
+        metadata.addHaving(str.isNotNull());
+        metadata.addJoin(JoinType.DEFAULT, str2);
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        metadata.setModifiers(modifiers);
+        metadata.addOrderBy(str.asc());
+        metadata.setProjection(str.append("abc"));
+        metadata.addWhere(str.eq("b"));
+        metadata.addWhere(str.isNotEmpty());
+
+        QueryMetadata clone = metadata.clone();
+        assertEquals(metadata.getGroupBy(), clone.getGroupBy());
+        assertEquals(metadata.getHaving(), clone.getHaving());
+        assertEquals(metadata.getJoins(), clone.getJoins());
+        assertEquals(metadata.getModifiers(), clone.getModifiers());
+        assertEquals(metadata.getOrderBy(), clone.getOrderBy());
+        assertEquals(metadata.getProjection(), clone.getProjection());
+        assertEquals(metadata.getWhere(), clone.getWhere());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void setParam() {
+        metadata.setParam(new Param(String.class, "str"), ConstantImpl.create("X"));
+        assertEquals(1, metadata.getParams().size());
+        assertTrue(metadata.getParams().get(new Param(String.class, "str")).equals(ConstantImpl.create("X")));
+    }
+
+    @Test
+    public void addFlag() {
+        QueryFlag flag = new QueryFlag(Position.START, "X");
+        metadata.addFlag(flag);
+        assertTrue(metadata.hasFlag(flag));
+    }
+
+    @Test
+    public void equals() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addGroupBy(str);
+        metadata.addHaving(str.isNotNull());
+        metadata.addJoin(JoinType.DEFAULT, str2);
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        metadata.setModifiers(modifiers);
+        metadata.addOrderBy(str.asc());
+        metadata.setProjection(str.append("abc"));
+        metadata.addWhere(str.eq("b"));
+        metadata.addWhere(str.isNotEmpty());
+
+        QueryMetadata metadata2 = new DefaultQueryMetadata();
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addJoin(JoinType.DEFAULT, str);
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addGroupBy(str);
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addHaving(str.isNotNull());
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addJoin(JoinType.DEFAULT, str2);
+        assertFalse(metadata.equals(metadata2));
+        metadata2.setModifiers(modifiers);
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addOrderBy(str.asc());
+        assertFalse(metadata.equals(metadata2));
+        metadata2.setProjection(str.append("abc"));
+        assertFalse(metadata.equals(metadata2));
+        metadata2.addWhere(str.eq("b"));
+        metadata2.addWhere(str.isNotEmpty());
+        assertTrue(metadata.equals(metadata2));
+    }
+
+    @Test
+    public void hashCode_() {
+        metadata.addJoin(JoinType.DEFAULT, str);
+        metadata.addGroupBy(str);
+        metadata.addHaving(str.isNotNull());
+        metadata.addJoin(JoinType.DEFAULT, str2);
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        metadata.setModifiers(modifiers);
+        metadata.addOrderBy(str.asc());
+        metadata.setProjection(str.append("abc"));
+        metadata.addWhere(str.eq("b"));
+        metadata.addWhere(str.isNotEmpty());
+        metadata.hashCode();
+    }
+
+    @Test
+    public void hashCode_empty_metadata() {
+        metadata.hashCode();
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java b/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java
new file mode 100644
index 0000000000..f52e8f1056
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import jdepend.framework.JDepend;
+
+public class DependenciesTest {
+
+    @Test
+    @Ignore
+    public void test() throws IOException {
+        // FIXME
+        JDepend jdepend = new JDepend();
+        jdepend.addDirectory("target/classes/com/querydsl/alias");
+        jdepend.addDirectory("target/classes/com/querydsl/codegen");
+        jdepend.addDirectory("target/classes/com/querydsl/dml");
+        jdepend.addDirectory("target/classes/com/querydsl/support");
+        jdepend.addDirectory("target/classes/com/querydsl/types");
+        jdepend.addDirectory("target/classes/com/querydsl/types/dsl");
+        jdepend.addDirectory("target/classes/com/querydsl/types/path");
+        jdepend.addDirectory("target/classes/com/querydsl/types/querydsl");
+        jdepend.addDirectory("target/classes/com/querydsl/types/template");
+
+        jdepend.analyze();
+        assertFalse(jdepend.containsCycles());
+
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/Entity.java b/querydsl-core/src/test/java/com/querydsl/core/Entity.java
new file mode 100644
index 0000000000..d2012d127a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/Entity.java
@@ -0,0 +1,28 @@
+package com.querydsl.core;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface Entity {
+
+    int getNum();
+
+    String getStr();
+
+    boolean isBool();
+
+    List<String> getList();
+
+    Set<String> getSet();
+
+    Map<String, String> getMap();
+
+    java.util.Date getDateTime();
+
+    java.sql.Date getDate();
+
+    java.sql.Time getTime();
+
+    String[] getArray();
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java b/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java
new file mode 100644
index 0000000000..574b40f902
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.util.*;
+
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.MapExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * @author tiwe
+ *
+ */
+public class FilterFactory {
+
+    private final ProjectionsFactory projections;
+
+    private final QuerydslModule module;
+
+    private final Target target;
+
+    public FilterFactory(ProjectionsFactory projections, QuerydslModule module, Target target) {
+        this.projections = projections;
+        this.module = module;
+        this.target = target;
+    }
+
+    public Collection<Predicate> booleanFilters(BooleanExpression expr, BooleanExpression other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.and(other));
+        rv.add(expr.or(other));
+        rv.add(expr.not().and(other.not()));
+        rv.add(expr.not());
+        rv.add(other.not());
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A> Collection<Predicate> collection(CollectionExpressionBase<?,A> expr,
+            CollectionExpression<?,A> other, A knownElement) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.contains(knownElement));
+        rv.add(expr.isEmpty());
+        rv.add(expr.isNotEmpty());
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size().gt(0));
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A> Collection<Predicate> array(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other,
+            A knownElement) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size().gt(0));
+        }
+        rv.add(expr.get(0).eq(knownElement));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    private <A extends Comparable<A>> Collection<Predicate> comparable(ComparableExpression<A> expr,
+            ComparableExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>(exprFilters(expr, other, knownValue));
+        rv.add(expr.gt(other));
+        rv.add(expr.gt(knownValue));
+        rv.add(expr.goe(other));
+        rv.add(expr.goe(knownValue));
+        rv.add(expr.lt(other));
+        rv.add(expr.lt(knownValue));
+        rv.add(expr.loe(other));
+        rv.add(expr.loe(knownValue));
+
+//        rv.add(expr.in(IntervalImpl.create(knownValue, null)));
+//        rv.add(expr.in(IntervalImpl.create(null, knownValue)));
+
+        return Collections.unmodifiableList(rv);
+
+    }
+
+    private <A extends Comparable<A>> Collection<Predicate> dateOrTime(TemporalExpression<A> expr,
+            TemporalExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        rv.add(expr.after(other));
+        rv.add(expr.after(knownValue));
+        rv.add(expr.before(other));
+        rv.add(expr.before(knownValue));
+        return Collections.unmodifiableList(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Predicate> date(DateExpression<A> expr,
+            DateExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        rv.addAll(comparable(expr, other, knownValue));
+        rv.addAll(dateOrTime(expr, other, knownValue));
+        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
+        rv.add(expr.month().eq(other.month()));
+        rv.add(expr.year().eq(other.year()));
+        rv.add(expr.yearMonth().eq(other.yearMonth()));
+        if (module.equals(QuerydslModule.SQL) || module.equals(QuerydslModule.COLLECTIONS)) {
+            if (target != Target.DERBY) {
+                rv.add(expr.yearWeek().eq(other.yearWeek()));
+            }
+        }
+        return Collections.unmodifiableList(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Predicate> dateTime(DateTimeExpression<A> expr,
+            DateTimeExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        rv.addAll(comparable(expr, other, knownValue));
+        rv.addAll(dateOrTime(expr, other, knownValue));
+        rv.add(expr.dayOfMonth().eq(1));
+        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
+
+        rv.add(expr.month().eq(1));
+        rv.add(expr.month().eq(other.month()));
+
+        rv.add(expr.year().eq(2000));
+        rv.add(expr.year().eq(other.year()));
+
+        rv.add(expr.yearMonth().eq(other.yearMonth()));
+
+        if (module.equals(QuerydslModule.SQL) || module.equals(QuerydslModule.COLLECTIONS)) {
+            if (target != Target.DERBY) {
+                rv.add(expr.yearWeek().eq(other.yearWeek()));
+            }
+        }
+
+        rv.add(expr.hour().eq(1));
+        rv.add(expr.hour().eq(other.hour()));
+
+        rv.add(expr.minute().eq(1));
+        rv.add(expr.minute().eq(other.minute()));
+
+        rv.add(expr.second().eq(1));
+        rv.add(expr.second().eq(other.second()));
+        return Collections.unmodifiableList(rv);
+    }
+
+    private <A> Collection<BooleanExpression> exprFilters(SimpleExpression<A> expr,
+            SimpleExpression<A> other, A knownValue) {
+        HashSet<BooleanExpression> rv = new HashSet<BooleanExpression>();
+        rv.add(expr.eq(other));
+        rv.add(expr.eq(knownValue));
+
+        rv.add(expr.ne(other));
+        rv.add(expr.ne(knownValue));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A, Q extends SimpleExpression<A>> Collection<Predicate> list(ListPath<A, Q> expr,
+            ListExpression<A, Q> other, A knownElement) {
+        List<Predicate> rv = new ArrayList<Predicate>(collection(expr, other, knownElement));
+        rv.add(expr.get(0).eq(knownElement));
+        return Collections.unmodifiableList(rv);
+    }
+
+    public <K,V> Collection<Predicate> map(MapExpressionBase<K,V,?> expr,
+            MapExpression<K,V> other, K knownKey, V knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.containsKey(knownKey));
+        rv.add(expr.containsValue(knownValue));
+        rv.add(expr.get(knownKey).eq(knownValue));
+        rv.add(expr.get(knownKey).ne(knownValue));
+        rv.add(expr.isEmpty());
+        rv.add(expr.isNotEmpty());
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size().gt(0));
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Number & Comparable<A>> Collection<Predicate> numeric(NumberExpression<A> expr,
+            NumberExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        for (NumberExpression<?> num : projections.numeric(expr, other, knownValue, true)) {
+            rv.add(num.lt(expr));
+        }
+        rv.add(expr.ne(other));
+        rv.add(expr.ne(knownValue));
+        rv.add(expr.goe(other));
+        rv.add(expr.goe(knownValue));
+        rv.add(expr.gt(other));
+        rv.add(expr.gt(knownValue));
+        rv.add(expr.loe(other));
+        rv.add(expr.loe(knownValue));
+        rv.add(expr.lt(other));
+        rv.add(expr.lt(knownValue));
+
+        rv.add(expr.in(1,2,3));
+        rv.add(expr.in(1L,2L,3L));
+
+        if (expr.getType().equals(Integer.class)) {
+            NumberExpression<Integer> eint = (NumberExpression) expr;
+            rv.add(eint.between(1, 2));
+            rv.add(eint.notBetween(1, 2));
+            rv.add(eint.mod(5).eq(0));
+        } else if (expr.getType().equals(Double.class)) {
+            NumberExpression<Double> edouble = (NumberExpression) expr;
+            rv.add(edouble.between(1.0, 2.0));
+            rv.add(edouble.notBetween(1.0, 2.0));
+        } else if (expr.getType().equals(Long.class)) {
+            NumberExpression<Long> elong = (NumberExpression) expr;
+            rv.add(elong.mod(5L).eq(0L));
+        }
+
+//        rv.add(expr.in(IntervalImpl.create(0, 100)));
+
+        return Collections.unmodifiableList(rv);
+    }
+
+    public <A> Collection<Predicate> pathFilters(SimpleExpression<A> expr,
+            SimpleExpression<A> other, A knownValue) {
+        return Arrays.<Predicate>asList(
+             expr.isNull(),
+             expr.isNotNull()
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    public Collection<Predicate> string(StringExpression expr, StringExpression other,
+            String knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        if (expr instanceof Path && other instanceof Path) {
+            rv.addAll(pathFilters(expr, other, knownValue));
+        }
+        rv.addAll(comparable(expr, other, knownValue));
+        for (SimpleExpression<String> eq : projections.string(expr, other, knownValue)) {
+            rv.add(eq.eq(other));
+        }
+        rv.add(expr.between("A", "Z"));
+
+        rv.add(expr.charAt(0).eq(knownValue.charAt(0)));
+
+        rv.add(expr.notBetween("A", "Z"));
+
+        rv.add(expr.contains(other));
+        rv.add(expr.contains(knownValue.substring(0,1)));
+        rv.add(expr.contains(knownValue.substring(1,2)));
+
+        rv.add(expr.containsIgnoreCase(other));
+        rv.add(expr.containsIgnoreCase(knownValue.substring(0,1)));
+        rv.add(expr.containsIgnoreCase(knownValue.substring(1,2)));
+
+        rv.add(expr.endsWith(other));
+        rv.add(expr.endsWith(knownValue.substring(1)));
+        rv.add(expr.endsWith(knownValue.substring(2)));
+
+        rv.add(expr.equalsIgnoreCase(other));
+        rv.add(expr.equalsIgnoreCase(knownValue));
+
+        rv.add(expr.in(Collections.singletonList(knownValue)));
+
+        rv.add(expr.indexOf(other).gt(0));
+        rv.add(expr.indexOf("X", 1).gt(0));
+        rv.add(expr.indexOf(knownValue).gt(0));
+
+        rv.add(expr.locate(other).gt(1));
+        if (!target.equals(Target.FIREBIRD)) { // FIXME
+            rv.add(expr.locate("X", 2).gt(1));
+        }
+        rv.add(expr.locate(knownValue).gt(1));
+
+//        if (!module.equals(Module.HQL) && !module.equals(Module.JDOQL) && !module.equals(Module.SQL)) {
+//            rv.add(expr.lastIndexOf(other).gt(0));
+//            rv.add(expr.lastIndexOf(knownValue).gt(0));
+//        }
+
+        rv.add(expr.in("A","B","C"));
+
+        rv.add(expr.isEmpty());
+        rv.add(expr.isNotEmpty());
+
+        rv.add(expr.length().gt(0));
+
+        rv.add(expr.like(knownValue.substring(0,1) + "%"));
+        rv.add(expr.like("%" + knownValue.substring(1)));
+        rv.add(expr.like("%" + knownValue.substring(1,2) + "%"));
+
+        rv.add(expr.like(knownValue.substring(0,1) + "%", '!'));
+        rv.add(expr.like("%" + knownValue.substring(1), '!'));
+        rv.add(expr.like("%" + knownValue.substring(1,2) + "%", '!'));
+
+        rv.add(expr.likeIgnoreCase(knownValue.substring(0, 1) + "%"));
+        rv.add(expr.likeIgnoreCase("%" + knownValue.substring(1)));
+        rv.add(expr.likeIgnoreCase("%" + knownValue.substring(1, 2) + "%"));
+
+        rv.add(expr.likeIgnoreCase(knownValue.substring(0, 1) + "%", '!'));
+        rv.add(expr.likeIgnoreCase("%" + knownValue.substring(1), '!'));
+        rv.add(expr.likeIgnoreCase("%" + knownValue.substring(1, 2) + "%", '!'));
+
+        rv.add(expr.notLike(knownValue.substring(0,1) + "%"));
+        rv.add(expr.notLike("%" + knownValue.substring(1)));
+        rv.add(expr.notLike("%" + knownValue.substring(1,2) + "%"));
+
+        if (!target.equals(Target.DERBY)
+         && !target.equals(Target.DB2)
+         && !target.equals(Target.FIREBIRD)
+         && !target.equals(Target.HSQLDB)
+         && !target.equals(Target.H2)
+         && !target.equals(Target.SQLITE)
+         && !target.equals(Target.SQLSERVER)) {
+            rv.add(expr.matches(knownValue.substring(0,1) + ".*"));
+            rv.add(expr.matches(".*" + knownValue.substring(1)));
+            rv.add(expr.matches(".*" + knownValue.substring(1,2) + ".*"));
+        }
+
+        rv.add(expr.notIn("A","B","C"));
+
+        rv.add(expr.notBetween("A", "Z"));
+        rv.add(expr.notBetween(other, other));
+
+        if (!target.equals(Target.DERBY) && !module.equals(QuerydslModule.JDO)) {
+            // https://issues.apache.org/jira/browse/DERBY-4389
+            rv.add(new Coalesce<String>(String.class, expr, other).getValue().eq("xxx"));
+        }
+
+//        rv.add(expr.in(IntervalImpl.create("A", "Z")));
+
+        return Collections.unmodifiableList(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Predicate> time(TimeExpression<A> expr,
+            TimeExpression<A> other, A knownValue) {
+        List<Predicate> rv = new ArrayList<Predicate>();
+        rv.addAll(comparable(expr, other, knownValue));
+        rv.addAll(dateOrTime(expr, other, knownValue));
+        rv.add(expr.hour().eq(other.hour()));
+        rv.add(expr.minute().eq(other.minute()));
+        rv.add(expr.second().eq(other.second()));
+        return Collections.unmodifiableList(rv);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java b/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java
new file mode 100644
index 0000000000..82adef955b
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * @author tiwe
+ *
+ */
+public class MatchingFiltersFactory {
+
+    private final QuerydslModule module;
+
+    private final Target target;
+
+    public MatchingFiltersFactory(QuerydslModule module, Target target) {
+        this.module = module;
+        this.target = target;
+    }
+
+    public <A> Collection<Predicate> array(ArrayExpression<A[], A> expr,
+            ArrayExpression<A[], A> other, A knownElement, A missingElement) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+//        rv.add(expr.isEmpty().not());
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size().gt(0));
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A> Collection<Predicate> collection(CollectionExpressionBase<?,A> expr,
+            CollectionExpression<?,A> other, A knownElement, A missingElement) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.contains(knownElement));
+            rv.add(expr.contains(missingElement).not());
+        }
+        rv.add(expr.isEmpty().not());
+        rv.add(expr.isNotEmpty());
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <A extends Comparable> Collection<Predicate> comparable(ComparableExpression<A> expr,
+            Expression<A> other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.eq(other));
+        rv.add(expr.goe(other));
+        rv.add(expr.loe(other));
+        rv.add(expr.ne(other).not());
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> date(DateExpression<java.sql.Date> expr,
+            DateExpression<java.sql.Date> other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>(comparable(expr, other));
+        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
+
+        if (!target.equals(Target.DERBY) && !module.equals(QuerydslModule.JDO) && !target.equals(Target.ORACLE)
+                && !target.equals(Target.FIREBIRD)
+                && (!target.equals(Target.POSTGRESQL) || !module.equals(QuerydslModule.JPA))) {
+            rv.add(expr.dayOfWeek().eq(other.dayOfWeek()));
+            rv.add(expr.dayOfYear().eq(other.dayOfYear()));
+
+            if (!target.equals(Target.SQLSERVER) && !target.equals(Target.MYSQL)
+                    && !target.equals(Target.CUBRID)
+                    && !target.equals(Target.POSTGRESQL) && !target.equals(Target.HSQLDB)) {
+                rv.add(expr.week().eq(other.week()));
+            }
+        }
+
+        rv.add(expr.month().eq(other.month()));
+        rv.add(expr.year().eq(other.year()));
+        rv.add(expr.yearMonth().eq(other.yearMonth()));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> date(DateExpression<java.sql.Date> expr,
+            DateExpression<java.sql.Date> other, java.sql.Date knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.addAll(date(expr, other));
+        rv.addAll(date(expr, DateConstant.create(knownValue)));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> dateTime(DateTimeExpression<java.util.Date> expr,
+            DateTimeExpression<java.util.Date> other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>(comparable(expr, other));
+        rv.add(expr.milliSecond().eq(other.milliSecond()));
+        rv.add(expr.second().eq(other.second()));
+        rv.add(expr.minute().eq(other.minute()));
+        rv.add(expr.hour().eq(other.hour()));
+        rv.add(expr.dayOfMonth().eq(other.dayOfMonth()));
+
+        if (!target.equals(Target.DERBY) && !module.equals(QuerydslModule.JDO) && !target.equals(Target.ORACLE)
+                && (!target.equals(Target.POSTGRESQL) || !module.equals(QuerydslModule.JPA))) {
+            rv.add(expr.dayOfWeek().eq(other.dayOfWeek()));
+            rv.add(expr.dayOfYear().eq(other.dayOfYear()));
+
+            if (!target.equals(Target.SQLSERVER) && !target.equals(Target.MYSQL)
+                    && !target.equals(Target.CUBRID)
+                    && !target.equals(Target.POSTGRESQL) && !target.equals(Target.HSQLDB)) {
+                rv.add(expr.week().eq(other.week()));
+            }
+        }
+
+        rv.add(expr.month().eq(other.month()));
+        rv.add(expr.year().eq(other.year()));
+        rv.add(expr.yearMonth().eq(other.yearMonth()));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> dateTime(DateTimeExpression<java.util.Date> expr,
+            DateTimeExpression<java.util.Date> other, java.util.Date knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.addAll(dateTime(expr, other));
+        rv.addAll(dateTime(expr, DateTimeConstant.create(knownValue)));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A,Q extends SimpleExpression<A>> Collection<Predicate> list(ListPath<A,Q> expr,
+            ListExpression<A,Q> other, A knownElement, A missingElement) {
+        return collection(expr, other, knownElement, missingElement);
+    }
+
+    public <K,V> Collection<Predicate> map(MapExpressionBase<K,V,?> expr,
+            MapExpression<K,V> other,  K knownKey, V knownValue, K missingKey, V missingValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.containsKey(knownKey));
+        rv.add(expr.containsKey(missingKey).not());
+        rv.add(expr.containsValue(knownValue));
+        rv.add(expr.containsValue(missingValue).not());
+        rv.add(expr.get(knownKey).eq(knownValue));
+        rv.add(expr.isEmpty().not());
+        rv.add(expr.isNotEmpty());
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A extends Number & Comparable<A>> Collection<Predicate> numeric(
+            NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.addAll(numeric(expr, other));
+        rv.addAll(numeric(expr, NumberConstant.create(knownValue)));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A extends Number & Comparable<A>> Collection<Predicate> numeric(
+            NumberExpression<A> expr, NumberExpression<A> other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.add(expr.eq(other));
+        rv.add(expr.goe(other));
+        rv.add(expr.gt(other.subtract(1)));
+        rv.add(expr.gt(other.subtract(2)));
+        rv.add(expr.loe(other));
+        rv.add(expr.lt(other.add(1)));
+        rv.add(expr.lt(other.add(2)));
+        rv.add(expr.ne(other).not());
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> string(StringExpression expr, StringExpression other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        if (module != QuerydslModule.LUCENE) {
+            rv.addAll(comparable(expr, other));
+
+            rv.add(expr.charAt(0).eq(other.charAt(0)));
+            rv.add(expr.charAt(1).eq(other.charAt(1)));
+        }
+
+        rv.add(expr.contains(other));
+        rv.add(expr.contains(other.substring(0,1)));
+        rv.add(expr.contains(other.substring(0,2)));
+        rv.add(expr.contains(other.substring(1,2)));
+        rv.add(expr.contains(other.substring(1)));
+        rv.add(expr.contains(other.substring(2)));
+
+        rv.add(expr.containsIgnoreCase(other));
+        rv.add(expr.containsIgnoreCase(other.lower()));
+        rv.add(expr.containsIgnoreCase(other.upper()));
+        rv.add(expr.containsIgnoreCase(other.substring(0,1)));
+        rv.add(expr.containsIgnoreCase(other.substring(0,2).lower()));
+        rv.add(expr.containsIgnoreCase(other.substring(1,2).upper()));
+        rv.add(expr.containsIgnoreCase(other.substring(1).lower()));
+        rv.add(expr.containsIgnoreCase(other.substring(2).upper()));
+
+        rv.add(expr.endsWith(other));
+        rv.add(expr.endsWith(other.substring(1)));
+        rv.add(expr.endsWith(other.substring(2)));
+
+        rv.add(expr.endsWithIgnoreCase(other));
+        rv.add(expr.endsWithIgnoreCase(other.substring(1)));
+        rv.add(expr.endsWithIgnoreCase(other.substring(2)));
+
+        rv.add(expr.eq(other));
+        rv.add(expr.equalsIgnoreCase(other));
+
+        if (module != QuerydslModule.LUCENE) {
+            rv.add(expr.indexOf(other).eq(0));
+            rv.add(expr.locate(other).eq(1));
+        }
+
+        if (target != Target.DERBY && module != QuerydslModule.LUCENE) {
+            rv.add(expr.indexOf(other.substring(1)).eq(1));
+            rv.add(expr.indexOf(other.substring(2)).eq(2));
+        }
+
+        if (module != QuerydslModule.LUCENE) {
+            rv.add(expr.isEmpty().not());
+            rv.add(expr.isNotEmpty());
+        }
+
+        if (module != QuerydslModule.LUCENE) {
+            rv.add(expr.length().eq(other.length()));
+            rv.add(expr.like(other));
+
+            if (module != QuerydslModule.JDO || other instanceof Constant<?>) {
+                rv.add(expr.like(other.substring(0,1).append("%")));
+                rv.add(expr.like(other.substring(0,1).append("%").append(other.substring(2))));
+                rv.add(expr.like(other.substring(1).prepend("%")));
+                rv.add(expr.like(other.substring(1,2).append("%").prepend("%")));
+            }
+        }
+
+        rv.add(expr.lower().eq(other.lower()));
+
+        if (module != QuerydslModule.LUCENE) {
+            if (!module.equals(QuerydslModule.SQL)
+            || (!target.equals(Target.HSQLDB)
+            && !target.equals(Target.FIREBIRD)
+            && !target.equals(Target.H2)
+            && !target.equals(Target.DB2)
+            && !target.equals(Target.DERBY)
+            && !target.equals(Target.SQLITE)
+            && !target.equals(Target.SQLSERVER))) {
+
+                rv.add(expr.matches(other));
+
+                if (module != QuerydslModule.JDO || other instanceof Constant<?>) {
+                    rv.add(expr.matches(other.substring(0,1).append(".*")));
+                    rv.add(expr.matches(other.substring(0,1).append(".").append(other.substring(2))));
+                    rv.add(expr.matches(other.substring(1).prepend(".*")));
+                    rv.add(expr.matches(other.substring(1,2).prepend(".*").append(".*")));
+                }
+            }
+
+            rv.add(expr.ne(other));
+        }
+
+        rv.add(expr.startsWith(other));
+        rv.add(expr.startsWith(other.substring(0,1)));
+        rv.add(expr.startsWith(other.substring(0,2)));
+
+        rv.add(expr.startsWithIgnoreCase(other));
+        rv.add(expr.startsWithIgnoreCase(other.substring(0,1)));
+        rv.add(expr.startsWithIgnoreCase(other.substring(0,2)));
+
+        if (module != QuerydslModule.LUCENE) {
+            rv.add(expr.substring(0,1).eq(other.substring(0,1)));
+            rv.add(expr.substring(1,2).eq(other.substring(1,2)));
+            rv.add(expr.substring(1).eq(other.substring(1)));
+
+            rv.add(expr.trim().eq(other.trim()));
+        }
+
+        rv.add(expr.upper().eq(other.upper()));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> string(StringExpression expr, StringExpression other,
+            String knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.addAll(string(expr, other));
+        rv.addAll(string(expr, StringConstant.create(knownValue)));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> time(TimeExpression<java.sql.Time> expr,
+            TimeExpression<java.sql.Time> other) {
+        HashSet<Predicate> rv = new HashSet<Predicate>(comparable(expr, other));
+        rv.add(expr.milliSecond().eq(other.milliSecond()));
+        rv.add(expr.second().eq(other.second()));
+        rv.add(expr.minute().eq(other.minute()));
+        rv.add(expr.hour().eq(other.hour()));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public Collection<Predicate> time(TimeExpression<java.sql.Time> expr,
+            TimeExpression<java.sql.Time> other, java.sql.Time knownValue) {
+        HashSet<Predicate> rv = new HashSet<Predicate>();
+        rv.addAll(time(expr, other));
+        rv.addAll(time(expr, TimeConstant.create(knownValue)));
+        return Collections.unmodifiableSet(rv);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java
new file mode 100644
index 0000000000..5b27b9a0fd
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.time.LocalDate;
+
+import org.junit.Test;
+
+import com.querydsl.core.domain.Cat;
+import com.querydsl.core.domain.QCat;
+import com.querydsl.core.types.ExpressionException;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class NullExpressionTest {
+
+    @Test
+    public void withConstructor() {
+        Cat cat = Projections.constructor(Cat.class, Expressions.nullExpression(String.class), QCat.cat.id, QCat.cat.bodyWeight).newInstance(null, 1, 2.5);
+        assertNotNull(cat);
+    }
+
+
+    @Test(expected = ExpressionException.class)
+    public void withoutConstructor() {
+        Cat cat = Projections.constructor(Cat.class, Expressions.nullExpression(String.class), QCat.cat.id, QCat.cat.birthdate).newInstance(null, 1, LocalDate.now());
+        assertNotNull(cat);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java b/querydsl-core/src/test/java/com/querydsl/core/NumberConstant.java
similarity index 79%
rename from querydsl-core/src/test/java/com/mysema/query/NumberConstant.java
rename to querydsl-core/src/test/java/com/querydsl/core/NumberConstant.java
index 9bf6f8db7e..2e2494d61d 100644
--- a/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/NumberConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.util.MathUtils;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.util.MathUtils;
 
 /**
  * NumberConstant represents numeric constants
@@ -28,7 +28,7 @@
  *
  * @param <D>
  */
-final class NumberConstant<D extends Number & Comparable<?>> extends NumberExpression<D> implements Constant<D>{
+final class NumberConstant<D extends Number & Comparable<?>> extends NumberExpression<D> implements Constant<D> {
 
     private static final long serialVersionUID = 2958824808974260439L;
 
@@ -41,18 +41,18 @@ final class NumberConstant<D extends Number & Comparable<?>> extends NumberExpre
      */
     @SuppressWarnings("unchecked")
     public static <T extends Number & Comparable<?>> NumberExpression<T> create(T val) {
-        return new NumberConstant<T>((Class<T>)val.getClass(), val);
+        return new NumberConstant<T>((Class<T>) val.getClass(), val);
     }
 
     private final D constant;
 
-    public NumberConstant(Class<? extends D> type, D constant) {
+    NumberConstant(Class<? extends D> type, D constant) {
         super(ConstantImpl.create(constant));
         this.constant = constant;
     }
 
     @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
+    public <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(this, context);
     }
 
@@ -79,7 +79,7 @@ public NumberExpression<D> add(Number right) {
     @Override
     public <N extends Number & Comparable<?>> NumberExpression<D> add(Expression<N> right) {
         if (right instanceof Constant<?>) {
-            return add(((Constant<N>)right).getConstant());
+            return add(((Constant<N>) right).getConstant());
         } else {
             return super.add(right);
         }
@@ -93,7 +93,7 @@ public NumberExpression<D> subtract(Number right) {
     @Override
     public <N extends Number & Comparable<?>> NumberExpression<D> subtract(Expression<N> right) {
         if (right instanceof Constant<?>) {
-            return subtract(((Constant<N>)right).getConstant());
+            return subtract(((Constant<N>) right).getConstant());
         } else {
             return super.subtract(right);
         }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/ProjectionsFactory.java b/querydsl-core/src/test/java/com/querydsl/core/ProjectionsFactory.java
new file mode 100644
index 0000000000..ac1d2a1e5a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/ProjectionsFactory.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.MapExpression;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * @author tiwe
+ *
+ */
+public class ProjectionsFactory {
+
+    private final QuerydslModule module;
+
+    private final Target target;
+
+    public ProjectionsFactory(QuerydslModule module, Target target) {
+        this.module = module;
+        this.target = target;
+    }
+
+    public <A> Collection<Expression<?>> array(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other, A knownElement) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size());
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A> Collection<Expression<?>> collection(CollectionExpressionBase<?,A> expr, CollectionExpression<?,A> other, A knownElement) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size());
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Expression<?>> date(DateExpression<A> expr, DateExpression<A> other, A knownValue) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        rv.add(expr.dayOfMonth());
+        rv.add(expr.month());
+        rv.add(expr.year());
+        rv.add(expr.yearMonth());
+
+        if (module != QuerydslModule.COLLECTIONS && module != QuerydslModule.RDFBEAN) {
+            rv.add(expr.min());
+            rv.add(expr.max());
+        }
+
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Expression<?>> dateTime(DateTimeExpression<A> expr, DateTimeExpression<A> other, A knownValue) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        rv.add(expr.dayOfMonth());
+        rv.add(expr.month());
+        rv.add(expr.year());
+        rv.add(expr.yearMonth());
+        rv.add(expr.hour());
+        rv.add(expr.minute());
+        rv.add(expr.second());
+
+        if (module != QuerydslModule.COLLECTIONS && module != QuerydslModule.RDFBEAN) {
+            rv.add(expr.min());
+            rv.add(expr.max());
+        }
+
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A,Q extends SimpleExpression<A>> Collection<Expression<?>> list(ListPath<A,Q> expr, ListExpression<A,Q> other, A knownElement) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        rv.add(expr.get(0));
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size());
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <K,V> Collection<Expression<?>> map(MapExpressionBase<K,V,?> expr, MapExpression<K,V> other, K knownKey, V knownValue) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        rv.add(expr.get(knownKey));
+        if (!module.equals(QuerydslModule.RDFBEAN)) {
+            rv.add(expr.size());
+        }
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numeric(NumberExpression<A> expr, NumberExpression<A> other, A knownValue, boolean forFilter) {
+        HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
+        rv.addAll(numeric(expr, other, forFilter));
+        rv.addAll(numeric(expr, NumberConstant.create(knownValue), forFilter));
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numeric(NumberExpression<A> expr, NumberExpression<?> other, boolean forFilter) {
+        HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
+        rv.add(expr.abs());
+        rv.add(expr.add(other));
+        rv.add(expr.divide(other));
+
+        if (target != Target.HSQLDB) {
+            rv.add(expr.negate());
+        }
+
+        rv.add(expr.multiply(other));
+        rv.add(expr.sqrt());
+        rv.add(expr.subtract(other));
+
+        if (!forFilter && module != QuerydslModule.COLLECTIONS && module != QuerydslModule.RDFBEAN) {
+            rv.add(expr.min());
+            rv.add(expr.max());
+            rv.add(expr.avg());
+            rv.add(expr.count());
+            rv.add(expr.countDistinct());
+        }
+
+        if (!(other instanceof Constant<?> || module == QuerydslModule.JDO || module == QuerydslModule.RDFBEAN)) {
+            CaseBuilder cases = new CaseBuilder();
+            rv.add(NumberConstant.create(1).add(cases
+                .when(expr.gt(10)).then(expr)
+                .when(expr.between(0, 10)).then((NumberExpression<A>) other)
+                .otherwise((NumberExpression<A>) other)));
+
+            rv.add(expr
+                    .when((NumberExpression<A>) other).then(expr)
+                    .otherwise((NumberExpression<A>) other));
+        }
+
+        return Collections.unmodifiableSet(rv);
+    }
+
+    public <A extends Number & Comparable<A>> Collection<NumberExpression<?>> numericCasts(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
+        if (!target.equals(Target.MYSQL)) {
+            HashSet<NumberExpression<?>> rv = new HashSet<NumberExpression<?>>();
+            rv.add(expr.byteValue());
+            rv.add(expr.doubleValue());
+            rv.add(expr.floatValue());
+            rv.add(expr.intValue());
+            rv.add(expr.longValue());
+            rv.add(expr.shortValue());
+            return Collections.unmodifiableSet(rv);
+        } else {
+            return Collections.emptySet();
+        }
+    }
+
+    public Collection<SimpleExpression<String>> string(StringExpression expr, StringExpression other, String knownValue) {
+        HashSet<SimpleExpression<String>> rv = new HashSet<SimpleExpression<String>>();
+        rv.addAll(stringProjections(expr, other));
+        rv.addAll(stringProjections(expr, StringConstant.create(knownValue)));
+        return rv;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Collection<SimpleExpression<String>> stringProjections(StringExpression expr, StringExpression other) {
+        HashSet<SimpleExpression<String>> rv = new HashSet<SimpleExpression<String>>();
+
+        rv.add(expr.append("Hello"));
+        rv.add(expr.append(other));
+
+        rv.add(expr.concat(other));
+        rv.add(expr.concat("Hello"));
+
+        rv.add(expr.lower());
+
+        rv.add(expr.prepend("Hello"));
+        rv.add(expr.prepend(other));
+
+        rv.add(expr.stringValue());
+
+        rv.add(expr.substring(1));
+        rv.add(expr.substring(0, 1));
+
+        if (!(other instanceof Constant<?> || module == QuerydslModule.JDO || module == QuerydslModule.RDFBEAN)) {
+            CaseBuilder cases = new CaseBuilder();
+            rv.add(cases.when(expr.eq("A")).then(other)
+                        .when(expr.eq("B")).then(expr)
+                        .otherwise(other));
+
+            rv.add(expr.when("A").then(other)
+                       .when("B").then(expr)
+                       .otherwise(other));
+        }
+
+        rv.add(expr.trim());
+
+        rv.add(expr.upper());
+
+        if (module != QuerydslModule.JDO) {
+            rv.add(expr.nullif("xxx"));
+        }
+
+        return Collections.unmodifiableSet(rv);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <A extends Comparable> Collection<Expression<?>> time(TimeExpression<A> expr, TimeExpression<A> other, A knownValue) {
+        HashSet<Expression<?>> rv = new HashSet<Expression<?>>();
+        rv.add(expr.hour());
+        rv.add(expr.minute());
+        rv.add(expr.second());
+        return Collections.unmodifiableSet(rv);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/QDefaultQueryMetadata.java b/querydsl-core/src/test/java/com/querydsl/core/QDefaultQueryMetadata.java
similarity index 79%
rename from querydsl-core/src/test/java/com/mysema/query/QDefaultQueryMetadata.java
rename to querydsl-core/src/test/java/com/querydsl/core/QDefaultQueryMetadata.java
index 1a2956ad51..f7086a1cb0 100644
--- a/querydsl-core/src/test/java/com/mysema/query/QDefaultQueryMetadata.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/QDefaultQueryMetadata.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,24 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ValidatingVisitor;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.PathInits;
-import com.mysema.query.types.path.SetPath;
-import com.mysema.query.types.path.SimplePath;
+package com.querydsl.core;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
 
 
 /**
@@ -76,7 +64,7 @@ public QDefaultQueryMetadata(BeanPath<? extends DefaultQueryMetadata> entity) {
         super(entity.getType(), entity.getMetadata());
     }
 
-    public QDefaultQueryMetadata(PathMetadata<?> metadata) {
+    public QDefaultQueryMetadata(PathMetadata metadata) {
         super(DefaultQueryMetadata.class, metadata);
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java b/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java
new file mode 100644
index 0000000000..abc71c7c90
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+
+import com.querydsl.core.support.QueryBase;
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.MapExpression;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * The Class StandardTest.
+ *
+ * @author tiwe
+ */
+public abstract class QueryExecution {
+
+    private final List<String> errors = new ArrayList<String>();
+
+    private final List<String> failures = new ArrayList<String>();
+
+    private final MatchingFiltersFactory matchers;
+
+    private final ProjectionsFactory projections;
+
+    private final FilterFactory filters;
+
+    private boolean runFilters = true;
+
+    private boolean runProjections = true;
+
+    private boolean counts = true;
+
+    private int total;
+
+    public QueryExecution(QuerydslModule module, Target target) {
+        projections = new ProjectionsFactory(module, target);
+        filters = new FilterFactory(projections, module, target);
+        matchers = new MatchingFiltersFactory(module, target);
+    }
+
+    public QueryExecution(ProjectionsFactory p, FilterFactory f, MatchingFiltersFactory m) {
+        projections = p;
+        filters = f;
+        matchers = m;
+    }
+
+    public void reset() {
+        errors.clear();
+        failures.clear();
+        total = 0;
+    }
+
+    private void runProjectionQueries(Collection<? extends Expression<?>> projections) {
+        if (this.runProjections) {
+            for (Expression<?> pr : projections) {
+                total++;
+                try {
+                    // projection
+                    runProjection(pr);
+
+                    // projection distinct
+                    runProjectionDistinct(pr);
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                    t = addError(pr, t);
+                }
+            }
+        }
+    }
+
+    private Throwable addError(Expression<?> expr, Throwable throwable) {
+        StringBuilder error = new StringBuilder();
+        error.append(expr).append(" failed : \n");
+        error.append(" ").append(throwable.getClass().getName()).append(" : ").append(throwable.getMessage()).append("\n");
+        if (throwable.getCause() != null) {
+            throwable = throwable.getCause();
+            error.append(" ").append(throwable.getClass().getName()).append(" : ").append(throwable.getMessage()).append("\n");
+        }
+        errors.add(error.toString());
+        return throwable;
+    }
+
+    private void runFilterQueries(Collection<Predicate> filters, boolean matching) {
+        if (this.runFilters) {
+            for (Predicate f : filters) {
+                total++;
+                try {
+                    // filter
+                    int results = runFilter(f);
+
+                    // filter distinct
+                    runFilterDistinct(f);
+
+                    if (counts) {
+                        // count
+                        runCount(f);
+
+                        // count distinct
+                        runCountDistinct(f);
+                    }
+
+                    if (matching && results == 0) {
+                        failures.add(f + " failed");
+                    }
+
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                    t = addError(f, t);
+                }
+            }
+        }
+    }
+
+    protected abstract Fetchable<?> createQuery();
+
+    protected abstract Fetchable<?> createQuery(Predicate filter);
+
+    private long runCount(Predicate f) {
+        Fetchable<?> p = createQuery(f);
+        try {
+            return p.fetchCount();
+        } finally {
+            close(p);
+        }
+    }
+
+    private long runCountDistinct(Predicate f) {
+        Fetchable<?> p = createQuery(f);
+        try {
+            ((QueryBase) p).distinct();
+            return p.fetchCount();
+        } finally {
+            close(p);
+        }
+    }
+
+    private int runFilter(Predicate f) {
+        Fetchable<?> p = createQuery(f);
+        try {
+            return p.fetch().size();
+        } finally {
+            close(p);
+        }
+    }
+
+    private int runFilterDistinct(Predicate f) {
+        Fetchable<?> p = createQuery(f);
+        try {
+            ((QueryBase) p).distinct();
+            return p.fetch().size();
+        } finally {
+            close(p);
+        }
+    }
+
+    private int runProjection(Expression<?> pr) {
+        Fetchable<?> p = createQuery();
+        try {
+            ((FetchableQuery) p).select(pr);
+            return p.fetch().size();
+        } finally {
+            close(p);
+        }
+    }
+
+    private int runProjectionDistinct(Expression<?> pr) {
+        Fetchable<?> p = createQuery();
+        try {
+            ((QueryBase) p).distinct();
+            ((FetchableQuery) p).select(pr);
+            return p.fetch().size();
+        } finally {
+            close(p);
+        }
+    }
+
+    private void close(Fetchable p) {
+        if (p instanceof Closeable) {
+            try {
+                ((Closeable) p).close();
+            } catch (IOException e) {
+                throw new QueryException(e);
+            }
+        }
+    }
+
+    public final void report() {
+        if (!failures.isEmpty() || !errors.isEmpty()) {
+            // System.err logging
+            System.err.println(failures.size() + " failures");
+            for (String f : failures) {
+                System.err.println(f);
+            }
+            System.err.println();
+            System.err.println(errors.size() + " errors");
+            for (String e : errors) {
+                System.err.println(e);
+            }
+
+            // construct String for Assert.fail()
+            StringBuilder buffer = new StringBuilder("Failed with ");
+            if (!failures.isEmpty()) {
+                buffer.append(failures.size()).append(" failure(s) ");
+                if (!errors.isEmpty()) {
+                    buffer.append("and ");
+                }
+            }
+            if (!errors.isEmpty()) {
+                buffer.append(errors.size()).append(" error(s) ");
+            }
+            buffer.append("of ").append(total).append(" tests\n");
+            for (String f : failures) {
+                buffer.append(f).append("\n");
+            }
+            for (String e : errors) {
+                buffer.append(e).append("\n");
+            }
+            Assert.fail(buffer.toString());
+        } else {
+            System.out.println("Success with " + total + " tests");
+        }
+    }
+
+    public final QueryExecution noFilters() {
+        runFilters = false;
+        return this;
+    }
+
+    public final QueryExecution noProjections() {
+        runProjections = false;
+        return this;
+    }
+
+    public final QueryExecution noCounts() {
+        counts = false;
+        return this;
+    }
+
+    public final <A> void runArrayTests(ArrayExpression<A[], A> expr, ArrayExpression<A[], A> other, A knownElement, A missingElement) {
+        runFilterQueries(matchers.array(expr, other, knownElement, missingElement), true);
+        runFilterQueries(filters.array(expr, other, knownElement), false);
+        runProjectionQueries(projections.array(expr, other, knownElement));
+    }
+
+    public final void runBooleanTests(BooleanExpression expr, BooleanExpression other) {
+        runFilterQueries(filters.booleanFilters(expr, other), false);
+    }
+
+    public final <A> void runCollectionTests(CollectionExpressionBase<?,A> expr, CollectionExpression<?,A> other, A knownElement, A missingElement) {
+        runFilterQueries(matchers.collection(expr, other, knownElement, missingElement), true);
+        runFilterQueries(filters.collection(expr, other, knownElement), false);
+        runProjectionQueries(projections.collection(expr, other, knownElement));
+    }
+
+    public final void runDateTests(DateExpression<java.sql.Date> expr, DateExpression<java.sql.Date> other, java.sql.Date knownValue) {
+        runFilterQueries(matchers.date(expr, other, knownValue), true);
+        runFilterQueries(filters.date(expr, other, knownValue), false);
+        runProjectionQueries(projections.date(expr, other, knownValue));
+    }
+
+    public final void runDateTimeTests(DateTimeExpression<java.util.Date> expr, DateTimeExpression<java.util.Date> other, java.util.Date knownValue) {
+        runFilterQueries(matchers.dateTime(expr, other, knownValue), true);
+        runFilterQueries(filters.dateTime(expr, other, knownValue), false);
+        runProjectionQueries(projections.dateTime(expr, other, knownValue));
+    }
+
+    public final <A, Q extends SimpleExpression<A>> void runListTests(ListPath<A,Q> expr, ListExpression<A,Q> other, A knownElement, A missingElement) {
+        runFilterQueries(matchers.list(expr, other, knownElement, missingElement), true);
+        runFilterQueries(filters.list(expr, other, knownElement), false);
+        runProjectionQueries(projections.list(expr, other, knownElement));
+    }
+
+    public final <K,V> void runMapTests(MapExpressionBase<K,V,?> expr, MapExpression<K,V> other, K knownKey, V knownValue, K missingKey, V missingValue) {
+        runFilterQueries(matchers.map(expr, other, knownKey, knownValue, missingKey, missingValue), true);
+        runFilterQueries(filters.map(expr, other, knownKey, knownValue), false);
+        runProjectionQueries(projections.map(expr, other, knownKey, knownValue));
+    }
+
+    public final <A extends Number & Comparable<A>> void runNumericCasts(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
+        runProjectionQueries(projections.numericCasts(expr, other, knownValue));
+    }
+
+    public final <A extends Number & Comparable<A>> void runNumericTests(NumberExpression<A> expr, NumberExpression<A> other, A knownValue) {
+        runFilterQueries(matchers.numeric(expr, other, knownValue), true);
+        runFilterQueries(filters.numeric(expr, other, knownValue), false);
+        runProjectionQueries(projections.numeric(expr, other, knownValue, false));
+    }
+
+    public final void runStringTests(StringExpression expr, StringExpression other, String knownValue) {
+        runFilterQueries(matchers.string(expr, other, knownValue), true);
+        runFilterQueries(filters.string(expr, other, knownValue), false);
+        runProjectionQueries(projections.string(expr, other, knownValue));
+    }
+
+    public final void runTimeTests(TimeExpression<java.sql.Time> expr, TimeExpression<java.sql.Time> other, java.sql.Time knownValue) {
+        runFilterQueries(matchers.time(expr, other, knownValue), true);
+        runFilterQueries(filters.time(expr, other, knownValue), false);
+        runProjectionQueries(projections.time(expr, other, knownValue));
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java b/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java
new file mode 100644
index 0000000000..b4b328d862
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.core.util.ReflectionUtils;
+
+public class QueryMetadaSerializationTest {
+
+    private QueryMetadata metadata = new DefaultQueryMetadata();
+
+    @Test
+    public void serialization() throws IOException, ClassNotFoundException {
+        StringPath expr = Expressions.stringPath("str");
+        metadata.addJoin(JoinType.DEFAULT, expr);
+        metadata.addFlag(new QueryFlag(Position.AFTER_FILTERS, ""));
+        metadata.addGroupBy(expr);
+        metadata.addHaving(expr.isEmpty());
+//        metadata.getJoins().get(0).addFlag(new JoinFlag(""));
+        metadata.addJoinCondition(expr.isEmpty());
+        metadata.addOrderBy(expr.asc());
+        metadata.setProjection(expr);
+        metadata.addWhere(expr.isEmpty());
+
+        QueryMetadata metadata2 = Serialization.serialize(metadata);
+
+        assertEquals(metadata.getFlags(), metadata2.getFlags());
+        assertEquals(metadata.getGroupBy().get(0), metadata2.getGroupBy().get(0));
+        assertEquals(metadata.getGroupBy(), metadata2.getGroupBy());
+        assertEquals(metadata.getHaving(), metadata2.getHaving());
+        assertEquals(metadata.getJoins(), metadata2.getJoins());
+        assertEquals(metadata.getModifiers(), metadata2.getModifiers());
+        assertEquals(metadata.getOrderBy(), metadata2.getOrderBy());
+        assertEquals(metadata.getParams(), metadata2.getParams());
+        assertEquals(metadata.getProjection(), metadata2.getProjection());
+        assertEquals(metadata.getWhere(), metadata2.getWhere());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void fullySerializable() {
+        Set<Class<?>> checked = new HashSet<Class<?>>(Arrays.asList(Collection.class, List.class, Set.class, Map.class,
+                Object.class, String.class, Class.class));
+        Stack<Class<?>> classes = new Stack<Class<?>>();
+        classes.addAll(Arrays.<Class<?>>asList(NumberPath.class, NumberOperation.class,
+                NumberTemplate.class, BeanPath.class, DefaultQueryMetadata.class));
+        while (!classes.isEmpty()) {
+            Class<?> clazz = classes.pop();
+            checked.add(clazz);
+            if (!Serializable.class.isAssignableFrom(clazz) && !clazz.isPrimitive()) {
+                fail(clazz.getName() + " is not serializable");
+            }
+            for (Field field : clazz.getDeclaredFields()) {
+                if (Modifier.isTransient(field.getModifiers())) {
+                    continue;
+                }
+                Set<Class<?>> types = new HashSet<Class<?>>(3);
+                types.add(field.getType());
+                if (field.getType().getSuperclass() != null) {
+                    types.add(field.getType().getSuperclass());
+                }
+                if (field.getType().getComponentType() != null) {
+                    types.add(field.getType().getComponentType());
+                }
+                if (Collection.class.isAssignableFrom(field.getType())) {
+                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 0));
+                } else if (Map.class.isAssignableFrom(field.getType())) {
+                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 0));
+                    types.add(ReflectionUtils.getTypeParameterAsClass(field.getGenericType(), 1));
+                }
+                types.removeAll(checked);
+                classes.addAll(types);
+            }
+        }
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java b/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java
new file mode 100644
index 0000000000..ec36029c8d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class QueryModifiersTest {
+
+    @Test
+    public void limit() {
+        QueryModifiers modifiers = QueryModifiers.limit(12L);
+        assertEquals(Long.valueOf(12), modifiers.getLimit());
+        assertNull(modifiers.getOffset());
+        assertTrue(modifiers.isRestricting());
+    }
+
+    @Test
+    public void offset() {
+        QueryModifiers modifiers = QueryModifiers.offset(12L);
+        assertEquals(Long.valueOf(12), modifiers.getOffset());
+        assertNull(modifiers.getLimit());
+        assertTrue(modifiers.isRestricting());
+    }
+
+    @Test
+    public void both() {
+        QueryModifiers modifiers = new QueryModifiers(1L,2L);
+        assertEquals(Long.valueOf(1), modifiers.getLimit());
+        assertEquals(Long.valueOf(2), modifiers.getOffset());
+        assertTrue(modifiers.isRestricting());
+    }
+
+    @Test
+    public void empty() {
+        QueryModifiers modifiers = new QueryModifiers(null, null);
+        assertNull(modifiers.getLimit());
+        assertNull(modifiers.getOffset());
+        assertFalse(modifiers.isRestricting());
+    }
+
+    @Test
+    public void hashCode_() {
+        QueryModifiers modifiers1 = new QueryModifiers(null, null);
+        QueryModifiers modifiers2 = new QueryModifiers(1L, null);
+        QueryModifiers modifiers3 = new QueryModifiers(null, 1L);
+
+        assertEquals(modifiers1.hashCode(), QueryModifiers.EMPTY.hashCode());
+        assertEquals(modifiers2.hashCode(), QueryModifiers.limit(1L).hashCode());
+        assertEquals(modifiers3.hashCode(), QueryModifiers.offset(1L).hashCode());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void illegalLimit() {
+        QueryModifiers.limit(-1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void illegalOffset() {
+        QueryModifiers.offset(-1);
+    }
+
+    @Test
+    public void subList() {
+        List<Integer> ints = Arrays.asList(1,2,3,4,5);
+        assertEquals(Arrays.asList(3,4,5), QueryModifiers.offset(2).subList(ints));
+        assertEquals(Arrays.asList(1,2,3), QueryModifiers.limit(3).subList(ints));
+        assertEquals(Arrays.asList(2,3,4), new QueryModifiers(3L, 1L).subList(ints));
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryMutability.java b/querydsl-core/src/test/java/com/querydsl/core/QueryMutability.java
new file mode 100644
index 0000000000..62be551d4e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QueryMutability.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import com.querydsl.core.types.Expression;
+
+public final class QueryMutability {
+
+    private final FetchableQuery<?,?> query;
+
+    public QueryMutability(FetchableQuery<?,?> query) throws SecurityException,
+            NoSuchMethodException, IllegalArgumentException,
+            IllegalAccessException, InvocationTargetException {
+        this.query = query;
+    }
+
+    public void test(Expression<?> p1, Expression<?> p2) throws IOException {
+        System.err.println("fetchCount");
+        query.select(p1).fetchCount();
+
+        System.err.println("countDistinct");
+        query.select(p1).distinct().fetchCount();
+
+        System.err.println("iterate");
+        query.select(p1).iterate();
+        query.select(p1, p2).iterate();
+
+        System.err.println("iterateDistinct");
+        query.select(p1).distinct().iterate();
+        query.select(p1, p2).distinct().iterate();
+
+        System.err.println("list");
+        query.select(p1).fetch();
+        query.select(p1, p2).fetch();
+
+        System.err.println("distinct fetch");
+        query.select(p1).distinct().fetch();
+        query.select(p2).distinct().fetch();
+
+        System.err.println("fetchResults");
+        query.select(p1).fetchResults();
+
+        System.err.println("distinct fetchResults");
+        query.select(p1).distinct().fetchResults();
+
+        System.err.println("fetchOne");
+        query.select(p1).fetchOne();
+        query.select(p1,p2).fetchOne();
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java b/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java
new file mode 100644
index 0000000000..c4eaa20bbf
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class QueryResultsTest {
+
+    private List<Integer> list = Arrays.asList(0,1,2,3,4,5,6,7,8,9);
+
+    private QueryResults<Integer> results = new QueryResults<Integer>(list,10L,0L,20);
+
+    @Test
+    public void getResults() {
+        assertEquals(list, results.getResults());
+    }
+
+    @Test
+    public void getTotal() {
+        assertEquals(20L, results.getTotal());
+    }
+
+    @Test
+    public void isEmpty() {
+        assertFalse(results.isEmpty());
+    }
+
+    @Test
+    public void getLimit() {
+        assertEquals(10L, results.getLimit());
+    }
+
+    @Test
+    public void getOffset() {
+        assertEquals(0L, results.getOffset());
+    }
+
+    @Test
+    public void emptyResults() {
+        QueryResults<Object> empty = QueryResults.emptyResults();
+        assertTrue(empty.isEmpty());
+        assertEquals(Long.MAX_VALUE, empty.getLimit());
+        assertEquals(0L, empty.getOffset());
+        assertEquals(0L, empty.getTotal());
+        assertEquals(Collections.emptyList(), empty.getResults());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/QuerydslModule.java b/querydsl-core/src/test/java/com/querydsl/core/QuerydslModule.java
new file mode 100644
index 0000000000..91a8770ac1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/QuerydslModule.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+/**
+ * @author tiwe
+ *
+ */
+public enum QuerydslModule {
+    /**
+     *
+     */
+    COLLECTIONS,
+    /**
+     *
+     */
+    JPA,
+    /**
+     *
+     */
+    JDO,
+    /**
+     *
+     */
+    RDFBEAN,
+    /**
+     *
+     */
+    SQL,
+    /**
+     *
+     */
+    LUCENE;
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java b/querydsl-core/src/test/java/com/querydsl/core/SimpleConstant.java
similarity index 75%
rename from querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java
rename to querydsl-core/src/test/java/com/querydsl/core/SimpleConstant.java
index 6aaccf0541..dc03048215 100644
--- a/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/SimpleConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.SimpleExpression;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.SimpleExpression;
 
 /**
  * SimpleConstant represents general constant expressions
@@ -26,7 +26,7 @@
  *
  * @param <D> Java type of constant
  */
-final class SimpleConstant<D> extends SimpleExpression<D> implements Constant<D> {
+public final class SimpleConstant<D> extends SimpleExpression<D> implements Constant<D> {
 
     private static final long serialVersionUID = -3211963259241932307L;
 
@@ -40,7 +40,7 @@ final class SimpleConstant<D> extends SimpleExpression<D> implements Constant<D>
     @SuppressWarnings("unchecked")
     public static <T> SimpleExpression<T> create(T val) {
         if (val instanceof Boolean) {
-            return (SimpleExpression<T>)BooleanConstant.create((Boolean)val);
+            return (SimpleExpression<T>) BooleanConstant.create((Boolean) val);
         } else {
             return new SimpleConstant<T>(val);
         }
@@ -55,7 +55,7 @@ public static <T> SimpleExpression<T> create(T val) {
     }
 
     @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
+    public <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(this, context);
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/StringConstant.java b/querydsl-core/src/test/java/com/querydsl/core/StringConstant.java
new file mode 100644
index 0000000000..10edc523c0
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/StringConstant.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.types.dsl.StringExpression;
+
+/**
+ * StringConstant represents String constants
+ *
+ * @author tiwe
+ *
+ */
+public final class StringConstant extends StringExpression implements Constant<String> {
+
+    private static final long serialVersionUID = 5182804405789674556L;
+
+    public static StringExpression create(String str) {
+        return new StringConstant(str);
+    }
+
+    private final String constant;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> length;
+
+    @Nullable
+    private transient volatile StringExpression lower, trim, upper;
+
+    StringConstant(String constant) {
+        super(ConstantImpl.create(constant));
+        this.constant = constant;
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public StringExpression append(Expression<String> s) {
+        if (s instanceof Constant<?>) {
+            return append(((Constant<String>) s).getConstant());
+        } else {
+            return super.append(s);
+        }
+    }
+
+    @Override
+    public StringExpression append(String s) {
+        return new StringConstant(constant + s);
+    }
+
+    @Override
+    public SimpleExpression<Character> charAt(int i) {
+        return SimpleConstant.create(constant.charAt(i));
+    }
+
+    @Override
+    public StringExpression concat(String s) {
+        return append(s);
+    }
+
+    @Override
+    public BooleanExpression eq(String s) {
+        return BooleanConstant.create(constant.equals(s));
+    }
+
+    @Override
+    public BooleanExpression equalsIgnoreCase(String str) {
+        return BooleanConstant.create(constant.equalsIgnoreCase(str));
+    }
+
+    @Override
+    public String getConstant() {
+        return constant;
+    }
+
+    @Override
+    public BooleanExpression isEmpty() {
+        return BooleanConstant.create(constant.isEmpty());
+    }
+
+    @Override
+    public BooleanExpression isNotEmpty() {
+        return BooleanConstant.create(!constant.isEmpty());
+    }
+
+    @Override
+    public NumberExpression<Integer> length() {
+        if (length == null) {
+            length = NumberConstant.create(constant.length());
+        }
+        return length;
+    }
+
+    @Override
+    public StringExpression lower() {
+        if (lower == null) {
+            lower = new StringConstant(constant.toLowerCase());
+        }
+        return lower;
+    }
+
+    @Override
+    public BooleanExpression matches(String pattern) {
+        return BooleanConstant.create(constant.matches(pattern));
+    }
+
+    @Override
+    public BooleanExpression ne(String s) {
+        return BooleanConstant.create(!constant.equals(s));
+    }
+
+    @Override
+    public StringExpression prepend(Expression<String> s) {
+        if (s instanceof Constant<?>) {
+            return prepend(((Constant<String>) s).getConstant());
+        } else {
+            return super.prepend(s);
+        }
+    }
+
+    @Override
+    public StringExpression prepend(String s) {
+        return new StringConstant(s + constant);
+    }
+
+    @Override
+    public StringExpression substring(int beginIndex) {
+        return new StringConstant(constant.substring(beginIndex));
+    }
+
+    @Override
+    public StringExpression substring(int beginIndex, int endIndex) {
+        return new StringConstant(constant.substring(beginIndex, endIndex));
+    }
+
+    @Override
+    public StringExpression toLowerCase() {
+        return lower();
+    }
+
+    @Override
+    public StringExpression toUpperCase() {
+        return upper();
+    }
+
+    @Override
+    public StringExpression trim() {
+        if (trim == null) {
+            trim = new StringConstant(constant.trim());
+        }
+        return trim;
+    }
+
+    @Override
+    public StringExpression upper() {
+        if (upper == null) {
+            upper = new StringConstant(constant.toUpperCase());
+        }
+        return upper;
+    }
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java b/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java
similarity index 90%
rename from querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java
index 6238bd5691..a425c0d2c8 100644
--- a/querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.StringExpression;
+import com.querydsl.core.types.dsl.StringExpression;
 
 public class StringConstantTest {
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/Target.java b/querydsl-core/src/test/java/com/querydsl/core/Target.java
similarity index 81%
rename from querydsl-core/src/test/java/com/mysema/query/Target.java
rename to querydsl-core/src/test/java/com/querydsl/core/Target.java
index 6bcb685053..7cff24174d 100644
--- a/querydsl-core/src/test/java/com/mysema/query/Target.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/Target.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,27 +11,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 /**
  * @author tiwe
  *
  */
-public enum Target{
+public enum Target {
     /**
      * CUBRID
      */
     CUBRID,
+    /**
+     * DB2
+     */
+    DB2,
     /**
      * Derby
      */
     DERBY,
+    /**
+     *
+     */
+    FIREBIRD,
     /**
      *
      */
     H2,
     /**
-     * HSSQLDB
+     * HSQLDB
      */
     HSQLDB,
     /**
@@ -47,9 +55,9 @@ public enum Target{
      */
     ORACLE,
     /**
-     * Postgres
+     * PostgreSQL
      */
-    POSTGRES,
+    POSTGRESQL,
     /**
      * Microsoft SQL Server
      */
diff --git a/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java b/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java
new file mode 100644
index 0000000000..13fb0092fd
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import io.github.classgraph.ClassGraph;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import com.querydsl.core.types.Templates;
+
+public class TemplatesTestBase {
+
+    @Rule
+    public final ErrorCollector errorCollector = new ErrorCollector();
+
+    private final ClassGraph querydsl = new ClassGraph().enableClassInfo().acceptPackages(
+            TemplatesTestBase.class.getPackage().getName());
+
+    private final String modulePrefix = getClass().getPackage().getName();
+
+    @Test
+    public void default_instance() {
+        List<Class<?>> templates = querydsl.scan().getSubclasses(Templates.class.getName()).loadClasses();
+        Set<Class<?>> moduleSpecific = templates.stream().filter(MODULE_SPECIFIC).collect(Collectors.toSet());
+
+        for (Class<?> template : moduleSpecific) {
+            try {
+                Templates defaultInstance = (Templates) template.getField("DEFAULT").get(null);
+                errorCollector.checkThat(defaultInstance, instanceOf(template));
+            } catch (Exception ex) {
+                errorCollector.addError(ex);
+            }
+        }
+    }
+
+    private final Predicate<Class<?>> objectPredicate = o -> Pattern.matches("class " + modulePrefix + ".*", o.toString());
+    private final Predicate<Class<?>> MODULE_SPECIFIC = objectPredicate.and(topLevelClass);
+
+    private static final Predicate<Class<?>> topLevelClass = input -> !input.isAnonymousClass()
+            && !input.isMemberClass();
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java b/querydsl-core/src/test/java/com/querydsl/core/TimeConstant.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/TimeConstant.java
rename to querydsl-core/src/test/java/com/querydsl/core/TimeConstant.java
index ab441b256b..64215bd267 100644
--- a/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/TimeConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,21 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import java.util.Calendar;
 
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.TimeExpression;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.TimeExpression;
 
 /**
  * @author tiwe
  *
  */
-final class TimeConstant<D extends java.util.Date> extends TimeExpression<D> implements Constant<D>{
+public final class TimeConstant<D extends java.util.Date> extends TimeExpression<D> implements Constant<D> {
 
     private static final long serialVersionUID = -7835941761930555480L;
 
@@ -46,7 +46,7 @@ public TimeConstant(D time) {
     }
 
     @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
+    public <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(this, context);
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java b/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java
similarity index 89%
rename from querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java
index 89133af1f0..5b4e27f686 100644
--- a/querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.core;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.TimeExpression;
+import com.querydsl.core.types.dsl.TimeExpression;
 
 public class TimeConstantTest {
 
@@ -31,7 +31,6 @@ public void test() {
         cal.set(Calendar.MINUTE,      30);
         cal.set(Calendar.SECOND,      12);
         cal.set(Calendar.MILLISECOND,  3);
-        System.out.println(cal.getTime());
 
         TimeExpression<Time> time = TimeConstant.create(new Time(cal.getTimeInMillis()));
         assertEquals("13",   time.hour().toString());
diff --git a/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java
new file mode 100644
index 0000000000..dbd4b0802b
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import static org.junit.Assert.assertEquals;
+import static com.querydsl.core.alias.Alias.$;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Path;
+
+public class AliasTest {
+
+    @Test
+    public void alias() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        Alias.alias(DomainType.class, $(domainType.getCollection()).any());
+    }
+
+    @Test
+    public void comparableEntity() {
+       ComparableEntity entity = Alias.alias(ComparableEntity.class);
+       Path<ComparableEntity> path = $(entity);
+       assertEquals(ComparableEntity.class, path.getType());
+    }
+
+    @Test
+    public void comparableEntity_property() {
+       ComparableEntity entity = Alias.alias(ComparableEntity.class);
+       Path<String> propertyPath = $(entity.getProperty());
+       assertEquals(String.class, propertyPath.getType());
+       assertEquals("property", propertyPath.getMetadata().getName());
+    }
+
+    @Test
+    public void basicUsage() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals("lower(domainType.firstName)", $(domainType.getFirstName()).lower().toString());
+        assertEquals("domainType.age", $(domainType.getAge()).toString());
+        assertEquals("domainType.map.get(a)", $(domainType.getMap().get("a")).toString());
+        assertEquals("domainType.list.get(0)", $(domainType.getList().get(0)).toString());
+
+        assertEquals("domainType.bigDecimal", $(domainType.getBigDecimal()).toString());
+        assertEquals("domainType.bigInteger", $(domainType.getBigInteger()).toString());
+        assertEquals("domainType.byte", $(domainType.getByte()).toString());
+        assertEquals("domainType.collection", $(domainType.getCollection()).toString());
+        assertEquals("domainType.double", $(domainType.getDouble()).toString());
+        assertEquals("domainType.float", $(domainType.getFloat()).toString());
+        assertEquals("domainType.date", $(domainType.getDate()).toString());
+        assertEquals("domainType.date2", $(domainType.getDate2()).toString());
+        assertEquals("domainType.set", $(domainType.getSet()).toString());
+        assertEquals("domainType.short", $(domainType.getShort()).toString());
+        assertEquals("domainType.time", $(domainType.getTime()).toString());
+        assertEquals("domainType.timestamp", $(domainType.getTimestamp()).toString());
+        assertEquals("domainType.gender", $(domainType.getGender()).toString());
+    }
+
+    @Test
+    public void getAny() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals(DomainType.class, Alias.getAny(domainType).getType());
+        assertEquals(String.class, Alias.getAny(domainType.getFirstName()).getType());
+    }
+
+    @Test
+    public void otherMethods() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals("domainType", domainType.toString());
+    }
+
+    @Test
+    public void var() {
+        assertEquals("it", Alias.var().toString());
+        assertEquals("varInteger1", Alias.var(1).toString());
+        assertEquals("X", Alias.var("X").toString());
+        assertEquals("varMALE", Alias.var(Gender.MALE).toString());
+        assertEquals("varAliasTest_XXX", Alias.var(new AliasTest()).toString());
+    }
+
+    @Override
+    public String toString() {
+        return "XXX";
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java
new file mode 100644
index 0000000000..faf14a9e27
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+import static org.junit.Assert.assertEquals;
+import static com.querydsl.core.alias.Alias.$;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.EntityPath;
+
+public class CollectionTest {
+
+    @Test
+    public void collectionUsage() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals("any(domainType.collection) = domainType", $(domainType.getCollection()).any().eq(domainType).toString());
+        assertEquals("any(domainType.set) = domainType", $(domainType.getSet()).any().eq(domainType).toString());
+        assertEquals("any(domainType.list) = domainType", $(domainType.getList()).any().eq(domainType).toString());
+        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList().get(0)).eq(domainType).toString());
+        assertEquals("domainType.list.get(0) = domainType", $(domainType.getList()).get(0).eq(domainType).toString());
+        assertEquals("domainType.map.get(key) = domainType", $(domainType.getMap()).get("key").eq(domainType).toString());
+
+        EntityPath<DomainType> domainTypePath = $(domainType);
+        assertEquals("domainType in domainType.collection", $(domainType.getCollection()).contains(domainTypePath).toString());
+    }
+
+    @Test
+    public void collectionUsage_types() {
+        DomainType domainType = Alias.alias(DomainType.class);
+        assertEquals(DomainType.class, $(domainType.getCollection()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getSet()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getList()).any().getType());
+        assertEquals(DomainType.class, $(domainType.getMap()).get("key").getType());
+    }
+
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/ComparableEntity.java b/querydsl-core/src/test/java/com/querydsl/core/alias/ComparableEntity.java
similarity index 88%
rename from querydsl-core/src/test/java/com/mysema/query/alias/ComparableEntity.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/ComparableEntity.java
index e857eb41ad..fe068e8821 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/ComparableEntity.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/ComparableEntity.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
-public class ComparableEntity implements Comparable<ComparableEntity>{
+public class ComparableEntity implements Comparable<ComparableEntity> {
 
     @Override
     public int compareTo(ComparableEntity o) {
@@ -23,7 +23,7 @@ public int compareTo(ComparableEntity o) {
     public boolean equals(Object o) {
         return o == this;
     }
-    
+
     public String getProperty() {
         return "";
     }
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/ComparablePropertyTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java
similarity index 91%
rename from querydsl-core/src/test/java/com/mysema/query/alias/ComparablePropertyTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java
index 390340d5ea..000834344f 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/ComparablePropertyTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import org.junit.Test;
 
 public class ComparablePropertyTest {
 
-    public static class Entity{
+    public static class Entity {
 
         private ComparableType property;
 
@@ -31,7 +31,7 @@ public void setProperty(ComparableType property) {
 
     }
 
-    public static class ComparableType implements Comparable<ComparableType>{
+    public static class ComparableType implements Comparable<ComparableType> {
 
         @Override
         public int compareTo(ComparableType o) {
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/DomainType.java b/querydsl-core/src/test/java/com/querydsl/core/alias/DomainType.java
similarity index 90%
rename from querydsl-core/src/test/java/com/mysema/query/alias/DomainType.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/DomainType.java
index 5c30d1048c..1c51362756 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/DomainType.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/DomainType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public interface DomainType{
+public interface DomainType {
 
     String getFirstName();
 
@@ -31,9 +31,9 @@ public interface DomainType{
     int getAge();
 
     List<DomainType> getList();
-    
+
     Collection<DomainType> getCollection();
-    
+
     Set<DomainType> getSet();
 
     Map<String,DomainType> getMap();
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/FinalPropertyTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java
similarity index 84%
rename from querydsl-core/src/test/java/com/mysema/query/alias/FinalPropertyTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java
index 260f88fbc0..95827c74cf 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/FinalPropertyTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import org.junit.Test;
 
 public class FinalPropertyTest {
 
-    public static class Entity{
+    public static class Entity {
 
         private Entity2 property;
 
@@ -31,7 +31,7 @@ public void setProperty(Entity2 property) {
 
     }
 
-    public static final class Entity2{
+    public static final class Entity2 {
 
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/alias/Gender.java b/querydsl-core/src/test/java/com/querydsl/core/alias/Gender.java
new file mode 100644
index 0000000000..84ce21009d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/Gender.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.alias;
+
+public enum Gender {
+    MALE,
+    FEMALE
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/MethodTypeTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java
similarity index 90%
rename from querydsl-core/src/test/java/com/mysema/query/alias/MethodTypeTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java
index 7673bf0dbf..1b688aafd9 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/MethodTypeTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@
 public class MethodTypeTest {
 
     @Test
-    public void Get() throws SecurityException, NoSuchMethodException {
+    public void get() throws SecurityException, NoSuchMethodException {
         Method getVal = MethodTypeTest.class.getMethod("getVal");
         Method hashCode = Object.class.getMethod("hashCode");
         Method size = Collection.class.getMethod("size");
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/PathFactoryTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java
similarity index 75%
rename from querydsl-core/src/test/java/com/mysema/query/alias/PathFactoryTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java
index da9f9bb001..8bb42c7da1 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/PathFactoryTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -25,103 +25,103 @@
 
 import org.junit.Test;
 
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class PathFactoryTest {
 
     private PathFactory pathFactory = new DefaultPathFactory();
-    
-    private PathMetadata<?> metadata = PathMetadataFactory.forVariable("var");
-    
+
+    private PathMetadata metadata = PathMetadataFactory.forVariable("var");
+
     @Test
-    public void CreateArrayPath() {
+    public void createArrayPath() {
         Path<String[]> path = pathFactory.createArrayPath(String[].class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateEntityPath() {
+    public void createEntityPath() {
         Path<Object> path = pathFactory.createEntityPath(Object.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateSimplePath() {
+    public void createSimplePath() {
         Path<Object> path = pathFactory.createSimplePath(Object.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateComparablePath() {
+    public void createComparablePath() {
         Path<String> path = pathFactory.createComparablePath(String.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateEnumPath() {
+    public void createEnumPath() {
         Path<PropertyType> path = pathFactory.createEnumPath(PropertyType.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateDatePath() {
+    public void createDatePath() {
         Path<Date> path = pathFactory.createDatePath(Date.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateTimePath() {
+    public void createTimePath() {
         Path<Time> path = pathFactory.createTimePath(Time.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateDateTimePath() {
+    public void createDateTimePath() {
         Path<Timestamp> path = pathFactory.createDateTimePath(Timestamp.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateNumberPath() {
+    public void createNumberPath() {
         Path<Integer> path = pathFactory.createNumberPath(Integer.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateBooleanPath() {
+    public void createBooleanPath() {
         Path<Boolean> path = pathFactory.createBooleanPath(metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateStringPath() {
+    public void createStringPath() {
         Path<String> path = pathFactory.createStringPath(metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateListPath() {
+    public void createListPath() {
         Path<List<Timestamp>> path = pathFactory.createListPath(Timestamp.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateSetPath() {
+    public void createSetPath() {
         Path<Set<Timestamp>> path = pathFactory.createSetPath(Timestamp.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateCollectionPath() {
+    public void createCollectionPath() {
         Path<Collection<Timestamp>> path = pathFactory.createCollectionPath(Timestamp.class, metadata);
         assertNotNull(path);
     }
 
     @Test
-    public void CreateMapPath() {
+    public void createMapPath() {
         Path<Map<String,Timestamp>> path = pathFactory.createMapPath(String.class, Timestamp.class, metadata);
         assertNotNull(path);
     }
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessors.java b/querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessors.java
similarity index 85%
rename from querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessors.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessors.java
index 713dde8ca3..7143869906 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessors.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessors.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
 public interface ScalaAccessors {
-    
+
     String firstName();
 
     String lastName();
diff --git a/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java b/querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessorsTest.java
similarity index 83%
rename from querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessorsTest.java
index 4ff89648a2..2355eaafaf 100644
--- a/querydsl-core/src/test/java/com/mysema/query/alias/ScalaAccessorsTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/alias/ScalaAccessorsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.alias;
+package com.querydsl.core.alias;
 
-import static com.mysema.query.alias.Alias.$;
 import static org.junit.Assert.assertEquals;
+import static com.querydsl.core.alias.Alias.$;
 
 import org.junit.Test;
 
 public class ScalaAccessorsTest {
-    
+
     @Test
-    public void ScalaAccessors() {
+    public void scalaAccessors() {
         ScalaAccessors scalaAccessors = Alias.alias(ScalaAccessors.class);
         assertEquals("scalaAccessors.firstName", $(scalaAccessors.firstName()).toString());
         assertEquals("scalaAccessors.lastName",  $(scalaAccessors.lastName()).toString());
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/A.java b/querydsl-core/src/test/java/com/querydsl/core/domain/A.java
new file mode 100644
index 0000000000..742167692a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/A.java
@@ -0,0 +1,10 @@
+package com.querydsl.core.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class A {
+
+    public Tenant tenant;
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/AbstractEntity.java b/querydsl-core/src/test/java/com/querydsl/core/domain/AbstractEntity.java
new file mode 100644
index 0000000000..1724099a71
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/AbstractEntity.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class AbstractEntity<T> extends GenericEntity<Integer, T> {
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/Animal.java b/querydsl-core/src/test/java/com/querydsl/core/domain/Animal.java
new file mode 100644
index 0000000000..d7e8edd7b6
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/Animal.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+
+/**
+ * The Class Animal.
+ */
+public class Animal {
+    private boolean alive;
+
+    private java.util.Date birthdate;
+
+    private int weight, toes;
+
+    private double bodyWeight;
+
+    private java.sql.Date dateField;
+
+    private int id;
+
+    private String name;
+
+    private java.sql.Time timeField;
+
+    public java.util.Date getBirthdate() {
+        return new java.util.Date(birthdate.getTime());
+    }
+
+    public double getBodyWeight() {
+        return bodyWeight;
+    }
+
+
+    public java.sql.Date getDateField() {
+        return new java.sql.Date(dateField.getTime());
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public java.sql.Time getTimeField() {
+        return timeField;
+    }
+
+    public int getToes() {
+        return toes;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public boolean isAlive() {
+        return alive;
+    }
+
+    public void setAlive(boolean alive) {
+        this.alive = alive;
+    }
+
+    public void setBirthdate(java.util.Date birthdate) {
+        this.birthdate = new java.util.Date(birthdate.getTime());
+    }
+
+    public void setBodyWeight(double bodyWeight) {
+        this.bodyWeight = bodyWeight;
+    }
+
+    public void setDateField(java.sql.Date dateField) {
+        this.dateField = new java.sql.Date(dateField.getTime());
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setTimeField(java.sql.Time timeField) {
+        this.timeField = timeField;
+    }
+
+    public void setToes(int toes) {
+        this.toes = toes;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/Cat.java b/querydsl-core/src/test/java/com/querydsl/core/domain/Cat.java
new file mode 100644
index 0000000000..b49d1e2d2f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/Cat.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * The Class Cat.
+ */
+public class Cat extends Animal {
+
+    private int breed;
+
+    private List<Cat> kittens = new ArrayList<Cat>();
+
+    private Set<Cat> kittensSet;
+
+    private Cat mate;
+
+    public Cat() { }
+
+    public Cat(String name, int id) {
+        this.setId(id);
+        this.setName(name);
+    }
+
+    public Cat(String name, int id, double bodyWeight) {
+        this(name, id);
+        this.setBodyWeight(bodyWeight);
+    }
+
+    public int getBreed() {
+        return breed;
+    }
+
+    public List<Cat> getKittens() {
+        return kittens;
+    }
+
+    public Cat getMate() {
+        return mate;
+    }
+
+    public void addKitten(Cat kitten) {
+        kittens.add(kitten);
+    }
+
+    public Set<Cat> getKittensSet() {
+        return kittensSet;
+    }
+
+    public void setKittensSet(Set<Cat> kittensSet) {
+        this.kittensSet = kittensSet;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CommonIdentifiable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/CommonIdentifiable.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/domain/CommonIdentifiable.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/CommonIdentifiable.java
index a79cddd3ee..1381650cd6 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CommonIdentifiable.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/CommonIdentifiable.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
 import java.io.Serializable;
 
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QuerySupertype;
 
 @QuerySupertype
 public class CommonIdentifiable<ID extends Serializable> extends CommonPersistence {
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java b/querydsl-core/src/test/java/com/querydsl/core/domain/CommonPersistence.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/CommonPersistence.java
index c2190052c6..0c3cc59aed 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CommonPersistence.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/CommonPersistence.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
-import com.mysema.query.annotations.QuerySupertype;
+import com.querydsl.core.annotations.QuerySupertype;
 
 @QuerySupertype
 public class CommonPersistence {
-    
+
     private Long version;
 
     public Long getVersion() {
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/Company.java b/querydsl-core/src/test/java/com/querydsl/core/domain/Company.java
new file mode 100644
index 0000000000..299d3220e5
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/Company.java
@@ -0,0 +1,18 @@
+package com.querydsl.core.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Company {
+
+    private CompanyPK key;
+
+    public CompanyPK getKey() {
+        return key;
+    }
+
+    public void setKey(final CompanyPK aKey) {
+        this.key = aKey;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroup.java b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroup.java
similarity index 84%
rename from querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroup.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroup.java
index 3018c4615d..30240784ac 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroup.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroup.java
@@ -1,6 +1,6 @@
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class CompanyGroup {
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroupPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroupPK.java
similarity index 86%
rename from querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroupPK.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroupPK.java
index eaf06081e0..8f8ef594bb 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/CompanyGroupPK.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyGroupPK.java
@@ -1,8 +1,8 @@
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
 import java.io.Serializable;
 
-import com.mysema.query.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbeddable;
 
 @SuppressWarnings("serial")
 @QueryEmbeddable
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyPK.java
new file mode 100644
index 0000000000..3c46787da5
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/CompanyPK.java
@@ -0,0 +1,18 @@
+package com.querydsl.core.domain;
+
+import com.querydsl.core.annotations.QueryEmbeddable;
+
+@QueryEmbeddable
+public class CompanyPK {
+
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/EmbeddableWithoutQType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/EmbeddableWithoutQType.java
similarity index 84%
rename from querydsl-core/src/test/java/com/mysema/query/domain/EmbeddableWithoutQType.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/EmbeddableWithoutQType.java
index e2c229e8eb..f3365c688d 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/EmbeddableWithoutQType.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/EmbeddableWithoutQType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
 public class EmbeddableWithoutQType {
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/GenericEntity.java b/querydsl-core/src/test/java/com/querydsl/core/domain/GenericEntity.java
similarity index 88%
rename from querydsl-core/src/test/java/com/mysema/query/domain/GenericEntity.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/GenericEntity.java
index 99396ae8ba..80bb192e98 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/GenericEntity.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/GenericEntity.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
 import java.io.Serializable;
 
 public class GenericEntity<KeyType extends Serializable, T> {
-    
+
     private KeyType id;
 
     public KeyType getId() {
@@ -26,5 +26,5 @@ public KeyType getId() {
     public void setId(KeyType id) {
         this.id = id;
     }
-    
+
 }
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/IdNamePair.java b/querydsl-core/src/test/java/com/querydsl/core/domain/IdNamePair.java
similarity index 86%
rename from querydsl-core/src/test/java/com/mysema/query/domain/IdNamePair.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/IdNamePair.java
index ca3035095a..3f9d3600e8 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/IdNamePair.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/IdNamePair.java
@@ -1,9 +1,9 @@
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
 public class IdNamePair<Type> {
 
     private String id;
-    
+
     private Type name;
 
     public String getId() {
@@ -21,7 +21,7 @@ public Type getName() {
     public void setName(Type name) {
         this.name = name;
     }
-    
-    
-    
+
+
+
 }
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/MyEmbeddable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/MyEmbeddable.java
similarity index 85%
rename from querydsl-core/src/test/java/com/mysema/query/domain/MyEmbeddable.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/MyEmbeddable.java
index 9448c9337b..176ad6a4c1 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/MyEmbeddable.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/MyEmbeddable.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
-import com.mysema.query.annotations.QueryEmbeddable;
+import com.querydsl.core.annotations.QueryEmbeddable;
 
 @QueryEmbeddable
 public class MyEmbeddable implements Comparable<MyEmbeddable> {
@@ -23,11 +23,11 @@ public class MyEmbeddable implements Comparable<MyEmbeddable> {
     public int compareTo(MyEmbeddable individualToCompare) {
         return -1;
     }
-    
+
     public boolean equals(Object o) {
         return o == this;
     }
-    
+
     public int getFoo() {
         return foo;
     }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QAbstractEntity.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QAbstractEntity.java
new file mode 100644
index 0000000000..6d8da5cfbb
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QAbstractEntity.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+@SuppressWarnings("unchecked")
+public class QAbstractEntity extends EntityPathBase<AbstractEntity> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAbstractEntity animal = new QAbstractEntity("abstractEntity");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public QAbstractEntity(String variable) {
+        super(AbstractEntity.class, forVariable(variable));
+    }
+
+    public QAbstractEntity(BeanPath<? extends AbstractEntity<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAbstractEntity(PathMetadata metadata) {
+        super(AbstractEntity.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QAnimal.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QAnimal.java
new file mode 100644
index 0000000000..985f67c11d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QAnimal.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+public class QAnimal extends EntityPathBase<Animal> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAnimal animal = new QAnimal("animal");
+
+    public final BooleanPath alive = createBoolean("alive");
+
+    public final DateTimePath<java.util.Date> birthdate = createDateTime("birthdate", java.util.Date.class);
+
+    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
+
+    public final DatePath<Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
+
+    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
+
+    public QAnimal(String variable) {
+        super(Animal.class, forVariable(variable));
+    }
+
+    public QAnimal(BeanPath<? extends Animal> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAnimal(PathMetadata metadata) {
+        super(Animal.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCat.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCat.java
new file mode 100644
index 0000000000..095afdcb55
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCat.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QCat is a Querydsl query type for Cat
+ */
+public class QCat extends EntityPathBase<Cat> {
+
+    private static final long serialVersionUID = -528210988;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCat cat = new QCat("cat");
+
+    public final QAnimal _super = new QAnimal(this);
+
+    //inherited
+    public final BooleanPath alive = _super.alive;
+
+    //inherited
+    public final DateTimePath<java.util.Date> birthdate = _super.birthdate;
+
+    //inherited
+    public final NumberPath<Double> bodyWeight = _super.bodyWeight;
+
+    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
+
+    //inherited
+    public final DatePath<Date> dateField = _super.dateField;
+
+    //inherited
+    public final NumberPath<Integer> id = _super.id;
+
+    public final ListPath<Cat, QCat> kittens = this.<Cat,QCat>createList("kittens", Cat.class, QCat.class, PathInits.DIRECT);
+
+    public final SetPath<Cat, QCat> kittensSet = this.<Cat,QCat>createSet("kittensSet", Cat.class, QCat.class, PathInits.DIRECT);
+
+    public final QCat mate;
+
+    //inherited
+    public final StringPath name = _super.name;
+
+    //inherited
+    public final TimePath<java.sql.Time> timeField = _super.timeField;
+
+    //inherited
+    public final NumberPath<Integer> toes = _super.toes;
+
+    //inherited
+    public final NumberPath<Integer> weight = _super.weight;
+
+    public QCat(String variable) {
+        this(Cat.class, forVariable(variable), INITS);
+    }
+
+    public QCat(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCat(PathMetadata metadata, PathInits inits) {
+        this(Cat.class, metadata, inits);
+    }
+
+    public QCat(Class<? extends Cat> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.mate = inits.isInitialized("mate") ? new QCat(forProperty("mate"), inits.get("mate")) : null;
+    }
+
+    public QCat kittens(int index) {
+        return kittens.get(index);
+    }
+
+    public QCat kittens(Expression<Integer> index) {
+        return kittens.get(index);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonIdentifiable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonIdentifiable.java
new file mode 100644
index 0000000000..2f7fff4900
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonIdentifiable.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.io.Serializable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+
+
+/**
+ * QCommonIdentifiable is a Querydsl query type for CommonIdentifiable
+ */
+public class QCommonIdentifiable extends EntityPathBase<CommonIdentifiable<? extends Serializable>> {
+
+    private static final long serialVersionUID = 1818647030;
+
+    public static final QCommonIdentifiable commonIdentifiable = new QCommonIdentifiable("commonIdentifiable");
+
+    public final QCommonPersistence _super = new QCommonPersistence(this);
+
+    public final SimplePath<Serializable> id = createSimple("id", java.io.Serializable.class);
+
+    //inherited
+    public final NumberPath<Long> version = _super.version;
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiable(String variable) {
+        super((Class) CommonIdentifiable.class, forVariable(variable));
+    }
+
+    public QCommonIdentifiable(BeanPath<? extends CommonIdentifiable<? extends Serializable>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiable(PathMetadata metadata) {
+        super((Class) CommonIdentifiable.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonPersistence.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonPersistence.java
new file mode 100644
index 0000000000..12c8d2d920
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCommonPersistence.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+/**
+ * QCommonPersistence is a Querydsl query type for CommonPersistence
+ */
+public class QCommonPersistence extends BeanPath<CommonPersistence> implements EntityPath<CommonPersistence> {
+
+    private static final long serialVersionUID = -1494672641;
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QCommonPersistence(BeanPath<? extends CommonPersistence> entity) {
+        super(entity.getType(),entity.getMetadata());
+    }
+
+    public QCommonPersistence(PathMetadata metadata) {
+        super(CommonPersistence.class, metadata);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCompany.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompany.java
new file mode 100644
index 0000000000..91b174aabf
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompany.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompany is a Querydsl query type for Company
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompany extends EntityPathBase<Company> {
+
+    private static final long serialVersionUID = 616888712;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompany company = new QCompany("company");
+
+    public final QCompanyPK key;
+
+    public QCompany(String variable) {
+        this(Company.class, forVariable(variable), INITS);
+    }
+
+    public QCompany(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompany(PathMetadata metadata, PathInits inits) {
+        this(Company.class, metadata, inits);
+    }
+
+    public QCompany(Class<? extends Company> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyPK(forProperty("key")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroup.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroup.java
new file mode 100644
index 0000000000..091c40fe70
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroup.java
@@ -0,0 +1,47 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompanyGroup is a Querydsl query type for CompanyGroup
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompanyGroup extends EntityPathBase<CompanyGroup> {
+
+    private static final long serialVersionUID = 144687575;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompanyGroup companyGroup = new QCompanyGroup("companyGroup");
+
+    public final QCompanyGroupPK key;
+
+    public final QCompany mainCompany;
+
+    public QCompanyGroup(String variable) {
+        this(CompanyGroup.class, forVariable(variable), INITS);
+    }
+
+    public QCompanyGroup(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompanyGroup(PathMetadata metadata, PathInits inits) {
+        this(CompanyGroup.class, metadata, inits);
+    }
+
+    public QCompanyGroup(Class<? extends CompanyGroup> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyGroupPK(forProperty("key")) : null;
+        this.mainCompany = inits.isInitialized("mainCompany") ? new QCompany(forProperty("mainCompany"), inits.get("mainCompany")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroupPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroupPK.java
new file mode 100644
index 0000000000..2e6a478900
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyGroupPK.java
@@ -0,0 +1,41 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyGroupPK is a Querydsl query type for CompanyGroupPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyGroupPK extends BeanPath<CompanyGroupPK> {
+
+    private static final long serialVersionUID = 1605808658;
+
+    public static final QCompanyGroupPK companyGroupPK = new QCompanyGroupPK("companyGroupPK");
+
+    public final StringPath companyNumber = createString("companyNumber");
+
+    public final NumberPath<Long> companyType = createNumber("companyType", Long.class);
+
+    public QCompanyGroupPK(String variable) {
+        super(CompanyGroupPK.class, forVariable(variable));
+    }
+
+    public QCompanyGroupPK(Path<? extends CompanyGroupPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyGroupPK(PathMetadata metadata) {
+        super(CompanyGroupPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyPK.java
new file mode 100644
index 0000000000..d2335ad872
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QCompanyPK.java
@@ -0,0 +1,38 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyPK is a Querydsl query type for CompanyPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyPK extends BeanPath<CompanyPK> {
+
+    private static final long serialVersionUID = 124567939;
+
+    public static final QCompanyPK companyPK = new QCompanyPK("companyPK");
+
+    public final StringPath id = createString("id");
+
+    public QCompanyPK(String variable) {
+        super(CompanyPK.class, forVariable(variable));
+    }
+
+    public QCompanyPK(Path<? extends CompanyPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyPK(PathMetadata metadata) {
+        super(CompanyPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QIdNamePair.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QIdNamePair.java
new file mode 100644
index 0000000000..05b73f4459
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QIdNamePair.java
@@ -0,0 +1,43 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QIdNamePair is a Querydsl query type for IdNamePair
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QIdNamePair extends BeanPath<IdNamePair<?>> {
+
+    private static final long serialVersionUID = -1491444395;
+
+    public static final QIdNamePair idNamePair = new QIdNamePair("idNamePair");
+
+    public final StringPath id = createString("id");
+
+    public final SimplePath<Object> name = createSimple("name", Object.class);
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePair(String variable) {
+        super((Class) IdNamePair.class, forVariable(variable));
+    }
+
+    public QIdNamePair(Path<? extends IdNamePair<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePair(PathMetadata metadata) {
+        super((Class) IdNamePair.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QMyEmbeddable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QMyEmbeddable.java
new file mode 100644
index 0000000000..64f5f0d48d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QMyEmbeddable.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QMyEmbeddable is a Querydsl query type for MyEmbeddable
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QMyEmbeddable extends BeanPath<MyEmbeddable> {
+
+    private static final long serialVersionUID = -968265626;
+
+    public static final QMyEmbeddable myEmbeddable = new QMyEmbeddable("myEmbeddable");
+
+    public final NumberPath<Integer> foo = createNumber("foo", Integer.class);
+
+    public QMyEmbeddable(String variable) {
+        super(MyEmbeddable.class, forVariable(variable));
+    }
+
+    public QMyEmbeddable(BeanPath<? extends MyEmbeddable> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QMyEmbeddable(PathMetadata metadata) {
+        super(MyEmbeddable.class, metadata);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperSupertype.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperSupertype.java
new file mode 100644
index 0000000000..564ba1965c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperSupertype.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QSuperSupertype is a Querydsl query type for SuperSupertype
+ */
+public class QSuperSupertype extends EntityPathBase<SuperSupertype> {
+
+    private static final long serialVersionUID = 518341775;
+
+    public static final QSuperSupertype superSupertype = new QSuperSupertype("superSupertype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QSuperSupertype(String variable) {
+        super(SuperSupertype.class, forVariable(variable));
+    }
+
+    public QSuperSupertype(BeanPath<? extends SuperSupertype> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperSupertype(PathMetadata metadata) {
+        super(SuperSupertype.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperclass.java b/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperclass.java
new file mode 100644
index 0000000000..3830fc8bae
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/QSuperclass.java
@@ -0,0 +1,39 @@
+package com.querydsl.core.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QSuperclass is a Querydsl query type for Superclass
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QSuperclass extends EntityPathBase<Superclass> {
+
+    private static final long serialVersionUID = -1300377102;
+
+    public static final QSuperclass superclass = new QSuperclass("superclass");
+
+    public final ListPath<IdNamePair<String>, QIdNamePair> fooOfSuperclass = this.<IdNamePair<String>, QIdNamePair>createList("fooOfSuperclass", IdNamePair.class, QIdNamePair.class, PathInits.DIRECT);
+
+    public QSuperclass(String variable) {
+        super(Superclass.class, forVariable(variable));
+    }
+
+    public QSuperclass(Path<? extends Superclass> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperclass(PathMetadata metadata) {
+        super(Superclass.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain/SuperSupertype.java b/querydsl-core/src/test/java/com/querydsl/core/domain/SuperSupertype.java
similarity index 85%
rename from querydsl-core/src/test/java/com/mysema/query/domain/SuperSupertype.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain/SuperSupertype.java
index c6361aad62..083604c80f 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain/SuperSupertype.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/SuperSupertype.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.domain;
+package com.querydsl.core.domain;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class SuperSupertype {
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/Superclass.java b/querydsl-core/src/test/java/com/querydsl/core/domain/Superclass.java
new file mode 100644
index 0000000000..f0de9d6e71
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/Superclass.java
@@ -0,0 +1,24 @@
+package com.querydsl.core.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.querydsl.core.annotations.QueryEmbedded;
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Superclass {
+
+    @QueryEmbedded
+    private List<IdNamePair<String>> fooOfSuperclass = new ArrayList<IdNamePair<String>>();
+
+    public List<IdNamePair<String>> getFooOfSuperclass() {
+        return fooOfSuperclass;
+    }
+
+    public void setFooOfSuperclass(List<IdNamePair<String>> fooOfSuperclass) {
+        this.fooOfSuperclass = fooOfSuperclass;
+    }
+
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/Tenant.java b/querydsl-core/src/test/java/com/querydsl/core/domain/Tenant.java
new file mode 100644
index 0000000000..54656d9eaa
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/Tenant.java
@@ -0,0 +1,8 @@
+package com.querydsl.core.domain;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Tenant {
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAbstractEntity.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAbstractEntity.java
new file mode 100644
index 0000000000..6fda83a9d2
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAbstractEntity.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.AbstractEntity;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+@SuppressWarnings("unchecked")
+public class QAbstractEntity extends EntityPathBase<AbstractEntity> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAbstractEntity animal = new QAbstractEntity("abstractEntity");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public QAbstractEntity(String variable) {
+        super(AbstractEntity.class, forVariable(variable));
+    }
+
+    public QAbstractEntity(BeanPath<? extends AbstractEntity<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAbstractEntity(PathMetadata metadata) {
+        super(AbstractEntity.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAnimal.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAnimal.java
new file mode 100644
index 0000000000..300fb8228c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QAnimal.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+import java.sql.Time;
+
+import com.querydsl.core.domain.Animal;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+public class QAnimal extends EntityPathBase<Animal> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAnimal animal = new QAnimal("animal");
+
+    public final BooleanPath alive = createBoolean("alive");
+
+    public final DateTimePath<java.util.Date> birthdate = createDateTime("birthdate", java.util.Date.class);
+
+    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
+
+    public final DatePath<Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final TimePath<Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
+
+    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
+
+    public QAnimal(String variable) {
+        super(Animal.class, forVariable(variable));
+    }
+
+    public QAnimal(BeanPath<? extends Animal> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAnimal(PathMetadata metadata) {
+        super(Animal.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCat.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCat.java
new file mode 100644
index 0000000000..06d21004c6
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCat.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+
+import com.querydsl.core.domain.Cat;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QCat is a Querydsl query type for Cat
+ */
+public class QCat extends EntityPathBase<Cat> {
+
+    private static final long serialVersionUID = -528210988;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCat cat = new QCat("cat");
+
+    public final QAnimal _super = new QAnimal(this);
+
+    //inherited
+    public final BooleanPath alive = _super.alive;
+
+    //inherited
+    public final DateTimePath<java.util.Date> birthdate = _super.birthdate;
+
+    //inherited
+    public final NumberPath<Double> bodyWeight = _super.bodyWeight;
+
+    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
+
+    //inherited
+    public final DatePath<Date> dateField = _super.dateField;
+
+    //inherited
+    public final NumberPath<Integer> id = _super.id;
+
+    public final ListPath<Cat, QCat> kittens = this.<Cat,QCat>createList("kittens", Cat.class, QCat.class, PathInits.DIRECT);
+
+    public final SetPath<Cat, QCat> kittensSet = this.<Cat,QCat>createSet("kittensSet", Cat.class, QCat.class, PathInits.DIRECT);
+
+    public final QCat mate;
+
+    //inherited
+    public final StringPath name = _super.name;
+
+    //inherited
+    public final TimePath<java.sql.Time> timeField = _super.timeField;
+
+    //inherited
+    public final NumberPath<Integer> toes = _super.toes;
+
+    //inherited
+    public final NumberPath<Integer> weight = _super.weight;
+
+    public QCat(String variable) {
+        this(Cat.class, forVariable(variable), INITS);
+    }
+
+    public QCat(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCat(PathMetadata metadata, PathInits inits) {
+        this(Cat.class, metadata, inits);
+    }
+
+    public QCat(Class<? extends Cat> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.mate = inits.isInitialized("mate") ? new QCat(forProperty("mate"), inits.get("mate")) : null;
+    }
+
+    public QCat kittens(int index) {
+        return kittens.get(index);
+    }
+
+    public QCat kittens(Expression<Integer> index) {
+        return kittens.get(index);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonIdentifiable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonIdentifiable.java
new file mode 100644
index 0000000000..b9fb7ca298
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonIdentifiable.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.io.Serializable;
+
+import com.querydsl.core.domain.CommonIdentifiable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+
+
+/**
+ * QCommonIdentifiable is a Querydsl query type for CommonIdentifiable
+ */
+public class QCommonIdentifiable extends EntityPathBase<CommonIdentifiable<? extends Serializable>> {
+
+    private static final long serialVersionUID = 1818647030;
+
+    public static final QCommonIdentifiable commonIdentifiable = new QCommonIdentifiable("commonIdentifiable");
+
+    public final QCommonPersistence _super = new QCommonPersistence(this);
+
+    public final SimplePath<Serializable> id = createSimple("id", java.io.Serializable.class);
+
+    //inherited
+    public final NumberPath<Long> version = _super.version;
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiable(String variable) {
+        super((Class) CommonIdentifiable.class, forVariable(variable));
+    }
+
+    public QCommonIdentifiable(BeanPath<? extends CommonIdentifiable<? extends Serializable>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiable(PathMetadata metadata) {
+        super((Class) CommonIdentifiable.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonPersistence.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonPersistence.java
new file mode 100644
index 0000000000..1b60c9f964
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCommonPersistence.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import com.querydsl.core.domain.CommonPersistence;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+/**
+ * QCommonPersistence is a Querydsl query type for CommonPersistence
+ */
+public class QCommonPersistence extends BeanPath<CommonPersistence> implements EntityPath<CommonPersistence> {
+
+    private static final long serialVersionUID = -1494672641;
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QCommonPersistence(BeanPath<? extends CommonPersistence> entity) {
+        super(entity.getType(),entity.getMetadata());
+    }
+
+    public QCommonPersistence(PathMetadata metadata) {
+        super(CommonPersistence.class, metadata);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompany.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompany.java
new file mode 100644
index 0000000000..54ee50c5c1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompany.java
@@ -0,0 +1,45 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.Company;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompany is a Querydsl query type for Company
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompany extends EntityPathBase<Company> {
+
+    private static final long serialVersionUID = 616888712;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompany company = new QCompany("company");
+
+    public final QCompanyPK key;
+
+    public QCompany(String variable) {
+        this(Company.class, forVariable(variable), INITS);
+    }
+
+    public QCompany(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompany(PathMetadata metadata, PathInits inits) {
+        this(Company.class, metadata, inits);
+    }
+
+    public QCompany(Class<? extends Company> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyPK(forProperty("key")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroup.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroup.java
new file mode 100644
index 0000000000..43fef091ca
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroup.java
@@ -0,0 +1,48 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroup;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompanyGroup is a Querydsl query type for CompanyGroup
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompanyGroup extends EntityPathBase<CompanyGroup> {
+
+    private static final long serialVersionUID = 144687575;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompanyGroup companyGroup = new QCompanyGroup("companyGroup");
+
+    public final QCompanyGroupPK key;
+
+    public final QCompany mainCompany;
+
+    public QCompanyGroup(String variable) {
+        this(CompanyGroup.class, forVariable(variable), INITS);
+    }
+
+    public QCompanyGroup(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompanyGroup(PathMetadata metadata, PathInits inits) {
+        this(CompanyGroup.class, metadata, inits);
+    }
+
+    public QCompanyGroup(Class<? extends CompanyGroup> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyGroupPK(forProperty("key")) : null;
+        this.mainCompany = inits.isInitialized("mainCompany") ? new QCompany(forProperty("mainCompany"), inits.get("mainCompany")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroupPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroupPK.java
new file mode 100644
index 0000000000..fb1996d676
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyGroupPK.java
@@ -0,0 +1,42 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroupPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyGroupPK is a Querydsl query type for CompanyGroupPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyGroupPK extends BeanPath<CompanyGroupPK> {
+
+    private static final long serialVersionUID = 1605808658;
+
+    public static final QCompanyGroupPK companyGroupPK = new QCompanyGroupPK("companyGroupPK");
+
+    public final StringPath companyNumber = createString("companyNumber");
+
+    public final NumberPath<Long> companyType = createNumber("companyType", Long.class);
+
+    public QCompanyGroupPK(String variable) {
+        super(CompanyGroupPK.class, forVariable(variable));
+    }
+
+    public QCompanyGroupPK(Path<? extends CompanyGroupPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyGroupPK(PathMetadata metadata) {
+        super(CompanyGroupPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyPK.java
new file mode 100644
index 0000000000..925d6045a8
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QCompanyPK.java
@@ -0,0 +1,39 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyPK is a Querydsl query type for CompanyPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyPK extends BeanPath<CompanyPK> {
+
+    private static final long serialVersionUID = 124567939;
+
+    public static final QCompanyPK companyPK = new QCompanyPK("companyPK");
+
+    public final StringPath id = createString("id");
+
+    public QCompanyPK(String variable) {
+        super(CompanyPK.class, forVariable(variable));
+    }
+
+    public QCompanyPK(Path<? extends CompanyPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyPK(PathMetadata metadata) {
+        super(CompanyPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QIdNamePair.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QIdNamePair.java
new file mode 100644
index 0000000000..7e2d504bce
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QIdNamePair.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QIdNamePair is a Querydsl query type for IdNamePair
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QIdNamePair extends BeanPath<IdNamePair<?>> {
+
+    private static final long serialVersionUID = -1491444395;
+
+    public static final QIdNamePair idNamePair = new QIdNamePair("idNamePair");
+
+    public final StringPath id = createString("id");
+
+    public final SimplePath<Object> name = createSimple("name", Object.class);
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePair(String variable) {
+        super((Class) IdNamePair.class, forVariable(variable));
+    }
+
+    public QIdNamePair(Path<? extends IdNamePair<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePair(PathMetadata metadata) {
+        super((Class) IdNamePair.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QMyEmbeddable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QMyEmbeddable.java
new file mode 100644
index 0000000000..b6eac7efcf
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QMyEmbeddable.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.MyEmbeddable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QMyEmbeddable is a Querydsl query type for MyEmbeddable
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QMyEmbeddable extends BeanPath<MyEmbeddable> {
+
+    private static final long serialVersionUID = -968265626;
+
+    public static final QMyEmbeddable myEmbeddable = new QMyEmbeddable("myEmbeddable");
+
+    public final NumberPath<Integer> foo = createNumber("foo", Integer.class);
+
+    public QMyEmbeddable(String variable) {
+        super(MyEmbeddable.class, forVariable(variable));
+    }
+
+    public QMyEmbeddable(BeanPath<? extends MyEmbeddable> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QMyEmbeddable(PathMetadata metadata) {
+        super(MyEmbeddable.class, metadata);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperSupertype.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperSupertype.java
new file mode 100644
index 0000000000..1aff7fd546
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperSupertype.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.SuperSupertype;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QSuperSupertype is a Querydsl query type for SuperSupertype
+ */
+public class QSuperSupertype extends EntityPathBase<SuperSupertype> {
+
+    private static final long serialVersionUID = 518341775;
+
+    public static final QSuperSupertype superSupertype = new QSuperSupertype("superSupertype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QSuperSupertype(String variable) {
+        super(SuperSupertype.class, forVariable(variable));
+    }
+
+    public QSuperSupertype(BeanPath<? extends SuperSupertype> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperSupertype(PathMetadata metadata) {
+        super(SuperSupertype.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperclass.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperclass.java
new file mode 100644
index 0000000000..75cdafd3ce
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query/QSuperclass.java
@@ -0,0 +1,41 @@
+package com.querydsl.core.domain.query;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.domain.Superclass;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QSuperclass is a Querydsl query type for Superclass
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QSuperclass extends EntityPathBase<Superclass> {
+
+    private static final long serialVersionUID = -1300377102;
+
+    public static final QSuperclass superclass = new QSuperclass("superclass");
+
+    public final ListPath<IdNamePair<String>, QIdNamePair> fooOfSuperclass = this.<IdNamePair<String>, QIdNamePair>createList("fooOfSuperclass", IdNamePair.class, QIdNamePair.class, PathInits.DIRECT);
+
+    public QSuperclass(String variable) {
+        super(Superclass.class, forVariable(variable));
+    }
+
+    public QSuperclass(Path<? extends Superclass> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperclass(PathMetadata metadata) {
+        super(Superclass.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAbstractEntityType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAbstractEntityType.java
new file mode 100644
index 0000000000..f535d97647
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAbstractEntityType.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.AbstractEntity;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+@SuppressWarnings("unchecked")
+public class QAbstractEntityType extends EntityPathBase<AbstractEntity> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAbstractEntityType animal = new QAbstractEntityType("abstractEntity");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public QAbstractEntityType(String variable) {
+        super(AbstractEntity.class, forVariable(variable));
+    }
+
+    public QAbstractEntityType(BeanPath<? extends AbstractEntity<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAbstractEntityType(PathMetadata metadata) {
+        super(AbstractEntity.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAnimalType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAnimalType.java
new file mode 100644
index 0000000000..7faa056005
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QAnimalType.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Time;
+import java.util.Date;
+
+import com.querydsl.core.domain.Animal;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+public class QAnimalType extends EntityPathBase<Animal> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QAnimalType animal = new QAnimalType("animal");
+
+    public final BooleanPath alive = createBoolean("alive");
+
+    public final DateTimePath<Date> birthdate = createDateTime("birthdate", java.util.Date.class);
+
+    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
+
+    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final TimePath<Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
+
+    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
+
+    public QAnimalType(String variable) {
+        super(Animal.class, forVariable(variable));
+    }
+
+    public QAnimalType(BeanPath<? extends Animal> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QAnimalType(PathMetadata metadata) {
+        super(Animal.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCatType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCatType.java
new file mode 100644
index 0000000000..a8ecbc7c3f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCatType.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.util.Date;
+
+import com.querydsl.core.domain.Cat;
+import com.querydsl.core.domain.QAnimal;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QCat is a Querydsl query type for Cat
+ */
+public class QCatType extends EntityPathBase<Cat> {
+
+    private static final long serialVersionUID = -528210988;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCatType cat = new QCatType("cat");
+
+    public final QAnimal _super = new QAnimal(this);
+
+    //inherited
+    public final BooleanPath alive = _super.alive;
+
+    //inherited
+    public final DateTimePath<Date> birthdate = _super.birthdate;
+
+    //inherited
+    public final NumberPath<Double> bodyWeight = _super.bodyWeight;
+
+    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
+
+    //inherited
+    public final DatePath<java.sql.Date> dateField = _super.dateField;
+
+    //inherited
+    public final NumberPath<Integer> id = _super.id;
+
+    public final ListPath<Cat, QCatType> kittens = this.<Cat,QCatType>createList("kittens", Cat.class, QCatType.class, PathInits.DIRECT);
+
+    public final SetPath<Cat, QCatType> kittensSet = this.<Cat,QCatType>createSet("kittensSet", Cat.class, QCatType.class, PathInits.DIRECT);
+
+    public final QCatType mate;
+
+    //inherited
+    public final StringPath name = _super.name;
+
+    //inherited
+    public final TimePath<java.sql.Time> timeField = _super.timeField;
+
+    //inherited
+    public final NumberPath<Integer> toes = _super.toes;
+
+    //inherited
+    public final NumberPath<Integer> weight = _super.weight;
+
+    public QCatType(String variable) {
+        this(Cat.class, forVariable(variable), INITS);
+    }
+
+    public QCatType(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCatType(PathMetadata metadata, PathInits inits) {
+        this(Cat.class, metadata, inits);
+    }
+
+    public QCatType(Class<? extends Cat> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.mate = inits.isInitialized("mate") ? new QCatType(forProperty("mate"), inits.get("mate")) : null;
+    }
+
+    public QCatType kittens(int index) {
+        return kittens.get(index);
+    }
+
+    public QCatType kittens(Expression<Integer> index) {
+        return kittens.get(index);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonIdentifiableType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonIdentifiableType.java
new file mode 100644
index 0000000000..a20d1c8841
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonIdentifiableType.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.io.Serializable;
+
+import com.querydsl.core.domain.CommonIdentifiable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+
+
+/**
+ * QCommonIdentifiable is a Querydsl query type for CommonIdentifiable
+ */
+public class QCommonIdentifiableType extends EntityPathBase<CommonIdentifiable<? extends Serializable>> {
+
+    private static final long serialVersionUID = 1818647030;
+
+    public static final QCommonIdentifiableType commonIdentifiable = new QCommonIdentifiableType("commonIdentifiable");
+
+    public final QCommonPersistenceType _super = new QCommonPersistenceType(this);
+
+    public final SimplePath<java.io.Serializable> id = createSimple("id", java.io.Serializable.class);
+
+    //inherited
+    public final NumberPath<Long> version = _super.version;
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiableType(String variable) {
+        super((Class) CommonIdentifiable.class, forVariable(variable));
+    }
+
+    public QCommonIdentifiableType(BeanPath<? extends CommonIdentifiable<? extends java.io.Serializable>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QCommonIdentifiableType(PathMetadata metadata) {
+        super((Class) CommonIdentifiable.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonPersistenceType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonPersistenceType.java
new file mode 100644
index 0000000000..96624975f1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCommonPersistenceType.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import com.querydsl.core.domain.CommonPersistence;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+/**
+ * QCommonPersistence is a Querydsl query type for CommonPersistence
+ */
+public class QCommonPersistenceType extends BeanPath<CommonPersistence> implements EntityPath<CommonPersistence> {
+
+    private static final long serialVersionUID = -1494672641;
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QCommonPersistenceType(BeanPath<? extends CommonPersistence> entity) {
+        super(entity.getType(),entity.getMetadata());
+    }
+
+    public QCommonPersistenceType(PathMetadata metadata) {
+        super(CommonPersistence.class, metadata);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupPKType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupPKType.java
new file mode 100644
index 0000000000..a0ae21a51b
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupPKType.java
@@ -0,0 +1,42 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroupPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyGroupPK is a Querydsl query type for CompanyGroupPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyGroupPKType extends BeanPath<CompanyGroupPK> {
+
+    private static final long serialVersionUID = 1605808658;
+
+    public static final QCompanyGroupPKType companyGroupPK = new QCompanyGroupPKType("companyGroupPK");
+
+    public final StringPath companyNumber = createString("companyNumber");
+
+    public final NumberPath<Long> companyType = createNumber("companyType", Long.class);
+
+    public QCompanyGroupPKType(String variable) {
+        super(CompanyGroupPK.class, forVariable(variable));
+    }
+
+    public QCompanyGroupPKType(Path<? extends CompanyGroupPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyGroupPKType(PathMetadata metadata) {
+        super(CompanyGroupPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupType.java
new file mode 100644
index 0000000000..6983fb5f00
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyGroupType.java
@@ -0,0 +1,50 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroup;
+import com.querydsl.core.domain.QCompany;
+import com.querydsl.core.domain.QCompanyGroupPK;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompanyGroup is a Querydsl query type for CompanyGroup
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompanyGroupType extends EntityPathBase<CompanyGroup> {
+
+    private static final long serialVersionUID = 144687575;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompanyGroupType companyGroup = new QCompanyGroupType("companyGroup");
+
+    public final QCompanyGroupPK key;
+
+    public final QCompany mainCompany;
+
+    public QCompanyGroupType(String variable) {
+        this(CompanyGroup.class, forVariable(variable), INITS);
+    }
+
+    public QCompanyGroupType(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompanyGroupType(PathMetadata metadata, PathInits inits) {
+        this(CompanyGroup.class, metadata, inits);
+    }
+
+    public QCompanyGroupType(Class<? extends CompanyGroup> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyGroupPK(forProperty("key")) : null;
+        this.mainCompany = inits.isInitialized("mainCompany") ? new QCompany(forProperty("mainCompany"), inits.get("mainCompany")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyPKType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyPKType.java
new file mode 100644
index 0000000000..a41014a715
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyPKType.java
@@ -0,0 +1,39 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyPK is a Querydsl query type for CompanyPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QCompanyPKType extends BeanPath<CompanyPK> {
+
+    private static final long serialVersionUID = 124567939;
+
+    public static final QCompanyPKType companyPK = new QCompanyPKType("companyPK");
+
+    public final StringPath id = createString("id");
+
+    public QCompanyPKType(String variable) {
+        super(CompanyPK.class, forVariable(variable));
+    }
+
+    public QCompanyPKType(Path<? extends CompanyPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QCompanyPKType(PathMetadata metadata) {
+        super(CompanyPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyType.java
new file mode 100644
index 0000000000..9f5ce1ef2e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QCompanyType.java
@@ -0,0 +1,46 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.Company;
+import com.querydsl.core.domain.QCompanyPK;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompany is a Querydsl query type for Company
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCompanyType extends EntityPathBase<Company> {
+
+    private static final long serialVersionUID = 616888712;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QCompanyType company = new QCompanyType("company");
+
+    public final QCompanyPK key;
+
+    public QCompanyType(String variable) {
+        this(Company.class, forVariable(variable), INITS);
+    }
+
+    public QCompanyType(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QCompanyType(PathMetadata metadata, PathInits inits) {
+        this(Company.class, metadata, inits);
+    }
+
+    public QCompanyType(Class<? extends Company> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QCompanyPK(forProperty("key")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QIdNamePairType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QIdNamePairType.java
new file mode 100644
index 0000000000..3de4408f0e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QIdNamePairType.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QIdNamePair is a Querydsl query type for IdNamePair
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QIdNamePairType extends BeanPath<IdNamePair<?>> {
+
+    private static final long serialVersionUID = -1491444395;
+
+    public static final QIdNamePairType idNamePair = new QIdNamePairType("idNamePair");
+
+    public final StringPath id = createString("id");
+
+    public final SimplePath<Object> name = createSimple("name", Object.class);
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePairType(String variable) {
+        super((Class) IdNamePair.class, forVariable(variable));
+    }
+
+    public QIdNamePairType(Path<? extends IdNamePair<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QIdNamePairType(PathMetadata metadata) {
+        super((Class) IdNamePair.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QMyEmbeddableType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QMyEmbeddableType.java
new file mode 100644
index 0000000000..c4e5a7236c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QMyEmbeddableType.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.MyEmbeddable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QMyEmbeddable is a Querydsl query type for MyEmbeddable
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QMyEmbeddableType extends BeanPath<MyEmbeddable> {
+
+    private static final long serialVersionUID = -968265626;
+
+    public static final QMyEmbeddableType myEmbeddable = new QMyEmbeddableType("myEmbeddable");
+
+    public final NumberPath<Integer> foo = createNumber("foo", Integer.class);
+
+    public QMyEmbeddableType(String variable) {
+        super(MyEmbeddable.class, forVariable(variable));
+    }
+
+    public QMyEmbeddableType(BeanPath<? extends MyEmbeddable> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QMyEmbeddableType(PathMetadata metadata) {
+        super(MyEmbeddable.class, metadata);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperSupertypeType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperSupertypeType.java
new file mode 100644
index 0000000000..f7dc9df880
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperSupertypeType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.SuperSupertype;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QSuperSupertype is a Querydsl query type for SuperSupertype
+ */
+public class QSuperSupertypeType extends EntityPathBase<SuperSupertype> {
+
+    private static final long serialVersionUID = 518341775;
+
+    public static final QSuperSupertypeType superSupertype = new QSuperSupertypeType("superSupertype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QSuperSupertypeType(String variable) {
+        super(SuperSupertype.class, forVariable(variable));
+    }
+
+    public QSuperSupertypeType(BeanPath<? extends SuperSupertype> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperSupertypeType(PathMetadata metadata) {
+        super(SuperSupertype.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperclassType.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperclassType.java
new file mode 100644
index 0000000000..6336595ab4
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query2/QSuperclassType.java
@@ -0,0 +1,42 @@
+package com.querydsl.core.domain.query2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.domain.QIdNamePair;
+import com.querydsl.core.domain.Superclass;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QSuperclass is a Querydsl query type for Superclass
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QSuperclassType extends EntityPathBase<Superclass> {
+
+    private static final long serialVersionUID = -1300377102;
+
+    public static final QSuperclassType superclass = new QSuperclassType("superclass");
+
+    public final ListPath<IdNamePair<String>, QIdNamePair> fooOfSuperclass = this.<IdNamePair<String>, QIdNamePair>createList("fooOfSuperclass", IdNamePair.class, QIdNamePair.class, PathInits.DIRECT);
+
+    public QSuperclassType(String variable) {
+        super(Superclass.class, forVariable(variable));
+    }
+
+    public QSuperclassType(Path<? extends Superclass> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QSuperclassType(PathMetadata metadata) {
+        super(Superclass.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAbstractEntity.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAbstractEntity.java
new file mode 100644
index 0000000000..d2c0f35166
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAbstractEntity.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.AbstractEntity;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+@SuppressWarnings("unchecked")
+public class QTAbstractEntity extends EntityPathBase<AbstractEntity> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QTAbstractEntity animal = new QTAbstractEntity("abstractEntity");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public QTAbstractEntity(String variable) {
+        super(AbstractEntity.class, forVariable(variable));
+    }
+
+    public QTAbstractEntity(BeanPath<? extends AbstractEntity<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTAbstractEntity(PathMetadata metadata) {
+        super(AbstractEntity.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAnimal.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAnimal.java
new file mode 100644
index 0000000000..a365db79ac
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTAnimal.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.util.Date;
+
+import com.querydsl.core.domain.Animal;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QAnimal is a Querydsl query type for Animal
+ */
+public class QTAnimal extends EntityPathBase<Animal> {
+
+    private static final long serialVersionUID = 781156670;
+
+    public static final QTAnimal animal = new QTAnimal("animal");
+
+    public final BooleanPath alive = createBoolean("alive");
+
+    public final DateTimePath<Date> birthdate = createDateTime("birthdate", java.util.Date.class);
+
+    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
+
+    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
+
+    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
+
+    public QTAnimal(String variable) {
+        super(Animal.class, forVariable(variable));
+    }
+
+    public QTAnimal(BeanPath<? extends Animal> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTAnimal(PathMetadata metadata) {
+        super(Animal.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCat.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCat.java
new file mode 100644
index 0000000000..a0893cc2f2
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCat.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.util.Date;
+
+import com.querydsl.core.domain.Cat;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+
+
+/**
+ * QCat is a Querydsl query type for Cat
+ */
+public class QTCat extends EntityPathBase<Cat> {
+
+    private static final long serialVersionUID = -528210988;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QTCat cat = new QTCat("cat");
+
+    public final QTAnimal _super = new QTAnimal(this);
+
+    //inherited
+    public final BooleanPath alive = _super.alive;
+
+    //inherited
+    public final DateTimePath<Date> birthdate = _super.birthdate;
+
+    //inherited
+    public final NumberPath<Double> bodyWeight = _super.bodyWeight;
+
+    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
+
+    //inherited
+    public final DatePath<java.sql.Date> dateField = _super.dateField;
+
+    //inherited
+    public final NumberPath<Integer> id = _super.id;
+
+    public final ListPath<Cat, QTCat> kittens = this.<Cat,QTCat>createList("kittens", Cat.class, QTCat.class, PathInits.DIRECT);
+
+    public final SetPath<Cat, QTCat> kittensSet = this.<Cat,QTCat>createSet("kittensSet", Cat.class, QTCat.class, PathInits.DIRECT);
+
+    public final QTCat mate;
+
+    //inherited
+    public final StringPath name = _super.name;
+
+    //inherited
+    public final TimePath<java.sql.Time> timeField = _super.timeField;
+
+    //inherited
+    public final NumberPath<Integer> toes = _super.toes;
+
+    //inherited
+    public final NumberPath<Integer> weight = _super.weight;
+
+    public QTCat(String variable) {
+        this(Cat.class, forVariable(variable), INITS);
+    }
+
+    public QTCat(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QTCat(PathMetadata metadata, PathInits inits) {
+        this(Cat.class, metadata, inits);
+    }
+
+    public QTCat(Class<? extends Cat> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.mate = inits.isInitialized("mate") ? new QTCat(forProperty("mate"), inits.get("mate")) : null;
+    }
+
+    public QTCat kittens(int index) {
+        return kittens.get(index);
+    }
+
+    public QTCat kittens(Expression<Integer> index) {
+        return kittens.get(index);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonIdentifiable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonIdentifiable.java
new file mode 100644
index 0000000000..c53f22363c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonIdentifiable.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.io.Serializable;
+
+import com.querydsl.core.domain.CommonIdentifiable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+
+
+/**
+ * QCommonIdentifiable is a Querydsl query type for CommonIdentifiable
+ */
+public class QTCommonIdentifiable extends EntityPathBase<CommonIdentifiable<? extends Serializable>> {
+
+    private static final long serialVersionUID = 1818647030;
+
+    public static final QTCommonIdentifiable commonIdentifiable = new QTCommonIdentifiable("commonIdentifiable");
+
+    public final QTCommonPersistence _super = new QTCommonPersistence(this);
+
+    public final SimplePath<java.io.Serializable> id = createSimple("id", java.io.Serializable.class);
+
+    //inherited
+    public final NumberPath<Long> version = _super.version;
+
+    @SuppressWarnings("unchecked")
+    public QTCommonIdentifiable(String variable) {
+        super((Class) CommonIdentifiable.class, forVariable(variable));
+    }
+
+    public QTCommonIdentifiable(BeanPath<? extends CommonIdentifiable<? extends java.io.Serializable>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QTCommonIdentifiable(PathMetadata metadata) {
+        super((Class) CommonIdentifiable.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonPersistence.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonPersistence.java
new file mode 100644
index 0000000000..63d8a9640c
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCommonPersistence.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import com.querydsl.core.domain.CommonPersistence;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+/**
+ * QCommonPersistence is a Querydsl query type for CommonPersistence
+ */
+public class QTCommonPersistence extends BeanPath<CommonPersistence> implements EntityPath<CommonPersistence> {
+
+    private static final long serialVersionUID = -1494672641;
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QTCommonPersistence(BeanPath<? extends CommonPersistence> entity) {
+        super(entity.getType(),entity.getMetadata());
+    }
+
+    public QTCommonPersistence(PathMetadata metadata) {
+        super(CommonPersistence.class, metadata);
+    }
+
+    @Override
+    public Object getMetadata(Path<?> property) {
+        return null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompany.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompany.java
new file mode 100644
index 0000000000..46fe70aacd
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompany.java
@@ -0,0 +1,45 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.Company;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompany is a Querydsl query type for Company
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTCompany extends EntityPathBase<Company> {
+
+    private static final long serialVersionUID = 616888712;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QTCompany company = new QTCompany("company");
+
+    public final QTCompanyPK key;
+
+    public QTCompany(String variable) {
+        this(Company.class, forVariable(variable), INITS);
+    }
+
+    public QTCompany(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QTCompany(PathMetadata metadata, PathInits inits) {
+        this(Company.class, metadata, inits);
+    }
+
+    public QTCompany(Class<? extends Company> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QTCompanyPK(forProperty("key")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroup.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroup.java
new file mode 100644
index 0000000000..42c231d545
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroup.java
@@ -0,0 +1,48 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroup;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QCompanyGroup is a Querydsl query type for CompanyGroup
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTCompanyGroup extends EntityPathBase<CompanyGroup> {
+
+    private static final long serialVersionUID = 144687575;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QTCompanyGroup companyGroup = new QTCompanyGroup("companyGroup");
+
+    public final QTCompanyGroupPK key;
+
+    public final QTCompany mainCompany;
+
+    public QTCompanyGroup(String variable) {
+        this(CompanyGroup.class, forVariable(variable), INITS);
+    }
+
+    public QTCompanyGroup(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QTCompanyGroup(PathMetadata metadata, PathInits inits) {
+        this(CompanyGroup.class, metadata, inits);
+    }
+
+    public QTCompanyGroup(Class<? extends CompanyGroup> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.key = inits.isInitialized("key") ? new QTCompanyGroupPK(forProperty("key")) : null;
+        this.mainCompany = inits.isInitialized("mainCompany") ? new QTCompany(forProperty("mainCompany"), inits.get("mainCompany")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroupPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroupPK.java
new file mode 100644
index 0000000000..b7b859c48e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyGroupPK.java
@@ -0,0 +1,42 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyGroupPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyGroupPK is a Querydsl query type for CompanyGroupPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QTCompanyGroupPK extends BeanPath<CompanyGroupPK> {
+
+    private static final long serialVersionUID = 1605808658;
+
+    public static final QTCompanyGroupPK companyGroupPK = new QTCompanyGroupPK("companyGroupPK");
+
+    public final StringPath companyNumber = createString("companyNumber");
+
+    public final NumberPath<Long> companyType = createNumber("companyType", Long.class);
+
+    public QTCompanyGroupPK(String variable) {
+        super(CompanyGroupPK.class, forVariable(variable));
+    }
+
+    public QTCompanyGroupPK(Path<? extends CompanyGroupPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTCompanyGroupPK(PathMetadata metadata) {
+        super(CompanyGroupPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyPK.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyPK.java
new file mode 100644
index 0000000000..0054945d34
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTCompanyPK.java
@@ -0,0 +1,39 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.CompanyPK;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanyPK is a Querydsl query type for CompanyPK
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QTCompanyPK extends BeanPath<CompanyPK> {
+
+    private static final long serialVersionUID = 124567939;
+
+    public static final QTCompanyPK companyPK = new QTCompanyPK("companyPK");
+
+    public final StringPath id = createString("id");
+
+    public QTCompanyPK(String variable) {
+        super(CompanyPK.class, forVariable(variable));
+    }
+
+    public QTCompanyPK(Path<? extends CompanyPK> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTCompanyPK(PathMetadata metadata) {
+        super(CompanyPK.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTIdNamePair.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTIdNamePair.java
new file mode 100644
index 0000000000..bf01913b59
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTIdNamePair.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QIdNamePair is a Querydsl query type for IdNamePair
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QTIdNamePair extends BeanPath<IdNamePair<?>> {
+
+    private static final long serialVersionUID = -1491444395;
+
+    public static final QTIdNamePair idNamePair = new QTIdNamePair("idNamePair");
+
+    public final StringPath id = createString("id");
+
+    public final SimplePath<Object> name = createSimple("name", Object.class);
+
+    @SuppressWarnings("unchecked")
+    public QTIdNamePair(String variable) {
+        super((Class) IdNamePair.class, forVariable(variable));
+    }
+
+    public QTIdNamePair(Path<? extends IdNamePair<?>> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    @SuppressWarnings("unchecked")
+    public QTIdNamePair(PathMetadata metadata) {
+        super((Class) IdNamePair.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTMyEmbeddable.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTMyEmbeddable.java
new file mode 100644
index 0000000000..f207a3f99e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTMyEmbeddable.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.MyEmbeddable;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QMyEmbeddable is a Querydsl query type for MyEmbeddable
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QTMyEmbeddable extends BeanPath<MyEmbeddable> {
+
+    private static final long serialVersionUID = -968265626;
+
+    public static final QTMyEmbeddable myEmbeddable = new QTMyEmbeddable("myEmbeddable");
+
+    public final NumberPath<Integer> foo = createNumber("foo", Integer.class);
+
+    public QTMyEmbeddable(String variable) {
+        super(MyEmbeddable.class, forVariable(variable));
+    }
+
+    public QTMyEmbeddable(BeanPath<? extends MyEmbeddable> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTMyEmbeddable(PathMetadata metadata) {
+        super(MyEmbeddable.class, metadata);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperSupertype.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperSupertype.java
new file mode 100644
index 0000000000..3ab55c27b2
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperSupertype.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.domain.SuperSupertype;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+
+
+/**
+ * QSuperSupertype is a Querydsl query type for SuperSupertype
+ */
+public class QTSuperSupertype extends EntityPathBase<SuperSupertype> {
+
+    private static final long serialVersionUID = 518341775;
+
+    public static final QTSuperSupertype superSupertype = new QTSuperSupertype("superSupertype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> version = createNumber("version", Long.class);
+
+    public QTSuperSupertype(String variable) {
+        super(SuperSupertype.class, forVariable(variable));
+    }
+
+    public QTSuperSupertype(BeanPath<? extends SuperSupertype> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTSuperSupertype(PathMetadata metadata) {
+        super(SuperSupertype.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperclass.java b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperclass.java
new file mode 100644
index 0000000000..45a086d340
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain/query3/QTSuperclass.java
@@ -0,0 +1,41 @@
+package com.querydsl.core.domain.query3;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.domain.IdNamePair;
+import com.querydsl.core.domain.Superclass;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QSuperclass is a Querydsl query type for Superclass
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTSuperclass extends EntityPathBase<Superclass> {
+
+    private static final long serialVersionUID = -1300377102;
+
+    public static final QTSuperclass superclass = new QTSuperclass("superclass");
+
+    public final ListPath<IdNamePair<String>, QTIdNamePair> fooOfSuperclass = this.<IdNamePair<String>, QTIdNamePair>createList("fooOfSuperclass", IdNamePair.class, QTIdNamePair.class, PathInits.DIRECT);
+
+    public QTSuperclass(String variable) {
+        super(Superclass.class, forVariable(variable));
+    }
+
+    public QTSuperclass(Path<? extends Superclass> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTSuperclass(PathMetadata metadata) {
+        super(Superclass.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/mysema/query/domain2/ABase.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/ABase.java
similarity index 75%
rename from querydsl-core/src/test/java/com/mysema/query/domain2/ABase.java
rename to querydsl-core/src/test/java/com/querydsl/core/domain2/ABase.java
index 24678abdc6..2ff1b9b7d1 100644
--- a/querydsl-core/src/test/java/com/mysema/query/domain2/ABase.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/ABase.java
@@ -1,25 +1,25 @@
-package com.mysema.query.domain2;
-
-import com.mysema.query.annotations.QuerySupertype;
-
-@QuerySupertype
-public abstract class ABase {
-    private Long id;
-
-    private TenantImpl tenant;
-
-    public Long getId() {
-        return id;
-    }
-
-    protected void setId(Long id) {
-        this.id = id;
-    }
-
-    public TenantImpl getTenant() {
-        return tenant;
-    }
-
-    public void setTenant(TenantImpl tenant) {
-    }
-}
+package com.querydsl.core.domain2;
+
+import com.querydsl.core.annotations.QuerySupertype;
+
+@QuerySupertype
+public abstract class ABase {
+    private Long id;
+
+    private TenantImpl tenant;
+
+    public Long getId() {
+        return id;
+    }
+
+    protected void setId(Long id) {
+        this.id = id;
+    }
+
+    public TenantImpl getTenant() {
+        return tenant;
+    }
+
+    public void setTenant(TenantImpl tenant) {
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/AImpl.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/AImpl.java
new file mode 100644
index 0000000000..8992111fb1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/AImpl.java
@@ -0,0 +1,8 @@
+package com.querydsl.core.domain2;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class AImpl extends ABase {
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/QABase.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/QABase.java
new file mode 100644
index 0000000000..6b2a197f17
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/QABase.java
@@ -0,0 +1,48 @@
+package com.querydsl.core.domain2;
+
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QABase is a Querydsl query type for ABase
+ */
+@Generated("com.querydsl.codegen.SupertypeSerializer")
+public class QABase extends EntityPathBase<ABase> {
+
+    private static final long serialVersionUID = -261663299;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QABase aBase = new QABase("aBase");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final QTenantImpl tenant;
+
+    public QABase(String variable) {
+        this(ABase.class, forVariable(variable), INITS);
+    }
+
+    public QABase(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QABase(PathMetadata metadata, PathInits inits) {
+        this(ABase.class, metadata, inits);
+    }
+
+    public QABase(Class<? extends ABase> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.tenant = inits.isInitialized("tenant") ? new QTenantImpl(forProperty("tenant")) : null;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/QAImpl.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/QAImpl.java
new file mode 100644
index 0000000000..05ffafac29
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/QAImpl.java
@@ -0,0 +1,58 @@
+package com.querydsl.core.domain2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QAImpl is a Querydsl query type for AImpl
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QAImpl extends EntityPathBase<AImpl> {
+
+    private static final long serialVersionUID = -261443316;
+
+    private static final PathInits INITS = PathInits.DIRECT;
+
+    public static final QAImpl aImpl = new QAImpl("aImpl");
+
+    public final QABase _super;
+
+    //inherited
+    public final NumberPath<Long> id;
+
+    // inherited
+    public final QTenantImpl tenant;
+
+    public QAImpl(String variable) {
+        this(AImpl.class, forVariable(variable), INITS);
+    }
+
+    public QAImpl(Path<? extends AImpl> entity) {
+        this(entity.getType(), entity.getMetadata(), INITS);
+    }
+
+    public QAImpl(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QAImpl(PathMetadata metadata, PathInits inits) {
+        this(AImpl.class, metadata, inits);
+    }
+
+    public QAImpl(Class<? extends AImpl> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this._super = new QABase(type, metadata, inits);
+        this.id = _super.id;
+        this.tenant = _super.tenant;
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/QTenantImpl.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/QTenantImpl.java
new file mode 100644
index 0000000000..29ad83f2ea
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/QTenantImpl.java
@@ -0,0 +1,35 @@
+package com.querydsl.core.domain2;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+
+
+/**
+ * QTenantImpl is a Querydsl query type for TenantImpl
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QTenantImpl extends EntityPathBase<TenantImpl> {
+
+    private static final long serialVersionUID = -1856470561;
+
+    public static final QTenantImpl tenantImpl = new QTenantImpl("tenantImpl");
+
+    public QTenantImpl(String variable) {
+        super(TenantImpl.class, forVariable(variable));
+    }
+
+    public QTenantImpl(Path<? extends TenantImpl> entity) {
+        super(entity.getType(), entity.getMetadata());
+    }
+
+    public QTenantImpl(PathMetadata metadata) {
+        super(TenantImpl.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/Tenant.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/Tenant.java
new file mode 100644
index 0000000000..4d13cd17e6
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/Tenant.java
@@ -0,0 +1,5 @@
+package com.querydsl.core.domain2;
+
+public interface Tenant {
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/domain2/TenantImpl.java b/querydsl-core/src/test/java/com/querydsl/core/domain2/TenantImpl.java
new file mode 100644
index 0000000000..89025eade6
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/domain2/TenantImpl.java
@@ -0,0 +1,8 @@
+package com.querydsl.core.domain2;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class TenantImpl implements Tenant {
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java b/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java
new file mode 100644
index 0000000000..627dace992
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/AbstractGroupByTest.java
@@ -0,0 +1,207 @@
+package com.querydsl.core.group;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.support.DummyFetchableQuery;
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.*;
+
+public abstract class AbstractGroupByTest {
+
+    protected static final DummyFetchableQuery<Tuple> BASIC_RESULTS = projectable(
+            row(null, "null post", 7, "comment 7"),
+            row(null, "null post", 8, "comment 8"),
+            row(1, "post 1", 1, "comment 1"),
+            row(1, "post 1", 2, "comment 2"),
+            row(1, "post 1", 3, "comment 3"),
+            row(2, "post 2", 4, "comment 4"),
+            row(2, "post 2", 5, "comment 5"),
+            row(3, "post 3", 6, "comment 6")
+    );
+
+    protected static final DummyFetchableQuery<Tuple> BASIC_RESULTS_UNORDERED = projectable(
+            row(null, "null post", 8, "comment 8"),
+            row(null, "null post", 7, "comment 7"),
+            row(1, "post 1", 2, "comment 2"),
+            row(1, "post 1", 1, "comment 1"),
+            row(2, "post 2", 4, "comment 4"),
+            row(1, "post 1", 3, "comment 3"),
+            row(3, "post 3", 6, "comment 6"),
+            row(2, "post 2", 5, "comment 5")
+    );
+
+    protected static final DummyFetchableQuery<Tuple> MAP_RESULTS = projectable(
+            row(null, "null post", pair(7, "comment 7")),
+            row(null, "null post", pair(8, "comment 8")),
+            row(1, "post 1", pair(1, "comment 1")),
+            row(1, "post 1", pair(2, "comment 2")),
+            row(1, "post 1", pair(3, "comment 3")),
+            row(2, "post 2", pair(5, "comment 5")),
+            row(3, "post 3", pair(6, "comment 6"))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> MAP2_RESULTS = projectable(
+            row(null, pair(7, "comment 7")),
+            row(null,  pair(8, "comment 8")),
+            row(1, pair(1, "comment 1")),
+            row(1, pair(2, "comment 2")),
+            row(1, pair(3, "comment 3")),
+            row(2, pair(5, "comment 5")),
+            row(3, pair(6, "comment 6"))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> MAP3_RESULTS = projectable(
+        row(1, pair(1, pair(1, "comment 1"))),
+        row(1, pair(1, pair(2, "comment 2"))),
+        row(2, pair(2, pair(5, "comment 5"))),
+        row(3, pair(3, pair(6, "comment 6"))),
+        row(null, pair(null, pair(7, "comment 7"))),
+        row(null, pair(null,  pair(8, "comment 8"))),
+        row(1, pair(1, pair(3, "comment 3")))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> MAP4_RESULTS = projectable(
+        row(1, pair(pair(1, "comment 1"), "post 1")),
+        row(1, pair(pair(1, "comment 2"), "post 1")),
+        row(2, pair(pair(2, "comment 5"), "post 2")),
+        row(3, pair(pair(3, "comment 6"), "post 3")),
+        row(null, pair(pair(null, "comment 7"), "null post")),
+        row(null, pair(pair(null, "comment 8"), "null post")),
+        row(1, pair(pair(1, "comment 3"), "post 1"))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> POST_W_COMMENTS = projectable(
+            row(null, null, "null post", comment(7)),
+            row(null, null, "null post", comment(8)),
+            row(1, 1, "post 1", comment(1)),
+            row(1, 1, "post 1", comment(2)),
+            row(1, 1, "post 1", comment(3)),
+            row(2, 2, "post 2", comment(5)),
+            row(3, 3, "post 3", comment(6))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> POST_W_COMMENTS2 = projectable(
+            row(null, "null post", comment(7)),
+            row(null, "null post", comment(8)),
+            row(1, "post 1", comment(1)),
+            row(1, "post 1", comment(2)),
+            row(1, "post 1", comment(3)),
+            row(2, "post 2", comment(5)),
+            row(3, "post 3", comment(6))
+    );
+
+    // [ user.name, latestPost(post.id, post.name), latestPost.comments() ]
+    protected static final DummyFetchableQuery<Tuple> USERS_W_LATEST_POST_AND_COMMENTS = projectable(
+            row("Jane", "Jane", 2, "post 2", comment(4)),
+            row("Jane", "Jane", 2, "post 2", comment(5)),
+            row("John", "John", 1, "post 1", comment(1)),
+            row("John", "John", 1, "post 1", comment(2)),
+            row("John", "John", 1, "post 1", comment(3))
+    );
+
+    protected static final DummyFetchableQuery<Tuple> POSTS_W_COMMENTS_SCORE = projectable(
+        row(null, 1.5),
+        row(1, 1.5),
+        row(1, 2.0),
+        row(1, 0.5),
+        row(2, 1.0),
+        row(2, 2.0)
+    );
+
+//    protected static final Projectable USERS_W_LATEST_POST_AND_COMMENTS2 = projectable(
+//            row("John", 1, "post 1", comment(1)),
+//            row("Jane", 2, "post 2", comment(4)),
+//            row("John", 1, "post 1", comment(2)),
+//            row("Jane", 2, "post 2", comment(5)),
+//            row("John", 1, "post 1", comment(3))
+//    );
+
+    protected static final SimplePath<Post> post = Expressions.path(Post.class, "post");
+
+    protected static final SimplePath<User> user = Expressions.path(User.class, "user");
+
+    protected static final SimplePath<Comment> comment = Expressions.path(Comment.class, "comment");
+
+    protected static final NumberExpression<Integer> postId = Expressions.numberPath(Integer.class, post, "id");
+
+    protected static final StringExpression userName = Expressions.stringPath(user, "name");
+
+    protected static final StringExpression postName = Expressions.stringPath(post, "name");
+
+    protected static final NumberPath<Integer> commentId = Expressions.numberPath(Integer.class, comment, "id");
+
+    protected static final StringExpression commentText = Expressions.stringPath(comment, "text");
+
+    protected static final NumberExpression<Double> score = Expressions.numberPath(Double.class, comment, "score");
+
+    protected static final ConstructorExpression<Comment> qComment = Projections.constructor(Comment.class, commentId, commentText, score);
+
+    protected static <K, V> Pair<K, V> pair(K key, V value) {
+        return new Pair<K, V>(key, value);
+    }
+
+    protected Integer toInt(int i) {
+        return i;
+    }
+
+    protected <T >Set<T> toSet(T... s) {
+        return new HashSet<T>(Arrays.asList(s));
+    }
+
+    protected static Comment comment(Integer id) {
+        return new Comment(id, "comment " + id, 0.0);
+    }
+
+    protected static DummyFetchableQuery<Tuple> projectable(final Object[]... rows) {
+        return new DummyFetchableQuery<Tuple>(toTuples(rows));
+    }
+
+    protected static Object[] row(Object... row) {
+        return row;
+    }
+
+    protected static List<Tuple> toTuples(Object[]... rows) {
+        List<Tuple> tuples = new ArrayList<>();
+        for (Object[] row : rows) {
+            tuples.add(new MockTuple(row));
+        }
+        return tuples;
+    }
+
+    public abstract void group_order();
+
+    public abstract void first_set_and_list();
+
+    public abstract void group_by_null();
+
+    public abstract void noSuchElementException();
+
+    public abstract void classCastException();
+
+    public abstract void map1();
+
+    public abstract void map2();
+
+    public abstract void map3();
+
+    public abstract void map4();
+
+    public abstract void array_access();
+
+    public abstract void transform_results();
+
+    public abstract void transform_as_bean();
+
+    public abstract void oneToOneToMany_projection();
+
+    public abstract void oneToOneToMany_projection_as_bean();
+
+    public abstract void oneToOneToMany_projection_as_bean_and_constructor();
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/Comment.java b/querydsl-core/src/test/java/com/querydsl/core/group/Comment.java
new file mode 100644
index 0000000000..61d7a55107
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/Comment.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+public class Comment {
+
+    private Integer id;
+
+    private String text;
+
+    private Double score;
+
+    public Comment() { }
+
+    public Comment(Integer id, String text, Double score) {
+        this.id = id;
+        this.text = text;
+        this.score = score;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * id.hashCode() + text.hashCode() + score.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof Comment) {
+            Comment other = (Comment) o;
+            return this.id.equals(other.id) && this.text.equals(other.text) && this.score.equals(other.score);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return id + ": " + text + "(score: " + score + ")";
+    }
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java
new file mode 100644
index 0000000000..df93d259a0
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByIterateTest.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import static org.junit.Assert.*;
+import static com.querydsl.core.group.GroupBy.*;
+
+import java.util.*;
+
+import org.junit.Test;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+
+public class GroupByIterateTest extends AbstractGroupByTest {
+
+    @Test
+    public void group_order() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS
+            .transform(groupBy(postId).iterate(postName, set(commentId)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+    }
+
+    @Test
+    public void first_set_and_list() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS.transform(
+            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(1);
+        assertEquals(toInt(1), group.getOne(postId));
+        assertEquals("post 1", group.getOne(postName));
+        assertEquals(toSet(1, 2, 3), group.getSet(commentId));
+        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), group.getList(commentText));
+    }
+
+    @Test
+    public void group_by_null() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS.transform(
+            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(0);
+        assertNull(group.getOne(postId));
+        assertEquals("null post", group.getOne(postName));
+        assertEquals(toSet(7, 8), group.getSet(commentId));
+        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(commentText));
+
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void noSuchElementException() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS.transform(
+            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(1);
+        group.getSet(qComment);
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void classCastException() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS.transform(
+            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(1);
+        group.getList(commentId);
+    }
+
+    @Test
+    public void map1() {
+        CloseableIterator<Group> resultsIt = MAP_RESULTS.transform(
+            groupBy(postId).iterate(postName, map(commentId, commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(1);
+        Map<Integer, String> comments = group.getMap(commentId, commentText);
+        assertEquals(3, comments.size());
+        assertEquals("comment 2", comments.get(2));
+    }
+
+    @Test
+    public void map2() {
+        CloseableIterator<Map<Integer, String>> resultsIt = MAP2_RESULTS.transform(
+            groupBy(postId).iterate(map(commentId, commentText)));
+        List<Map<Integer, String>> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Map<Integer, String> comments = results.get(1);
+        assertEquals(3, comments.size());
+        assertEquals("comment 2", comments.get(2));
+    }
+
+    @Test
+    public void map22() {
+        CloseableIterator<Map<Integer, String>> results = MAP2_RESULTS.transform(
+            groupBy(postId).iterate(map(commentId, commentText)));
+        List<Map<Integer, String>> actual = IteratorAdapter.asList(results);
+
+        Object commentId = null;
+        Map<Integer, String> comments = null;
+        List<Map<Integer, String>> expected = new LinkedList<Map<Integer, String>>();
+        for (Iterator<Tuple> iterator = MAP2_RESULTS.iterate(); iterator.hasNext();) {
+            Tuple tuple = iterator.next();
+            Object[] array = tuple.toArray();
+
+            if (comments == null || !(commentId == array[0] || commentId != null && commentId.equals(array[0]))) {
+                comments = new LinkedHashMap<Integer,String>();
+                expected.add(comments);
+            }
+            commentId = array[0];
+            @SuppressWarnings("unchecked")
+            Pair<Integer, String> pair = (Pair<Integer, String>) array[1];
+
+            comments.put(pair.getFirst(), pair.getSecond());
+        }
+        assertEquals(expected.toString(), actual.toString());
+    }
+
+    @Test
+    public void map3() {
+        CloseableIterator<Map<Integer, Map<Integer, String>>> results = MAP3_RESULTS.transform(
+            groupBy(postId).iterate(map(postId, map(commentId, commentText))));
+        List<Map<Integer, Map<Integer, String>>> actual = IteratorAdapter.asList(results);
+
+        Object postId = null;
+        Map<Integer, Map<Integer, String>> posts = null;
+        List<Map<Integer, Map<Integer, String>>> expected = new LinkedList<Map<Integer, Map<Integer, String>>>();
+        for (Iterator<Tuple> iterator = MAP3_RESULTS.iterate(); iterator.hasNext();) {
+            Tuple tuple = iterator.next();
+            Object[] array = tuple.toArray();
+
+            if (posts == null || !(postId == array[0] || postId != null && postId.equals(array[0]))) {
+                posts = new LinkedHashMap<Integer, Map<Integer,String>>();
+                expected.add(posts);
+            }
+            postId = array[0];
+            @SuppressWarnings("unchecked")
+            Pair<Integer, Pair<Integer, String>> pair = (Pair<Integer, Pair<Integer, String>>) array[1];
+            Integer first = pair.getFirst();
+            Map<Integer, String> comments = posts.computeIfAbsent(first, k -> new LinkedHashMap<Integer, String>());
+            Pair<Integer, String> second = pair.getSecond();
+            comments.put(second.getFirst(), second.getSecond());
+        }
+        assertEquals(expected.toString(), actual.toString());
+    }
+
+    @Test
+    public void map4() {
+        CloseableIterator<Map<Map<Integer, String>, String>> results = MAP4_RESULTS.transform(
+            groupBy(postId).iterate(map(map(postId, commentText), postName)));
+        List<Map<Map<Integer, String>, String>> actual = IteratorAdapter.asList(results);
+
+        Object commentId = null;
+        Map<Map<Integer, String>, String> comments = null;
+        List<Map<Map<Integer, String>, String>> expected = new LinkedList<Map<Map<Integer, String>, String>>();
+        for (Iterator<Tuple> iterator = MAP4_RESULTS.iterate(); iterator.hasNext();) {
+            Tuple tuple = iterator.next();
+            Object[] array = tuple.toArray();
+
+            if (comments == null || !(commentId == array[0] || commentId != null && commentId.equals(array[0]))) {
+                comments = new LinkedHashMap<Map<Integer, String>, String>();
+                expected.add(comments);
+            }
+            commentId = array[0];
+            @SuppressWarnings("unchecked")
+            Pair<Pair<Integer, String>, String> pair = (Pair<Pair<Integer, String>, String>) array[1];
+            Pair<Integer, String> first = pair.getFirst();
+            Map<Integer, String> posts = Collections.singletonMap(first.getFirst(), first.getSecond());
+            comments.put(posts, pair.getSecond());
+        }
+        assertEquals(expected.toString(), actual.toString());
+    }
+
+    @Test
+    public void array_access() {
+        CloseableIterator<Group> resultsIt = BASIC_RESULTS.transform(
+            groupBy(postId).iterate(postName, set(commentId), list(commentText)));
+        List<Group> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Group group = results.get(1);
+        Object[] array = group.toArray();
+        assertEquals(toInt(1), array[0]);
+        assertEquals("post 1", array[1]);
+        assertEquals(toSet(1, 2, 3), array[2]);
+        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), array[3]);
+    }
+
+    @Test
+    public void transform_results() {
+        CloseableIterator<Post> resultsIt = POST_W_COMMENTS.transform(
+                groupBy(postId).iterate(Projections.constructor(Post.class, postId, postName, set(qComment))));
+        List<Post> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(toInt(1), post.getId());
+        assertEquals("post 1", post.getName());
+        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
+    }
+
+    @Test
+    public void transform_as_bean() {
+        CloseableIterator<Post> resultsIt = POST_W_COMMENTS.transform(
+                groupBy(postId).iterate(Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
+        List<Post> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(4, results.size());
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(toInt(1), post.getId());
+        assertEquals("post 1", post.getName());
+        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
+    }
+
+
+    @Test
+    public void oneToOneToMany_projection() {
+        CloseableIterator<User> resultsIt = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).iterate(Projections.constructor(User.class, userName,
+                Projections.constructor(Post.class, postId, postName, set(qComment)))));
+        List<User> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(2, results.size());
+
+        User user = results.get(0);
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+    @Test
+    public void oneToOneToMany_projection_as_bean() {
+        CloseableIterator<User> resultsIt = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).iterate(Projections.bean(User.class, userName,
+                Projections.bean(Post.class, postId, postName, set(qComment).as("comments")).as("latestPost"))));
+        List<User> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(2, results.size());
+
+        User user = results.get(0);
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+    @Test
+    public void oneToOneToMany_projection_as_bean_and_constructor() {
+        CloseableIterator<User> resultsIt = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).iterate(Projections.bean(User.class, userName,
+                Projections.constructor(Post.class, postId, postName, set(qComment)).as("latestPost"))));
+        List<User> results = IteratorAdapter.asList(resultsIt);
+
+        assertEquals(2, results.size());
+
+        User user = results.get(0);
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
similarity index 83%
rename from querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
index ec650e7f49..a83fd178f9 100644
--- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,38 +11,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.group;
-
-
-import static com.mysema.query.group.GroupBy.groupBy;
-import static com.mysema.query.group.GroupBy.list;
-import static com.mysema.query.group.GroupBy.map;
-import static com.mysema.query.group.GroupBy.set;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+package com.querydsl.core.group;
+
+import static org.junit.Assert.*;
+import static com.querydsl.core.group.GroupBy.*;
+
+import java.util.*;
 
 import org.junit.Test;
 
 import com.mysema.commons.lang.CloseableIterator;
 import com.mysema.commons.lang.IteratorAdapter;
 import com.mysema.commons.lang.Pair;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Projections;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
 
 public class GroupByListTest extends AbstractGroupByTest {
-    
+
     @Test
-    public void Group_Order() {
+    public void group_order() {
         List<Group> results = BASIC_RESULTS
             .transform(groupBy(postId).list(postName, set(commentId)));
 
@@ -50,7 +37,7 @@ public void Group_Order() {
     }
 
     @Test
-    public void First_Set_And_List() {
+    public void first_set_and_list() {
         List<Group> results = BASIC_RESULTS.transform(
             groupBy(postId).list(postName, set(commentId), list(commentText)));
 
@@ -64,7 +51,7 @@ public void First_Set_And_List() {
     }
 
     @Test
-    public void Group_By_Null() {
+    public void group_by_null() {
         List<Group> results = BASIC_RESULTS.transform(
             groupBy(postId).list(postName, set(commentId), list(commentText)));
 
@@ -78,8 +65,8 @@ public void Group_By_Null() {
 
     }
 
-    @Test(expected=NoSuchElementException.class)
-    public void NoSuchElementException() {
+    @Test(expected = NoSuchElementException.class)
+    public void noSuchElementException() {
         List<Group> results = BASIC_RESULTS.transform(
             groupBy(postId).list(postName, set(commentId), list(commentText)));
 
@@ -89,8 +76,8 @@ public void NoSuchElementException() {
         group.getSet(qComment);
     }
 
-    @Test(expected=ClassCastException.class)
-    public void ClassCastException() {
+    @Test(expected = ClassCastException.class)
+    public void classCastException() {
         List<Group> results = BASIC_RESULTS.transform(
             groupBy(postId).list(postName, set(commentId), list(commentText)));
 
@@ -101,7 +88,7 @@ public void ClassCastException() {
     }
 
     @Test
-    public void Map() {
+    public void map1() {
         List<Group> results = MAP_RESULTS.transform(
             groupBy(postId).list(postName, map(commentId, commentText)));
 
@@ -114,7 +101,7 @@ public void Map() {
     }
 
     @Test
-    public void Map2() {
+    public void map2() {
         List<Map<Integer, String>> results = MAP2_RESULTS.transform(
             groupBy(postId).list(map(commentId, commentText)));
 
@@ -124,19 +111,19 @@ public void Map2() {
         assertEquals(3, comments.size());
         assertEquals("comment 2", comments.get(2));
     }
- 
+
     @Test
-    public void Map3() {        
+    public void map3() {
         List<Map<Integer, Map<Integer, String>>> actual = MAP3_RESULTS.transform(
             groupBy(postId).list(map(postId, map(commentId, commentText))));
-        
+
         Object postId = null;
         Map<Integer, Map<Integer, String>> posts = null;
         List<Map<Integer, Map<Integer, String>>> expected = new LinkedList<Map<Integer, Map<Integer, String>>>();
         for (Iterator<Tuple> iterator = MAP3_RESULTS.iterate(); iterator.hasNext();) {
             Tuple tuple = iterator.next();
             Object[] array = tuple.toArray();
-            
+
             if (posts == null || !(postId == array[0] || postId != null && postId.equals(array[0]))) {
                 posts = new LinkedHashMap<Integer, Map<Integer,String>>();
                 expected.add(posts);
@@ -145,30 +132,26 @@ public void Map3() {
             @SuppressWarnings("unchecked")
             Pair<Integer, Pair<Integer, String>> pair = (Pair<Integer, Pair<Integer, String>>) array[1];
             Integer first = pair.getFirst();
-            Map<Integer, String> comments = posts.get(first);
-            if (comments == null) {
-                comments = new LinkedHashMap<Integer, String>();
-                posts.put(first, comments);
-            }
+            Map<Integer, String> comments = posts.computeIfAbsent(first, k -> new LinkedHashMap<Integer, String>());
             Pair<Integer, String> second = pair.getSecond();
             comments.put(second.getFirst(), second.getSecond());
-        }      
+        }
         assertEquals(expected.toString(), actual.toString());
     }
 
     @Test
-    public void Map4() {    
+    public void map4() {
         CloseableIterator<Map<Map<Integer, String>, String>> results = MAP4_RESULTS.transform(
             groupBy(postId).iterate(map(map(postId, commentText), postName)));
         List<Map<Map<Integer, String>, String>> actual = IteratorAdapter.asList(results);
-        
+
         Object commentId = null;
         Map<Map<Integer, String>, String> comments = null;
         List<Map<Map<Integer, String>, String>> expected = new LinkedList<Map<Map<Integer, String>, String>>();
         for (Iterator<Tuple> iterator = MAP4_RESULTS.iterate(); iterator.hasNext();) {
             Tuple tuple = iterator.next();
             Object[] array = tuple.toArray();
- 
+
             if (comments == null || !(commentId == array[0] || commentId != null && commentId.equals(array[0]))) {
                 comments = new LinkedHashMap<Map<Integer, String>, String>();
                 expected.add(comments);
@@ -176,15 +159,15 @@ public void Map4() {
             commentId = array[0];
             @SuppressWarnings("unchecked")
             Pair<Pair<Integer, String>, String> pair = (Pair<Pair<Integer, String>, String>) array[1];
-            Pair<Integer, String> first = pair.getFirst(); 
+            Pair<Integer, String> first = pair.getFirst();
             Map<Integer, String> posts = Collections.singletonMap(first.getFirst(), first.getSecond());
             comments.put(posts, pair.getSecond());
-        }      
+        }
         assertEquals(expected.toString(), actual.toString());
     }
 
     @Test
-    public void Array_Access() {
+    public void array_access() {
         List<Group> results = BASIC_RESULTS.transform(
             groupBy(postId).list(postName, set(commentId), list(commentText)));
 
@@ -199,7 +182,7 @@ public void Array_Access() {
     }
 
     @Test
-    public void Transform_Results() {
+    public void transform_results() {
         List<Post> results = POST_W_COMMENTS.transform(
                 groupBy(postId).list(Projections.constructor(Post.class, postId, postName, set(qComment))));
 
@@ -213,7 +196,7 @@ public void Transform_Results() {
     }
 
     @Test
-    public void Transform_As_Bean() {
+    public void transform_as_bean() {
         List<Post> results = POST_W_COMMENTS.transform(
                 groupBy(postId).list(Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
 
@@ -228,7 +211,7 @@ public void Transform_As_Bean() {
 
 
     @Test
-    public void OneToOneToMany_Projection() {
+    public void oneToOneToMany_projection() {
         List<User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
             groupBy(userName).list(Projections.constructor(User.class, userName,
                 Projections.constructor(Post.class, postId, postName, set(qComment)))));
@@ -243,7 +226,7 @@ public void OneToOneToMany_Projection() {
     }
 
     @Test
-    public void OneToOneToMany_Projection_As_Bean() {
+    public void oneToOneToMany_projection_as_bean() {
         List<User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
             groupBy(userName).list(Projections.bean(User.class, userName,
                 Projections.bean(Post.class, postId, postName, set(qComment).as("comments")).as("latestPost"))));
@@ -258,7 +241,7 @@ public void OneToOneToMany_Projection_As_Bean() {
     }
 
     @Test
-    public void OneToOneToMany_Projection_As_Bean_And_Constructor() {
+    public void oneToOneToMany_projection_as_bean_and_constructor() {
         List<User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
             groupBy(userName).list(Projections.bean(User.class, userName,
                 Projections.constructor(Post.class, postId, postName, set(qComment)).as("latestPost"))));
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java
new file mode 100644
index 0000000000..512aeb362d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/GroupByMapTest.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import static com.querydsl.core.group.GroupBy.*;
+import static org.junit.Assert.*;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import org.junit.Test;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.core.types.dsl.StringPath;
+
+import java.math.MathContext;
+import java.math.RoundingMode;
+
+public class GroupByMapTest extends AbstractGroupByTest {
+
+    @Test
+    public void compile() {
+        StringExpression str = Expressions.stringPath("str");
+        GroupExpression<String, String> strGroup = new GOne<String>(str);
+        GroupBy.sortedMap(strGroup, str, null);
+        GroupBy.sortedMap(str, strGroup, null);
+    }
+
+    @Test
+    public void group_order() {
+        Map<Integer, Group> results = BASIC_RESULTS
+            .transform(groupBy(postId).as(postName, set(commentId)));
+        assertEquals(4, results.size());
+    }
+
+    @Test
+    public void set_by_sorted() {
+        Map<Integer, Group> results = BASIC_RESULTS_UNORDERED
+                .transform(groupBy(postId).as(postName, sortedSet(commentId)));
+
+        Group group = results.get(1);
+        Iterator<Integer> it = group.getSet(commentId).iterator();
+        assertEquals(1, it.next().intValue());
+        assertEquals(2, it.next().intValue());
+        assertEquals(3, it.next().intValue());
+    }
+
+    @Test
+    public void set_by_sorted_reverse() {
+        Map<Integer, Group> results = BASIC_RESULTS_UNORDERED
+                .transform(groupBy(postId).as(postName, sortedSet(commentId, Comparator.reverseOrder())));
+
+        Group group = results.get(1);
+        Iterator<Integer> it = group.getSet(commentId).iterator();
+        assertEquals(3, it.next().intValue());
+        assertEquals(2, it.next().intValue());
+        assertEquals(1, it.next().intValue());
+    }
+
+    @Test
+    public void first_set_and_list() {
+        Map<Integer, Group> results = BASIC_RESULTS.transform(
+            groupBy(postId).as(postName, set(commentId), list(commentText)));
+
+        Group group = results.get(1);
+        assertEquals(toInt(1), group.getOne(postId));
+        assertEquals("post 1", group.getOne(postName));
+        assertEquals(toSet(1, 2, 3), group.getSet(commentId));
+        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), group.getList(commentText));
+    }
+
+    @Test
+    public void group_by_null() {
+        Map<Integer, Group> results = BASIC_RESULTS.transform(
+            groupBy(postId).as(postName, set(commentId), list(commentText)));
+
+        Group group = results.get(null);
+        assertNull(group.getOne(postId));
+        assertEquals("null post", group.getOne(postName));
+        assertEquals(toSet(7, 8), group.getSet(commentId));
+        assertEquals(Arrays.asList("comment 7", "comment 8"), group.getList(commentText));
+
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void noSuchElementException() {
+        Map<Integer, Group> results = BASIC_RESULTS.transform(
+            groupBy(postId).as(postName, set(commentId), list(commentText)));
+
+        Group group = results.get(1);
+        group.getSet(qComment);
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void classCastException() {
+        Map<Integer, Group> results = BASIC_RESULTS.transform(
+            groupBy(postId).as(postName, set(commentId), list(commentText)));
+
+        Group group = results.get(1);
+        group.getList(commentId);
+    }
+
+    @Test
+    public void map1() {
+        Map<Integer, Group> results = MAP_RESULTS.transform(
+            groupBy(postId).as(postName, map(commentId, commentText)));
+
+        Group group = results.get(1);
+
+        Map<Integer, String> comments = group.getMap(commentId, commentText);
+        assertEquals(3, comments.size());
+        assertEquals("comment 2", comments.get(2));
+    }
+
+    @Test
+    public void map_sorted() {
+        Map<Integer, Group> results = MAP_RESULTS.transform(
+                groupBy(postId).as(postName, sortedMap(commentId, commentText)));
+
+        Group group = results.get(1);
+
+        Iterator<Map.Entry<Integer, String>> it = group.getMap(commentId, commentText).entrySet().iterator();
+        assertEquals(1, it.next().getKey().intValue());
+        assertEquals(2, it.next().getKey().intValue());
+        assertEquals(3, it.next().getKey().intValue());
+    }
+
+    @Test
+    public void map_sorted_reverse() {
+        Map<Integer, Group> results = MAP_RESULTS.transform(
+                groupBy(postId).as(postName, sortedMap(commentId, commentText, Comparator.reverseOrder())));
+
+        Group group = results.get(1);
+
+        Iterator<Map.Entry<Integer, String>> it = group.getMap(commentId, commentText).entrySet().iterator();
+        assertEquals(3, it.next().getKey().intValue());
+        assertEquals(2, it.next().getKey().intValue());
+        assertEquals(1, it.next().getKey().intValue());
+    }
+
+
+    @Test
+    public void map2() {
+        Map<Integer, Map<Integer, String>> results = MAP2_RESULTS.transform(
+            groupBy(postId).as(map(commentId, commentText)));
+
+        Map<Integer, String> comments = results.get(1);
+        assertEquals(3, comments.size());
+        assertEquals("comment 2", comments.get(2));
+    }
+
+    @Test
+    public void map3() {
+        Map<Integer, Map<Integer, Map<Integer, String>>> actual = MAP3_RESULTS.transform(
+            groupBy(postId).as(map(postId, map(commentId, commentText))));
+
+        Map<Integer, Map<Integer, Map<Integer, String>>> expected = new LinkedHashMap<Integer, Map<Integer, Map<Integer, String>>>();
+        for (Iterator<Tuple> iterator = MAP3_RESULTS.iterate(); iterator.hasNext();) {
+            Tuple tuple = iterator.next();
+            Object[] array = tuple.toArray();
+
+            Map<Integer, Map<Integer, String>> posts = expected.get(array[0]);
+            if (posts == null) {
+                posts = new LinkedHashMap<Integer, Map<Integer,String>>();
+                expected.put((Integer) array[0], posts);
+            }
+            @SuppressWarnings("unchecked")
+            Pair<Integer, Pair<Integer, String>> pair = (Pair<Integer, Pair<Integer, String>>) array[1];
+            Integer first = pair.getFirst();
+            Map<Integer, String> comments = posts.computeIfAbsent(first, k -> new LinkedHashMap<Integer, String>());
+            Pair<Integer, String> second = pair.getSecond();
+            comments.put(second.getFirst(), second.getSecond());
+        }
+        assertEquals(expected.toString(), actual.toString());
+    }
+
+    @Test
+    public void map4() {
+        Map<Integer, Map<Map<Integer, String>, String>> actual = MAP4_RESULTS.transform(
+            groupBy(postId).as(map(map(postId, commentText), postName)));
+
+        Map<Integer, Map<Map<Integer, String>, String>> expected = new LinkedHashMap<Integer, Map<Map<Integer, String>, String>>();
+        for (Iterator<Tuple> iterator = MAP4_RESULTS.iterate(); iterator.hasNext();) {
+            Tuple tuple = iterator.next();
+            Object[] array = tuple.toArray();
+
+            Map<Map<Integer, String>, String> comments = expected.get(array[0]);
+            if (comments == null) {
+                comments = new LinkedHashMap<Map<Integer, String>, String>();
+                expected.put((Integer) array[0], comments);
+            }
+            @SuppressWarnings("unchecked")
+            Pair<Pair<Integer, String>, String> pair = (Pair<Pair<Integer, String>, String>) array[1];
+            Pair<Integer, String> first = pair.getFirst();
+            Map<Integer, String> posts = Collections.singletonMap(first.getFirst(), first.getSecond());
+            comments.put(posts, pair.getSecond());
+        }
+        assertEquals(expected.toString(), actual.toString());
+    }
+
+    @Test
+    public void array_access() {
+        Map<Integer, Group> results = BASIC_RESULTS.transform(
+            groupBy(postId).as(postName, set(commentId), list(commentText)));
+
+        Group group = results.get(1);
+        Object[] array = group.toArray();
+        assertEquals(toInt(1), array[0]);
+        assertEquals("post 1", array[1]);
+        assertEquals(toSet(1, 2, 3), array[2]);
+        assertEquals(Arrays.asList("comment 1", "comment 2", "comment 3"), array[3]);
+    }
+
+    @Test
+    public void transform_results() {
+        Map<Integer, Post> results = POST_W_COMMENTS.transform(
+                groupBy(postId).as(Projections.constructor(Post.class, postId, postName, set(qComment))));
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(toInt(1), post.getId());
+        assertEquals("post 1", post.getName());
+        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
+    }
+
+    @Test
+    public void transform_via_groupByProjection() {
+        Map<Integer, Post> results = POST_W_COMMENTS2.transform(
+                new GroupByProjection<Integer, Post>(postId, postName, set(qComment)) {
+                    @Override
+                    protected Post transform(Group group) {
+                        return new Post(
+                                group.getOne(postId),
+                                group.getOne(postName),
+                                group.getSet(qComment));
+
+                    }
+                });
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(toInt(1), post.getId());
+        assertEquals("post 1", post.getName());
+        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
+    }
+
+    @Test
+    public void transform_as_bean() {
+        Map<Integer, Post> results = POST_W_COMMENTS.transform(
+                groupBy(postId).as(Projections.bean(Post.class, postId, postName, set(qComment).as("comments"))));
+
+        Post post = results.get(1);
+        assertNotNull(post);
+        assertEquals(toInt(1), post.getId());
+        assertEquals("post 1", post.getName());
+        assertEquals(toSet(comment(1), comment(2), comment(3)), post.getComments());
+    }
+
+
+    @Test
+    public void oneToOneToMany_projection() {
+        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).as(Projections.constructor(User.class, userName,
+                Projections.constructor(Post.class, postId, postName, set(qComment)))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+    @Test
+    public void oneToOneToMany_projection_as_bean() {
+        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).as(Projections.bean(User.class, userName,
+                Projections.bean(Post.class, postId, postName, set(qComment).as("comments")).as("latestPost"))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+    @Test
+    public void oneToOneToMany_projection_as_bean_and_constructor() {
+        Map<String, User> results = USERS_W_LATEST_POST_AND_COMMENTS.transform(
+            groupBy(userName).as(Projections.bean(User.class, userName,
+                Projections.constructor(Post.class, postId, postName, set(qComment)).as("latestPost"))));
+
+        assertEquals(2, results.size());
+
+        User user = results.get("Jane");
+        Post post = user.getLatestPost();
+        assertEquals(toInt(2), post.getId());
+        assertEquals("post 2", post.getName());
+        assertEquals(toSet(comment(4), comment(5)), post.getComments());
+    }
+
+    @Test
+    public void signature() {
+        StringPath str = Expressions.stringPath("str");
+        NumberPath<BigDecimal> bigd = Expressions.numberPath(BigDecimal.class, "bigd");
+
+        ResultTransformer<Map<String, SortedMap<BigDecimal, SortedMap<BigDecimal, Map<String, String>>>>> resultTransformer = GroupBy.groupBy(str).as(
+                GroupBy.sortedMap(bigd,
+                        GroupBy.sortedMap(bigd,
+                                GroupBy.map(str, str),
+                                Comparator.nullsLast(Comparator.naturalOrder())),
+                           Comparator.nullsFirst(Comparator.naturalOrder())));
+        assertNotNull(resultTransformer);
+    }
+
+    @Test
+    public void average_with_default_math_context() {
+        Map<Integer, Double> results = POSTS_W_COMMENTS_SCORE
+                .transform(groupBy(postId).as(avg(score)));
+        assertEquals(1.5, results.get(null), 0.0);
+        assertEquals(((1.5 + 2.0 + 0.5) / 3), results.get(1), 0.0);
+        assertEquals(((1.0 + 2.0) / 2), results.get(2), 0.0);
+    }
+
+    @Test
+    public void average_with_user_provided_math_context() {
+        MathContext oneDigitMathContext = new MathContext(2, RoundingMode.HALF_EVEN);
+        Map<Integer, Double> results = POSTS_W_COMMENTS_SCORE
+                .transform(groupBy(postId).as(avg(score, oneDigitMathContext)));
+        assertEquals(1.5, results.get(null), 0.0);
+        assertEquals(1.3, results.get(1), 0.0);
+        assertEquals(1.5, results.get(2), 0.0);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/group/MockTuple.java b/querydsl-core/src/test/java/com/querydsl/core/group/MockTuple.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/group/MockTuple.java
rename to querydsl-core/src/test/java/com/querydsl/core/group/MockTuple.java
index 14889f87e0..03b5693dca 100644
--- a/querydsl-core/src/test/java/com/mysema/query/group/MockTuple.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/MockTuple.java
@@ -1,18 +1,19 @@
-package com.mysema.query.group;
+package com.querydsl.core.group;
 
 import java.util.Arrays;
 
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
 
-public class MockTuple implements Tuple{
+public class MockTuple implements Tuple {
 
     private final Object[] a;
-    
+
     public MockTuple(Object[] a) {
         this.a = a;
     }
-    
+
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T get(int index, Class<T> type) {
         return (T) a[index];
@@ -22,7 +23,7 @@ public <T> T get(int index, Class<T> type) {
     public <T> T get(Expression<T> expr) {
         return null;
     }
-    
+
     @Override
     public int size() {
         return a.length;
@@ -48,10 +49,10 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return Arrays.hashCode(a);
     }
-    
+
     @Override
     public String toString() {
         return Arrays.toString(a);
     }
-    
+
 }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/Post.java b/querydsl-core/src/test/java/com/querydsl/core/group/Post.java
new file mode 100644
index 0000000000..f9010383d6
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/Post.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+import java.util.Set;
+
+public class Post {
+
+    private Integer id;
+
+    private String name;
+
+    private Set<Comment> comments;
+
+    public Post() {
+
+    }
+
+    public Post(Integer id, String name, Set<Comment> comments) {
+        this.id = id;
+        this.name = name;
+        this.comments = comments;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<Comment> getComments() {
+        return comments;
+    }
+
+    public void setComments(Set<Comment> comments) {
+        this.comments = comments;
+    }
+
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/group/User.java b/querydsl-core/src/test/java/com/querydsl/core/group/User.java
new file mode 100644
index 0000000000..978f578566
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/group/User.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group;
+
+
+/**
+ * TODO: How to project an inner group, i.e. [User] 1->1 [Post] 1->N [Comment]
+ */
+public class User {
+
+    private String name;
+
+    private Post latestPost;
+
+    public User() {
+
+    }
+
+    public User(String name, Post latestPost) {
+        this.name = name;
+        this.latestPost = latestPost;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Post getLatestPost() {
+        return latestPost;
+    }
+
+    public void setLatestPost(Post latestPost) {
+        this.latestPost = latestPost;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/querydsl/core/serialization/DummySerializer.java b/querydsl-core/src/test/java/com/querydsl/core/serialization/DummySerializer.java
new file mode 100644
index 0000000000..a953b1fbc0
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/serialization/DummySerializer.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.serialization;
+
+import com.querydsl.core.support.SerializerBase;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.Templates;
+
+class DummySerializer extends SerializerBase<DummySerializer> {
+
+    DummySerializer(Templates templates) {
+        super(templates);
+    }
+
+    @Override
+    public Void visit(SubQueryExpression<?> query, Void context) {
+        return null;
+    }
+
+    @Override
+    public Void visit(FactoryExpression<?> expr, Void context) {
+        return null;
+    }
+
+    @Override
+    public Void visit(ParamExpression<?> expr, Void context) {
+        return null;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/serialization/JavaTemplatesTest.java b/querydsl-core/src/test/java/com/querydsl/core/serialization/JavaTemplatesTest.java
new file mode 100644
index 0000000000..33a47a1488
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/serialization/JavaTemplatesTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.serialization;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.JavaTemplates;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Templates;
+
+public class JavaTemplatesTest {
+
+    @Test
+    public void mappings() {
+        Templates templates = new JavaTemplates();
+        int matched = 0;
+        for (Operator operator : Ops.values()) {
+            ++matched;
+            assertNotNull(templates.getTemplate(operator));
+        }
+
+        assertTrue(matched > 0);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/serialization/SerializerBaseTest.java b/querydsl-core/src/test/java/com/querydsl/core/serialization/SerializerBaseTest.java
new file mode 100644
index 0000000000..bc97b23076
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/serialization/SerializerBaseTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.serialization;
+
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.JavaTemplates;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class SerializerBaseTest {
+
+    @Test
+    public void test() {
+        DummySerializer serializer = new DummySerializer(new JavaTemplates());
+        StringPath strPath = Expressions.stringPath("str");
+        // path
+        serializer.handle(strPath);
+        // operation
+        serializer.handle(strPath.isNotNull());
+        // long path
+        serializer.handle(new PathBuilder<Object>(Object.class,"p").getList("l",Map.class).get(0));
+        // constant
+        serializer.handle(ConstantImpl.create(""));
+        //  custom
+        serializer.handle(ExpressionUtils.template(Object.class, "xxx", ConstantImpl.create("")));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/CollectionAnyVisitorTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/CollectionAnyVisitorTest.java
new file mode 100644
index 0000000000..b073a09ce9
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/CollectionAnyVisitorTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.domain.QCat;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Predicate;
+
+
+public class CollectionAnyVisitorTest {
+
+    private QCat cat = QCat.cat;
+
+    @Test
+    public void path() {
+        assertEquals("cat_kittens_0", serialize(cat.kittens.any()));
+    }
+
+    @Test
+    public void longer_path() {
+        assertEquals("cat_kittens_0.name", serialize(cat.kittens.any().name));
+    }
+
+    @Test
+    public void longer_path2() {
+        CollectionAnyVisitor visitor = new CollectionAnyVisitor();
+        assertEquals("cat_kittens_0.name", serialize(cat.kittens.any().name, visitor));
+        assertEquals("cat_kittens_1.name", serialize(cat.kittens.any().name, visitor));
+    }
+
+    @Test
+    public void very_long_path() {
+        assertEquals("cat_kittens_0_kittens_1.name", serialize(cat.kittens.any().kittens.any().name));
+    }
+
+    @Test
+    public void simple_booleanOperation() {
+        Predicate predicate = cat.kittens.any().name.eq("Ruth123");
+        assertEquals("cat_kittens_0.name = Ruth123", serialize(predicate));
+    }
+
+    @Test
+    public void simple_stringOperation() {
+        Predicate predicate = cat.kittens.any().name.substring(1).eq("uth123");
+        assertEquals("substring(cat_kittens_0.name,1) = uth123", serialize(predicate));
+    }
+
+    @Test
+    public void and_operation() {
+        Predicate predicate = cat.kittens.any().name.eq("Ruth123").and(cat.kittens.any().bodyWeight.gt(10.0));
+        assertEquals("cat_kittens_0.name = Ruth123 && cat_kittens_1.bodyWeight > 10.0", serialize(predicate));
+    }
+
+    @Test
+    public void template() {
+        Expression<Boolean> templateExpr = ExpressionUtils.template(Boolean.class, "{0} = {1}",
+                cat.kittens.any().name, ConstantImpl.create("Ruth123"));
+        assertEquals("cat_kittens_0.name = Ruth123", serialize(templateExpr));
+    }
+
+    private String serialize(Expression<?> expression) {
+        return serialize(expression, new CollectionAnyVisitor());
+    }
+
+    private String serialize(Expression<?> expression, CollectionAnyVisitor visitor) {
+        Expression<?> transformed = expression.accept(visitor, new Context());
+        return transformed.toString();
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/ConstantHidingExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/ConstantHidingExpressionTest.java
new file mode 100644
index 0000000000..f1c4c623fe
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/ConstantHidingExpressionTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.core.support;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class ConstantHidingExpressionTest {
+
+    @Test
+    public void constants_hidden() {
+        FactoryExpression<Tuple> tuple = Projections.tuple(
+                Expressions.stringPath("str"),
+                Expressions.TRUE,
+                Expressions.FALSE.as("false"),
+                Expressions.constant(1));
+        FactoryExpression<Tuple> wrapped = new ConstantHidingExpression<Tuple>(tuple);
+        assertEquals(1, wrapped.getArgs().size());
+        Tuple t = wrapped.newInstance("s");
+
+        assertEquals("s", t.get(Expressions.stringPath("str")));
+        assertEquals(Boolean.TRUE, t.get(Expressions.TRUE));
+        assertEquals(Boolean.FALSE, t.get(Expressions.FALSE.as("false")));
+        assertEquals(Integer.valueOf(1), t.get(Expressions.constant(1)));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/DummyEntity.java b/querydsl-core/src/test/java/com/querydsl/core/support/DummyEntity.java
new file mode 100644
index 0000000000..9113f99054
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/DummyEntity.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.support;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DummyEntity {
+
+    private DummyEntity other;
+
+    private List<DummyEntity> list;
+
+    private Set<DummyEntity> set;
+
+    private Map<String,DummyEntity> map;
+
+    public List<DummyEntity> getList() {
+        return list;
+    }
+
+    public Set<DummyEntity> getSet() {
+        return set;
+    }
+
+    public Map<String, DummyEntity> getMap() {
+        return map;
+    }
+
+    public DummyEntity getOther() {
+        return other;
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java b/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
new file mode 100644
index 0000000000..d070f70f1d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
@@ -0,0 +1,59 @@
+package com.querydsl.core.support;
+
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+
+public class DummyFetchable<T> implements Fetchable<T> {
+
+    private final List<T> results;
+
+    public DummyFetchable(List<T> results) {
+        this.results = results;
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        return new IteratorAdapter<T>(results.iterator());
+    }
+
+    @Override
+    public List<T> fetch() {
+        return results;
+    }
+
+    @Nullable
+    @Override
+    public T fetchFirst() {
+        return results.isEmpty() ? null : results.get(0);
+    }
+
+    @Nullable
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        if (results.size() > 1) {
+            throw new NonUniqueResultException();
+        } else if (results.isEmpty()) {
+            return null;
+        } else {
+            return results.get(0);
+        }
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        return new QueryResults<T>(results, QueryModifiers.EMPTY, results.size());
+    }
+
+    @Override
+    public long fetchCount() {
+        return results.size();
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchableQuery.java b/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchableQuery.java
new file mode 100644
index 0000000000..cef69b831e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchableQuery.java
@@ -0,0 +1,73 @@
+package com.querydsl.core.support;
+
+import java.util.List;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Predicate;
+
+public class DummyFetchableQuery<T> extends DummyFetchable<T> implements FetchableQuery<T, DummyFetchableQuery<T>> {
+
+    public DummyFetchableQuery(List<T> results) {
+        super(results);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <U> DummyFetchableQuery<U> select(Expression<U> expr) {
+        return (DummyFetchableQuery<U>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public DummyFetchableQuery<Tuple> select(Expression<?>... exprs) {
+        return (DummyFetchableQuery<Tuple>) this;
+    }
+
+    @Override
+    public <T1> T1 transform(ResultTransformer<T1> transformer) {
+        return transformer.transform(this);
+    }
+
+    @Override
+    public DummyFetchableQuery<T> limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit) {
+        return this;
+    }
+
+    @Override
+    public DummyFetchableQuery<T> offset(@Range(from = 0, to = Integer.MAX_VALUE) long offset) {
+        return this;
+    }
+
+    @Override
+    public DummyFetchableQuery<T> restrict(QueryModifiers modifiers) {
+        return this;
+    }
+
+    @Override
+    public DummyFetchableQuery<T> orderBy(OrderSpecifier<?>... o) {
+        return this;
+    }
+
+    @Override
+    public <U> DummyFetchableQuery<T> set(ParamExpression<U> param, U value) {
+        return this;
+    }
+
+    @Override
+    public DummyFetchableQuery<T> distinct() {
+        return this;
+    }
+
+    @Override
+    public DummyFetchableQuery<T> where(Predicate... o) {
+        return this;
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/EnumConversionTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/EnumConversionTest.java
new file mode 100644
index 0000000000..7b0ea508b5
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/EnumConversionTest.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.EnumPath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class EnumConversionTest {
+
+    public enum Color { GREEN, BLUE, RED, YELLOW, B, W }
+
+    @Test
+    public void nameForCharacter() {
+        EnumPath<Color> color = Expressions.enumPath(Color.class, "path");
+        EnumConversion<Color> conv = new EnumConversion<Color>(color);
+        assertEquals(Color.W, conv.newInstance('W'));
+    }
+
+    @Test
+    public void name() {
+        EnumPath<Color> color = Expressions.enumPath(Color.class, "path");
+        EnumConversion<Color> conv = new EnumConversion<Color>(color);
+        assertEquals(Color.BLUE, conv.newInstance("BLUE"));
+    }
+
+    @Test
+    public void ordinal() {
+        EnumPath<Color> color = Expressions.enumPath(Color.class, "path");
+        EnumConversion<Color> conv = new EnumConversion<Color>(color);
+        assertEquals(Color.RED, conv.newInstance(2));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void illegal() {
+        StringPath string = Expressions.stringPath("path");
+        EnumConversion<String> conv = new EnumConversion<String>(string);
+        fail("EnumConversion successfully created for a non-enum type");
+        conv.newInstance(0);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/NumberConversionsTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/NumberConversionsTest.java
new file mode 100644
index 0000000000..e3169709cf
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/NumberConversionsTest.java
@@ -0,0 +1,56 @@
+package com.querydsl.core.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QTuple;
+import com.querydsl.core.types.dsl.EnumPath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class NumberConversionsTest {
+
+    public enum Color { GREEN, BLUE, RED, YELLOW, BLACK, WHITE }
+
+    @Test
+    public void name() {
+        EnumPath<Color> color = Expressions.enumPath(Color.class, "path");
+        QTuple qTuple = Projections.tuple(color);
+        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
+        assertEquals(Color.BLUE, conversions.newInstance("BLUE").get(color));
+    }
+
+    @Test
+    public void ordinal() {
+        EnumPath<Color> color = Expressions.enumPath(Color.class, "path");
+        QTuple qTuple = Projections.tuple(color);
+        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
+        assertEquals(Color.RED, conversions.newInstance(2).get(color));
+    }
+
+    @Test
+    public void safe_number_conversion() {
+        StringPath strPath = Expressions.stringPath("strPath");
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        QTuple qTuple = Projections.tuple(strPath, intPath);
+        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
+        assertNotNull(conversions.newInstance(1, 2));
+    }
+
+    @Test
+    public void number_conversion() {
+        StringPath strPath = Expressions.stringPath("strPath");
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        QTuple qTuple = Projections.tuple(strPath, intPath);
+        NumberConversions<Tuple> conversions = new NumberConversions<Tuple>(qTuple);
+        Tuple tuple = conversions.newInstance("a", 3L);
+        assertEquals("a", tuple.get(strPath));
+        assertEquals(Integer.valueOf(3), tuple.get(intPath));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/OrderedQueryMetadataTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/OrderedQueryMetadataTest.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/support/OrderedQueryMetadataTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/support/OrderedQueryMetadataTest.java
index 6559fa372f..f31607364c 100644
--- a/querydsl-core/src/test/java/com/mysema/query/support/OrderedQueryMetadataTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/OrderedQueryMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.support;
+package com.querydsl.core.support;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,30 +20,30 @@
 
 import org.junit.Test;
 
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class OrderedQueryMetadataTest {
 
-    private Path<Object> x = new PathImpl<Object>(Object.class, PathMetadataFactory.forVariable("x"));
-    private Path<Object> y = new PathImpl<Object>(Object.class, PathMetadataFactory.forVariable("y"));
-    private Path<Object> x_a = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(x, "a"));
-    private Path<Object> x_a_a = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(x_a, "a"));
-    private Path<Object> x_a_b = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(x_a, "b"));
-    private Path<Object> x_b = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(x, "a"));
-    private Path<Object> y_a = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(y, "a"));
-    private Path<Object> y_b = new PathImpl<Object>(Object.class, PathMetadataFactory.forProperty(y, "b"));
+    private Path<Object> x = ExpressionUtils.path(Object.class, PathMetadataFactory.forVariable("x"));
+    private Path<Object> y = ExpressionUtils.path(Object.class, PathMetadataFactory.forVariable("y"));
+    private Path<Object> x_a = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(x, "a"));
+    private Path<Object> x_a_a = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(x_a, "a"));
+    private Path<Object> x_a_b = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(x_a, "b"));
+    private Path<Object> x_b = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(x, "a"));
+    private Path<Object> y_a = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(y, "a"));
+    private Path<Object> y_b = ExpressionUtils.path(Object.class, PathMetadataFactory.forProperty(y, "b"));
 
     private void addJoin(QueryMetadata md, JoinExpression j) {
         md.addJoin(j.getType(), j.getTarget());
     }
 
     @Test
-    public void AddJoin() {
+    public void addJoin() {
         List<JoinExpression> joins = new ArrayList<JoinExpression>();
         joins.add(new JoinExpression(JoinType.DEFAULT, x));
         joins.add(new JoinExpression(JoinType.DEFAULT, y));
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinPerformanceTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinPerformanceTest.java
new file mode 100644
index 0000000000..1349b35184
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinPerformanceTest.java
@@ -0,0 +1,48 @@
+package com.querydsl.core.support;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+
+@Ignore
+public class QueryMixinPerformanceTest {
+
+    public static final int iterations = 2000000;
+
+    @Test
+    public void normal() { // 1791
+        EntityPath<DummyEntity> entity = new EntityPathBase<DummyEntity>(DummyEntity.class, "entity");
+        EntityPathBase<DummyEntity> other = new EntityPathBase<DummyEntity>(DummyEntity.class,
+                PathMetadataFactory.forProperty(entity, "other"));
+
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            QueryMixin<?> mixin = new QueryMixin<Void>();
+            mixin.from(entity);
+            mixin.where(other.eq(new DummyEntity()));
+            mixin.setProjection(entity);
+        }
+        System.err.println(System.currentTimeMillis() - start);
+    }
+
+    @Test
+    public void array_arguments() { // 2260
+        EntityPath<DummyEntity> entity = new EntityPathBase<DummyEntity>(DummyEntity.class, "entity");
+        EntityPath[] entities = new EntityPath[]{entity};
+        EntityPathBase<DummyEntity> other = new EntityPathBase<DummyEntity>(DummyEntity.class,
+                PathMetadataFactory.forProperty(entity, "other"));
+
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            QueryMixin<?> mixin = new QueryMixin<Void>();
+            mixin.from(entities);
+            mixin.where(other.eq(new DummyEntity()));
+            mixin.setProjection(entity);
+        }
+        System.err.println(System.currentTimeMillis() - start);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/QueryMixinTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinTest.java
similarity index 82%
rename from querydsl-core/src/test/java/com/mysema/query/support/QueryMixinTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinTest.java
index 14f9cacd1e..6c3dc84820 100644
--- a/querydsl-core/src/test/java/com/mysema/query/support/QueryMixinTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/QueryMixinTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,46 +11,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.support;
+package com.querydsl.core.support;
 
-import static com.mysema.query.alias.Alias.$;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static com.querydsl.core.alias.Alias.$;
 
 import org.junit.Test;
 
-import com.mysema.query.JoinExpression;
-import com.mysema.query.alias.Alias;
-import com.mysema.query.domain.QCommonPersistence;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.BooleanExpression;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.domain.QCommonPersistence;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
 
 public class QueryMixinTest {
 
-    @SuppressWarnings("unchecked")
-    private QueryMixin<?> mixin = new QueryMixin();
+    private QueryMixin<?> mixin = new QueryMixin<Void>();
 
     private QCommonPersistence entity = new QCommonPersistence(PathMetadataFactory.forVariable("entity"));
 
     @Test
-    public void Where_Null() {
-        mixin.where((Predicate)null);
+    public void where_null() {
+        mixin.where((Predicate) null);
     }
-    
+
     @Test
-    public void GetJoins_with_condition() {
+    public void getJoins_with_condition() {
         mixin.innerJoin(entity);
         mixin.on(entity.version.isNull(), entity.version.isNotNull());
 
         assertEquals(1, mixin.getMetadata().getJoins().size());
         JoinExpression je = mixin.getMetadata().getJoins().get(0);
         assertEquals(entity, je.getTarget());
-        assertEquals(BooleanExpression.allOf(entity.version.isNull(), entity.version.isNotNull()), je.getCondition());
+        assertEquals(Expressions.allOf(entity.version.isNull(), entity.version.isNotNull()), je.getCondition());
     }
 
     @Test
-    public void GetJoins_no_condition() {
+    public void getJoins_no_condition() {
         mixin.innerJoin(entity);
 
         assertEquals(1, mixin.getMetadata().getJoins().size());
@@ -58,14 +57,14 @@ public void GetJoins_no_condition() {
         assertEquals(entity, je.getTarget());
         assertNull(je.getCondition());
     }
-    
+
     @Test
-    public void InnerJoin() {
+    public void innerJoin() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
         DummyEntity e3 = Alias.alias(DummyEntity.class, "e3");
         DummyEntity e4 = Alias.alias(DummyEntity.class, "e4");
-        
+
         // inner join
         mixin.innerJoin($(e));
         mixin.innerJoin($(e.getOther()),$(e2));
@@ -76,14 +75,14 @@ public void InnerJoin() {
 
         assertEquals(6, mixin.getMetadata().getJoins().size());
     }
-    
+
     @Test
-    public void Join() {
+    public void join() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
         DummyEntity e3 = Alias.alias(DummyEntity.class, "e3");
         DummyEntity e4 = Alias.alias(DummyEntity.class, "e4");
-        
+
         // inner join
         mixin.innerJoin($(e));
         mixin.innerJoin($(e.getOther()),$(e2));
@@ -94,28 +93,28 @@ public void Join() {
 
         assertEquals(6, mixin.getMetadata().getJoins().size());
     }
-    
+
     @Test
-    public void Joins() {
+    public void joins() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
-        
+
         mixin.join($(e));
         mixin.on($(e).isNotNull());
         mixin.join($(e.getOther()),$(e2));
         mixin.on($(e).isNotNull());
-        
+
         assertEquals(2, mixin.getMetadata().getJoins().size());
-        
+
     }
-    
+
     @Test
-    public void LeftJoin() {
+    public void leftJoin() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
         DummyEntity e3 = Alias.alias(DummyEntity.class, "e3");
         DummyEntity e4 = Alias.alias(DummyEntity.class, "e4");
-        
+
         // left join
         mixin.leftJoin($(e));
         mixin.leftJoin($(e.getOther()),$(e2));
@@ -126,9 +125,9 @@ public void LeftJoin() {
 
         assertEquals(6, mixin.getMetadata().getJoins().size());
     }
-    
+
     @Test
-    public void RightJoin() {
+    public void rightJoin() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
         DummyEntity e3 = Alias.alias(DummyEntity.class, "e3");
@@ -145,14 +144,14 @@ public void RightJoin() {
 
         assertEquals(6, mixin.getMetadata().getJoins().size());
     }
-    
+
     @Test
-    public void FullJoin() {
+    public void fullJoin() {
         DummyEntity e = Alias.alias(DummyEntity.class);
         DummyEntity e2 = Alias.alias(DummyEntity.class, "e2");
         DummyEntity e3 = Alias.alias(DummyEntity.class, "e3");
         DummyEntity e4 = Alias.alias(DummyEntity.class, "e4");
-        
+
         // full join
         mixin.fullJoin($(e));
         mixin.fullJoin($(e.getOther()),$(e2));
@@ -163,7 +162,7 @@ public void FullJoin() {
 
         assertEquals(6, mixin.getMetadata().getJoins().size());
     }
-    
+
 
 }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/support/ReplaceVisitorTest.java b/querydsl-core/src/test/java/com/querydsl/core/support/ReplaceVisitorTest.java
new file mode 100644
index 0000000000..fc48da362a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/support/ReplaceVisitorTest.java
@@ -0,0 +1,44 @@
+package com.querydsl.core.support;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class ReplaceVisitorTest {
+
+    private static final ReplaceVisitor<Void> visitor = new ReplaceVisitor<Void>() {
+        public Expression<?> visit(Path<?> expr, @Nullable Void context) {
+            if (expr.getMetadata().isRoot()) {
+                return ExpressionUtils.path(expr.getType(), expr.getMetadata().getName() + "_");
+            } else {
+                return super.visit(expr, context);
+            }
+        }
+    };
+
+    @Test
+    public void operation() {
+        Expression<String> str = Expressions.stringPath(ExpressionUtils.path(Object.class, "customer"), "name");
+        Expression<String> str2 = Expressions.stringPath("str");
+        Expression<String> concat = Expressions.stringOperation(Ops.CONCAT, str, str2);
+        assertEquals("customer.name + str", concat.toString());
+        assertEquals("customer_.name + str_", concat.accept(visitor, null).toString());
+    }
+
+    @Test
+    public void templateExpression() {
+        Expression<String> str = Expressions.stringPath(ExpressionUtils.path(Object.class, "customer"), "name");
+        Expression<String> str2 = Expressions.stringPath("str");
+        Expression<String> concat = Expressions.stringTemplate("{0} + {1}", str, str2);
+        assertEquals("customer.name + str", concat.toString());
+        assertEquals("customer_.name + str_", concat.accept(visitor, null).toString());
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/CUBRID.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/CUBRID.java
new file mode 100644
index 0000000000..1161647a03
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/CUBRID.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface CUBRID extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/DB2.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/DB2.java
new file mode 100644
index 0000000000..3ee6bf54ef
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/DB2.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface DB2 extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Database.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Database.java
new file mode 100644
index 0000000000..e874db1315
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Database.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+/**
+ * {@code Database} is a category for tests that require a connection to a database.
+ */
+public interface Database {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Derby.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Derby.java
new file mode 100644
index 0000000000..923f6d991b
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Derby.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface Derby extends EmbeddedDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/EmbeddedDatabase.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/EmbeddedDatabase.java
new file mode 100644
index 0000000000..c7c3e0430a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/EmbeddedDatabase.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+/**
+ * {@code EmbeddedDatabase} is a category for tests that require access to embeddable
+ * databases such as H2 and HSQL.
+ */
+public interface EmbeddedDatabase extends Database {
+}
diff --git a/querydsl-core/src/test/java/com/mysema/testutil/EmptyStatement.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/testutil/EmptyStatement.java
rename to querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java
index bd3938728b..126f8675bf 100644
--- a/querydsl-core/src/test/java/com/mysema/testutil/EmptyStatement.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.testutil;
+package com.querydsl.core.testutil;
 
 import org.junit.runners.model.Statement;
 
-public class EmptyStatement extends Statement{
+public final class EmptyStatement extends Statement {
 
     public static final Statement DEFAULT = new EmptyStatement();
-    
-    private EmptyStatement() {}
+
+    private EmptyStatement() { }
 
     @Override
     public void evaluate() throws Throwable {
-        
+
     }
 
 }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/ExcludeIn.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/ExcludeIn.java
new file mode 100644
index 0000000000..60a011915a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/ExcludeIn.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.testutil;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface ExcludeIn {
+    /**
+     * @return
+     */
+    com.querydsl.core.Target[] value();
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/ExternalDatabase.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/ExternalDatabase.java
new file mode 100644
index 0000000000..a898c05d45
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/ExternalDatabase.java
@@ -0,0 +1,9 @@
+package com.querydsl.core.testutil;
+
+/**
+ * {@code ExternalDatabase} is a category for tests that require access to databases, such as MySQL or PostgreSQL, that
+ * must be externally configured.
+ */
+public interface ExternalDatabase extends Database {
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Firebird.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Firebird.java
new file mode 100644
index 0000000000..eadca66ab3
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Firebird.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface Firebird extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/H2.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/H2.java
new file mode 100644
index 0000000000..ecc31faca8
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/H2.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface H2 extends EmbeddedDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/HSQLDB.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/HSQLDB.java
new file mode 100644
index 0000000000..29be35d70f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/HSQLDB.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface HSQLDB extends EmbeddedDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/IncludeIn.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/IncludeIn.java
new file mode 100644
index 0000000000..92e72d498e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/IncludeIn.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.testutil;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface IncludeIn {
+    /**
+     * @return
+     */
+    com.querydsl.core.Target[] value();
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/MongoDB.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/MongoDB.java
new file mode 100644
index 0000000000..be7e8cbd5b
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/MongoDB.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface MongoDB extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/MySQL.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/MySQL.java
new file mode 100644
index 0000000000..5362be1a6a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/MySQL.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface MySQL extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Oracle.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Oracle.java
new file mode 100644
index 0000000000..157157b809
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Oracle.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface Oracle extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java
new file mode 100644
index 0000000000..a746c911c4
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java
@@ -0,0 +1,40 @@
+package com.querydsl.core.testutil;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.runners.Parameterized;
+import org.junit.runners.model.RunnerScheduler;
+
+public class Parallelized extends Parameterized {
+
+    public Parallelized(Class<?> klass) throws Throwable {
+        super(klass);
+        setScheduler(new ThreadPoolScheduler());
+    }
+
+    private static class ThreadPoolScheduler implements RunnerScheduler {
+        private ExecutorService executor;
+
+        ThreadPoolScheduler() {
+            int numThreads = Runtime.getRuntime().availableProcessors();
+            executor = Executors.newFixedThreadPool(numThreads);
+        }
+
+        @Override
+        public void finished() {
+            executor.shutdown();
+            try {
+                executor.awaitTermination(10, TimeUnit.MINUTES);
+            } catch (InterruptedException exc) {
+                throw new RuntimeException(exc);
+            }
+        }
+
+        @Override
+        public void schedule(Runnable childStatement) {
+            executor.submit(childStatement);
+        }
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Performance.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Performance.java
new file mode 100644
index 0000000000..623c76bbf9
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Performance.java
@@ -0,0 +1,8 @@
+package com.querydsl.core.testutil;
+
+/**
+ * Performance is used as a test category to make performance tests
+ */
+public interface Performance {
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/PostgreSQL.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/PostgreSQL.java
new file mode 100644
index 0000000000..5a9e90d8ff
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/PostgreSQL.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface PostgreSQL extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/ReportingOnly.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/ReportingOnly.java
new file mode 100644
index 0000000000..a375cd251d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/ReportingOnly.java
@@ -0,0 +1,7 @@
+package com.querydsl.core.testutil;
+
+/**
+ * ReportingOnly is used as a test category to make reporting only tests
+ */
+public interface ReportingOnly {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLServer.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLServer.java
new file mode 100644
index 0000000000..0d2b7953d5
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLServer.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface SQLServer extends ExternalDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLite.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLite.java
new file mode 100644
index 0000000000..fe02bcb9e5
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/SQLite.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+public interface SQLite extends EmbeddedDatabase {
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/Serialization.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/Serialization.java
new file mode 100644
index 0000000000..acfb362353
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/Serialization.java
@@ -0,0 +1,28 @@
+package com.querydsl.core.testutil;
+
+import java.io.*;
+
+public final class Serialization {
+
+    private Serialization() { }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T serialize(T obj) {
+        try {
+            // serialize
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream out = new ObjectOutputStream(baos);
+            out.writeObject(obj);
+            out.close();
+
+            // deserialize
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            ObjectInputStream in = new ObjectInputStream(bais);
+            T rv = (T) in.readObject();
+            in.close();
+            return rv;
+        } catch (IOException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/SlowTest.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/SlowTest.java
new file mode 100644
index 0000000000..ddb289950d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/SlowTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.core.testutil;
+
+/**
+ * {@code SlowTest} is a test category for really slow tests.
+ */
+public interface SlowTest {
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/ThreadSafety.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/ThreadSafety.java
new file mode 100644
index 0000000000..db51133f2a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/ThreadSafety.java
@@ -0,0 +1,35 @@
+package com.querydsl.core.testutil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.*;
+
+public final class ThreadSafety {
+
+    private ThreadSafety() { }
+
+    public static void check(Runnable... runnables) {
+        Collection<Callable<Object>> callables = new ArrayList<>(runnables.length);
+        ExecutorService executor = Executors.newFixedThreadPool(runnables.length);
+
+        for (Runnable runnable : runnables) {
+            callables.add(Executors.callable(runnable));
+        }
+        List<Future<Object>> result;
+        try {
+            result = executor.invokeAll(callables);
+        } catch (InterruptedException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        for (Future<Object> each : result) {
+            try {
+                // all need to complete successfully
+                each.get();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java b/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java
new file mode 100644
index 0000000000..6c231b13c9
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.testutil;
+
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.RunListener;
+
+/**
+ *
+ * @author Shredder121
+ */
+public class TravisFoldListener extends RunListener {
+
+    private static final long ID = System.currentTimeMillis();
+
+    @Override
+    public void testRunStarted(Description description) throws Exception {
+        System.out.println("travis_fold:start:tests" + ID);
+        System.out.println("Running tests");
+    }
+
+    @Override
+    public void testRunFinished(Result result) throws Exception {
+        System.out.println("travis_fold:end:tests" + ID);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/Concatenation.java b/querydsl-core/src/test/java/com/querydsl/core/types/Concatenation.java
similarity index 80%
rename from querydsl-core/src/test/java/com/mysema/query/types/Concatenation.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/Concatenation.java
index b8518fc86c..6b434706b0 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/Concatenation.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/Concatenation.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
+
+import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Arrays;
 import java.util.List;
@@ -20,18 +22,20 @@
  * @author tiwe
  *
  */
-public class Concatenation extends ExpressionBase<String> implements FactoryExpression<String>{
+public class Concatenation extends FactoryExpressionBase<String> {
 
     private static final long serialVersionUID = -355693583588722395L;
 
+    @Unmodifiable
     private final List<Expression<?>> args;
-    
+
     public Concatenation(Expression<?>... args) {
         super(String.class);
-        this.args = Arrays.<Expression<?>>asList(args);
+        this.args = Arrays.asList(args);
     }
-    
+
     @Override
+    @Unmodifiable
     public List<Expression<?>> getArgs() {
         return args;
     }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ConstantImplTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ConstantImplTest.java
new file mode 100644
index 0000000000..bb777d2be1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ConstantImplTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class ConstantImplTest {
+
+    @Test
+    public void create() {
+        assertNotNull(ConstantImpl.create(true));
+        assertNotNull(ConstantImpl.create((byte) 1));
+        assertNotNull(ConstantImpl.create(ConstantImplTest.class));
+        assertNotNull(ConstantImpl.create(1));
+        assertNotNull(ConstantImpl.create(1L));
+        assertNotNull(ConstantImpl.create((short) 1));
+        assertNotNull(ConstantImpl.create("x"));
+//        assertNotNull(ConstantImpl.create("x",true));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ConstructorExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ConstructorExpressionTest.java
new file mode 100644
index 0000000000..c9b7b60261
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ConstructorExpressionTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.testutil.ThreadSafety;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class ConstructorExpressionTest {
+
+    StringPath str1 = Expressions.stringPath("str1");
+    StringPath str2 = Expressions.stringPath("str2");
+    StringPath str3 = Expressions.stringPath("str3");
+    Concatenation concat = new Concatenation(str1, str2);
+
+    @Test
+    public void constructor() {
+        Expression<Long> longVal = ConstantImpl.create(1L);
+        Expression<String> stringVal = ConstantImpl.create("");
+        ProjectionExample instance = new ConstructorExpression<ProjectionExample>(ProjectionExample.class,
+                new Class<?>[]{long.class, String.class}, longVal, stringVal).newInstance(0L, "");
+        assertNotNull(instance);
+        assertEquals((Long) 0L, instance.id);
+        assertTrue(instance.text.isEmpty());
+    }
+
+    @Test
+    public void create() {
+        Expression<Long> longVal = ConstantImpl.create(1L);
+        Expression<String> stringVal = ConstantImpl.create("");
+        assertNotNull(Projections.constructor(ProjectionExample.class, longVal, stringVal).newInstance(0L, ""));
+    }
+
+    @Test
+    public void create2() {
+        Expression<Long> longVal = ConstantImpl.create(1L);
+        assertNotNull(Projections.constructor(ProjectionExample.class, longVal).newInstance(0L));
+    }
+
+    @Test
+    public void create3() {
+        assertNotNull(Projections.constructor(ProjectionExample.class).newInstance());
+    }
+
+    @Test
+    public void create4() {
+        Expression<String> stringVal = ConstantImpl.create("");
+        assertNotNull(Projections.constructor(ProjectionExample.class, stringVal).newInstance(""));
+    }
+
+    @Test
+    public void createNullPrimitive() {
+        Expression<Boolean> booleanVal = ConstantImpl.create(false);
+        Expression<Byte> byteVal = ConstantImpl.create((byte) 0);
+        Expression<Character> charVal = ConstantImpl.create('\0');
+        Expression<Short> shortVal = ConstantImpl.create((short) 0);
+        Expression<Integer> intVal = ConstantImpl.create(0);
+        Expression<Long> longVal = ConstantImpl.create(0L);
+        Expression<Float> floatVal = ConstantImpl.create(0.0F);
+        Expression<Double> doubleVal = ConstantImpl.create(0.0);
+        ProjectionExample instance = Projections.constructor(ProjectionExample.class,
+                booleanVal, byteVal,
+                charVal, shortVal,
+                intVal, longVal,
+                floatVal, doubleVal)
+                .newInstance(null, null,
+                        null, null,
+                        null, null,
+                        null, null);
+        assertNotNull(instance);
+    }
+
+    @Test
+    public void factoryExpression_has_right_args() {
+        FactoryExpression<ProjectionExample> constructor = Projections.constructor(ProjectionExample.class, concat);
+        constructor = FactoryExpressionUtils.wrap(constructor);
+        assertEquals(Arrays.asList(str1, str2), constructor.getArgs());
+    }
+
+    @Test
+    public void factoryExpression_newInstance() {
+        FactoryExpression<ProjectionExample> constructor = Projections.constructor(ProjectionExample.class, concat);
+        constructor = FactoryExpressionUtils.wrap(constructor);
+        ProjectionExample projection = constructor.newInstance("12", "34");
+        assertEquals("1234", projection.text);
+    }
+
+    @Test
+    public void serializability() {
+        ConstructorExpression<String> expr = Serialization.serialize(Projections.constructor(String.class));
+        assertEquals("", expr.newInstance());
+    }
+
+    @Test
+    public void threadSafety() {
+        final ConstructorExpression<String> expr = Projections.constructor(String.class);
+        Runnable invoker = new Runnable() {
+            @Override
+            public void run() {
+                expr.newInstance();
+            }
+        };
+        ThreadSafety.check(invoker, invoker);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/DeepPopulationTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/DeepPopulationTest.java
similarity index 79%
rename from querydsl-core/src/test/java/com/mysema/query/types/DeepPopulationTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/DeepPopulationTest.java
index 5f53e2227a..42d1f37a85 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/DeepPopulationTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/DeepPopulationTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,8 +19,9 @@
 
 import org.junit.Test;
 
-import com.mysema.query.Tuple;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
 
 public class DeepPopulationTest {
 
@@ -61,11 +62,11 @@ public void setId(String id) {
     }
 
     @Test
-    public void Deep_Population_Via_QBean() {
-        StringPath name = new StringPath("name");
-        StringPath id = new StringPath("id");
+    public void deep_population_via_qBean() {
+        StringPath name = Expressions.stringPath("name");
+        StringPath id = Expressions.stringPath("id");
         QBean<Entity2> entity2Bean = new QBean<Entity2>(Entity2.class, name, id);
-        QBean<Entity1> entity1Bean = new QBean<Entity1>(Entity1.class, 
+        QBean<Entity1> entity1Bean = new QBean<Entity1>(Entity1.class,
                 Collections.singletonMap("entity2", entity2Bean));
 
         Entity1 entity1 = FactoryExpressionUtils.wrap(entity1Bean).newInstance("nameX","idX");
@@ -74,9 +75,9 @@ public void Deep_Population_Via_QBean() {
     }
 
     @Test
-    public void Deep_Population_Via_QTuple() {
-        StringPath name = new StringPath("name");
-        StringPath id = new StringPath("id");
+    public void deep_population_via_qTuple() {
+        StringPath name = Expressions.stringPath("name");
+        StringPath id = Expressions.stringPath("id");
         QBean<Entity2> entity2Bean = new QBean<Entity2>(Entity2.class, name, id);
         QTuple tupleExpr = new QTuple(entity2Bean);
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionSerializationTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionSerializationTest.java
new file mode 100644
index 0000000000..91bc12b55a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionSerializationTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.core.types;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class ExpressionSerializationTest {
+
+    @Test
+    public void serialize() throws ClassNotFoundException, IOException {
+        QTuple e = new QTuple(Expressions.stringPath("x"), Expressions.numberPath(Integer.class, "y"));
+        serialize(e);
+        serialize(e.newInstance("a",1));
+    }
+
+    private void serialize(Object obj) throws IOException, ClassNotFoundException {
+        Object obj2 = Serialization.serialize(obj);
+        obj2.hashCode();
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionUtilsTest.java
new file mode 100644
index 0000000000..b6ba8427e3
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressionUtilsTest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class ExpressionUtilsTest {
+
+    private static final StringPath str = Expressions.stringPath("str");
+
+    private static final StringPath str2 = Expressions.stringPath("str2");
+
+    @Test
+    public void likeToRegex() {
+        assertEquals(".*", regex(ConstantImpl.create("%")));
+        assertEquals("^abc.*", regex(ConstantImpl.create("abc%")));
+        assertEquals(".*abc$", regex(ConstantImpl.create("%abc")));
+        assertEquals("^.$",  regex(ConstantImpl.create("_")));
+
+        StringPath path = Expressions.stringPath("path");
+        assertEquals("path + .*", regex(path.append("%")));
+        assertEquals(".* + path", regex(path.prepend("%")));
+        assertEquals("path + .", regex(path.append("_")));
+        assertEquals(". + path", regex(path.prepend("_")));
+    }
+
+    @Test
+    @Ignore
+    public void likeToRegexSpeed() {
+        // 4570
+        StringPath path = Expressions.stringPath("path");
+        final int iterations = 1000000;
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            regex(ConstantImpl.create("%"));
+            regex(ConstantImpl.create("abc%"));
+            regex(ConstantImpl.create("%abc"));
+            regex(ConstantImpl.create("_"));
+            regex(path.append("%"));
+            regex(path.prepend("%"));
+            regex(path.append("_"));
+            regex(path.prepend("_"));
+        }
+        long duration = System.currentTimeMillis() - start;
+        System.err.println(duration);
+    }
+
+    @Test
+    public void likeToRegex_escape() {
+        assertEquals("^\\.$",  regex(ConstantImpl.create(".")));
+    }
+
+    @Test
+    public void regexToLike() {
+        assertEquals("%", like(ConstantImpl.create(".*")));
+        assertEquals("_",  like(ConstantImpl.create(".")));
+        assertEquals(".", like(ConstantImpl.create("\\.")));
+
+        StringPath path = Expressions.stringPath("path");
+        assertEquals("path + %", like(path.append(".*")));
+        assertEquals("% + path", like(path.prepend(".*")));
+        assertEquals("path + _", like(path.append(".")));
+        assertEquals("_ + path", like(path.prepend(".")));
+    }
+
+    @Test(expected = QueryException.class)
+    public void regexToLike_fail() {
+        like(ConstantImpl.create("a*"));
+    }
+
+    @Test(expected = QueryException.class)
+    public void regexToLike_fail2() {
+        like(ConstantImpl.create("\\d"));
+    }
+
+    @Test(expected = QueryException.class)
+    public void regexToLike_fail3() {
+        like(ConstantImpl.create("[ab]"));
+    }
+
+    @Test
+    @Ignore
+    public void regexToLikeSpeed() {
+        // 3255
+        StringPath path = Expressions.stringPath("path");
+        final int iterations = 1000000;
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            like(ConstantImpl.create(".*"));
+            like(ConstantImpl.create("."));
+            like(path.append(".*"));
+            like(path.prepend(".*"));
+            like(path.append("."));
+            like(path.prepend("."));
+        }
+        long duration = System.currentTimeMillis() - start;
+        System.err.println(duration);
+    }
+
+    private String regex(Expression<String> expr) {
+        return ExpressionUtils.likeToRegex(expr).toString();
+    }
+
+    private String like(Expression<String> expr) {
+        return ExpressionUtils.regexToLike(expr).toString();
+    }
+
+    @Test
+    public void count() {
+        assertEquals("count(str)", ExpressionUtils.count(str).toString());
+    }
+
+    @Test
+    public void eqConst() {
+        assertEquals("str = X", ExpressionUtils.eqConst(str, "X").toString());
+    }
+
+    @Test
+    public void eq() {
+        assertEquals("str = str2", ExpressionUtils.eq(str, str2).toString());
+    }
+
+    @Test
+    public void in() {
+        assertEquals("str in [a, b, c]", ExpressionUtils.in(str, Arrays.asList("a","b","c")).toString());
+    }
+
+    @Test
+    public void in_subQuery() {
+        String s = ExpressionUtils.in(str, new SubQueryExpressionImpl<String>(String.class, new DefaultQueryMetadata())).toString();
+        assertTrue(s.startsWith("str in com.querydsl.core.DefaultQueryMetadata@c"));
+    }
+
+    @Test
+    public void inAny() {
+        Collection<List<String>> of = Arrays.asList(Arrays.asList("a", "b", "c"), Arrays.asList("d", "e", "f"));
+        assertEquals("str in [a, b, c] || str in [d, e, f]",
+                ExpressionUtils.inAny(str, of).toString());
+    }
+
+    @Test
+    public void isNull() {
+        assertEquals("str is null", ExpressionUtils.isNull(str).toString());
+    }
+
+    @Test
+    public void isNotNull() {
+        assertEquals("str is not null", ExpressionUtils.isNotNull(str).toString());
+    }
+
+    @Test
+    public void neConst() {
+        assertEquals("str != X", ExpressionUtils.neConst(str, "X").toString());
+    }
+
+    @Test
+    public void ne() {
+        assertEquals("str != str2", ExpressionUtils.ne(str, str2).toString());
+    }
+
+    @Test
+    public void notInAny() {
+        Collection<List<String>> of = Arrays.asList(Arrays.asList("a", "b", "c"), Arrays.asList("d", "e", "f"));
+        assertEquals("str not in [a, b, c] && str not in [d, e, f]",
+                ExpressionUtils.notInAny(str, of).toString());
+    }
+
+    @Test
+    public void notIn_subQuery() {
+        String s = ExpressionUtils.notIn(str, new SubQueryExpressionImpl<String>(String.class, new DefaultQueryMetadata())).toString();
+        assertTrue(s.startsWith("str not in com.querydsl.core.DefaultQueryMetadata@c"));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ExpressivityTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressivityTest.java
similarity index 89%
rename from querydsl-core/src/test/java/com/mysema/query/types/ExpressivityTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/ExpressivityTest.java
index e102ebd967..085a0648c3 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/ExpressivityTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ExpressivityTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -6,46 +6,35 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.query.support.DetachableMixin;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.MathExpressions;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.StringExpressions;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.dsl.*;
 
 public class ExpressivityTest {
-    
+
     private NumberExpression<Integer> num;
-    
+
     private StringExpression str;
-    
+
     private DateExpression<Date> date;
-    
-    private DetachableMixin sub;
-    
+
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Before
     public void setUp() {
-        num = new NumberPath<Integer>(Integer.class, "num");
-        str = new StringPath("str");
-        date = new DatePath<Date>(Date.class, "date");
-        QueryMixin query = new QueryMixin();
+        num = Expressions.numberPath(Integer.class, "num");
+        str = Expressions.stringPath("str");
+        date = Expressions.datePath(Date.class, "date");
+        QueryMixin<?> query = new QueryMixin<Void>();
         query.from(num, str);
-        sub = new DetachableMixin(query);
+        // TODO sub
     }
-    
+
     @Test
     public void test() {
         //Field<T>               abs()
         num.abs();
         //Field<BigDecimal>      acos()
-        MathExpressions.acos(num);        
-        //Field<T>               add(Field<?> value)        
+        MathExpressions.acos(num);
+        //Field<T>               add(Field<?> value)
         num.add(num);
         //Field<T>               add(Number value)
         num.add(1);
@@ -54,13 +43,13 @@ public void test() {
         //SortField<T>           asc()
         num.asc();
         //Field<Integer>         ascii()
-        
+
         //Field<BigDecimal>      asin()
         MathExpressions.asin(num);
         //Field<BigDecimal>      atan()
         MathExpressions.atan(num);
         //Field<BigDecimal>      atan2(Field<? extends Number> y)
-    
+
         //Field<BigDecimal>      atan2(Number y)
 
         //Field<BigDecimal>      avg()
@@ -71,22 +60,22 @@ public void test() {
         num.between(num, num);
         //Condition              between(T minValue, T maxValue)
         num.between(1,10);
-        // bitAnd        
-        
+        // bitAnd
+
         //Field<Integer>         bitLength()
-        
+
         // bitNand
-        
+
         // bitNor
-        
+
         // bitOr
-        
+
         // bitXnor
-        
+
         // bitXor
 
         //<Z> Field<Z>           cast(Class<? extends Z> type)
-        num.castToNum(Long.class);        
+        num.castToNum(Long.class);
         //<Z> Field<Z>           ast(DataType<Z> type)
 
         //<Z> Field<Z>           cast(Field<Z> field)
@@ -128,9 +117,9 @@ public void test() {
         // currentTimestamp
         Expressions.currentTimestamp();
         // currval
-        
+
         // dateadd
-        
+
         // dateDiff
         // TODO
         //<Z> Field<Z>           decode(Field<T> search, Field<Z> result)
@@ -141,10 +130,10 @@ public void test() {
 
         //<Z> Field<Z>           decode(T search, Z result, Object... more)
 
-        //Field<BigDecimal>      deg() 
+        //Field<BigDecimal>      deg()
         MathExpressions.degrees(num);
         //SortField<T>           desc()
-        num.desc();        
+        num.desc();
         //Field<T>               div(Field<? extends Number> value)
         num.divide(num);
         //Field<T>               div(Number value)
@@ -156,21 +145,21 @@ public void test() {
         //Condition              equal(Field<T> field)
         num.eq(1);
         //Condition              equal(Select<?> query)
-        num.eq(sub.unique(num));
+        //num.eq(sub.unique(num));
         //Condition              equal(T value)
         num.eq(num);
         //Condition              equalAll(Field<T[]> array)
 
         //Condition              equalAll(Select<?> query)
-        num.eqAll(sub.list(num));
+        //num.eqAll(sub.select(num));
         //Condition              equalAll(T... array)
 
         //Condition              equalAny(Field<T[]> array) -> in
-        
+
         //Condition              equalAny(Select<?> query) -> in
-        num.eqAny(sub.list(num));
+        //num.eqAny(sub.select(num));
         //Condition              equalAny(T... array) -> in
-        
+
         //Condition              equalIgnoreCase(Field<String> value)
         str.equalsIgnoreCase(str);
         //Condition              equalIgnoreCase(String value)
@@ -190,37 +179,37 @@ public void test() {
         //Condition              greaterOrEqual(Field<T> field)
         num.goe(num);
         //Condition              greaterOrEqual(Select<?> query)
-        num.goe(sub.unique(num));
+        //num.goe(sub.unique(num));
         //Condition              greaterOrEqual(T value)
         num.goe(1);
         //Condition              greaterOrEqualAll(Field<T[]> array)
 
         //Condition              greaterOrEqualAll(Select<?> query)
-        num.goeAll(sub.list(num));
+        //num.goeAll(sub.select(num));
         //Condition              greaterOrEqualAll(T... array)
 
         //Condition              greaterOrEqualAny(Field<T[]> array)
 
         //Condition              greaterOrEqualAny(Select<?> query)
-        num.goeAny(sub.list(num));
+        //num.goeAny(sub.select(num));
         //Condition              greaterOrEqualAny(T... array)
 
         //Condition              greaterThan(Field<T> field)
         num.gt(num);
         //Condition              greaterThan(Select<?> query)
-        num.gt(sub.unique(num));
+        //num.gt(sub.select(num));
         //Condition              greaterThan(T value)
         num.gt(1);
         //Condition              greaterThanAll(Field<T[]> array)
 
         //Condition              greaterThanAll(Select<?> query)
-        num.gtAll(sub.list(num));
+        //num.gtAll(sub.select(num));
         //Condition              greaterThanAll(T... array)
 
         //Condition              greaterThanAny(Field<T[]> array)
 
         //Condition              greaterThanAny(Select<?> query)
-        num.gtAny(sub.list(num));
+        //num.gtAny(sub.select(num));
         //Condition              greaterThanAny(T... array)
 
         //Field<T>               greatest(Field<?>... others)
@@ -230,9 +219,9 @@ public void test() {
         //Condition              in(Collection<T> values)
         num.in(Arrays.asList(1,2,3));
         //Condition              in(Field<?>... values)
-        
+
         //Condition              in(Select<?> query)
-        num.in(sub.list(num));
+        //num.in(sub.select(num));
         //Condition              in(T... values)
         num.in(1,2,3);
         //Condition              isFalse()
@@ -272,37 +261,37 @@ public void test() {
         //Condition              lessOrEqual(Field<T> field)
         num.loe(num);
         //Condition              lessOrEqual(Select<?> query)
-        num.loe(sub.unique(num));
+        //num.loe(sub.unique(num));
         //Condition              lessOrEqual(T value)
         num.loe(1);
         //Condition              lessOrEqualAll(Field<T[]> array)
 
         //Condition              lessOrEqualAll(Select<?> query)
-        num.loeAll(sub.list(num));
+        //num.loeAll(sub.select(num));
         //Condition              lessOrEqualAll(T... array)
 
         //Condition              lessOrEqualAny(Field<T[]> array)
 
         //Condition              lessOrEqualAny(Select<?> query)
-        num.loeAny(sub.list(num));
+        //num.loeAny(sub.select(num));
         //Condition              lessOrEqualAny(T... array)
 
         //Condition              lessThan(Field<T> field)
         num.lt(num);
         //Condition              lessThan(Select<?> query)
-        num.lt(sub.unique(num));
+        //num.lt(sub.select(num));
         //Condition              lessThan(T value)
         num.lt(1);
         //Condition              lessThanAll(Field<T[]> array)
 
         //Condition              lessThanAll(Select<?> query)
-        num.ltAll(sub.list(num));
+        //num.ltAll(sub.select(num));
         //Condition              lessThanAll(T... array)
 
         //Condition              lessThanAny(Field<T[]> array)
 
         //Condition              lessThanAny(Select<?> query)
-        num.ltAny(sub.list(num));
+        //num.ltAny(sub.select(num));
         //Condition              lessThanAny(T... array)
 
         //Condition              like(Field<String> value)
@@ -356,19 +345,19 @@ public void test() {
         //Condition              notEqual(Field<T> field)
         num.ne(num);
         //Condition              notEqual(Select<?> query)
-        num.ne(sub.unique(num));
+        //num.ne(sub.select(num));
         //Condition              notEqual(T value)
         num.ne(1);
         //Condition              notEqualAll(Field<T[]> array)
 
         //Condition              notEqualAll(Select<?> query)
-        num.neAll(sub.list(num));
+        //num.neAll(sub.select(num));
         //Condition              notEqualAll(T... array)
 
         //Condition              notEqualAny(Field<T[]> array) -> notIn
 
         //Condition              notEqualAny(Select<?> query) -> notIn
-        num.neAny(sub.list(num));
+        //num.neAny(sub.select(num));
         //Condition              notEqualAny(T... array) -> notIn
 
         //Condition              notEqualIgnoreCase(Field<String> value)
@@ -378,9 +367,9 @@ public void test() {
         //Condition              notIn(Collection<T> values)
         num.notIn(Arrays.asList(1,2,3));
         //Condition              notIn(Field<?>... values)
-        
+
         //Condition              notIn(Select<?> query)
-        num.notIn(sub.list(num));
+        //num.notIn(sub.select(num));
         //Condition              notIn(T... values)
         num.notIn(1, 2, 3);
         //Condition              notLike(Field<String> value)
@@ -392,7 +381,7 @@ public void test() {
         //Condition              notLike(String value, char escape)
         str.notLike("a%",'!');
         //Field<T>               nullif(Field<T> other)
-        
+
         //Field<T>               nullif(T other)
 
         //Field<T>               nvl(Field<T> defaultValue)
@@ -406,12 +395,12 @@ public void test() {
         //Field<Integer>         octetLength()
 
         //Field<Integer>         position(Field<String> search)
-        str.locate(str);        
+        str.locate(str);
         //Field<Integer>         position(String search)
         str.locate("a");
         //Field<BigDecimal>      power(Number exponent)
         MathExpressions.power(num, 4);
-        //Field<BigDecimal>      rad() 
+        //Field<BigDecimal>      rad()
         MathExpressions.radians(num);
         //Field<String>          repeat(Field<? extends Number> count)
 
@@ -440,9 +429,9 @@ public void test() {
         //Field<String>          rtrim()
         StringExpressions.rtrim(str);
         // shl (bitwise shift left)
-        
+
         // shr (bitwise shift right)
-        
+
         //Field<Integer>         sign()
         MathExpressions.sign(num);
         //Field<BigDecimal>      sin()
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/JavaTemplatesTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/JavaTemplatesTest.java
new file mode 100644
index 0000000000..50f08e1718
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/JavaTemplatesTest.java
@@ -0,0 +1,59 @@
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class JavaTemplatesTest {
+
+    private Templates templates = JavaTemplates.DEFAULT;
+
+    @Test
+    public void precedence() {
+        // postfix    expr++ expr--
+        // unary    ++expr --expr +expr -expr ~ !
+        // multiplicative    * / %
+        // additive    + -
+        // shift    << >> >>>
+        // relational    < > <= >= instanceof
+        // equality    == !=
+        // bitwise AND    &
+        // bitwise exclusive OR    ^
+        // bitwise inclusive OR    |
+        // logical AND    &&
+        // logical OR    ||
+        // ternary    ? :
+        // assignment    = += -= *= /= %= &= ^= |= <<= >>= >>>=
+
+        int p1 = getPrecedence(Ops.NOT);
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        int p4 = getPrecedence(Ops.LT, Ops.GT, Ops.GOE, Ops.LOE, Ops.BETWEEN, Ops.INSTANCE_OF);
+        int p5 = getPrecedence(Ops.EQ, Ops.NE);
+        int p6 = getPrecedence(Ops.AND);
+        int p7 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+    }
+
+    @Test
+    public void generic_precedence() {
+        TemplatesTestUtils.testPrecedence(JavaTemplates.DEFAULT);
+    }
+
+    protected int getPrecedence(Operator... ops) {
+        int precedence = templates.getPrecedence(ops[0]);
+        for (int i = 1; i < ops.length; i++) {
+            assertEquals(ops[i].name(), precedence, templates.getPrecedence(ops[i]));
+        }
+        return precedence;
+    }
+
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java
new file mode 100644
index 0000000000..68b32df64d
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/MappingProjectionTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class MappingProjectionTest {
+
+    StringPath str1 = Expressions.stringPath("str1");
+    StringPath str2 = Expressions.stringPath("str2");
+
+    @SuppressWarnings("serial")
+    @Test
+    public void two_args() {
+        MappingProjection<Pair<String,String>> mapping = new MappingProjection<Pair<String,String>>(Pair.class, str1, str2) {
+            @Override
+            protected Pair<String, String> map(Tuple row) {
+                return Pair.of(row.get(str1), row.get(str2));
+            }
+        };
+
+        Pair<String, String> pair = mapping.newInstance("1", "2");
+        assertEquals("1", pair.getFirst());
+        assertEquals("2", pair.getSecond());
+    }
+
+    @SuppressWarnings("serial")
+    @Test
+    public void single_arg() {
+        MappingProjection<String> mapping = new MappingProjection<String>(String.class, str1) {
+            @Override
+            protected String map(Tuple row) {
+                return row.get(str1);
+            }
+        };
+
+        assertEquals("1", mapping.newInstance("1"));
+    }
+
+    @Test
+    public void distinct_expressions() {
+        MappingProjection<Pair<String,String>> mapping = new MappingProjection<Pair<String,String>>(Pair.class, str1, str1) {
+            @Override
+            protected Pair<String, String> map(Tuple row) {
+                return Pair.of(row.get(str1), row.get(str1));
+            }
+        };
+
+        assertEquals(1, mapping.getArgs().size());
+        assertEquals(Pair.of("1", "1"), mapping.newInstance("1"));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/NestedExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/NestedExpressionTest.java
new file mode 100644
index 0000000000..5b749b29cd
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/NestedExpressionTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class NestedExpressionTest {
+
+    StringPath str1 = Expressions.stringPath("str1");
+    StringPath str2 = Expressions.stringPath("str2");
+    StringPath str3 = Expressions.stringPath("str3");
+    StringPath str4 = Expressions.stringPath("str3");
+
+    Concatenation concat1 = new Concatenation(new Concatenation(str1, str2), str3);
+    Concatenation concat2 = new Concatenation(new Concatenation(str1, new Concatenation(str2, str3)), str4);
+
+    @Test
+    public void wrapped_projection_has_right_arguments() {
+        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat1);
+        assertEquals(Arrays.asList(str1, str2, str3), wrapped.getArgs());
+    }
+
+    @Test
+    public void wrapped_projection_compresses_projection() {
+        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat1);
+        assertEquals("123", wrapped.newInstance("1","2","3"));
+    }
+
+    @Test
+    public void deeply_wrapped_projection_has_right_arguments() {
+        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat2);
+        assertEquals(Arrays.asList(str1, str2, str3, str4), wrapped.getArgs());
+    }
+
+    @Test
+    public void deeply_wrapped_projection_compresses_projection() {
+        FactoryExpression<String> wrapped = FactoryExpressionUtils.wrap(concat2);
+        assertEquals("1234", wrapped.newInstance("1","2","3","4"));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ParamTest.java
similarity index 81%
rename from querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/ParamTest.java
index 93077f1c00..44176f71fd 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ParamTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.Param;
+import com.querydsl.core.types.dsl.Param;
 
 public class ParamTest {
 
@@ -29,20 +30,20 @@ public class ParamTest {
     Param<String> param4 = new Param<String>(String.class);
 
     @Test
-    public void Identity() {
+    public void identity() {
         assertEquals(param11, param12);
         assertFalse(param11.equals(param2));
         assertFalse(param11.equals(param3));
         assertFalse(param11.equals(param4));
     }
-    
+
     @Test
-    public void Anon() {
-        System.out.println(param4.getName());
+    public void anon() {
+        assertNotNull(param4.getName());
     }
 
     @Test
-    public void GetNotSetMessage() {
+    public void getNotSetMessage() {
         assertEquals("The parameter param1 needs to be set", param11.getNotSetMessage());
         assertEquals("A parameter of type java.lang.String was not set", param4.getNotSetMessage());
     }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/PredicateOperationTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/PredicateOperationTest.java
new file mode 100644
index 0000000000..55ba7c2709
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/PredicateOperationTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class PredicateOperationTest {
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void not() {
+        Path<?> o1 = ExpressionUtils.path(Object.class, "o1");
+        Path<?> o2 = ExpressionUtils.path(Object.class, "o2");
+        PredicateOperation template = ExpressionUtils.predicate(Ops.EQ, o1, o2);
+        assertEquals("!(o1 = o2)", template.not().toString());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/PredicateTemplateTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/PredicateTemplateTest.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/types/PredicateTemplateTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/PredicateTemplateTest.java
index 2a883fdada..0f87b992a3 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/PredicateTemplateTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/PredicateTemplateTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,8 +20,8 @@
 public class PredicateTemplateTest {
 
     @Test
-    public void Not() {
-        PredicateTemplate template = new PredicateTemplate("XXX");
+    public void not() {
+        PredicateTemplate template = ExpressionUtils.predicateTemplate("XXX");
         assertEquals("!XXX", template.not().toString());
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ProjectionExample.java b/querydsl-core/src/test/java/com/querydsl/core/types/ProjectionExample.java
similarity index 92%
rename from querydsl-core/src/test/java/com/mysema/query/types/ProjectionExample.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/ProjectionExample.java
index 8fd22a767c..76eb68d562 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/ProjectionExample.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ProjectionExample.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 public class ProjectionExample {
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ProjectionsTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ProjectionsTest.java
new file mode 100644
index 0000000000..623aece3f0
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ProjectionsTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.QBeanPropertyTest.Entity;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class ProjectionsTest {
+
+    public static class VarArgs {
+        String[] args;
+
+        public VarArgs(String... strs) {
+            args = strs;
+        }
+    }
+
+    public static class VarArgs2 {
+        String arg;
+        String[] args;
+
+        public VarArgs2(String s, String... strs) {
+            arg = s;
+            args = strs;
+        }
+    }
+
+    public static class Entity1 {
+        String arg1, arg2;
+
+        public Entity1(String arg1, String arg2) {
+            this.arg1 = arg1;
+            this.arg2 = arg2;
+        }
+    }
+
+    public static class Entity2 {
+        String arg1;
+        Entity1 entity;
+
+        public Entity2(String arg1, Entity1 entity) {
+            this.arg1 = arg1;
+            this.entity = entity;
+        }
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void array() {
+        FactoryExpression<String[]> expr = Projections.array(String[].class,
+                ExpressionUtils.path(String.class, "p1"), ExpressionUtils.path(String.class, "p2"));
+        assertEquals(String[].class, expr.newInstance("1", "2").getClass());
+    }
+
+    @Test
+    public void beanClassOfTExpressionOfQArray() {
+        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
+        QBean<Entity> beanProjection = Projections.bean(Entity.class,
+                entity.getNumber("cId", Integer.class),
+                entity.getNumber("eId", Integer.class));
+
+        assertEquals(Entity.class, beanProjection.newInstance(1, 2).getClass());
+    }
+
+    @Test
+    public void constructor() {
+        Expression<Long> longVal = ConstantImpl.create(1L);
+        Expression<String> stringVal = ConstantImpl.create("");
+        assertEquals(ProjectionExample.class, Projections.constructor(ProjectionExample.class, longVal, stringVal)
+                .newInstance(0L, "").getClass());
+    }
+
+    @Test
+    public void constructor_varArgs() {
+        Expression<String> stringVal = ConstantImpl.create("");
+        VarArgs instance = Projections.constructor(VarArgs.class, stringVal, stringVal).newInstance("X", "Y");
+        assertArrayEquals(new String[]{"X", "Y"}, instance.args);
+    }
+
+    @Test
+    public void constructor_varArgs2() {
+        Expression<String> stringVal = ConstantImpl.create("");
+        VarArgs2 instance = Projections.constructor(VarArgs2.class, stringVal, stringVal, stringVal).newInstance("X", "Y", "Z");
+        assertEquals("X", instance.arg);
+        assertArrayEquals(new String[]{"Y", "Z"}, instance.args);
+    }
+
+    @Test
+    public void constructor_varArgs3() {
+        Constant<Long> longVal = ConstantImpl.create(1L);
+        Constant<Character> charVal = ConstantImpl.create('\0');
+        ProjectionExample instance = Projections
+                .constructor(ProjectionExample.class,
+                        longVal, charVal,
+                        charVal, charVal,
+                        charVal, charVal,
+                        charVal, charVal,
+                        charVal, charVal,
+                        charVal)
+                .newInstance(null, 'm',
+                        'y', 's',
+                        'e', 'm',
+                        'a', null,
+                        'l', 't',
+                        'd');
+        assertEquals(0L, (long) instance.id);
+        // null character cannot be inserted, so a literal String can't be used.
+        String expectedText = String.valueOf(new char[]{'m', 'y', 's', 'e', 'm', 'a',
+            '\0', 'l', 't', 'd'});
+        assertEquals(expectedText, instance.text);
+    }
+
+    @Test
+    public void fieldsClassOfTExpressionOfQArray() {
+        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
+        QBean<Entity> beanProjection = Projections.fields(Entity.class,
+                entity.getNumber("cId", Integer.class),
+                entity.getNumber("eId", Integer.class));
+
+        assertEquals(Entity.class, beanProjection.newInstance(1, 2).getClass());
+    }
+
+    @Test
+    public void nested() {
+        StringPath str1 = Expressions.stringPath("str1");
+        StringPath str2 = Expressions.stringPath("str2");
+        StringPath str3 = Expressions.stringPath("str3");
+        FactoryExpression<Entity1> entity = Projections.constructor(Entity1.class, str1, str2);
+        FactoryExpression<Entity2> wrapper = Projections.constructor(Entity2.class, str3, entity);
+        FactoryExpression<Entity2> wrapped = FactoryExpressionUtils.wrap(wrapper);
+
+        Entity2 w = wrapped.newInstance("a", "b", "c");
+        assertEquals("a", w.arg1);
+        assertEquals("b", w.entity.arg1);
+        assertEquals("c", w.entity.arg2);
+
+        w = wrapped.newInstance("a", null, null);
+        assertEquals("a", w.arg1);
+        assertNotNull(w.entity);
+
+        w = wrapped.newInstance(null, null, null);
+        assertNotNull(w.entity);
+    }
+
+    @Test
+    public void nestedSkipNulls() {
+        StringPath str1 = Expressions.stringPath("str1");
+        StringPath str2 = Expressions.stringPath("str2");
+        StringPath str3 = Expressions.stringPath("str3");
+        FactoryExpression<Entity1> entity = Projections.constructor(Entity1.class, str1, str2).skipNulls();
+        FactoryExpression<Entity2> wrapper = Projections.constructor(Entity2.class, str3, entity);
+        FactoryExpression<Entity2> wrapped = FactoryExpressionUtils.wrap(wrapper);
+
+        Entity2 w = wrapped.newInstance("a", "b", "c");
+        assertEquals("a", w.arg1);
+        assertEquals("b", w.entity.arg1);
+        assertEquals("c", w.entity.arg2);
+
+        w = wrapped.newInstance("a", null, null);
+        assertEquals("a", w.arg1);
+        assertNull(w.entity);
+
+        w = wrapped.newInstance(null, null, null);
+        assertNull(w.entity);
+    }
+
+    @Test
+    public void nestedSkipNulls2() {
+        StringPath str1 = Expressions.stringPath("str1");
+        StringPath str2 = Expressions.stringPath("str2");
+        StringPath str3 = Expressions.stringPath("str3");
+        FactoryExpression<Entity1> entity = Projections.constructor(Entity1.class, str1, str2).skipNulls();
+        FactoryExpression<Entity2> wrapper = Projections.constructor(Entity2.class, str3, entity).skipNulls();
+        FactoryExpression<Entity2> wrapped = FactoryExpressionUtils.wrap(wrapper);
+
+        Entity2 w = wrapped.newInstance("a", "b", "c");
+        assertEquals("a", w.arg1);
+        assertEquals("b", w.entity.arg1);
+        assertEquals("c", w.entity.arg2);
+
+        w = wrapped.newInstance("a", null, null);
+        assertEquals("a", w.arg1);
+        assertNull(w.entity);
+
+        w = wrapped.newInstance(null, null, null);
+        assertNull(w);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QBeanFieldAccessTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanFieldAccessTest.java
similarity index 81%
rename from querydsl-core/src/test/java/com/mysema/query/types/QBeanFieldAccessTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/QBeanFieldAccessTest.java
index f94862f2d8..9d48ea88f9 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/QBeanFieldAccessTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanFieldAccessTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -22,11 +22,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.query.types.path.BooleanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.PathBuilderFactory;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.dsl.*;
 
 
 public class QBeanFieldAccessTest {
@@ -60,7 +56,7 @@ public void setUp() {
     }
 
     @Test
-    public void with_Class_and_Exprs_using_fields() {
+    public void with_class_and_exprs_using_fields() {
         QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, true, name, age, married);
         Entity bean = beanProjection.newInstance("Fritz", 30, true);
         assertEquals("Fritz", bean.name);
@@ -69,8 +65,8 @@ public void with_Class_and_Exprs_using_fields() {
     }
 
     @Test
-    public void with_Path_and_Exprs_using_fields() {
-        QBean<Entity> beanProjection = new QBean<Entity>(entity, true, name, age, married);
+    public void with_path_and_exprs_using_fields() {
+        QBean<Entity> beanProjection = Projections.fields(entity, name, age, married);
         Entity bean = beanProjection.newInstance("Fritz", 30, true);
         assertEquals("Fritz", bean.name);
         assertEquals(30, bean.age);
@@ -78,7 +74,7 @@ public void with_Path_and_Exprs_using_fields() {
     }
 
     @Test
-    public void with_Class_and_Map_using_fields() {
+    public void with_class_and_map_using_fields() {
         Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
         bindings.put("name", name);
         bindings.put("age", age);
@@ -91,8 +87,8 @@ public void with_Class_and_Map_using_fields() {
     }
 
     @Test
-    public void with_Class_and_Alias_using_fields() {
-        StringPath name2 = new StringPath("name2");
+    public void with_class_and_alias_using_fields() {
+        StringPath name2 = Expressions.stringPath("name2");
         QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, true, name.as(name2), age, married);
         Entity bean = beanProjection.newInstance("Fritz", 30, true);
         assertNull(bean.name);
@@ -102,7 +98,7 @@ public void with_Class_and_Alias_using_fields() {
     }
 
     @Test
-    public void with_Nested_FactoryExpression() {
+    public void with_nested_factoryExpression() {
         Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
         bindings.put("age", age);
         bindings.put("name", new Concatenation(name, name2));
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/QBeanPropertyTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanPropertyTest.java
similarity index 89%
rename from querydsl-core/src/test/java/com/mysema/query/types/QBeanPropertyTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/QBeanPropertyTest.java
index eebbc808f6..8ffe13bb6f 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/QBeanPropertyTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanPropertyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.path.PathBuilder;
+import com.querydsl.core.types.dsl.PathBuilder;
 
 public class QBeanPropertyTest {
 
@@ -43,12 +43,10 @@ public void seteId(Integer eId) {
             this.eId = eId;
         }
 
-
-
     }
 
     @Test
-    public void Field_Access() {
+    public void field_access() {
         PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
         QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, true,
                 entity.getNumber("cId",Integer.class),
@@ -60,7 +58,7 @@ public void Field_Access() {
     }
 
     @Test
-    public void Property_Access() {
+    public void property_access() {
         PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class, "entity");
         QBean<Entity> beanProjection = new QBean<Entity>(Entity.class,
                 entity.getNumber("cId",Integer.class),
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/QBeanTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanTest.java
new file mode 100644
index 0000000000..a3b1fb3d02
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QBeanTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.*;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.*;
+
+
+public class QBeanTest {
+
+    public static class Entity {
+
+        private String name;
+
+        private String name2;
+
+        private int age;
+
+        private boolean married;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getAge() {
+            return age;
+        }
+
+        public void setAge(int age) {
+            this.age = age;
+        }
+
+        public boolean isMarried() {
+            return married;
+        }
+
+        public void setMarried(boolean married) {
+            this.married = married;
+        }
+
+        public String getName2() {
+            return name2;
+        }
+
+        public void setName2(String name2) {
+            this.name2 = name2;
+        }
+
+    }
+
+    public static class SubEntity extends Entity {
+
+    }
+
+    private PathBuilder<Entity> entity;
+
+    private StringPath name, name2;
+
+    private NumberPath<Integer> age;
+
+    private BooleanPath married;
+
+    @Before
+    public void setUp() {
+        entity = new PathBuilderFactory().create(Entity.class);
+        name = entity.getString("name");
+        name2 = entity.getString("name2");
+        age = entity.getNumber("age", Integer.class);
+        married = entity.getBoolean("married");
+    }
+
+    @Test
+    public void with_class_and_exprs() {
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name, age, married);
+        Entity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertEquals("Fritz", bean.getName());
+        assertEquals(30, bean.getAge());
+        assertEquals(true, bean.isMarried());
+    }
+
+    @Test
+    public void with_path_and_exprs() {
+        QBean<Entity> beanProjection = Projections.bean(entity, name, age, married);
+        Entity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertEquals("Fritz", bean.getName());
+        assertEquals(30, bean.getAge());
+        assertEquals(true, bean.isMarried());
+    }
+
+    @Test
+    public void with_unknown_properties() {
+        QBean<Entity> beanProjection = Projections.bean(entity, name, age, Expressions.booleanPath("unknown"));
+        Entity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertEquals("Fritz", bean.getName());
+        assertEquals(30, bean.getAge());
+    }
+
+    @Test
+    public void with_class_and_map() {
+        Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
+        bindings.put("name", name);
+        bindings.put("age", age);
+        bindings.put("married", married);
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, bindings);
+        Entity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertEquals("Fritz", bean.getName());
+        assertEquals(30, bean.getAge());
+        assertEquals(true, bean.isMarried());
+    }
+
+    @Test
+    public void with_class_and_alias() {
+        StringPath name2 = Expressions.stringPath("name2");
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name.as(name2), age, married);
+        Entity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertNull(bean.getName());
+        assertEquals("Fritz", bean.getName2());
+        assertEquals(30, bean.getAge());
+        assertEquals(true, bean.isMarried());
+    }
+
+    @Test
+    public void with_nested_factoryExpression() {
+        Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
+        bindings.put("age", age);
+        bindings.put("name", new Concatenation(name, name2));
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, bindings);
+        FactoryExpression<Entity> wrappedProjection = FactoryExpressionUtils.wrap(beanProjection);
+        Entity bean = wrappedProjection.newInstance(30, "Fri","tz");
+        assertEquals("Fritz", bean.getName());
+
+    }
+
+    @Test
+    public void with_nested_factoryExpression2() {
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class,
+                age, ExpressionUtils.as(new Concatenation(name, name2), "name"));
+        FactoryExpression<Entity> wrappedProjection = FactoryExpressionUtils.wrap(beanProjection);
+        Entity bean = wrappedProjection.newInstance(30, "Fri","tz");
+        assertEquals("Fritz", bean.getName());
+    }
+
+    @Test
+    public void supertype_population() {
+        QBean<SubEntity> beanProjection = new QBean<SubEntity>(SubEntity.class, true, name, age, married);
+        SubEntity bean = beanProjection.newInstance("Fritz", 30, true);
+        assertEquals("Fritz", bean.getName());
+        assertEquals(30, bean.getAge());
+        assertEquals(true, bean.isMarried());
+    }
+
+    @Test
+    public void skipNulls() {
+        QBean<Object> bean = Projections.bean(Object.class);
+        assertEquals(bean, bean);
+        assertEquals(bean.skipNulls(), bean.skipNulls());
+        assertFalse(bean.skipNulls().equals(bean));
+        assertFalse(bean.equals(bean.skipNulls()));
+    }
+
+    @Test
+    public void alias() {
+        QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name.as("name2"));
+        assertEquals(name.as("name2"), beanProjection.getArgs().get(0));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/QListTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QListTest.java
new file mode 100644
index 0000000000..697222d6f9
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QListTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+
+public class QListTest {
+
+    @Test
+    public void newInstance() {
+        QList qList = new QList(Expressions.stringPath("a"), Expressions.stringPath("b"));
+        List<?> list = qList.newInstance("a", null);
+        assertEquals(2, list.size());
+        assertEquals("a", list.get(0));
+        assertNull(list.get(1));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/QMapTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QMapTest.java
new file mode 100644
index 0000000000..98772137dd
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QMapTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QMapTest {
+
+    StringPath str1 = Expressions.stringPath("str1");
+    StringPath str2 = Expressions.stringPath("str2");
+    StringPath str3 = Expressions.stringPath("str3");
+    StringPath str4 = Expressions.stringPath("str4");
+    Expression<?>[] exprs1 = new Expression[]{str1, str2};
+    Expression<?>[] exprs2 = new Expression[]{str3, str4};
+
+    Concatenation concat = new Concatenation(str1, str2);
+
+    @Test
+    public void twoExpressions_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), new QMap(str1, str2).getArgs());
+    }
+
+    @Test
+    public void oneArray_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), new QMap(exprs1).getArgs());
+    }
+
+    @Test
+    public void twoExpressionArrays_getArgs() {
+        assertEquals(Arrays.asList(str1, str2, str3, str4), new QMap(exprs1, exprs2).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), FactoryExpressionUtils.wrap(new QMap(concat)).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_getArgs2() {
+        assertEquals(Arrays.asList(str1, str2, str3), FactoryExpressionUtils.wrap(new QMap(concat, str3)).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_newInstance() {
+        QMap expr = new QMap(concat);
+        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("12", "34").get(concat));
+    }
+
+    @Test
+    public void nestedProjection_newInstance2() {
+        QMap expr = new QMap(str1, str2, concat);
+        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("1", "2", "12", "34").get(concat));
+    }
+
+    @Test
+    public void tuple_equals() {
+        QMap expr = new QMap(str1, str2);
+        assertEquals(expr.newInstance("str1", "str2"), expr.newInstance("str1", "str2"));
+    }
+
+    @Test
+    public void tuple_hashCode() {
+        QMap expr = new QMap(str1, str2);
+        assertEquals(expr.newInstance("str1", "str2").hashCode(), expr.newInstance("str1", "str2").hashCode());
+    }
+
+    @Test
+    public void null_value() {
+        QMap expr = new QMap(str1, str2);
+        assertNotNull(expr.newInstance("str1", null));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/QTupleTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/QTupleTest.java
new file mode 100644
index 0000000000..54686cba1e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/QTupleTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QTupleTest {
+
+    StringPath str1 = Expressions.stringPath("str1");
+    StringPath str2 = Expressions.stringPath("str2");
+    StringPath str3 = Expressions.stringPath("str3");
+    StringPath str4 = Expressions.stringPath("str4");
+    Expression<?>[] exprs1 = new Expression[]{str1, str2};
+    Expression<?>[] exprs2 = new Expression[]{str3, str4};
+
+    Concatenation concat = new Concatenation(str1, str2);
+
+    @Test
+    public void alias() {
+        Expression<?> expr = str1.as("s");
+        QTuple qTuple = new QTuple(expr);
+        Tuple tuple = qTuple.newInstance("arg");
+        assertEquals("arg", tuple.get(expr));
+        assertEquals("arg", tuple.get(Expressions.stringPath("s")));
+    }
+
+    @Test
+    public void twoExpressions_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), new QTuple(str1, str2).getArgs());
+    }
+
+    @Test
+    public void oneArray_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), new QTuple(exprs1).getArgs());
+    }
+
+    @Test
+    public void twoExpressionArrays_getArgs() {
+        assertEquals(Arrays.asList(str1, str2, str3, str4), new QTuple(exprs1, exprs2).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_getArgs() {
+        assertEquals(Arrays.asList(str1, str2), FactoryExpressionUtils.wrap(new QTuple(concat)).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_getArgs2() {
+        assertEquals(Arrays.asList(str1, str2, str3), FactoryExpressionUtils.wrap(new QTuple(concat, str3)).getArgs());
+    }
+
+    @Test
+    public void nestedProjection_newInstance() {
+        QTuple expr = new QTuple(concat);
+        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("12", "34").get(concat));
+    }
+
+    @Test
+    public void nestedProjection_newInstance2() {
+        QTuple expr = new QTuple(str1, str2, concat);
+        assertEquals("1234", FactoryExpressionUtils.wrap(expr).newInstance("1", "2", "12", "34").get(concat));
+    }
+
+    @Test
+    public void tuple_equals() {
+        QTuple expr = new QTuple(str1, str2);
+        assertEquals(expr.newInstance("str1", "str2"), expr.newInstance("str1", "str2"));
+    }
+
+    @Test
+    public void tuple_hashCode() {
+        QTuple expr = new QTuple(str1, str2);
+        assertEquals(expr.newInstance("str1", "str2").hashCode(), expr.newInstance("str1", "str2").hashCode());
+    }
+
+    @Test
+    @Ignore
+    public void duplicates() {
+        QTuple expr = new QTuple(str1, str1);
+        assertEquals(1, expr.getArgs().size());
+        assertEquals(str1, expr.getArgs().get(0));
+    }
+
+    @Test
+    @Ignore
+    public void duplicates2() {
+        QTuple expr = new QTuple(Arrays.asList(str1, str1));
+        assertEquals(1, expr.getArgs().size());
+        assertEquals(str1, expr.getArgs().get(0));
+    }
+
+    @Test
+    public void newInstance() {
+        assertNotNull(new QTuple(str1, str1).newInstance(null, null));
+        assertNull(new QTuple(str1, str1).skipNulls().newInstance(null, null));
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/SerializationTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/SerializationTest.java
new file mode 100644
index 0000000000..50565de4b8
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/SerializationTest.java
@@ -0,0 +1,86 @@
+package com.querydsl.core.types;
+
+import static com.querydsl.core.testutil.Serialization.serialize;
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+import io.github.classgraph.ClassGraph;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.types.dsl.*;
+
+public class SerializationTest {
+
+    public enum Gender { MALE, FEMALE }
+
+    @Test
+    public void expressions() throws Exception {
+        Map<Class<?>, Object> args = new HashMap<>();
+        args.put(Object.class, "obj");
+        args.put(BeanPath.class, new EntityPathBase<Object>(Object.class, "obj"));
+        args.put(Class.class, Integer.class);
+        args.put(Class[].class, new Class<?>[]{Object.class, Object.class});
+        args.put(java.util.Date.class, new java.util.Date(0));
+        args.put(java.sql.Date.class, new java.sql.Date(0));
+        args.put(java.sql.Time.class, new java.sql.Time(0));
+        args.put(java.sql.Timestamp.class, new java.sql.Timestamp(0));
+        args.put(Expression.class, Expressions.enumPath(Gender.class, "e"));
+        args.put(Expression[].class, new Expression<?>[]{
+                Expressions.enumPath(Gender.class, "e"), Expressions.stringPath("s")});
+        args.put(FactoryExpression.class, Projections.tuple(Expressions.stringPath("str")));
+        args.put(GroupExpression.class, GroupBy.avg(Expressions.numberPath(Integer.class, "num")));
+        args.put(Number.class, 1);
+        args.put(Operator.class, Ops.AND);
+        args.put(Path.class, Expressions.stringPath("str"));
+        args.put(PathBuilderValidator.class, PathBuilderValidator.DEFAULT);
+        args.put(PathMetadata.class, PathMetadataFactory.forVariable("obj"));
+        args.put(PathInits.class, PathInits.DEFAULT);
+        args.put(Predicate.class, Expressions.path(Object.class, "obj").isNull());
+        args.put(QueryMetadata.class, new DefaultQueryMetadata());
+        args.put(String.class, "obj");
+
+        ClassGraph reflections = new ClassGraph().enableClassInfo();
+        List<Class<?>> types = reflections.scan().getSubclasses(Expression.class.getName()).loadClasses();
+        for (Class<?> type : types) {
+            if (!type.isInterface() && !type.isMemberClass() && !Modifier.isAbstract(type.getModifiers())) {
+                for (Constructor<?> c : type.getConstructors()) {
+                    Object[] parameters = new Object[c.getParameterTypes().length];
+                    for (int i = 0; i < c.getParameterTypes().length; i++) {
+                        parameters[i] = Objects.requireNonNull(args.get(c.getParameterTypes()[i]),
+                                c.getParameterTypes()[i].getName());
+                    }
+                    c.setAccessible(true);
+                    Object o = c.newInstance(parameters);
+                    assertEquals(o, Serialization.serialize(o));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void order() {
+        OrderSpecifier<?> order = new OrderSpecifier<String>(Order.ASC, Expressions.stringPath("str"));
+        assertEquals(order, Serialization.serialize(order));
+    }
+
+    @Test
+    public void roundtrip() throws Exception {
+        Path<?> path = ExpressionUtils.path(Object.class, "entity");
+        SimplePath<?> path2 = Expressions.path(Object.class, "entity");
+        assertEquals(path, serialize(path));
+        assertEquals(path2, serialize(path2));
+        assertEquals(path2.isNull(), serialize(path2.isNull()));
+        assertEquals(path.hashCode(), serialize(path).hashCode());
+        assertEquals(path2.hashCode(), serialize(path2).hashCode());
+        assertEquals(path2.isNull().hashCode(), serialize(path2.isNull()).hashCode());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/SignatureTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/SignatureTest.java
new file mode 100644
index 0000000000..68ced6d405
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/SignatureTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Coalesce;
+import com.querydsl.core.types.dsl.DslExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimpleExpression;
+
+public class SignatureTest {
+
+    private List<Class<?>> classes = new ArrayList<Class<?>>();
+
+    @Before
+    public void setUp() throws ClassNotFoundException {
+        for (String folder : Collections.singletonList("com/querydsl/core/types/dsl")) {
+            for (String file : new File("src/main/java",folder).list()) {
+                if (file.endsWith(".java") && !file.equals("package-info.java")) {
+                    String className = (folder + "." + file.substring(0, file.length() - 5)).replace('/', '.');
+                    classes.add(Class.forName(className));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void returnType_extends_simpleExpression() {
+        assertFalse(classes.isEmpty());
+        Set<String> skippedMethods = new HashSet<String>(Arrays.asList("getArg","getRoot","not"));
+        List<String> errors = new ArrayList<String>();
+        for (Class<?> cl : classes) {
+            if (cl.equals(Expressions.class)) {
+                continue;
+            }
+            for (Method m : cl.getDeclaredMethods()) {
+                if (!skippedMethods.contains(m.getName())
+                 && Modifier.isPublic(m.getModifiers())
+                 && Expression.class.isAssignableFrom(m.getReturnType())
+                 && !Coalesce.class.isAssignableFrom(m.getReturnType())
+                 && !DslExpression.class.isAssignableFrom(m.getReturnType())
+                 && !SimpleExpression.class.isAssignableFrom(m.getReturnType())) {
+                    errors.add(cl.getSimpleName() + "." + m.getName() + " has illegal return type");
+                }
+            }
+        }
+        for (String error : errors) {
+            System.err.println(error);
+        }
+        if (!errors.isEmpty()) {
+            Assert.fail("Got " + errors.size() + " errors");
+        }
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/StringTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/StringTest.java
new file mode 100644
index 0000000000..dcb3e75f3a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/StringTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Test;
+
+
+public class StringTest {
+
+    private static class DummyTemplates extends Templates {
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void patternAvailability() throws IllegalArgumentException, IllegalAccessException {
+        Templates ops = new DummyTemplates();
+        Set<Field> missing = new HashSet<Field>();
+        for (Field field : Ops.class.getFields()) {
+            if (field.getType().equals(Operator.class)) {
+                Operator op = (Operator) field.get(null);
+                if (ops.getTemplate(op) == null) {
+                    missing.add(field);
+                }
+            }
+        }
+        for (Class<?> cl : Ops.class.getClasses()) {
+            for (Field field : cl.getFields()) {
+                if (field.getType().equals(Operator.class)) {
+                    Operator op = (Operator) field.get(null);
+                    if (ops.getTemplate(op) == null) {
+                        missing.add(field);
+                    }
+                }
+            }
+        }
+
+        if (!missing.isEmpty()) {
+            for (Field field : missing) {
+                System.err.println(field.getName());
+            }
+            fail();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void toString_() {
+        SomeType alias = alias(SomeType.class, "alias");
+
+        // Path toString
+        assertEquals("alias.name", $(alias.getName()).toString());
+        assertEquals("alias.ref.name", $(alias.getRef().getName()).toString());
+        assertEquals("alias.refs.get(0)", $(alias.getRefs().get(0)).toString());
+
+        // Operation toString
+        assertEquals("lower(alias.name)", $(alias.getName()).lower().toString());
+
+        // ConstructorExpression
+        ConstructorExpression<SomeType> someType = new ConstructorExpression<SomeType>(SomeType.class, new Class<?>[]{SomeType.class}, $(alias));
+        assertEquals("new SomeType(alias)", someType.toString());
+
+        // ArrayConstructorExpression
+        ArrayConstructorExpression<SomeType> someTypeArray = new ArrayConstructorExpression<SomeType>(SomeType[].class,$(alias));
+        assertEquals("new SomeType[](alias)", someTypeArray.toString());
+    }
+
+
+    public static class SomeType {
+
+        public SomeType() { }
+
+        public SomeType(SomeType st) { }
+
+        public String getName() {
+            return "";
+        }
+
+        public SomeType getRef() {
+            return null;
+        }
+
+        public List<SomeType> getRefs() {
+            return null;
+        }
+
+        public int getAmount() {
+            return 0;
+        }
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/TemplateExpressionImplTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateExpressionImplTest.java
new file mode 100644
index 0000000000..8788e982f8
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateExpressionImplTest.java
@@ -0,0 +1,16 @@
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+public class TemplateExpressionImplTest {
+
+    @Test
+    public void equals() {
+        Expression<?> expr1 = ExpressionUtils.template(String.class, "abc", "abc");
+        Expression<?> expr2 = ExpressionUtils.template(String.class, "abc", "def");
+        assertFalse(expr1.equals(expr2));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java
new file mode 100644
index 0000000000..839700f8cc
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateInfiniteLoop.java
@@ -0,0 +1,43 @@
+package com.querydsl.core.types;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public final class TemplateInfiniteLoop {
+
+    private TemplateInfiniteLoop() { }
+
+    static String[] templates = createTemplates();
+
+    public static void main(String[] args) {
+        ExecutorService executorService = Executors.newFixedThreadPool(3);
+        executorService.execute(new Runner());
+        executorService.execute(new Runner());
+        executorService.execute(new Runner());
+        executorService.shutdown();
+    }
+
+    private static class Runner implements Runnable {
+        public void run() {
+            for (int i = 0; i < 100000; i++) {
+                TemplateFactory.DEFAULT.create(templates[i % templates.length]);
+            }
+        }
+    }
+
+    /**
+     * Generates array of strings: "\0a", "\0\0a", "\0\0\0a" etc. all with the
+     * same hashCode
+     *
+     * @return
+     */
+    private static String[] createTemplates() {
+        String[] tab = new String[10000];
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < tab.length; i++) {
+            builder.append('\0');
+            tab[i] = builder.toString() + 'a';
+        }
+        return tab;
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/TemplateTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateTest.java
new file mode 100644
index 0000000000..1dffea9a30
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/TemplateTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TemplateTest {
+
+    @Test
+    public void test() {
+        TemplateFactory factory = new TemplateFactory('\\');
+        match("[0, ' + ', 1, ' + ', 2]", factory.create("{0} + {1} + {2}"));
+        match("['blah ', 0, ' + ', 1, ' + ', 2, ' XXX']", factory.create("blah {0} + {1} + {2} XXX"));
+        match("['+', 1]",                factory.create("+{1}"));
+        match("[1, '.method()']",        factory.create("{1}.method()"));
+        match("[0, '.get(', 1, ')']",    factory.create("{0}.get({1})"));
+        match("[0, '.', 1s]",            factory.create("{0}.{1s}"));
+    }
+
+    @Test
+    public void operation() {
+        TemplateFactory factory = new TemplateFactory('\\');
+        match("[0 ADD 1]",               factory.create("{0+1}"));
+        match("[0 DIV 1]",               factory.create("{0/1}"));
+    }
+
+    @Test
+    public void operationConst() {
+        TemplateFactory factory = new TemplateFactory('\\');
+        match("[0 ADD 1]",               factory.create("{0+'1'}"));
+        match("[0 DIV 1.0]",             factory.create("{0/'1.0'}"));
+        match("[0 MULT 3.141592653589793, ' / 180.0)']",
+            factory.create("{0*'3.141592653589793'} / 180.0)"));
+    }
+
+    @Test
+    public void like() {
+        TemplateFactory factory = new TemplateFactory('\\');
+        match("[0]",                     factory.create("{0%}"));
+        match("[0]",                     factory.create("{%0}"));
+        match("[0]",                     factory.create("{%0%}"));
+
+        match("[0]",                     factory.create("{0%%}"));
+        match("[0]",                     factory.create("{%%0}"));
+        match("[0]",                     factory.create("{%%0%%}"));
+    }
+
+    private void match(String string, Template template) {
+        assertEquals(string, template.getElements().toString());
+    }
+
+}
+
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/TemplatesTestUtils.java b/querydsl-core/src/test/java/com/querydsl/core/types/TemplatesTestUtils.java
new file mode 100644
index 0000000000..8281d18555
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/TemplatesTestUtils.java
@@ -0,0 +1,36 @@
+package com.querydsl.core.types;
+
+import org.junit.Assert;
+
+public final class TemplatesTestUtils {
+
+    public static void testPrecedence(Templates templates) {
+        int likePrecedence = templates.getPrecedence(Ops.LIKE);
+        int eqPrecedence = templates.getPrecedence(Ops.EQ);
+        if (templates.getPrecedence(Ops.EQ_IGNORE_CASE) != eqPrecedence) {
+            Assert.fail("Unexpected precedence for EQ_IGNORE_CASE "
+                    + templates.getPrecedence(Ops.EQ_IGNORE_CASE));
+        }
+        for (Operator op : Ops.values()) {
+            Template template = templates.getTemplate(op);
+            String str = template.toString();
+            int precedence = templates.getPrecedence(op);
+            if (str.contains(" like ") && precedence != likePrecedence) {
+                Assert.fail("Unexpected precedence for " + op + " with template " + template);
+            } else if (!str.contains("(") && !str.contains(".") && precedence < 0) {
+                Assert.fail("Unexpected precedence for " + op + " with template " + template);
+            } else if (str.matches(".*[<>] ?\\-?\\d")) {
+                if (precedence != Templates.Precedence.COMPARISON) {
+                    Assert.fail("Unsafe pattern for " + op + " with template " + template);
+                }
+            } else if (str.matches(".*[\\+\\-] ?\\-?\\d")) {
+                if (precedence != Templates.Precedence.ARITH_LOW && precedence != Templates.Precedence.ARITH_HIGH) {
+                    Assert.fail("Unsafe pattern for " + op + " with template " + template);
+                }
+            }
+        }
+    }
+
+    private TemplatesTestUtils() { }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ToStringVisitorTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ToStringVisitorTest.java
new file mode 100644
index 0000000000..6c2034313f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ToStringVisitorTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.domain.QCat;
+import com.querydsl.core.types.dsl.BooleanPath;
+import com.querydsl.core.types.dsl.Expressions;
+
+
+public class ToStringVisitorTest {
+
+    private Templates templates = new Templates() {
+        {
+            add(PathType.PROPERTY, "{0}_{1}");
+            add(PathType.COLLECTION_ANY, "{0}");
+        }
+    };
+
+    @Test
+    public void operation() {
+        assertEquals("cat_name is not null",
+                QCat.cat.name.isNotNull().accept(ToStringVisitor.DEFAULT, templates));
+    }
+
+    @Test
+    public void template() {
+        Expression<Boolean> template = ExpressionUtils.template(Boolean.class, "{0} is not null", QCat.cat.name);
+        assertEquals("cat_name is not null",
+                template.accept(ToStringVisitor.DEFAULT, templates));
+    }
+
+    @Test
+    public void path() {
+        assertEquals("cat_kittens_kittens_name",
+                QCat.cat.kittens.any().kittens.any().name.accept(ToStringVisitor.DEFAULT, templates));
+    }
+
+    @Test
+    public void complex() {
+        BooleanPath a = Expressions.booleanPath("a");
+        BooleanPath b = Expressions.booleanPath("d");
+        BooleanPath c = Expressions.booleanPath("c");
+        BooleanPath d = Expressions.booleanPath("d");
+        Predicate complex = a.or(b).and(c.or(d));
+        assertEquals("(a || d) && (c || d)", complex.accept(ToStringVisitor.DEFAULT, templates));
+
+
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/TypesTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/TypesTest.java
similarity index 91%
rename from querydsl-core/src/test/java/com/mysema/query/types/TypesTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/TypesTest.java
index aa6e6583b4..53efadea5e 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/TypesTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/TypesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/ValidatingVisitorTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/ValidatingVisitorTest.java
new file mode 100644
index 0000000000..7a0b89695e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/ValidatingVisitorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+
+@SuppressWarnings("unchecked")
+public class ValidatingVisitorTest {
+
+    private final Set<Expression<?>> known = new HashSet<Expression<?>>();
+
+    private final ValidatingVisitor validator = ValidatingVisitor.DEFAULT;
+
+    @Before
+    public void setUp() {
+        known.add(ExpressionUtils.path(Object.class, "path"));
+    }
+
+    @Test
+    public void visitConstantOfQVoid() {
+        validator.visit(ConstantImpl.create("XXX"), known);
+    }
+
+    @Test
+    public void visitFactoryExpressionOfQVoid() {
+        validator.visit(new QBean(Object.class, ExpressionUtils.path(String.class, "path")), known);
+    }
+
+    @Test
+    public void visitOperationOfQVoid() {
+        validator.visit((Operation) Expressions.path(Object.class, "path").isNull(), known);
+    }
+
+    @Test
+    public void visitParamExpressionOfQVoid() {
+        validator.visit(new Param(Object.class, "prop"), known);
+    }
+
+    @Test
+    public void visitPathOfQVoid() {
+        validator.visit(ExpressionUtils.path(Object.class, "path"), known);
+    }
+
+    @Test
+    public void visitSubQueryExpressionOfQVoid() {
+        validator.visit(new SubQueryExpressionImpl(Object.class, new DefaultQueryMetadata()), known);
+    }
+
+    @Test
+    public void visitTemplateExpressionOfQVoid() {
+        validator.visit((TemplateExpression) Expressions.template(Object.class, "XXX"), known);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/VisitorTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/VisitorTest.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/types/VisitorTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/VisitorTest.java
index a358f10f78..29afab7b31 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/VisitorTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/VisitorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,11 +22,11 @@
 public class VisitorTest {
 
     @Test
-    public void Iteration() throws SecurityException, NoSuchMethodException{
+    public void iteration() throws SecurityException, NoSuchMethodException {
         List<Class<?>> types = new ArrayList<Class<?>>();
 //        types.addAll(Arrays.<Class<?>>asList(Alias.class.getClasses()));
-        types.addAll(Arrays.<Class<?>>asList(Operation.class.getClasses()));
-        types.addAll(Arrays.<Class<?>>asList(Path.class.getClasses()));
+        types.addAll(Arrays.asList(Operation.class.getClasses()));
+        types.addAll(Arrays.asList(Path.class.getClasses()));
         for (Class<?> innerType : types) {
             if (!innerType.isInterface() && Expression.class.isAssignableFrom(innerType)) {
                 Visitor.class.getDeclaredMethod("visit",innerType);
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/ArrayConstructorExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayConstructorExpressionTest.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/types/expr/ArrayConstructorExpressionTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayConstructorExpressionTest.java
index d3faffd05f..c5d0f3e181 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/ArrayConstructorExpressionTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayConstructorExpressionTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,24 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.expr;
+package com.querydsl.core.types.dsl;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.ArrayConstructorExpression;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.ArrayConstructorExpression;
 
 public class ArrayConstructorExpressionTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void NewInstanceObjectArray() {
+    public void newInstanceObjectArray() {
         ArrayConstructorExpression<String> constructor = new ArrayConstructorExpression<String>(
                 String[].class,  new StringPath("test"), new StringPath("test2"));
 
-        String[] strings = constructor.newInstance((Object[])new String[]{"1", "2"});
+        String[] strings = constructor.newInstance((Object[]) new String[]{"1", "2"});
         assertEquals("1", strings[0]);
         assertEquals("2", strings[1]);
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/ArrayPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayPathTest.java
similarity index 77%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/ArrayPathTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayPathTest.java
index 6bec228b44..3cd83c436e 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/ArrayPathTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ArrayPathTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,22 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.types.ConstantImpl;
+import com.querydsl.core.types.ConstantImpl;
 
 
 public class ArrayPathTest {
 
     @Test
-    public void Get() {
+    public void get() {
         ArrayPath<String[], String> arrayPath = new ArrayPath<String[], String>(String[].class, "p");
         assertNotNull(arrayPath.get(ConstantImpl.create(0)));
-        
+
     }
-    
+
 }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BeanPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BeanPathTest.java
new file mode 100644
index 0000000000..8c65b9e831
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BeanPathTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+
+public class BeanPathTest {
+
+    public static class SubClass extends BeanPathTest {
+
+    }
+
+    public static class MyBeanPath extends BeanPath<BeanPathTest> {
+
+        private static final long serialVersionUID = 6225684967115368814L;
+
+        public MyBeanPath(PathMetadata metadata) {
+            super(BeanPathTest.class, metadata);
+        }
+
+        public MyBeanPath(PathMetadata metadata, @Nullable PathInits inits) {
+            super(BeanPathTest.class, metadata);
+        }
+
+    }
+
+    private BeanPath<BeanPathTest> beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class, "p");
+
+    @Test
+    public void as_path() {
+        SimplePath<BeanPathTest> simplePath = new SimplePath<BeanPathTest>(BeanPathTest.class, "p");
+        assertNotNull(beanPath.as(simplePath));
+    }
+
+    @Test
+    @Ignore
+    public void as_class() {
+        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
+        assertEquals(beanPath, otherPath);
+        assertTrue(otherPath.getMetadata().isRoot());
+    }
+
+    @Test
+    public void as_class_cached() {
+        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
+//        assertEquals(beanPath, otherPath);
+        assertTrue(otherPath == beanPath.as(MyBeanPath.class));
+    }
+
+    @Test
+    @Ignore
+    public void as_class_with_inits() {
+        beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class,
+                PathMetadataFactory.forVariable("p"), PathInits.DEFAULT);
+        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
+        assertEquals(beanPath, otherPath);
+    }
+
+    @Test
+    public void as_class_with_inits_cached() {
+        beanPath = new BeanPath<BeanPathTest>(BeanPathTest.class,
+                PathMetadataFactory.forVariable("p"), PathInits.DEFAULT);
+        MyBeanPath otherPath = beanPath.as(MyBeanPath.class);
+//        assertEquals(beanPath, otherPath);
+        assertTrue(otherPath == beanPath.as(MyBeanPath.class));
+    }
+
+    @Test
+    public void createEnum() {
+        assertNotNull(beanPath.createEnum("property", PropertyType.class));
+    }
+
+    @Test
+    public void instanceOf() {
+        assertNotNull(beanPath.instanceOf(BeanPathTest.class));
+    }
+
+    @Test
+    public void instanceOfAny() {
+        BooleanExpression pred1 = beanPath.instanceOf(BeanPathTest.class).or(beanPath.instanceOf(SubClass.class));
+        BooleanExpression pred2 = beanPath.instanceOfAny(BeanPathTest.class, SubClass.class);
+        assertEquals(pred1, pred2);
+        assertEquals("p instanceof class com.querydsl.core.types.dsl.BeanPathTest || " +
+                 "p instanceof class com.querydsl.core.types.dsl.BeanPathTest$SubClass", pred2.toString());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanExpressionTest.java
new file mode 100644
index 0000000000..a437d8c95a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanExpressionTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BooleanExpressionTest {
+
+    private final BooleanExpression a = new BooleanPath("a");
+    private final BooleanExpression b = new BooleanPath("b");
+    private final BooleanExpression c = new BooleanPath("c");
+
+    @Test
+    public void anyOf() {
+        assertEquals(a.or(b).or(c), Expressions.anyOf(a, b, c));
+    }
+
+    @Test
+    public void allOf() {
+        assertEquals(a.and(b).and(c), Expressions.allOf(a, b, c));
+    }
+
+    @Test
+    public void allOf_with_nulls() {
+        assertEquals("a && b", Expressions.allOf(a, b, null).toString());
+        assertEquals("a", Expressions.allOf(a, null).toString());
+        assertEquals("a", Expressions.allOf(null, a).toString());
+    }
+
+    @Test
+    public void anyOf_with_nulls() {
+        assertEquals("a || b", Expressions.anyOf(a, b, null).toString());
+        assertEquals("a", Expressions.anyOf(a, null).toString());
+        assertEquals("a", Expressions.anyOf(null, a).toString());
+    }
+
+    @Test
+    public void andAnyOf() {
+        assertEquals(a.and(b.or(c)), a.andAnyOf(b, c));
+    }
+
+    @Test
+    public void orAllOf() {
+        assertEquals(a.or(b.and(c)), a.orAllOf(b, c));
+    }
+
+    @Test
+    public void not() {
+        assertEquals(a, a.not().not());
+    }
+
+    @Test
+    public void isTrue() {
+        assertEquals(a.eq(true), a.isTrue());
+    }
+
+    @Test
+    public void isFalse() {
+        assertEquals(a.eq(false), a.isFalse());
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanTemplateTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanTemplateTest.java
new file mode 100644
index 0000000000..a8ba44276f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/BooleanTemplateTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BooleanTemplateTest {
+
+    @Test
+    public void true_() {
+        assertEquals("true", Expressions.TRUE.toString());
+    }
+
+    @Test
+    public void false_() {
+        assertEquals("false", Expressions.FALSE.toString());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/CaseBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
similarity index 76%
rename from querydsl-core/src/test/java/com/mysema/query/types/CaseBuilderTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
index 1f52f77958..99ceacfd7e 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/CaseBuilderTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,30 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types;
+package com.querydsl.core.types.dsl;
 
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.CaseBuilder;
-import com.mysema.query.types.expr.EnumExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.template.BooleanTemplate;
-
 public class CaseBuilderTest {
 
     public enum Gender {
         MALE, FEMALE
     }
 
-    public static class Customer{
+    public static class Customer {
         private long annualSpending;
         public long getAnnualSpending() {
             return annualSpending;
@@ -42,15 +34,15 @@ public long getAnnualSpending() {
     }
 
     @Test
-    public void General() {
+    public void general() {
         SimpleExpression<Object> expr = new CaseBuilder()
-            .when(BooleanTemplate.TRUE).then(new Object())
+            .when(Expressions.TRUE).then(new Object())
             .otherwise(null);
         assertNotNull(expr);
     }
 
     @Test
-    public void BooleanTyped() {
+    public void booleanTyped() {
         Customer c = alias(Customer.class, "customer");
         BooleanExpression cases = new CaseBuilder()
             .when($(c.getAnnualSpending()).gt(10000)).then(true)
@@ -64,7 +56,23 @@ public void BooleanTyped() {
     }
 
     @Test
-    public void EnumTyped() {
+    public void booleanTyped_predicate() {
+        Customer c = alias(Customer.class, "customer");
+        BooleanExpression cases = new CaseBuilder()
+                .when($(c.getAnnualSpending()).gt(20000)).then(false)
+                .when($(c.getAnnualSpending()).gt(10000)).then(true)
+                .otherwise(false);
+
+        assertEquals(
+                "case " +
+                        "when customer.annualSpending > 20000 then false " +
+                        "when customer.annualSpending > 10000 then true " +
+                        "else false " +
+                        "end", cases.toString());
+    }
+
+    @Test
+    public void enumTyped() {
         Customer c = alias(Customer.class, "customer");
         EnumExpression<Gender> cases = new CaseBuilder()
             .when($(c.getAnnualSpending()).gt(10000)).then(Gender.MALE)
@@ -78,7 +86,7 @@ public void EnumTyped() {
     }
 
     @Test
-    public void NumberTyped() {
+    public void numberTyped() {
         Customer c = alias(Customer.class, "customer");
         NumberExpression<Integer> cases = new CaseBuilder()
             .when($(c.getAnnualSpending()).gt(10000)).then(1)
@@ -96,7 +104,7 @@ public void NumberTyped() {
     }
 
     @Test
-    public void StringTyped() {
+    public void stringTyped() {
 //        CASE
 //          WHEN c.annualSpending > 10000 THEN 'Premier'
 //          WHEN c.annualSpending >  5000 THEN 'Gold'
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java
new file mode 100644
index 0000000000..259aaac47a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CaseForEqBuilderTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Time;
+
+import org.junit.Test;
+
+public class CaseForEqBuilderTest {
+
+    public enum EnumExample { A, B }
+
+    public static class Customer {
+        private long annualSpending;
+        public long getAnnualSpending() {
+            return annualSpending;
+        }
+    }
+
+    @Test
+    public void numberTyped() {
+        Customer c = alias(Customer.class, "customer");
+
+        NumberExpression<Integer> cases = $(c.getAnnualSpending())
+            .when(1000L).then(1)
+            .when(2000L).then(2)
+            .when(5000L).then(3)
+            .otherwise(4);
+
+        assertEquals(
+                "case customer.annualSpending " +
+                "when 1000 then 1 " +
+                "when 2000 then 2 " +
+                "when 5000 then 3 " +
+                "else 4 " +
+                "end", cases.toString());
+    }
+
+    @Test
+    public void stringTyped() {
+        Customer c = alias(Customer.class, "customer");
+
+        StringExpression cases = $(c.getAnnualSpending())
+            .when(1000L).then("bronze")
+            .when(2000L).then("silver")
+            .when(5000L).then("gold")
+            .otherwise("platinum");
+
+        assertNotNull(cases);
+
+    }
+
+    @Test
+    public void booleanTyped() {
+        Customer c = alias(Customer.class, "customer");
+
+        BooleanExpression cases = $(c.getAnnualSpending())
+            .when(1000L).then(true)
+            .otherwise(false);
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void dateType() {
+        Customer c = alias(Customer.class, "customer");
+
+        DateExpression<java.sql.Date> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new java.sql.Date(0))
+                .otherwise(new java.sql.Date(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void dateTimeType() {
+        Customer c = alias(Customer.class, "customer");
+
+        DateTimeExpression<java.util.Date> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new java.util.Date(0))
+                .otherwise(new java.util.Date(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void timeType() {
+        Customer c = alias(Customer.class, "customer");
+
+        TimeExpression<Time> cases = $(c.getAnnualSpending())
+                .when(1000L).then(new Time(0))
+                .otherwise(new Time(0));
+
+        assertNotNull(cases);
+    }
+
+    @Test
+    public void enumType() {
+        Customer c = alias(Customer.class, "customer");
+
+        EnumExpression<EnumExample> cases = $(c.getAnnualSpending())
+                .when(1000L).then(EnumExample.A)
+                .otherwise(EnumExample.B);
+
+        assertNotNull(cases);
+    }
+
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CoalesceTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CoalesceTest.java
new file mode 100644
index 0000000000..f819f3736f
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CoalesceTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class CoalesceTest {
+
+    private final StringPath firstname = new StringPath("firstname");
+
+    private final StringPath lastname = new StringPath("lastname");
+
+    @Test
+    public void mutable() {
+        Coalesce<String> c = new Coalesce<String>(firstname, lastname).add("xxx");
+        assertEquals("coalesce(firstname, lastname, xxx)", c.toString());
+        assertEquals("coalesce(firstname, lastname, xxx, yyy)", c.add("yyy").toString());
+    }
+
+    @Test
+    public void withList() {
+        Coalesce<String> c = new Coalesce<String>(firstname, lastname).add("xxx");
+        assertEquals("coalesce(firstname, lastname, xxx)", c.toString());
+    }
+
+    @Test
+    public void withSingleArg() {
+        Coalesce<String> c = new Coalesce<String>().add("xxx");
+        assertEquals("coalesce(xxx)", c.toString());
+    }
+
+    @Test
+    public void asComparable() {
+        Coalesce<String> c = new Coalesce<String>(firstname, lastname);
+        c.getValue().asc();
+    }
+
+    @Test
+    public void asString() {
+        Coalesce<String> c = new Coalesce<String>(firstname, lastname);
+        c.asString().lower();
+    }
+
+    @Test
+    public void withoutWarnings() {
+        Coalesce<String> c = new Coalesce<String>(String.class).add(firstname).add(lastname);
+        assertEquals("coalesce(firstname, lastname)", c.toString());
+    }
+
+    @Test
+    public void dsl() {
+        assertEquals("coalesce(firstname, lastname)", firstname.coalesce(lastname).toString());
+    }
+
+    @Test
+    public void dsl2() {
+        assertEquals("coalesce(firstname, lastname, xxx)", new Coalesce<String>().add(firstname).add(lastname).add("xxx").toString());
+    }
+
+    @Test
+    public void dsl3() {
+        assertEquals("coalesce(firstname, xxx)", firstname.coalesce("xxx").toString());
+    }
+
+    @Test
+    public void asc() {
+        assertEquals("coalesce(firstname, xxx) ASC", firstname.coalesce("xxx").asc().toString());
+    }
+
+    @Test
+    public void desc() {
+        assertEquals("coalesce(firstname, xxx) DESC", firstname.coalesce("xxx").desc().toString());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/CollectionPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CollectionPathTest.java
similarity index 77%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/CollectionPathTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/CollectionPathTest.java
index 7a78659374..e925d30938 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/CollectionPathTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/CollectionPathTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,34 +11,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class CollectionPathTest {
-    
+
     private CollectionPath<String,StringPath> stringPath = new CollectionPath<String,StringPath>(
-            String.class, StringPath.class, 
+            String.class, StringPath.class,
             PathMetadataFactory.forVariable("stringPath"));
-    
+
     @Test
-    public void ToString() {        
+    public void toString_() {
         assertEquals("stringPath", stringPath.toString());
         assertEquals("any(stringPath)", stringPath.any().toString());
         assertEquals("eqIc(any(stringPath),X)", stringPath.any().equalsIgnoreCase("X").toString());
     }
-    
+
     @Test
-    public void GetElementType() {
+    public void getElementType() {
         assertEquals(String.class, stringPath.getElementType());
     }
-    
+
     @Test
-    public void GetParameter() {        
+    public void getParameter() {
         assertEquals(String.class, stringPath.getParameter(0));
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/ComparableExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ComparableExpressionTest.java
similarity index 76%
rename from querydsl-core/src/test/java/com/mysema/query/types/expr/ComparableExpressionTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/ComparableExpressionTest.java
index 534088059b..64f95b46f3 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/expr/ComparableExpressionTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ComparableExpressionTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,25 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.expr;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.path.StringPath;
-
 public class ComparableExpressionTest {
-    
+
     private StringPath strPath = new StringPath("str");
-    
+
     @Test
-    public void Between_Start_Given() {
-        assertEquals(strPath.goe("A"), strPath.between("A", null));        
+    public void between_start_given() {
+        assertEquals(strPath.goe("A"), strPath.between("A", null));
     }
-    
+
     @Test
-    public void Between_End_Given() {
+    public void between_end_given() {
         assertEquals(strPath.loe("Z"), strPath.between(null, "Z"));
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ExpressionsTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ExpressionsTest.java
new file mode 100644
index 0000000000..af6b25d38a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ExpressionsTest.java
@@ -0,0 +1,434 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.lang.reflect.Method;
+import java.sql.Time;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.BeanUtils;
+
+public class ExpressionsTest {
+
+    private static final StringPath str = new StringPath("str");
+
+    private static final BooleanExpression a = new BooleanPath("a"), b = new BooleanPath("b");
+
+    private enum testEnum {
+        TEST,
+        TEST_2
+    }
+
+    private TimeZone timeZone = null;
+
+    @Before
+    public void setUp() {
+        this.timeZone = TimeZone.getDefault();
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
+    @After
+    public void tearDown() {
+        TimeZone.setDefault(this.timeZone);
+    }
+
+    @Test
+    public void  Signature() throws NoSuchMethodException {
+        List<String> types = Arrays.asList("boolean", "comparable", "date", "dsl", "dateTime",
+                "enum", "number", "simple", "string", "time");
+        for (String type : types) {
+            if (type.equals("boolean") || type.equals("string")) {
+                assertReturnType(Expressions.class.getMethod(type + "Path", String.class));
+                assertReturnType(Expressions.class.getMethod(type + "Path", Path.class, String.class));
+                assertReturnType(Expressions.class.getMethod(type + "Path", PathMetadata.class));
+                assertReturnType(Expressions.class.getMethod(type + "Operation", Operator.class, Expression[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", String.class, Object[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", String.class, List.class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Template.class, Object[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Template.class, List.class));
+            } else {
+                assertReturnType(Expressions.class.getMethod(type + "Path", Class.class, String.class));
+                assertReturnType(Expressions.class.getMethod(type + "Path", Class.class, Path.class, String.class));
+                assertReturnType(Expressions.class.getMethod(type + "Path", Class.class, PathMetadata.class));
+                assertReturnType(Expressions.class.getMethod(type + "Operation", Class.class, Operator.class, Expression[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Class.class, String.class, Object[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Class.class, String.class, List.class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Class.class, Template.class, Object[].class));
+                assertReturnType(Expressions.class.getMethod(type + "Template", Class.class, Template.class, List.class));
+            }
+        }
+
+        // arrays
+        assertReturnType(Expressions.class.getMethod("arrayPath", Class.class, String.class));
+        assertReturnType(Expressions.class.getMethod("arrayPath", Class.class, Path.class, String.class));
+        assertReturnType(Expressions.class.getMethod("arrayPath", Class.class, PathMetadata.class));
+    }
+
+    private void assertReturnType(Method method) {
+        assertEquals(BeanUtils.capitalize(method.getName()), method.getReturnType().getSimpleName());
+    }
+
+    @Test
+    public void as() {
+        assertEquals("null as str", Expressions.as(null, str).toString());
+        assertEquals("s as str", Expressions.as(new StringPath("s"), str).toString());
+    }
+
+    @Test
+    public void allOf() {
+        assertEquals("a && b", Expressions.allOf(a, b).toString());
+    }
+
+    @Test
+    public void allOf_with_nulls() {
+        assertEquals("a && b", Expressions.allOf(a, b, null).toString());
+        assertEquals("a", Expressions.allOf(a, null).toString());
+        assertEquals("a", Expressions.allOf(null, a).toString());
+    }
+
+    @Test
+    public void anyOf() {
+        assertEquals("a || b", Expressions.anyOf(a, b).toString());
+    }
+
+    @Test
+    public void anyOf_with_nulls() {
+        assertEquals("a || b", Expressions.anyOf(a, b, null).toString());
+        assertEquals("a", Expressions.anyOf(a, null).toString());
+        assertEquals("a", Expressions.anyOf(null, a).toString());
+    }
+
+    @Test
+    public void constant() {
+        assertEquals("X", Expressions.constant("X").toString());
+    }
+
+    @Test
+    public void constant_as() {
+        assertEquals("str as str", Expressions.constantAs("str", str).toString());
+    }
+
+    @Test
+    public void template() {
+        assertEquals("a && b", Expressions.template(Object.class, "{0} && {1}", a, b).toString());
+    }
+
+    @Test
+    public void comparableTemplate() {
+        assertEquals("a && b",
+                Expressions.comparableTemplate(Boolean.class, "{0} && {1}", a, b).toString());
+    }
+
+    @Test
+    public void numberTemplate() {
+        assertEquals("1", Expressions.numberTemplate(Integer.class, "1").toString());
+    }
+
+    @Test
+    public void stringTemplate() {
+        assertEquals("X", Expressions.stringTemplate("X").toString());
+    }
+
+    @Test
+    public void booleanTemplate() {
+        assertEquals("a && b", Expressions.booleanTemplate("{0} && {1}", a, b).toString());
+    }
+
+    @Test
+    public void subQuery() {
+        // TODO
+    }
+
+    @Test
+    public void operation() {
+        assertEquals("a && b", Expressions.operation(Boolean.class, Ops.AND, a, b).toString());
+    }
+
+    @Test
+    public void predicate() {
+        assertEquals("a && b", Expressions.predicate(Ops.AND, a, b).toString());
+    }
+
+    @Test
+    public void pathClassOfTString() {
+        assertEquals("variable", Expressions.path(String.class, "variable").toString());
+    }
+
+    @Test
+    public void pathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.path(String.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void comparablePathClassOfTString() {
+        assertEquals("variable", Expressions.comparablePath(String.class, "variable").toString());
+    }
+
+    @Test
+    public void comparablePathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.comparablePath(String.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void datePathClassOfTString() {
+        assertEquals("variable", Expressions.datePath(Date.class, "variable").toString());
+    }
+
+    @Test
+    public void datePathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.datePath(Date.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void dateTimePathClassOfTString() {
+        assertEquals("variable", Expressions.dateTimePath(Date.class, "variable").toString());
+    }
+
+    @Test
+    public void dateTimePathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.dateTimePath(Date.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void timePathClassOfTString() {
+        assertEquals("variable", Expressions.timePath(Date.class, "variable").toString());
+    }
+
+    @Test
+    public void timePathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.timePath(Date.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void numberPathClassOfTString() {
+        assertEquals("variable", Expressions.numberPath(Integer.class, "variable").toString());
+    }
+
+    @Test
+    public void numberPathClassOfTPathOfQString() {
+        assertEquals("variable.property", Expressions.numberPath(Integer.class,
+                Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void stringPathString() {
+        assertEquals("variable", Expressions.stringPath("variable").toString());
+    }
+
+    @Test
+    public void stringPathPathOfQString() {
+        assertEquals("variable.property",
+                Expressions.stringPath(Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void stringOperation() {
+        assertEquals("substring(str,2)",
+                Expressions.stringOperation(Ops.SUBSTR_1ARG, str, ConstantImpl.create(2)).toString());
+    }
+
+    @Test
+    public void booleanPathString() {
+        assertEquals("variable", Expressions.booleanPath("variable").toString());
+    }
+
+    @Test
+    public void booleanPathPathOfQString() {
+        assertEquals("variable.property",
+                Expressions.booleanPath(Expressions.path(Object.class, "variable"), "property").toString());
+    }
+
+    @Test
+    public void booleanOperation() {
+        assertEquals("a && b", Expressions.booleanOperation(Ops.AND, a, b).toString());
+    }
+
+    @Test
+    public void comparableOperation() {
+        assertEquals("a && b", Expressions.comparableOperation(Boolean.class, Ops.AND, a, b).toString());
+    }
+
+    @Test
+    public void dateOperation() {
+        assertEquals("current_date()",
+                Expressions.dateOperation(Date.class, Ops.DateTimeOps.CURRENT_DATE).toString());
+    }
+
+    @Test
+    public void dateTimeOperation() {
+        assertEquals("current_timestamp()",
+                Expressions.dateTimeOperation(Date.class, Ops.DateTimeOps.CURRENT_TIMESTAMP).toString());
+    }
+
+    @Test
+    public void timeOperation() {
+        assertEquals("current_time()",
+                Expressions.timeOperation(Time.class, Ops.DateTimeOps.CURRENT_TIME).toString());
+    }
+
+    @Test
+    public void cases() {
+        // TODO
+    }
+
+    @Test
+    public void asBoolean_returns_a_corresponding_BooleanExpression_for_a_given_Expression() {
+        assertEquals("true = true", Expressions.asBoolean(Expressions.constant(true)).isTrue().toString());
+    }
+
+    @Test
+    public void asBoolean_returns_a_corresponding_BooleanExpression_for_a_given_Constant() {
+        assertEquals("true = true", Expressions.asBoolean(true).isTrue().toString());
+    }
+
+    @Test
+    public void asBoolean_equals_works_for_returned_values() {
+        assertEquals(Expressions.asBoolean(true), Expressions.asBoolean(true));
+        assertNotEquals(Expressions.asBoolean(true), Expressions.asBoolean(false));
+    }
+
+    @Test
+    public void asComparable_returns_a_corresponding_ComparableExpression_for_a_given_Expression() {
+        assertEquals("1 = 1",
+                Expressions.asComparable(Expressions.constant(1L)).eq(Expressions.constant(1L)).toString());
+    }
+
+    @Test
+    public void asComparable_returns_a_corresponding_ComparableExpression_for_a_given_Constant() {
+        assertEquals("1 = 1", Expressions.asComparable(1L).eq(1L).toString());
+    }
+
+    @Test
+    public void asComparable_equals_works_for_returned_values() {
+        assertEquals(Expressions.asComparable(1L), Expressions.asComparable(1L));
+        assertNotEquals(Expressions.asComparable(1L), Expressions.asComparable(2L));
+    }
+
+    @Test
+    public void asDate_returns_a_corresponding_DateExpression_for_a_given_Expression() {
+        assertEquals("year(Thu Jan 01 00:00:00 UTC 1970)",
+                Expressions.asDate(Expressions.constant(new Date(1L))).year().toString());
+    }
+
+    @Test
+    public void asDate_returns_a_corresponding_DateExpression_for_a_given_Constant() {
+        assertEquals("year(Thu Jan 01 00:00:00 UTC 1970)", Expressions.asDate(new Date(1L)).year().toString());
+    }
+
+    @Test
+    public void asDate_equals_works_for_returned_values() {
+        assertEquals(Expressions.asDate(new Date(1L)).year(), Expressions.asDate(new Date(1L)).year());
+        assertNotEquals(Expressions.asDate(new Date(1L)).year(), Expressions.asDate(new Date(2L)).year());
+    }
+
+    @Test
+    public void asDateTime_returns_a_corresponding_DateTimeExpression_for_a_given_Expression() {
+        assertEquals("min(Thu Jan 01 00:00:00 UTC 1970)",
+                Expressions.asDateTime(Expressions.constant(new Date(1L))).min().toString());
+    }
+
+    @Test
+    public void asDateTime_returns_a_corresponding_DateTimeExpression_for_a_given_Constant() {
+        assertEquals("min(Thu Jan 01 00:00:00 UTC 1970)", Expressions.asDateTime(new Date(1L)).min().toString());
+    }
+
+    @Test
+    public void asDateTime_equals_works_for_returned_values() {
+        assertEquals(Expressions.asDateTime(new Date(1L)).min(), Expressions.asDateTime(new Date(1L)).min());
+        assertNotEquals(Expressions.asDateTime(new Date(1L)).min(), Expressions.asDateTime(new Date(2L)).min());
+    }
+
+    @Test
+    public void asTime_returns_a_corresponding_TimeExpression_for_a_given_Expression() {
+        assertEquals("hour(Thu Jan 01 00:00:00 UTC 1970)",
+                Expressions.asTime(Expressions.constant(new Date(1L))).hour().toString());
+    }
+
+    @Test
+    public void asTime_returns_a_corresponding_TimeExpression_for_a_given_Constant() {
+        assertEquals("hour(Thu Jan 01 00:00:00 UTC 1970)", Expressions.asTime(new Date(1L)).hour().toString());
+    }
+
+    @Test
+    public void asTime_equals_works_for_returned_values() {
+        assertEquals(Expressions.asTime(new Date(1L)).hour(), Expressions.asTime(new Date(1L)).hour());
+        assertNotEquals(Expressions.asTime(new Date(1L)).hour(), Expressions.asTime(new Date(2L)).hour());
+    }
+
+    @Test
+    public void asEnum_returns_a_corresponding_EnumExpression_for_a_given_Expression() {
+        assertEquals("ordinal(TEST)", Expressions.asEnum(Expressions.constant(testEnum.TEST)).ordinal().toString());
+    }
+
+    @Test
+    public void asEnum_returns_a_corresponding_EnumExpression_for_a_given_Constant() {
+        assertEquals("ordinal(TEST)", Expressions.asEnum(testEnum.TEST).ordinal().toString());
+    }
+
+    @Test
+    public void asEnum_equals_works_for_returned_values() {
+        assertEquals(Expressions.asEnum(testEnum.TEST), Expressions.asEnum(testEnum.TEST));
+        assertNotEquals(Expressions.asEnum(testEnum.TEST), Expressions.asEnum(testEnum.TEST_2));
+    }
+
+    @Test
+    public void asNumber_returns_a_corresponding_NumberExpression_for_a_given_Expression() {
+        assertEquals("1 + 1", Expressions.asNumber(Expressions.constant(1L)).add(Expressions.constant(1L)).toString());
+    }
+
+    @Test
+    public void asNumber_returns_a_corresponding_NumberExpression_for_a_given_Constant() {
+        assertEquals("1 + 1", Expressions.asNumber(1L).add(Expressions.constant(1L)).toString());
+    }
+
+    @Test
+    public void asNumber_equals_works_for_returned_values() {
+        assertEquals(Expressions.asNumber(42L), Expressions.asNumber(42L));
+        assertNotEquals(Expressions.asNumber(42L), Expressions.asNumber(256L));
+    }
+
+    @Test
+    public void asString_returns_a_corresponding_StringExpression_for_a_given_Expression() {
+        assertEquals("left + right",
+                Expressions.asString(Expressions.constant("left")).append(Expressions.constant("right")).toString());
+    }
+
+    @Test
+    public void asString_returns_a_corresponding_StringExpression_for_a_given_Constant() {
+        assertEquals("left + right", Expressions.asString("left").append(Expressions.constant("right")).toString());
+    }
+
+    @Test
+    public void asString_equals_works_for_returned_values() {
+        assertEquals(Expressions.asString("foo"), Expressions.asString("foo"));
+        assertNotEquals(Expressions.asString("foo"), Expressions.asString("bar"));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/Gender.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/Gender.java
new file mode 100644
index 0000000000..4851a8bfa1
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/Gender.java
@@ -0,0 +1,5 @@
+package com.querydsl.core.types.dsl;
+
+enum Gender {
+    MALE, FEMALE
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/ListPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ListPathTest.java
similarity index 78%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/ListPathTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/ListPathTest.java
index 3d1a0f3d55..de8fedf1e0 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/ListPathTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/ListPathTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,37 +11,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class ListPathTest {
-    
+
     private ListPath<String,StringPath> stringPath = new ListPath<String,StringPath>(
-            String.class, StringPath.class, 
+            String.class, StringPath.class,
             PathMetadataFactory.forVariable("stringPath"));
-    
+
     @Test
-    public void ToString() {        
+    public void toString_() {
         assertEquals("stringPath", stringPath.toString());
         assertEquals("any(stringPath)", stringPath.any().toString());
         assertEquals("eqIc(stringPath.get(0),X)", stringPath.get(0).equalsIgnoreCase("X").toString());
         assertEquals("eqIc(any(stringPath),X)", stringPath.any().equalsIgnoreCase("X").toString());
-        assertEquals("stringPath.get(0)", stringPath.get(ConstantImpl.create(0)).toString());        
+        assertEquals("stringPath.get(0)", stringPath.get(ConstantImpl.create(0)).toString());
     }
-    
+
     @Test
-    public void GetElementType() {
+    public void getElementType() {
         assertEquals(String.class, stringPath.getElementType());
     }
-    
+
     @Test
-    public void GetParameter() {        
+    public void getParameter() {
         assertEquals(String.class, stringPath.getParameter(0));
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/MapPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/MapPathTest.java
similarity index 76%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/MapPathTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/MapPathTest.java
index 457f00676e..534ab0b20a 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/MapPathTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/MapPathTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,37 +11,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-import com.mysema.query.types.ConstantImpl;
+import com.querydsl.core.types.ConstantImpl;
 
 public class MapPathTest {
 
     private MapPath<String,String,StringPath> mapPath = new MapPath<String,String,StringPath>(
             String.class, String.class, StringPath.class, "p");
-    
+
     @Test
-    public void Get() {
+    public void get() {
         assertNotNull(mapPath.get("X"));
         assertNotNull(mapPath.get(ConstantImpl.create("X")));
     }
-    
+
     @Test
-    public void GetKeytType() {
+    public void getKeyType() {
         assertEquals(String.class, mapPath.getKeyType());
     }
 
     @Test
-    public void GetValueType() {
+    public void getValueType() {
         assertEquals(String.class, mapPath.getValueType());
     }
-    
+
     @Test
-    public void GetParameter() {
+    public void getParameter() {
         assertEquals(String.class, mapPath.getParameter(0));
         assertEquals(String.class, mapPath.getParameter(1));
     }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberExpressionTest.java
new file mode 100644
index 0000000000..ca1362d11e
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberExpressionTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class NumberExpressionTest {
+
+    private NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "int");
+
+    @Test
+    public void between_start_given() {
+        assertEquals(intPath.goe(1L), intPath.between(1L, null));
+    }
+
+    @Test
+    public void between_end_given() {
+        assertEquals(intPath.loe(3L), intPath.between(null, 3L));
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberPathTest.java
new file mode 100644
index 0000000000..1ff83c60a2
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/NumberPathTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.Operation;
+
+public class NumberPathTest {
+
+    private NumberPath<Byte> bytePath = new NumberPath<Byte>(Byte.class, "bytePath");
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void bytePath_in() {
+        Operation<?> operation = (Operation<?>) bytePath.in(1, 2, 3);
+        Constant<List<Byte>> rightArg = (Constant<List<Byte>>) operation.getArg(1);
+        List<Byte> numbers = rightArg.getConstant();
+        assertEquals(Byte.valueOf((byte) 1), numbers.get(0));
+        assertEquals(Byte.valueOf((byte) 2), numbers.get(1));
+        assertEquals(Byte.valueOf((byte) 3), numbers.get(2));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void bytePath_notIn() {
+        Operation<?> operation = (Operation<?>) bytePath.notIn(1, 2, 3);
+        Constant<List<Byte>> rightArg = (Constant<List<Byte>>) operation.getArg(1);
+        List<Byte> numbers = rightArg.getConstant();
+        assertEquals(Byte.valueOf((byte) 1), numbers.get(0));
+        assertEquals(Byte.valueOf((byte) 2), numbers.get(1));
+        assertEquals(Byte.valueOf((byte) 3), numbers.get(2));
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/OperationTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/OperationTest.java
new file mode 100644
index 0000000000..dd196f4262
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/OperationTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Time;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+
+public class OperationTest {
+
+    enum ExampleEnum { A, B }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void various() {
+        Expression[] args = new Expression[]{new StringPath("x"), new StringPath("y")};
+        List<Operation<?>> operations = new ArrayList<Operation<?>>();
+//        paths.add(new ArrayOperation(String[].class, "p"));
+        operations.add(new BooleanOperation(Ops.EQ, args));
+        operations.add(new ComparableOperation(String.class, Ops.SUBSTR_1ARG, args));
+        operations.add(new DateOperation(Date.class, Ops.DateTimeOps.CURRENT_DATE, args));
+        operations.add(new DateTimeOperation(Date.class,Ops.DateTimeOps.CURRENT_TIMESTAMP, args));
+        operations.add(new EnumOperation(ExampleEnum.class,Ops.ALIAS, args));
+        operations.add(new NumberOperation(Integer.class,Ops.ADD, args));
+        operations.add(new SimpleOperation(String.class,Ops.TRIM, args));
+        operations.add(new StringOperation(Ops.CONCAT, args));
+        operations.add(new TimeOperation(Time.class,Ops.DateTimeOps.CURRENT_TIME, args));
+
+        for (Operation<?> operation : operations) {
+            Operation<?> other = ExpressionUtils.operation(operation.getType(), operation.getOperator(),
+                    new ArrayList<>(operation.getArgs()));
+            assertEquals(operation.toString(), operation.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT));
+            assertEquals(operation.hashCode(), other.hashCode());
+            assertEquals(operation, other);
+            assertNotNull(operation.getOperator());
+            assertNotNull(operation.getArgs());
+            assertNotNull(operation.getType());
+        }
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderFactoryTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderFactoryTest.java
new file mode 100644
index 0000000000..938f992803
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderFactoryTest.java
@@ -0,0 +1,48 @@
+
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class PathBuilderFactoryTest {
+
+    @Test
+    public void create() {
+        PathBuilderFactory factory = new PathBuilderFactory("");
+        PathBuilder<Object> pathBuilder = factory.create(Object.class);
+        assertEquals("object", pathBuilder.toString());
+        assertEquals(Object.class, pathBuilder.getType());
+
+        pathBuilder.get("prop", Object.class);
+        pathBuilder.get("prop", String.class);
+        pathBuilder.get("prop", Object.class);
+    }
+
+    @Test
+    public void create_withSuffix() {
+        PathBuilderFactory factory = new PathBuilderFactory("_");
+        PathBuilder<Object> pathBuilder = factory.create(Object.class);
+        assertEquals("object_", pathBuilder.toString());
+        assertEquals(Object.class, pathBuilder.getType());
+
+        pathBuilder.get("prop", Object.class);
+        pathBuilder.get("prop", String.class);
+        pathBuilder.get("prop", Object.class);
+    }
+
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderTest.java
new file mode 100644
index 0000000000..54020885db
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.*;
+
+import java.sql.Time;
+import java.util.Date;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.util.BeanMap;
+
+public class PathBuilderTest {
+
+    @Test
+    public void getEnum() {
+        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
+        EnumPath<Gender> enumPath = entityPath.getEnum("gender", Gender.class);
+        assertNotNull(enumPath.ordinal());
+        assertEquals(enumPath, entityPath.get(enumPath));
+    }
+
+    @Test
+    public void getByExample() {
+        User user = new User();
+        user.setFirstName("firstName");
+        user.setLastName("lastName");
+        String byExample = getByExample(user).toString();
+        assertTrue(byExample.contains("entity.lastName = lastName"));
+        assertTrue(byExample.contains("entity.firstName = firstName"));
+    }
+
+    @Test
+    public void getArray() {
+        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
+        ArrayPath<String[], String> array = entityPath.getArray("array", String[].class);
+        assertEquals(String[].class, array.getType());
+        assertEquals(String.class, array.getElementType());
+    }
+
+    @Test
+    public void getList() {
+        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
+        entityPath.getList("list", String.class, StringPath.class).get(0).lower();
+        entityPath.getList("list", String.class).get(0);
+    }
+
+    @Test
+    public void getMap() {
+        PathBuilder<User> entityPath = new PathBuilder<User>(User.class, "entity");
+        entityPath.getMap("map", String.class, String.class, StringPath.class).get("").lower();
+        entityPath.getMap("map", String.class, String.class).get("");
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> BooleanBuilder getByExample(T entity) {
+        PathBuilder<T> entityPath = new PathBuilder<T>((Class<T>) entity.getClass(), "entity");
+        BooleanBuilder conditions = new BooleanBuilder();
+        Map<String, Object> beanMap = new BeanMap(entity);
+        for (Map.Entry<String, Object> entry : beanMap.entrySet()) {
+            if (!entry.getKey().equals("class")) {
+                if (entry.getValue() != null) {
+                    conditions.and(entityPath.get(entry.getKey()).eq(entry.getValue()));
+                }
+            }
+        }
+        return conditions;
+    }
+
+    @Test
+    public void get() {
+        PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity");
+        NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "int");
+        StringPath strPath = new StringPath("str");
+        BooleanPath booleanPath = new BooleanPath("boolean");
+
+        assertEquals("entity.int", entity.get(intPath).toString());
+        assertEquals("entity.str", entity.get(strPath).toString());
+        assertEquals("entity.boolean", entity.get(booleanPath).toString());
+
+        assertEquals("entity.int", entity.get(entity.get(intPath)).toString());
+    }
+
+    @Test
+    public void various() {
+        PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity");
+        entity.getBoolean("boolean");
+        entity.getCollection("col", User.class);
+        entity.getComparable("comparable", Comparable.class);
+        entity.getDate("date", Date.class);
+        entity.getDateTime("dateTime", Date.class);
+        entity.getList("list", User.class);
+        entity.getMap("map", String.class, User.class);
+        entity.getNumber("number", Integer.class);
+        entity.getSet("set", User.class);
+        entity.getSimple("simple", Object.class);
+        entity.getString("string");
+        entity.getTime("time", Time.class);
+    }
+
+    @Test
+    public void calling_get_with_the_same_name_and_different_types_returns_correct_type() {
+            PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity");
+            String pathName = "some_path";
+            assertEquals(Object.class, entity.get(pathName).getType());
+            assertEquals(Integer.class, entity.get(pathName, Integer.class).getType());
+            assertEquals(User.class, entity.get(pathName, User.class).getType());
+    }
+
+    @Test
+    public void calling_get_with_the_same_name_and_different_types_returns_specific_type_when_validating() {
+            PathBuilder<User> entity = new PathBuilder<User>(User.class, "entity", PathBuilderValidator.FIELDS);
+            String pathName = "username";
+            assertEquals(String.class, entity.get(pathName).getType());
+            assertEquals(String.class, entity.get(pathName, Comparable.class).getType());
+            assertEquals(String.class, entity.get(pathName, Object.class).getType());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderValidatorTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderValidatorTest.java
new file mode 100644
index 0000000000..c95896d7e7
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathBuilderValidatorTest.java
@@ -0,0 +1,69 @@
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.junit.Test;
+
+public class PathBuilderValidatorTest {
+
+    public static class Customer {
+        String name;
+        Collection<Integer> collection;
+        Map<String, Integer> map;
+    }
+
+    public static class ExtendedCustomer extends Customer { }
+
+    public static class Project {
+        public String getName() {
+            return "";
+        }
+
+        public Collection<Integer> getCollection() {
+            return null;
+        }
+
+        public Map<String, Integer> getMap() {
+            return null;
+        }
+    }
+
+    public static class ExtendedProject extends Project {
+        public boolean isStarted() {
+            return true;
+        }
+    }
+
+    @Test
+    public void defaults() {
+        assertEquals(String.class, PathBuilderValidator.DEFAULT.validate(Customer.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.DEFAULT.validate(ExtendedCustomer.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.DEFAULT.validate(Project.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.DEFAULT.validate(ExtendedProject.class, "name", String.class));
+    }
+
+    @Test
+    public void fields() {
+        assertEquals(String.class, PathBuilderValidator.FIELDS.validate(Customer.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.FIELDS.validate(ExtendedCustomer.class, "name", String.class));
+        assertEquals(Integer.class, PathBuilderValidator.FIELDS.validate(Customer.class, "collection", Collection.class));
+        assertEquals(Integer.class, PathBuilderValidator.FIELDS.validate(Customer.class, "map", Map.class));
+        assertNull(PathBuilderValidator.FIELDS.validate(Project.class, "name", String.class));
+        assertNull(PathBuilderValidator.FIELDS.validate(ExtendedProject.class, "name", String.class));
+    }
+
+    @Test
+    public void properties() {
+        assertNull(PathBuilderValidator.PROPERTIES.validate(Customer.class, "name", String.class));
+        assertNull(PathBuilderValidator.PROPERTIES.validate(ExtendedCustomer.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.PROPERTIES.validate(Project.class, "name", String.class));
+        assertEquals(String.class, PathBuilderValidator.PROPERTIES.validate(ExtendedProject.class, "name", String.class));
+        assertEquals(Boolean.class, PathBuilderValidator.PROPERTIES.validate(ExtendedProject.class, "started", Boolean.class));
+        assertEquals(Integer.class, PathBuilderValidator.PROPERTIES.validate(Project.class, "collection", Collection.class));
+        assertEquals(Integer.class, PathBuilderValidator.PROPERTIES.validate(Project.class, "map", Map.class));
+    }
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/PathInitsTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathInitsTest.java
similarity index 79%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/PathInitsTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathInitsTest.java
index d8ceff9f42..98c519a9e7 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/PathInitsTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathInitsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -21,34 +21,34 @@
 public class PathInitsTest {
 
     @Test
-    public void Default() {
+    public void defaultInits() {
         assertFalse(PathInits.DEFAULT.isInitialized(""));
     }
-    
+
     @Test
-    public void IsInitialized() {
+    public void isInitialized() {
         PathInits inits = new PathInits(".2").get("");
         assertFalse(inits.isInitialized("1"));
         assertTrue(inits.isInitialized("2"));
     }
-        
+
     @Test
-    public void Wildcard() {
+    public void wildcard() {
         assertTrue(new PathInits("*").isInitialized(""));
     }
 
     @Test
-    public void Wildcard2() {
-        PathInits inits = new PathInits(".*").get("");        
+    public void wildcard2() {
+        PathInits inits = new PathInits(".*").get("");
         assertTrue(inits.isInitialized("1"));
         assertTrue(inits.isInitialized("2"));
     }
-    
+
     @Test
-    public void Deep_Wildcard() {
+    public void deep_wildcard() {
         PathInits inits = new PathInits("*.*").get("");
         assertTrue(inits.isInitialized("1"));
         assertTrue(inits.isInitialized("2"));
     }
-    
+
 }
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathTest.java
new file mode 100644
index 0000000000..6a5a9b101a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/PathTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.*;
+import static com.querydsl.core.alias.Alias.$;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.sql.Time;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import org.junit.Test;
+
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryTransient;
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.Annotations;
+
+public class PathTest {
+
+    enum ExampleEnum { A, B }
+
+    public static class Superclass {
+
+        @Nullable
+        public String getProperty4() {
+            return null;
+        }
+    }
+
+    @QueryEntity
+    public static class Entity extends Superclass {
+
+        @Nullable
+        private String property1;
+
+        private String property2;
+
+        @QueryTransient
+        private String property3;
+
+        public String getProperty1() {
+            return property1;
+        }
+
+        @NotNull
+        public String getProperty2() {
+            return property2;
+        }
+
+        @NotNull
+        public String getProperty3() {
+            return property3;
+        }
+
+    }
+
+    @Test
+    public void getAnnotatedElement() {
+        Entity entity = Alias.alias(Entity.class);
+        AnnotatedElement element = $(entity).getAnnotatedElement();
+
+        // type
+        assertEquals(Entity.class, element);
+    }
+
+    @Test
+    public void getAnnotatedElement_for_property() {
+        Entity entity = Alias.alias(Entity.class);
+        AnnotatedElement property1 = $(entity.getProperty1()).getAnnotatedElement();
+        AnnotatedElement property2 = $(entity.getProperty2()).getAnnotatedElement();
+        AnnotatedElement property3 = $(entity.getProperty3()).getAnnotatedElement();
+        AnnotatedElement property4 = $(entity.getProperty4()).getAnnotatedElement();
+
+        // property (field)
+        assertEquals(Annotations.class, property1.getClass());
+
+        // property2 (method)
+        assertEquals(Annotations.class, property2.getClass());
+
+        // property3 (both)
+        assertEquals(Field.class, property3.getClass());
+        assertTrue(property3.isAnnotationPresent(QueryTransient.class));
+        assertNotNull(property3.getAnnotation(QueryTransient.class));
+
+        // property 4 (superclass)
+        assertEquals(Annotations.class, property4.getClass());
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void equals() {
+        assertEquals(new StringPath("s"),  new StringPath("s"));
+        assertEquals(new BooleanPath("b"), new BooleanPath("b"));
+        assertEquals(new NumberPath<Integer>(Integer.class,"n"), new NumberPath<Integer>(Integer.class,"n"));
+
+        assertEquals(new ArrayPath(String[].class, "p"), ExpressionUtils.path(String.class, "p"));
+        assertEquals(new BooleanPath("p"), ExpressionUtils.path(Boolean.class, "p"));
+        assertEquals(new ComparablePath(String.class,"p"), ExpressionUtils.path(String.class, "p"));
+        assertEquals(new DatePath(Date.class,"p"), ExpressionUtils.path(Date.class, "p"));
+        assertEquals(new DateTimePath(Date.class,"p"), ExpressionUtils.path(Date.class, "p"));
+        assertEquals(new EnumPath(ExampleEnum.class,"p"), ExpressionUtils.path(ExampleEnum.class, "p"));
+        assertEquals(new NumberPath(Integer.class,"p"), ExpressionUtils.path(Integer.class, "p"));
+        assertEquals(new StringPath("p"), ExpressionUtils.path(String.class, "p"));
+        assertEquals(new TimePath(Time.class,"p"), ExpressionUtils.path(Time.class, "p"));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void various_properties() {
+        Path<?> parent = ExpressionUtils.path(Object.class, "parent");
+        List<Path<?>> paths = new ArrayList<Path<?>>();
+        paths.add(new ArrayPath(String[].class, parent, "p"));
+        paths.add(new BeanPath(Object.class, parent, "p"));
+        paths.add(new BooleanPath(parent, "p"));
+        paths.add(new CollectionPath(String.class, StringPath.class, parent, "p"));
+        paths.add(new ComparablePath(String.class, parent, "p"));
+        paths.add(new DatePath(Date.class, parent, "p"));
+        paths.add(new DateTimePath(Date.class, parent, "p"));
+        paths.add(new EnumPath(ExampleEnum.class, parent, "p"));
+        paths.add(new ListPath(String.class, StringPath.class, parent, "p"));
+        paths.add(new MapPath(String.class, String.class, StringPath.class, parent, "p"));
+        paths.add(new NumberPath(Integer.class, parent, "p"));
+        paths.add(new SetPath(String.class, StringPath.class, parent, "p"));
+        paths.add(new SimplePath(String.class, parent, "p"));
+        paths.add(new StringPath(parent, "p"));
+        paths.add(new TimePath(Time.class, parent, "p"));
+
+        for (Path<?> path : paths) {
+            Path other = ExpressionUtils.path(path.getType(), PathMetadataFactory.forProperty(parent, "p"));
+            assertEquals(path.toString(), path.accept(ToStringVisitor.DEFAULT, Templates.DEFAULT));
+            assertEquals(path.hashCode(), other.hashCode());
+            assertEquals(path, other);
+            assertNotNull(path.getMetadata());
+            assertNotNull(path.getType());
+            assertEquals(parent, path.getRoot());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void various() {
+        List<Path<?>> paths = new ArrayList<Path<?>>();
+        paths.add(new ArrayPath(String[].class, "p"));
+        paths.add(new BeanPath(Object.class, "p"));
+        paths.add(new BooleanPath("p"));
+        paths.add(new CollectionPath(String.class, StringPath.class, "p"));
+        paths.add(new ComparablePath(String.class,"p"));
+        paths.add(new DatePath(Date.class,"p"));
+        paths.add(new DateTimePath(Date.class,"p"));
+        paths.add(new EnumPath(ExampleEnum.class,"p"));
+        paths.add(new ListPath(String.class, StringPath.class, "p"));
+        paths.add(new MapPath(String.class, String.class, StringPath.class, "p"));
+        paths.add(new NumberPath(Integer.class,"p"));
+        paths.add(new SetPath(String.class, StringPath.class, "p"));
+        paths.add(new SimplePath(String.class,"p"));
+        paths.add(new StringPath("p"));
+        paths.add(new TimePath(Time.class,"p"));
+
+        for (Path<?> path : paths) {
+            Path other = ExpressionUtils.path(path.getType(), "p");
+            assertEquals(path.toString(), path.accept(ToStringVisitor.DEFAULT, null));
+            assertEquals(path.hashCode(), other.hashCode());
+            assertEquals(path, other);
+            assertNotNull(path.getMetadata());
+            assertNotNull(path.getType());
+            assertEquals(path, path.getRoot());
+        }
+    }
+
+    @Test
+    public void parent_path() {
+        Path<Object> person = ExpressionUtils.path(Object.class, "person");
+        Path<String> name = ExpressionUtils.path(String.class, person, "name");
+        assertEquals("person.name", name.toString());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/QTupleTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/QTupleTest.java
new file mode 100644
index 0000000000..167189f344
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/QTupleTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QTuple;
+
+public class QTupleTest {
+
+    private StringPath first = new StringPath("x");
+
+    private NumberPath<Integer> second = new NumberPath<Integer>(Integer.class,"y");
+
+    private BooleanPath third = new BooleanPath("z");
+
+    private QTuple tupleExpression = Projections.tuple(first, second, third);
+
+    @Test
+    public void newInstanceObjectArray() {
+        Tuple tuple = tupleExpression.newInstance("1", 42, true);
+        assertEquals(3, tuple.size());
+        assertEquals("1", tuple.get(0, String.class));
+        assertEquals(Integer.valueOf(42), tuple.get(1, Integer.class));
+        assertEquals(Boolean.TRUE, tuple.get(2, Boolean.class));
+        assertEquals("1", tuple.get(first));
+        assertEquals(Integer.valueOf(42), tuple.get(second));
+        assertEquals(Boolean.TRUE, tuple.get(third));
+
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/path/SetPathTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/SetPathTest.java
similarity index 76%
rename from querydsl-core/src/test/java/com/mysema/query/types/path/SetPathTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/types/dsl/SetPathTest.java
index 10706d21bd..b059fe370d 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/path/SetPathTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/SetPathTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,34 +11,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.types.path;
+package com.querydsl.core.types.dsl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.PathMetadataFactory;
+import com.querydsl.core.types.PathMetadataFactory;
 
 public class SetPathTest {
-    
+
     private SetPath<String,StringPath> stringPath = new SetPath<String,StringPath>(
-            String.class, StringPath.class, 
+            String.class, StringPath.class,
             PathMetadataFactory.forVariable("stringPath"));
-    
+
     @Test
-    public void ToString() {        
+    public void toString_() {
         assertEquals("stringPath", stringPath.toString());
         assertEquals("any(stringPath)", stringPath.any().toString());
         assertEquals("eqIc(any(stringPath),X)", stringPath.any().equalsIgnoreCase("X").toString());
     }
-    
+
     @Test
-    public void GetElementType() {
+    public void getElementType() {
         assertEquals(String.class, stringPath.getElementType());
     }
-    
+
     @Test
-    public void GetParameter() {        
+    public void getParameter() {
         assertEquals(String.class, stringPath.getParameter(0));
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/SimpleExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/SimpleExpressionTest.java
new file mode 100644
index 0000000000..16f8bbdf69
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/SimpleExpressionTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+import java.sql.Time;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+
+public class SimpleExpressionTest {
+
+    enum ExampleEnum { A, B }
+
+    @Test
+    public void as_usage() {
+        SimpleExpression<String> str = new StringPath("str");
+        assertEquals("str as alias", str.as("alias").toString());
+        assertEquals("str as alias", str.as(new StringPath("alias")).toString());
+    }
+
+    @Test
+    public void case_() {
+        SimpleExpression<String> str = new StringPath("str");
+        // nullif(str, 'xxx')
+        str.when("xxx").thenNull().otherwise(str);
+    }
+
+    @Test
+    public void subclasses_override_as() throws SecurityException, NoSuchMethodException {
+        List<Class<?>> classes = Arrays.<Class<?>>asList(
+                BooleanExpression.class,
+                ComparableExpression.class,
+                DateExpression.class,
+                DateTimeExpression.class,
+                EnumExpression.class,
+                NumberExpression.class,
+                SimpleExpression.class,
+                StringExpression.class,
+                TimeExpression.class);
+
+        for (Class<?> cl : classes) {
+            Method asPath = cl.getDeclaredMethod("as", Path.class);
+            assertEquals(cl, asPath.getReturnType());
+
+            Method asString = cl.getDeclaredMethod("as", String.class);
+            assertEquals(cl, asString.getReturnType());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void various() {
+        List<DslExpression<?>> paths = new ArrayList<DslExpression<?>>();
+        paths.add(new ArrayPath(String[].class, "p"));
+        paths.add(new BeanPath(Object.class, "p"));
+        paths.add(new BooleanPath("p"));
+        paths.add(new CollectionPath(String.class, StringPath.class, "p"));
+        paths.add(new ComparablePath(String.class,"p"));
+        paths.add(new DatePath(Date.class,"p"));
+        paths.add(new DateTimePath(Date.class,"p"));
+        paths.add(new EnumPath(ExampleEnum.class,"p"));
+        paths.add(new ListPath(String.class, StringPath.class, "p"));
+        paths.add(new MapPath(String.class, String.class, StringPath.class, "p"));
+        paths.add(new NumberPath(Integer.class,"p"));
+        paths.add(new SetPath(String.class, StringPath.class, "p"));
+        paths.add(new SimplePath(String.class,"p"));
+        paths.add(new StringPath("p"));
+        paths.add(new TimePath(Time.class,"p"));
+
+        for (DslExpression<?> expr : paths) {
+            Path<?> o = ExpressionUtils.path(expr.getType(), "o");
+            assertEquals(ExpressionUtils.operation(expr.getType(), Ops.ALIAS, expr, o), expr.as("o"));
+            Path p = ExpressionUtils.path(expr.getType(), "p");
+            assertEquals(ExpressionUtils.operation(expr.getType(), Ops.ALIAS, expr, p), expr.as(p));
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void eq_null() {
+        new SimplePath<Object>(Object.class, "path").eq((Object) null);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/TemplateExpressionTest.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/TemplateExpressionTest.java
new file mode 100644
index 0000000000..08b2358430
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/TemplateExpressionTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.types.dsl;
+
+import static org.junit.Assert.*;
+
+import java.sql.Time;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.types.*;
+
+public class TemplateExpressionTest {
+
+    @Test
+    public void constructors() {
+        Templates templates = new JavaTemplates();
+        Template template = TemplateFactory.DEFAULT.create("{0}");
+        List<Expression<?>> args = Collections.singletonList(new StringPath("a"));
+        List<TemplateExpression<?>> customs = Arrays.<TemplateExpression<?>>asList(
+            new BooleanTemplate(template, args),
+            new ComparableTemplate<String>(String.class, template, args),
+            new DateTemplate<java.sql.Date>(java.sql.Date.class, template, args),
+            new DateTimeTemplate<Date>(Date.class, template, args),
+            new EnumTemplate<PropertyType>(PropertyType.class, template, args),
+            new NumberTemplate<Integer>(Integer.class, template, args),
+            new SimpleTemplate<Object>(Object.class, template, args),
+            new StringTemplate(template, args),
+            new TimeTemplate<Time>(Time.class, template, args)
+        );
+        TemplateExpression<?> prev = null;
+        for (TemplateExpression<?> custom : customs) {
+            assertNotNull(custom);
+            assertNotNull(custom.getTemplate());
+            assertNotNull(custom.getType());
+            assertNotNull(custom.getArgs());
+            assertEquals(custom, custom);
+            if (prev != null) {
+                assertFalse(custom.equals(prev));
+            }
+            //assertEquals(custom.getType().hashCode(), custom.hashCode());
+            custom.accept(ToStringVisitor.DEFAULT, templates);
+            prev = custom;
+        }
+    }
+
+    @Test
+    public void factoryMethods() {
+        String template = "";
+        Expression<Boolean> arg = ConstantImpl.create(true);
+
+        Expressions.booleanTemplate(template, arg);
+        Expressions.comparableTemplate(String.class, template, arg);
+        Expressions.dateTemplate(Date.class, template, arg);
+        Expressions.dateTimeTemplate(Date.class, template, arg);
+        Expressions.enumTemplate(PropertyType.class, template, arg);
+        Expressions.numberTemplate(Integer.class, template, arg);
+        Expressions.template(Object.class, template, arg);
+        Expressions.stringTemplate(template, arg);
+        Expressions.timeTemplate(Time.class, template, arg);
+    }
+
+    @Test
+    public void factoryMethods2() {
+        Template template = TemplateFactory.DEFAULT.create("");
+        Expression<Boolean> arg = ConstantImpl.create(true);
+
+        Expressions.booleanTemplate(template, arg);
+        Expressions.comparableTemplate(String.class, template, arg);
+        Expressions.dateTemplate(Date.class, template, arg);
+        Expressions.dateTimeTemplate(Date.class, template, arg);
+        Expressions.enumTemplate(PropertyType.class, template, arg);
+        Expressions.numberTemplate(Integer.class, template, arg);
+        Expressions.template(Object.class, template, arg);
+        Expressions.stringTemplate(template, arg);
+        Expressions.timeTemplate(Time.class, template, arg);
+    }
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/types/dsl/User.java b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/User.java
new file mode 100644
index 0000000000..ed7c4652fb
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/types/dsl/User.java
@@ -0,0 +1,41 @@
+package com.querydsl.core.types.dsl;
+
+public class User {
+
+    private String firstName, lastName, username;
+
+    private Gender gender;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Gender getGender() {
+        return gender;
+    }
+
+    public void setGender(Gender gender) {
+        this.gender = gender;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-core/src/test/java/com/mysema/util/ArrayUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/ArrayUtilsTest.java
similarity index 85%
rename from querydsl-core/src/test/java/com/mysema/util/ArrayUtilsTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/util/ArrayUtilsTest.java
index a48749e32a..140686f40c 100644
--- a/querydsl-core/src/test/java/com/mysema/util/ArrayUtilsTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/ArrayUtilsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 
 import org.junit.Test;
 
 public class ArrayUtilsTest {
-    
+
     @Test
     public void test() {
         Object[] array = ArrayUtils.combine(5, new Object[]{"a","b"}, new Object[]{"c","d","e"});
diff --git a/querydsl-core/src/test/java/com/querydsl/core/util/BeanMapTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/BeanMapTest.java
new file mode 100644
index 0000000000..19e9af5c23
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/BeanMapTest.java
@@ -0,0 +1,114 @@
+package com.querydsl.core.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class BeanMapTest {
+
+    private BeanMap beanMap;
+
+    @Before
+    public void setUp() {
+        beanMap = new BeanMap(new Entity());
+    }
+
+    @Test
+    public void size() {
+        assertEquals(4, beanMap.size());
+    }
+
+    @Test
+    public void clear() {
+        beanMap.clear();
+        assertEquals(4, beanMap.size());
+    }
+
+    @Test
+    public void primitives() {
+        beanMap.put("id", 5);
+        assertEquals(5, ((Entity) beanMap.getBean()).getId());
+    }
+
+    @Test
+    public void beanMap() {
+        assertEquals(0, new BeanMap().size());
+    }
+
+    @Test
+    public void beanMapObject() {
+        assertEquals(4, new BeanMap(new Entity()).size());
+    }
+
+    @Test
+    public void toString_() {
+        assertEquals("BeanMap<null>", new BeanMap().toString());
+    }
+
+    @Test
+    public void clone_() throws CloneNotSupportedException {
+        assertEquals(beanMap, beanMap.clone());
+    }
+
+    @Test
+    public void putAllWriteable() {
+
+    }
+
+    @Test
+    public void containsKeyString() {
+        assertTrue(beanMap.containsKey("id"));
+    }
+
+    @Test
+    public void containsValueObject() {
+
+    }
+
+    @Test
+    public void getString() {
+        beanMap.put("firstName", "John");
+        assertEquals("John", beanMap.get("firstName"));
+    }
+
+    @Test
+    public void keySet() {
+        assertEquals(new HashSet<>(Arrays.asList("id", "class", "firstName", "lastName")), beanMap.keySet());
+    }
+
+    @Test
+    public void entrySet() {
+        beanMap.put("firstName", "John");
+        assertFalse(beanMap.entrySet().isEmpty());
+    }
+
+    @Test
+    @Ignore
+    public void values() {
+        beanMap.put("firstName", "John");
+        assertEquals(Arrays.asList(0, null, Entity.class, "John"), beanMap.values());
+    }
+
+    @Test
+    public void getType() {
+
+    }
+
+    @Test
+    public void getBean() {
+        assertEquals(Entity.class, beanMap.getBean().getClass());
+    }
+
+    @Test
+    public void setBean() {
+        Entity entity = new Entity();
+        beanMap.setBean(entity);
+        assertTrue(entity == beanMap.getBean());
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/util/BeanUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/BeanUtilsTest.java
similarity index 88%
rename from querydsl-core/src/test/java/com/mysema/util/BeanUtilsTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/util/BeanUtilsTest.java
index 9880050cb3..89653ddc5f 100644
--- a/querydsl-core/src/test/java/com/mysema/util/BeanUtilsTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/BeanUtilsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,7 +20,7 @@
 public class BeanUtilsTest {
 
     @Test
-    public void Capitalize() {
+    public void capitalize() {
         assertEquals("X", BeanUtils.capitalize("x"));
         assertEquals("Prop", BeanUtils.capitalize("prop"));
         assertEquals("URL",  BeanUtils.capitalize("URL"));
@@ -29,7 +29,7 @@ public void Capitalize() {
     }
 
     @Test
-    public void Uncapitalize() {
+    public void uncapitalize() {
         assertEquals("x",    BeanUtils.uncapitalize("X"));
         assertEquals("prop", BeanUtils.uncapitalize("Prop"));
         assertEquals("URL",  BeanUtils.uncapitalize("URL"));
diff --git a/querydsl-core/src/test/java/com/mysema/query/util/ConstructorUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/ConstructorUtilsTest.java
similarity index 83%
rename from querydsl-core/src/test/java/com/mysema/query/util/ConstructorUtilsTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/util/ConstructorUtilsTest.java
index 710f83a98d..b477913e66 100644
--- a/querydsl-core/src/test/java/com/mysema/query/util/ConstructorUtilsTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/ConstructorUtilsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2014, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,17 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.util;
+package com.querydsl.core.util;
 
-import static com.mysema.query.util.ConstructorUtils.*;
-import static com.mysema.util.ArrayUtils.isEmpty;
+import static com.querydsl.core.util.ArrayUtils.isEmpty;
+import static com.querydsl.core.util.ConstructorUtils.getConstructorParameters;
 import static org.junit.Assert.*;
 
-import com.mysema.query.types.ProjectionExample;
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
+
 import org.junit.Test;
 
+import com.querydsl.core.types.ProjectionExample;
+
 /**
  *
  * @author Shredder121
@@ -29,7 +31,7 @@
 public class ConstructorUtilsTest {
 
     @Test
-    public void GetDefaultConstructor() {
+    public void getDefaultConstructor() {
         Class<?>[] args = {};
         Constructor<?> emptyDefaultConstructor = getConstructor(ProjectionExample.class, args);
         Constructor<?> nullDefaultConstructor = getConstructor(ProjectionExample.class, null);
@@ -40,7 +42,7 @@ public void GetDefaultConstructor() {
     }
 
     @Test
-    public void GetSimpleConstructor() {
+    public void getSimpleConstructor() {
         Class<?>[] args = {Long.class};
         Constructor<?> constructor = getConstructor(ProjectionExample.class, args);
         assertNotNull(constructor);
@@ -48,7 +50,7 @@ public void GetSimpleConstructor() {
     }
 
     @Test
-    public void GetDefaultConstructorParameters() {
+    public void getDefaultConstructorParameters() {
         Class<?>[] args = {Long.class, String.class};
         Class<?>[] expected = {Long.TYPE, String.class};
         Class<?>[] constructorParameters = getConstructorParameters(ProjectionExample.class, args);
diff --git a/querydsl-core/src/test/java/com/querydsl/core/util/Entity.java b/querydsl-core/src/test/java/com/querydsl/core/util/Entity.java
new file mode 100644
index 0000000000..efe8300827
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/Entity.java
@@ -0,0 +1,35 @@
+package com.querydsl.core.util;
+
+public class Entity {
+
+    private int id;
+
+    private String firstName, lastName;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+
+
+}
diff --git a/querydsl-core/src/test/java/com/querydsl/core/util/MathUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/MathUtilsTest.java
new file mode 100644
index 0000000000..5c971a311a
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/MathUtilsTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import static org.junit.Assert.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class MathUtilsTest {
+
+    @Rule
+    public final ExpectedException expectedException = ExpectedException.none();
+
+    @Test
+    public void sum() {
+        assertEquals(Integer.valueOf(5), MathUtils.sum(2, 3.0));
+    }
+
+    @Test
+    public void difference() {
+        assertEquals(Integer.valueOf(2), MathUtils.difference(5, 3.0));
+    }
+
+    @Test
+    public void cast_returns_correct_type() {
+        checkCast(1, BigDecimal.class);
+        checkCast(1, BigInteger.class);
+        checkCast(1, Double.class);
+        checkCast(1, Float.class);
+        checkCast(1, Integer.class);
+        checkCast(1, Long.class);
+        checkCast(1, Short.class);
+        checkCast(1, Byte.class);
+    }
+
+    @Test
+    public void cast_returns_argument_as_is_when_compatible() {
+        checkSame(BigDecimal.ONE, BigDecimal.class);
+        checkSame(BigInteger.ONE, BigInteger.class);
+        checkSame((double) 1, Double.class);
+        checkSame((float) 1, Float.class);
+        checkSame(1, Integer.class);
+        checkSame((long) 1, Long.class);
+        checkSame((short) 1, Short.class);
+        checkSame((byte) 1, Byte.class);
+    }
+
+    @Test
+    public void cast_returns_null_when_input_is_null() {
+        Integer result = MathUtils.cast(null, Integer.class);
+        assertNull(result);
+    }
+
+    @Test
+    public void cast_throws_on_unsupported_numbers() {
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("Unsupported target type");
+
+        checkCast(1, AtomicInteger.class);
+    }
+
+    private static void checkCast(Number value, Class<? extends Number> targetClass) {
+        Number target = MathUtils.cast(value, targetClass);
+        assertSame(targetClass, target.getClass());
+    }
+
+    private static <N extends Number> void checkSame(N value, Class<N> targetClass) {
+        N target = MathUtils.cast(value, targetClass);
+        assertSame(value, target);
+    }
+
+}
diff --git a/querydsl-core/src/test/java/com/mysema/util/MultiIteratorTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
similarity index 88%
rename from querydsl-core/src/test/java/com/mysema/util/MultiIteratorTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
index bd8cb88bb5..0e12eee58c 100644
--- a/querydsl-core/src/test/java/com/mysema/util/MultiIteratorTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/MultiIteratorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,25 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.util;
+package com.querydsl.core.util;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.*;
 
-import static java.util.Arrays.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import org.junit.Test;
 
 import com.mysema.commons.lang.IteratorAdapter;
 
-
+@SuppressWarnings("unchecked")
 public class MultiIteratorTest {
-    
+
     private MultiIterator it;
 
     private List<Integer> list1 = Arrays.asList(1, 2);
@@ -39,7 +34,7 @@ public class MultiIteratorTest {
     private List<Integer> list3, list4;
 
     @Test
-    public void EmptyList() {
+    public void emptyList() {
         it = new MultiIterator(Arrays.asList(list1, list2));
         while (it.hasNext()) {
             it.next();
@@ -48,13 +43,13 @@ public void EmptyList() {
     }
 
     @Test
-    public void OneLevel() {
-        it = new MultiIterator(Arrays.asList(list1));
+    public void oneLevel() {
+        it = new MultiIterator(Collections.singletonList(list1));
         assertIteratorEquals(Arrays.asList(row(1), row(2)).iterator(), it);
     }
 
     @Test
-    public void TwoLevels() {
+    public void twoLevels() {
         list2 = Arrays.asList(10, 20, 30);
         it = new MultiIterator(Arrays.asList(list1, list2));
         Iterator<Object[]> base = Arrays.asList(row(1, 10), row(1, 20),
@@ -63,7 +58,7 @@ public void TwoLevels() {
     }
 
     @Test
-    public void ThreeLevels() {
+    public void threeLevels() {
         list1 = Arrays.asList(1, 2);
         list2 = Arrays.asList(10, 20, 30);
         list3 = Arrays.asList(100, 200, 300, 400);
@@ -80,7 +75,7 @@ public void ThreeLevels() {
     }
 
     @Test
-    public void FourLevels() {
+    public void fourLevels() {
         list1 = Arrays.asList(1, 2);
         list2 = Arrays.asList(10, 20, 30);
         list3 = Arrays.asList(100, 200, 300, 400);
@@ -101,25 +96,25 @@ public void FourLevels() {
     }
 
     @Test
-    public void FourLevels2() {
+    public void fourLevels2() {
         list1 = new ArrayList<Integer>(100);
-        for (int i = 0; i < 100; i++)
+        for (int i = 0; i < 100; i++) {
             list1.add(i + 1);
+        }
         list2 = list1;
         it = new MultiIterator(Arrays.asList(list1, list2));
         while (it.hasNext()) {
             it.next();
         }
     }
-    
-    @SuppressWarnings("unchecked")
+
     @Test
     public void test() {
         List<Integer> list1 = asList(1, 2, 3, 4);
         List<Integer> list2 = asList(10, 20, 30);
         MultiIterator<Integer> iterator = new MultiIterator<Integer>(asList(list1, list2));
         List<Object[]> list = IteratorAdapter.asList(iterator);
-        
+
         assertEquals(asList(1, 10), asList(list.get(0)));
         assertEquals(asList(1, 20), asList(list.get(1)));
         assertEquals(asList(1, 30), asList(list.get(2)));
@@ -133,7 +128,7 @@ public void test() {
         assertEquals(asList(4, 20), asList(list.get(10)));
         assertEquals(asList(4, 30), asList(list.get(11)));
     }
-    
+
 
     protected void assertIteratorEquals(Iterator<Object[]> a, Iterator<Object[]> b) {
         while (a.hasNext()) {
diff --git a/querydsl-core/src/test/java/com/mysema/query/util/NullSafeComparableComparatorTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/NullSafeComparableComparatorTest.java
similarity index 80%
rename from querydsl-core/src/test/java/com/mysema/query/util/NullSafeComparableComparatorTest.java
rename to querydsl-core/src/test/java/com/querydsl/core/util/NullSafeComparableComparatorTest.java
index 29a14ed805..14f3d00dfc 100644
--- a/querydsl-core/src/test/java/com/mysema/query/util/NullSafeComparableComparatorTest.java
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/NullSafeComparableComparatorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.util;
+package com.querydsl.core.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,27 +23,27 @@ public class NullSafeComparableComparatorTest {
     private final NullSafeComparableComparator<String> comparator = new NullSafeComparableComparator<String>();
 
     @Test
-    public void Null_Before_Object() {
+    public void null_before_object() {
         assertTrue(comparator.compare(null, "X") < 0);
     }
 
     @Test
-    public void Object_After_Null() {
+    public void object_after_null() {
         assertTrue(comparator.compare("X", null) > 0);
     }
 
     @Test
-    public void Object_Eq_Object() {
+    public void object_eq_object() {
         assertEquals(0, comparator.compare("X", "X"));
     }
 
     @Test
-    public void Object_Lt_Object() {
+    public void object_lt_object() {
         assertTrue(comparator.compare("X", "Y") < 0);
     }
 
     @Test
-    public void Object_Gt_Object() {
+    public void object_gt_object() {
         assertTrue(comparator.compare("Z", "Y") > 0);
     }
 
diff --git a/querydsl-core/src/test/java/com/querydsl/core/util/ReflectionUtilsTest.java b/querydsl-core/src/test/java/com/querydsl/core/util/ReflectionUtilsTest.java
new file mode 100644
index 0000000000..8a976fc043
--- /dev/null
+++ b/querydsl-core/src/test/java/com/querydsl/core/util/ReflectionUtilsTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.SimpleExpression;
+
+public class ReflectionUtilsTest {
+
+    String property;
+
+    @Test
+    public void getAnnotatedElement() {
+        AnnotatedElement annotatedElement = ReflectionUtils.getAnnotatedElement(ReflectionUtilsTest.class, "property", String.class);
+        assertNotNull(annotatedElement);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void getImplementedInterfaces() {
+        Set<Class<?>> ifaces = ReflectionUtils.getImplementedInterfaces(SimpleExpression.class);
+        assertEquals(new HashSet<Class<?>>(Arrays.asList(Serializable.class, Expression.class)), ifaces);
+    }
+
+}
diff --git a/querydsl-core/template.mf b/querydsl-core/template.mf
deleted file mode 100644
index 9a8e05291e..0000000000
--- a/querydsl-core/template.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.core
-Bundle-Name: Querydsl Core
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Excluded-Imports: com.infradna.tool.bridge_method_injector
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  javax.annotation.*;version="0",  
-  net.sf.cglib.proxy.*;version="${cglib.version}";resolution:=optional,
-  com.google.common.*;version="${guava.version}"
diff --git a/querydsl-docs/etc/jpa2_comparison.txt b/querydsl-docs/etc/jpa2_comparison.txt
index 2f4e47d4ab..c104938f5d 100644
--- a/querydsl-docs/etc/jpa2_comparison.txt
+++ b/querydsl-docs/etc/jpa2_comparison.txt
@@ -1,279 +1,279 @@
-Below is a comparison of JPA 2 Criteria and Querydsl HQL queries.
-
-The purpose of this comparison is to show the benefits of using a dynamic metamodel like the Querydsl metamodel compared to a static metamodel like the JPA 2 Criteria metamodel.
-
-Feel free to ask for more JPA 2 -> Querydsl translations in the comments of this post.
-
-The differences of the metamodels themselves are not discussed here. Both Querydsl and JPA 2 use APT for metamodel generation, so the configuration 
-overhead is comparable.
-
-
-[b]Selecting an entity[/b]
-
-[code]
-CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
-Root<Person> personRoot = criteria.from( Person.class );
-criteria.select( personRoot );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<Person> people = em.createQuery( criteria ).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<Person> people = query.from(person).where(person.eyeColor.eq("brown"))
-  .list(person);
-[/code]
-
-
-[b]Selecting an attribute[/b]
-
-[code]
-CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
-Root<Person> personRoot = criteria.from( Person.class );
-criteria.select( personRoot.get( Person_.age ) );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<Integer> ages = em.createQuery( criteria ).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<Integer> ages = query.from(person).where(person.eyeColor.eq("brown"))
-  .list(person.age);
-[/code]
-
-
-[b]Select an expression[/b]
-
-
-[code]
-CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
-Root<Person> personRoot = criteria.from( Person.class );
-criteria.select( builder.max( personRoot.get( Person_.age ) ) );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-Integer maxAge = em.createQuery( criteria ).getSingleResult();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-Integer maxAge = query.from(person)
-    .where(person.eyeColor.eq("brown"))
-    .uniqueResult(person.age.max());
-[/code]
-
-[b]Selecting an array[/b]
-
-[code]
-CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
-Root<Person> personRoot = criteria.from( Person.class );
-Path<Long> idPath = personRoot.get( Person_.id );
-Path<Integer> agePath = personRoot.get( Person_.age );
-criteria.select( builder.array( idPath, agePath ) );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<Object[]> valueArray = em.createQuery( criteria ).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<Object[]> valueArray = query.from(person)
-    .where(person.eyeColor.eq("brown"))
-    .list(person.id, person.age);
-[/code]
-
-
-[b]Selecting an array (2)[/b]
-
-[code]
-CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
-Root<Person> personRoot = criteria.from( Person.class );
-Path<Long> idPath = personRoot.get( Person_.id );
-Path<Integer> agePath = personRoot.get( Person_.age );
-criteria.multiselect( idPath, agePath );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<Object[]> valueArray = em.createQuery( criteria ).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<Object[]> valueArray = query.from(person)
-  .where(person.eyeColor.eq("brown"))
-  .list(person.id, person.age);
-[/code]
-
-[b]Selecting an wrapper[/b]
-
-[code]
-CriteriaQuery<PersonWrapper> criteria = builder.createQuery( PersonWrapper.class);
-Root<Person> personRoot = criteria.from( Person.class );
-criteria.select(
-    builder.construct(
-      PersonWrapper.class,
-      personRoot.get( Person_.id ),
-      personRoot.get( Person_.age )
-    ));
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<PersonWrapper> people = em.createQuery( criteria ).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<PersonWrapper> people = query.from(person)
-    .where(person.eyeColor.eq("brown"))
-    .list(new QPersonWrapper(person.id, person.age))
-[/code]
-
-[b]Selecting a tuple[/b]
-
-[code]
-CriteriaQuery<Tuple> criteria = builder.createTupleQuery();
-Root<Person> personRoot = criteria.from( Person.class );
-Path<Long> idPath = personRoot.get( Person_.id );
-Path<Integer> agePath = personRoot.get( Person_.age );
-criteria.multiselect( idPath, agePath );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
-List<Tuple> tuples = em.createQuery( criteria ).getResultList();
-[/code]
-
-Not supported in Querydsl. Feel free to provide snippets how this could be done.
-
-
-[b]Using parameters[/b]
-
-[code]
-CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
-Root<Person> personRoot = criteria.from( Person.class );
-criteria.select( personRoot );
-ParameterExpression<String> eyeColorParam = builder.parameter( String.class );
-criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), eyeColorParam ) );
-TypedQuery<Person> query = em.createQuery( criteria );
-query.setParameter( eyeColorParam, "brown" );
-List<Person> people = em.createQuery( query).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson person = QPerson.person;
-List<Person> people = query.from(person)
-  .where(person.eyeColor.eq("brown"))
-  .list(person);
-[/code]
-
-
-[b]Multiple roots[/b]
-
-[code]
-CriteriaQuery query = builder.createQuery();
-Root<Person> men = query.from( Person.class );
-Root<Person> women = query.from( Person.class );
-Predicate menRestriction = builder.and(
-    builder.equal( men.get( Person_.gender ), Gender.MALE ),
-    builder.equal( men.get( Person_.relationshipStatus ), 
-RelationshipStatus.SINGLE )
-);
-Predicate womenRestriction = builder.and(
-    builder.equal( women.get( Person_.gender ), Gender.FEMALE ),
-    builder.equal( women.get( Person_.relationshipStatus ), 
-RelationshipStatus.SINGLE )
-);
-query.where( builder.and( menRestriction, womenRestriction ) );
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QPerson men = new QPerson("men");
-QPerson women = new QPerson("women");
-query.from(men, women).where(
-      men.gender.eq(Gender.MALE),
-      men.relationshipStatus.eq(RelationshipStatsu.SINGLE),
-      women.gender.eq(Gender.FEMALE),
-      women.relationshipStatsu.eq(RelationshipStatsu.SINGLE));    
-[/code]
-
-[b]Fetch joins[/b]
-
-[code]
-CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
-Root<Employee> emp = query.from(Employee.class);
-emp.fetch("address");
-query.select(emp);
-List<Employee> employees = em.createQuery( query).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QEmployee employee = QEmployee.employee;
-List<Employee> employees = query.from(employee).join(employee.address).fetch()
-    .list(employee);
-[/code]
-
-[b]Left join[/b]
-
-[code]
-CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
-Root<Employee> emp = query.from(Employee.class);
-emp.fetch(Empoyee_.phones, JoinType.LEFT);
-query.select(emp).distinct(true);
-List<Employee> employees = em.createQuery( query).getResultList();
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QEmployee employee = QEmployee.employee;
-List<Employee> employees = query.from(employee)
-    .leftJoin(employee.phones).fetch()
-    .listDistinct(employee);
-[/code]
-
-[b]Subquery[/b]
-
-[code]
-CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
-Root<Employee> emp = query.from(Employee.class);
-Subquery<Project> sq = query.subquery(Project.class);
-Root<Project> projecti sq.from(Project.class);
-Join<Project,Employeee> sqEmp = project.join(Project_.employees);
-sq.select(project)
-  .where(cb.equals(sqEmp, emp),
-         cb.eqauls(project.get(Project_.name),
-                   cb.parameter(String.class,"project")));
-criteria.add(cb.exists());
-[/code]
-
-becomes
-
-[code]
-JPAQuery query = new JPAQuery(em);
-QEmployee employee = QEmployee.employee;
-QEmployee emp = new QEmployee("emp");
-QProject project = QProject.project;
-query.from(employee).where(
-    new HQLSubQuery().from(project).join(project.employees, emp)
-      .where(emp.eq(employee), project.name.eq("some name"))
-      .list(project).exists()
-  ).list(employee);
-[/code]
\ No newline at end of file
+Below is a comparison of JPA 2 Criteria and Querydsl HQL queries.
+
+The purpose of this comparison is to show the benefits of using a dynamic metamodel like the Querydsl metamodel compared to a static metamodel like the JPA 2 Criteria metamodel.
+
+Feel free to ask for more JPA 2 -> Querydsl translations in the comments of this post.
+
+The differences of the metamodels themselves are not discussed here. Both Querydsl and JPA 2 use APT for metamodel generation, so the configuration 
+overhead is comparable.
+
+
+[b]Selecting an entity[/b]
+
+[code]
+CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
+Root<Person> personRoot = criteria.from( Person.class );
+criteria.select( personRoot );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<Person> people = em.createQuery( criteria ).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<Person> people = query.from(person).where(person.eyeColor.eq("brown"))
+  .list(person);
+[/code]
+
+
+[b]Selecting an attribute[/b]
+
+[code]
+CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
+Root<Person> personRoot = criteria.from( Person.class );
+criteria.select( personRoot.get( Person_.age ) );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<Integer> ages = em.createQuery( criteria ).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<Integer> ages = query.from(person).where(person.eyeColor.eq("brown"))
+  .list(person.age);
+[/code]
+
+
+[b]Select an expression[/b]
+
+
+[code]
+CriteriaQuery<Integer> criteria = builder.createQuery( Integer.class );
+Root<Person> personRoot = criteria.from( Person.class );
+criteria.select( builder.max( personRoot.get( Person_.age ) ) );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+Integer maxAge = em.createQuery( criteria ).getSingleResult();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+Integer maxAge = query.from(person)
+    .where(person.eyeColor.eq("brown"))
+    .uniqueResult(person.age.max());
+[/code]
+
+[b]Selecting an array[/b]
+
+[code]
+CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
+Root<Person> personRoot = criteria.from( Person.class );
+Path<Long> idPath = personRoot.get( Person_.id );
+Path<Integer> agePath = personRoot.get( Person_.age );
+criteria.select( builder.array( idPath, agePath ) );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<Object[]> valueArray = em.createQuery( criteria ).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<Object[]> valueArray = query.from(person)
+    .where(person.eyeColor.eq("brown"))
+    .list(person.id, person.age);
+[/code]
+
+
+[b]Selecting an array (2)[/b]
+
+[code]
+CriteriaQuery<Object[]> criteria = builder.createQuery( Object[].class );
+Root<Person> personRoot = criteria.from( Person.class );
+Path<Long> idPath = personRoot.get( Person_.id );
+Path<Integer> agePath = personRoot.get( Person_.age );
+criteria.multiselect( idPath, agePath );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<Object[]> valueArray = em.createQuery( criteria ).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<Object[]> valueArray = query.from(person)
+  .where(person.eyeColor.eq("brown"))
+  .list(person.id, person.age);
+[/code]
+
+[b]Selecting an wrapper[/b]
+
+[code]
+CriteriaQuery<PersonWrapper> criteria = builder.createQuery( PersonWrapper.class);
+Root<Person> personRoot = criteria.from( Person.class );
+criteria.select(
+    builder.construct(
+      PersonWrapper.class,
+      personRoot.get( Person_.id ),
+      personRoot.get( Person_.age )
+    ));
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<PersonWrapper> people = em.createQuery( criteria ).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<PersonWrapper> people = query.from(person)
+    .where(person.eyeColor.eq("brown"))
+    .list(new QPersonWrapper(person.id, person.age))
+[/code]
+
+[b]Selecting a tuple[/b]
+
+[code]
+CriteriaQuery<Tuple> criteria = builder.createTupleQuery();
+Root<Person> personRoot = criteria.from( Person.class );
+Path<Long> idPath = personRoot.get( Person_.id );
+Path<Integer> agePath = personRoot.get( Person_.age );
+criteria.multiselect( idPath, agePath );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), "brown" ) );
+List<Tuple> tuples = em.createQuery( criteria ).getResultList();
+[/code]
+
+Not supported in Querydsl. Feel free to provide snippets how this could be done.
+
+
+[b]Using parameters[/b]
+
+[code]
+CriteriaQuery<Person> criteria = builder.createQuery( Person.class );
+Root<Person> personRoot = criteria.from( Person.class );
+criteria.select( personRoot );
+ParameterExpression<String> eyeColorParam = builder.parameter( String.class );
+criteria.where( builder.equal( personRoot.get( Person_.eyeColor ), eyeColorParam ) );
+TypedQuery<Person> query = em.createQuery( criteria );
+query.setParameter( eyeColorParam, "brown" );
+List<Person> people = em.createQuery( query).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson person = QPerson.person;
+List<Person> people = query.from(person)
+  .where(person.eyeColor.eq("brown"))
+  .list(person);
+[/code]
+
+
+[b]Multiple roots[/b]
+
+[code]
+CriteriaQuery query = builder.createQuery();
+Root<Person> men = query.from( Person.class );
+Root<Person> women = query.from( Person.class );
+Predicate menRestriction = builder.and(
+    builder.equal( men.get( Person_.gender ), Gender.MALE ),
+    builder.equal( men.get( Person_.relationshipStatus ), 
+RelationshipStatus.SINGLE )
+);
+Predicate womenRestriction = builder.and(
+    builder.equal( women.get( Person_.gender ), Gender.FEMALE ),
+    builder.equal( women.get( Person_.relationshipStatus ), 
+RelationshipStatus.SINGLE )
+);
+query.where( builder.and( menRestriction, womenRestriction ) );
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QPerson men = new QPerson("men");
+QPerson women = new QPerson("women");
+query.from(men, women).where(
+      men.gender.eq(Gender.MALE),
+      men.relationshipStatus.eq(RelationshipStatus.SINGLE),
+      women.gender.eq(Gender.FEMALE),
+      women.relationshipStatus.eq(RelationshipStatus.SINGLE));
+[/code]
+
+[b]Fetch joins[/b]
+
+[code]
+CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
+Root<Employee> emp = query.from(Employee.class);
+emp.fetch("address");
+query.select(emp);
+List<Employee> employees = em.createQuery( query).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QEmployee employee = QEmployee.employee;
+List<Employee> employees = query.from(employee).join(employee.address).fetch()
+    .list(employee);
+[/code]
+
+[b]Left join[/b]
+
+[code]
+CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
+Root<Employee> emp = query.from(Employee.class);
+emp.fetch(Employee_.phones, JoinType.LEFT);
+query.select(emp).distinct(true);
+List<Employee> employees = em.createQuery( query).getResultList();
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QEmployee employee = QEmployee.employee;
+List<Employee> employees = query.from(employee)
+    .leftJoin(employee.phones).fetch()
+    .listDistinct(employee);
+[/code]
+
+[b]Subquery[/b]
+
+[code]
+CriteriaQuery<Employee> query = builder.createQuery(Employee.class);
+Root<Employee> emp = query.from(Employee.class);
+Subquery<Project> sq = query.subquery(Project.class);
+Root<Project> project sq.from(Project.class);
+Join<Project,Employee> sqEmp = project.join(Project_.employees);
+sq.select(project)
+  .where(cb.equals(sqEmp, emp),
+         cb.equals(project.get(Project_.name),
+                   cb.parameter(String.class,"project")));
+criteria.add(cb.exists());
+[/code]
+
+becomes
+
+[code]
+JPAQuery query = new JPAQuery(em);
+QEmployee employee = QEmployee.employee;
+QEmployee emp = new QEmployee("emp");
+QProject project = QProject.project;
+query.from(employee).where(
+    new HQLSubQuery().from(project).join(project.employees, emp)
+      .where(emp.eq(employee), project.name.eq("some name"))
+      .list(project).exists()
+  ).list(employee);
+[/code]
diff --git a/querydsl-docs/pom.xml b/querydsl-docs/pom.xml
index 4d68710df2..1243a8c101 100644
--- a/querydsl-docs/pom.xml
+++ b/querydsl-docs/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.2.1</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-docs</artifactId>
   <name>Querydsl - Documentation</name>
   <packaging>jdocbook</packaging>
@@ -17,6 +17,7 @@
   <properties>
     <translation>en-US</translation>
     <xslthl.config>http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml</xslthl.config>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
   <build>
@@ -24,7 +25,7 @@
       <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jdocbook-plugin</artifactId>
-        <version>2.3.5</version>
+        <version>2.3.10</version>
         <extensions>true</extensions>
         <configuration>
           <masterTranslation>${translation}</masterTranslation>
@@ -61,7 +62,7 @@
           <dependency>
             <groupId>net.sf.xslthl</groupId>
             <artifactId>xslthl</artifactId>
-            <version>2.0.1</version>          
+            <version>2.1.3</version>          
           </dependency>
         </dependencies>
       </plugin>
@@ -91,4 +92,27 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <repositories>
+    <repository>
+      <id>jboss</id>
+      <url>https://repository.jboss.org/nexus/content/repositories/releases</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>jboss-thirdparty</id>
+      <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
 </project>
diff --git a/querydsl-docs/src/main/docbook/css/highlight.css b/querydsl-docs/src/main/docbook/css/highlight.css
index 2c94b74073..7efd8fd13a 100644
--- a/querydsl-docs/src/main/docbook/css/highlight.css
+++ b/querydsl-docs/src/main/docbook/css/highlight.css
@@ -1,39 +1,39 @@
-/* 
-   code highlight CSS resemblign the Eclipse IDE default color schema
-   @author Costin Leau
-*/
-
-.hl-keyword {
-  color: #7F0055;
-  font-weight: bold; 
-}
-
-.hl-comment {
-  color: #3F5F5F;
-  font-style: italic;
-}
-
-.hl-multiline-comment {
-  color: #3F5FBF;
-  font-style: italic;
-}
-
-.hl-tag {
-  color: #3F7F7F;
-}
-
-.hl-attribute {
-  color: #7F007F;
-}
-
-.hl-value {
-  color: #2A00FF;
-}
-
-.hl-string {
-  color: #2A00FF;
-}
-
-.hl-annotation {
-  font-style: normal;
-}
\ No newline at end of file
+/* 
+   code highlight CSS resembling the Eclipse IDE default color schema
+   @author Costin Leau
+*/
+
+.hl-keyword {
+  color: #7F0055;
+  font-weight: bold; 
+}
+
+.hl-comment {
+  color: #3F5F5F;
+  font-style: italic;
+}
+
+.hl-multiline-comment {
+  color: #3F5FBF;
+  font-style: italic;
+}
+
+.hl-tag {
+  color: #3F7F7F;
+}
+
+.hl-attribute {
+  color: #7F007F;
+}
+
+.hl-value {
+  color: #2A00FF;
+}
+
+.hl-string {
+  color: #2A00FF;
+}
+
+.hl-annotation {
+  font-style: normal;
+}
diff --git a/querydsl-docs/src/main/docbook/css/stylesheet.css b/querydsl-docs/src/main/docbook/css/stylesheet.css
index 8c48ae1e60..5955cb2a3e 100644
--- a/querydsl-docs/src/main/docbook/css/stylesheet.css
+++ b/querydsl-docs/src/main/docbook/css/stylesheet.css
@@ -1,119 +1,204 @@
-@IMPORT url("highlight.css");
-
-html {
-  padding:       0pt;
-  margin:        0pt;
-}
-
-body {
-  color: #333333;  
-  font-family:   Arial, Sans-serif;
-  margin: 15px 30px;
-}
-
-div.book, div.chapter, div.appendix, div.part, body > div.sect1 {
-  margin-left: 10%;
-  margin-right: 10%;	
-}	
-
-div {
-  margin:        0pt;
-}
-
-p {
-  text-align:    justify;
-}
-
-hr {
-    background: none repeat scroll 0 0 #CCCCFF;
-    border: 1px solid #CCCCC;
-}
-
-h1,h2,h3,h4 {
-  /*color:         #234623;*/
-  font-family:   Arial, Sans-serif;
-}
-
-pre {
-  line-height:   1.0;
-  /*color:         black;*/
-}
-
-pre.programlisting {
-  font-size:     10pt;
-  padding:       6pt 10pt;
-  border: 1px solid #CCCCCC;
-  border-radius: 3px 3px 3px 3px;
-  background:    #f8f8f8;
-  clear:         both;
-}
-
-div.table {
-  margin:        1em;
-  padding:       0.5em;
-  text-align:    center;
-}
-
-div.table table {
-  display:       table;
-  width:         100%;
-}
-
-div.table td {
-  padding-left:  7px;
-  padding-right: 7px;
-}
-
-.sidebar {
-  float: right;
-  margin: 10px 0 10px 30px;
-  padding: 10px 20px 20px 20px;
-  width: 33%;
-  border: 1px solid black;
-  background-color: #F4F4F4;
-  font-size: 14px;
-}
-
-.mediaobject {
-  padding-top: 30px; 
-  padding-bottom: 30px; 
-}
-
-.legalnotice {
-  font-family: Verdana, Arial, helvetica, sans-serif;
-  font-size: 12px;
-  font-style: italic;
-}
-
-p.releaseinfo {
-  font-size: 100%;
-  font-weight: bold;
-  font-family: Verdana, Arial, helvetica, sans-serif;
-  padding-top: 10px;
-}
-
-p.pubdate {
-    font-size: 120%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-span.productname {
-    font-size: 200%;
-    font-weight: bold; 
-    font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-.code {
-	font-size: 14px;
-	/*color: 0000C0;*/
-}
-
-div.table td, div.table th {
-    padding: 7px;
-}
-
-a {
-	text-decoration: none;
-	/*color: #3030D8;*/
-}
+@import url("highlight.css");
+
+html {
+    padding:       0pt;
+    margin:        0pt;
+}
+
+body {
+    color: #333333;
+    font-family:   Arial, Sans-serif;
+    margin: 15px 30px;
+    display: block;
+}
+
+div.book {
+    margin-top: 5em;
+    margin-left: 10%;
+    margin-right: 10%;
+}
+
+div {
+    margin:        0pt;
+}
+
+p {
+    text-align:    justify;
+}
+
+hr {
+    border: 1px solid #CCCCCC;
+    background: #CCCCCC;
+}
+
+h1,h2,h3,h4,h5,h6 {
+    color: #000000;
+    cursor: text;
+    font-weight: bold;
+    margin: 30px 0 10px;
+    padding: 0;
+}
+
+h1,h2,h3 {
+    margin: 40px 0 10px;
+}
+
+h1 {
+    margin: 70px 0 30px;
+    padding-top: 20px;
+}
+
+div.part h1 {
+    border-top: 1px dotted #CCCCCC;
+}
+
+h1,h1 code {
+    font-size: 32px;
+}
+
+h2,h2 code {
+    font-size: 24px;
+}
+
+h3,h3 code {
+    font-size: 20px;
+}
+
+h4,h1 code,h5,h5 code,h6,h6 code {
+    font-size: 18px;
+}
+
+pre {
+    line-height:   1.0;
+    /*color:         black;*/
+}
+
+pre.programlisting {
+    font-size:     10pt;
+    padding:       6pt 10pt;
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    background:    #f8f8f8;
+    clear:         both;
+}
+
+div.table {
+    margin:        1em;
+    padding:       0.5em;
+    text-align:    center;
+}
+
+div.table table {
+    display:       table;
+    width:         100%;
+}
+
+div.table td {
+    padding-left:  7px;
+    padding-right: 7px;
+}
+
+.sidebar {
+    float: right;
+    margin: 10px 0 10px 30px;
+    padding: 10px 20px 20px 20px;
+    width: 33%;
+    border: 1px solid black;
+    background-color: #F4F4F4;
+    font-size: 14px;
+}
+
+.mediaobject {
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+.legalnotice {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+    font-style: italic;
+}
+
+p.releaseinfo {
+    font-size: 100%;
+    font-weight: bold;
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    padding-top: 10px;
+}
+
+p.pubdate {
+    font-size: 120%;
+    font-weight: bold; 
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+span.productname {
+    font-size: 200%;
+    font-weight: bold; 
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+.code {
+    font-size: 14px;
+    /*color: 0000C0;*/
+}
+
+div.table td, div.table th {
+    padding: 7px;
+}
+
+a {
+    text-decoration: none;
+    color: #4183C4;
+}
+
+/* toc font sizes */
+
+div.toc {
+    line-height: 1.2;
+}
+
+dl,dt {
+    margin-top: 1px;
+    margin-bottom: 0;
+}
+
+div.toc>dl>dt {
+    font-size: 32px;
+    font-weight: bold;
+    margin: 30px 0 10px 0;
+    display: block;
+}
+
+div.toc>dl>dd>dl>dt {
+    font-size: 24px;
+    font-weight: bold;
+    margin: 20px 0 10px 0;
+    display: block;
+}
+
+div.toc>dl>dd>dl>dd>dl>dt {
+    font-weight: bold;
+    font-size: 20px;
+    margin: 10px 0 0 0;
+}
+
+/* authorgroup */
+
+.authorgroup .author {
+    display: inline;
+}
+
+.authorgroup .author h3 {
+    font-size: 1em;
+    font-weight: normal;
+    display: inline;
+}
+
+.authorgroup > .author:before {
+    content: ", ";
+}
+
+.authorgroup > .author:first-child:before {
+    content: "";
+}
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml b/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
index f2782f0bf3..52591299b7 100644
--- a/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
+++ b/querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
@@ -1,57 +1,77 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "3.4.0">
-        <!ENTITY copyrightYear "2007-2014">
-        <!ENTITY copyrightHolder "Original authors">
-]>
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-    <bookinfo>
-        <title>Querydsl - Reference Documentation</title>
-        <!-- Type-safe queries for Java -->
-        <productname>Querydsl</productname>    
-        <releaseinfo>&versionNumber;</releaseinfo>
-        <authorgroup>
-          <author>
-            <firstname>Timo</firstname>
-            <surname>Westkämper</surname>
-          </author>
-          <author>
-            <firstname>Samppa</firstname>
-            <surname>Saarela</surname>
-          </author>
-          <author>
-            <firstname>Vesa</firstname>
-            <surname>Marttila</surname>
-          </author>
-          <author>
-            <firstname>Lassi</firstname>
-            <surname>Immonen</surname>
-          </author>		  
-        </authorgroup>
-        <mediaobject>        
-            <imageobject role="fo">
-                <imagedata fileref="media/global.logo.png" align="center" />
-            </imageobject>
-            <imageobject role="html">
-                <imagedata fileref="media/global.logo.png" depth="3cm" />
-            </imageobject>
-        </mediaobject>
-                
-        <copyright>
-            <year>&copyrightYear;</year>
-            <holder>&copyrightHolder;</holder>
-        </copyright>
-        <xi:include href="legal_notice.xml"/>
-
-    </bookinfo>
-
-    <toc/>
-
-    <xi:include href="content/preface.xml"/>       
-    <xi:include href="content/intro.xml" />
-    <xi:include href="content/tutorials.xml"/>    
-    <xi:include href="content/general.xml"/>                
-    <xi:include href="content/troubleshooting.xml"/>
-    
-</book>
-
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+        <!ENTITY versionNumber "5.0.0.M1">
+        <!ENTITY copyrightYear "2007-2020">
+        <!ENTITY copyrightHolder "The Querydsl Team">
+]>
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
+    <bookinfo>
+        <title>Querydsl Reference Guide</title>
+        <!-- Type-safe queries for Java -->
+        <productname>Querydsl</productname>
+        <releaseinfo>&versionNumber;</releaseinfo>
+        <authorgroup>
+          <author>
+            <firstname>Timo</firstname>
+            <surname>Westkämper</surname>
+          </author>
+          <author>
+            <firstname>Samppa</firstname>
+            <surname>Saarela</surname>
+          </author>
+          <author>
+            <firstname>Vesa</firstname>
+            <surname>Marttila</surname>
+          </author>
+          <author>
+            <firstname>Lassi</firstname>
+            <surname>Immonen</surname>
+          </author>
+          <author>
+            <firstname>Ruben</firstname>
+            <surname>Dijkstra</surname>
+          </author>
+          <author>
+            <firstname>John</firstname>
+            <surname>Tims</surname>
+          </author>
+          <author>
+            <firstname>Robert</firstname>
+            <surname>Bain</surname>
+          </author>
+          <author>
+            <firstname>Ido</firstname>
+            <surname>Salomon</surname>
+          </author>
+          <author>
+            <firstname>Jan-Willem</firstname>
+            <surname>Gmelig Meyling</surname>
+          </author>
+        </authorgroup>
+        <mediaobject>
+            <imageobject role="fo">
+                <imagedata fileref="media/global.logo.png" align="center" />
+            </imageobject>
+            <imageobject role="html">
+                <imagedata fileref="media/global.logo.png" depth="3cm" />
+            </imageobject>
+        </mediaobject>
+
+        <copyright>
+            <year>&copyrightYear;</year>
+            <holder>&copyrightHolder;</holder>
+        </copyright>
+        <xi:include href="legal_notice.xml"/>
+
+    </bookinfo>
+
+    <toc/>
+
+    <xi:include href="content/preface.xml"/>
+    <xi:include href="content/intro.xml" />
+    <xi:include href="content/tutorials.xml"/>
+    <xi:include href="content/general.xml"/>
+    <xi:include href="content/troubleshooting.xml"/>
+
+</book>
+
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general.xml b/querydsl-docs/src/main/docbook/en-US/content/general.xml
index 5d51b140e9..52e7c5b8b4 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general.xml
@@ -1,16 +1,16 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="general" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <title>General usage</title>
-    
-    <para>
-    The General usage section covers aspects that are not covered in the tutorial section of the reference documentation.
-    It follows a use case oriented structure.
-    </para>
-    
-	<xi:include href="general/creating-queries.xml" />
-	<xi:include href="general/result-handling.xml"/>
-	<xi:include href="general/codegen.xml"/>
-	<xi:include href="general/alias.xml" />
-                           
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<chapter id="general" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <title>General usage</title>
+    
+    <para>
+    The General usage section covers aspects that are not covered in the tutorial section of the reference documentation.
+    It follows a use case oriented structure.
+    </para>
+    
+    <xi:include href="general/creating-queries.xml" />
+    <xi:include href="general/result-handling.xml"/>
+    <xi:include href="general/codegen.xml"/>
+    <xi:include href="general/alias.xml" />
+                           
 </chapter>    
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml b/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
index bb0eae82f5..7c057de9cc 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/alias.xml
@@ -19,9 +19,9 @@
 
   <programlisting language="java"><![CDATA[
 QCat cat = new QCat("cat");
-for (String name : query.from(cat,cats)
+for (String name : queryFactory.select(cat.name).from(cat,cats)
     .where(cat.kittens.size().gt(0))
-    .list(cat.name)){
+    .fetch()) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -33,9 +33,9 @@ for (String name : query.from(cat,cats)
 
   <programlisting language="java"><![CDATA[
 Cat c = alias(Cat.class, "cat");
-for (String name : query.from($(c),cats)
+for (String name : select($(c.getName())).from($(c),cats)
     .where($(c.getKittens()).size().gt(0))
-    .list($(c.getName()))){
+    .fetch()) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -46,8 +46,8 @@ for (String name : query.from($(c),cats)
   </para>
 
   <programlisting language="java"><![CDATA[
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
 ]]></programlisting>
 
   <para>
@@ -57,9 +57,9 @@ import static com.mysema.query.alias.Alias.alias;
 
   <programlisting language="java"><![CDATA[
 Cat c = alias(Cat.class, "cat");
-for (String name : query.from($(c),cats)
+for (String name : queryFactory.select($(c.getName())).from($(c),cats)
     .where($(c.getKittens().size()).gt(0))
-    .list($(c.getName()))){
+    .fetch()) {
     System.out.println(name);
 }
 ]]></programlisting>
@@ -92,4 +92,4 @@ $(c.getMate().getName().toLowerCase())
   </para>
 
 </sect1>
-  
+
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml b/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
index 1b43c07190..4197e098d7 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/codegen.xml
@@ -6,33 +6,33 @@
     generation in the JPA, JDO and Mongodb modules. This section describes various configuration
     options for the code generation and an alternative to APT usage.
   </para>
-  
+
   <sect2>
     <title>Path initialization</title>
 
     <para>
       By default Querydsl initializes only reference properties of the first two levels. In cases where
       longer initialization paths are required, these have to be annotated in the domain
-      types via 
-       <code>com.mysema.query.annotations.QueryInit</code>
+      types via
+       <code>com.querydsl.core.annotations.QueryInit</code>
       annotations. QueryInit is used on properties where deep initializations are
       needed. The following example demonstrates the usage.
     </para>
 
     <programlisting language="java"><![CDATA[
-@Entity      
+@Entity
 class Event {
     @QueryInit("customer.address")
     Account account;
-}      
+}
 
 @Entity
-class Account{
-    Customer customer;    
+class Account {
+    Customer customer;
 }
 
 @Entity
-class Customer{
+class Customer {
     String name;
     Address address;
     // ...
@@ -47,8 +47,8 @@ class Customer{
 
     <para>
       The automatic path initialization replaces the manual one, which
-      required the entity fields to be non-final. The declarative format has the benefit 
-      to be applied to all top level instances of a Query type and to enable the usage 
+      required the entity fields to be non-final. The declarative format has the benefit
+      to be applied to all top level instances of a Query type and to enable the usage
       of final entity fields.
     </para>
 
@@ -71,7 +71,7 @@ class Customer{
     <para>
       The serialization options are
     </para>
-    
+
     <table>
       <title>Config options</title>
       <tgroup cols='2' align='left' colsep='1' rowsep='1'>
@@ -115,18 +115,18 @@ class Customer{
     <programlisting language="java"><![CDATA[
 @Config(entityAccessors=true)
 @Entity
-public class User {
+public class User {
     //...
-}     
+}
 ]]></programlisting>
 
     <para>Customization of package content:</para>
 
     <programlisting language="java"><![CDATA[
 @Config(listAccessors=true)
-package com.mysema.query.domain.rel;
+package com.querydsl.core.domain.rel;
 
-import com.mysema.query.annotations.Config;
+import com.querydsl.core.annotations.Config;
 ]]></programlisting>
 
   <!-- TODO table for options ? -->
@@ -135,7 +135,7 @@ import com.mysema.query.annotations.Config;
       If you want to customize the serializer configuration globally,
       you can do this via the following APT options
     </para>
-    
+
     <table>
       <title>APT options</title>
       <tgroup cols='2' align='left' colsep='1' rowsep='1'>
@@ -187,7 +187,7 @@ import com.mysema.query.annotations.Config;
           <row>
             <entry>querydsl.includedClasses</entry>
             <entry>comma separated list of class names to be included into code generation (default: all)</entry>
-          </row>          
+          </row>
           <row>
             <entry>querydsl.excludedPackages</entry>
             <entry>comma separated list of packages to be excluded from code generation (default: none)</entry>
@@ -196,10 +196,26 @@ import com.mysema.query.annotations.Config;
             <entry>querydsl.excludedClasses</entry>
             <entry>comma separated list of class names to be excluded from code generation (default: none)</entry>
           </row>
-          
+          <row>
+            <entry>querydsl.useFields</entry>
+            <entry>set whether fields are used as metadata source (default: true)</entry>
+          </row>
+          <row>
+            <entry>querydsl.useGetters</entry>
+            <entry>set whether accessors are used as metadata source (default: true)</entry>
+          </row>
+          <row>
+            <entry>querydsl.generatedAnnotationClass</entry>
+            <entry>
+              The fully qualified class name of the <emphasis>Single-Element Annotation</emphasis> (with String element) to be added on the generated sources. Build in
+              <emphasis>com.querydsl.core.annotations.Generated</emphasis>has CLASS retention which can be used for byte code analysis tools like Jacoco.
+              (default: <emphasis>javax.annotation.Generated</emphasis> or<emphasis>javax.annotation.processing.Generated</emphasis> depending on the java version). See also
+              <ulink url="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</ulink>
+            </entry>
+          </row>
         </tbody>
       </tgroup>
-    </table> 
+    </table>
 
     <para>Using the Maven APT plugin this works for example like this:
     </para>
@@ -212,7 +228,7 @@ import com.mysema.query.annotations.Config;
     <plugin>
       <groupId>com.mysema.maven</groupId>
       <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
+      <version>1.1.3</version>
       <executions>
         <execution>
           <goals>
@@ -220,10 +236,11 @@ import com.mysema.query.annotations.Config;
           </goals>
           <configuration>
             <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
             <options>
               <querydsl.entityAccessors>true</querydsl.entityAccessors>
-            </options>          
+              <querydsl.useFields>false</querydsl.useFields>
+            </options>
           </configuration>
         </execution>
       </executions>
@@ -234,6 +251,125 @@ import com.mysema.query.annotations.Config;
 </project>
 ]]></programlisting>
 
+    <para>
+      Alternatively <code>maven-compiler-plugin</code> can be configured
+      to hook APT directly into compilation:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+      <project>
+        <build>
+        <plugins>
+          ...
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <generatedSourcesDirectory>target/generated-sources/java</generatedSourcesDirectory>
+              <compilerArgs>
+                <arg>-Aquerydsl.entityAccessors=true</arg>
+                <arg>-Aquerydsl.useFields=false</arg>
+              </compilerArgs>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.querydsl</groupId>
+                <artifactId>querydsl-apt</artifactId>
+                <version>${querydsl.version}</version>
+                <classifier>jpa</classifier>
+              </dependency>
+              <dependency>
+                <groupId>org.hibernate.javax.persistence</groupId>
+                <artifactId>hibernate-jpa-2.1-api</artifactId>
+                <version>1.0.0.Final</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          ...
+        </plugins>
+        </build>
+      </project>
+]]></programlisting>
+
+    <para>
+      Notice that you need to use a proper classifier when defining dependency
+      to <code>com.querydsl:querydsl-apt</code>. Those additional artifacts
+      define the annotation processor to be used in
+      <code>META-INF/services/javax.annotation.processing.Processor</code>.
+    </para>
+
+    <para>Available classifiers include:</para>
+
+    <itemizedlist>
+      <listitem>
+        <code>general</code>
+      </listitem>
+      <listitem>
+        <code>hibernate</code>
+      </listitem>
+      <listitem>
+        <code>jdo</code>
+      </listitem>
+      <listitem>
+        <code>jpa</code>
+      </listitem>
+    </itemizedlist>
+
+    <para>
+      With this configuration query objects can have their sources generated
+      and compiled during compilation of the domain objects. This will also
+      automatically add the generated sources directory to Maven project
+      source roots.
+    </para>
+
+    <para>
+      The great advantage of this approach is that it can also handle
+      annotated Groovy classes using <code>groovy-eclipse</code> compiler:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+      <project>
+        <build>
+        <plugins>
+          ...
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <compilerId>groovy-eclipse-compiler</compilerId>
+              <generatedSourcesDirectory>target/generated-sources/java</generatedSourcesDirectory>
+              <compilerArgs>
+                <arg>-Aquerydsl.entityAccessors=true</arg>
+                <arg>-Aquerydsl.useFields=false</arg>
+              </compilerArgs>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-eclipse-compiler</artifactId>
+                <version>2.9.1-01</version>
+              </dependency>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-eclipse-batch</artifactId>
+                <version>2.3.7-01</version>
+              </dependency>
+              <dependency>
+                <groupId>com.querydsl</groupId>
+                <artifactId>querydsl-apt</artifactId>
+                <version>${querydsl.version}</version>
+                <classifier>jpa</classifier>
+              </dependency>
+              <dependency>
+                <groupId>org.hibernate.javax.persistence</groupId>
+                <artifactId>hibernate-jpa-2.1-api</artifactId>
+                <version>1.0.0.Final</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          ...
+        </plugins>
+        </build>
+      </project>
+]]></programlisting>
 
   </sect2>
 
@@ -245,27 +381,27 @@ import com.mysema.query.annotations.Config;
       type. This can be useful for example in cases where comparison and String operations should
       be blocked on certain String paths or Date / Time support for
       custom types needs to be added. Support for Date / Time types of the Joda time API
-      and JDK (java.util.Date, Calendar and subtypes) is built in, but other APIs might need 
+      and JDK (java.util.Date, Calendar and subtypes) is built in, but other APIs might need
       to be supported using this feature.
     </para>
 
     <para>The following example demonstrates the usage:</para>
 
     <programlisting language="java"><![CDATA[
-@Entity      
-public class MyEntity{      
+@Entity
+public class MyEntity {
     @QueryType(PropertyType.SIMPLE)
     public String stringAsSimple;
-        
+
     @QueryType(PropertyType.COMPARABLE)
     public String stringAsComparable;
-        
+
     @QueryType(PropertyType.NONE)
-    public String stringNotInQuerydsl;    
-}        
+    public String stringNotInQuerydsl;
+}
 ]]></programlisting>
 
-    <para>The value <code>PropertyType.NONE</code> can be used to skip a property in the 
+    <para>The value <code>PropertyType.NONE</code> can be used to skip a property in the
       query type generation. This case is different from @Transient or @QueryTransient
       annotated properties, where properties are not persisted. PropertyType.NONE just
       omits the property from the Querydsl query type.
@@ -283,62 +419,62 @@ public class MyEntity{
 
     <para>Here is a simple example from a unit test: </para>
 
-    <programlisting language="java"><![CDATA[   
+    <programlisting language="java"><![CDATA[
 @QueryEntity
-public static class User{
-       
+public static class User {
+
     String name;
-       
+
     User manager;
-       
+
 }
 ]]></programlisting>
 
-<programlisting language="java"><![CDATA[   
+<programlisting language="java"><![CDATA[
 @QueryDelegate(User.class)
-public static BooleanPath isManagedBy(QUser user, User other){
+public static BooleanPath isManagedBy(QUser user, User other) {
     return user.manager.eq(other);
-}   
+}
 ]]></programlisting>
 
     <para>And the generated methods in the QUser query type:</para>
 
-    <programlisting language="java"><![CDATA[   
+    <programlisting language="java"><![CDATA[
 public BooleanPath isManagedBy(QUser other) {
-    return com.mysema.query.domain.DelegateTest.isManagedBy(this, other);
+    return DelegateTest.isManagedBy(this, other);
 }
-    
+
 ]]></programlisting>
 
     <para>Delegate methods can also be used to extend built-in types.
       Here are some examples
     </para>
 
-    <programlisting language="java"><![CDATA[       
+    <programlisting language="java"><![CDATA[
 public class QueryExtensions {
 
     @QueryDelegate(Date.class)
-    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period){
+    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period) {
         return date.goe(period.getFirst()).and(date.loe(period.getSecond()));
     }
 
     @QueryDelegate(Timestamp.class)
-    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period){
+    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period) {
         Timestamp first = new Timestamp(DateUtils.truncate(period.getFirst(), Calendar.DAY_OF_MONTH).getTime());
         Calendar second = Calendar.getInstance();
         second.setTime(DateUtils.truncate(period.getSecond(), Calendar.DAY_OF_MONTH));
         second.add(1, Calendar.DAY_OF_MONTH);
         return timestamp.goe(first).and(timestamp.lt(new Timestamp(second.getTimeInMillis())));
     }
-    
-}    
+
+}
 ]]></programlisting>
 
     <para>When delegate methods are declared for builtin types then subclasses with the
         proper delegate method usages are created:
     </para>
 
-    <programlisting language="java"><![CDATA[      
+    <programlisting language="java"><![CDATA[
 public class QDate extends DatePath<java.sql.Date> {
 
     public QDate(BeanPath<? extends java.sql.Date> entity) {
@@ -385,7 +521,7 @@ public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
     </para>
 
     <para>
-      To actually create the types use the <code>com.mysema.query.apt.QuerydslAnnotationProcessor</code>.
+      To actually create the types use the <code>com.querydsl.apt.QuerydslAnnotationProcessor</code>.
       In Maven you do it like this:
     </para>
 
@@ -397,7 +533,7 @@ public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
     <plugin>
       <groupId>com.mysema.maven</groupId>
       <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
+      <version>1.1.3</version>
       <executions>
         <execution>
           <goals>
@@ -405,7 +541,7 @@ public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
           </goals>
           <configuration>
             <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
+            <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
           </configuration>
         </execution>
       </executions>
@@ -421,7 +557,7 @@ public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
   <sect2>
 
     <title>Classpath based code generation</title>
-    
+
      <para>For cases where annotated Java sources
     are not available, such as the usage of a different JVM
     language such as Scala or Groovy or annotation addition via bytecode manipulation the
@@ -431,21 +567,21 @@ public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
 
     <para>To make GenericExporter available add a dependency to the querydsl-codegen
       module to your project, or to be more precise
-      <code>com.mysema.querydsl:querydsl-codegen:${querydsl.version}</code>.
+      <code>com.querydsl:querydsl-codegen:${querydsl.version}</code>.
     </para>
 
     <para>Below is an example for JPA</para>
 
-    <programlisting language="java"><![CDATA[    		
+    <programlisting language="java"><![CDATA[
 GenericExporter exporter = new GenericExporter();
 exporter.setKeywords(Keywords.JPA);
 exporter.setEntityAnnotation(Entity.class);
 exporter.setEmbeddableAnnotation(Embeddable.class);
-exporter.setEmbeddedAnnotation(Embedded.class);        
+exporter.setEmbeddedAnnotation(Embedded.class);
 exporter.setSupertypeAnnotation(MappedSuperclass.class);
 exporter.setSkipAnnotation(Transient.class);
 exporter.setTargetFolder(new File("target/generated-sources/java"));
-exporter.export(DomainClass.class.getPackage());    	
+exporter.export(DomainClass.class.getPackage());
 ]]></programlisting>
 
     <para>This will export all the JPA annotated classes in the package of the DomainClass
@@ -459,13 +595,13 @@ exporter.export(DomainClass.class.getPackage());
       <para>The goals generic-export, jpa-export and jdo-export of the querydsl-maven-plugin
         can be used for GenericExporter usage via Maven.
       </para>
-      
+
       <para>
-      The different goals are mapped to the Querydsl, JPA and JDO annotations. 
+      The different goals are mapped to the Querydsl, JPA and JDO annotations.
       </para>
-      
+
       <para>The configuration elements are</para>
-      
+
       <table>
         <title>Maven configuration</title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
@@ -485,8 +621,8 @@ exporter.export(DomainClass.class.getPackage());
               <entry>targetFolder</entry>
               <entry>target folder for generated sources</entry>
             </row>
-            <row>    
-              <entry>boolean</entry>       
+            <row>
+              <entry>boolean</entry>
               <entry>scala</entry>
               <entry>true, if Scala sources should be generated instead (default: false)</entry>
             </row>
@@ -495,7 +631,7 @@ exporter.export(DomainClass.class.getPackage());
               <entry>packages</entry>
               <entry>packages to be introspected for entity classes</entry>
             </row>
-            <row> 
+            <row>
               <entry>boolean</entry>
               <entry>handleFields</entry>
               <entry>true, if fields should be treated as properties (default: true)</entry>
@@ -517,40 +653,48 @@ exporter.export(DomainClass.class.getPackage());
             </row>
           </tbody>
         </tgroup>
-      </table>      
+      </table>
 
       <para>Here is an example for JPA annotated classes</para>
 
-      <programlisting language="xml"><![CDATA[            
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>  
-  <executions>
-    <execution>    
-      <phase>process-classes</phase>
-      <goals>
-        <goal>jpa-export</goal>
-      </goals>
-      <configuration>
-        <targetFolder>target/generated-sources/java</targetFolder>
-        <packages>
-          <package>com.example.domain</package>
-        </packages>
-      </configuration>      
-    </execution>
-  </executions>
-</plugin>           
+      <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <executions>
+          <execution>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>jpa-export</goal>
+            </goals>
+            <configuration>
+              <targetFolder>target/generated-sources/java</targetFolder>
+              <packages>
+                <package>com.example.domain</package>
+              </packages>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
 ]]></programlisting>
 
       <para>This will export the JPA annotated classes of the <code>com.example.domain</code> package and
-      subpackages to the target/generated-sources/java directory.           
+      subpackages to the target/generated-sources/java directory.
       </para>
-      
+
       <para>If you need to compile the generated sources directly after that, then you can use
       the <code>compile</code> goal for that.</para>
-    
- <programlisting language="xml"><![CDATA[                        
+
+ <programlisting language="xml"><![CDATA[
 <execution>
   <goals>
     <goal>compile</goal>
@@ -558,11 +702,11 @@ exporter.export(DomainClass.class.getPackage());
   <configuration>
     <sourceFolder>target/generated-sources/scala</targetFolder>
   </configuration>
-</execution>         
-]]></programlisting>    
-    
+</execution>
+]]></programlisting>
+
     <para>The <code>compile</code> goal has the following configuration elements</para>
-    
+
     <table>
       <title>Maven configuration</title>
       <tgroup cols='3' align='left' colsep='1' rowsep='1'>
@@ -606,59 +750,67 @@ exporter.export(DomainClass.class.getPackage());
             <entry>Map</entry>
             <entry>compilerOptions</entry>
             <entry>options for the compiler</entry>
-          </row>            
+          </row>
         </tbody>
       </tgroup>
-    </table>    
-    
+    </table>
+
     <para>All options except <code>sourceFolder</code> are optional.</para>
-    
+
   </sect3>
-  
+
   <sect3>
-  
-    <title>Scala support</title>      
+
+    <title>Scala support</title>
 
       <para>If you need Scala output of the classes, use a variant of the following
       configuration
       </para>
-      
-      <programlisting language="xml"><![CDATA[                        
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>  
-  <dependencies>
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-scala</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
-    </dependency>
-  </dependencies>
-  <executions>
-    <execution>
-      <goals>
-        <goal>jpa-export</goal>
-      </goals>
-      <configuration>
-        <targetFolder>target/generated-sources/scala</targetFolder>
-        <scala>true</scala>
-        <packages>
-          <package>com.example.domain</package>
-        </packages>       
-      </configuration>
-    </execution>
-  </executions>
-</plugin>               
+
+      <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-scala</artifactId>
+            <version>${querydsl.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jpa-export</goal>
+            </goals>
+            <configuration>
+              <targetFolder>target/generated-sources/scala</targetFolder>
+              <scala>true</scala>
+              <packages>
+                <package>com.example.domain</package>
+              </packages>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
 ]]></programlisting>
 
     </sect3>
 
   </sect2>
 
-</sect1>    
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
index 955abca83a..e5fa188b1d 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/creating-queries.xml
@@ -3,58 +3,58 @@
   <title>Creating queries</title>
 
   <para>Query construction in Querydsl involves calling query methods with expression arguments. Since
-  query methods are mostly module specific and have already been presented in the tutorial section, 
+  query methods are mostly module specific and have already been presented in the tutorial section,
   this part will focus on expressions.</para>
-  
-  <para>Expressions are normally constructed by accessing fields and calling methods on the generated 
-  expression types of your domain module. For cases where code generation is not applicable generic ways 
+
+  <para>Expressions are normally constructed by accessing fields and calling methods on the generated
+  expression types of your domain module. For cases where code generation is not applicable generic ways
   to construct expressions can be used instead.</para>
-  
+
   <sect2>
     <title>Complex predicates</title>
 
     <para>
-      To construct complex boolean expressions, use the <code>com.mysema.query.BooleanBuilder</code> class. It
+      To construct complex boolean expressions, use the <code>com.querydsl.core.BooleanBuilder</code> class. It
       implements Predicate and can be used in cascaded form:
     </para>
 
     <programlisting language="java"><![CDATA[
-public List<Customer> getCustomer(String... names){
-    QCustomer customer = QCustomer.customer;    
-    JPAQuery query = new JPAQuery(entityManager).from(customer);    
+public List<Customer> getCustomer(String... names) {
+    QCustomer customer = QCustomer.customer;
+    JPAQuery<Customer> query = queryFactory.selectFrom(customer);
     BooleanBuilder builder = new BooleanBuilder();
-    for (String name : names){
+    for (String name : names) {
         builder.or(customer.name.eq(name));
     }
-    query.where(builder); // customer.name eq name1 OR customer.name eq name2 OR ...  
-    return query.list(customer);
+    query.where(builder); // customer.name eq name1 OR customer.name eq name2 OR ...
+    return query.fetch();
 }
 ]]></programlisting>
 
     <para><code>BooleanBuilder</code> is mutable and represents initially null and after each <code>and</code>
     or <code>or</code> call the result of the operation.</para>
 
-  </sect2>  
+  </sect2>
 
   <sect2>
 
     <title>Dynamic expressions</title>
 
     <para>
-      The <code>com.mysema.query.support.Expressions</code>
+      The <code>com.querydsl.core.types.dsl.Expressions</code>
       class is a static factory class for dynamic expression construction.
       The factory methods are named by the returned type and are mostly self-documenting.
     </para>
-    
+
     <para>
     In general the <code>Expressions</code> class should be used only in cases where fluent DSL forms
-    can't be used, such as dynamic paths, custom syntax or custom operations.  
+    can't be used, such as dynamic paths, custom syntax or custom operations.
     </para>
-    
+
     <para>The following expression </para>
 
     <programlisting language="java"><![CDATA[
-QPerson person = QPerson.person; 	    
+QPerson person = QPerson.person;
 person.firstName.startsWith("P");
 ]]></programlisting>
 
@@ -73,20 +73,20 @@ Expressions.predicate(Ops.STARTS_WITH, personFirstName, constant);
     </para>
 
   </sect2>
-  
+
   <sect2>
-  
+
     <title>Dynamic paths</title>
 
     <para>In addition to the <code>Expressions</code> based expression creation Querydsl provides
     also a more fluent API for dynamic path creation.</para>
 
     <para>
-      For dynamic path generation the <code>com.mysema.query.types.path.PathBuilder</code> class can be used. It extends
+      For dynamic path generation the <code>com.querydsl.core.types.dsl.PathBuilder</code> class can be used. It extends
       <code>EntityPathBase</code> and can be used as an alternative to class generation and alias-usage
       for path generation.
     </para>
-    
+
     <para>
     Compared to the Expressions API PathBuilder doesn't provide direct support for unknown operations
     or custom syntax, but the syntax is closer to the normal DSL.
@@ -129,6 +129,18 @@ entityPath.getMap("map", String.class, String.class).get("key");
 entityPath.getMap("map", String.class, String.class, StringPath.class).get("key").lower();
 ]]></programlisting>
 
+    <para>For PathBuilder validation a PathBuilderValidator can be used. It can be injected in the constructor
+    and will be used transitively for the new PathBuilder</para>
+
+    <programlisting language="java"><![CDATA[
+PathBuilder<Customer> customer = new PathBuilder<Customer>(Customer.class, "customer", validator);
+]]></programlisting>
+
+    <para>PathBuilderValidator.FIELDS will verify field existence, PathBuilderValidator.PROPERTIES validates
+      Bean properties and JPAPathBuilderValidator validates using a JPA metamodel.
+    </para>
+
+
   </sect2>
 
   <sect2>
@@ -138,33 +150,33 @@ entityPath.getMap("map", String.class, String.class, StringPath.class).get("key"
       <code>CaseBuilder</code> class like this:
     </para>
 
-    <programlisting language="java"><![CDATA[    
-QCustomer customer = QCustomer.customer;    
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
 Expression<String> cases = new CaseBuilder()
     .when(customer.annualSpending.gt(10000)).then("Premier")
     .when(customer.annualSpending.gt(5000)).then("Gold")
     .when(customer.annualSpending.gt(2000)).then("Silver")
     .otherwise("Bronze");
-// The cases expression can now be used in a projection or condition        
+// The cases expression can now be used in a projection or condition
 ]]></programlisting>
 
     <para>For case expressions with equals-operations use the following simpler form instead:
     </para>
 
-    <programlisting language="java"><![CDATA[    
-QCustomer customer = QCustomer.customer;    
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
 Expression<String> cases = customer.annualSpending
     .when(10000).then("Premier")
     .when(5000).then("Gold")
     .when(2000).then("Silver")
     .otherwise("Bronze");
-// The cases expression can now be used in a projection or condition        
+// The cases expression can now be used in a projection or condition
 ]]></programlisting>
 
     <para>Case expressions are not yet supported in JDOQL.</para>
 
   </sect2>
-  
+
   <sect2>
 
     <title>Casting expressions</title>
@@ -172,9 +184,9 @@ Expression<String> cases = customer.annualSpending
     <para>
       To avoid a generic signature in expression types the type hierarchies are
       flattened. The result is that all generated query types are direct subclasses of
-      <code>com.mysema.query.types.path.EntityPathBase</code>
+      <code>com.querydsl.core.types.dsl.EntityPathBase</code>
       or
-      <code>com.mysema.query.types.path.BeanPath</code>
+      <code>com.querydsl.core.types.dsl.BeanPath</code>
       and cannot be directly cast to their logical supertypes.
     </para>
 
@@ -186,17 +198,17 @@ Expression<String> cases = customer.annualSpending
 
     <programlisting language="java"><![CDATA[
 // from Account
-QAccount extends EntityPathBase<Account>{
+QAccount extends EntityPathBase<Account> {
     // ...
 }
 
 // from BankAccount extends Account
-QBankAccount extends EntityPathBase<BankAccount>{
+QBankAccount extends EntityPathBase<BankAccount> {
 
     public final QAccount _super = new QAccount(this);
-    
+
     // ...
-}            
+}
 ]]></programlisting>
 
     <para>To cast from a supertype to a subtype you can use the
@@ -206,24 +218,24 @@ QBankAccount extends EntityPathBase<BankAccount>{
 
     <programlisting language="java"><![CDATA[
 QAccount account = new QAccount("account");
-QBankAccount bankAccount = account.as(QBankAccount.class);    
+QBankAccount bankAccount = account.as(QBankAccount.class);
 ]]></programlisting>
 
-  </sect2>  
-  
+  </sect2>
+
   <sect2>
-  
+
     <title>Select literals</title>
-    
-    <para>Literals can be selected by refering to them via Constant expressions. Here is a simple example </para>
-    
+
+    <para>Literals can be selected by referring to them via Constant expressions. Here is a simple example </para>
+
     <programlisting language="java"><![CDATA[
-query.list(Expressions.constant(1),
-           Expressions.constant("abc"));    
-]]></programlisting>     
+query.select(Expressions.constant(1),
+             Expressions.constant("abc"));
+]]></programlisting>
+
+    <para>Constant expressions are often used in subqueries.</para>
 
-    <para>Constant expressions are often used in subqueries.</para>    
-  
   </sect2>
 
-</sect1>    
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml b/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
index 0db418c64c..9b1ffc8b52 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/general/result-handling.xml
@@ -1,43 +1,45 @@
 <sect1 id="result_handling">
 
   <title>Result handling</title>
-  
+
   <para>Querydsl provides two ways to customize results, FactoryExpressions for row based transformation
   and ResultTransformer for aggregation.</para>
 
-  <para>The <code>com.mysema.query.types.FactoryExpression</code> interface is used for Bean creation,
-  constructor invocation and for the creation of more complex objects. The functionality of the 
-  FactoryExpression implementations of Querydsl can be accessed via the 
-  <code>com.mysema.query.types.Projections</code> class.</para>
-  
-  <para>For the <code>com.mysema.query.ResultTransformer</code> interface <code>GroupBy</code> is the
+  <para>The <code>com.querydsl.core.types.FactoryExpression</code> interface is used for Bean creation,
+  constructor invocation and for the creation of more complex objects. The functionality of the
+  FactoryExpression implementations of Querydsl can be accessed via the
+  <code>com.querydsl.core.types.Projections</code> class.</para>
+
+  <para>For the <code>com.querydsl.core.ResultTransformer</code> interface <code>GroupBy</code> is the
   main implementation.</para>
 
   <sect2>
-  
+
     <title>Returning multiple columns</title>
-    
-    <para>Since Querydsl 3.0 the default type for multi-column results is <code>com.mysema.query.Tuple</code>.
-    Tuple provides provides a typesafe Map like interface to access column data from a Tuple row object.</para> 
-    
+
+    <para>Since Querydsl 3.0 the default type for multi-column results is <code>com.querydsl.core.Tuple</code>.
+    Tuple provides a typesafe Map like interface to access column data from a Tuple row object.</para>
+
     <programlisting language="java"><![CDATA[
-List<Tuple> result = query.from(employee).list(employee.firstName, employee.lastName);
+List<Tuple> result = query.select(employee.firstName, employee.lastName)
+                          .from(employee).fetch();
 for (Tuple row : result) {
      System.out.println("firstName " + row.get(employee.firstName));
-     System.out.println("lastName " + row.get(employee.lastName)); 
-}}     
-]]></programlisting>    
+     System.out.println("lastName " + row.get(employee.lastName));
+}}
+]]></programlisting>
 
     <para>This example could also have been written via the QTuple expression class like this</para>
-    
+
     <programlisting language="java"><![CDATA[
-List<Tuple> result = query.from(employee).list(new QTuple(employee.firstName, employee.lastName));
+List<Tuple> result = query.select(new QTuple(employee.firstName, employee.lastName))
+                          .from(employee).fetch();
 for (Tuple row : result) {
      System.out.println("firstName " + row.get(employee.firstName));
-     System.out.println("lastName " + row.get(employee.lastName)); 
-}}     
-]]></programlisting>        
-  
+     System.out.println("lastName " + row.get(employee.lastName));
+}}
+]]></programlisting>
+
   </sect2>
 
   <sect2>
@@ -46,30 +48,30 @@ for (Tuple row : result) {
 
     <para>In cases where Beans need to be populated based on the results of the query, Bean projections
     can be used like this</para>
-    
+
     <programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.bean(UserDTO.class, user.firstName, user.lastName));
+List<UserDTO> dtos = query.select(
+    Projections.bean(UserDTO.class, user.firstName, user.lastName)).fetch();
 ]]></programlisting>
 
    <para>When fields should be directly used instead of setters the following variant can be
    used instead</para>
-   
+
 <programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.fields(UserDTO.class, user.firstName, user.lastName));
-]]></programlisting>   
+List<UserDTO> dtos = query.select(
+    Projections.fields(UserDTO.class, user.firstName, user.lastName)).fetch();
+]]></programlisting>
 
   </sect2>
 
   <sect2>
     <title>Constructor usage</title>
-    
+
     <para>Constructor based row transformation can be used like this</para>
-    
+
     <programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.bean(UserDTO.class, user.firstName, user.lastName));
+List<UserDTO> dtos = query.select(
+    Projections.constructor(UserDTO.class, user.firstName, user.lastName)).fetch();
 ]]></programlisting>
 
     <para>As an alternative to the generic Constructor expression usage constructors
@@ -80,7 +82,7 @@ List<UserDTO> dtos = query.list(
 class CustomerDTO {
 
   @QueryProjection
-  public CustomerDTO(long id, String name){
+  public CustomerDTO(long id, String name) {
      ...
   }
 
@@ -92,7 +94,8 @@ class CustomerDTO {
     <programlisting language="java"><![CDATA[
 QCustomer customer = QCustomer.customer;
 JPQLQuery query = new HibernateQuery(session);
-List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id, customer.name));     
+List<CustomerDTO> dtos = query.select(new QCustomerDTO(customer.id, customer.name))
+                              .from(customer).fetch();
 ]]></programlisting>
 
     <para>While the example is Hibernate specific, this feature is
@@ -100,8 +103,8 @@ List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id,
     </para>
 
     <para>If the type with the QueryProjection annotation is not an annotated entity
-      type, you can use the constructor projection like in the example, but if the 
-      annotated type would be an entity type, then the constructor projection would need to be 
+      type, you can use the constructor projection like in the example, but if the
+      annotated type would be an entity type, then the constructor projection would need to be
       created via a call to the static create method of the query type:
     </para>
 
@@ -110,7 +113,7 @@ List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id,
 class Customer {
 
   @QueryProjection
-  public Customer(long id, String name){
+  public Customer(long id, String name) {
      ...
   }
 
@@ -120,7 +123,8 @@ class Customer {
     <programlisting language="java"><![CDATA[
 QCustomer customer = QCustomer.customer;
 JPQLQuery query = new HibernateQuery(session);
-List<Customer> dtos = query.from(customer).list(QCustomer.create(customer.id, customer.name));   
+List<Customer> dtos = query.select(QCustomer.create(customer.id, customer.name))
+                           .from(customer).fetch();
 ]]></programlisting>
 
     <para>Alternatively, if code generation is not an option, you can
@@ -128,8 +132,9 @@ List<Customer> dtos = query.from(customer).list(QCustomer.create(customer.id, cu
     </para>
 
     <programlisting language="java"><![CDATA[
-List<Customer> dtos = query.from(customer)
-    .list(ConstructorExpression.create(Customer.class, customer.id, customer.name));   
+List<Customer> dtos = query
+    .select(Projections.constructor(Customer.class, customer.id, customer.name))
+    .from(customer).fetch();
 ]]></programlisting>
 
   </sect2>
@@ -140,7 +145,7 @@ List<Customer> dtos = query.from(customer)
 
     <para>
       The
-      <code>com.mysema.query.group.GroupBy</code>
+      <code>com.querydsl.core.group.GroupBy</code>
       class provides aggregation functionality which can be used to aggregate query results
       in memory. Below are some usage examples.
     </para>
@@ -150,8 +155,8 @@ List<Customer> dtos = query.from(customer)
     </para>
 
     <programlisting language="java"><![CDATA[
-import static com.mysema.query.group.GroupBy.*;
-   
+import static com.querydsl.core.group.GroupBy.*;
+
 Map<Integer, List<Comment>> results = query.from(post, comment)
     .where(comment.post.id.eq(post.id))
     .transform(groupBy(post.id).as(list(comment)));
@@ -161,7 +166,7 @@ Map<Integer, List<Comment>> results = query.from(post, comment)
 
     <para>Multiple result columns</para>
 
-    <programlisting language="java"><![CDATA[    
+    <programlisting language="java"><![CDATA[
 Map<Integer, Group> results = query.from(post, comment)
     .where(comment.post.id.eq(post.id))
     .transform(groupBy(post.id).as(post.name, set(comment.id)));
@@ -177,11 +182,11 @@ Map<Integer, Group> results = query.from(post, comment)
     <para>
       More examples can be found
       <ulink
-        url="https://github.com/mysema/querydsl/blob/master/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java"
+        url="https://github.com/querydsl/querydsl/blob/master/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java"
       >here</ulink>
       .
     </para>
 
   </sect2>
 
-</sect1>    
\ No newline at end of file
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/intro.xml b/querydsl-docs/src/main/docbook/en-US/content/intro.xml
index ae25667e7f..eb3af3d5b1 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/intro.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/intro.xml
@@ -1,60 +1,59 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="intro" revision="1">
-  <title>Introduction</title>
-
-  <sect1>
-    <title>Background</title>
-
-    <para>
-      Querydsl was born out of the need to maintain HQL queries in a typesafe way.
-      Incremental construction of HQL queries requires String concatenation and results
-      in hard to read code. Unsafe references to domain types and properties
-      via plain Strings were another issue with String based HQL construction.
-    </para>
-
-    <para>
-      With a changing domain model type-safety brings huge benefits in software
-      development. Domain changes are directly reflected in queries and autocomplete in
-      query construction makes query construction faster and safer.
-    </para>
-
-    <para>
-      HQL for Hibernate was the first target language for Querydsl, but nowadays it
-      supports JPA, JDO, JDBC, Lucene, Hibernate Search, MongoDB, Collections and RDFBean
-      as backends.
-    </para>
-
-  </sect1>
-
-  <sect1>
-
-    <title>Principles</title>
-
-    <para>
-      <emphasis>Type safety</emphasis>
-      is the core principle of Querydsl. Queries are constructed based on generated query
-      types that reflect the properties of your domain types. Also function/method
-      invocations are constructed in a fully type-safe manner.
-    </para>
-
-    <para>
-      <emphasis>Consistency</emphasis>
-      is another important principle. The query paths and operations are the same
-      in all implementations and also the Query interfaces have a common base interface.
-    </para>
-
-    <para>
-      All query instances can be reused multiple times. After the projection the paging data 
-      (limit and offset) and the definition of the projection are removed.
-    </para>
-
-    <para>
-      To get an impression of the expressivity of the Querydsl query and expression types go to
-      the javadocs and explore <code>com.mysema.query.Query</code>, <code>com.mysema.query.Projectable</code> 
-      and <code>com.mysema.query.types.Expression</code>.
-    </para>
-
-  </sect1>
-
-</chapter>    
\ No newline at end of file
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<chapter id="intro" revision="1">
+  <title>Introduction</title>
+
+  <sect1>
+    <title>Background</title>
+
+    <para>
+      Querydsl was born out of the need to maintain HQL queries in a typesafe way.       
+      Incremental construction of HQL queries requires String concatenation and results
+      in hard to read code. Unsafe references to domain types and properties
+      via plain Strings were another issue with String based HQL construction.
+    </para>
+
+    <para>
+      With a changing domain model type-safety brings huge benefits in software
+      development. Domain changes are directly reflected in queries and autocomplete in
+      query construction makes query construction faster and safer.
+    </para>
+
+    <para>
+      HQL for Hibernate was the first target language for Querydsl, but nowadays it
+      supports JPA, JDO, JDBC, Lucene, Hibernate Search, MongoDB, Collections and RDFBean
+      as backends.
+    </para>
+    
+    <para>
+      If you are completely new to database access in Java,<ulink url="https://www.marcobehler.com/guides/a-guide-to-accessing-databases-in-java">https://www.marcobehler.com/guides/a-guide-to-accessing-databases-in-java</ulink> contains a good overview of the various parts, pieces and options and shows you where exactly QueryDSL fits in.
+    </para>
+
+  </sect1>
+
+  <sect1>
+
+    <title>Principles</title>
+
+    <para>
+      <emphasis>Type safety</emphasis>
+      is the core principle of Querydsl. Queries are constructed based on generated query
+      types that reflect the properties of your domain types. Also function/method
+      invocations are constructed in a fully type-safe manner.
+    </para>
+
+    <para>
+      <emphasis>Consistency</emphasis>
+      is another important principle. The query paths and operations are the same
+      in all implementations and also the Query interfaces have a common base interface.
+    </para>
+
+    <para>
+      To get an impression of the expressivity of the Querydsl query and expression types go to
+      the javadocs and explore <code>com.querydsl.core.Query</code>, <code>com.querydsl.core.Fetchable</code>
+      and <code>com.querydsl.core.types.Expression</code>.
+    </para>
+
+  </sect1>
+
+</chapter>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/preface.xml b/querydsl-docs/src/main/docbook/en-US/content/preface.xml
index 4bf454c3a9..593af57ff5 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/preface.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/preface.xml
@@ -1,33 +1,33 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<preface id="preface">
-  <title>Preface</title>
-
-  <para>
-    Querydsl is a framework which enables the construction of statically
-    typed SQL-like queries. Instead of writing queries as inline strings or externalizing them
-    into XML files they can be constructed via a fluent API like Querydsl.
-  </para>
-
-  <para>
-    The benefits of using a fluent API in comparison to simple strings are for example
-  </para>
-
-  <orderedlist>
-    <listitem>
-      <para>code completion in IDE</para>
-    </listitem>
-    <listitem>
-      <para>almost none syntactically invalid queries allowed</para>
-    </listitem>
-    <listitem>
-      <para>domain types and properties can be referenced safely</para>
-    </listitem>
-    <listitem>
-      <para>adopts better to refactoring changes in domain types</para>
-    </listitem>
-  </orderedlist>
-
-  <!-- more -->
-
-</preface>
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<preface id="preface">
+  <title>Preface</title>
+
+  <para>
+    Querydsl is a framework which enables the construction of statically
+    typed SQL-like queries. Instead of writing queries as inline strings or externalizing them
+    into XML files they can be constructed via a fluent API like Querydsl.
+  </para>
+
+  <para>
+    The benefits of using a fluent API in comparison to simple strings are for example
+  </para>
+
+  <itemizedlist>
+    <listitem>
+      <para>code completion in IDE</para>
+    </listitem>
+    <listitem>
+      <para>almost none syntactically invalid queries allowed</para>
+    </listitem>
+    <listitem>
+      <para>domain types and properties can be referenced safely</para>
+    </listitem>
+    <listitem>
+      <para>adopts better to refactoring changes in domain types</para>
+    </listitem>
+  </itemizedlist>
+
+  <!-- more -->
+
+</preface>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/troubleshooting.xml b/querydsl-docs/src/main/docbook/en-US/content/troubleshooting.xml
index 4e6b328c31..22d719db9d 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/troubleshooting.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/troubleshooting.xml
@@ -1,106 +1,74 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="troubleshooting" revision="1">
-  <title>Troubleshooting</title>
-
-  <sect1>
-    <title>Insufficient type arguments</title>
-
-    <para>
-      Querydsl needs properly encoded List Set, Collection and Map properties in all code generation
-      scenarios.
-    </para>
-
-    <para>When using improperly encoded fields or getters you might the following
-      stacktrace:</para>
-
-    <programlisting><![CDATA[    
-java.lang.RuntimeException: Caught exception for field com.mysema.query.jdoql.testdomain.Store#products
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:117)
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:80)
-  at com.sun.tools.javac.code.Symbol$ClassSymbol.accept(Symbol.java:827)
-  at com.mysema.query.apt.Processor.getClassModel(Processor.java:154)
-  at com.mysema.query.apt.Processor.process(Processor.java:191)
-  ...
-Caused by: java.lang.IllegalArgumentException: Insufficient type arguments for List
-  at com.mysema.query.apt.APTTypeModel.visitDeclared(APTTypeModel.java:112)
-  at com.mysema.query.apt.APTTypeModel.visitDeclared(APTTypeModel.java:40)
-  at com.sun.tools.javac.code.Type$ClassType.accept(Type.java:696)
-  at com.mysema.query.apt.APTTypeModel.<init>(APTTypeModel.java:55)
-  at com.mysema.query.apt.APTTypeModel.get(APTTypeModel.java:48)
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:114)
-  ... 35 more
-]]></programlisting>
-
-    <para>
-      Examples of problematic field declarations and their corrections:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-    private Collection names; // WRONG
-    
-    private Collection<String> names; // RIGHT
-    
-    private Map employeesByName; // WRONG
-    
-    private Map<String,Employee> employeesByName; // RIGHT
-]]></programlisting>
-
-
-  </sect1>
-
-  <sect1>
-
-    <title>Multithreaded initialization of Querydsl Q-types</title>
-
-    <para>When Querydsl Q-types are initialized from multiple threads, deadlocks can
-      occur, if the Q-types have circular dependencies.</para>
-
-    <para>An easy to use solution is to initialize the classes in a single thread before
-      they are used in different threads.</para>
-
-    <para>The com.mysema.util.ClassPathUtils class can be used for that like this:</para>
-
-    <programlisting language="java"><![CDATA[
-    ClassPathUtils.scanPackage(Thread.currentThread().getContextClassLoader(), packageToLoad);
-]]></programlisting>
-
-    <para>Replace packageToLoad with the package of the classes you want to initialize.
-    </para>
-
-  </sect1>
-
-
-  <sect1>
-    <title>JDK5 usage</title>
-
-    <para>
-      When compiling your project with JDK 5, you might get the following compilation failure:
-    </para>
-
-    <programlisting><![CDATA[
-[INFO] ------------------------------------------------------------------------
-[ERROR] BUILD FAILURE
-[INFO] ------------------------------------------------------------------------
-[INFO] Compilation failure
-...
-class file has wrong version 50.0, should be 49.0
-]]></programlisting>
-
-    <para>
-      The class file version 50.0 is used by Java 6.0, and 49.0 is used by Java 5.0.
-    </para>
-
-    <para>
-      Querydsl is tested against JDK 6.0 only, as we use APT extensively, which is available only
-      since JDK 6.0.
-    </para>
-
-    <para>
-      If you want to use it with JDK 5.0 you might want to try to compile Querydsl yourself.
-    </para>
-
-  </sect1>
-
-</chapter>
-
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<chapter id="troubleshooting" revision="1">
+  <title>Troubleshooting</title>
+
+  <sect1>
+    <title>Insufficient type arguments</title>
+
+    <para>
+      Querydsl needs properly encoded List Set, Collection and Map properties in all code generation
+      scenarios.
+    </para>
+
+    <para>When using improperly encoded fields or getters you might the following
+      stacktrace:</para>
+
+    <programlisting><![CDATA[
+java.lang.RuntimeException: Caught exception for field com.querydsl.jdo.testdomain.Store#products
+  at com.querydsl.apt.Processor$2.visitType(Processor.java:117)
+  at com.querydsl.apt.Processor$2.visitType(Processor.java:80)
+  at com.sun.tools.javac.code.Symbol$ClassSymbol.accept(Symbol.java:827)
+  at com.querydsl.apt.Processor.getClassModel(Processor.java:154)
+  at com.querydsl.apt.Processor.process(Processor.java:191)
+  ...
+Caused by: java.lang.IllegalArgumentException: Insufficient type arguments for List
+  at com.querydsl.apt.APTTypeModel.visitDeclared(APTTypeModel.java:112)
+  at com.querydsl.apt.APTTypeModel.visitDeclared(APTTypeModel.java:40)
+  at com.sun.tools.javac.code.Type$ClassType.accept(Type.java:696)
+  at com.querydsl.apt.APTTypeModel.<init>(APTTypeModel.java:55)
+  at com.querydsl.apt.APTTypeModel.get(APTTypeModel.java:48)
+  at com.querydsl.apt.Processor$2.visitType(Processor.java:114)
+  ... 35 more
+]]></programlisting>
+
+    <para>
+      Examples of problematic field declarations and their corrections:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+    private Collection names; // WRONG
+
+    private Collection<String> names; // RIGHT
+
+    private Map employeesByName; // WRONG
+
+    private Map<String,Employee> employeesByName; // RIGHT
+]]></programlisting>
+
+
+  </sect1>
+
+  <sect1>
+
+    <title>Multithreaded initialization of Querydsl Q-types</title>
+
+    <para>When Querydsl Q-types are initialized from multiple threads, deadlocks can
+      occur, if the Q-types have circular dependencies.</para>
+
+    <para>An easy to use solution is to initialize the classes in a single thread before
+      they are used in different threads.</para>
+
+    <para>The com.querydsl.codegen.ClassPathUtils class can be used for that like this:</para>
+
+    <programlisting language="java"><![CDATA[
+    ClassPathUtils.scanPackage(Thread.currentThread().getContextClassLoader(), packageToLoad);
+]]></programlisting>
+
+    <para>Replace packageToLoad with the package of the classes you want to initialize.
+    </para>
+
+  </sect1>
+
+</chapter>
+
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials.xml
index d033996654..13b7bfbd2e 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials.xml
@@ -1,22 +1,22 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="tutorials" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <title>Tutorials</title>
-    
-    <para>
-    Instead of a general Getting started guide we provide integration
-    guides for the main backends of Querydsl.
-    </para>
-    
-    
-    <xi:include href="tutorials/jpa.xml" />
-    <xi:include href="tutorials/jdo.xml" />
-    <xi:include href="tutorials/sql.xml" />
-    <xi:include href="tutorials/spatial.xml" />
-    <xi:include href="tutorials/lucene.xml" />
-    <xi:include href="tutorials/hibernate-search.xml" />
-    <xi:include href="tutorials/mongodb.xml" />
-    <xi:include href="tutorials/collections.xml" />
-    <xi:include href="tutorials/scala.xml" />
-	
-</chapter>    
\ No newline at end of file
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<chapter id="tutorials" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <title>Tutorials</title>
+
+    <para>
+    Instead of a general Getting started guide we provide integration
+    guides for the main backends of Querydsl.
+    </para>
+
+
+    <xi:include href="tutorials/jpa.xml" />
+    <xi:include href="tutorials/jdo.xml" />
+    <xi:include href="tutorials/sql.xml" />
+    <xi:include href="tutorials/spatial.xml" />
+    <xi:include href="tutorials/lucene.xml" />
+    <xi:include href="tutorials/hibernate-search.xml" />
+    <xi:include href="tutorials/mongodb.xml" />
+    <xi:include href="tutorials/collections.xml" />
+    <xi:include href="tutorials/scala.xml" />
+
+</chapter>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
index 500b2d4056..669880cbe1 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/collections.xml
@@ -1,282 +1,276 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="collections_integration" revision="1">
-
-  <title>Querying Collections</title>
-
-  <para>The querydsl-collections module can be used with generated query types and
-    without.
-    The first section describes the usage without generated query types:
-  </para>
-
-  <sect2>
-    <title>Usage without generated query types</title>
-
-    <para>
-      To use querydsl-collections without generated query types you need to
-      use the
-      Querydsl alias feature. Here are some examples.
-    </para>
-
-    <para>
-      To get started, add the following static imports:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-// needed for access of the Querydsl Collections API    
-import static com.mysema.query.collections.CollQueryFactory.*;
-// needed, if you use the $-invocations    
-import static com.mysema.query.alias.Alias.*;
-]]></programlisting>
-
-    <para>
-      And now create an alias instance for the Cat class. Alias instances can only be
-      created for non-final classes with an empty constructor. Make sure your class has one.
-    </para>
-
-    <para>
-      The alias instance of type Cat and its getter invocations are
-      transformed into paths by wrapping them into dollar method invocations.
-      The call
-      <code>c.getKittens()</code>
-      for example is internally
-      transformed into the property path <code>c.kittens</code> inside the
-      dollar method.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : from($(c),cats)
-  .where($(c.getKittens()).size().gt(0))
-  .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>
-      The following example is a variation of the previous, where the access
-      to the
-      list size happens inside the dollar-method invocation.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : from($(c),cats)
-  .where($(c.getKittens().size()).gt(0))
-  .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>
-      All non-primitive and non-final typed properties of aliases are aliases
-      themselves. So you may cascade method calls until you hit a
-      primitive or non-final type (e.g. java.lang.String) in the dollar-method scope.
-    </para>
-
-    <para>
-      e.g.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-$(c.getMate().getName())
-]]></programlisting>
-
-    <para>
-      is transformed into
-      <emphasis>c.mate.name</emphasis>
-      internally, but
-    </para>
-
-    <programlisting language="java"><![CDATA[
-$(c.getMate().getName().toLowerCase())
-]]></programlisting>
-
-    <para>
-      is not transformed properly, since the toLowerCase() invocation is not tracked.
-    </para>
-    <para>
-      Note also that you may only invoke getters, size(), contains(Object) and
-      get(int) on alias types. All other invocations throw exceptions.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Usage with generated query types</title>
-
-    <para>
-      The example above can be expressed like this with generated expression types
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCat cat = new QCat("cat");
-for (String name : from(cat,cats)
-  .where(cat.kittens.size().gt(0))
-  .list(cat.name)){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>When you use generated query types, you instantiate expressions instead of alias
-      instances
-      and use the property paths directly without any dollar-method wrapping.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Maven integration</title>
-
-    <para>
-      Add the following dependencies to your Maven project:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>    
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-collections</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-
-    <para>
-      If you are not using JPA or JDO you can generate expression types for your
-      domain types by
-      annotating them with the
-      <code>com.mysema.query.annotations.QueryEntity</code>
-      annotation and adding the
-      following plugin configuration into your Maven configuration (pom.xml):
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant integration</title>
-
-    <para>Place the jar files from the full-deps bundle on your classpath and use the
-      following tasks for Querydsl code generation:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.QuerydslAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      Replace
-      <emphasis>src</emphasis>
-      with your main source folder,
-      <emphasis>generated</emphasis>
-      with your folder for generated sources and
-      <emphasis>build</emphasis>
-      with your target folder.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Hamcrest matchers</title>
-
-    <para>Querydsl Collections provides Hamcrest matchers. With these imports</para>
-
-    <programlisting language="java"><![CDATA[    
-import static org.hamcrest.core.IsEqual.equalTo;
-import static com.mysema.query.collections.PathMatcher.hasValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-]]></programlisting>
-
-    <para>they can be used like this:</para>
-
-    <programlisting language="java"><![CDATA[  
-Car car = new Car();
-car.setHorsePower(123);
-        
-assertThat(car, hasValue($.horsePower));
-assertThat(car, hasValue($.horsePower, equalTo(123)));  
-]]></programlisting>
-
-    <para>
-      The Hamcrest matchers have been contributed by
-      <ulink url="https://github.com/jeroenvs">Jeroen van Schagen</ulink>
-      .
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Usage with the Eclipse Compiler for Java</title>
-
-    <para>If Querydsl Collections is used with a JRE where the system compiler is not available,
-    CollQuery instances can also be configured to use the Eclipse Compiler for Java (ECJ) instead:</para>
-
-    <programlisting language="java"><![CDATA[
-DefaultEvaluatorFactory evaluatorFactory = new DefaultEvaluatorFactory(
-    CollQueryTemplates.DEFAULT,
-    new ECJEvaluatorFactory(getClass().getClassLoader()));
-QueryEngine queryEngine = new DefaultQueryEngine(evaluatorFactory);
-CollQuery query = new CollQuery(queryEngine);
-]]></programlisting>
-
-  </sect2>
-
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<sect1 id="collections_integration" revision="1">
+
+  <title>Querying Collections</title>
+
+  <para>The querydsl-collections module can be used with generated query types and
+    without.
+    The first section describes the usage without generated query types:
+  </para>
+
+  <sect2>
+    <title>Usage without generated query types</title>
+
+    <para>
+      To use querydsl-collections without generated query types you need to
+      use the
+      Querydsl alias feature. Here are some examples.
+    </para>
+
+    <para>
+      To get started, add the following static imports:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+// needed for access of the Querydsl Collections API
+import static com.querydsl.collections.CollQueryFactory.*;
+// needed, if you use the $-invocations
+import static com.querydsl.core.alias.Alias.*;
+]]></programlisting>
+
+    <para>
+      And now create an alias instance for the Cat class. Alias instances can only be
+      created for non-final classes with an empty constructor. Make sure your class has one.
+    </para>
+
+    <para>
+      The alias instance of type Cat and its getter invocations are
+      transformed into paths by wrapping them into dollar method invocations.
+      The call
+      <code>c.getKittens()</code>
+      for example is internally
+      transformed into the property path <code>c.kittens</code> inside the
+      dollar method.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+Cat c = alias(Cat.class, "cat");
+for (String name : select($(c.getName())).from($(c),cats)
+  .where($(c.getKittens()).size().gt(0))
+  .fetch()) {
+    System.out.println(name);
+}
+]]></programlisting>
+
+    <para>
+      The following example is a variation of the previous, where the access
+      to the
+      list size happens inside the dollar-method invocation.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+Cat c = alias(Cat.class, "cat");
+for (String name : select($(c.getName())).from($(c),cats)
+  .where($(c.getKittens().size()).gt(0))
+  .fetch()) {
+    System.out.println(name);
+}
+]]></programlisting>
+
+    <para>
+      All non-primitive and non-final typed properties of aliases are aliases
+      themselves. So you may cascade method calls until you hit a
+      primitive or non-final type (e.g. java.lang.String) in the dollar-method scope.
+    </para>
+
+    <para>
+      e.g.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+$(c.getMate().getName())
+]]></programlisting>
+
+    <para>
+      is transformed into
+      <emphasis>c.mate.name</emphasis>
+      internally, but
+    </para>
+
+    <programlisting language="java"><![CDATA[
+$(c.getMate().getName().toLowerCase())
+]]></programlisting>
+
+    <para>
+      is not transformed properly, since the toLowerCase() invocation is not tracked.
+    </para>
+    <para>
+      Note also that you may only invoke getters, size(), contains(Object) and
+      get(int) on alias types. All other invocations throw exceptions.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Usage with generated query types</title>
+
+    <para>
+      The example above can be expressed like this with generated expression types
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCat cat = new QCat("cat");
+for (String name : select(cat.name).from(cat,cats)
+  .where(cat.kittens.size().gt(0))
+  .fetch()) {
+    System.out.println(name);
+}
+]]></programlisting>
+
+    <para>When you use generated query types, you instantiate expressions instead of alias
+      instances
+      and use the property paths directly without any dollar-method wrapping.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Maven integration</title>
+
+    <para>
+      Add the following dependencies to your Maven project:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-apt</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>
+
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-collections</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+]]></programlisting>
+
+
+    <para>
+      If you are not using JPA or JDO you can generate expression types for your
+      domain types by
+      annotating them with the
+      <code>com.querydsl.core.annotations.QueryEntity</code>
+      annotation and adding the
+      following plugin configuration into your Maven configuration (pom.xml):
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+  <plugins>
+    ...
+    <plugin>
+      <groupId>com.mysema.maven</groupId>
+      <artifactId>apt-maven-plugin</artifactId>
+      <version>1.1.3</version>
+      <executions>
+        <execution>
+          <goals>
+            <goal>process</goal>
+          </goals>
+          <configuration>
+            <outputDirectory>target/generated-sources/java</outputDirectory>
+            <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+          </configuration>
+        </execution>
+      </executions>
+    </plugin>
+    ...
+  </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Ant integration</title>
+
+    <para>Place the jar files from the full-deps bundle on your classpath and use the
+      following tasks for Querydsl code generation:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+    <!-- APT based code generation -->
+    <javac srcdir="${src}" classpathref="cp">
+      <compilerarg value="-proc:only"/>
+      <compilerarg value="-processor"/>
+      <compilerarg value="com.querydsl.apt.QuerydslAnnotationProcessor"/>
+      <compilerarg value="-s"/>
+      <compilerarg value="${generated}"/>
+    </javac>
+
+    <!-- compilation -->
+    <javac classpathref="cp" destdir="${build}">
+      <src path="${src}"/>
+      <src path="${generated}"/>
+    </javac>
+]]></programlisting>
+
+    <para>
+      Replace
+      <emphasis>src</emphasis>
+      with your main source folder,
+      <emphasis>generated</emphasis>
+      with your folder for generated sources and
+      <emphasis>build</emphasis>
+      with your target folder.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Hamcrest matchers</title>
+
+    <para>Querydsl Collections provides Hamcrest matchers. With these imports</para>
+
+    <programlisting language="java"><![CDATA[
+import static org.hamcrest.core.IsEqual.equalTo;
+import static com.querydsl.collections.PathMatcher.hasValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+]]></programlisting>
+
+    <para>they can be used like this:</para>
+
+    <programlisting language="java"><![CDATA[
+Car car = new Car();
+car.setHorsePower(123);
+
+assertThat(car, hasValue($.horsePower));
+assertThat(car, hasValue($.horsePower, equalTo(123)));
+]]></programlisting>
+
+    <para>
+      The Hamcrest matchers have been contributed by
+      <ulink url="https://github.com/jeroenvs">Jeroen van Schagen</ulink>
+      .
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Usage with the Eclipse Compiler for Java</title>
+
+    <para>If Querydsl Collections is used with a JRE where the system compiler is not available,
+    CollQuery instances can also be configured to use the Eclipse Compiler for Java (ECJ) instead:</para>
+
+    <programlisting language="java"><![CDATA[
+DefaultEvaluatorFactory evaluatorFactory = new DefaultEvaluatorFactory(
+    CollQueryTemplates.DEFAULT,
+    new ECJEvaluatorFactory(getClass().getClassLoader()));
+QueryEngine queryEngine = new DefaultQueryEngine(evaluatorFactory);
+CollQuery query = new CollQuery(queryEngine);
+]]></programlisting>
+
+  </sect2>
+
 </sect1>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/hibernate-search.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/hibernate-search.xml
index 0668d6f02b..9e2cb18a89 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/hibernate-search.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/hibernate-search.xml
@@ -25,8 +25,8 @@
 QUser user = QUser.user;
 SearchQuery<User> query = new SearchQuery<User>(session, user);
 List<User> list = query
-	.where(user.firstName.eq("Bob"))
-	.list();
+    .where(user.firstName.eq("Bob"))
+    .fetch();
 ]]></programlisting>
 
   </sect2>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
index 4534b82b28..3f54a7c3b6 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jdo.xml
@@ -1,510 +1,526 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="jdo_integration" revision="1">
-  <title>Querying JDO</title>
-
-  <para>
-    Querydsl defines a general statically typed syntax for querying on top of
-    persisted domain model data. JDO and JPA are the primary integration
-    technologies for
-    Querydsl. This guide describes how to use Querydsl
-    in combination with JDO.
-  </para>
-
-  <sect2>
-    <title>Maven integration</title>
-
-    <para>
-      Add the following dependencies to your Maven project:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>        
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-jdo</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>
-
-    <para>
-      And now, configure the Maven APT plugin which generates the query types
-      used by
-      Querydsl:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-    <plugins>
-      ...
-      <plugin>
-        <groupId>com.mysema.maven</groupId>
-        <artifactId>apt-maven-plugin</artifactId>
-        <version>1.0.9</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/generated-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.jdo.JDOAnnotationProcessor</processor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    ...
-    </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-    <para>
-      The JDOAnnotationProcessor finds domain types annotated with the
-      <code>javax.jdo.annotations.PersistenceCapable</code> annotation and generates
-      query types for them.
-    </para>
-
-    <para>
-      Run clean install and you will get your query types generated into
-      target/generated-sources/java.
-    </para>
-
-    <para>
-      If you use Eclipse, run mvn eclipse:eclipse to update your Eclipse project to
-      include target/generated-sources/java as a source folder.
-    </para>
-
-    <para>
-      Now you are able to construct JDO query instances and instances of the query domain model.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant integration</title>
-
-    <para>Place the jar files from the full-deps bundle on your classpath and use the
-      following tasks for Querydsl code generation:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.jdo.JDOAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      Replace
-      <emphasis>src</emphasis>
-      with your main source folder,
-      <emphasis>generated</emphasis>
-      with your folder for generated sources
-      and
-      <emphasis>build</emphasis>
-      with your target folder.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Using query types</title>
-
-    <para>
-      To create queries with Querydsl you need to instantiate variables and Query
-      implementations. We will start with the variables.
-    </para>
-
-    <para>
-      Let's assume that your project has the following domain type:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@PersistenceCapable
-public class Customer {
-  private String firstName;
-  private String lastName;
-  
-  public String getFirstName(){
-    return firstName;
-  }
-  
-  public String getLastName(){
-    return lastName;
-  }
-  
-  public void setFirstName(String fn){
-    firstName = fn;
-  }
-  
-  public void setLastName(String ln)[
-    lastName = ln;
-  }
-}
-]]></programlisting>
-
-    <para>
-      Querydsl will generate a query type with the simple name QCustomer into the
-      same package as Customer. QCustomer can be used as a statically
-      typed variable in Querydsl as a representative for the
-      Customer type.
-    </para>
-
-    <para>
-      QCustomer has a default instance variable which can be accessed as a static
-      field:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-]]></programlisting>
-
-    <para>
-      Alternatively you can define your own Customer variables like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = new QCustomer("myCustomer");
-]]></programlisting>
-
-    <para>
-      QCustomer reflects all the properties of the original type Customer as public
-      fields. The firstName field can be accessed like this
-    </para>
-
-    <programlisting language="java"><![CDATA[
-customer.firstName;
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Querying with JDO</title>
-
-    <para>
-      For the JDO-module JDOQuery is the main Query implementation. It
-      is instantiated like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-PersistenceManager pm = ...;
-JDOQuery query = new JDOQuery (pm);
-]]></programlisting>
-
-    <para>
-      To retrieve the customer with the first name Bob you would construct a
-      query like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JDOQuery query = new JDOQuery (pm);
-Customer bob = query.from(customer)
-  .where(customer.firstName.eq("Bob"))
-  .uniqueResult(customer);
-query.close();
-]]></programlisting>
-
-    <para>
-      The from call defines the query source, the where part defines the
-      filter and uniqueResult defines the projection and tells Querydsl
-      to return a single element. Easy, right?
-    </para>
-
-    <para>
-      To create a query with multiple sources you just use the JDOQuery class like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer, company);    
-]]></programlisting>
-
-    <para>
-      And to use multiple filters use it like this
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));   
-]]></programlisting>
-
-    <para>Or like this</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-    <para>If you want to combine the filters via "or" then use the following pattern
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>General usage</title>
-
-    <para>Use the the cascading methods of the JDOQuery class like this</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      Add query sources here, the first argument becomes the main source
-      and the others are treated as variables.
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      Add query filters, either in varargs form separated via commas or
-      cascaded via the and-operator.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      Add group by arguments in varargs form.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Add having filters of the "group by" grouping as an varargs array of
-      Predicate expressions.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      Add ordering of the result as an varargs array of order expressions.
-      Use asc() and desc() on numeric, string and other comparable expression to access the
-      OrderSpecifier instances.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      Set the paging of the result. Limit for max results,
-      offset for skipping rows and restrict for defining both in one call.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ordering</title>
-
-    <para>The syntax for declaring ordering is </para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.desc())
-    .list(customer);
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Grouping</title>
-
-    <para>Grouping can be done in the following form</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Delete clauses</title>
-    <para>Delete clauses in Querydsl JDO follow a simple delete-where-execute form. Here
-      are some examples:
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// delete all customers
-new JDODeleteClause(pm, customer).execute();
-// delete all customers with a level less than 3
-new JDODeleteClause(pm, customer).where(customer.level.lt(3)).execute();  
-]]></programlisting>
-
-    <para>The second parameter of the JDODeleteClause constructor is the entity to be
-      deleted. The where call is optional and the execute call performs the deletion and 
-      returns the amount of deleted entities.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Subqueries</title>
-
-    <para>To create a subquery you create a <code>JDOSubQuery</code> instance, add the query parameters 
-      via from, where etc and use unique or list to create a subquery, which is just a type-safe 
-      expression for the query. unique is used for a unique result and list for a list result.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QDepartment department = QDepartment.department;
-QDepartment d = new QDepartment("d");
-query.from(department)
-    .where(department.employees.size().eq(
-        new JDOSubQuery().from(d).unique(AggregationFunctions.max(d.employees.size()))
-     )).list(department);  
-]]></programlisting>
-
-    <para>represents the following native JDO query</para>
-
-    <programlisting>
-SELECT this FROM com.mysema.query.jdoql.models.company.Department
-WHERE this.employees.size() == 
-(SELECT max(d.employees.size()) FROM com.mysema.query.jdoql.models.company.Department d)
-</programlisting>
-
-    <para>Another example</para>
-
-    <programlisting language="java"><![CDATA[
-QEmployee employee = QEmployee.employee;
-QEmployee e = new QEmployee("e");
-query.from(employee)
-    .where(employee.weeklyhours.gt(
-        new JDOSubQuery().from(employee.department.employees, e)
-        .where(e.manager.eq(employee.manager))
-        .unique(AggregationFunctions.avg(e.weeklyhours))
-    )).list(employee);
-]]></programlisting>
-
-    <para>which represents the following native JDO query</para>
-
-    <programlisting>
-SELECT this FROM com.mysema.query.jdoql.models.company.Employee 
-WHERE this.weeklyhours > 
-(SELECT avg(e.weeklyhours) FROM this.department.employees e WHERE e.manager == this.manager)
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Using Native SQL</title>
-
-    <para>Querydsl supports Native SQL in JDO via the <code>JDOSQLQuery</code> class.</para>
-
-    <para>To use it, you must generate Querydsl query types for your SQL schema. This can
-      be done for example with the following Maven configuration:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${project.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.mycompany.mydomain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder> 
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>
-]]></programlisting>
-
-    <para>When the query types have successfully been generated into the location of your
-      choice, you can use them in your queries.
-    </para>
-
-    <para>Single column query:</para>
-
-    <programlisting language="java"><![CDATA[
-// serialization templates
-SQLTemplates templates = new DerbyTemplates(); 
-// query types (S* for SQL, Q* for domain types)
-SAnimal cat = new SAnimal("cat");   
-SAnimal mate = new SAnimal("mate"); 
- 
-JDOSQLQuery query = new JDOSQLQuery(pm, templates);
-List<String> names = query.from(cat).list(cat.name);
-]]></programlisting>
-
-    <para>Query multiple columns:</para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-List<Object[]> rows = query.from(cat).list(cat.id, cat.name);
-]]></programlisting>
-
-    <para>Query all columns:</para>
-
-    <programlisting language="java"><![CDATA[
-List<Object[]> rows = query.from(cat).list(cat.all());
- ]]></programlisting>
-
-    <para>Query with joins: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-cats = query.from(cat)
-    .innerJoin(mate).on(cat.mateId.eq(mate.id))
-    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
-    .list(catEntity);
-]]></programlisting>
-
-    <para>Query and project into DTO: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-List<CatDTO> catDTOs = query.from(cat)
-    .orderBy(cat.name.asc())
-    .list(ConstructorExpression.create(CatDTO.class, cat.id, cat.name));
-]]></programlisting>
-
-  </sect2>
-
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<sect1 id="jdo_integration" revision="1">
+  <title>Querying JDO</title>
+
+  <para>
+    Querydsl defines a general statically typed syntax for querying on top of
+    persisted domain model data. JDO and JPA are the primary integration
+    technologies for
+    Querydsl. This guide describes how to use Querydsl
+    in combination with JDO.
+  </para>
+
+  <sect2>
+    <title>Maven integration</title>
+
+    <para>
+      Add the following dependencies to your Maven project:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-apt</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>
+
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-jdo</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+]]></programlisting>
+
+    <para>
+      And now, configure the Maven APT plugin which generates the query types
+      used by
+      Querydsl:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jdo.JDOAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    ...
+    </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+    <para>
+      The JDOAnnotationProcessor finds domain types annotated with the
+      <code>javax.jdo.annotations.PersistenceCapable</code> annotation and generates
+      query types for them.
+    </para>
+
+    <para>
+      Run clean install and you will get your query types generated into
+      target/generated-sources/java.
+    </para>
+
+    <para>
+      If you use Eclipse, run mvn eclipse:eclipse to update your Eclipse project to
+      include target/generated-sources/java as a source folder.
+    </para>
+
+    <para>
+      Now you are able to construct JDO query instances and instances of the query domain model.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Ant integration</title>
+
+    <para>Place the jar files from the full-deps bundle on your classpath and use the
+      following tasks for Querydsl code generation:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+    <!-- APT based code generation -->
+    <javac srcdir="${src}" classpathref="cp">
+      <compilerarg value="-proc:only"/>
+      <compilerarg value="-processor"/>
+      <compilerarg value="com.querydsl.apt.jdo.JDOAnnotationProcessor"/>
+      <compilerarg value="-s"/>
+      <compilerarg value="${generated}"/>
+    </javac>
+
+    <!-- compilation -->
+    <javac classpathref="cp" destdir="${build}">
+      <src path="${src}"/>
+      <src path="${generated}"/>
+    </javac>
+]]></programlisting>
+
+    <para>
+      Replace
+      <emphasis>src</emphasis>
+      with your main source folder,
+      <emphasis>generated</emphasis>
+      with your folder for generated sources
+      and
+      <emphasis>build</emphasis>
+      with your target folder.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using query types</title>
+
+    <para>
+      To create queries with Querydsl you need to instantiate variables and Query
+      implementations. We will start with the variables.
+    </para>
+
+    <para>
+      Let's assume that your project has the following domain type:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+@PersistenceCapable
+public class Customer {
+  private String firstName;
+  private String lastName;
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setFirstName(String fn) {
+    firstName = fn;
+  }
+
+  public void setLastName(String ln) {
+    lastName = ln;
+  }
+}
+]]></programlisting>
+
+    <para>
+      Querydsl will generate a query type with the simple name QCustomer into the
+      same package as Customer. QCustomer can be used as a statically
+      typed variable in Querydsl as a representative for the
+      Customer type.
+    </para>
+
+    <para>
+      QCustomer has a default instance variable which can be accessed as a static
+      field:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+]]></programlisting>
+
+    <para>
+      Alternatively you can define your own Customer variables like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = new QCustomer("myCustomer");
+]]></programlisting>
+
+    <para>
+      QCustomer reflects all the properties of the original type Customer as public
+      fields. The firstName field can be accessed like this
+    </para>
+
+    <programlisting language="java"><![CDATA[
+customer.firstName;
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Querying with JDO</title>
+
+    <para>
+      For the JDO-module <code>JDOQuery</code> is the main Query implementation. It
+      is instantiated like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+PersistenceManager pm = ...;
+JDOQuery<?> query = new JDOQuery<Void>(pm);
+]]></programlisting>
+
+    <para>For the examples of this chapter the queries are created via a <code>JDOQueryFactory</code> instance.
+    <code>JDOQueryFactory</code> should be the preferred option to obtain <code>JDOQuery</code> instances.</para>
+
+    <para>
+      To retrieve the customer with the first name Bob you would construct a
+      query like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+Customer bob = queryFactory.selectFrom(customer)
+                   .where(customer.firstName.eq("Bob"))
+                   .fetchOne();
+]]></programlisting>
+
+    <para>
+      The selectFrom call defines the query source and projection, the where part defines the
+      filter and fetchOne tells Querydsl to return a single element. Easy, right?
+    </para>
+
+    <para>Alternatively you can express it also like this</para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+Customer bob = queryFactory.select(customer).from(customer)
+                   .where(customer.firstName.eq("Bob"))
+                   .fetchOne();
+]]></programlisting>
+
+    <para>
+      To create a query with multiple sources you just use the JDOQuery class like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+QCompany company = QCompany.company;
+query.from(customer, company);
+]]></programlisting>
+
+    <para>
+      And to use multiple filters use it like this
+    </para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));
+]]></programlisting>
+
+    <para>Or like this</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
+]]></programlisting>
+
+    <para>If you want to combine the filters via "or" then use the following pattern
+    </para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>General usage</title>
+
+    <para>Use the the cascading methods of the JDOQuery class like this</para>
+
+    <para>
+      <emphasis>select:</emphasis>
+      Set the projection of the query. (Not necessary if created via query factory)
+    </para>
+
+    <para>
+      <emphasis>from:</emphasis>
+      Add query sources here, the first argument becomes the main source
+      and the others are treated as variables.
+    </para>
+
+    <para>
+      <emphasis>where:</emphasis>
+      Add query filters, either in varargs form separated via commas or
+      cascaded via the and-operator.
+    </para>
+
+    <para>
+      <emphasis>groupBy:</emphasis>
+      Add group by arguments in varargs form.
+    </para>
+
+    <para>
+      <emphasis>having:</emphasis>
+      Add having filters of the "group by" grouping as an varargs array of
+      Predicate expressions.
+    </para>
+
+    <para>
+      <emphasis>orderBy:</emphasis>
+      Add ordering of the result as an varargs array of order expressions.
+      Use asc() and desc() on numeric, string and other comparable expression to access the
+      OrderSpecifier instances.
+    </para>
+
+    <para>
+      <emphasis>limit, offset, restrict:</emphasis>
+      Set the paging of the result. Limit for max results,
+      offset for skipping rows and restrict for defining both in one call.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Ordering</title>
+
+    <para>The syntax for declaring ordering is </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+queryFactory.selectFrom(customer)
+    .orderBy(customer.lastName.asc(), customer.firstName.desc())
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Grouping</title>
+
+    <para>Grouping can be done in the following form</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.lastName).from(customer)
+    .groupBy(customer.lastName)
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Delete clauses</title>
+
+    <para>Delete clauses in Querydsl JDO follow a simple delete-where-execute form. Here
+      are some examples:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+// delete all customers
+queryFactory.delete(customer).execute();
+// delete all customers with a level less than 3
+queryFactory.delete(customer).where(customer.level.lt(3)).execute();
+]]></programlisting>
+
+    <para>The second parameter of the JDODeleteClause constructor is the entity to be
+      deleted. The where call is optional and the execute call performs the deletion and
+      returns the amount of deleted entities.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Subqueries</title>
+
+    <para>To create a subquery you can use one of the factory methods of <code>JDOExpressions</code>
+      and add the query parameters via from, where etc.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QDepartment department = QDepartment.department;
+QDepartment d = new QDepartment("d");
+queryFactory.selectFrom(department)
+    .where(department.size.eq(JDOExpressions.select(d.size.max()).from(d))
+    .fetch();
+]]></programlisting>
+
+    <para>represents the following native JDO query</para>
+
+    <programlisting>
+SELECT this FROM com.querydsl.jdo.models.company.Department
+WHERE this.size ==
+(SELECT max(d.size) FROM com.querydsl.jdo.models.company.Department d)
+    </programlisting>
+
+    <para>Another example</para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee employee = QEmployee.employee;
+QEmployee e = new QEmployee("e");
+queryFactory.selectFrom(employee)
+    .where(employee.weeklyhours.gt(
+        JDOExpressions.select(e.weeklyhours.avg())
+                      .from(employee.department.employees, e)
+                      .where(e.manager.eq(employee.manager)))
+    .fetch();
+]]></programlisting>
+
+    <para>which represents the following native JDO query</para>
+
+    <programlisting>
+SELECT this FROM com.querydsl.jdo.models.company.Employee
+WHERE this.weeklyhours >
+(SELECT avg(e.weeklyhours) FROM this.department.employees e WHERE e.manager == this.manager)
+    </programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using Native SQL</title>
+
+    <para>Querydsl supports Native SQL in JDO via the <code>JDOSQLQuery</code> class.</para>
+
+    <para>To use it, you must generate Querydsl query types for your SQL schema. This can
+      be done for example with the following Maven configuration:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
+          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
+          <packageName>com.mycompany.mydomain</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+    <para>When the query types have successfully been generated into the location of your
+      choice, you can use them in your queries.
+    </para>
+
+    <para>Single column query:</para>
+
+    <programlisting language="java"><![CDATA[
+// serialization templates
+SQLTemplates templates = new DerbyTemplates();
+// query types (S* for SQL, Q* for domain types)
+SAnimal cat = new SAnimal("cat");
+SAnimal mate = new SAnimal("mate");
+
+JDOSQLQuery<?> query = new JDOSQLQuery<Void>(pm, templates);
+List<String> names = query.select(cat.name).from(cat).fetch();
+]]></programlisting>
+
+    <para>Query multiple columns:</para>
+
+    <programlisting language="java"><![CDATA[
+query = new JDOSQLQuery<Void>(pm, templates);
+List<Tuple> rows = query.select(cat.id, cat.name).from(cat).fetch();
+]]></programlisting>
+
+    <para>Query all columns:</para>
+
+    <programlisting language="java"><![CDATA[
+List<Tuple> rows = query.select(cat.all()).from(cat).fetch();
+ ]]></programlisting>
+
+    <para>Query with joins: </para>
+
+    <programlisting language="java"><![CDATA[
+query = new JDOSQLQuery<Void>(pm, templates);
+cats = query.select(catEntity).from(cat)
+    .innerJoin(mate).on(cat.mateId.eq(mate.id))
+    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
+    .fetch();
+]]></programlisting>
+
+    <para>Query and project into DTO: </para>
+
+    <programlisting language="java"><![CDATA[
+query = new JDOSQLQuery<Void>(pm, templates);
+List<CatDTO> catDTOs = query.select(Projections.constructor(CatDTO.class, cat.id, cat.name))
+    .from(cat)
+    .orderBy(cat.name.asc())
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
 </sect1>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
index 5a07af0a02..8a7653439e 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/jpa.xml
@@ -1,715 +1,708 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="jpa_integration" revision="1">
-
-  <title>Querying JPA</title>
-
-  <para>
-    Querydsl defines a general statically typed syntax for querying on top of
-    persisted domain model data. JDO and JPA are the primary integration
-    technologies for Querydsl. This guide describes how to use Querydsl
-    in combination with JPA.
-  </para>
-
-  <para>
-    Querydsl for JPA is an alternative to both JPQL and Criteria queries. It combines the
-    dynamic nature of Criteria queries with the expressiveness of JPQL and all that in a fully 
-    typesafe manner.
-  </para>
-
-  <sect2>
-    <title>Maven integration</title>
-
-    <para>
-      Add the following dependencies to your Maven project:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>    
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-jpa</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-    <para>
-      And now, configure the Maven APT plugin:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-    <para>
-      The JPAAnnotationProcessor finds domain types annotated with the
-      javax.persistence.Entity annotation and generates query types for them.
-    </para>
-
-    <para>
-      If you use Hibernate annotations in your domain types you should use
-      the APT processor
-      <code>com.mysema.query.apt.hibernate.HibernateAnnotationProcessor</code>
-      instead.
-    </para>
-
-    <para>
-      Run clean install and you will get your Query types generated into
-      target/generated-sources/java.
-    </para>
-
-    <para>
-      If you use Eclipse, run mvn eclipse:eclipse to update your Eclipse project to
-      include target/generated-sources/java as a source folder.
-    </para>
-
-    <para>
-      Now you are able to construct JPA query instances and instances of
-      the query domain model.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant integration</title>
-
-    <para>Place the jar files from the full-deps bundle on your classpath and use the
-      following tasks for Querydsl code generation:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.jpa.JPAAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      Replace
-      <emphasis>src</emphasis>
-      with your main source folder,
-      <emphasis>generated</emphasis>
-      with your folder for generated sources
-      and
-      <emphasis>build</emphasis>
-      with your target folder.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Using Querydsl JPA in Roo</title>
-
-    <para>
-      If you are using Querydsl JPA with Spring Roo you can replace
-      <code>com.mysema.query.apt.jpa.JPAAnnotationProcessor</code>
-      with
-      <code>com.mysema.query.apt.roo.RooAnnotationProcessor</code>
-      which will handle
-      <code>@RooJpaEntity</code> and <code>@RooJpaActiveRecord</code>
-      annotated classes instead of
-      <code>@Entity</code>
-      annotated classes.
-    </para>
-    
-    <para>
-      APT based code generation doesn't work well with AspectJ IDTs.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Generating the model from hbm.xml files</title>
-
-    <para>If you are using Hibernate with an XML based configuration, you can use the XML
-      metadata to create your Querydsl model.
-    </para>
-
-    <para><code>com.mysema.query.jpa.codegen.HibernateDomainExporter</code> provides the
-      functionality for this:</para>
-
-    <programlisting language="java"><![CDATA[
-HibernateDomainExporter exporter = new HibernateDomainExporter(
-  "Q",                     // name prefix
-  new File("target/gen3"), // target folder
-  configuration);          // instance of org.hibernate.cfg.Configuration 
-
-exporter.export();
-]]></programlisting>
-
-    <para>The HibernateDomainExporter needs to be executed within a classpath where the
-      domain types are visible, since the property types are resolved
-      via reflection.
-    </para>
-
-    <para>All JPA annotations are ignored, but Querydsl annotations such as @QueryInit and
-      @QueryType are taken into account.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Using query types</title>
-
-    <para>
-      To create queries with Querydsl you need to instantiate variables and
-      Query implementations. We will start with the variables.
-    </para>
-
-    <para>
-      Let's assume that your project has the following domain type:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@Entity
-public class Customer {
-    private String firstName;
-    private String lastName;
-
-    public String getFirstName(){
-        return firstName;
-    }
-
-    public String getLastName(){
-        return lastName;
-    }
-
-    public void setFirstName(String fn){
-        firstName = fn;
-    }
-
-    public void setLastName(String ln)[
-        lastName = ln;
-    }
-}
-]]></programlisting>
-
-    <para>
-      Querydsl will generate a query type with the simple name QCustomer into the
-      same package as Customer. QCustomer can be used as a statically
-      typed variable in Querydsl queries as a representative for the
-      Customer type.
-    </para>
-
-    <para>
-      QCustomer has a default instance variable which can be accessed as a static
-      field:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-]]></programlisting>
-
-    <para>
-      Alternatively you can define your own Customer variables like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = new QCustomer("myCustomer");
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Querying</title>
-
-    <para>The Querydsl JPA module supports both the JPA and the Hibernate API.</para>
-
-    <para>
-      To use the JPA API you use <code>JPAQuery</code> instances for your queries like
-      this:
-    </para>
-
-<programlisting language="java"><![CDATA[
-// where entityManager is a JPA EntityManager   
-JPAQuery query = new JPAQuery(entityManager); 
-]]></programlisting>
-
-    <para>If you are using the Hibernate API instead, you can instantiate a 
-    <code>HibernateQuery</code> like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-// where session is a Hibernate session
-HibernateQuery query = new HibernateQuery(session); 
-]]></programlisting>
-    
-
-    <para>Both JPAQuery and HibernateQuery implement the JPQLQuery interface.</para>
-
-    <para>
-      To retrieve the customer with the first name Bob you would construct a
-      query like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JPAQuery query = new JPAQuery(entityManager);
-Customer bob = query.from(customer)
-  .where(customer.firstName.eq("Bob"))
-  .uniqueResult(customer);
-]]></programlisting>
-
-    <para>
-      The from call defines the query source, the where part defines the
-      filter and uniqueResult defines the projection and tells Querydsl
-      to return a single element. Easy, right?
-    </para>
-
-    <para>
-      To create a query with multiple sources you use the query like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer, company);    
-]]></programlisting>
-
-    <para>
-      And to use multiple filters use it like this
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));   
-]]></programlisting>
-
-    <para>Or like this</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-    <para>In native JPQL form the query would be written like this: </para>
-
-    <programlisting>
-from Customer as customer
-    where customer.firstName = "Bob" and customer.lastName = "Wilson"
-</programlisting>
-
-    <para>If you want to combine the filters via "or" then use the following pattern
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Using joins</title>
-
-    <para>Querydsl supports the following join variants in JPQL: inner join, join, left
-      join and full join. Join usage is typesafe, and follows the following pattern:
-    </para>
-
-    <programlisting language="java"><![CDATA[  
-QCat cat = QCat.cat;
-QCat mate = new QCat("mate");
-QCate kitten = new QCat("kitten");
-query.from(cat)
-    .innerJoin(cat.mate, mate)
-    .leftJoin(cat.kittens, kitten)
-    .list(cat);
-]]></programlisting>
-
-    <para>The native JPQL version of the query would be </para>
-
-    <programlisting>
-from Cat as cat
-    inner join cat.mate as mate
-    left outer join cat.kittens as kitten
-</programlisting>
-
-    <para>Another example</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(cat)
-    .leftJoin(cat.kittens, kitten)
-    .on(kitten.bodyWeight.gt(10.0))
-    .list(cat);
-]]></programlisting>
-
-    <para>With the following JPQL version</para>
-
-    <programlisting>  
-from Cat as cat
-    left join cat.kittens as kitten
-    on kitten.bodyWeight > 10.0  
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>General usage</title>
-
-    <para>Use the the cascading methods of the JPQLQuery interface like this</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      Add the query sources here.
-    </para>
-
-    <para>
-      <emphasis>innerJoin, join, leftJoin, fullJoin, on:</emphasis>
-      Add join elements using these constructs.
-      For the join methods the first argument is the join source and the second the target
-      (alias).
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      Add query filters, either in varargs form separated via commas or
-      cascaded via the and-operator.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      Add group by arguments in varargs form.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Add having filters of the "group by" grouping as an varags array of
-      Predicate expressions.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      Add ordering of the result as an varargs array of order expressions.
-      Use asc() and desc() on numeric, string and other comparable expression to access the
-      OrderSpecifier instances.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      Set the paging of the result. Limit for max results,
-      offset for skipping rows and restrict for defining both in one call.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ordering</title>
-
-    <para>The syntax for declaring ordering is </para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.desc())
-    .list(customer);
-]]></programlisting>
-
-    <para>which is equivalent to the following native JPQL</para>
-
-    <programlisting>  
-from Customer as customer
-    order by customer.lastName asc, customer.firstName desc
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Grouping</title>
-
-    <para>Grouping can be done in the following form</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>which is equivalent to the following native JPQL</para>
-
-    <programlisting>  
-select customer.lastName
-    from Customer as customer
-    group by customer.lastName
-</programlisting>
-
-
-  </sect2>
-
-  <sect2>
-    <title>Delete clauses</title>
-    <para>Delete clauses in Querydsl JPA follow a simple delete-where-execute form. Here
-      are some
-      examples:
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// delete all customers
-new JPADeleteClause(entityManager, customer).execute();
-// delete all customers with a level less than 3
-new JPADeleteClause(entityManager, customer).where(customer.level.lt(3)).execute();  
-]]></programlisting>
-
-    <para>The second parameter of the JPADeleteClause constructor is the entity to
-      be deleted.
-      The where call is optional and the execute call performs the deletion and returns the
-      amount of
-      deleted entities.
-    </para>
-
-    <para>For Hibernate based Delete usage, use the HibernateDeleteClause instead.</para>
-    
-    <para>DML clauses in JPA don't take JPA level cascade rules into account and don't provide 
-    finegrained second level cache interaction.</para>
-  </sect2>
-
-  <sect2>
-    <title>Update clauses</title>
-    
-    <para>Update clauses in Querydsl JPA follow a simple update-set/where-execute form.
-      Here are some examples:
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// rename customers named Bob to Bobby
-new JPAUpdateClause(session, customer).where(customer.name.eq("Bob"))
-    .set(customer.name, "Bobby")
-    .execute();  
-]]></programlisting>
-
-    <para>The second parameter of the JPAUpdateClause constructor is the entity to
-      be updated.
-      The set invocations define the property updates in SQL-Update-style and the execute call
-      performs
-      the Update and returns the amount of updated entities.
-    </para>
-
-    <para>For Hibernate based Update usage, use the HibernateUpdateClause instead.</para>
-    
-    <para>DML clauses in JPA don't take JPA level cascade rules into account and don't provide 
-    finegrained second level cache interaction.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Subqueries</title>
-
-    <para>To create a subquery you create a JPASubQuery instance, define the query
-      parameters
-      via from, where etc and use
-      unique or list to create a subquery, which is just a type-safe Querydsl expression for the
-      query.
-      unique is used for a unique (single) result and list for a list result.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QDepartment department = QDepartment.department;
-QDepartment d = new QDepartment("d");
-query.from(department)
-    .where(department.employees.size().eq(
-        new JPASubQuery().from(d).unique(d.employees.size().max())
-     )).list(department);
-]]></programlisting>
-
-    <para>Another example</para>
-
-    <programlisting language="java"><![CDATA[
-QEmployee employee = QEmployee.employee;
-QEmployee e = new QEmployee("e");
-query.from(employee)
-    .where(employee.weeklyhours.gt(
-        new JPASubQuery().from(employee.department.employees, e)
-        .where(e.manager.eq(employee.manager))
-        .unique(e.weeklyhours.avg())
-    )).list(employee);
-]]></programlisting>
-
-    <para>For Hibernate based sub query usage, use the HibernateSubQuery instead.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Exposing the original query</title>
-
-    <para>If you need to tune the original Query before the execution of the query you
-      can expose it like this:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-JPAQuery query = new JPAQuery(entityManager);
-Query jpaQuery = query.from(employee).createQuery(employee);
-// ...
-List results = jpaQuery.getResultList();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>Using Native SQL in JPA queries</title>
-
-    <para>Querydsl supports Native SQL in JPA via the JPASQLQuery class.
-    </para>
-
-    <para>To use it, you must generate Querydsl query types for your SQL schema. This can
-      be done for example with the following Maven configuration:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${project.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.mycompany.mydomain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder> 
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>
-]]></programlisting>
-
-    <para>When the query types have successfully been generated into the location of your
-      choice, you can use them in your queries.
-    </para>
-
-    <para>Single column query:</para>
-
-    <programlisting language="java"><![CDATA[
-// serialization templates
-SQLTemplates templates = new DerbyTemplates(); 
-// query types (S* for SQL, Q* for domain types)
-SAnimal cat = new SAnimal("cat");   
-SAnimal mate = new SAnimal("mate"); 
-QCat catEntity = QCat.cat;          
- 
-JPASQLQuery query = new JPASQLQuery(entityManager, templates);
-List<String> names = query.from(cat).list(cat.name);
-]]></programlisting>
-
-    <para>If you mix entity (e.g. QCat) and table (e.g. SAnimal) references in your query you need to make sure that they 
-    use the same variable names. SAnimal.animal has the variable name "animal", so a new instance
-    (new SAnimal("cat")) was used instead.</para>
-    
-    <para>An alternative pattern could be</para>
-    
-    <programlisting language="java"><![CDATA[
-QCat catEntity = QCat.cat;    
-SAnimal cat = new SAnimal(catEntity.getMetadata().getName());
-]]></programlisting>      
-
-    <para>Query multiple columns:</para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<Object[]> rows = query.from(cat).list(cat.id, cat.name);
-]]></programlisting>
-
-    <para>Query all columns:</para>
-
-    <programlisting language="java"><![CDATA[
-List<Object[]> rows = query.from(cat).list(cat.all());
- ]]></programlisting>
-
-    <para>Query in SQL, but project as entity: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<Cat> cats = query.from(cat).orderBy(cat.name.asc()).list(catEntity);
-]]></programlisting>
-
-    <para>Query with joins: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-cats = query.from(cat)
-    .innerJoin(mate).on(cat.mateId.eq(mate.id))
-    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
-    .list(catEntity);
-]]></programlisting>
-
-    <para>Query and project into DTO: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<CatDTO> catDTOs = query.from(cat)
-    .orderBy(cat.name.asc())
-    .list(ConstructorExpression.create(CatDTO.class, cat.id, cat.name));
-]]></programlisting>
-
-    <para>If you are using the Hibernate API instead of the JPA API, then use
-      HibernateSQLQuery instead.
-    </para>
-
-  </sect2>
-
-</sect1>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<sect1 id="jpa_integration" revision="1">
+
+  <title>Querying JPA</title>
+
+  <para>
+    Querydsl defines a general statically typed syntax for querying on top of
+    persisted domain model data. JDO and JPA are the primary integration
+    technologies for Querydsl. This guide describes how to use Querydsl
+    in combination with JPA.
+  </para>
+
+  <para>
+    Querydsl for JPA is an alternative to both JPQL and Criteria queries. It combines the
+    dynamic nature of Criteria queries with the expressiveness of JPQL and all that in a fully
+    typesafe manner.
+  </para>
+
+  <sect2>
+    <title>Maven integration</title>
+
+    <para>
+      Add the following dependencies to your Maven project:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-apt</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>
+
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-jpa</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+]]></programlisting>
+
+    <para>
+      And now, configure the Maven APT plugin:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+  <plugins>
+    ...
+    <plugin>
+      <groupId>com.mysema.maven</groupId>
+      <artifactId>apt-maven-plugin</artifactId>
+      <version>1.1.3</version>
+      <executions>
+        <execution>
+          <goals>
+            <goal>process</goal>
+          </goals>
+          <configuration>
+            <outputDirectory>target/generated-sources/java</outputDirectory>
+            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+          </configuration>
+        </execution>
+      </executions>
+    </plugin>
+    ...
+  </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+    <para>
+      The JPAAnnotationProcessor finds domain types annotated with the
+      javax.persistence.Entity annotation and generates query types for them.
+    </para>
+
+    <para>
+      If you use Hibernate annotations in your domain types you should use
+      the APT processor
+      <code>com.querydsl.apt.hibernate.HibernateAnnotationProcessor</code>
+      instead.
+    </para>
+
+    <para>
+      Run clean install and you will get your Query types generated into
+      target/generated-sources/java.
+    </para>
+
+    <para>
+      If you use Eclipse, run mvn eclipse:eclipse to update your Eclipse project to
+      include target/generated-sources/java as a source folder.
+    </para>
+
+    <para>
+      Now you are able to construct JPA query instances and instances of
+      the query domain model.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Ant integration</title>
+
+    <para>Place the jar files from the full-deps bundle on your classpath and use the
+      following tasks for Querydsl code generation:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+    <!-- APT based code generation -->
+    <javac srcdir="${src}" classpathref="cp">
+      <compilerarg value="-proc:only"/>
+      <compilerarg value="-processor"/>
+      <compilerarg value="com.querydsl.apt.jpa.JPAAnnotationProcessor"/>
+      <compilerarg value="-s"/>
+      <compilerarg value="${generated}"/>
+    </javac>
+
+    <!-- compilation -->
+    <javac classpathref="cp" destdir="${build}">
+      <src path="${src}"/>
+      <src path="${generated}"/>
+    </javac>
+]]></programlisting>
+
+    <para>
+      Replace
+      <emphasis>src</emphasis>
+      with your main source folder,
+      <emphasis>generated</emphasis>
+      with your folder for generated sources
+      and
+      <emphasis>build</emphasis>
+      with your target folder.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using Querydsl JPA in Roo</title>
+
+    <para>
+      If you are using Querydsl JPA with Spring Roo you can replace
+      <code>com.querydsl.apt.jpa.JPAAnnotationProcessor</code>
+      with
+      <code>com.querydsl.apt.roo.RooAnnotationProcessor</code>
+      which will handle
+      <code>@RooJpaEntity</code> and <code>@RooJpaActiveRecord</code>
+      annotated classes instead of
+      <code>@Entity</code>
+      annotated classes.
+    </para>
+
+    <para>
+      APT based code generation doesn't work well with AspectJ IDTs.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Generating the model from hbm.xml files</title>
+
+    <para>If you are using Hibernate with an XML based configuration, you can use the XML
+      metadata to create your Querydsl model.
+    </para>
+
+    <para><code>com.querydsl.jpa.codegen.HibernateDomainExporter</code> provides the
+      functionality for this:</para>
+
+    <programlisting language="java"><![CDATA[
+HibernateDomainExporter exporter = new HibernateDomainExporter(
+  "Q",                     // name prefix
+  new File("target/gen3"), // target folder
+  configuration);          // instance of org.hibernate.cfg.Configuration
+
+exporter.export();
+]]></programlisting>
+
+    <para>The HibernateDomainExporter needs to be executed within a classpath where the
+      domain types are visible, since the property types are resolved
+      via reflection.
+    </para>
+
+    <para>All JPA annotations are ignored, but Querydsl annotations such as @QueryInit and
+      @QueryType are taken into account.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using query types</title>
+
+    <para>
+      To create queries with Querydsl you need to instantiate variables and
+      Query implementations. We will start with the variables.
+    </para>
+
+    <para>
+      Let's assume that your project has the following domain type:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+@Entity
+public class Customer {
+    private String firstName;
+    private String lastName;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setFirstName(String fn) {
+        firstName = fn;
+    }
+
+    public void setLastName(String ln) {
+        lastName = ln;
+    }
+}
+]]></programlisting>
+
+    <para>
+      Querydsl will generate a query type with the simple name QCustomer into the
+      same package as Customer. QCustomer can be used as a statically
+      typed variable in Querydsl queries as a representative for the
+      Customer type.
+    </para>
+
+    <para>
+      QCustomer has a default instance variable which can be accessed as a static
+      field:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+]]></programlisting>
+
+    <para>
+      Alternatively you can define your own Customer variables like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = new QCustomer("myCustomer");
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Querying</title>
+
+    <para>The Querydsl JPA module supports both the JPA and the Hibernate API.</para>
+
+    <para>
+      To use the JPA API you use <code>JPAQuery</code> instances for your queries like
+      this:
+    </para>
+
+<programlisting language="java"><![CDATA[
+// where entityManager is a JPA EntityManager
+JPAQuery<?> query = new JPAQuery<Void>(entityManager);
+]]></programlisting>
+
+    <para>If you are using the Hibernate API instead, you can instantiate a
+    <code>HibernateQuery</code> like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+// where session is a Hibernate session
+HibernateQuery<?> query = new HibernateQuery<Void>(session);
+]]></programlisting>
+
+    <para>Both <code>JPAQuery</code> and <code>HibernateQuery</code> implement the <code>JPQLQuery</code> interface.</para>
+
+    <para>For the examples of this chapter the queries are created via a <code>JPAQueryFactory</code> instance.
+      <code>JPAQueryFactory</code> should be the preferred option to obtain <code>JPAQuery</code> instances.</para>
+
+    <para>For the Hibernate API <code>HibernateQueryFactory</code> can be used</para>
+
+    <para>
+      To retrieve the customer with the first name Bob you would construct a
+      query like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+Customer bob = queryFactory.selectFrom(customer)
+  .where(customer.firstName.eq("Bob"))
+  .fetchOne();
+]]></programlisting>
+
+    <para>
+      The selectFrom call defines the query source and projection, the where part defines the
+      filter and fetchOne tells Querydsl to return a single element. Easy, right?
+    </para>
+
+    <para>
+      To create a query with multiple sources you use the query like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+QCompany company = QCompany.company;
+query.from(customer, company);
+]]></programlisting>
+
+    <para>
+      And to use multiple filters use it like this
+    </para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));
+]]></programlisting>
+
+    <para>Or like this</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
+]]></programlisting>
+
+    <para>In native JPQL form the query would be written like this: </para>
+
+    <programlisting>
+select customer from Customer as customer
+where customer.firstName = "Bob" and customer.lastName = "Wilson"
+</programlisting>
+
+    <para>If you want to combine the filters via "or" then use the following pattern
+    </para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(customer)
+    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using joins</title>
+
+    <para>Querydsl supports the following join variants in JPQL: inner join, join, left
+      join and right join. Join usage is typesafe, and follows the following pattern:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCat cat = QCat.cat;
+QCat mate = new QCat("mate");
+QCat kitten = new QCat("kitten");
+queryFactory.selectFrom(cat)
+    .innerJoin(cat.mate, mate)
+    .leftJoin(cat.kittens, kitten)
+    .fetch();
+]]></programlisting>
+
+    <para>The native JPQL version of the query would be </para>
+
+    <programlisting>
+select cat from Cat as cat
+inner join cat.mate as mate
+left outer join cat.kittens as kitten
+</programlisting>
+
+    <para>Another example</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.selectFrom(cat)
+    .leftJoin(cat.kittens, kitten)
+    .on(kitten.bodyWeight.gt(10.0))
+    .fetch();
+]]></programlisting>
+
+    <para>With the following JPQL version</para>
+
+    <programlisting>
+select cat from Cat as cat
+left join cat.kittens as kitten
+on kitten.bodyWeight > 10.0
+</programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>General usage</title>
+
+    <para>Use the the cascading methods of the JPQLQuery interface like this</para>
+
+    <para>
+      <emphasis>select:</emphasis>
+      Set the projection of the query. (Not necessary if created via query factory)
+    </para>
+
+    <para>
+      <emphasis>from:</emphasis>
+      Add the query sources here.
+    </para>
+
+    <para>
+      <emphasis>innerJoin, join, leftJoin, rightJoin, on:</emphasis>
+      Add join elements using these constructs.
+      For the join methods the first argument is the join source and the second the target
+      (alias).
+    </para>
+
+    <para>
+      <emphasis>where:</emphasis>
+      Add query filters, either in varargs form separated via commas or
+      cascaded via the and-operator.
+    </para>
+
+    <para>
+      <emphasis>groupBy:</emphasis>
+      Add group by arguments in varargs form.
+    </para>
+
+    <para>
+      <emphasis>having:</emphasis>
+      Add having filters of the "group by" grouping as an varags array of
+      Predicate expressions.
+    </para>
+
+    <para>
+      <emphasis>orderBy:</emphasis>
+      Add ordering of the result as an varargs array of order expressions.
+      Use asc() and desc() on numeric, string and other comparable expression to access the
+      OrderSpecifier instances.
+    </para>
+
+    <para>
+      <emphasis>limit, offset, restrict:</emphasis>
+      Set the paging of the result. Limit for max results,
+      offset for skipping rows and restrict for defining both in one call.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Ordering</title>
+
+    <para>The syntax for declaring ordering is </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+queryFactory.selectFrom(customer)
+    .orderBy(customer.lastName.asc(), customer.firstName.desc())
+    .fetch();
+]]></programlisting>
+
+    <para>which is equivalent to the following native JPQL</para>
+
+    <programlisting>
+select customer from Customer as customer
+order by customer.lastName asc, customer.firstName desc
+</programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Grouping</title>
+
+    <para>Grouping can be done in the following form</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.lastName).from(customer)
+    .groupBy(customer.lastName)
+    .fetch();
+]]></programlisting>
+
+    <para>which is equivalent to the following native JPQL</para>
+
+    <programlisting>
+select customer.lastName
+from Customer as customer
+group by customer.lastName
+</programlisting>
+
+
+  </sect2>
+
+  <sect2>
+    <title>Delete clauses</title>
+    <para>Delete clauses in Querydsl JPA follow a simple delete-where-execute form. Here
+      are some
+      examples:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+// delete all customers
+queryFactory.delete(customer).execute();
+// delete all customers with a level less than 3
+queryFactory.delete(customer).where(customer.level.lt(3)).execute();
+]]></programlisting>
+
+    <para>The where call is optional and the execute call performs the deletion and returns the
+      amount of deleted entities.
+    </para>
+
+    <para>DML clauses in JPA don't take JPA level cascade rules into account and don't provide
+    fine-grained second level cache interaction.</para>
+  </sect2>
+
+  <sect2>
+    <title>Update clauses</title>
+
+    <para>Update clauses in Querydsl JPA follow a simple update-set/where-execute form.
+      Here are some examples:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+// rename customers named Bob to Bobby
+queryFactory.update(customer).where(customer.name.eq("Bob"))
+    .set(customer.name, "Bobby")
+    .execute();
+]]></programlisting>
+
+    <para>The set invocations define the property updates in SQL-Update-style and the execute call
+      performs the Update and returns the amount of updated entities.
+    </para>
+
+    <para>DML clauses in JPA don't take JPA level cascade rules into account and don't provide
+    fine-grained second level cache interaction.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Subqueries</title>
+
+    <para>To create a subquery you use the static factory methods of <code>JPAExpressions</code> and
+      define the query parameters via from, where etc.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QDepartment department = QDepartment.department;
+QDepartment d = new QDepartment("d");
+queryFactory.selectFrom(department)
+    .where(department.size.eq(
+        JPAExpressions.select(d.size.max()).from(d)))
+     .fetch();
+]]></programlisting>
+
+    <para>Another example</para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee employee = QEmployee.employee;
+QEmployee e = new QEmployee("e");
+queryFactory.selectFrom(employee)
+    .where(employee.weeklyhours.gt(
+        JPAExpressions.select(e.weeklyhours.avg())
+            .from(employee.department.employees, e)
+            .where(e.manager.eq(employee.manager))))
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+    <title>Exposing the original query</title>
+
+    <para>If you need to tune the original Query before the execution of the query you
+      can expose it like this:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+Query jpaQuery = queryFactory.selectFrom(employee).createQuery();
+// ...
+List results = jpaQuery.getResultList();
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+    <title>Using Native SQL in JPA queries</title>
+
+    <para>Querydsl supports Native SQL in JPA via the JPASQLQuery class.
+    </para>
+
+    <para>To use it, you must generate Querydsl query types for your SQL schema. This can
+      be done for example with the following Maven configuration:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
+          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
+          <packageName>com.mycompany.mydomain</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+    <para>When the query types have successfully been generated into the location of your
+      choice, you can use them in your queries.
+    </para>
+
+    <para>Single column query:</para>
+
+    <programlisting language="java"><![CDATA[
+// serialization templates
+SQLTemplates templates = new DerbyTemplates();
+// query types (S* for SQL, Q* for domain types)
+SAnimal cat = new SAnimal("cat");
+SAnimal mate = new SAnimal("mate");
+QCat catEntity = QCat.cat;
+
+JPASQLQuery<?> query = new JPASQLQuery<Void>(entityManager, templates);
+List<String> names = query.select(cat.name).from(cat).fetch();
+]]></programlisting>
+
+    <para>If you mix entity (e.g. QCat) and table (e.g. SAnimal) references in your query you need to make sure that they
+    use the same variable names. SAnimal.animal has the variable name "animal", so a new instance
+    (new SAnimal("cat")) was used instead.</para>
+
+    <para>An alternative pattern could be</para>
+
+    <programlisting language="java"><![CDATA[
+QCat catEntity = QCat.cat;
+SAnimal cat = new SAnimal(catEntity.getMetadata().getName());
+]]></programlisting>
+
+    <para>Query multiple columns:</para>
+
+    <programlisting language="java"><![CDATA[
+query = new JPASQLQuery<Void>(entityManager, templates);
+List<Tuple> rows = query.select(cat.id, cat.name).from(cat).fetch();
+]]></programlisting>
+
+    <para>Query all columns:</para>
+
+    <programlisting language="java"><![CDATA[
+List<Tuple> rows = query.select(cat.all()).from(cat).fetch();
+ ]]></programlisting>
+
+    <para>Query in SQL, but project as entity: </para>
+
+    <programlisting language="java"><![CDATA[
+query = new JPASQLQuery<Void>(entityManager, templates);
+List<Cat> cats = query.select(catEntity).from(cat).orderBy(cat.name.asc()).fetch();
+]]></programlisting>
+
+    <para>Query with joins: </para>
+
+    <programlisting language="java"><![CDATA[
+query = new JPASQLQuery<Void>(entityManager, templates);
+cats = query.select(catEntity).from(cat)
+    .innerJoin(mate).on(cat.mateId.eq(mate.id))
+    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
+    .fetch();
+]]></programlisting>
+
+    <para>Query and project into DTO: </para>
+
+    <programlisting language="java"><![CDATA[
+query = new JPASQLQuery<Void>(entityManager, templates);
+List<CatDTO> catDTOs = query.select(Projections.constructor(CatDTO.class, cat.id, cat.name))
+    .from(cat)
+    .orderBy(cat.name.asc())
+    .fetch();
+]]></programlisting>
+
+    <para>If you are using the Hibernate API instead of the JPA API, then use
+      <code>HibernateSQLQuery</code> instead.
+    </para>
+
+  </sect2>
+
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
index 0c62b6e5f4..5890297c8c 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/lucene.xml
@@ -5,47 +5,45 @@
   <title>Querying Lucene</title>
 
   <para>This chapter describes the querying functionality of the Lucene module.</para>
-  
+
   <sect2>
     <title>Maven integration</title>
 
     <para>
-      Querydsl Lucene can be used via the querydsl-lucene3 module for Lucene 3 and querydsl-lucene4
-      for Lucene 4
+      Querydsl Lucene can be used via the querydsl-lucene3 module for Lucene 3, querydsl-lucene4
+      for Lucene 4 and querydsl-lucene5 for Lucene 5
     </para>
-    
+
     <para>Lucene 3:</para>
 
     <programlisting language="xml"><![CDATA[
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-lucene3</artifactId>
   <version>${querydsl.version}</version>
 </dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
 ]]></programlisting>
 
   <para>Lucene 4:</para>
-  
+
     <programlisting language="xml"><![CDATA[
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-lucene4</artifactId>
   <version>${querydsl.version}</version>
 </dependency>
+]]></programlisting>
 
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>  
 
+ <para>Lucene 5:</para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-lucene5</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+]]></programlisting>
   </sect2>
 
   <sect2>
@@ -55,16 +53,16 @@
     <para>With fields year and title a manually created query type could look something
       like this:</para>
 
-    <programlisting language="java"><![CDATA[ 
-public class QDocument extends EntityPathBase<Document>{
+    <programlisting language="java"><![CDATA[
+public class QDocument extends EntityPathBase<Document> {
     private static final long serialVersionUID = -4872833626508344081L;
-        
+
     public QDocument(String var) {
         super(Document.class, PathMetadataFactory.forVariable(var));
     }
 
     public final StringPath year = createString("year");
-        
+
     public final StringPath title = createString("title");
 }
 ]]></programlisting>
@@ -81,19 +79,19 @@ public class QDocument extends EntityPathBase<Document>{
 
     <para>Querying with Querydsl Lucene is as simple as this:</para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 QDocument doc = new QDocument("doc");
 
 IndexSearcher searcher = new IndexSearcher(index);
-LuceneQuery query = new LuceneQuery(true, searcher); 
+LuceneQuery query = new LuceneQuery(true, searcher);
 List<Document> documents = query
     .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
-    .list();
+    .fetch();
 ]]></programlisting>
 
     <para>which is transformed into the following Lucene query:</para>
 
-    <programlisting><![CDATA[     
+    <programlisting><![CDATA[
 +year:[1800 TO 2000] +title:huckle*
 ]]></programlisting>
 
@@ -143,16 +141,16 @@ List<Document> documents = query
 
     <para>The syntax for declaring ordering is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .orderBy(doc.title.asc(), doc.year.desc())
-    .list();
+    .fetch();
 ]]></programlisting>
 
     <para>which is equivalent to the following Lucene query</para>
 
-    <programlisting>  
+    <programlisting>
 title:*
 </programlisting>
 
@@ -163,11 +161,11 @@ title:*
     </para>
 
     <programlisting language="java"><![CDATA[
-Sort sort = ...; 
+Sort sort = ...;
 query
     .where(doc.title.like("*"))
     .sort(sort)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -177,11 +175,11 @@ query
 
     <para>The syntax for declaring a limit is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .limit(10)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -191,11 +189,11 @@ query
 
     <para>The syntax for declaring an offset is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .offset(3)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -205,13 +203,13 @@ query
     <title>Fuzzy searches</title>
 
     <para>Fuzzy searches can be expressed via fuzzyLike methods in the
-      <code>com.mysema.query.lucene.LuceneExpressions</code> class:
+      <code>com.querydsl.lucene3.LuceneExpressions</code> class:
     </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(LuceneExpressions.fuzzyLike(doc.title, "Hello"))
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -222,21 +220,21 @@ query
 
     <para>It is possible to apply a single Lucene filter to the query like this:</para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .filter(filter)
-    .list();
+    .fetch();
 ]]></programlisting>
 
     <para>A shortcut for distinct filtering is provided via the distinct(Path) method:
     </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .distinct(doc.title)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/mongodb.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/mongodb.xml
index aa6444c823..3bcc1c3d4a 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/mongodb.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/mongodb.xml
@@ -15,23 +15,17 @@
 
     <programlisting language="xml"><![CDATA[
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-apt</artifactId>
   <version>${querydsl.version}</version>
   <scope>provided</scope>
-</dependency>    
-        
+</dependency>
+
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-mongodb</artifactId>
   <version>${querydsl.version}</version>
 </dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
 ]]></programlisting>
 
     <para>
@@ -47,7 +41,7 @@
       <plugin>
         <groupId>com.mysema.maven</groupId>
         <artifactId>apt-maven-plugin</artifactId>
-        <version>1.0.9</version>
+        <version>1.1.3</version>
         <executions>
           <execution>
             <goals>
@@ -55,7 +49,7 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.morphia.MorphiaAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.morphia.MorphiaAnnotationProcessor</processor>
             </configuration>
           </execution>
         </executions>
@@ -99,12 +93,12 @@
     <programlisting language="java"><![CDATA[
 Morphia morphia;
 Datastore datastore;
-// ...	
+// ...
 QUser user = new QUser("user");
 MorphiaQuery<User> query = new MorphiaQuery<User>(morphia, datastore, user);
 List<User> list = query
-	.where(user.firstName.eq("Bob"))
-	.list();
+    .where(user.firstName.eq("Bob"))
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -153,11 +147,11 @@ List<User> list = query
 
     <para>The syntax for declaring ordering is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .orderBy(doc.title.asc(), doc.year.desc())
-    .list();
+    .fetch();
 ]]></programlisting>
 
     <para>The results are sorted ascending based on title and year.</para>
@@ -169,11 +163,11 @@ query
 
     <para>The syntax for declaring a limit is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .limit(10)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -183,11 +177,11 @@ query
 
     <para>The syntax for declaring an offset is </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
     .offset(3)
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -200,10 +194,10 @@ query
       via the near-method:
     </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(geoEntity.location.near(50.0, 50.0))
-    .list();
+    .fetch();
 ]]></programlisting>
 
   </sect2>
@@ -213,13 +207,13 @@ query
     <title>Select only relevant fields</title>
 
     <para>To select only relevant fields you can use the overloaded projection methods
-      list, iterate, uniqueResult and singleResult methods like this
+      fetch, iterate, fetchOne and fetchFirst methods like this
     </para>
 
-    <programlisting language="java"><![CDATA[ 
+    <programlisting language="java"><![CDATA[
 query
     .where(doc.title.like("*"))
-    .list(doc.title, doc.path);
+    .fetch(doc.title, doc.path);
 ]]></programlisting>
 
     <para>This query will load only the title and path fields of the documents.</para>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml
index 79db49679a..5cf0ab4213 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/scala.xml
@@ -5,12 +5,12 @@
   <title>Querying in Scala</title>
 
   <para>Generic support for Querydsl usage in Scala is available via querydsl-scala
-    module. To add it to your Maven build, use the following snippet :
+    module. To add it to your Maven build, use the following snippet:
   </para>
 
   <programlisting language="xml"><![CDATA[
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-scala</artifactId>
   <version>${querydsl.version}</version>
 </dependency>
@@ -38,7 +38,7 @@ expr eq "Ben"           expr === "Ben"
 expr ne "Ben"           expr !== "Ben"
 expr append "X"         expr + "X"
 expr isEmpty            expr is empty
-expr isNotEmpoty        expr not empty
+expr isNotEmpty         expr not empty
 
 // boolean
 left and right          left && right
@@ -52,7 +52,7 @@ expr gt 5               expr > 5
 expr goe 5              expr >= 5
 expr notBetween(2,6)    expr not between (2,6)
 expr negate             -expr
- 
+
 // numeric
 expr add 3              expr + 3
 expr subtract 3         expr - 3
@@ -67,66 +67,23 @@ map.get("X")            map("X")
 
   </sect2>
 
-  <sect2>
-    <title>Improved projections</title>
-
-    <para>The Querydsl Scala module offers a few implicit conversion to make Querydsl
-      query projections more Scala compatible.
-    </para>
-
-    <para>
-      The <code>RichProjectable</code> and <code>RichSimpleProjectable</code> wrappers should be used to enable
-      Scala projections for Querydsl queries.
-      By importing the contents of <code>com.mysema.query.scala.Helpers</code>
-      the needed implicit conversions become available.
-    </para>
-
-    <para>
-      For example the following query with the standard API would return a <code>java.util.List</code> of
-      type <code>Object[]</code>.
-    </para>
-
-    <programlisting language="java"><![CDATA[  
-query.from(person).list(person.firstName, person.lastName, person.age)
-]]></programlisting>
-
-    <para>With the added conversions you can use select instead of list for Scala list
-      typed results, unique instead of uniqueResult for
-      Option typed results and single instead of singleResult for Option typed results.
-    </para>
-
-    <para>The previous query could be expressed like this with the implicit conversions:
-    </para>
-
-    <programlisting language="java"><![CDATA[
-import com.mysema.query.scala.Helpers._
-  
-query.from(person).select(person.firstName, person.lastName, person.age)
-]]></programlisting>
-
-    <para>In this case the result type would be List[(String,String,Integer)] or in other
-      words List of Tuple3[String,String,Integer].
-    </para>
-
-  </sect2>
-
   <sect2>
 
     <title>Querying with SQL</title>
 
     <para>
       Like with Querydsl SQL for Java you need to generate Query types to be able to construct
-      your queries. The following code examples show how this is done :
+      your queries. The following code examples show how this is done:
     </para>
 
     <para>Generation without Bean types :</para>
 
-    <programlisting language="java"><![CDATA[  
+    <programlisting language="java"><![CDATA[
 val directory = new java.io.File("target/jdbcgen1")
 val namingStrategy = new DefaultNamingStrategy()
 val exporter = new MetaDataExporter()
 exporter.setNamePrefix("Q")
-exporter.setPackageName("com.mysema")
+exporter.setPackageName("com.querydsl")
 exporter.setSchemaPattern("PUBLIC")
 exporter.setTargetFolder(directory)
 exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
@@ -137,69 +94,21 @@ exporter.export(connection.getMetaData)
 
     <para>Generation with Bean types :</para>
 
-    <programlisting language="java"><![CDATA[    
+    <programlisting language="java"><![CDATA[
 val directory = new java.io.File("target/jdbcgen2")
 val namingStrategy = new DefaultNamingStrategy()
 val exporter = new MetaDataExporter()
 exporter.setNamePrefix("Q")
-exporter.setPackageName("com.mysema")
+exporter.setPackageName("com.querydsl")
 exporter.setSchemaPattern("PUBLIC")
 exporter.setTargetFolder(directory)
 exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
 exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer])
 exporter.setCreateScalaSources(true)
 exporter.setTypeMappings(ScalaTypeMappings.create)
-exporter.export(connection.getMetaData)        
-]]></programlisting>
-
-    <sect3>
-
-      <title>Compact queries</title>
-
-      <para>Querydsl Scala provides a compact query syntax for Querydsl SQL. The syntax is
-        inspired by domain oriented query syntaxes like that from the Rogue framework.
-      </para>
-
-      <para>
-        The domain oriented queries are implemented as implicit conversions from
-        <code>RelationalPath</code> instances into queries. This functionality
-        can be made available by implementing the
-        <code>com.mysema.query.scala.sql.SQLHelpers</code>
-        trait in your service or DAO classes.
-      </para>
-
-      <para>Using this compact syntax you can use your meta model classes as a starting
-        point for queries.
-      </para>
-
-      <para>Instead of the following normal syntax</para>
-
-      <programlisting language="java"><![CDATA[    
-query().from(employee).select(employee.firstName, employee.lastName)        
-]]></programlisting>
-
-      <para>you could use the companion object of Employee or QEmployee and write it like
-        this </para>
-
-      <programlisting language="java"><![CDATA[    
-Employee.select(_.firstName, _.lastName)        
-]]></programlisting>
-
-      <para>Instead of giving expressions to orderBy, where, select, single and unique you
-        can give functions which take the root expression of
-        the query and return another expression. The expanded form of the previous example would be
-      </para>
-
-      <programlisting language="java"><![CDATA[    
-Employee.select({ e => e.firstName }, { e => e.lastName })        
+exporter.export(connection.getMetaData)
 ]]></programlisting>
 
-      <para>
-        See the signature of the <code>com.mysema.query.scala.sql.RichSimpleQuery</code>
-        class for details.
-      </para>
-
-    </sect3>
 
     <sect3>
 
@@ -209,39 +118,47 @@ Employee.select({ e => e.firstName }, { e => e.lastName })
         querydsl-maven-plugin. Here is an example configuration
       </para>
 
-      <programlisting language="xml"><![CDATA[      
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>
-  <configuration>
-    <jdbcDriver>com.mysql.jdbc.Driver</jdbcDriver>
-    <jdbcUrl>jdbc:mysql://localhost:3306/test</jdbcUrl>
-    <jdbcUser>matko</jdbcUser>
-    <jdbcPassword>matko</jdbcPassword>			
-    <packageName>com.example.schema</packageName>
-    <targetFolder>${project.basedir}/src/main/scala</targetFolder>
-    <exportBeans>true</exportBeans>
-    <createScalaSources>true</createScalaSources>    		    
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>mysql</groupId>
-	  <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.16</version>
-	</dependency>
-	  <dependency>
-    	<groupId>com.mysema.querydsl</groupId>
-    	<artifactId>querydsl-scala</artifactId>
-    	<version>${querydsl.version}</version>
-  	  </dependency>
-  	  <dependency>
-    	<groupId>org.scala-lang</groupId>
-    	<artifactId>scala-library</artifactId>
-    	<version>${scala.version}</version>
-  	  </dependency>
-  </dependencies>
-</plugin>     
+      <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <configuration>
+          <jdbcDriver>com.mysql.jdbc.Driver</jdbcDriver>
+          <jdbcUrl>jdbc:mysql://localhost:3306/test</jdbcUrl>
+          <jdbcUser>matko</jdbcUser>
+          <jdbcPassword>matko</jdbcPassword>
+          <packageName>com.example.schema</packageName>
+          <targetFolder>${project.basedir}/src/main/scala</targetFolder>
+          <exportBeans>true</exportBeans>
+          <createScalaSources>true</createScalaSources>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.16</version>
+          </dependency>
+          <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-scala</artifactId>
+            <version>${querydsl.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
 ]]></programlisting>
 
       <para>The maven goal to execute is querydsl:export.</para>
@@ -259,7 +176,7 @@ Employee.select({ e => e.firstName }, { e => e.lastName })
 
     <para>Here is a minimal example with JPA :</para>
 
-    <programlisting language="java"><![CDATA[  
+    <programlisting language="java"><![CDATA[
 @Entity
 class User {
   @BeanProperty
@@ -289,35 +206,35 @@ class Department {
     <programlisting language="java"><![CDATA[
 val person = Person as "person"
 
-query.from(person).where(person.firstName like "Rob%").list(person)
+selectFrom(person).where(person.firstName like "Rob%").fetch()
 ]]></programlisting>
 
     <para>Unique result</para>
 
     <programlisting language="java"><![CDATA[
-query.from(person).where(person.firstName like "Rob%").unique(person)
+selectFrom(person).where(person.firstName like "Rob%").fetchOne()
 ]]></programlisting>
 
     <para>Long where</para>
 
     <programlisting language="java"><![CDATA[
-query.from(person) 
-  .where(person.firstName like "Rob%", person.lastName like "An%") 
-  .list(person)
+selectFrom(person)
+  .where(person.firstName like "Rob%", person.lastName like "An%")
+  .fetch()
 ]]></programlisting>
 
     <para>Order</para>
 
     <programlisting language="java"><![CDATA[
-query.from(person).orderBy(person.firstName asc).list(person)
+selectFrom(person).orderBy(person.firstName asc).fetch()
 ]]></programlisting>
 
     <para>Not null</para>
 
     <programlisting language="java"><![CDATA[
-query.from(person) 
-  .where(person.firstName isEmpty, person.lastName isNotNull) 
-  .list(person)
+selectFrom(person)
+  .where(person.firstName isEmpty, person.lastName isNotNull)
+  .fetch()
 ]]></programlisting>
 
     <para>The factory method for query creation is</para>
@@ -336,4 +253,4 @@ val person = Person as "person"
 
   </sect2>
 
-</sect1>  
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml
index 15ecd81276..96f07affbd 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/spatial.xml
@@ -3,33 +3,33 @@
 <sect1 id="spatial" revision="1">
 
   <title>Querydsl Spatial</title>
-  
-  <para>Support for Spatial queries is available via the Querydsl Spatial module, which is an extension 
+
+  <para>Support for Spatial queries is available via the Querydsl Spatial module, which is an extension
   module to the SQL module. The Spatial module supports the object model of Simple Feature Access in queries
   and object binding.</para>
-  
+
   <para>The <ulink url="http://www.geolatte.org/">geolatte</ulink> project is used for the object model.</para>
-  
+
   <imagedata fileref="media/spatial.svg" scalefit="1" width="90%"/>
-  
+
   <sect2>
     <title>Maven integration</title>
-    
+
     <para>
       Add the following dependency to your Maven project:
     </para>
-    
+
     <programlisting language="xml"><![CDATA[
 <dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-spatial</artifactId>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql-spatial</artifactId>
   <version>${querydsl.version}</version>
-</dependency>    
+</dependency>
 ]]></programlisting>
 
     <para>Additionally the following database specific extra dependencies:</para>
-    
-<programlisting language="xml"><![CDATA[    
+
+<programlisting language="xml"><![CDATA[
 <!-- for PostgreSQL usage -->
 <dependency>
   <groupId>org.postgis</groupId>
@@ -46,39 +46,47 @@
   <scope>provided</scope>
 </dependency>
 ]]></programlisting>
-    
+
   </sect2>
-  
+
   <sect2>
 
     <title>Code generation via Maven</title>
-    
+
     <para>The code generation for Querydsl SQL can be set to detect the usage of spatial types in
     database schemas and use geolatte types in these case via the spatial property:</para>
-    
-    <programlisting language="xml"><![CDATA[   
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>
-  ...
-  <configuration>
-    ...
-    <spatial>true</spatial>
-  </configuration>
-</plugin>  
-]]></programlisting>  
-    
-  </sect2>  
-  
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        ...
+        <configuration>
+          ...
+          <spatial>true</spatial>
+        </configuration>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+  </sect2>
+
   <sect2>
-  
+
     <title>Runtime configuration</title>
-    
+
     <para>The runtime configuration aspect of the spatial module is that instead of the normal
     SQLTemplates instances, spatial enabled instances are used. Below is a list of spatial enabled
     SQLTemplates classes.</para>
-    
+
     <itemizedlist>
       <listitem>
         <para>GeoDBTemplates (for H2)</para>
@@ -98,81 +106,81 @@
       <listitem>
         <para>TeradataSpatialTemplates</para>
       </listitem>
-    </itemizedlist>    
-  
+    </itemizedlist>
+
   </sect2>
-  
+
   <sect2>
-  
+
     <title>Querying</title>
-    
-    <para>With code generation and runtime configuration set for spatial types we can now try 
+
+    <para>With code generation and runtime configuration set for spatial types we can now try
     queries with it.</para>
-    
+
     <sect3>
-    
+
       <title>Filter by Distance</title>
-      
+
       <programlisting language="java"><![CDATA[
-Geometry point = Wkt.fromWkt("Point(2 2)");  
-query.where(table.geo.distance(point).lt(5.0));      
-]]></programlisting>      
+Geometry point = Wkt.fromWkt("Point(2 2)");
+query.where(table.geo.distance(point).lt(5.0));
+]]></programlisting>
 
-      <para>In addition to straight distance between geometries spherical and spherodial distance are provided via
+      <para>In addition to straight distance between geometries spherical and spheroidal distance are provided via
       distanceSphere and distanceSpheroid.</para>
-    
+
     </sect3>
-    
+
     <sect3>
-    
+
       <title>Contains</title>
-      
+
       <programlisting language="java"><![CDATA[
-Geometry point = Wkt.fromWkt("Point(2 2)");  
-query.where(table.geo.contains(point));      
-]]></programlisting>        
-    
+Geometry point = Wkt.fromWkt("Point(2 2)");
+query.where(table.geo.contains(point));
+]]></programlisting>
+
     </sect3>
-    
+
     <sect3>
-    
+
       <title>Intersection</title>
-      
+
       <programlisting language="java"><![CDATA[
-Geometry geo = query.uniqueResult(table.geo1.intersection(table.geo2));      
+Geometry geo = query.select(table.geo1.intersection(table.geo2)).fetchOne();
 ]]></programlisting>
-    
+
     </sect3>
-    
+
     <sect3>
-     
-      <title>Access to the SPATIAL_REF_SYS table</title>   
-    
-      <para>Unified access to the SPATIAL_REF_SYS standard table is provided via the QSpatialRefSys 
+
+      <title>Access to the SPATIAL_REF_SYS table</title>
+
+      <para>Unified access to the SPATIAL_REF_SYS standard table is provided via the QSpatialRefSys
       and SpatialRefSys classes. SPATIAL_REF_SYS contains data about the supported spatial reference systems.</para>
-      
+
       <programlisting language="java"><![CDATA[
 QSpatialRefSys spatialRefSys = QSpatialRefSys.spatialRefSys;
-List<SpatialRefSys> referenceSystems = query.from(spatialRefSys).list(spatialRefSys);
-]]></programlisting>      
-    
+List<SpatialRefSys> referenceSystems = query.select(spatialRefSys).from(spatialRefSys).fetch();
+]]></programlisting>
+
     </sect3>
-  
+
   </sect2>
-  
+
   <sect2>
-  
+
     <title>Inheritance</title>
-    
+
     <para>In case you use only generic geometry types in your database schema you can use conversion methods
     in the object model to convert to more specific types.</para>
-    
+
     <programlisting language="java"><![CDATA[
 GeometryPath<Geometry> geometry = shapes.geometry;
 PointPath<Point> point = geometry.asPoint();
 NumberExpression<Double> pointX = point.x(); // x() is not available on GeometryExpression/GeometryPath
 ]]></programlisting>
-  
+
   </sect2>
-  
-</sect1>  
\ No newline at end of file
+
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
index 8ea98f762d..b05e40f10e 100644
--- a/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
+++ b/querydsl-docs/src/main/docbook/en-US/content/tutorials/sql.xml
@@ -1,1101 +1,1287 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="sql_integration" revision="1">
-
-  <title>Querying SQL</title>
-
-  <para>This chapter describes the query type generation and querying functionality of the
-    SQL module.</para>
-
-  <sect2>
-    <title>Maven integration</title>
-
-    <para>
-      Add the following dependencies to your Maven project:
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-sql</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>    
-        
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-sql-codegen</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-    <para>The querydsl-sql-codegen dependency can be skipped, if code generation happens
-      via Maven or Ant.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Code generation via Maven</title>
-
-    <para>This functionality should be primarily used via the Maven plugin. Here is an example:
-    </para>
-
-    <programlisting language="xml"><![CDATA[   
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.myproject.domain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>  
-]]></programlisting>
-
-    <para>
-      Use the goal <emphasis>test-export</emphasis>
-      to add the targetFolder as a test compile source root
-      instead of a compile source root.
-    </para>
-
-    <table>
-      <title>Parameters</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>Name</entry>
-            <entry>Description</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>jdbcDriver</entry>
-            <entry>class name of the JDBC driver</entry>
-          </row>
-          <row>
-            <entry>jdbcUrl</entry>
-            <entry>JDBC url</entry>
-          </row>
-          <row>
-            <entry>jdbcUser</entry>
-            <entry>JDBC user</entry>
-          </row>
-          <row>
-            <entry>jdbcPassword</entry>
-            <entry>JDBC password</entry>
-          </row>
-          <row>
-            <entry>namePrefix</entry>
-            <entry>name prefix for generated query classes (default: Q)</entry>
-          </row>
-          <row>
-            <entry>nameSuffix</entry>
-            <entry>name suffix for generated query classes (default: )</entry>
-          </row>
-          <row>
-            <entry>beanPrefix</entry>
-            <entry>name prefix for generated bean classes</entry>
-          </row>
-          <row>
-            <entry>beanSuffix</entry>
-            <entry>name suffix for generated bean classes</entry>
-          </row>
-          <row>
-            <entry>packageName</entry>
-            <entry>package name where source files should be generated</entry>
-          </row>
-          <row>
-            <entry>beanPackageName</entry>
-            <entry>package name where bean files should be generated, (default:
-              packageName)</entry>
-          </row>
-          <row>
-            <entry>beanInterfaces</entry>
-            <entry>array of interface classnames to add to the bean classes (default: empty)</entry>
-          </row>
-          <row>
-            <entry>beanAddToString</entry>
-            <entry>set to true to create a default toString() implementation (default: false)</entry>
-          </row>
-          <row>
-            <entry>beanAddFullConstructor</entry>
-            <entry>set to true to create a full constructor in addition to public empty (default: false)</entry>
-          </row>
-          <row>
-            <entry>beanPrintSupertype</entry>
-            <entry>set to true to print the supertype as well (default: false)</entry>
-          </row>
-          <row>
-            <entry>schemaPattern</entry>
-            <entry>a schema name pattern; must match the schema name as it is stored in the database;
-              (default: null)</entry>
-          </row>
-          <row>
-            <entry>tableNamePattern</entry>
-            <entry>a table name pattern; must match the table name as it is stored in the database, 
-              multiple can be separated by comma
-              (default: null)</entry>
-          </row>
-          <row>
-            <entry>targetFolder</entry>
-            <entry>target folder where source filder should be generated</entry>
-          </row>
-          <row>
-            <entry>namingStrategyClass</entry>
-            <entry>class name of the NamingStrategy class (default: DefaultNamingStrategy)
-            </entry>
-          </row>
-          <row>
-            <entry>beanSerializerClass</entry>
-            <entry>class name of the BeanSerializer class (default: BeanSerializer)</entry>
-          </row>
-          <row>
-            <entry>serializerClass</entry>
-            <entry>class name of the Serializer class (default: MetaDataSerializer)</entry>
-          </row>
-          <row>
-            <entry>exportBeans</entry>
-            <entry>set to true to generate beans as well, see section 2.14.13 (default:
-              false)</entry>
-          </row>
-          <row>
-            <entry>innerClassesForKeys</entry>
-            <entry>set to true to generate inner classes for keys (default: false)</entry>
-          </row>
-          <row>
-            <entry>validationAnnotations</entry>
-            <entry>set to true to enable serialization of validation annotations
-              (default: false)</entry>
-          </row>
-          <row>
-            <entry>columnAnnotations</entry>
-            <entry>export column annotations (default: false)</entry>
-          </row>
-          <row>
-            <entry>createScalaSources</entry>
-            <entry>whether to export Scala sources instead of Java sources, (default:
-              false)</entry>
-          </row>
-          <row>
-            <entry>schemaToPackage</entry>
-            <entry>append schema name to package (default: false)</entry>
-          </row>
-          <row>
-            <entry>lowerCase</entry>
-            <entry>lower case transformation of names (default: false)</entry>
-          </row>
-          <row>
-            <entry>exportTables</entry>
-            <entry>export tables (default: true)</entry>
-          </row>
-          <row>
-            <entry>exportViews</entry>
-            <entry>export views (default: true)</entry>
-          </row>
-          <row>
-            <entry>exportPrimaryKeys</entry>
-            <entry>export primary keys (default: true)</entry>
-          </row>
-          <row>
-            <entry>exportForeignKeys</entry>
-            <entry>export foreign keys (default: true)</entry>
-          </row>
-          <row>
-            <entry>customTypes</entry>
-            <entry>Custom user types (default: none)</entry>
-          </row>
-          <row>
-            <entry>typeMappings</entry>
-            <entry>Mappings of table.column to Java type (default: none)</entry>
-          </row>
-          <row>
-            <entry>numericMappings</entry>
-            <entry>Mappings of size/digits to Java type (default: none)</entry>
-          </row>
-          <row>
-            <entry>imports</entry>
-            <entry>Array of java imports added to generated query classes: <emphasis>com.bar</emphasis> for package (without .* notation), <emphasis>com.bar.Foo</emphasis> for class (default: empty)
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    
-    <para>Custom types can be used to register additional Type implementations:</para>
-    
-<programlisting language="xml"><![CDATA[       
-<customTypes>
-  <customType>com.mysema.query.sql.types.InputStreamType</customType>
-</customTypes>
-]]></programlisting>       
-
-    <para>Type mappings can be used to register table.column specific java types:</para>
-    
-<programlisting language="xml"><![CDATA[       
-<typeMappings>
-  <typeMapping>
-    <table>IMAGE</table>
-    <column>CONTENTS</column>
-    <type>java.io.InputStream</type>
-  </typeMapping>
-</typeMappings>
-]]></programlisting>       
-   
-
-    <para>The defaults for the numeric mappings are </para>
-    
-    <table>
-      <title>Numeric mappings</title>
-      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>Total digits</entry>
-            <entry>Decimal digits</entry>
-            <entry>Type</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>&gt; 18</entry>
-            <entry>0</entry>
-            <entry>BigInteger</entry>
-          </row>
-          <row>
-            <entry>&gt; 9</entry>
-            <entry>0</entry>
-            <entry>Long</entry>
-          </row>
-          <row>
-            <entry>&gt; 4</entry>
-            <entry>0</entry>
-            <entry>Integer</entry>
-          </row>
-          <row>
-            <entry>&gt; 2</entry>
-            <entry>0</entry>
-            <entry>Short</entry>
-          </row>
-          <row>
-            <entry>&gt; 0</entry>
-            <entry>0</entry>
-            <entry>Byte</entry>
-          </row>
-          <row>
-            <entry>&gt; 16</entry>
-            <entry>&gt; 0</entry>
-            <entry>BigDecimal</entry>
-          </row>
-          <row>
-            <entry>&gt; 0</entry>
-            <entry>&gt; 0</entry>
-            <entry>Double</entry>
-          </row>      
-        </tbody>
-      </tgroup>
-    </table>          
-    
-    <para>They can be customized for specific total/decimal digits combinations like this:</para>
-    
-<programlisting language="xml"><![CDATA[    
-<numericMappings>
-  <numericMapping>
-    <total>1</total>
-    <decimal>0</decimal>
-    <javaType>java.lang.Byte</javaType>
-  </numericMapping>
-</numericMappings>   
-]]></programlisting>
-
-    <para>Imports can be used to add cross-schema foreign keys support.</para>
-
-    <para>Compared to APT based code generation certain functionality is not available such as QueryDelegate annotation handling.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Code generation via ANT</title>
-
-    <para>
-      The ANT task <code>com.mysema.query.sql.ant.AntMetaDataExporter</code>
-      of the querydsl-sql module provides the same functionality as an ANT task.
-      The configuration parameters of the task are the same as for the Maven plugin.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Creating the query types</title>
-
-    <para>To get started export your schema into Querydsl query types like this:</para>
-
-    <programlisting language="java"><![CDATA[  
-java.sql.Connection conn = ...;
-MetaDataExporter exporter = new MetaDataExporter();
-exporter.setPackageName("com.myproject.mydomain");
-exporter.setTargetFolder(new File("target/generated-sources/java"));
-exporter.export(conn.getMetaData());  
-]]></programlisting>
-
-    <para>This declares that the database schema is to be mirrored into the
-      com.myproject.domain package in the target/generated-sources/java folder.
-    </para>
-
-    <para>
-      The generated types have the table name transformed to mixed case as the class name and a
-      similar mixed case transformation applied to the columns which are available as property 
-      paths in the query type.
-    </para>
-
-    <para>
-      In addition to this primary key and foreign key constraints are provided as fields 
-      which can be used for compact join declarations.
-    </para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>Configuration</title>
-    
-    <para>The configuration is done via the com.mysema.query.sql.Configuration class which takes the
-    Querydsl SQL dialect as an argument. For H2 you would create it like this</para>
-    
-    <programlisting language="java"><![CDATA[ 
-SQLTemplates templates = new H2Templates();
-Configuration configuration = new Configuration(templates);     
-]]></programlisting>
-
-    <para>Querydsl uses SQL dialects to customize the SQL serialization needed for
-      different relational databases. The available dialects are:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>CUBRIDTemplates (tested with 8.4)</para>
-      </listitem>
-      <listitem>
-        <para>DerbyTemplates (tested with 10.8.2.2)</para>
-      </listitem>
-      <listitem>
-        <para>HSQLDBTemplates (tested with 2.2.4)</para>
-      </listitem>
-      <listitem>
-        <para>H2Templates (tested with 1.3.164)</para>
-      </listitem>
-      <listitem>
-        <para>MySQLTemplates (tested with MySQL 5.5)</para>
-      </listitem>
-      <listitem>
-        <para>OracleTemplates (test with Oracle 10 and 11)</para>
-      </listitem>
-      <listitem>
-        <para>PostgresTemplates (tested with 9.1)</para>
-      </listitem>
-      <listitem>
-        <para>SQLiteTemplates (tested with xerial JDBC 3.7.2)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServerTemplates (tested with SQL Server)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2005Templates (for SQL Server 2005)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2008Templates (for SQL Server 2008)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2012Templates (for SQL Server 2012 and later)</para>
-      </listitem>
-      <listitem>
-        <para>TeradataTemplates (tested with Teradata 14)</para>
-      </listitem>
-      
-    </itemizedlist>    
-    
-    <para>For customized SQLTemplates instances you can use the builder pattern like this</para>    
-  
-  <programlisting language="java"><![CDATA[
-  H2Templates.builder()
-     .printSchema() // to include the schema in the output
-     .quote()       // to quote names
-     .newLineToSingleSpace() // to replace new lines with single space in the output
-     .escape(ch)    // to set the escape char
-     .build();      // to get the customized SQLTemplates instance
-]]></programlisting>  
-
-    <para>The methods of the Configuration class can be used to enable direct serialization of literals
-    via setUseLiterals(true), override schema and tables and register custom types. For full details look
-    at the javadocs of Configuration.</para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>Querying</title>
-
-    <para>Querying with Querydsl SQL is as simple as this:</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = new QCustomer("c");
-
-SQLQuery query = new SQLQuery(connection, configuration); 
-List<String> lastNames = query.from(customer)
-    .where(customer.firstName.eq("Bob"))
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>
-      which is transformed into the following sql query, assuming that the related table
-      name is <emphasis>customer</emphasis>
-      and the columns <emphasis>first_name</emphasis>
-      and <emphasis>last_name</emphasis>:
-    </para>
-
-    <programlisting><![CDATA[     
-SELECT c.last_name 
-FROM customer c 
-WHERE c.first_name = 'Bob'
-]]></programlisting>  
-
-  </sect2>
-
-  <sect2>
-
-    <title>General usage</title>
-
-    <para>Use the the cascading methods of the SQLQuery class like this</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      Add the query sources here.
-    </para>
-
-    <para>
-      <emphasis>innerJoin, join, leftJoin, fullJoin, on:</emphasis>
-      Add join elements using these constructs.
-      For the join methods the first argument is the join source and the second the target
-      (alias).
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      Add query filters, either in varargs form separated via commas or
-      cascaded via the and-operator.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      Add group by arguments in varargs form.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Add having filter of the "group by" grouping as an varags array of
-      Predicate expressions.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      Add ordering of the result as an varargs array of order expressions.
-      Use asc() and desc() on numeric, string and other comparable expression to access the
-      OrderSpecifier instances.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      Set the paging of the result. Limit for max results,
-      offset for skipping rows and restrict for defining both in one call.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Joins</title>
-
-    <para>Joins are constructed using the following syntax:</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer)
-    .innerJoin(customer.company, company)
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-    <para>and for a left join:</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .leftJoin(customer.company, company)
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-    <para>Alternatively the join condition can also be written out:</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .leftJoin(company).on(customer.company.eq(company.id))
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-  </sect2>
-
-
-  <sect2>
-
-    <title>Ordering</title>
-
-    <para>The syntax for declaring ordering is </para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.asc())
-    .list(customer.firstName, customer.lastName);
-]]></programlisting>
-
-    <para>which is equivalent to the following native SQL</para>
-
-    <programlisting>  
-SELECT c.first_name, c.last_name
-FROM customer c 
-ORDER BY c.last_name ASC, c.first_name ASC
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Grouping</title>
-
-    <para>Grouping can be done in the following form</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>which is equivalent to the following native SQL</para>
-
-    <programlisting>  
-SELECT c.last_name 
-FROM customer c 
-GROUP BY c.last_name
-</programlisting>
-
-  </sect2>
-
-  <!-- <sect2> <title>Union queries</title> <para>TODO</para> </sect2> -->
-
-  <sect2>
-
-    <title>Using Subqueries</title>
-
-    <para>
-      To create a subquery you create a SQLSubQuery instance, define the query parameters via
-      from, where etc and use unique or list to create a subquery, which is just a type-safe Querydsl
-      expression for the query. unique is used for a unique (single) result and list for a
-      list result.
-    </para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-QCustomer customer2 = new QCustomer("customer2");
-query.from(customer).where(
-  customer.status.eq(new SQLSubQuery().from(customer2).unique(customer2.status.max()))
-  .list(customer.all())  
-]]></programlisting>
-
-    <para>Another example</para>
-
-    <programlisting language="java"><![CDATA[ 
-QStatus status = QStatus.status;
-query.from(customer).where(  
-  customer.status.in(new SQLSubQuery().from(status).where(status.level.lt(3)).list(status.id))  
-  .list(customer.all())    
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-  
-    <title>Selecting literals</title>
-    
-    <para>To select literals you need to create constant instances for them like this:</para>
-    
-    <programlisting language="java"><![CDATA[
-query.list(Expressions.constant(1),
-           Expressions.constant("abc"));    
-]]></programlisting>     
-
-    <para>The class  <code>com.mysema.query.support.Expressions</code> offers also other useful static methods for
-    projections, operation and template creation.</para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>Query extension support</title>
-
-    <para>Custom query extensions to support engine specific syntax can be created by
-      subclassing AbstractSQLQuery and adding flagging methods like
-      in the given MySQLQuery example:
-    </para>
-
-    <programlisting language="java"><![CDATA[          
-public class MySQLQuery extends AbstractSQLQuery<MySQLQuery> {
-    
-    public MySQLQuery(Connection conn) {
-        this(conn, new MySQLTemplates(), new DefaultQueryMetadata());
-    }
-    
-    public MySQLQuery(Connection conn, SQLTemplates templates) {
-        this(conn, templates, new DefaultQueryMetadata());
-    }
-    
-    protected MySQLQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
-        super(conn, new Configuration(templates), metadata);
-    }
-    
-    public MySQLQuery bigResult(){
-        return addFlag(Position.AFTER_SELECT, "SQL_BIG_RESULT ");
-    }
-    
-    public MySQLQuery bufferResult(){
-        return addFlag(Position.AFTER_SELECT, "SQL_BUFFER_RESULT ");
-    }
- 
- 
-    // ...   
-}        
-]]></programlisting>
-
-    <para>
-      The flags are custom SQL snippets that can be inserted at specific points in the
-      serialization. The supported positions are the enums of the
-      <code>com.mysema.query.QueryFlag.Position</code> enum class.
-    </para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>Window functions</title>
-    
-    <para>Window functions are supported in Querydsl via the methods in the <code>SQLExpressions</code> class.</para>
-    
-    <para>Usage example:</para>
-    
-    <programlisting language="java"><![CDATA[
-query.from(employee)
-    .list(SQLExpressions.rowNumber()
-        .over()
-        .partitionBy(employee.name)
-        .orderBy(employee.id));
-]]></programlisting>
-  
-  </sect2>
-  
-  <sect2>
-  
-    <title>Other SQL expressions</title>
-    
-    <para>
-    Other SQL expressions are also available from the <code>SQLExpressions</code> class as static methods.
-    </para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>Using Data manipulation commands</title>
-
-    <para>All the DMLClause implementation in the Querydsl SQL module take three
-      parameters, the Connection, the SQLTemplates instance
-      used in the queries and the main entity the DMLClause is bound to.
-    </para>
-
-    <sect3>
-
-      <title>Insert</title>
-
-      <para>With columns</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-  
-new SQLInsertClause(conn, configuration, survey)
-    .columns(survey.id, survey.name)
-    .values(3, "Hello").execute();
-]]></programlisting>
-
-      <para>Without columns</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .values(4, "Hello").execute();
-]]></programlisting>
-
-      <para>With subquery</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .columns(survey.id, survey.name)
-    .select(new SQLSubQuery().from(survey2).list(survey2.id.add(1), survey2.name))
-    .execute();
-]]></programlisting>
-
-      <para>With subquery, without columns</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .select(new SQLSubQuery().from(survey2).list(survey2.id.add(10), survey2.name))
-    .execute();
-]]></programlisting>
-
-    <para>As an alternative to the columns/values usage, Querydsl provides also a set
-     method which can be used like this</para>
-    
-    <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-  
-new SQLInsertClause(conn, configuration, survey)
-    .set(survey.id, 3)
-    .set(survey.name, "Hello").execute();
-]]></programlisting>    
-
-     <para>which is equivalent to the first example. Usage of the set method always 
-     expands internally to columns and values.</para>
-     
-     <para>Beware that</para>
-     
-     <programlisting language="java"><![CDATA[
-columns(...).select(...)
-]]></programlisting>    
-
-     <para>maps the result set of the given query to be inserted whereas</para>
-     
-     <para>To get the created keys out instead of modified rows count use one of the executeWithKey/s method.</para>
-
-<programlisting language="java"><![CDATA[
-set(...)
-]]></programlisting>    
-
-     <para>maps single columns and nulls are used for empty subquery results.</para>
-     
-     <para>To populate a clause instance based on the contents of a bean you can use</para>
-
-    <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .populate(surveyBean).execute();
-]]></programlisting>
-
-    <para>This will exclude null bindings, if you need also null bindings use</para>
-    
-    <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .populate(surveyBean, DefaultMapper.WITH_NULL_BINDINGS).execute();
-]]></programlisting>    
-
-    </sect3>
-
-    <sect3>
-
-      <title>Update</title>
-
-      <para>With where</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-
-new SQLUpdateClause(conn, configuration, survey)
-    .where(survey.name.eq("XXX"))
-    .set(survey.name, "S")
-    .execute();
-]]></programlisting>
-
-      <para>Without where</para>
-
-      <programlisting language="java"><![CDATA[  
-new SQLUpdateClause(conn, configuration, survey)
-    .set(survey.name, "S")
-    .execute(); 
-]]></programlisting>
-
-    <para>Using bean population</para>
-    
-<programlisting language="java"><![CDATA[
-new SQLUpdateClause(conn, configuration, survey)
-    .populate(surveyBean)
-    .execute();
-]]></programlisting>        
-
-    </sect3>
-
-    <sect3>
-
-      <title>Delete</title>
-
-      <para>With where</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-
-new SQLDelecteClause(conn, configuration, survey)
-    .where(survey.name.eq("XXX"))
-    .execute();
-    
-]]></programlisting>
-
-      <para>Without where</para>
-
-      <programlisting language="java"><![CDATA[  
-new SQLDelecteClause(conn, configuration, survey)
-    .execute()  
-]]></programlisting>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Batch support in DML clauses</title>
-
-    <para>Querydsl SQL supports usage of JDBC batch updates through the DML APIs. If you
-      have consecutive DML calls with a similar structure,
-      you can bundle the the calls via addBatch() usage into one DMLClause. See the examples how
-      it works for UPDATE, DELETE and INSERT.
-    </para>
-
-    <para>Update:</para>
-
-    <programlisting language="java"><![CDATA[   	
-QSurvey survey = QSurvey.survey;
-
-insert(survey).values(2, "A").execute();
-insert(survey).values(3, "B").execute();
-
-SQLUpdateClause update = update(survey);
-update.set(survey.name, "AA").where(survey.name.eq("A")).addBatch();
-update.set(survey.name, "BB").where(survey.name.eq("B")).addBatch();
-]]></programlisting>
-
-    <para>Delete:</para>
-
-    <programlisting language="java"><![CDATA[
-insert(survey).values(2, "A").execute();
-insert(survey).values(3, "B").execute();
-
-SQLDeleteClause delete = delete(survey);
-delete.where(survey.name.eq("A")).addBatch();
-delete.where(survey.name.eq("B")).addBatch();
-assertEquals(2, delete.execute());
-]]></programlisting>
-
-    <para>Insert:</para>
-
-    <programlisting language="java"><![CDATA[
-SQLInsertClause insert = insert(survey);
-insert.set(survey.id, 5).set(survey.name, "5").addBatch();
-insert.set(survey.id, 6).set(survey.name, "6").addBatch();
-assertEquals(2, insert.execute());
-]]></programlisting>
-
-
-  </sect2>
-
-  <sect2>
-
-    <title>Bean class generation</title>
-
-    <para>To create JavaBean DTO types for the tables of your schema use the
-      MetaDataExporter like this:</para>
-
-    <programlisting language="java"><![CDATA[  
-java.sql.Connection conn = ...;
-MetaDataExporter exporter = new MetaDataExporter();
-exporter.setPackageName("com.myproject.mydomain");
-exporter.setTargetFolder(new File("src/main/java"))	;
-exporter.setBeanSerializer(new BeanSerializer());   
-exporter.export(conn.getMetaData());  
-]]></programlisting>
-
-    <para>Now you can use the bean types as arguments to the populate method in DML
-      clauses and you can project directly
-      to bean types in queries. Here is a simple example in JUnit form:
-    </para>
-
-    <programlisting language="java"><![CDATA[    	
-QEmployee e = new QEmployee("e");
-   
-// Insert
-Employee employee = new Employee();
-employee.setFirstname("John");
-Integer id = insert(e).populate(employee).executeWithKey(e.id);
-employee.setId(id);
-
-// Update
-employee.setLastname("Smith");
-assertEquals(1l, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
-
-// Query
-Employee smith = query().from(e).where(e.lastname.eq("Smith")).uniqueResult(e);
-assertEquals("John", smith.getFirstname());
-
-// Delete 
-assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
-]]></programlisting>
-
-    <para>The factory methods used in the previous example are here:</para>
-
-    <programlisting language="java"><![CDATA[      	
-protected SQLUpdateClause update(RelationalPath<?> e){
-    return new SQLUpdateClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLInsertClause insert(RelationalPath<?> e){
-    return new SQLInsertClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLDeleteClause delete(RelationalPath<?> e){
-    return new SQLDeleteClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLMergeClause merge(RelationalPath<?> e){
-    return new SQLMergeClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLQuery query() {
-    return new SQLQuery(Connections.getConnection(), templates);  	
-}
-  	
-]]></programlisting>
-
-  </sect2>
-
-<!-- 
-  <sect2>
-
-    <title>Custom syntax expressions</title>
-
-    <para>
-      If you need to specify SQL function calls in Querydsl you can use TemplateExpressions to
-      express them. For general expressions you can use the SimpleTemplate class and for typed 
-      expressions BooleanTemplate, ComparableTemplate, DateTemplate,
-      DateTimeTemplate, EnumTemplate, NumberTemplate, StringTemplate and TimeTemplate.
-    </para>
-
-    <para>Here is an example for SimpleTemplate usage:</para>
-
-    <programlisting language="java"><![CDATA[
-Expression<?> arg1 = ...;
-Expression<?> arg2 = ...;
-Expression<String> expression = SimpleTemplate.create(String.class, "myfunction({0},{1})", arg1, arg2);		
-]]></programlisting>
-
-    <para>And here is an example for a Number typed template expression:</para>
-
-    <programlisting language="java"><![CDATA[
-Expression<?> arg1 = ...;
-Expression<?> arg2 = ...;
-NumberExpression<Integer> expression = NumberTemplate.create(Integer.class, "myfunction({0},{1})", arg1, arg2);		
-]]></programlisting>
-
-  </sect2>
- -->  
-
-  <sect2>
-  
-    <title>Extracting the SQL query and bindings</title>
-    
-    <para>The SQL query and bindings can be extracted via the getSQL method:</para>
-    
-    <programlisting language="java"><![CDATA[
-SQLBindings bindings = query.getSQL(customer.id, customer.firstname, customer.lastname);
-System.out.println(bindings.getSQL()); 
-]]></programlisting>    
-    
-   <para>If you need also all literals in the SQL string you can enable literal serialization on the 
-   query or configuration level via setUseLiterals(true).</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Custom types</title>
-
-    <para>Querydsl SQL provides the possibility to declare custom type mappings for
-      ResultSet/Statement interaction. The custom type mappings can be
-      declared in com.mysema.query.sql.Configuration instances, which are supplied as constructor
-      arguments to the actual queries:
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-Configuration configuration = new Configuration(new H2Templates());
-// overrides the mapping for Types.DATE
-configuration.register(new UtilDateType());		
-]]></programlisting>
-
-    <para>And for a table column</para>
-
-    <programlisting language="java"><![CDATA[    
-Configuration configuration = new Configuration(new H2Templates());
-// declares a maping for the gender column in the person table
-configuration.register("person", "gender",  new EnumByNameType<Gender>(Gender.class));
-]]></programlisting>
-
-    <para>To customize a numeric mapping you can use the registerNumeric method like this
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-configuration.registerNumeric(5,2,Float.class);
-]]></programlisting>
-
-    <para>This will map the Float type to the NUMERIC(5,2) type.</para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>Listening to queries and clauses</title>
-    
-    <para>SQLListener is a listener interface that can be used to listen to queries and DML clause. SQLListener
-    instances can be registered either on the configuration and on the query/clause level via the addListener method.</para>
-  
-    <para>Use cases for listeners are data synchronization, logging, cacheing and validation.</para>
-  
-  </sect2>
-
-
-</sect1>    
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<sect1 id="sql_integration" revision="1">
+
+  <title>Querying SQL</title>
+
+  <para>This chapter describes the query type generation and querying functionality of the
+    SQL module.</para>
+
+  <sect2>
+    <title>Maven integration</title>
+
+    <para>
+      Add the following dependencies to your Maven project:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql-codegen</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>
+]]></programlisting>
+
+    <para>The querydsl-sql-codegen dependency can be skipped, if code generation happens
+      via Maven.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Code generation via Maven</title>
+
+    <para>This functionality should be primarily used via the Maven plugin. Here is an example:
+    </para>
+
+    <programlisting language="xml"><![CDATA[
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
+          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
+          <packageName>com.myproject.domain</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+]]></programlisting>
+
+    <para>
+      Use the goal <emphasis>test-export</emphasis>
+      to treat the target folder as a test source folder for use with test code.
+    </para>
+
+    <table>
+      <title>Parameters</title>
+      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+        <colspec colname='Name' colwidth="1*" />
+        <colspec colname='Descriptions' colwidth="1*" />
+        <thead>
+          <row>
+            <entry>Name</entry>
+            <entry>Description</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>jdbcDriver</entry>
+            <entry>class name of the JDBC driver</entry>
+          </row>
+          <row>
+            <entry>jdbcUrl</entry>
+            <entry>JDBC url</entry>
+          </row>
+          <row>
+            <entry>jdbcUser</entry>
+            <entry>JDBC user</entry>
+          </row>
+          <row>
+            <entry>jdbcPassword</entry>
+            <entry>JDBC password</entry>
+          </row>
+          <row>
+            <entry>namePrefix</entry>
+            <entry>name prefix for generated query classes (default: Q)</entry>
+          </row>
+          <row>
+            <entry>nameSuffix</entry>
+            <entry>name suffix for generated query classes (default: )</entry>
+          </row>
+          <row>
+            <entry>beanPrefix</entry>
+            <entry>name prefix for generated bean classes</entry>
+          </row>
+          <row>
+            <entry>beanSuffix</entry>
+            <entry>name suffix for generated bean classes</entry>
+          </row>
+          <row>
+            <entry>packageName</entry>
+            <entry>package name where source files should be generated</entry>
+          </row>
+          <row>
+            <entry>beanPackageName</entry>
+            <entry>package name where bean files should be generated, (default:
+              packageName)</entry>
+          </row>
+          <row>
+            <entry>beanInterfaces</entry>
+            <entry>array of interface classnames to add to the bean classes (default: empty)</entry>
+          </row>
+          <row>
+            <entry>beanAddToString</entry>
+            <entry>set to true to create a default toString() implementation (default: false)</entry>
+          </row>
+          <row>
+            <entry>beanAddFullConstructor</entry>
+            <entry>set to true to create a full constructor in addition to public empty (default: false)</entry>
+          </row>
+          <row>
+            <entry>beanPrintSupertype</entry>
+            <entry>set to true to print the supertype as well (default: false)</entry>
+          </row>
+          <row>
+            <entry>schemaPattern</entry>
+            <entry>a schema name pattern in LIKE pattern form; must match the schema name as it is stored in the database,
+              multiple can be separated by comma
+              (default: null)</entry>
+          </row>
+          <row>
+            <entry>tableNamePattern</entry>
+            <entry>a table name pattern in LIKE pattern form; must match the table name as it is stored in the database,
+              multiple can be separated by comma
+              (default: null)</entry>
+          </row>
+          <row>
+            <entry>targetFolder</entry>
+            <entry>target folder where sources should be generated</entry>
+          </row>
+          <row>
+            <entry>beansTargetFolder</entry>
+            <entry>target folder where bean sources should be generated, defaults to the same value as targetFolder</entry>
+          </row>
+          <row>
+            <entry>namingStrategyClass</entry>
+            <entry>class name of the NamingStrategy class (default: DefaultNamingStrategy)
+            </entry>
+          </row>
+          <row>
+            <entry>beanSerializerClass</entry>
+            <entry>class name of the BeanSerializer class (default: BeanSerializer)</entry>
+          </row>
+          <row>
+            <entry>serializerClass</entry>
+            <entry>class name of the Serializer class (default: MetaDataSerializer)</entry>
+          </row>
+          <row>
+            <entry>exportBeans</entry>
+            <entry>set to true to generate beans as well, see section 2.14.13 (default:
+              false)</entry>
+          </row>
+          <row>
+            <entry>innerClassesForKeys</entry>
+            <entry>set to true to generate inner classes for keys (default: false)</entry>
+          </row>
+          <row>
+            <entry>validationAnnotations</entry>
+            <entry>set to true to enable serialization of validation annotations
+              (default: false)</entry>
+          </row>
+          <row>
+            <entry>columnAnnotations</entry>
+            <entry>export column annotations (default: false)</entry>
+          </row>
+          <row>
+            <entry>createScalaSources</entry>
+            <entry>whether to export Scala sources instead of Java sources, (default:
+              false)</entry>
+          </row>
+          <row>
+            <entry>schemaToPackage</entry>
+            <entry>append schema name to package (default: false)</entry>
+          </row>
+          <row>
+            <entry>lowerCase</entry>
+            <entry>lower case transformation of names (default: false)</entry>
+          </row>
+          <row>
+            <entry>exportTables</entry>
+            <entry>export tables (default: true)</entry>
+          </row>
+          <row>
+            <entry>exportViews</entry>
+            <entry>export views (default: true)</entry>
+          </row>
+          <row>
+            <entry>exportPrimaryKeys</entry>
+            <entry>export primary keys (default: true)</entry>
+          </row>
+          <row>
+            <entry>tableTypesToExport</entry>
+            <entry>Comma-separated list of table types to export (allowable values will depend on JDBC driver).  Allows for arbitrary set of types to be exported, e.g.: "TABLE, MATERIALIZED VIEW". The exportTables and exportViews parameters will be ignored if this parameter is set. (default: none)</entry>
+          </row>
+          <row>
+            <entry>exportForeignKeys</entry>
+            <entry>export foreign keys (default: true)</entry>
+          </row>
+          <row>
+            <entry>exportDirectForeignKeys</entry>
+            <entry>export direct foreign keys (default: true)</entry>
+          </row>
+          <row>
+            <entry>exportInverseForeignKeys</entry>
+            <entry>export inverse foreign keys (default: true)</entry>
+          </row>
+          <row>
+            <entry>customTypes</entry>
+            <entry>Custom user types (default: none)</entry>
+          </row>
+          <row>
+            <entry>typeMappings</entry>
+            <entry>Mappings of table.column to Java type (default: none)</entry>
+          </row>
+          <row>
+            <entry>numericMappings</entry>
+            <entry>Mappings of size/digits to Java type (default: none)</entry>
+          </row>
+          <row>
+            <entry>imports</entry>
+            <entry>Array of java imports added to generated query classes: <emphasis>com.bar</emphasis> for package (without .* notation), <emphasis>com.bar.Foo</emphasis> for class (default: empty)</entry>
+          </row>
+          <row>
+            <entry>generatedAnnotationClass</entry>
+            <entry>
+              The fully qualified class name of the <emphasis>Single-Element Annotation</emphasis> (with String element) to be added on the generated sources. Build in
+              <emphasis>com.querydsl.core.annotations.Generated</emphasis>has CLASS retention which can be used for byte code analysis tools like Jacoco.
+              (default: <emphasis>javax.annotation.Generated</emphasis> or<emphasis>javax.annotation.processing.Generated</emphasis> depending on the java version). See also
+              <ulink url="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</ulink>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>Custom types can be used to register additional Type implementations:</para>
+
+<programlisting language="xml"><![CDATA[
+<customTypes>
+  <customType>com.querydsl.sql.types.InputStreamType</customType>
+</customTypes>
+]]></programlisting>
+
+    <para>Type mappings can be used to register table.column specific java types:</para>
+
+<programlisting language="xml"><![CDATA[
+<typeMappings>
+  <typeMapping>
+    <table>IMAGE</table>
+    <column>CONTENTS</column>
+    <type>java.io.InputStream</type>
+  </typeMapping>
+</typeMappings>
+]]></programlisting>
+
+    <para>The defaults for the numeric mappings are </para>
+
+    <table>
+      <title>Numeric mappings</title>
+      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <colspec colname='Name' colwidth="1*" />
+        <colspec colname='Descriptions' colwidth="1*" />
+        <thead>
+          <row>
+            <entry>Total digits</entry>
+            <entry>Decimal digits</entry>
+            <entry>Type</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>&gt; 18</entry>
+            <entry>0</entry>
+            <entry>BigInteger</entry>
+          </row>
+          <row>
+            <entry>&gt; 9</entry>
+            <entry>0</entry>
+            <entry>Long</entry>
+          </row>
+          <row>
+            <entry>&gt; 4</entry>
+            <entry>0</entry>
+            <entry>Integer</entry>
+          </row>
+          <row>
+            <entry>&gt; 2</entry>
+            <entry>0</entry>
+            <entry>Short</entry>
+          </row>
+          <row>
+            <entry>&gt; 0</entry>
+            <entry>0</entry>
+            <entry>Byte</entry>
+          </row>
+          <row>
+            <entry>&gt; 0</entry>
+            <entry>&gt; 0</entry>
+            <entry>BigDecimal</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>They can be customized for specific total/decimal digits combinations like this:</para>
+
+<programlisting language="xml"><![CDATA[
+<numericMappings>
+  <numericMapping>
+    <total>1</total>
+    <decimal>0</decimal>
+    <javaType>java.lang.Byte</javaType>
+  </numericMapping>
+</numericMappings>
+]]></programlisting>
+
+    <para>Imports can be used to add cross-schema foreign keys support.</para>
+
+    <para>Schemas, tables and columns can also be renamed using the plugin. Here are some examples:</para>
+    <para>Renaming a schema:</para>
+    <programlisting language="xml"><![CDATA[
+<renameMappings>
+  <renameMapping>
+    <fromSchema>PROD</fromSchema>
+    <toSchema>TEST</toSchema>
+  </renameMapping>
+</renameMappings>
+]]></programlisting>
+
+    <para>Renaming a table:</para>
+    <programlisting language="xml"><![CDATA[
+<renameMappings>
+  <renameMapping>
+    <fromSchema>PROD</fromSchema>
+    <fromTable>CUSTOMER</fromTable>
+    <toTable>CSTMR</toTable>
+  </renameMapping>
+</renameMappings>
+]]></programlisting>
+
+    <para>Renaming a column:</para>
+    <programlisting language="xml"><![CDATA[
+<renameMappings>
+  <renameMapping>
+    <fromSchema>PROD</fromSchema>
+    <fromTable>CUSTOMER</fromTable>
+    <fromColumn>ID</fromColumn>
+    <toColumn>IDX</toTable>
+  </renameMapping>
+</renameMappings>
+]]></programlisting>
+
+    <para>Note: fromSchema can be omitted when renaming tables and columns.</para>
+
+    <para>Compared to APT based code generation certain functionality is not available such as QueryDelegate annotation handling.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Code generation via ANT</title>
+
+    <para>
+      The ANT task <code>com.querydsl.sql.codegen.ant.AntMetaDataExporter</code>
+      of the querydsl-sql module provides the same functionality as an ANT task.
+      The configuration parameters of the task are the same as for the Maven plugin, except for the composite types.
+    </para>
+
+    <para>
+      The composite types are used without the wrapper element like in this example.
+    </para>
+
+<programlisting language="xml"><![CDATA[
+<project name="testproject" default="codegen" basedir=".">
+
+  <taskdef name="codegen" classname="com.querydsl.sql.codegen.ant.AntMetaDataExporter"/>
+
+  <target name="codegen">
+    <codegen
+      jdbcDriver="org.h2.Driver"
+      jdbcUser="sa"
+      jdbcUrl="jdbc:h2:/dbs/db1"
+      packageName="test"
+      targetFolder="target/generated-sources/java">
+      <renameMapping fromSchema="PUBLIC" toSchema="PUB"/>
+    </codegen>
+  </target>
+</project>
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Creating the query types</title>
+
+    <para>To get started export your schema into Querydsl query types like this:</para>
+
+    <programlisting language="java"><![CDATA[
+java.sql.Connection conn = ...;
+MetaDataExporter exporter = new MetaDataExporter();
+exporter.setPackageName("com.myproject.mydomain");
+exporter.setTargetFolder(new File("target/generated-sources/java"));
+exporter.export(conn.getMetaData());
+]]></programlisting>
+
+    <para>This declares that the database schema is to be mirrored into the
+      com.myproject.domain package in the target/generated-sources/java folder.
+    </para>
+
+    <para>
+      The generated types have the table name transformed to mixed case as the class name and a
+      similar mixed case transformation applied to the columns which are available as property
+      paths in the query type.
+    </para>
+
+    <para>
+      In addition to this primary key and foreign key constraints are provided as fields
+      which can be used for compact join declarations.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Configuration</title>
+
+    <para>The configuration is done via the com.querydsl.sql.Configuration class which takes
+      the
+      Querydsl SQL dialect as an argument. For H2 you would create it like this</para>
+
+    <programlisting language="java"><![CDATA[
+SQLTemplates templates = new H2Templates();
+Configuration configuration = new Configuration(templates);
+]]></programlisting>
+
+    <para>Querydsl uses SQL dialects to customize the SQL serialization needed for
+      different relational databases. The available dialects are:
+    </para>
+
+    <itemizedlist>
+      <listitem>
+        <para>CUBRIDTemplates (tested with CUBRID 8.4)</para>
+      </listitem>
+      <listitem>
+        <para>DB2Templates (tested with DB2 10.1.2)</para>
+      </listitem>
+      <listitem>
+        <para>DerbyTemplates (tested with Derby 10.8.2.2)</para>
+      </listitem>
+      <listitem>
+        <para>FirebirdTemplates (tested with Firebird 2.5)</para>
+      </listitem>
+      <listitem>
+        <para>HSQLDBTemplates (tested with HSQLDB 2.2.4)</para>
+      </listitem>
+      <listitem>
+        <para>H2Templates (tested with H2 1.3.164)</para>
+      </listitem>
+      <listitem>
+        <para>MySQLTemplates (tested with MySQL 5.5)</para>
+      </listitem>
+      <listitem>
+        <para>OracleTemplates (test with Oracle 10 and 11)</para>
+      </listitem>
+      <listitem>
+        <para>PostgreSQLTemplates (tested with PostgreSQL 9.1)</para>
+      </listitem>
+      <listitem>
+        <para>SQLiteTemplates (tested with xerial JDBC 3.7.2)</para>
+      </listitem>
+      <listitem>
+        <para>SQLServerTemplates (tested with SQL Server)</para>
+      </listitem>
+      <listitem>
+        <para>SQLServer2005Templates (for SQL Server 2005)</para>
+      </listitem>
+      <listitem>
+        <para>SQLServer2008Templates (for SQL Server 2008)</para>
+      </listitem>
+      <listitem>
+        <para>SQLServer2012Templates (for SQL Server 2012 and later)</para>
+      </listitem>
+      <listitem>
+        <para>TeradataTemplates (tested with Teradata 14)</para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>For customized SQLTemplates instances you can use the builder pattern like this</para>
+
+  <programlisting language="java"><![CDATA[
+  H2Templates.builder()
+     .printSchema() // to include the schema in the output
+     .quote()       // to quote names
+     .newLineToSingleSpace() // to replace new lines with single space in the output
+     .escape(ch)    // to set the escape char
+     .build();      // to get the customized SQLTemplates instance
+]]></programlisting>
+
+    <para>The methods of the Configuration class can be used to enable direct serialization of literals
+    via setUseLiterals(true), override schema and tables and register custom types. For full details look
+    at the javadocs of Configuration.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Querying</title>
+
+    <para>For the following examples we will be using the <code>SQLQueryFactory</code> class for query creation.
+      Using it results in more concise code compared to constructor based query creation.</para>
+
+    <programlisting language="java"><![CDATA[
+SQLQueryFactory queryFactory = new SQLQueryFactory(configuration, dataSource);
+]]></programlisting>
+
+    <para>Querying with Querydsl SQL is as simple as this:</para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = new QCustomer("c");
+
+List<String> lastNames = queryFactory.select(customer.lastName).from(customer)
+    .where(customer.firstName.eq("Bob"))
+    .fetch();
+]]></programlisting>
+
+    <para>
+      which is transformed into the following sql query, assuming that the related table
+      name is <emphasis>customer</emphasis>
+      and the columns <emphasis>first_name</emphasis>
+      and <emphasis>last_name</emphasis>:
+    </para>
+
+    <programlisting><![CDATA[
+SELECT c.last_name
+FROM customer c
+WHERE c.first_name = 'Bob'
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>General usage</title>
+
+    <para>Use the the cascading methods of the SQLQuery class like this</para>
+
+    <para>
+      <emphasis>select:</emphasis>
+      Set the projection of the query. (Not necessary if created via query factory)
+    </para>
+
+    <para>
+      <emphasis>from:</emphasis>
+      Add the query sources here.
+    </para>
+
+    <para>
+      <emphasis>innerJoin, join, leftJoin, rightJoin, fullJoin, on:</emphasis>
+      Add join elements using these constructs.
+      For the join methods the first argument is the join source and the second the target
+      (alias).
+    </para>
+
+    <para>
+      <emphasis>where:</emphasis>
+      Add query filters, either in varargs form separated via commas or
+      cascaded via the and-operator.
+    </para>
+
+    <para>
+      <emphasis>groupBy:</emphasis>
+      Add group by arguments in varargs form.
+    </para>
+
+    <para>
+      <emphasis>having:</emphasis>
+      Add having filter of the "group by" grouping as an varags array of
+      Predicate expressions.
+    </para>
+
+    <para>
+      <emphasis>orderBy:</emphasis>
+      Add ordering of the result as an varargs array of order expressions.
+      Use asc() and desc() on numeric, string and other comparable expression to access the
+      OrderSpecifier instances.
+    </para>
+
+    <para>
+      <emphasis>limit, offset, restrict:</emphasis>
+      Set the paging of the result. Limit for max results,
+      offset for skipping rows and restrict for defining both in one call.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Joins</title>
+
+    <para>Joins are constructed using the following syntax:</para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+QCompany company = QCompany.company;
+queryFactory.select(customer.firstName, customer.lastName, company.name)
+    .from(customer)
+    .innerJoin(customer.company, company)
+    .fetch();
+]]></programlisting>
+
+    <para>and for a left join:</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.firstName, customer.lastName, company.name)
+    .from(customer)
+    .leftJoin(customer.company, company)
+    .fetch();
+]]></programlisting>
+
+    <para>Alternatively the join condition can also be written out:</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.firstName, customer.lastName, company.name)
+    .from(customer)
+    .leftJoin(company).on(customer.company.eq(company))
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
+
+  <sect2>
+
+    <title>Ordering</title>
+
+    <para>The syntax for declaring ordering is </para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.firstName, customer.lastName)
+    .from(customer)
+    .orderBy(customer.lastName.asc(), customer.firstName.asc())
+    .fetch();
+]]></programlisting>
+
+    <para>which is equivalent to the following native SQL</para>
+
+    <programlisting>
+SELECT c.first_name, c.last_name
+FROM customer c
+ORDER BY c.last_name ASC, c.first_name ASC
+</programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Grouping</title>
+
+    <para>Grouping can be done in the following form</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(customer.lastName)
+    .from(customer)
+    .groupBy(customer.lastName)
+    .fetch();
+]]></programlisting>
+
+    <para>which is equivalent to the following native SQL</para>
+
+    <programlisting>
+SELECT c.last_name
+FROM customer c
+GROUP BY c.last_name
+</programlisting>
+
+  </sect2>
+
+  <!-- <sect2> <title>Union queries</title> <para>TODO</para> </sect2> -->
+
+  <sect2>
+
+    <title>Using Subqueries</title>
+
+    <para>To create a subquery you can use one of the factory methods of <code>SQLExpressions</code>
+      and add the query parameters via from, where etc.
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QCustomer customer = QCustomer.customer;
+QCustomer customer2 = new QCustomer("customer2");
+queryFactory.select(customer.all())
+    .from(customer)
+    .where(customer.status.eq(
+        SQLExpressions.select(customer2.status.max()).from(customer2)))
+    .fetch()
+]]></programlisting>
+
+    <para>Another example</para>
+
+    <programlisting language="java"><![CDATA[
+QStatus status = QStatus.status;
+queryFactory.select(customer.all())
+    .from(customer)
+    .where(customer.status.in(
+        SQLExpressions.select(status.id).from(status).where(status.level.lt(3))))
+    .fetch();
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Selecting literals</title>
+
+    <para>To select literals you need to create constant instances for them like this:</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(Expressions.constant(1),
+                    Expressions.constant("abc"));
+]]></programlisting>
+
+    <para>The class  <code>com.querydsl.core.types.dsl.Expressions</code> offers also other useful static methods for
+    projections, operation and template creation.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Query extension support</title>
+
+    <para>Custom query extensions to support engine specific syntax can be created by
+      subclassing AbstractSQLQuery and adding flagging methods like
+      in the given MySQLQuery example:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+public class MySQLQuery<T> extends AbstractSQLQuery<T, MySQLQuery<T>> {
+
+    public MySQLQuery(Connection conn) {
+        this(conn, new MySQLTemplates(), new DefaultQueryMetadata());
+    }
+
+    public MySQLQuery(Connection conn, SQLTemplates templates) {
+        this(conn, templates, new DefaultQueryMetadata());
+    }
+
+    protected MySQLQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
+        super(conn, new Configuration(templates), metadata);
+    }
+
+    public MySQLQuery bigResult() {
+        return addFlag(Position.AFTER_SELECT, "SQL_BIG_RESULT ");
+    }
+
+    public MySQLQuery bufferResult() {
+        return addFlag(Position.AFTER_SELECT, "SQL_BUFFER_RESULT ");
+    }
+
+
+    // ...
+}
+]]></programlisting>
+
+    <para>
+      The flags are custom SQL snippets that can be inserted at specific points in the
+      serialization. The supported positions are the enums of the
+      <code>com.querydsl.core.QueryFlag.Position</code> enum class.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Window functions</title>
+
+    <para>Window functions are supported in Querydsl via the methods in the <code>SQLExpressions</code> class.</para>
+
+    <para>Usage example:</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.select(SQLExpressions.rowNumber()
+        .over()
+        .partitionBy(employee.name)
+        .orderBy(employee.id))
+     .from(employee)
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Common table expressions</title>
+
+    <para>Common table expressions are supported in Querydsl SQL via two syntax variants</para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee employee = QEmployee.employee;
+queryFactory.with(employee, SQLExpressions.select(employee.all)
+                                          .from(employee)
+                                          .where(employee.name.startsWith("A")))
+            .from(...)
+]]></programlisting>
+
+    <para>And using a column listing</para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee employee = QEmployee.employee;
+queryFactory.with(employee, employee.id, employee.name)
+            .as(SQLExpressions.select(employee.id, employee.name)
+                              .from(employee)
+                              .where(employee.name.startsWith("A")))
+            .from(...)
+]]></programlisting>
+
+    <para>If the columns of the common table expression are a subset of an existing table or view
+    it is advisable to use a generated path type for it, e.g. QEmployee in this case, but if the
+    columns don't fit any existing table PathBuilder can be used instead.</para>
+
+    <para>Below is an example for such a case</para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee employee = QEmployee.employee;
+QDepartment department = QDepartment.department;
+PathBuilder<Tuple> emp = new PathBuilder<Tuple>(Tuple.class, "emp");
+queryFactory.with(emp, SQLExpressions.select(employee.id, employee.name, employee.departmentId,
+                                          department.name.as("departmentName"))
+                                      .from(employee)
+                                      .innerJoin(department).on(employee.departmentId.eq(department.id))))
+            .from(...)
+]]></programlisting>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Other SQL expressions</title>
+
+    <para>
+    Other SQL expressions are also available from the <code>SQLExpressions</code> class as static methods.
+    </para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Using Data manipulation commands</title>
+
+    <sect3>
+
+      <title>Insert</title>
+
+      <para>With columns</para>
+
+      <programlisting language="java"><![CDATA[
+QSurvey survey = QSurvey.survey;
+
+queryFactory.insert(survey)
+    .columns(survey.id, survey.name)
+    .values(3, "Hello").execute();
+]]></programlisting>
+
+      <para>Without columns</para>
+
+      <programlisting language="java"><![CDATA[
+queryFactory.insert(survey)
+    .values(4, "Hello").execute();
+]]></programlisting>
+
+      <para>With subquery</para>
+
+      <programlisting language="java"><![CDATA[
+queryFactory.insert(survey)
+    .columns(survey.id, survey.name)
+    .select(SQLExpressions.select(survey2.id.add(1), survey2.name).from(survey2))
+    .execute();
+]]></programlisting>
+
+      <para>With subquery, without columns</para>
+
+      <programlisting language="java"><![CDATA[
+queryFactory.insert(survey)
+    .select(SQLExpressions.select(survey2.id.add(10), survey2.name).from(survey2))
+    .execute();
+]]></programlisting>
+
+    <para>As an alternative to the columns/values usage, Querydsl provides also a set
+     method which can be used like this</para>
+
+    <programlisting language="java"><![CDATA[
+QSurvey survey = QSurvey.survey;
+
+queryFactory.insert(survey)
+    .set(survey.id, 3)
+    .set(survey.name, "Hello").execute();
+]]></programlisting>
+
+     <para>which is equivalent to the first example. Usage of the set method always
+     expands internally to columns and values.</para>
+
+     <para>Beware that</para>
+
+     <programlisting language="java"><![CDATA[
+columns(...).select(...)
+]]></programlisting>
+
+     <para>maps the result set of the given query to be inserted whereas</para>
+
+     <para>To get the created keys out instead of modified rows count use one of the executeWithKey/s method.</para>
+
+<programlisting language="java"><![CDATA[
+set(...)
+]]></programlisting>
+
+     <para>maps single columns and nulls are used for empty subquery results.</para>
+
+     <para>To populate a clause instance based on the contents of a bean you can use</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.insert(survey)
+    .populate(surveyBean).execute();
+]]></programlisting>
+
+    <para>This will exclude null bindings, if you need also null bindings use</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.insert(survey)
+    .populate(surveyBean, DefaultMapper.WITH_NULL_BINDINGS).execute();
+]]></programlisting>
+
+    </sect3>
+
+    <sect3>
+
+      <title>Update</title>
+
+      <para>With where</para>
+
+      <programlisting language="java"><![CDATA[
+QSurvey survey = QSurvey.survey;
+
+queryFactory.update(survey)
+    .where(survey.name.eq("XXX"))
+    .set(survey.name, "S")
+    .execute();
+]]></programlisting>
+
+      <para>Without where</para>
+
+      <programlisting language="java"><![CDATA[
+queryFactory.update(survey)
+    .set(survey.name, "S")
+    .execute();
+]]></programlisting>
+
+    <para>Using bean population</para>
+
+<programlisting language="java"><![CDATA[
+queryFactory.update(survey)
+    .populate(surveyBean)
+    .execute();
+]]></programlisting>
+
+    </sect3>
+
+    <sect3>
+
+      <title>Delete</title>
+
+      <para>With where</para>
+
+      <programlisting language="java"><![CDATA[
+QSurvey survey = QSurvey.survey;
+
+queryFactory.delete(survey)
+    .where(survey.name.eq("XXX"))
+    .execute();
+
+]]></programlisting>
+
+      <para>Without where</para>
+
+      <programlisting language="java"><![CDATA[
+queryFactory.delete(survey)
+    .execute()
+]]></programlisting>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Batch support in DML clauses</title>
+
+    <para>Querydsl SQL supports usage of JDBC batch updates through the DML APIs. If you
+      have consecutive DML calls with a similar structure,
+      you can bundle the the calls via addBatch() usage into one DMLClause. See the examples how
+      it works for UPDATE, DELETE and INSERT.
+    </para>
+
+    <para>Update:</para>
+
+    <programlisting language="java"><![CDATA[
+QSurvey survey = QSurvey.survey;
+
+queryFactory.insert(survey).values(2, "A").execute();
+queryFactory.insert(survey).values(3, "B").execute();
+
+SQLUpdateClause update = queryFactory.update(survey);
+update.set(survey.name, "AA").where(survey.name.eq("A")).addBatch();
+update.set(survey.name, "BB").where(survey.name.eq("B")).addBatch();
+]]></programlisting>
+
+    <para>Delete:</para>
+
+    <programlisting language="java"><![CDATA[
+queryFactory.insert(survey).values(2, "A").execute();
+queryFactory.insert(survey).values(3, "B").execute();
+
+SQLDeleteClause delete = queryFactory.delete(survey);
+delete.where(survey.name.eq("A")).addBatch();
+delete.where(survey.name.eq("B")).addBatch();
+assertEquals(2, delete.execute());
+]]></programlisting>
+
+    <para>Insert:</para>
+
+    <programlisting language="java"><![CDATA[
+SQLInsertClause insert = queryFactory.insert(survey);
+insert.set(survey.id, 5).set(survey.name, "5").addBatch();
+insert.set(survey.id, 6).set(survey.name, "6").addBatch();
+assertEquals(2, insert.execute());
+]]></programlisting>
+
+
+  </sect2>
+
+  <sect2>
+
+    <title>Bean class generation</title>
+
+    <para>To create JavaBean DTO types for the tables of your schema use the
+      MetaDataExporter like this:</para>
+
+    <programlisting language="java"><![CDATA[
+java.sql.Connection conn = ...;
+MetaDataExporter exporter = new MetaDataExporter();
+exporter.setPackageName("com.myproject.mydomain");
+exporter.setTargetFolder(new File("src/main/java"));
+exporter.setBeanSerializer(new BeanSerializer());
+exporter.export(conn.getMetaData());
+]]></programlisting>
+
+    <para>Now you can use the bean types as arguments to the populate method in DML
+      clauses and you can project directly
+      to bean types in queries. Here is a simple example in JUnit form:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+QEmployee e = new QEmployee("e");
+
+// Insert
+Employee employee = new Employee();
+employee.setFirstname("John");
+Integer id = queryFactory.insert(e).populate(employee).executeWithKey(e.id);
+employee.setId(id);
+
+// Update
+employee.setLastname("Smith");
+assertEquals(1l, queryFactory.update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
+
+// Query
+Employee smith = queryFactory.selectFrom(e).where(e.lastname.eq("Smith")).fetchOne();
+assertEquals("John", smith.getFirstname());
+
+// Delete
+assertEquals(1l, queryFactory.delete(e).where(e.id.eq(employee.getId())).execute());
+]]></programlisting>
+
+  </sect2>
+
+<!--
+  <sect2>
+
+    <title>Custom syntax expressions</title>
+
+    <para>
+      If you need to specify SQL function calls in Querydsl you can use TemplateExpressions to
+      express them. For general expressions you can use the SimpleTemplate class and for typed
+      expressions BooleanTemplate, ComparableTemplate, DateTemplate,
+      DateTimeTemplate, EnumTemplate, NumberTemplate, StringTemplate and TimeTemplate.
+    </para>
+
+    <para>Here is an example for SimpleTemplate usage:</para>
+
+    <programlisting language="java"><![CDATA[
+Expression<?> arg1 = ...;
+Expression<?> arg2 = ...;
+Expression<String> expression = SimpleTemplate.create(String.class, "myfunction({0},{1})", arg1, arg2);
+]]></programlisting>
+
+    <para>And here is an example for a Number typed template expression:</para>
+
+    <programlisting language="java"><![CDATA[
+Expression<?> arg1 = ...;
+Expression<?> arg2 = ...;
+NumberExpression<Integer> expression = NumberTemplate.create(Integer.class, "myfunction({0},{1})", arg1, arg2);
+]]></programlisting>
+
+  </sect2>
+ -->
+
+  <sect2>
+
+    <title>Extracting the SQL query and bindings</title>
+
+    <para>The SQL query and bindings can be extracted via the getSQL method:</para>
+
+    <programlisting language="java"><![CDATA[
+SQLBindings bindings = query.getSQL();
+System.out.println(bindings.getSQL());
+]]></programlisting>
+
+   <para>If you need also all literals in the SQL string you can enable literal serialization on the
+   query or configuration level via setUseLiterals(true).</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Custom types</title>
+
+    <para>Querydsl SQL provides the possibility to declare custom type mappings for
+      ResultSet/Statement interaction. The custom type mappings can be
+      declared in com.querydsl.sql.Configuration instances, which are supplied as constructor
+      arguments to the actual queries:
+    </para>
+
+    <programlisting language="java"><![CDATA[
+Configuration configuration = new Configuration(new H2Templates());
+// overrides the mapping for Types.DATE
+configuration.register(new UtilDateType());
+]]></programlisting>
+
+    <para>And for a table column</para>
+
+    <programlisting language="java"><![CDATA[
+Configuration configuration = new Configuration(new H2Templates());
+// declares a mapping for the gender column in the person table
+configuration.register("person", "gender",  new EnumByNameType<Gender>(Gender.class));
+]]></programlisting>
+
+    <para>To customize a numeric mapping you can use the registerNumeric method like this
+    </para>
+
+    <programlisting language="java"><![CDATA[
+configuration.registerNumeric(5,2,Float.class);
+]]></programlisting>
+
+    <para>This will map the Float type to the NUMERIC(5,2) type.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Listening to queries and clauses</title>
+
+    <para>SQLListener is a listener interface that can be used to listen to queries and DML clause. SQLListener
+    instances can be registered either on the configuration and on the query/clause level via the addListener method.</para>
+
+    <para>Use cases for listeners are data synchronization, logging, caching and validation.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Spring integration</title>
+
+    <para>Querydsl SQL integrates with Spring through the querydsl-sql-spring module:</para>
+
+    <programlisting language="xml"><![CDATA[
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql-spring</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+]]></programlisting>
+
+    <para>It provides Spring exception translation and a Spring connection provider for usage of Querydsl SQL
+    with Spring transaction managers. Below is a configuration example:</para>
+
+    <programlisting language="java"><![CDATA[
+package com.querydsl.example.config;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLQueryFactory;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.spring.SpringConnectionProvider;
+import com.querydsl.sql.spring.SpringExceptionTranslator;
+import com.querydsl.sql.types.DateTimeType;
+import com.querydsl.sql.types.LocalDateType;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+
+@Configuration
+public class JdbcConfiguration {
+
+    @Bean
+    public DataSource dataSource() {
+        // implementation omitted
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        return new DataSourceTransactionManager(dataSource());
+    }
+
+    @Bean
+    public com.querydsl.sql.Configuration querydslConfiguration() {
+        SQLTemplates templates = H2Templates.builder().build(); //change to your Templates
+        com.querydsl.sql.Configuration configuration = new com.querydsl.sql.Configuration(templates);
+        configuration.setExceptionTranslator(new SpringExceptionTranslator());
+        return configuration;
+    }
+
+    @Bean
+    public SQLQueryFactory queryFactory() {
+        SpringConnectionProvider provider = new SpringConnectionProvider(dataSource());
+        return new SQLQueryFactory(querydslConfiguration(), provider);
+    }
+
+}
+]]></programlisting>
+
+
+  </sect2>
+
+
+</sect1>
diff --git a/querydsl-docs/src/main/docbook/en-US/legal_notice.xml b/querydsl-docs/src/main/docbook/en-US/legal_notice.xml
index 807303cb66..4fc7c34162 100644
--- a/querydsl-docs/src/main/docbook/en-US/legal_notice.xml
+++ b/querydsl-docs/src/main/docbook/en-US/legal_notice.xml
@@ -1,10 +1,9 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<legalnotice id="Legal_Notice">
-    <title>Legal Notice</title>
-    <para>
-        Copyright <trademark class="copyright"/> 2007-2013 by Mysema Ltd.  This copyrighted material is made available to
-        anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the
-        <ulink url="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</ulink>.
-    </para>
-</legalnotice>
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<legalnotice id="Legal_Notice">
+    <para>
+        This copyrighted material is made available to
+        anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the
+        <ulink url="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</ulink>.
+    </para>
+</legalnotice>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml b/querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml
deleted file mode 100644
index 66f6f39f1c..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/Querydsl_Reference.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-        <!ENTITY versionNumber "3.4.0">
-        <!ENTITY copyrightYear "2007-2014">
-        <!ENTITY copyrightHolder "Original authors">
-]>
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-    <bookinfo>
-        <title>Querydsl - 레퍼런스 문서</title>
-        <!-- Type-safe queries for Java -->
-        <productname>Querydsl</productname>    
-        <releaseinfo>&versionNumber;</releaseinfo>
-        <authorgroup>
-          <author>
-            <firstname>Timo</firstname>
-            <surname>Westkämper</surname>
-          </author>
-          <author>
-            <firstname>Samppa</firstname>
-            <surname>Saarela</surname>
-          </author>
-          <author>
-            <firstname>Vesa</firstname>
-            <surname>Marttila</surname>
-          </author>
-          <author>
-            <firstname>Lassi</firstname>
-            <surname>Immonen</surname>
-          </author>		  
-        </authorgroup>
-        <mediaobject>        
-            <imageobject role="fo">
-                <imagedata fileref="media/global.logo.png" align="center" />
-            </imageobject>
-            <imageobject role="html">
-                <imagedata fileref="media/global.logo.png" depth="3cm" />
-            </imageobject>
-        </mediaobject>
-                
-        <copyright>
-            <year>&copyrightYear;</year>
-            <holder>&copyrightHolder;</holder>
-        </copyright>
-        <xi:include href="legal_notice.xml"/>
-
-    </bookinfo>
-
-    <toc/>
-
-    <xi:include href="content/preface.xml"/>       
-    <xi:include href="content/intro.xml" />
-    <xi:include href="content/tutorials.xml"/>    
-    <xi:include href="content/general.xml"/>                
-    <xi:include href="content/troubleshooting.xml"/>
-    
-</book>
-
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general.xml
deleted file mode 100644
index ddd2a8c6f8..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="general" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <title>일반 사용법</title>
-    
-    <para>
-    본 장은 레퍼런스 튜토리얼에서 다루지 않은 내용을 설명한다.
-    </para>
-    
-	<xi:include href="general/creating-queries.xml" />
-	<xi:include href="general/result-handling.xml"/>
-	<xi:include href="general/codegen.xml"/>
-	<xi:include href="general/alias.xml" />
-                           
-</chapter>    
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml
deleted file mode 100644
index 3f97f64a20..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/alias.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<sect1 id="alias">
-
-  <title>별칭 사용법</title>
-
-  <para>
-    코드 생성을 할 수 없는 경우, 표현식 생성을 위한 경로 참조 목적으로 별칭 객체를 사용할 수 있다.
-    자바빈 객체의 프록시를 생성하고 프록시 객체의 getter 메서드를 경로로 사용할 수 있다.
-  </para>
-
-  <para>
-    다음 예제는 생성된 타입을 이용한 표현식 생성을 대신해서 어떻게 별칭 객체를 사용할 수 있는 보여준다.
-  </para>
-
-  <para>
-    먼저 다음 예제는 APT가 생성된 도메인 타입을 이용해서 쿼리를 실행하는 코드를 보자.
-  </para>
-
-  <programlisting language="java"><![CDATA[
-QCat cat = new QCat("cat");
-for (String name : query.from(cat,cats)
-    .where(cat.kittens.size().gt(0))
-    .list(cat.name)){
-    System.out.println(name);
-}
-]]></programlisting>
-
-  <para>
-    그리고, 다음은 Cal 클래스를 이용해서 별칭 인스턴스를 사용하는 예이다.
-    $ 메서드 파라미터인 <code>c.getKittens()</code>는 내부적으로 프로퍼티 경로 <code>c.kittens</code>로 변환된다.
-  </para>
-
-  <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : query.from($(c),cats)
-    .where($(c.getKittens()).size().gt(0))
-    .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-  <para>
-    별칭 기능을 사용하려면 다음의 두 import를 추가해야 한다.
-  </para>
-
-  <programlisting language="java"><![CDATA[
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-]]></programlisting>
-
-  <para>
-    다음 예는 앞 예제의 변형이다. $ 메서드 안에서 리스트의 size()에 접근하고 있다.
-  </para>
-
-  <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : query.from($(c),cats)
-    .where($(c.getKittens().size()).gt(0))
-    .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-  <para>
-    기본 데이터 타입이 아니고 final이 아닌 모든 별칭 프로퍼티는 별칭 자체이다.
-    따라서, $ 메서드 내에서 기본 데이터 타입이나 final 타입이 나오기 전까지 메서드를 
-    이어서 호출할 수 있다. 다음은 예이다.
-  </para>
-
-  <programlisting language="java"><![CDATA[
-$(c.getMate().getName())
-]]></programlisting>
-
-  <para>
-    is transformed into *c.mate.name* internally, but
-  </para>
-
-  <programlisting language="java"><![CDATA[
-$(c.getMate().getName().toLowerCase())
-]]></programlisting>
-
-  <para>
-    이 코드는 내부적으로 <code>toLowerCase()</code>으로 변환된다.
-  </para>
-
-  <para>
-    별칭 타입에서는 getters, size(), contains(Object), get(int)만 호출할 수 있음에 유의하자.
-    모든 다른 메서드 호출은 익셉션을 발생시킨다.
-  </para>
-
-</sect1>
-  
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml
deleted file mode 100644
index eca90495c9..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/codegen.xml
+++ /dev/null
@@ -1,649 +0,0 @@
-<sect1 id="codegen">
-
-  <title>코드 생성</title>
-
-  <para>Querydsl은 JPA, JDO, Mongodb 모듈에서 코드 생성을 위해 자바6의 APT 어노테이션 처리 기능을 사용한다.
-이 절에서는 코드 생성을 위한 다양한 설정 옵션과 APT에 대한 대안을 설명한다.
-  </para>
-  
-  <sect2>
-    <title>경로 초기화</title>
-
-    <para>
-      기본적으로 Querydsl은 처음 2레벨의 레퍼런스 프로퍼티만 초기화한다. 더 깊은 경로로 초기화해야 한다면,
-      <code>com.mysema.query.annotations.QueryInit</code> 애노테이션을 도메인 타입에 적용해야 한다.
-      더 깊은 레벨로 초기화가 필요한 프로퍼티에 QueryInit 어노테이션을 적용한다. 다음은 적용 예를 보여주고 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@Entity      
-class Event {
-    @QueryInit("customer.address")
-    Account account;
-}      
-
-@Entity
-class Account{
-    Customer customer;    
-}
-
-@Entity
-class Customer{
-    String name;
-    Address address;
-    // ...
-}
-]]></programlisting>
-
-    <para>
-      이 예제는 Event 경로가 루트 경로인 /로 초기화될 때, account.customer 경로의 초기화를 실행한다.
-      경로 초기화 포맷은 와일드카드 문자(customer.* 또는 그냥 * 등)를 지원한다.
-    </para>
-
-    <para>
-      자동 경로 초기화는 수동 초기화를 대신하며, 엔티티 필드가 final이어선 안 된다.
-      선언적 포맷은 쿼리 타입의 모든 최상위 레벨 인스턴스에 적용할 수 있고
-      final 엔티티 필드의 사용을 가능하게 해주는 이점이 있다.
-    </para>
-
-    <para>
-      선호하는 초기화 방식은 자동 경로 초기화지만, 다음에 설명할 Config 어노테이션을 이용해서
-      수동 초기화를 활성화시킬 수 있다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>커스터마이징</title>
-
-    <para>
-      패키지나 타입에 Config 어노테이션을 사용해서 Querydsl의 직렬화를 커스터마이징할 수 있다.
-      Querydsl은 어노테이션이 적용된 패키지와 타입의 직렬화 방식을 변경한다.
-    </para>
-
-    <para>
-      직렬화 옵션은 다음과 같다.
-    </para>
-    
-    <table>
-      <title>Config 옵션</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>이름</entry>
-            <entry>설명</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>entityAccessors</entry>
-            <entry>public final 필드 대신 엔티티 경로로 사용할 접근 메서드 (기본값: false)</entry>
-          </row>
-          <row>
-            <entry>listAccessors</entry>
-            <entry>listProperty(int index) 형식의 메서드 (기본값: false)</entry>
-          </row>
-          <row>
-            <entry>mapAccessors</entry>
-            <entry>mapProperty(Key key) 형식의 접근 메서드 (기본값: false)</entry>
-          </row>
-          <row>
-            <entry>createDefaultVariable</entry>
-            <entry>기본 변수 생성 (기본값: true)</entry>
-          </row>
-          <row>
-            <entry>defaultVariableName</entry>
-            <entry>기본 변수의 이름</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-
-    <para>다음은 몇 가지 예이다.</para>
-
-    <para>엔티티 타입 직렬화 커스터마이징::</para>
-
-    <programlisting language="java"><![CDATA[
-@Config(entityAccessors=true)
-@Entity
-public class User {
-    //...
-}     
-]]></programlisting>
-
-    <para>엔티티 타입 직렬화 커스터마이징::</para>
-
-    <programlisting language="java"><![CDATA[
-@Config(listAccessors=true)
-package com.mysema.query.domain.rel;
-
-import com.mysema.query.annotations.Config;
-]]></programlisting>
-
-  <!-- TODO table for options ? -->
-
-    <para>
-      만약 직렬화 설정을 글로벌하게 변경하고 싶다면, 다음의 APT 옵셥을 사용하면 된다.
-    </para>
-    
-    <table>
-      <title>APT 옵션</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>이름</entry>
-            <entry>설명</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>querydsl.entityAccessors</entry>
-            <entry>레퍼런스 필드 접근 활성화</entry>
-          </row>
-          <row>
-            <entry>querydsl.listAccessors</entry>
-            <entry>인덱스 이용한 리스트 직접 겁근 활성화</entry>
-          </row>
-          <row>
-            <entry>querydsl.mapAccessors</entry>
-            <entry>키 기반 맵 직접 접근 활성화</entry>
-          </row>
-          <row>
-            <entry>querydsl.prefix</entry>
-            <entry>쿼리 타입을 위한 접두어 (기본값: Q)</entry>
-          </row>
-          <row>
-            <entry>querydsl.suffix</entry>
-            <entry>쿼리 타입을 위한 접미사</entry>
-          </row>
-          <row>
-            <entry>querydsl.packageSuffix</entry>
-            <entry>쿼리 타입 패키지를 위한 접미사</entry>
-          </row>
-          <row>
-            <entry>querydsl.createDefaultVariable</entry>
-            <entry>기본 변수 만들지 여부</entry>
-          </row>
-          <row>
-            <entry>querydsl.unknownAsEmbeddable</entry>
-            <entry>애노테이션 비적용 클래스를 embeddable로 처리할지 여부 (기본값: false)</entry>
-          </row>
-          <row>
-            <entry>querydsl.includedPackages</entry>
-            <entry>코드 생성에 포함될 패키지 목록 (콤마로 구분) (default: all)</entry>
-          </row>
-          <row>
-            <entry>querydsl.includedClasses</entry>
-            <entry>코드 생성에 포함될 클래스 이름 목록 (콤마로 구분) (default: all)</entry>
-          </row>          
-          <row>
-            <entry>querydsl.excludedPackages</entry>
-            <entry>코드 생성에서 제외할 패키지 이름 (콤마로 구분) (default: none)</entry>
-          </row>
-          <row>
-            <entry>querydsl.excludedClasses</entry>
-            <entry>코드 생성에서 제외할 클래스 이름 (콤마로 구분) (default: none)</entry>
-          </row>
-          
-        </tbody>
-      </tgroup>
-    </table> 
-
-    <para>다음은 메이븐 APT 플러그인 옵션 사용 예다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
-            <options>
-              <querydsl.entityAccessors>true</querydsl.entityAccessors>
-            </options>          
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-
-  </sect2>
-
-  <sect2 id="custom_types">
-    <title>커스텀 타입 매핑</title>
-
-    <para>
-      경로 타입을 바꾸고 싶으면 커스텀 타입 매핑을 사용하면 된다. 특정 String 경로에 대해 비교나 
-      String 연산을 막아야 하거나 커스텀 타입을 위해 Date/Time 지원이 추가되어야 하는 경우에 
-      커스텀 타입 매핑을 유용하게 사용할 수 있다. Joda time API와 JDK(java.util.Date, Calendar 그리고 하위 타입)의
-      시간 타입은 기본으로 지원하며, 다른 API가 필요할 경우 이 기능을 사용하면 된다.
-    </para>
-
-    <para>다음은 예시다.</para>
-
-    <programlisting language="java"><![CDATA[
-@Entity      
-public class MyEntity{      
-    @QueryType(PropertyType.SIMPLE)
-    public String stringAsSimple;
-        
-    @QueryType(PropertyType.COMPARABLE)
-    public String stringAsComparable;
-        
-    @QueryType(PropertyType.NONE)
-    public String stringNotInQuerydsl;    
-}        
-]]></programlisting>
-
-    <para><code>PropertyType.NONE</code>은 쿼리 타입 생성시 프로퍼티를 생략할 때 사용된다.
-    @Transient나 @QueryTransient 어노테이션이 적용된 프로퍼티가 영속 대상에서 빠지는 것과 차이가 난다.
-    PropertyType.NONE은 단지 Querydsl 쿼리 타입에서 해당 프로퍼티를 제외한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>위임 메서드(Delegate methods)</title>
-
-    <para>정적 메서드를 위임 메서드로 선언하려면, 해당하는 도메인 타입을 값으로 갖는 
-      QueryDelegate 어노테이션을 정적 메서드에 적용하고, 정적 메서드의 첫 번째 파라미터로
-      해당하는 Querydsl 쿼리 타입을 제공한다.
-    </para>
-
-    <para>다음은 예제다. </para>
-
-    <programlisting language="java"><![CDATA[   
-@QueryEntity
-public static class User{
-       
-    String name;
-       
-    User manager;
-       
-}
-]]></programlisting>
-
-<programlisting language="java"><![CDATA[   
-@QueryDelegate(User.class)
-public static BooleanPath isManagedBy(QUser user, User other){
-    return user.manager.eq(other);
-}   
-]]></programlisting>
-
-    <para>QUser 쿼리 타입의 생성된 메서드는 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[   
-public BooleanPath isManagedBy(QUser other) {
-    return com.mysema.query.domain.DelegateTest.isManagedBy(this, other);
-}
-    
-]]></programlisting>
-
-    <para>내장 타입을 확장하는데 위임 메서드를 사용할 수도 있다. 다음은 몇 가지 예제다.
-    </para>
-
-    <programlisting language="java"><![CDATA[       
-public class QueryExtensions {
-
-    @QueryDelegate(Date.class)
-    public static BooleanExpression inPeriod(DatePath<Date> date, Pair<Date,Date> period){
-        return date.goe(period.getFirst()).and(date.loe(period.getSecond()));
-    }
-
-    @QueryDelegate(Timestamp.class)
-    public static BooleanExpression inDatePeriod(DateTimePath<Timestamp> timestamp, Pair<Date,Date> period){
-        Timestamp first = new Timestamp(DateUtils.truncate(period.getFirst(), Calendar.DAY_OF_MONTH).getTime());
-        Calendar second = Calendar.getInstance();
-        second.setTime(DateUtils.truncate(period.getSecond(), Calendar.DAY_OF_MONTH));
-        second.add(1, Calendar.DAY_OF_MONTH);
-        return timestamp.goe(first).and(timestamp.lt(new Timestamp(second.getTimeInMillis())));
-    }
-    
-}    
-]]></programlisting>
-
-    <para>내장 타입을 위한 위임 메서드를 선언하면, 위임 메서드를 알맞게 사용하는 하위 클래스가 만들어진다.
-    </para>
-
-    <programlisting language="java"><![CDATA[      
-public class QDate extends DatePath<java.sql.Date> {
-
-    public QDate(BeanPath<? extends java.sql.Date> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QDate(PathMetadata<?> metadata) {
-        super(java.sql.Date.class, metadata);
-    }
-
-    public BooleanExpression inPeriod(com.mysema.commons.lang.Pair<java.sql.Date, java.sql.Date> period) {
-        return QueryExtensions.inPeriod(this, period);
-    }
-
-}
-
-public class QTimestamp extends DateTimePath<java.sql.Timestamp> {
-
-    public QTimestamp(BeanPath<? extends java.sql.Timestamp> entity) {
-        super(entity.getType(), entity.getMetadata());
-    }
-
-    public QTimestamp(PathMetadata<?> metadata) {
-        super(java.sql.Timestamp.class, metadata);
-    }
-
-    public BooleanExpression inDatePeriod(com.mysema.commons.lang.Pair<java.sql.Date, java.sql.Date> period) {
-        return QueryExtensions.inDatePeriod(this, period);
-    }
-
-}
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>애노테이션 비적용 타입</title>
-
-    <para>
-      @QueryEntities 애노테이션을 만들면, 애노테이션이 적용되지 않은 타입에 대해서도
-      Querydsl 쿼리 타입을 생성하는 것이 가능하다. QueryEntities 애노테이션을 선택한
-      패키지에 넣고, value 속성에 복제할 클래스를 값으로 지정한다.
-    </para>
-
-    <para>
-      실제로 타입을 생성하려면 <code>com.mysema.query.apt.QuerydslAnnotationProcessor</code>를 사용한다.
-      메이븐 설정 방법은 다음과 같다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>클래스패스 기반 코드 생성</title>
-    
-     <para>어노테이션이 적용된 자바 소스를 사용할 수 없는 경우(예를 들어, Scala나 Groovy와 같은
-      다른 JVM 언어를 사용했거나, 바이트코드 조작을 이용해서 어노테이션을 추가한 경우 등),
-      <code>GenericExporter</code> 클래스를 사용해서 클래스패스에서 어노테이션이 적용된 클래스를
-      스캔하고 검색된 클래스를 위한 쿼리 타입을 생성할 수 있다.
-    </para>
-
-    <para>
-      GenericExporter를 사용하려면 querydsl-codegen 모듈을 의존에 추가해주어야 한다.
-      (더 정확하게는 <code>com.mysema.querydsl:querydsl-codegen:${querydsl.version}</code> 모듈)
-    </para>
-
-    <para>다음은 JPA를 위한 예제다.</para>
-
-    <programlisting language="java"><![CDATA[    		
-GenericExporter exporter = new GenericExporter();
-exporter.setKeywords(Keywords.JPA);
-exporter.setEntityAnnotation(Entity.class);
-exporter.setEmbeddableAnnotation(Embeddable.class);
-exporter.setEmbeddedAnnotation(Embedded.class);        
-exporter.setSupertypeAnnotation(MappedSuperclass.class);
-exporter.setSkipAnnotation(Transient.class);
-exporter.setTargetFolder(new File("target/generated-sources/java"));
-exporter.export(DomainClass.class.getPackage());    	
-]]></programlisting>
-
-    <para>이 코드는 DomainClass의 패키지 및 그 하위패키지에 위치한 모든 JPA 애노테이션 적용 클래스를
-    찾아 target/generated-sources/java 디렉토리에 쿼리 타입을 생성한다.
-    </para>
-
-    <sect3>
-
-      <title>메이븐 사용법</title>
-
-      <para>querydsl-maven-plugin의 generic-export, jpa-exportㅡjdo-export 골을 통해
-       GenericExporter를 사용할 수 있다.
-      </para>
-      
-      <para>
-      각 골은 Querydsl, JPA, JDO 어노테이션에 매핑된다.
-      </para>
-      
-      <para>설정 엘리먼트는 다음과 같다.</para>
-      
-      <table>
-        <title>메이븐 설정</title>
-        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-          <colspec colname='Type' colwidth="1*" />
-          <colspec colname='Element' colwidth="1*" />
-          <colspec colname='Descriptions' colwidth="1*" />
-          <thead>
-            <row>
-              <entry>타입</entry>
-              <entry>엘리먼트</entry>
-              <entry>설명</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry>File</entry>
-              <entry>targetFolder</entry>
-              <entry>생성된 소스가 위치할 대상 폴더</entry>
-            </row>
-            <row>    
-              <entry>boolean</entry>       
-              <entry>scala</entry>
-              <entry>Scala 소스를 생성하려면 true (기본값: false)</entry>
-            </row>
-            <row>
-              <entry>String[]</entry>
-              <entry>packages</entry>
-              <entry>엔티티 클래스를 검색할 패키지</entry>
-            </row>
-            <row> 
-              <entry>boolean</entry>
-              <entry>handleFields</entry>
-              <entry>필드를 프로퍼티로 처리할 경우 true (기본값: true)</entry>
-            </row>
-            <row>
-              <entry>boolean</entry>
-              <entry>handleMethods</entry>
-              <entry>getter를 프로퍼티로 처리할 경우 true (기본값: true)</entry>
-            </row>
-            <row>
-              <entry>String</entry>
-              <entry>sourceEncoding</entry>
-              <entry>생성할 소스 파일의 캐릭터 인코딩</entry>
-            </row>
-            <row>
-              <entry>boolean</entry>
-              <entry>testClasspath</entry>
-              <entry>테스트 클래스패스를 사용하려면 true</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>      
-
-      <para>다음은 JPA 어노테이션이 적용된 클래스를 위한 예다.</para>
-
-      <programlisting language="xml"><![CDATA[            
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>  
-  <executions>
-    <execution>    
-      <phase>process-classes</phase>
-      <goals>
-        <goal>jpa-export</goal>
-      </goals>
-      <configuration>
-        <targetFolder>target/generated-sources/java</targetFolder>
-        <packages>
-          <package>com.example.domain</package>
-        </packages>
-      </configuration>      
-    </execution>
-  </executions>
-</plugin>           
-]]></programlisting>
-
-      <para>
-        위 메이븐 설정은 <code>com.example.domain</code> 및 그 하위 패키지의
-        JPA 애노테이션 적용 클래스를 찾아 target/generated-sources/java 디렉토리에 코드를 생성한다.
-      </para>
-      
-      <para>생성 후에, 직접 생성된 소스를 컴파일하려면 그 소스 폴더를 위한 <code>compile</code> 골을 사용하면 된다.</para>
-    
- <programlisting language="xml"><![CDATA[                        
-<execution>
-  <goals>
-    <goal>compile</goal>
-  </goals>
-  <configuration>
-    <sourceFolder>target/generated-sources/scala</targetFolder>
-  </configuration>
-</execution>         
-]]></programlisting>    
-    
-    <para><code>compile</code> 골은 다음 설정 엘리먼트를 갖는다.</para>
-    
-    <table>
-      <title>메이븐 설정</title>
-      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Type' colwidth="1*" />
-        <colspec colname='Element' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>타입</entry>
-            <entry>엘리먼트</entry>
-            <entry>설명</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>File</entry>
-            <entry>sourceFolder</entry>
-            <entry>소스를 생성할 소스 폴더</entry>
-          </row>
-          <row>
-            <entry>String</entry>
-            <entry>sourceEncoding</entry>
-            <entry>소스의 캐릭터 인코딩</entry>
-          </row>
-          <row>
-            <entry>String</entry>
-            <entry>source</entry>
-            <entry>컴파일러의 -source 옵션</entry>
-          </row>
-          <row>
-            <entry>String</entry>
-            <entry>target</entry>
-            <entry>컴파일러의 -target 옵션</entry>
-          </row>
-          <row>
-            <entry>boolean</entry>
-            <entry>testClasspath</entry>
-            <entry>테스트 클래스패스를 사용할 경우 true</entry>
-          </row>
-          <row>
-            <entry>Map</entry>
-            <entry>compilerOptions</entry>
-            <entry>컴파일러 옵션</entry>
-          </row>            
-        </tbody>
-      </tgroup>
-    </table>    
-    
-    <para><code>sourceFolder</code>를 제외한 모든 옵션은 선택사항이다.</para>
-    
-  </sect3>
-  
-  <sect3>
-  
-    <title>Scala 지원</title>      
-
-      <para>Scala 출력을 원하면, 다음 설정을 사용하자.
-      </para>
-      
-      <programlisting language="xml"><![CDATA[                        
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>  
-  <dependencies>
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-scala</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
-    </dependency>
-  </dependencies>
-  <executions>
-    <execution>
-      <goals>
-        <goal>jpa-export</goal>
-      </goals>
-      <configuration>
-        <targetFolder>target/generated-sources/scala</targetFolder>
-        <scala>true</scala>
-        <packages>
-          <package>com.example.domain</package>
-        </packages>       
-      </configuration>
-    </execution>
-  </executions>
-</plugin>               
-]]></programlisting>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>    
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml
deleted file mode 100644
index 1cc3d26573..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/creating-queries.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<sect1 id="creating_queries">
-
-  <title>쿼리 생성</title>
-
-  <para>Querydsl에서 Query를 생성하려면 표현식 인자를 이용해서 query 메서드를 호출한다.
-  query 메서드는 모듈에 따라 다르고 이미 튜토리얼에서 설명했으므로, 본 절에서는 표현식에 초점을 맞출 것이다.</para>
-  
-  <para>표현식을 생성할 때에는 도메인 모듈에서 생성한 표현식 타입의 필드와 메서드를 이용한다.
-    코드 생성할 수 없는 경우, 표현식을 생성하기 위한 범용 방법을 사용하면 된다.</para>
-  
-  <sect2>
-    <title>복합 조건(complext predicates)</title>
-
-    <para>
-      복합 불리언 표현식을 작성하려면 <code>com.mysema.query.BooleanBuilder</code> 클래스를 사용한다.
-      이 클래스는 Predicate을 구현하고 있고 메서드 체인 형식으로 사용할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-public List<Customer> getCustomer(String... names){
-    QCustomer customer = QCustomer.customer;    
-    JPAQuery query = new JPAQuery(entityManager).from(customer);    
-    BooleanBuilder builder = new BooleanBuilder();
-    for (String name : names){
-        builder.or(customer.name.eq(name));
-    }
-    query.where(builder); // customer.name eq name1 OR customer.name eq name2 OR ...  
-    return query.list(customer);
-}
-]]></programlisting>
-
-    <para><code>BooleanBuilder</code>는 상태변경이 되며(mutable) 초기에는 null을,
-    각 <code>and</code> 또는 <code>or</code> 호출 뒤에는 오퍼레이션의 결과를 표현한다.
-    </para>
-
-  </sect2>  
-
-  <sect2>
-
-    <title>동적 표현식</title>
-
-    <para>
-      <code>com.mysema.query.support.Expressions</code> 클래스는 동적인 표현식 생성을 위한 정적 팩토리 클래스다.
-      팩토리 메서드는 리턴 타입에 따라 이름을 지었으므로 쉽게 유추할 수 있다.
-    </para>
-    
-    <para>
-      일반적으로 동적 경로, 커스텀 구문이나 커스텀 오퍼레이션과 같이 Fluent DSL 형식을 사용할 수 없는 경우에 한해 <code>Expressions</code> 클래스를 사용한다.
-    </para>
-    
-    <para>다음 표현식을 보자.</para>
-
-    <programlisting language="java"><![CDATA[
-QPerson person = QPerson.person; 	    
-person.firstName.startsWith("P");
-]]></programlisting>
-
-    <para>만약 Q타입 생성이 가능하지 않으면 다음과 같이 위와 동일한 표현식을 만들 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[
-Path<Person> person = Expressions.path(Person.class, "person");
-Path<String> personFirstName = Expressions.path(String.class, person, "firstName");
-Constant<String> constant = Expressions.constant("P");
-Expressions.predicate(Ops.STARTS_WITH, personFirstName, constant);
-]]></programlisting>
-
-    <para>Path 인스턴스는 변수와 프로퍼티를 의미하고, Constant는 상수를, Operation은 오퍼레이션을 표현하며,
-    TemplateExpression 인스턴스를 사용해서 String 템플릿으로 표현식을 표현할 수 있다.
-    </para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>동적 경로</title>
-
-    <para><code>Expressions</code> 기반의 표현식 생성 외에 Querydsl은 동적 경로 생성을 위한 더 표현력이 좋은 API를 제공한다.</para>
-
-    <para>
-      동적 경로 생성을 위해 <code>com.mysema.query.types.path.PathBuilder</code> 클래스를 사용할 수 있다.
-      이 클래스는 <code>EntityPathBase</code> 클래스를 확장하고 있고 경로 생성을 위해 클래스 생성과 별칭 사용 대신에 사용가능하다.
-    </para>
-    
-    <para>
-      Expressions API와 비교하면 PathBuilder 커스텀 구문이나 unknown 오퍼레이션을 직접 지원하진 않지만,
-      구문이 일반 DSL에 더 가깝다.
-    </para>
-
-    <para>Strign 프로퍼티:</para>
-
-    <programlisting language="java"><![CDATA[
-PathBuilder<User> entityPath = new
-PathBuilder<User>(User.class, "entity");
-// fully generic access
-entityPath.get("userName");
-// .. or with supplied type
-entityPath.get("userName", String.class);
-// .. and correct signature
-entityPath.getString("userName").lower();
-]]></programlisting>
-
-    <para>컴포넌트 타입을 가진 List 프로퍼티: </para>
-
-    <programlisting language="java"><![CDATA[
-entityPath.getList("list", String.class).get(0);
-]]></programlisting>
-
-    <para>복합 표현식 타입 사용:</para>
-
-    <programlisting language="java"><![CDATA[
-entityPath.getList("list", String.class, StringPath.class).get(0).lower();
-]]></programlisting>
-
-    <para>키와 값 타입을 갖는 맵 프로퍼티: </para>
-
-    <programlisting language="java"><![CDATA[
-entityPath.getMap("map", String.class, String.class).get("key");
-]]></programlisting>
-
-    <para>복합 표현식 타입 사용:</para>
-
-    <programlisting language="java"><![CDATA[
-entityPath.getMap("map", String.class, String.class, StringPath.class).get("key").lower();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>Case 표현식</title>
-
-    <para>case-when-then-else 표현식을 만들 땐, 다음과 같이 <code>CaseBuilder</code> 클래스를 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-QCustomer customer = QCustomer.customer;    
-Expression<String> cases = new CaseBuilder()
-    .when(customer.annualSpending.gt(10000)).then("Premier")
-    .when(customer.annualSpending.gt(5000)).then("Gold")
-    .when(customer.annualSpending.gt(2000)).then("Silver")
-    .otherwise("Bronze");
-// The cases expression can now be used in a projection or condition        
-]]></programlisting>
-
-    <para>equals-operations을 가진 case 표현식은 다음과 같이 단순한 형태를 사용하면 된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-QCustomer customer = QCustomer.customer;    
-Expression<String> cases = customer.annualSpending
-    .when(10000).then("Premier")
-    .when(5000).then("Gold")
-    .when(2000).then("Silver")
-    .otherwise("Bronze");
-// The cases expression can now be used in a projection or condition        
-]]></programlisting>
-
-    <para>JDOQL에서는 아직 Case 표현식을 지원하지 않는다.</para>
-
-  </sect2>
-  
-  <sect2>
-
-    <title>Casting 표현식</title>
-
-    <para>
-      표현식 타입에서 지네릭 시그너처를 피하기 위해, 타입 계층을 단순화시킨다. 그 결과로 모든 생성된 쿼리 타입은
-      <code>com.mysema.query.types.path.EntityPathBase</code>나 <code>com.mysema.query.types.path.BeanPath</code>를
-      직접 상속받으며, 논리적인 상위 타입으로 타입 변환할 수 없다.
-    </para>
-
-    <para>
-      자바 타입 변환을 직접 사용하는 대신, <code>_super</code> 필드를 통해서 상위 타입에 대한 레퍼런스에 접근할 수 있다. 생성된 쿼리 타입이 한 개 상위 타입을 가질 경우, _super 필드를 사용할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-// from Account
-QAccount extends EntityPathBase<Account>{
-    // ...
-}
-
-// from BankAccount extends Account
-QBankAccount extends EntityPathBase<BankAccount>{
-
-    public final QAccount _super = new QAccount(this);
-    
-    // ...
-}            
-]]></programlisting>
-
-    <para>상위 타입에서 하위 타입으로 변환하려면 EntityPathBase 클래스의 as 메서드를 사용하면 된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QAccount account = new QAccount("account");
-QBankAccount bankAccount = account.as(QBankAccount.class);    
-]]></programlisting>
-
-  </sect2>  
-  
-  <sect2>
-  
-    <title>리터럴 선택</title>
-    
-    <para>Constant 표현식을 통해 리터럴을 선택할 수 있다. 다음은 간단한 예다.</para>
-    
-    <programlisting language="java"><![CDATA[
-query.list(Expressions.constant(1),
-           Expressions.constant("abc"));    
-]]></programlisting>     
-
-    <para>서브쿼리에서 Constant 표현식을 종종 사용한다.</para>    
-  
-  </sect2>
-
-</sect1>    
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml b/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml
deleted file mode 100644
index dfc5d5f921..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/general/result-handling.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<sect1 id="result_handling">
-
-  <title>결과 처리</title>
-  
-  <para>Querydsl은 결과 처리를 커스터마이징 하기 위해 행 기반 변환을 위한 FactoryExpressions과
-   집합을 위한 ResultTransformer를 제공하고 있다.</para>
-
-  <para><code>com.mysema.query.types.FactoryExpression</code> 인터페이스는 빈 생성, 생성자 호출 
-  그리고 더 복잡한 객체를 생성하기 위해 사용된다. <code>com.mysema.query.types.Projections</code> 클래스를
-  이용해서 FactoryExpression 구현체 기능에 접근할 수 있다.</para>
-  
-  <para><code>com.mysema.query.ResultTransformer</code> 인터페이스의 주요 구현체는 <code>GroupBy</code> 클래스이다.</para>
-
-  <sect2>
-  
-    <title>다중 컬럼 리턴</title>
-    
-    <para>Querydsl 3.0 부터 다중 컬럼 결과를 위한 기본 타입은 <code>com.mysema.query.Tuple</code> 이다.
-    Tuple은 타입에 안전한 Map을 제공하고, 이를 통해 Tuple 행 객체로부터 컬럼 데이터에 접근할 수 있다.</para> 
-    
-    <programlisting language="java"><![CDATA[
-List<Tuple> result = query.from(employee).list(employee.firstName, employee.lastName);
-for (Tuple row : result) {
-     System.out.println("firstName " + row.get(employee.firstName));
-     System.out.println("lastName " + row.get(employee.lastName)); 
-}}     
-]]></programlisting>    
-
-    <para>위 예제를 QTuple 클래스를 이용하면 다음과 같이 작성할 수 있다.</para>
-    
-    <programlisting language="java"><![CDATA[
-List<Tuple> result = query.from(employee).list(new QTuple(employee.firstName, employee.lastName));
-for (Tuple row : result) {
-     System.out.println("firstName " + row.get(employee.firstName));
-     System.out.println("lastName " + row.get(employee.lastName)); 
-}}     
-]]></programlisting>        
-  
-  </sect2>
-
-  <sect2>
-
-    <title>빈 생성(population)</title>
-
-    <para>쿼리 결과로부터 빈을 생성하고 싶다면, Bean 프로젝션을 사용하면 된다.</para>
-    
-    <programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.bean(UserDTO.class, user.firstName, user.lastName));
-]]></programlisting>
-
-   <para>setter 메서드 대신 필드에 직접 접근해야 한다면 다음 코드를 사용하면 된다.</para>
-   
-<programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.fields(UserDTO.class, user.firstName, user.lastName));
-]]></programlisting>   
-
-  </sect2>
-
-  <sect2>
-    <title>생성자 사용</title>
-    
-    <para>생성자 기반의 행 변환을 하는 방법은 다음과 같다.</para>
-    
-    <programlisting language="java"><![CDATA[
-List<UserDTO> dtos = query.list(
-    Projections.bean(UserDTO.class, user.firstName, user.lastName));
-]]></programlisting>
-
-    <para>지네릭 생성자 표현식을 사용하는 대신, <code>QueryProjection</code> 어노테이션을 적용한 생성자를 사용할 수도 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-class CustomerDTO {
-
-  @QueryProjection
-  public CustomerDTO(long id, String name){
-     ...
-  }
-
-}
-]]></programlisting>
-
-    <para>그리고, 이 클래스를 다음과 같이 쿼리에서 사용 가능하다.</para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JPQLQuery query = new HibernateQuery(session);
-List<CustomerDTO> dtos = query.from(customer).list(new QCustomerDTO(customer.id, customer.name));     
-]]></programlisting>
-
-    <para>이 예제가 Hibernate용 코드이긴 하지만, 다른 모든 모듈에서도 이 기능을 사용할 수 있다.
-    </para>
-
-    <para>만약 QueryProjection 어노테이션이 적용된 타입이 엔티티(@Entity) 타입이 아니라면,
-      예제처럼 생성자 프로젝션을 사용할 수 있다. 하지만, 어노테이션이 적용된 타입이
-      엔티티(@Entity) 타입이라면 쿼리 타입의 정적 create 메서드를 실행해서 생성자 프로젝션을
-      만들 필요가 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@Entity
-class Customer {
-
-  @QueryProjection
-  public Customer(long id, String name){
-     ...
-  }
-
-}
-]]></programlisting>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JPQLQuery query = new HibernateQuery(session);
-List<Customer> dtos = query.from(customer).list(QCustomer.create(customer.id, customer.name));   
-]]></programlisting>
-
-    <para>코드 생성을 할 수 없다면, 다음과 같이 생성자 프로젝션을 생성할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-List<Customer> dtos = query.from(customer)
-    .list(ConstructorExpression.create(Customer.class, customer.id, customer.name));   
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>결과 집합(aggregation)</title>
-
-    <para>
-      <code>com.mysema.query.group.GroupBy</code> 클래스는 메모리에서 쿼리 결과에 대한 집합 연산을 수행하는
-      집합 함수를 제공한다. 다음은 사용 예이다.
-    </para>
-
-    <para>
-      부모 자식 관계에 대한 집합 연산
-    </para>
-
-    <programlisting language="java"><![CDATA[
-import static com.mysema.query.group.GroupBy.*;
-   
-Map<Integer, List<Comment>> results = query.from(post, comment)
-    .where(comment.post.id.eq(post.id))
-    .transform(groupBy(post.id).as(list(comment)));
-]]></programlisting>
-
-    <para>이 코드는 post id와 관련된 커멘트를 매핑한다.</para>
-
-    <para>다중 결과 컬럼</para>
-
-    <programlisting language="java"><![CDATA[    
-Map<Integer, Group> results = query.from(post, comment)
-    .where(comment.post.id.eq(post.id))
-    .transform(groupBy(post.id).as(post.name, set(comment.id)));
-]]></programlisting>
-
-    <para>이 코드는 post id와 Group을 매핑한다. Group은 post name과 comment id를 갖는다.
-    </para>
-
-    <para>Group은 GroupBy에 대해 Tuple 인터페이스와 같은 역할을 한다.</para>
-
-    <para>
-      더 많은 예제는 
-      <ulink
-        url="https://github.com/mysema/querydsl/blob/master/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java"
-      >여기</ulink>를 참고한다.
-      .
-    </para>
-
-  </sect2>
-
-</sect1>    
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/intro.xml b/querydsl-docs/src/main/docbook/ko-KR/content/intro.xml
deleted file mode 100644
index 222316443f..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/intro.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="intro" revision="1">
-  <title>Introduction</title>
-
-  <sect1>
-    <title>Background</title>
-
-    <para>
-      Querydsl은 타입에 안전한 방식으로 HQL 쿼리를 실행하기 위한 목적으로 만들어졌다.
-      HQL 쿼리를 작성하다보면 String 연결을 이용하게 되고,
-      이는 결과적으로 읽기 어려운 코드를 만드는 문제를 야기한다.
-      String을 이용해서 도메인 타입과 프로퍼티를 참조하다보면 
-      오타 등으로 잘못된 참조를 하게 될 수 있으며,
-      이는 String을 이용해서 HQL 작성할 때 발생하는 또 다른 문제다.
-    </para>
-
-    <para>
-      타입에 안전하도록 도메인 모델을 변경하면 소프트웨어 개발에서 큰 이득을 얻게 된다.
-      도메인의 변경이 직접적으로 쿼리에 반영되고, 쿼리 작성 과정에서 코드 자동완성 기능을
-      사용함으로써 쿼리를 더 빠르고 안전하게 만들 수 있게 된다.
-    </para>
-
-    <para>
-      Querydsl의 최초 쿼리 언어 대상은 Hibernate의 HQL이었으나,
-      현재는 JPA, JDO, JDBC, Lucene, Hibernate Search, MongoDB, 콜렉션 그리고 RDFBean을 지원한다.
-    </para>
-
-  </sect1>
-
-  <sect1>
-
-    <title>원칙</title>
-
-    <para>
-      Querydsl의 핵심 원칙은 <emphasis>타입 안정성(Type safety)</emphasis>이다.
-      도메인 타입의 프로퍼티를 반영해서 생성한 쿼리 타입을 이용해서 쿼리를 작성하게 된다.
-      또한, 완전히 타입에 안전한 방법으로 함수/메서드 호출이 이루어진다.
-    </para>
-
-    <para>
-      또 다른 중요한 원칙은 <emphasis>일관성(consistency)</emphasis>이다.
-      기반 기술에 상관없이 쿼리 경로와 오퍼레이션은 모두 동일하며,
-      Query 인터페이스는 공통의 상위 인터페이스를 갖는다.
-    </para>
-
-    <para>
-      모든 쿼리 인스턴스는 여러 차례 재사용 가능하다.
-      쿼리 실행 이후 페이징 데이터와 프로젝션 정의는 제거된다.
-    </para>
-
-    <para>
-      Javadoc에서 com.mysema.query.Query, com.mysema.query.Projectable 그리고 
-      com.mysema.query.types.Expression의 내용을 보면 Querydsl 쿼리와 표현 타입이 제공하는
-      표현력을 알게 될 것이다.
-    </para>
-
-  </sect1>
-
-</chapter>    
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/preface.xml b/querydsl-docs/src/main/docbook/ko-KR/content/preface.xml
deleted file mode 100644
index 7fb7471488..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/preface.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<preface id="preface">
-  <title>서문</title>
-
-  <para>
-    Querydsl 정적 타입을 이용해서 SQL과 같은 쿼리를 생성할 수 있도록 해 주는 프레임워크다.
-    문자열로 작성하거나 XML 파일에 쿼리를 작성하는 대신, 
-    Querydsl이 제공하는 플루언트(Fluent) API를 이용해서 쿼리를 생성할 수 있다.
-  </para>
-
-  <para>
-    단순 문자열과 비교해서 Fluent API를 사용할 때의 장점은 다음과 같다.
-  </para>
-
-  <orderedlist>
-    <listitem>
-      <para>IDE의 코드 자동 완성 기능 사용</para>
-    </listitem>
-    <listitem>
-      <para>문법적으로 잘못된 쿼리를 허용하지 않음</para>
-    </listitem>
-    <listitem>
-      <para>도메인 타입과 프로퍼티를 안전하게 참조할 수 있음</para>
-    </listitem>
-    <listitem>
-      <para>도메인 타입의 리팩토링을 더 잘 할 수 있음</para>
-    </listitem>
-  </orderedlist>
-
-  <!-- more -->
-
-</preface>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/troubleshooting.xml b/querydsl-docs/src/main/docbook/ko-KR/content/troubleshooting.xml
deleted file mode 100644
index 286fed3964..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/troubleshooting.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="troubleshooting" revision="1">
-  <title>문제해결</title>
-
-  <sect1>
-    <title>불충분한 타입 인자</title>
-
-    <para>
-      Querydsl이 코드 생성을 하려면 List, Set, Collection, Map 프로퍼티가 올바르게 인코딩 되어 있어야 한다.
-    </para>
-
-    <para>올바르게 인코딩되지 않은 필드나 getter를 사용할 경우, 다음과 같은 에러가 발생한다.</para>
-
-    <programlisting><![CDATA[    
-java.lang.RuntimeException: Caught exception for field com.mysema.query.jdoql.testdomain.Store#products
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:117)
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:80)
-  at com.sun.tools.javac.code.Symbol$ClassSymbol.accept(Symbol.java:827)
-  at com.mysema.query.apt.Processor.getClassModel(Processor.java:154)
-  at com.mysema.query.apt.Processor.process(Processor.java:191)
-  ...
-Caused by: java.lang.IllegalArgumentException: Insufficient type arguments for List
-  at com.mysema.query.apt.APTTypeModel.visitDeclared(APTTypeModel.java:112)
-  at com.mysema.query.apt.APTTypeModel.visitDeclared(APTTypeModel.java:40)
-  at com.sun.tools.javac.code.Type$ClassType.accept(Type.java:696)
-  at com.mysema.query.apt.APTTypeModel.<init>(APTTypeModel.java:55)
-  at com.mysema.query.apt.APTTypeModel.get(APTTypeModel.java:48)
-  at com.mysema.query.apt.Processor$2.visitType(Processor.java:114)
-  ... 35 more
-]]></programlisting>
-
-    <para>
-      다음은 문제가 되는 필드 선언과 올바른 선언의 예를 보여주고 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-    private Collection names; // WRONG
-    
-    private Collection<String> names; // RIGHT
-    
-    private Map employeesByName; // WRONG
-    
-    private Map<String,Employee> employeesByName; // RIGHT
-]]></programlisting>
-
-
-  </sect1>
-
-  <sect1>
-
-    <title>멀티쓰레드 환경에서 Querydsl Q타입의 초기화</title>
-
-    <para>Q타입이 순환 의존을 가질 경우, 멀티 쓰레드 환경에서 Q타입을 초기화하면 데드락이 발생할 수 있다.</para>
-
-    <para>이에 대한 가장 쉬운 해결책은 멀티쓰레드 환경에서 사용되기 전에 단일 쓰레드에서 클래스를 초기화하는 것이다.</para>
-
-    <para>이런 목적으로 com.mysema.util.ClassPathUtils 클래스를 사용할 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[
-    ClassPathUtils.scanPackage(Thread.currentThread().getContextClassLoader(), packageToLoad);
-]]></programlisting>
-
-    <para>packageToLoad를 실제 초기화하길 원하는 클래스의 패키지로 바꾸면 된다.</para>
-
-  </sect1>
-
-
-  <sect1>
-    <title>JDK5 사용</title>
-
-    <para>
-      JDK 5로 프로젝트를 컴파일할 때, 다음과 같이 컴파일에 실패할 수 있다.
-    </para>
-
-    <programlisting><![CDATA[
-[INFO] ------------------------------------------------------------------------
-[ERROR] BUILD FAILURE
-[INFO] ------------------------------------------------------------------------
-[INFO] Compilation failure
-...
-class file has wrong version 50.0, should be 49.0
-]]></programlisting>
-
-    <para>
-      자바6에서 사용되는 클래스 파일 버전은 50.0이고 자바5는 49.0이다.
-    </para>
-
-    <para>
-      JDK 6.0 이후 버전에서 사용가능한 APT를 광범위하게 사용하고 있기 때문에, Querydsl을 JDK 6.0에서만 테스트 했다.
-    </para>
-
-    <para>
-      만약 JDK 5.0에서 Querydsl을 사용하길 원한다면 Querydsl 자체를 직접 컴파일해야 한다.
-    </para>
-
-  </sect1>
-
-</chapter>
-
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials.xml
deleted file mode 100644
index 8114a0cef8..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="tutorials" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <title>튜토리얼</title>
-    
-    <para>
-    일반적인 시작 안내 문서 대신 Querydsl이 지원하는 주요 백엔드 기술에 대한 안내 문서를 제공한다.
-    </para>
-    
-    
-    <xi:include href="tutorials/jpa.xml" />
-    <xi:include href="tutorials/jdo.xml" />
-    <xi:include href="tutorials/sql.xml" />
-    <xi:include href="tutorials/lucene.xml" />
-    <xi:include href="tutorials/hibernate-search.xml" />
-    <xi:include href="tutorials/mongodb.xml" />
-    <xi:include href="tutorials/collections.xml" />
-    <xi:include href="tutorials/scala.xml" />
-	
-</chapter>    
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml
deleted file mode 100644
index db6e7057f2..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/collections.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="collections_integration" revision="1">
-
-  <title>콜렉션 쿼리</title>
-
-  <para>생성된 쿼리 타입을 이용하거나 또는 쿼리 타입 없이 querydsl-collections 모듈을 사용할 수 있다.
-    첫 번째 절에서는 생성된 쿼리 타입 없이 사용하는 방법을 설명한다.
-  </para>
-
-  <sect2>
-    <title>생성된 쿼리 타입 없이 사용하기</title>
-
-    <para>
-      생성된 쿼리 타입 없이 querydsl-collections 모듈을 사용하려면, Querydsl 별칭 기능을 사용해야 한다. 다음은 몇 가지 예다.
-    </para>
-
-    <para>
-      먼저 다음의 정적 임포트를 추가한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-// needed for access of the Querydsl Collections API    
-import static com.mysema.query.collections.CollQueryFactory.*;
-// needed, if you use the $-invocations    
-import static com.mysema.query.alias.Alias.*;
-]]></programlisting>
-
-    <para>
-      이제 Cat 클래스에 대한 별칭 인스턴스를 만들어보자.
-      기본 생성자를 가진 non-final 클래스에 대해서만 Alias 인스턴스를 만들수 있다.
-    </para>
-
-    <para>
-      $ 메서드로 감싸는 방법으로 Cat 타입의 별칭 인스턴스 및 그것의 getter 메서드 호출을 
-      경로로 바꾼다. 예를 들어, <code>c.getKittens()</code>에 대한 호출은 
-      $ 메서드를 통해 c.kittends 경로로 바뀐다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : from($(c),cats)
-  .where($(c.getKittens()).size().gt(0))
-  .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>
-      다음은 앞 예제를 다르게 작성해본 것이다. 아래 코드는 List의 size() 메서드를 $ 메서드로 감쌌다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Cat c = alias(Cat.class, "cat");
-for (String name : from($(c),cats)
-  .where($(c.getKittens().size()).gt(0))
-  .list($(c.getName()))){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>
-      별칭의 모든 비-기본타입과 non-final 타입 프로퍼티는 별칭 그 자체이다. 
-      따라서, $ 메서드 범위안에서 기본 타입이나 non-final 타입 (예, java.lang.String)을 만날 때 까지
-      연속된 메서드 호출이 가능하다.
-    </para>
-
-    <para>
-      예를 들어,
-    </para>
-
-    <programlisting language="java"><![CDATA[
-$(c.getMate().getName())
-]]></programlisting>
-
-    <para>
-      이 코드는 <emphasis>c.mate.name</emphasis>으로 바뀐다.
-      하지만, 아래 코드는 올바르게 바뀌지 않는다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-$(c.getMate().getName().toLowerCase())
-]]></programlisting>
-
-    <para>
-      그 이유는 toLowerCase() 호출은 추적되지 않기 때문이다.
-    </para>
-    <para>
-      별칭 타입에 대해 getter, size(), contains(Object), get(int) 만 호출할 수 있다.
-      나머지 다른 메서드에 대한 호출은 익셉션을 발생시킨다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>생성된 쿼리 타입을 갖고 사용하기</title>
-
-    <para>
-      앞서 예제를 생성된 쿼리 타입을 이용하면 다음과 같이 표현할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCat cat = new QCat("cat");
-for (String name : from(cat,cats)
-  .where(cat.kittens.size().gt(0))
-  .list(cat.name)){
-    System.out.println(name);
-}
-]]></programlisting>
-
-    <para>생성된 쿼리 타입을 사용하면, 별칭 인스턴스 대신 표현식을 생성할 수 있고
-      $ 메서드를 사용할 필요 없이 프로퍼티 경로를 바로 사용할 수 있다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>메이븐 통합</title>
-
-    <para>
-      다음 의존을 메이븐 프로젝트에 추가한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>    
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-collections</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-
-    <para>
-      JPA나 JDO를 사용하지 않는다면, 도메인 타입에 <code>com.mysema.query.annotations.QueryEntity</code>
-      애노테이션을 적용하고 메이븐 설정(pom.xml)에 다음 플러그인 설정을 추가함으로써
-      표현식 타입을 생성할 수 있다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant 통합</title>
-
-    <para>클래스패스에 full-deps에 포함된 jar 파일들을 위치시키고, 다음 태스크를 이용해서 Querydsl 코드를 생성한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.QuerydslAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      <emphasis>src</emphasis>를 메인 소스 폴더로 변경하고,
-      <emphasis>generated</emphasis>를 생성된 소스를 위한 폴더로 변경하고,
-      <emphasis>build</emphasis>를 클래스 생성 폴더로 변경한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Hamcrest matchers</title>
-
-    <para>Querydsl Collections 모듈은 Hamcrest matchers를 제공한다. 다음의 import를 통해 사용하면 된다.</para>
-
-    <programlisting language="java"><![CDATA[    
-import static org.hamcrest.core.IsEqual.equalTo;
-import static com.mysema.query.collections.PathMatcher.hasValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-]]></programlisting>
-
-    <para>다음과 같이 사용할 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[  
-Car car = new Car();
-car.setHorsePower(123);
-        
-assertThat(car, hasValue($.horsePower));
-assertThat(car, hasValue($.horsePower, equalTo(123)));  
-]]></programlisting>
-
-    <para>
-      <ulink url="https://github.com/jeroenvs">Jeroen van Schagen</ulink>가 Hamcrest matchers를 기여했다.
-    </para>
-
-  </sect2>
-
-</sect1>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/hibernate-search.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/hibernate-search.xml
deleted file mode 100644
index 6b8f2ca4be..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/hibernate-search.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<sect1 id="hibernate_search_integration" revision="1">
-  <title>Hibernate Search 쿼리</title>
-
-  <para>Hibernate Search 모듈의 쿼리 기능을 설명한다.
-  </para>
-
-  <sect2>
-
-    <title>Querydsl 쿼리 타입 생성</title>
-    <para>
-      쿼리 타입을 생성하는 방법은 본 문서의 <link linkend="jpa_integration">JPA 쿼리</link> 부분을 참고한다.
-    </para>
-  </sect2>
-
-  <sect2>
-    <title>쿼리</title>
-
-    <para>Querydsl Hibernate Search를 이용한 쿼리는 다음과 같이 간단하다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QUser user = QUser.user;
-SearchQuery<User> query = new SearchQuery<User>(session, user);
-List<User> list = query
-	.where(user.firstName.eq("Bob"))
-	.list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>일반 용법</title>
-
-    <para>
-      일반 용법은 <link linkend="lucene_integration">Querying Lucene의 일반 용법</link>을 참고한다.
-    </para>
-
-    <para>
-      쿼리 직렬화 과정에서 Querydsl Lucene module과의 유일한 차이점은 경로를 다르게
-      처리한다는 것이다. <code>org.hibernate.search.annotations.Field</code> 애노테이션이
-      적용된 프로퍼티인 경우, 필드 이름에 대한 대체 방법으로 name 속성의 값을 사용한다.
-    </para>
-
-  </sect2>
-</sect1>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml
deleted file mode 100644
index 9b0155d6ac..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jdo.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="jdo_integration" revision="1">
-  <title>JDO 쿼리</title>
-
-  <para>
-    Querydsl은 영속 도메인 모델에 대해 쿼리할 수 있는 범용적인 정적 타입 구문을 정의하고 있다.
-    JDO와 JPA는 Querydsl이 지원하는 주요 기술이다. 이 안내 문서에서는 JDO와 함께 Querydsl을
-    사용하는 방법을 설명한다.
-  </para>
-
-  <sect2>
-    <title>메이븐 통합</title>
-
-    <para>
-      메이븐 프로젝트의 의존 설정에 다음을 추가한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>        
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-jdo</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>
-
-    <para>
-      다음으로 Querydsl에서 쿼리 타입을 생성하기 위해 사용하는 메이븐 APT 플러그인을 설정한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-    <plugins>
-      ...
-      <plugin>
-        <groupId>com.mysema.maven</groupId>
-        <artifactId>apt-maven-plugin</artifactId>
-        <version>1.0.9</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/generated-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.jdo.JDOAnnotationProcessor</processor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    ...
-    </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-    <para>
-      JDOAnnotationProcessor는 <code>javax.jdo.annotations.PersistenceCapable</code> 애노테이션이
-      적용된 타입을 찾아서 그 타입을 위한 쿼리 타입을 생성한다.
-    </para>
-
-    <para>
-      `mvn clean install`을 실행하면, target/generated-sources/java 디렉토리에 Query 타입이 생성된다.
-    </para>
-
-    <para>
-      이클립스를 사용할 경우, `mvn eclipse:eclipse`을 실행하면
-      target/generated-sources/java 디렉토리가 소스 폴더에 추가된다.
-    </para>
-
-    <para>
-      생성된 Query 타입을 이용하면 JDO 쿼리 인스턴스와 쿼리 도메인 모델 인스턴스를 생성할 수 있다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant 통합</title>
-
-    <para>클래스패스에 full-deps에 포함된 jar 파일들을 위치시키고,
-      다음 태스크를 이용해서 Querydsl 코드를 생성한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.jdo.JDOAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      <emphasis>src</emphasis>를 메인 소스 폴더로 변경하고,
-      <emphasis>generated</emphasis>를 생성된 소스를 위한 폴더로 변경하고,
-      <emphasis>build</emphasis>를 클래스 생성 폴더로 변경한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리 타입 사용하기</title>
-
-    <para>
-      Querydsl을 이용해서 쿼리를 작성하려면, 변수와 Query 구현체를 생성해야 한다.
-      먼저 변수부터 시작해보자.
-    </para>
-
-    <para>
-      다음과 같은 도메인 타입이 있다고 가정하다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@PersistenceCapable
-public class Customer {
-  private String firstName;
-  private String lastName;
-  
-  public String getFirstName(){
-    return firstName;
-  }
-  
-  public String getLastName(){
-    return lastName;
-  }
-  
-  public void setFirstName(String fn){
-    firstName = fn;
-  }
-  
-  public void setLastName(String ln)[
-    lastName = ln;
-  }
-}
-]]></programlisting>
-
-    <para>
-      Querydsl은 Customer와 동일한 패키지에 QCustomer라는 이름을 가진 쿼리 타입을 생성한다.
-      Querydsl 쿼리에서 Customer 타입을 위한 정적 타입 변수로 QCustomer를 사용한다.
-    </para>
-
-    <para>
-      QCustomer는 기본 인스턴스 변수를 갖고 있으며, 다음과 같이 정적 필드로 접근할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-]]></programlisting>
-
-    <para>
-      다음처럼 Customer 변수를 직접 정의할 수도 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = new QCustomer("myCustomer");
-]]></programlisting>
-
-    <para>
-      QCustomer는 원래 Customer 타입의 모든 프로퍼티를 public 필드로 반영한다.
-      firstName 필다는 다음과 같이 접근할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-customer.firstName;
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리</title>
-
-    <para>
-      JDOQuery가 JDO 모듈을 위한 Query 구현체이며, 다음과 같이 인스턴스를 생성한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-PersistenceManager pm = ...;
-JDOQuery query = new JDOQuery (pm);
-]]></programlisting>
-
-    <para>
-      firstName 프로퍼티가 Bob인 Customer를 조회하고 싶다면 다음의 쿼리를 사용하면 된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JDOQuery query = new JDOQuery (pm);
-Customer bob = query.from(customer)
-  .where(customer.firstName.eq("Bob"))
-  .uniqueResult(customer);
-query.close();
-]]></programlisting>
-
-    <para>
-      from 메서드는 쿼리 대상(소스)을 지정하고, where 부분은 필터를 정의하고,
-      uniqueResult는 프로젝션을 정의해서 1개 결과만 리턴하라고 지시한다.
-    </para>
-
-    <para>
-      여러 소스로부터 쿼리를 만들고 싶다면 다음처럼 쿼리를 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer, company);    
-]]></programlisting>
-
-    <para>
-      여러 필터를 사용하는 방법은 다음과 같다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));   
-]]></programlisting>
-
-    <para>또는, 다음과 같이 해도 된다.</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-    <para>필터 조건을 or로 조합하고 싶다면 다음 패턴을 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>일반 용법</title>
-
-    <para>JDOQuery 클래스의 cascading 메서드는 다음과 같다.</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      쿼리 소스를 추가한다. 첫 번째 인자는 메인 소스가 되고, 나머지는 변수로 취급한다.
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      쿼리 필터를 추가한다. 가변인자나 and/or 메서드를 이용해서 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      가변인자 형식의 인자를 기준으로 그룹을 추가한다.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Predicate 표현식을 이용해서 "group by" 그룹핑의 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      정렬 표현식을 이용해서 정렬 순서를 지정한다. 숫자나 문자열에 대해서는
-      asc()나 desc()를 사용하고, OrderSpecifier에 접근하기 위해 다른 비교 표현식을 사용한다.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      결과의 페이징을 설정한다. limit은 최대 결과 개수, offset은 결과의 시작 행,
-      restrict는 limit과 offset을 함께 정의한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>정렬</title>
-
-    <para>정렬을 위한 구문은 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.desc())
-    .list(customer);
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>그룹핑</title>
-
-    <para>그룹핑은 다음과 같은 코드로 처리한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>DeleteClause</title>
-    <para>Querydsl JDO에서 DeleteClause는 간단한 delete-where-execute 형태를 취한다.
-      다음은 몇 가지 예다.
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// delete all customers
-new JDODeleteClause(pm, customer).execute();
-// delete all customers with a level less than 3
-new JDODeleteClause(pm, customer).where(customer.level.lt(3)).execute();  
-]]></programlisting>
-
-    <para>JDODeleteClause 생성자의 두 번째 파라미터는 삭제할 엔티티 대상이다.
-      where는 필요에 따라 추가할 수 있으며, execute를 실행하면 삭제를 수행하고
-      삭제된 엔티티의 개수를 리턴한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>서브쿼리</title>
-
-    <para>서브쿼리를 만들려면 <code>JDOSubQuery</code>를 사용하면 된다.
-    서브쿼리를 만들기 위해 from 메서드로 쿼리 파라미터를 정의하고, unique나 list를 이용한다.
-    unique는 단일 결과를 위해 사용하고 list는 리스트 결과를 위해 사용한다.
-    서브쿼리도 쿼리처럼 타입에 안전한 Querydsl 표현식이다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QDepartment department = QDepartment.department;
-QDepartment d = new QDepartment("d");
-query.from(department)
-    .where(department.employees.size().eq(
-        new JDOSubQuery().from(d).unique(AggregationFunctions.max(d.employees.size()))
-     )).list(department);  
-]]></programlisting>
-
-    <para>위 코드는 다음의 네이티브 JDO 쿼리를 표현한다.</para>
-
-    <programlisting>
-SELECT this FROM com.mysema.query.jdoql.models.company.Department
-WHERE this.employees.size() == 
-(SELECT max(d.employees.size()) FROM com.mysema.query.jdoql.models.company.Department d)
-</programlisting>
-
-    <para>다른 예제</para>
-
-    <programlisting language="java"><![CDATA[
-QEmployee employee = QEmployee.employee;
-QEmployee e = new QEmployee("e");
-query.from(employee)
-    .where(employee.weeklyhours.gt(
-        new JDOSubQuery().from(employee.department.employees, e)
-        .where(e.manager.eq(employee.manager))
-        .unique(AggregationFunctions.avg(e.weeklyhours))
-    )).list(employee);
-]]></programlisting>
-
-    <para>위 코드는 다음의 네이티브 JDO 쿼리를 표현한다.</para>
-
-    <programlisting>
-SELECT this FROM com.mysema.query.jdoql.models.company.Employee 
-WHERE this.weeklyhours > 
-(SELECT avg(e.weeklyhours) FROM this.department.employees e WHERE e.manager == this.manager)
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>네티이브 SQL 사용하기</title>
-
-    <para><code>JDOSQLQuery</code> 클래스를 사용하면 JDO의
-    네이티브 SQL을 Querydsl에서 사용할 수 있다.
-    </para>
-
-    <para>이걸 사용하려면 SQL 스키마를 위한 Querydsl 쿼라 티입을 생성해야 한다.
-      다음은 이를 위한 Maven 설정 예를 보여주고 있다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${project.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.mycompany.mydomain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder> 
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>
-]]></programlisting>
-
-    <para>지정한 위치에 쿼리 타입을 성공적으로 생성했다면, 쿼리에서 그 타입을 사용할 수 있다.
-    </para>
-
-    <para>한 개 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-// serialization templates
-SQLTemplates templates = new DerbyTemplates(); 
-// query types (S* for SQL, Q* for domain types)
-SAnimal cat = new SAnimal("cat");   
-SAnimal mate = new SAnimal("mate"); 
- 
-JDOSQLQuery query = new JDOSQLQuery(pm, templates);
-List<String> names = query.from(cat).list(cat.name);
-]]></programlisting>
-
-    <para>다중 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-List<Object[]> rows = query.from(cat).list(cat.id, cat.name);
-]]></programlisting>
-
-    <para>모든 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-List<Object[]> rows = query.from(cat).list(cat.all());
- ]]></programlisting>
-
-    <para>조인을 이용한 쿼리: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-cats = query.from(cat)
-    .innerJoin(mate).on(cat.mateId.eq(mate.id))
-    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
-    .list(catEntity);
-]]></programlisting>
-
-    <para>쿼리 결과를 DTO로 구하기: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JDOSQLQuery(pm, templates);
-List<CatDTO> catDTOs = query.from(cat)
-    .orderBy(cat.name.asc())
-    .list(ConstructorExpression.create(CatDTO.class, cat.id, cat.name));
-]]></programlisting>
-
-  </sect2>
-
-</sect1>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml
deleted file mode 100644
index a53c7cd967..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/jpa.xml
+++ /dev/null
@@ -1,685 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="jpa_integration" revision="1">
-
-  <title>JPA 쿼리</title>
-
-  <para>
-    Querydsl은 영속 도메인 모델에 대해 쿼리할 수 있는 범용적인 정적 타입 구문을 정의하고 있다.
-    JDO와 JPA는 Querydsl이 지원하는 주요 기술이다.
-    이 안내 문서에서는 JPA와 함께 Querydsl을 사용하는 방법을 설명한다.
-  </para>
-
-  <para>
-    Querydsl은 JPQL과 Criteria 쿼리를 모두 대체할 수 있다.
-    Querydsl은 Criteria 쿼리의 동적인 특징과 JPQL의 표현력을 타입에 안전한 방법으로 제공한다.
-  </para>
-
-  <sect2>
-    <title>메이븐 통합</title>
-
-    <para>
-      메이븐 프로젝트의 의존 설정에 다음을 추가한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>    
-    
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-jpa</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-    <para>
-      다음으로 메이븐 APT 플러그인을 설정한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-  <plugins>
-    ...
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.9</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    ...
-  </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-    <para>
-      JPAAnnotationProcessor는 javax.persistence.Entity 애노테이션을 가진
-      도메인 타입을 찾아서 쿼리 타입을 생성한다.
-    </para>
-
-    <para>
-      도메인 타입으로 Hibernate 애노테이션을 사용하면, APT 프로세서로
-      <code>com.mysema.query.apt.hibernate.HibernateAnnotationProcessor</code>를 사용해야 한다.
-    </para>
-
-    <para>
-      mvn clean install 을 실행하면,
-      target/generated-sources/java 디렉토리에 Query 타입이 생성된다.
-    </para>
-
-    <para>
-      이클립스를 사용할 경우, mvn eclipse:eclipse 를 실행하면
-      target/generated-sources/java 디렉토리가 소스 폴더에 추가된다.
-    </para>
-
-    <para>
-      생성된 Query 타입을 이용하면 JPA 쿼리 인스턴스와 
-      쿼리 도메인 모델 인스턴스를 생성할 수 있다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Ant 통합</title>
-
-    <para>
-      클래스패스에 full-deps에 포함된 jar 파일들을 위치시키고,
-      다음 태스크를 이용해서 Querydsl 코드를 생성한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-    <!-- APT based code generation -->
-    <javac srcdir="${src}" classpathref="cp">
-      <compilerarg value="-proc:only"/>      
-      <compilerarg value="-processor"/>
-      <compilerarg value="com.mysema.query.apt.jpa.JPAAnnotationProcessor"/>
-      <compilerarg value="-s"/>
-      <compilerarg value="${generated}"/>
-    </javac>
-    
-    <!-- compilation -->
-    <javac classpathref="cp" destdir="${build}">      
-      <src path="${src}"/>
-      <src path="${generated}"/>
-    </javac>    
-]]></programlisting>
-
-    <para>
-      <emphasis>src</emphasis>를 메인 소스 폴더로 변경하고,
-      <emphasis>generated</emphasis>를 생성된 소스를 위한 폴더로 변경하고,
-      <emphasis>build</emphasis>를 클래스 생성 폴더로 변경한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Roo에서 Querydsl JPA 사용하기</title>
-
-    <para>
-      스프링 Roo에서 Querydsl JPA를 사용한다면,
-      <code>com.mysema.query.apt.jpa.JPAAnnotationProcessor</code> 대신
-      <code>com.mysema.query.apt.roo.RooAnnotationProcessor</code>를 사용할 수 있다.
-      RooAnnotationProcessor는 <code>@Entity</code>가 적용된 클래스 대신
-      <code>@RooJpaEntity</code>와 <code>@RooJpaActiveRecord</code> 애노테이션이 적용된
-      클래스를 처리한다.
-    </para>
-    
-    <para>
-      APT 기반의 코드 생성 기능은 AspectJ IDT에는 잘 동작하지 않는다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>hbm.xml 파일에서 쿼리 모델 생성하기</title>
-
-    <para>
-      하이버네이트에서 XML 기반 설정을 사용하고 있다면,
-      Querydsl 모델을 생성하기 위해 XML 메타정보를 사용할 수 있다.
-    </para>
-
-    <para>
-      <code>com.mysema.query.jpa.codegen.HibernateDomainExporter</code>가 이 기능을 제공한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-HibernateDomainExporter exporter = new HibernateDomainExporter(
-  "Q",                     // name prefix
-  new File("target/gen3"), // target folder
-  configuration);          // instance of org.hibernate.cfg.Configuration 
-
-exporter.export();
-]]></programlisting>
-
-    <para>
-      HibernateDomainExporter는 리플렉션을 이용해서 도메인의 프로퍼티 타입을 확인하기 때문에,
-      HibernateDomainExporter를 실행하려면 클래스패스에 도메인 타입이 위치해야 한다.
-    </para>
-
-    <para>모든 JPA 어노테이션은 무시되지만, @QueryInit이나 @QueryType과 같은
-    Querydsl 애노테이션은 처리한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리 타입 사용하기</title>
-
-    <para>
-      Querydsl을 이용해서 쿼리를 작성하려면, 변수와 Query 구현체를 생성해야 한다.
-      먼저 변수부터 시작해보자.
-    </para>
-
-    <para>
-      다음과 같은 도메인 타입이 있다고 가정하다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-@Entity
-public class Customer {
-    private String firstName;
-    private String lastName;
-
-    public String getFirstName(){
-        return firstName;
-    }
-
-    public String getLastName(){
-        return lastName;
-    }
-
-    public void setFirstName(String fn){
-        firstName = fn;
-    }
-
-    public void setLastName(String ln)[
-        lastName = ln;
-    }
-}
-]]></programlisting>
-
-    <para>
-      Querydsl은 Customer와 동일한 패키지에 QCustomer라는 이름을 가진 쿼리 타입을 생성한다.
-      Querydsl 쿼리에서 Customer 타입을 위한 정적 타입 변수로 QCustomer를 사용한다.
-    </para>
-
-    <para>
-      QCustomer는 기본 인스턴스 변수를 갖고 있으며, 다음과 같이 정적 필드로 접근할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-]]></programlisting>
-
-    <para>
-      다음처럼 Customer 변수를 직접 정의할 수도 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = new QCustomer("myCustomer");
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리</title>
-
-    <para>Querdsl JPA 모듈은 JPA와 Hibernate API를 모두 지원한다.</para>
-
-    <para>
-      JPA API를 사용하려면 다음과 같이 <code>JPAQuery</code> 인스턴스를 사용하면 된다.
-    </para>
-
-<programlisting language="java"><![CDATA[
-// where entityManager is a JPA EntityManager   
-JPAQuery query = new JPAQuery(entityManager); 
-]]></programlisting>
-
-    <para>Hibernate를 사용한다면, <code>HibernateQuery</code>를 사용하면 된다.    </para>
-
-    <programlisting language="java"><![CDATA[
-// where session is a Hibernate session
-HibernateQuery query = new HibernateQuery(session); 
-]]></programlisting>
-    
-
-    <para>JPAQuery와 HibernateQuery는 둘 다 JPQLQuery 인터페이스를 구현하고 있다.</para>
-
-    <para>
-      firstName 프로퍼티가 Bob인 Customer를 조회하고 싶다면 다음의 쿼리를 사용하면 된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-JPAQuery query = new JPAQuery(entityManager);
-Customer bob = query.from(customer)
-  .where(customer.firstName.eq("Bob"))
-  .uniqueResult(customer);
-]]></programlisting>
-
-    <para>
-      from 메서드는 쿼리 대상(소스)을 지정하고, where 부분은 필터를 정의하고,
-      uniqueResult는 프로젝션을 정의하고, 1개 결과만 리턴하라고 지시한다.
-    </para>
-
-    <para>
-      여러 소스로부터 쿼리를 만들고 싶다면 다음처럼 쿼리를 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer, company);    
-]]></programlisting>
-
-    <para>
-      여러 필터를 사용하는 방법은 다음과 같다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob"), customer.lastName.eq("Wilson"));   
-]]></programlisting>
-
-    <para>또는, 다음과 같이 해도 된다.</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").and(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-    <para>위 코드를 JPQL 쿼리로 작성하면 다음과 같을 것이다.</para>
-
-    <programlisting>
-from Customer as customer
-    where customer.firstName = "Bob" and customer.lastName = "Wilson"
-</programlisting>
-
-    <para>필터 조건을 or로 조합하고 싶다면 다음 패턴을 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-query.from(customer)
-    .where(customer.firstName.eq("Bob").or(customer.lastName.eq("Wilson")));
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>조인</title>
-
-    <para>Querydsl은 JPQL의 이너 조인, 조인, 레프트 조인, 풀조인을 지원한다.
-      조인 역시 타입에 안전하며 다음 패턴에 따라 작성한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[  
-QCat cat = QCat.cat;
-QCat mate = new QCat("mate");
-QCate kitten = new QCat("kitten");
-query.from(cat)
-    .innerJoin(cat.mate, mate)
-    .leftJoin(cat.kittens, kitten)
-    .list(cat);
-]]></programlisting>
-
-    <para>위 쿼리를 JPQL로 작성하면 다음과 같다.</para>
-
-    <programlisting>
-from Cat as cat
-    inner join cat.mate as mate
-    left outer join cat.kittens as kitten
-</programlisting>
-
-    <para>다음은 조인을 사용하는 또 다른 예다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(cat)
-    .leftJoin(cat.kittens, kitten)
-    .on(kitten.bodyWeight.gt(10.0))
-    .list(cat);
-]]></programlisting>
-
-    <para>위 코드의 JPQL 버전은 다음과 같다.</para>
-
-    <programlisting>  
-from Cat as cat
-    left join cat.kittens as kitten
-    on kitten.bodyWeight > 10.0  
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>일반 용법</title>
-
-    <para>JPQLQuery 인터페이스의 cascading 메서드는 다음과 같다.</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      쿼리 소스를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>innerJoin, join, leftJoin, fullJoin, on:</emphasis>
-      조인 부분을 추가한다. 조인 메서드에서 첫 번째 인자는 조인 소스이고,
-      두 번재 인자는 대상(별칭)이다.
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      쿼리 필터를 추가한다. 가변인자나 and/or 메서드를 이용해서 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      가변인자 형식의 인자를 기준으로 그룹을 추가한다.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Predicate 표현식을 이용해서 "group by" 그룹핑의 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      정렬 표현식을 이용해서 정렬 순서를 지정한다.
-      숫자나 문자열에 대해서는 asc()나 desc()를 사용하고,
-      OrderSpecifier에 접근하기 위해 다른 비교 표현식을 사용한다.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      결과의 페이징을 설정한다. limit은 최대 결과 개수, offset은 결과의 시작 행,
-      restrict는 limit과 offset을 함께 정의한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>정렬</title>
-
-    <para>정렬을 위한 구문은 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.desc())
-    .list(customer);
-]]></programlisting>
-
-    <para>위 코드는 다음의 JPQL과 동일하다.</para>
-
-    <programlisting>  
-from Customer as customer
-    order by customer.lastName asc, customer.firstName desc
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>그룹핑</title>
-
-    <para>그룹핑은 다음과 같은 코드로 처리한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>동등한 JPQL은 다음고 같다.</para>
-
-    <programlisting>  
-select customer.lastName
-    from Customer as customer
-    group by customer.lastName
-</programlisting>
-
-
-  </sect2>
-
-  <sect2>
-    <title>DeleteClause</title>
-    <para>Querydsl JPA에서 DeleteClause는 간단한 delete-where-execute 형태를 취한다.
-      다음은 몇 가지 예다.
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// delete all customers
-new JPADeleteClause(entityManager, customer).execute();
-// delete all customers with a level less than 3
-new JPADeleteClause(entityManager, customer).where(customer.level.lt(3)).execute();  
-]]></programlisting>
-
-    <para>JPADeleteClause 생성자의 두 번째 파라미터는 삭제할 엔티티 대상이다.
-      where는 필요에 따라 추가할 수 있으며, execute를 실행하면 삭제를 수행하고
-      삭제된 엔티티의 개수를 리턴한다.
-    </para>
-
-    <para>Hibernate 이용시, HibernateDeleteClause를 사용하면 된다.</para>
-    
-    <para>JPA의 DML 절은 JPA 레벨의 영속성 전파 규칙을 따르지 않고,
-      2차 레벨 캐시와의 연동되지 않는다.</para>
-  </sect2>
-
-  <sect2>
-    <title>UpdateClause</title>
-    
-    <para>Querydsl JPA의 UpdateClause은 간단한 update-set/where-execute 형태를 취한다.
-      다음은 몇 가지 예다.
-    </para>
-
-    <programlisting language="java"><![CDATA[   
-QCustomer customer = QCustomer.customer;
-// rename customers named Bob to Bobby
-new JPAUpdateClause(session, customer).where(customer.name.eq("Bob"))
-    .set(customer.name, "Bobby")
-    .execute();  
-]]></programlisting>
-
-    <para>JPAUpdateClause 생성자의 두 번째 파라미터는 수정할 엔티티 대상이다.
-      set은 SQL의 update 스타일로 프로퍼티 수정을 정의하고,
-      execute를 실행하면 수정을 실행하고 수정된 엔티티의 개수를 리턴한다.
-    </para>
-
-    <para>Hibernate 이용시, HibernateUpdateClause를 사용한다.</para>
-    
-    <para>JPA에서 DML 절은 JPA 레벨의 영속성 전파 규칙을 따르지 않고,
-      2차 레벨 캐시와 연동되지 않는다.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>서브쿼리</title>
-
-    <para>서브쿼리를 만들려면 JPASubQuery를 사용하면 된다.
-      서브쿼리를 만들기 위해 from 메서드로 쿼리 파라미터를 정의하고, unique나 list를 이용한다.
-      unique는 단일 결과를 위해 사용하고 list는 리스트 결과를 위해 사용한다.
-      서브쿼리도 쿼리처럼 타입에 안전한 Querydsl 표현식이다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-QDepartment department = QDepartment.department;
-QDepartment d = new QDepartment("d");
-query.from(department)
-    .where(department.employees.size().eq(
-        new JPASubQuery().from(d).unique(d.employees.size().max())
-     )).list(department);
-]]></programlisting>
-
-    <para>다른 예제</para>
-
-    <programlisting language="java"><![CDATA[
-QEmployee employee = QEmployee.employee;
-QEmployee e = new QEmployee("e");
-query.from(employee)
-    .where(employee.weeklyhours.gt(
-        new JPASubQuery().from(employee.department.employees, e)
-        .where(e.manager.eq(employee.manager))
-        .unique(e.weeklyhours.avg())
-    )).list(employee);
-]]></programlisting>
-
-    <para>Hibernate를 사용할 경우, HibernateSubQuery를 사용하면 된다.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>원래의 JPA Query 구하기</title>
-
-    <para>만약 쿼리를 실행하기 전에 JPA Query를 구하고 싶다면, 다음 코드를 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-JPAQuery query = new JPAQuery(entityManager);
-Query jpaQuery = query.from(employee).createQuery(employee);
-// ...
-List results = jpaQuery.getResultList();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>JPA 쿼리에서 네이티브 SQL 사용하기</title>
-
-    <para>JPASQLQuery 클래스를 사용하면 JPA의 네이티브 SQL을 Querydsl에서 사용할 수 있다.
-    </para>
-
-    <para>이걸 사용하려면 SQL 스키마를 위한 Querydsl 쿼라 티입을 생성해야 한다.
-      다음은 이를 위한 Maven 설정 예를 보여주고 있다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${project.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.mycompany.mydomain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder> 
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>
-]]></programlisting>
-
-    <para>지정한 위치에 쿼리 타입을 성공적으로 생성했다면, 쿼리에서 그 타입을 사용할 수 있다.
-    </para>
-
-    <para>한 개 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-// serialization templates
-SQLTemplates templates = new DerbyTemplates(); 
-// query types (S* for SQL, Q* for domain types)
-SAnimal cat = new SAnimal("cat");   
-SAnimal mate = new SAnimal("mate"); 
-QCat catEntity = QCat.cat;          
- 
-JPASQLQuery query = new JPASQLQuery(entityManager, templates);
-List<String> names = query.from(cat).list(cat.name);
-]]></programlisting>
-
-    <para>한 쿼리에서 엔티티(예, QCat)와 테이블(예, SAnimal)에 대한 참조를 섞어 쓰고 싶다면,
-      같은 변수명을 갖도록 해야 한다. SAnimal.animal은 "animal"이란 변수명을 가지므로
-      새로운 인스턴스 (new SAnimal("cat"))을 대신 사용했다.</para>
-    
-    <para>다음과 같이 할 수도 있다.</para>
-    
-    <programlisting language="java"><![CDATA[
-QCat catEntity = QCat.cat;    
-SAnimal cat = new SAnimal(catEntity.getMetadata().getName());
-]]></programlisting>      
-
-    <para>다중 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<Object[]> rows = query.from(cat).list(cat.id, cat.name);
-]]></programlisting>
-
-    <para>모든 컬럼 쿼리:</para>
-
-    <programlisting language="java"><![CDATA[
-List<Object[]> rows = query.from(cat).list(cat.all());
- ]]></programlisting>
-
-    <para>SQL로 쿼리를 하고, 결과는 엔티티로 구하기: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<Cat> cats = query.from(cat).orderBy(cat.name.asc()).list(catEntity);
-]]></programlisting>
-
-    <para>조인을 이용한 쿼리: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-cats = query.from(cat)
-    .innerJoin(mate).on(cat.mateId.eq(mate.id))
-    .where(cat.dtype.eq("Cat"), mate.dtype.eq("Cat"))
-    .list(catEntity);
-]]></programlisting>
-
-    <para>쿼리 결과를 DTO로 구하기: </para>
-
-    <programlisting language="java"><![CDATA[
-query = new JPASQLQuery(entityManager, templates);
-List<CatDTO> catDTOs = query.from(cat)
-    .orderBy(cat.name.asc())
-    .list(ConstructorExpression.create(CatDTO.class, cat.id, cat.name));
-]]></programlisting>
-
-    <para>JPA API 대신 하이버네이트 API를 사용한다면, HibernateSQLQuery를 사용한다.
-    </para>
-
-  </sect2>
-
-</sect1>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml
deleted file mode 100644
index faec988c32..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/lucene.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="lucene_integration" revision="1">
-
-  <title>루신 쿼리</title>
-
-  <para>이 절에서는 루신 모듈의 쿼리 기능을 설명한다.</para>
-  
-  <sect2>
-    <title>Maven integration</title>
-
-    <para>
-      Querydsl 루신을 사용하려면 루신 3은 querydsl-lucene3 모듈을 그리고 루신 4는 querydsl-lucene4 모듈을 사용한다.
-    </para>
-    
-    <para>루신 3:</para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-lucene3</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>
-
-  <para>루신 4:</para>
-  
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-lucene4</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>  
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리 타입 생성</title>
-
-    <para>다음과 같은 방식으로 year와 title 필드를 가진 쿼리 타입을 직접 작성할 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-public class QDocument extends EntityPathBase<Document>{
-    private static final long serialVersionUID = -4872833626508344081L;
-        
-    public QDocument(String var) {
-        super(Document.class, PathMetadataFactory.forVariable(var));
-    }
-
-    public final StringPath year = createString("year");
-        
-    public final StringPath title = createString("title");
-}
-]]></programlisting>
-
-    <para>QDocument는 year와 title 필드를 가진 루신 Document를 표현한다.</para>
-
-    <para>루신의 경우 스키마 데이터를 사용할 수 없기 때문에 코드 생성 기능을 사용할 수 없다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-    <title>쿼리</title>
-
-    <para>Querydsl 루신으로 쿼리하는 것은 간단하다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-QDocument doc = new QDocument("doc");
-
-IndexSearcher searcher = new IndexSearcher(index);
-LuceneQuery query = new LuceneQuery(true, searcher); 
-List<Document> documents = query
-    .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
-    .list();
-]]></programlisting>
-
-    <para>위 코드는 다음의 루신 쿼리로 바뀐다.</para>
-
-    <programlisting><![CDATA[     
-+year:[1800 TO 2000] +title:huckle*
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>일반 용법</title>
-
-    <para>LuceneQuery 클래스의 cascading 메서드는 다음과 같다.</para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      쿼리 필터를 추가한다. 가변인자나 and/or 메서드를 이용해서 필터를 추가한다.
-      PStrings에 수행되는 오퍼레이션을 지원한다.
-      (<emphasis>matches</emphasis>, <emphasis>indexOf</emphasis>, <emphasis>charAt</emphasis>은 제외).
-      현재 <emphasis>in</emphasis>은 지원되지 않으며, 향후 지원할 예정이다.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      정렬 표현식을 이용해서 정렬 순서를 지정한다. 숫자나 문자열에 대해서는 asc()나 desc()를
-      사용하고, OrderSpecifier에 접근하기 위해 다른 비교 표현식을 사용한다.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      결과의 페이징을 설정한다. limit은 최대 결과 개수, offset은 결과의 시작 행,
-      restrict는 limit과 offset을 함께 정의한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>정렬</title>
-
-    <para>정렬 구문은 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .orderBy(doc.title.asc(), doc.year.desc())
-    .list();
-]]></programlisting>
-
-    <para>위 코드는 다음 루신 쿼리와 동일하다.</para>
-
-    <programlisting>  
-title:*
-</programlisting>
-
-    <para>title과 year의 오름차순으로 결과를 정렬한다.</para>
-
-    <para>sort 메서드와 Sort 인스턴스를 사용해서 정렬을 지정할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Sort sort = ...; 
-query
-    .where(doc.title.like("*"))
-    .sort(sort)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>결과 개수 제한</title>
-
-    <para>결과 개수 제한은 다음과 같이 한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .limit(10)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>오프셋</title>
-
-    <para>오프셋은 다음과 같이 지정한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .offset(3)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>퍼지(fuzzy) 검색</title>
-
-    <para><code>com.mysema.query.lucene.LuceneExpressions</code> 클래스에서 정의된
-    fuzzyLike 메서드를 이용해서 퍼지 검색을 할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(LuceneExpressions.fuzzyLike(doc.title, "Hello"))
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>루신 필터를 쿼리에 적용하기</title>
-
-    <para>단일 루신 필터를 쿼리에 적용할 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .filter(filter)
-    .list();
-]]></programlisting>
-
-    <para>distinct 필터링을 위한 distinct(Path) 메서드를 제공한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .distinct(doc.title)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-</sect1>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml
deleted file mode 100644
index 718595b01a..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/mongodb.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="mongodb_integration" revision="1">
-
-  <title>Mongodb 쿼리</title>
-
-  <para>Mongodb 모듈의 조회 기능을 설명한다.</para>
-
-  <sect2>
-    <title>메이븐 통합</title>
-
-    <para>
-      메이븐 프로젝트에 다음 의존을 추가한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-apt</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>    
-        
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-mongodb</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>    
-]]></programlisting>
-
-    <para>
-      Querydsl을 이용해서 쿼리 타입을 생성하기 위해 메이븐 APT 플러그인을 설정한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<project>
-  <build>
-    <plugins>
-      ...
-      <plugin>
-        <groupId>com.mysema.maven</groupId>
-        <artifactId>apt-maven-plugin</artifactId>
-        <version>1.0.9</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/generated-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.morphia.MorphiaAnnotationProcessor</processor>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    ...
-    </plugins>
-  </build>
-</project>
-]]></programlisting>
-
-    <para>
-      MorphiaAnnotationProcessor는 <code>com.google.code.morphia.annotations.Entity</code>
-      애노테이션이 적용된 도메인 타입을 위한 Querydsl 쿼리 타입을 생성한다.
-    </para>
-
-    <para>
-      mvn clean install 을 실행하면 target/generated-sources/java 폴더에 쿼라 타입 코드가 생성된다.
-    </para>
-
-    <para>
-      이클립스를 사용중이면, mvn eclipse:eclipse 을 실행해서
-      target/generated-sources/java을 이클립스 프로젝트의 소스 폴더에 포함시킨다.
-    </para>
-
-    <para>
-      이제 쿼리 도메인 모델을 이용해서 Mongodb를 조회할 수 있다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리</title>
-
-    <para>Querydsl Mongodb를 이용하면 다음과 같이 간단하게 쿼리할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-Morphia morphia;
-Datastore datastore;
-// ...	
-QUser user = new QUser("user");
-MorphiaQuery<User> query = new MorphiaQuery<User>(morphia, datastore, user);
-List<User> list = query
-	.where(user.firstName.eq("Bob"))
-	.list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>일반 용법</title>
-
-    <para>MongodbQuery 클래스의 cascading 메서드는 다음과 같다.</para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      쿼리 필터를 추가한다. 가변인자나 and/or 메서드를 이용해서 필터를 추가한다.
-      PStrings에 수행되는 오퍼레이션을 지원한다.
-      (<emphasis>matches</emphasis>, <emphasis>indexOf</emphasis>, <emphasis>charAt</emphasis>은 제외).
-      현재 <emphasis>in</emphasis>은 지원되지 않으며, 향후 지원할 예정이다.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      정렬 표현식을 이용해서 정렬 순서를 지정한다. 숫자나 문자열에 대해서는
-      asc()나 desc()를 사용하고, OrderSpecifier에 접근하기 위해 다른 비교 표현식을 사용한다.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      결과의 페이징을 설정한다. limit은 최대 결과 개수, offset은 결과의 시작 행,
-      restrict는 limit과 offset을 함께 정의한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>정렬</title>
-
-    <para>정렬 구문은 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .orderBy(doc.title.asc(), doc.year.desc())
-    .list();
-]]></programlisting>
-
-    <para>title과 year의 오름차순으로 결과를 정렬한다.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>결과 개수 제한</title>
-
-    <para>다음과 같이 결과 개수를 제한한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .limit(10)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>오프셋</title>
-
-    <para>다음과 같이 오프셋을 지정한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .offset(3)
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>공간(Geospatial) 쿼리</title>
-
-    <para>near(Douyble[]) 메서드를 이용해서 공간 검색을 할 수 있다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(geoEntity.location.near(50.0, 50.0))
-    .list();
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>관련 필드만 선택하기</title>
-
-    <para>관련 필드만 선택하고 싶다면, 선택 대상 목록을 갖는 list, iterate, uniqueResult,
-    singleResult 메서드를 사용하면 된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[ 
-query
-    .where(doc.title.like("*"))
-    .list(doc.title, doc.path);
-]]></programlisting>
-
-    <para>이 쿼리는 문서의 title과 path 필드만 조회한다.</para>
-
-  </sect2>
-
-</sect1>
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/scala.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/scala.xml
deleted file mode 100644
index 7f7c8f8253..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/scala.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="scala" revision="1">
-
-  <title>Scala에서 쿼리하기</title>
-
-  <para>querydsl-scala 모듈을 통해 Scala에서 Querydsl을 사용할 수 있다. 
-    이 모듈을 사용하려면 메이븐 빌드에 다음의 코드를 추가한다.
-  </para>
-
-  <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-scala</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>
-]]></programlisting>
-
-  <sect2>
-
-    <title>Scala를 위한 DSL 표현</title>
-
-    <para>Scala 용 Querydsl은 표현식 생성을 위한 별도 DSL을 제공한다.
-      Scala DSL은 가독성과 간결함을 향상시키기 위해
-      연산자 오버로딩, 함수 포인터, 임의 임포트 등 언어의 특징을 활용한다.
-    </para>
-
-    <para>주요 대체 DSL은 다음과 같다.</para>
-
-<!-- TODO use a table for this -->
-
-    <programlisting><![CDATA[
-//Standard              Alternative
-
-expr isNotNull          expr is not(null)
-expr isNull             expr is null
-expr eq "Ben"           expr === "Ben"
-expr ne "Ben"           expr !== "Ben"
-expr append "X"         expr + "X"
-expr isEmpty            expr is empty
-expr isNotEmpoty        expr not empty
-
-// boolean
-left and right          left && right
-left or right           left || right
-expr not                !expr
-
-// comparison
-expr lt 5               expr < 5
-expr loe 5              expr <= 5
-expr gt 5               expr > 5
-expr goe 5              expr >= 5
-expr notBetween(2,6)    expr not between (2,6)
-expr negate             -expr
- 
-// numeric
-expr add 3              expr + 3
-expr subtract 3         expr - 3
-expr divide 3           expr / 3
-expr multiply 3         expr * 3
-expr mod 5              expr % 5
-
-// collection
-list.get(0)             list(0)
-map.get("X")            map("X")
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-    <title>향상된 프로젝션</title>
-
-    <para>Querydsl Scala 모듈은 Querydsl의 쿼리 프로젝션을 Scala에 더욱 알맞게 만들기 위해
-      몇몇 임의 변환을 제공한다.
-    </para>
-
-    <para>
-      Querydsl 쿼리에서 Scala 프로젝션을 활성화하려면 
-      <code>RichProjectable</code>와 <code>RichSimpleProjectable</code> 래퍼를 사용해야 한다.
-      <code>com.mysema.query.scala.Helpers</code>를 임포트 함으로써 필요한 임의 변환이 가능해진다.
-    </para>
-
-    <para>
-      예를 들어, 표준 API를 이용한 다음 쿼리는 <code>Object[]</code> 타입의  <code>java.util.List</code>를 리턴한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[  
-query.from(person).list(person.firstName, person.lastName, person.age)
-]]></programlisting>
-
-    <para>임의 변환을 추가함으로써, list대신에 select를 이용해서 Scala List 타입 결과를 사용할 수 있다.
-      또한, uniqueResult나 singleResult 대신에 unique와 single를 이용해서 Option 타입으로 결과를 사용할 수 있다.
-    </para>
-
-    <para>임의 변환을 사용하면 앞서 쿼리를 다음과 같이 작성할 수 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[
-import com.mysema.query.scala.Helpers._
-  
-query.from(person).select(person.firstName, person.lastName, person.age)
-]]></programlisting>
-
-    <para>이 경우 결과 타입은 List[(String,String,Integer)] 즉, Tuple3[String,String,Integer]의 List가 된다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>SQL을 이용한 쿼리</title>
-
-    <para>
-      자바를 위한 Querydsl SQL과 마찬가지로, 쿼리를 만들려면 쿼리 타입을 생성해야 한다.
-      다음은 쿼리 타입 생성을 위한 코드 예제다.
-    </para>
-
-    <para>빈 타입 없이 생성하기:</para>
-
-    <programlisting language="java"><![CDATA[  
-val directory = new java.io.File("target/jdbcgen1")
-val namingStrategy = new DefaultNamingStrategy()
-val exporter = new MetaDataExporter()
-exporter.setNamePrefix("Q")
-exporter.setPackageName("com.mysema")
-exporter.setSchemaPattern("PUBLIC")
-exporter.setTargetFolder(directory)
-exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
-exporter.setCreateScalaSources(true)
-exporter.setTypeMappings(ScalaTypeMappings.create)
-exporter.export(connection.getMetaData)
-]]></programlisting>
-
-    <para>빈 타입을 이용해서 생성하기:</para>
-
-    <programlisting language="java"><![CDATA[    
-val directory = new java.io.File("target/jdbcgen2")
-val namingStrategy = new DefaultNamingStrategy()
-val exporter = new MetaDataExporter()
-exporter.setNamePrefix("Q")
-exporter.setPackageName("com.mysema")
-exporter.setSchemaPattern("PUBLIC")
-exporter.setTargetFolder(directory)
-exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
-exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer])
-exporter.setCreateScalaSources(true)
-exporter.setTypeMappings(ScalaTypeMappings.create)
-exporter.export(connection.getMetaData)        
-]]></programlisting>
-
-    <sect3>
-
-      <title>컴팩트 쿼리</title>
-
-      <para>Querydsl Scala은 Querydls SQL을 위한 컴팩트 쿼리를 제공한다.
-        이 구문은 Rogue 프레임워크의 도메인 지향 쿼리 구문에서 영감을 얻었다.
-      </para>
-
-      <para>
-        <code>RelationalPath</code> 인스턴스를 쿼리로 임의 변환해서 도메인 지향 쿼리를 구현한다.
-        서비스나 DAO 클래스가 <code>com.mysema.query.scala.sql.SQLHelpers</code> 트레잇을 상속하면
-        이 기능을 사용할 수 있다.
-      </para>
-
-      <para>컴팩트 쿼리를 사용하면, 쿼리의 시작 지점으로 메타 모델 클래스를 사용할 수 있다.
-      </para>
-
-      <para>다음의 일반 쿼리를 사용하는 대신에</para>
-
-      <programlisting language="java"><![CDATA[    
-query().from(employee).select(employee.firstName, employee.lastName)        
-]]></programlisting>
-
-      <para>다음과 같이 Employee 또는 QEmployee의 companio 객체를 사용할 수 있다.</para>
-
-      <programlisting language="java"><![CDATA[    
-Employee.select(_.firstName, _.lastName)        
-]]></programlisting>
-
-      <para>표현식에 orderBy, where, select, single, unique를 사용하는 대신,
-        쿼리의 루트 표현식을 파라미터로 받고 다른 표현식을 리턴하는 함수를 사용할 수 있다.
-        다음은 앞 예제를 확장한 형식이다.
-      </para>
-
-      <programlisting language="java"><![CDATA[    
-Employee.select({ e => e.firstName }, { e => e.lastName })        
-]]></programlisting>
-
-      <para>
-        자세한 내용은 <code>com.mysema.query.scala.sql.RichSimpleQuery</code>의 시그너처를 참고하기 바란다.
-      </para>
-
-    </sect3>
-
-    <sect3>
-
-      <title>코드 생성</title>
-
-      <para>querydsl-maven-plugin을 이용해서 SQL 메타타입과 프로젝션을 위한 Scala 소스를 생성한다.
-        다음은 설정 예다.
-      </para>
-
-      <programlisting language="xml"><![CDATA[      
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>
-  <configuration>
-    <jdbcDriver>com.mysql.jdbc.Driver</jdbcDriver>
-    <jdbcUrl>jdbc:mysql://localhost:3306/test</jdbcUrl>
-    <jdbcUser>matko</jdbcUser>
-    <jdbcPassword>matko</jdbcPassword>			
-    <packageName>com.example.schema</packageName>
-    <targetFolder>${project.basedir}/src/main/scala</targetFolder>
-    <exportBeans>true</exportBeans>
-    <createScalaSources>true</createScalaSources>    		    
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>mysql</groupId>
-	  <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.16</version>
-	</dependency>
-	  <dependency>
-    	<groupId>com.mysema.querydsl</groupId>
-    	<artifactId>querydsl-scala</artifactId>
-    	<version>${querydsl.version}</version>
-  	  </dependency>
-  	  <dependency>
-    	<groupId>org.scala-lang</groupId>
-    	<artifactId>scala-library</artifactId>
-    	<version>${scala.version}</version>
-  	  </dependency>
-  </dependencies>
-</plugin>     
-]]></programlisting>
-
-      <para>querydsl:export 메이븐 골을 실행한다.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>다른 백엔드에 대한 쿼리</title>
-
-    <para>다른 백엔드에 대해 쿼리를 하려면, Expression 모델을 수동으로 만들거나 별칭 함수를 사용해야 한다.
-    </para>
-
-    <para>다음은 JPA를 이용할 때의 예제다.</para>
-
-    <programlisting language="java"><![CDATA[  
-@Entity
-class User {
-  @BeanProperty
-  @Id
-  var id: Integer = _;
-  @BeanProperty
-  var userName: String = _;
-  @BeanProperty
-  @ManyToOne
-  var department: Department = _;
-}
-
-@Entity
-class Department {
-  @BeanProperty
-  @Id
-  var id: Integer = _;
-  @BeanProperty
-  var name: String = _;
-}
-]]></programlisting>
-
-    <para>다음은 몇 가지 쿼리 예제다.</para>
-
-    <para>List</para>
-
-    <programlisting language="java"><![CDATA[
-val person = Person as "person"
-
-query.from(person).where(person.firstName like "Rob%").list(person)
-]]></programlisting>
-
-    <para>Unique result</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(person).where(person.firstName like "Rob%").unique(person)
-]]></programlisting>
-
-    <para>Long where</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(person) 
-  .where(person.firstName like "Rob%", person.lastName like "An%") 
-  .list(person)
-]]></programlisting>
-
-    <para>Order</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(person).orderBy(person.firstName asc).list(person)
-]]></programlisting>
-
-    <para>Not null</para>
-
-    <programlisting language="java"><![CDATA[
-query.from(person) 
-  .where(person.firstName isEmpty, person.lastName isNotNull) 
-  .list(person)
-]]></programlisting>
-
-    <para>쿼리 생성을 위한 팩토리 메서드</para>
-
-    <programlisting language="java"><![CDATA[
-def query() = new JPAQuery(entityManager)
-]]></programlisting>
-
-    <para>위 쿼리를 실행하려면 다음과 같이 변수를 생성해야 한다.</para>
-
-    <programlisting language="java"><![CDATA[
-val person = Person as "person"
-]]></programlisting>
-
-    <para>하이버네이트에서 XML 기반 설정을 사용할 경우, 아직 Scala 모듈을 사용할 수 없다.
-      HibernateDomainExporter는 현재 자바 소스 파일 생성만 지원한다.</para>
-
-  </sect2>
-
-</sect1>  
diff --git a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml
deleted file mode 100644
index 46f8133069..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/content/tutorials/sql.xml
+++ /dev/null
@@ -1,1081 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 id="sql_integration" revision="1">
-
-  <title>SQL 쿼리</title>
-
-  <para>본 절에서는 SQL 모듈의 쿼라 타입 생성과 쿼리 기능을 설명한다.</para>
-
-  <sect2>
-    <title>메이븐 통합</title>
-
-    <para>
-      메이븐 프로젝트에 다음의 의존을 추가한다.
-    </para>
-
-    <programlisting language="xml"><![CDATA[
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-sql</artifactId>
-  <version>${querydsl.version}</version>
-</dependency>    
-        
-<dependency>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-sql-codegen</artifactId>
-  <version>${querydsl.version}</version>
-  <scope>provided</scope>
-</dependency>
-
-<dependency>
-  <groupId>org.slf4j</groupId>
-  <artifactId>slf4j-log4j12</artifactId>
-  <version>1.6.1</version>
-</dependency>   
-]]></programlisting>
-
-    <para>코드 생성을 메이븐이나 Ant에서 할 경우 querydsl-sql-codegen 의존은 생략할 수 있다.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>메이븐을 통한 코드 생성</title>
-
-    <para>코드 생성은 주로 메이븐 플러그인을 통해서 수행한다. 다음은 설정 예다.</para>
-
-    <programlisting language="xml"><![CDATA[   
-<plugin>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <version>${querydsl.version}</version>
-  <executions>
-    <execution>
-      <goals>
-        <goal>export</goal>
-      </goals>
-    </execution>            
-  </executions>
-  <configuration>
-    <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-    <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-    <packageName>com.myproject.domain</packageName>
-    <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
-  </configuration>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
-  </dependencies>
-</plugin>  
-]]></programlisting>
-
-    <para>
-      컴파일 소스 루트 대신에 테스트 컴파일 소스 루트로 targetFolder를 추가하려면
-      <emphasis>test-export</emphasis> 골을 사용하면 된다.
-    </para>
-
-    <table>
-      <title>파라미터</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>이름</entry>
-            <entry>설명</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>jdbcDriver</entry>
-            <entry>JDBC 드라이버 클래스 이름</entry>
-          </row>
-          <row>
-            <entry>jdbcUrl</entry>
-            <entry>JDBC URL</entry>
-          </row>
-          <row>
-            <entry>jdbcUser</entry>
-            <entry>JDBC 사용자</entry>
-          </row>
-          <row>
-            <entry>jdbcPassword</entry>
-            <entry>JDBC 암호</entry>
-          </row>
-          <row>
-            <entry>namePrefix</entry>
-            <entry>생성될 쿼리 클래스의 접두어 (기본: Q)</entry>
-          </row>
-          <row>
-            <entry>nameSuffix</entry>
-            <entry>생성될 쿼리 클래스의 접미사 (기본: )</entry>
-          </row>
-          <row>
-            <entry>beanPrefix</entry>
-            <entry>생성될 빈Bean 클래스의 접두어</entry>
-          </row>
-          <row>
-            <entry>beanSuffix</entry>
-            <entry>생성될 빈 클래스의 접미사 </entry>
-          </row>
-          <row>
-            <entry>packageName</entry>
-            <entry>생성될 소스 파일이 위치할 패키지</entry>
-          </row>
-          <row>
-            <entry>beanPackageName</entry>
-            <entry>빈 파일이 생성될 패키지 이름 (기본: packageName)</entry>
-          </row>
-          <row>
-            <entry>beanInterfaces</entry>
-            <entry>빈 클래스에 추가할 인터페이스 목록 (기본: 없음)</entry>
-          </row>
-          <row>
-            <entry>beanAddToString</entry>
-            <entry>true로 지정하면 기본 toString() 구현을 생성 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>beanAddFullConstructor</entry>
-            <entry>true로 지정하면 기본 생성자 외에 완전한 생성자를 생성 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>beanPrintSupertype</entry>
-            <entry>true로 지정하면 상위 타입을 출력 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>schemaPattern</entry>
-            <entry>스키마 이름 패턴. 반드시 데이터베이스에 존재하는 스키마 이름과 일치해야 한다. (기본: null)</entry>
-          </row>
-          <row>
-            <entry>tableNamePattern</entry>
-            <entry>테이블 이름 패턴. 반드시 데이터베이스에 존재하는 테이블 이름과 일치해야 하며,
-            콤마로 구분해서 두 개 이상 지정할 수 있다. (기본: null)</entry>
-          </row>
-          <row>
-            <entry>targetFolder</entry>
-            <entry>소스 파일을 생성할 폴더를 지정</entry>
-          </row>
-          <row>
-            <entry>namingStrategyClass</entry>
-            <entry>NamingStrategy로 사용할 클래스 이름을 입력 (기본: DefaultNamingStrategy)
-            </entry>
-          </row>
-          <row>
-            <entry>beanSerializerClass</entry>
-            <entry>BeanSerializer로 사용할 클래스 이름 (기본: BeanSerializer)</entry>
-          </row>
-          <row>
-            <entry>serializerClass</entry>
-            <entry>Serializer로 사용할 클래스 이름 (기본: MetaDataSerializer)</entry>
-          </row>
-          <row>
-            <entry>exportBeans</entry>
-            <entry>true로 지정하면 빈을 함께 생성. 2.14.13 참고. (기본: false)</entry>
-          </row>
-          <row>
-            <entry>innerClassesForKeys</entry>
-            <entry>true로 지정하면 키를 내부 클래스로 생성 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>validationAnnotations</entry>
-            <entry>true로 지정하면 Validation 어노테이션의 직렬화를 가능하게 함 (기본: false) </entry>
-          </row>
-          <row>
-            <entry>columnAnnotations</entry>
-            <entry>true로 지정하면 컬럼 어노테이션을 추출함 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>createScalaSources</entry>
-            <entry>true로 지정하면 자바 소스 대신 Scala 소스로 추찰함 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>schemaToPackage</entry>
-            <entry>true로 지정하면 스키마 이름을 패키지에 붙임 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>lowerCase</entry>
-            <entry>true로 지정하면 이름을 소문자로 변환 (기본: false)</entry>
-          </row>
-          <row>
-            <entry>exportTables</entry>
-            <entry>true로 지정하면 테이블을 추출 (기본: true)</entry>
-          </row>
-          <row>
-            <entry>exportViews</entry>
-            <entry>true로 지정한 뷰를 추출 (기본: true)</entry>
-          </row>
-          <row>
-            <entry>exportPrimaryKeys</entry>
-            <entry>true로 지정하면 PK를 추출 (기본: true)</entry>
-          </row>
-          <row>
-            <entry>exportForeignKeys</entry>
-            <entry>true로 지정하면 외부키를 추출 (기본: true)</entry>
-          </row>
-          <row>
-            <entry>customTypes</entry>
-            <entry>커스텀 사용자 타입 (기본: 없음)</entry>
-          </row>
-          <row>
-            <entry>typeMappings</entry>
-            <entry>테이블.컬럼에서 자바 타입으로 매핑 (기본: 없음)</entry>
-          </row>
-          <row>
-            <entry>numericMappings</entry>
-            <entry>크기/숫자에서 자바 타입으로 매핑 (기본: 없음)</entry>
-          </row>
-          <row>
-            <entry>imports</entry>
-            <entry>생성된 쿼리 클래스에 추가할 자바 import 목록: 패키지의 경우 (.* 없이) 패키지 이름만(예, <emphasis>com.bar</emphasis>), 클래스의 경우 완전한 클래스 이름 (예, <emphasis>com.bar.Foo</emphasis>) 사용. (기본: 없음)
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    
-    <para>추가로 타입 구현을 등록하고 싶을 때 customTypes을 사용한다.</para>
-    
-<programlisting language="xml"><![CDATA[       
-<customTypes>
-  <customType>com.mysema.query.sql.types.InputStreamType</customType>
-</customTypes>
-]]></programlisting>       
-
-    <para>테이블.컬럼을 위한 자바 타입을 등록하고 싶을 때 typeMappings를 사용한다.</para>
-    
-<programlisting language="xml"><![CDATA[       
-<typeMappings>
-  <typeMapping>
-    <table>IMAGE</table>
-    <column>CONTENTS</column>
-    <type>java.io.InputStream</type>
-  </typeMapping>
-</typeMappings>
-]]></programlisting>       
-   
-
-    <para>숫자 매핑을 위한 기본 타입은 다음과 같다.</para>
-    
-    <table>
-      <title>숫자 매핑</title>
-      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-        <colspec colname='Name' colwidth="1*" />
-        <colspec colname='Descriptions' colwidth="1*" />
-        <thead>
-          <row>
-            <entry>크기</entry>
-            <entry>자리(Digits)</entry>
-            <entry>타입</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry>&gt; 18</entry>
-            <entry>0</entry>
-            <entry>BigInteger</entry>
-          </row>
-          <row>
-            <entry>&gt; 9</entry>
-            <entry>0</entry>
-            <entry>Long</entry>
-          </row>
-          <row>
-            <entry>&gt; 4</entry>
-            <entry>0</entry>
-            <entry>Integer</entry>
-          </row>
-          <row>
-            <entry>&gt; 2</entry>
-            <entry>0</entry>
-            <entry>Short</entry>
-          </row>
-          <row>
-            <entry>&gt; 0</entry>
-            <entry>0</entry>
-            <entry>Byte</entry>
-          </row>
-          <row>
-            <entry>&gt; 16</entry>
-            <entry>&gt; 0</entry>
-            <entry>BigDecimal</entry>
-          </row>
-          <row>
-            <entry>&gt; 0</entry>
-            <entry>&gt; 0</entry>
-            <entry>Double</entry>
-          </row>      
-        </tbody>
-      </tgroup>
-    </table>          
-    
-    <para>특정 크기/자리에 대한 커스텀 타입은 다음과 같이 설정한다.</para>
-    
-<programlisting language="xml"><![CDATA[    
-<numericMappings>
-  <numericMapping>
-    <size>1</size>
-    <digits>0</digits>
-    <javaType>java.lang.Byte</javaType>
-  </numericMapping>
-</numericMappings>   
-]]></programlisting>          
-    
-    <para>Import를 사용하면 크로스 스키마 외래키 지원을 추가할 수 있다.</para>
-
-    <para>APT 기반 코드 생성과 비교할 때 특정 기능은 사용할 수 없다. (예, QueryDelegate 애노테이션 처리)</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>ANT를 통한 코드 생성</title>
-
-    <para>
-      Querydsl-sql 모듈이 제공하는 <code>com.mysema.query.sql.ant.AntMetaDataExporter</code>
-      ANT 태스크는 ANT 태스크(어떤 ANT 태스크?)와 같은 기능을 제공한다.
-      태스크의 설정 파라미터느는
-      메이븐 플러그인과 동일하다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리 타입 만들기</title>
-
-    <para>DB 스키마를 Querydsl의 쿼리 타입으로 만들려면 다음과 같이 하면 된다.</para>
-
-    <programlisting language="java"><![CDATA[  
-java.sql.Connection conn = ...;
-MetaDataExporter exporter = new MetaDataExporter();
-exporter.setPackageName("com.myproject.mydomain");
-exporter.setTargetFolder(new File("target/generated-sources/java"));
-exporter.export(conn.getMetaData());  
-]]></programlisting>
-
-    <para>위 코드를 실행하면 데이터베이스 스키마로부터
-      생성한 쿼리 타입 소스 코드(com.myproject.mydomain 패키지에 속함)를
-      target/generated-sources/java 디렉토리에 만든다.
-    </para>
-
-    <para>
-      생성된 타입의 클래스 이름은 변형된 테이블 이름이 되며,
-      쿼리 티입 프로퍼티 경로의 이름을 변형된 컬럼 이름이 된다.
-    </para>
-
-    <para>
-      추가로, 간략한 조인 설정을 위해 PK와 FK를 위한 필드가 추가된다.
-    </para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>설정</title>
-    
-    <para>com.mysema.query.sql.Configuration 클래스를 이용해서 설정하며,
-      Configuration 클래스는 생성자 인자로 Querydsl SQL Dialect를 취한다.
-      예를 들어, H2 DB 사용시 다음과 같이 생성한다.</para>
-    
-    <programlisting language="java"><![CDATA[ 
-SQLTemplates templates = new H2Templates();
-Configuration configuration = new Configuration(templates);     
-]]></programlisting>
-
-    <para>Querydsl은 서로 다른 RDBMS를 위한 SQL 직렬화를 커스터마이징하기 위해
-      SQL Dialect를 사용한다. 사용가능한 Dialect는 다음과 같다.
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>CUBRIDTemplates (tested with 8.4)</para>
-      </listitem>
-      <listitem>
-        <para>DerbyTemplates (tested with 10.8.2.2)</para>
-      </listitem>
-      <listitem>
-        <para>HSQLDBTemplates (tested with 2.2.4)</para>
-      </listitem>
-      <listitem>
-        <para>H2Templates (tested with 1.3.164)</para>
-      </listitem>
-      <listitem>
-        <para>MySQLTemplates (tested with MySQL 5.5)</para>
-      </listitem>
-      <listitem>
-        <para>OracleTemplates (test with Oracle 10 and 11)</para>
-      </listitem>
-      <listitem>
-        <para>PostgresTemplates (tested with 9.1)</para>
-      </listitem>
-      <listitem>
-        <para>SQLiteTemplates (tested with xerial JDBC 3.7.2)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServerTemplates (tested with SQL Server)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2005Templates (for SQL Server 2005)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2008Templates (for SQL Server 2008)</para>
-      </listitem>
-      <listitem>
-        <para>SQLServer2012Templates (for SQL Server 2012 and later)</para>
-      </listitem>
-      <listitem>
-        <para>TeradataTemplates (tested with Teradata 14)</para>
-      </listitem>
-      
-    </itemizedlist>    
-    
-    <para>SQLTemplate 객체의 설정을 변경하려면 다음과 같이 빌더 패턴을 사용할 수 있다.</para>    
-  
-  <programlisting language="java"><![CDATA[
-  H2Templates.builder()
-     .printSchema() // to include the schema in the output
-     .quote()       // to quote names
-     .newLineToSingleSpace() // to replace new lines with single space in the output
-     .escape(ch)    // to set the escape char
-     .build();      // to get the customized SQLTemplates instance
-]]></programlisting>  
-
-    <para>Configuration 클래스를 이용하면 setUseLiterals(true)를 통한 리터럴의 직접 직렬화 활성,
-      스키마와 테이블 재정의, 커스텀 타입을 등록할 수 있다. 완전한 내용은 javadoc의
-      Configuration를 참고한다.</para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리</title>
-
-    <para>Querydsl SQL을 이용해서 쿼리하는 방법은 다음처럼 간단하다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = new QCustomer("c");
-
-SQLQuery query = new SQLQuery(connection, configuration); 
-List<String> lastNames = query.from(customer)
-    .where(customer.firstName.eq("Bob"))
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>
-      위 코드는 다음의 SQL로 변환되어 실행된다.
-      (테이블 이름은 <emphasis>customer</emphasis>, 컬럼 이름은 <emphasis>first_name</emphasis>,
-      <emphasis>last_name</emphasis>이라고 가정)
-    </para>
-
-    <programlisting><![CDATA[     
-SELECT c.last_name 
-FROM customer c 
-WHERE c.first_name = 'Bob'
-]]></programlisting>  
-
-  </sect2>
-
-  <sect2>
-
-    <title>일반 용법</title>
-
-    <para>SQLQuery 클래스의 cascading 메서드는 다음과 같다.</para>
-
-    <para>
-      <emphasis>from:</emphasis>
-      쿼리 소스를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>innerJoin, join, leftJoin, fullJoin, on:</emphasis>
-      조인 부분을 추가한다. 조인 메서드에서 첫 번째 인자는 조인 소스이고,
-      두 번재 인자는 대상(별칭)이다.
-    </para>
-
-    <para>
-      <emphasis>where:</emphasis>
-      쿼리 필터를 추가한다. 가변인자나 and/or 메서드를 이용해서 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>groupBy:</emphasis>
-      가변인자 형식의 인자를 기준으로 그룹을 추가한다.
-    </para>
-
-    <para>
-      <emphasis>having:</emphasis>
-      Predicate 표현식을 이용해서 "group by" 그룹핑의 필터를 추가한다.
-    </para>
-
-    <para>
-      <emphasis>orderBy:</emphasis>
-      정렬 표현식을 이용해서 정렬 순서를 지정한다.
-      숫자나 문자열에 대해서는 asc()나 desc()를 사용하고,
-      OrderSpecifier에 접근하기 위해 다른 비교 표현식을 사용한다.
-    </para>
-
-    <para>
-      <emphasis>limit, offset, restrict:</emphasis>
-      결과의 페이징을 설정한다. limit은 최대 결과 개수, offset은 결과의 시작 행,
-      restrict는 limit과 offset을 함께 정의한다.
-    </para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>조인</title>
-
-    <para>다음 구문을 이용해서 조인을 한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-QCompany company = QCompany.company;
-query.from(customer)
-    .innerJoin(customer.company, company)
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-    <para>레프트 조인은 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .leftJoin(customer.company, company)
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-    <para>조인 조건을 쓸 수도 있다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .leftJoin(company).on(customer.company.eq(company.id))
-    .list(customer.firstName, customer.lastName, company.name);
-]]></programlisting>
-
-  </sect2>
-
-
-  <sect2>
-
-    <title>정렬</title>
-
-    <para>다음은 정렬 구문이다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .orderBy(customer.lastName.asc(), customer.firstName.asc())
-    .list(customer.firstName, customer.lastName);
-]]></programlisting>
-
-    <para>위 코드는 아래 SQL 쿼리와 동등하다.</para>
-
-    <programlisting>  
-SELECT c.first_name, c.last_name
-FROM customer c 
-ORDER BY c.last_name ASC, c.first_name ASC
-</programlisting>
-
-  </sect2>
-
-  <sect2>
-
-    <title>그룹핑</title>
-
-    <para>다음 형식을 이용해서 그룹핑을 한다.</para>
-
-    <programlisting language="java"><![CDATA[ 
-query.from(customer)
-    .groupBy(customer.lastName)
-    .list(customer.lastName);
-]]></programlisting>
-
-    <para>다음은 위 코드에 해당하는 SQL 쿼리다.</para>
-
-    <programlisting>  
-SELECT c.last_name 
-FROM customer c 
-GROUP BY c.last_name
-</programlisting>
-
-  </sect2>
-
-  <!-- <sect2> <title>Union queries</title> <para>TODO</para> </sect2> -->
-
-  <sect2>
-
-    <title>서브쿼리</title>
-
-    <para>
-      서브쿼리를 만들려면 SQLSubQuery를 사용하면 된다.
-      서브쿼리를 만들기 위해 from 메서드로 쿼리 파라미터를 정의하고, unique나 list를 이용한다.
-      unique는 단일 결과를 위해 사용하고 list는 리스트 결과를 위해 사용한다.
-      서브쿼리도 쿼리처럼 타입에 안전한 Querydsl 표현식이다.
-    </para>
-
-    <programlisting language="java"><![CDATA[ 
-QCustomer customer = QCustomer.customer;
-QCustomer customer2 = new QCustomer("customer2");
-query.from(customer).where(
-  customer.status.eq(new SQLSubQuery().from(customer2).unique(customer2.status.max()))
-  .list(customer.all())  
-]]></programlisting>
-
-    <para>다른 예제</para>
-
-    <programlisting language="java"><![CDATA[ 
-QStatus status = QStatus.status;
-query.from(customer).where(  
-  customer.status.in(new SQLSubQuery().from(status).where(status.level.lt(3)).list(status.id))  
-  .list(customer.all())    
-]]></programlisting>
-
-  </sect2>
-
-  <sect2>
-  
-    <title>리터럴 조회</title>
-    
-    <para>리터럴을 조회하려면, 다음과 같이 constant 인스턴스를 생성해주면 된다.</para>
-    
-    <programlisting language="java"><![CDATA[
-query.list(Expressions.constant(1),
-           Expressions.constant("abc"));    
-]]></programlisting>     
-
-    <para><code>com.mysema.query.support.Expressions</code> 클래스는
-    프로젝션, 오퍼레이션, 템플릿 생성을 위한 유용한 정적 메서드도 제공한다.</para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>쿼리 확장 지원</title>
-
-    <para>엔진에 특화된 구문을 사용하려면 커스텀 쿼리 확장을 사용한다.
-      커스텀 쿼리 확장은 AbstractSQLQuery를 상속받아 구현할 수 있다.
-      다음은 MySQLQuery 클래스에서 플래그를 추가하는 예를 보여주고 있다.
-    </para>
-
-    <programlisting language="java"><![CDATA[          
-public class MySQLQuery extends AbstractSQLQuery<MySQLQuery> {
-    
-    public MySQLQuery(Connection conn) {
-        this(conn, new MySQLTemplates(), new DefaultQueryMetadata());
-    }
-    
-    public MySQLQuery(Connection conn, SQLTemplates templates) {
-        this(conn, templates, new DefaultQueryMetadata());
-    }
-    
-    protected MySQLQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
-        super(conn, new Configuration(templates), metadata);
-    }
-    
-    public MySQLQuery bigResult(){
-        return addFlag(Position.AFTER_SELECT, "SQL_BIG_RESULT ");
-    }
-    
-    public MySQLQuery bufferResult(){
-        return addFlag(Position.AFTER_SELECT, "SQL_BUFFER_RESULT ");
-    }
- 
- 
-    // ...   
-}        
-]]></programlisting>
-
-    <para>
-      플래그는 직렬화 과정에서 특정 위치에 삽입될 수 있는 커스텀 SQL 부분 코드다.
-      <code>com.mysema.query.QueryFlag.Position</code> 열거 타입에 지원되는 위치가 정의되어 있다.
-    </para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>윈도우 함수</title>
-    
-    <para>Querydsl은 <code>SQLExpressions</code> 클래스를 통해서 윈도우 함수를 지원한다.</para>
-    
-    <para>다음은 사용 예다.</para>
-    
-    <programlisting language="java"><![CDATA[
-query.from(employee)
-    .list(SQLExpressions.rowNumber()
-        .over()
-        .partitionBy(employee.name)
-        .orderBy(employee.id));
-]]></programlisting>
-  
-  </sect2>
-  
-  <sect2>
-  
-    <title>다른 SQL 표현식</title>
-    
-    <para>
-    <code>SQLExpressions</code> 클래스의 정적 메서드를 이용해서 다른 SQL 표현식을 사용할 수 있다.
-    </para>
-  
-  </sect2>
-
-  <sect2>
-
-    <title>DML 명령 사용하기</title>
-
-    <para>Querydsl SQL 모듈의 모든 DMLClause 구현체는 Connection, 쿼리에 사용될 SQLTemplate,
-    DMLClause와 엮일 메인 엔티티의 세 개 파라미터를 필요로 한다.
-    </para>
-
-    <sect3>
-
-      <title>삽입</title>
-
-      <para>컬럼 지정</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-  
-new SQLInsertClause(conn, configuration, survey)
-    .columns(survey.id, survey.name)
-    .values(3, "Hello").execute();
-]]></programlisting>
-
-      <para>컬럼 없이</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .values(4, "Hello").execute();
-]]></programlisting>
-
-      <para>서브쿼리 이용</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .columns(survey.id, survey.name)
-    .select(new SQLSubQuery().from(survey2).list(survey2.id.add(1), survey2.name))
-    .execute();
-]]></programlisting>
-
-      <para>서브쿼리 이용, 컬럼 없이</para>
-
-      <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .select(new SQLSubQuery().from(survey2).list(survey2.id.add(10), survey2.name))
-    .execute();
-]]></programlisting>
-
-    <para>columns/values를 사용하는 대신, set 메서드를 이용</para>
-    
-    <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-  
-new SQLInsertClause(conn, configuration, survey)
-    .set(survey.id, 3)
-    .set(survey.name, "Hello").execute();
-]]></programlisting>    
-
-     <para>위 코드는 첫 번째 예제와 동일하다.
-      set 메서드를 사용하면 내부적으로 columns/values가 사용된다.</para>
-     
-     <para>아래 형식의 코드에서는 컬럼과 쿼리 결과 집합을 매핑하는 것에 주의하자.</para>
-     
-     <programlisting language="java"><![CDATA[
-columns(...).select(...)
-]]></programlisting>    
-     
-     <para>변경된 행 개수 대신 생성된 키를 구하고 싶다면 executeWithKey/s 메서드를 사용한다.</para>
-
-<programlisting language="java"><![CDATA[
-set(...)
-]]></programlisting>    
-
-     <para>위 코드는 한 개 컬럼을 매핑한다. 서브 쿼리 결과가 없으면 null을 사용한다.</para>
-     
-     <para>빈의 데이터에 기반해서 clause 인스턴스를 생성하려면 다음의 코드를 사용한다.</para>
-
-    <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .populate(surveyBean).execute();
-]]></programlisting>
-
-    <para>위 코드는 빈의 데이터 중 null은 제외한다. null도 포함시키고 싶다면 아래 코드를 사용한다.
-</para>
-    
-    <programlisting language="java"><![CDATA[
-new SQLInsertClause(conn, configuration, survey)
-    .populate(surveyBean, DefaultMapper.WITH_NULL_BINDINGS).execute();
-]]></programlisting>    
-
-    </sect3>
-
-    <sect3>
-
-      <title>수정</title>
-
-      <para>where 절 포함</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-
-new SQLUpdateClause(conn, configuration, survey)
-    .where(survey.name.eq("XXX"))
-    .set(survey.name, "S")
-    .execute();
-]]></programlisting>
-
-      <para>where 절 없이</para>
-
-      <programlisting language="java"><![CDATA[  
-new SQLUpdateClause(conn, configuration, survey)
-    .set(survey.name, "S")
-    .execute(); 
-]]></programlisting>
-
-    <para>빈을 이용</para>
-    
-<programlisting language="java"><![CDATA[
-new SQLUpdateClause(conn, configuration, survey)
-    .populate(surveyBean)
-    .execute();
-]]></programlisting>        
-
-    </sect3>
-
-    <sect3>
-
-      <title>삭제</title>
-
-      <para>where 절 포함</para>
-
-      <programlisting language="java"><![CDATA[
-QSurvey survey = QSurvey.survey;
-
-new SQLDelecteClause(conn, configuration, survey)
-    .where(survey.name.eq("XXX"))
-    .execute();
-    
-]]></programlisting>
-
-      <para>where 없이</para>
-
-      <programlisting language="java"><![CDATA[  
-new SQLDelecteClause(conn, configuration, survey)
-    .execute()  
-]]></programlisting>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-
-    <title>DMLClause의 배치 지원</title>
-
-    <para>Querydsl SQL은 DML API를 통해서 JDBC 배치 업데이터를 지원한다.
-      같은 구조를 갖는 DML을 연속해서 실행할 경우, addBatch() 메서드를 이용해서
-      한 DMLClause로 묶을 수 있다.
-      UPDATE, DELETE, INSERT에 대해 어떻게 동작하는지 예제를 살펴보자.
-    </para>
-
-    <para>수정:</para>
-
-    <programlisting language="java"><![CDATA[   	
-QSurvey survey = QSurvey.survey;
-
-insert(survey).values(2, "A").execute();
-insert(survey).values(3, "B").execute();
-
-SQLUpdateClause update = update(survey);
-update.set(survey.name, "AA").where(survey.name.eq("A")).addBatch();
-update.set(survey.name, "BB").where(survey.name.eq("B")).addBatch();
-]]></programlisting>
-
-    <para>삭제:</para>
-
-    <programlisting language="java"><![CDATA[
-insert(survey).values(2, "A").execute();
-insert(survey).values(3, "B").execute();
-
-SQLDeleteClause delete = delete(survey);
-delete.where(survey.name.eq("A")).addBatch();
-delete.where(survey.name.eq("B")).addBatch();
-assertEquals(2, delete.execute());
-]]></programlisting>
-
-    <para>삽입:</para>
-
-    <programlisting language="java"><![CDATA[
-SQLInsertClause insert = insert(survey);
-insert.set(survey.id, 5).set(survey.name, "5").addBatch();
-insert.set(survey.id, 6).set(survey.name, "6").addBatch();
-assertEquals(2, insert.execute());
-]]></programlisting>
-
-
-  </sect2>
-
-  <sect2>
-
-    <title>빈 클래스 생성</title>
-
-    <para>MetaDataExporter를 이용해서 테이블에 대한 자바빈 DTO 타입을 생성한다.</para>
-
-    <programlisting language="java"><![CDATA[  
-java.sql.Connection conn = ...;
-MetaDataExporter exporter = new MetaDataExporter();
-exporter.setPackageName("com.myproject.mydomain");
-exporter.setTargetFolder(new File("src/main/java"))	;
-exporter.setBeanSerializer(new BeanSerializer());   
-exporter.export(conn.getMetaData());  
-]]></programlisting>
-
-    <para>DMLClause의 populate 메서드의 인자로 빈 타입을 사용할 수 있으며,
-      쿼리에서 빈 타입을 직접 선택할 수 있다. 다음은 JUnit으로 작성한 간단한 예이다.
-    </para>
-
-    <programlisting language="java"><![CDATA[    	
-QEmployee e = new QEmployee("e");
-   
-// Insert
-Employee employee = new Employee();
-employee.setFirstname("John");
-Integer id = insert(e).populate(employee).executeWithKey(e.id);
-employee.setId(id);
-
-// Update
-employee.setLastname("Smith");
-assertEquals(1l, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
-
-// Query
-Employee smith = query().from(e).where(e.lastname.eq("Smith")).uniqueResult(e);
-assertEquals("John", smith.getFirstname());
-
-// Delete 
-assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
-]]></programlisting>
-
-    <para>앞서 예제에서 사용한 팩토리 메서드는 다음과 같다.</para>
-
-    <programlisting language="java"><![CDATA[      	
-protected SQLUpdateClause update(RelationalPath<?> e){
-    return new SQLUpdateClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLInsertClause insert(RelationalPath<?> e){
-    return new SQLInsertClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLDeleteClause delete(RelationalPath<?> e){
-    return new SQLDeleteClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLMergeClause merge(RelationalPath<?> e){
-    return new SQLMergeClause(Connections.getConnection(), templates, e);
-}
-
-protected SQLQuery query() {
-    return new SQLQuery(Connections.getConnection(), templates);  	
-}
-  	
-]]></programlisting>
-
-  </sect2>
-
-<!-- 
-  <sect2>
-
-    <title>Custom syntax expressions</title>
-
-    <para>
-      If you need to specify SQL function calls in Querydsl you can use TemplateExpressions to
-      express them. For general expressions you can use the SimpleTemplate class and for typed 
-      expressions BooleanTemplate, ComparableTemplate, DateTemplate,
-      DateTimeTemplate, EnumTemplate, NumberTemplate, StringTemplate and TimeTemplate.
-    </para>
-
-    <para>Here is an example for SimpleTemplate usage:</para>
-
-    <programlisting language="java"><![CDATA[
-Expression<?> arg1 = ...;
-Expression<?> arg2 = ...;
-Expression<String> expression = SimpleTemplate.create(String.class, "myfunction({0},{1})", arg1, arg2);		
-]]></programlisting>
-
-    <para>And here is an example for a Number typed template expression:</para>
-
-    <programlisting language="java"><![CDATA[
-Expression<?> arg1 = ...;
-Expression<?> arg2 = ...;
-NumberExpression<Integer> expression = NumberTemplate.create(Integer.class, "myfunction({0},{1})", arg1, arg2);		
-]]></programlisting>
-
-  </sect2>
- -->  
-
-  <sect2>
-  
-    <title>SQL 쿼리와 바인딩 추출하기</title>
-    
-    <para>getSQL 메서드를 통해서 SQL 쿼리와 바인딩 값을 구할 수 있다.</para>
-    
-    <programlisting language="java"><![CDATA[
-SQLBindings bindings = query.getSQL(customer.id, customer.firstname, customer.lastname);
-System.out.println(bindings.getSQL()); 
-]]></programlisting>    
-    
-   <para>SQL 문자열에 포함된 모든 리터럴이 필요하다면, setUseLiterals(true)를 이용해서
-    쿼리의 리터럴 직렬화를 활성화하면 된다.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>커스텀 타입</title>
-
-    <para>Querydsl SQL은 ResultSet/Statement에서 커스텀 타입 매핑을 지원한다.
-      com.mysema.query.sql.Configuration 객체를 이용해서 커스텀 카입 매핑을 등록한다.
-      Configuration 객체는 실제 쿼리의 생성자 인자로 제공된다.
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-Configuration configuration = new Configuration(new H2Templates());
-// overrides the mapping for Types.DATE
-configuration.register(new UtilDateType());		
-]]></programlisting>
-
-    <para>특정 테이블 컬럼을 위한 커스텀 타입 매핑 등록</para>
-
-    <programlisting language="java"><![CDATA[    
-Configuration configuration = new Configuration(new H2Templates());
-// declares a maping for the gender column in the person table
-configuration.register("person", "gender",  new EnumByNameType<Gender>(Gender.class));
-]]></programlisting>
-
-    <para>숫자에 대한 커스텀 타입 매핑을 등록하려면 registerNumeric 메서드를 사용한다.
-    </para>
-
-    <programlisting language="java"><![CDATA[    
-configuration.registerNumeric(5,2,Float.class);
-]]></programlisting>
-
-    <para>이는 Float 타입을 NUMERIC(5,2) 타입으로 매핑한다.</para>
-
-  </sect2>
-  
-  <sect2>
-  
-    <title>Query와 Clause 리스닝</title>
-    
-    <para>SQLListener는 쿼리와 DMLClause를 리스닝 할 때 사용되는 리스너 인터페이스이다.
-    Configuration이나 Query, Clause의 addListener 메서드를 통해서 SQLListener 객체를 등록할 수 있다.</para>
-  
-    <para>리스너의 적용 예로는 데이터 동기화, 로깅, 캐싱, 검증이 있다.</para>
-  
-  </sect2>
-
-
-</sect1>    
diff --git a/querydsl-docs/src/main/docbook/ko-KR/legal_notice.xml b/querydsl-docs/src/main/docbook/ko-KR/legal_notice.xml
deleted file mode 100644
index 2fa6055d6f..0000000000
--- a/querydsl-docs/src/main/docbook/ko-KR/legal_notice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<legalnotice id="Legal_Notice">
-    <title>Legal Notice</title>
-    <para>
-        저작권 <trademark class="copyright"/> Mysema Ltd, 2007-2013.
-	    이 저작물은 <ulink url="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</ulink>에 따라
-	    누구나 사용, 편집, 복사, 재배포 가능합니다. 
-    </para>
-</legalnotice>
diff --git a/querydsl-docs/src/main/styles/html/custom.xsl b/querydsl-docs/src/main/styles/html/custom.xsl
index 04f4b43798..ab88ae1f37 100644
--- a/querydsl-docs/src/main/styles/html/custom.xsl
+++ b/querydsl-docs/src/main/styles/html/custom.xsl
@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:xslthl="http://xslthl.sf.net"
-        exclude-result-prefixes="xslthl"
-        version='1.0'>
-        
-  <xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
-  <xsl:import href="&db_xsl_path;/html/highlight.xsl"/>
-
-<!-- Extensions -->
-  <xsl:param name="use.extensions">1</xsl:param>
-  <xsl:param name="tablecolumns.extension">0</xsl:param>
-  <xsl:param name="callout.extensions">1</xsl:param>
-
-<!-- Activate Graphics -->
-  <xsl:param name="admon.graphics" select="1"/>
-  <xsl:param name="admon.graphics.path">images/</xsl:param>
-  <xsl:param name="admon.graphics.extension">.gif</xsl:param>
-  <xsl:param name="callout.graphics" select="1" />
-  <xsl:param name="callout.defaultcolumn">120</xsl:param>
-  <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-  <xsl:param name="callout.graphics.extension">.gif</xsl:param>
-
-  <xsl:param name="table.borders.with.css" select="1"/>
-  <xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
-  <xsl:param name="html.stylesheet.type">text/css</xsl:param>
-  <xsl:param name="generate.toc">book toc,title</xsl:param>
-
-  <xsl:param name="admonition.title.properties">text-align: left</xsl:param>
-
-<!-- Label Chapters and Sections (numbering) -->
-  <xsl:param name="chapter.autolabel" select="1"/>
-  <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.autolabel.max.depth" select="3"/>
-
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-  <xsl:param name="table.footnote.number.format" select="'1'"/>
-
-<!-- Show only Sections up to level 3 in the TOCs -->
-  <xsl:param name="toc.section.depth">3</xsl:param>
-
-<!-- Remove "Chapter" from the Chapter titles... -->
-  <xsl:param name="local.l10n.xml" select="document('')"/>
-  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-    <l:l10n language="en">
-      <l:context name="title-numbered">
-        <l:template name="chapter" text="%n.&#160;%t"/>
-        <l:template name="section" text="%n&#160;%t"/>
-      </l:context>
-    </l:l10n>
-  </l:i18n>
-
-<!-- Use code syntax highlighting -->
-  <xsl:param name="highlight.source" select="1"/>
-
-  <xsl:template match='xslthl:keyword'>
-    <span class="hl-keyword"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:comment'>
-    <span class="hl-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:oneline-comment'>
-    <span class="hl-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:multiline-comment'>
-    <span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:tag'>
-    <span class="hl-tag"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:attribute'>
-    <span class="hl-attribute"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:value'>
-    <span class="hl-value"><xsl:value-of select='.'/></span>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:string'>
-    <span class="hl-string"><xsl:value-of select='.'/></span>
-  </xsl:template>
-  
-  <!--  fixes -->
-
-  <xsl:template match='xslthl:annotation'>
-    <span class="hl-annotation"><xsl:apply-templates/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:number'>
-    <span class="hl-value"><xsl:apply-templates/></span>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:doccomment'>
-    <xsl:apply-templates/>
-  </xsl:template>    
-  
-  
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:xslthl="http://xslthl.sf.net"
+        exclude-result-prefixes="xslthl"
+        version='1.0'>
+        
+  <xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
+  <xsl:import href="&db_xsl_path;/html/highlight.xsl"/>
+
+<!-- Extensions -->
+  <xsl:param name="use.extensions">1</xsl:param>
+  <xsl:param name="tablecolumns.extension">0</xsl:param>
+  <xsl:param name="callout.extensions">1</xsl:param>
+
+<!-- Activate Graphics -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path">images/</xsl:param>
+  <xsl:param name="admon.graphics.extension">.gif</xsl:param>
+  <xsl:param name="callout.graphics" select="1" />
+  <xsl:param name="callout.defaultcolumn">120</xsl:param>
+  <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.gif</xsl:param>
+
+  <xsl:param name="table.borders.with.css" select="1"/>
+  <xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
+  <xsl:param name="html.stylesheet.type">text/css</xsl:param>
+  <xsl:param name="generate.toc">book toc,title</xsl:param>
+
+  <xsl:param name="admonition.title.properties">text-align: left</xsl:param>
+
+<!-- Label Chapters and Sections (numbering) -->
+  <xsl:param name="chapter.autolabel" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.autolabel.max.depth" select="3"/>
+
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="table.footnote.number.format" select="'1'"/>
+
+<!-- Show only Sections up to level 3 in the TOCs -->
+  <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!-- Remove "Chapter" from the Chapter titles... -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n language="en">
+      <l:context name="title-numbered">
+        <l:template name="chapter" text="%n.&#160;%t"/>
+        <l:template name="section" text="%n&#160;%t"/>
+      </l:context>
+    </l:l10n>
+  </l:i18n>
+
+<!-- Use code syntax highlighting -->
+  <xsl:param name="highlight.source" select="1"/>
+
+  <xsl:template match='xslthl:keyword'>
+    <span class="hl-keyword"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:comment'>
+    <span class="hl-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:oneline-comment'>
+    <span class="hl-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:multiline-comment'>
+    <span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:tag'>
+    <span class="hl-tag"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:attribute'>
+    <span class="hl-attribute"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:value'>
+    <span class="hl-value"><xsl:value-of select='.'/></span>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:string'>
+    <span class="hl-string"><xsl:value-of select='.'/></span>
+  </xsl:template>
+  
+  <!--  fixes -->
+
+  <xsl:template match='xslthl:annotation'>
+    <span class="hl-annotation"><xsl:apply-templates/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:number'>
+    <span class="hl-value"><xsl:apply-templates/></span>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:doccomment'>
+    <xsl:apply-templates/>
+  </xsl:template>    
+  
+  
+
+</xsl:stylesheet>
diff --git a/querydsl-docs/src/main/styles/html/titlepage.xsl b/querydsl-docs/src/main/styles/html/titlepage.xsl
index fbc618183b..09539c068c 100644
--- a/querydsl-docs/src/main/styles/html/titlepage.xsl
+++ b/querydsl-docs/src/main/styles/html/titlepage.xsl
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
-  <t:titlepage-content t:side="recto">
-    <productname/>
-    <title/>
-    <subtitle/>
-    <!-- <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <mediaobject/> -->
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-    <hr/>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-</t:templates>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <productname/>
+    <title/>
+    <subtitle/>
+    <!-- <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <mediaobject/> -->
+    <othercredit/>
+    <releaseinfo/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+</t:templates>
diff --git a/querydsl-docs/src/main/styles/html_single/custom.xsl b/querydsl-docs/src/main/styles/html_single/custom.xsl
index 4036b803ba..a9b9c698ae 100644
--- a/querydsl-docs/src/main/styles/html_single/custom.xsl
+++ b/querydsl-docs/src/main/styles/html_single/custom.xsl
@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:xslthl="http://xslthl.sf.net"
-        exclude-result-prefixes="xslthl"
-        version='1.0'>
-        
-  <xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
-  <xsl:import href="&db_xsl_path;/html/highlight.xsl"/>
-
-<!-- Extensions -->
-  <xsl:param name="use.extensions">1</xsl:param>
-  <xsl:param name="tablecolumns.extension">0</xsl:param>
-  <xsl:param name="callout.extensions">1</xsl:param>
-
-<!-- Activate Graphics -->
-  <xsl:param name="admon.graphics" select="1"/>
-  <xsl:param name="admon.graphics.path">images/</xsl:param>
-  <xsl:param name="admon.graphics.extension">.gif</xsl:param>
-  <xsl:param name="callout.graphics" select="1" />
-  <xsl:param name="callout.defaultcolumn">120</xsl:param>
-  <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-  <xsl:param name="callout.graphics.extension">.gif</xsl:param>
-
-  <xsl:param name="table.borders.with.css" select="1"/>
-  <xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
-  <xsl:param name="html.stylesheet.type">text/css</xsl:param>
-  <xsl:param name="generate.toc">book toc,title</xsl:param>
-
-  <xsl:param name="admonition.title.properties">text-align: left</xsl:param>
-
-<!-- Label Chapters and Sections (numbering) -->
-  <xsl:param name="chapter.autolabel" select="1"/>
-  <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.autolabel.max.depth" select="3"/>
-
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-  <xsl:param name="table.footnote.number.format" select="'1'"/>
-
-<!-- Show only Sections up to level 3 in the TOCs -->
-  <xsl:param name="toc.section.depth">3</xsl:param>
-
-<!-- Remove "Chapter" from the Chapter titles... -->
-  <xsl:param name="local.l10n.xml" select="document('')"/>
-  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-    <l:l10n language="en">
-      <l:context name="title-numbered">
-        <l:template name="chapter" text="%n.&#160;%t"/>
-        <l:template name="section" text="%n&#160;%t"/>
-      </l:context>
-    </l:l10n>
-  </l:i18n>
-
-<!-- Use code syntax highlighting -->
-  <xsl:param name="highlight.source" select="1"/>
-
-  <xsl:template match='xslthl:keyword'>
-    <span class="hl-keyword"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:comment'>
-    <span class="hl-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:oneline-comment'>
-    <span class="hl-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:multiline-comment'>
-    <span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:tag'>
-    <span class="hl-tag"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:attribute'>
-    <span class="hl-attribute"><xsl:value-of select='.'/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:value'>
-    <span class="hl-value"><xsl:value-of select='.'/></span>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:string'>
-    <span class="hl-string"><xsl:value-of select='.'/></span>
-  </xsl:template>
-  
-  <!--  fixes -->
-
-  <xsl:template match='xslthl:annotation'>
-    <span class="hl-annotation"><xsl:apply-templates/></span>
-  </xsl:template>
-
-  <xsl:template match='xslthl:number'>
-    <span class="hl-value"><xsl:apply-templates/></span>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:doccomment'>
-    <xsl:apply-templates/>
-  </xsl:template>    
-  
-  
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:xslthl="http://xslthl.sf.net"
+        exclude-result-prefixes="xslthl"
+        version='1.0'>
+        
+  <xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
+  <xsl:import href="&db_xsl_path;/html/highlight.xsl"/>
+
+<!-- Extensions -->
+  <xsl:param name="use.extensions">1</xsl:param>
+  <xsl:param name="tablecolumns.extension">0</xsl:param>
+  <xsl:param name="callout.extensions">1</xsl:param>
+
+<!-- Activate Graphics -->
+  <xsl:param name="admon.graphics" select="1"/>
+  <xsl:param name="admon.graphics.path">images/</xsl:param>
+  <xsl:param name="admon.graphics.extension">.gif</xsl:param>
+  <xsl:param name="callout.graphics" select="1" />
+  <xsl:param name="callout.defaultcolumn">120</xsl:param>
+  <xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.gif</xsl:param>
+
+  <xsl:param name="table.borders.with.css" select="1"/>
+  <xsl:param name="html.stylesheet">css/stylesheet.css</xsl:param>
+  <xsl:param name="html.stylesheet.type">text/css</xsl:param>
+  <xsl:param name="generate.toc">book toc,title</xsl:param>
+
+  <xsl:param name="admonition.title.properties">text-align: left</xsl:param>
+
+<!-- Label Chapters and Sections (numbering) -->
+  <xsl:param name="chapter.autolabel" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.autolabel.max.depth" select="3"/>
+
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="table.footnote.number.format" select="'1'"/>
+
+<!-- Show only Sections up to level 3 in the TOCs -->
+  <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!-- Remove "Chapter" from the Chapter titles... -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n language="en">
+      <l:context name="title-numbered">
+        <l:template name="chapter" text="%n.&#160;%t"/>
+        <l:template name="section" text="%n&#160;%t"/>
+      </l:context>
+    </l:l10n>
+  </l:i18n>
+
+<!-- Use code syntax highlighting -->
+  <xsl:param name="highlight.source" select="1"/>
+
+  <xsl:template match='xslthl:keyword'>
+    <span class="hl-keyword"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:comment'>
+    <span class="hl-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:oneline-comment'>
+    <span class="hl-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:multiline-comment'>
+    <span class="hl-multiline-comment"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:tag'>
+    <span class="hl-tag"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:attribute'>
+    <span class="hl-attribute"><xsl:value-of select='.'/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:value'>
+    <span class="hl-value"><xsl:value-of select='.'/></span>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:string'>
+    <span class="hl-string"><xsl:value-of select='.'/></span>
+  </xsl:template>
+  
+  <!--  fixes -->
+
+  <xsl:template match='xslthl:annotation'>
+    <span class="hl-annotation"><xsl:apply-templates/></span>
+  </xsl:template>
+
+  <xsl:template match='xslthl:number'>
+    <span class="hl-value"><xsl:apply-templates/></span>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:doccomment'>
+    <xsl:apply-templates/>
+  </xsl:template>    
+  
+  
+
+</xsl:stylesheet>
diff --git a/querydsl-docs/src/main/styles/html_single/titlepage.xsl b/querydsl-docs/src/main/styles/html_single/titlepage.xsl
index fbc618183b..09539c068c 100644
--- a/querydsl-docs/src/main/styles/html_single/titlepage.xsl
+++ b/querydsl-docs/src/main/styles/html_single/titlepage.xsl
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
-  <t:titlepage-content t:side="recto">
-    <productname/>
-    <title/>
-    <subtitle/>
-    <!-- <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <mediaobject/> -->
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-    <hr/>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-</t:templates>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <productname/>
+    <title/>
+    <subtitle/>
+    <!-- <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <mediaobject/> -->
+    <othercredit/>
+    <releaseinfo/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+</t:templates>
diff --git a/querydsl-docs/src/main/styles/pdf/custom.xsl b/querydsl-docs/src/main/styles/pdf/custom.xsl
index 27c742853a..120ce5d0c1 100644
--- a/querydsl-docs/src/main/styles/pdf/custom.xsl
+++ b/querydsl-docs/src/main/styles/pdf/custom.xsl
@@ -1,522 +1,528 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        xmlns:fo="http://www.w3.org/1999/XSL/Format"
-        xmlns:xslthl="http://xslthl.sf.net"
-        exclude-result-prefixes="xslthl"
-        version='1.0'>
-        
-  <xsl:import href="&db_xsl_path;/fo/docbook.xsl"/>
-
-  <xsl:import href="&db_xsl_path;/fo/highlight.xsl"/>
-
-<!-- Use nice graphics for admonitions -->
-  <xsl:param name="admon.graphics">'1'</xsl:param>
-  <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param>
-  <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/>
-  <xsl:param name="paper.type" select="'@paper.type@'"/>
-
-  <xsl:param name="page.margin.top" select="'1cm'"/>
-  <xsl:param name="region.before.extent" select="'1cm'"/>
-  <xsl:param name="body.margin.top" select="'1.5cm'"/>
-
-  <xsl:param name="body.margin.bottom" select="'1.5cm'"/>
-  <xsl:param name="region.after.extent" select="'1cm'"/>
-  <xsl:param name="page.margin.bottom" select="'1cm'"/>
-  <xsl:param name="title.margin.left" select="'0cm'"/>
-
-<!--###################################################
-    Header
-  ################################################### -->
-
-<!-- More space in the center header for long text -->
-  <xsl:attribute-set name="header.content.properties">
-    <xsl:attribute name="font-family">
-      <xsl:value-of select="$body.font.family"/>
-    </xsl:attribute>
-    <xsl:attribute name="margin-left">-5em</xsl:attribute>
-    <xsl:attribute name="margin-right">-5em</xsl:attribute>
-  </xsl:attribute-set>
-
-<!--###################################################
-    Table of Contents
-  ################################################### -->
-
-  <xsl:param name="generate.toc">
-    book      toc,title
-  </xsl:param>
-
-<!--###################################################
-    Custom Header
-  ################################################### -->
-
-  <xsl:template name="header.content">
-    <xsl:param name="pageclass" select="''"/>
-    <xsl:param name="sequence" select="''"/>
-    <xsl:param name="position" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-
-    <xsl:variable name="Version">
-      <xsl:choose>
-        <xsl:when test="//productname">
-          <xsl:value-of select="//productname"/><xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>please define productname in your docbook file!</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="$sequence='blank'">
-        <xsl:choose>
-          <xsl:when test="$position='center'">
-            <xsl:value-of select="$Version"/>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <!-- nop -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$pageclass='titlepage'">
-        <!-- nop: other titlepage sequences have no header -->
-      </xsl:when>
-
-      <xsl:when test="$position='center'">
-        <xsl:value-of select="$Version"/>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!--###################################################
-    Custom Footer
-  ################################################### -->
-
-  <xsl:template name="footer.content">
-    <xsl:param name="pageclass" select="''"/>
-    <xsl:param name="sequence" select="''"/>
-    <xsl:param name="position" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-
-    <xsl:variable name="Version">
-      <xsl:choose>
-        <xsl:when test="//releaseinfo">
-          <xsl:value-of select="//releaseinfo"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- nop -->
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="Title">
-      <xsl:value-of select="//title"/>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="$sequence='blank'">
-        <xsl:choose>
-          <xsl:when test="$double.sided != 0 and $position = 'left'">
-            <xsl:value-of select="$Version"/>
-          </xsl:when>
-
-          <xsl:when test="$double.sided = 0 and $position = 'center'">
-            <!-- nop -->
-          </xsl:when>
-
-          <xsl:otherwise>
-            <fo:page-number/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$pageclass='titlepage'">
-        <!-- nop: other titlepage sequences have no footer -->
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided = 0 and $position='right'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
-        <xsl:value-of select="$Version"/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
-        <xsl:value-of select="$Version"/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided = 0 and $position='left'">
-        <xsl:value-of select="$Version"/>
-      </xsl:when>
-
-      <xsl:when test="$position='center'">
-        <xsl:value-of select="$Title"/>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-before='page'/>
-  </xsl:template>
-
-<!--###################################################
-    Extensions
-  ################################################### -->
-
-<!-- These extensions are required for table printing and other stuff -->
-  <xsl:param name="use.extensions">1</xsl:param>
-  <xsl:param name="tablecolumns.extension">0</xsl:param>
-  <xsl:param name="callout.extensions">1</xsl:param>
-  <xsl:param name="fop.extensions">1</xsl:param>
-
-<!--###################################################
-    Paper & Page Size
-  ################################################### -->
-
-<!-- Paper type, no headers on blank pages, no double sided printing -->
-  <xsl:param name="double.sided">0</xsl:param>
-  <xsl:param name="headers.on.blank.pages">0</xsl:param>
-  <xsl:param name="footers.on.blank.pages">0</xsl:param>
-
-<!--###################################################
-    Fonts & Styles
-  ################################################### -->
-
-  <xsl:param name="hyphenate">false</xsl:param>
-
-<!-- Default Font size -->
-  <xsl:param name="body.font.master">11</xsl:param>
-  <xsl:param name="body.font.small">8</xsl:param>
-
-<!-- Line height in body text -->
-  <xsl:param name="line-height">1.4</xsl:param>
-
-<!-- Chapter title size -->
-  <xsl:attribute-set name="chapter.titlepage.recto.style">
-    <xsl:attribute name="text-align">left</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.master * 1.8"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-<!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
-   Let's remove it, so this sucker can use our attribute-set only... -->
-  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-        xsl:use-attribute-sets="chapter.titlepage.recto.style">
-      <xsl:call-template name="component.title">
-      <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
-  <xsl:attribute-set name="section.title.level1.properties">
-    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.master * 1.5"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-  </xsl:attribute-set>
-  <xsl:attribute-set name="section.title.level2.properties">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.master * 1.25"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-  </xsl:attribute-set>
-  <xsl:attribute-set name="section.title.level3.properties">
-    <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.master * 1.0"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-  </xsl:attribute-set>
-
-<!-- Use code syntax highlighting -->
-  <xsl:param name="highlight.source" select="1"/>
-  <xsl:param name="highlight.default.language" select="xml" />
-
-  <xsl:template match='xslthl:keyword'>
-    <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:comment'>
-    <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match='xslthl:oneline-comment'>
-    <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match='xslthl:multiline-comment'>
-    <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match='xslthl:tag'>
-    <fo:inline  color="#3F7F7F"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-
-  <xsl:template match='xslthl:attribute'>
-    <fo:inline color="#7F007F"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-    
-  <xsl:template match='xslthl:value'>
-    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-  
-  <xsl:template match='xslthl:string'>
-    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
-  </xsl:template>
-  
-  <!--  fixes -->
-
-  <xsl:template match='xslthl:annotation'>
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <xsl:template match='xslthl:number'>
-    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
-  </xsl:template>  
-
-<!--###################################################
-    Tables
-  ################################################### -->
-
-  <!-- Some padding inside tables -->
-  <xsl:attribute-set name="table.cell.padding">
-    <xsl:attribute name="padding-left">4pt</xsl:attribute>
-    <xsl:attribute name="padding-right">4pt</xsl:attribute>
-    <xsl:attribute name="padding-top">4pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
-  </xsl:attribute-set>
-
-<!-- Only hairlines as frame and cell borders in tables -->
-  <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
-  <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
-
-<!--###################################################
-    Labels
-  ################################################### -->
-
-<!-- Label Chapters and Sections (numbering) -->
-  <xsl:param name="chapter.autolabel" select="1"/>
-  <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.autolabel.max.depth" select="1"/>
-
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-  <xsl:param name="table.footnote.number.format" select="'1'"/>
-
-<!--###################################################
-    Programlistings
-  ################################################### -->
-
-<!-- Verbatim text formatting (programlistings) -->
-  <xsl:attribute-set name="monospace.verbatim.properties">
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.small * 1.0"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-
-    <xsl:attribute name="border-color">#444444</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.1pt</xsl:attribute>
-    <xsl:attribute name="padding-top">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
-    <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
-    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Shade (background) programlistings -->
-  <xsl:param name="shade.verbatim">1</xsl:param>
-  <xsl:attribute-set name="shade.verbatim.style">
-    <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-  </xsl:attribute-set>
-
-  <xsl:attribute-set name="example.properties">
-    <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
-    <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-  </xsl:attribute-set>
-
-<!--###################################################
-    Title information for Figures, Examples etc.
-  ################################################### -->
-
-  <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
-    <xsl:attribute name="font-weight">normal</xsl:attribute>
-    <xsl:attribute name="font-style">italic</xsl:attribute>
-    <xsl:attribute name="font-size">
-      <xsl:value-of select="$body.font.master"/>
-      <xsl:text>pt</xsl:text>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
-  </xsl:attribute-set>
-
-<!--###################################################
-    Callouts
-  ################################################### -->
-
-<!-- don't use images for callouts -->
-  <xsl:param name="callout.graphics">0</xsl:param>
-  <xsl:param name="callout.unicode">1</xsl:param>
-
-<!-- Place callout marks at this column in annotated areas -->
-  <xsl:param name="callout.defaultcolumn">90</xsl:param>
-
-<!--###################################################
-    Misc
-  ################################################### -->
-
-<!-- Placement of titles -->
-  <xsl:param name="formal.title.placement">
-    figure after
-    example after
-    equation before
-    table before
-    procedure before
-  </xsl:param>
-
-<!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
-  <xsl:param name="variablelist.as.blocks">1</xsl:param>
-
-  <xsl:param name="body.start.indent">0pt</xsl:param>
-
-<!-- Show only Sections up to level 3 in the TOCs -->
-  <xsl:param name="toc.section.depth">3</xsl:param>
-
-<!-- Remove "Chapter" from the Chapter titles... -->
-  <xsl:param name="local.l10n.xml" select="document('')"/>
-  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-    <l:l10n language="en">
-      <l:context name="title-numbered">
-        <l:template name="chapter" text="%n.&#160;%t"/>
-        <l:template name="section" text="%n&#160;%t"/>
-      </l:context>
-      <l:context name="title">
-        <l:template name="example" text="Example&#160;%n&#160;%t"/>
-      </l:context>
-    </l:l10n>
-  </l:i18n>
-
-<!--###################################################
-    colored and hyphenated links 
-  ################################################### --> 
-
-  <xsl:template match="ulink">
-    <fo:basic-link external-destination="{@url}"
-        xsl:use-attribute-sets="xref.properties"
-        text-decoration="underline"
-        color="blue">
-      <xsl:choose>
-        <xsl:when test="count(child::node())=0">
-          <xsl:value-of select="@url"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:basic-link>
-  </xsl:template>
-
-  <xsl:template match="link">
-    <fo:basic-link internal-destination="{@linkend}"
-        xsl:use-attribute-sets="xref.properties"
-        text-decoration="underline"
-        color="blue">
-      <xsl:choose>
-        <xsl:when test="count(child::node())=0">
-          <xsl:value-of select="@linkend"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:basic-link>
-  </xsl:template>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "http://docbook.sourceforge.net/release/xsl/current">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        xmlns:xslthl="http://xslthl.sf.net"
+        exclude-result-prefixes="xslthl"
+        version='1.0'>
+        
+  <xsl:import href="&db_xsl_path;/fo/docbook.xsl"/>
+
+  <xsl:import href="&db_xsl_path;/fo/highlight.xsl"/>
+
+<!-- Use nice graphics for admonitions -->
+  <xsl:param name="admon.graphics">'1'</xsl:param>
+  <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param>
+  <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/>
+  <xsl:param name="paper.type" select="'@paper.type@'"/>
+
+  <xsl:param name="page.margin.top" select="'1cm'"/>
+  <xsl:param name="region.before.extent" select="'1cm'"/>
+  <xsl:param name="body.margin.top" select="'1.5cm'"/>
+
+  <xsl:param name="body.margin.bottom" select="'1.5cm'"/>
+  <xsl:param name="region.after.extent" select="'1cm'"/>
+  <xsl:param name="page.margin.bottom" select="'1cm'"/>
+  <xsl:param name="title.margin.left" select="'0cm'"/>
+
+<!--###################################################
+    Header
+  ################################################### -->
+
+<!-- More space in the center header for long text -->
+  <xsl:attribute-set name="header.content.properties">
+    <xsl:attribute name="font-family">
+      <xsl:value-of select="$body.font.family"/>
+    </xsl:attribute>
+    <xsl:attribute name="margin-left">-5em</xsl:attribute>
+    <xsl:attribute name="margin-right">-5em</xsl:attribute>
+  </xsl:attribute-set>
+
+<!--###################################################
+    Table of Contents
+  ################################################### -->
+
+  <xsl:param name="generate.toc">
+    book      toc,title
+  </xsl:param>
+
+<!--###################################################
+    Custom Header
+  ################################################### -->
+
+  <xsl:template name="header.content">
+    <xsl:param name="pageclass" select="''"/>
+    <xsl:param name="sequence" select="''"/>
+    <xsl:param name="position" select="''"/>
+    <xsl:param name="gentext-key" select="''"/>
+
+    <xsl:variable name="Version">
+      <xsl:choose>
+        <xsl:when test="//productname">
+          <xsl:value-of select="//productname"/><xsl:text> </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>please define productname in your docbook file!</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$sequence='blank'">
+        <xsl:choose>
+          <xsl:when test="$position='center'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:otherwise>
+            <!-- nop -->
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+
+      <xsl:when test="$pageclass='titlepage'">
+        <!-- nop: other titlepage sequences have no header -->
+      </xsl:when>
+
+      <xsl:when test="$position='center'">
+        <xsl:value-of select="$Version"/>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <!-- nop -->
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+<!--###################################################
+    Custom Footer
+  ################################################### -->
+
+  <xsl:template name="footer.content">
+    <xsl:param name="pageclass" select="''"/>
+    <xsl:param name="sequence" select="''"/>
+    <xsl:param name="position" select="''"/>
+    <xsl:param name="gentext-key" select="''"/>
+
+    <xsl:variable name="Version">
+      <xsl:choose>
+        <xsl:when test="//releaseinfo">
+          <xsl:value-of select="//releaseinfo"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- nop -->
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="Title">
+      <xsl:value-of select="//title"/>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$sequence='blank'">
+        <xsl:choose>
+          <xsl:when test="$double.sided != 0 and $position = 'left'">
+            <xsl:value-of select="$Version"/>
+          </xsl:when>
+
+          <xsl:when test="$double.sided = 0 and $position = 'center'">
+            <!-- nop -->
+          </xsl:when>
+
+          <xsl:otherwise>
+            <fo:page-number/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+
+      <xsl:when test="$pageclass='titlepage'">
+        <!-- nop: other titlepage sequences have no footer -->
+      </xsl:when>
+
+      <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+        <fo:page-number/>
+      </xsl:when>
+
+      <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+        <fo:page-number/>
+      </xsl:when>
+
+      <xsl:when test="$double.sided = 0 and $position='right'">
+        <fo:page-number/>
+      </xsl:when>
+
+      <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
+        <xsl:value-of select="$Version"/>
+      </xsl:when>
+
+      <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
+        <xsl:value-of select="$Version"/>
+      </xsl:when>
+
+      <xsl:when test="$double.sided = 0 and $position='left'">
+        <xsl:value-of select="$Version"/>
+      </xsl:when>
+
+      <xsl:when test="$position='center'">
+        <xsl:value-of select="$Title"/>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <!-- nop -->
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="processing-instruction('hard-pagebreak')">
+    <fo:block break-before='page'/>
+  </xsl:template>
+
+<!--###################################################
+    Extensions
+  ################################################### -->
+
+<!-- These extensions are required for table printing and other stuff -->
+  <xsl:param name="use.extensions">1</xsl:param>
+  <xsl:param name="tablecolumns.extension">0</xsl:param>
+  <xsl:param name="callout.extensions">1</xsl:param>
+  <xsl:param name="fop.extensions">1</xsl:param>
+
+<!--###################################################
+    Paper & Page Size
+  ################################################### -->
+
+<!-- Paper type, no headers on blank pages, no double sided printing -->
+  <xsl:param name="double.sided">0</xsl:param>
+  <xsl:param name="headers.on.blank.pages">0</xsl:param>
+  <xsl:param name="footers.on.blank.pages">0</xsl:param>
+
+<!--###################################################
+    Fonts & Styles
+  ################################################### -->
+
+  <xsl:param name="hyphenate">false</xsl:param>
+
+<!-- Default Font size -->
+  <xsl:param name="body.font.master">11</xsl:param>
+  <xsl:param name="body.font.small">8</xsl:param>
+
+<!-- Line height in body text -->
+  <xsl:param name="line-height">1.4</xsl:param>
+
+<!-- Chapter title size -->
+  <xsl:attribute-set name="chapter.titlepage.recto.style">
+    <xsl:attribute name="text-align">left</xsl:attribute>
+    <xsl:attribute name="font-weight">bold</xsl:attribute>
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.master * 1.8"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+  </xsl:attribute-set>
+
+<!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
+   Let's remove it, so this sucker can use our attribute-set only... -->
+  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+    <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        xsl:use-attribute-sets="chapter.titlepage.recto.style">
+      <xsl:call-template name="component.title">
+      <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
+      </xsl:call-template>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Start each chapter on a new page -->
+  <xsl:attribute-set name="chapter.title.properties">
+    <xsl:attribute name="break-before">page</xsl:attribute>
+  </xsl:attribute-set>
+
+<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+  <xsl:attribute-set name="section.title.level1.properties">
+    <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.master * 1.5"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="section.title.level2.properties">
+    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.master * 1.25"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+  </xsl:attribute-set>
+  <xsl:attribute-set name="section.title.level3.properties">
+    <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.master * 1.0"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+  </xsl:attribute-set>
+
+<!-- Use code syntax highlighting -->
+  <xsl:param name="highlight.source" select="1"/>
+  <xsl:param name="highlight.default.language" select="xml" />
+
+  <xsl:template match='xslthl:keyword'>
+    <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:comment'>
+    <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+
+  <xsl:template match='xslthl:oneline-comment'>
+    <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+
+  <xsl:template match='xslthl:multiline-comment'>
+    <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+
+  <xsl:template match='xslthl:tag'>
+    <fo:inline  color="#3F7F7F"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+
+  <xsl:template match='xslthl:attribute'>
+    <fo:inline color="#7F007F"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+    
+  <xsl:template match='xslthl:value'>
+    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+  
+  <xsl:template match='xslthl:string'>
+    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
+  </xsl:template>
+  
+  <!--  fixes -->
+
+  <xsl:template match='xslthl:annotation'>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match='xslthl:number'>
+    <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline>
+  </xsl:template>  
+
+<!--###################################################
+    Tables
+  ################################################### -->
+
+  <!-- Some padding inside tables -->
+  <xsl:attribute-set name="table.cell.padding">
+    <xsl:attribute name="padding-left">4pt</xsl:attribute>
+    <xsl:attribute name="padding-right">4pt</xsl:attribute>
+    <xsl:attribute name="padding-top">4pt</xsl:attribute>
+    <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+  </xsl:attribute-set>
+
+<!-- Only hairlines as frame and cell borders in tables -->
+  <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+  <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+<!--###################################################
+    Labels
+  ################################################### -->
+
+<!-- Label Chapters and Sections (numbering) -->
+  <xsl:param name="chapter.autolabel" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.autolabel.max.depth" select="1"/>
+
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="table.footnote.number.format" select="'1'"/>
+
+<!--###################################################
+    Programlistings
+  ################################################### -->
+
+<!-- Verbatim text formatting (programlistings) -->
+  <xsl:attribute-set name="monospace.verbatim.properties">
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.small * 1.0"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="verbatim.properties">
+    <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+
+    <xsl:attribute name="border-color">#444444</xsl:attribute>
+    <xsl:attribute name="border-style">solid</xsl:attribute>
+    <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+    <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+    <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+    <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+    <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+    <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+    <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+    <xsl:attribute name="keep-together.within-page">always</xsl:attribute>
+  </xsl:attribute-set>
+
+    <!-- Shade (background) programlistings -->
+  <xsl:param name="shade.verbatim">1</xsl:param>
+  <xsl:attribute-set name="shade.verbatim.style">
+    <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="list.block.spacing">
+    <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="example.properties">
+    <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
+    <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+  </xsl:attribute-set>
+
+<!--###################################################
+    Title information for Figures, Examples etc.
+  ################################################### -->
+
+  <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+    <xsl:attribute name="font-weight">normal</xsl:attribute>
+    <xsl:attribute name="font-style">italic</xsl:attribute>
+    <xsl:attribute name="font-size">
+      <xsl:value-of select="$body.font.master"/>
+      <xsl:text>pt</xsl:text>
+    </xsl:attribute>
+    <xsl:attribute name="hyphenate">false</xsl:attribute>
+    <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+    <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+  </xsl:attribute-set>
+
+<!--###################################################
+    Callouts
+  ################################################### -->
+
+<!-- don't use images for callouts -->
+  <xsl:param name="callout.graphics">0</xsl:param>
+  <xsl:param name="callout.unicode">1</xsl:param>
+
+<!-- Place callout marks at this column in annotated areas -->
+  <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+    Misc
+  ################################################### -->
+
+<!-- Placement of titles -->
+  <xsl:param name="formal.title.placement">
+    figure after
+    example after
+    equation before
+    table before
+    procedure before
+  </xsl:param>
+
+<!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
+  <xsl:param name="variablelist.as.blocks">1</xsl:param>
+
+  <xsl:param name="body.start.indent">0pt</xsl:param>
+
+<!-- Show only Sections up to level 3 in the TOCs -->
+  <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!-- Remove "Chapter" from the Chapter titles... -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n language="en">
+      <l:context name="title-numbered">
+        <l:template name="chapter" text="%n.&#160;%t"/>
+        <l:template name="section" text="%n&#160;%t"/>
+      </l:context>
+      <l:context name="title">
+        <l:template name="example" text="Example&#160;%n&#160;%t"/>
+      </l:context>
+    </l:l10n>
+  </l:i18n>
+
+<!--###################################################
+    colored and hyphenated links 
+  ################################################### --> 
+
+  <xsl:template match="ulink">
+    <fo:basic-link external-destination="{@url}"
+        xsl:use-attribute-sets="xref.properties"
+        text-decoration="underline"
+        color="blue">
+      <xsl:choose>
+        <xsl:when test="count(child::node())=0">
+          <xsl:value-of select="@url"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </fo:basic-link>
+  </xsl:template>
+
+  <xsl:template match="link">
+    <fo:basic-link internal-destination="{@linkend}"
+        xsl:use-attribute-sets="xref.properties"
+        text-decoration="underline"
+        color="blue">
+      <xsl:choose>
+        <xsl:when test="count(child::node())=0">
+          <xsl:value-of select="@linkend"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </fo:basic-link>
+  </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/querydsl-docs/src/main/styles/pdf/titlepage.xsl b/querydsl-docs/src/main/styles/pdf/titlepage.xsl
index e2825243de..dc18e1e0de 100644
--- a/querydsl-docs/src/main/styles/pdf/titlepage.xsl
+++ b/querydsl-docs/src/main/styles/pdf/titlepage.xsl
@@ -1,101 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <t:titlepage t:element="book" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-             t:named-template="division.title"
-             param:node="ancestor-or-self::book[1]"
-             text-align="center"
-             font-size="&hsize5;"
-             space-before="&hsize5space;"
-             font-weight="bold"
-             font-family="{$title.fontset}"/>
-      <subtitle
-                text-align="center"
-                font-size="&hsize4;"
-                space-before="&hsize4space;"
-                font-family="{$title.fontset}"/>
-
-      <!-- <corpauthor space-before="0.5em"
-                  font-size="&hsize2;"/>
-      <authorgroup space-before="0.5em"
-                   font-size="&hsize2;"/>
-      <author space-before="0.5em"
-              font-size="&hsize2;"/> -->
-
-    <mediaobject space-before="2em" space-after="2em"/>   
-    <releaseinfo space-before="5em" font-size="&hsize2;"/>
-    <copyright space-before="1.5em"
-              font-weight="normal"
-              font-size="8"/>
-    <legalnotice space-before="5em"
-              font-weight="normal"
-              font-style="italic"
-              font-size="8"/>
-    <othercredit space-before="2em"
-              font-weight="normal"
-              font-size="8"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-              text-align="start"
-              margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-</t:templates>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!DOCTYPE t:templates [
+<!ENTITY hsize0 "10pt">
+<!ENTITY hsize1 "12pt">
+<!ENTITY hsize2 "14.4pt">
+<!ENTITY hsize3 "17.28pt">
+<!ENTITY hsize4 "20.736pt">
+<!ENTITY hsize5 "24.8832pt">
+<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
+<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
+<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
+<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
+<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
+<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
+]>
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:fo="http://www.w3.org/1999/XSL/Format"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <t:titlepage t:element="book" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
+      <title
+             t:named-template="division.title"
+             param:node="ancestor-or-self::book[1]"
+             text-align="center"
+             font-size="&hsize5;"
+             space-before="&hsize5space;"
+             font-weight="bold"
+             font-family="{$title.fontset}"/>
+      <subtitle
+                text-align="center"
+                font-size="&hsize4;"
+                space-before="&hsize4space;"
+                font-family="{$title.fontset}"/>
+
+      <!-- <corpauthor space-before="0.5em"
+                  font-size="&hsize2;"/>
+      <authorgroup space-before="0.5em"
+                   font-size="&hsize2;"/>
+      <author space-before="0.5em"
+              font-size="&hsize2;"/> -->
+
+    <mediaobject space-before="2em" space-after="2em"/>   
+    <releaseinfo space-before="5em" font-size="&hsize2;"/>
+    <copyright space-before="1.5em"
+              font-weight="normal"
+              font-size="8"/>
+    <legalnotice space-before="5em"
+              font-weight="normal"
+              font-style="italic"
+              font-size="8"/>
+    <othercredit space-before="2em"
+              font-weight="normal"
+              font-size="8"/>
+    <pubdate space-before="0.5em"/>
+    <revision space-before="0.5em"/>
+    <revhistory space-before="0.5em"/>
+    <abstract space-before="0.5em"
+              text-align="start"
+              margin-left="0.5in"
+              margin-right="0.5in"
+              font-family="{$body.fontset}"/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+</t:templates>
diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml
new file mode 100644
index 0000000000..7178148d0e
--- /dev/null
+++ b/querydsl-examples/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-examples</artifactId>
+  <name>Querydsl - Examples</name>
+  <url>${project.homepage}</url>
+  <packaging>pom</packaging>
+
+  <properties>
+    <checkstyle.skip>true</checkstyle.skip>
+    <enforcer.skip>true</enforcer.skip>
+  </properties>
+
+  <modules>
+    <module>querydsl-example-sql-spring</module>
+    <module>querydsl-example-sql-guice</module>
+    <module>querydsl-example-jpa-guice</module>
+    <module>querydsl-example-kotlin-jpa</module>
+    <module>querydsl-example-kotlin-mongodb</module>
+    <module>querydsl-example-kotlin-codegen</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.10</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4.1</version>
+        <executions>
+          <execution>
+            <id>enforce-banned-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies/>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.semver</groupId>
+            <artifactId>enforcer-rule</artifactId>
+            <version>0.9.33</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/querydsl-examples/querydsl-example-jpa-guice/README.md b/querydsl-examples/querydsl-example-jpa-guice/README.md
new file mode 100644
index 0000000000..56a7fe41e6
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/README.md
@@ -0,0 +1,8 @@
+## Querydsl JPA Example
+
+Querydsl JPA Example is an example project that demonstrates some best practices on how to use Querydsl JPA in repositories.
+
+Querydsl combines the typesafety of a Criteria API with the syntax of JPQL into an attractive alternative.
+
+Guice is used as the DI layer to complement the already available Spring + Querydsl tutorials and examples.
+
diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
new file mode 100644
index 0000000000..acc4b9d152
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-examples</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-example-jpa-guice</artifactId>
+  <packaging>jar</packaging>
+  <name>Querydsl example - JPA Guice</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <failIfNoTests>false</failIfNoTests>
+
+    <guice.version>5.1.0</guice.version>
+    <h2.version>1.3.170</h2.version>
+  </properties>
+
+  <dependencies>
+
+    <!-- guice -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-persist</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>javax.el-api</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <!-- persistence -->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <version>${hibernate.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-ehcache</artifactId>
+      <version>${hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>${hibernate.validator.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</artifactId>
+      <version>${hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-jpa</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-core</artifactId>
+      <version>2.6.11</version>
+    </dependency>
+
+    <!-- TEST dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>querydsl-example-jpa-guice</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.0.9</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype-oss-public</id>
+      <url>https://oss.sonatype.org/content/groups/public</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>11</source>
+              <target>11</target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/JpaInitializer.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/JpaInitializer.java
new file mode 100644
index 0000000000..eb3faca09c
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/JpaInitializer.java
@@ -0,0 +1,11 @@
+package com.querydsl.example.jpa.guice;
+
+import com.google.inject.Inject;
+import com.google.inject.persist.PersistService;
+
+public class JpaInitializer {
+    @Inject
+    public JpaInitializer(PersistService service) {
+        service.start();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/ServiceModule.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/ServiceModule.java
new file mode 100644
index 0000000000..988ab87bd1
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/guice/ServiceModule.java
@@ -0,0 +1,17 @@
+package com.querydsl.example.jpa.guice;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+import com.google.inject.persist.jpa.JpaPersistModule;
+import com.querydsl.example.jpa.repository.TweetRepository;
+import com.querydsl.example.jpa.repository.UserRepository;
+
+public class ServiceModule extends AbstractModule {
+    @Override
+    protected void configure() {
+        install(new JpaPersistModule("h2").properties(System.getProperties()));
+        bind(JpaInitializer.class).asEagerSingleton();
+        bind(TweetRepository.class).in(Scopes.SINGLETON);
+        bind(UserRepository.class).in(Scopes.SINGLETON);
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/BaseEntity.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/BaseEntity.java
new file mode 100644
index 0000000000..93696145b4
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/BaseEntity.java
@@ -0,0 +1,25 @@
+package com.querydsl.example.jpa.model;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+
+@MappedSuperclass
+public abstract class BaseEntity implements Identifiable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Identifiable.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Identifiable.java
new file mode 100644
index 0000000000..09ac2666cb
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Identifiable.java
@@ -0,0 +1,5 @@
+package com.querydsl.example.jpa.model;
+
+public interface Identifiable {
+    Long getId();
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Location.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Location.java
new file mode 100644
index 0000000000..61b28b58e2
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Location.java
@@ -0,0 +1,44 @@
+package com.querydsl.example.jpa.model;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+@Entity
+@Table(name = "location",
+       uniqueConstraints = @UniqueConstraint(columnNames = { "longitude", "latitude"}))
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+public class Location extends BaseEntity {
+
+    private Double longitude;
+
+    private Double latitude;
+
+    public Location() {
+    }
+
+    public Location(Double longitude, Double latitude) {
+        this.longitude = longitude;
+        this.latitude = latitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Tweet.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Tweet.java
new file mode 100644
index 0000000000..ad2dd88a29
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Tweet.java
@@ -0,0 +1,63 @@
+package com.querydsl.example.jpa.model;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "tweet")
+public class Tweet extends BaseEntity {
+    private String content;
+
+    @ManyToOne(optional = false)
+    private User poster;
+
+    @ManyToMany(fetch = FetchType.EAGER)
+    private List<User> mentions = new ArrayList<User>();
+
+    @ManyToOne
+    private Location location;
+
+    public Tweet() {
+    }
+
+    public Tweet(User poster, String content, List<User> mentions,
+            Location location) {
+        this.poster = poster;
+        this.content = content;
+        this.mentions = mentions;
+        this.location = location;
+    }
+
+    public void setPoster(User poster) {
+        this.poster = poster;
+    }
+
+    public void setMentions(List<User> mentions) {
+        this.mentions = mentions;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public User getPoster() {
+        return poster;
+    }
+
+    public List<User> getMentions() {
+        return mentions;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/User.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/User.java
new file mode 100644
index 0000000000..679ff2b39c
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/User.java
@@ -0,0 +1,43 @@
+package com.querydsl.example.jpa.model;
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "user")
+public class User extends BaseEntity {
+    @Column(unique = true)
+    private String username;
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "poster")
+    private Set<Tweet> tweets = new HashSet<Tweet>();
+
+    public User() {
+    }
+
+    public User(Long id, String username) {
+        setId(id);
+        this.username = username;
+    }
+
+    public User(String username) {
+        this.username = username;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setTweets(Set<Tweet> tweets) {
+        this.tweets = tweets;
+    }
+
+    public Set<Tweet> getTweets() {
+        return tweets;
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/AbstractRepository.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/AbstractRepository.java
new file mode 100644
index 0000000000..b96ecffff7
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/AbstractRepository.java
@@ -0,0 +1,71 @@
+package com.querydsl.example.jpa.repository;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.example.jpa.model.Identifiable;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.impl.JPADeleteClause;
+import com.querydsl.jpa.impl.JPAQuery;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.persistence.EntityManager;
+
+import org.hibernate.Session;
+
+public abstract class AbstractRepository<T extends Identifiable> implements Repository<T, Long> {
+
+    @Inject
+    private Provider<EntityManager> em;
+
+    protected <T> JPAQuery<T> selectFrom(EntityPath<T> entity) {
+        return select(entity).from(entity);
+    }
+
+    protected <T> JPAQuery<T> select(Expression<T> select) {
+        return new JPAQuery<>(em.get(), HQLTemplates.DEFAULT).select(select);
+    }
+
+    protected JPADeleteClause delete(EntityPath<?> entity) {
+        return new JPADeleteClause(em.get(), entity, HQLTemplates.DEFAULT);
+    }
+
+    protected void detach(Object entity) {
+        em.get().detach(entity);
+    }
+
+    protected <E> E find(Class<E> type, Long id) {
+        return em.get().find(type, id);
+    }
+
+    protected void persist(Object entity) {
+        em.get().persist(entity);
+    }
+
+    protected <E> E merge(E entity) {
+        return em.get().merge(entity);
+    }
+
+    protected <E extends Identifiable> E persistOrMerge(E entity) {
+        if (entity.getId() != null) {
+            return merge(entity);
+        }
+        persist(entity);
+        return entity;
+    }
+
+    protected void remove(Object entity) {
+        em.get().remove(entity);
+    }
+
+    protected <T> HibernateQuery<T> selectFromHibernateQuery(EntityPath<T> entity) {
+        return selectHibernateQuery(entity).from(entity);
+    }
+
+    protected <T> HibernateQuery<T> selectHibernateQuery(Expression<T> select) {
+        return new HibernateQuery<>(em.get().unwrap(Session.class)).select(select);
+    }
+
+
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/Repository.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/Repository.java
new file mode 100644
index 0000000000..632748b6dd
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/Repository.java
@@ -0,0 +1,14 @@
+package com.querydsl.example.jpa.repository;
+
+import java.io.Serializable;
+
+public interface Repository<Entity, Id extends Serializable> {
+    /**
+     * Get the persisted instance with the given id
+     *
+     * @param id
+     * @return
+     */
+    Entity findById(Id id);
+
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/TweetRepository.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/TweetRepository.java
new file mode 100644
index 0000000000..f2455bcebc
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/TweetRepository.java
@@ -0,0 +1,30 @@
+package com.querydsl.example.jpa.repository;
+
+import com.google.inject.persist.Transactional;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.jpa.model.Tweet;
+
+import java.util.List;
+
+import static com.querydsl.example.jpa.model.QTweet.tweet;
+
+@Transactional
+public class TweetRepository extends AbstractRepository<Tweet> {
+
+    public Tweet save(Tweet tweet) {
+        return persistOrMerge(tweet);
+    }
+
+    @Override
+    public Tweet findById(Long id) {
+        return find(Tweet.class, id);
+    }
+
+    public List<Tweet> findAll(Predicate expr) {
+        return selectFrom(tweet).where(expr).fetch();
+    }
+
+    public List<Tweet> findAllWithHibernateQuery(Predicate expr) {
+        return selectFromHibernateQuery(tweet).where(expr).fetch();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/UserRepository.java b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/UserRepository.java
new file mode 100644
index 0000000000..9ceda21436
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/repository/UserRepository.java
@@ -0,0 +1,30 @@
+package com.querydsl.example.jpa.repository;
+
+import com.google.inject.persist.Transactional;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.jpa.model.User;
+
+import java.util.List;
+
+import static com.querydsl.example.jpa.model.QUser.user;
+
+@Transactional
+public class UserRepository extends AbstractRepository<User> {
+
+    @Override
+    public User findById(Long id) {
+        return find(User.class, id);
+    }
+
+    public User save(User user) {
+        return persistOrMerge(user);
+    }
+
+    public List<User> findAll(Predicate expr) {
+        return selectFrom(user).where(expr).fetch();
+    }
+
+    public List<User> all() {
+        return selectFrom(user).fetch();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml b/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..457ed1e7cb
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+  version="1.0">
+  <persistence-unit name="h2" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    <properties>
+      <property name="hibernate.archive.autodetection" value="class" />
+      <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+      <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
+      <property name="hibernate.connection.url" value="jdbc:h2:./target/h2-hibernate" />
+      <property name="hibernate.connection.user" value="sa" />
+      <property name="hibernate.show_sql" value="false" />
+      <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+      <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+      <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.ehcache.EhCacheRegionFactory" />
+    </properties>
+  </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java
new file mode 100644
index 0000000000..ca1c152891
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java
@@ -0,0 +1,22 @@
+package com.querydsl.example.jpa.guice;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.querydsl.example.jpa.guice.ServiceModule;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+
+public class GuiceTestRunner extends BlockJUnit4ClassRunner {
+
+    private static final Injector injector = Guice
+            .createInjector(new ServiceModule());
+
+    public GuiceTestRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    @Override
+    protected Object createTest() throws Exception {
+        return injector.getInstance(getTestClass().getJavaClass());
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java
new file mode 100644
index 0000000000..2125f7e060
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java
@@ -0,0 +1,57 @@
+package com.querydsl.example.jpa.repository;
+
+import com.google.inject.persist.Transactional;
+import com.querydsl.example.jpa.guice.GuiceTestRunner;
+import org.hibernate.Session;
+import org.hibernate.jdbc.Work;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.persistence.EntityManager;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(GuiceTestRunner.class)
+public abstract class AbstractPersistenceTest {
+    @Inject
+    private Provider<EntityManager> em;
+
+    @Before
+    @Transactional
+    public void before() {
+        EntityManager entityManager = em.get();
+        entityManager.getEntityManagerFactory().getCache().evictAll();
+        Session session = entityManager.unwrap(Session.class);
+        session.doWork(new Work() {
+            @Override
+            public void execute(Connection connection)
+                    throws SQLException {
+                List<String> tables = new ArrayList<String>();
+                DatabaseMetaData md = connection.getMetaData();
+                ResultSet rs = md.getTables(null, null, null, new String[] {"TABLE"});
+                try {
+                    while (rs.next()) {
+                        tables.add(rs.getString("TABLE_NAME"));
+                    }
+                } finally {
+                    rs.close();
+                }
+
+                try (java.sql.Statement stmt = connection.createStatement()) {
+                    stmt.execute("SET REFERENTIAL_INTEGRITY FALSE");
+                    for (String table : tables) {
+                        stmt.execute("TRUNCATE TABLE " + table);
+                    }
+                    stmt.execute("SET REFERENTIAL_INTEGRITY TRUE");
+                }
+
+            }
+        });
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java
new file mode 100644
index 0000000000..18ed700fc3
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java
@@ -0,0 +1,100 @@
+package com.querydsl.example.jpa.repository;
+
+import com.querydsl.example.jpa.model.Tweet;
+import com.querydsl.example.jpa.model.User;
+import org.junit.Test;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static com.querydsl.example.jpa.model.QTweet.tweet;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TweetRepositoryTest extends AbstractPersistenceTest {
+    @Inject
+    private TweetRepository repository;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @Test
+    public void save_and_find_by_id() {
+        User poster = new User("dr_frank");
+        userRepository.save(poster);
+
+        String content = "I am alive! #YOLO";
+        Tweet tweet = new Tweet(poster, content,
+                Collections.<User>emptyList(), null);
+        repository.save(tweet);
+        assertEquals(content, repository.findById(tweet.getId()).getContent());
+    }
+
+    @Test
+    public void find_list_by_predicate() {
+        User poster = new User("dr_frank");
+        userRepository.save(poster);
+
+        repository.save(new Tweet(poster, "It is a alive! #YOLO", Collections.<User>emptyList(), null));
+        repository.save(new Tweet(poster, "Oh the humanity!", Collections.<User>emptyList(), null));
+        repository.save(new Tweet(poster, "#EpicFail", Collections.<User>emptyList(), null));
+        assertEquals(1, repository.findAll(tweet.content.contains("#YOLO")).size());
+    }
+
+    @Test
+    public void find_list_by_predicate_with_hibernate() {
+        User poster = new User("dr_frank");
+        userRepository.save(poster);
+
+        repository.save(new Tweet(poster, "It is a alive! #YOLO", Collections.<User>emptyList(), null));
+        repository.save(new Tweet(poster, "Oh the humanity!", Collections.<User>emptyList(), null));
+        repository.save(new Tweet(poster, "#EpicFail", Collections.<User>emptyList(), null));
+        assertEquals(1, repository.findAllWithHibernateQuery(tweet.content.contains("#YOLO")).size());
+    }
+
+
+    @Test
+    public void find_list_by_complex_predicate() {
+        List<String> usernames = Arrays.asList("dr_frank", "mike", "maggie", "liza");
+        List<User> users = new ArrayList<>();
+        for (String username : usernames) {
+            users.add(userRepository.save(new User(username)));
+        }
+        User poster = new User("duplo");
+        userRepository.save(poster);
+        for (int i = 0; i < 100; i++) {
+            repository.save(new Tweet(poster, "spamming @dr_frank " + i, users.subList(0, 1), null));
+        }
+        assertTrue(repository.findAll(tweet.mentions.contains(users.get(1))).isEmpty());
+
+        assertEquals(100, repository.findAll(tweet.mentions.contains(users.get(0))).size());
+
+        assertTrue(repository.findAll(tweet.mentions.any().username.eq("duplo")).isEmpty());
+
+        assertEquals(100, repository.findAll(tweet.mentions.any().username.eq("dr_frank")).size());
+    }
+
+    @Test
+    public void find_list_by_complex_predicate_hibernate() {
+        List<String> usernames = Arrays.asList("dr_frank", "mike", "maggie", "liza");
+        List<User> users = new ArrayList<>();
+        for (String username : usernames) {
+            users.add(userRepository.save(new User(username)));
+        }
+        User poster = new User("duplo");
+        userRepository.save(poster);
+        for (int i = 0; i < 100; i++) {
+            repository.save(new Tweet(poster, "spamming @dr_frank " + i, users.subList(0, 1), null));
+        }
+        assertTrue(repository.findAllWithHibernateQuery(tweet.mentions.contains(users.get(1))).isEmpty());
+
+        assertEquals(100, repository.findAllWithHibernateQuery(tweet.mentions.contains(users.get(0))).size());
+
+        assertTrue(repository.findAllWithHibernateQuery(tweet.mentions.any().username.eq("duplo")).isEmpty());
+
+        assertEquals(100, repository.findAllWithHibernateQuery(tweet.mentions.any().username.eq("dr_frank")).size());
+    }
+}
diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java
new file mode 100644
index 0000000000..27faeefe90
--- /dev/null
+++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.example.jpa.repository;
+
+import com.querydsl.example.jpa.model.User;
+import com.querydsl.example.jpa.repository.UserRepository;
+import org.junit.Test;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class UserRepositoryTest extends AbstractPersistenceTest {
+    @Inject
+    private UserRepository repository;
+
+    @Test
+    public void save_and_get_by_id() {
+        String username = "jackie";
+        User user = new User(username);
+        repository.save(user);
+        assertEquals(username, repository.findById(user.getId()).getUsername());
+    }
+
+    @Test
+    public void get_all() {
+        repository.save(new User("jimmy"));
+        assertTrue(repository.all().size() == 1);
+    }
+}
diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml
new file mode 100644
index 0000000000..81d35dc4c0
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>querydsl-examples</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>querydsl-example-kotlin-codegen</artifactId>
+    <name>Querydsl example - Kotlin Codegen</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>2.2.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <configuration>
+                    <compilerPlugins>
+                        <plugin>jpa</plugin>
+                    </compilerPlugins>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>com.querydsl</groupId>
+                            <artifactId>querydsl-kotlin-codegen</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                        <annotationProcessorPath>
+                            <groupId>com.querydsl</groupId>
+                            <artifactId>querydsl-apt</artifactId>
+                            <version>${project.version}</version>
+                            <classifier>jpa</classifier>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-noarg</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-kapt</id>
+                        <goals>
+                            <goal>test-kapt</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt b/querydsl-examples/querydsl-example-kotlin-codegen/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
new file mode 100644
index 0000000000..bbda297056
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-codegen/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin.entity
+
+import javax.persistence.*
+
+@Entity
+data class ExampleEntity(
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        val id: Int,
+
+        @Column
+        val name: String,
+
+        @OneToMany(mappedBy = "parent")
+        val children: List<ExampleEntity>? = null,
+
+        @ManyToOne
+        val parent: ExampleEntity? = null
+) {
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
new file mode 100644
index 0000000000..09e4807d9a
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin
+
+import com.querydsl.examples.kotlin.entity.ExampleEntity
+import com.querydsl.examples.kotlin.entity.QExampleEntity
+import com.querydsl.examples.kotlin.entity.QExampleEntity.Companion.exampleEntity
+import com.querydsl.jpa.impl.JPAQuery
+import org.junit.Test
+
+class ExampleEntityTest {
+
+    @Test
+    fun basicMetamodelExpression() {
+        val child : QExampleEntity = QExampleEntity("child")
+
+        JPAQuery<ExampleEntity>()
+                .from(exampleEntity)
+                .innerJoin(exampleEntity.children, child)
+                .select(exampleEntity.name, child.name)
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
new file mode 100644
index 0000000000..d69d2b0cdd
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>querydsl-examples</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>querydsl-example-kotlin</artifactId>
+    <name>Querydsl example - Kotlin JPA</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>2.2.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <configuration>
+                    <compilerPlugins>
+                        <plugin>jpa</plugin>
+                    </compilerPlugins>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>com.querydsl</groupId>
+                            <artifactId>querydsl-apt</artifactId>
+                            <version>${project.version}</version>
+                            <classifier>jpa</classifier>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-noarg</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-kapt</id>
+                        <goals>
+                            <goal>test-kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
+                                <sourceDir>target/generated-sources/kapt/test</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt b/querydsl-examples/querydsl-example-kotlin-jpa/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
new file mode 100644
index 0000000000..bbda297056
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-jpa/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin.entity
+
+import javax.persistence.*
+
+@Entity
+data class ExampleEntity(
+        @Id
+        @GeneratedValue(strategy = GenerationType.AUTO)
+        val id: Int,
+
+        @Column
+        val name: String,
+
+        @OneToMany(mappedBy = "parent")
+        val children: List<ExampleEntity>? = null,
+
+        @ManyToOne
+        val parent: ExampleEntity? = null
+) {
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
new file mode 100644
index 0000000000..dd8b5425a7
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin
+
+import com.querydsl.examples.kotlin.entity.ExampleEntity
+import com.querydsl.examples.kotlin.entity.QExampleEntity
+import com.querydsl.examples.kotlin.entity.QExampleEntity.exampleEntity
+import com.querydsl.jpa.impl.JPAQuery
+import org.junit.Test
+
+class ExampleEntityTest {
+
+    @Test
+    fun basicMetamodelExpression() {
+        val child : QExampleEntity = QExampleEntity("child")
+
+        JPAQuery<ExampleEntity>()
+                .from(exampleEntity)
+                .innerJoin(exampleEntity.children, child)
+                .select(exampleEntity.name, child.name)
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
new file mode 100644
index 0000000000..e3888375ac
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>querydsl-examples</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>querydsl-example-kotlin-mongodb</artifactId>
+    <name>Querydsl example - Kotlin MongoDB</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>2.6.7</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-mongodb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>com.querydsl</groupId>
+                            <artifactId>querydsl-apt</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                    <annotationProcessors>
+                        <annotationProcessor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-noarg</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-kapt</id>
+                        <goals>
+                            <goal>test-kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
+                                <sourceDir>target/generated-sources/kapt/test</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
new file mode 100644
index 0000000000..7b79f65f20
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/entity/ExampleEntity.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin.entity
+
+import com.querydsl.core.annotations.QueryEntity
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.mapping.Document
+
+@Document
+@QueryEntity
+data class ExampleEntity(
+        @Id
+        val id: Int,
+
+        val name: String,
+
+        val age : Int
+) {
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleEntityRespository.kt b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleEntityRespository.kt
new file mode 100644
index 0000000000..fc3bee88a3
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleEntityRespository.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin.repository
+
+import com.querydsl.examples.kotlin.entity.ExampleEntity
+import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.querydsl.QuerydslPredicateExecutor
+
+interface ExampleEntityRespository : MongoRepository<ExampleEntity, String>, QuerydslPredicateExecutor<ExampleEntity> {
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleUse.kt b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleUse.kt
new file mode 100644
index 0000000000..c5cd683525
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-mongodb/src/main/kotlin/com/querydsl/examples/kotlin/repository/ExampleUse.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin.repository
+
+import com.querydsl.examples.kotlin.entity.QExampleEntity
+
+class ExampleUse {
+
+    fun test() {
+        val qExampleEntity = QExampleEntity("test");
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
new file mode 100644
index 0000000000..2ea4c8d7a4
--- /dev/null
+++ b/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.examples.kotlin
+
+import com.querydsl.examples.kotlin.entity.QExampleEntity
+import org.junit.Test
+
+class ExampleEntityTest {
+
+    @Test
+    fun basicMetamodelExpression() {
+        val example : QExampleEntity = QExampleEntity("example")
+        val predicate = example.name.eq("Eric")
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-sql-guice/README.md b/querydsl-examples/querydsl-example-sql-guice/README.md
new file mode 100644
index 0000000000..14fd1c17e1
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/README.md
@@ -0,0 +1,7 @@
+## Querydsl SQL Example
+
+Querydsl SQL Example is an example project that demonstrates some best practices on how to use Querydsl SQL in repositories.
+
+Compared to direct JDBC usage Querydsl SQL is typesafe, closer to SQL and abstracts over SQL dialect specific differences.
+
+Guice is used as the DI layer to complement the already available Spring + Querydsl tutorials and examples.
diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml
new file mode 100644
index 0000000000..852f831f40
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-examples</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-example-sql-guice</artifactId>
+  <packaging>jar</packaging>
+  <name>Querydsl example - SQL Guice</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <failIfNoTests>false</failIfNoTests>
+    <guice.version>5.1.0</guice.version>
+    <h2.version>1.4.186</h2.version>
+  </properties>
+
+  <dependencies>
+
+    <!-- guice -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+
+    <!-- logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <!-- persistence -->
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>c3p0</groupId>
+      <artifactId>c3p0</artifactId>
+      <version>0.9.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+    </dependency>
+
+    <!-- TEST dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>querydsl-example-sql-guice</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.h2.Driver</jdbcDriver>
+          <jdbcUrl>jdbc:h2:mem:;INIT=runscript from 'file:${project.baseUri}/src/main/sql/001_schema.sql'</jdbcUrl>
+          <jdbcUser>sa</jdbcUser>
+          <packageName>com.querydsl.example.sql.model</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+          <exportBeans>true</exportBeans>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>11</source>
+              <target>11</target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ConnectionContext.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ConnectionContext.java
new file mode 100644
index 0000000000..7cf5040582
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ConnectionContext.java
@@ -0,0 +1,40 @@
+package com.querydsl.example.sql.guice;
+
+import javax.inject.Inject;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public class ConnectionContext {
+
+    private final DataSource dataSource;
+
+    private final ThreadLocal<Connection> connectionHolder = new ThreadLocal<Connection>();
+
+    @Inject
+    public ConnectionContext(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public Connection getConnection(boolean create) {
+        Connection connection = connectionHolder.get();
+        if (!create || connection != null) {
+            return connection;
+        }
+        try {
+            connection = dataSource.getConnection();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        connectionHolder.set(connection);
+        return connection;
+    }
+
+    public Connection getConnection() {
+        return connectionHolder.get();
+    }
+
+    public void removeConnection() {
+        connectionHolder.remove();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ServiceModule.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ServiceModule.java
new file mode 100644
index 0000000000..eb705ce0c6
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/ServiceModule.java
@@ -0,0 +1,67 @@
+package com.querydsl.example.sql.guice;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Scopes;
+import com.google.inject.matcher.Matchers;
+import com.google.inject.name.Names;
+import com.mchange.v2.c3p0.DataSources;
+import com.querydsl.example.sql.repository.TweetRepository;
+import com.querydsl.example.sql.repository.UserRepository;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.H2Templates;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+public class ServiceModule extends AbstractModule {
+    @Override
+    protected void configure() {
+        Properties properties = new Properties();
+        try {
+            properties.load(getClass().getResourceAsStream("/jdbc.properties"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        for (Entry<Object, Object> entry : properties.entrySet()) {
+            bind(String.class).annotatedWith(Names.named((String)entry.getKey()))
+                    .toInstance((String) entry.getValue());
+        }
+
+        bind(ConnectionContext.class).in(Scopes.SINGLETON);
+        bind(TweetRepository.class).in(Scopes.SINGLETON);
+        bind(UserRepository.class).in(Scopes.SINGLETON);
+
+        TransactionInterceptor interceptor = new TransactionInterceptor();
+        requestInjection(interceptor);
+        bindInterceptor(Matchers.any(), Matchers.annotatedWith(Transactional.class), interceptor);
+    }
+
+    @Provides
+    @Singleton
+    public Configuration configuration() {
+        return new Configuration(new H2Templates());
+    }
+
+    @Provides
+    @Singleton
+    public DataSource dataSource(@Named("jdbc.user") String user,
+                                 @Named("jdbc.password") String password,
+                                 @Named("jdbc.url") String url,
+                                 @Named("jdbc.driver") String driver) {
+        try {
+            Class.forName(driver);
+            return DataSources.pooledDataSource(DataSources.unpooledDataSource(
+                    url, user, password));
+
+        } catch (SQLException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/TransactionInterceptor.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/TransactionInterceptor.java
new file mode 100644
index 0000000000..32c235e0fa
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/TransactionInterceptor.java
@@ -0,0 +1,35 @@
+package com.querydsl.example.sql.guice;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+import javax.inject.Inject;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+
+public class TransactionInterceptor implements MethodInterceptor {
+    @Inject
+    private ConnectionContext context;
+
+    @Override
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+        Method method = invocation.getMethod();
+        Transactional annotation = method.getAnnotation(Transactional.class);
+        if (annotation == null || context.getConnection() != null) {
+            return invocation.proceed();
+        }
+        Connection connection = context.getConnection(true);
+        connection.setAutoCommit(false);
+        try {
+            Object rv = invocation.proceed();
+            connection.commit();
+            return rv;
+        } catch (Exception e) {
+            connection.rollback();
+            throw e;
+        } finally {
+            connection.close();
+            context.removeConnection();
+        }
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/Transactional.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/Transactional.java
new file mode 100644
index 0000000000..db379ed9a3
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/guice/Transactional.java
@@ -0,0 +1,11 @@
+package com.querydsl.example.sql.guice;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Transactional {
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/AbstractRepository.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/AbstractRepository.java
new file mode 100644
index 0000000000..3fbbc40fe3
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/AbstractRepository.java
@@ -0,0 +1,49 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.example.sql.guice.ConnectionContext;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+
+import javax.inject.Inject;
+import javax.sql.DataSource;
+import java.sql.Connection;
+
+public abstract class AbstractRepository {
+    @Inject
+    private Configuration configuration;
+
+    @Inject
+    private ConnectionContext context;
+
+    @Inject
+    private DataSource datasource;
+
+    private Connection getConnection() {
+        return context.getConnection();
+    }
+
+    protected <T> SQLQuery<T> selectFrom(RelationalPath<T> entity) {
+        return select(entity).from(entity);
+    }
+
+    protected <T> SQLQuery<T> select(Expression<T> entity) {
+        return new SQLQuery<Void>(getConnection(), configuration).select(entity);
+    }
+
+    protected SQLInsertClause insert(RelationalPath<?> path) {
+        return new SQLInsertClause(getConnection(), configuration, path);
+    }
+
+    protected SQLUpdateClause update(RelationalPath<?> path) {
+        return new SQLUpdateClause(getConnection(), configuration, path);
+    }
+
+    protected SQLDeleteClause delete(RelationalPath<?> path) {
+        return new SQLDeleteClause(getConnection(), configuration, path);
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/TweetRepository.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/TweetRepository.java
new file mode 100644
index 0000000000..3e9f0575c7
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/TweetRepository.java
@@ -0,0 +1,74 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.sql.guice.Transactional;
+import com.querydsl.example.sql.model.Tweet;
+import com.querydsl.example.sql.model.TweetUser;
+import com.querydsl.sql.dml.SQLInsertClause;
+
+import java.util.List;
+
+import static com.querydsl.example.sql.model.QLocation.location;
+import static com.querydsl.example.sql.model.QTweet.tweet;
+import static com.querydsl.example.sql.model.QTweetUser.tweetUser;
+import static com.querydsl.example.sql.model.QUser.user;
+
+public class TweetRepository extends AbstractRepository {
+    @Transactional
+    public Long save(Tweet entity) {
+        if (entity.getId() != null) {
+            update(tweet).populate(entity).execute();
+            return entity.getId();
+        }
+        return insert(tweet).populate(entity)
+                .executeWithKey(user.id);
+    }
+
+    @Transactional
+    public Long save(Tweet tweet, Long... mentions) {
+        Long tweetId = save(tweet);
+        SQLInsertClause insert = insert(tweetUser);
+        for (Long mentionsId : mentions) {
+            TweetUser tu = new TweetUser();
+            tu.setTweetId(tweetId);
+            tu.setMentionsId(mentionsId);
+            insert.populate(tu).addBatch();
+        }
+        insert.execute();
+        return tweetId;
+    }
+
+    @Transactional
+    public Tweet findById(Long id) {
+        return selectFrom(tweet).where(tweet.id.eq(id)).fetchOne();
+    }
+
+    @Transactional
+    public List<Tweet> findOfUser(String username) {
+        return select(tweet).from(user)
+                .innerJoin(tweet).on(tweet.posterId.eq(user.id))
+                .fetch();
+    }
+
+    @Transactional
+    public List<Tweet> findWithMentioned(Long userId) {
+        return selectFrom(tweet)
+                .innerJoin(tweetUser).on(tweet.id.eq(tweetUser.tweetId))
+                .where(tweetUser.mentionsId.eq(userId))
+                .fetch();
+    }
+
+    @Transactional
+    public List<Tweet> findOfArea(double[] pointA, double[] pointB) {
+        return selectFrom(tweet)
+                .innerJoin(location).on(tweet.locationId.eq(location.id))
+                .where(location.longitude.between(pointA[0], pointB[0]),
+                       location.latitude.between(pointA[1], pointB[1]))
+                .fetch();
+    }
+
+    @Transactional
+    public List<Tweet> findAll(Predicate expr) {
+        return selectFrom(tweet).where(expr).fetch();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserInfo.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserInfo.java
new file mode 100644
index 0000000000..a0c4340119
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserInfo.java
@@ -0,0 +1,22 @@
+package com.querydsl.example.sql.repository;
+
+public class UserInfo {
+
+    private final String username;
+
+    private final long tweets;
+
+    public UserInfo(String username, long tweets) {
+        this.username = username;
+        this.tweets = tweets;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public long getTweets() {
+        return tweets;
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserRepository.java b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserRepository.java
new file mode 100644
index 0000000000..1afa107054
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/java/com/querydsl/example/sql/repository/UserRepository.java
@@ -0,0 +1,47 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.Projections;
+import com.querydsl.example.sql.guice.Transactional;
+import com.querydsl.example.sql.model.User;
+
+import java.util.List;
+
+import static com.querydsl.example.sql.model.QTweet.tweet;
+import static com.querydsl.example.sql.model.QUser.user;
+
+public class UserRepository extends AbstractRepository {
+    @Transactional
+    public User findById(Long id) {
+        return selectFrom(user).where(user.id.eq(id)).fetchOne();
+    }
+
+    @Transactional
+    public Long save(User entity) {
+        if (entity.getId() != null) {
+            update(user).populate(entity).execute();
+            return entity.getId();
+        }
+        return insert(user).populate(entity)
+                .executeWithKey(user.id);
+    }
+
+    @Transactional
+    public List<UserInfo> allWithTweetCount() {
+        return select(Projections.constructor(UserInfo.class, user.username, tweet.id.count())).from(user)
+                .leftJoin(tweet).on(user.id.eq(tweet.posterId))
+                .groupBy(user.username)
+                .fetch();
+    }
+
+    @Transactional
+    public List<User> findAll(Predicate expr) {
+        return selectFrom(user).where(expr).fetch();
+    }
+
+    @Transactional
+    public List<User> all() {
+        return selectFrom(user).fetch();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties b/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties
new file mode 100644
index 0000000000..8e1552f3ee
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties
@@ -0,0 +1,4 @@
+jdbc.url=jdbc:h2:mem:testdb;INIT=runscript from 'src/main/sql/001_schema.sql'
+jdbc.user=sa
+jdbc.password=
+jdbc.driver=org.h2.Driver
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql b/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql
new file mode 100644
index 0000000000..a8532d58ac
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql
@@ -0,0 +1,29 @@
+create schema if not exists PUBLIC;
+
+create table if not exists LOCATION
+(
+    ID        BIGINT auto_increment primary key,
+    LATITUDE  DOUBLE,
+    LONGITUDE DOUBLE,
+);
+
+create table if not exists USER
+(
+    ID       BIGINT auto_increment primary key,
+    USERNAME VARCHAR(255)
+);
+
+create table if not exists TWEET
+(
+    ID          BIGINT auto_increment primary key,
+    CONTENT     VARCHAR(255),
+    LOCATION_ID BIGINT,
+    POSTER_ID   BIGINT not null,
+);
+
+create table if not exists TWEET_USER
+(
+    TWEET_ID    BIGINT not null,
+    MENTIONS_ID BIGINT not null,
+);
+
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java
new file mode 100644
index 0000000000..44b7b94ce2
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java
@@ -0,0 +1,28 @@
+package com.querydsl.example.sql.guice;
+
+import com.google.inject.Inject;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+@RunWith(GuiceTestRunner.class)
+public class ConnectionContextTest {
+
+    @Inject
+    private ConnectionContext context;
+
+    @After
+    public void tearDown() {
+        context.removeConnection();
+    }
+
+    @Test
+    public void get_connection() {
+        assertNotNull(context.getConnection(true));
+        assertNotNull(context.getConnection());
+        context.removeConnection();
+        assertNull(context.getConnection());
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java
new file mode 100644
index 0000000000..ee49f18d63
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java
@@ -0,0 +1,21 @@
+package com.querydsl.example.sql.guice;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+
+public class GuiceTestRunner extends BlockJUnit4ClassRunner {
+
+    private static final Injector injector = Guice
+            .createInjector(new ServiceModule());
+
+    public GuiceTestRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    @Override
+    protected Object createTest() throws Exception {
+        return injector.getInstance(getTestClass().getJavaClass());
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java
new file mode 100644
index 0000000000..4697aca209
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java
@@ -0,0 +1,52 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.example.sql.guice.GuiceTestRunner;
+import com.querydsl.example.sql.guice.Transactional;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(GuiceTestRunner.class)
+public abstract class AbstractPersistenceTest {
+    @Inject
+    private DataSource dataSource;
+
+    @Before
+    @Transactional
+    public void before() {
+        try (Connection connection = dataSource.getConnection()) {
+            List<String> tables = new ArrayList<String>();
+            DatabaseMetaData md = connection.getMetaData();
+            ResultSet rs = md.getTables(null, null, null,
+                    new String[] { "TABLE" });
+            try {
+                while (rs.next()) {
+                    tables.add(rs.getString("TABLE_NAME"));
+                }
+            } finally {
+                rs.close();
+            }
+
+            java.sql.Statement stmt = connection.createStatement();
+            try {
+                stmt.execute("SET REFERENTIAL_INTEGRITY FALSE");
+                for (String table : tables) {
+                    stmt.execute("TRUNCATE TABLE " + table);
+                }
+                stmt.execute("SET REFERENTIAL_INTEGRITY TRUE");
+            } finally {
+                stmt.close();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java
new file mode 100644
index 0000000000..9115c028ad
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java
@@ -0,0 +1,86 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.example.sql.model.Tweet;
+import com.querydsl.example.sql.model.User;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.inject.Inject;
+
+import static com.querydsl.example.sql.model.QTweet.tweet;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class TweetRepositoryTest extends AbstractPersistenceTest {
+    @Inject
+    private TweetRepository repository;
+
+    @Inject
+    private UserRepository userRepository;
+
+    private Long posterId;
+
+    @Before
+    public void setUp() {
+        User poster = new User();
+        poster.setUsername("dr_frank");
+        posterId = userRepository.save(poster);
+    }
+
+    @Test
+    public void save_and_find_by_id() {
+        String content = "I am alive! #YOLO";
+        Tweet tweet = new Tweet();
+        tweet.setContent(content);
+        tweet.setPosterId(posterId);
+        Long id = repository.save(tweet);
+        assertEquals(content, repository.findById(id).getContent());
+    }
+
+    @Test
+    public void save_and_find_by_username() {
+        String content = "I am alive! #YOLO";
+        Tweet tweet = new Tweet();
+        tweet.setContent(content);
+        tweet.setPosterId(posterId);
+        repository.save(tweet);
+
+        assertFalse(repository.findOfUser("dr_frank").isEmpty());
+    }
+
+    @Test
+    public void save_with_mentions() {
+        User other = new User();
+        other.setUsername("dexter");
+        Long otherId = userRepository.save(other);
+
+        String content = "I am alive! #YOLO";
+        Tweet tweet = new Tweet();
+        tweet.setContent(content);
+        tweet.setPosterId(posterId);
+        Long tweetId = repository.save(tweet, otherId);
+
+        assertEquals(tweetId, repository.findWithMentioned(otherId).get(0).getId());
+    }
+
+    @Test
+    public void find_list_by_predicate() {
+        Tweet tw1 = new Tweet();
+        tw1.setPosterId(posterId);
+        tw1.setContent("It is a alive! #YOLO");
+        repository.save(tw1);
+
+        Tweet tw2 = new Tweet();
+        tw2.setPosterId(posterId);
+        tw2.setContent("Oh the humanity!");
+        repository.save(tw2);
+
+        Tweet tw3 = new Tweet();
+        tw3.setPosterId(posterId);
+        tw3.setContent("#EpicFail");
+        repository.save(tw3);
+
+        assertEquals(1, repository.findAll(tweet.content.contains("#YOLO")).size());
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java
new file mode 100644
index 0000000000..4f2848da0b
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java
@@ -0,0 +1,53 @@
+package com.querydsl.example.sql.repository;
+
+import com.querydsl.example.sql.model.Tweet;
+import com.querydsl.example.sql.model.User;
+import org.junit.Test;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class UserRepositoryTest extends AbstractPersistenceTest {
+    @Inject
+    private UserRepository repository;
+
+    @Inject
+    private TweetRepository tweetRepository;
+
+    @Test
+    public void save_and_get_by_id() {
+        String username = "jackie";
+        User user = new User();
+        user.setUsername(username);
+        Long id = repository.save(user);
+        assertEquals(username, repository.findById(id).getUsername());
+    }
+
+    @Test
+    public void get_all() {
+        User user = new User();
+        user.setUsername("jimmy");
+        repository.save(user);
+        assertTrue(repository.all().size() == 1);
+    }
+
+    @Test
+    public void get_all_with_tweet_count() {
+        User user = new User();
+        user.setUsername("jimmy");
+        Long posterId = repository.save(user);
+
+        Tweet tw3 = new Tweet();
+        tw3.setPosterId(posterId);
+        tw3.setContent("#EpicFail");
+        tweetRepository.save(tw3);
+
+        List<UserInfo> infos = repository.allWithTweetCount();
+        assertFalse(infos.isEmpty());
+        for (UserInfo info : infos) {
+            assertNotNull(info.getUsername());
+        }
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/README.md b/querydsl-examples/querydsl-example-sql-spring/README.md
new file mode 100644
index 0000000000..253ce96e19
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/README.md
@@ -0,0 +1,7 @@
+## Querydsl Customer DAO
+
+Querydsl Customer DAO is an example project that demonstrates some best practices on how to use Querydsl SQL on the DAO level in Spring projects.
+
+Compared to direct JDBC usage Querydsl SQL is typesafe, closer to SQL and abstracts over SQL dialect specific differences.
+
+This example project presents a version of Querydsl SQL usage where no generated bean types are used, but external DTO types are populated from queries.
diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml
new file mode 100644
index 0000000000..aa25e707dc
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-examples</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-example-sql-spring</artifactId>
+  <packaging>jar</packaging>
+  <name>Querydsl example - SQL Spring</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <spring.version>5.3.19</spring.version>
+    <h2.version>1.3.170</h2.version>
+  </properties>
+
+  <dependencies>
+
+    <!-- spring -->
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.30</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- persistence -->
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+      <version>5.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+    </dependency>
+
+    <!-- logging -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <!-- TEST dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>querydsl-example-sql-spring</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.h2.Driver</jdbcDriver>
+          <jdbcUrl>jdbc:h2:mem:;INIT=runscript from 'file:${project.baseUri}/src/main/resources/sql/001_schema.sql'</jdbcUrl>
+          <jdbcUser>sa</jdbcUser>
+          <customTypes>
+            <customType>com.querydsl.sql.types.DateTimeType</customType>
+            <customType>com.querydsl.sql.types.LocalDateType</customType>
+          </customTypes>
+          <packageName>com.querydsl.example.sql</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype-oss-public</id>
+      <url>https://oss.sonatype.org/content/groups/public</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>11</source>
+              <target>11</target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>java-8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.zaxxer</groupId>
+          <artifactId>HikariCP</artifactId>
+          <version>4.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/AppConfiguration.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/AppConfiguration.java
new file mode 100644
index 0000000000..6f4f74ae4c
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/AppConfiguration.java
@@ -0,0 +1,44 @@
+package com.querydsl.example.config;
+
+import com.querydsl.example.dao.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.inject.Inject;
+
+@Configuration
+@EnableTransactionManagement
+@Import(JdbcConfiguration.class)
+public class AppConfiguration {
+
+   @Inject Environment env;
+
+   @Bean
+   public CustomerDao customerDao() {
+       return new CustomerDaoImpl();
+   }
+
+   @Bean
+   public OrderDao orderDao() {
+       return new OrderDaoImpl();
+   }
+
+   @Bean
+   public PersonDao personDao() {
+       return new PersonDaoImpl();
+   }
+
+   @Bean
+   public ProductDao productDao() {
+       return new ProductDaoImpl();
+   }
+
+   @Bean
+   public SupplierDao supplierDao() {
+       return new SupplierDaoImpl();
+   }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/JdbcConfiguration.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/JdbcConfiguration.java
new file mode 100644
index 0000000000..3fce31ce94
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/config/JdbcConfiguration.java
@@ -0,0 +1,58 @@
+package com.querydsl.example.config;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLQueryFactory;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.spring.SpringConnectionProvider;
+import com.querydsl.sql.spring.SpringExceptionTranslator;
+import com.querydsl.sql.types.DateTimeType;
+import com.querydsl.sql.types.LocalDateType;
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.inject.Inject;
+import javax.sql.DataSource;
+
+@Configuration
+@PropertySource({"classpath:jdbc.properties"})
+public class JdbcConfiguration {
+
+    @Inject Environment env;
+
+    @Bean
+    public DataSource dataSource() {
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setDriverClassName(env.getRequiredProperty("jdbc.driver"));
+        dataSource.setJdbcUrl(env.getRequiredProperty("jdbc.url"));
+        dataSource.setUsername(env.getRequiredProperty("jdbc.user"));
+        dataSource.setPassword(env.getRequiredProperty("jdbc.password"));
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        return new DataSourceTransactionManager(dataSource());
+    }
+
+    @Bean
+    public com.querydsl.sql.Configuration querydslConfiguration() {
+        SQLTemplates templates = H2Templates.builder().build();
+        com.querydsl.sql.Configuration configuration = new com.querydsl.sql.Configuration(templates);
+        configuration.setExceptionTranslator(new SpringExceptionTranslator());
+        configuration.register(new DateTimeType());
+        configuration.register(new LocalDateType());
+        return configuration;
+    }
+
+    @Bean
+    public SQLQueryFactory queryFactory() {
+        SpringConnectionProvider provider = new SpringConnectionProvider(dataSource());
+        return new SQLQueryFactory(querydslConfiguration(), provider);
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDao.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDao.java
new file mode 100644
index 0000000000..fc7befd07d
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDao.java
@@ -0,0 +1,20 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.dto.Customer;
+
+import java.util.List;
+
+public interface CustomerDao {
+
+    Customer findById(long id);
+
+    List<Customer> findAll(Predicate... where);
+
+    Customer save(Customer c);
+
+    long count();
+
+    void delete(Customer p);
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java
new file mode 100644
index 0000000000..5cec247126
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java
@@ -0,0 +1,114 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.QBean;
+import com.querydsl.example.dto.Address;
+import com.querydsl.example.dto.Customer;
+import com.querydsl.example.dto.CustomerAddress;
+import com.querydsl.example.dto.Person;
+import com.querydsl.sql.SQLQueryFactory;
+import com.querydsl.sql.dml.SQLInsertClause;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static com.querydsl.core.types.Projections.bean;
+import static com.querydsl.example.sql.QAddress.address;
+import static com.querydsl.example.sql.QCustomer.customer;
+import static com.querydsl.example.sql.QCustomerAddress.customerAddress;
+import static com.querydsl.example.sql.QPerson.person;
+
+@Transactional
+public class CustomerDaoImpl implements CustomerDao {
+
+    @Inject
+    SQLQueryFactory queryFactory;
+
+    final QBean<CustomerAddress> customerAddressBean = bean(CustomerAddress.class,
+            customerAddress.addressTypeCode, customerAddress.fromDate, customerAddress.toDate,
+            bean(Address.class, address.all()).as("address"));
+
+    final QBean<Customer> customerBean = bean(Customer.class,
+            customer.id, customer.name,
+            bean(Person.class, person.all()).as("contactPerson"),
+            GroupBy.set(customerAddressBean).as("addresses"));
+
+    @Override
+    public Customer findById(long id) {
+        List<Customer> customers = findAll(customer.id.eq(id));
+        return customers.isEmpty() ? null : customers.get(0);
+    }
+
+    @Override
+    public List<Customer> findAll(Predicate... where) {
+        return queryFactory.from(customer)
+            .leftJoin(customer.contactPersonFk, person)
+            .leftJoin(customer._customer3Fk, customerAddress)
+            .leftJoin(customerAddress.addressFk, address)
+            .where(where)
+            .transform(GroupBy.groupBy(customer.id).list(customerBean));
+    }
+
+    @Override
+    public Customer save(Customer c) {
+        Long id = c.getId();
+
+        if (id == null) {
+            id = queryFactory.insert(customer)
+                    .set(customer.name, c.getName())
+                    .set(customer.contactPersonId, c.getContactPerson().getId())
+                    .executeWithKey(customer.id);
+            c.setId(id);
+        } else {
+            queryFactory.update(customer)
+                .set(customer.name, c.getName())
+                .set(customer.contactPersonId, c.getContactPerson().getId())
+                .where(customer.id.eq(c.getId()))
+                .execute();
+
+            // delete address rows
+            queryFactory.delete(customerAddress)
+                .where(customerAddress.customerId.eq(id))
+                .execute();
+        }
+
+        SQLInsertClause insert = queryFactory.insert(customerAddress);
+        for (CustomerAddress ca : c.getAddresses()) {
+            if (ca.getAddress().getId() == null) {
+                ca.getAddress().setId(queryFactory.insert(address)
+                    .populate(ca.getAddress())
+                    .executeWithKey(address.id));
+            }
+            insert.set(customerAddress.customerId, id)
+                .set(customerAddress.addressId, ca.getAddress().getId())
+                .set(customerAddress.addressTypeCode, ca.getAddressTypeCode())
+                .set(customerAddress.fromDate, ca.getFromDate())
+                .set(customerAddress.toDate, ca.getToDate())
+                .addBatch();
+        }
+        insert.execute();
+
+        c.setId(id);
+        return c;
+    }
+
+    @Override
+    public long count() {
+        return queryFactory.from(customer).fetchCount();
+    }
+
+    @Override
+    public void delete(Customer c) {
+        // TODO use combined delete clause
+        queryFactory.delete(customerAddress)
+            .where(customerAddress.customerId.eq(c.getId()))
+            .execute();
+
+        queryFactory.delete(customer)
+            .where(customer.id.eq(c.getId()))
+            .execute();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDao.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDao.java
new file mode 100644
index 0000000000..6409175a4e
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDao.java
@@ -0,0 +1,20 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.dto.Order;
+
+import java.util.List;
+
+public interface OrderDao {
+
+    Order findById(long id);
+
+    List<Order> findAll(Predicate... where);
+
+    Order save(Order order);
+
+    long count();
+
+    void delete(Order p);
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDaoImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDaoImpl.java
new file mode 100644
index 0000000000..24c061aea4
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/OrderDaoImpl.java
@@ -0,0 +1,108 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.dml.StoreClause;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.QBean;
+import com.querydsl.example.dto.CustomerPaymentMethod;
+import com.querydsl.example.dto.Order;
+import com.querydsl.example.dto.OrderProduct;
+import com.querydsl.sql.SQLQueryFactory;
+import com.querydsl.sql.dml.SQLInsertClause;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static com.querydsl.core.types.Projections.bean;
+import static com.querydsl.example.sql.QCustomerOrder.customerOrder;
+import static com.querydsl.example.sql.QCustomerOrderProduct.customerOrderProduct;
+import static com.querydsl.example.sql.QCustomerPaymentMethod.customerPaymentMethod;
+
+@Transactional
+public class OrderDaoImpl implements OrderDao {
+
+    @Inject
+    SQLQueryFactory queryFactory;
+
+    final QBean<OrderProduct> orderProductBean = bean(OrderProduct.class,
+            customerOrderProduct.productId, customerOrderProduct.comments, customerOrderProduct.quantity);
+
+    final QBean<Order> orderBean = bean(Order.class,
+            customerOrder.id, customerOrder.orderPlacedDate, customerOrder.orderPaidDate,
+            customerOrder.orderStatus, customerOrder.totalOrderPrice,
+            bean(CustomerPaymentMethod.class, customerPaymentMethod.all()).as("customerPaymentMethod"),
+            GroupBy.set(orderProductBean).as("orderProducts"));
+
+    @Override
+    public Order findById(long id) {
+        List<Order> orders = findAll(customerOrder.id.eq(id));
+        return orders.isEmpty() ? null : orders.get(0);
+    }
+
+    @Override
+    public List<Order> findAll(Predicate... where) {
+        return queryFactory.from(customerOrder)
+            .leftJoin(customerOrder.paymentMethodFk, customerPaymentMethod)
+            .leftJoin(customerOrder._orderFk, customerOrderProduct)
+            .where(where)
+            .transform(GroupBy.groupBy(customerOrder.id).list(orderBean));
+    }
+
+    private <T extends StoreClause<T>> T populate(T dml, Order o) {
+        return dml.set(customerOrder.customerPaymentMethodId, o.getCustomerPaymentMethod().getId())
+            .set(customerOrder.orderPlacedDate, o.getOrderPlacedDate())
+            .set(customerOrder.totalOrderPrice, o.getTotalOrderPrice());
+    }
+
+    @Override
+    public Order save(Order o) {
+        Long id = o.getId();
+
+        if (id == null) {
+            id = populate(queryFactory.insert(customerOrder), o)
+                    .executeWithKey(customerOrder.id);
+            o.setId(id);
+        } else {
+            populate(queryFactory.update(customerOrder), o)
+                .where(customerOrder.id.eq(id))
+                .execute();
+
+            // delete orderproduct rows
+            queryFactory.delete(customerOrderProduct)
+                .where(customerOrderProduct.orderId.eq(id))
+                .execute();
+        }
+
+        SQLInsertClause insert = queryFactory.insert(customerOrderProduct);
+        for (OrderProduct op : o.getOrderProducts()) {
+            insert.set(customerOrderProduct.orderId, id)
+                .set(customerOrderProduct.comments, op.getComments())
+                .set(customerOrderProduct.productId, op.getProductId())
+                .set(customerOrderProduct.quantity, op.getQuantity())
+                .addBatch();
+        }
+        insert.execute();
+
+        o.setId(id);
+        return o;
+    }
+
+    @Override
+    public long count() {
+        return queryFactory.from(customerOrder).fetchCount();
+    }
+
+    @Override
+    public void delete(Order o) {
+        // TODO use combined delete clause
+        queryFactory.delete(customerOrderProduct)
+            .where(customerOrderProduct.orderId.eq(o.getId()))
+            .execute();
+
+        queryFactory.delete(customerOrder)
+            .where(customerOrder.id.eq(o.getId()))
+            .execute();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDao.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDao.java
new file mode 100644
index 0000000000..ce61ba4a6a
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDao.java
@@ -0,0 +1,20 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.dto.Person;
+
+import java.util.List;
+
+public interface PersonDao {
+
+    Person findById(long id);
+
+    List<Person> findAll(Predicate... where);
+
+    Person save(Person p);
+
+    long count();
+
+    void delete(Person p);
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDaoImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDaoImpl.java
new file mode 100644
index 0000000000..48b5366a41
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/PersonDaoImpl.java
@@ -0,0 +1,69 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.QBean;
+import com.querydsl.example.dto.Person;
+import com.querydsl.sql.SQLQueryFactory;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static com.querydsl.core.types.Projections.bean;
+import static com.querydsl.example.sql.QPerson.person;
+
+@Transactional
+public class PersonDaoImpl implements PersonDao {
+
+    @Inject
+    SQLQueryFactory queryFactory;
+
+    final QBean<Person> personBean = bean(Person.class, person.all());
+
+    @Override
+    public Person findById(long id) {
+        return queryFactory.select(personBean)
+                .from(person)
+                .where(person.id.eq(id))
+                .fetchOne();
+    }
+
+    @Override
+    public List<Person> findAll(Predicate... where) {
+        return queryFactory.select(personBean)
+                .from(person)
+                .where(where)
+                .fetch();
+    }
+
+    @Override
+    public Person save(Person p) {
+        Long id = p.getId();
+
+        if (id == null) {
+            id = queryFactory.insert(person)
+                .populate(p)
+                .executeWithKey(person.id);
+            p.setId(id);
+        } else {
+            queryFactory.update(person)
+                .populate(p)
+                .where(person.id.eq(id)).execute();
+        }
+
+        return p;
+    }
+
+    @Override
+    public long count() {
+        return queryFactory.from(person).fetchCount();
+    }
+
+    @Override
+    public void delete(Person p) {
+        queryFactory.delete(person)
+            .where(person.id.eq(p.getId()))
+            .execute();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDao.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDao.java
new file mode 100644
index 0000000000..cbd891d13f
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDao.java
@@ -0,0 +1,20 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.dto.Product;
+
+import java.util.List;
+
+public interface ProductDao {
+
+    Product findById(long id);
+
+    List<Product> findAll(Predicate... where);
+
+    Product save(Product p);
+
+    long count();
+
+    void delete(Product p);
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDaoImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDaoImpl.java
new file mode 100644
index 0000000000..691162cb87
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/ProductDaoImpl.java
@@ -0,0 +1,107 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.dml.StoreClause;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.QBean;
+import com.querydsl.example.dto.Product;
+import com.querydsl.example.dto.ProductL10n;
+import com.querydsl.example.dto.Supplier;
+import com.querydsl.sql.SQLQueryFactory;
+import com.querydsl.sql.dml.SQLInsertClause;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static com.querydsl.core.types.Projections.bean;
+import static com.querydsl.example.sql.QProduct.product;
+import static com.querydsl.example.sql.QProductL10n.productL10n;
+import static com.querydsl.example.sql.QSupplier.supplier;
+
+@Transactional
+public class ProductDaoImpl implements ProductDao {
+
+    @Inject
+    SQLQueryFactory queryFactory;
+
+    final QBean<ProductL10n> productL10nBean = bean(ProductL10n.class,
+            productL10n.description, productL10n.lang, productL10n.name);
+
+    final QBean<Product> productBean = bean(Product.class,
+            product.id, product.name, product.otherProductDetails, product.price,
+            bean(Supplier.class, supplier.all()).as("supplier"),
+            GroupBy.set(productL10nBean).as("localizations"));
+
+    @Override
+    public Product findById(long id) {
+        List<Product> persons = findAll(product.id.eq(id));
+        return persons.isEmpty() ? null : persons.get(0);
+    }
+
+    @Override
+    public List<Product> findAll(Predicate... where) {
+        return queryFactory.from(product)
+            .innerJoin(product.supplierFk, supplier)
+            .innerJoin(product._productFk, productL10n)
+            .where(where)
+            .transform(GroupBy.groupBy(product.id).list(productBean));
+    }
+
+    private <T extends StoreClause<T>> T populate(T dml, Product p) {
+        return dml.set(product.name, p.getName())
+            .set(product.otherProductDetails, p.getOtherProductDetails())
+            .set(product.price, p.getPrice())
+            .set(product.supplierId, p.getSupplier().getId());
+    }
+
+    @Override
+    public Product save(Product p) {
+        Long id = p.getId();
+
+        if (id == null) {
+            id = populate(queryFactory.insert(product), p)
+                .executeWithKey(product.id);
+            p.setId(id);
+        } else {
+            populate(queryFactory.update(product), p)
+                .where(product.id.eq(id))
+                .execute();
+
+            // delete l10n rows
+            queryFactory.delete(productL10n)
+                .where(productL10n.productId.eq(id))
+                .execute();
+        }
+
+        SQLInsertClause insert = queryFactory.insert(productL10n);
+        for (ProductL10n l10n : p.getLocalizations()) {
+            insert.set(productL10n.productId, id)
+                .set(productL10n.description, l10n.getDescription())
+                .set(productL10n.lang, l10n.getLang())
+                .set(productL10n.name, l10n.getName())
+                .addBatch();
+        }
+        insert.execute();
+
+        return p;
+    }
+
+    @Override
+    public long count() {
+        return queryFactory.from(product).fetchCount();
+    }
+
+    @Override
+    public void delete(Product p) {
+        // TODO use combined delete clause
+        queryFactory.delete(productL10n)
+            .where(productL10n.productId.eq(p.getId()))
+            .execute();
+
+        queryFactory.delete(product)
+            .where(product.id.eq(p.getId()))
+            .execute();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDao.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDao.java
new file mode 100644
index 0000000000..e8558702e5
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDao.java
@@ -0,0 +1,20 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.example.dto.Supplier;
+
+import java.util.List;
+
+public interface SupplierDao {
+
+    Supplier findById(long id);
+
+    List<Supplier> findAll(Predicate... where);
+
+    Supplier save(Supplier s);
+
+    long count();
+
+    void delete(Supplier s);
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDaoImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDaoImpl.java
new file mode 100644
index 0000000000..f50e89c843
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dao/SupplierDaoImpl.java
@@ -0,0 +1,68 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.QBean;
+import com.querydsl.example.dto.Supplier;
+import com.querydsl.sql.SQLQueryFactory;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static com.querydsl.core.types.Projections.bean;
+import static com.querydsl.example.sql.QSupplier.supplier;
+
+@Transactional
+public class SupplierDaoImpl implements SupplierDao {
+
+    @Inject
+    SQLQueryFactory queryFactory;
+
+    final QBean<Supplier> supplierBean = bean(Supplier.class, supplier.all());
+
+    @Override
+    public Supplier findById(long id) {
+        List<Supplier> suppliers = findAll(supplier.id.eq(id));
+        return suppliers.isEmpty() ? null : suppliers.get(0);
+    }
+
+    @Override
+    public List<Supplier> findAll(Predicate... where) {
+        return queryFactory.select(supplierBean)
+            .from(supplier)
+            .where(where)
+            .fetch();
+    }
+
+    @Override
+    public Supplier save(Supplier s) {
+        if (s.getId() == null) {
+            Long id = queryFactory.insert(supplier)
+                .set(supplier.code, s.getCode())
+                .set(supplier.name, s.getName())
+                .executeWithKey(supplier.id);
+            s.setId(id);
+        } else {
+            queryFactory.update(supplier)
+                .set(supplier.code, s.getCode())
+                .set(supplier.name, s.getName())
+                .where(supplier.id.eq(s.getId()))
+                .execute();
+        }
+
+        return s;
+    }
+
+    @Override
+    public long count() {
+        return queryFactory.from(supplier).fetchCount();
+    }
+
+    @Override
+    public void delete(Supplier s) {
+        queryFactory.delete(supplier)
+            .where(supplier.id.eq(s.getId()))
+            .execute();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Address.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Address.java
new file mode 100644
index 0000000000..73d217af82
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Address.java
@@ -0,0 +1,15 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+@Data
+public class Address {
+
+    private Long id;
+
+    private String street, zip, town, state, country;
+
+    private String otherDetails;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Customer.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Customer.java
new file mode 100644
index 0000000000..9e28838519
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Customer.java
@@ -0,0 +1,19 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+public class Customer {
+
+    private Long id;
+
+    private Person contactPerson;
+
+    private String name;
+
+    private Set<CustomerAddress> addresses;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerAddress.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerAddress.java
new file mode 100644
index 0000000000..e78b9f268a
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerAddress.java
@@ -0,0 +1,16 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+import org.joda.time.LocalDate;
+
+@Data
+public class CustomerAddress {
+
+    private Address address;
+
+    private String addressTypeCode;
+
+    private LocalDate fromDate, toDate;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerPaymentMethod.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerPaymentMethod.java
new file mode 100644
index 0000000000..cb422dda58
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/CustomerPaymentMethod.java
@@ -0,0 +1,18 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+import org.joda.time.LocalDate;
+
+@Data
+public class CustomerPaymentMethod {
+
+    private Long id;
+
+    private Long customerId;
+
+    private String cardNumber, otherDetails, paymentMethodCode;
+
+    private LocalDate fromDate, toDate;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Order.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Order.java
new file mode 100644
index 0000000000..88e02e48c4
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Order.java
@@ -0,0 +1,24 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+import org.joda.time.LocalDate;
+
+import java.util.Set;
+
+@Data
+public class Order {
+
+    private Long id;
+
+    private CustomerPaymentMethod customerPaymentMethod;
+
+    private LocalDate orderPlacedDate, orderPaidDate;
+
+    private String orderStatus;
+
+    private Double totalOrderPrice;
+
+    private Set<OrderProduct> orderProducts;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderDelivery.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderDelivery.java
new file mode 100644
index 0000000000..06085992b0
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderDelivery.java
@@ -0,0 +1,14 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+import org.joda.time.LocalDate;
+
+@Data
+public class OrderDelivery {
+
+    private String deliveryStatusCode;
+
+    private LocalDate reportedDate;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderProduct.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderProduct.java
new file mode 100644
index 0000000000..91613982c5
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/OrderProduct.java
@@ -0,0 +1,15 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+@Data
+public class OrderProduct {
+
+    private Long productId;
+
+    private String comments;
+
+    private Integer quantity;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Person.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Person.java
new file mode 100644
index 0000000000..6cb63d65a6
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Person.java
@@ -0,0 +1,13 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+@Data
+public class Person {
+
+    private Long id;
+
+    private String firstName, lastName, email, phone;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Product.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Product.java
new file mode 100644
index 0000000000..def999e782
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Product.java
@@ -0,0 +1,22 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+public class Product {
+
+    private Long id;
+
+    private String name;
+
+    private String otherProductDetails;
+
+    private Double price;
+
+    private Supplier supplier;
+
+    private Set<ProductL10n> localizations;
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/ProductL10n.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/ProductL10n.java
new file mode 100644
index 0000000000..1a749c7bf1
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/ProductL10n.java
@@ -0,0 +1,15 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+@Data
+public class ProductL10n {
+
+    private String description;
+
+    private String lang;
+
+    private String name;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Supplier.java b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Supplier.java
new file mode 100644
index 0000000000..322fcf34d8
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/java/com/querydsl/example/dto/Supplier.java
@@ -0,0 +1,15 @@
+package com.querydsl.example.dto;
+
+import lombok.Data;
+
+@Data
+public class Supplier {
+
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+}
+
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/001_schema.sql b/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/001_schema.sql
new file mode 100644
index 0000000000..20e9e02bf8
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/001_schema.sql
@@ -0,0 +1,104 @@
+create table supplier (
+  id serial primary key,
+  code varchar(255),
+  name varchar(255)
+);
+
+create table product (
+  id serial primary key,
+  supplier_id long,
+  name varchar(64),
+  price double,
+  other_product_details varchar(64),
+  
+  constraint supplier_fk foreign key (supplier_id) references supplier(id)
+);
+
+create table product_l10n (
+  product_id long,
+  lang varchar(5),
+  name varchar(128),
+  description varchar(255),  
+  
+  constraint product_fk foreign key (product_id) references product(id)
+);
+
+create table person (
+  id serial primary key,
+  first_name varchar(64),
+  last_name varchar(64),
+  phone varchar(64),
+  email varchar(64)
+);
+
+create table customer (
+  id serial primary key,
+  name varchar(64),
+  contact_person_id long,
+ 
+  constraint contact_person_fk foreign key (contact_person_id) references person(id)
+);
+
+create table customer_payment_method (
+  id serial primary key,
+  customer_id long,
+  payment_method_code varchar(12),
+  card_number varchar(24),
+  from_date date,
+  to_date date,
+  other_details varchar(128),
+  
+  constraint customer_fk foreign key (customer_id) references customer(id)
+);
+
+create table customer_order (
+  id serial primary key, 
+  customer_id long,
+  customer_payment_method_id long,
+  order_status varchar(12),
+  order_placed_date date,
+  order_paid_date date,
+  total_order_price double,
+  
+  constraint customer2_fk foreign key (customer_id) references customer(id),
+  constraint payment_method_fk foreign key (customer_payment_method_id) references customer_payment_method(id)
+);
+
+create table customer_order_product (
+  order_id long,
+  product_id long,
+  quantity int,
+  comments varchar(12),
+  
+  constraint order_fk foreign key (order_id) references customer_order(id),
+  constraint product2_fk foreign key (product_id) references product(id)
+);
+
+create table customer_order_delivery (
+  order_id long,
+  reported_date date,
+  delivery_status_code varchar(12),
+  
+  constraint order2_fk foreign key (order_id) references customer_order(id)
+);
+
+create table address (
+  id serial primary key, 
+  street varchar(64),
+  zip varchar(64),
+  town varchar(64),
+  state varchar(64),
+  country varchar(3),
+  other_details varchar(64) 
+);
+
+create table customer_address (
+  customer_id long,
+  address_id long,
+  from_date date,
+  to_date date,
+  address_type_code varchar(12),
+  
+  constraint customer3_fk foreign key (customer_id) references customer(id),
+  constraint address_fk foreign key (address_id) references address(id)
+);
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/drop_all.sql b/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/drop_all.sql
new file mode 100644
index 0000000000..56025e8f23
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/main/resources/sql/drop_all.sql
@@ -0,0 +1 @@
+drop all objects;
\ No newline at end of file
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestConfiguration.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestConfiguration.java
new file mode 100644
index 0000000000..0936821f4b
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestConfiguration.java
@@ -0,0 +1,18 @@
+package com.querydsl.example.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@Import(AppConfiguration.class)
+@EnableTransactionManagement
+public class TestConfiguration {
+
+    @Bean
+    public TestDataService testDataService() {
+        return new TestDataServiceImpl();
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataService.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataService.java
new file mode 100644
index 0000000000..8f8ba98bcb
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataService.java
@@ -0,0 +1,9 @@
+package com.querydsl.example.config;
+
+public interface TestDataService {
+
+    void addTestData();
+
+    void cleanTestData();
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java
new file mode 100644
index 0000000000..deafe5f750
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/config/TestDataServiceImpl.java
@@ -0,0 +1,136 @@
+package com.querydsl.example.config;
+
+import com.querydsl.example.dao.*;
+import com.querydsl.example.dto.*;
+import org.joda.time.LocalDate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.sql.DataSource;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+
+@Transactional
+public class TestDataServiceImpl implements TestDataService {
+
+    @Autowired DataSource dataSource;
+
+    @Autowired CustomerDao customerDao;
+    @Autowired OrderDao orderDao;
+    @Autowired PersonDao personDao;
+    @Autowired ProductDao productDao;
+    @Autowired SupplierDao supplierDao;
+
+    @Override
+    public void addTestData() {
+        // suppliers
+        Supplier supplier = new Supplier();
+        supplier.setCode("acme");
+        supplier.setName("ACME");
+        supplierDao.save(supplier);
+
+        Supplier supplier2 = new Supplier();
+        supplier2.setCode("bigs");
+        supplier2.setName("BigS");
+        supplierDao.save(supplier2);
+
+        // products
+        Product product = new Product();
+        product.setName("Screwdriver");
+        product.setPrice(12.0);
+        product.setSupplier(supplier);
+
+        ProductL10n l10nEn = new ProductL10n();
+        l10nEn.setLang("en");
+        l10nEn.setName("Screwdriver");
+
+        ProductL10n l10nDe = new ProductL10n();
+        l10nDe.setLang("de");
+        l10nDe.setName("Schraubenzieher");
+
+        product.setLocalizations(new HashSet<ProductL10n>(Arrays.asList(l10nEn, l10nDe)));
+        productDao.save(product);
+
+        Product product2 = new Product();
+        product2.setName("Hammer");
+        product2.setPrice(5.0);
+        product2.setSupplier(supplier2);
+
+        l10nEn = new ProductL10n();
+        l10nEn.setLang("en");
+        l10nEn.setName("Hammer");
+
+        product2.setLocalizations(Collections.singleton(l10nEn));
+        productDao.save(product2);
+
+        // persons
+        Person person = new Person();
+        person.setFirstName("John");
+        person.setLastName("Doe");
+        person.setEmail("john.doe@aexample.com");
+        personDao.save(person);
+
+        Person person2 = new Person();
+        person2.setFirstName("Mary");
+        person2.setLastName("Blue");
+        person2.setEmail("mary.blue@example.com");
+        personDao.save(person2);
+
+        // customers
+        Address address = new Address();
+        address.setStreet("Mainstreet 1");
+        address.setZip("00100");
+        address.setTown("Helsinki");
+        address.setCountry("FI");
+
+        CustomerAddress customerAddress = new CustomerAddress();
+        customerAddress.setAddress(address);
+        customerAddress.setAddressTypeCode("office");
+        customerAddress.setFromDate(new LocalDate());
+
+        Customer customer = new Customer();
+        customer.setAddresses(Collections.singleton(customerAddress));
+        customer.setContactPerson(person);
+        customer.setName("SmallS");
+        customerDao.save(customer);
+
+        Customer customer2 = new Customer();
+        customer2.setAddresses(Collections.<CustomerAddress>emptySet());
+        customer2.setContactPerson(person);
+        customer2.setName("MediumM");
+        customerDao.save(customer2);
+
+        // orders
+        OrderProduct orderProduct = new OrderProduct();
+        orderProduct.setComments("my comments");
+        orderProduct.setProductId(product.getId());
+        orderProduct.setQuantity(4);
+
+        CustomerPaymentMethod paymentMethod = new CustomerPaymentMethod();
+        paymentMethod.setCardNumber("11111111111");
+        paymentMethod.setCustomerId(customer.getId());
+        paymentMethod.setFromDate(new LocalDate());
+        paymentMethod.setPaymentMethodCode("abc");
+
+        Order order = new Order();
+        order.setCustomerPaymentMethod(paymentMethod);
+        order.setOrderPlacedDate(new LocalDate());
+        order.setOrderProducts(Collections.singleton(orderProduct));
+        order.setTotalOrderPrice(13124.00);
+        orderDao.save(order);
+    }
+
+    @Override
+    public void cleanTestData() {
+        ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
+        populator.addScripts(
+                new ClassPathResource("sql/drop_all.sql"),
+                new ClassPathResource("sql/001_schema.sql")
+        );
+        populator.execute(dataSource);
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java
new file mode 100644
index 0000000000..46414ef5c9
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java
@@ -0,0 +1,27 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.config.TestConfiguration;
+import com.querydsl.example.config.TestDataService;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {TestConfiguration.class})
+@Rollback
+@Transactional
+public abstract class AbstractDaoTest {
+
+    @Autowired
+    TestDataService testDataService;
+
+    @Before
+    public void setUp() {
+        testDataService.cleanTestData();
+        testDataService.addTestData();
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java
new file mode 100644
index 0000000000..bcab6f4419
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java
@@ -0,0 +1,40 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.dto.Customer;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class CustomerDaoTest extends AbstractDaoTest {
+
+    @Autowired
+    CustomerDao customerDao;
+
+    @Test
+    public void findAll() {
+        List<Customer> customers = customerDao.findAll();
+        assertFalse(customers.isEmpty());
+    }
+
+    @Test
+    public void findById() {
+        assertNotNull(customerDao.findById(1));
+    }
+
+    @Test
+    public void update() {
+        Customer customer = customerDao.findById(1);
+        customerDao.save(customer);
+    }
+
+    @Test
+    public void delete() {
+        Customer customer = customerDao.findById(1);
+        customerDao.delete(customer);
+        assertNull(customerDao.findById(1));
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
new file mode 100644
index 0000000000..37ee31c841
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
@@ -0,0 +1,53 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.dto.CustomerPaymentMethod;
+import com.querydsl.example.dto.Order;
+import com.querydsl.example.dto.OrderProduct;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class OrderDaoTest extends AbstractDaoTest {
+
+    @Autowired
+    OrderDao orderDao;
+
+    @Test
+    public void findAll() {
+        List<Order> orders = orderDao.findAll();
+        assertFalse(orders.isEmpty());
+    }
+
+    @Test
+    public void findById() {
+        assertNotNull(orderDao.findById(1));
+    }
+
+    @Test
+    public void update() {
+        Order order = orderDao.findById(1);
+        orderDao.save(order);
+    }
+
+    @Test
+    public void delete() {
+        OrderProduct orderProduct = new OrderProduct();
+        orderProduct.setProductId(1L);
+        orderProduct.setQuantity(1);
+
+        // FIXME
+        CustomerPaymentMethod paymentMethod = new CustomerPaymentMethod();
+
+        Order order = new Order();
+        order.setCustomerPaymentMethod(paymentMethod);
+        order.setOrderProducts(Collections.singleton(orderProduct));
+        orderDao.save(order);
+        assertNotNull(order.getId());
+        orderDao.delete(order);
+        assertNull(orderDao.findById(order.getId()));
+    }
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java
new file mode 100644
index 0000000000..920b30ea0d
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java
@@ -0,0 +1,43 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.dto.Person;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class PersonDaoTest extends AbstractDaoTest {
+
+    @Autowired
+    PersonDao personDao;
+
+    @Test
+    public void findAll() {
+        List<Person> persons = personDao.findAll();
+        assertFalse(persons.isEmpty());
+    }
+
+    @Test
+    public void findById() {
+        assertNotNull(personDao.findById(1));
+    }
+
+    @Test
+    public void update() {
+        Person person = personDao.findById(1);
+        personDao.save(person);
+    }
+
+    @Test
+    public void delete() {
+        Person person = new Person();
+        person.setEmail("john@acme.com");
+        personDao.save(person);
+        assertNotNull(person.getId());
+        personDao.delete(person);
+        assertNull(personDao.findById(person.getId()));
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java
new file mode 100644
index 0000000000..79d062de93
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java
@@ -0,0 +1,49 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.dto.Product;
+import com.querydsl.example.dto.ProductL10n;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class ProductDaoTest extends AbstractDaoTest {
+
+    @Autowired
+    SupplierDao supplierDao;
+
+    @Autowired ProductDao productDao;
+
+    @Test
+    public void findAll() {
+        List<Product> products = productDao.findAll();
+        assertFalse(products.isEmpty());
+    }
+
+    @Test
+    public void findById() {
+        assertNotNull(productDao.findById(1));
+    }
+
+    @Test
+    public void update() {
+        Product product = productDao.findById(1);
+        productDao.save(product);
+    }
+
+    @Test
+    public void delete() {
+        Product product = new Product();
+        product.setSupplier(supplierDao.findById(1));
+        product.setName("ProductX");
+        product.setLocalizations(Collections.singleton(new ProductL10n()));
+        productDao.save(product);
+        assertNotNull(productDao.findById(product.getId()));
+        productDao.delete(product);
+        assertNull(productDao.findById(product.getId()));
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java
new file mode 100644
index 0000000000..12782ff7af
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java
@@ -0,0 +1,42 @@
+package com.querydsl.example.dao;
+
+import com.querydsl.example.dto.Supplier;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class SupplierDaoTest extends AbstractDaoTest {
+
+    @Autowired
+    SupplierDao supplierDao;
+
+    @Test
+    public void findAll() {
+        List<Supplier> suppliers = supplierDao.findAll();
+        assertFalse(suppliers.isEmpty());
+    }
+
+    @Test
+    public void findById() {
+        assertNotNull(supplierDao.findById(1));
+    }
+
+    @Test
+    public void update() {
+        Supplier supplier = supplierDao.findById(1);
+        supplierDao.save(supplier);
+    }
+
+    @Test
+    public void delete() {
+        Supplier supplier = new Supplier();
+        supplierDao.save(supplier);
+        assertNotNull(supplier.getId());
+        supplierDao.delete(supplier);
+        assertNull(supplierDao.findById(supplier.getId()));
+    }
+
+}
diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/resources/jdbc.properties b/querydsl-examples/querydsl-example-sql-spring/src/test/resources/jdbc.properties
new file mode 100644
index 0000000000..4f8e43b32b
--- /dev/null
+++ b/querydsl-examples/querydsl-example-sql-spring/src/test/resources/jdbc.properties
@@ -0,0 +1,4 @@
+jdbc.driver=org.h2.Driver
+jdbc.url=jdbc:h2:mem:example'
+jdbc.user=sa
+jdbc.password=
\ No newline at end of file
diff --git a/querydsl-guava/pom.xml b/querydsl-guava/pom.xml
new file mode 100644
index 0000000000..82f3a83824
--- /dev/null
+++ b/querydsl-guava/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>querydsl-root</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>querydsl-guava</artifactId>
+    <name>Querydsl - Guava Group By utilities</name>
+    <description>Utilities for creating group by factory expressions for Guava collection types</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test-jar</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>com.querydsl.core.group.guava</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java
new file mode 100644
index 0000000000..5e6cdc2270
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GMultimap.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.SortedSetMultimap;
+import com.google.common.collect.TreeMultimap;
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.group.AbstractGroupExpression;
+import com.querydsl.core.group.GroupCollector;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.group.QPair;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+abstract class GMultimap<K, V, M extends Multimap<K,V>> extends AbstractGroupExpression<Pair<K, V>, M> {
+
+    private static final long serialVersionUID = 7106389414200843920L;
+
+    GMultimap(QPair<K,V> qpair) {
+        super(Multimap.class, qpair);
+    }
+
+    protected abstract M createMap();
+
+    public static <T, U> GMultimap<T, U, Multimap<T,U>> createLinked(QPair<T, U> expr) {
+        return new GMultimap<T, U, Multimap<T, U>>(expr) {
+            @Override
+            protected Multimap<T, U> createMap() {
+                return LinkedHashMultimap.create();
+            }
+        };
+    }
+
+    public static <T extends Comparable<? super T>, U extends Comparable<? super U>> GMultimap<T, U, SortedSetMultimap<T, U>> createSorted(QPair<T, U> expr) {
+        return new GMultimap<T, U, SortedSetMultimap<T, U>>(expr) {
+            @Override
+            protected SortedSetMultimap<T, U> createMap() {
+                return TreeMultimap.create();
+            }
+        };
+    }
+
+    public static <T, U> GMultimap<T, U, SortedSetMultimap<T, U>> createSorted(QPair<T, U> expr, final Comparator<? super T> comparator, final Comparator<? super U> comparator2) {
+        return new GMultimap<T, U, SortedSetMultimap<T, U>>(expr) {
+            @Override
+            protected SortedSetMultimap<T, U> createMap() {
+                return TreeMultimap.create(comparator, comparator2);
+            }
+        };
+    }
+
+    @Override
+    public GroupCollector<Pair<K,V>, M> createGroupCollector() {
+        return new GroupCollector<Pair<K,V>, M>() {
+
+            private final M map = createMap();
+
+            @Override
+            public void add(Pair<K,V> pair) {
+                map.put(pair.getFirst(), pair.getSecond());
+            }
+
+            @Override
+            public M get() {
+                return map;
+            }
+
+        };
+    }
+
+    static class Mixin<K, V, T, U, R extends Multimap<? super T, ? super U>> extends AbstractGroupExpression<Pair<K, V>, R> {
+
+        private static final long serialVersionUID = 1939989270493531116L;
+
+        private class GroupCollectorImpl implements GroupCollector<Pair<K, V>, R> {
+
+            private final GroupCollector<Pair<T, U>, R> groupCollector;
+
+            private final Map<K, GroupCollector<K, T>> keyCollectors = new LinkedHashMap<K, GroupCollector<K, T>>();
+
+            private final Map<GroupCollector<K, T>, GroupCollector<V, U>> valueCollectors = new HashMap<GroupCollector<K, T>, GroupCollector<V, U>>();
+
+            GroupCollectorImpl() {
+                this.groupCollector = mixin.createGroupCollector();
+            }
+
+            @Override
+            public void add(Pair<K, V> pair) {
+                K first = pair.getFirst();
+                GroupCollector<K, T> keyCollector = keyCollectors.get(first);
+                if (keyCollector == null) {
+                    keyCollector = keyExpression.createGroupCollector();
+                    keyCollectors.put(first, keyCollector);
+                }
+                keyCollector.add(first);
+                GroupCollector<V, U> valueCollector = valueCollectors.get(keyCollector);
+                if (valueCollector == null) {
+                    valueCollector = valueExpression.createGroupCollector();
+                    valueCollectors.put(keyCollector, valueCollector);
+                }
+                V second = pair.getSecond();
+                valueCollector.add(second);
+            }
+
+            @Override
+            public R get() {
+                for (GroupCollector<K, T> keyCollector : keyCollectors.values()) {
+                    T key = keyCollector.get();
+                    GroupCollector<V, U> valueCollector = valueCollectors.remove(keyCollector);
+                    U value = valueCollector.get();
+                    groupCollector.add(Pair.of(key, value));
+                }
+                keyCollectors.clear();
+                return groupCollector.get();
+            }
+
+        }
+
+        private final GroupExpression<Pair<T, U>, R> mixin;
+
+        private final GroupExpression<K, T> keyExpression;
+        private final GroupExpression<V, U> valueExpression;
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        Mixin(GroupExpression<K, T> keyExpression, GroupExpression<V, U> valueExpression, AbstractGroupExpression<Pair<T, U>, R> mixin) {
+            super((Class) mixin.getType(), QPair.create(keyExpression.getExpression(), valueExpression.getExpression()));
+            this.keyExpression = keyExpression;
+            this.valueExpression = valueExpression;
+            this.mixin = mixin;
+        }
+
+        @Override
+        public GroupCollector<Pair<K, V>, R> createGroupCollector() {
+            return new GroupCollectorImpl();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GOne.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GOne.java
new file mode 100644
index 0000000000..91c3cc5b68
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GOne.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.querydsl.core.group.AbstractGroupExpression;
+import com.querydsl.core.group.GroupCollector;
+import com.querydsl.core.types.Expression;
+
+class GOne<T> extends AbstractGroupExpression<T, T> {
+
+    private static final long serialVersionUID = 3518868612387641383L;
+
+    @SuppressWarnings("unchecked")
+    GOne(Expression<T> expr) {
+        super((Class) expr.getType(), expr);
+    }
+
+    @Override
+    public GroupCollector<T,T> createGroupCollector() {
+        return new GroupCollector<T,T>() {
+            private boolean first = true;
+
+            private T val;
+
+            @Override
+            public void add(T o) {
+                if (first) {
+                    val = o;
+                    first = false;
+                }
+            }
+
+            @Override
+            public T get() {
+                return val;
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java
new file mode 100644
index 0000000000..30e42c3c30
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GTable.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+import com.google.common.collect.TreeBasedTable;
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.group.AbstractGroupExpression;
+import com.querydsl.core.group.GroupCollector;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.group.QPair;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+
+abstract class GTable<R, C, V, M extends Table<R, C, V>> extends AbstractGroupExpression<Pair<Pair<R, C>, V>, M> {
+
+    private static final long serialVersionUID = 7106389414200843920L;
+
+    GTable(QPair<Pair<R,C>, V> qpair) {
+        super(Table.class, qpair);
+    }
+
+    protected abstract M createTable();
+
+    public static <T, U, W> GTable<T, U, W, Table<T, U, W>> create(QPair<Pair<T, U>, W> expr) {
+        return new GTable<T, U, W, Table<T, U, W>>(expr) {
+            @Override
+            protected Table<T, U, W> createTable() {
+                return HashBasedTable.create();
+            }
+        };
+    }
+
+    public static <T extends Comparable<? super T>, U extends Comparable<? super U>, W> GTable<T, U, W, TreeBasedTable<T, U, W>> createSorted(QPair<Pair<T, U>, W> expr) {
+        return new GTable<T, U, W, TreeBasedTable<T, U, W>>(expr) {
+            @Override
+            protected TreeBasedTable<T, U, W> createTable() {
+                return TreeBasedTable.create();
+            }
+        };
+    }
+
+    public static <T, U, W> GTable<T, U, W, TreeBasedTable<T, U, W>> createSorted(QPair<Pair<T, U>, W> expr, final Comparator<? super T> rowComparator, final Comparator<? super U> columnComparator) {
+        return new GTable<T, U, W, TreeBasedTable<T, U, W>>(expr) {
+            @Override
+            protected TreeBasedTable<T, U, W> createTable() {
+                return TreeBasedTable.create(rowComparator, columnComparator);
+            }
+        };
+    }
+
+    @Override
+    public GroupCollector<Pair<Pair<R, C>, V>, M> createGroupCollector() {
+        return new GroupCollector<Pair<Pair<R, C>, V>, M>() {
+
+            private final M table = createTable();
+
+            @Override
+            public void add(Pair<Pair<R, C>, V> pair) {
+                table.put(pair.getFirst().getFirst(), pair.getFirst().getSecond(), pair.getSecond());
+            }
+
+            @Override
+            public M get() {
+                return table;
+            }
+
+        };
+    }
+
+    static class Mixin<R, C, V, T, U, W, RES extends Table<? super T, ? super U, ? super W>> extends AbstractGroupExpression<Pair<Pair<R, C>, V>, RES> {
+
+        private static final long serialVersionUID = 1939989270493531116L;
+
+        private class GroupCollectorImpl implements GroupCollector<Pair<Pair<R, C>, V>, RES> {
+
+            private final  GroupCollector<Pair<Pair<T, U>, W>, RES> groupCollector;
+
+            private final Table<R, C, GroupCollector<R, T>> rowCollectors = HashBasedTable.create();
+            private final Map<GroupCollector<R, T>, GroupCollector<C, U>> columnCollectors = new HashMap<GroupCollector<R, T>, GroupCollector<C, U>>();
+            private final Map<GroupCollector<C, U>, GroupCollector<V, W>> valueCollectors = new HashMap<GroupCollector<C, U>, GroupCollector<V, W>>();
+
+            GroupCollectorImpl() {
+                this.groupCollector = mixin.createGroupCollector();
+            }
+
+            @Override
+            public void add(Pair<Pair<R, C>, V> pair) {
+                Pair<R, C> first = pair.getFirst();
+                R rowKey = first.getFirst();
+                C columnKey = first.getSecond();
+
+                GroupCollector<R, T> rowCollector = rowCollectors.get(rowKey, columnKey);
+                if (rowCollector == null) {
+                    rowCollector = rowExpression.createGroupCollector();
+                    rowCollectors.put(rowKey, columnKey, rowCollector);
+                }
+                rowCollector.add(rowKey);
+
+                GroupCollector<C, U> columnCollector = columnCollectors.get(rowCollector);
+                if (columnCollector == null) {
+                    columnCollector = columnExpression.createGroupCollector();
+                    columnCollectors.put(rowCollector, columnCollector);
+                }
+                columnCollector.add(columnKey);
+
+                GroupCollector<V, W> valueCollector = valueCollectors.get(columnCollector);
+                if (valueCollector == null) {
+                    valueCollector = valueExpression.createGroupCollector();
+                    valueCollectors.put(columnCollector, valueCollector);
+                }
+                V second = pair.getSecond();
+                valueCollector.add(second);
+            }
+
+            @Override
+            public RES get() {
+                for (GroupCollector<R, T> rowCollector : rowCollectors.values()) {
+                    T rowKey = rowCollector.get();
+                    GroupCollector<C, U> columnCollector = columnCollectors.get(rowCollector);
+                    U columnKey = columnCollector.get();
+                    GroupCollector<V, W> valueCollector = valueCollectors.get(columnCollector);
+                    W value = valueCollector.get();
+                    groupCollector.add(Pair.of(Pair.of(rowKey, columnKey), value));
+                }
+                return groupCollector.get();
+            }
+
+        }
+
+        private final GroupExpression<Pair<Pair<T, U>, W>, RES> mixin;
+        private final GroupExpression<R, T> rowExpression;
+        private final GroupExpression<C, U> columnExpression;
+        private final GroupExpression<V, W> valueExpression;
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        Mixin(GroupExpression<R, T> rowExpression, GroupExpression<C, U> columnExpression, GroupExpression<V, W> valueExpression, AbstractGroupExpression<Pair<Pair<T, U>, W>, RES> mixin) {
+            super((Class) mixin.getType(), QPair.create(QPair.create(rowExpression.getExpression(), columnExpression.getExpression()), valueExpression.getExpression()));
+            this.rowExpression = rowExpression;
+            this.columnExpression = columnExpression;
+            this.valueExpression = valueExpression;
+            this.mixin = mixin;
+        }
+
+        @Override
+        public GroupCollector<Pair<Pair<R, C>, V>, RES> createGroupCollector() {
+            return new GroupCollectorImpl();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByMultimap.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByMultimap.java
new file mode 100644
index 0000000000..67593459b9
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByMultimap.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.group.AbstractGroupByTransformer;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.group.GroupImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+
+/**
+ * Provides aggregated results as a map
+ *
+ * @author Jan-Willem Gmelig Meyling
+ *
+ * @param <K> multi map key type
+ * @param <V> multi map value type
+ * @param <R> multi map type
+ */
+public class GroupByMultimap<K, V, R extends Multimap<K,V>> extends AbstractGroupByTransformer<K, R> {
+
+    GroupByMultimap(Expression<K> key, Expression<?>... expressions) {
+        super(key, expressions);
+    }
+
+    @Override
+    public R transform(FetchableQuery<?,?> query) {
+        Multimap<K, Group> groups = LinkedHashMultimap.create();
+
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        CloseableIterator<Tuple> iter = query.select(expr).iterate();
+        try {
+            while (iter.hasNext()) {
+                @SuppressWarnings("unchecked") //This type is mandated by the key type
+                K[] row = (K[]) iter.next().toArray();
+                K groupId = row[0];
+                GroupImpl group = new GroupImpl(groupExpressions, maps);
+                groups.put(groupId, group);
+                group.add(row);
+            }
+        } finally {
+            iter.close();
+        }
+
+        // transform groups
+        return transform(groups);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    protected R transform(Multimap<K, Group> groups) {
+        return (R) groups;
+    }
+
+}
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByTable.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByTable.java
new file mode 100644
index 0000000000..5d6432e59f
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GroupByTable.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Table;
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.group.AbstractGroupByTransformer;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.group.GroupImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpressionUtils;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.util.ArrayUtils;
+
+/**
+ * Provides aggregated results as a table
+ *
+ * @author Jan-Willem Gmelig Meyling
+ *
+ * @param <R> row type
+ * @param <C> column type
+ * @param <V> value type
+ * @param <RES> table type
+ */
+public class GroupByTable<R, C, V, RES extends Table<R, C, V>> extends AbstractGroupByTransformer<R, RES> {
+
+    GroupByTable(Expression<R> rowKey, Expression<C> columnKey, Expression<?>... expressions) {
+        super(rowKey, ArrayUtils.combine(Expression.class, columnKey, expressions));
+    }
+
+    @Override
+    public RES transform(FetchableQuery<?,?> query) {
+        // TODO Table<Object, Object, Group> after support for it in https://github.com/querydsl/querydsl/issues/2644
+        Table<R, Object, Group> groups = HashBasedTable.create();
+
+        // create groups
+        FactoryExpression<Tuple> expr = FactoryExpressionUtils.wrap(Projections.tuple(expressions));
+        boolean hasGroups = false;
+        for (Expression<?> e : expr.getArgs()) {
+            hasGroups |= e instanceof GroupExpression;
+        }
+        if (hasGroups) {
+            expr = withoutGroupExpressions(expr);
+        }
+        CloseableIterator<Tuple> iter = query.select(expr).iterate();
+        try {
+            while (iter.hasNext()) {
+                @SuppressWarnings("unchecked") //This type is mandated by the key type
+                Object[] row = iter.next().toArray();
+                R groupId = (R) row[0];
+                Object rowId = row[1];
+                GroupImpl group = (GroupImpl) groups.get(groupId, rowId);
+                if (group == null) {
+                    group = new GroupImpl(groupExpressions, maps);
+                    groups.put(groupId, rowId, group);
+                }
+                group.add(row);
+            }
+        } finally {
+            iter.close();
+        }
+
+        // transform groups
+        return transform(groups);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    protected RES transform(Table<R, ?, Group> groups) {
+        return (RES) groups;
+    }
+
+}
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java
new file mode 100644
index 0000000000..e7970d0c0f
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupBy.java
@@ -0,0 +1,455 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.Multimap;
+import com.google.common.collect.SortedSetMultimap;
+import com.google.common.collect.Table;
+import com.google.common.collect.TreeBasedTable;
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.group.AbstractGroupExpression;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.group.GroupExpression;
+import com.querydsl.core.group.QPair;
+import com.querydsl.core.types.Expression;
+
+import java.util.Comparator;
+
+/**
+ * {@code GuavaGroupBy} extends {@code GroupBy} with factory methods for creating {@link ResultTransformer} and {@link
+ * GroupExpression} instances for Guava Collection types.
+ *
+ * @author Jan-Willem Gmelig Meyling
+ */
+public final class GuavaGroupBy extends GroupBy {
+
+    /**
+     * Create a new GroupByBuilder for the given key expression
+     *
+     * @param key key for aggregation
+     * @return builder for further specification
+     */
+    public static <K> GuavaGroupByBuilder<K> groupBy(Expression<K> key) {
+        return new GuavaGroupByBuilder<K>(key);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V> AbstractGroupExpression<Pair<K, V>, Multimap<K, V>> multimap(Expression<K> key,
+                                                                                      Expression<V> value) {
+        return GMultimap.createLinked(QPair.create(key, value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T> AbstractGroupExpression<Pair<K, V>, Multimap<T, V>> multimap(GroupExpression<K, T> key,
+                                                                                         Expression<V> value) {
+        return multimap(key, new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, U> AbstractGroupExpression<Pair<K, V>, Multimap<K, U>> multimap(Expression<K> key,
+                                                                                         GroupExpression<V, U> value) {
+        return multimap(new GOne<K>(key), value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T, U> AbstractGroupExpression<Pair<K, V>, Multimap<T, U>> multimap(GroupExpression<K, T> key,
+                                                                                            GroupExpression<V, U> value) {
+        return new GMultimap.Mixin<K, V, T, U, Multimap<T, U>>(key, value, GMultimap.createLinked(QPair.create(key, value)));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K extends Comparable<? super K>, V extends Comparable<? super V>> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<K, V>> sortedSetMultimap(Expression<K> key,
+                                                                                                                                                                    Expression<V> value) {
+        return GMultimap.createSorted(QPair.create(key, value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T extends Comparable<? super T>> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<T, V>> sortedSetMultimap(GroupExpression<K, T> key,
+                                                                                                                                         Expression<V> value) {
+        return sortedSetMultimap(key, (GroupExpression) new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K extends Comparable<? super K>, V, U> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<K, U>> sortedSetMultimap(Expression<K> key,
+                                                                                                                                         GroupExpression<V, U> value) {
+        return sortedSetMultimap(new GOne<K>(key), (GroupExpression) value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @return wrapper expression
+     */
+    public static <K, V, T extends Comparable<? super T>, U extends Comparable<? super U>> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<T, U>> sortedSetMultimap(GroupExpression<K, T> key,
+                                                                                                                                                                          GroupExpression<V, U> value) {
+        return new GMultimap.Mixin<K, V, T, U, SortedSetMultimap<T, U>>(key, value, GMultimap.createSorted(QPair.create(key, value)));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param keyComparator comparator for the created TreeMap instances
+     * @param valueComparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<K, V>> sortedSetMultimap(Expression<K> key,
+                                                                                                        Expression<V> value,
+                                                                                                        Comparator<? super K> keyComparator,
+                                                                                                        Comparator<? super V> valueComparator) {
+        return GMultimap.createSorted(QPair.create(key, value), keyComparator, valueComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param comparator comparator for the created TreeMap instances
+     * @param valueComparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, T> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<T, V>> sortedSetMultimap(GroupExpression<K, T> key,
+                                                                                                           Expression<V> value,
+                                                                                                           Comparator<? super T> comparator,
+                                                                                                           Comparator<? super V> valueComparator) {
+        return sortedSetMultimap(key, new GOne<V>(value), comparator, valueComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param keyComparator comparator for the created TreeMap instances
+     * @param valueComparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, U> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<K, U>> sortedSetMultimap(Expression<K> key,
+                                                                                                           GroupExpression<V, U> value,
+                                                                                                           Comparator<? super K> keyComparator,
+                                                                                                           Comparator<? super U> valueComparator) {
+        return sortedSetMultimap(new GOne<K>(key), value, keyComparator, valueComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing TreeMap using the given comparator
+     *
+     * @param key key for the map entries
+     * @param value value for the map entries
+     * @param keyComparator comparator for the created TreeMap instances
+     * @param valueComparator comparator for the created TreeMap instances
+     * @return wrapper expression
+     */
+    public static <K, V, T, U> AbstractGroupExpression<Pair<K, V>, SortedSetMultimap<T, U>> sortedSetMultimap(GroupExpression<K, T> key,
+                                                                                                              GroupExpression<V, U> value,
+                                                                                                              Comparator<? super T> keyComparator,
+                                                                                                              Comparator<? super U> valueComparator) {
+        return new GMultimap.Mixin<K, V, T, U, SortedSetMultimap<T, U>>(key, value, GMultimap.createSorted(QPair.create(key, value), keyComparator, valueComparator));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<R, C, V>> table(Expression<R> row,
+                                                                                               Expression<C> column,
+                                                                                               Expression<V> value) {
+        return GTable.create(QPair.create(QPair.create(row, column), value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<W, C, V>> table(GroupExpression<R, W> row,
+                                                                                                  Expression<C> column,
+                                                                                                  Expression<V> value) {
+        return table(row, new GOne<C>(column), new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<W, X, V>> table(GroupExpression<R, W> row,
+                                                                                                     GroupExpression<C, X> column,
+                                                                                                     Expression<V> value) {
+        return table(row, column, new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<R, W, V>> table(Expression<R> row,
+                                                                                                  GroupExpression<C, W> column,
+                                                                                                  Expression<V> value) {
+        return table(new GOne<R>(row), column, new GOne<V>(value));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<R, X, W>> table(Expression<R> row,
+                                                                                                     GroupExpression<C, X> column,
+                                                                                                     GroupExpression<V, W> value) {
+        return table(new GOne<R>(row), column, value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<X, C, W>> table(GroupExpression<R, X> row,
+                                                                                                     Expression<C> column,
+                                                                                                     GroupExpression<V, W> value) {
+        return table(row, new GOne<C>(column), value);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<R, C, W>> table(Expression<R> row,
+                                                                                                  Expression<C> column,
+                                                                                                  GroupExpression<V, W> value) {
+        return table(new GOne<R>(row), new GOne<C>(column), value);
+    }
+
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, T, U, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, Table<T, U, W>> table(GroupExpression<R, T> row,
+                                                                                                        GroupExpression<C, U> column,
+                                                                                                        GroupExpression<V, W> value) {
+        return new GTable.Mixin<R, C, V, T, U, W, Table<T, U, W>>(
+                row, column, value, GTable.create(QPair.create(QPair.create(row, column), value)));
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<R, C, V>> sortedTable(Expression<R> row,
+                                                                                                              Expression<C> column,
+                                                                                                              Expression<V> value,
+                                                                                                              Comparator<? super R> rowComparator,
+                                                                                                              Comparator<? super C> columnComparator) {
+        return GTable.createSorted(QPair.create(QPair.create(row, column), value), rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<W, C, V>> sortedTable(GroupExpression<R, W> row,
+                                                                                                                 Expression<C> column,
+                                                                                                                 Expression<V> value,
+                                                                                                                 Comparator<? super W> rowComparator,
+                                                                                                                 Comparator<? super C> columnComparator) {
+        return GuavaGroupBy.<R, C, V, W, C, V>sortedTable(row, new GOne<C>(column), new GOne<V>(value), rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<W, X, V>> sortedTable(GroupExpression<R, W> row,
+                                                                                                                    GroupExpression<C, X> column,
+                                                                                                                    Expression<V> value,
+                                                                                                                    Comparator<? super W> rowComparator,
+                                                                                                                    Comparator<? super X> columnComparator) {
+        return GuavaGroupBy.<R, C, V, W, X, V> sortedTable(row, column, new GOne<V>(value), rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<R, W, V>> sortedTable(Expression<R> row,
+                                                                                                                 GroupExpression<C, W> column,
+                                                                                                                 Expression<V> value,
+                                                                                                                 Comparator<? super R> rowComparator,
+                                                                                                                 Comparator<? super W> columnComparator) {
+        return GuavaGroupBy.<R, C, V, R, W, V>sortedTable(new GOne<R>(row), column, new GOne<V>(value), rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<R, X, W>> sortedTable(Expression<R> row,
+                                                                                                                    GroupExpression<C, X> column,
+                                                                                                                    GroupExpression<V, W> value,
+                                                                                                                    Comparator<? super R> rowComparator,
+                                                                                                                    Comparator<? super X> columnComparator) {
+        return GuavaGroupBy.<R, C, V, R, X, W>sortedTable(new GOne<R>(row), column, value, rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W, X> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<X, C, W>> sortedTable(GroupExpression<R, X> row,
+                                                                                                                    Expression<C> column,
+                                                                                                                    GroupExpression<V, W> value,
+                                                                                                                    Comparator<? super X> rowComparator,
+                                                                                                                    Comparator<? super C> columnComparator) {
+        return sortedTable(row, new GOne<C>(column), value, rowComparator, columnComparator);
+    }
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<R, C, W>> sortedTable(Expression<R> row,
+                                                                                                                 Expression<C> column,
+                                                                                                                 GroupExpression<V, W> value,
+                                                                                                                 Comparator<? super R> rowComparator,
+                                                                                                                 Comparator<? super C> columnComparator) {
+        return GuavaGroupBy.<R, C, V, R, C, W>sortedTable(new GOne<R>(row), new GOne<C>(column), value, rowComparator, columnComparator);
+    }
+
+
+    /**
+     * Create a new aggregating map expression using a backing LinkedHashMap
+     *
+     * @param row row for the table entries
+     * @param column column for the table entries
+     * @param value value for the table entries
+     * @return wrapper expression
+     */
+    public static <R, C, V, T, U, W> AbstractGroupExpression<Pair<Pair<R, C>, V>, TreeBasedTable<T, U, W>> sortedTable(GroupExpression<R, T> row,
+                                                                                                                       GroupExpression<C, U> column,
+                                                                                                                       GroupExpression<V, W> value,
+                                                                                                                       Comparator<? super T> rowComparator,
+                                                                                                                       Comparator<? super U> columnComparator) {
+        return new GTable.Mixin<R, C, V, T, U, W, TreeBasedTable<T, U, W>>(
+                row, column, value, GTable.createSorted(QPair.create(QPair.create(row, column), value), rowComparator, columnComparator));
+    }
+
+    private GuavaGroupBy() {
+    }
+
+}
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupByBuilder.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupByBuilder.java
new file mode 100644
index 0000000000..c27aa11d39
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/GuavaGroupByBuilder.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.core.group.guava;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
+import com.google.common.collect.Table.Cell;
+import com.google.common.collect.TreeBasedTable;
+import com.google.common.collect.TreeMultimap;
+import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.group.GroupByBuilder;
+import com.querydsl.core.types.Expression;
+
+import java.util.Comparator;
+import java.util.Map;
+
+/**
+ * {@code GroupByBuilder} is a fluent builder for GroupBy transformer instances. This class is not to be used directly,
+ * but via {@link GuavaGroupBy}.
+ *
+ * @param <K>
+ * @author Jan-Willem Gmelig Melying
+ */
+public class GuavaGroupByBuilder<K> extends GroupByBuilder<K> {
+
+    /**
+     * Create a new GroupByBuilder for the given key expression
+     *
+     * @param key key for aggregating
+     */
+    public GuavaGroupByBuilder(Expression<K> key) {
+        super(key);
+    }
+
+    /**
+     * Get the results as multi map
+     *
+     * @param expression value expression
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<Multimap<K, V>> asMultimap(Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByMultimap<K, V, Multimap<K, V>>(key, expression) {
+            @Override
+            protected Multimap<K, V> transform(Multimap<K, Group> groups) {
+                Multimap<K, V> results = LinkedHashMultimap.create();
+                for (Map.Entry<K, Group> entry : groups.entries()) {
+                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as multi map
+     *
+     * @param expression value expression
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <V extends Comparable<? super V>> ResultTransformer<TreeMultimap<K, V>> asSortedSetMultimap(Expression<V> expression) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByMultimap<K, V, TreeMultimap<K, V>>(key, expression) {
+            @Override
+            protected TreeMultimap<K, V> transform(Multimap<K, Group> groups) {
+                TreeMultimap<K, V> results = (TreeMultimap) TreeMultimap.create();
+                for (Map.Entry<K, Group> entry : groups.entries()) {
+                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as multi map
+     *
+     * @param expression value expression
+     * @param comparator key comparator
+     * @param valueComparator value comparator
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <V> ResultTransformer<TreeMultimap<K, V>> asSortedSetMultimap(Expression<V> expression,
+                                                                         final Comparator<? super K> comparator,
+                                                                         final Comparator<? super V> valueComparator) {
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByMultimap<K, V, TreeMultimap<K, V>>(key, expression) {
+            @Override
+            protected TreeMultimap<K, V> transform(Multimap<K, Group> groups) {
+                TreeMultimap<K, V> results = TreeMultimap.create(comparator, valueComparator);
+                for (Map.Entry<K, Group> entry : groups.entries()) {
+                    results.put(entry.getKey(), entry.getValue().getOne(lookup));
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as sorted table
+     *
+     * @param column column expression
+     * @param expression value expression
+     * @param <C> Column type
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <C, V> ResultTransformer<Table<K, C, V>> asTable(final Expression<C> column, final Expression<V> expression) {
+        final Expression<C> columnKeyLookup = getLookup(column);
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByTable<K, C, V, Table<K, C, V>>(key, column, expression) {
+            @Override
+            protected Table<K, C, V> transform(Table<K, ?, Group> groups) {
+                Table<K, C, V> results = HashBasedTable.create();
+                for (Cell<K, ?, Group> cell : groups.cellSet()) {
+                    K rowKey = cell.getRowKey();
+                    C columnKey = cell.getValue().getOne(columnKeyLookup);
+                    V value = cell.getValue().getOne(lookup);
+                    results.put(rowKey, columnKey, value);
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as sorted table
+     *
+     * @param column column expression
+     * @param expression value expression
+     * @param <C> Column type
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <C extends Comparable<? super C>, V> ResultTransformer<TreeBasedTable<K, C, V>> asSortedTable(final Expression<C> column, final Expression<V> expression) {
+        final Expression<C> columnKeyLookup = getLookup(column);
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByTable<K, C, V, TreeBasedTable<K, C, V>>(key, column, expression) {
+            @Override
+            protected TreeBasedTable<K, C, V> transform(Table<K, ?, Group> groups) {
+                TreeBasedTable<K, C, V> results = (TreeBasedTable) TreeBasedTable.create();
+                for (Cell<K, ?, Group> cell : groups.cellSet()) {
+                    K rowKey = cell.getRowKey();
+                    C columnKey = cell.getValue().getOne(columnKeyLookup);
+                    V value = cell.getValue().getOne(lookup);
+                    results.put(rowKey, columnKey, value);
+                }
+                return results;
+            }
+        };
+    }
+
+    /**
+     * Get the results as sorted table
+     *
+     * @param column column expression
+     * @param expression value expression
+     * @param rowComparator row comparator
+     * @param columnComparator column comparator
+     * @param <C> Column type
+     * @param <V> Value type
+     * @return new result transformer
+     */
+    public <C, V> ResultTransformer<TreeBasedTable<K, C, V>> asSortedTable(final Expression<C> column,
+                                                                           final Expression<V> expression,
+                                                                           final Comparator<? super K> rowComparator,
+                                                                           final Comparator<? super C> columnComparator) {
+        final Expression<C> columnKeyLookup = getLookup(column);
+        final Expression<V> lookup = getLookup(expression);
+        return new GroupByTable<K, C, V, TreeBasedTable<K, C, V>>(key, column, expression) {
+            @Override
+            protected TreeBasedTable<K, C, V> transform(Table<K, ?, Group> groups) {
+                TreeBasedTable<K, C, V> results = TreeBasedTable.create(rowComparator, columnComparator);
+                for (Cell<K, ?, Group> cell : groups.cellSet()) {
+                    K rowKey = cell.getRowKey();
+                    C columnKey = cell.getValue().getOne(columnKeyLookup);
+                    V value = cell.getValue().getOne(lookup);
+                    results.put(rowKey, columnKey, value);
+                }
+                return results;
+            }
+        };
+    }
+
+}
diff --git a/querydsl-guava/src/main/java/com/querydsl/core/group/guava/package-info.java b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/package-info.java
new file mode 100644
index 0000000000..40524882e2
--- /dev/null
+++ b/querydsl-guava/src/main/java/com/querydsl/core/group/guava/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Utilities for creating group by factory expressions for Guava collection types
+ */
+package com.querydsl.core.group.guava;
+
diff --git a/querydsl-hibernate-search/pom.xml b/querydsl-hibernate-search/pom.xml
index 1680faea40..f9f9373c88 100644
--- a/querydsl-hibernate-search/pom.xml
+++ b/querydsl-hibernate-search/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-hibernate-search</artifactId>
   <name>Querydsl - Hibernate Search support</name>
   <description>Hibernate Search support for querydsl</description>
@@ -23,16 +23,36 @@
   </scm>
   
   <properties>
-    <hibernate.version>4.1.7.Final</hibernate.version>
-    <hibernate.validator.version>4.3.0.Final</hibernate.validator.version>
-    <hibernate.search.version>4.2.0.Final</hibernate.search.version>
-    <lucene.version>3.6.2</lucene.version>
+    <hibernate.version>5.5.3.Final</hibernate.version>
+    <hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
+    <hibernate.search.version>5.11.10.Final</hibernate.search.version>
+    <lucene.version>5.5.5</lucene.version>
+    <osgi.import.package>
+      org.apache.lucene.*;version="[3.6,4)",
+      org.hibernate.*;version="[4,5)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
   </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hibernate.common</groupId>
+        <artifactId>hibernate-commons-annotations</artifactId>
+        <version>5.1.2.Final</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   
   <dependencies> 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-lucene3</artifactId>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-lucene5</artifactId>
       <version>${project.version}</version>
     </dependency>
     
@@ -50,27 +70,31 @@
           <groupId>asm</groupId>
           <artifactId>asm</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jboss-logging</artifactId>
+          <groupId>org.jboss.logging</groupId>
+        </exclusion>
       </exclusions>      
       <scope>provided</scope>      
     </dependency>   
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>${hibernate.validator.version}</version>
       <scope>provided</scope>
-      <exclusions>    
+      <exclusions>
         <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+          <artifactId>jboss-logging</artifactId>
+          <groupId>org.jboss.logging</groupId>
         </exclusion>
-      </exclusions>      
+      </exclusions>
     </dependency>    
  
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-      <scope>compile</scope>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>2.2.3</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -81,7 +105,7 @@
     </dependency>   
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search</artifactId>
+      <artifactId>hibernate-search-orm</artifactId>
       <version>${hibernate.search.version}</version>
       <scope>provided</scope>
       <exclusions>
@@ -89,12 +113,20 @@
          <groupId>hsqldb</groupId>
          <artifactId>hsqldb</artifactId>
        </exclusion>
+        <exclusion>
+          <artifactId>hibernate-core</artifactId>
+          <groupId>org.hibernate</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
       </exclusions>
     </dependency>  
     <dependency>
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.6.0.GA</version>
+      <version>3.12.1.GA</version>
       <scope>provided</scope>
     </dependency>    
     
@@ -105,22 +137,51 @@
       <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
-    </dependency>      
-    
+    </dependency>
+
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.hibernate.search</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>     
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -138,4 +199,4 @@
   </build>
     
   
-</project>
+</project>
diff --git a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchQuery.java b/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchQuery.java
deleted file mode 100644
index cefc01df49..0000000000
--- a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchQuery.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.hibernate.search;
-
-import java.util.List;
-
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.hibernate.Session;
-import org.hibernate.search.FullTextQuery;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.Search;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleProjectable;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Predicate;
-
-/**
- * SearchQuery is a Query implementation for Hibernate Search
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class SearchQuery<T> implements SimpleQuery<SearchQuery<T>>, SimpleProjectable<T> {
-
-    private final EntityPath<T> path;
-
-    private final QueryMixin<SearchQuery<T>> queryMixin;
-
-    private final LuceneSerializer serializer;
-
-    private final FullTextSession session;
-
-    /**
-     * Create a new SearchQuery instance
-     * 
-     * @param session
-     * @param path
-     */
-    public SearchQuery(FullTextSession session, EntityPath<T> path) {
-        this.queryMixin = new QueryMixin<SearchQuery<T>>(this);
-        this.session = session;
-        this.path = path;
-        this.serializer = SearchSerializer.DEFAULT;
-        queryMixin.from(path);
-    }
-
-    public SearchQuery(Session session, EntityPath<T> path) {
-        this(Search.getFullTextSession(session), path);
-    }
-
-
-    @Override
-    public boolean exists() {
-        return createQuery(true).getResultSize() > 0;
-    }
-
-    @Override
-    public boolean notExists() {
-        return createQuery(true).getResultSize() == 0;
-    }
-
-    @Override
-    public long count() {
-        return createQuery(true).getResultSize();
-    }
-
-    private FullTextQuery createQuery(boolean forCount) {
-        QueryMetadata metadata = queryMixin.getMetadata();
-        org.apache.lucene.search.Query query;
-        if (metadata.getWhere() != null) {
-            query = serializer.toQuery(metadata.getWhere(), metadata);
-        } else {
-            query = new MatchAllDocsQuery();
-        } 
-        FullTextQuery fullTextQuery = session.createFullTextQuery(query, path.getType());
-
-        // order
-        if (!metadata.getOrderBy().isEmpty() && !forCount) {
-            fullTextQuery.setSort(serializer.toSort(metadata.getOrderBy()));
-        }
-
-        // paging
-        QueryModifiers modifiers = metadata.getModifiers();
-        if (modifiers != null && modifiers.isRestricting() && !forCount) {
-            Integer limit = modifiers.getLimitAsInteger();
-            Integer offset = modifiers.getOffsetAsInteger();
-            if (limit != null) {
-                fullTextQuery.setMaxResults(limit.intValue());
-            }
-            if (offset != null) {
-                fullTextQuery.setFirstResult(offset.intValue());
-            }
-        }
-        return fullTextQuery;
-    }
-
-
-    @Override
-    public SearchQuery<T> distinct() {
-        // do nothing
-        return this;
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public CloseableIterator<T> iterate() {
-        return new IteratorAdapter<T>(createQuery(false).iterate());
-    }
-
-    public CloseableIterator<T> iterateDistinct() {
-        return iterate();
-    }
-
-    @Override
-    public SearchQuery<T> limit(long limit) {
-        return queryMixin.limit(limit);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<T> list() {
-        return createQuery(false).list();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public SearchResults<T> listResults() {
-        FullTextQuery query = createQuery(false);
-        return new SearchResults<T>(query.list(), queryMixin.getMetadata().getModifiers(), query.getResultSize());
-    }
-
-    @Override
-    public SearchQuery<T> offset(long offset) {
-        return queryMixin.offset(offset);
-    }
-
-    @Override
-    public SearchQuery<T> orderBy(OrderSpecifier<?>... o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public SearchQuery<T> restrict(QueryModifiers modifiers) {
-        return queryMixin.restrict(modifiers);
-    }
-
-    @Override
-    public <P> SearchQuery<T> set(ParamExpression<P> param, P value) {
-        return queryMixin.set(param, value);
-    }
-
-    @Override
-    public T singleResult() {
-        return limit(1).uniqueResult();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public T uniqueResult() {
-        try {
-            return (T) createQuery(false).uniqueResult();
-        } catch (org.hibernate.NonUniqueResultException e) {
-            throw new NonUniqueResultException();
-        }
-    }
-
-    @Override
-    public SearchQuery<T> where(Predicate... e) {
-        return queryMixin.where(e);
-    }
-
-
-}
diff --git a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchSerializer.java b/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchSerializer.java
deleted file mode 100644
index 880c147b21..0000000000
--- a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/SearchSerializer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.hibernate.search;
-
-import org.hibernate.search.annotations.Field;
-
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.types.Path;
-
-/**
- * SearchSerializer extends the LuceneSerializer to use {@link Field} annotation data from paths 
- * 
- * @author tiwe
- *
- */
-public class SearchSerializer extends LuceneSerializer{
-
-    public static final SearchSerializer DEFAULT = new SearchSerializer(false,true);
-
-    /**
-     * Create a new SearchSerializer instance
-     * 
-     * @param lowerCase
-     * @param splitTerms
-     */
-    public SearchSerializer(boolean lowerCase, boolean splitTerms) {
-        super(lowerCase, splitTerms);
-    }
-
-    @Override
-    public String toField(Path<?> path) {
-        if (path.getAnnotatedElement() != null) {
-            Field fieldAnn = path.getAnnotatedElement().getAnnotation(Field.class);
-            if (fieldAnn != null && fieldAnn.name().length() > 0) {
-                return fieldAnn.name();
-            }
-        }
-        return super.toField(path);
-    }
-
-}
diff --git a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/package-info.java b/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/package-info.java
deleted file mode 100644
index 245cd2a63c..0000000000
--- a/querydsl-hibernate-search/src/main/java/com/mysema/query/hibernate/search/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.hibernate.search;
diff --git a/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/AbstractSearchQuery.java b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/AbstractSearchQuery.java
new file mode 100644
index 0000000000..eb1f3510b9
--- /dev/null
+++ b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/AbstractSearchQuery.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import java.util.List;
+
+import com.querydsl.lucene5.LuceneSerializer;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.hibernate.Session;
+import org.hibernate.search.FullTextQuery;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.*;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * Abstract base class for Hibernate Search query classes
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ */
+public abstract class AbstractSearchQuery<T, Q extends AbstractSearchQuery<T,Q>> implements SimpleQuery<Q>, Fetchable<T> {
+
+    private final EntityPath<T> path;
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final LuceneSerializer serializer;
+
+    private final FullTextSession session;
+
+    @SuppressWarnings("unchecked")
+    public AbstractSearchQuery(FullTextSession session, EntityPath<T> path) {
+        this.queryMixin = new QueryMixin<Q>((Q) this);
+        this.session = session;
+        this.path = path;
+        this.serializer = SearchSerializer.DEFAULT;
+        queryMixin.from(path);
+    }
+
+    public AbstractSearchQuery(Session session, EntityPath<T> path) {
+        this(Search.getFullTextSession(session), path);
+    }
+
+    @Override
+    public long fetchCount() {
+        return createQuery(true).getResultSize();
+    }
+
+    private FullTextQuery createQuery(boolean forCount) {
+        QueryMetadata metadata = queryMixin.getMetadata();
+        org.apache.lucene.search.Query query;
+        if (metadata.getWhere() != null) {
+            query = serializer.toQuery(metadata.getWhere(), metadata);
+        } else {
+            query = new MatchAllDocsQuery();
+        }
+        FullTextQuery fullTextQuery = session.createFullTextQuery(query, path.getType());
+
+        // order
+        if (!metadata.getOrderBy().isEmpty() && !forCount) {
+            fullTextQuery.setSort(serializer.toSort(metadata.getOrderBy()));
+        }
+
+        // paging
+        QueryModifiers modifiers = metadata.getModifiers();
+        if (modifiers.isRestricting() && !forCount) {
+            Integer limit = modifiers.getLimitAsInteger();
+            Integer offset = modifiers.getOffsetAsInteger();
+            if (limit != null) {
+                fullTextQuery.setMaxResults(limit);
+            }
+            if (offset != null) {
+                fullTextQuery.setFirstResult(offset);
+            }
+        }
+        return fullTextQuery;
+    }
+
+
+    @Override
+    public Q distinct() {
+        return queryMixin.distinct();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public CloseableIterator<T> iterate() {
+        return new IteratorAdapter<T>(createQuery(false).iterate());
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<T> fetch() {
+        return createQuery(false).list();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public QueryResults<T> fetchResults() {
+        FullTextQuery query = createQuery(false);
+        return new QueryResults<T>(query.list(), queryMixin.getMetadata().getModifiers(), query.getResultSize());
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    @Override
+    public <P> Q set(ParamExpression<P> param, P value) {
+        return queryMixin.set(param, value);
+    }
+
+    @Override
+    public T fetchFirst() {
+        return limit(1).fetchOne();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        try {
+            return (T) createQuery(false).uniqueResult();
+        } catch (org.hibernate.NonUniqueResultException e) {
+            throw new NonUniqueResultException(e);
+        }
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchQuery.java b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchQuery.java
new file mode 100644
index 0000000000..5df66045c1
--- /dev/null
+++ b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchQuery.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import org.hibernate.Session;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+
+import com.querydsl.core.types.EntityPath;
+
+/**
+ * {@code SearchQuery} is a Query implementation for Hibernate Search
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class SearchQuery<T> extends AbstractSearchQuery<T, SearchQuery<T>> {
+
+    /**
+     * Create a new SearchQuery instance
+     *
+     * @param session session
+     * @param path query source
+     */
+    public SearchQuery(FullTextSession session, EntityPath<T> path) {
+        super(session, path);
+    }
+
+    /**
+     * Create a new SearchQuery instance
+     *
+     * @param session session
+     * @param path query source
+     */
+    public SearchQuery(Session session, EntityPath<T> path) {
+        this(Search.getFullTextSession(session), path);
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchSerializer.java b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchSerializer.java
new file mode 100644
index 0000000000..ba3d18b096
--- /dev/null
+++ b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/SearchSerializer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import com.querydsl.lucene5.LuceneSerializer;
+import org.hibernate.search.annotations.Field;
+
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code SearchSerializer} extends the {@link LuceneSerializer} to use {@link Field} annotation data from paths
+ *
+ * @author tiwe
+ *
+ */
+public class SearchSerializer extends LuceneSerializer {
+
+    public static final SearchSerializer DEFAULT = new SearchSerializer(false,true);
+
+    /**
+     * Create a new SearchSerializer instance
+     *
+     * @param lowerCase lowercase names
+     * @param splitTerms split terms
+     */
+    public SearchSerializer(boolean lowerCase, boolean splitTerms) {
+        super(lowerCase, splitTerms);
+    }
+
+    @Override
+    public String toField(Path<?> path) {
+        if (path.getAnnotatedElement() != null) {
+            Field fieldAnn = path.getAnnotatedElement().getAnnotation(Field.class);
+            if (fieldAnn != null && fieldAnn.name().length() > 0) {
+                return fieldAnn.name();
+            }
+        }
+        return super.toField(path);
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/package-info.java b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/package-info.java
new file mode 100644
index 0000000000..503d07dad5
--- /dev/null
+++ b/querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Hibernate Search support
+ */
+package com.querydsl.hibernate.search;
diff --git a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/AbstractQueryTest.java b/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/AbstractQueryTest.java
deleted file mode 100644
index 420b180163..0000000000
--- a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/AbstractQueryTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.hibernate.search;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Properties;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-import com.mysema.util.FileUtils;
-
-public abstract class AbstractQueryTest {
-
-    private static SessionFactory sessionFactory;
-
-    @BeforeClass
-    public static void setUpClass() throws IOException{
-        FileUtils.delete(new File("target/derbydb"));
-        FileUtils.delete(new File("target/lucene"));
-        AnnotationConfiguration cfg = new AnnotationConfiguration();
-        cfg.addAnnotatedClass(User.class);
-        Properties props = new Properties();
-        InputStream is = SearchQueryTest.class.getResourceAsStream("/derby.properties");
-        try {
-            props.load(is);    
-        } finally {
-            is.close();
-        }        
-        cfg.setProperties(props);
-        sessionFactory = cfg.buildSessionFactory();
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        if (sessionFactory != null) {
-            sessionFactory.close();    
-        }        
-    }
-
-    private Session session;
-
-    protected Session getSession() {
-        return session;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void setUp() {
-        session = sessionFactory.openSession();
-        session.beginTransaction();
-
-        // clean up
-        List<User> users = session.createQuery("from User").list();
-        for (User user : users) {
-            session.delete(user);
-        }
-    }
-
-    @After
-    public void tearDown() throws HibernateException, SQLException{
-        if (!session.getTransaction().wasRolledBack()) {
-            session.getTransaction().commit();
-        }
-        session.close();
-    }
-
-}
diff --git a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchQueryTest.java b/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchQueryTest.java
deleted file mode 100644
index a299836c65..0000000000
--- a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchQueryTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.hibernate.search;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.SearchResults;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.expr.BooleanExpression;
-
-public class SearchQueryTest extends AbstractQueryTest {
-
-    private final QUser user = new QUser("user");
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        createUser("Bob", "Stewart", "Smith", "bob@example.com");
-
-        createUser("Barbara", "X", "Lock", "barbara@a.com");
-        createUser("Anton", "X", "Bruckner", "anton@b.com");
-        createUser("Robert", "X", "Downing", "bob@c.com");
-        createUser("John", "X", "Stewart", "john@d.com");
-
-        Session session = getSession();
-        session.flush();
-        session.getTransaction().commit();
-        session.beginTransaction();
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query().where(user.emailAddress.eq("bob@example.com")).exists());
-        assertFalse(query().where(user.emailAddress.eq("bobby@example.com")).exists());
-    }
-
-    @Test
-    public void NotExists() {
-        assertFalse(query().where(user.emailAddress.eq("bob@example.com")).notExists());
-        assertTrue(query().where(user.emailAddress.eq("bobby@example.com")).notExists());
-    }
-
-    @Test
-    public void Count() {
-        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
-        assertEquals(1, query().where(filter).count());
-    }
-
-    @Test
-    public void UniqueResult() {
-        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
-        User u = query().where(filter).uniqueResult();
-        assertNotNull(u);
-        assertEquals("bob@example.com", u.getEmailAddress());
-    }
-
-    @Test
-    public void List() {
-        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
-        List<User> list = query().where(filter).list();
-        assertEquals(1, list.size());
-        User u = query().where(filter).uniqueResult();
-        assertEquals(u, list.get(0));
-    }
-
-    @Test(expected = NonUniqueResultException.class)
-    public void Unique_Result_Throws_Exception_On_Multiple_Results() {
-        query().where(user.middleName.eq("X")).uniqueResult();
-    }
-
-    @Test
-    public void SingleResult() {
-        assertNotNull(query().where(user.middleName.eq("X")).singleResult());
-    }
-
-    @Test
-    public void Ordering() {
-        BooleanExpression filter = user.middleName.eq("X");
-        // asc
-        List<String> asc = getFirstNames(query().where(filter).orderBy(
-                user.firstName.asc()).list());
-        assertEquals(Arrays.asList("Anton", "Barbara", "John", "Robert"), asc);
-
-        // desc
-        List<String> desc = getFirstNames(query().where(filter).orderBy(
-                user.firstName.desc()).list());
-        assertEquals(Arrays.asList("Robert", "John", "Barbara", "Anton"), desc);
-    }
-
-    @Test
-    public void Paging() {
-        BooleanExpression filter = user.middleName.eq("X");
-        OrderSpecifier<?> order = user.firstName.asc();
-
-        // limit
-        List<String> limit = getFirstNames(query().where(filter).orderBy(order)
-                .limit(2).list());
-        assertEquals(Arrays.asList("Anton", "Barbara"), limit);
-
-        // offset
-        List<String> offset = getFirstNames(query().where(filter)
-                .orderBy(order).offset(1).list());
-        assertEquals(Arrays.asList("Barbara", "John", "Robert"), offset);
-
-        // limit + offset
-        List<String> limitAndOffset = getFirstNames(query().where(filter)
-                .orderBy(order).limit(2).offset(1).list());
-        assertEquals(Arrays.asList("Barbara", "John"), limitAndOffset);
-    }
-
-    @Test
-    public void ListResults() {
-        BooleanExpression filter = user.middleName.eq("X");
-        SearchResults<User> users = query().where(filter).orderBy(
-                user.firstName.asc()).limit(2).listResults();
-        List<String> asc = getFirstNames(users.getResults());
-        assertEquals(Arrays.asList("Anton", "Barbara"), asc);
-        assertEquals(4, users.getTotal());
-    }
-    
-    @Test
-    public void No_Where() {
-        assertEquals(5, query().list().size());
-    }
-    
-    @Test @Ignore // OufOfMemoryError
-    public void Limit_Max_Value() {
-        assertEquals(5, query().limit(Long.MAX_VALUE).list().size());
-    }
-
-    private List<String> getFirstNames(List<User> users) {
-        List<String> rv = new ArrayList<String>(users.size());
-        for (User user : users) {
-            rv.add(user.getFirstName());
-        }
-        return rv;
-    }
-
-    private User createUser(String firstName, String middleName,
-            String lastName, String email) {
-        User user = new User();
-        user.setFirstName(firstName);
-        user.setMiddleName(middleName);
-        user.setLastName(lastName);
-        user.setEmailAddress(email);
-        getSession().save(user);
-        return user;
-    }
-
-    private SearchQuery<User> query() {
-        return new SearchQuery<User>(getSession(), user);
-    }
-
-}
diff --git a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/User.java b/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/User.java
deleted file mode 100644
index 272a7c0cfc..0000000000
--- a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/User.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.hibernate.search;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.search.annotations.Analyze;
-import org.hibernate.search.annotations.Analyzer;
-import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Store;
-
-@Entity
-@Table(name = "user_")
-@Indexed
-@Analyzer(impl = org.apache.lucene.analysis.standard.StandardAnalyzer.class)
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 5955148455600241741L;
-
-    @Id
-    @GeneratedValue
-    @DocumentId
-    private Long id;
-
-    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
-    private String firstName;
-
-    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
-    private String lastName;
-
-    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
-    private String middleName;
-
-    @NaturalId
-    @Field(analyze = Analyze.NO, name="email", index = Index.YES, store = Store.YES)
-    private String emailAddress;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getMiddleName() {
-        return middleName;
-    }
-
-    public void setMiddleName(String middleName) {
-        this.middleName = middleName;
-    }
-
-    public String getEmailAddress() {
-        return emailAddress;
-    }
-
-    public void setEmailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
-    }
-
-}
diff --git a/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/AbstractQueryTest.java b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/AbstractQueryTest.java
new file mode 100644
index 0000000000..2965aa7b62
--- /dev/null
+++ b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/AbstractQueryTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Properties;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.resource.transaction.spi.TransactionStatus;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+import com.querydsl.core.util.FileUtils;
+
+public abstract class AbstractQueryTest {
+
+    private static SessionFactory sessionFactory;
+
+    @BeforeClass
+    public static void setUpClass() throws IOException {
+        FileUtils.delete(new File("target/derbydb"));
+        FileUtils.delete(new File("target/lucene3"));
+        Configuration cfg = new Configuration();
+        cfg.addAnnotatedClass(User.class);
+        Properties props = new Properties();
+        try (InputStream is = SearchQueryTest.class.getResourceAsStream("/derby.properties")) {
+            props.load(is);
+        }
+        cfg.setProperties(props);
+        sessionFactory = cfg.buildSessionFactory();
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        if (sessionFactory != null) {
+            sessionFactory.close();
+        }
+    }
+
+    private Session session;
+
+    protected Session getSession() {
+        return session;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        // clean up
+        List<User> users = session.createQuery("from User").list();
+        for (User user : users) {
+            session.delete(user);
+        }
+        session.flush();
+    }
+
+    @After
+    public void tearDown() throws HibernateException, SQLException {
+        if (session.getTransaction().getStatus().isNotOneOf(TransactionStatus.ROLLED_BACK, TransactionStatus.ROLLING_BACK, TransactionStatus.MARKED_ROLLBACK)) {
+            session.getTransaction().commit();
+        }
+        session.close();
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/QUser.java b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/QUser.java
similarity index 80%
rename from querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/QUser.java
rename to querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/QUser.java
index c6284d61b6..513acabfcc 100644
--- a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/QUser.java
+++ b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/QUser.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.hibernate.search;
+package com.querydsl.hibernate.search;
 
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.StringPath;
 
 public class QUser extends EntityPathBase<User> {
 
diff --git a/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchQueryTest.java b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchQueryTest.java
new file mode 100644
index 0000000000..b2bd5da591
--- /dev/null
+++ b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchQueryTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+public class SearchQueryTest extends AbstractQueryTest {
+
+    private final QUser user = new QUser("user");
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        createUser("Bob", "Stewart", "Smith", "bob@example.com");
+
+        createUser("Barbara", "X", "Lock", "barbara@a.com");
+        createUser("Anton", "X", "Bruckner", "anton@b.com");
+        createUser("Robert", "X", "Downing", "bob@c.com");
+        createUser("John", "X", "Stewart", "john@d.com");
+
+        Session session = getSession();
+        session.flush();
+        session.getTransaction().commit();
+        session.beginTransaction();
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(query().where(user.emailAddress.eq("bob@example.com")).fetchCount() > 0);
+        assertFalse(query().where(user.emailAddress.eq("bobby@example.com")).fetchCount() > 0);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(query().where(user.emailAddress.eq("bob@example.com")).fetchCount() == 0);
+        assertTrue(query().where(user.emailAddress.eq("bobby@example.com")).fetchCount() == 0);
+    }
+
+    @Test
+    public void count() {
+        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
+        assertEquals(1, query().where(filter).fetchCount());
+    }
+
+    @Test
+    public void uniqueResult() {
+        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
+        User u = query().where(filter).fetchOne();
+        assertNotNull(u);
+        assertEquals("bob@example.com", u.getEmailAddress());
+    }
+
+    @Test
+    public void list() {
+        BooleanExpression filter = user.emailAddress.eq("bob@example.com");
+        List<User> list = query().where(filter).fetch();
+        assertEquals(1, list.size());
+        User u = query().where(filter).fetchOne();
+        assertEquals(u, list.get(0));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void unique_result_throws_exception_on_multiple_results() {
+        query().where(user.middleName.eq("X")).fetchOne();
+    }
+
+    @Test
+    public void singleResult() {
+        assertNotNull(query().where(user.middleName.eq("X")).fetchFirst());
+    }
+
+    @Test
+    public void ordering() {
+        BooleanExpression filter = user.middleName.eq("X");
+        // asc
+        List<String> asc = getFirstNames(query().where(filter).orderBy(
+                user.firstName.asc()).fetch());
+        assertEquals(Arrays.asList("Anton", "Barbara", "John", "Robert"), asc);
+
+        // desc
+        List<String> desc = getFirstNames(query().where(filter).orderBy(
+                user.firstName.desc()).fetch());
+        assertEquals(Arrays.asList("Robert", "John", "Barbara", "Anton"), desc);
+    }
+
+    @Test
+    public void paging() {
+        BooleanExpression filter = user.middleName.eq("X");
+        OrderSpecifier<?> order = user.firstName.asc();
+
+        // limit
+        List<String> limit = getFirstNames(query().where(filter).orderBy(order)
+                .limit(2).fetch());
+        assertEquals(Arrays.asList("Anton", "Barbara"), limit);
+
+        // offset
+        List<String> offset = getFirstNames(query().where(filter)
+                .orderBy(order).offset(1).fetch());
+        assertEquals(Arrays.asList("Barbara", "John", "Robert"), offset);
+
+        // limit + offset
+        List<String> limitAndOffset = getFirstNames(query().where(filter)
+                .orderBy(order).limit(2).offset(1).fetch());
+        assertEquals(Arrays.asList("Barbara", "John"), limitAndOffset);
+    }
+
+    @Test
+    public void listResults() {
+        BooleanExpression filter = user.middleName.eq("X");
+        QueryResults<User> users = query().where(filter).orderBy(
+                user.firstName.asc()).limit(2).fetchResults();
+        List<String> asc = getFirstNames(users.getResults());
+        assertEquals(Arrays.asList("Anton", "Barbara"), asc);
+        assertEquals(4, users.getTotal());
+    }
+
+    @Test
+    public void no_where() {
+        assertEquals(5, query().fetch().size());
+    }
+
+    @Test @Ignore // OufOfMemoryError
+    public void limit_max_value() {
+        assertEquals(5, query().limit(Long.MAX_VALUE).fetch().size());
+    }
+
+    private List<String> getFirstNames(List<User> users) {
+        List<String> rv = new ArrayList<String>(users.size());
+        for (User user : users) {
+            rv.add(user.getFirstName());
+        }
+        return rv;
+    }
+
+    private User createUser(String firstName, String middleName,
+            String lastName, String email) {
+        User user = new User();
+        user.setFirstName(firstName);
+        user.setMiddleName(middleName);
+        user.setLastName(lastName);
+        user.setEmailAddress(email);
+        getSession().save(user);
+        return user;
+    }
+
+    private SearchQuery<User> query() {
+        return new SearchQuery<User>(getSession(), user);
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchSerializerTest.java b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchSerializerTest.java
similarity index 81%
rename from querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchSerializerTest.java
rename to querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchSerializerTest.java
index af73823364..e9ba40f56a 100644
--- a/querydsl-hibernate-search/src/test/java/com/mysema/query/hibernate/search/SearchSerializerTest.java
+++ b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/SearchSerializerTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.hibernate.search;
+package com.querydsl.hibernate.search;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.hibernate.search.SearchSerializer;
-
 public class SearchSerializerTest {
 
     @Test
-    public void ToField() {
+    public void toField() {
         SearchSerializer serializer = SearchSerializer.DEFAULT;
         QUser user = new QUser("user");
         assertEquals("email", serializer.toField(user.emailAddress));
diff --git a/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/User.java b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/User.java
new file mode 100644
index 0000000000..bfb91ff15f
--- /dev/null
+++ b/querydsl-hibernate-search/src/test/java/com/querydsl/hibernate/search/User.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.hibernate.search;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.search.annotations.*;
+
+@Entity
+@Table(name = "user_")
+@Indexed
+@Analyzer(impl = org.apache.lucene.analysis.standard.StandardAnalyzer.class)
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 5955148455600241741L;
+
+    @Id
+    @GeneratedValue
+    @DocumentId
+    private Long id;
+
+    @SortableField
+    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
+    private String firstName;
+
+    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
+    private String lastName;
+
+    @Field(analyze = Analyze.NO, index = Index.YES, store = Store.YES)
+    private String middleName;
+
+    @NaturalId
+    @Field(analyze = Analyze.NO, name = "email", index = Index.YES, store = Store.YES)
+    private String emailAddress;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getMiddleName() {
+        return middleName;
+    }
+
+    public void setMiddleName(String middleName) {
+        this.middleName = middleName;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+}
diff --git a/querydsl-hibernate-search/src/test/resources/derby.properties b/querydsl-hibernate-search/src/test/resources/derby.properties
index 802938d213..4d96c12e66 100644
--- a/querydsl-hibernate-search/src/test/resources/derby.properties
+++ b/querydsl-hibernate-search/src/test/resources/derby.properties
@@ -1,16 +1,15 @@
-## Derby
-hibernate.dialect=org.hibernate.dialect.DerbyDialect
-hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
-hibernate.connection.url=jdbc:derby:target/derbydb;create=true
-hibernate.connection.pool_size=0
-
-## Common properties
-hibernate.show_sql=false
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=update
-
-hibernate.search.default.directory_provider=org.hibernate.search.store.impl.FSDirectoryProvider
-hibernate.search.default.indexBase=target/lucene/indexes
-hibernate.search.default.batch.merge_factor=10
-hibernate.search.default.batch.max_buffered_docs=10
-      
+## Derby
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
+hibernate.connection.url=jdbc:derby:target/derbydb;create=true
+hibernate.connection.pool_size=0
+
+## Common properties
+hibernate.show_sql=false
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=update
+
+hibernate.search.default.directory_provider=org.hibernate.search.store.impl.FSDirectoryProvider
+hibernate.search.default.indexBase=target/lucene/indexes
+hibernate.search.default.batch.merge_factor=10
+hibernate.search.default.batch.max_buffered_docs=10
diff --git a/querydsl-hibernate-search/template.mf b/querydsl-hibernate-search/template.mf
deleted file mode 100644
index 44bb92527f..0000000000
--- a/querydsl-hibernate-search/template.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.hibernate-search
-Bundle-Name: Querydsl Hibernate Search
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  org.apache.lucene.*;version="[3.0.0,3.1.0)",
-  org.hibernate.*;version="[3.0.0,4.0.0)",
-  org.slf4j.*;version="${slf4j.version}"
\ No newline at end of file
diff --git a/querydsl-jdo/README.md b/querydsl-jdo/README.md
index a79dbd2436..3fb53b5104 100644
--- a/querydsl-jdo/README.md
+++ b/querydsl-jdo/README.md
@@ -6,43 +6,49 @@ The JDO module provides integration with the JDO API.
 
  Add the following dependencies to your Maven project :
 
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-apt</artifactId>
-      <version>${querydsl.version}</version>
-      <scope>provided</scope>
-    </dependency>        
-        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-jdo</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-apt</artifactId>
+  <version>${querydsl.version}</version>
+  <scope>provided</scope>
+</dependency>        
     
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>    
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-jdo</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 And now, configure the Maven APT plugin which generates the query types used by Querydsl :
 
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.6</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jdo.JDOAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
+```XML
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jdo.JDOAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+```
 
 The JDOAnnotationProcessor finds domain types annotated with the javax.jdo.annotations.PersistenceCapable annotation and generates Querydsl query types for them.
 
@@ -56,11 +62,14 @@ Now you are able to construct JDOQL query instances and instances of the query d
 
 Querying with Querydsl JDO is as simple as this :
 
-    QCustomer customer = QCustomer.customer;
-    JDOQuery query = new JDOQuery(pm);
-    Customer bob = query.from(customer)
-      .where(customer.firstName.eq("Bob"))
-      .uniqueResult(customer);
-    query.close();
+```JAVA
+QCustomer customer = QCustomer.customer;
+JDOQuery<?> query = new JDOQuery<Void>(pm);
+Customer bob = query.select(customer)
+  .from(customer)
+  .where(customer.firstName.eq("Bob"))
+  .fetchOne();
+query.close();
+```
 
-For more information on the Querydsl JDO module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s02.html
\ No newline at end of file
+For more information on the Querydsl JDO module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s02.html
diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
index 4bf79f0d78..f16e30deee 100644
--- a/querydsl-jdo/pom.xml
+++ b/querydsl-jdo/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-jdo</artifactId>
   <name>Querydsl - JDO support</name>
   <description>JDO support for Querydsl</description>
@@ -23,58 +23,48 @@
   </scm>
 
   <properties>   
-    <dn.version>3.2.0-release</dn.version>
-    <dn.plugin.version>3.2.0-release</dn.plugin.version>
+    <dn.version>5.2.8</dn.version>
+    <dn.plugin.version>5.2.1</dn.plugin.version>
   </properties>
 
   <dependencies>
-  
+
+
     <dependency>
-      <groupId>javax.jdo</groupId>
-      <artifactId>jdo-api</artifactId>
-      <version>3.0.1</version>
+      <groupId>org.datanucleus</groupId>
+      <artifactId>javax.jdo</artifactId>
+      <scope>provided</scope>
     </dependency>
-    <!-- 
     <dependency>
-      <groupId>javax.jdo</groupId>
-      <artifactId>jdo2-api</artifactId>
-      <version>2.3-eb</version>
-   </dependency>
-     -->        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-codegen</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>        
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-apt</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>        
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional> 
-    </dependency>      
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>    
 
     <!-- test -->
 
@@ -106,18 +96,23 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>    
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
 
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>jdepend</groupId>
       <artifactId>jdepend</artifactId>
@@ -130,8 +125,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>      
     
       <plugin>
@@ -149,6 +144,13 @@
             </configuration>              
           </execution>            
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.jdo</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin> 
         
       <!-- this plugin does the JDO class enhancement -->
@@ -158,7 +160,7 @@
         <version>${dn.plugin.version}</version>
         <configuration>
             <metadataDirectory>target/test-classes</metadataDirectory>
-            <metadataIncludes>com/mysema/query/jdo/test/domain/*.class</metadataIncludes>
+            <metadataIncludes>com/querydsl/jdo/test/domain/*.class</metadataIncludes>
             <log4jConfiguration>src/test/resources/log4j.properties</log4jConfiguration>
             <verbose>true</verbose>
             <props>src/test/resources/datanucleus.properties</props>
@@ -226,7 +228,7 @@
               </property>                  
             </systemProperties>    
             <includes>
-              <include>com/mysema/query/PackageVerification.java</include>
+              <include>com/querydsl/jdo/PackageVerification.java</include>
             </includes>
           </configuration>
           </execution>
@@ -244,7 +246,7 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
               <logOnlyOnError>true</logOnlyOnError>
             </configuration>
           </execution>
@@ -252,13 +254,13 @@
       </plugin>   
       
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
           <jdbcDriver>org.hsqldb.jdbcDriver</jdbcDriver>
           <jdbcUrl>jdbc:hsqldb:target/jdo</jdbcUrl>
-          <packageName>com.mysema.query.jdo.test.domain.sql</packageName>
+          <packageName>com.querydsl.jdo.test.domain.sql</packageName>
           <userName>sa</userName>
           <targetFolder>src/test/java</targetFolder>
           <namePrefix>S</namePrefix>
@@ -267,7 +269,7 @@
             <dependency>
               <groupId>hsqldb</groupId>
               <artifactId>hsqldb</artifactId>
-              <version>1.8.0.7</version>
+              <version>1.8.0.10</version>
             </dependency>
         </dependencies>
       </plugin>    
@@ -278,15 +280,15 @@
   <repositories>
     <repository>
       <id>datanucleus</id>
-      <url>http://www.datanucleus.org/downloads/maven2</url>
+      <url>https://www.datanucleus.org/downloads/maven2</url>
     </repository>
   </repositories>
 
   <pluginRepositories>
     <pluginRepository>
       <id>datanucleus</id>
-      <url>http://www.datanucleus.org/downloads/maven2</url>
+      <url>https://www.datanucleus.org/downloads/maven2</url>
     </pluginRepository>
   </pluginRepositories>
 
-</project>
+</project>
diff --git a/querydsl-jdo/src/apt/META-INF/services/javax.annotation.processing.Processor b/querydsl-jdo/src/apt/META-INF/services/javax.annotation.processing.Processor
index 390c5f8f7f..ff511957d0 100644
--- a/querydsl-jdo/src/apt/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-jdo/src/apt/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.jdo.JDOAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.jdo.JDOAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-jdo/src/main/assembly.xml b/querydsl-jdo/src/main/assembly.xml
index 8f6d041068..aebd32e50a 100644
--- a/querydsl-jdo/src/main/assembly.xml
+++ b/querydsl-jdo/src/main/assembly.xml
@@ -8,30 +8,28 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>	
-  </fileSets>	
+      <directory>src/apt</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>    
+  </fileSets>    
   <dependencySets>
     <dependencySet>
       <unpack>true</unpack>
       <scope>compile</scope>
-	  <excludes>
-	  	<exclude>cglib:cglib</exclude>
-		<exclude>com.mysema.querydsl:querydsl-sql</exclude>		
-		<exclude>com.mysema.querydsl:querydsl-jdo</exclude>
-		<exclude>org.slf4j:slf4j-api</exclude>
-		<exclude>org.slf4j:slf4j-log4j12</exclude>					
-	  </excludes>
+      <excludes>
+        <exclude>cglib:cglib</exclude>
+        <exclude>com.querydsl:querydsl-sql</exclude>
+        <exclude>com.querydsl:querydsl-jdo</exclude>
+      </excludes>
     </dependencySet>
     <dependencySet>
       <unpack>true</unpack>
-	  <scope>provided</scope>
-	  <includes>
-	  	<include>com.mysema.querydsl:*</include>		
-	  	<include>com.mysema.codegen:*</include>							
-	  </includes>
-    </dependencySet>		
+      <scope>provided</scope>
+      <includes>
+        <include>com.querydsl:*</include>
+        <include>com.querydsl.codegen.utils:*</include>
+      </includes>
+    </dependencySet>        
   </dependencySets>
 </assembly>
 
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java
deleted file mode 100644
index 9c3165210c..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.support.ProjectableQuery;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-
-/**
- * Abstract base class for custom implementations of the JDOCommonQuery interface.
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public abstract class AbstractJDOQuery<Q extends AbstractJDOQuery<Q>> extends ProjectableQuery<Q> implements JDOQLQuery{
-
-    private static final Logger logger = LoggerFactory.getLogger(JDOQuery.class);
-
-    private final Closeable closeable = new Closeable() {
-        @Override
-        public void close() throws IOException {
-            AbstractJDOQuery.this.close();
-        }
-    };
-
-    private final boolean detach;
-
-    private List<Object> orderedConstants = new ArrayList<Object>();
-
-    @Nullable
-    private final PersistenceManager persistenceManager;
-
-    private final List<Query> queries = new ArrayList<Query>(2);
-
-    private final JDOQLTemplates templates;
-
-    protected final Set<String> fetchGroups = new HashSet<String>();
-
-    @Nullable
-    protected Integer maxFetchDepth;
-
-    @Nullable
-    private FactoryExpression<?> projection;
-
-    public AbstractJDOQuery(@Nullable PersistenceManager persistenceManager) {
-        this(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
-    }
-
-    @SuppressWarnings("unchecked")
-    public AbstractJDOQuery(
-            @Nullable PersistenceManager persistenceManager,
-            JDOQLTemplates templates,
-            QueryMetadata metadata, boolean detach) {
-        super(new JDOQueryMixin<Q>(metadata));
-        this.queryMixin.setSelf((Q) this);
-        this.templates = templates;
-        this.persistenceManager = persistenceManager;
-        this.detach = detach;
-    }
-
-    /**
-     * Add the fetch group to the set of active fetch groups.
-     *
-     * @param string
-     * @return
-     */
-    @Override
-    public Q addFetchGroup(String fetchGroupName) {
-        fetchGroups.add(fetchGroupName);
-        return (Q)this;
-    }
-
-    /**
-     * Close the query and related resources
-     */
-    @Override
-    public void close() {
-        for (Query query : queries) {
-            query.closeAll();
-        }
-    }
-
-    @Override
-    public long count() {
-        Query query = createQuery(true);
-        query.setUnique(true);
-        reset();
-        Long rv = (Long) execute(query, true);
-        if (rv != null) {
-            return rv.longValue();
-        } else {
-            throw new QueryException("Query returned null");
-        }
-    }
-
-    @Override
-    public boolean exists() {
-        boolean rv = limit(1).uniqueResult(getSource()) != null;
-        close();
-        return rv;
-    }
-
-    private Expression<?> getSource() {
-        return queryMixin.getMetadata().getJoins().get(0).getTarget();
-    }
-
-    private Query createQuery(boolean forCount) {
-        Expression<?> source = getSource();
-
-        // serialize
-        JDOQLSerializer serializer = new JDOQLSerializer(getTemplates(), source);
-        serializer.serialize(queryMixin.getMetadata(), forCount, false);
-
-        logQuery(serializer.toString());
-
-        // create Query
-        Query query = persistenceManager.newQuery(serializer.toString());
-        orderedConstants = serializer.getConstants();
-        queries.add(query);
-
-        if (!forCount) {
-            List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
-            if (projection.get(0) instanceof FactoryExpression) {
-                this.projection = (FactoryExpression<?>)projection.get(0);
-            }
-            if (!fetchGroups.isEmpty()) {
-                query.getFetchPlan().setGroups(fetchGroups);
-            }
-            if (maxFetchDepth != null) {
-                query.getFetchPlan().setMaxFetchDepth(maxFetchDepth);
-            }
-        }
-
-        return query;
-    }
-
-    protected void logQuery(String queryString) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(queryString.replace('\n', ' '));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T detach(T results) {
-        if (results instanceof Collection) {
-            return (T) persistenceManager.detachCopyAll(results);
-        } else {
-            return persistenceManager.detachCopy(results);
-        }
-    }
-
-    private Object project(FactoryExpression<?> expr, Object row) {
-        if (row == null) {
-            return null;
-        } else if (row.getClass().isArray()) {
-            return expr.newInstance((Object[])row);
-        } else {
-            return expr.newInstance(new Object[]{row});
-        }
-    }
-
-    @Nullable
-    private Object execute(Query query, boolean forCount) {
-        Object rv;
-        if (!orderedConstants.isEmpty()) {
-            rv = query.executeWithArray(orderedConstants.toArray());
-        } else {
-            rv = query.execute();
-        }
-        if (isDetach()) {
-            rv = detach(rv);
-        }
-        if (projection != null && !forCount) {
-            if (rv instanceof List) {
-                List<?> original = (List<?>)rv;
-                rv = Lists.newArrayList();
-                for (Object o : original) {
-                    ((List)rv).add(project(projection, o));
-                }
-            } else {
-                rv = project(projection, rv);
-            }
-        }
-
-        return rv;
-    }
-
-    @Override
-    public Q from(EntityPath<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-
-    public JDOQLTemplates getTemplates() {
-        return templates;
-    }
-
-    public boolean isDetach() {
-        return detach;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return new IteratorAdapter<Tuple>(list(args).iterator(), closeable);
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return new IteratorAdapter<RT>(list(projection).iterator(), closeable);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> List<RT> list(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Object rv = execute(createQuery(false), false);
-        reset();
-        return rv instanceof List ? (List<RT>)rv : Collections.singletonList((RT)rv);
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Query countQuery = createQuery(true);
-        countQuery.setUnique(true);
-        countQuery.setResult("count(this)");
-        long total = (Long) execute(countQuery, true);
-        if (total > 0) {
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            Query query = createQuery(false);
-            reset();
-            return new SearchResults<RT>((List<RT>) execute(query, false), modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    private void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    /**
-     * Set the maximum fetch depth when fetching.
-     * A value of 0 has no meaning and will throw a JDOUserException.
-     * A value of -1 means that no limit is placed on fetching.
-     * A positive integer will result in that number of references from the
-     * initial object to be fetched.
-     *
-     * @param maxFetchDepth
-     * @return
-     */
-    @Override
-    public Q setMaxFetchDepth(int depth) {
-        maxFetchDepth = depth;
-        return (Q)this;
-    }
-
-    @Override
-    public String toString() {
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            Expression<?> source = getSource();
-            JDOQLSerializer serializer = new JDOQLSerializer(getTemplates(), source);
-            serializer.serialize(queryMixin.getMetadata(), false, false);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-    @Override
-    @Nullable
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        return (RT)uniqueResult();
-    }
-
-    @Nullable
-    private Object uniqueResult() {
-        if (getMetadata().getModifiers().getLimit() == null) {
-            limit(2);
-        }
-        Query query = createQuery(false);
-        reset();
-        Object rv = execute(query, false);
-        if (rv instanceof List) {
-            List<?> list = (List)rv;
-            if (!list.isEmpty()) {
-                if (list.size() > 1) {
-                    throw new NonUniqueResultException();
-                }
-                return list.get(0);
-            } else {
-                return null;
-            }
-        } else {
-            return rv;
-        }
-    }
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOSubQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOSubQuery.java
deleted file mode 100644
index 5c07f535ec..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOSubQuery.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.DetachableQuery;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-
-/**
- * Abstract superclass for SubQuery implementations
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public class AbstractJDOSubQuery<Q extends AbstractJDOSubQuery<Q>> extends DetachableQuery<Q> implements JDOCommonQuery<Q> {
-
-    public AbstractJDOSubQuery() {
-        this(new DefaultQueryMetadata().noValidate());
-    }
-
-    @SuppressWarnings("unchecked")
-    public AbstractJDOSubQuery(QueryMetadata metadata) {
-        super(new JDOQueryMixin<Q>(metadata));
-        this.queryMixin.setSelf((Q)this);
-    }
-
-    public Q from(EntityPath<?> arg) {
-        return queryMixin.from(arg);
-    }
-    
-    public Q from(EntityPath<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    public <P> Q from(CollectionExpression<?,P> target, EntityPath<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    public String toString() {
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            Expression<?> source = queryMixin.getMetadata().getJoins().get(0).getTarget();
-            JDOQLSerializer serializer = new JDOQLSerializer(JDOQLTemplates.DEFAULT, source);
-            serializer.setStrict(false);
-            serializer.serialize(queryMixin.getMetadata(), false, false);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOCommonQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOCommonQuery.java
deleted file mode 100644
index 4ca54bcf49..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOCommonQuery.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import com.mysema.query.Query;
-import com.mysema.query.types.EntityPath;
-
-/**
- * JDOCommonQuery is a parent interface for JDOQLQuery and JDOSubQuery
- * 
- * @author tiwe
- *
- * @param <Q>
- */
-public interface JDOCommonQuery<Q extends JDOCommonQuery<Q>> extends Query<Q> {
-    
-    /**
-     * Add query sources
-     *
-     * @param sources
-     * @return
-     */
-    Q from(EntityPath<?>... sources);
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java
deleted file mode 100644
index 09e4bda98a..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import java.io.Closeable;
-
-import javax.jdo.PersistenceManager;
-
-import com.mysema.query.Projectable;
-
-/**
- * Query interface for JDOQL queries
- *
- * @author tiwe
- *
- */
-public interface JDOQLQuery extends JDOCommonQuery<JDOQLQuery>, Projectable, Closeable {
-
-    /**
-     * Clone the state of the query for the given PersistenceManager
-     *
-     * @param persistenceManager
-     * @return
-     */
-    JDOQLQuery clone(PersistenceManager persistenceManager);
-
-    /**
-     * Add the fetch group to the set of active fetch groups.
-     * 
-     * @param string
-     * @return
-     */
-    JDOQLQuery addFetchGroup(String fetchGroupName);
-
-    /**
-     * Set the maximum fetch depth when fetching. 
-     * A value of 0 has no meaning and will throw a JDOUserException.
-     * A value of -1 means that no limit is placed on fetching.
-     * A positive integer will result in that number of references from the
-     * initial object to be fetched.
-     * 
-     * @param maxFetchDepth
-     * @return
-     */
-    JDOQLQuery setMaxFetchDepth(int maxFetchDepth);
-    
-    /**
-     * Close the query and related resources
-     */
-    @Override
-    void close();
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
deleted file mode 100644
index a110011502..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Stack;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.primitives.Primitives;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.Param;
-
-/**
- * JDOQLSerializer serializes Querydsl queries and expressions into JDOQL strings
- *
- * @author tiwe
- *
- */
-public final class JDOQLSerializer extends SerializerBase<JDOQLSerializer> {
-
-    private static final String COMMA = ", ";
-
-    private static final String FROM = "\nFROM ";
-
-    private static final String GROUP_BY = "\nGROUP BY ";
-
-    private static final String HAVING = "\nHAVING ";
-
-    private static final String ORDER_BY = "\nORDER BY ";
-
-    private static final String PARAMETERS = "\nPARAMETERS ";
-
-    private static final String RANGE = "\nRANGE ";
-
-    private static final String SELECT = "SELECT ";
-
-    private static final String SELECT_COUNT = "SELECT count(";
-
-    private static final String SELECT_COUNT_THIS = "SELECT count(this)\n";
-
-    private static final String SELECT_DISTINCT = "SELECT DISTINCT ";
-
-    private static final String SELECT_UNIQUE = "SELECT UNIQUE ";
-
-    private static final String THIS = "this";
-
-    private static final String VARIABLES = "\nVARIABLES ";
-
-    private static final String WHERE = "\nWHERE ";
-    
-    private static Comparator<Map.Entry<Object,String>> comparator = new Comparator<Map.Entry<Object,String>>() {
-        @Override
-        public int compare(Entry<Object, String> o1, Entry<Object, String> o2) {
-            return o1.getValue().compareTo(o2.getValue());
-        }
-    };
-
-    private final Expression<?> candidatePath;
-
-    private final List<Object> constants = new ArrayList<Object>();
-
-    private final Stack<Map<Object,String>> constantToLabel = new Stack<Map<Object,String>>();
-    
-    public JDOQLSerializer(JDOQLTemplates templates, Expression<?> candidate) {
-        super(templates);
-        this.candidatePath = candidate;
-        this.constantToLabel.push(new HashMap<Object,String>());
-    }
-
-    public Expression<?> getCandidatePath() {
-        return candidatePath;
-    }
-
-    public List<Object> getConstants() {
-        return constants;
-    }
-    
-    @Override
-    public Map<Object,String> getConstantToLabel() {
-        return constantToLabel.peek();
-    }
-
-    public void serialize(QueryMetadata metadata, boolean forCountRow, boolean subQuery) {
-        final List<? extends Expression<?>> select = metadata.getProjection();
-        final List<JoinExpression> joins = metadata.getJoins();
-        final Expression<?> source = joins.get(0).getTarget();
-        final Predicate where = metadata.getWhere();
-        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
-        final Predicate having = metadata.getHaving();
-        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
-
-        constantToLabel.push(new HashMap<Object,String>());
-        
-        // select
-        boolean skippedSelect = false;
-        if (forCountRow) {
-            if (joins.size() == 1 && !subQuery) {
-                append(SELECT_COUNT_THIS);
-            } else {
-                append(SELECT_COUNT);
-                boolean first = true;
-                for (JoinExpression je : joins) {
-                    if (!first) {
-                        append(COMMA);
-                    }
-                    handle(je.getTarget());
-                    first = false;
-                }
-                append(")");
-            }
-
-        } else if (!select.isEmpty()) {
-            if (metadata.isDistinct()) {
-                append(SELECT_DISTINCT);
-            } else if (metadata.isUnique() && !subQuery) {
-                append(SELECT_UNIQUE);
-            } else {
-                append(SELECT);
-            }
-            if (select.size() >1 || !select.get(0).equals(source) || metadata.isDistinct()) {
-                handle(COMMA, select);    
-            } else {
-                skippedSelect = true;
-            }
-        }
-
-        // from
-        append(skippedSelect ? FROM.substring(1) : FROM);
-        if (source instanceof Operation && subQuery) {
-            handle(source);
-        } else {
-            append(source.getType().getName());
-            if (!source.equals(candidatePath)) {
-                append(" ").handle(source);
-            }
-        }
-
-        // where
-        if (where != null) {
-            append(WHERE).handle(where);
-        }
-
-        // variables
-        if (joins.size() > 1) {
-            serializeVariables(joins);
-        }
-        
-        int position = getLength();
-        
-        // group by
-        if (!groupBy.isEmpty()) {
-            append(GROUP_BY).handle(COMMA, groupBy);
-        }
-
-        // having
-        if (having != null) {
-            append(HAVING).handle(having);
-        }
-
-        // order by
-        if (!orderBy.isEmpty() && !forCountRow) {
-            append(ORDER_BY);
-            boolean first = true;
-            for (final OrderSpecifier<?> os : orderBy) {
-                if (!first) {
-                    append(COMMA);
-                }
-                handle(os.getTarget());
-                append(" " + os.getOrder());
-                first = false;
-            }
-        }
-
-        // range
-        if (!forCountRow && metadata.getModifiers().isRestricting()) {
-            Long limit = metadata.getModifiers().getLimit();
-            Long offset = metadata.getModifiers().getOffset();
-            serializeModifiers(limit, offset);
-        }
-        
-        // parameters        
-        if (!getConstantToLabel().isEmpty()) {
-            insert(position, serializeParameters(metadata.getParams()));            
-        }
-        
-        constantToLabel.pop();
-        
-    }
-
-    private void serializeModifiers(@Nullable Long limit, @Nullable Long offset) {
-        append(RANGE);
-        if (offset != null) {
-            append(String.valueOf(offset));
-            if (limit != null) {
-                append(COMMA);
-                append(String.valueOf(offset + limit));
-            }
-        } else {
-            append("0, ").append(String.valueOf(limit));
-        }
-    }
-
-    private String serializeParameters(Map<ParamExpression<?>, Object> params) {
-        final StringBuilder b = new StringBuilder();
-        b.append(PARAMETERS);
-        boolean first = true;
-        final List<Map.Entry<Object, String>> entries = new ArrayList<Map.Entry<Object, String>>(getConstantToLabel().entrySet());
-        Collections.sort(entries, comparator);
-        for (Map.Entry<Object, String> entry : entries) {
-            if (!first) {
-                b.append(COMMA);
-            }
-            if (Param.class.isInstance(entry.getKey())) {
-                Object constant = params.get(entry.getKey());
-                if (constant == null) {
-                    throw new ParamNotSetException((Param<?>) entry.getKey());
-                }
-                constants.add(constant);
-                b.append(((Param<?>)entry.getKey()).getType().getName());
-            } else {
-                constants.add(entry.getKey());
-                b.append(entry.getKey().getClass().getName());
-            }
-            b.append(" ").append(entry.getValue());
-            first = false;
-        }
-        return b.toString();
-    }
-
-    private void serializeVariables(List<JoinExpression> joins) {
-        append(VARIABLES);
-        for (int i = 1; i < joins.size(); i++) {
-            final JoinExpression je = joins.get(i);
-            if (i > 1) {
-                append("; ");
-            }
-
-            // type specifier
-            if (je.getTarget() instanceof EntityPath) {
-                final EntityPath<?> pe = (EntityPath<?>) je.getTarget();
-                if (pe.getMetadata().getParent() == null) {
-                    append(pe.getType().getName()).append(" ");
-                }
-            }
-            handle(je.getTarget());
-        }
-    }
-
-    @Override
-    public Void visit(Path<?> path, Void context) {
-        if (path.equals(candidatePath)) {
-            append(THIS);
-        } else {
-            super.visit(path, context);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visit(SubQueryExpression<?> query, Void context) {
-        append("(");
-        serialize(query.getMetadata(), false, true);
-        append(")");
-        return null;
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    protected void visitOperation(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        if (operator == Ops.INSTANCE_OF) {
-            handle(args.get(0)).append(" instanceof ");
-            append(((Constant<Class<?>>) args.get(1)).getConstant().getName());
-
-        } else if (operator == Ops.LIKE || operator == Ops.LIKE_ESCAPE) {
-            super.visitOperation(type, Ops.MATCHES, 
-                ImmutableList.of(args.get(0), ExpressionUtils.likeToRegex((Expression<String>) args.get(1), false)));
-            
-        // exists    
-        } else if (operator == Ops.EXISTS && args.get(0) instanceof SubQueryExpression) {
-            final SubQueryExpression subQuery = (SubQueryExpression) args.get(0);
-            append("(");
-            serialize(subQuery.getMetadata(), true, true);
-            append(") > 0");
-
-        // not exists    
-        } else if (operator == Ops.NOT && args.get(0) instanceof Operation 
-                && ((Operation)args.get(0)).getOperator().equals(Ops.EXISTS)) {    
-            final SubQueryExpression subQuery = (SubQueryExpression) ((Operation)args.get(0)).getArg(0);
-            append("(");
-            serialize(subQuery.getMetadata(), true, true);
-            append(") == 0");
-                
-        } else if (operator == Ops.NUMCAST) {
-            Class<?> clazz = ((Constant<Class<?>>)args.get(1)).getConstant();
-            if (Number.class.isAssignableFrom(clazz) && Primitives.isWrapperType(clazz)) {
-                clazz = Primitives.unwrap(clazz);
-            }
-            append("("+clazz.getSimpleName()+")").handle(args.get(0));
-
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-    
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java
deleted file mode 100644
index 0844765f1f..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import com.mysema.query.types.JavaTemplates;
-import com.mysema.query.types.Ops;
-
-/**
- * JDOQLTemplates provides patterns for JDOQL serialization
- *
- * @author tiwe
- *
- */
-public final class JDOQLTemplates extends JavaTemplates {
-
-    public static final JDOQLTemplates DEFAULT = new JDOQLTemplates();
-
-    protected JDOQLTemplates() {
-        // String
-        add(Ops.STRING_CONTAINS, "{0}.indexOf({1}) > -1", 25);
-        add(Ops.STRING_CONTAINS_IC, "{0l}.indexOf({1l}) > -1", 25);
-        add(Ops.EQ_IGNORE_CASE, "{0l}.equals({1l})");
-        add(Ops.STRING_IS_EMPTY, "{0} == \"\"", 25);
-        add(Ops.LIKE, "{0}.like({1})");
-        add(Ops.LIKE_ESCAPE, "{0}.like({1})");
-
-        add(Ops.STRING_CAST, "(String){0}");
-
-        // Date
-        add(Ops.DateTimeOps.MONTH, "({0}.getMonth() + 1)"); // getMonth() in JDO returns a range from 0-11
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "{0}.getDay()");
-        add(Ops.DateTimeOps.MILLISECOND, "0"); // NOT supported in JDOQL
-
-        add(Ops.DateTimeOps.YEAR_MONTH, "({0}.getYear() * 100 + {0}.getMonth() + 1)");
-
-        // other
-        add(Ops.ALIAS, "{0} {1}");
-    }
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java
deleted file mode 100644
index b21187c4aa..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import javax.jdo.PersistenceManager;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-
-/**
- * JDOQuery is the default implementation of the JDOQLQuery interface
- *
- * @author tiwe
- *
- * @param <A>
- */
-public final class JDOQuery extends AbstractJDOQuery<JDOQuery> {
-
-    /**
-     * Create a detached JDOQuery instance
-     * The query can be attached via the clone method
-     *
-     * @param persistenceManager
-     */
-    public JDOQuery() {
-        super(null, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
-    }
-
-    /**
-     * Create a new JDOQuery instance
-     *
-     * @param persistenceManager PersistenceManager instance to use
-     * @param templates JDOQLTemplates to use
-     * @param detach detached results or not
-     */
-    public JDOQuery(PersistenceManager persistenceManager, JDOQLTemplates templates, boolean detach) {
-        super(persistenceManager, templates, new DefaultQueryMetadata(), detach);
-    }
-
-    /**
-     * Create a new JDOQuery instance
-     *
-     * @param persistenceManager PersistenceManager instance to use
-     * @param detach detached results or not
-     */
-    public JDOQuery(PersistenceManager persistenceManager, boolean detach) {
-        super(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), detach);
-    }
-
-    /**
-     * Create a new JDOQuery instance
-     *
-     * @param persistenceManager PersistenceManager instance to use
-     */
-    public JDOQuery(PersistenceManager persistenceManager) {
-        super(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
-    }
-
-    /**
-     * Create a new JDOQuery instance
-     * 
-     * @param persistenceManager
-     * @param templates
-     * @param metadata
-     * @param detach
-     */
-    protected JDOQuery(PersistenceManager persistenceManager, JDOQLTemplates templates, 
-            QueryMetadata metadata, boolean detach) {
-        super(persistenceManager, templates, metadata, detach);
-    }
-
-    /**
-     * Clone the state of this query to a new JDOQuery instance with the given PersistenceManager
-     *
-     * @param persistenceManager
-     * @return
-     */
-    public JDOQuery clone(PersistenceManager persistenceManager) {
-        JDOQuery query = new JDOQuery(persistenceManager, getTemplates(), 
-                getMetadata().clone(), isDetach());
-        query.fetchGroups.addAll(fetchGroups);
-        query.maxFetchDepth = maxFetchDepth;
-        return query;
-    }
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryFactory.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryFactory.java
deleted file mode 100644
index 3406d049ad..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import javax.inject.Provider;
-import javax.jdo.PersistenceManager;
-
-import com.mysema.query.QueryFactory;
-import com.mysema.query.jdo.dml.JDODeleteClause;
-import com.mysema.query.types.EntityPath;
-
-/**
- * Factory class for query and DML clause creation
- *
- * @author tiwe
- *
- */
-public class JDOQueryFactory implements QueryFactory<JDOQuery, JDOSubQuery> {
-
-    private final Provider<PersistenceManager> persistenceManager;
-
-    public JDOQueryFactory(Provider<PersistenceManager> persistenceManager) {
-        this.persistenceManager = persistenceManager;
-    }
-
-    public JDODeleteClause delete(EntityPath<?> path) {
-        return new JDODeleteClause(persistenceManager.get(), path);
-    }
-
-    public JDOQuery from(EntityPath<?> from) {
-        return query().from(from);
-    }
-
-    public JDOQuery query() {
-        return new JDOQuery(persistenceManager.get());
-    }
-
-    public JDOSubQuery subQuery() {
-        return new JDOSubQuery();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryMixin.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryMixin.java
deleted file mode 100644
index 143080b0a2..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQueryMixin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.CollectionAnyVisitor;
-import com.mysema.query.support.Context;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-
-/**
- * JDOQueryMixin extends {@link QueryMixin} to provide module specific extensions 
- * 
- * @author tiwe
- *
- * @param <T>
- */
-public class JDOQueryMixin<T> extends QueryMixin<T> {
-    
-    public JDOQueryMixin() {}
-
-    public JDOQueryMixin(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-    public JDOQueryMixin(T self, QueryMetadata metadata) {
-        super(self, metadata);
-    }
-        
-    @Override
-    protected Predicate normalize(Predicate predicate, boolean where) {
-        predicate = (Predicate)ExpressionUtils.extract(predicate);
-        if (predicate != null) {
-            Context context = new Context();            
-            Predicate transformed = (Predicate) predicate.accept(CollectionAnyVisitor.DEFAULT, context);
-            for (int i = 0; i < context.paths.size(); i++) {
-                Path<?> path = context.paths.get(i);            
-                addCondition(context, i, path, where);
-            }
-            return transformed;    
-        } else {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCondition(Context context, int i, Path<?> path, boolean where) {
-        EntityPath<?> alias = context.replacements.get(i);                 
-        from(alias);
-        Predicate condition = PredicateOperation.create(Ops.IN, alias, path.getMetadata().getParent());
-        if (where) {
-            super.where(condition);
-        } else {
-            super.having(condition);
-        }
-    }
-    
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOSubQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOSubQuery.java
deleted file mode 100644
index 4285c47b26..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOSubQuery.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.query.NumberSubQuery;
-
-/**
- * JDOSubQuery is subquery implementation for JDOQL
- *
- * @author tiwe
- *
- */
-public class JDOSubQuery extends AbstractJDOSubQuery<JDOSubQuery> {
-    
-    public JDOSubQuery() {
-        super();
-    }
-
-    public JDOSubQuery(QueryMetadata metadata) {
-        super(metadata);
-    }
-    
-    @Override
-    public BooleanExpression exists() {
-        return count().gt(0l);
-    }
-    
-    @Override
-    public BooleanExpression notExists() {
-        return count().eq(0l);
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public NumberSubQuery<Long> count() {
-        Expression<?> target = queryMixin.getMetadata().getJoins().get(0).getTarget();
-        if (target instanceof Operation && ((Operation)target).getOperator() == Ops.ALIAS) {
-            target = ((Operation)target).getArg(1);
-        }
-        return unique(NumberOperation.create(Long.class, Ops.AggOps.COUNT_AGG, target));  
-    }
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOUpdateClause.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOUpdateClause.java
deleted file mode 100644
index 4fe34d853f..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOUpdateClause.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.dml;
-
-import java.util.List;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * UpdateClause implementation for JDO
- *
- * @author tiwe
- *
- */
-public class JDOUpdateClause implements UpdateClause<JDOUpdateClause> {
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    @Override
-    public long execute() {
-        // TODO : implement
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public JDOUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
-        for (int i = 0; i < paths.size(); i++) {
-            if (values.get(i) != null) {
-                metadata.addProjection(ExpressionUtils.eqConst(((Expression)paths.get(i)), values.get(i)));
-            } else {
-                metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)), 
-                        new NullExpression(paths.get(i).getType())));
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public <T> JDOUpdateClause set(Path<T> path, T value) {
-        if (value != null) {
-            metadata.addProjection(ExpressionUtils.eqConst(path, value));
-        } else {
-            metadata.addProjection(ExpressionUtils.eq(path, new NullExpression<T>(path.getType())));
-        }
-        return this;
-    }
-
-
-    @Override
-    public <T> JDOUpdateClause set(Path<T> path, Expression<? extends T> expression) {
-        metadata.addProjection(ExpressionUtils.eq(path, expression));
-        return this;
-    }
-    
-    @Override
-    public <T> JDOUpdateClause setNull(Path<T> path) {
-        metadata.addProjection(ExpressionUtils.eq(path, new NullExpression<T>(path.getType())));
-        return this;
-    }
-    
-    @Override
-    public JDOUpdateClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);    
-        }        
-        return this;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return metadata.getProjection().isEmpty();
-    }
-
-
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/package-info.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/package-info.java
deleted file mode 100644
index f2555d0450..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * DML operations support for Querydsl JDOQL
- */
-package com.mysema.query.jdo.dml;
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/package-info.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/package-info.java
deleted file mode 100644
index f513725e6c..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * JDOQL support for Querydsl
- */
-package com.mysema.query.jdo;
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
deleted file mode 100644
index f220ce32a1..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.sql;
-
-import javax.annotation.Nullable;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Query;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.*;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.ProjectableSQLQuery;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Base class for JDO based SQLQuery implementations
- *
- * @author tiwe
- *
- * @param <T>
- */
-@SuppressWarnings("rawtypes")
-public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T>> extends ProjectableSQLQuery<T> {
-
-
-    private static final Logger logger = LoggerFactory.getLogger(JDOSQLQuery.class);
-
-    private final Closeable closeable = new Closeable() {
-        @Override
-        public void close() throws IOException {
-            AbstractSQLQuery.this.close();
-        }
-    };
-
-    protected final boolean detach;
-
-    private List<Object> orderedConstants = new ArrayList<Object>();
-
-    @Nullable
-    protected final PersistenceManager persistenceManager;
-
-    protected List<Query> queries = new ArrayList<Query>(2);
-
-    @Nullable
-    protected FactoryExpression<?> projection;
-
-    protected final QueryMixin<T> queryMixin;
-
-    @Nullable
-    protected Expression<?> union;
-
-    protected boolean unionAll;
-
-    @SuppressWarnings("unchecked")
-    public AbstractSQLQuery(QueryMetadata metadata, Configuration conf, PersistenceManager persistenceManager,
-                            boolean detach) {
-        super(new QueryMixin<T>(metadata, false), conf);
-        this.queryMixin = super.queryMixin;
-        this.queryMixin.setSelf((T)this);
-        this.persistenceManager = persistenceManager;
-        this.detach = detach;
-    }
-
-    public void close() {
-        for (Query query : queries) {
-            query.closeAll();
-        }
-    }
-
-    @Override
-    public long count() {
-        Query query = createQuery(true);
-        query.setUnique(true);
-        reset();
-        Long rv = (Long) execute(query, true);
-        if (rv != null) {
-            return rv.longValue();
-        } else {
-            throw new QueryException("Query returned null");
-        }
-    }
-
-    private Query createQuery(boolean forCount) {
-        SQLSerializer serializer = new SQLSerializer(configuration);
-        if (union != null) {
-            serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
-        } else {
-            serializer.serialize(queryMixin.getMetadata(), forCount);
-        }
-
-
-        // create Query
-        if (logger.isDebugEnabled()) {
-            logger.debug(serializer.toString());
-        }
-        Query query = persistenceManager.newQuery("javax.jdo.query.SQL",serializer.toString());
-        orderedConstants = serializer.getConstants();
-        queries.add(query);
-
-        if (!forCount) {
-            List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
-            if (projection.get(0) instanceof FactoryExpression) {
-                this.projection = (FactoryExpression<?>)projection.get(0);
-            }
-        } else {
-            query.setResultClass(Long.class);
-        }
-
-        return query;
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T detach(T results) {
-        if (results instanceof Collection) {
-            return (T) persistenceManager.detachCopyAll(results);
-        } else {
-            return persistenceManager.detachCopy(results);
-        }
-    }
-
-    private Object project(FactoryExpression<?> expr, Object row) {
-        if (row == null) {
-            return null;
-        } else if (row.getClass().isArray()) {
-            return expr.newInstance((Object[])row);
-        } else {
-            return expr.newInstance(new Object[]{row});
-        }
-    }
-
-    private Object execute(Query query, boolean forCount) {
-        Object rv;
-        if (!orderedConstants.isEmpty()) {
-            rv = query.executeWithArray(orderedConstants.toArray());
-        } else {
-            rv = query.execute();
-        }
-        if (isDetach()) {
-            rv = detach(rv);
-        }
-        if (projection != null && !forCount) {
-            if (rv instanceof List) {
-                List<?> original = (List<?>)rv;
-                rv = Lists.newArrayList();
-                for (Object o : original) {
-                    ((List)rv).add(project(projection, o));
-                }
-            } else {
-                rv = project(projection, rv);
-            }
-        }
-        return rv;
-    }
-
-    @Override
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-
-    public boolean isDetach() {
-        return detach;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        return new IteratorAdapter<RT>(list(projection).iterator(), closeable);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> List<RT> list(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Object rv = execute(createQuery(false), false);
-        reset();
-        return rv instanceof List ? (List<RT>)rv : Collections.singletonList((RT) rv);
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Query countQuery = createQuery(true);
-        countQuery.setUnique(true);
-        long total = (Long) execute(countQuery, true);
-        if (total > 0) {
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            Query query = createQuery(false);
-            reset();
-            return new SearchResults<RT>((List<RT>) execute(query, false), modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    private void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    @Override
-    public String toString() {
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            SQLSerializer serializer = new SQLSerializer(configuration);
-            serializer.serialize(queryMixin.getMetadata(), false);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-
-    @Override
-    @Nullable
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        return (RT)uniqueResult();
-    }
-
-    @Nullable
-    private Object uniqueResult() {
-        if (getMetadata().getModifiers().getLimit() == null) {
-            limit(2);
-        }
-        Query query = createQuery(false);
-        reset();
-        Object rv = execute(query, false);
-        if (rv instanceof List) {
-            List<?> list = (List<?>)rv;
-            if (!list.isEmpty()) {
-                if (list.size() > 1) {
-                    throw new NonUniqueResultException();
-                }
-                return list.get(0);
-            } else {
-                return null;
-            }
-        } else {
-            return rv;
-        }
-    }
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
deleted file mode 100644
index 23321a2996..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.sql;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-
-import javax.annotation.Nullable;
-import javax.jdo.PersistenceManager;
-
-/**
- * JDOSQLQuery is an SQLQuery implementation that uses JDO's SQL query functionality
- * to execute queries
- *
- * @author tiwe
- *
- */
-public final class JDOSQLQuery extends AbstractSQLQuery<JDOSQLQuery> {
-
-    public JDOSQLQuery(@Nullable PersistenceManager persistenceManager, SQLTemplates templates) {
-        this(persistenceManager, new Configuration(templates), new DefaultQueryMetadata().noValidate(), false);
-    }
-
-    public JDOSQLQuery(@Nullable PersistenceManager persistenceManager, Configuration configuration) {
-        this(persistenceManager, configuration, new DefaultQueryMetadata().noValidate(), false);
-    }
-
-    public JDOSQLQuery(
-            @Nullable PersistenceManager persistenceManager,
-            Configuration configuration,
-            QueryMetadata metadata, boolean detach) {
-        super(metadata, configuration, persistenceManager, detach);
-    }
-
-    @Override
-    public JDOSQLQuery clone() {
-        JDOSQLQuery query = new JDOSQLQuery(persistenceManager, configuration, getMetadata().clone(), detach);
-        query.clone(this);
-        return query;
-    }
-
-    @Override
-    protected SQLSerializer createSerializer() {
-        return new SQLSerializer(configuration);
-    }
-}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/package-info.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/package-info.java
deleted file mode 100644
index f9bd56fa7b..0000000000
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.jdo.sql;
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
new file mode 100644
index 0000000000..5a1d749048
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.*;
+import com.querydsl.core.support.FetchableSubQueryBase;
+import com.querydsl.core.types.*;
+
+/**
+ * Abstract base class for custom implementations of the {@link JDOQLQuery} interface.
+ *
+ * @author tiwe
+ *
+ * @param <T> result type
+ * @param <Q> concrete subclass
+ */
+public abstract class AbstractJDOQuery<T, Q extends AbstractJDOQuery<T, Q>> extends FetchableSubQueryBase<T, Q> implements JDOQLQuery<T> {
+
+    private static final Logger logger =  Logger.getLogger(JDOQuery.class.getName());
+
+    private final Closeable closeable = new Closeable() {
+        @Override
+        public void close() throws IOException {
+            AbstractJDOQuery.this.close();
+        }
+    };
+
+    private final boolean detach;
+
+    private List<Object> orderedConstants = new ArrayList<Object>();
+
+    @Nullable
+    private final PersistenceManager persistenceManager;
+
+    private final List<Query> queries = new ArrayList<Query>(2);
+
+    private final JDOQLTemplates templates;
+
+    protected final Set<String> fetchGroups = new HashSet<String>();
+
+    @Nullable
+    protected Integer maxFetchDepth;
+
+    @Nullable
+    private FactoryExpression<?> projection;
+
+    public AbstractJDOQuery(@Nullable PersistenceManager persistenceManager) {
+        this(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
+    }
+
+    @SuppressWarnings("unchecked")
+    public AbstractJDOQuery(
+            @Nullable PersistenceManager persistenceManager,
+            JDOQLTemplates templates,
+            QueryMetadata metadata, boolean detach) {
+        super(new JDOQueryMixin<Q>(metadata));
+        this.queryMixin.setSelf((Q) this);
+        this.templates = templates;
+        this.persistenceManager = persistenceManager;
+        this.detach = detach;
+    }
+
+    /**
+     * Add the fetch group to the set of active fetch groups.
+     *
+     * @param fetchGroupName fetch group name
+     * @return the current object
+     */
+    @Override
+    public Q addFetchGroup(String fetchGroupName) {
+        fetchGroups.add(fetchGroupName);
+        return queryMixin.getSelf();
+    }
+
+    /**
+     * Close the query and related resources
+     */
+    @Override
+    public void close() {
+        for (Query query : queries) {
+            query.closeAll();
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        try {
+            Query query = createQuery(true);
+            query.setUnique(true);
+            Long rv = (Long) execute(query, true);
+            if (rv != null) {
+                return rv;
+            } else {
+                throw new QueryException("Query returned null");
+            }
+        } finally {
+            reset();
+        }
+
+    }
+
+    private Expression<?> getSource() {
+        return queryMixin.getMetadata().getJoins().get(0).getTarget();
+    }
+
+    private Query createQuery(boolean forCount) {
+        Expression<?> source = getSource();
+
+        // serialize
+        JDOQLSerializer serializer = new JDOQLSerializer(getTemplates(), source);
+        serializer.serialize(queryMixin.getMetadata(), forCount, false);
+
+        logQuery(serializer.toString(), serializer.getConstantToLabel());
+
+        // create Query
+        Query query = persistenceManager.newQuery(serializer.toString());
+        orderedConstants = serializer.getConstants();
+        queries.add(query);
+
+        if (!forCount) {
+            Expression<?> projection = queryMixin.getMetadata().getProjection();
+            if (projection instanceof FactoryExpression) {
+                this.projection = (FactoryExpression<?>) projection;
+            }
+            if (!fetchGroups.isEmpty()) {
+                query.getFetchPlan().setGroups(fetchGroups);
+            }
+            if (maxFetchDepth != null) {
+                query.getFetchPlan().setMaxFetchDepth(maxFetchDepth);
+            }
+        }
+
+        return query;
+    }
+
+    protected void logQuery(String queryString, Map<Object, String> parameters) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T detach(T results) {
+        if (results instanceof Collection) {
+            return (T) persistenceManager.detachCopyAll((Collection<?>) results);
+        } else {
+            return persistenceManager.detachCopy(results);
+        }
+    }
+
+    private Object project(FactoryExpression<?> expr, Object row) {
+        if (row == null) {
+            return null;
+        } else if (row.getClass().isArray()) {
+            return expr.newInstance((Object[]) row);
+        } else {
+            return expr.newInstance(new Object[]{row});
+        }
+    }
+
+    @Nullable
+    private Object execute(Query query, boolean forCount) {
+        Object rv;
+        if (!orderedConstants.isEmpty()) {
+            rv = query.executeWithArray(orderedConstants.toArray());
+        } else {
+            rv = query.execute();
+        }
+        if (isDetach()) {
+            rv = detach(rv);
+        }
+        if (projection != null && !forCount) {
+            if (rv instanceof List) {
+                List<?> original = (List<?>) rv;
+                rv = new ArrayList<>();
+                for (Object o : original) {
+                    ((List) rv).add(project(projection, o));
+                }
+            } else {
+                rv = project(projection, rv);
+            }
+        }
+
+        return rv;
+    }
+
+    @Override
+    public Q from(EntityPath<?>... args) {
+        return queryMixin.from(args);
+    }
+
+    @Override
+    public <U> Q from(CollectionExpression<?, U> path, Path<U> alias) {
+        return (Q) queryMixin.from((Expression) ExpressionUtils.as((Path) path, alias));
+    }
+
+    public JDOQLTemplates getTemplates() {
+        return templates;
+    }
+
+    public boolean isDetach() {
+        return detach;
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        return new IteratorAdapter<T>(fetch().iterator(), closeable);
+    }
+
+    @Override
+    public Stream<T> stream() {
+        return fetch().stream().onClose(this::close);
+    }
+
+    @Override
+    public List<T> fetch() {
+        try {
+            Object rv = execute(createQuery(false), false);
+            @SuppressWarnings("unchecked") // Compile time checking of user code mandates it to be T
+            List<T> result = rv instanceof List ? (List<T>) rv : Collections.singletonList((T) rv);
+            return result;
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        try {
+            Query countQuery = createQuery(true);
+            countQuery.setUnique(true);
+            countQuery.setResult("count(this)");
+            long total = (Long) execute(countQuery, true);
+            if (total > 0) {
+                QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+                Query query = createQuery(false);
+                return new QueryResults<T>((List<T>) execute(query, false), modifiers, total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } finally {
+            reset();
+        }
+    }
+
+    private void reset() {
+    }
+
+    /**
+     * Set the maximum fetch depth when fetching.
+     * A value of 0 has no meaning and will throw a {@link JDOUserException}.
+     * A value of -1 means that no limit is placed on fetching.
+     * A positive integer will result in that number of references from the
+     * initial object to be fetched.
+     *
+     * @param depth fetch depth
+     * @return the current object
+     */
+    @Override
+    public Q setMaxFetchDepth(int depth) {
+        maxFetchDepth = depth;
+        return queryMixin.getSelf();
+    }
+
+    @Override
+    public String toString() {
+        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
+            Expression<?> source = getSource();
+            JDOQLSerializer serializer = new JDOQLSerializer(getTemplates(), source);
+            serializer.serialize(queryMixin.getMetadata(), false, false);
+            return serializer.toString().trim();
+        } else {
+            return super.toString();
+        }
+    }
+
+    @Nullable
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        if (getMetadata().getModifiers().getLimit() == null) {
+            limit(2);
+        }
+        try {
+            Query query = createQuery(false);
+            Object rv = execute(query, false);
+            if (rv instanceof List) {
+                @SuppressWarnings("unchecked") // Compile time checking of user code mandates this
+                List<T> list = (List<T>) rv;
+                if (!list.isEmpty()) {
+                    if (list.size() > 1) {
+                        throw new NonUniqueResultException();
+                    }
+                    return list.get(0);
+                } else {
+                    return null;
+                }
+            } else {
+                // it is not a List typed expression
+                @SuppressWarnings("unchecked") // Compile time checking of user code mandates this
+                T result = (T) rv;
+                return result;
+            }
+        } finally {
+            reset();
+        }
+
+    }
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java
new file mode 100644
index 0000000000..03ad666e0b
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOExpressions.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * Common JDO expressions
+ */
+public final class JDOExpressions {
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(expr)
+     */
+    public static <T> JDOQuery<T> select(Expression<T> expr) {
+        return new JDOQuery<Void>().select(expr);
+    }
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    public static JDOQuery<Tuple> select(Expression<?>... exprs) {
+        return new JDOQuery<Void>().select(exprs);
+    }
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(distinct expr)
+     */
+    public static <T> JDOQuery<T> selectDistinct(Expression<T> expr) {
+        return select(expr).distinct();
+    }
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(distinct exprs)
+     */
+    public static JDOQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return select(exprs).distinct();
+    }
+
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection 0
+     *
+     * @return select(0)
+     */
+    public static JDOQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the projection 1
+     *
+     * @return select(1)
+     */
+    public static JDOQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    /**
+     * Create a new detached {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection and source
+     * @param <T>
+     * @return select(expr).from(expr)
+     */
+    public static <T> JDOQuery<T> selectFrom(EntityPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+    private JDOExpressions() { }
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java
new file mode 100644
index 0000000000..d326270673
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLQuery.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.io.Closeable;
+
+import javax.jdo.PersistenceManager;
+
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Query;
+import com.querydsl.core.support.ExtendedSubQuery;
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+
+/**
+ * Query interface for JDOQL queries
+ *
+ * @author tiwe
+ *
+ * @param <T> result type
+ */
+public interface JDOQLQuery<T> extends FetchableQuery<T, JDOQLQuery<T>>, Query<JDOQLQuery<T>>, ExtendedSubQuery<T>, Closeable {
+
+    /**
+     * Add query sources
+     *
+     * @param sources sources
+     * @return the current object
+     */
+    JDOQLQuery<T> from(EntityPath<?>... sources);
+
+    /**
+     * Add query sources
+     *
+     * @param path source
+     * @param alias alias
+     * @param <U>
+     * @return the current object
+     */
+    <U> JDOQLQuery<T> from(CollectionExpression<?, U> path, Path<U> alias);
+
+    /**
+     * Clone the state of the query for the given PersistenceManager
+     *
+     * @param persistenceManager persistence manager
+     * @return cloned query
+     */
+    JDOQLQuery<T> clone(PersistenceManager persistenceManager);
+
+    /**
+     * Add the fetch group to the set of active fetch groups.
+     *
+     * @param fetchGroupName fetch group name
+     * @return the current object
+     */
+    JDOQLQuery<T> addFetchGroup(String fetchGroupName);
+
+    /**
+     * Set the maximum fetch depth when fetching.
+     * A value of 0 has no meaning and will throw a JDOUserException.
+     * A value of -1 means that no limit is placed on fetching.
+     * A positive integer will result in that number of references from the
+     * initial object to be fetched.
+     *
+     * @param maxFetchDepth max fetch depth
+     * @return the current object
+     */
+    JDOQLQuery<T> setMaxFetchDepth(int maxFetchDepth);
+
+    /**
+     * Close the query and related resources
+     */
+    @Override
+    void close();
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java
new file mode 100644
index 0000000000..971509cc14
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLSerializer.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.SerializerBase;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.util.PrimitiveUtils;
+
+/**
+ * {@code JDOQLSerializer} serializes Querydsl queries and expressions into JDOQL strings
+ *
+ * @author tiwe
+ *
+ */
+public final class JDOQLSerializer extends SerializerBase<JDOQLSerializer> {
+
+    private static final String COMMA = ", ";
+
+    private static final String FROM = "\nFROM ";
+
+    private static final String GROUP_BY = "\nGROUP BY ";
+
+    private static final String HAVING = "\nHAVING ";
+
+    private static final String ORDER_BY = "\nORDER BY ";
+
+    private static final String PARAMETERS = "\nPARAMETERS ";
+
+    private static final String RANGE = "\nRANGE ";
+
+    private static final String SELECT = "SELECT ";
+
+    private static final String SELECT_COUNT = "SELECT count(";
+
+    private static final String SELECT_COUNT_THIS = "SELECT count(this)\n";
+
+    private static final String SELECT_DISTINCT = "SELECT DISTINCT ";
+
+    private static final String SELECT_UNIQUE = "SELECT UNIQUE ";
+
+    private static final String THIS = "this";
+
+    private static final String VARIABLES = "\nVARIABLES ";
+
+    private static final String WHERE = "\nWHERE ";
+
+    private static Comparator<Map.Entry<Object,String>> comparator = new Comparator<Map.Entry<Object,String>>() {
+        @Override
+        public int compare(Entry<Object, String> o1, Entry<Object, String> o2) {
+            return o1.getValue().compareTo(o2.getValue());
+        }
+    };
+
+    private final Expression<?> candidatePath;
+
+    private final List<Object> constants = new ArrayList<Object>();
+
+    private final Stack<Map<Object,String>> constantToLabel = new Stack<Map<Object,String>>();
+
+    public JDOQLSerializer(JDOQLTemplates templates, Expression<?> candidate) {
+        super(templates);
+        this.candidatePath = candidate;
+        this.constantToLabel.push(new LinkedHashMap<>());
+    }
+
+    public Expression<?> getCandidatePath() {
+        return candidatePath;
+    }
+
+    @Override
+    public List<Object> getConstants() {
+        return constants;
+    }
+
+    @Override
+    public Map<Object,String> getConstantToLabel() {
+        return constantToLabel.peek();
+    }
+
+    public void serialize(QueryMetadata metadata, boolean forCountRow, boolean subQuery) {
+        final Expression<?> select = metadata.getProjection();
+        final List<JoinExpression> joins = metadata.getJoins();
+        final Expression<?> source = joins.get(0).getTarget();
+        final Predicate where = metadata.getWhere();
+        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
+        final Predicate having = metadata.getHaving();
+        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
+
+        constantToLabel.push(new LinkedHashMap<Object,String>());
+
+        // select
+        boolean skippedSelect = false;
+        if (forCountRow) {
+            if (joins.size() == 1 && !subQuery) {
+                append(SELECT_COUNT_THIS);
+            } else {
+                append(SELECT_COUNT);
+                handle(source);
+                append(")");
+            }
+
+        } else if (select != null) {
+            if (metadata.isDistinct()) {
+                append(SELECT_DISTINCT);
+            } else if (metadata.isUnique() && !subQuery) {
+                append(SELECT_UNIQUE);
+            } else {
+                append(SELECT);
+            }
+            if (!select.equals(source) || metadata.isDistinct()) {
+                handle(select);
+            } else {
+                skippedSelect = true;
+            }
+        }
+
+        // from
+        append(skippedSelect ? FROM.substring(1) : FROM);
+        if (source instanceof Operation && subQuery) {
+            handle(source);
+        } else {
+            append(source.getType().getName());
+            if (!source.equals(candidatePath)) {
+                append(" ").handle(source);
+            }
+        }
+
+        // where
+        if (where != null) {
+            append(WHERE).handle(where);
+        }
+
+        // variables
+        if (joins.size() > 1) {
+            serializeVariables(joins);
+        }
+
+        int position = getLength();
+
+        // group by
+        if (!groupBy.isEmpty()) {
+            append(GROUP_BY).handle(COMMA, groupBy);
+        }
+
+        // having
+        if (having != null) {
+            append(HAVING).handle(having);
+        }
+
+        // order by
+        if (!orderBy.isEmpty() && !forCountRow) {
+            append(ORDER_BY);
+            boolean first = true;
+            for (final OrderSpecifier<?> os : orderBy) {
+                if (!first) {
+                    append(COMMA);
+                }
+                handle(os.getTarget());
+                append(" " + os.getOrder());
+                first = false;
+            }
+        }
+
+        // range
+        if (!forCountRow && metadata.getModifiers().isRestricting()) {
+            Long limit = metadata.getModifiers().getLimit();
+            Long offset = metadata.getModifiers().getOffset();
+            serializeModifiers(limit, offset);
+        }
+
+        // parameters
+        if (!getConstantToLabel().isEmpty()) {
+            insert(position, serializeParameters(metadata.getParams()));
+        }
+
+        constantToLabel.pop();
+
+    }
+
+    private void serializeModifiers(@Nullable Long limit, @Nullable Long offset) {
+        append(RANGE);
+        if (offset != null) {
+            append(String.valueOf(offset));
+            if (limit != null) {
+                append(COMMA);
+                append(String.valueOf(offset + limit));
+            }
+        } else {
+            append("0, ").append(String.valueOf(limit));
+        }
+    }
+
+    private String serializeParameters(Map<ParamExpression<?>, Object> params) {
+        final StringBuilder b = new StringBuilder();
+        b.append(PARAMETERS);
+        boolean first = true;
+        final Collection<Map.Entry<Object, String>> entries = getConstantToLabel().entrySet();
+        for (Map.Entry<Object, String> entry : entries) {
+            if (!first) {
+                b.append(COMMA);
+            }
+            if (entry.getKey() instanceof Param) {
+                Object constant = params.get(entry.getKey());
+                if (constant == null) {
+                    throw new ParamNotSetException((Param<?>) entry.getKey());
+                }
+                constants.add(constant);
+                b.append(((Param<?>) entry.getKey()).getType().getName());
+            } else {
+                constants.add(entry.getKey());
+                b.append(entry.getKey().getClass().getName());
+            }
+            b.append(" ").append(entry.getValue());
+            first = false;
+        }
+        return b.toString();
+    }
+
+    private void serializeVariables(List<JoinExpression> joins) {
+        append(VARIABLES);
+        for (int i = 1; i < joins.size(); i++) {
+            final JoinExpression je = joins.get(i);
+            if (i > 1) {
+                append("; ");
+            }
+
+            // type specifier
+            if (je.getTarget() instanceof EntityPath) {
+                final EntityPath<?> pe = (EntityPath<?>) je.getTarget();
+                if (pe.getMetadata().getParent() == null) {
+                    append(pe.getType().getName()).append(" ");
+                }
+            }
+            handle(je.getTarget());
+        }
+    }
+
+    @Override
+    public Void visit(Path<?> path, Void context) {
+        if (path.equals(candidatePath)) {
+            append(THIS);
+        } else {
+            super.visit(path, context);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visit(SubQueryExpression<?> query, Void context) {
+        append("(");
+        serialize(query.getMetadata(), false, true);
+        append(")");
+        return null;
+    }
+
+    @Override
+    protected void visitOperation(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        if (operator == Ops.INSTANCE_OF) {
+            handle(args.get(0)).append(" instanceof ");
+            @SuppressWarnings("unchecked") //This is the expected type for instanceOf
+            Constant<Class<?>> rightArg = (Constant<Class<?>>) args.get(1);
+            append(rightArg.getConstant().getName());
+
+        } else if (operator == Ops.LIKE || operator == Ops.LIKE_ESCAPE || operator == Ops.LIKE_IC || operator == Ops.LIKE_ESCAPE_IC) {
+            @SuppressWarnings("unchecked") //This is the expected type for like
+            Expression<String> string = (Expression<String>) args.get(0);
+            @SuppressWarnings("unchecked") //This is the expected type for like
+            Expression<String> regex = ExpressionUtils.likeToRegex((Expression<String>) args.get(1), false);
+            if (operator == Ops.LIKE_IC || operator == Ops.LIKE_ESCAPE_IC) {
+                string = ExpressionUtils.toLower(string);
+                regex = ExpressionUtils.toLower(regex);
+            }
+            super.visitOperation(type, Ops.MATCHES,
+                Arrays.asList(string, regex));
+
+        // exists
+        } else if (operator == Ops.EXISTS && args.get(0) instanceof SubQueryExpression) {
+            final SubQueryExpression subQuery = (SubQueryExpression) args.get(0);
+            append("(");
+            serialize(subQuery.getMetadata(), true, true);
+            append(") > 0");
+
+        // not exists
+        } else if (operator == Ops.NOT && args.get(0) instanceof Operation
+                && ((Operation) args.get(0)).getOperator().equals(Ops.EXISTS)) {
+            final SubQueryExpression subQuery = (SubQueryExpression) ((Operation) args.get(0)).getArg(0);
+            append("(");
+            serialize(subQuery.getMetadata(), true, true);
+            append(") == 0");
+
+        } else if (operator == Ops.NUMCAST) {
+            @SuppressWarnings("unchecked") //This is the expected type for castToNum
+            Constant<Class<?>> rightArg = (Constant<Class<?>>) args.get(1);
+            Class<?> clazz = rightArg.getConstant();
+            if (Number.class.isAssignableFrom(clazz) && PrimitiveUtils.isWrapperType(clazz)) {
+                clazz = PrimitiveUtils.unwrap(clazz);
+            }
+            append("(" + clazz.getSimpleName() + ")").handle(args.get(0));
+
+        } else if (operator == Ops.ALIAS) {
+            if (args.get(1) instanceof Path && !((Path<?>) args.get(1)).getMetadata().isRoot()) {
+                Path<?> path = (Path<?>) args.get(1);
+                args = Arrays.asList(args.get(0),
+                        ExpressionUtils.path(path.getType(), path.getMetadata().getName()));
+            }
+            super.visitOperation(type, operator, args);
+
+        } else {
+            super.visitOperation(type, operator, args);
+        }
+    }
+
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
new file mode 100644
index 0000000000..f14a4a52d7
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import com.querydsl.core.types.JavaTemplates;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code JDOQLTemplates} provides patterns for JDOQL serialization
+ *
+ * @author tiwe
+ *
+ */
+public final class JDOQLTemplates extends JavaTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final JDOQLTemplates DEFAULT = new JDOQLTemplates();
+
+    protected JDOQLTemplates() {
+        // String
+        add(Ops.STRING_CONTAINS, "{0}.indexOf({1}) > -1", Precedence.COMPARISON);
+        add(Ops.STRING_CONTAINS_IC, "{0l}.indexOf({1l}) > -1", Precedence.COMPARISON);
+        add(Ops.EQ_IGNORE_CASE, "{0l}.equals({1l})");
+        add(Ops.STRING_IS_EMPTY, "{0} == \"\"", Precedence.EQUALITY);
+        add(Ops.LIKE, "{0}.like({1})");
+        add(Ops.LIKE_IC, "{0l}.like({1l})");
+        add(Ops.LIKE_ESCAPE, "{0}.like({1})");
+        add(Ops.LIKE_ESCAPE_IC, "{0l}.like({1l})");
+
+        add(Ops.STRING_CAST, "(String){0}");
+
+        // Date
+        add(Ops.DateTimeOps.MONTH, "({0}.getMonth() + 1)"); // getMonth() in JDO returns a range from 0-11
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "{0}.getDay()");
+        add(Ops.DateTimeOps.MILLISECOND, "0"); // NOT supported in JDOQL
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "({0}.getYear() * 100 + {0}.getMonth() + 1)");
+
+        // other
+        add(Ops.ALIAS, "{0} {1}");
+    }
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java
new file mode 100644
index 0000000000..326fc776ec
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQuery.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import javax.jdo.PersistenceManager;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code JDOQuery} is the default implementation of the {@link JDOQLQuery} interface
+ *
+ * @author tiwe
+ *
+ * @param <T> result type
+ */
+public class JDOQuery<T> extends AbstractJDOQuery<T, JDOQuery<T>> {
+
+    /**
+     * Create a detached {@link JDOQuery} instance
+     * The query can be attached via the clone method
+     *
+     */
+    public JDOQuery() {
+        super(null, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance
+     *
+     * @param persistenceManager PersistenceManager instance to use
+     * @param templates JDOQLTemplates to use
+     * @param detach detached results or not
+     */
+    public JDOQuery(PersistenceManager persistenceManager, JDOQLTemplates templates, boolean detach) {
+        super(persistenceManager, templates, new DefaultQueryMetadata(), detach);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance
+     *
+     * @param persistenceManager PersistenceManager instance to use
+     * @param detach detached results or not
+     */
+    public JDOQuery(PersistenceManager persistenceManager, boolean detach) {
+        super(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), detach);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance
+     *
+     * @param persistenceManager PersistenceManager instance to use
+     */
+    public JDOQuery(PersistenceManager persistenceManager) {
+        super(persistenceManager, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance
+     *
+     * @param persistenceManager PersistenceManager instance to use
+     * @param templates templates to use
+     * @param metadata query metadata
+     * @param detach detached results or not
+     */
+    protected JDOQuery(PersistenceManager persistenceManager, JDOQLTemplates templates,
+            QueryMetadata metadata, boolean detach) {
+        super(persistenceManager, templates, metadata, detach);
+    }
+
+    /**
+     * Clone the state of this query to a new {@link JDOQuery} instance with the given {@link PersistenceManager}
+     *
+     * @param persistenceManager PersistenceManager instance to use
+     * @return cloned query
+     */
+    @Override
+    public JDOQuery<T> clone(PersistenceManager persistenceManager) {
+        JDOQuery<T> query = new JDOQuery<T>(persistenceManager, getTemplates(),
+                getMetadata().clone(), isDetach());
+        query.fetchGroups.addAll(fetchGroups);
+        query.maxFetchDepth = maxFetchDepth;
+        return query;
+    }
+
+    @Override
+    public <U> JDOQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new projection type
+        JDOQuery<U> newType = (JDOQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public JDOQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new projection type
+        JDOQuery<Tuple> newType = (JDOQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java
new file mode 100644
index 0000000000..23a2b0e9f9
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryFactory.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import javax.jdo.PersistenceManager;
+
+import com.querydsl.core.QueryFactory;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jdo.dml.JDODeleteClause;
+
+import java.util.function.Supplier;
+
+/**
+ * Factory class for query and DML clause creation
+ *
+ * @author tiwe
+ *
+ */
+public class JDOQueryFactory implements QueryFactory<JDOQuery<?>> {
+
+    private final Supplier<PersistenceManager> persistenceManager;
+
+    public JDOQueryFactory(Supplier<PersistenceManager> persistenceManager) {
+        this.persistenceManager = persistenceManager;
+    }
+
+    public JDODeleteClause delete(EntityPath<?> path) {
+        return new JDODeleteClause(persistenceManager.get(), path);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(expr)
+     */
+    public <T> JDOQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    public JDOQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(distinct expr)
+     */
+    public <T> JDOQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(distinct exprs)
+     */
+    public JDOQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the projection 0
+     *
+     * @return select(0)
+     */
+    public JDOQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the projection 1
+     *
+     * @return select(1)
+     */
+    public JDOQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    /**
+     * Create a new {@link JDOQuery} instance with the given projection
+     *
+     * @param expr projection and source
+     * @param <T>
+     * @return select(expr).from(expr)
+     */
+    public <T> JDOQuery<T> selectFrom(EntityPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+    public JDOQuery<?> from(EntityPath<?> from) {
+        return query().from(from);
+    }
+
+    @Override
+    public JDOQuery<?> query() {
+        return new JDOQuery<Void>(persistenceManager.get());
+    }
+
+
+}
\ No newline at end of file
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java
new file mode 100644
index 0000000000..20a4a63a84
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQueryMixin.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.Context;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.*;
+
+/**
+ * {@code JDOQueryMixin} extends {@link QueryMixin} to provide module-specific extensions
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JDOQueryMixin<T> extends QueryMixin<T> {
+
+    public JDOQueryMixin() { }
+
+    public JDOQueryMixin(QueryMetadata metadata) {
+        super(metadata);
+    }
+
+    public JDOQueryMixin(T self, QueryMetadata metadata) {
+        super(self, metadata);
+    }
+
+    @Override
+    protected Predicate convert(Predicate predicate, Role role) {
+        predicate = (Predicate) ExpressionUtils.extract(predicate);
+        if (predicate != null) {
+            Context context = new Context();
+            Predicate transformed = (Predicate) predicate.accept(collectionAnyVisitor, context);
+            for (int i = 0; i < context.paths.size(); i++) {
+                Path<?> path = context.paths.get(i);
+                addCondition(context, i, path, role);
+            }
+            return transformed;
+        } else {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void addCondition(Context context, int i, Path<?> path, Role role) {
+        EntityPath<?> alias = context.replacements.get(i);
+        from(alias);
+        Predicate condition = ExpressionUtils.predicate(Ops.IN, alias, path.getMetadata().getParent());
+        if (role == Role.WHERE) {
+            super.where(condition);
+        } else {
+            super.having(condition);
+        }
+    }
+
+}
diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDODeleteClause.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
similarity index 83%
rename from querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDODeleteClause.java
rename to querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
index 568c0ecb65..9beb6ccf61 100644
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDODeleteClause.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDODeleteClause.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.dml;
+package com.querydsl.jdo.dml;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,17 +20,17 @@
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.jdo.JDOQLSerializer;
-import com.mysema.query.jdo.JDOQLTemplates;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Predicate;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jdo.JDOQLSerializer;
+import com.querydsl.jdo.JDOQLTemplates;
 
 /**
- * DeleteClause implementation for JDO
+ * {@link DeleteClause} implementation for JDO
  *
  * @author tiwe
  *
@@ -49,7 +49,7 @@ public JDODeleteClause(PersistenceManager pm, EntityPath<?> entity) {
         this(pm, entity, JDOQLTemplates.DEFAULT);
     }
 
-    public JDODeleteClause(PersistenceManager persistenceManager, EntityPath<?> entity, 
+    public JDODeleteClause(PersistenceManager persistenceManager, EntityPath<?> entity,
             JDOQLTemplates templates) {
         this.entity = entity;
         this.persistenceManager = persistenceManager;
@@ -66,7 +66,7 @@ public long execute() {
             query.setFilter(serializer.toString());
             Map<Object,String> constToLabel = serializer.getConstantToLabel();
 
-            try{
+            try {
                 if (!constToLabel.isEmpty()) {
                     List<Object> constants = new ArrayList<Object>(constToLabel.size());
                     StringBuilder builder = new StringBuilder();
@@ -83,26 +83,26 @@ public long execute() {
                 } else {
                     return query.deletePersistentAll();
                 }
-            }finally{
+            } finally {
                 query.closeAll();
             }
         } else {
-            try{
+            try {
                 return query.deletePersistentAll();
-            }finally{
+            } finally {
                 query.closeAll();
             }
         }
     }
-    
+
     @Override
     public JDODeleteClause where(Predicate... o) {
         for (Predicate p : o) {
-            metadata.addWhere(p);    
-        }        
+            metadata.addWhere(p);
+        }
         return this;
     }
-    
+
     @Override
     public String toString() {
         JDOQLSerializer serializer = new JDOQLSerializer(templates, entity);
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java
new file mode 100644
index 0000000000..4bb2ac71ff
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/JDOUpdateClause.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.dml;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@link UpdateClause} implementation for JDO
+ *
+ * @author tiwe
+ *
+ */
+public class JDOUpdateClause implements UpdateClause<JDOUpdateClause> {
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private final Map<Path<?>, Expression<?>> updates = new LinkedHashMap<>();
+
+    @Override
+    public long execute() {
+        // TODO : implement
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public JDOUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
+        for (int i = 0; i < paths.size(); i++) {
+            if (values.get(i) != null) {
+                updates.put(paths.get(i), Expressions.constant(values.get(i)));
+            } else {
+                updates.put(paths.get(i), Expressions.nullExpression(paths.get(i)));
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public <T> JDOUpdateClause set(Path<T> path, T value) {
+        if (value != null) {
+            updates.put(path, Expressions.constant(value));
+        } else {
+            updates.put(path, Expressions.nullExpression(path));
+        }
+        return this;
+    }
+
+
+    @Override
+    public <T> JDOUpdateClause set(Path<T> path, Expression<? extends T> expression) {
+        updates.put(path, expression);
+        return this;
+    }
+
+    @Override
+    public <T> JDOUpdateClause setNull(Path<T> path) {
+        updates.put(path, Expressions.nullExpression(path));
+        return this;
+    }
+
+    @Override
+    public JDOUpdateClause where(Predicate... o) {
+        for (Predicate p : o) {
+            metadata.addWhere(p);
+        }
+        return this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return updates.isEmpty();
+    }
+
+
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/package-info.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/package-info.java
new file mode 100644
index 0000000000..e4ef354a29
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/dml/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * DML operations support
+ */
+package com.querydsl.jdo.dml;
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/package-info.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/package-info.java
new file mode 100644
index 0000000000..bb52784eb4
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JDO support
+ */
+package com.querydsl.jdo;
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
new file mode 100644
index 0000000000..1744f38fe3
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.sql;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jetbrains.annotations.Nullable;
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.*;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.ProjectableSQLQuery;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.SQLSerializer;
+
+/**
+ * Base class for JDO-based {@link SQLQuery} implementations
+ *
+ * @author tiwe
+ *
+ * @param <T> result type
+ * @param <Q> concrete subclass
+ */
+@SuppressWarnings("rawtypes")
+public abstract class AbstractSQLQuery<T, Q extends AbstractSQLQuery<T, Q>> extends ProjectableSQLQuery<T, Q> {
+
+    private static final Logger logger = Logger.getLogger(JDOSQLQuery.class.getName());
+
+    private final Closeable closeable = new Closeable() {
+        @Override
+        public void close() throws IOException {
+            AbstractSQLQuery.this.close();
+        }
+    };
+
+    protected final boolean detach;
+
+    private List<Object> orderedConstants = new ArrayList<Object>();
+
+    @Nullable
+    protected final PersistenceManager persistenceManager;
+
+    protected List<Query> queries = new ArrayList<Query>(2);
+
+    @Nullable
+    protected FactoryExpression<?> projection;
+
+    protected final QueryMixin<Q> queryMixin;
+
+    @SuppressWarnings("unchecked")
+    public AbstractSQLQuery(QueryMetadata metadata, Configuration conf, PersistenceManager persistenceManager,
+                            boolean detach) {
+        super(new QueryMixin<Q>(metadata, false), conf);
+        this.queryMixin = super.queryMixin;
+        this.queryMixin.setSelf((Q) this);
+        this.persistenceManager = persistenceManager;
+        this.detach = detach;
+    }
+
+    /**
+     * Close the query and related resources
+     */
+    public void close() {
+        for (Query query : queries) {
+            query.closeAll();
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        Query query = createQuery(true);
+        query.setUnique(true);
+        Long rv = (Long) execute(query, true);
+        if (rv != null) {
+            return rv;
+        } else {
+            throw new QueryException("Query returned null");
+        }
+    }
+
+    private Query createQuery(boolean forCount) {
+        SQLSerializer serializer = new SQLSerializer(configuration);
+        if (union != null) {
+            serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
+        } else {
+            serializer.serialize(queryMixin.getMetadata(), forCount);
+        }
+
+
+        // create Query
+        if (logger.isLoggable(Level.FINE)) {
+            logger.fine(serializer.toString());
+        }
+        Query query = persistenceManager.newQuery("javax.jdo.query.SQL", serializer.toString());
+        orderedConstants = serializer.getConstants();
+        queries.add(query);
+
+        if (!forCount) {
+            Expression<?> projection = queryMixin.getMetadata().getProjection();
+            if (projection instanceof FactoryExpression) {
+                this.projection = (FactoryExpression<?>) projection;
+            }
+        } else {
+            query.setResultClass(Long.class);
+        }
+
+        return query;
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T detach(T results) {
+        if (results instanceof Collection) {
+            return (T) persistenceManager.detachCopyAll(results);
+        } else {
+            return persistenceManager.detachCopy(results);
+        }
+    }
+
+    private Object project(FactoryExpression<?> expr, Object row) {
+        if (row == null) {
+            return null;
+        } else if (row.getClass().isArray()) {
+            return expr.newInstance((Object[]) row);
+        } else {
+            return expr.newInstance(row);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Object execute(Query query, boolean forCount) {
+        Object rv;
+        if (!orderedConstants.isEmpty()) {
+            rv = query.executeWithArray(orderedConstants.toArray());
+        } else {
+            rv = query.execute();
+        }
+        if (isDetach()) {
+            rv = detach(rv);
+        }
+        if (projection != null && !forCount) {
+            if (rv instanceof List) {
+                List<?> original = (List<?>) rv;
+                rv = new ArrayList<>();
+                for (Object o : original) {
+                    ((List) rv).add(project(projection, o));
+                }
+            } else {
+                rv = project(projection, rv);
+            }
+        }
+        return rv;
+    }
+
+    public boolean isDetach() {
+        return detach;
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        return new IteratorAdapter<T>(fetch().iterator(), closeable);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<T> fetch() {
+        Object rv = execute(createQuery(false), false);
+        return rv instanceof List ? (List<T>) rv : Collections.singletonList((T) rv);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public QueryResults<T> fetchResults() {
+        Query countQuery = createQuery(true);
+        countQuery.setUnique(true);
+        long total = (Long) execute(countQuery, true);
+        if (total > 0) {
+            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+            Query query = createQuery(false);
+            return new QueryResults<T>((List<T>) execute(query, false), modifiers, total);
+        } else {
+            return QueryResults.emptyResults();
+        }
+    }
+
+    @Override
+    public String toString() {
+        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
+            SQLSerializer serializer = new SQLSerializer(configuration);
+            serializer.serialize(queryMixin.getMetadata(), false);
+            return serializer.toString().trim();
+        } else {
+            return super.toString();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @Nullable
+    public T fetchOne() throws NonUniqueResultException {
+        if (getMetadata().getModifiers().getLimit() == null) {
+            limit(2);
+        }
+        Query query = createQuery(false);
+        Object rv = execute(query, false);
+        if (rv instanceof List) {
+            List<?> list = (List<?>) rv;
+            if (!list.isEmpty()) {
+                if (list.size() > 1) {
+                    throw new NonUniqueResultException();
+                }
+                return (T) list.get(0);
+            } else {
+                return null;
+            }
+        } else {
+            return (T) rv;
+        }
+    }
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java
new file mode 100644
index 0000000000..bf2c34189e
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/JDOSQLQuery.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.sql;
+
+import org.jetbrains.annotations.Nullable;
+import javax.jdo.PersistenceManager;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.SQLSerializer;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code JDOSQLQuery} is a {@link SQLQuery} implementation that uses JDO's SQL query functionality
+ * to execute queries
+ *
+ * @author tiwe
+ *
+ * @param <T> result type
+ *
+ */
+public final class JDOSQLQuery<T> extends AbstractSQLQuery<T, JDOSQLQuery<T>> {
+
+    public JDOSQLQuery(@Nullable PersistenceManager persistenceManager, SQLTemplates templates) {
+        this(persistenceManager, new Configuration(templates), new DefaultQueryMetadata(), false);
+    }
+
+    public JDOSQLQuery(@Nullable PersistenceManager persistenceManager, Configuration configuration) {
+        this(persistenceManager, configuration, new DefaultQueryMetadata(), false);
+    }
+
+    public JDOSQLQuery(
+            @Nullable PersistenceManager persistenceManager,
+            Configuration configuration,
+            QueryMetadata metadata, boolean detach) {
+        super(metadata, configuration, persistenceManager, detach);
+    }
+
+    @Override
+    public JDOSQLQuery<T> clone() {
+        JDOSQLQuery<T> query = new JDOSQLQuery<T>(persistenceManager, configuration, getMetadata().clone(), detach);
+        query.clone(this);
+        return query;
+    }
+
+    @Override
+    protected SQLSerializer createSerializer() {
+        return new SQLSerializer(configuration);
+    }
+
+    @Override
+    public <U> JDOSQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        JDOSQLQuery<U> newType = (JDOSQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public JDOSQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        JDOSQLQuery<Tuple> newType = (JDOSQLQuery<Tuple>) this;
+        return newType;
+    }
+}
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/package-info.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/package-info.java
new file mode 100644
index 0000000000..c6c43c2bef
--- /dev/null
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/sql/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SQL queries for JDO
+ */
+package com.querydsl.jdo.sql;
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/JDOQueryStandardTest.java b/querydsl-jdo/src/test/java/com/mysema/query/JDOQueryStandardTest.java
deleted file mode 100644
index 07d3d595c7..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/JDOQueryStandardTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.jdo.AbstractJDOTest;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.jdo.test.domain.QStore;
-import com.mysema.query.jdo.test.domain.Store;
-import com.mysema.query.types.ArrayConstructorExpression;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.expr.Param;
-
-public class JDOQueryStandardTest extends AbstractJDOTest {
-
-    public static class Projection {
-
-        public Projection(String str) {}
-
-    }
-
-    private static final Date publicationDate;
-
-    private static final java.sql.Date date;
-
-    private static final java.sql.Time time;
-
-    static{
-        Calendar cal = Calendar.getInstance();
-        cal.set(2000, 1, 2, 3, 4);
-        cal.set(Calendar.MILLISECOND, 0);
-        publicationDate = cal.getTime();
-        date = new java.sql.Date(cal.getTimeInMillis());
-        time = new java.sql.Time(cal.getTimeInMillis());
-    }
-
-    private static String productName = "ABCD";
-
-    private static String otherName = "ABC0";
-
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                // Product instances
-                pm.makePersistent(new Product("ABC" + i, "F" + i, i * 200.00, 2, publicationDate));
-                pm.makePersistent(new Product("DEF" + i, "E" + i, i * 200.00, 4, publicationDate));
-                pm.makePersistent(new Product("GHI" + i, "D" + i, i * 200.00, 6, publicationDate));
-
-                // Product of Store
-                Product product = new Product(productName,"A",100.0,1, publicationDate);
-                pm.makePersistent(product);
-
-                // Store instances
-                Store store = new Store();
-                store.getProducts().add(product);
-                store.getProductsByName().put(productName, product);
-                pm.makePersistent(store);
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-    private final QueryExecution standardTest = new QueryExecution(Module.JDO, Target.H2) {
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery() {
-            return Pair.of(
-                (Projectable)query().from(store, product, otherProduct),
-                new Expression<?>[]{store, product, otherProduct});
-        }
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery(Predicate filter) {
-            return Pair.of(
-                (Projectable)query().from(store, product, otherProduct).where(filter),
-                new Expression<?>[]{store, product, otherProduct});
-        }
-    };
-
-    private final QProduct product = QProduct.product;
-
-    private final QProduct otherProduct = new QProduct("otherProduct");
-
-    private final QStore store = QStore.store;
-
-    private final QStore otherStore = new QStore("otherStore");
-
-    @Test
-    public void StandardTest() {
-        Product p = query().from(product).where(product.name.eq(productName)).limit(1).uniqueResult(product);
-        Product p2 = query().from(product).where(product.name.startsWith(otherName)).limit(1).uniqueResult(product);
-        standardTest.noProjections();
-        standardTest.noCounts();
-
-        standardTest.runBooleanTests(product.name.isNull(), otherProduct.price.lt(10.00));
-        standardTest.runCollectionTests(store.products, otherStore.products, p, p2);
-        standardTest.runDateTests(product.dateField, otherProduct.dateField, date);
-        standardTest.runDateTimeTests(product.publicationDate, otherProduct.publicationDate, publicationDate);
-        // NO list support in JDOQL
-//        testData.listTests(store.products, otherStore.products, p);
-        standardTest.runMapTests(store.productsByName, otherStore.productsByName, productName, p, "X", p2);
-        standardTest.runNumericCasts(product.price, otherProduct.price, 200.0);
-        standardTest.runNumericTests(product.amount, otherProduct.amount, 2);
-        standardTest.runStringTests(product.name, otherProduct.name, productName);
-        standardTest.runTimeTests(product.timeField, otherProduct.timeField, time);
-
-        standardTest.report();
-    }
-
-    @Test
-    public void TupleProjection() {
-        List<Tuple> tuples = query().from(product).list(new QTuple(product.name, product.price));
-        assertFalse(tuples.isEmpty());
-        for (Tuple tuple : tuples) {
-            assertNotNull(tuple);
-            assertNotNull(tuple.get(product.name));
-            assertNotNull(tuple.get(product.price));
-            assertNotNull(tuple.get(0,String.class));
-            assertNotNull(tuple.get(1,Double.class));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    @Ignore
-    public void ArrayProjection() {
-        // typed array not supported
-        List<String[]> results = query().from(store)
-                .list(new ArrayConstructorExpression<String>(String[].class, store.name));
-        assertFalse(results.isEmpty());
-        for (String[] result : results) {
-            assertNotNull(result);
-            assertNotNull(result[0]);
-        }
-    }
-
-    @Test
-    @Ignore
-    public void ConstructorProjection() {
-        List<Projection> results = query().from(store)
-                .list(ConstructorExpression.create(Projection.class, store.name));
-        assertFalse(results.isEmpty());
-        for (Projection result : results) {
-            assertNotNull(result);
-        }
-    }
-
-    @Test
-    public void Params() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("ABC0",query().from(product).where(product.name.eq(name)).set(name, "ABC0")
-                .uniqueResult(product.name));
-    }
-
-    @Test
-    public void Params_anon() {
-        Param<String> name = new Param<String>(String.class);
-        assertEquals("ABC0",query().from(product).where(product.name.eq(name)).set(name, "ABC0")
-                .uniqueResult(product.name));
-    }
-
-    @Test(expected=ParamNotSetException.class)
-    public void Params_not_set() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("ABC0",query().from(product).where(product.name.eq(name))
-                .uniqueResult(product.name));
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query().from(product).where(product.name.eq("ABC0")).exists());
-    }
-
-    @Test
-    public void NotExists() {
-        assertTrue(query().from(product).where(product.name.eq("XXX")).notExists());
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java b/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java
deleted file mode 100644
index 61cbc40b7f..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.jdo.annotations.PersistenceCapable;
-
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.query.apt.jdo.JDOAnnotationProcessor;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.types.Expression;
-
-public class PackageVerification {
-    
-    @Test
-    public void Verify_Package() throws Exception{
-        String version = System.getProperty("version");
-        verify(new File("target/querydsl-jdo-"+version+"-apt-one-jar.jar"));        
-    }
-
-    private void verify(File oneJar) throws Exception {
-        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
-        // verify classLoader
-        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
-        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
-        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
-        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
-        oneJarClassLoader.loadClass(PersistenceCapable.class.getName()); // jdo        
-        Class cl = oneJarClassLoader.loadClass(JDOAnnotationProcessor.class.getName()); // querydsl-apt
-        cl.newInstance();
-        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
-        assertEquals(JDOAnnotationProcessor.class.getName(), 
-                Resources.toString(oneJarClassLoader.findResource(resourceKey), Charsets.UTF_8));
-    }
-    
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/AbstractJDOTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/AbstractJDOTest.java
deleted file mode 100644
index f4934ebf36..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/AbstractJDOTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import java.util.List;
-
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Transaction;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-
-import com.mysema.query.jdo.dml.JDODeleteClause;
-import com.mysema.query.jdo.test.domain.Book;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.Store;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Predicate;
-
-public abstract class AbstractJDOTest {
-
-    private static final JDOQLTemplates templates = new JDOQLTemplates();
-    
-    protected static final PersistenceManagerFactory pmf = 
-            JDOHelper.getPersistenceManagerFactory("datanucleus.properties");
-
-    protected PersistenceManager pm;
-
-    protected Transaction tx;
-
-    protected JDOQuery query() {
-        return new JDOQuery(pm, templates, false);
-    }
-
-    protected JDOQuery detachedQuery() {
-        return new JDOQuery(pm, templates, true);
-    }
-
-    protected JDOSubQuery sub() {
-        return new JDOSubQuery();
-    }
-
-    protected <T> List<T> query(EntityPath<T> source, Predicate condition) {
-        return query().from(source).where(condition).list(source);
-    }
-
-    protected JDODeleteClause delete(EntityPath<?> entity) {
-        return new JDODeleteClause(pm, entity, templates);
-    }
-
-    @Before
-    public void setUp() {
-        pm = pmf.getPersistenceManager();
-        tx = pm.currentTransaction();
-        tx.begin();
-    }
-
-    @After
-    public void tearDown() {
-        if (tx.isActive()) {
-            tx.rollback();
-        }
-        pm.close();
-    }
-
-    @AfterClass
-    public static void doCleanUp() {
-        // Clean out the database
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            pm.newQuery(Store.class).deletePersistentAll();
-            pm.newQuery(Book.class).deletePersistentAll();
-            pm.newQuery(Product.class).deletePersistentAll();
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/AggregateTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/AggregateTest.java
deleted file mode 100644
index 94dbf5610c..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/AggregateTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class AggregateTest extends AbstractJDOTest{
-
-    private final QProduct product = QProduct.product;
-
-    @Test
-    public void Unique() {
-        double min = 200.00, avg = 400.00, max = 600.00;
-        assertEquals(Double.valueOf(min), query().from(product).uniqueResult(product.price.min()));
-        assertEquals(Double.valueOf(avg), query().from(product).uniqueResult(product.price.avg()));
-        assertEquals(Double.valueOf(max), query().from(product).uniqueResult(product.price.max()));
-    }
-
-    @Test
-    public void List() {
-        double min = 200.00, avg = 400.00, max = 600.00;
-        assertEquals(Double.valueOf(min), query().from(product).list(product.price.min()).get(0));
-        assertEquals(Double.valueOf(avg), query().from(product).list(product.price.avg()).get(0));
-        assertEquals(Double.valueOf(max), query().from(product).list(product.price.max()).get(0));        
-    }
-    
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F", 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E", 400.00, 4));
-                pm.makePersistent(new Product("A" + i, "D", 600.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/BasicsTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/BasicsTest.java
deleted file mode 100644
index ba38935797..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/BasicsTest.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import com.mysema.query.types.Projections;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.jdo.test.domain.Book;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QBook;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.types.Expression;
-
-public class BasicsTest extends AbstractJDOTest {
-
-    private static final JDOQLTemplates templates = new JDOQLTemplates();
-
-    private final QBook book = QBook.book;
-
-    private final QProduct product = QProduct.product;
-
-    private final QProduct product2 = new QProduct("product2");
-
-    @Test
-    public void Serialization() throws IOException{
-        JDOQuery query = query();
-
-        assertEquals("FROM com.mysema.query.jdo.test.domain.Product", query.from(product).toString());
-        assertEquals("FROM com.mysema.query.jdo.test.domain.Product" +
-            "\nVARIABLES com.mysema.query.jdo.test.domain.Product product2",
-            query.from(product2).toString());
-
-        query.where(product.ne(product2)).list(product, product2);
-        query.close();
-    }
-
-    @Test
-    public void SubQuerySerialization() throws IOException{
-        JDOSubQuery query = sub();
-
-        assertEquals("FROM com.mysema.query.jdo.test.domain.Product", query.from(product).toString());
-        assertEquals("FROM com.mysema.query.jdo.test.domain.Product" +
-            "\nVARIABLES com.mysema.query.jdo.test.domain.Product product2",
-            query.from(product2).toString());
-
-    }
-
-    @Test
-    public void Delete() {
-        long count = query().from(product).count();
-        assertEquals(0, delete(product).where(product.name.eq("XXX")).execute());
-        assertEquals(count, delete(product).execute());
-    }
-
-    @Test
-    public void CountTests() {
-        assertEquals("count", 2, query().from(product).count());
-    }
-
-    @Test
-    public void List_Distinct() {
-        query().from(product).distinct().list(product);
-    }
-    
-    @Test
-    public void List_Distinct_Two_Sources() {
-        query().from(product, product2).distinct().list(product, product2);
-    }
-    
-    @Test
-    public void Single_Result() {
-        query().from(product).singleResult(product);
-    }
-    
-    @Test
-    public void Single_Result_With_Array() {
-        query().from(product).singleResult(new Expression<?>[]{product});
-    }
-
-    @Test
-    public void FactoryExpression_In_GroupBy() {
-        Expression<Product> productBean = Projections.bean(Product.class, product.name, product.description);
-        assertFalse(query().from(product).groupBy(productBean).list(productBean).isEmpty());
-    }
-
-    @Test(expected=NonUniqueResultException.class)
-    public void Unique_Result_Throws_Exception_On_Multiple_Results() {
-        query().from(product).uniqueResult(product);
-    }
-
-    @Test
-    public void SimpleTest() throws IOException{
-        JDOQuery query = new JDOQuery(pm, templates, false);
-        assertEquals("Sony Discman", query.from(product).where(product.name.eq("Sony Discman"))
-                .uniqueResult(product.name));
-        query.close();
-    }
-
-    @Test
-    public void ProjectionTests() {
-        assertEquals("Sony Discman", query().from(product).where(product.name.eq("Sony Discman"))
-                .uniqueResult(product.name));
-    }
-
-    @Test
-    public void BasicTests() {
-        assertEquals("list", 2, query().from(product).list(product).size());
-        assertEquals("list", 2, query().from(product).list(product.name,product.description).size());
-        assertEquals("list", 1, query().from(book).list(book).size());
-        assertEquals("eq", 1, query(product, product.name.eq("Sony Discman")).size());
-        assertEquals("instanceof ", 1, query(product,product.instanceOf(Book.class)).size());
-    }
-
-    @Test
-    @Ignore
-    public void DetachedResults() {
-        for (Product p : detachedQuery().from(product).list(product)) {
-            System.out.println(p);
-        }
-    }
-
-    @Test
-    public void Empty_BooleanBuilder() {
-        assertEquals("empty boolean builder", 2, query(product, new BooleanBuilder()).size());
-    }
-
-    @Test
-    public void And() {
-        assertEquals("and", 1, query(product, product.name.eq("Sony Discman").and(product.price.loe(300.00))).size());
-    }
-
-    @Test
-    public void Or() {
-        assertEquals("or", 2,  query(product, product.name.eq("Sony Discman").or(product.price.loe(300.00))).size());
-    }
-
-    @Test
-    public void Not() {
-        assertEquals("not", 2, query(product, product.name.eq("Sony MP3 player").not()).size());
-    }
-
-    @Test
-    public void NumericTests() {
-        // numeric
-        // TODO +
-        // TODO -
-        // TODO *
-        // TODO /
-        // TODO %
-        // TODO Math.abs
-        // TODO Math.sqrt
-    }
-
-    @Test
-    public void Eq() {
-        assertEquals("eq", 1, query(product, product.price.eq(200.00)).size());
-        assertEquals("eq", 0, query(product, product.price.eq(100.00)).size());
-    }
-
-    @Test
-    public void Ne() {
-        assertEquals("ne", 2, query(product, product.price.ne(100.00)).size());
-    }
-
-    @Test
-    public void Lt() {
-        assertEquals("lt", 2, query(product, product.price.lt(300.00)).size());
-    }
-
-    @Test
-    public void Gt() {
-        assertEquals("gt", 1, query(product, product.price.gt(100.00)).size());
-    }
-
-    @Test
-    public void Goe() {
-        assertEquals("goe", 1, query(product, product.price.goe(100.00)).size());
-    }
-
-    @Test
-    public void Loe() {
-        assertEquals("loe", 2, query(product, product.price.loe(300.00)).size());
-    }
-
-    @Test
-    public void Starts_With() {
-        assertEquals("startsWith", 1, query(product,product.name.startsWith("Sony Discman")).size());
-    }
-
-    @Test
-    public void Matches() {
-        assertEquals("matches", 1, query(product,product.name.matches("Sony.*")).size());
-    }
-
-    @Test
-    public void Like() {
-        assertEquals("matches", 1, query(product,product.name.like("Sony%")).size());
-    }
-
-    @Test
-    public void Ends_With() {
-        assertEquals("endsWith", 1, query(product,product.name.endsWith("Discman")).size());
-    }
-
-    @Test
-    public void To_LowerCase() {
-        assertEquals("toLowerCase", 1, query(product,product.name.lower().eq("sony discman")).size());
-    }
-
-    @Test
-    public void To_UpperCase() {
-        assertEquals("toUpperCase", 1, query(product,product.name.upper().eq("SONY DISCMAN")).size());
-    }
-
-    @Test
-    public void Index_Of() {
-        assertEquals("indexOf", 1, query(product,product.name.indexOf("S").eq(0)).size());
-    }
-
-    @Test
-    public void Substring1() {
-        assertEquals("substring", 1, query(product,product.name.substring(5).eq("Discman")).size());
-    }
-
-    @Test
-    public void Substring2() {
-        assertEquals("substring", 1, query(product,product.name.substring(0, 4).eq("Sony")).size());
-    }
-
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            pm.makePersistent(new Product("Sony Discman","A standard discman from Sony", 200.00, 3));
-            pm.makePersistent(new Book("Lord of the Rings by Tolkien","The classic story", 49.99, 5, "JRR Tolkien", "12345678","MyBooks Factory"));
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/CollectionTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/CollectionTest.java
deleted file mode 100644
index ee8020eeb6..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/CollectionTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Book;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.jdo.test.domain.QStore;
-
-public class CollectionTest extends AbstractJDOTest {
-    
-    private final QStore store = QStore.store;
-    
-    @Test
-    public void Contains_Key() {
-        query(store, store.productsByName.containsKey("XXX"));
-    }
-    
-    @Test
-    public void Contains_Value() {
-        Product product = query().from(QProduct.product).list(QProduct.product).get(0);
-        query(store, store.productsByName.containsValue(product));
-    }
-    
-    @Test
-    @Ignore
-    public void Get() {
-        query(store, store.products.get(0).name.isNotNull());
-    }
-    
-    @Test
-    public void isEmpty() {
-        query(store, store.products.isEmpty());
-    }    
-
-    @Test
-    public void isNotEmpty() {
-        query(store, store.products.isNotEmpty());
-    }
-    
-    @Test
-    public void Size() {
-        query(store, store.products.size().gt(0));
-    }
-    
-    @Test
-    public void Collection_Any() {
-        query(store, store.products.any().name.eq("Sony Discman"));
-    }
-    
-    @Test
-    public void Collection_Any_And() {
-        query(store, store.products.any().name.eq("Sony Discman").and(store.products.any().price.gt(10.0)));
-    }
-    
-    @Test
-    @Ignore // Not supported
-    public void Collection_Any_In_Projection() {
-        query().from(store).list(store.products.any());
-    }
-    
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            pm.makePersistent(new Product("Sony Discman","A standard discman from Sony", 200.00, 3));
-            pm.makePersistent(new Book("Lord of the Rings by Tolkien","The classic story", 49.99, 5, "JRR Tolkien", "12345678","MyBooks Factory"));
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/DependenciesTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/DependenciesTest.java
deleted file mode 100644
index be4d64c523..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/DependenciesTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-
-import jdepend.framework.JDepend;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class DependenciesTest {
-    
-    @Test
-    @Ignore
-    public void test() throws IOException{
-        JDepend jdepend = new JDepend();        
-        jdepend.addDirectory("target/classes/com/mysema/query/jdo");
-        jdepend.addDirectory("target/classes/com/mysema/query/jdo/dml");
-        jdepend.addDirectory("target/classes/com/mysema/query/jdo/sql");
-        
-        jdepend.analyze();    
-        assertFalse(jdepend.containsCycles());
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/FetchPlanTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/FetchPlanTest.java
deleted file mode 100644
index c0dc45362f..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/FetchPlanTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.jdo.test.domain.QStore;
-
-public class FetchPlanTest extends AbstractJDOTest{
-    
-    private JDOQuery query;
-    
-    @After
-    public void tearDown() {
-        if (query != null) {
-            query.close();
-        }
-        super.tearDown();
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Test
-    public void ListProducts() throws Exception{
-        QProduct product = QProduct.product;
-        query = query();
-        query.from(product)
-             .where(product.name.startsWith("A"))
-             .addFetchGroup("myfetchgroup1")
-             .addFetchGroup("myfetchgroup2")
-             .setMaxFetchDepth(2)
-             .list(product);
-//        query.close();
-        
-        Field queriesField = AbstractJDOQuery.class.getDeclaredField("queries");
-        queriesField.setAccessible(true);
-        List<Query> queries = (List<Query>)queriesField.get(query);
-        Query jdoQuery = queries.get(0);
-        assertEquals(new HashSet<String>(Arrays.asList("myfetchgroup1","myfetchgroup2")), 
-                jdoQuery.getFetchPlan().getGroups());
-        assertEquals(2, jdoQuery.getFetchPlan().getMaxFetchDepth());
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Test
-    public void ListStores() throws Exception{
-        QStore store = QStore.store;
-        query = query(); 
-        query.from(store)
-            .addFetchGroup("products")
-            .list(store);
-        
-        Field queriesField = AbstractJDOQuery.class.getDeclaredField("queries");
-        queriesField.setAccessible(true);
-        List<Query> queries = (List<Query>)queriesField.get(query);
-        Query jdoQuery = queries.get(0);
-        assertEquals(new HashSet<String>(Arrays.asList("products")), 
-                jdoQuery.getFetchPlan().getGroups());
-        assertEquals(1, jdoQuery.getFetchPlan().getMaxFetchDepth());
-    }
-    
-    @BeforeClass
-    public static void doPersist() {
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F", 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E", 400.00, 4));
-                pm.makePersistent(new Product("A" + i, "D", 600.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/GroupByTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/GroupByTest.java
deleted file mode 100644
index 9fc8912329..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/GroupByTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class GroupByTest extends AbstractJDOTest {
-
-    private QProduct product = QProduct.product;
-
-    @Test
-    public void Distinct() {
-        assertEquals(3, query().from(product).distinct().list(product.description).size());
-        assertEquals(3, query().from(product).distinct().list(product.price).size());
-    }
-
-    @Test
-    public void GroupBy() {
-        assertEquals(3, query().from(product).groupBy(product.description).list(product.description).size());
-        assertEquals(3, query().from(product).groupBy(product.price).list(product.price).size());
-    }
-    
-    @Test
-    public void Having() {
-        assertEquals(3, query().from(product)
-                .groupBy(product.description).having(product.description.ne("XXX"))
-                .list(product.description).size());
-        assertEquals(3, query().from(product)
-                .groupBy(product.price).having(product.price.gt(0))
-                .list(product.price).size());
-    }
-
-    @BeforeClass
-    public static void doPersist() {
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F", 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E", 400.00, 4));
-                pm.makePersistent(new Product("A" + i, "D", 600.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQLMethodsTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQLMethodsTest.java
deleted file mode 100644
index a83696aafd..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQLMethodsTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.jdo.test.domain.QStore;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-
-public class JDOQLMethodsTest extends AbstractJDOTest {
-
-    private QProduct product = QProduct.product;
-
-    private QStore store = QStore.store;
-
-    @Test
-    public void test() {
-        Product p = query().from(product).limit(1).uniqueResult(product);
-        for (BooleanExpression f : getFilters(
-                product.name, product.description, "A0",
-                store.products, p,
-                store.productsByName, "A0", p,
-                product.amount)) {
-            query().from(store, product).where(f).list(store, product);
-        }
-    }
-
-    private <A,K,V> List<BooleanExpression> getFilters(
-            StringExpression str, StringExpression other, String knownString,
-            ListPath<A,?> list, A element,
-            MapPath<K,V, ?> map, K key, V value,
-            NumberExpression<Integer> number) {
-        return Arrays.<BooleanExpression>asList(
-           // java.lang.String
-           str.startsWith(knownString),
-           str.endsWith(knownString),
-           str.indexOf(knownString).gt(-1),
-           str.indexOf(knownString, 1).gt(-1),
-           str.substring(1).eq(knownString),
-           str.substring(1,2).eq(knownString),
-           str.lower().eq(knownString),
-           str.upper().eq(knownString),
-           str.matches(".*"),
-           // java.util.Collection
-           list.isEmpty(),
-           list.isNotEmpty(),
-           list.contains(element),
-           list.size().gt(0),
-           // java.util.Map
-           map.isEmpty(),
-           map.isNotEmpty(),
-           map.containsKey(key),
-           map.containsValue(value),
-           map.get(key).eq(value),
-           map.size().gt(0),
-           number.abs().gt(0),
-           number.sqrt().gt(0)
-        );
-    }
-
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F" + i, i * 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E" + i, i * 200.00, 4));
-                pm.makePersistent(new Product("A" + i, "D" + i, i * 200.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQueryFactoryTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQueryFactoryTest.java
deleted file mode 100644
index 34381e8d35..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOQueryFactoryTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertNotNull;
-
-import javax.inject.Provider;
-import javax.jdo.PersistenceManager;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class JDOQueryFactoryTest {
-
-    private JDOQueryFactory queryFactory;
-
-    @Before
-    public void setUp() {
-        Provider<PersistenceManager> provider = new Provider<PersistenceManager>() {
-            @Override
-            public PersistenceManager get() {
-                return EasyMock.createNiceMock(PersistenceManager.class);
-            }
-        };
-        queryFactory = new JDOQueryFactory(provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QProduct.product));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QProduct.product));
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSQLQueryTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSQLQueryTest.java
deleted file mode 100644
index 8efdd20c95..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSQLQueryTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-import java.sql.SQLException;
-import java.util.List;
-
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.jdo.sql.JDOSQLQuery;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.sql.SProduct;
-import com.mysema.query.sql.HSQLDBTemplates;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.BooleanExpression;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class JDOSQLQueryTest extends AbstractJDOTest{
-    
-    private final SQLTemplates sqlTemplates = new HSQLDBTemplates();
-    
-    private final SProduct product = SProduct.product;
-    
-    private JDOSQLQuery sql() {
-        return new JDOSQLQuery(pm, sqlTemplates);
-    }
-    
-    protected SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-    
-
-    @Test
-    public void Count() {        
-        assertEquals(30l, sql().from(product).count());        
-    }
-    
-    @Test(expected=NonUniqueResultException.class)
-    public void UniqueResult() {
-        sql().from(product).uniqueResult(product.name);
-    }
-    
-    @Test
-    public void SingleResult() {
-        sql().from(product).singleResult(product.name);
-    }
-    
-    @Test
-    public void SingleResult_With_Array() {
-        sql().from(product).singleResult(new Expression[]{product.name});
-    }
-    
-    @Test    
-    public void StartsWith_Count() {
-        assertEquals(10l, sql().from(product).where(product.name.startsWith("A")).count());
-        assertEquals(10l, sql().from(product).where(product.name.startsWith("B")).count());
-        assertEquals(10l, sql().from(product).where(product.name.startsWith("C")).count());
-        
-    }
-    
-    @Test
-    public void Eq_Count() {
-        for (int i = 0; i < 10; i++) {
-            assertEquals(1l, sql().from(product).where(product.name.eq("A"+i)).count());
-            assertEquals(1l, sql().from(product).where(product.name.eq("B"+i)).count());
-            assertEquals(1l, sql().from(product).where(product.name.eq("C"+i)).count());
-        }
-    }
-    
-    @Test
-    public void ScalarQueries() {
-        BooleanExpression filter = product.name.startsWith("A");
-        
-        // count
-        assertEquals(10l, sql().from(product).where(filter).count());
-
-        // countDistinct
-        assertEquals(10l, sql().from(product).where(filter).distinct().count());
-
-        // list
-        assertEquals(10, sql().from(product).where(filter).list(product.name).size());
-
-        // list with limit
-        assertEquals(3, sql().from(product).limit(3).list(product.name).size());
-
-        // list with offset
-//        assertEquals(7, sql().from(product).offset(3).list(product.name).size());
-
-        // list with limit and offset
-        assertEquals(3, sql().from(product).offset(3).limit(3).list(product.name).size());
-
-        // list multiple
-        for (Tuple row : sql().from(product).list(product.productId, product.name, product.amount)) {
-            assertNotNull(row.get(0, Object.class));
-            assertNotNull(row.get(1, Object.class));
-            assertNotNull(row.get(2, Object.class));
-        }
-
-        // listResults
-        SearchResults<String> results = sql().from(product).limit(3).listResults(product.name);
-        assertEquals(3, results.getResults().size());
-        assertEquals(30l, results.getTotal());
-
-    }
-    
-    @Ignore
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(product).unique(product.amount.max());
-        SubQueryExpression<Integer> sq2 = sq().from(product).unique(product.amount.min());
-        List<Integer> list = sql().union(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-    
-    @Ignore
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union_All() {
-        SubQueryExpression<Integer> sq1 = sq().from(product).unique(product.amount.max());
-        SubQueryExpression<Integer> sq2 = sq().from(product).unique(product.amount.min());
-        List<Integer> list = sql().unionAll(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @Test
-    public void EntityProjections() {
-        List<Product> products = sql()
-            .from(product)
-            .list(ConstructorExpression.create(Product.class,
-                    product.name, product.description, product.price, product.amount));
-        assertEquals(30, products.size());
-        for (Product p : products) {
-            assertNotNull(p.getName());
-            assertNotNull(p.getDescription());
-            assertNotNull(p.getPrice());
-            assertNotNull(p.getAmount());
-        }
-    }
-
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F", 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E", 400.00, 4));
-                pm.makePersistent(new Product("A" + i, "D", 600.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSubQueryTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSubQueryTest.java
deleted file mode 100644
index f0d3043d66..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/JDOSubQueryTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class JDOSubQueryTest {
-    
-    @Test
-    public void Multiple_Projections() {
-        JDOSubQuery query = new JDOSubQuery();
-        query.from(QProduct.product);
-        assertEquals(1, query.list(QProduct.product).getMetadata().getProjection().size());
-        assertEquals(1, query.list(QProduct.product).getMetadata().getProjection().size());
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/OrderingTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/OrderingTest.java
deleted file mode 100644
index df96122d9e..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/OrderingTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class OrderingTest extends AbstractJDOTest {
-
-    private QProduct product = QProduct.product;
-
-    @Test
-    public void Order_Asc() {
-        List<String> namesAsc = query().from(product).orderBy(
-                product.name.asc(), product.description.desc()).list(
-                product.name);
-        assertEquals(30, namesAsc.size());
-        String prev = null;
-        for (String name : namesAsc) {
-            if (prev != null) {
-                assertTrue(prev.compareTo(name) < 0);
-            }
-            prev = name;
-        }
-    }
-
-    @Test
-    public void Order_Desc() {
-        List<String> namesDesc = query().from(product).orderBy(
-                product.name.desc()).list(product.name);
-        assertEquals(30, namesDesc.size());
-        String prev = null;
-        for (String name : namesDesc) {
-            if (prev != null) {
-                assertTrue(prev.compareTo(name) > 0);
-            }
-            prev = name;
-        }
-    }
-
-    @Test
-    public void TabularResults() {
-        List<Tuple> rows = query().from(product).orderBy(product.name.asc())
-                .list(product.name, product.description);
-        assertEquals(30, rows.size());
-        for (Tuple row : rows) {
-            assertEquals(row.get(0, String.class).substring(1), 
-                    row.get(1, String.class).substring(1));
-        }
-    }
-
-    @Test
-    public void Limit_Order_Asc() {
-        assertEquals(Arrays.asList("A0", "A1"), 
-            query().from(product).orderBy(product.name.asc()).limit(2).list(product.name));
-    }
-    
-    @Test
-    public void Limit_Order_Desc() {
-        assertEquals(Arrays.asList("C9", "C8"), 
-            query().from(product).orderBy(product.name.desc()).limit(2).list(product.name));
-    }
-    
-    public void Limit_and_Offset() {
-        assertEquals(Arrays.asList("A2", "A3", "A4"), 
-            query().from(product).orderBy(product.name.asc()).offset(2).limit(3).list(product.name));    
-    }
-
-    @Test
-    public void SearchResults() {
-        SearchResults<String> results = query().from(product).orderBy(
-                product.name.asc()).limit(2).listResults(product.name);
-        assertEquals(Arrays.asList("A0", "A1"), results.getResults());
-        assertEquals(30, results.getTotal());
-
-    }
-
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F" + i, i * 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E" + i, i * 200.00, 4));
-                pm.makePersistent(new Product("A" + i, "D" + i, i * 200.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/QueryMutabilityTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/QueryMutabilityTest.java
deleted file mode 100644
index f0d86eb1f8..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/QueryMutabilityTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.junit.Test;
-
-import com.mysema.query.QueryMutability;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class QueryMutabilityTest extends AbstractJDOTest{
-
-    @Test
-    public void QueryMutability() throws IOException, SecurityException,
-            IllegalArgumentException, NoSuchMethodException,
-            IllegalAccessException, InvocationTargetException {
-        QProduct product = QProduct.product;
-        JDOQuery query = (JDOQuery) query().from(product);
-        new QueryMutability(query).test(product.name, product.description);
-    }
-
-    @Test
-    public void Clone() {
-        QProduct product = QProduct.product;
-        JDOQuery query = new JDOQuery().from(product).where(product.name.isNotNull());
-        JDOQuery query2 = query.clone(pm);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        query2.list(product);
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/SubqueriesTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/SubqueriesTest.java
deleted file mode 100644
index 292e1b6dd1..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/SubqueriesTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class SubqueriesTest extends AbstractJDOTest {
-    
-    private QProduct product = QProduct.product;
-
-    private QProduct other = new QProduct("other");
-    
-    @Test
-    public void List_Exists() {
-        query().from(product).where(sub().from(other).list(other).exists()).list(product);
-    }
-    
-    @Test
-    public void List_NotExists() {
-        query().from(product).where(sub().from(other).list(other).notExists()).list(product);
-    }
-    
-    @Test
-    public void List_Contains() {
-        query().from(product).where(sub().from(other).list(other.name).contains(product.name)).list(product);
-    }
-
-    @Test
-    public void Gt_Subquery() {
-        for (double price : query().from(product)
-                .where(product.price.gt(sub().from(other).unique(other.price.avg())))
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-    
-    @Test
-    public void Gt_Subquery_with_Condition() {
-        for (double price : query().from(product)
-                .where(product.price.gt(sub().from(other).where(other.name.eq("XXX")).unique(other.price.avg())))
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-
-    @Test
-    public void Eq_Subquery() {
-        for (double price : query().from(product)
-                .where(product.price.eq(sub().from(other).unique(other.price.avg())))
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-    
-
-    @Test
-    public void In_Subquery() {
-        for (double price : query().from(product)
-                .where(product.price.in(
-                        sub().from(other).where(other.name.eq("Some name")).list(other.price)))
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-
-    @Test
-    public void Count() {
-        for (double price : query().from(product)
-                .where(sub().from(other).where(other.price.gt(product.price)).count().gt(0))
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-    
-    @Test
-    public void Exists() {
-        for (double price : query().from(product)
-                .where(sub().from(other).where(other.price.gt(product.price)).exists())
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-    
-    @Test
-    public void Not_Exists() {
-        for (double price : query().from(product)
-                .where(sub().from(other).where(other.price.gt(product.price)).notExists())
-                .list(product.price)) {
-            System.out.println(price);
-        }
-    }
-    
-
-    
-    @BeforeClass
-    public static void doPersist() {
-        // Persistence of a Product and a Book.
-        PersistenceManager pm = pmf.getPersistenceManager();
-        Transaction tx = pm.currentTransaction();
-        try {
-            tx.begin();
-            for (int i = 0; i < 10; i++) {
-                pm.makePersistent(new Product("C" + i, "F" + i, i * 200.00, 2));
-                pm.makePersistent(new Product("B" + i, "E" + i, i * 200.00, 4));
-                pm.makePersistent(new Product("A" + i, "D" + i, i * 200.00, 6));
-            }
-            tx.commit();
-        } finally {
-            if (tx.isActive()) {
-                tx.rollback();
-            }
-            pm.close();
-        }
-        System.out.println("");
-
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Account.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Account.java
deleted file mode 100644
index b874746b8b..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Account.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.models.company;
-
-import com.mysema.query.annotations.QueryEntity;
-
-/**
- * User account for a person.
- *
- * @version $Revision: 1.2 $
- */
-@QueryEntity
-public class Account {
-    private long id; // PK if app id
-    private String username;
-    private boolean enabled;
-
-    public Account() {
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public boolean getEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean b) {
-        enabled = b;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String s) {
-        username = s;
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Department.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Department.java
deleted file mode 100644
index fb7213f0a0..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Department.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.models.company;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.mysema.query.annotations.QueryEntity;
-
-/**
- * Department in a company. Has a Manager, and a set of Projects being worked
- * on.
- *
- * @version $Revision: 1.1 $
- */
-@QueryEntity
-public class Department {
-    private String name;
-    private Manager manager;
-    private Set<Project> projects = new HashSet<Project>();
-    private List<Employee> employees;
-
-    public Department() {
-
-    }
-
-    public Department(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setManager(Manager mgr) {
-        this.manager = mgr;
-    }
-
-    public Manager getManager() {
-        return this.manager;
-    }
-
-    public Set<Project> getProjects() {
-        return projects;
-    }
-
-    public void setProjects(Set<Project> projects) {
-        this.projects = projects;
-    }
-
-    public void addProject(Project proj) {
-        this.projects.add(proj);
-    }
-
-    public String toString() {
-        return name;
-    }
-
-    public List<Employee> getEmployees() {
-        return employees;
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Employee.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Employee.java
deleted file mode 100644
index 5cd01fc5ad..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Employee.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.models.company;
-
-import com.mysema.query.annotations.QueryEntity;
-
-/**
- * Employee in a company.
- *
- * @version $Revision: 1.3 $
- */
-@QueryEntity
-public class Employee extends Person {
-    private String serialNo;
-    private float salary;
-    private String salaryCurrency;
-    private Integer yearsInCompany;
-    private Manager manager;
-    private Account account;
-    private int weeklyhours;
-    private Department department;
-
-    /** Used for the querying of static fields. */
-    public static final String FIRSTNAME = "Bart";
-
-    public Employee() {
-    }
-
-    public Employee(long id, String firstname, String lastname, String email,
-            float sal, String serial) {
-        super(id, firstname, lastname, email);
-        this.salary = sal;
-        this.serialNo = serial;
-    }
-
-    public Employee(long id, String firstname, String lastname, String email,
-            float sal, String serial, Integer yearsInCompany) {
-        super(id, firstname, lastname, email);
-        this.salary = sal;
-        this.serialNo = serial;
-        this.yearsInCompany = yearsInCompany;
-    }
-
-    public Account getAccount() {
-        return this.account;
-    }
-
-    public String getSerialNo() {
-        return this.serialNo;
-    }
-
-    public float getSalary() {
-        return this.salary;
-    }
-
-    public String getSalaryCurrency() {
-        return this.salaryCurrency;
-    }
-
-    public Manager getManager() {
-        return this.manager;
-    }
-
-    public Integer getYearsInCompany() {
-        return this.yearsInCompany;
-    }
-
-    public void setManager(Manager mgr) {
-        this.manager = mgr;
-    }
-
-    public void setAccount(Account acct) {
-        this.account = acct;
-    }
-
-    public void setSerialNo(String sn) {
-        this.serialNo = sn;
-    }
-
-    public void setSalary(float s) {
-        this.salary = s;
-    }
-
-    public void setSalaryCurrency(String s) {
-        this.salaryCurrency = s;
-    }
-
-    public void setYearsInCompany(Integer y) {
-        this.yearsInCompany = y;
-    }
-
-    public int getWeeklyhours() {
-        return weeklyhours;
-    }
-
-    public Department getDepartment() {
-        return department;
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Person.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Person.java
deleted file mode 100644
index f04fb499a7..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Person.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.models.company;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.StringTokenizer;
-
-import com.mysema.query.annotations.QueryEntity;
-
-/**
- * Person in a company.
- */
-@QueryEntity
-public class Person implements Cloneable {
-
-    public static class Id implements Serializable {
-
-        private static final long serialVersionUID = -4893934512712167318L;
-
-        public String globalNum;
-
-        public long personNum;
-
-        public Id() {
-        }
-
-        public Id(String str) {
-            StringTokenizer toke = new StringTokenizer(str, "::");
-
-            str = toke.nextToken();
-            this.personNum = Integer.parseInt(str);
-            str = toke.nextToken();
-            this.globalNum = str;
-        }
-
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-
-            if (!(obj instanceof Id)) {
-                return false;
-            }
-
-            Id c = (Id) obj;
-            return personNum == c.personNum && globalNum.equals(c.globalNum);
-        }
-
-        public int hashCode() {
-            return ((int) this.personNum) ^ this.globalNum.hashCode();
-        }
-
-        public String toString() {
-            return String.valueOf(this.personNum) + "::"
-                    + String.valueOf(this.globalNum);
-        }
-    }
-
-    /** Used for the querying of static fields. */
-    public static final String FIRSTNAME = "Woody";
-
-    private static Random random = new Random();
-
-    private int age;
-
-    private Person bestFriend;
-
-    private String emailAddress;
-
-    private String firstName;
-
-    private String globalNum; // Part of PK when app id
-
-    private String lastName;
-
-    private long personNum; // Part of PK when app id
-
-    private Map<String, PhoneNumber> phoneNumbers = new HashMap<String, PhoneNumber>();
-
-    public Person() {
-    }
-
-    public Person(long num, String first, String last, String email) {
-        globalNum = "global:" + random.nextInt();
-        personNum = num;
-        firstName = first;
-        lastName = last;
-        emailAddress = email;
-    }
-
-    public String asString() {
-        return "Person : number=" + getPersonNum() + " forename="
-                + getFirstName() + " surname=" + getLastName() + " email="
-                + getEmailAddress() + " bestfriend=" + getBestFriend();
-    }
-
-    public Object clone() {
-        Object o = null;
-
-        try {
-            o = super.clone();
-        } catch (CloneNotSupportedException e) {
-            /* can't happen */
-        }
-
-        return o;
-    }
-
-    public boolean compareTo(Object obj) {
-        // TODO Use globalNum here too ?
-        Person p = (Person) obj;
-        return bestFriend == p.bestFriend && firstName.equals(p.firstName)
-                && lastName.equals(p.lastName)
-                && emailAddress.equals(p.emailAddress)
-                && personNum == p.personNum;
-    }
-
-    // Note that this is only really correct for application identity, but we
-    // also use this class for datastore id
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        }
-        if ((o == null) || (o.getClass() != this.getClass()))
-            return false;
-
-        Person other = (Person) o;
-        return personNum == other.personNum
-                && (globalNum == other.globalNum || (globalNum != null && globalNum
-                        .equals(other.globalNum)));
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public Person getBestFriend() {
-        return bestFriend;
-    }
-
-    public String getEmailAddress() {
-        return emailAddress;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public String getGlobalNum() {
-        return globalNum;
-    }
-
-    public synchronized String getLastName() {
-        return lastName;
-    }
-
-    public long getPersonNum() {
-        return personNum;
-    }
-
-    public Map<String, PhoneNumber> getPhoneNumbers() {
-        return phoneNumbers;
-    }
-
-    // Note that this is only really correct for application identity, but we
-    // also use this class for datastore id
-    public int hashCode() {
-        int hash = 7;
-        hash = 31 * hash + (int) personNum;
-        hash = 31 * hash + (null == globalNum ? 0 : globalNum.hashCode());
-        return hash;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public void setBestFriend(Person p) {
-        this.bestFriend = p;
-    }
-
-    public void setEmailAddress(String s) {
-        emailAddress = s;
-    }
-
-    public void setFirstName(String s) {
-        firstName = s;
-    }
-
-    public void setGlobalNum(String globalNum) {
-        this.globalNum = globalNum;
-    }
-
-    public void setLastName(String s) {
-        lastName = s;
-    }
-
-    public void setPersonNum(long num) {
-        personNum = num;
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PhoneNumber.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PhoneNumber.java
deleted file mode 100644
index af9707eff9..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PhoneNumber.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.models.company;
-
-import com.mysema.query.annotations.QueryEntity;
-
-/**
- * Phone number of a person.
- *
- * @version $Revision: 1.1 $
- */
-@QueryEntity
-public class PhoneNumber {
-    long id; // PK when using app id
-    String name;
-    String number;
-
-    public PhoneNumber() {
-    }
-
-    public PhoneNumber(String name, String number) {
-        this.name = name;
-        this.number = number;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/AbstractTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/AbstractTest.java
deleted file mode 100644
index 60a302707a..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/AbstractTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.serialization;
-
-import com.mysema.query.jdo.JDOQLSerializer;
-import com.mysema.query.jdo.JDOSubQuery;
-import com.mysema.query.jdo.JDOQLTemplates;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.SubQueryExpression;
-
-public abstract class AbstractTest {
-
-    protected JDOSubQuery query() {
-        return new JDOSubQuery();
-    }
-
-    protected String serialize(SubQueryExpression<?> expr) {
-        Expression<?> source = expr.getMetadata().getJoins().get(0).getTarget();
-        JDOQLSerializer serializer = new JDOQLSerializer(JDOQLTemplates.DEFAULT, source);
-        serializer.serialize(expr.getMetadata(), false, false);
-        String rv = serializer.toString().replace('\n', ' ');
-        return rv;
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ContainerTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ContainerTest.java
deleted file mode 100644
index 78dc0c523a..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ContainerTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.serialization;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.jdo.models.fitness.QGym;
-import com.mysema.query.jdo.models.fitness.Wardrobe;
-
-public class ContainerTest extends AbstractTest{
-
-    private QGym gym = QGym.gym1;
-
-    private Wardrobe wrd = new Wardrobe(), wrd1 = new Wardrobe(), wrd2 = new Wardrobe();
-
-    @Before
-    public void setUp() {
-        wrd.setModel("model");
-    }
-
-    @Test
-    public void NotContainsValuesInMapFields() {
-
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsValue(wrd) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes.containsValue(a1) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1",
-
-          serialize(query().from(gym)
-                  .where(gym.wardrobes.containsValue(wrd).not()).list(gym)));
-
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsValue(wrd) && !this.wardrobes.containsValue(wrd2) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
-
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes.containsValue(a1) && !this.wardrobes.containsValue(a2) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1, com.mysema.query.jdo.models.fitness.Wardrobe a2",
-
-          serialize(query().from(gym)
-                  .where(gym.wardrobes.containsValue(wrd).not(), gym.wardrobes.containsValue(wrd2).not())
-                  .list(gym)));
-//
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsValue(wrd) && !this.wardrobes.containsValue(wrd2) && this.wardrobes.containsValue(wrd1) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
-
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes.containsValue(a1) && !this.wardrobes.containsValue(a2) && this.wardrobes.containsValue(a3) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1, com.mysema.query.jdo.models.fitness.Wardrobe a2, com.mysema.query.jdo.models.fitness.Wardrobe a3",
-
-        serialize(query().from(gym)
-                .where(
-                    gym.wardrobes.containsValue(wrd).not(),
-                    gym.wardrobes.containsValue(wrd1).not(),
-                    gym.wardrobes.containsValue(wrd2))
-                .list(gym)));
-    }
-
-    @Test 
-    public void NotContainsKeysInMapFields() {
-
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes2.containsKey(wrd) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes2.containsKey(a1) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1",
-
-          serialize(query().from(gym)
-                   .where(gym.wardrobes2.containsKey(wrd).not()).list(gym)));
-//
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes2.containsKey(wrd) && !this.wardrobes2.containsKey(wrd2) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes2.containsKey(a1) && !this.wardrobes2.containsKey(a2) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1, com.mysema.query.jdo.models.fitness.Wardrobe a2",
-
-          serialize(query().from(gym)
-                   .where(
-                       gym.wardrobes2.containsKey(wrd).not(),
-                       gym.wardrobes2.containsKey(wrd2).not())
-                   .list(gym)));
-//
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes2.containsKey(wrd) && !this.wardrobes2.containsKey(wrd2) && this.wardrobes2.containsKey(wrd1) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE !this.wardrobes2.containsKey(a1) && !this.wardrobes2.containsKey(a2) && this.wardrobes2.containsKey(a3) " +
-          "PARAMETERS com.mysema.query.jdo.models.fitness.Wardrobe a1, com.mysema.query.jdo.models.fitness.Wardrobe a2, com.mysema.query.jdo.models.fitness.Wardrobe a3",
-
-        serialize(query().from(gym)
-                 .where(
-                     gym.wardrobes2.containsKey(wrd).not(),
-                     gym.wardrobes2.containsKey(wrd2).not(),
-                     gym.wardrobes2.containsKey(wrd1))
-                 .list(gym)));
-    }
-
-    @Test 
-    public void NotContainsEntryInMapFields() {
-        // NOTE : containsEntry is not supported in Querydsl
-
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
-//
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) && !this.wardrobes.containsEntry(wrd2.model,wrd2) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
-//
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) && !this.wardrobes.containsEntry(wrd2.model,wrd2) && this.wardrobes.containsEntry(wrd1.model,wrd1) "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
-
-    }
-
-    @Test 
-    public void GetInMapFields() {
-
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "WHERE this.wardrobes.get(wrd.model) == wrd "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "WHERE this.wardrobes.get(a1) == a2 " +
-          "PARAMETERS java.lang.String a1, com.mysema.query.jdo.models.fitness.Wardrobe a2",
-
-          serialize(query().from(gym)
-                   .where(gym.wardrobes.get(wrd.getModel()).eq(wrd)).list(gym)));
-    }
-
-    @Test 
-    public void GetInOrderingInMapFields() {
-//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
-//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
-//        .setOrdering("this.wardrobes.get(wrd.model).model ascending");
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.fitness.Gym " +
-          "PARAMETERS java.lang.String a1 " +
-          "ORDER BY this.wardrobes.get(a1).model ASC",
-
-          serialize(query().from(gym)
-                   .orderBy(gym.wardrobes.get(wrd.getModel()).model.asc()).list(gym)));
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/GroupByTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/GroupByTest.java
deleted file mode 100644
index ff2fa56c60..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/GroupByTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mysema.query.jdo.serialization;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jdo.models.company.QEmployee;
-
-public class GroupByTest extends AbstractTest {
-    
-    @Test
-    public void GroupBy() {
-        QEmployee employee = QEmployee.employee;
-        assertEquals(
-                "SELECT FROM com.mysema.query.jdo.models.company.Employee "+
-                "PARAMETERS java.lang.String a1 "+
-                "GROUP BY this.emailAddress "+
-                "HAVING this.emailAddress != a1",
-
-                serialize(query()
-                    .from(employee)
-                    .groupBy(employee.emailAddress).having(employee.emailAddress.ne("XXX"))
-                    .list(employee)));
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/QuerySerializationTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/QuerySerializationTest.java
deleted file mode 100644
index 48d4b3ebba..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/QuerySerializationTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.serialization;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jdo.test.domain.Book;
-import com.mysema.query.jdo.test.domain.QProduct;
-
-public class QuerySerializationTest extends AbstractTest{
-
-    private QProduct product = QProduct.product;
-
-    private QProduct other = new QProduct("other");
-
-    @Test
-    public void SelectFromWhereOrder() {
-        assertEquals(
-            "SELECT UNIQUE this.name " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE this.name == a1 " +
-            "PARAMETERS java.lang.String a1 " +
-            "ORDER BY this.name ASC",
-
-            serialize(query().from(product)
-              .where(product.name.eq("Test"))
-              .orderBy(product.name.asc())
-              .unique(product.name)));
-    }
-
-    @Test
-    public void SelectFromWhereGroupBy() {
-        assertEquals(
-            "SELECT this.name " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE this.name.startsWith(a1) || this.name.endsWith(a2) " +
-            "PARAMETERS java.lang.String a1, java.lang.String a2 " +
-            "GROUP BY this.price",
-
-            serialize(query().from(product)
-              .where(product.name.startsWith("A").or(product.name.endsWith("B")))
-              .groupBy(product.price)
-              .list(product.name)));
-    }
-
-    @Test
-    public void SelectFrom2Sources() {
-        assertEquals(
-            "SELECT this.name " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE this.name == other.name " +
-            "VARIABLES com.mysema.query.jdo.test.domain.Product other",
-
-            serialize(query().from(product, other)
-              .where(product.name.eq(other.name))
-              .list(product.name)));
-    }
-
-    @Test
-    public void WithSubQuery() {
-        assertEquals(
-            "SELECT this.price " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE this.price < " +
-            "(SELECT avg(other.price) FROM com.mysema.query.jdo.test.domain.Product other)",
-
-            serialize(query().from(product)
-              .where(product.price.lt(query().from(other).unique(other.price.avg())))
-              .list(product.price)));
-    }
-
-    @Test
-    public void WithSubQuery2() {
-        // FIXME : how to model this ?!?
-        assertEquals(
-            "SELECT this.name " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE (SELECT other.price FROM com.mysema.query.jdo.test.domain.Product other " +
-                "WHERE other.name == a1 " +
-                "PARAMETERS java.lang.String a1).contains(this.price)",
-
-            serialize(query().from(product)
-              .where(product.price.in(query().from(other).where(other.name.eq("Some name")).list(other.price)))
-              .list(product.name)));
-    }
-
-    @Test
-    public void InstanceofQuery() {
-        assertEquals(
-            "SELECT " +
-            "FROM com.mysema.query.jdo.test.domain.Product " +
-            "WHERE this instanceof com.mysema.query.jdo.test.domain.Book",
-
-            serialize(query().from(product)
-              .where(product.instanceOf(Book.class))
-              .list(product)));
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/SubqueriesTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/SubqueriesTest.java
deleted file mode 100644
index 029abfe8d4..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/SubqueriesTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.serialization;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jdo.models.company.QDepartment;
-import com.mysema.query.jdo.models.company.QEmployee;
-
-public class SubqueriesTest extends AbstractTest{
-
-    private QDepartment department = QDepartment.department;
-
-    private QDepartment d = new QDepartment("d");
-
-    private QEmployee e = new QEmployee("e");
-
-    private QEmployee employee = QEmployee.employee;
-
-/*  "SELECT FROM " + Department.class.getName() + " WHERE this.employees.size() == " +
- *  "(SELECT MAX(d.employees.size()) FROM " + Department.class.getName() + " d)"; */
-    @Test
-    public void test1() {
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.company.Department " +
-          "WHERE this.employees.size() == " +
-          "(SELECT max(d.employees.size()) FROM com.mysema.query.jdo.models.company.Department d)",
-
-          serialize(query().from(department).where(department.employees.size().eq(
-               query().from(d).unique(d.employees.size().max())
-            )).list(department))
-        );
-    }
-
-/*  "SELECT FROM " + Employee.class.getName() + " WHERE this.weeklyhours > " +
- *  "(SELECT AVG(e.weeklyhours) FROM this.department.employees e)"; */
-    @Test
-    public void test2() {
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.company.Employee " +
-          "WHERE this.weeklyhours > " +
-          "(SELECT avg(e.weeklyhours) FROM this.department.employees e)",
-
-          serialize(query().from(employee).where(employee.weeklyhours.gt(
-               query().from(employee.department.employees, e).unique(e.weeklyhours.avg())
-            )).list(employee))
-        );
-    }
-
-/*  "SELECT FROM " + Employee.class.getName() +
- *   " WHERE this.weeklyhours > " +
- *   "(SELECT AVG(e.weeklyhours) FROM this.department.employees e " +
- *   " WHERE e.manager == this.manager)"; */
-    @Test
-    public void test3() {
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.company.Employee " +
-          "WHERE this.weeklyhours > " +
-          "(SELECT avg(e.weeklyhours) FROM this.department.employees e WHERE e.manager == this.manager)",
-
-          serialize(query().from(employee).where(employee.weeklyhours.gt(
-               query().from(employee.department.employees, e).where(e.manager.eq(employee.manager)).unique(e.weeklyhours.avg())
-            )).list(employee))
-        );
-    }
-/*  "SELECT FROM " + Employee.class.getName() + " WHERE this.weeklyhours > " +
- *   "(SELECT AVG(e.weeklyhours) FROM " + Employee.class.getName() + " e)"; */
-    @Test
-    public void test4() {
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.company.Employee " +
-          "WHERE this.weeklyhours > " +
-          "(SELECT avg(e.weeklyhours) FROM com.mysema.query.jdo.models.company.Employee e)",
-
-          serialize(query().from(employee).where(employee.weeklyhours.gt(
-               query().from(e).unique(e.weeklyhours.avg())
-            )).list(employee))
-        );
-    }
-
-/*  "SELECT FROM " + Employee.class.getName() +
- *   " WHERE this.weeklyhours == emp.weeklyhours && " +
- *   "emp.firstname == 'emp1First' VARIABLES Employee emp"; */
-    @Test
-    public void test5() {
-        assertEquals(
-          "SELECT FROM com.mysema.query.jdo.models.company.Employee " +
-          "WHERE this.weeklyhours == e.weeklyhours && this.firstName == a1 " +
-          "VARIABLES com.mysema.query.jdo.models.company.Employee e " +
-          "PARAMETERS java.lang.String a1",
-
-          serialize(query().from(employee, e)
-              .where(
-                  employee.weeklyhours.eq(e.weeklyhours),
-                  employee.firstName.eq("emp1First")
-              ).list(employee))
-        );
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Book.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Book.java
deleted file mode 100644
index e91c801d28..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Book.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import java.util.Date;
-
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-
-/**
- * Definition of a Book. Extends basic Product class.
- */
-@PersistenceCapable
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-public class Book extends Product {
-    private String author = null;
-
-    private String isbn = null;
-
-    private String publisher = null;
-
-    protected Book() {
-        super();
-    }
-
-    public Book(String name, String description, double price, int amount, String author,
-            String isbn, String publisher) {
-        this(name, description, price, amount, author, isbn, publisher, new Date());
-    }
-
-    public Book(String name, String description, double price, int amount, String author,
-            String isbn, String publisher, Date date) {
-        super(name, description, price, amount, date);
-        this.author = author;
-        this.isbn = isbn;
-        this.publisher = publisher;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public String getIsbn() {
-        return isbn;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public void setIsbn(String isbn) {
-        this.isbn = isbn;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public String toString() {
-        return "Book : " + author + " - " + getName();
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Product.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Product.java
deleted file mode 100644
index 262408cd6e..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Product.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import java.util.Date;
-
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-
-/**
- * Definition of a Product Represents a product, and contains the key aspects of
- * the item.
- */
-@PersistenceCapable
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-public class Product {
-    private String name = null;
-
-    private String description = null;
-
-    private double price = 0.0;
-
-    private Date publicationDate;
-
-    @Persistent
-    private java.sql.Date dateField;
-
-    @Persistent
-    private java.sql.Time timeField;
-
-    private int amount;
-
-    public Product() {
-    }
-
-    public Product(String name, String description, double price, int amount) {
-        this(name, description, price, amount, new Date());
-    }
-
-    public Product(String name, String description, double price, int amount, Date publicationDate) {
-        this.name = name;
-        this.description = description;
-        this.price = price;
-        this.amount = amount;
-        this.publicationDate = new Date(publicationDate.getTime());
-        this.dateField = new java.sql.Date(publicationDate.getTime());
-        this.timeField = new java.sql.Time(publicationDate.getTime());
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public double getPrice() {
-        return price;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setPrice(double price) {
-        this.price = price;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public Date getPublicationDate() {
-        return publicationDate;
-    }
-
-    public void setPublicationDate(Date publicationDate) {
-        this.publicationDate = new java.sql.Date(publicationDate.getTime());
-    }
-
-    public java.sql.Date getDateField() {
-        return new java.sql.Date(dateField.getTime());
-    }
-
-    public void setDateField(java.sql.Date dateField) {
-        this.dateField = new java.sql.Date(dateField.getTime());
-    }
-
-    public java.sql.Time getTimeField() {
-        return timeField;
-    }
-
-    public void setTimeField(java.sql.Time timeField) {
-        this.timeField = timeField;
-    }
-
-    public String toString() {
-        return "Product : " + name + " [" + description + "]";
-    }
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QBook.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QBook.java
deleted file mode 100644
index e8cd5581e1..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QBook.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-/**
- * QBook is a Querydsl query type for Book
- *
- */
-@SuppressWarnings("serial")
-public class QBook extends EntityPathBase<com.mysema.query.jdo.test.domain.Book>{
-
-    public static final QBook book = new QBook("book");
-
-    public final StringPath author = createString("author");
-
-    public final StringPath description = createString("description");
-
-    public final StringPath isbn = createString("isbn");
-
-    public final StringPath name = createString("name");
-
-    public final StringPath publisher = createString("publisher");
-
-    public final DateTimePath<java.util.Date> publicationDate = createDateTime("publicationDate",java.util.Date.class);
-
-    public final NumberPath<Integer> amount = createNumber("amount",Integer.class);
-
-    public final NumberPath<Double> price = createNumber("price",Double.class);
-
-    public QBook(String path) {
-          this(com.mysema.query.jdo.test.domain.Book.class, path);
-    }
-    
-    public QBook(Class<? extends com.mysema.query.jdo.test.domain.Book> cl, String path) {
-          super(cl, PathMetadataFactory.forVariable(path));
-    }
-    
-    public QBook(PathMetadata<?> metadata) {
-         super(com.mysema.query.jdo.test.domain.Book.class, metadata);
-    }
-    
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QProduct.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QProduct.java
deleted file mode 100644
index 1ba0192a95..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QProduct.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-/**
- * QProduct is a Querydsl query type for Product
- *
- */
-@SuppressWarnings("serial")
-public class QProduct extends EntityPathBase<com.mysema.query.jdo.test.domain.Product>{
-
-    public static final QProduct product = new QProduct("product");
-
-    public final StringPath description = createString("description");
-
-    public final StringPath name = createString("name");
-
-    public final DateTimePath<java.util.Date> publicationDate = createDateTime("publicationDate",java.util.Date.class);
-
-    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
-
-    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
-
-    public final NumberPath<Integer> amount = createNumber("amount",Integer.class);
-
-    public final NumberPath<Double> price = createNumber("price",Double.class);
-
-    public QProduct(String path) {
-          this(com.mysema.query.jdo.test.domain.Product.class, path);
-    }
-    
-    public QProduct(Class<? extends com.mysema.query.jdo.test.domain.Product> cl, String path) {
-          super(cl, PathMetadataFactory.forVariable(path));
-    }
-    
-    public QProduct(PathMetadata<?> metadata) {
-         super(com.mysema.query.jdo.test.domain.Product.class, metadata);
-    }
-    
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QStore.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QStore.java
deleted file mode 100644
index f6fbf65103..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/QStore.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.ListPath;
-import com.mysema.query.types.path.MapPath;
-import com.mysema.query.types.path.PathInits;
-import com.mysema.query.types.path.StringPath;
-
-/**
- * QStore is a Querydsl query type for Store
- *
- */
-@SuppressWarnings("serial")
-public class QStore extends EntityPathBase<com.mysema.query.jdo.test.domain.Store>{
-
-    public static final QStore store = new QStore("store");
-
-    public final StringPath name = createString("name");
-
-    public final MapPath<String, Product, QProduct> productsByName = this.<String, Product, QProduct>createMap("productsByName",String.class,Product.class,QProduct.class);
-
-    public final ListPath<Product, QProduct> products = this.<Product, QProduct>createList("products",Product.class,QProduct.class, PathInits.DIRECT);
-
-    public QProduct productsByName(String key) {
-        return new QProduct(PathMetadataFactory.forMapAccess(productsByName,key));
-    }
-
-    public QProduct productsByName(com.mysema.query.types.Expression<String> key) {
-        return new QProduct(PathMetadataFactory.forMapAccess(productsByName,key));
-    }
-
-    public QStore(String path) {
-          this(Store.class, path);
-    }
-    
-    public QStore(Class<? extends Store> cl, String path) {
-          super(cl, PathMetadataFactory.forVariable(path));
-    }
-    
-    public QStore(PathMetadata<?> metadata) {
-         super(Store.class, metadata);
-    }
-    
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Store.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Store.java
deleted file mode 100644
index 3f2f106e21..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/Store.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jdo.annotations.*;
-
-@PersistenceCapable
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-@FetchGroups({
-    @FetchGroup(name="products", members={@Persistent(name="products")})
-})
-public class Store {
-
-    private String name;
-
-    @Join
-    @Element(types=Product.class)
-    private List<Product> products = new ArrayList<Product>();
-
-    @Join
-    @Key(types=String.class)
-    @Value(types=Product.class)
-    private Map<String,Product> productsByName = new HashMap<String,Product>();
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Map<String, Product> getProductsByName() {
-        return productsByName;
-    }
-
-    public void setProductsByName(Map<String, Product> productsByName) {
-        this.productsByName = productsByName;
-    }
-
-    public List<Product> getProducts() {
-        return products;
-    }
-
-    public void setProducts(List<Product> products) {
-        this.products = products;
-    }
-
-}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SBook.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SBook.java
deleted file mode 100644
index d903d6bd43..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SBook.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-
-/**
- * SBook is a Querydsl query type for SBook
- */
-//@Table(value="BOOK")
-public class SBook extends RelationalPathBase<SBook> {
-
-    private static final long serialVersionUID = -1566558053;
-
-    public static final SBook book = new SBook("BOOK");
-
-    public final StringPath author = createString("AUTHOR");
-
-    public final NumberPath<Long> bookId = createNumber("BOOK_ID", Long.class);
-
-    public final StringPath isbn = createString("ISBN");
-
-    public final StringPath publisher = createString("PUBLISHER");
-
-    public final PrimaryKey<SBook> sysIdx65 = createPrimaryKey(bookId);
-
-    public final ForeignKey<SProduct> bookFk1 = new ForeignKey<SProduct>(this, bookId, "PRODUCT_ID");
-
-    public SBook(String variable) {
-        super(SBook.class, forVariable(variable), null, "BOOK");
-    }
-
-    public SBook(BeanPath<? extends SBook> entity) {
-        super(entity.getType(),entity.getMetadata(), null, "BOOK");
-    }
-
-    public SBook(PathMetadata<?> metadata) {
-        super(SBook.class, metadata, null, "BOOK");
-    }
-
-}
-
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SProduct.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SProduct.java
deleted file mode 100644
index 1f3023b0ab..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SProduct.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain.sql;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.*;
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-
-/**
- * SProduct is a Querydsl query type for SProduct
- */
-//@Table(value="PRODUCT")
-public class SProduct extends RelationalPathBase<SProduct> {
-
-    private static final long serialVersionUID = -590374403;
-
-    public static final SProduct product = new SProduct("PRODUCT");
-
-    public final NumberPath<Integer> amount = createNumber("AMOUNT", Integer.class);
-
-    public final DatePath<java.sql.Date> datefield = createDate("DATEFIELD", java.sql.Date.class);
-
-    public final StringPath description = createString("DESCRIPTION");
-
-    public final StringPath name = createString("NAME");
-
-    public final NumberPath<Double> price = createNumber("PRICE", Double.class);
-
-    public final NumberPath<Long> productId = createNumber("PRODUCT_ID", Long.class);
-
-    public final DateTimePath<java.util.Date> publicationdate = createDateTime("PUBLICATIONDATE", java.util.Date.class);
-
-    public final TimePath<java.sql.Time> timefield = createTime("TIMEFIELD", java.sql.Time.class);
-
-    public final PrimaryKey<SProduct> sysIdx47 = createPrimaryKey(productId);
-
-    public final ForeignKey<SStoreProducts> _storeProductsFk2 = new ForeignKey<SStoreProducts>(this, productId, "PRODUCT_ID_EID");
-
-    public final ForeignKey<SBook> _bookFk1 = new ForeignKey<SBook>(this, productId, "BOOK_ID");
-
-    public final ForeignKey<SStoreProductsbyname> _storeProductsbynameFk2 = new ForeignKey<SStoreProductsbyname>(this, productId, "PRODUCT_ID_VID");
-
-    public SProduct(String variable) {
-        super(SProduct.class, forVariable(variable), null, "PRODUCT");
-        addMetadata();
-    }
-
-    public SProduct(BeanPath<? extends SProduct> entity) {
-        super(entity.getType(),entity.getMetadata(), null, "PRODUCT");
-        addMetadata();
-    }
-
-    public SProduct(PathMetadata<?> metadata) {
-        super(SProduct.class, metadata, null, "PRODUCT");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(amount, ColumnMetadata.named("AMOUNT"));
-        addMetadata(datefield, ColumnMetadata.named("DATEFIELD"));
-        addMetadata(description, ColumnMetadata.named("DESCRIPTION"));
-        addMetadata(name, ColumnMetadata.named("NAME"));
-        addMetadata(price, ColumnMetadata.named("PRICE"));
-        addMetadata(productId, ColumnMetadata.named("PRODUCT_ID"));
-        addMetadata(publicationdate, ColumnMetadata.named("PUBLICATIONDATE"));
-        addMetadata(timefield, ColumnMetadata.named("TIMEFIELD"));
-    }
-    
-}
-
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStore.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStore.java
deleted file mode 100644
index 0123c13005..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStore.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-
-/**
- * SStore is a Querydsl query type for SStore
- */
-//@Table(value="STORE")
-public class SStore extends RelationalPathBase<SStore> {
-
-    private static final long serialVersionUID = -1302810257;
-
-    public static final SStore store = new SStore("STORE");
-
-    public final StringPath name = createString("NAME");
-
-    public final NumberPath<Long> storeId = createNumber("STORE_ID", Long.class);
-
-    public final PrimaryKey<SStore> sysIdx51 = createPrimaryKey(storeId);
-
-    public final ForeignKey<SStoreProductsbyname> _storeProductsbynameFk1 = new ForeignKey<SStoreProductsbyname>(this, storeId, "STORE_ID_OID");
-
-    public final ForeignKey<SStoreProducts> _storeProductsFk1 = new ForeignKey<SStoreProducts>(this, storeId, "STORE_ID_OID");
-
-    public SStore(String variable) {
-        super(SStore.class, forVariable(variable), null, "STORE");
-    }
-
-    public SStore(BeanPath<? extends SStore> entity) {
-        super(entity.getType(),entity.getMetadata(), null, "STORE");
-    }
-
-    public SStore(PathMetadata<?> metadata) {
-        super(SStore.class, metadata, null, "STORE");
-    }
-
-}
-
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProducts.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProducts.java
deleted file mode 100644
index a2d4d0466d..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProducts.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-
-
-/**
- * SStoreProducts is a Querydsl query type for SStoreProducts
- */
-//@Table(value="STORE_PRODUCTS")
-public class SStoreProducts extends RelationalPathBase<SStoreProducts> {
-
-    private static final long serialVersionUID = 1019873267;
-
-    public static final SStoreProducts storeProducts = new SStoreProducts("STORE_PRODUCTS");
-
-    public final NumberPath<Integer> idx = createNumber("IDX", Integer.class);
-
-    public final NumberPath<Long> productIdEid = createNumber("PRODUCT_ID_EID", Long.class);
-
-    public final NumberPath<Long> storeIdOid = createNumber("STORE_ID_OID", Long.class);
-
-    public final PrimaryKey<SStoreProducts> sysIdx55 = createPrimaryKey(idx, storeIdOid);
-
-    public final ForeignKey<SProduct> storeProductsFk2 = new ForeignKey<SProduct>(this, productIdEid, "PRODUCT_ID");
-
-    public final ForeignKey<SStore> storeProductsFk1 = new ForeignKey<SStore>(this, storeIdOid, "STORE_ID");
-
-    public SStoreProducts(String variable) {
-        super(SStoreProducts.class, forVariable(variable), null, "STORE_PRODUCTS");
-    }
-
-    public SStoreProducts(BeanPath<? extends SStoreProducts> entity) {
-        super(entity.getType(),entity.getMetadata(), null, "STORE_PRODUCTS");
-    }
-
-    public SStoreProducts(PathMetadata<?> metadata) {
-        super(SStoreProducts.class, metadata, null, "STORE_PRODUCTS");
-    }
-
-}
-
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProductsbyname.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProductsbyname.java
deleted file mode 100644
index 7e4ddd5629..0000000000
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/test/domain/sql/SStoreProductsbyname.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jdo.test.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-
-/**
- * SStoreProductsbyname is a Querydsl query type for SStoreProductsbyname
- */
-//@Table(value="STORE_PRODUCTSBYNAME")
-public class SStoreProductsbyname extends RelationalPathBase<SStoreProductsbyname> {
-
-    private static final long serialVersionUID = 764053781;
-
-    public static final SStoreProductsbyname storeProductsbyname = new SStoreProductsbyname("STORE_PRODUCTSBYNAME");
-
-    public final StringPath key = createString("KEY");
-
-    public final NumberPath<Long> productIdVid = createNumber("PRODUCT_ID_VID", Long.class);
-
-    public final NumberPath<Long> storeIdOid = createNumber("STORE_ID_OID", Long.class);
-
-    public final PrimaryKey<SStoreProductsbyname> sysIdx53 = createPrimaryKey(key, storeIdOid);
-
-    public final ForeignKey<SStore> storeProductsbynameFk1 = new ForeignKey<SStore>(this, storeIdOid, "STORE_ID");
-
-    public final ForeignKey<SProduct> storeProductsbynameFk2 = new ForeignKey<SProduct>(this, productIdVid, "PRODUCT_ID");
-
-    public SStoreProductsbyname(String variable) {
-        super(SStoreProductsbyname.class, forVariable(variable), null, "STORE_PRODUCTSBYNAME");
-    }
-
-    public SStoreProductsbyname(BeanPath<? extends SStoreProductsbyname> entity) {
-        super(entity.getType(),entity.getMetadata(), null, "STORE_PRODUCTSBYNAME");
-    }
-
-    public SStoreProductsbyname(PathMetadata<?> metadata) {
-        super(SStoreProductsbyname.class, metadata, null, "STORE_PRODUCTSBYNAME");
-    }
-
-}
-
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/AbstractJDOTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/AbstractJDOTest.java
new file mode 100644
index 0000000000..1cc38112b6
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/AbstractJDOTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.util.List;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Transaction;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jdo.dml.JDODeleteClause;
+import com.querydsl.jdo.test.domain.Book;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.Store;
+
+public abstract class AbstractJDOTest {
+
+    private static final JDOQLTemplates templates = new JDOQLTemplates();
+
+    protected static final PersistenceManagerFactory pmf =
+            JDOHelper.getPersistenceManagerFactory("datanucleus.properties");
+
+    protected PersistenceManager pm;
+
+    protected Transaction tx;
+
+    protected JDOQuery<?> query() {
+        return new JDOQuery<Void>(pm, templates, false);
+    }
+
+    protected JDOQuery<?> detachedQuery() {
+        return new JDOQuery<Void>(pm, templates, true);
+    }
+
+    protected <T> List<T> query(EntityPath<T> source, Predicate condition) {
+        return query().from(source).where(condition).select(source).fetch();
+    }
+
+    protected JDODeleteClause delete(EntityPath<?> entity) {
+        return new JDODeleteClause(pm, entity, templates);
+    }
+
+    @Before
+    public void setUp() {
+        pm = pmf.getPersistenceManager();
+        tx = pm.currentTransaction();
+        tx.begin();
+    }
+
+    @After
+    public void tearDown() {
+        if (tx.isActive()) {
+            tx.rollback();
+        }
+        pm.close();
+    }
+
+    @AfterClass
+    public static void doCleanUp() {
+        // Clean out the database
+        PersistenceManager pm = pmf.getPersistenceManager();
+        Transaction tx = pm.currentTransaction();
+        try {
+            tx.begin();
+            pm.newQuery(Store.class).deletePersistentAll();
+            pm.newQuery(Book.class).deletePersistentAll();
+            pm.newQuery(Product.class).deletePersistentAll();
+            tx.commit();
+        } finally {
+            if (tx.isActive()) {
+                tx.rollback();
+            }
+            pm.close();
+        }
+    }
+
+    protected static void doPersist(List<?> entities) {
+        PersistenceManager pm = pmf.getPersistenceManager();
+        Transaction tx = pm.currentTransaction();
+        try {
+            tx.begin();
+            pm.makePersistentAll(entities);
+            tx.commit();
+        } finally {
+            if (tx.isActive()) {
+                tx.rollback();
+            }
+            pm.close();
+        }
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/AggregateTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/AggregateTest.java
new file mode 100644
index 0000000000..515b430a64
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/AggregateTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class AggregateTest extends AbstractJDOTest {
+
+    private final QProduct product = QProduct.product;
+
+    @Test
+    public void unique() {
+        double min = 200.00, avg = 400.00, max = 600.00;
+        assertEquals(Double.valueOf(min), query().from(product).select(product.price.min()).fetchOne());
+        assertEquals(Double.valueOf(avg), query().from(product).select(product.price.avg()).fetchOne());
+        assertEquals(Double.valueOf(max), query().from(product).select(product.price.max()).fetchOne());
+    }
+
+    @Test
+    public void list() {
+        double min = 200.00, avg = 400.00, max = 600.00;
+        assertEquals(Double.valueOf(min), query().from(product).select(product.price.min()).fetch().get(0));
+        assertEquals(Double.valueOf(avg), query().from(product).select(product.price.avg()).fetch().get(0));
+        assertEquals(Double.valueOf(max), query().from(product).select(product.price.max()).fetch().get(0));
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Product> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F", 200.00, 2));
+            entities.add(new Product("B" + i, "E", 400.00, 4));
+            entities.add(new Product("A" + i, "D", 600.00, 6));
+        }
+        doPersist(entities);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/BasicsTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/BasicsTest.java
new file mode 100644
index 0000000000..682ccbbf93
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/BasicsTest.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jdo.test.domain.Book;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QBook;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class BasicsTest extends AbstractJDOTest {
+
+    private static final JDOQLTemplates templates = new JDOQLTemplates();
+
+    private final QBook book = QBook.book;
+
+    private final QProduct product = QProduct.product;
+
+    private final QProduct product2 = new QProduct("product2");
+
+    @Test
+    public void serialization() throws IOException {
+        JDOQuery<?> query = query();
+
+        assertEquals("FROM com.querydsl.jdo.test.domain.Product", query.from(product).toString());
+        assertEquals("FROM com.querydsl.jdo.test.domain.Product" +
+            "\nVARIABLES com.querydsl.jdo.test.domain.Product product2",
+            query.from(product2).toString());
+
+        query.where(product.ne(product2)).select(product, product2).fetch();
+        query.close();
+    }
+
+    @Test
+    public void subQuerySerialization() throws IOException {
+        JDOQuery<?> query = query();
+
+        assertEquals("FROM com.querydsl.jdo.test.domain.Product", query.from(product).toString());
+        assertEquals("FROM com.querydsl.jdo.test.domain.Product" +
+            "\nVARIABLES com.querydsl.jdo.test.domain.Product product2",
+            query.from(product2).toString());
+
+    }
+
+    @Test
+    public void delete() {
+        long count = query().from(product).fetchCount();
+        assertEquals(0, delete(product).where(product.name.eq("XXX")).execute());
+        assertEquals(count, delete(product).execute());
+    }
+
+    @Test
+    public void alias() {
+        assertEquals(2, query().from(product).select(product.name.as(product.name)).fetch().size());
+    }
+
+    @Test
+    public void countTests() {
+        assertEquals("count", 2, query().from(product).fetchCount());
+    }
+
+    @Test
+    public void list_distinct() {
+        // XXX List implementation of JDO provider has weird equals implementation
+        assertEquals(
+                new ArrayList<>(query().from(product).orderBy(product.name.asc()).select(product.name).fetch()),
+                new ArrayList<>(query().from(product).orderBy(product.name.asc()).distinct().select(product.name).fetch()));
+    }
+
+    @Test
+    public void list_distinct_two_sources() {
+        try {
+            // XXX List implementation of JDO provider has weird equals implementation
+            assertEquals(
+                    new ArrayList<>(query().from(product, product2).select(product, product2).fetch()),
+                    new ArrayList<>(query().from(product, product2).distinct().select(product, product2).fetch()));
+        } catch (AssertionError e) {
+            Assume.assumeNoException("Unreliable test, but keep around", e);
+        }
+    }
+
+    @Test
+    public void single_result() {
+        query().from(product).select(product).fetchFirst();
+    }
+
+    @Test
+    public void single_result_with_array() {
+        query().from(product).select(new Expression<?>[]{product}).fetchFirst();
+    }
+
+    @Test
+    public void factoryExpression_in_groupBy() {
+        Expression<Product> productBean = Projections.bean(Product.class, product.name, product.description);
+        assertFalse(query().from(product).groupBy(productBean).select(productBean).fetch().isEmpty());
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void unique_result_throws_exception_on_multiple_results() {
+        query().from(product).select(product).fetchOne();
+    }
+
+    @Test
+    public void simpleTest() throws IOException {
+        JDOQuery<?> query = new JDOQuery<Void>(pm, templates, false);
+        assertEquals("Sony Discman", query.from(product).where(product.name.eq("Sony Discman"))
+                .select(product.name).fetchOne());
+        query.close();
+    }
+
+    @Test
+    public void projectionTests() {
+        assertEquals("Sony Discman", query().from(product).where(product.name.eq("Sony Discman"))
+                .select(product.name).fetchOne());
+    }
+
+    @Test
+    public void basicTests() {
+        assertEquals("list", 2, query().from(product).select(product).fetch().size());
+        assertEquals("list", 2, query().from(product).select(product.name,product.description).fetch().size());
+        assertEquals("list", 1, query().from(book).select(book).fetch().size());
+        assertEquals("eq", 1, query(product, product.name.eq("Sony Discman")).size());
+        assertEquals("instanceof ", 1, query(product,product.instanceOf(Book.class)).size());
+    }
+
+    @Test
+    @Ignore
+    public void detachedResults() {
+        for (Product p : detachedQuery().from(product).select(product).fetch()) {
+            assertNotNull(p);
+        }
+    }
+
+    @Test
+    public void empty_booleanBuilder() {
+        assertEquals("empty boolean builder", 2, query(product, new BooleanBuilder()).size());
+    }
+
+    @Test
+    public void and() {
+        assertEquals("and", 1, query(product, product.name.eq("Sony Discman").and(product.price.loe(300.00))).size());
+    }
+
+    @Test
+    public void or() {
+        assertEquals("or", 2,  query(product, product.name.eq("Sony Discman").or(product.price.loe(300.00))).size());
+    }
+
+    @Test
+    public void not() {
+        assertEquals("not", 2, query(product, product.name.eq("Sony MP3 player").not()).size());
+    }
+
+    @Test
+    public void numericTests() {
+        // numeric
+        // TODO +
+        // TODO -
+        // TODO *
+        // TODO /
+        // TODO %
+        // TODO Math.abs
+        // TODO Math.sqrt
+    }
+
+    @Test
+    public void eq() {
+        assertEquals("eq", 1, query(product, product.price.eq(200.00)).size());
+        assertEquals("eq", 0, query(product, product.price.eq(100.00)).size());
+    }
+
+    @Test
+    public void ne() {
+        assertEquals("ne", 2, query(product, product.price.ne(100.00)).size());
+    }
+
+    @Test
+    public void in_empty() {
+        assertEquals(0, query(product, product.name.in(Collections.emptyList())).size());
+    }
+
+    @Test
+    public void not_in_empty() {
+        int count = query(product, product.name.isNotNull()).size();
+        assertEquals(count, query(product, product.name.notIn(Collections.emptyList())).size());
+    }
+
+    @Test
+    public void lt() {
+        assertEquals("lt", 2, query(product, product.price.lt(300.00)).size());
+    }
+
+    @Test
+    public void gt() {
+        assertEquals("gt", 1, query(product, product.price.gt(100.00)).size());
+    }
+
+    @Test
+    public void goe() {
+        assertEquals("goe", 1, query(product, product.price.goe(100.00)).size());
+    }
+
+    @Test
+    public void loe() {
+        assertEquals("loe", 2, query(product, product.price.loe(300.00)).size());
+    }
+
+    @Test
+    public void starts_with() {
+        assertEquals("startsWith", 1, query(product,product.name.startsWith("Sony Discman")).size());
+    }
+
+    @Test
+    public void matches() {
+        assertEquals("matches", 1, query(product,product.name.matches("Sony.*")).size());
+        assertSame(
+                query(product, product.name.matches("Sony.*")).size(),
+                query(product, product.name.likeIgnoreCase("sony%")).size()
+        );
+    }
+
+    @Test
+    public void like() {
+        assertEquals("matches", 1, query(product,product.name.like("Sony%")).size());
+    }
+
+    @Test
+    public void ends_with() {
+        assertEquals("endsWith", 1, query(product,product.name.endsWith("Discman")).size());
+    }
+
+    @Test
+    public void to_lowerCase() {
+        assertEquals("toLowerCase", 1, query(product,product.name.lower().eq("sony discman")).size());
+    }
+
+    @Test
+    public void to_upperCase() {
+        assertEquals("toUpperCase", 1, query(product,product.name.upper().eq("SONY DISCMAN")).size());
+    }
+
+    @Test
+    public void index_of() {
+        assertEquals("indexOf", 1, query(product,product.name.indexOf("S").eq(0)).size());
+    }
+
+    @Test
+    public void substring1() {
+        assertEquals("substring", 1, query(product,product.name.substring(5).eq("Discman")).size());
+    }
+
+    @Test
+    public void substring2() {
+        assertEquals("substring", 1, query(product,product.name.substring(0, 4).eq("Sony")).size());
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        doPersist(Arrays.asList(
+                new Product("Sony Discman", "A standard discman from Sony", 200.00, 3),
+                new Book("Lord of the Rings by Tolkien", "The classic story", 49.99, 5, "JRR Tolkien", "12345678", "MyBooks Factory")));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/CollectionTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/CollectionTest.java
new file mode 100644
index 0000000000..10466e6ae1
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/CollectionTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Book;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+import com.querydsl.jdo.test.domain.QStore;
+
+public class CollectionTest extends AbstractJDOTest {
+
+    private final QStore store = QStore.store;
+
+    @Test
+    public void contains_key() {
+        query(store, store.productsByName.containsKey("XXX"));
+    }
+
+    @Test
+    public void contains_value() {
+        Product product = query().from(QProduct.product).select(QProduct.product).fetch().get(0);
+        query(store, store.productsByName.containsValue(product));
+    }
+
+    @Test
+    @Ignore
+    public void get() {
+        query(store, store.products.get(0).name.isNotNull());
+    }
+
+    @Test
+    public void isEmpty() {
+        query(store, store.products.isEmpty());
+    }
+
+    @Test
+    public void isNotEmpty() {
+        query(store, store.products.isNotEmpty());
+    }
+
+    @Test
+    public void size() {
+        query(store, store.products.size().gt(0));
+    }
+
+    @Test
+    public void collection_any() {
+        query(store, store.products.any().name.eq("Sony Discman"));
+    }
+
+    @Test
+    public void collection_any_and() {
+        query(store, store.products.any().name.eq("Sony Discman").and(store.products.any().price.gt(10.0)));
+    }
+
+    @Test
+    public void collection_any_count() {
+        query().from(store).where(store.products.any().name.eq("Sony Discman")).fetchCount();
+    }
+
+    @Test
+    @Ignore // Not supported
+    public void collection_any_in_projection() {
+        query().from(store).select(store.products.any()).fetch();
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        doPersist(Arrays.asList(
+                new Product("Sony Discman", "A standard discman from Sony", 200.00, 3),
+                new Book("Lord of the Rings by Tolkien","The classic story", 49.99, 5, "JRR Tolkien", "12345678","MyBooks Factory")));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/DependenciesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/DependenciesTest.java
new file mode 100644
index 0000000000..34931cccb1
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/DependenciesTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import jdepend.framework.JDepend;
+
+public class DependenciesTest {
+
+    @Test
+    @Ignore
+    public void test() throws IOException {
+        JDepend jdepend = new JDepend();
+        jdepend.addDirectory("target/classes/com/querydsl/jdo");
+        jdepend.addDirectory("target/classes/com/querydsl/jdo/dml");
+        jdepend.addDirectory("target/classes/com/querydsl/jdo/sql");
+
+        jdepend.analyze();
+        assertFalse(jdepend.containsCycles());
+
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/FetchPlanTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/FetchPlanTest.java
new file mode 100644
index 0000000000..47d02d48eb
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/FetchPlanTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.jdo.Query;
+
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+import com.querydsl.jdo.test.domain.QStore;
+
+public class FetchPlanTest extends AbstractJDOTest {
+
+    private JDOQuery<?> query;
+
+    @After
+    public void tearDown() {
+        if (query != null) {
+            query.close();
+        }
+        super.tearDown();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void listProducts() throws Exception {
+        QProduct product = QProduct.product;
+        query = query();
+        query.from(product)
+             .where(product.name.startsWith("A"))
+             .addFetchGroup("myfetchgroup1")
+             .addFetchGroup("myfetchgroup2")
+             .setMaxFetchDepth(2)
+             .select(product).fetch();
+//        query.close();
+
+        Field queriesField = AbstractJDOQuery.class.getDeclaredField("queries");
+        queriesField.setAccessible(true);
+        List<Query> queries = (List<Query>) queriesField.get(query);
+        Query jdoQuery = queries.get(0);
+        assertEquals(new HashSet<String>(Arrays.asList("myfetchgroup1","myfetchgroup2")),
+                jdoQuery.getFetchPlan().getGroups());
+        assertEquals(2, jdoQuery.getFetchPlan().getMaxFetchDepth());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void listStores() throws Exception {
+        QStore store = QStore.store;
+        query = query();
+        query.from(store)
+            .addFetchGroup("products")
+            .select(store).fetch();
+
+        Field queriesField = AbstractJDOQuery.class.getDeclaredField("queries");
+        queriesField.setAccessible(true);
+        List<Query> queries = (List<Query>) queriesField.get(query);
+        Query jdoQuery = queries.get(0);
+        assertEquals(new HashSet<String>(Collections.singletonList("products")),
+                jdoQuery.getFetchPlan().getGroups());
+        assertEquals(1, jdoQuery.getFetchPlan().getMaxFetchDepth());
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F", 200.00, 2));
+            entities.add(new Product("B" + i, "E", 400.00, 4));
+            entities.add(new Product("A" + i, "D", 600.00, 6));
+        }
+        doPersist(entities);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/GroupByTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/GroupByTest.java
new file mode 100644
index 0000000000..56c27c795a
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/GroupByTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class GroupByTest extends AbstractJDOTest {
+
+    private QProduct product = QProduct.product;
+
+    @Test
+    public void distinct() {
+        assertEquals(3, query().from(product).distinct().select(product.description).fetch().size());
+        assertEquals(3, query().from(product).distinct().select(product.price).fetch().size());
+    }
+
+    @Test
+    public void groupBy() {
+        assertEquals(3, query().from(product).groupBy(product.description).select(product.description).fetch().size());
+        assertEquals(3, query().from(product).groupBy(product.price).select(product.price).fetch().size());
+    }
+
+    @Test
+    public void having() {
+        assertEquals(3, query().from(product)
+                .groupBy(product.description).having(product.description.ne("XXX"))
+                .select(product.description).fetch().size());
+        assertEquals(3, query().from(product)
+                .groupBy(product.price).having(product.price.gt(0))
+                .select(product.price).fetch().size());
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F", 200.00, 2));
+            entities.add(new Product("B" + i, "E", 400.00, 4));
+            entities.add(new Product("A" + i, "D", 600.00, 6));
+        }
+        doPersist(entities);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLMethodsTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLMethodsTest.java
new file mode 100644
index 0000000000..70de43f8b1
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLMethodsTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+import com.querydsl.jdo.test.domain.QStore;
+
+public class JDOQLMethodsTest extends AbstractJDOTest {
+
+    private QProduct product = QProduct.product;
+
+    private QStore store = QStore.store;
+
+    @Test
+    public void test() {
+        Product p = query().from(product).limit(1).select(product).fetchOne();
+        for (BooleanExpression f : getFilters(
+                product.name, product.description, "A0",
+                store.products, p,
+                store.productsByName, "A0", p,
+                product.amount)) {
+            query().from(store, product).where(f).select(store, product);
+        }
+    }
+
+    private <A,K,V> List<BooleanExpression> getFilters(
+            StringExpression str, StringExpression other, String knownString,
+            ListPath<A,?> list, A element,
+            MapPath<K,V, ?> map, K key, V value,
+            NumberExpression<Integer> number) {
+        return Arrays.<BooleanExpression>asList(
+           // java.lang.String
+           str.startsWith(knownString),
+           str.endsWith(knownString),
+           str.indexOf(knownString).gt(-1),
+           str.indexOf(knownString, 1).gt(-1),
+           str.substring(1).eq(knownString),
+           str.substring(1,2).eq(knownString),
+           str.lower().eq(knownString),
+           str.likeIgnoreCase(knownString),
+           str.upper().eq(knownString),
+           str.matches(".*"),
+           // java.util.Collection
+           list.isEmpty(),
+           list.isNotEmpty(),
+           list.contains(element),
+           list.size().gt(0),
+           // java.util.Map
+           map.isEmpty(),
+           map.isNotEmpty(),
+           map.containsKey(key),
+           map.containsValue(value),
+           map.get(key).eq(value),
+           map.size().gt(0),
+           number.abs().gt(0),
+           number.sqrt().gt(0)
+        );
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F" + i, i * 200.00, 2));
+            entities.add(new Product("B" + i, "E" + i, i * 200.00, 4));
+            entities.add(new Product("A" + i, "D" + i, i * 200.00, 6));
+        }
+        doPersist(entities);
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java
new file mode 100644
index 0000000000..bdc537806b
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java
@@ -0,0 +1,70 @@
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.TemplatesTestUtils;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class JDOQLTemplatesTest {
+
+    @Test
+    public void precedence() {
+//        Cast
+//        Unary ("~") ("!")
+        int p1 =  getPrecedence(Ops.NOT);
+//        Unary ("+") ("-")
+        int p2 = getPrecedence(Ops.NEGATE);
+//        Multiplicative ("*") ("/") ("%")
+        int p3 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+//        Additive ("+") ("-")
+        int p4 = getPrecedence(Ops.ADD, Ops.SUB);
+//        Relational (">=") (">") ("<=") ("<") ("instanceof")
+        int p5 = getPrecedence(Ops.GOE, Ops.GT, Ops.LOE, Ops.LT, Ops.INSTANCE_OF);
+//        Equality ("==") ("!=")
+        int p6 = getPrecedence(Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+//        Boolean logical AND ("&")
+//        Boolean logical OR ("|")
+//        Conditional AND ("&&")
+        int p7 = getPrecedence(Ops.AND);
+//        Conditional OR ("||")
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+    protected int getPrecedence(Operator... ops) {
+        int precedence = JDOQLTemplates.DEFAULT.getPrecedence(ops[0]);
+        for (int i = 1; i < ops.length; i++) {
+            assertEquals(ops[i].name(), precedence, JDOQLTemplates.DEFAULT.getPrecedence(ops[i]));
+        }
+        return precedence;
+    }
+
+    @Test
+    public void generic_precedence() {
+        TemplatesTestUtils.testPrecedence(JDOQLTemplates.DEFAULT);
+    }
+
+    @Test
+    public void concat() {
+        StringPath a = Expressions.stringPath("a");
+        StringPath b = Expressions.stringPath("b");
+        StringPath c = Expressions.stringPath("c");
+        Expression<?> expr = a.append(b).toLowerCase();
+        String str = new JDOQLSerializer(JDOQLTemplates.DEFAULT, c).handle(expr).toString();
+        assertEquals("(a + b).toLowerCase()", str);
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryFactoryTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryFactoryTest.java
new file mode 100644
index 0000000000..8c837b1155
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryFactoryTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertNotNull;
+
+import javax.jdo.PersistenceManager;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.QProduct;
+
+import java.util.function.Supplier;
+
+public class JDOQueryFactoryTest {
+
+    private JDOQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<PersistenceManager> provider = () -> EasyMock.<PersistenceManager> createNiceMock(PersistenceManager.class);
+        queryFactory = new JDOQueryFactory(provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QProduct.product));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QProduct.product));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryStandardTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryStandardTest.java
new file mode 100644
index 0000000000..cfbaeb8316
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQueryStandardTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.*;
+import com.querydsl.core.types.ArrayConstructorExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.jdo.test.domain.Book;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QBook;
+import com.querydsl.jdo.test.domain.QProduct;
+import com.querydsl.jdo.test.domain.QStore;
+import com.querydsl.jdo.test.domain.Store;
+
+public class JDOQueryStandardTest extends AbstractJDOTest {
+
+    public static class Projection {
+
+        public Projection(String str) { }
+
+    }
+
+    private static final Date publicationDate;
+
+    private static final java.sql.Date date;
+
+    private static final java.sql.Time time;
+
+    static {
+        Calendar cal = Calendar.getInstance();
+        cal.set(2000, 1, 2, 3, 4);
+        cal.set(Calendar.MILLISECOND, 0);
+        publicationDate = cal.getTime();
+        date = new java.sql.Date(cal.getTimeInMillis());
+        time = new java.sql.Time(cal.getTimeInMillis());
+    }
+
+    private static String productName = "ABCD";
+
+    private static String otherName = "ABC0";
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            // Product instances
+            entities.add(new Product("ABC" + i, "F" + i, i * 200.00, 2, publicationDate));
+            entities.add(new Product("DEF" + i, "E" + i, i * 200.00, 4, publicationDate));
+            entities.add(new Product("GHI" + i, "D" + i, i * 200.00, 6, publicationDate));
+
+            // Product of Store
+            Product product = new Product(productName,"A",100.0,1, publicationDate);
+            entities.add(product);
+
+            // Store instances
+            Store store = new Store();
+            store.getProducts().add(product);
+            store.getProductsByName().put(productName, product);
+            entities.add(store);
+        }
+        doPersist(entities);
+    }
+
+    private final QueryExecution standardTest = new QueryExecution(QuerydslModule.JDO, Target.H2) {
+        @Override
+        protected Fetchable createQuery() {
+            return query().from(store, product, otherProduct).select(store, product, otherProduct);
+        }
+        @Override
+        protected Fetchable createQuery(Predicate filter) {
+            return query().from(store, product, otherProduct).where(filter)
+                .select(store, product, otherProduct);
+        }
+    };
+
+    private final QProduct product = QProduct.product;
+
+    private final QProduct otherProduct = new QProduct("otherProduct");
+
+    private final QStore store = QStore.store;
+
+    private final QStore otherStore = new QStore("otherStore");
+
+    @Test
+    public void standardTest() {
+        Product p = query().from(product).where(product.name.eq(productName)).limit(1).select(product).fetchOne();
+        Product p2 = query().from(product).where(product.name.startsWith(otherName)).limit(1).select(product).fetchOne();
+        standardTest.noProjections();
+        standardTest.noCounts();
+
+        standardTest.runBooleanTests(product.name.isNull(), otherProduct.price.lt(10.00));
+        standardTest.runCollectionTests(store.products, otherStore.products, p, p2);
+        standardTest.runDateTests(product.dateField, otherProduct.dateField, date);
+        standardTest.runDateTimeTests(product.publicationDate, otherProduct.publicationDate, publicationDate);
+        // NO list support in JDOQL
+//        testData.listTests(store.products, otherStore.products, p);
+        standardTest.runMapTests(store.productsByName, otherStore.productsByName, productName, p, "X", p2);
+        standardTest.runNumericCasts(product.price, otherProduct.price, 200.0);
+        standardTest.runNumericTests(product.amount, otherProduct.amount, 2);
+        standardTest.runStringTests(product.name, otherProduct.name, productName);
+        standardTest.runTimeTests(product.timeField, otherProduct.timeField, time);
+
+        standardTest.report();
+    }
+
+    @Test
+    public void tupleProjection() {
+        List<Tuple> tuples = query().from(product).select(product.name, product.price).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple);
+            assertNotNull(tuple.get(product.name));
+            assertNotNull(tuple.get(product.price));
+            assertNotNull(tuple.get(0,String.class));
+            assertNotNull(tuple.get(1,Double.class));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @Ignore
+    public void arrayProjection() {
+        // typed array not supported
+        List<String[]> results = query().from(store)
+                .select(new ArrayConstructorExpression<String>(String[].class, store.name)).fetch();
+        assertFalse(results.isEmpty());
+        for (String[] result : results) {
+            assertNotNull(result);
+            assertNotNull(result[0]);
+        }
+    }
+
+    @Test
+    @Ignore
+    public void constructorProjection() {
+        List<Projection> results = query().from(store)
+                .select(Projections.constructor(Projection.class, store.name)).fetch();
+        assertFalse(results.isEmpty());
+        for (Projection result : results) {
+            assertNotNull(result);
+        }
+    }
+
+    @Test
+    public void params() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("ABC0",query().from(product).where(product.name.eq(name)).set(name, "ABC0")
+                .select(product.name).fetchFirst());
+    }
+
+    @Test
+    public void params_anon() {
+        Param<String> name = new Param<String>(String.class);
+        assertEquals("ABC0",query().from(product).where(product.name.eq(name)).set(name, "ABC0")
+                .select(product.name).fetchFirst());
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void params_not_set() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("ABC0",query().from(product).where(product.name.eq(name))
+                .select(product.name).fetchFirst());
+    }
+
+    @Test
+    public void detatchCollection() {
+        new JDOQuery<Book>(pm, true)
+                .select(QBook.book).from(QBook.book)
+                .fetch();
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOSQLQueryTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOSQLQueryTest.java
new file mode 100644
index 0000000000..1749a679bf
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOSQLQueryTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.*;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jdo.sql.JDOSQLQuery;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.sql.SProduct;
+import com.querydsl.sql.HSQLDBTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+public class JDOSQLQueryTest extends AbstractJDOTest {
+
+    private final SQLTemplates sqlTemplates = new HSQLDBTemplates();
+
+    private final SProduct product = SProduct.product;
+
+    protected JDOSQLQuery<?> sql() {
+        return new JDOSQLQuery<Void>(pm, sqlTemplates);
+    }
+
+    @Test
+    public void count() {
+        assertEquals(30L, sql().from(product).fetchCount());
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResult() {
+        sql().from(product).orderBy(product.name.asc()).select(product.name).fetchOne();
+    }
+
+    @Test
+    public void singleResult() {
+        assertEquals("A0", sql().from(product).orderBy(product.name.asc())
+                .select(product.name).fetchFirst());
+    }
+
+    @Test
+    public void singleResult_with_array() {
+        assertEquals("A0", sql().from(product).orderBy(product.name.asc())
+                .select(new Expression<?>[]{product.name}).fetchFirst().get(product.name));
+    }
+
+    @Test
+    public void startsWith_count() {
+        assertEquals(10L, sql().from(product).where(product.name.startsWith("A")).fetchCount());
+        assertEquals(10L, sql().from(product).where(product.name.startsWith("B")).fetchCount());
+        assertEquals(10L, sql().from(product).where(product.name.startsWith("C")).fetchCount());
+
+    }
+
+    @Test
+    public void eq_count() {
+        for (int i = 0; i < 10; i++) {
+            assertEquals(1L, sql().from(product).where(product.name.eq("A" + i)).fetchCount());
+            assertEquals(1L, sql().from(product).where(product.name.eq("B" + i)).fetchCount());
+            assertEquals(1L, sql().from(product).where(product.name.eq("C" + i)).fetchCount());
+        }
+    }
+
+    @Test
+    public void scalarQueries() {
+        BooleanExpression filter = product.name.startsWith("A");
+
+        // fetchCount
+        assertEquals(10L, sql().from(product).where(filter).fetchCount());
+
+        // countDistinct
+        assertEquals(10L, sql().from(product).where(filter).distinct().fetchCount());
+
+        // fetch
+        assertEquals(10, sql().from(product).where(filter).select(product.name).fetch().size());
+
+        // fetch with limit
+        assertEquals(3, sql().from(product).limit(3).select(product.name).fetch().size());
+
+        // fetch with offset
+//        assertEquals(7, sql().from(product).offset(3).fetch(product.name).size());
+
+        // fetch with limit and offset
+        assertEquals(3, sql().from(product).offset(3).limit(3).select(product.name).fetch().size());
+
+        // fetch multiple
+        for (Tuple row : sql().from(product).select(product.productId, product.name, product.amount).fetch()) {
+            assertNotNull(row.get(0, Object.class));
+            assertNotNull(row.get(1, Object.class));
+            assertNotNull(row.get(2, Object.class));
+        }
+
+        // fetchResults
+        QueryResults<String> results = sql().from(product).limit(3).select(product.name).fetchResults();
+        assertEquals(3, results.getResults().size());
+        assertEquals(30L, results.getTotal());
+
+    }
+
+    @Ignore
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union() throws SQLException {
+        SubQueryExpression<Integer> sq1 = sql().from(product).select(product.amount.max());
+        SubQueryExpression<Integer> sq2 = sql().from(product).select(product.amount.min());
+        List<Integer> list = sql().union(sq1, sq2).list();
+        assertFalse(list.isEmpty());
+    }
+
+    @Ignore
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union_all() {
+        SubQueryExpression<Integer> sq1 = sql().from(product).select(product.amount.max());
+        SubQueryExpression<Integer> sq2 = sql().from(product).select(product.amount.min());
+        List<Integer> list = sql().unionAll(sq1, sq2).list();
+        assertFalse(list.isEmpty());
+    }
+
+    @Test
+    public void entityProjections() {
+        List<Product> products = sql()
+            .from(product)
+            .select(Projections.constructor(Product.class,
+                    product.name, product.description, product.price, product.amount)).fetch();
+        assertEquals(30, products.size());
+        for (Product p : products) {
+            assertNotNull(p.getName());
+            assertNotNull(p.getDescription());
+            assertNotNull(p.getPrice());
+            assertNotNull(p.getAmount());
+        }
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F", 200.00, 2));
+            entities.add(new Product("B" + i, "E", 400.00, 4));
+            entities.add(new Product("A" + i, "D", 600.00, 6));
+        }
+        doPersist(entities);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/OrderingTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/OrderingTest.java
new file mode 100644
index 0000000000..3840f4e96b
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/OrderingTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class OrderingTest extends AbstractJDOTest {
+
+    private QProduct product = QProduct.product;
+
+    @Test
+    public void order_asc() {
+        List<String> namesAsc = query().from(product).orderBy(
+                product.name.asc(), product.description.desc()).select(
+                product.name).fetch();
+        assertEquals(30, namesAsc.size());
+        String prev = null;
+        for (String name : namesAsc) {
+            if (prev != null) {
+                assertTrue(prev.compareTo(name) < 0);
+            }
+            prev = name;
+        }
+    }
+
+    @Test
+    public void order_desc() {
+        List<String> namesDesc = query().from(product).orderBy(
+                product.name.desc()).select(product.name).fetch();
+        assertEquals(30, namesDesc.size());
+        String prev = null;
+        for (String name : namesDesc) {
+            if (prev != null) {
+                assertTrue(prev.compareTo(name) > 0);
+            }
+            prev = name;
+        }
+    }
+
+    @Test
+    public void tabularResults() {
+        List<Tuple> rows = query().from(product).orderBy(product.name.asc())
+                .select(product.name, product.description).fetch();
+        assertEquals(30, rows.size());
+        for (Tuple row : rows) {
+            assertEquals(row.get(0, String.class).substring(1),
+                    row.get(1, String.class).substring(1));
+        }
+    }
+
+    @Test
+    public void limit_order_asc() {
+        assertEquals(Arrays.asList("A0", "A1"),
+            query().from(product).orderBy(product.name.asc()).limit(2).select(product.name).fetch());
+    }
+
+    @Test
+    public void limit_order_desc() {
+        assertEquals(Arrays.asList("C9", "C8"),
+            query().from(product).orderBy(product.name.desc()).limit(2).select(product.name).fetch());
+    }
+
+    public void limit_and_offset() {
+        assertEquals(Arrays.asList("A2", "A3", "A4"),
+            query().from(product).orderBy(product.name.asc()).offset(2).limit(3).select(product.name).fetch());
+    }
+
+    @Test
+    public void queryResults() {
+        QueryResults<String> results = query().from(product).orderBy(
+                product.name.asc()).limit(2).select(product.name).fetchResults();
+        assertEquals(Arrays.asList("A0", "A1"), results.getResults());
+        assertEquals(30, results.getTotal());
+
+    }
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F" + i, i * 200.00, 2));
+            entities.add(new Product("B" + i, "E" + i, i * 200.00, 4));
+            entities.add(new Product("A" + i, "D" + i, i * 200.00, 6));
+        }
+        doPersist(entities);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/PackageVerification.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/PackageVerification.java
new file mode 100644
index 0000000000..f2ded1fba3
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/PackageVerification.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Scanner;
+
+import javax.jdo.annotations.PersistenceCapable;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.apt.jdo.JDOAnnotationProcessor;
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.core.types.Expression;
+
+public class PackageVerification {
+
+    @Test
+    public void verify_package() throws Exception {
+        String version = System.getProperty("version");
+        verify(new File("target/querydsl-jdo-" + version + "-apt-one-jar.jar"));
+    }
+
+    private void verify(File oneJar) throws Exception {
+        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
+        // verify classLoader
+        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
+        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
+        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
+        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
+        oneJarClassLoader.loadClass(PersistenceCapable.class.getName()); // jdo
+        Class cl = oneJarClassLoader.loadClass(JDOAnnotationProcessor.class.getName()); // querydsl-apt
+        cl.newInstance();
+        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
+        assertEquals(JDOAnnotationProcessor.class.getName(),
+                new Scanner(oneJarClassLoader.findResource(resourceKey).openStream()).nextLine());
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/QueryMutabilityTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/QueryMutabilityTest.java
new file mode 100644
index 0000000000..a383b9860a
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/QueryMutabilityTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.junit.Test;
+
+import com.querydsl.core.QueryMutability;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class QueryMutabilityTest extends AbstractJDOTest {
+
+    @Test
+    public void queryMutability() throws IOException, SecurityException,
+            IllegalArgumentException, NoSuchMethodException,
+            IllegalAccessException, InvocationTargetException {
+        QProduct product = QProduct.product;
+        JDOQuery<?> query = query().from(product);
+        new QueryMutability(query).test(product.name, product.description);
+    }
+
+    @Test
+    public void clone_() {
+        QProduct product = QProduct.product;
+        JDOQuery<?> query = new JDOQuery<Void>().from(product).where(product.name.isNotNull());
+        JDOQuery<?> query2 = query.clone(pm);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        query2.select(product).fetch();
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/SubqueriesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/SubqueriesTest.java
new file mode 100644
index 0000000000..2583a8909e
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/SubqueriesTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Product;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class SubqueriesTest extends AbstractJDOTest {
+
+    private QProduct product = QProduct.product;
+
+    private QProduct other = new QProduct("other");
+
+    @Test
+    public void list_exists() {
+        query().from(product).where(query().from(other).select(other).exists()).select(product).fetch();
+    }
+
+    @Test
+    public void list_notExists() {
+        query().from(product).where(query().from(other).select(other).notExists()).select(product).fetch();
+    }
+
+    @Test
+    public void list_contains() {
+        query().from(product).where(product.name.in(query().from(other).select(other.name))).select(product).fetch();
+    }
+
+    @Test
+    public void gt_subquery() {
+        double avg = query().from(product).select(product.price.avg()).fetchFirst();
+        for (double price : query().from(product)
+                .where(product.price.gt(query().from(other).select(other.price.avg())))
+                .select(product.price).fetch()) {
+            assertTrue(price > avg);
+        }
+    }
+
+    @Test
+    public void gt_subquery_with_condition() {
+        for (double price : query().from(product)
+                .where(product.price.gt(query().from(other).where(other.name.eq("XXX")).select(other.price.avg())))
+                .select(product.price).fetch()) {
+            System.out.println(price);
+        }
+    }
+
+    @Test
+    public void eq_subquery() {
+        double avg = query().from(product).select(product.price.avg()).fetchFirst();
+        for (double price : query().from(product)
+                .where(product.price.eq(query().from(other).select(other.price.avg())))
+                .select(product.price).fetch()) {
+            assertEquals(avg, price, 0.0001);
+        }
+    }
+
+
+    @Test
+    public void in_subquery() {
+        for (double price : query().from(product)
+                .where(product.price.in(
+                        query().from(other).where(other.name.eq("Some name")).select(other.price)))
+                .select(product.price).fetch()) {
+            System.out.println(price);
+        }
+    }
+
+    @Test
+    public void count() {
+        for (double price : query().from(product)
+                .where(query().from(other).where(other.price.gt(product.price)).select(other.count()).gt(0L))
+                .select(product.price).fetch()) {
+            System.out.println(price);
+        }
+    }
+
+    @Test
+    public void exists() {
+        for (double price : query().from(product)
+                .where(query().from(other).where(other.price.gt(product.price)).exists())
+                .select(product.price).fetch()) {
+            System.out.println(price);
+        }
+    }
+
+    @Test
+    public void not_exists() {
+        for (double price : query().from(product)
+                .where(query().from(other).where(other.price.gt(product.price)).notExists())
+                .select(product.price).fetch()) {
+            System.out.println(price);
+        }
+    }
+
+
+
+    @BeforeClass
+    public static void doPersist() {
+        List<Object> entities = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            entities.add(new Product("C" + i, "F" + i, i * 200.00, 2));
+            entities.add(new Product("B" + i, "E" + i, i * 200.00, 4));
+            entities.add(new Product("A" + i, "D" + i, i * 200.00, 6));
+        }
+        doPersist(entities);
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/TemplatesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/TemplatesTest.java
new file mode 100644
index 0000000000..2485ea037e
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/TemplatesTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo;
+
+import com.querydsl.core.TemplatesTestBase;
+
+public class TemplatesTest extends TemplatesTestBase {
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Account.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Account.java
new file mode 100644
index 0000000000..cf7379cdda
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Account.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.models.company;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+/**
+ * User account for a person.
+ *
+ * @version $Revision: 1.2 $
+ */
+@QueryEntity
+public class Account {
+    private long id; // PK if app id
+    private String username;
+    private boolean enabled;
+
+    public Account() {
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean b) {
+        enabled = b;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String s) {
+        username = s;
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Department.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Department.java
new file mode 100644
index 0000000000..8d2019cde4
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Department.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.models.company;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+/**
+ * Department in a company. Has a Manager, and a set of Projects being worked
+ * on.
+ *
+ * @version $Revision: 1.1 $
+ */
+@QueryEntity
+public class Department {
+    private String name;
+    private Manager manager;
+    private Set<Project> projects = new HashSet<Project>();
+    private List<Employee> employees;
+
+    public Department() {
+
+    }
+
+    public Department(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setManager(Manager mgr) {
+        this.manager = mgr;
+    }
+
+    public Manager getManager() {
+        return this.manager;
+    }
+
+    public Set<Project> getProjects() {
+        return projects;
+    }
+
+    public void setProjects(Set<Project> projects) {
+        this.projects = projects;
+    }
+
+    public void addProject(Project proj) {
+        this.projects.add(proj);
+    }
+
+    public String toString() {
+        return name;
+    }
+
+    public List<Employee> getEmployees() {
+        return employees;
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Developer.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Developer.java
similarity index 88%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Developer.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Developer.java
index 68b8977a49..2ae53dd237 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Developer.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Developer.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Developer of software for a system.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/DeveloperRC.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/DeveloperRC.java
similarity index 86%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/DeveloperRC.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/DeveloperRC.java
index 4d8d42e603..6f8cb05082 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/DeveloperRC.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/DeveloperRC.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class DeveloperRC extends PersonRC {
@@ -44,7 +44,7 @@ public void setId(Long id) {
      *            The id to set.
      */
     public void setId(BigDecimal id) {
-        this.id = Long.valueOf(id.longValue());
+        this.id = id.longValue();
     }
 
     /**
@@ -52,7 +52,7 @@ public void setId(BigDecimal id) {
      *            The id to set.
      */
     public void setId(BigInteger id) {
-        this.id = Long.valueOf(id.longValue());
+        this.id = id.longValue();
     }
 
     /**
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Employee.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Employee.java
new file mode 100644
index 0000000000..e540d649c4
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Employee.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.models.company;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+/**
+ * Employee in a company.
+ *
+ * @version $Revision: 1.3 $
+ */
+@QueryEntity
+public class Employee extends Person {
+    private String serialNo;
+    private float salary;
+    private String salaryCurrency;
+    private Integer yearsInCompany;
+    private Manager manager;
+    private Account account;
+    private int weeklyhours;
+    private Department department;
+
+    /** Used for the querying of static fields. */
+    public static final String FIRSTNAME = "Bart";
+
+    public Employee() {
+    }
+
+    public Employee(long id, String firstname, String lastname, String email,
+            float sal, String serial) {
+        super(id, firstname, lastname, email);
+        this.salary = sal;
+        this.serialNo = serial;
+    }
+
+    public Employee(long id, String firstname, String lastname, String email,
+            float sal, String serial, Integer yearsInCompany) {
+        super(id, firstname, lastname, email);
+        this.salary = sal;
+        this.serialNo = serial;
+        this.yearsInCompany = yearsInCompany;
+    }
+
+    public Account getAccount() {
+        return this.account;
+    }
+
+    public String getSerialNo() {
+        return this.serialNo;
+    }
+
+    public float getSalary() {
+        return this.salary;
+    }
+
+    public String getSalaryCurrency() {
+        return this.salaryCurrency;
+    }
+
+    public Manager getManager() {
+        return this.manager;
+    }
+
+    public Integer getYearsInCompany() {
+        return this.yearsInCompany;
+    }
+
+    public void setManager(Manager mgr) {
+        this.manager = mgr;
+    }
+
+    public void setAccount(Account acct) {
+        this.account = acct;
+    }
+
+    public void setSerialNo(String sn) {
+        this.serialNo = sn;
+    }
+
+    public void setSalary(float s) {
+        this.salary = s;
+    }
+
+    public void setSalaryCurrency(String s) {
+        this.salaryCurrency = s;
+    }
+
+    public void setYearsInCompany(Integer y) {
+        this.yearsInCompany = y;
+    }
+
+    public int getWeeklyhours() {
+        return weeklyhours;
+    }
+
+    public Department getDepartment() {
+        return department;
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/InsuranceDepartment.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/InsuranceDepartment.java
similarity index 87%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/InsuranceDepartment.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/InsuranceDepartment.java
index 837e2e7933..6b2d80b610 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/InsuranceDepartment.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/InsuranceDepartment.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class InsuranceDepartment extends Department {
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Manager.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Manager.java
similarity index 92%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Manager.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Manager.java
index b5f11d00ee..36154060c9 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Manager.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Manager.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Manager of a set of Employees, and departments.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Office.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Office.java
similarity index 94%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Office.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Office.java
index b645b2fcdd..7d1f800fb9 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Office.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Office.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,7 +19,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * An office in the company.
@@ -55,7 +55,7 @@ public void setDate(Date date) {
     }
 
     /**
-     * Accessor for the roomt name
+     * Accessor for the room name
      *
      * @return Returns the room name.
      */
@@ -112,8 +112,9 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         }
-        if ((o == null) || (o.getClass() != this.getClass()))
+        if ((o == null) || (o.getClass() != this.getClass())) {
             return false;
+        }
 
         Office other = (Office) o;
         return floor == other.floor
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Organisation.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Organisation.java
similarity index 84%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Organisation.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Organisation.java
index 598fde8d4d..a5e4bf1b65 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Organisation.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Organisation.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Organisation that hands out qualifications to employees after taking training
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Person.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Person.java
new file mode 100644
index 0000000000..ce4b7ae1a2
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Person.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.models.company;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.StringTokenizer;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+/**
+ * Person in a company.
+ */
+@QueryEntity
+public class Person implements Cloneable {
+
+    public static class Id implements Serializable {
+
+        private static final long serialVersionUID = -4893934512712167318L;
+
+        public String globalNum;
+
+        public long personNum;
+
+        public Id() {
+        }
+
+        public Id(String str) {
+            StringTokenizer toke = new StringTokenizer(str, "::");
+
+            str = toke.nextToken();
+            this.personNum = Integer.parseInt(str);
+            str = toke.nextToken();
+            this.globalNum = str;
+        }
+
+        public boolean equals(Object obj) {
+            if (obj == this) {
+                return true;
+            }
+            if (!(obj instanceof Id)) {
+                return false;
+            }
+
+            Id c = (Id) obj;
+            return personNum == c.personNum && globalNum.equals(c.globalNum);
+        }
+
+        public int hashCode() {
+            return ((int) this.personNum) ^ this.globalNum.hashCode();
+        }
+
+        public String toString() {
+            return String.valueOf(this.personNum) + "::"
+                    + String.valueOf(this.globalNum);
+        }
+    }
+
+    /** Used for the querying of static fields. */
+    public static final String FIRSTNAME = "Woody";
+
+    private static Random random = new Random();
+
+    private int age;
+
+    private Person bestFriend;
+
+    private String emailAddress;
+
+    private String firstName;
+
+    private String globalNum; // Part of PK when app id
+
+    private String lastName;
+
+    private long personNum; // Part of PK when app id
+
+    private Map<String, PhoneNumber> phoneNumbers = new HashMap<String, PhoneNumber>();
+
+    public Person() {
+    }
+
+    public Person(long num, String first, String last, String email) {
+        globalNum = "global:" + random.nextInt();
+        personNum = num;
+        firstName = first;
+        lastName = last;
+        emailAddress = email;
+    }
+
+    public String asString() {
+        return "Person : number=" + getPersonNum() + " forename="
+                + getFirstName() + " surname=" + getLastName() + " email="
+                + getEmailAddress() + " bestfriend=" + getBestFriend();
+    }
+
+    public Object clone() {
+        Object o = null;
+
+        try {
+            o = super.clone();
+        } catch (CloneNotSupportedException e) {
+            /* can't happen */
+        }
+
+        return o;
+    }
+
+    public boolean compareTo(Object obj) {
+        // TODO Use globalNum here too ?
+        Person p = (Person) obj;
+        return bestFriend == p.bestFriend && firstName.equals(p.firstName)
+                && lastName.equals(p.lastName)
+                && emailAddress.equals(p.emailAddress)
+                && personNum == p.personNum;
+    }
+
+    // Note that this is only really correct for application identity, but we
+    // also use this class for datastore id
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        }
+        if ((o == null) || (o.getClass() != this.getClass())) {
+            return false;
+        }
+
+        Person other = (Person) o;
+        return personNum == other.personNum
+                && (globalNum == other.globalNum || (globalNum != null && globalNum
+                        .equals(other.globalNum)));
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public Person getBestFriend() {
+        return bestFriend;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getGlobalNum() {
+        return globalNum;
+    }
+
+    public synchronized String getLastName() {
+        return lastName;
+    }
+
+    public long getPersonNum() {
+        return personNum;
+    }
+
+    public Map<String, PhoneNumber> getPhoneNumbers() {
+        return phoneNumbers;
+    }
+
+    // Note that this is only really correct for application identity, but we
+    // also use this class for datastore id
+    public int hashCode() {
+        int hash = 7;
+        hash = 31 * hash + (int) personNum;
+        hash = 31 * hash + (null == globalNum ? 0 : globalNum.hashCode());
+        return hash;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public void setBestFriend(Person p) {
+        this.bestFriend = p;
+    }
+
+    public void setEmailAddress(String s) {
+        emailAddress = s;
+    }
+
+    public void setFirstName(String s) {
+        firstName = s;
+    }
+
+    public void setGlobalNum(String globalNum) {
+        this.globalNum = globalNum;
+    }
+
+    public void setLastName(String s) {
+        lastName = s;
+    }
+
+    public void setPersonNum(long num) {
+        personNum = num;
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonHolder.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonHolder.java
similarity index 94%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonHolder.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonHolder.java
index 6c72c4f979..7cf78a2985 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonHolder.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonHolder.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Convenience class that can be used in query results for holding Person
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonRC.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonRC.java
similarity index 93%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonRC.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonRC.java
index fd890c36bf..723fbbb854 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonRC.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonRC.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 @QueryEntity
 public class PersonRC {
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonalDetails.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonalDetails.java
similarity index 93%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonalDetails.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonalDetails.java
index da0b68758b..d3c67bbd43 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/PersonalDetails.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PersonalDetails.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Details of a person. Represents a subset of the information available from
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PhoneNumber.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PhoneNumber.java
new file mode 100644
index 0000000000..61f8a00cf8
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/PhoneNumber.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.models.company;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+/**
+ * Phone number of a person.
+ *
+ * @version $Revision: 1.1 $
+ */
+@QueryEntity
+public class PhoneNumber {
+    long id; // PK when using app id
+    String name;
+    String number;
+
+    public PhoneNumber() {
+    }
+
+    public PhoneNumber(String name, String number) {
+        this.name = name;
+        this.number = number;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Project.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Project.java
similarity index 87%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Project.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Project.java
index 0325ecaa45..519c0da252 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Project.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Project.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Project in a company.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Qualification.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Qualification.java
similarity index 91%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Qualification.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Qualification.java
index faa54b28f1..9d307d6517 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/company/Qualification.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/company/Qualification.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.company;
+package com.querydsl.jdo.models.company;
 
 import java.util.Date;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Qualification of a person.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Cloth.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Cloth.java
similarity index 83%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Cloth.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Cloth.java
index f23339896d..9d69e8c8a3 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Cloth.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Cloth.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.fitness;
+package com.querydsl.jdo.models.fitness;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Item of clothing in a Gym.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Gym.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Gym.java
similarity index 94%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Gym.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Gym.java
index 5a5414675a..5319e03f59 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Gym.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Gym.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.fitness;
+package com.querydsl.jdo.models.fitness;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Gymnasium.
@@ -29,7 +29,7 @@ public class Gym {
     private String location;
     private String name;
 
-    // this must be initialized in the constructor. dont change it
+    // this must be initialized in the constructor. don't change it
     private Map<String, Wardrobe> wardrobes; // store Wardrobe in values
     private Map<Wardrobe, String> wardrobes2; // store Wardrobe in keys
     private Map<String, Wardrobe> wardrobesInverse; // store Wardrobe in values
@@ -53,7 +53,7 @@ public class Gym {
     private String stringValue;
 
     public Gym() {
-        // this must be initialized in the constructor. dont change it
+        // this must be initialized in the constructor. don't change it
         wardrobes = new HashMap<String, Wardrobe>();
         equipments = new HashMap<String, GymEquipment>();
         partners = new HashMap<String, Gym>();
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/GymEquipment.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/GymEquipment.java
similarity index 87%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/GymEquipment.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/GymEquipment.java
index e3a5e458e1..444c54fdfb 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/GymEquipment.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/GymEquipment.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.fitness;
+package com.querydsl.jdo.models.fitness;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Piece of equipment in a Gym.
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Wardrobe.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java
similarity index 82%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Wardrobe.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java
index 3afdbfadd5..8f99409026 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/models/fitness/Wardrobe.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/models/fitness/Wardrobe.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.models.fitness;
+package com.querydsl.jdo.models.fitness;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mysema.query.annotations.QueryEntity;
+import com.querydsl.core.annotations.QueryEntity;
 
 /**
  * Container for clothes in a Gym.
@@ -25,7 +25,7 @@
  */
 @QueryEntity
 public class Wardrobe {
-    // this must be initialized in the constructor. dont change it
+    // this must be initialized in the constructor. don't change it
     private List<Cloth> clothes;
     private String model;
     private Gym gym;
@@ -33,7 +33,7 @@ public class Wardrobe {
     private String stringValue;
 
     public Wardrobe() {
-        // this must be initialized in the constructor. dont change it
+        // this must be initialized in the constructor. don't change it
         clothes = new ArrayList<Cloth>();
     }
 
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/AbstractTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/AbstractTest.java
new file mode 100644
index 0000000000..82ebb3cb23
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/AbstractTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.serialization;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.jdo.JDOQLSerializer;
+import com.querydsl.jdo.JDOQLTemplates;
+
+public abstract class AbstractTest {
+
+    protected String serialize(SubQueryExpression<?> expr) {
+        Expression<?> source = expr.getMetadata().getJoins().get(0).getTarget();
+        JDOQLSerializer serializer = new JDOQLSerializer(JDOQLTemplates.DEFAULT, source);
+        serializer.serialize(expr.getMetadata(), false, false);
+        return serializer.toString().replace('\n', ' ');
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ContainerTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ContainerTest.java
new file mode 100644
index 0000000000..721c7afe55
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ContainerTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.serialization;
+
+import static com.querydsl.jdo.JDOExpressions.selectFrom;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jdo.models.fitness.QGym;
+import com.querydsl.jdo.models.fitness.Wardrobe;
+
+public class ContainerTest extends AbstractTest {
+
+    private QGym gym = QGym.gym1;
+
+    private Wardrobe wrd = new Wardrobe(), wrd1 = new Wardrobe(), wrd2 = new Wardrobe();
+
+    @Before
+    public void setUp() {
+        wrd.setModel("model");
+    }
+
+    @Test
+    public void notContainsValuesInMapFields() {
+
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsValue(wrd) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes.containsValue(a1) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1",
+
+          serialize(selectFrom(gym)
+                  .where(gym.wardrobes.containsValue(wrd).not())));
+
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsValue(wrd) && !this.wardrobes.containsValue(wrd2) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
+
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes.containsValue(a1) && !this.wardrobes.containsValue(a2) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1, com.querydsl.jdo.models.fitness.Wardrobe a2",
+
+          serialize(selectFrom(gym)
+                  .where(gym.wardrobes.containsValue(wrd).not(), gym.wardrobes.containsValue(wrd2).not())));
+//
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsValue(wrd) && !this.wardrobes.containsValue(wrd2) && this.wardrobes.containsValue(wrd1) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
+
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes.containsValue(a1) && !this.wardrobes.containsValue(a2) && this.wardrobes.containsValue(a3) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1, com.querydsl.jdo.models.fitness.Wardrobe a2, com.querydsl.jdo.models.fitness.Wardrobe a3",
+
+        serialize(selectFrom(gym)
+                .where(
+                    gym.wardrobes.containsValue(wrd).not(),
+                    gym.wardrobes.containsValue(wrd1).not(),
+                    gym.wardrobes.containsValue(wrd2))));
+    }
+
+    @Test
+    public void notContainsKeysInMapFields() {
+
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes2.containsKey(wrd) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes2.containsKey(a1) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1",
+
+          serialize(selectFrom(gym)
+                   .where(gym.wardrobes2.containsKey(wrd).not())));
+//
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes2.containsKey(wrd) && !this.wardrobes2.containsKey(wrd2) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes2.containsKey(a1) && !this.wardrobes2.containsKey(a2) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1, com.querydsl.jdo.models.fitness.Wardrobe a2",
+
+          serialize(selectFrom(gym)
+                   .where(
+                       gym.wardrobes2.containsKey(wrd).not(),
+                       gym.wardrobes2.containsKey(wrd2).not())));
+//
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes2.containsKey(wrd) && !this.wardrobes2.containsKey(wrd2) && this.wardrobes2.containsKey(wrd1) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE !this.wardrobes2.containsKey(a1) && !this.wardrobes2.containsKey(a2) && this.wardrobes2.containsKey(a3) " +
+          "PARAMETERS com.querydsl.jdo.models.fitness.Wardrobe a1, com.querydsl.jdo.models.fitness.Wardrobe a2, com.querydsl.jdo.models.fitness.Wardrobe a3",
+
+        serialize(selectFrom(gym)
+                 .where(
+                     gym.wardrobes2.containsKey(wrd).not(),
+                     gym.wardrobes2.containsKey(wrd2).not(),
+                     gym.wardrobes2.containsKey(wrd1))));
+    }
+
+    @Test
+    public void notContainsEntryInMapFields() {
+        // NOTE : containsEntry is not supported in Querydsl
+
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
+//
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) && !this.wardrobes.containsEntry(wrd2.model,wrd2) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2");
+//
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE !this.wardrobes.containsEntry(wrd.model,wrd) && !this.wardrobes.containsEntry(wrd2.model,wrd2) && this.wardrobes.containsEntry(wrd1.model,wrd1) "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd,org.jpox.samples.models.fitness.Wardrobe wrd2,org.jpox.samples.models.fitness.Wardrobe wrd1");
+
+    }
+
+    @Test
+    public void getInMapFields() {
+
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "WHERE this.wardrobes.get(wrd.model) == wrd "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "WHERE this.wardrobes.get(a1) == a2 " +
+          "PARAMETERS java.lang.String a1, com.querydsl.jdo.models.fitness.Wardrobe a2",
+
+          serialize(selectFrom(gym)
+                   .where(gym.wardrobes.get(wrd.getModel()).eq(wrd))));
+    }
+
+    @Test
+    public void getInOrderingInMapFields() {
+//        "SELECT FROM org.jpox.samples.models.fitness.Gym "
+//                + "PARAMETERS org.jpox.samples.models.fitness.Wardrobe wrd");
+//        .setOrdering("this.wardrobes.get(wrd.model).model ascending");
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.fitness.Gym " +
+          "PARAMETERS java.lang.String a1 " +
+          "ORDER BY this.wardrobes.get(a1).model ASC",
+
+          serialize(selectFrom(gym)
+                   .orderBy(gym.wardrobes.get(wrd.getModel()).model.asc())));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ExprSerializationTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ExprSerializationTest.java
similarity index 86%
rename from querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ExprSerializationTest.java
rename to querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ExprSerializationTest.java
index 69b2ade6f8..a110f63c1f 100644
--- a/querydsl-jdo/src/test/java/com/mysema/query/jdo/serialization/ExprSerializationTest.java
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/ExprSerializationTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,20 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jdo.serialization;
+package com.querydsl.jdo.serialization;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.jdo.JDOQLSerializer;
-import com.mysema.query.jdo.JDOQLTemplates;
-import com.mysema.query.jdo.test.domain.Book;
-import com.mysema.query.jdo.test.domain.Product;
-import com.mysema.query.jdo.test.domain.QBook;
-import com.mysema.query.jdo.test.domain.QProduct;
-import com.mysema.query.jdo.test.domain.QStore;
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jdo.JDOQLSerializer;
+import com.querydsl.jdo.JDOQLTemplates;
+import com.querydsl.jdo.test.domain.*;
 
 public class ExprSerializationTest {
 
@@ -35,20 +31,20 @@ public class ExprSerializationTest {
     private QStore store = QStore.store;
 
     @Test
-    public void InstanceOf() {
+    public void instanceOf() {
         assertEquals(
-                "product instanceof com.mysema.query.jdo.test.domain.Book",
+                "product instanceof com.querydsl.jdo.test.domain.Book",
                 serialize(product.instanceOf(Book.class)));
     }
 
     @Test
-    public void Eq() {
+    public void eq() {
         assertEquals("this.name == product.name", serialize(book.name.eq(product.name)));
         assertEquals("this == product", serialize(book.eq(product)));
     }
 
     @Test
-    public void Aggregation() {
+    public void aggregation() {
         assertEquals("sum(product.price)", serialize(product.price.sum()));
         assertEquals("min(product.price)", serialize(product.price.min()));
         assertEquals("max(product.price)", serialize(product.price.max()));
@@ -57,7 +53,7 @@ public void Aggregation() {
     }
 
     @Test
-    public void BooleanTests() {
+    public void booleanTests() {
         // boolean
         assertEquals("product.name == a1 && product.price <= a2",
                 serialize(product.name.eq("Sony Discman").and(product.price.loe(300.00))));
@@ -68,7 +64,7 @@ public void BooleanTests() {
     }
 
     @Test
-    public void CollectionTests() {
+    public void collectionTests() {
         Product product = new Product();
         // collection
         assertEquals("store.products.contains(a1)",
@@ -84,7 +80,7 @@ public void CollectionTests() {
     }
 
     @Test
-    public void MapTests() {
+    public void mapTests() {
         assertEquals("store.productsByName.containsKey(a1)",
                 serialize(store.productsByName.containsKey("")));
         assertEquals("store.productsByName.containsValue(a1)",
@@ -97,7 +93,7 @@ public void MapTests() {
     }
 
     @Test
-    public void NumericTests() {
+    public void numericTests() {
         // numeric
         assertEquals("product.price == a1", serialize(product.price.eq(200.00)));
         assertEquals("product.price != a1", serialize(product.price.ne(100.00)));
@@ -115,7 +111,7 @@ public void NumericTests() {
     }
 
     @Test
-    public void StringTests() {
+    public void stringTests() {
         // string
         assertEquals("product.name.startsWith(a1)", serialize(product.name.startsWith("Sony Discman")));
         assertEquals("product.name.endsWith(a1)", serialize(product.name.endsWith("Discman")));
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/GroupByTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/GroupByTest.java
new file mode 100644
index 0000000000..f4e29eb90c
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/GroupByTest.java
@@ -0,0 +1,25 @@
+package com.querydsl.jdo.serialization;
+
+import static com.querydsl.jdo.JDOExpressions.selectFrom;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.jdo.models.company.QEmployee;
+
+public class GroupByTest extends AbstractTest {
+
+    @Test
+    public void groupBy() {
+        QEmployee employee = QEmployee.employee;
+        assertEquals(
+                "SELECT FROM com.querydsl.jdo.models.company.Employee " +
+                "PARAMETERS java.lang.String a1 " +
+                "GROUP BY this.emailAddress " +
+                "HAVING this.emailAddress != a1",
+
+                serialize(selectFrom(employee)
+                    .groupBy(employee.emailAddress).having(employee.emailAddress.ne("XXX"))));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/QuerySerializationTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/QuerySerializationTest.java
new file mode 100644
index 0000000000..d1e379f282
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/QuerySerializationTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.serialization;
+
+import static com.querydsl.jdo.JDOExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.jdo.test.domain.Book;
+import com.querydsl.jdo.test.domain.QProduct;
+
+public class QuerySerializationTest extends AbstractTest {
+
+    private QProduct product = QProduct.product;
+
+    private QProduct other = new QProduct("other");
+
+    @Test
+    public void selectFromWhereOrder() {
+        assertEquals(
+            "SELECT this.name " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE this.name == a1 " +
+            "PARAMETERS java.lang.String a1 " +
+            "ORDER BY this.name ASC",
+
+            serialize(select(product.name).from(product)
+              .where(product.name.eq("Test"))
+              .orderBy(product.name.asc())));
+    }
+
+    @Test
+    public void selectFromWhereGroupBy() {
+        assertEquals(
+            "SELECT this.name " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE this.name.startsWith(a1) || this.name.endsWith(a2) " +
+            "PARAMETERS java.lang.String a1, java.lang.String a2 " +
+            "GROUP BY this.price",
+
+            serialize(select(product.name).from(product)
+              .where(product.name.startsWith("A").or(product.name.endsWith("B")))
+              .groupBy(product.price)));
+    }
+
+    @Test
+    public void selectFrom2Sources() {
+        assertEquals(
+            "SELECT this.name " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE this.name == other.name " +
+            "VARIABLES com.querydsl.jdo.test.domain.Product other",
+
+            serialize(select(product.name).from(product, other)
+              .where(product.name.eq(other.name))));
+    }
+
+    @Test
+    public void withSubQuery() {
+        assertEquals(
+            "SELECT this.price " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE this.price < " +
+            "(SELECT avg(other.price) FROM com.querydsl.jdo.test.domain.Product other)",
+
+            serialize(select(product.price).from(product)
+              .where(product.price.lt(select(other.price.avg()).from(other)))));
+    }
+
+    @Test
+    public void withSubQuery2() {
+        // FIXME : how to model this ?!?
+        assertEquals(
+            "SELECT this.name " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE (SELECT other.price FROM com.querydsl.jdo.test.domain.Product other " +
+                "WHERE other.name == a1 " +
+                "PARAMETERS java.lang.String a1).contains(this.price)",
+
+            serialize(select(product.name).from(product)
+              .where(product.price.in(select(other.price).from(other).where(other.name.eq("Some name"))))));
+    }
+
+    @Test
+    public void instanceofQuery() {
+        assertEquals(
+            "SELECT " +
+            "FROM com.querydsl.jdo.test.domain.Product " +
+            "WHERE this instanceof com.querydsl.jdo.test.domain.Book",
+
+            serialize(select(product).from(product)
+              .where(product.instanceOf(Book.class))));
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/SubqueriesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/SubqueriesTest.java
new file mode 100644
index 0000000000..81824762b8
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/serialization/SubqueriesTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.serialization;
+
+import static com.querydsl.jdo.JDOExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.jdo.models.company.QDepartment;
+import com.querydsl.jdo.models.company.QEmployee;
+
+public class SubqueriesTest extends AbstractTest {
+
+    private QDepartment department = QDepartment.department;
+
+    private QDepartment d = new QDepartment("d");
+
+    private QEmployee e = new QEmployee("e");
+
+    private QEmployee employee = QEmployee.employee;
+
+/*  "SELECT FROM " + Department.class.getName() + " WHERE this.employees.size() == " +
+ *  "(SELECT MAX(d.employees.size()) FROM " + Department.class.getName() + " d)"; */
+    @Test
+    public void test1() {
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.company.Department " +
+          "WHERE this.employees.size() == " +
+          "(SELECT max(d.employees.size()) FROM com.querydsl.jdo.models.company.Department d)",
+
+          serialize(select(department).from(department).where(department.employees.size().eq(
+                  select(d.employees.size().max()).from(d)
+            )))
+        );
+    }
+
+/*  "SELECT FROM " + Employee.class.getName() + " WHERE this.weeklyhours > " +
+ *  "(SELECT AVG(e.weeklyhours) FROM this.department.employees e)"; */
+    @Test
+    public void test2() {
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.company.Employee " +
+          "WHERE this.weeklyhours > " +
+          "(SELECT avg(e.weeklyhours) FROM this.department.employees e)",
+
+          serialize(select(employee).from(employee).where(employee.weeklyhours.gt(
+                  select(e.weeklyhours.avg()).from(employee.department.employees, e)
+            )))
+        );
+    }
+
+/*  "SELECT FROM " + Employee.class.getName() +
+ *   " WHERE this.weeklyhours > " +
+ *   "(SELECT AVG(e.weeklyhours) FROM this.department.employees e " +
+ *   " WHERE e.manager == this.manager)"; */
+    @Test
+    public void test3() {
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.company.Employee " +
+          "WHERE this.weeklyhours > " +
+          "(SELECT avg(e.weeklyhours) FROM this.department.employees e WHERE e.manager == this.manager)",
+
+          serialize(select(employee).from(employee).where(employee.weeklyhours.gt(
+                  select(e.weeklyhours.avg()).from(employee.department.employees, e).where(e.manager.eq(employee.manager))
+            )))
+        );
+    }
+/*  "SELECT FROM " + Employee.class.getName() + " WHERE this.weeklyhours > " +
+ *   "(SELECT AVG(e.weeklyhours) FROM " + Employee.class.getName() + " e)"; */
+    @Test
+    public void test4() {
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.company.Employee " +
+          "WHERE this.weeklyhours > " +
+          "(SELECT avg(e.weeklyhours) FROM com.querydsl.jdo.models.company.Employee e)",
+
+          serialize(select(employee).from(employee).where(employee.weeklyhours.gt(
+                  select(e.weeklyhours.avg()).from(e)
+            )))
+        );
+    }
+
+/*  "SELECT FROM " + Employee.class.getName() +
+ *   " WHERE this.weeklyhours == emp.weeklyhours && " +
+ *   "emp.firstname == 'emp1First' VARIABLES Employee emp"; */
+    @Test
+    public void test5() {
+        assertEquals(
+          "SELECT FROM com.querydsl.jdo.models.company.Employee " +
+          "WHERE this.weeklyhours == e.weeklyhours && this.firstName == a1 " +
+          "VARIABLES com.querydsl.jdo.models.company.Employee e " +
+          "PARAMETERS java.lang.String a1",
+
+          serialize(select(employee).from(employee, e)
+              .where(
+                  employee.weeklyhours.eq(e.weeklyhours),
+                  employee.firstName.eq("emp1First")
+              ))
+        );
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Book.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Book.java
new file mode 100644
index 0000000000..884fc7433f
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Book.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import java.util.Date;
+
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+
+/**
+ * Definition of a Book. Extends basic Product class.
+ */
+@PersistenceCapable
+@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
+public class Book extends Product {
+    private String author = null;
+
+    private String isbn = null;
+
+    private String publisher = null;
+
+    protected Book() {
+        super();
+    }
+
+    public Book(String name, String description, double price, int amount, String author,
+            String isbn, String publisher) {
+        this(name, description, price, amount, author, isbn, publisher, new Date());
+    }
+
+    public Book(String name, String description, double price, int amount, String author,
+            String isbn, String publisher, Date date) {
+        super(name, description, price, amount, date);
+        this.author = author;
+        this.isbn = isbn;
+        this.publisher = publisher;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public String getPublisher() {
+        return publisher;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher = publisher;
+    }
+
+    public String toString() {
+        return "Book : " + author + " - " + getName();
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Product.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Product.java
new file mode 100644
index 0000000000..2c0be4fc7c
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Product.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import java.util.Date;
+
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+
+/**
+ * Definition of a Product Represents a product, and contains the key aspects of
+ * the item.
+ */
+@PersistenceCapable
+@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
+public class Product {
+    private String name = null;
+
+    private String description = null;
+
+    private double price = 0.0;
+
+    private Date publicationDate;
+
+    @Persistent
+    private java.sql.Date dateField;
+
+    @Persistent
+    private java.sql.Time timeField;
+
+    private int amount;
+
+    public Product() {
+    }
+
+    public Product(String name, String description, double price, int amount) {
+        this(name, description, price, amount, new Date());
+    }
+
+    public Product(String name, String description, double price, int amount, Date publicationDate) {
+        this.name = name;
+        this.description = description;
+        this.price = price;
+        this.amount = amount;
+        this.publicationDate = new Date(publicationDate.getTime());
+        this.dateField = new java.sql.Date(publicationDate.getTime());
+        this.timeField = new java.sql.Time(publicationDate.getTime());
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public Date getPublicationDate() {
+        return publicationDate;
+    }
+
+    public void setPublicationDate(Date publicationDate) {
+        this.publicationDate = new java.sql.Date(publicationDate.getTime());
+    }
+
+    public java.sql.Date getDateField() {
+        return new java.sql.Date(dateField.getTime());
+    }
+
+    public void setDateField(java.sql.Date dateField) {
+        this.dateField = new java.sql.Date(dateField.getTime());
+    }
+
+    public java.sql.Time getTimeField() {
+        return timeField;
+    }
+
+    public void setTimeField(java.sql.Time timeField) {
+        this.timeField = timeField;
+    }
+
+    public String toString() {
+        return "Product : " + name + " [" + description + "]";
+    }
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QBook.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QBook.java
new file mode 100644
index 0000000000..b3f96013d8
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QBook.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+/**
+ * QBook is a Querydsl query type for Book
+ *
+ */
+@SuppressWarnings("serial")
+public class QBook extends EntityPathBase<com.querydsl.jdo.test.domain.Book> {
+
+    public static final QBook book = new QBook("book");
+
+    public final StringPath author = createString("author");
+
+    public final StringPath description = createString("description");
+
+    public final StringPath isbn = createString("isbn");
+
+    public final StringPath name = createString("name");
+
+    public final StringPath publisher = createString("publisher");
+
+    public final DateTimePath<java.util.Date> publicationDate = createDateTime("publicationDate",java.util.Date.class);
+
+    public final NumberPath<Integer> amount = createNumber("amount",Integer.class);
+
+    public final NumberPath<Double> price = createNumber("price",Double.class);
+
+    public QBook(String path) {
+          this(com.querydsl.jdo.test.domain.Book.class, path);
+    }
+
+    public QBook(Class<? extends com.querydsl.jdo.test.domain.Book> cl, String path) {
+          super(cl, PathMetadataFactory.forVariable(path));
+    }
+
+    public QBook(PathMetadata metadata) {
+         super(com.querydsl.jdo.test.domain.Book.class, metadata);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QProduct.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QProduct.java
new file mode 100644
index 0000000000..f3a9d13dc5
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QProduct.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * QProduct is a Querydsl query type for Product
+ *
+ */
+@SuppressWarnings("serial")
+public class QProduct extends EntityPathBase<com.querydsl.jdo.test.domain.Product> {
+
+    public static final QProduct product = new QProduct("product");
+
+    public final StringPath description = createString("description");
+
+    public final StringPath name = createString("name");
+
+    public final DateTimePath<java.util.Date> publicationDate = createDateTime("publicationDate",java.util.Date.class);
+
+    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> amount = createNumber("amount",Integer.class);
+
+    public final NumberPath<Double> price = createNumber("price",Double.class);
+
+    public QProduct(String path) {
+          this(com.querydsl.jdo.test.domain.Product.class, path);
+    }
+
+    public QProduct(Class<? extends com.querydsl.jdo.test.domain.Product> cl, String path) {
+          super(cl, PathMetadataFactory.forVariable(path));
+    }
+
+    public QProduct(PathMetadata metadata) {
+         super(com.querydsl.jdo.test.domain.Product.class, metadata);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QStore.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QStore.java
new file mode 100644
index 0000000000..344b2c3d1e
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/QStore.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * QStore is a Querydsl query type for Store
+ *
+ */
+@SuppressWarnings("serial")
+public class QStore extends EntityPathBase<com.querydsl.jdo.test.domain.Store> {
+
+    public static final QStore store = new QStore("store");
+
+    public final StringPath name = createString("name");
+
+    public final MapPath<String, Product, QProduct> productsByName = this.<String, Product, QProduct>createMap("productsByName",String.class,Product.class,QProduct.class);
+
+    public final ListPath<Product, QProduct> products = this.<Product, QProduct>createList("products",Product.class,QProduct.class, PathInits.DIRECT);
+
+    public QProduct productsByName(String key) {
+        return new QProduct(PathMetadataFactory.forMapAccess(productsByName,key));
+    }
+
+    public QProduct productsByName(com.querydsl.core.types.Expression<String> key) {
+        return new QProduct(PathMetadataFactory.forMapAccess(productsByName,key));
+    }
+
+    public QStore(String path) {
+          this(Store.class, path);
+    }
+
+    public QStore(Class<? extends Store> cl, String path) {
+          super(cl, PathMetadataFactory.forVariable(path));
+    }
+
+    public QStore(PathMetadata metadata) {
+         super(Store.class, metadata);
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Store.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Store.java
new file mode 100644
index 0000000000..b2951afb04
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/Store.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jdo.annotations.*;
+
+@PersistenceCapable
+@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
+@FetchGroups({
+    @FetchGroup(name = "products", members = {@Persistent(name = "products")})
+})
+public class Store {
+
+    private String name;
+
+    @Join
+    @Element(types = Product.class)
+    private List<Product> products = new ArrayList<Product>();
+
+    @Join
+    @Key(types = String.class)
+    @Value(types = Product.class)
+    private Map<String,Product> productsByName = new HashMap<String,Product>();
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map<String, Product> getProductsByName() {
+        return productsByName;
+    }
+
+    public void setProductsByName(Map<String, Product> productsByName) {
+        this.productsByName = productsByName;
+    }
+
+    public List<Product> getProducts() {
+        return products;
+    }
+
+    public void setProducts(List<Product> products) {
+        this.products = products;
+    }
+
+}
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SBook.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SBook.java
new file mode 100644
index 0000000000..33ffd8f26a
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SBook.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+
+/**
+ * SBook is a Querydsl query type for SBook
+ */
+//@Table(value="BOOK")
+public class SBook extends RelationalPathBase<SBook> {
+
+    private static final long serialVersionUID = -1566558053;
+
+    public static final SBook book = new SBook("BOOK");
+
+    public final StringPath author = createString("AUTHOR");
+
+    public final NumberPath<Long> bookId = createNumber("BOOK_ID", Long.class);
+
+    public final StringPath isbn = createString("ISBN");
+
+    public final StringPath publisher = createString("PUBLISHER");
+
+    public final PrimaryKey<SBook> sysIdx65 = createPrimaryKey(bookId);
+
+    public final ForeignKey<SProduct> bookFk1 = new ForeignKey<SProduct>(this, bookId, "PRODUCT_ID");
+
+    public SBook(String variable) {
+        super(SBook.class, forVariable(variable), "", "BOOK");
+    }
+
+    public SBook(BeanPath<? extends SBook> entity) {
+        super(entity.getType(),entity.getMetadata(), "", "BOOK");
+    }
+
+    public SBook(PathMetadata metadata) {
+        super(SBook.class, metadata, "", "BOOK");
+    }
+
+}
+
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SProduct.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SProduct.java
new file mode 100644
index 0000000000..8414405c58
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SProduct.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+import java.sql.Time;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+
+/**
+ * SProduct is a Querydsl query type for SProduct
+ */
+//@Table(value="PRODUCT")
+public class SProduct extends RelationalPathBase<SProduct> {
+
+    private static final long serialVersionUID = -590374403;
+
+    public static final SProduct product = new SProduct("PRODUCT");
+
+    public final NumberPath<Integer> amount = createNumber("AMOUNT", Integer.class);
+
+    public final DatePath<Date> datefield = createDate("DATEFIELD", java.sql.Date.class);
+
+    public final StringPath description = createString("DESCRIPTION");
+
+    public final StringPath name = createString("NAME");
+
+    public final NumberPath<Double> price = createNumber("PRICE", Double.class);
+
+    public final NumberPath<Long> productId = createNumber("PRODUCT_ID", Long.class);
+
+    public final DateTimePath<java.util.Date> publicationdate = createDateTime("PUBLICATIONDATE", java.util.Date.class);
+
+    public final TimePath<Time> timefield = createTime("TIMEFIELD", java.sql.Time.class);
+
+    public final PrimaryKey<SProduct> sysIdx47 = createPrimaryKey(productId);
+
+    public final ForeignKey<SStoreProducts> _storeProductsFk2 = new ForeignKey<SStoreProducts>(this, productId, "PRODUCT_ID_EID");
+
+    public final ForeignKey<SBook> _bookFk1 = new ForeignKey<SBook>(this, productId, "BOOK_ID");
+
+    public final ForeignKey<SStoreProductsbyname> _storeProductsbynameFk2 = new ForeignKey<SStoreProductsbyname>(this, productId, "PRODUCT_ID_VID");
+
+    public SProduct(String variable) {
+        super(SProduct.class, forVariable(variable), "", "PRODUCT");
+        addMetadata();
+    }
+
+    public SProduct(BeanPath<? extends SProduct> entity) {
+        super(entity.getType(),entity.getMetadata(), "", "PRODUCT");
+        addMetadata();
+    }
+
+    public SProduct(PathMetadata metadata) {
+        super(SProduct.class, metadata, "", "PRODUCT");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(amount, ColumnMetadata.named("AMOUNT"));
+        addMetadata(datefield, ColumnMetadata.named("DATEFIELD"));
+        addMetadata(description, ColumnMetadata.named("DESCRIPTION"));
+        addMetadata(name, ColumnMetadata.named("NAME"));
+        addMetadata(price, ColumnMetadata.named("PRICE"));
+        addMetadata(productId, ColumnMetadata.named("PRODUCT_ID"));
+        addMetadata(publicationdate, ColumnMetadata.named("PUBLICATIONDATE"));
+        addMetadata(timefield, ColumnMetadata.named("TIMEFIELD"));
+    }
+
+}
+
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStore.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStore.java
new file mode 100644
index 0000000000..02f69c7c5a
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStore.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+
+/**
+ * SStore is a Querydsl query type for SStore
+ */
+//@Table(value="STORE")
+public class SStore extends RelationalPathBase<SStore> {
+
+    private static final long serialVersionUID = -1302810257;
+
+    public static final SStore store = new SStore("STORE");
+
+    public final StringPath name = createString("NAME");
+
+    public final NumberPath<Long> storeId = createNumber("STORE_ID", Long.class);
+
+    public final PrimaryKey<SStore> sysIdx51 = createPrimaryKey(storeId);
+
+    public final ForeignKey<SStoreProductsbyname> _storeProductsbynameFk1 = new ForeignKey<SStoreProductsbyname>(this, storeId, "STORE_ID_OID");
+
+    public final ForeignKey<SStoreProducts> _storeProductsFk1 = new ForeignKey<SStoreProducts>(this, storeId, "STORE_ID_OID");
+
+    public SStore(String variable) {
+        super(SStore.class, forVariable(variable), "", "STORE");
+    }
+
+    public SStore(BeanPath<? extends SStore> entity) {
+        super(entity.getType(),entity.getMetadata(), "", "STORE");
+    }
+
+    public SStore(PathMetadata metadata) {
+        super(SStore.class, metadata, "", "STORE");
+    }
+
+}
+
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProducts.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProducts.java
new file mode 100644
index 0000000000..9311cd6d2f
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProducts.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+
+/**
+ * SStoreProducts is a Querydsl query type for SStoreProducts
+ */
+//@Table(value="STORE_PRODUCTS")
+public class SStoreProducts extends RelationalPathBase<SStoreProducts> {
+
+    private static final long serialVersionUID = 1019873267;
+
+    public static final SStoreProducts storeProducts = new SStoreProducts("STORE_PRODUCTS");
+
+    public final NumberPath<Integer> idx = createNumber("IDX", Integer.class);
+
+    public final NumberPath<Long> productIdEid = createNumber("PRODUCT_ID_EID", Long.class);
+
+    public final NumberPath<Long> storeIdOid = createNumber("STORE_ID_OID", Long.class);
+
+    public final PrimaryKey<SStoreProducts> sysIdx55 = createPrimaryKey(idx, storeIdOid);
+
+    public final ForeignKey<SProduct> storeProductsFk2 = new ForeignKey<SProduct>(this, productIdEid, "PRODUCT_ID");
+
+    public final ForeignKey<SStore> storeProductsFk1 = new ForeignKey<SStore>(this, storeIdOid, "STORE_ID");
+
+    public SStoreProducts(String variable) {
+        super(SStoreProducts.class, forVariable(variable), "", "STORE_PRODUCTS");
+    }
+
+    public SStoreProducts(BeanPath<? extends SStoreProducts> entity) {
+        super(entity.getType(),entity.getMetadata(), "", "STORE_PRODUCTS");
+    }
+
+    public SStoreProducts(PathMetadata metadata) {
+        super(SStoreProducts.class, metadata, "", "STORE_PRODUCTS");
+    }
+
+}
+
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProductsbyname.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProductsbyname.java
new file mode 100644
index 0000000000..a389c45f6e
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/test/domain/sql/SStoreProductsbyname.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jdo.test.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+
+/**
+ * SStoreProductsbyname is a Querydsl query type for SStoreProductsbyname
+ */
+//@Table(value="STORE_PRODUCTSBYNAME")
+public class SStoreProductsbyname extends RelationalPathBase<SStoreProductsbyname> {
+
+    private static final long serialVersionUID = 764053781;
+
+    public static final SStoreProductsbyname storeProductsbyname = new SStoreProductsbyname("STORE_PRODUCTSBYNAME");
+
+    public final StringPath key = createString("KEY");
+
+    public final NumberPath<Long> productIdVid = createNumber("PRODUCT_ID_VID", Long.class);
+
+    public final NumberPath<Long> storeIdOid = createNumber("STORE_ID_OID", Long.class);
+
+    public final PrimaryKey<SStoreProductsbyname> sysIdx53 = createPrimaryKey(key, storeIdOid);
+
+    public final ForeignKey<SStore> storeProductsbynameFk1 = new ForeignKey<SStore>(this, storeIdOid, "STORE_ID");
+
+    public final ForeignKey<SProduct> storeProductsbynameFk2 = new ForeignKey<SProduct>(this, productIdVid, "PRODUCT_ID");
+
+    public SStoreProductsbyname(String variable) {
+        super(SStoreProductsbyname.class, forVariable(variable), "", "STORE_PRODUCTSBYNAME");
+    }
+
+    public SStoreProductsbyname(BeanPath<? extends SStoreProductsbyname> entity) {
+        super(entity.getType(),entity.getMetadata(), "", "STORE_PRODUCTSBYNAME");
+    }
+
+    public SStoreProductsbyname(PathMetadata metadata) {
+        super(SStoreProductsbyname.class, metadata, "", "STORE_PRODUCTSBYNAME");
+    }
+
+}
+
diff --git a/querydsl-jdo/src/test/resources/datanucleus.properties b/querydsl-jdo/src/test/resources/datanucleus.properties
index 44813ad81c..57ee19eff7 100644
--- a/querydsl-jdo/src/test/resources/datanucleus.properties
+++ b/querydsl-jdo/src/test/resources/datanucleus.properties
@@ -1,13 +1,16 @@
-javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory
-
-javax.jdo.option.ConnectionDriverName=org.h2.Driver
-javax.jdo.option.ConnectionURL=jdbc:h2:~/dbs/test
-javax.jdo.option.ConnectionUserName=sa
-javax.jdo.option.ConnectionPassword=
-#javax.jdo.option.Mapping=h2
-
-datanucleus.metadata.validate=false
-datanucleus.autoCreateSchema=true
-datanucleus.autoCreateTables=true
-datanucleus.validateTables=true
-datanucleus.validateConstraints=true
+javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory
+
+javax.jdo.option.ConnectionDriverName=org.h2.Driver
+javax.jdo.option.ConnectionURL=jdbc:h2:./target/test
+javax.jdo.option.ConnectionUserName=sa
+javax.jdo.option.ConnectionPassword=
+#javax.jdo.option.Mapping=h2
+
+datanucleus.metadata.validate=false
+datanucleus.schema.autoCreateAll=true
+datanucleus.schema.autoCreateDatabase=true
+datanucleus.schema.autoCreateSchema=true
+datanucleus.schema.autoCreateTables=true
+datanucleus.schema.autoCreateColumns=true
+datanucleus.schema.validateTables=true
+datanucleus.schema.validateConstraints=true
diff --git a/querydsl-jdo/src/test/resources/log4j.properties b/querydsl-jdo/src/test/resources/log4j.properties
index b86a4715ee..a458916ee4 100644
--- a/querydsl-jdo/src/test/resources/log4j.properties
+++ b/querydsl-jdo/src/test/resources/log4j.properties
@@ -1,11 +1,11 @@
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m%n
-
-### set log levels - for more verbose logging change 'info' to 'debug' ###
-
-log4j.rootLogger=WARN, stdout
-
-#log4j.logger.com.mysema.query.jdo=DEBUG
+### direct log messages to stdout ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m %X%n
+
+### set log levels - for more verbose logging change 'info' to 'debug' ###
+
+log4j.rootLogger=WARN, stdout
+
+#log4j.logger.com.querydsl.jdo=DEBUG
diff --git a/querydsl-jdo/template.mf b/querydsl-jdo/template.mf
deleted file mode 100644
index 6782ed012e..0000000000
--- a/querydsl-jdo/template.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.jdo
-Bundle-Name: Querydsl JDO
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",
-  javax.jdo.*;version="[2.0.0,4.0.0)",
-  com.google.common.*;version="${guava.version}",
-  org.slf4j.*;version="${slf4j.version}"
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/pom.xml b/querydsl-jpa-codegen/pom.xml
index a04b06c41a..407d4aca5f 100644
--- a/querydsl-jpa-codegen/pom.xml
+++ b/querydsl-jpa-codegen/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-jpa-codegen</artifactId>
   <name>Querydsl - JPA Codegen support</name>
   <description>JPA Codegen support for Querydsl</description>
@@ -21,13 +21,13 @@
     <developerConnection>${project.checkout}</developerConnection>
     <url>${project.githubpage}</url>
   </scm>
-  
-  <properties>
-    <hibernate.version>4.1.7.Final</hibernate.version>
-    <hibernate.validator.version>4.3.0.Final</hibernate.validator.version>
-  </properties>
-  
-  <dependencies>   
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
@@ -43,45 +43,45 @@
         </exclusion>
       </exclusions>      
       <scope>provided</scope>      
-    </dependency>   
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>${hibernate.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>${hibernate.validator.version}</version>
       <scope>provided</scope>
-    <exclusions>
+      <exclusions>
         <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+          <artifactId>jboss-logging</artifactId>
+          <groupId>org.jboss.logging</groupId>
         </exclusion>
-    </exclusions>      
+      </exclusions>
     </dependency>    
  
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-      <scope>compile</scope>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>2.2.3</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-codegen</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-jpa</artifactId>
       <version>${project.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-jpa</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -89,7 +89,7 @@
     </dependency>   
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -99,28 +99,46 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
-    </dependency>              
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>    
         
   </dependencies>
 
   <build>
-    <plugins>     
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.jpa.codegen</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>org.eclipse.transformer.maven</artifactId>
+        <version>0.2.0</version>
+        <executions>
+          <execution>
+            <id>jakarta-ee</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <classifier>jakarta</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>           
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/Constants.java b/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/Constants.java
deleted file mode 100644
index 1bb386ede2..0000000000
--- a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/Constants.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.codegen;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Constants defines keywords used in Hibernate
- * 
- * @author tiwe
- *
- */
-public final class Constants {
-    
-    public static final List<String> keywords = ImmutableList.of(
-            "ABS","ALL","AND","ANY","AS","ASC","AVG","BETWEEN",
-            "BIT_LENGTH[51]","BOTH","BY","CASE","CHAR_LENGTH",
-            "CHARACTER_LENGTH","CLASS",
-            "COALESCE","CONCAT","COUNT","CURRENT_DATE","CURRENT_TIME",
-            "CURRENT_TIMESTAMP",
-            "DELETE","DESC","DISTINCT","ELSE","EMPTY","END","ENTRY",
-            "ESCAPE","EXISTS","FALSE","FETCH",
-            "FROM","GROUP","HAVING","IN","INDEX","INNER","IS","JOIN",
-            "KEY","LEADING","LEFT","LENGTH","LIKE",
-            "LOCATE","LOWER","MAX","MEMBER","MIN","MOD","NEW","NOT",
-            "NULL","NULLIF","OBJECT","OF","OR",
-            "ORDER","OUTER","POSITION","SELECT","SET","SIZE","SOME",
-            "SQRT","SUBSTRING","SUM","THEN",
-            "TRAILING","TRIM","TRUE","TYPE","UNKNOWN","UPDATE","UPPER",
-            "VALUE","WHEN","WHERE");
-
-    private Constants() {}
-
-}
diff --git a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/HibernateDomainExporter.java b/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/HibernateDomainExporter.java
deleted file mode 100644
index 7bcd8045e3..0000000000
--- a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/HibernateDomainExporter.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.codegen;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.AnnotatedElement;
-import java.nio.charset.Charset;
-import java.util.Iterator;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.hibernate.MappingException;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.mapping.Component;
-import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.ManyToOne;
-import org.hibernate.mapping.MappedSuperclass;
-import org.hibernate.mapping.OneToMany;
-import org.hibernate.mapping.PersistentClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-
-/**
- * HibernateDomainExporter exports Hibernate XML configuration files to Querydsl expression types
- *
- * @author tiwe
- *
- */
-public class HibernateDomainExporter extends AbstractDomainExporter{
-
-    private static final Logger logger = LoggerFactory.getLogger(HibernateDomainExporter.class);
-
-    private final Configuration configuration;
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param targetFolder
-     * @param configuration
-     */
-    public HibernateDomainExporter(File targetFolder, Configuration configuration) {
-        this("Q", "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param configuration
-     */
-    public HibernateDomainExporter(String namePrefix, File targetFolder, Configuration configuration) {
-        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param configuration
-     * @param charset
-     */
-    public HibernateDomainExporter(String namePrefix, File targetFolder, Configuration configuration,
-            Charset charset) {
-        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration, charset);
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param nameSuffix
-     * @param targetFolder
-     * @param configuration
-     */
-    public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder,
-            Configuration configuration) {
-        this(namePrefix, nameSuffix, targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     */
-    public HibernateDomainExporter(String namePrefix, File targetFolder,
-            SerializerConfig serializerConfig, Configuration configuration) {
-        this(namePrefix, "", targetFolder, serializerConfig, configuration, Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     * @param charset
-     */
-    public HibernateDomainExporter(String namePrefix, File targetFolder,
-            SerializerConfig serializerConfig, Configuration configuration, Charset charset) {
-        this(namePrefix, "", targetFolder, serializerConfig, configuration, charset);
-    }
-
-    /**
-     * Create a new HibernateDomainExporter instance
-     *
-     * @param namePrefix
-     * @param nameSuffix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     * @param charset
-     */
-    public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder,
-            SerializerConfig serializerConfig, Configuration configuration, Charset charset) {
-        super(namePrefix, nameSuffix, targetFolder, serializerConfig, charset);
-        configuration.buildMappings();
-        this.configuration = configuration;
-    }
-
-    @Override
-    protected void collectTypes() throws IOException, XMLStreamException, ClassNotFoundException,
-        NoSuchMethodException {
-        // super classes
-        Iterator<?> superClassMappings = configuration.getMappedSuperclassMappings();
-        while (superClassMappings.hasNext()) {
-            MappedSuperclass msc = (MappedSuperclass)superClassMappings.next();
-            EntityType entityType = createSuperType(msc.getMappedClass());
-            if (msc.getDeclaredIdentifierProperty() != null) {
-                handleProperty(entityType, msc.getMappedClass(), msc.getDeclaredIdentifierProperty());
-            }
-            Iterator<?> properties = msc.getDeclaredPropertyIterator();
-            while (properties.hasNext()) {
-                handleProperty(entityType, msc.getMappedClass(), (org.hibernate.mapping.Property) properties.next());
-            }
-        }
-
-        // entity classes
-        Iterator<?> classMappings = configuration.getClassMappings();
-        while (classMappings.hasNext()) {
-            PersistentClass pc = (PersistentClass)classMappings.next();
-            EntityType entityType = createEntityType(pc.getMappedClass());
-            if (pc.getDeclaredIdentifierProperty() != null) {
-                handleProperty(entityType, pc.getMappedClass(), pc.getDeclaredIdentifierProperty());
-            } else if (!pc.isInherited() && pc.hasIdentifierProperty()) {
-                logger.info(entityType.toString() + pc.getIdentifierProperty());
-                handleProperty(entityType, pc.getMappedClass(), pc.getIdentifierProperty());
-            } else if (pc.getIdentifier() != null) {
-                KeyValue identifier = pc.getIdentifier();
-                if (identifier instanceof Component) {
-                    Component component = (Component)identifier;
-                    Iterator<?> properties = component.getPropertyIterator();
-                    if (component.isEmbedded()) {
-                        while (properties.hasNext()) {
-                            handleProperty(entityType, pc.getMappedClass(), (org.hibernate.mapping.Property) properties.next());
-                        }
-                    } else {
-                        String name = component.getNodeName();
-                        Class<?> clazz = component.getType().getReturnedClass();
-                        Type propertyType = getType(pc.getMappedClass(), clazz, name);
-                        AnnotatedElement annotated = getAnnotatedElement(pc.getMappedClass(), name);
-                        Property property = createProperty(entityType, name, propertyType, annotated);
-                        entityType.addProperty(property);
-                        // handle component properties
-                        EntityType embeddedType = createEmbeddableType(propertyType);
-                        while (properties.hasNext()) {
-                            handleProperty(embeddedType, clazz, (org.hibernate.mapping.Property) properties.next());
-                        }
-                    }
-                }
-                // TODO handle other KeyValue subclasses such as Any, DependentValue and ToOne
-            }
-            Iterator<?> properties = pc.getDeclaredPropertyIterator();
-            while (properties.hasNext()) {
-                handleProperty(entityType, pc.getMappedClass(), (org.hibernate.mapping.Property) properties.next());
-            }
-        }
-    }
-
-    private void handleProperty(EntityType entityType, Class<?> cl, org.hibernate.mapping.Property p)
-            throws NoSuchMethodException, ClassNotFoundException {
-        if (p.isBackRef()) {
-            return;
-        }
-        Class<?> clazz = Object.class;
-        try {
-            clazz = p.getType().getReturnedClass();
-        } catch (MappingException e) {
-            // ignore
-        }
-        Type propertyType = getType(cl, clazz, p.getName());
-        try {
-            propertyType = getPropertyType(p, propertyType);
-        } catch (MappingException e) {
-            // ignore
-        }
-
-        AnnotatedElement annotated = getAnnotatedElement(cl, p.getName());
-        propertyType = getTypeOverride(propertyType, annotated);
-        if (propertyType == null) {
-            return;
-        }
-
-        if (p.isComposite()) {
-            EntityType embeddedType = createEmbeddableType(propertyType);
-            Iterator<?> properties = ((Component)p.getValue()).getPropertyIterator();
-            while (properties.hasNext()) {
-                handleProperty(embeddedType, embeddedType.getJavaClass(), (org.hibernate.mapping.Property)properties.next());
-            }
-            propertyType = embeddedType;
-        } else if (propertyType.getCategory() == TypeCategory.ENTITY || p.getValue() instanceof ManyToOne) {
-            propertyType = createEntityType(propertyType);
-        } else if (propertyType.getCategory() == TypeCategory.CUSTOM) {
-            propertyType = createEmbeddableType(propertyType);
-        } else if (p.getValue() instanceof org.hibernate.mapping.Collection) {
-            org.hibernate.mapping.Collection collection = (org.hibernate.mapping.Collection)p.getValue();
-            if (collection.getElement() instanceof OneToMany) {
-                String entityName = ((OneToMany)collection.getElement()).getReferencedEntityName();
-                if (entityName != null) {
-                    if (collection.isMap()) {
-                        Type keyType = typeFactory.get(Class.forName(propertyType.getParameters().get(0).getFullName()));
-                        Type valueType = typeFactory.get(Class.forName(entityName));
-                        propertyType = new SimpleType(propertyType, keyType, valueType);
-                    } else {
-                        Type componentType = typeFactory.get(Class.forName(entityName));
-                        propertyType = new SimpleType(propertyType, componentType);
-                    }
-                }
-            } else if (collection.getElement() instanceof Component) {
-                Component component = (Component)collection.getElement();
-                Class<?> embeddedClass = Class.forName(component.getComponentClassName());
-                EntityType embeddedType = createEmbeddableType(embeddedClass);
-                Iterator<?> properties = component.getPropertyIterator();
-                while (properties.hasNext()) {
-                    handleProperty(embeddedType, embeddedClass, (org.hibernate.mapping.Property)properties.next());
-                }
-            }
-        }
-
-        Property property = createProperty(entityType, p.getName(), propertyType, annotated);
-        entityType.addProperty(property);
-    }
-
-    private Type getPropertyType(org.hibernate.mapping.Property p, Type propertyType) {
-        switch (propertyType.getCategory()) {
-        case DATE:
-        case TIME:
-        case DATETIME:
-            String type = p.getType().getName();
-            if ("time".equals(type)) {
-                propertyType = propertyType.as(TypeCategory.TIME);
-            } else if ("date".equals(type)) {
-                propertyType = propertyType.as(TypeCategory.DATE);
-            } else if ("timestamp".equals(type)) {
-                propertyType = propertyType.as(TypeCategory.DATETIME);
-            }
-        default:
-        }
-        return propertyType;
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/JPADomainExporter.java b/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/JPADomainExporter.java
deleted file mode 100644
index bd7c53e345..0000000000
--- a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/JPADomainExporter.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.codegen;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.AnnotatedElement;
-import java.nio.charset.Charset;
-import java.util.Map;
-
-import javax.persistence.Temporal;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.MappedSuperclassType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.xml.stream.XMLStreamException;
-
-import org.hibernate.MappingException;
-
-import com.google.common.collect.Maps;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-
-/**
- * JPADomainExporter exports JPA 2 metamodels to Querydsl expression types
- *
- * @author tiwe
- *
- */
-public class JPADomainExporter extends AbstractDomainExporter {
-
-    private final Metamodel configuration;
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param targetFolder
-     * @param configuration
-     */
-    public JPADomainExporter(File targetFolder, Metamodel configuration) {
-        this("Q", "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param configuration
-     */
-    public JPADomainExporter(String namePrefix, File targetFolder, Metamodel configuration) {
-        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param configuration
-     * @param charset
-     */
-    public JPADomainExporter(String namePrefix, File targetFolder, Metamodel configuration,
-            Charset charset) {
-        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration, charset);
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param nameSuffix
-     * @param targetFolder
-     * @param configuration
-     */
-    public JPADomainExporter(String namePrefix, String nameSuffix, File targetFolder,
-            Metamodel configuration) {
-        this(namePrefix, nameSuffix, targetFolder, SimpleSerializerConfig.DEFAULT, configuration,
-                Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     */
-    public JPADomainExporter(String namePrefix, File targetFolder,
-            SerializerConfig serializerConfig, Metamodel configuration) {
-        this(namePrefix, "", targetFolder, serializerConfig, configuration, Charset.defaultCharset());
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     * @param charset
-     */
-    public JPADomainExporter(String namePrefix, File targetFolder,
-            SerializerConfig serializerConfig, Metamodel configuration, Charset charset) {
-        this(namePrefix, "", targetFolder, serializerConfig, configuration, charset);
-    }
-
-    /**
-     * Create a new JPADomainExporter instance
-     *
-     * @param namePrefix
-     * @param nameSuffix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param configuration
-     * @param charset
-     */
-    public JPADomainExporter(String namePrefix, String nameSuffix, File targetFolder,
-            SerializerConfig serializerConfig, Metamodel configuration, Charset charset) {
-        super(namePrefix, nameSuffix, targetFolder, serializerConfig, charset);
-        this.configuration = configuration;
-    }
-
-    @Override
-    protected void collectTypes() throws IOException, XMLStreamException, ClassNotFoundException,
-        NoSuchMethodException {
-
-        Map<ManagedType<?>, EntityType> types = Maps.newHashMap();
-        for (ManagedType<?> managedType : configuration.getManagedTypes()) {
-            if (managedType instanceof MappedSuperclassType) {
-                types.put(managedType, createSuperType(managedType.getJavaType()));
-            } else if (managedType instanceof javax.persistence.metamodel.EntityType) {
-                types.put(managedType, createEntityType(managedType.getJavaType()));
-            } else if (managedType instanceof EmbeddableType) {
-                types.put(managedType, createEmbeddableType(managedType.getJavaType()));
-            } else {
-                throw new IllegalArgumentException("Unknown type " + managedType);
-            }
-        }
-
-        // handle properties
-        for (Map.Entry<ManagedType<?>, EntityType> entry : types.entrySet()) {
-            EntityType entityType = entry.getValue();
-            for (Attribute<?,?> attribute : entry.getKey().getDeclaredAttributes()) {
-                handleProperty(entityType, entityType.getJavaClass(), attribute);
-            }
-        }
-
-    }
-
-    private void handleProperty(EntityType entityType, Class<?> cl, Attribute<?,?> p)
-            throws NoSuchMethodException, ClassNotFoundException {
-        Class<?> clazz = Object.class;
-        try {
-            clazz = p.getJavaType();
-        } catch (MappingException e) {
-            // ignore
-        }
-        Type propertyType = getType(cl, clazz, p.getName());
-
-        AnnotatedElement annotated = getAnnotatedElement(cl, p.getName());
-        propertyType = getTypeOverride(propertyType, annotated);
-        if (propertyType == null) {
-            return;
-        }
-
-        if (p.isCollection()) {
-            if (p instanceof MapAttribute) {
-                MapAttribute<?,?,?> map = (MapAttribute<?,?,?>)p;
-                Type keyType = typeFactory.get(map.getKeyJavaType());
-                Type valueType = typeFactory.get(map.getElementType().getJavaType());
-                valueType = getPropertyType(p, valueType);
-                propertyType = new SimpleType(propertyType, keyType, valueType);
-            } else {
-                Type valueType = typeFactory.get(((PluralAttribute<?,?,?>)p).getElementType().getJavaType());
-                valueType = getPropertyType(p, valueType);
-                propertyType = new SimpleType(propertyType, valueType);
-            }
-        } else {
-            propertyType = getPropertyType(p, propertyType);
-        }
-
-        Property property = createProperty(entityType, p.getName(), propertyType, annotated);
-        entityType.addProperty(property);
-    }
-
-    private Type getPropertyType(Attribute<?, ?> p, Type propertyType) {
-        Temporal temporal = ((AnnotatedElement)p.getJavaMember()).getAnnotation(Temporal.class);
-        if (temporal != null) {
-            switch (temporal.value()) {
-            case DATE: propertyType = propertyType.as(TypeCategory.DATE); break;
-            case TIME: propertyType = propertyType.as(TypeCategory.TIME); break;
-            case TIMESTAMP: propertyType = propertyType.as(TypeCategory.DATETIME); break;
-            }
-        }
-        return propertyType;
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/AbstractDomainExporter.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/AbstractDomainExporter.java
similarity index 77%
rename from querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/AbstractDomainExporter.java
rename to querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/AbstractDomainExporter.java
index fa37b4121a..7f9cfb7cb1 100644
--- a/querydsl-jpa-codegen/src/main/java/com/mysema/query/jpa/codegen/AbstractDomainExporter.java
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/AbstractDomainExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,83 +11,71 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.codegen;
+package com.querydsl.jpa.codegen;
+
+import com.querydsl.codegen.*;
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.annotations.Config;
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryInit;
+import com.querydsl.core.annotations.QueryType;
+import com.querydsl.core.util.Annotations;
+import com.querydsl.core.util.ReflectionUtils;
+import org.jetbrains.annotations.Nullable;
 
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.QueryException;
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryInit;
-import com.mysema.query.annotations.QueryType;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.codegen.EmbeddableSerializer;
-import com.mysema.query.codegen.EntitySerializer;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.Supertype;
-import com.mysema.query.codegen.SupertypeSerializer;
-import com.mysema.query.codegen.TypeFactory;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.util.Annotations;
-import com.mysema.util.ReflectionUtils;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
- * AbstractDomainExporter is a common supertype for DomainExporters
+ * {@code AbstractDomainExporter} is a common supertype for domain exporters
  *
  * @author tiwe
  *
  */
 public abstract class AbstractDomainExporter {
 
-    private static final Logger logger = LoggerFactory.getLogger(HibernateDomainExporter.class);
+    private static final Logger logger = Logger.getLogger(AbstractDomainExporter.class.getName());
 
     private final File targetFolder;
 
-    private final Map<Class<?>, EntityType> allTypes = Maps.newHashMap();
+    private final Map<Class<?>, EntityType> allTypes = new HashMap<>();
 
-    private final Map<Class<?>, EntityType> entityTypes = Maps.newHashMap();
+    private final Map<Class<?>, EntityType> entityTypes = new HashMap<>();
 
-    private final Map<Class<?>, EntityType> embeddableTypes = Maps.newHashMap();
+    private final Map<Class<?>, EntityType> embeddableTypes = new HashMap<>();
 
-    private final Map<Class<?>, EntityType> superTypes = Maps.newHashMap();
+    private final Map<Class<?>, EntityType> superTypes = new HashMap<>();
+
+    private final Map<Class<?>, SerializerConfig> typeToConfig = new HashMap<>();
 
     private final Set<EntityType> serialized = new HashSet<EntityType>();
 
     @SuppressWarnings("unchecked")
-    protected final TypeFactory typeFactory = new TypeFactory(Arrays.<Class<? extends Annotation>>asList(Entity.class,
+    protected final TypeFactory typeFactory = new TypeFactory(Arrays.asList(Entity.class,
             javax.persistence.MappedSuperclass.class, Embeddable.class));
 
     private final QueryTypeFactory queryTypeFactory;
@@ -106,13 +94,9 @@ public abstract class AbstractDomainExporter {
 
     private final Set<File> generatedFiles = new HashSet<File>();
 
-    /**
-     * @param namePrefix
-     * @param nameSuffix
-     * @param targetFolder
-     * @param serializerConfig
-     * @param charset
-     */
+    private Function<EntityType, String> variableNameFunction;
+
+    @SuppressWarnings("unchecked")
     public AbstractDomainExporter(String namePrefix, String nameSuffix, File targetFolder,
             SerializerConfig serializerConfig, Charset charset) {
         this.targetFolder = targetFolder;
@@ -122,11 +106,13 @@ public AbstractDomainExporter(String namePrefix, String nameSuffix, File targetF
         module.bind(CodegenModule.PREFIX, namePrefix);
         module.bind(CodegenModule.SUFFIX, nameSuffix);
         module.bind(CodegenModule.KEYWORDS, Constants.keywords);
+        module.loadExtensions();
         this.queryTypeFactory = module.get(QueryTypeFactory.class);
         this.typeMappings = module.get(TypeMappings.class);
         this.embeddableSerializer = module.get(EmbeddableSerializer.class);
         this.entitySerializer = module.get(EntitySerializer.class);
         this.supertypeSerializer = module.get(SupertypeSerializer.class);
+        this.variableNameFunction = module.get(Function.class, CodegenModule.VARIABLE_NAME_FUNCTION_CLASS);
     }
 
     /**
@@ -143,7 +129,7 @@ public void execute() throws IOException {
         }
 
         // go through supertypes
-        Set<Supertype> additions = Sets.newHashSet();
+        Set<Supertype> additions = new HashSet<>();
         for (Map.Entry<Class<?>, EntityType> entry : allTypes.entrySet()) {
             EntityType entityType = entry.getValue();
             if (entityType.getSuperType() != null && !allTypes.containsKey(entityType.getSuperType().getType().getJavaClass())) {
@@ -206,6 +192,7 @@ private EntityType createEntityType(Class<?> cl,  Map<Class<?>, EntityType> type
             return allTypes.get(cl);
         } else {
             EntityType type = typeFactory.getEntityType(cl);
+            registerConfig(type);
             typeMappings.register(type, queryTypeFactory.create(type));
             if (!cl.getSuperclass().equals(Object.class)) {
                 type.addSupertype(new Supertype(typeFactory.get(cl.getSuperclass(), cl.getGenericSuperclass())));
@@ -225,7 +212,8 @@ protected EntityType createEntityType(Type type,  Map<Class<?>, EntityType> type
         if (allTypes.containsKey(key)) {
             return allTypes.get(key);
         } else {
-            EntityType entityType = new EntityType(type);
+            EntityType entityType = new EntityType(type, variableNameFunction);
+            registerConfig(entityType);
             typeMappings.register(entityType, queryTypeFactory.create(entityType));
             Class<?> superClass = key.getSuperclass();
             if (entityType.getSuperType() == null && superClass != null && !superClass.equals(Object.class)) {
@@ -237,6 +225,17 @@ protected EntityType createEntityType(Type type,  Map<Class<?>, EntityType> type
         }
     }
 
+    private void registerConfig(EntityType entityType) {
+        Class<?> key = entityType.getJavaClass();
+        Config config = key.getAnnotation(Config.class);
+        if (config == null && key.getPackage() != null) {
+            config = key.getPackage().getAnnotation(Config.class);
+        }
+        if (config != null) {
+            typeToConfig.put(key, SimpleSerializerConfig.getConfig(config));
+        }
+    }
+
     @Nullable
     protected Type getTypeOverride(Type propertyType, AnnotatedElement annotated) {
         if (annotated.isAnnotationPresent(QueryType.class)) {
@@ -252,9 +251,9 @@ protected Type getTypeOverride(Type propertyType, AnnotatedElement annotated) {
 
     protected Property createProperty(EntityType entityType, String propertyName, Type propertyType,
             AnnotatedElement annotated) {
-        List<String> inits = Collections.<String>emptyList();
+        List<String> inits = Collections.emptyList();
         if (annotated.isAnnotationPresent(QueryInit.class)) {
-            inits = ImmutableList.copyOf(annotated.getAnnotation(QueryInit.class).value());
+            inits = Collections.unmodifiableList(Arrays.asList(annotated.getAnnotation(QueryInit.class).value()));
         }
         return new Property(entityType, propertyName, propertyType, inits);
     }
@@ -319,18 +318,19 @@ private void serialize(Map<Class<?>, EntityType> types, Serializer serializer) t
     private void write(Serializer serializer, String path, EntityType type) throws IOException {
         File targetFile = new File(targetFolder, path);
         generatedFiles.add(targetFile);
-        Writer w = writerFor(targetFile);
-        try{
+        try (Writer w = writerFor(targetFile)) {
             CodeWriter writer = new JavaWriter(w);
-            serializer.serialize(type, serializerConfig, writer);
-        }finally{
-            w.close();
+            if (typeToConfig.containsKey(type.getJavaClass())) {
+                serializer.serialize(type, typeToConfig.get(type.getJavaClass()), writer);
+            } else {
+                serializer.serialize(type, serializerConfig, writer);
+            }
         }
     }
 
     private Writer writerFor(File file) {
         if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
-            logger.error("Folder " + file.getParent() + " could not be created");
+            logger.log(Level.WARNING, "Folder " + file.getParent() + " could not be created");
         }
         try {
             return new OutputStreamWriter(new FileOutputStream(file), charset);
@@ -339,6 +339,14 @@ private Writer writerFor(File file) {
         }
     }
 
+    protected Type normalize(Type first, Type second) {
+        if (first.getFullName().equals(second.getFullName())) {
+            return first;
+        } else {
+            return second;
+        }
+    }
+
     public void setUnknownAsEntity(boolean unknownAsEntity) {
         typeFactory.setUnknownAsEntity(unknownAsEntity);
     }
diff --git a/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/Constants.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/Constants.java
new file mode 100644
index 0000000000..246c641369
--- /dev/null
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/Constants.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.codegen;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Constants defines keywords used in Hibernate
+ *
+ * @author tiwe
+ *
+ */
+final class Constants {
+
+    public static final List<String> keywords = Collections.unmodifiableList(Arrays.asList(
+            "ABS", "ALL", "AND", "ANY", "AS", "ASC", "AVG", "BETWEEN",
+            "BIT_LENGTH[51]", "BOTH", "BY", "CASE", "CHAR_LENGTH",
+            "CHARACTER_LENGTH", "CLASS",
+            "COALESCE", "CONCAT", "COUNT", "CURRENT_DATE", "CURRENT_TIME",
+            "CURRENT_TIMESTAMP",
+            "DELETE", "DESC", "DISTINCT", "ELSE", "EMPTY", "END", "ENTRY",
+            "ESCAPE", "EXISTS", "FALSE", "FETCH",
+            "FROM", "GROUP", "HAVING", "IN", "INDEX", "INNER", "IS", "JOIN",
+            "KEY", "LEADING", "LEFT", "LENGTH", "LIKE",
+            "LOCATE", "LOWER", "MAX", "MEMBER", "MIN", "MOD", "NEW", "NOT",
+            "NULL", "NULLIF", "OBJECT", "OF", "OR",
+            "ORDER", "OUTER", "POSITION", "SELECT", "SET", "SIZE", "SOME",
+            "SQRT", "SUBSTRING", "SUM", "THEN",
+            "TRAILING", "TRIM", "TRUE", "TYPE", "UNKNOWN", "UPDATE", "UPPER",
+            "VALUE", "WHEN", "WHERE"));
+
+    private Constants() { }
+
+}
diff --git a/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/JPADomainExporter.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/JPADomainExporter.java
new file mode 100644
index 0000000000..e6c8bc14cd
--- /dev/null
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/JPADomainExporter.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.codegen;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.AnnotatedElement;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Temporal;
+import javax.persistence.metamodel.*;
+import javax.xml.stream.XMLStreamException;
+
+import org.hibernate.MappingException;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.SerializerConfig;
+import com.querydsl.codegen.SimpleSerializerConfig;
+
+/**
+ * {@code JPADomainExporter} exports JPA 2 metamodels to Querydsl expression types
+ *
+ * @author tiwe
+ *
+ */
+public class JPADomainExporter extends AbstractDomainExporter {
+
+    private final Metamodel metamodel;
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param targetFolder target folder
+     * @param metamodel metamodel
+     */
+    public JPADomainExporter(File targetFolder, Metamodel metamodel) {
+        this("Q", "", targetFolder, SimpleSerializerConfig.DEFAULT, metamodel,
+                Charset.defaultCharset());
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param targetFolder target folder
+     * @param metamodel metamodel
+     */
+    public JPADomainExporter(String namePrefix, File targetFolder, Metamodel metamodel) {
+        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, metamodel,
+                Charset.defaultCharset());
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param targetFolder target folder
+     * @param metamodel metamodel
+     * @param charset charset (default: system charset)
+     */
+    public JPADomainExporter(String namePrefix, File targetFolder, Metamodel metamodel,
+            Charset charset) {
+        this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, metamodel, charset);
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param nameSuffix name suffix
+     * @param targetFolder target folder
+     * @param metamodel metamodel
+     */
+    public JPADomainExporter(String namePrefix, String nameSuffix, File targetFolder,
+            Metamodel metamodel) {
+        this(namePrefix, nameSuffix, targetFolder, SimpleSerializerConfig.DEFAULT, metamodel,
+                Charset.defaultCharset());
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param targetFolder target folder
+     * @param serializerConfig serializer config
+     * @param metamodel metamodel
+     */
+    public JPADomainExporter(String namePrefix, File targetFolder,
+            SerializerConfig serializerConfig, Metamodel metamodel) {
+        this(namePrefix, "", targetFolder, serializerConfig, metamodel, Charset.defaultCharset());
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param targetFolder target folder
+     * @param serializerConfig serializer config
+     * @param metamodel metamodel
+     * @param charset charset (default: system charset)
+     */
+    public JPADomainExporter(String namePrefix, File targetFolder,
+            SerializerConfig serializerConfig, Metamodel metamodel, Charset charset) {
+        this(namePrefix, "", targetFolder, serializerConfig, metamodel, charset);
+    }
+
+    /**
+     * Create a new JPADomainExporter instance
+     *
+     * @param namePrefix name prefix (default: Q)
+     * @param nameSuffix name suffix (default: empty)
+     * @param targetFolder target folder
+     * @param serializerConfig serializer config
+     * @param metamodel metamodel
+     * @param charset charset (default: system charset)
+     */
+    public JPADomainExporter(String namePrefix, String nameSuffix, File targetFolder,
+            SerializerConfig serializerConfig, Metamodel metamodel, Charset charset) {
+        super(namePrefix, nameSuffix, targetFolder, serializerConfig, charset);
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    protected void collectTypes() throws IOException, XMLStreamException, ClassNotFoundException,
+        NoSuchMethodException {
+
+        Map<ManagedType<?>, EntityType> types = new HashMap<>();
+        for (ManagedType<?> managedType : metamodel.getManagedTypes()) {
+            if (managedType instanceof MappedSuperclassType) {
+                types.put(managedType, createSuperType(managedType.getJavaType()));
+            } else if (managedType instanceof javax.persistence.metamodel.EntityType) {
+                types.put(managedType, createEntityType(managedType.getJavaType()));
+            } else if (managedType instanceof EmbeddableType) {
+                types.put(managedType, createEmbeddableType(managedType.getJavaType()));
+            } else {
+                throw new IllegalArgumentException("Unknown type " + managedType);
+            }
+        }
+
+        // handle properties
+        for (Map.Entry<ManagedType<?>, EntityType> entry : types.entrySet()) {
+            EntityType entityType = entry.getValue();
+            for (Attribute<?,?> attribute : entry.getKey().getDeclaredAttributes()) {
+                handleProperty(entityType, entityType.getJavaClass(), attribute);
+            }
+        }
+
+    }
+
+    private void handleProperty(EntityType entityType, Class<?> cl, Attribute<?,?> p)
+            throws NoSuchMethodException, ClassNotFoundException {
+        Class<?> clazz = Object.class;
+        try {
+            clazz = p.getJavaType();
+        } catch (MappingException e) {
+            // ignore
+        }
+        Type propertyType = getType(cl, clazz, p.getName());
+
+        AnnotatedElement annotated = getAnnotatedElement(cl, p.getName());
+        propertyType = getTypeOverride(propertyType, annotated);
+        if (propertyType == null) {
+            return;
+        }
+
+        if (p.isCollection()) {
+            if (p instanceof MapAttribute) {
+                MapAttribute<?,?,?> map = (MapAttribute<?,?,?>) p;
+                Type keyType = typeFactory.get(map.getKeyJavaType());
+                Type valueType = typeFactory.get(map.getElementType().getJavaType());
+                valueType = getPropertyType(p, valueType);
+                propertyType = new SimpleType(propertyType,
+                        normalize(propertyType.getParameters().get(0), keyType),
+                        normalize(propertyType.getParameters().get(1), valueType));
+            } else {
+                Type valueType = typeFactory.get(((PluralAttribute<?,?,?>) p).getElementType().getJavaType());
+                valueType = getPropertyType(p, valueType);
+                propertyType = new SimpleType(propertyType,
+                        normalize(propertyType.getParameters().get(0), valueType));
+            }
+        } else {
+            propertyType = getPropertyType(p, propertyType);
+        }
+
+        Property property = createProperty(entityType, p.getName(), propertyType, annotated);
+        entityType.addProperty(property);
+    }
+
+    private Type getPropertyType(Attribute<?, ?> p, Type propertyType) {
+        Temporal temporal = ((AnnotatedElement) p.getJavaMember()).getAnnotation(Temporal.class);
+        if (temporal != null) {
+            switch (temporal.value()) {
+            case DATE: propertyType = propertyType.as(TypeCategory.DATE); break;
+            case TIME: propertyType = propertyType.as(TypeCategory.TIME); break;
+            case TIMESTAMP: propertyType = propertyType.as(TypeCategory.DATETIME); break;
+            }
+        }
+        return propertyType;
+    }
+
+}
diff --git a/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporter.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporter.java
new file mode 100644
index 0000000000..4c8f95a597
--- /dev/null
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporter.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.codegen.ant;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.metamodel.Metamodel;
+
+import com.querydsl.jpa.codegen.JPADomainExporter;
+
+/**
+ * {@code AntJPADomainExporter} exports JPA 2 metamodels to Querydsl expression types
+ *
+ * @author 200003548
+ */
+public class AntJPADomainExporter {
+
+    /**
+     * Additional property to use when creating the JPA entity manager factory
+     */
+    public static class Property {
+        private String name;
+        private String value;
+        public String getName() {
+            return name;
+        }
+        public void setName(String name) {
+            this.name = name;
+        }
+        public String getValue() {
+            return value;
+        }
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
+
+    /**
+     * Set of additional properties to use when creating the JPA entity manager factory
+     */
+    public static class Configuration {
+        private Map<String, String> properties = new HashMap<String, String>();
+        public Map<String, String> getProperties() {
+            return properties;
+        }
+        public void addConfiguredProperty(Property property) {
+            properties.put(property.getName(), property.getValue());
+        }
+    }
+
+    /**
+     * Set of additional properties to use when creating the JPA entity manager factory
+     * (no default - not required)
+     */
+    private Configuration configuration;
+
+    /**
+     * Name prefix for generated query types (default: "Q")
+     */
+    private String namePrefix = "Q";
+
+    /**
+     * Name suffix for generated query types (default: "")
+     */
+    private String nameSuffix = "";
+
+    /**
+     * Target folder in which to generate query types (no default - required)
+     */
+    private String targetFolder;
+
+    /**
+     * Name of persistence unit from which to generate query types (no default - required)
+     */
+    private String persistenceUnitName;
+
+    private Set<File> generatedFiles = Collections.emptySet();
+
+    public Configuration getConfiguration() {
+        return configuration;
+    }
+
+    public void addConfiguration(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    public String getNamePrefix() {
+        return namePrefix;
+    }
+
+    public void setNamePrefix(String namePrefix) {
+        this.namePrefix = namePrefix;
+    }
+
+    public String getNameSuffix() {
+        return nameSuffix;
+    }
+
+    public void setNameSuffix(String nameSuffix) {
+        this.nameSuffix = nameSuffix;
+    }
+
+    public String getTargetFolder() {
+        return targetFolder;
+    }
+
+    public void setTargetFolder(String targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    public String getPersistenceUnitName() {
+        return persistenceUnitName;
+    }
+
+    public void setPersistenceUnitName(String persistenceUnitName) {
+        this.persistenceUnitName = persistenceUnitName;
+    }
+
+    public Set<File> getGeneratedFiles() {
+        return generatedFiles;
+    }
+
+    /**
+     * Exports the named persistence unit's metamodel to Querydsl query types.  Expects to be
+     * called by Ant via name convention using a method with signature public void execute().
+     */
+    public void execute() {
+        // We can assume we have the named persistence unit and its mapping file in our classpath,
+        // but we may have to allow some properties in that persistence unit to be overridden before
+        // we can successfully get that persistence unit's metamodel.
+        Map<String, String> properties = (configuration != null) ? configuration.getProperties() : null;
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
+
+        // Now we can get the persistence unit's metamodel and export it to Querydsl query types.
+        Metamodel configuration = emf.getMetamodel();
+        JPADomainExporter exporter = new JPADomainExporter(namePrefix, nameSuffix, new File(targetFolder), configuration);
+        try {
+            exporter.execute();
+            generatedFiles = exporter.getGeneratedFiles();
+        } catch (IOException e) {
+            throw new RuntimeException("Error in JPADomainExporter", e);
+        }
+    }
+
+}
diff --git a/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/package-info.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/package-info.java
new file mode 100644
index 0000000000..0e20b664d2
--- /dev/null
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/ant/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * ANT integration for JPA code generation
+ */
+package com.querydsl.jpa.codegen.ant;
diff --git a/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/package-info.java b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/package-info.java
new file mode 100644
index 0000000000..fedf81fd27
--- /dev/null
+++ b/querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JPA and Hibernate model based code generation
+ */
+package com.querydsl.jpa.codegen;
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/GenericExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/GenericExporterTest.java
deleted file mode 100644
index 5d03a6889e..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/GenericExporterTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.jpa;
-
-import java.io.File;
-
-import org.junit.Test;
-
-import com.mysema.query.codegen.GenericExporter;
-
-public class GenericExporterTest {
-
-    @Test
-    public void test() {
-        GenericExporter exporter = new GenericExporter();
-        exporter.setTargetFolder(new File("target/" + GenericExporterTest.class.getSimpleName()));
-        exporter.export(getClass().getPackage());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/HibernateDomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/HibernateDomainExporterTest.java
deleted file mode 100644
index f080b29152..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/HibernateDomainExporterTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.codegen;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.annotations.Config;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-import com.mysema.query.jpa.domain.Domain;
-import com.mysema.query.jpa.domain2.Domain2;
-import com.mysema.util.FileUtils;
-
-public class HibernateDomainExporterTest {
-
-    private final SerializerConfig serializerConfig = SimpleSerializerConfig.getConfig(Domain.class
-            .getPackage().getAnnotation(Config.class));
-
-    @Test
-    public void Execute_MyEntity() throws IOException {
-        FileUtils.delete(new File("target/gen6"));
-        File myEntity = new File("src/test/resources/entity.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(myEntity);
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen6"), config);
-        exporter.execute();
-
-        File targetFile = new File("target/gen6/com/mysema/query/jpa/codegen/QMyEntity.java");
-        assertContains(targetFile, "StringPath pk1", "StringPath pk2", "StringPath prop1");
-    }
-
-    @Test
-    public void Execute_Contact() throws IOException {
-        FileUtils.delete(new File("target/gen1"));
-        File contact = new File("src/test/resources/contact.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen1"), config);
-        exporter.execute();
-
-        File targetFile = new File("target/gen1/com/mysema/query/jpa/domain2/QContact.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Contact_with_Suffix() throws IOException {
-        FileUtils.delete(new File("target/gen1"));
-        File contact = new File("src/test/resources/contact.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        HibernateDomainExporter exporter = new HibernateDomainExporter("", "Type", new File(
-                "target/gen1"), config);
-        exporter.execute();
-
-        File targetFile = new File("target/gen1/com/mysema/query/jpa/domain2/ContactType.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Contact2() throws IOException {
-        FileUtils.delete(new File("target/gen2"));
-        File contact = new File("src/test/resources/contact2.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen2"), config);
-        exporter.execute();
-
-        File targetFile = new File("target/gen2/com/mysema/query/jpa/domain2/QContact.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Multiple() throws IOException {
-        FileUtils.delete(new File("target/gen3"));
-        Configuration config = new Configuration();
-        for (Class<?> cl : Domain.classes) {
-            config.addAnnotatedClass(cl);
-        }
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen3"), serializerConfig, config);
-        exporter.execute();
-
-        List<String> failures = new ArrayList<String>();
-        for (File file : new File("target/gen3/com/mysema/query/jpa/domain").listFiles()) {
-            String result1 = Files.toString(file, Charsets.UTF_8);
-            String result2 = Files
-                    .toString(
-                            new File(
-                                    "../querydsl-jpa/target/generated-test-sources/java/com/mysema/query/jpa/domain",
-                                    file.getName()), Charsets.UTF_8);
-            if (!result1.equals(result2)) {
-                System.err.println(file.getName());
-                failures.add(file.getName());
-            }
-        }
-
-        if (!failures.isEmpty()) {
-            fail("Failed with " + failures.size() + " failures");
-        }
-
-    }
-
-    @Test
-    public void Execute_Multiple2() throws IOException {
-        FileUtils.delete(new File("target/gen4"));
-        Configuration config = new Configuration();
-        for (Class<?> cl : Domain2.classes) {
-            config.addAnnotatedClass(cl);
-        }
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen4"), serializerConfig, config);
-        exporter.execute();
-
-        List<String> failures = new ArrayList<String>();
-        for (File file : new File("target/gen4/com/mysema/query/jpa/domain2").listFiles()) {
-            String result1 = Files.toString(file, Charsets.UTF_8);
-            String result2 = Files
-                    .toString(
-                            new File(
-                                    "../querydsl-jpa/target/generated-test-sources/java/com/mysema/query/jpa/domain2",
-                                    file.getName()), Charsets.UTF_8);
-            if (!result1.equals(result2)) {
-                System.err.println(file.getName());
-                failures.add(file.getName());
-            }
-        }
-
-        if (!failures.isEmpty()) {
-            fail("Failed with " + failures.size() + " failures");
-        }
-
-    }
-
-    @Test
-    public void Execute_Store() throws IOException {
-        FileUtils.delete(new File("target/gen5"));
-        File contact = new File("src/test/resources/store.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q",
-                new File("target/gen5"), config);
-        exporter.execute();
-
-        File targetFile = new File("target/gen5/com/mysema/query/jpa/domain3/QStore.java");
-        assertContains(targetFile, "StringPath code", "StringPath address");
-
-        targetFile = new File("target/gen5/com/mysema/query/jpa/domain3/QHardwareStore.java");
-        assertContains(targetFile, "StringPath code = _super.code;", "StringPath address");
-    }
-
-    private static void assertContains(File file, String... strings) throws IOException {
-        assertTrue(file.getPath() + " doesn't exist", file.exists());
-        String result = Files.toString(file, Charsets.UTF_8);
-        for (String str : strings) {
-            assertTrue(str + " was not contained", result.contains(str));
-        }
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/JPADomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/JPADomainExporterTest.java
deleted file mode 100644
index e53586e1ee..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/JPADomainExporterTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.codegen;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.persistence.metamodel.Metamodel;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.ejb.metamodel.MetamodelImpl;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.annotations.Config;
-import com.mysema.query.codegen.SerializerConfig;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-import com.mysema.query.jpa.domain.Domain;
-import com.mysema.query.jpa.domain2.Domain2;
-import com.mysema.util.FileUtils;
-
-public class JPADomainExporterTest {
-
-    private static Properties props = new Properties();
-
-    static {
-        try {
-            InputStream is = JPADomainExporterTest.class.getResourceAsStream("/h2.properties");
-            props.load(is);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    private final SerializerConfig serializerConfig = SimpleSerializerConfig.getConfig(Domain.class
-            .getPackage().getAnnotation(Config.class));
-
-
-    private Metamodel convert(Configuration config) {
-        ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
-            .applySettings(props)
-            .buildServiceRegistry();
-
-        config.setProperties(props);
-        config.buildMappings();
-        SessionFactory sessionFactory = config.buildSessionFactory(serviceRegistry);
-        return MetamodelImpl.buildMetamodel(config.getClassMappings(),
-                (SessionFactoryImplementor) sessionFactory, true);
-    }
-
-    @Test
-    @Ignore // FIXME
-    public void Execute_MyEntity() throws IOException {
-        FileUtils.delete(new File("target/jpagen6"));
-        File myEntity = new File("src/test/resources/entity.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(myEntity);
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen6"), convert(config));
-        exporter.execute();
-
-        File targetFile = new File("target/jpagen6/com/mysema/query/jpa/codegen/QMyEntity.java");
-        assertContains(targetFile, "StringPath pk1", "StringPath pk2", "StringPath prop1");
-    }
-
-    @Test
-    public void Execute_Contact() throws IOException {
-        FileUtils.delete(new File("target/jpagen1"));
-        File contact = new File("src/test/resources/contact.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen1"), convert(config));
-        exporter.execute();
-
-        File targetFile = new File("target/jpagen1/com/mysema/query/jpa/domain2/QContact.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Contact_with_Suffix() throws IOException {
-        FileUtils.delete(new File("target/jpagen1"));
-        File contact = new File("src/test/resources/contact.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        JPADomainExporter exporter = new JPADomainExporter("", "Type", new File(
-                "target/jpagen1"), convert(config));
-        exporter.execute();
-
-        File targetFile = new File("target/jpagen1/com/mysema/query/jpa/domain2/ContactType.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Contact2() throws IOException {
-        FileUtils.delete(new File("target/jpagen2"));
-        File contact = new File("src/test/resources/contact2.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen2"), convert(config));
-        exporter.execute();
-
-        File targetFile = new File("target/jpagen2/com/mysema/query/jpa/domain2/QContact.java");
-        assertContains(targetFile, "StringPath email", "StringPath firstName",
-                "NumberPath<Long> id", "StringPath lastName");
-    }
-
-    @Test
-    public void Execute_Multiple() throws IOException {
-        FileUtils.delete(new File("target/jpagen3"));
-        Configuration config = new Configuration();
-        for (Class<?> cl : Domain.classes) {
-            config.addAnnotatedClass(cl);
-        }
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen3"), serializerConfig, convert(config));
-        exporter.execute();
-
-        List<String> failures = new ArrayList<String>();
-        for (File file : new File("target/jpagen3/com/mysema/query/jpa/domain").listFiles()) {
-            String result1 = Files.toString(file, Charsets.UTF_8);
-            String result2 = Files
-                    .toString(
-                            new File(
-                                    "../querydsl-jpa/target/generated-test-sources/java/com/mysema/query/jpa/domain",
-                                    file.getName()), Charsets.UTF_8);
-            if (!result1.equals(result2)) {
-                System.err.println(file.getName());
-                failures.add(file.getName());
-            }
-        }
-
-        failures.remove("QCalendar.java"); // FIXME
-
-        if (!failures.isEmpty()) {
-            fail("Failed with " + failures.size() + " failures");
-        }
-
-    }
-
-    @Test
-    public void Execute_Multiple2() throws IOException {
-        FileUtils.delete(new File("target/jpagen4"));
-        Configuration config = new Configuration();
-        for (Class<?> cl : Domain2.classes) {
-            config.addAnnotatedClass(cl);
-        }
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen4"), serializerConfig, convert(config));
-        exporter.execute();
-
-        List<String> failures = new ArrayList<String>();
-        for (File file : new File("target/jpagen4/com/mysema/query/jpa/domain2").listFiles()) {
-            String result1 = Files.toString(file, Charsets.UTF_8);
-            String result2 = Files
-                    .toString(
-                            new File(
-                                    "../querydsl-jpa/target/generated-test-sources/java/com/mysema/query/jpa/domain2",
-                                    file.getName()), Charsets.UTF_8);
-            if (!result1.equals(result2)) {
-                System.err.println(file.getName());
-                failures.add(file.getName());
-            }
-        }
-
-        if (!failures.isEmpty()) {
-            fail("Failed with " + failures.size() + " failures");
-        }
-
-    }
-
-    @Test
-    @Ignore // FIXME
-    public void Execute_Store() throws IOException {
-        FileUtils.delete(new File("target/jpagen5"));
-        File contact = new File("src/test/resources/store.hbm.xml");
-        Configuration config = new Configuration();
-        config.addFile(contact);
-        JPADomainExporter exporter = new JPADomainExporter("Q",
-                new File("target/jpagen5"), convert(config));
-        exporter.execute();
-
-        File targetFile = new File("target/jpagen5/com/mysema/query/jpa/domain3/QStore.java");
-        assertContains(targetFile, "StringPath code", "StringPath address");
-
-        targetFile = new File("target/jpagen5/com/mysema/query/jpa/domain3/QHardwareStore.java");
-        assertContains(targetFile, "StringPath code = _super.code;", "StringPath address");
-    }
-
-    private static void assertContains(File file, String... strings) throws IOException {
-        assertTrue(file.getPath() + " doesn't exist", file.exists());
-        String result = Files.toString(file, Charsets.UTF_8);
-        for (String str : strings) {
-            assertTrue(str + " was not contained", result.contains(str));
-        }
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/MyEntity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/MyEntity.java
deleted file mode 100644
index 4ed1ed05aa..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/MyEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query.jpa.codegen;
-
-
-public class MyEntity {
-
-    private String pk1, pk2, prop1;
-
-    public String getPk1() {
-        return pk1;
-    }
-
-    public void setPk1(String pk1) {
-        this.pk1 = pk1;
-    }
-
-    public String getPk2() {
-        return pk2;
-    }
-
-    public void setPk2(String pk2) {
-        this.pk2 = pk2;
-    }
-
-    public String getProp1() {
-        return prop1;
-    }
-
-    public void setProp1(String prop1) {
-        this.prop1 = prop1;
-    }
-
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/CustomType.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/CustomType.java
deleted file mode 100644
index 9c9c719d01..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/CustomType.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa.domain10;
-
-
-public class CustomType {
-
-    String property;
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/DomainExporterTest.java
deleted file mode 100644
index 2252b4fbe4..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/DomainExporterTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.jpa.domain10;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain10/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain10/QEntity.java").exists());
-        assertFalse(new File(gen, "com/mysema/query/jpa/domain10/QCustomType.java").exists());
-
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/Entity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/Entity.java
deleted file mode 100644
index 446f958884..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain10/Entity.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query.jpa.domain10;
-
-public class Entity {
-    
-    String id;
-    
-    CustomType custom;
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/DomainExporterTest.java
deleted file mode 100644
index 85a6d9644f..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/DomainExporterTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mysema.query.jpa.domain11;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain11/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain11/QOtherthing.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain11/QSomething.java").exists());
-        
-        String str = Files.toString(new File(gen, "com/mysema/query/jpa/domain11/QOtherthing.java"), Charsets.UTF_8);
-        assertTrue(str.contains("QSomething"));
-        
-        str = Files.toString(new File(gen, "com/mysema/query/jpa/domain11/QSomething.java"), Charsets.UTF_8);
-        assertTrue(str.contains("id"));
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/ISomething.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/ISomething.java
deleted file mode 100644
index ef4150673f..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/ISomething.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain11;
-
-public interface ISomething {
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Otherthing.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Otherthing.java
deleted file mode 100644
index d27c95195a..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Otherthing.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query.jpa.domain11;
-
-public class Otherthing {
-
-    String id;
-    
-    ISomething property;
-    
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Something.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Something.java
deleted file mode 100644
index dabeb47dfc..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain11/Something.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mysema.query.jpa.domain11;
-
-public class Something implements ISomething {
-    
-    String id;
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/DomainExporterTest.java
deleted file mode 100644
index ac792c2e2e..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/DomainExporterTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.jpa.domain12;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain12/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain12/QEntity.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain12/QSupertype.java").exists());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Entity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Entity.java
deleted file mode 100644
index 3babb46e26..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Entity.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query.jpa.domain12;
-
-public class Entity extends Supertype {
-    
-    String id;
-
-    Entity entity;
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Supertype.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Supertype.java
deleted file mode 100644
index 69986c7224..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain12/Supertype.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mysema.query.jpa.domain12;
-
-public class Supertype {
-
-    String property;
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/DomainExporterTest.java
deleted file mode 100644
index ed4c20241a..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/DomainExporterTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.jpa.domain13;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain13/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();        
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain13/QEntity.java").exists());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Entity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Entity.java
deleted file mode 100644
index e1c6154b9d..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Entity.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.query.jpa.domain13;
-
-class Entity {
-    String id;
-    
-    Status status;
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Status.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Status.java
deleted file mode 100644
index 1c8409f07f..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain13/Status.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain13;
-
-public enum Status {
-    BUSY, AVAILABLE;
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/DomainExporterTest.java
deleted file mode 100644
index c37c8bdaf9..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/DomainExporterTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.jpa.domain14;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain14/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();        
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain14/QSiCZuCapiRechtMapping.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain14/QMappingID.java").exists());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/MappingID.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/MappingID.java
deleted file mode 100644
index dac7633174..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/MappingID.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.jpa.domain14;
-
-import java.io.Serializable;
-
-public class MappingID implements Serializable {
-
-    private static final long serialVersionUID = -4623004134095871109L;
-    private short systemID;
-
-    private int capiID;
-
-    public MappingID() {
-        // Default-Konstruktor wird vom Hinernate Criteria-API verwendet
-    }
-
-    public MappingID(short systemID, int capiID) {
-        this.capiID = capiID;
-        this.systemID = systemID;
-    }
-
-    public short getSystemID() {
-        return systemID;
-    }
-
-    public int getCapiID() {
-        return capiID;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/SiCZuCapiRechtMapping.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/SiCZuCapiRechtMapping.java
deleted file mode 100644
index b74794d59c..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain14/SiCZuCapiRechtMapping.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.jpa.domain14;
-
-public abstract class SiCZuCapiRechtMapping {
-
-    private MappingID id;
-
-    public void setId(MappingID id) {
-        this.id = id;
-    }
-
-    public int getSystemID() {
-        return id.getSystemID();
-    }
-
-    public int getCapiPID() {
-        return id.getCapiID();
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/DomainExporterTest.java
deleted file mode 100644
index 6681b2a0bd..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/DomainExporterTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.jpa.domain15;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain15/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();        
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain15/QEntity.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain15/QEntity2.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain15/QSuperclass.java").exists());
-        
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity.java
deleted file mode 100644
index 0131b51f7a..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa.domain15;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Entity extends Superclass<String> {
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity2.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity2.java
deleted file mode 100644
index dad7b094b9..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Entity2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa.domain15;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Entity2 extends Superclass<Integer> {
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Superclass.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Superclass.java
deleted file mode 100644
index 83369488e5..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain15/Superclass.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query.jpa.domain15;
-
-import java.util.List;
-
-import com.mysema.query.annotations.QuerySupertype;
-
-@QuerySupertype
-public class Superclass<T> {
-
-    Long id;
-    
-    List<T> values;
-    
-    List<? extends T> values2;
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom.java
deleted file mode 100644
index 1d044120f9..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain16;
-
-public class Custom {
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom2.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom2.java
deleted file mode 100644
index fae9f71eab..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom2.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain16;
-
-public class Custom2 {
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom3.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom3.java
deleted file mode 100644
index be472f5e41..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Custom3.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain16;
-
-public class Custom3 {
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/DomainExporterTest.java
deleted file mode 100644
index 59eeff152d..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/DomainExporterTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query.jpa.domain16;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain16/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain16/QEntity.java").exists());
-        assertFalse(new File(gen, "com/mysema/query/jpa/domain16/QCustom.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain16/QCustom2.java").exists());
-        assertFalse(new File(gen, "com/mysema/query/jpa/domain16/QCustom3.java").exists());
-
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Entity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Entity.java
deleted file mode 100644
index bd8af9787c..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain16/Entity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mysema.query.jpa.domain16;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
-
-public class Entity {
-
-    private Long id;
-
-    @QueryType(PropertyType.SIMPLE)
-    private Custom custom;
-
-    @QueryType(PropertyType.ENTITY)
-    private Custom2 custom2;
-
-    private Custom3 custom3;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Custom getCustom() {
-        return custom;
-    }
-
-    public void setCustom(Custom custom) {
-        this.custom = custom;
-    }
-
-    public Custom2 getCustom2() {
-        return custom2;
-    }
-
-    public void setCustom2(Custom2 custom2) {
-        this.custom2 = custom2;
-    }
-
-    public Custom3 getCustom3() {
-        return custom3;
-    }
-
-    public void setCustom3(Custom3 custom3) {
-        this.custom3 = custom3;
-    }
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Contact.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Contact.java
deleted file mode 100644
index e4a4334653..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Contact.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-public abstract class Contact {
-    
-    private Long id;
-
-    private String value;
-    
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Customer.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Customer.java
deleted file mode 100644
index 5c4e4afda7..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Customer.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-
-public class Customer extends Person<CustomerContact, CustomerHistory> {
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerContact.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerContact.java
deleted file mode 100644
index 0678eb177e..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerContact.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-public class CustomerContact extends Contact {
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerHistory.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerHistory.java
deleted file mode 100644
index a844fde7ae..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/CustomerHistory.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-public class CustomerHistory extends HistoryEntity {
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/DomainExporterTest.java
deleted file mode 100644
index 709c567991..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/DomainExporterTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-    
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        for (String res : Arrays.asList("Customer.hbm.xml", 
-                "CustomerContact.hbm.xml", 
-                "CustomerHistory.hbm.xml")) {
-            config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain5/" + res));
-        }
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-
-        File targetFile = new File(gen, "com/mysema/query/jpa/domain5/QCustomer.java");
-        assertContains(targetFile, "SetPath<CustomerContact, QCustomerContact>",
-                                   "SetPath<CustomerHistory, QCustomerHistory>");
-    }
-
-
-    private static void assertContains(File file, String... strings) throws IOException {
-        assertTrue(file.getPath() + " doesn't exist", file.exists());
-        String result = Files.toString(file, Charsets.UTF_8);
-        for (String str : strings) {
-            assertTrue(str + " was not contained", result.contains(str));
-        }
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/HistoryEntity.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/HistoryEntity.java
deleted file mode 100644
index f4e38b2811..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/HistoryEntity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-public class HistoryEntity {
-
-    private Long id;
-    
-    private String description;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    
-    
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Person.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Person.java
deleted file mode 100644
index c6155f8747..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain5/Person.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mysema.query.jpa.domain5;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-public class Person<T extends Contact, H extends HistoryEntity> {
-
-    private Long id;
-    
-    private Set<T> contacts = new HashSet<T>();
-
-    private Set<H> history = new HashSet<H>();
-    
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Set<T> getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(Set<T> contacts) {
-        this.contacts = contacts;
-    }
-
-    public Set<H> getHistory() {
-        return history;
-    }
-
-    public void setHistory(Set<H> history) {
-        this.history = history;
-    }
-
-    
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/Contact.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/Contact.java
deleted file mode 100644
index bf9b839e29..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/Contact.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mysema.query.jpa.domain6;
-
-import java.util.List;
-
-public class Contact {
-
-    private long id;
-    private String name;
-    private List<PhoneNumber> phoneNumbers;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<PhoneNumber> getPhoneNumbers() {
-        return phoneNumbers;
-    }
-
-    public void setPhoneNumbers(List<PhoneNumber> phoneNumbers) {
-        this.phoneNumbers = phoneNumbers;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/DomainExporterTest.java
deleted file mode 100644
index 2c1a5e76f7..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/DomainExporterTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query.jpa.domain6;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-    
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain6/Contact.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-
-        File targetFile = new File(gen, "com/mysema/query/jpa/domain6/QContact.java");
-        assertContains(targetFile, "ListPath<PhoneNumber, QPhoneNumber> phoneNumbers");
-        
-        targetFile = new File(gen, "com/mysema/query/jpa/domain6/QPhoneNumber.java");
-        assertContains(targetFile, "QPhoneNumber extends BeanPath<PhoneNumber>", 
-                                   "StringPath number = createString(\"number\")");
-    }
-
-    private static void assertContains(File file, String... strings) throws IOException {
-        assertTrue(file.getPath() + " doesn't exist", file.exists());
-        String result = Files.toString(file, Charsets.UTF_8);
-        for (String str : strings) {
-            assertTrue(str + " was not contained", result.contains(str));
-        }
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/PhoneNumber.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/PhoneNumber.java
deleted file mode 100644
index f0cb7fae91..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain6/PhoneNumber.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query.jpa.domain6;
-
-public class PhoneNumber {
-
-    private String type;
-    private String number;
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/A.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/A.java
deleted file mode 100644
index 3729373db9..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/A.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mysema.query.jpa.domain7;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class A {
-
-    public int id;
-    
-    public List<B> b = new ArrayList<B>();
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/B.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/B.java
deleted file mode 100644
index 292a8d192d..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/B.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.jpa.domain7;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class B {
-
-    public int id;
-    
-    public List<C> c = new ArrayList<C>();
-    
-    public A a;
-
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/C.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/C.java
deleted file mode 100644
index 47bc9beab6..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/C.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query.jpa.domain7;
-
-public class C {
-    
-    public int id;
-    
-    public B b;
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/DomainExporterTest.java
deleted file mode 100644
index 498eb2d17a..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain7/DomainExporterTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mysema.query.jpa.domain7;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain7/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain7/QA.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain7/QB.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain7/QC.java").exists());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/A.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/A.java
deleted file mode 100644
index 313354ad39..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/A.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.query.jpa.domain8;
-
-public class A {
-
-    String property1;
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/B.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/B.java
deleted file mode 100644
index be05b7ff21..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/B.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa.domain8;
-
-public class B extends A {
-    
-    Long id;
-
-    String property2;
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/DomainExporterTest.java
deleted file mode 100644
index 79b59b9fd1..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain8/DomainExporterTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.jpa.domain8;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain8/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-        
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain8/QA.java").exists());
-        assertTrue(new File(gen, "com/mysema/query/jpa/domain8/QB.java").exists());
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/DomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/DomainExporterTest.java
deleted file mode 100644
index 0ffd9c9be5..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/DomainExporterTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mysema.query.jpa.domain9;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.hibernate.cfg.Configuration;
-import org.junit.Test;
-
-import com.mysema.query.jpa.codegen.HibernateDomainExporter;
-import com.mysema.util.FileUtils;
-
-public class DomainExporterTest {
-
-    @Test
-    public void Execute() throws IOException {
-        File gen = new File("target/" + getClass().getSimpleName());
-        FileUtils.delete(gen);
-        Configuration config = new Configuration();
-        config.addFile(new File("src/test/resources/com/mysema/query/jpa/domain9/domain.hbm.xml"));
-        HibernateDomainExporter exporter = new HibernateDomainExporter("Q", gen, config);
-        exporter.execute();
-    }
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltig.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltig.java
deleted file mode 100644
index 08b0b00b62..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltig.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.query.jpa.domain9;
-
-public abstract class EigentumPersonRechtsgueltig {
-    
-    String id;
-    
-}
diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltigSnapshot.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltigSnapshot.java
deleted file mode 100644
index 6bc5aa0c44..0000000000
--- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/domain9/EigentumPersonRechtsgueltigSnapshot.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mysema.query.jpa.domain9;
-
-public class EigentumPersonRechtsgueltigSnapshot extends EigentumPersonRechtsgueltig {
-    
-}
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java
new file mode 100644
index 0000000000..cb59ea901f
--- /dev/null
+++ b/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.codegen;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+import org.junit.rules.TemporaryFolder;
+
+public class JPADomainExporterTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Rule
+    public ErrorCollector errors = new ErrorCollector();
+
+    @Test
+    public void test() throws IOException {
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("h2", new Properties());
+        Path outputFolder = folder.getRoot().toPath();
+        JPADomainExporter exporter = new JPADomainExporter(outputFolder.toFile(), emf.getMetamodel());
+        exporter.execute();
+
+        File origRoot = new File("../querydsl-jpa/target/generated-test-sources/java");
+        Set<File> files = exporter.getGeneratedFiles();
+        assertFalse(files.isEmpty());
+        for (File file : files) {
+            Path relativeFile = outputFolder.relativize(file.toPath());
+            Path origFile = origRoot.toPath().resolve(relativeFile);
+            String reference = new String(Files.readAllBytes(origFile), StandardCharsets.UTF_8);
+            String content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+            errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
+        }
+    }
+
+}
diff --git a/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java b/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java
new file mode 100644
index 0000000000..f8396a8fe8
--- /dev/null
+++ b/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java
@@ -0,0 +1,49 @@
+package com.querydsl.jpa.codegen.ant;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+import org.junit.rules.TemporaryFolder;
+
+public class AntJPADomainExporterTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Rule
+    public ErrorCollector errors = new ErrorCollector();
+
+    @Test
+    public void test() throws IOException {
+        AntJPADomainExporter exporter = new AntJPADomainExporter();
+        exporter.setNamePrefix("Q");
+        exporter.setNameSuffix("");
+        Path outputFolder = folder.getRoot().toPath();
+        exporter.setTargetFolder(outputFolder.toFile().getAbsolutePath());
+        exporter.setPersistenceUnitName("h2");
+        exporter.execute();
+
+        File origRoot = new File("../querydsl-jpa/target/generated-test-sources/java");
+        Set<File> files = exporter.getGeneratedFiles();
+        assertFalse(files.isEmpty());
+        for (File file : files) {
+            Path relativeFile = outputFolder.relativize(file.toPath());
+            Path origFile = origRoot.toPath().resolve(relativeFile);
+            String reference = new String(java.nio.file.Files.readAllBytes(origFile), StandardCharsets.UTF_8);
+            String content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+            errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
+        }
+    }
+
+}
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain10/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain10/domain.hbm.xml
deleted file mode 100644
index 3ff1b00de0..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain10/domain.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain10">
-   
-  <class name="Entity" table="Entity" mutable="false">
-  
-    <id name="id" type="string" length="40"/>
-
-    <property name="custom" type="object"/>
-    
-  </class>
-   
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain11/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain11/domain.hbm.xml
deleted file mode 100644
index 40f62b43f3..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain11/domain.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field" package="com.mysema.query.jpa.domain11">
-	<class name="Otherthing" table="Otherthing">
-	    <id name="id" type="string" length="40"/>
- 
-		<many-to-one name="property" class="Something" lazy="false"
-			fetch="join">
-			<column name="SOMETHING_ID" length="40" />
-		</many-to-one>
-
-	</class>
-	
-	<class name="Something" table="Something">
-	   <id name="id" type="string" length="40"/>
-	   
-	</class>
-	
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain12/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain12/domain.hbm.xml
deleted file mode 100644
index 30b532309e..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain12/domain.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field" package="com.mysema.query.jpa.domain12">
-	<class name="Entity" table="Entity">
-	    <id name="id" type="string" length="40"/>
- 
-        <property name="property" type="string"/>
- 
-		<many-to-one name="entity" class="Entity" lazy="false" fetch="join">
-			<column name="SOMETHING_ID" length="40" />
-		</many-to-one>
-
-	</class>
-	
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain13/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain13/domain.hbm.xml
deleted file mode 100644
index 19dffc8fda..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain13/domain.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field" package="com.mysema.query.jpa.domain13">
-  <class name="Entity">
-    <id name="id">
-      <generator class="native"/>
-    </id>
-
-    <property name="status">
-      <type name="org.hibernate.type.EnumType">
-         <param name="enumClass">com.mysema.query.jpa.domain13.Status</param>
-      </type>
-    </property>
-  </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain14/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain14/domain.hbm.xml
deleted file mode 100644
index f0475c0cde..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain14/domain.hbm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-   
-<hibernate-mapping package="com.mysema.query.jpa.domain14" default-access="field">
-
-  <class name="SiCZuCapiRechtMapping">
-
-    <composite-id name="id" class="MappingID">
-        <key-property name="capiID"/>
-        <key-property name="systemID"/>
-    </composite-id>     
-
-  </class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain15/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain15/domain.hbm.xml
deleted file mode 100644
index fb9537b380..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain15/domain.hbm.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-   
-<hibernate-mapping package="com.mysema.query.jpa.domain15" default-access="field">
-
-  <class name="Superclass">  
-    <id name="id">
-      <generator class="native"/>
-    </id>
-    <property name="values"/>    
-    <property name="values2"/>
-  </class>
-
-  <class name="Entity">  
-    <id name="id">
-      <generator class="native"/>
-    </id>
-    <property name="values"/>    
-    <property name="values2"/>
-  </class>
-  
-  <class name="Entity2">  
-    <id name="id">
-      <generator class="native"/>
-    </id>
-  </class>  
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain16/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain16/domain.hbm.xml
deleted file mode 100644
index 672d3347d8..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain16/domain.hbm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-   
-<hibernate-mapping package="com.mysema.query.jpa.domain16" default-access="field">
-
-  <class name="Entity">  
-    <id name="id">
-      <generator class="native"/>
-    </id>
-    <property name="custom"/>
-    <property name="custom2"/>
-    <property name="custom3"/>
-  </class>
-  
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/Customer.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/Customer.hbm.xml
deleted file mode 100644
index 2b5303f7d0..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/Customer.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain5" default-lazy="false">
-    <class name="Customer" table="customer">
-
-        <id name="id" column="id">
-            <generator class="identity"/>
-        </id>
-
-        <set name="contacts" cascade="all-delete-orphan" order-by="value" fetch="join">
-            <key column="customer_id"/>
-            <one-to-many class="CustomerContact"/>
-        </set>
-        <set name="history" cascade="all-delete-orphan" order-by="creationDate DESC" fetch="select" lazy="true">
-            <key column="customer_id"/>
-            <one-to-many class="CustomerHistory"/>
-        </set>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerContact.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerContact.hbm.xml
deleted file mode 100644
index 2bf759fdc5..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerContact.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain5" default-lazy="false">
-    <class name="CustomerContact" table="customer_contact">
-
-        <id name="id" column="id">
-            <generator class="identity"/>
-        </id>
-
-        <property name="value"/>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerHistory.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerHistory.hbm.xml
deleted file mode 100644
index f24609dd0a..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain5/CustomerHistory.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain5" default-lazy="false">
-    <class name="CustomerHistory" table="customer_history">
-
-        <id name="id" column="id">
-            <generator class="identity"/>
-        </id>
-
-        <property name="description" type="text"/>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain6/Contact.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain6/Contact.hbm.xml
deleted file mode 100644
index c54f660d43..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain6/Contact.hbm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain6" default-lazy="false">
-  <class name="Contact" table="CONTACT" mutable="false">
-    <id name="id" column="ID">
-      <generator class="increment" />
-    </id>
-    <property name="name" column="name" not-null="true" />
-    <list name="phoneNumbers" table="CONTACT_PHONE_NUMBER" lazy="false">
-        <key column="CONTACT_ID"/>
-        <list-index column="INDEX" base="0"/>
-        <composite-element class="PhoneNumber">
-            <property name="type"/>
-            <property name="number" />
-        </composite-element>
-    </list>
-  </class>
-</hibernate-mapping>  
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain7/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain7/domain.hbm.xml
deleted file mode 100644
index 7088c06fb4..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain7/domain.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain7">
-   <class name="A" table="A">
-      <id access="field" name="id" type="int" column="A_ID" length="4">
-         <generator class="sequence"><param name="sequence">a_id_seq</param></generator>
-      </id>
-      <list access="field" name="b" lazy="true" inverse="false">
-         <key column="A_ID" not-null="true" unique="true" />
-         <index column="B_IDX" />
-         <one-to-many class="B" />
-      </list>
-   </class>
-   
-   <class name="B" table="B">
-      <id access="field" name="id" type="int" column="B_ID" length="4">
-         <generator class="sequence"><param name="sequence">b_id_seq</param></generator>
-      </id>
-      <list access="field" name="c" lazy="true" inverse="false">
-         <key column="B_ID" not-null="true" unique="true" />
-         <index column="C_IDX" />
-         <one-to-many class="C" />
-      </list>
-      <many-to-one access="field" name="a" class="A"
-         foreign-key="FK_B_A" column="A_ID" insert="false" update="false"
-         not-null="true" />
-   </class>
-   
-   <class name="C" table="C">
-      <id access="field" name="id" type="int" column="C_ID" length="4">
-         <generator class="sequence"><param name="sequence">c_id_seq</param></generator>
-      </id>
-      <many-to-one access="field" name="b" class="B"
-         foreign-key="FK_C_B" column="B_ID" insert="false" update="false"
-         not-null="true" />
-   </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain8/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain8/domain.hbm.xml
deleted file mode 100644
index e6fdd7b958..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain8/domain.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain8">
-   
-   <class name="B" table="B">
-      <id access="field" name="id" type="int" column="B_ID" length="4">
-         <generator class="sequence"><param name="sequence">b_id_seq</param></generator>
-      </id>
-      <property name="property1" column="property1" not-null="true" />
-      <property name="property2" column="property2" not-null="true" />
-   </class>
-   
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain9/domain.hbm.xml b/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain9/domain.hbm.xml
deleted file mode 100644
index 73b0dbd0f8..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/com/mysema/query/jpa/domain9/domain.hbm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain9">
-   
-  <class name="EigentumPersonRechtsgueltigSnapshot" table="EigentumPersonRechtsgueltigSS" mutable="false">
-
-    <id name="id" type="string" length="40"/>
-    
-  </class>
-   
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/contact.hbm.xml b/querydsl-jpa-codegen/src/test/resources/contact.hbm.xml
deleted file mode 100644
index bbe23fcf41..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/contact.hbm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain2">
-  <class name="Contact" table="CONTACT">
-   <id name="id" type="long" column="ID" >
-   <generator class="assigned"/>
-  </id>
-
-  <property name="firstName">
-     <column name="FIRSTNAME" />
-  </property>
-  <property name="lastName">
-    <column name="LASTNAME"/>
-  </property>
-  <property name="email">
-    <column name="EMAIL"/>
-  </property>
- </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/contact2.hbm.xml b/querydsl-jpa-codegen/src/test/resources/contact2.hbm.xml
deleted file mode 100644
index 5d84dc2f6d..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/contact2.hbm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-  <class name="com.mysema.query.jpa.domain2.Contact" table="CONTACT">
-   <id name="id" type="long" column="ID" >
-   <generator class="assigned"/>
-  </id>
-
-  <property name="firstName">
-     <column name="FIRSTNAME" />
-  </property>
-  <property name="lastName">
-    <column name="LASTNAME"/>
-  </property>
-  <property name="email">
-    <column name="EMAIL"/>
-  </property>
- </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/entity.hbm.xml b/querydsl-jpa-codegen/src/test/resources/entity.hbm.xml
deleted file mode 100644
index e6c1a9789a..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/entity.hbm.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-    <class name="com.mysema.query.jpa.codegen.MyEntity" table="MY_TABLE">
-        <composite-id>
-            <key-property name="pk1" column="PK1"/>
-            <key-property name="pk2" column="PK2"/>
-        </composite-id>
-        <property name="prop1" column="PROP1"/>
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/h2.properties b/querydsl-jpa-codegen/src/test/resources/h2.properties
deleted file mode 100644
index 8ebdf759ad..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/h2.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class=org.h2.Driver
-hibernate.connection.url=jdbc:h2:mem:
-hibernate.connection.username=sa
-hibernate.connection.password=
-
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/src/test/resources/hibernate.cfg.xml b/querydsl-jpa-codegen/src/test/resources/hibernate.cfg.xml
deleted file mode 100644
index eb1c3b8cf2..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/hibernate.cfg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
-"-//Hibernate/Hibernate Configuration DTD//EN"
-"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-<session-factory>
-	<property name="hibernate.dialect">com.mysema.query.jpa.support.ExtendedDerbyDialect</property>
-	<property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
-	<property name="hibernate.connection.url">jdbc:derby:target/derbydb;create=true</property>
-</session-factory>
-</hibernate-configuration>
diff --git a/querydsl-jpa-codegen/src/test/resources/store.hbm.xml b/querydsl-jpa-codegen/src/test/resources/store.hbm.xml
deleted file mode 100644
index 09cf3dfd0e..0000000000
--- a/querydsl-jpa-codegen/src/test/resources/store.hbm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-
-	<class name="com.mysema.query.jpa.domain3.Store" table="STORE" discriminator-value="S">
-
-<!--  
-       <discriminator column="subclass" type="character"/>
- -->
-        <id name="code" type="java.lang.String" column="CODE">
-            <generator class="assigned"/>
-        </id>
-
-        <property name="name">
-            <column name="NAME"/>
-        </property>
-
-        <property name="address">
-            <column name="ADDRESS"/>
-        </property>
-
-        <property name="city">
-            <column name="CITY"/>
-        </property>
-
-        <property name="phoneDetails">
-            <column name="PHONE_DETAILS" length="30"/>
-        </property>
-
-        <property name="faxDetails">
-            <column name="FAX_DETAILS" length="30"/>
-        </property>
-
-        <property name="zipCode">
-            <column name="ZIP_CODE" length="15"/>
-        </property>
-
-        <property name="chainCode">
-            <column name="CHAIN_CODE"/>
-        </property>
-
-        <subclass name="com.mysema.query.jpa.domain3.HardwareStore" discriminator-value="D">
-
-           <property name="storeCode">
-           		<column name="STORE_CODE"/>
-           </property>
-
-        </subclass>
-
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/querydsl-jpa-codegen/template.mf b/querydsl-jpa-codegen/template.mf
deleted file mode 100644
index 3ec0530f3e..0000000000
--- a/querydsl-jpa-codegen/template.mf
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.jpa.codegen
-Bundle-Name: Querydsl JPA Codegen
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.codegen.*;version="${codegen.version}",
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",
-  javax.persistence.*;version="[2.0.0,2.1.0)",
-  javax.xml.stream.*;version="0",
-  org.hibernate.*;version="${hibernate.version}",
-  org.slf4j.*;version="${slf4j.version}",
-  com.google.common.*;version="${guava.version}"
\ No newline at end of file
diff --git a/querydsl-jpa/README.md b/querydsl-jpa/README.md
index edbd3c3887..01e9bfafcb 100644
--- a/querydsl-jpa/README.md
+++ b/querydsl-jpa/README.md
@@ -6,47 +6,53 @@ The JPA module provides integration with the JPA 2 persistence API.
 
  Add the following dependencies to your Maven project :
 
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-apt</artifactId>
-      <version>${querydsl.version}</version>
-      <scope>provided</scope>
-    </dependency>    
-        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-jpa</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>   
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-jpa</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 And now, configure the Maven APT plugin :
 
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.6</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
+```XML
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-apt</artifactId>
+            <version>${querydsl.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+```
 
 The JPAAnnotationProcessor finds domain types annotated with the javax.persistence.Entity annotation and generates query types for them.
 
-If you use Hibernate annotations in your domain types you should use the APT processor com.mysema.query.apt.hibernate.HibernateAnnotationProcessor instead.
+If you use Hibernate annotations in your domain types you should use the APT processor com.querydsl.apt.hibernate.HibernateAnnotationProcessor instead.
 
 Run clean install and you will get your Query types generated into target/generated-sources/java.
 
@@ -58,10 +64,13 @@ Now you are able to construct JPQL query instances and instances of the query do
 
 Querying with Querydsl JPA is as simple as this :
 
-    QCustomer customer = QCustomer.customer;
-    JPAQuery query = new JPAQuery(entityManager);
-    Customer bob = query.from(customer)
-      .where(customer.firstName.eq("Bob"))
-      .uniqueResult(customer);
-      
-For more information on the Querydsl JPA module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02.html#jpa_integration      
\ No newline at end of file
+```JAVA
+QCustomer customer = QCustomer.customer;
+JPAQuery<?> query = new JPAQuery<Void>(entityManager);
+Customer bob = query.select(customer)
+  .from(customer)
+  .where(customer.firstName.eq("Bob"))
+  .fetchOne();
+```
+
+For more information on the Querydsl JPA module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02.html#jpa_integration
diff --git a/querydsl-jpa/etc/features.txt b/querydsl-jpa/etc/features.txt
index 29a368482a..3255735ef4 100644
--- a/querydsl-jpa/etc/features.txt
+++ b/querydsl-jpa/etc/features.txt
@@ -1,39 +1,39 @@
-* mathematical operators +, -, *, /
-
-* binary comparison operators =, >=, <=, <>, !=, like
-
-* logical operations and, or, not
-
-* Parentheses ( ), indicating grouping
-
-* in, not in, between, is null, is not null, is empty, is not empty, member of and not member of
-
-* "Simple" case, case ... when ... then ... else ... end, and "searched" case, case when ... then ... else ... end
-
-* string concatenation ...||... or concat(...,...)
-
-* current_date(), current_time(), current_timestamp()
-
-* second(...), minute(...), hour(...), day(...), month(...), year(...),
-
-* Any function or operator defined by EJB-QL 3.0: substring(), trim(), lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(), mod()
-
-* coalesce() and nullif()
-
-* str() for converting numeric or temporal values to a readable string
-
-* cast(... as ...), where the second argument is the name of a Hibernate type, and extract(... from ...) if ANSI cast() and extract() is supported by the underlying database
-
-* the HQL index() function, that applies to aliases of a joined indexed collection
-
-* HQL functions that take collection-valued path expressions: size(), minelement(), maxelement(), minindex(), maxindex(), along with the special elements() and indices functions which may be quantified using some, all, exists, any, in.
-
-* Any database-supported SQL scalar function like sign(), trunc(), rtrim(), sin()
-
-* JDBC-style positional parameters ?
-
-* named parameters :name, :start_date, :x1
-
-* SQL literals 'foo', 69, 6.66E+2, '1970-01-01 10:00:01.0'
-
+* mathematical operators +, -, *, /
+
+* binary comparison operators =, >=, <=, <>, !=, like
+
+* logical operations and, or, not
+
+* Parentheses ( ), indicating grouping
+
+* in, not in, between, is null, is not null, is empty, is not empty, member of and not member of
+
+* "Simple" case, case ... when ... then ... else ... end, and "searched" case, case when ... then ... else ... end
+
+* string concatenation ...||... or concat(...,...)
+
+* current_date(), current_time(), current_timestamp()
+
+* second(...), minute(...), hour(...), day(...), month(...), year(...),
+
+* Any function or operator defined by EJB-QL 3.0: substring(), trim(), lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(), mod()
+
+* coalesce() and nullif()
+
+* str() for converting numeric or temporal values to a readable string
+
+* cast(... as ...), where the second argument is the name of a Hibernate type, and extract(... from ...) if ANSI cast() and extract() is supported by the underlying database
+
+* the HQL index() function, that applies to aliases of a joined indexed collection
+
+* HQL functions that take collection-valued path expressions: size(), minelement(), maxelement(), minindex(), maxindex(), along with the special elements() and indices functions which may be quantified using some, all, exists, any, in.
+
+* Any database-supported SQL scalar function like sign(), trunc(), rtrim(), sin()
+
+* JDBC-style positional parameters ?
+
+* named parameters :name, :start_date, :x1
+
+* SQL literals 'foo', 69, 6.66E+2, '1970-01-01 10:00:01.0'
+
 * Java public static final constants eg.Color.TABBY 
\ No newline at end of file
diff --git a/querydsl-jpa/etc/precedence.txt b/querydsl-jpa/etc/precedence.txt
index fad0e18475..b857f7096a 100644
--- a/querydsl-jpa/etc/precedence.txt
+++ b/querydsl-jpa/etc/precedence.txt
@@ -1,40 +1,40 @@
-BINARY, COLLATE
-!, 
-NOT
-- (unary minus), 
-~ (unary bit inversion)
-^
-*, 
-/, 
-DIV, 
-%, 
-MOD
--, 
-+
-<<, 
->>
-&
-|
-=, 
-<=>, 
->=, 
->, 
-<=, 
-<, 
-<>, 
-!=, 
-IS, 
-LIKE, 
-REGEXP, 
-IN
-BETWEEN, 
-CASE, 
-WHEN, 
-THEN, 
-ELSE
-&&, 
-AND
-||, 
-OR, 
-XOR
+BINARY, COLLATE
+!, 
+NOT
+- (unary minus), 
+~ (unary bit inversion)
+^
+*, 
+/, 
+DIV, 
+%, 
+MOD
+-, 
++
+<<, 
+>>
+&
+|
+=, 
+<=>, 
+>=, 
+>, 
+<=, 
+<, 
+<>, 
+!=, 
+IS, 
+LIKE, 
+REGEXP, 
+IN
+BETWEEN, 
+CASE, 
+WHEN, 
+THEN, 
+ELSE
+&&, 
+AND
+||, 
+OR, 
+XOR
 :=
\ No newline at end of file
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 5b0fea7725..75a8232314 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-jpa</artifactId>
   <name>Querydsl - JPA support</name>
   <description>JPA support for Querydsl</description>
@@ -23,12 +23,15 @@
   </scm>
   
   <properties>
-    <hibernate.version>4.3.5.Final</hibernate.version>
-    <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
-    <eclipselink.version>2.5.1</eclipselink.version>
+    <osgi.import.package>javax.persistence.*;version="[1.1,3)",${osgi.import.package.root}</osgi.import.package>
   </properties>
   
-  <dependencies>   
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
@@ -43,69 +46,93 @@
           <artifactId>asm</artifactId>
         </exclusion>
       </exclusions>      
-      <scope>provided</scope>      
-    </dependency>   
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>${hibernate.version}</version>
+      <optional>true</optional>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>${hibernate.validator.version}</version>
-      <scope>provided</scope>
-      <exclusions>    
-        <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>      
-    </dependency>    
- 
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.1-api</artifactId>
-      <version>1.0.0.Final</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
-    </dependency> 
+    </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-apt</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
-    </dependency>    
-    
+    </dependency>
+
+    <!-- test -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>${hibernate.validator.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>    
-    
-    <!-- test -->
-        
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cglib.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>${asm.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>${asm.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>eclipselink</artifactId>
       <version>${eclipselink.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>validation-api</artifactId>
+          <groupId>javax.validation</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
       <scope>provided</scope>
     </dependency>
     
@@ -114,6 +141,12 @@
       <artifactId>postgresql</artifactId>
       <version>${postgresql.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>    
 
     <!-- 
@@ -143,12 +176,6 @@
          </exclusion>
        </exclusions>
      </dependency>
-     <dependency>
-      <groupId>com.jolbox</groupId>
-      <artifactId>bonecp</artifactId>
-      <version>0.7.1.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     
     <dependency>
       <groupId>org.hsqldb</groupId>
@@ -160,7 +187,6 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>
     
@@ -170,6 +196,12 @@
       <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -177,26 +209,32 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>${jtds.version}</version>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>${mssql.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    
+
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>jdepend</groupId>
       <artifactId>jdepend</artifactId>
@@ -210,8 +248,8 @@
     <plugins> 
     
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>   
           
       <plugin>
@@ -219,7 +257,7 @@
           <artifactId>maven-jar-plugin</artifactId>
         <executions>
            <execution>
-               <id>apt</id>
+             <id>apt</id>
              <goals>
                <goal>jar</goal>                
              </goals>    
@@ -235,7 +273,14 @@
             </goals>
           </execution>               
         </executions>
-      </plugin>            
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.jpa</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -246,8 +291,24 @@
             </goals>
           </execution>
         </executions>
-      </plugin>      
-            
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.transformer</groupId>
+        <artifactId>org.eclipse.transformer.maven</artifactId>
+        <version>0.2.0</version>
+        <executions>
+          <execution>
+            <id>jakarta-ee</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <classifier>jakarta</classifier>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
@@ -280,6 +341,10 @@
                 <name>derby.stream.error.file</name>
                 <value>target/derby.log</value>
             </property>
+            <property>
+                <name>org.jboss.logging.provider</name>
+                <value>slf4j</value>
+            </property>
           </systemProperties>
         </configuration>
         <executions>
@@ -297,7 +362,7 @@
               </property>                  
             </systemProperties>    
             <includes>
-              <include>com/mysema/query/PackageVerification.java</include>
+              <include>com/querydsl/jpa/PackageVerification.java</include>
             </includes>
           </configuration>
           </execution>
@@ -315,14 +380,14 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.hibernate.HibernateAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.hibernate.HibernateAnnotationProcessor</processor>
               <logOnlyOnError>true</logOnlyOnError>
             </configuration>            
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <!-- 
@@ -337,7 +402,7 @@
         <configuration>
           <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
           <jdbcUrl>jdbc:derby:target/derbydb;create=true</jdbcUrl>
-          <packageName>com.mysema.query.jpa.domain.sql</packageName>
+          <packageName>com.querydsl.jpa.domain.sql</packageName>
           <targetFolder>src/test/java</targetFolder>
           <namePrefix>S</namePrefix>
             <imports>
@@ -350,10 +415,32 @@
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>${derby.version}</version>
-          </dependency> 
+          </dependency>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
         </dependencies>
       </plugin>    
     </plugins>
   </build>
 
-</project>
+  <profiles>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/querydsl-jpa/src/apt-hibernate/META-INF/services/javax.annotation.processing.Processor b/querydsl-jpa/src/apt-hibernate/META-INF/services/javax.annotation.processing.Processor
index 4f7291436b..bb12f8599e 100644
--- a/querydsl-jpa/src/apt-hibernate/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-jpa/src/apt-hibernate/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.hibernate.HibernateAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.hibernate.HibernateAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-jpa/src/apt/META-INF/services/javax.annotation.processing.Processor b/querydsl-jpa/src/apt/META-INF/services/javax.annotation.processing.Processor
index 4774bfb506..720345c294 100644
--- a/querydsl-jpa/src/apt/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-jpa/src/apt/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.jpa.JPAAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.jpa.JPAAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-jpa/src/main/assembly-hibernate.xml b/querydsl-jpa/src/main/assembly-hibernate.xml
index 49405bfd89..cec7aa7c90 100644
--- a/querydsl-jpa/src/main/assembly-hibernate.xml
+++ b/querydsl-jpa/src/main/assembly-hibernate.xml
@@ -21,18 +21,16 @@
       <unpack>true</unpack>
       <excludes>
         <exclude>cglib:cglib</exclude>
-        <exclude>com.mysema.querydsl:querydsl-sql</exclude>
-        <exclude>com.mysema.querydsl:querydsl-jpa</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>                    
+        <exclude>com.querydsl:querydsl-sql</exclude>
+        <exclude>com.querydsl:querydsl-jpa</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
       <unpack>true</unpack>
       <scope>provided</scope>
       <includes>
-        <include>com.mysema.querydsl:*</include>
-        <include>com.mysema.codegen:*</include>
+        <include>com.querydsl:*</include>
+        <include>com.querydsl.codegen.utils:*</include>
         <include>org.hibernate:hibernate-core</include>
         <include>org.hibernate.javax.persistence:*</include>
       </includes>
diff --git a/querydsl-jpa/src/main/assembly.xml b/querydsl-jpa/src/main/assembly.xml
index df3483aa98..24669eba05 100644
--- a/querydsl-jpa/src/main/assembly.xml
+++ b/querydsl-jpa/src/main/assembly.xml
@@ -27,18 +27,16 @@
       <unpack>true</unpack>
       <excludes>
         <exclude>cglib:cglib</exclude>
-        <exclude>com.mysema.querydsl:querydsl-sql</exclude>
-        <exclude>com.mysema.querydsl:querydsl-jpa</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>org.slf4j:slf4j-log4j12</exclude>                
+        <exclude>com.querydsl:querydsl-sql</exclude>
+        <exclude>com.querydsl:querydsl-jpa</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
       <unpack>true</unpack>
       <scope>provided</scope>
       <includes>
-        <include>com.mysema.querydsl:*</include>
-        <include>com.mysema.codegen:*</include>
+        <include>com.querydsl:*</include>
+        <include>com.querydsl.codegen.utils:*</include>
         <include>org.hibernate.javax.persistence:*</include>
       </includes>
     </dependencySet>
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPASubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPASubQuery.java
deleted file mode 100644
index b32254377e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPASubQuery.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.DetachableQuery;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-
-/**
- * Abstract superclass for SubQuery implementations
- *
- * @author tiwe
- *
- * @param <Q> concrete subtype
- */
-public class AbstractJPASubQuery<Q extends AbstractJPASubQuery<Q>> extends DetachableQuery<Q> implements JPQLSubQuery {
-
-    private final JPAQueryMixin<Q> queryMixin;
-
-    public AbstractJPASubQuery() {
-        this(new DefaultQueryMetadata().noValidate());
-    }
-
-    @SuppressWarnings("unchecked")
-    public AbstractJPASubQuery(QueryMetadata metadata) {
-        super(new JPAQueryMixin<Q>(metadata));
-        super.queryMixin.setSelf((Q)this);
-        this.queryMixin = (JPAQueryMixin<Q>) super.queryMixin;
-    }
-
-    @Override
-    public NumberSubQuery<Long> count() {
-        StringBuilder count = new StringBuilder();
-        for (JoinExpression join : queryMixin.getMetadata().getJoins()) {
-            if (join.getType() == JoinType.DEFAULT) {
-                count.append(count.length() == 0 ? "count(" : ", ");
-                count.append(join.getTarget().toString());
-            }
-        }
-        count.append(")");
-        return unique(NumberTemplate.create(Long.class, count.toString()));
-    }
-
-    public Q from(EntityPath<?> o) {
-        return queryMixin.from(o);
-    }
-
-    @Override
-    public Q from(EntityPath<?>... o) {
-        return queryMixin.from(o);
-    }
-
-    @Override
-    public <P> Q fullJoin(CollectionExpression<?,P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    @Override
-    public <P> Q fullJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q fullJoin(EntityPath<P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    @Override
-    public <P> Q fullJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q fullJoin(MapExpression<?,P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    @Override
-    public <P> Q fullJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q innerJoin(CollectionExpression<?,P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    @Override
-    public <P> Q innerJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q innerJoin(EntityPath<P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    @Override
-    public <P> Q innerJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q innerJoin(MapExpression<?,P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    @Override
-    public <P> Q innerJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q join(CollectionExpression<?,P> target) {
-        return queryMixin.join(target);
-    }
-
-    @Override
-    public <P> Q join(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    public <P> Q join(EntityPath<P> target) {
-        return queryMixin.join(target);
-    }
-
-    @Override
-    public <P> Q join(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    public <P> Q join(MapExpression<?,P> target) {
-        return queryMixin.join(target);
-    }
-
-    @Override
-    public <P> Q join(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    public <P> Q leftJoin(CollectionExpression<?,P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    @Override
-    public <P> Q leftJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q leftJoin(EntityPath<P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    @Override
-    public <P> Q leftJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q leftJoin(MapExpression<?,P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    @Override
-    public <P> Q leftJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q rightJoin(CollectionExpression<?,P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    @Override
-    public <P> Q rightJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q rightJoin(EntityPath<P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    @Override
-    public <P> Q rightJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @Override
-    public <P> Q rightJoin(MapExpression<?,P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    @Override
-    public <P> Q rightJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    public Q on(Predicate condition) {
-        return queryMixin.on(condition);
-    }
-
-    @Override
-    public Q on(Predicate... conditions) {
-        return queryMixin.on(conditions);
-    }
-
-    @Override
-    public Q limit(long l) {
-        throw new UnsupportedOperationException("JPQL doesn't support limit on subqueries");
-    }
-
-    @Override
-    public Q offset(long o) {
-        throw new UnsupportedOperationException("JPQL doesn't support offset on subqueries");
-    }
-
-    @Override
-    public String toString() {
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            JPQLSerializer serializer = new JPQLSerializer(JPQLTemplates.DEFAULT, null);
-            serializer.setStrict(false);
-            serializer.serialize(queryMixin.getMetadata(), false, null);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java
deleted file mode 100644
index f253c24d2e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.ProjectableSQLQuery;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.TemplateExpression;
-
-import javax.persistence.Entity;
-
-/**
- * Abstract super class for SQLQuery implementation for JPA and Hibernate
- *
- * @author tiwe
- *
- * @param <Q> concrete subtype
- */
-public abstract class AbstractSQLQuery<Q extends AbstractSQLQuery<Q>> extends ProjectableSQLQuery<Q> {
-
-    private static final class NativeQueryMixin<T> extends QueryMixin<T> {
-        private NativeQueryMixin(QueryMetadata metadata) {
-            super(metadata, false);
-        }
-
-        @Override
-        public <RT> Expression<RT> convert(Expression<RT> expr, boolean forOrder) {
-            return Conversions.convertForNativeQuery(super.convert(expr, forOrder));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public AbstractSQLQuery(QueryMetadata metadata, Configuration configuration) {
-        super(new NativeQueryMixin<Q>(metadata), configuration);
-        this.queryMixin.setSelf((Q) this);
-    }
-
-    protected boolean isEntityExpression(Expression<?> expr) {
-        return expr instanceof EntityPath || expr.getType().isAnnotationPresent(Entity.class);
-    }
-
-    protected Expression<?> extractEntityExpression(Expression<?> expr) {
-        if (expr instanceof Operation) {
-            return ((Operation<?>)expr).getArg(0);
-        } else if (expr instanceof TemplateExpression) {
-            return (Expression<?>) ((TemplateExpression<?>)expr).getArg(0);
-        } else {
-            return expr;
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/Conversions.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/Conversions.java
deleted file mode 100644
index 02d73bb13e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/Conversions.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLOps;
-import com.mysema.query.support.EnumConversion;
-import com.mysema.query.support.NumberConversion;
-import com.mysema.query.support.NumberConversions;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-
-/**
- * Conversions provides module specific projection conversion functionality
- *
- * @author tiwe
- *
- */
-public final class Conversions {
-
-    public static <RT> Expression<RT> convert(Expression<RT> expr) {
-        if (isAggSumWithConversion(expr) || isCountAggConversion(expr)) {
-            return new NumberConversion<RT>(expr);
-        } else if (expr instanceof FactoryExpression) {
-            FactoryExpression<RT> factorye = (FactoryExpression<RT>)expr;
-            for (Expression<?> e : factorye.getArgs()) {
-                if (isAggSumWithConversion(e) || isCountAggConversion(expr)) {
-                    return new NumberConversions<RT>(factorye);
-                }
-            }
-        }
-        return expr;
-    }
-
-    private static boolean isEntityPathAndNeedsWrapping(Expression<?> expr) {
-        if ((expr instanceof Path && expr.getType().isAnnotationPresent(Entity.class)) ||
-            (expr instanceof EntityPath && !RelationalPath.class.isInstance(expr))) {
-            Path<?> path = (Path<?>)expr;
-            if (path.getMetadata().getParent() == null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static <RT> FactoryExpression<RT> createEntityPathConversions(FactoryExpression<RT> factorye) {
-        List<Expression<?>> conversions = Lists.newArrayList();
-        for (Expression<?> e : factorye.getArgs()) {
-            if (isEntityPathAndNeedsWrapping(e)) {
-                conversions.add(OperationImpl.create(e.getType(), SQLOps.ALL, e));
-            } else {
-                conversions.add(e);
-            }
-        }
-        return FactoryExpressionUtils.wrap(factorye, conversions);
-    }
-
-    public static <RT> Expression<RT> convertForNativeQuery(Expression<RT> expr) {
-        if (isEntityPathAndNeedsWrapping(expr)) {
-            return OperationImpl.create(expr.getType(), SQLOps.ALL, expr);
-        } else if (Number.class.isAssignableFrom(expr.getType())) {
-            return new NumberConversion<RT>(expr);
-        } else if (Enum.class.isAssignableFrom(expr.getType())) {
-            return new EnumConversion<RT>(expr);
-        } else if (expr instanceof FactoryExpression) {
-            FactoryExpression<RT> factorye = (FactoryExpression<RT>)expr;
-            boolean numberConversions = false;
-            boolean hasEntityPath = false;
-            for (Expression<?> e : factorye.getArgs()) {
-                if (isEntityPathAndNeedsWrapping(e)) {
-                    hasEntityPath = true;
-                } else if (Number.class.isAssignableFrom(e.getType())) {
-                    numberConversions = true;
-                } else if (Enum.class.isAssignableFrom(e.getType())) {
-                    numberConversions = true;
-                }
-            }
-            if (hasEntityPath) {
-                factorye = createEntityPathConversions(factorye);
-            }
-            if (numberConversions) {
-                factorye = new NumberConversions<RT>(factorye);
-            }
-            return factorye;
-        }
-        return expr;
-    }
-
-    private static boolean isAggSumWithConversion(Expression<?> expr) {
-        expr = ExpressionUtils.extract(expr);
-        if (expr instanceof Operation) {
-            Operation<?> operation = (Operation<?>)expr;
-            Class<?> type = operation.getType();
-            if (type.equals(Float.class) || type.equals(Integer.class) || type.equals(Long.class)
-                    || type.equals(Short.class) || type.equals(Byte.class)) {
-                if (operation.getOperator() == Ops.AggOps.SUM_AGG) {
-                    return true;
-                } else {
-                    for (Expression<?> e : operation.getArgs()) {
-                        if (isAggSumWithConversion(e)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean isCountAggConversion(Expression<?> expr) {
-        expr = ExpressionUtils.extract(expr);
-        if (expr instanceof Operation) {
-            Operation<?> operation = (Operation<?>)expr;
-            return operation.getOperator() == Ops.AggOps.COUNT_AGG;
-        }
-        return false;
-    }
-
-    private Conversions() {}
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/DefaultQueryHandler.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/DefaultQueryHandler.java
deleted file mode 100644
index f8072dce02..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/DefaultQueryHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.Iterator;
-
-import javax.annotation.Nullable;
-import javax.persistence.Query;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.types.FactoryExpression;
-
-/**
- * @author tiwe
- *
- */
-public final class DefaultQueryHandler implements QueryHandler {
-
-    public static final QueryHandler DEFAULT = new DefaultQueryHandler();
-
-    @Override
-    public void addEntity(Query query, String alias, Class<?> type) {
-        // do nothing
-    }
-
-    @Override
-    public void addScalar(Query query, String alias, Class<?> type) {
-        // do nothing
-    }
-
-    @Override
-    public boolean createNativeQueryTyped() {
-        return true;
-    }
-
-    @Override
-    public <T> CloseableIterator<T> iterate(Query query, @Nullable final FactoryExpression<?> projection) {
-        Iterator<T> iterator = query.getResultList().iterator();
-        if (projection != null) {
-            return new TransformingIterator<T>(iterator, projection);
-        } else {
-            return new IteratorAdapter<T>(iterator);
-        }
-    }
-
-    @Override
-    public boolean transform(Query query, FactoryExpression<?> projection) {
-        return false;
-    }
-
-    @Override
-    public boolean wrapEntityProjections() {
-        return false;
-    }
-
-    private DefaultQueryHandler() {}
-
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkHandler.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkHandler.java
deleted file mode 100644
index 0dc1a1cf07..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.persistence.Query;
-
-import org.eclipse.persistence.config.QueryHints;
-import org.eclipse.persistence.config.ResultSetType;
-import org.eclipse.persistence.jpa.JpaQuery;
-import org.eclipse.persistence.queries.Cursor;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.types.FactoryExpression;
-
-/**
- *
- * @author tiwe
- *
- */
-public class EclipseLinkHandler implements QueryHandler {
-
-    @Override
-    public void addEntity(Query query, String alias, Class<?> type) {
-        // do nothing
-    }
-
-    @Override
-    public void addScalar(Query query, String alias, Class<?> type) {
-        // do nothing
-    }
-
-    @Override
-    public boolean createNativeQueryTyped() {
-        return true;
-    }
-
-    @Override
-    public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
-        Iterator<T> iterator = null;
-        Closeable closeable = null;
-        if (query instanceof JpaQuery) {
-            JpaQuery<T> elQuery = (JpaQuery<T>) query;
-            elQuery.setHint(QueryHints.RESULT_SET_TYPE, ResultSetType.ForwardOnly);
-            elQuery.setHint(QueryHints.SCROLLABLE_CURSOR, true);
-            final Cursor cursor = elQuery.getResultCursor();
-            closeable = new Closeable() {
-                @Override
-                public void close() throws IOException {
-                    cursor.close();
-                }
-            };
-            iterator = cursor;
-        } else {
-            iterator = query.getResultList().iterator();
-        }
-        if (projection != null) {
-            return new TransformingIterator<T>(iterator, closeable, projection);
-        } else {
-            return new IteratorAdapter<T>(iterator, closeable);
-        }
-    }
-
-    @Override
-    public boolean transform(Query query, FactoryExpression<?> projection) {
-        return false;
-    }
-
-    @Override
-    public boolean wrapEntityProjections() {
-        return false;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java
deleted file mode 100644
index e1131e1ff3..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableMap;
-import com.mysema.query.types.Ops;
-
-/**
- * EclipseLinkTemplates extends JPQLTemplates with EclipseLink specific extensions
- *
- * @author tiwe
- *
- */
-public class EclipseLinkTemplates extends JPQLTemplates {
-
-    private static final QueryHandler QUERY_HANDLER;
-
-    static {
-        QueryHandler instance;
-        try {
-            instance = (QueryHandler) Class.forName("com.mysema.query.jpa.EclipseLinkHandler").newInstance();
-        } catch (NoClassDefFoundError e) {
-            instance = DefaultQueryHandler.DEFAULT;
-        } catch (Exception e) {
-            instance = DefaultQueryHandler.DEFAULT;
-        }
-        QUERY_HANDLER = instance;
-    }
-
-
-    public static final EclipseLinkTemplates DEFAULT = new EclipseLinkTemplates();
-
-    private final Map<Class<?>, String> typeNames;
-
-    public EclipseLinkTemplates() {
-        this(DEFAULT_ESCAPE);
-    }
-
-    public EclipseLinkTemplates(char escape) {
-        super(escape, QUERY_HANDLER);
-
-        ImmutableMap.Builder<Class<?>, String> builder = ImmutableMap.builder();
-        builder.put(Short.class, "short");
-        builder.put(Integer.class, "integer");
-        builder.put(Long.class, "bigint");
-        builder.put(BigInteger.class, "bigint");
-        builder.put(Float.class, "float");
-        builder.put(Double.class, "double");
-        builder.put(BigDecimal.class, "double");
-        typeNames = builder.build();
-
-        add(Ops.CHAR_AT, "substring({0},{1}+1,1)");
-        add(JPQLOps.CAST, "cast({0} {1s})");
-        add(Ops.STRING_CAST, "cast({0} varchar(255))");
-        add(Ops.NUMCAST, "cast({0} {1s})");
-
-        // datetime
-        add(Ops.DateTimeOps.MILLISECOND, "extract(microsecond from {0})");
-        add(Ops.DateTimeOps.SECOND, "extract(second from {0})");
-        add(Ops.DateTimeOps.MINUTE, "extract(minute from {0})");
-        add(Ops.DateTimeOps.HOUR, "extract(hour from {0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "extract(day from {0})");
-        add(Ops.DateTimeOps.MONTH, "extract(month from {0})");
-        add(Ops.DateTimeOps.YEAR, "extract(year from {0})");
-    }
-
-    @Override
-    public String getTypeForCast(Class<?> cl) {
-        return typeNames.get(cl);
-    }
-
-    @Override
-    public boolean isPathInEntitiesSupported() {
-        return false;
-    }
-
-    @Override
-    public boolean isSelect1Supported() {
-        return true;
-    }
-
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HQLTemplates.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/HQLTemplates.java
deleted file mode 100644
index 77b255616a..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HQLTemplates.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableMap;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.PathType;
-
-/**
- * HQLTemplates extends JPQLTemplates with Hibernate specific extensions
- *
- * @author tiwe
- *
- */
-public class HQLTemplates extends JPQLTemplates {
-
-    private static final QueryHandler QUERY_HANDLER;
-
-    static {
-        QueryHandler instance;
-        try {
-            instance = (QueryHandler) Class.forName("com.mysema.query.jpa.HibernateHandler").newInstance();
-        } catch (NoClassDefFoundError e) {
-            instance = DefaultQueryHandler.DEFAULT;
-        } catch (Exception e) {
-            instance = DefaultQueryHandler.DEFAULT;
-        }
-        QUERY_HANDLER = instance;
-    }
-
-    private static final List<Operator<?>> wrapElements = Arrays.<Operator<?>> asList(
-            Ops.QuantOps.ALL,
-            Ops.QuantOps.ANY,
-            Ops.QuantOps.AVG_IN_COL,
-            Ops.EXISTS);
-
-    public static final HQLTemplates DEFAULT = new HQLTemplates();
-
-    private final Map<Class<?>, String> typeNames;
-
-    public HQLTemplates() {
-        this(DEFAULT_ESCAPE);
-    }
-
-    public HQLTemplates(char escape) {
-        super(escape, QUERY_HANDLER);
-
-        ImmutableMap.Builder<Class<?>, String> builder = ImmutableMap.builder();
-        builder.put(Byte.class, "byte");
-        builder.put(Short.class, "short");
-        builder.put(Integer.class, "integer");
-        builder.put(Long.class, "long");
-        builder.put(BigInteger.class, "big_integer");
-        builder.put(Float.class, "float");
-        builder.put(Double.class, "double");
-        builder.put(BigDecimal.class, "big_decimal");
-        typeNames = builder.build();
-
-        // TODO : remove this when Hibernate supports type(alias)
-        add(Ops.INSTANCE_OF, "{0}.class = {1}");
-        // TODO : remove this when Hibernate supports type(alias)
-        add(JPQLOps.TYPE, "{0}.class");
-        // TODO : remove this when Hibernate supports member of properly
-        add(JPQLOps.MEMBER_OF, "{0} in elements({1})");
-        add(JPQLOps.NOT_MEMBER_OF, "{0} not in elements({1})");
-
-        // path types
-        for (PathType type : new PathType[] {
-                PathType.LISTVALUE,
-                PathType.MAPVALUE,
-                PathType.MAPVALUE_CONSTANT }) {
-            add(type, "{0}[{1}]");
-        }
-        add(PathType.LISTVALUE_CONSTANT, "{0}[{1s}]");
-        add(PathType.COLLECTION_ANY, "any elements({0})");
-
-        add(Ops.CONTAINS_KEY, "{1} in indices({0})");
-        add(Ops.CONTAINS_VALUE, "{1} in elements({0})");
-    }
-
-    @Override
-    public boolean wrapElements(Operator<?> operator) {
-        return wrapElements.contains(operator);
-    }
-
-    @Override
-    public boolean isTypeAsString() {
-        return true;
-    }
-
-    @Override
-    public String getTypeForCast(Class<?> cl) {
-        return typeNames.get(cl);
-    }
-
-    @Override
-    public String getExistsProjection() {
-        return "1";
-    }
-
-    @Override
-    public boolean isSelect1Supported() {
-        // TODO return true, when JPQLTemplates becomes standard
-        return false;
-    }
-
-    @Override
-    public boolean isEnumInPathSupported() {
-        // related : http://opensource.atlassian.com/projects/hibernate/browse/HHH-5159
-        return false;
-    }
-
-    @Override
-    public boolean wrapConstant(Object constant) {
-        // related : https://hibernate.onjira.com/browse/HHH-6913
-        Class<?> type = constant.getClass();
-        return type.isArray() || Collection.class.isAssignableFrom(type);
-    }
-
-    @Override
-    public boolean isWithForOn() {
-        return true;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateHandler.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateHandler.java
deleted file mode 100644
index a3e5ab9549..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.Iterator;
-
-import javax.persistence.Query;
-
-import org.hibernate.SQLQuery;
-import org.hibernate.ScrollMode;
-import org.hibernate.ScrollableResults;
-import org.hibernate.ejb.HibernateQuery;
-import org.hibernate.transform.ResultTransformer;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.types.FactoryExpression;
-
-/**
- * @author tiwe
- *
- */
-public class HibernateHandler implements QueryHandler {
-
-    @Override
-    public void addEntity(Query query, String alias, Class<?> type) {
-        if (query instanceof HibernateQuery) {
-            org.hibernate.Query hibernateQuery = ((HibernateQuery)query).getHibernateQuery();
-            if (hibernateQuery instanceof SQLQuery) {
-                ((SQLQuery)hibernateQuery).addEntity(alias, type);
-            }
-        }
-    }
-
-    @Override
-    public void addScalar(Query query, String alias, Class<?> type) {
-        if (query instanceof HibernateQuery) {
-            org.hibernate.Query hibernateQuery = ((HibernateQuery)query).getHibernateQuery();
-            if (hibernateQuery instanceof SQLQuery) {
-                ((SQLQuery)hibernateQuery).addScalar(alias);
-            }
-        }
-    }
-
-    @Override
-    public boolean createNativeQueryTyped() {
-        return false;
-    }
-
-    @Override
-    public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
-        if (query instanceof HibernateQuery) {
-            HibernateQuery hQuery = (HibernateQuery)query;
-            ScrollableResults results = hQuery.getHibernateQuery().scroll(ScrollMode.FORWARD_ONLY);
-            CloseableIterator<T> iterator = new ScrollableResultsIterator<T>(results);
-            if (projection != null) {
-                iterator = new TransformingIterator<T>(iterator, projection);
-            }
-            return iterator;
-        } else {
-            Iterator<T> iterator = query.getResultList().iterator();
-            if (projection != null) {
-                return new TransformingIterator<T>(iterator, projection);
-            } else {
-                return new IteratorAdapter<T>(iterator);
-            }
-        }
-    }
-
-    @Override
-    public boolean transform(Query query, FactoryExpression<?> projection) {
-        if (query instanceof HibernateQuery) {
-            ResultTransformer transformer = new FactoryExpressionTransformer(projection);
-            ((HibernateQuery)query).getHibernateQuery().setResultTransformer(transformer);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean wrapEntityProjections() {
-        return true;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACollectionAnyVisitor.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACollectionAnyVisitor.java
deleted file mode 100644
index 812b510448..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACollectionAnyVisitor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.UUID;
-
-import javax.persistence.Entity;
-
-import com.mysema.query.support.CollectionAnyVisitor;
-import com.mysema.query.support.Context;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-import com.mysema.query.types.ToStringVisitor;
-import com.mysema.query.types.path.EntityPathBase;
-
-/**
- * JPACollectionAnyVisitor extends the {@link CollectionAnyVisitor} class with module specific
- * extensions
- *
- * @author tiwe
- *
- */
-public final class JPACollectionAnyVisitor extends CollectionAnyVisitor {
-
-    public static final JPACollectionAnyVisitor DEFAULT = new JPACollectionAnyVisitor();
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected Predicate exists(Context c, Predicate condition) {
-        JPASubQuery query = new JPASubQuery();
-        for (int i = 0; i < c.paths.size(); i++) {
-            Path<?> child = c.paths.get(i).getMetadata().getParent();
-            EntityPath<Object> replacement = (EntityPath<Object>) c.replacements.get(i);
-            if (c.paths.get(i).getType().isAnnotationPresent(Entity.class)) {
-                query.from(replacement);
-                query.where(PredicateOperation.create(Ops.IN, replacement, child));
-            } else {
-                // join via parent
-                Path<?> parent = child.getMetadata().getParent();
-                String prefix = parent.accept(ToStringVisitor.DEFAULT, TEMPLATES).replace('.', '_');
-                String suffix = UUID.randomUUID().toString().replace("-", "").substring(0,5);
-                EntityPathBase<Object> newParent = new EntityPathBase<Object>(parent.getType(), prefix + suffix);
-                EntityPath<Object> newChild = new EntityPathBase<Object>(child.getType(),
-                        PathMetadataFactory.forProperty(newParent, child.getMetadata().getName()));
-                query.from(newParent).innerJoin(newChild, replacement);
-                query.where(ExpressionUtils.eq(newParent, parent));
-            }
-        }
-        c.clear();
-        query.where(condition);
-        return query.exists();
-    }
-
-    private JPACollectionAnyVisitor() {}
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACommonQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACommonQuery.java
deleted file mode 100644
index 5f979d64e1..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPACommonQuery.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.Query;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * JPACommonQuery is a common interface for queries and subqueries of this module
- * 
- * @author tiwe
- *
- * @param <Q>
- */
-public interface JPACommonQuery<Q extends JPACommonQuery<Q>> extends Query<Q> {
-    
-    /**
-     * Set the sources of this query
-     *
-     * @param sources
-     * @return
-     */
-    Q from(EntityPath<?>... sources);
-
-    /**
-     * Create a inner join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q innerJoin(EntityPath<P> target);
-
-    /**
-     * Create a inner join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q innerJoin(EntityPath<P> target, Path<P> alias);
-
-    /**
-     * Create a inner join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q innerJoin(CollectionExpression<?, P> target);
-
-    /**
-     * Create a inner join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q innerJoin(CollectionExpression<?,P> target, Path<P> alias);
-
-    /**
-     * Create a inner join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q innerJoin(MapExpression<?, P> target);
-
-    /**
-     * Create a inner join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q innerJoin(MapExpression<?, P> target, Path<P> alias);
-
-    /**
-     * Create a join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q join(EntityPath<P> target);
-
-    /**
-     * Create a join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q join(EntityPath<P> target, Path<P> alias);
-
-    /**
-     * Create a join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q join(CollectionExpression<?,P> target);
-
-    /**
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q join(CollectionExpression<?,P> target, Path<P> alias);
-
-    /**
-     * Create a join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q join(MapExpression<?, P> target);
-
-    /**
-     * Create a join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q join(MapExpression<?, P> target, Path<P> alias);
-
-    /**
-     * Create a left join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q leftJoin(EntityPath<P> target);
-
-    /**
-     * Create a left join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q leftJoin(EntityPath<P> target, Path<P> alias);
-
-    /**
-     * Create a left join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q leftJoin(CollectionExpression<?,P> target);
-
-    /**
-     * Create a left join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q leftJoin(CollectionExpression<?,P> target, Path<P> alias);
-
-    /**
-     * Create a left join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q leftJoin(MapExpression<?, P> target);
-
-    /**
-     * Create a left join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q leftJoin(MapExpression<?, P> target, Path<P> alias);
-    
-    /**
-     * Create a right join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q rightJoin(EntityPath<P> target);
-
-    /**
-     * Create a right join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q rightJoin(EntityPath<P> target, Path<P> alias);
-
-    /**
-     * Create a right join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q rightJoin(CollectionExpression<?,P> target);
-
-    /**
-     * Create a right join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q rightJoin(CollectionExpression<?,P> target, Path<P> alias);
-
-    /**
-     * Create a right join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q rightJoin(MapExpression<?, P> target);
-
-    /**
-     * Create a right join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q rightJoin(MapExpression<?, P> target, Path<P> alias);
-
-
-    /**
-     * Create a full join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q fullJoin(EntityPath<P> target);
-
-    /**
-     * Create a full join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q fullJoin(EntityPath<P> target, Path<P> alias);
-
-    /**
-     * Create a full join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q fullJoin(CollectionExpression<?,P> target);
-
-    /**
-     * Create a full join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q fullJoin(CollectionExpression<?,P> target, Path<P> alias);
-
-    /**
-     * Create a full join with the given target.
-     * Use fetch() to add the fetch parameter to this join.
-     *
-     * @param <P>
-     * @param target
-     * @return
-     */
-    <P> Q fullJoin(MapExpression<?, P> target);
-
-    /**
-     * Create a full join with the given target and alias.
-     *
-     * @param <P>
-     * @param target
-     * @param alias
-     * @return
-     */
-    <P> Q fullJoin(MapExpression<?, P> target, Path<P> alias);
-    
-    /**
-     * Add join conditions to the last added join
-     *
-     * @param condition
-     * @return
-     */
-    Q on(Predicate... condition);
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAExpressions.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAExpressions.java
deleted file mode 100644
index 3df05e29fe..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAExpressions.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.ComparableOperation;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * JPAExpressions provides factory methods for JPQL specific operations
- * elements.
- *
- * @author tiwe
- */
-@SuppressWarnings("unchecked")
-public final class JPAExpressions {
-
-    /**
-     * Get the avg(col) expression
-     *
-     * @param col
-     * @return
-     */
-    public static <A extends Comparable<? super A>> ComparableExpression<A> avg(CollectionExpression<?,A> col) {
-        return ComparableOperation.create((Class)col.getParameter(0), Ops.QuantOps.AVG_IN_COL, (Expression<?>)col);
-    }
-
-    /**
-     * Get the max(col) expression
-     *
-     * @param left
-     * @return
-     */
-    public static <A extends Comparable<? super A>> ComparableExpression<A> max(CollectionExpression<?,A> left) {
-        return ComparableOperation.create((Class)left.getParameter(0), Ops.QuantOps.MAX_IN_COL, (Expression<?>)left);
-    }
-
-    /**
-     * Get the min(col) expression
-     *
-     * @param left
-     * @return
-     */
-    public static <A extends Comparable<? super A>> ComparableExpression<A> min(CollectionExpression<?,A> left) {
-        return ComparableOperation.create((Class)left.getParameter(0), Ops.QuantOps.MIN_IN_COL, (Expression<?>)left);
-    }
-
-    /**
-     * Get the type(path) expression
-     *
-     * @param path
-     * @return
-     */
-    public static StringExpression type(EntityPath<?> path) {
-        return StringOperation.create(JPQLOps.TYPE, path);
-    }
-
-    private JPAExpressions() {}
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryBase.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryBase.java
deleted file mode 100644
index 323bf6aea8..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryBase.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.Tuple;
-import com.mysema.query.support.ProjectableQuery;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MapExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.template.NumberTemplate;
-
-/**
- * JPAQueryBase is a base Query class for JPA queries
- *
- * @author tiwe
- */
-public abstract class JPAQueryBase<Q extends JPAQueryBase<Q>> extends ProjectableQuery<Q> implements JPQLQuery {
-
-    protected final JPAQueryMixin<Q> queryMixin;
-
-    private final JPQLTemplates templates;
-
-    @SuppressWarnings("unchecked")
-    public JPAQueryBase(QueryMetadata md, JPQLTemplates templates) {
-        super(new JPAQueryMixin<Q>(md));
-        super.queryMixin.setSelf((Q) this);
-        this.queryMixin = (JPAQueryMixin<Q>) super.queryMixin;
-        this.templates = templates;
-    }
-
-    protected JPQLTemplates getTemplates() {
-        return templates;
-    }
-    
-    protected abstract JPQLSerializer createSerializer();
-    
-    protected JPQLSerializer serialize(boolean forCountRow) {
-        if (queryMixin.getMetadata().getJoins().isEmpty()) {
-            throw new IllegalArgumentException("No joins given");
-        }
-        JPQLSerializer serializer = createSerializer();
-        serializer.serialize(queryMixin.getMetadata(), forCountRow, null);
-        return serializer;
-    }
-
-    protected void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    @Override
-    public boolean exists() {
-        if (templates.isSelect1Supported()) {
-            return limit(1).singleResult(NumberTemplate.ONE) != null;
-        } else {            
-            EntityPath<?> entityPath = (EntityPath<?>) queryMixin.getMetadata().getJoins().get(0).getTarget();
-            return !limit(1).list(entityPath).isEmpty();
-        }                
-    }
-
-    public Q fetch() {
-        return queryMixin.fetch();
-    }
-
-    public Q fetchAll() {
-        return queryMixin.fetchAll();
-    }
-
-    public Q from(EntityPath<?> arg) {
-        return queryMixin.from(arg);
-    }
-    
-    public Q from(EntityPath<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    public <P> Q fullJoin(CollectionExpression<?,P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    public <P> Q fullJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    public <P> Q fullJoin(EntityPath<P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    public <P> Q fullJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    public <P> Q fullJoin(MapExpression<?,P> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    public <P> Q fullJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    public <P> Q innerJoin(CollectionExpression<?,P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    public <P> Q innerJoin(CollectionExpression<?,P>target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    public <P> Q innerJoin(EntityPath<P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    public <P> Q innerJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    public <P> Q innerJoin(MapExpression<?,P> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    public <P> Q innerJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    public <P> Q join(CollectionExpression<?,P> target) {
-        return queryMixin.join(target);
-    }
-
-    public <P> Q join(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    public <P> Q join(EntityPath<P> target) {
-        return queryMixin.join(target);
-    }
-
-    public <P> Q join(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    public <P> Q join(MapExpression<?,P> target) {
-        return queryMixin.join(target);
-    }
-
-    public <P> Q join(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    public <P> Q leftJoin(CollectionExpression<?,P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    public <P> Q leftJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    public <P> Q leftJoin(EntityPath<P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    public <P> Q leftJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    public <P> Q leftJoin(MapExpression<?,P> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    public <P> Q leftJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    public <P> Q rightJoin(CollectionExpression<?,P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    public <P> Q rightJoin(CollectionExpression<?,P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    public <P> Q rightJoin(EntityPath<P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    public <P> Q rightJoin(EntityPath<P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    public <P> Q rightJoin(MapExpression<?,P> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    public <P> Q rightJoin(MapExpression<?,P> target, Path<P> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-    
-    public Q on(Predicate condition) {
-        return queryMixin.on(condition);
-    }
-    
-    public Q on(Predicate... conditions) {
-        return queryMixin.on(conditions);
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public String toString() {
-        JPQLSerializer serializer = serialize(false);
-        return serializer.toString().trim();
-    }
-
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-    
-    public abstract Q clone();
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryMixin.java
deleted file mode 100644
index 15da7c814a..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryMixin.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import javax.persistence.Entity;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.*;
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.CollectionPathBase;
-
-/**
- * JPAQueryMixin extends {@link QueryMixin} to support JPQL join construction
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class JPAQueryMixin<T> extends QueryMixin<T> {
-
-    private final Set<Path<?>> paths = Sets.newHashSet();
-
-    private final Map<Expression<?>, Path<?>> aliases = Maps.newHashMap();
-
-    private ReplaceVisitor replaceVisitor;
-
-    public static final JoinFlag FETCH = new JoinFlag("fetch ");
-
-    public static final JoinFlag FETCH_ALL_PROPERTIES = new JoinFlag(" fetch all properties");
-
-    public JPAQueryMixin() {}
-
-    public JPAQueryMixin(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-    public JPAQueryMixin(T self, QueryMetadata metadata) {
-        super(self, metadata);
-    }
-
-    public T fetch() {
-        addJoinFlag(FETCH);
-        return getSelf();
-    }
-
-    public T fetchAll() {
-        addJoinFlag(FETCH_ALL_PROPERTIES);
-        return getSelf();
-    }
-
-    @Override
-    protected <D> Expression<D> createAlias(Expression<?> expr, Path<?> alias) {
-        aliases.put(expr, alias);
-        return super.createAlias(expr, alias);
-    }
-
-    private boolean isEntityPath(Path<?> path) {
-        if (path instanceof CollectionPathBase) {
-            return isEntityPath((Path<?>) ((CollectionPathBase)path).any());
-        } else {
-            return path instanceof EntityPath
-                || path.getType().isAnnotationPresent(Entity.class);
-        }
-    }
-
-    private <T> Class<T> getElementTypeOrType(Path<T> path) {
-        if (path instanceof CollectionExpression) {
-            return ((CollectionExpression)path).getParameter(0);
-        } else {
-            return (Class<T>) path.getType();
-        }
-    }
-
-    private <T> Path<T> shorten(Path<T> path, List<Path<?>> paths) {
-        PathMetadata<?> metadata = path.getMetadata();
-        if (metadata.isRoot() || paths.contains(path)) {
-            return path;
-        } else if (aliases.containsKey(path)) {
-            return (Path<T>) aliases.get(path);
-        } else if (metadata.getPathType() == PathType.COLLECTION_ANY) {
-            return (Path<T>) shorten(metadata.getParent(), paths);
-        } else if (!isEntityPath(path)) {
-            Path<?> parent = shorten(metadata.getParent(), paths);
-            if (parent.equals(metadata.getParent())) {
-                return path;
-            } else {
-                return new PathImpl<T>(path.getType(),
-                        new PathMetadata(parent, metadata.getElement(), metadata.getPathType()));
-            }
-        } else if (metadata.getParent().getMetadata().isRoot()) {
-            Class<T> type = getElementTypeOrType(path);
-            Path<T> newPath = new PathImpl<T>(type, path.toString().replace('.', '_'));
-            leftJoin(path, newPath);
-            return newPath;
-        } else {
-            Class<T> type = getElementTypeOrType(path);
-            Path<?> parent = shorten(metadata.getParent(), paths);
-            Path<T> oldPath = new PathImpl<T>(path.getType(),
-                    new PathMetadata(parent, metadata.getElement(), metadata.getPathType()));
-            Path<T> newPath = new PathImpl<T>(type, oldPath.toString().replace('.', '_'));
-            leftJoin(oldPath, newPath);
-            return newPath;
-        }
-    }
-
-    private <T> Path<T> convertPathForOrder(Path<T> path) {
-        PathMetadata<?> metadata = path.getMetadata();
-        // at least three levels
-        if (metadata.getParent() != null && !metadata.getParent().getMetadata().isRoot()) {
-            Set<Expression<?>> exprs = Sets.newHashSet();
-            QueryMetadata md = getMetadata();
-            exprs.addAll(md.getGroupBy());
-            if (md.getWhere() != null) exprs.add(md.getWhere());
-            if (md.getHaving() != null) exprs.add(md.getHaving());
-            List<Path<?>> paths = Lists.newArrayList();
-            // extract paths
-            PathsExtractor.DEFAULT.visit(exprs, paths);
-
-            if (!paths.contains(path) && !paths.contains(metadata.getParent())) {
-                Path<?> shortened = shorten(metadata.getParent(), paths);
-                return new PathImpl<T>(path.getType(),
-                        new PathMetadata(shortened, metadata.getElement(), metadata.getPathType()));
-            } else {
-                return path;
-            }
-        } else {
-            return path;
-        }
-    }
-
-    @Override
-    public <RT> Expression<RT> convert(Expression<RT> expr, boolean forOrder) {
-        if (forOrder) {
-            if (expr instanceof Path) {
-                expr = convertPathForOrder((Path)expr);
-            } else {
-                if (replaceVisitor == null) {
-                    replaceVisitor = new ReplaceVisitor() {
-                        public Expression<?> visit(Path<?> expr, Void context) {
-                            return convertPathForOrder(expr);
-                        }
-                    };
-                }
-                expr = (Expression<RT>)expr.accept(replaceVisitor, null);
-            }
-        }
-        return Conversions.convert(super.convert(expr, forOrder));
-    }
-
-    @Override
-    protected Predicate normalize(Predicate predicate, boolean where) {
-        if (predicate != null) {
-            predicate = (Predicate) ExpressionUtils.extract(predicate);
-        }
-        if (predicate != null) {
-            // transform any usage
-            predicate = (Predicate) predicate.accept(JPACollectionAnyVisitor.DEFAULT, new Context());
-
-            // transform list access
-            Context context = new Context();
-            predicate = (Predicate) predicate.accept(ListAccessVisitor.DEFAULT, context);
-            for (int i = 0; i < context.paths.size(); i++) {
-                Path<?> path = context.paths.get(i);
-                if (!paths.contains(path)) {
-                    addCondition(context, i, path, where);
-                }
-            }
-            return predicate;
-        } else {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCondition(Context context, int i, Path<?> path, boolean where) {
-        paths.add(path);
-        EntityPath<?> alias = context.replacements.get(i);
-        leftJoin((Expression)path.getMetadata().getParent(), context.replacements.get(i));
-        Expression index = OperationImpl.create(Integer.class, JPQLOps.INDEX, alias);
-        Object element = path.getMetadata().getElement();
-        if (!(element instanceof Expression)) {
-            element = ConstantImpl.create(element);
-        }
-        Predicate condition = ExpressionUtils.eq(index, (Expression)element);
-        if (where) {
-            super.where(condition);
-        } else {
-            super.having(condition);
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java
deleted file mode 100644
index 1b415bc305..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.QueryMetadata;
-
-/**
- * JPASubQuery is a subquery class for JPA
- *
- * @author tiwe
- *
- */
-public final class JPASubQuery extends AbstractJPASubQuery<JPASubQuery> {
-
-    public JPASubQuery() {
-        super();
-    }
-
-    public JPASubQuery(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLOps.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLOps.java
deleted file mode 100644
index 16d222879c..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLOps.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class JPQLOps {
-
-    private static final String NS = JPQLOps.class.getName();
-
-    public static final Operator<Object> TREAT = new OperatorImpl<Object>(NS, "TREAT");
-
-    public static final Operator<Integer> INDEX = new OperatorImpl<Integer>(NS, "INDEX");
-
-    public static final Operator<String> TYPE = new OperatorImpl<String>(NS, "TYPE");
-
-    public static final Operator<Object> CAST = new OperatorImpl<Object>(NS, "CAST");
-
-    public static final Operator<Boolean> MEMBER_OF = new OperatorImpl<Boolean>(NS, "MEMBER_OF");
-
-    public static final Operator<Boolean> NOT_MEMBER_OF = new OperatorImpl<Boolean>(NS, "NOT_MEMBER_OF");
-
-    private JPQLOps(){}
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java
deleted file mode 100644
index eab1cc2e16..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQuery.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.Projectable;
-
-/**
- * Query interface for JPQL queries
- *
- * @author tiwe
- *
- */
-public interface JPQLQuery extends JPACommonQuery<JPQLQuery>, Projectable {
-
-    /**
-     * Add the "fetch" flag to the last defined join
-     *
-     * Mind that collection joins might result in duplicate rows and that "inner join fetch"
-     * will restrict your result set.
-     *
-     * @return
-     */
-    JPQLQuery fetch();
-
-    /**
-      * Add the "fetch all properties" flag to the last defined join.
-      * @return
-       */
-    JPQLQuery fetchAll();
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryFactory.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryFactory.java
deleted file mode 100644
index dc0f56987d..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.QueryFactory;
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.types.EntityPath;
-
-/**
- * Common interface for JPA related QueryFactory implementations
- * 
- * @author tiwe
- *
- */
-public interface JPQLQueryFactory extends QueryFactory<JPQLQuery, JPQLSubQuery> {
-
-    /**
-     * Create a new DELETE clause
-     * 
-     * @param path
-     * @return
-     */
-    DeleteClause<?> delete(EntityPath<?> path);
-
-    /**
-     * Create a new Query with the given source
-     * 
-     * @param from
-     * @return
-     */
-    JPQLQuery from(EntityPath<?> from);
-    
-    /**
-     * Create a new UPDATE clause
-     * 
-     * @param path
-     * @return
-     */
-    UpdateClause<?> update(EntityPath<?> path);
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
deleted file mode 100644
index b92feff66b..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.SingularAttribute;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.*;
-import com.mysema.util.MathUtils;
-
-/**
- * JPQLSerializer serializes Querydsl expressions into JPQL syntax.
- *
- * @author tiwe
- */
-public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
-
-    private static final Set<Operator<?>> NUMERIC = ImmutableSet.<Operator<?>>of(
-            Ops.ADD, Ops.SUB, Ops.MULT, Ops.DIV,
-            Ops.LT, Ops.LOE, Ops.GT, Ops.GOE, Ops.BETWEEN);
-
-    private static final String COMMA = ", ";
-
-    private static final String DELETE = "delete from ";
-
-    private static final String FROM = "from ";
-
-    private static final String GROUP_BY = "\ngroup by ";
-
-    private static final String HAVING = "\nhaving ";
-
-    private static final String ORDER_BY = "\norder by ";
-
-    private static final String SELECT = "select ";
-
-    private static final String SELECT_COUNT = "select count(";
-
-    private static final String SELECT_COUNT_DISTINCT = "select count(distinct ";
-
-    private static final String SELECT_DISTINCT = "select distinct ";
-
-    private static final String SET = "\nset ";
-
-    private static final String UPDATE = "update ";
-
-    private static final String WHERE = "\nwhere ";
-
-    private static final String WITH = " with ";
-
-    private static final String ON = " on ";
-
-    private static final Map<JoinType, String> joinTypes = new EnumMap<JoinType, String>(JoinType.class);
-
-    private final JPQLTemplates templates;
-
-    private final EntityManager entityManager;
-
-    private boolean inProjection = false;
-
-    static{
-        joinTypes.put(JoinType.DEFAULT, COMMA);
-        joinTypes.put(JoinType.FULLJOIN, "\n  full join ");
-        joinTypes.put(JoinType.INNERJOIN, "\n  inner join ");
-        joinTypes.put(JoinType.JOIN, "\n  inner join ");
-        joinTypes.put(JoinType.LEFTJOIN, "\n  left join ");
-        joinTypes.put(JoinType.RIGHTJOIN, "\n  right join ");
-    }
-
-    private boolean wrapElements = false;
-
-    public JPQLSerializer(JPQLTemplates templates) {
-        this(templates, null);
-    }
-
-    public JPQLSerializer(JPQLTemplates templates, EntityManager em) {
-        super(templates);
-        this.templates = templates;
-        this.entityManager = em;
-    }
-
-    private String getEntityName(Class<?> clazz) {
-        final Entity entityAnnotation = clazz.getAnnotation(Entity.class);
-        if (entityAnnotation != null && entityAnnotation.name().length() > 0) {
-            return entityAnnotation.name();
-        } else if (clazz.getPackage() != null) {
-            String pn = clazz.getPackage().getName();
-            return clazz.getName().substring(pn.length() + 1);
-        } else {
-            return clazz.getName();
-        }
-    }
-
-    private void handleJoinTarget(JoinExpression je) {
-        // type specifier
-        if (je.getTarget() instanceof EntityPath<?>) {
-            final EntityPath<?> pe = (EntityPath<?>) je.getTarget();
-            if (pe.getMetadata().isRoot()) {
-                append(getEntityName(pe.getType()));
-                append(" ");
-            }
-            handle(je.getTarget());
-        } else if (je.getTarget() instanceof Operation) {
-            Operation<?> op = (Operation)je.getTarget();
-            if (op.getOperator() == Ops.ALIAS) {
-                boolean treat = false;
-                if (Collection.class.isAssignableFrom(op.getArg(0).getType())) {
-                    if (op.getArg(0) instanceof CollectionExpression) {
-                        Class<?> par = ((CollectionExpression)op.getArg(0)).getParameter(0);
-                        treat = !par.equals(op.getArg(1).getType());
-                    }
-                } else if (Map.class.isAssignableFrom(op.getArg(0).getType())) {
-                    if (op.getArg(0) instanceof MapExpression) {
-                        Class<?> par = ((MapExpression)op.getArg(0)).getParameter(1);
-                        treat = !par.equals(op.getArg(1).getType());
-                    }
-                } else {
-                    treat = !op.getArg(0).getType().equals(op.getArg(1).getType());
-                }
-                if (treat) {
-                    Expression<?> entityName = ConstantImpl.create(getEntityName(op.getArg(1).getType()));
-                    Expression<?> t = OperationImpl.create(op.getType(), JPQLOps.TREAT, op.getArg(0), entityName);
-                    op = OperationImpl.create(op.getType(), Ops.ALIAS, t, op.getArg(1));
-                }
-            }
-            handle(op);
-        } else {
-            handle(je.getTarget());
-        }
-    }
-
-    public void serialize(QueryMetadata metadata, boolean forCountRow, @Nullable String projection) {
-        final List<? extends Expression<?>> select = metadata.getProjection();
-        final List<JoinExpression> joins = metadata.getJoins();
-        final Predicate where = metadata.getWhere();
-        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
-        final Predicate having = metadata.getHaving();
-        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
-
-        // select
-        boolean inProjectionOrig = inProjection;
-        inProjection = true;
-        if (projection != null) {
-            append(SELECT).append(projection).append("\n");
-
-        } else if (forCountRow) {
-            if (!metadata.isDistinct()) {
-                append(SELECT_COUNT);
-            } else {
-                append(SELECT_COUNT_DISTINCT);
-            }
-            if(!select.isEmpty()) {
-                if (select.get(0) instanceof FactoryExpression) {
-                    handle(joins.get(0).getTarget());
-                } else {
-                    // TODO : make sure this works
-                    handle(COMMA, select);
-                }
-            } else {
-                handle(joins.get(0).getTarget());
-            }
-            append(")\n");
-
-        } else {
-            if (!metadata.isDistinct()) {
-                append(SELECT);
-            } else {
-                append(SELECT_DISTINCT);
-            }
-            if (!select.isEmpty()) {
-                handle(COMMA, select);
-            } else {
-                handle(metadata.getJoins().get(0).getTarget());
-            }
-            append("\n");
-
-        }
-        inProjection = inProjectionOrig;
-
-        // from
-        append(FROM);
-        serializeSources(forCountRow, joins);
-
-        // where
-        if (where != null) {
-            append(WHERE).handle(where);
-        }
-
-        // group by
-        if (!groupBy.isEmpty()) {
-            append(GROUP_BY).handle(COMMA, groupBy);
-        }
-
-        // having
-        if (having != null) {
-            append(HAVING).handle(having);
-        }
-
-        // order by
-        if (!orderBy.isEmpty() && !forCountRow) {
-            append(ORDER_BY);
-            boolean first = true;
-            for (final OrderSpecifier<?> os : orderBy) {
-                if (!first) {
-                    append(COMMA);
-                }
-                handle(os.getTarget());
-                append(os.getOrder() == Order.ASC ? " asc" : " desc");
-                if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
-                    append(" nulls first");
-                } else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
-                    append(" nulls last");
-                }
-                first = false;
-            }
-        }
-    }
-
-    public void serializeForDelete(QueryMetadata md) {
-        append(DELETE);
-        handleJoinTarget(md.getJoins().get(0));
-        if (md.getWhere() != null) {
-            append(WHERE).handle(md.getWhere());
-        }
-    }
-
-    public void serializeForUpdate(QueryMetadata md) {
-        append(UPDATE);
-        handleJoinTarget(md.getJoins().get(0));
-        append(SET);
-        handle(COMMA, md.getProjection());
-        if (md.getWhere() != null) {
-            append(WHERE).handle(md.getWhere());
-        }
-    }
-
-    private void serializeSources(boolean forCountRow, List<JoinExpression> joins) {
-        for (int i = 0; i < joins.size(); i++) {
-            final JoinExpression je = joins.get(i);
-            if (i > 0) {
-                append(joinTypes.get(je.getType()));
-            }
-            if (je.hasFlag(JPAQueryMixin.FETCH) && !forCountRow) {
-                handle(JPAQueryMixin.FETCH);
-            }
-            handleJoinTarget(je);
-            // XXX Hibernate specific flag
-            if (je.hasFlag(JPAQueryMixin.FETCH_ALL_PROPERTIES) && !forCountRow) {
-                handle(JPAQueryMixin.FETCH_ALL_PROPERTIES);
-            }
-
-            if (je.getCondition() != null) {
-                append(templates.isWithForOn() ? WITH : ON);
-                handle(je.getCondition());
-            }
-        }
-    }
-
-    @Override
-    public void visitConstant(Object constant) {
-        boolean wrap = templates.wrapConstant(constant);
-        if (wrap) {
-             append("(");
-        }
-        append("?");
-        if (!getConstantToLabel().containsKey(constant)) {
-            final String constLabel = String.valueOf(getConstantToLabel().size()+1);
-            getConstantToLabel().put(constant, constLabel);
-            append(constLabel);
-        } else {
-            append(getConstantToLabel().get(constant));
-        }
-        if (wrap) {
-            append(")");
-        }
-    }
-
-    @Override
-    public Void visit(ParamExpression<?> param, Void context) {
-        append("?");
-        if (!getConstantToLabel().containsKey(param)) {
-            final String paramLabel = String.valueOf(getConstantToLabel().size()+1);
-            getConstantToLabel().put(param, paramLabel);
-            append(paramLabel);
-        } else {
-            append(getConstantToLabel().get(param));
-        }
-        return null;
-    }
-
-    @Override
-    public Void visit(SubQueryExpression<?> query, Void context) {
-        append("(");
-        serialize(query.getMetadata(), false, null);
-        append(")");
-        return null;
-    }
-
-    @Override
-    public Void visit(Path<?> expr, Void context) {
-        // only wrap a PathCollection, if it the pathType is PROPERTY
-        boolean wrap = wrapElements
-        && (Collection.class.isAssignableFrom(expr.getType()) || Map.class.isAssignableFrom(expr.getType()))
-        && expr.getMetadata().getPathType().equals(PathType.PROPERTY);
-        if (wrap) {
-            append("elements(");
-        }
-        super.visit(expr, context);
-        if (wrap) {
-            append(")");
-        }
-        return null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void visitOperation(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        boolean old = wrapElements;
-        wrapElements = templates.wrapElements(operator);
-
-        if (operator == Ops.EQ && args.get(1) instanceof Operation &&
-                ((Operation)args.get(1)).getOperator() == Ops.QuantOps.ANY) {
-            args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation)args.get(1)).getArg(0));
-            visitOperation(type, Ops.IN, args);
-
-        } else if (operator == Ops.NE && args.get(1) instanceof Operation &&
-                ((Operation)args.get(1)).getOperator() == Ops.QuantOps.ANY) {
-            args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation)args.get(1)).getArg(0));
-            visitOperation(type, Ops.NOT_IN, args);
-
-        } else if (operator == Ops.IN || operator == Ops.NOT_IN) {
-            if (args.get(1) instanceof Path) {
-                visitAnyInPath(type, operator, args);
-            } else if (args.get(0) instanceof Path && args.get(1) instanceof Constant) {
-                visitPathInCollection(type, operator, args);
-            } else {
-                super.visitOperation(type, operator, args);
-            }
-
-        } else if (operator == Ops.INSTANCE_OF) {
-            visitInstanceOf(type, operator, args);
-
-        } else if (operator == Ops.NUMCAST) {
-            visitNumCast(args);
-
-        } else if (operator == Ops.EXISTS && args.get(0) instanceof SubQueryExpression) {
-            final SubQueryExpression subQuery = (SubQueryExpression) args.get(0);
-            append("exists (");
-            serialize(subQuery.getMetadata(), false, templates.getExistsProjection());
-            append(")");
-
-        } else if (operator == Ops.MATCHES || operator == Ops.MATCHES_IC) {
-            super.visitOperation(type, Ops.LIKE,
-                    ImmutableList.of(args.get(0), ExpressionUtils.regexToLike((Expression<String>) args.get(1))));
-
-        } else if (operator == Ops.LIKE && args.get(1) instanceof Constant) {
-            final String escape = String.valueOf(templates.getEscapeChar());
-            final String escaped = args.get(1).toString().replace(escape, escape + escape);
-            super.visitOperation(String.class, Ops.LIKE,
-                    ImmutableList.of(args.get(0), ConstantImpl.create(escaped)));
-
-        } else if (NUMERIC.contains(operator)) {
-            super.visitOperation(type, operator, normalizeNumericArgs(args));
-
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-
-        wrapElements = old;
-    }
-
-    private void visitNumCast(List<? extends Expression<?>> args) {
-        final Class<?> targetType = (Class<?>) ((Constant<?>) args.get(1)).getConstant();
-        final String typeName = templates.getTypeForCast(targetType);
-        visitOperation(targetType, JPQLOps.CAST, ImmutableList.of(args.get(0), ConstantImpl.create(typeName)));
-    }
-
-    private void visitInstanceOf(Class<?> type, Operator<?> operator,
-            List<? extends Expression<?>> args) {
-        if (templates.isTypeAsString()) {
-            final List<Expression<?>> newArgs = new ArrayList<Expression<?>>(args);
-            final Class<?> cl = ((Class<?>) ((Constant<?>) newArgs.get(1)).getConstant());
-            // use discriminator value instead of fqnm
-            if (cl.getAnnotation(DiscriminatorValue.class) != null) {
-                newArgs.set(1, ConstantImpl.create(cl.getAnnotation(DiscriminatorValue.class).value()));
-            } else {
-                newArgs.set(1, ConstantImpl.create(cl.getSimpleName()));
-            }
-            super.visitOperation(type, operator, newArgs);
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private void visitPathInCollection(Class<?> type, Operator<?> operator,
-            List<? extends Expression<?>> args) {
-        // NOTE turns entityPath in collection into entityPath.id in (collection of ids)
-        if (entityManager != null && !templates.isPathInEntitiesSupported() && args.get(0).getType().isAnnotationPresent(Entity.class)) {
-            Path<?> lhs = (Path<?>) args.get(0);
-            Constant<?> rhs = (Constant<?>) args.get(1);
-            final Metamodel metamodel = entityManager.getMetamodel();
-            final PersistenceUnitUtil util = entityManager.getEntityManagerFactory().getPersistenceUnitUtil();
-            final EntityType<?> entityType = metamodel.entity(args.get(0).getType());
-            if (entityType.hasSingleIdAttribute()) {
-                SingularAttribute<?,?> id = getIdProperty(entityType);
-                // turn lhs into id path
-                lhs = new PathImpl(id.getJavaType(), lhs, id.getName());
-                // turn rhs into id collection
-                Set ids = new HashSet();
-                for (Object entity : (Collection<?>)rhs.getConstant()) {
-                    ids.add(util.getIdentifier(entity));
-                }
-                rhs = ConstantImpl.create(ids);
-                args = ImmutableList.of(lhs, rhs);
-            }
-        }
-        super.visitOperation(type, operator, args);
-    }
-
-    @SuppressWarnings("rawtypes")
-    private SingularAttribute<?,?> getIdProperty(EntityType entity) {
-        final Set<SingularAttribute> singularAttributes = entity.getSingularAttributes();
-        for (final SingularAttribute singularAttribute : singularAttributes) {
-            if (singularAttribute.isId()) {
-                return singularAttribute;
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private void visitAnyInPath(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        if (!templates.isEnumInPathSupported() && args.get(0) instanceof Constant && Enum.class.isAssignableFrom(args.get(0).getType())) {
-            final Enumerated enumerated = ((Path)args.get(1)).getAnnotatedElement().getAnnotation(Enumerated.class);
-            final Enum constant = (Enum)((Constant)args.get(0)).getConstant();
-            if (enumerated == null || enumerated.value() == EnumType.ORDINAL) {
-                args = ImmutableList.of(ConstantImpl.create(constant.ordinal()), args.get(1));
-            } else {
-                args = ImmutableList.of(ConstantImpl.create(constant.name()), args.get(1));
-            }
-        }
-        super.visitOperation(type,
-                operator == Ops.IN ? JPQLOps.MEMBER_OF : JPQLOps.NOT_MEMBER_OF,
-                args);
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private List<? extends Expression<?>> normalizeNumericArgs(List<? extends Expression<?>> args) {
-        boolean hasConstants = false;
-        Class<? extends Number> numType = null;
-        for (Expression<?> arg : args) {
-            if (Number.class.isAssignableFrom(arg.getType())) {
-                if (arg instanceof Constant) {
-                    hasConstants = true;
-                } else {
-                    numType = (Class<? extends Number>) arg.getType();
-                }
-            }
-        }
-        if (hasConstants && numType != null) {
-            final List<Expression<?>> newArgs = new ArrayList<Expression<?>>(args.size());
-            for (final Expression<?> arg : args) {
-                if (arg instanceof Constant && Number.class.isAssignableFrom(arg.getType())
-                        && !arg.getType().equals(numType)) {
-                    final Number number = (Number) ((Constant)arg).getConstant();
-                    newArgs.add(ConstantImpl.create(MathUtils.cast(number, (Class)numType)));
-                } else {
-                    newArgs.add(arg);
-                }
-            }
-            return newArgs;
-        } else {
-            return args;
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java
deleted file mode 100644
index a3032829ab..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSubQuery.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.Detachable;
-
-/**
- * @author tiwe
- *
- */
-public interface JPQLSubQuery extends Detachable, JPACommonQuery<JPQLSubQuery>{
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java
deleted file mode 100644
index a2179d238e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLTemplates.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.Templates;
-
-/**
- * JPQLTemplates extends {@link Templates} to provide operator patterns for JPQL
- * serialization
- *
- * @author tiwe
- * @see HQLTemplates
- * @see EclipseLinkTemplates
- */
-public class JPQLTemplates extends Templates {
-
-    public static final char DEFAULT_ESCAPE = '!';
-
-    public static final JPQLTemplates DEFAULT = new JPQLTemplates();
-
-    private final QueryHandler queryHandler;
-
-    protected JPQLTemplates() {
-        this(DEFAULT_ESCAPE, DefaultQueryHandler.DEFAULT);
-    }
-
-    protected JPQLTemplates(char escape) {
-        this(escape, DefaultQueryHandler.DEFAULT);
-    }
-
-    protected JPQLTemplates(char escape, QueryHandler queryHandler) {
-        super(escape);
-        this.queryHandler = queryHandler;
-
-        add(Ops.CASE, "case {0} end");
-        add(Ops.CASE_WHEN,  "when {0} then {1} {2}", 0);
-        add(Ops.CASE_ELSE,  "else {0}", 0);
-
-        //CHECKSTYLE:OFF
-        // boolean
-        add(Ops.AND, "{0} and {1}", 36);
-        add(Ops.NOT, "not {0}", 3);
-        add(Ops.OR, "{0} or {1}", 38);
-        add(Ops.XNOR, "{0} xnor {1}", 39);
-        add(Ops.XOR, "{0} xor {1}", 39);
-
-        // comparison
-        add(Ops.BETWEEN, "{0} between {1} and {2}", 30);
-
-        // numeric
-        add(Ops.MathOps.SQRT, "sqrt({0})");
-        add(Ops.MOD, "mod({0},{1})", 0);
-
-        // various
-        add(Ops.NE, "{0} <> {1}", 25);
-        add(Ops.IS_NULL, "{0} is null", 26);
-        add(Ops.IS_NOT_NULL, "{0} is not null", 26);
-        add(JPQLOps.CAST, "cast({0} as {1s})");
-        add(Ops.NUMCAST, "cast({0} as {1s})");
-
-        // collection
-        add(JPQLOps.MEMBER_OF, "{0} member of {1}");
-        add(JPQLOps.NOT_MEMBER_OF, "{0} not member of {1}");
-
-        add(Ops.IN, "{0} in {1}");
-        add(Ops.NOT_IN, "{0} not in {1}");
-        add(Ops.COL_IS_EMPTY, "{0} is empty");
-        add(Ops.COL_SIZE, "size({0})");
-        add(Ops.ARRAY_SIZE, "size({0})");
-
-        // string
-        add(Ops.LIKE, "{0} like {1} escape '"+escape+"'",1);
-        add(Ops.CONCAT, "concat({0},{1})",0);
-        add(Ops.MATCHES, "{0} like {1}  escape '"+escape+"'", 27); // TODO : support real regexes
-        add(Ops.MATCHES_IC, "{0} like {1} escape '"+escape+"'", 27); // TODO : support real regexes
-        add(Ops.LOWER, "lower({0})");
-        add(Ops.SUBSTR_1ARG, "substring({0},{1s}+1)", 1);
-        add(Ops.SUBSTR_2ARGS, "substring({0},{1s}+1,{2s}-{1s})", 1);
-        add(Ops.TRIM, "trim({0})");
-        add(Ops.UPPER, "upper({0})");
-        add(Ops.EQ_IGNORE_CASE, "{0l} = {1l}");
-        add(Ops.CHAR_AT, "cast(substring({0},{1s}+1,1) as char)");
-        add(Ops.STRING_IS_EMPTY, "length({0}) = 0");
-
-        add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '"+escape+"'");
-        add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '"+escape+"'");
-        add(Ops.ENDS_WITH, "{0} like {%1} escape '"+escape+"'");
-        add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '"+escape+"'");
-        add(Ops.STARTS_WITH, "{0} like {1%} escape '"+escape+"'");
-        add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '"+escape+"'");
-        add(Ops.INDEX_OF, "locate({1},{0})-1");
-        add(Ops.INDEX_OF_2ARGS, "locate({1},{0},{2s}+1)-1");
-
-        // date time
-        add(Ops.DateTimeOps.SYSDATE, "sysdate");
-        add(Ops.DateTimeOps.CURRENT_DATE, "current_date");
-        add(Ops.DateTimeOps.CURRENT_TIME, "current_time");
-        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp");
-
-        add(Ops.DateTimeOps.MILLISECOND, "0"); // NOT supported in HQL
-        add(Ops.DateTimeOps.SECOND, "second({0})");
-        add(Ops.DateTimeOps.MINUTE, "minute({0})");
-        add(Ops.DateTimeOps.HOUR, "hour({0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
-        add(Ops.DateTimeOps.MONTH, "month({0})");
-        add(Ops.DateTimeOps.YEAR, "year({0})");
-
-        add(Ops.DateTimeOps.YEAR_MONTH, "year({0}) * 100 + month({0})");
-
-        // path types
-        add(PathType.PROPERTY, "{0}.{1s}");
-        add(PathType.VARIABLE, "{0s}");
-
-        // case for eq
-        add(Ops.CASE_EQ, "case {1} end");
-        add(Ops.CASE_EQ_WHEN,  "when {0} = {1} then {2} {3}");
-        add(Ops.CASE_EQ_ELSE,  "else {0}");
-
-        add(Ops.INSTANCE_OF, "type({0}) = {1}");
-        add(JPQLOps.TYPE, "type({0})");
-        add(JPQLOps.INDEX, "index({0})");
-        add(JPQLOps.TREAT, "treat({0} as {1s})");
-
-        //CHECKSTYLE:ON
-    }
-
-    public boolean wrapElements(Operator<?> operator) {
-        return false;
-    }
-
-    public boolean isTypeAsString() {
-        // TODO : get rid of this when Hibernate supports type(alias)
-        return false;
-    }
-
-    public String getTypeForCast(Class<?> cl) {
-        return cl.getSimpleName().toLowerCase();
-    }
-
-    public boolean isEnumInPathSupported() {
-        return true;
-    }
-
-    public boolean isPathInEntitiesSupported() {
-        return true;
-    }
-
-    public boolean isSelect1Supported() {
-        return false;
-    }
-
-    @Nullable
-    public String getExistsProjection() {
-        return null;
-    }
-
-    public boolean wrapConstant(Object constant) {
-        // related : https://hibernate.onjira.com/browse/HHH-6913
-        return false;
-    }
-
-    public boolean isWithForOn() {
-        return false;
-    }
-
-    public QueryHandler getQueryHandler() {
-        return queryHandler;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java
deleted file mode 100644
index 76611e4dff..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.*;
-import com.mysema.query.types.*;
-
-import java.util.*;
-
-/**
- * NativeSQLSerializer extends the SQLSerializer class to extract referenced entity paths and change
- * some serialization formats
- *
- * @author tiwe
- *
- */
-public final class NativeSQLSerializer extends SQLSerializer {
-
-    private final Map<Expression<?>, String> aliases = Maps.newHashMap();
-
-    private final boolean wrapEntityProjections;
-
-    public NativeSQLSerializer(Configuration configuration) {
-        this(configuration, false);
-    }
-
-    public NativeSQLSerializer(Configuration configuration, boolean wrapEntityProjections) {
-        super(configuration);
-        this.wrapEntityProjections = wrapEntityProjections;
-    }
-
-    private boolean isAlias(Expression<?> expr) {
-        return expr instanceof Operation && ((Operation<?>)expr).getOperator() == Ops.ALIAS;
-    }
-
-    public Map<Expression<?>, String> getAliases() {
-        return aliases;
-    }
-
-    private boolean isAllExpression(Expression<?> expr) {
-        if (expr instanceof Operation) {
-            return ((Operation<?>)expr).getOperator() == SQLOps.ALL;
-        } else if (expr instanceof TemplateExpression) {
-            return ((TemplateExpression<?>)expr).getTemplate().toString().equals("*");
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public void serialize(QueryMetadata metadata, boolean forCountRow) {
-        // TODO get rid of this wrapping when Hibernate doesn't require unique aliases anymore
-        int size = metadata.getProjection().size();
-        Expression<?>[] args = metadata.getProjection().toArray(new Expression<?>[size]);
-        boolean modified = false;
-        Set<String> used = new HashSet<String>();
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] instanceof Path) {
-                Path<?> path = (Path<?>)args[i];
-                if (!used.add(path.getMetadata().getName())) {
-                    String alias = "col__"+(i+1);
-                    aliases.put(args[i], alias);
-                    args[i] = ExpressionUtils.as(args[i], alias);
-                    modified = true;
-                } else {
-                    aliases.put(path, ColumnMetadata.getName(path));
-                }
-            } else if (args[i] instanceof FactoryExpression) {
-                FactoryExpression<?> factoryExpr = (FactoryExpression<?>)args[i];
-                List<Expression<?>> fargs = Lists.newArrayList(factoryExpr.getArgs());
-                for (int j = 0; j < fargs.size(); j++) {
-                    if (fargs.get(j) instanceof Path) {
-                        Path<?> path = (Path<?>) fargs.get(j);
-                        String columnName = ColumnMetadata.getName(path);
-                        if (!used.add(columnName)) {
-                            String alias = "col__"+(i+1)+"_"+(j+1);
-                            aliases.put(path, alias);
-                            fargs.set(j, ExpressionUtils.as(fargs.get(j), alias));
-                        } else {
-                            aliases.put(path, columnName);
-                        }
-                    } else if (isAlias(fargs.get(j))) {
-                        Operation<?> operation = (Operation<?>)fargs.get(j);
-                        aliases.put(operation, operation.getArg(1).toString());
-                    } else if (!isAllExpression(fargs.get(j))) {
-                        String alias = "col__"+(i+1)+"_"+(j+1);
-                        aliases.put(fargs.get(j), alias);
-                        fargs.set(j, ExpressionUtils.as(fargs.get(j), alias));
-                    }
-                }
-                args[i] = new QTuple(ImmutableList.copyOf(fargs));
-                modified = true;
-            } else if (isAlias(args[i])) {
-                Operation<?> operation = (Operation<?>)args[i];
-                aliases.put(operation, operation.getArg(1).toString());
-            } else {
-                // https://github.com/mysema/querydsl/issues/80
-                if (!isAllExpression(args[i])) {
-                    String alias = "col__"+(i+1);
-                    aliases.put(args[i], alias);
-                    args[i] = ExpressionUtils.as(args[i], alias);
-                    modified = true;
-                }
-            }
-        }
-        if (modified) {
-            metadata = metadata.clone();
-            metadata.clearProjection();
-            for (Expression<?> arg : args) {
-                metadata.addProjection(arg);
-            }
-        }
-        super.serialize(metadata, forCountRow);
-    }
-
-    @Override
-    public void visitConstant(Object constant) {
-        if (constant instanceof Collection<?>) {
-            append("(");
-            boolean first = true;
-            for (Object element : ((Collection<?>)constant)) {
-                if (!first) {
-                    append(", ");
-                }
-                visitConstant(element);
-                first = false;
-            }
-            append(")");
-        } else if (!getConstantToLabel().containsKey(constant)) {
-            String constLabel = String.valueOf(getConstantToLabel().size() + 1);
-            getConstantToLabel().put(constant, constLabel);
-            append("?"+constLabel);
-        } else {
-            append("?"+getConstantToLabel().get(constant));
-        }
-    }
-
-    @Override
-    protected void visitOperation(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        if (operator == SQLOps.ALL
-                && !RelationalPath.class.isInstance(args.get(0))
-                && wrapEntityProjections) {
-            append("{");
-            super.visitOperation(type, operator, args);
-            append("}");
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/OpenJPATemplates.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/OpenJPATemplates.java
deleted file mode 100644
index fbef17757a..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/OpenJPATemplates.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.PathType;
-
-/**
- * OpenJPATemplates extends JPQLTemplates with OpenJPA specific extensions
- *
- * @author tiwe
- *
- */
-public class OpenJPATemplates extends JPQLTemplates{
-
-    public static final OpenJPATemplates DEFAULT = new OpenJPATemplates();
-
-    public OpenJPATemplates() {
-        this(DEFAULT_ESCAPE);
-        add(PathType.VARIABLE, "{0s}_");
-        add(Ops.ALIAS, "{0} {1}");
-        add(Ops.NEGATE, "-1 * {0}", 7);
-    }
-
-    public OpenJPATemplates(char escape) {
-        super(escape);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/QueryHandler.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/QueryHandler.java
deleted file mode 100644
index 705126e6eb..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/QueryHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import javax.annotation.Nullable;
-import javax.persistence.Query;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.types.FactoryExpression;
-
-/**
- * QueryHandler provides injection of provider specific functionality into the query logic
- *
- * @author tiwe
- *
- */
-public interface QueryHandler {
-
-    /**
-     * @return
-     */
-    boolean createNativeQueryTyped();
-
-    /**
-     * Iterate the results with the optional projection
-     *
-     * @param query
-     * @return
-     */
-    <T> CloseableIterator<T> iterate(Query query, @Nullable FactoryExpression<?> projection);
-
-    /**
-     * Add the given scalar to the given native query
-     *
-     * @param query
-     * @param alias
-     * @param type
-     */
-    void addScalar(Query query, String alias, Class<?> type);
-
-    /**
-     * Add the given entity to the given native query
-     *
-     * @param query
-     * @param alias
-     * @param type
-     */
-    void addEntity(Query query, String alias, Class<?> type);
-
-    /**
-     * Transform the results of the given query using the given factory expression
-     *
-     * @param query
-     * @param projection
-     * @return
-     */
-    boolean transform(Query query, FactoryExpression<?> projection);
-
-    /**
-     * @return
-     */
-    boolean wrapEntityProjections();
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java
deleted file mode 100644
index f84eeb5299..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.hibernate.FlushMode;
-import org.hibernate.LockMode;
-import org.hibernate.Query;
-import org.hibernate.ScrollMode;
-import org.hibernate.ScrollableResults;
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.jpa.FactoryExpressionTransformer;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPAQueryBase;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.jpa.ScrollableResultsIterator;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import com.mysema.query.types.Path;
-
-/**
- * Abstract base class for Hibernate API based implementations of the JPQL interface
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public abstract class AbstractHibernateQuery<Q extends AbstractHibernateQuery<Q>> extends JPAQueryBase<Q> {
-
-    private static final Logger logger = LoggerFactory.getLogger(HibernateQuery.class);
-
-    @Nullable
-    protected Boolean cacheable, readOnly;
-
-    @Nullable
-    protected String cacheRegion, comment;
-
-    protected int fetchSize = 0;
-
-    protected final Map<Path<?>,LockMode> lockModes = new HashMap<Path<?>,LockMode>();
-
-    @Nullable
-    protected FlushMode flushMode;
-
-    private final SessionHolder session;
-
-    protected int timeout = 0;
-
-    public AbstractHibernateQuery(Session session) {
-        this(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
-    }
-
-    public AbstractHibernateQuery(SessionHolder session, JPQLTemplates patterns, QueryMetadata metadata) {
-        super(metadata, patterns);
-        this.session = session;
-    }
-
-    @Override
-    public long count() {
-        QueryModifiers modifiers = getMetadata().getModifiers();
-        Query query = createQuery(modifiers, true);
-        reset();
-        Long rv = (Long)query.uniqueResult();
-        if (rv != null) {
-            return rv.longValue();
-        } else {
-            throw new QueryException("Query returned null");
-        }
-    }
-
-    /**
-     * Expose the original Hibernate query for the given projection
-     *
-     * @param expr
-     * @return
-     */
-    public Query createQuery(Expression<?> expr) {
-        queryMixin.addProjection(expr);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    /**
-     * Expose the original Hibernate query for the given projection
-     *
-     * @param expr1
-     * @param expr2
-     * @param rest
-     * @return
-     */
-    public Query createQuery(Expression<?> expr1, Expression<?> expr2, Expression<?>... rest) {
-        queryMixin.addProjection(expr1);
-        queryMixin.addProjection(expr2);
-        queryMixin.addProjection(rest);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    /**
-     * Expose the original Hibernate query for the given projection
-     *
-     * @param args
-     * @return
-     */
-    public Query createQuery(Expression<?>[] args) {
-        queryMixin.addProjection(args);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    private Query createQuery(@Nullable QueryModifiers modifiers, boolean forCount) {
-        JPQLSerializer serializer = serialize(forCount);
-        String queryString = serializer.toString();
-        logQuery(queryString);
-        Query query = session.createQuery(queryString);
-        HibernateUtil.setConstants(query, serializer.getConstantToLabel(), getMetadata().getParams());
-        if (fetchSize > 0) {
-            query.setFetchSize(fetchSize);
-        }
-        if (timeout > 0) {
-            query.setTimeout(timeout);
-        }
-        if (cacheable != null) {
-            query.setCacheable(cacheable);
-        }
-        if (cacheRegion != null) {
-            query.setCacheRegion(cacheRegion);
-        }
-        if (comment != null) {
-            query.setComment(comment);
-        }
-        if (readOnly != null) {
-            query.setReadOnly(readOnly);
-        }
-        for (Map.Entry<Path<?>, LockMode> entry : lockModes.entrySet()) {
-            query.setLockMode(entry.getKey().toString(), entry.getValue());
-        }
-        if (flushMode != null) {
-            query.setFlushMode(flushMode);
-        }
-
-        if (modifiers != null && modifiers.isRestricting()) {
-            Integer limit = modifiers.getLimitAsInteger();
-            Integer offset = modifiers.getOffsetAsInteger();
-            if (limit != null) {
-                query.setMaxResults(limit.intValue());
-            }
-            if (offset != null) {
-                query.setFirstResult(offset.intValue());
-            }
-        }
-
-        // set transformer, if necessary
-        List<? extends Expression<?>> projection = getMetadata().getProjection();
-        if (projection.size() == 1 && !forCount) {
-            Expression<?> expr = projection.get(0);
-            if (expr instanceof FactoryExpression<?>) {
-                query.setResultTransformer(new FactoryExpressionTransformer((FactoryExpression<?>) projection.get(0)));
-            }
-        } else if (!forCount) {
-            FactoryExpression<?> proj = FactoryExpressionUtils.wrap(projection);
-            if (proj != null) {
-                query.setResultTransformer(new FactoryExpressionTransformer(proj));
-            }
-        }
-        return query;
-    }
-
-    /**
-     * Return the query results as an <tt>Iterator</tt>.<br>
-     * <br>
-     * Entities returned as results are initialized on demand. The first
-     * SQL query returns identifiers only.<br>
-     */
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    /**
-     * Return the query results as an <tt>Iterator</tt>. If the query
-     * contains multiple results pre row, the results are returned in
-     * an instance of <tt>Object[]</tt>.<br>
-     * <br>
-     * Entities returned as results are initialized on demand. The first
-     * SQL query returns identifiers only.<br>
-     */
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        Query query = createQuery(projection);
-        reset();
-        ScrollableResults results = query.scroll(ScrollMode.FORWARD_ONLY);
-        return new ScrollableResultsIterator<RT>(results);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> List<RT> list(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        reset();
-        return query.list();
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Query countQuery = createQuery(null, true);
-        long total = (Long) countQuery.uniqueResult();
-        try{
-            if (total > 0) {
-                QueryModifiers modifiers = getMetadata().getModifiers();
-                Query query = createQuery(modifiers, false);
-                @SuppressWarnings("unchecked")
-                List<RT> list = query.list();
-                return new SearchResults<RT>(list, modifiers, total);
-            } else {
-                return SearchResults.emptyResults();
-            }
-        }finally{
-            reset();
-        }
-    }
-
-    protected void logQuery(String queryString) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(queryString.replace('\n', ' '));
-        }
-    }
-
-    /**
-     * Return the query results as <tt>ScrollableResults</tt>. The
-     * scrollability of the returned results depends upon JDBC driver
-     * support for scrollable <tt>ResultSet</tt>s.<br>
-     *
-     * @param mode
-     * @param expr
-     * @return
-     */
-    public ScrollableResults scroll(ScrollMode mode, Expression<?> expr) {
-        Query query = createQuery(expr);
-        reset();
-        return query.scroll(mode);
-    }
-
-    /**
-     * Return the query results as <tt>ScrollableResults</tt>. The
-     * scrollability of the returned results depends upon JDBC driver
-     * support for scrollable <tt>ResultSet</tt>s.<br>
-     *
-     * @param mode
-     * @param args
-     * @return
-     */
-    public ScrollableResults scroll(ScrollMode mode, Expression<?>... args) {
-        Query query = createQuery(args);
-        reset();
-        return query.scroll(mode);
-    }
-
-    /**
-     * Enable caching of this query result set.
-     * @param cacheable Should the query results be cacheable?
-     */
-    @SuppressWarnings("unchecked")
-    public Q setCacheable(boolean cacheable) {
-        this.cacheable = cacheable;
-        return (Q)this;
-    }
-
-    /**
-     * Set the name of the cache region.
-     * @param cacheRegion the name of a query cache region, or <tt>null</tt>
-     * for the default query cache
-     */
-    @SuppressWarnings("unchecked")
-    public Q setCacheRegion(String cacheRegion) {
-        this.cacheRegion = cacheRegion;
-        return (Q)this;
-    }
-
-    /**
-     * Add a comment to the generated SQL.
-     * @param comment
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q setComment(String comment) {
-        this.comment = comment;
-        return (Q)this;
-    }
-
-    /**
-     * Set a fetch size for the underlying JDBC query.
-     * @param fetchSize the fetch size
-     */
-    @SuppressWarnings("unchecked")
-    public Q setFetchSize(int fetchSize) {
-        this.fetchSize = fetchSize;
-        return (Q)this;
-    }
-
-    /**
-     * Set the lock mode for the given path.
-     */
-    @SuppressWarnings("unchecked")
-    public Q setLockMode(Path<?> path, LockMode lockMode) {
-        lockModes.put(path, lockMode);
-        return (Q)this;
-    }
-
-    /**
-     * Override the current session flush mode, just for this query.
-     */
-    @SuppressWarnings("unchecked")
-    public Q setFlushMode(FlushMode flushMode) {
-        this.flushMode = flushMode;
-        return (Q)this;
-    }
-
-    /**
-     * Entities retrieved by this query will be loaded in
-     * a read-only mode where Hibernate will never dirty-check
-     * them or make changes persistent.
-     *
-     */
-    @SuppressWarnings("unchecked")
-    public Q setReadOnly(boolean readOnly) {
-        this.readOnly = readOnly;
-        return (Q)this;
-    }
-
-    /**
-     * Set a timeout for the underlying JDBC query.
-     * @param timeout the timeout in seconds
-     */
-    @SuppressWarnings("unchecked")
-    public Q setTimeout(int timeout) {
-        this.timeout = timeout;
-        return (Q)this;
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        return (RT)uniqueResult();
-    }
-
-    private Object uniqueResult() {
-        QueryModifiers modifiers = getMetadata().getModifiers();
-        Query query = createQuery(modifiers, false);
-        reset();
-        try{
-            return query.uniqueResult();
-        } catch (org.hibernate.NonUniqueResultException e) {
-            throw new NonUniqueResultException();
-        }
-    }
-    
-    protected JPQLSerializer createSerializer() {
-        return new JPQLSerializer(getTemplates());
-    }
-    
-    protected void clone(Q query) {
-        cacheable = query.cacheable;
-        cacheRegion = query.cacheRegion;
-        fetchSize = query.fetchSize;
-        flushMode = query.flushMode;
-        lockModes.putAll(query.lockModes);
-        readOnly = query.readOnly;
-        timeout = query.timeout;
-    }
-    
-    protected abstract Q clone(SessionHolder sessionHolder);
-
-    /**
-     * Clone the state of this query to a new instance with the given Session
-     *
-     * @param session
-     * @return
-     */
-    public Q clone(Session session) {
-        return this.clone(new DefaultSessionHolder(session));
-    }
-
-    /**
-     * Clone the state of this query to a new instance with the given StatelessSession
-     *
-     * @param session
-     * @return
-     */
-    public Q clone(StatelessSession session) {
-        return this.clone(new StatelessSessionHolder(session));
-    }
-    
-    /**
-     * Clone the state of this query to a new instance
-     *
-     * @return
-     */
-    public Q clone() {
-        return this.clone(this.session);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java
deleted file mode 100644
index 095e81f09e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-import org.hibernate.Session;
-
-/**
- * DefaultSessionHolder is the default implementation of the {@link SessionHolder} interface
- * 
- * @author tiwe
- *
- */
-public class DefaultSessionHolder implements SessionHolder{
-
-    private final Session session;
-
-    public DefaultSessionHolder(Session session) {
-        this.session = session;
-    }
-
-    @Override
-    public Query createQuery(String queryString) {
-        return session.createQuery(queryString);
-    }
-
-    @Override
-    public SQLQuery createSQLQuery(String queryString) {
-        return session.createSQLQuery(queryString);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java
deleted file mode 100644
index 9efae77656..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import java.util.Map;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Predicate;
-
-/**
- * DeleteClause implementation for Hibernate
- *
- * @author tiwe
- *
- */
-public class HibernateDeleteClause implements DeleteClause<HibernateDeleteClause> {
-
-    private final QueryMetadata md = new DefaultQueryMetadata();
-
-    private final SessionHolder session;
-
-    private final JPQLTemplates templates;
-
-    public HibernateDeleteClause(Session session, EntityPath<?> entity) {
-        this(new DefaultSessionHolder(session), entity, HQLTemplates.DEFAULT);
-    }
-
-    public HibernateDeleteClause(StatelessSession session, EntityPath<?> entity) {
-        this(new StatelessSessionHolder(session), entity, HQLTemplates.DEFAULT);
-    }
-
-    public HibernateDeleteClause(Session session, EntityPath<?> entity, JPQLTemplates templates) {
-        this(new DefaultSessionHolder(session), entity, templates);
-    }
-    
-    public HibernateDeleteClause(SessionHolder session, EntityPath<?> entity, JPQLTemplates templates) {
-        this.session = session;
-        this.templates = templates;
-        md.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    @Override
-    public long execute() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, null);
-        serializer.serializeForDelete(md);
-        Map<Object,String> constants = serializer.getConstantToLabel();
-
-        Query query = session.createQuery(serializer.toString());
-        HibernateUtil.setConstants(query, constants, md.getParams());
-        return query.executeUpdate();
-    }
-    
-    @Override
-    public HibernateDeleteClause where(Predicate... o) {
-        for (Predicate p : o) {
-            md.addWhere(p);    
-        }        
-        return this;
-    }
-    
-    @Override
-    public String toString() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, null);
-        serializer.serializeForDelete(md);
-        return serializer.toString();
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java
deleted file mode 100644
index 3b2005fc69..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLTemplates;
-
-/**
- * HibernateQuery is the default implementation of the JPQLQuery interface for Hibernate
- *
- * @author tiwe
- *
- */
-public final class HibernateQuery extends AbstractHibernateQuery<HibernateQuery> {
-
-    /**
-     * Creates a detached query
-     * The query can be attached via the clone method
-     */
-    public HibernateQuery() {
-        super(NoSessionHolder.DEFAULT, HQLTemplates.DEFAULT, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new Session bound query
-     *
-     * @param session
-     */
-    public HibernateQuery(Session session) {
-        super(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
-    }
-    
-    /**
-     * Creates a new Session bound query
-     *
-     * @param session
-     */
-    public HibernateQuery(Session session, QueryMetadata metadata) {
-        super(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, metadata);
-    }
-
-    /**
-     * Creates a new Session bound query
-     *
-     * @param session
-     * @param templates
-     */
-    public HibernateQuery(Session session, JPQLTemplates templates) {
-        super(new DefaultSessionHolder(session), templates, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new Stateless session bound query
-     *
-     * @param session
-     */
-    public HibernateQuery(StatelessSession session) {
-        super(new StatelessSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new Session bound query
-     * 
-     * @param session
-     * @param templates
-     */
-    public HibernateQuery(SessionHolder session, JPQLTemplates templates) {
-        super(session, templates, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new Session bound query
-     * 
-     * @param session
-     * @param templates
-     * @param metadata
-     */
-    public HibernateQuery(SessionHolder session, JPQLTemplates templates, QueryMetadata metadata) {
-        super(session, templates, metadata);
-    }
-
-    @Override
-    protected HibernateQuery clone(SessionHolder sessionHolder) {
-        HibernateQuery q = new HibernateQuery(sessionHolder, 
-                getTemplates(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQueryFactory.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQueryFactory.java
deleted file mode 100644
index f916868cc9..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQueryFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import javax.inject.Provider;
-
-import org.hibernate.Session;
-
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLQueryFactory;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-
-/**
- * Factory class for query and DML clause creation
- *
- * @author tiwe
- *
- */
-public class HibernateQueryFactory implements JPQLQueryFactory {
-
-    private final JPQLTemplates templates;
-
-    private final Provider<Session> session;
-
-    public HibernateQueryFactory(Provider<Session> session) {
-        this(HQLTemplates.DEFAULT, session);
-    }
-
-    public HibernateQueryFactory(JPQLTemplates templates, Provider<Session> session) {
-        this.session = session;
-        this.templates = templates;
-    }
-
-    public HibernateDeleteClause delete(EntityPath<?> path) {
-        return new HibernateDeleteClause(session.get(), path, templates);
-    }
-
-    public HibernateQuery from(EntityPath<?> from) {
-        return query().from(from);
-    }
-
-    public HibernateUpdateClause update(EntityPath<?> path) {
-        return new HibernateUpdateClause(session.get(), path, templates);
-    }
-
-    public HibernateQuery query() {
-        return new HibernateQuery(session.get(), templates);
-    }
-
-    public HibernateSubQuery subQuery() {
-        return new HibernateSubQuery();
-    }
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java
deleted file mode 100644
index 31ccce3221..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.AbstractJPASubQuery;
-
-/**
- * HibernateSubQuery is a subquery class for Hibernate
- *
- * @author tiwe
- *
- */
-public final class HibernateSubQuery extends AbstractJPASubQuery<HibernateSubQuery> {
-
-    public HibernateSubQuery() {
-        super();
-    }
-
-    public HibernateSubQuery(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java
deleted file mode 100644
index ab75428544..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import java.util.List;
-import java.util.Map;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * UpdateClause implementation for Hibernate
- *
- * @author tiwe
- *
- */
-public class HibernateUpdateClause implements
-        UpdateClause<HibernateUpdateClause> {
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final SessionHolder session;
-
-    private final JPQLTemplates templates;
-
-    public HibernateUpdateClause(Session session, EntityPath<?> entity) {
-        this(new DefaultSessionHolder(session), entity, HQLTemplates.DEFAULT);
-    }
-
-    public HibernateUpdateClause(StatelessSession session, EntityPath<?> entity) {
-        this(new StatelessSessionHolder(session), entity, HQLTemplates.DEFAULT);
-    }
-    
-    public HibernateUpdateClause(Session session, EntityPath<?> entity, JPQLTemplates templates) {
-        this(new DefaultSessionHolder(session), entity, templates);
-    }
-
-    public HibernateUpdateClause(SessionHolder session, EntityPath<?> entity, 
-            JPQLTemplates templates) {
-        this.session = session;
-        this.templates = templates;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    @Override
-    public long execute() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, null);
-        serializer.serializeForUpdate(metadata);
-        Map<Object, String> constants = serializer.getConstantToLabel();
-
-        Query query = session.createQuery(serializer.toString());
-        HibernateUtil.setConstants(query, constants, metadata.getParams());
-        return query.executeUpdate();
-    }
-
-    @Override
-    public <T> HibernateUpdateClause set(Path<T> path, T value) {
-        if (value != null) {
-            metadata.addProjection(ExpressionUtils.eqConst(path, value));
-        } else {
-            setNull(path);
-        }
-        return this;
-    }
-    
-    @Override
-    public <T> HibernateUpdateClause set(Path<T> path, Expression<? extends T> expression) {
-        if (expression != null) {
-            metadata.addProjection(ExpressionUtils.eq(path, expression));    
-        } else {
-            setNull(path);
-        }        
-        return this;
-    }
-    
-    @Override
-    public <T> HibernateUpdateClause setNull(Path<T> path) {
-        metadata.addProjection(ExpressionUtils.eq(path, new NullExpression<T>(path.getType())));
-        return this;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public HibernateUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
-        for (int i = 0; i < paths.size(); i++) {
-            if (values.get(i) != null) {
-                metadata.addProjection(ExpressionUtils.eqConst((Expression)paths.get(i), values.get(i)));
-            } else {
-                metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)),
-                        new NullExpression(paths.get(i).getType())));
-            }
-
-        }
-        return this;
-    }
-
-    @Override
-    public HibernateUpdateClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);    
-        }        
-        return this;
-    }
-    
-    @Override
-    public String toString() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, null);
-        serializer.serializeForUpdate(metadata);
-        return serializer.toString();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return metadata.getProjection().isEmpty();
-    }
-
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java
deleted file mode 100644
index e6634b78b8..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.Query;
-import org.hibernate.type.BigDecimalType;
-import org.hibernate.type.BigIntegerType;
-import org.hibernate.type.ByteType;
-import org.hibernate.type.DoubleType;
-import org.hibernate.type.FloatType;
-import org.hibernate.type.IntegerType;
-import org.hibernate.type.LongType;
-import org.hibernate.type.ShortType;
-import org.hibernate.type.Type;
-
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.expr.Param;
-
-/**
- * HibernateUtil provides static utility methods for Hibernate
- *
- * @author tiwe
- *
- */
-public final class HibernateUtil {
-
-    private static final Map<Class<?>,Type> TYPES = new HashMap<Class<?>,Type>();
-
-    static{
-        TYPES.put(Byte.class, new ByteType());
-        TYPES.put(Short.class, new ShortType());
-        TYPES.put(Integer.class, new IntegerType());
-        TYPES.put(Long.class, new LongType());
-        TYPES.put(BigInteger.class, new BigIntegerType());
-        TYPES.put(Double.class, new DoubleType());
-        TYPES.put(Float.class, new FloatType());
-        TYPES.put(BigDecimal.class, new BigDecimalType());
-    }
-
-    private HibernateUtil() {}
-
-    public static void setConstants(Query query, Map<Object,String> constants, 
-            Map<ParamExpression<?>, Object> params) {
-        for (Map.Entry<Object, String> entry : constants.entrySet()) {
-            String key = entry.getValue();
-            Object val = entry.getKey();
-            if (Param.class.isInstance(val)) {
-                val = params.get(val);
-                if (val == null) {
-                    throw new ParamNotSetException((Param<?>) entry.getKey());
-                }
-            }
-            setValue(query, key, val);
-        }
-    }
-
-    private static void setValue(Query query, String key, Object val) {
-        if (val instanceof Collection<?>) {
-            query.setParameterList(key, (Collection<?>) val);
-        } else if (val.getClass().isArray()) {
-            query.setParameterList(key, (Object[]) val);
-        } else if (TYPES.containsKey(val.getClass())) {
-            query.setParameter(key, val, TYPES.get(val.getClass()));
-        } else {
-            query.setParameter(key, val);
-        }
-    }
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java
deleted file mode 100644
index 8b53ff2ae5..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-
-/**
- * NoSessionHolder is a session holder for detached HibernateQuery usage
- *
- * @author tiwe
- *
- */
-public final class NoSessionHolder implements SessionHolder {
-
-    public static final SessionHolder DEFAULT = new NoSessionHolder();
-
-    private NoSessionHolder() {}
-
-    @Override
-    public Query createQuery(String queryString) {
-        throw new UnsupportedOperationException("No session in detached Query available");
-    }
-
-    @Override
-    public SQLQuery createSQLQuery(String queryString) {
-        throw new UnsupportedOperationException("No session in detached Query available");
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java
deleted file mode 100644
index e970a93814..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-
-/**
- * Abstraction for different Hibernate Session signatures
- *
- * @author tiwe
- *
- */
-public interface SessionHolder {
-
-    /**
-     * Create a JPQL query for the given query string
-     * 
-     * @param queryString
-     * @return
-     */
-    Query createQuery(String queryString);
-
-    /**
-     * Create an SQL query for the given query string
-     * 
-     * @param queryString
-     * @return
-     */
-    SQLQuery createSQLQuery(String queryString);
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java
deleted file mode 100644
index 58170ad500..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate;
-
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-import org.hibernate.StatelessSession;
-
-/**
- * SessionHolder implementation using StatelessSession
- * 
- * @author tiwe
- *
- */
-public class StatelessSessionHolder implements SessionHolder{
-
-    private final StatelessSession session;
-
-    public StatelessSessionHolder(StatelessSession session) {
-        this.session = session;
-    }
-
-    @Override
-    public Query createQuery(String queryString) {
-        return session.createQuery(queryString);
-    }
-
-    @Override
-    public SQLQuery createSQLQuery(String queryString) {
-        return session.createSQLQuery(queryString);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java
deleted file mode 100644
index fd0ca70fc7..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * JPQL for Hibernate
- */
-package com.mysema.query.jpa.hibernate;
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
deleted file mode 100644
index 847b5cf860..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate.sql;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.*;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.jpa.AbstractSQLQuery;
-import com.mysema.query.jpa.FactoryExpressionTransformer;
-import com.mysema.query.jpa.NativeSQLSerializer;
-import com.mysema.query.jpa.ScrollableResultsIterator;
-import com.mysema.query.jpa.hibernate.DefaultSessionHolder;
-import com.mysema.query.jpa.hibernate.HibernateUtil;
-import com.mysema.query.jpa.hibernate.SessionHolder;
-import com.mysema.query.jpa.hibernate.StatelessSessionHolder;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import org.hibernate.Query;
-import org.hibernate.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * AbstractHibernateSQLQuery is the base class for Hibernate Native SQL queries
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public abstract class AbstractHibernateSQLQuery<Q extends AbstractHibernateSQLQuery<Q>> extends AbstractSQLQuery<Q> {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbstractHibernateSQLQuery.class);
-
-    protected Boolean cacheable, readOnly;
-
-    protected String cacheRegion;
-
-    protected int fetchSize = 0;
-
-    private final SessionHolder session;
-
-    protected int timeout = 0;
-
-    public AbstractHibernateSQLQuery(Session session, Configuration conf) {
-        this(new DefaultSessionHolder(session), conf, new DefaultQueryMetadata());
-    }
-
-    public AbstractHibernateSQLQuery(StatelessSession session, Configuration conf) {
-        this(new StatelessSessionHolder(session), conf, new DefaultQueryMetadata());
-    }
-
-    public AbstractHibernateSQLQuery(SessionHolder session, Configuration conf, QueryMetadata metadata) {
-        super(metadata, conf);
-        this.session = session;
-    }
-
-    public Query createQuery(Expression<?>... args) {
-        queryMixin.getMetadata().setValidate(false);
-        queryMixin.addProjection(args);
-        return createQuery(false);
-    }
-
-    private Query createQuery(boolean forCount) {
-        NativeSQLSerializer serializer = (NativeSQLSerializer) serialize(forCount);
-        String queryString = serializer.toString();
-        logQuery(queryString);
-        org.hibernate.SQLQuery query = session.createSQLQuery(queryString);
-        // set constants
-        HibernateUtil.setConstants(query, serializer.getConstantToLabel(), queryMixin.getMetadata().getParams());
-
-        if (!forCount) {
-            Map<Expression<?>, String> aliases = serializer.getAliases();
-            // set entity paths
-            List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
-            Expression<?> proj = projection.get(0);
-            if (proj instanceof FactoryExpression) {
-                for (Expression<?> expr : ((FactoryExpression<?>)proj).getArgs()) {
-                    if (isEntityExpression(expr)) {
-                        query.addEntity(extractEntityExpression(expr).toString(), expr.getType());
-                    } else if (aliases.containsKey(expr)) {
-                        query.addScalar(aliases.get(expr));
-                    }
-                }
-            } else if (isEntityExpression(proj)) {
-                query.addEntity(extractEntityExpression(proj).toString(), proj.getType());
-            } else if (aliases.containsKey(proj)) {
-                query.addScalar(aliases.get(proj));
-            }
-
-            // set result transformer, if projection is a FactoryExpression instance
-            if (projection.size() == 1 && proj instanceof FactoryExpression) {
-                query.setResultTransformer(new FactoryExpressionTransformer((FactoryExpression<?>) proj));
-            }
-        }
-
-        if (fetchSize > 0) {
-            query.setFetchSize(fetchSize);
-        }
-        if (timeout > 0) {
-            query.setTimeout(timeout);
-        }
-        if (cacheable != null) {
-            query.setCacheable(cacheable);
-        }
-        if (cacheRegion != null) {
-            query.setCacheRegion(cacheRegion);
-        }
-        if (readOnly != null) {
-            query.setReadOnly(readOnly);
-        }
-        return query;
-    }
-
-    @Override
-    protected SQLSerializer createSerializer() {
-        return new NativeSQLSerializer(configuration, true);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        Query query = createQuery(projection);
-        reset();
-        return query.list();
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        Query query = createQuery(projection);
-        reset();
-        ScrollableResults results = query.scroll(ScrollMode.FORWARD_ONLY);
-        return new ScrollableResultsIterator<RT>(results);
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> projection) {
-        // TODO : handle entity projections as well
-        queryMixin.addProjection(projection);
-        Query query = createQuery(true);
-        long total = ((Number)query.uniqueResult()).longValue();
-        if (total > 0) {
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            query = createQuery(false);
-            @SuppressWarnings("unchecked")
-            List<RT> list = query.list();
-            reset();
-            return new SearchResults<RT>(list, modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    protected void logQuery(String queryString) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(queryString.replace('\n', ' '));
-        }
-    }
-
-    protected void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        return (RT)uniqueResult(query);
-    }
-
-    @Nullable
-    private Object uniqueResult(Query query) {
-        reset();
-        try{
-            return query.uniqueResult();
-        }catch (org.hibernate.NonUniqueResultException e) {
-            throw new NonUniqueResultException();
-        }
-    }
-
-    /**
-     * Enable caching of this query result set.
-     * @param cacheable Should the query results be cacheable?
-     */
-    @SuppressWarnings("unchecked")
-    public Q setCacheable(boolean cacheable) {
-        this.cacheable = cacheable;
-        return (Q)this;
-    }
-
-    /**
-     * Set the name of the cache region.
-     * @param cacheRegion the name of a query cache region, or <tt>null</tt>
-     * for the default query cache
-     */
-    @SuppressWarnings("unchecked")
-    public Q setCacheRegion(String cacheRegion) {
-        this.cacheRegion = cacheRegion;
-        return (Q)this;
-    }
-
-    /**
-     * Set a fetch size for the underlying JDBC query.
-     * @param fetchSize the fetch size
-     */
-    @SuppressWarnings("unchecked")
-    public Q setFetchSize(int fetchSize) {
-        this.fetchSize = fetchSize;
-        return (Q)this;
-    }
-
-    /**
-     * Entities retrieved by this query will be loaded in
-     * a read-only mode where Hibernate will never dirty-check
-     * them or make changes persistent.
-     *
-     */
-    @SuppressWarnings("unchecked")
-    public Q setReadOnly(boolean readOnly) {
-        this.readOnly = readOnly;
-        return (Q)this;
-    }
-
-    /**
-     * Set a timeout for the underlying JDBC query.
-     * @param timeout the timeout in seconds
-     */
-    @SuppressWarnings("unchecked")
-    public Q setTimeout(int timeout) {
-        this.timeout = timeout;
-        return (Q)this;
-    }
-    
-    protected void clone(Q query) {
-        super.clone(query);
-        cacheable = query.cacheable;
-        cacheRegion = query.cacheRegion;
-        fetchSize = query.fetchSize;
-        readOnly = query.readOnly;
-        timeout = query.timeout;
-    }
-    
-    protected abstract Q clone(SessionHolder session);
-
-    public Q clone(Session session) {
-        return this.clone(new DefaultSessionHolder(session));
-    }   
-    
-    public Q clone(StatelessSession statelessSession) {
-        return this.clone(new StatelessSessionHolder(statelessSession));
-    }
-
-    @Override
-    public Q clone() {
-        return this.clone(this.session);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
deleted file mode 100644
index 697406976d..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.hibernate.sql;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.hibernate.SessionHolder;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLTemplates;
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-
-/**
- * HibernateSQLQuery is an SQLQuery implementation that uses Hibernate's Native SQL functionality
- * to execute queries
- *
- * @author tiwe
- *
- */
-public final class HibernateSQLQuery extends AbstractHibernateSQLQuery<HibernateSQLQuery> {
-
-    public HibernateSQLQuery(Session session, SQLTemplates sqlTemplates) {
-        super(session, new Configuration(sqlTemplates));
-    }
-    
-    public HibernateSQLQuery(Session session, Configuration conf) {
-        super(session, conf);
-    }
-
-    public HibernateSQLQuery(StatelessSession session, SQLTemplates sqlTemplates) {
-        super(session, new Configuration(sqlTemplates));
-    }
-    
-    public HibernateSQLQuery(StatelessSession session, Configuration conf) {
-        super(session, conf);
-    }
-    
-    public HibernateSQLQuery(SessionHolder session, SQLTemplates sqlTemplates, QueryMetadata metadata) {
-        super(session, new Configuration(sqlTemplates), metadata);
-    }
-    
-    public HibernateSQLQuery(SessionHolder session, Configuration conf, QueryMetadata metadata) {
-        super(session, conf, metadata);
-    }
-
-    @Override
-    protected HibernateSQLQuery clone(SessionHolder sessionHolder) {
-        HibernateSQLQuery q = new HibernateSQLQuery(sessionHolder, configuration, getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/package-info.java
deleted file mode 100644
index 77abe8bb29..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.jpa.hibernate.sql;
-
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java
deleted file mode 100644
index d499c6288e..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.jpa.JPAQueryBase;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.jpa.QueryHandler;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-
-/**
- * Abstract base class for JPA API based implementations of the JPQLQuery interface
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public abstract class AbstractJPAQuery<Q extends AbstractJPAQuery<Q>> extends JPAQueryBase<Q> {
-
-    private static final Logger logger = LoggerFactory.getLogger(JPAQuery.class);
-
-    protected final Multimap<String,Object> hints = HashMultimap.create();
-      
-    protected final EntityManager entityManager;
-    
-    protected final QueryHandler queryHandler;
-
-    @Nullable
-    protected LockModeType lockMode;
-
-    @Nullable
-    protected FlushModeType flushMode;
-
-    @Nullable
-    protected FactoryExpression<?> projection;
-
-    public AbstractJPAQuery(EntityManager em) {
-        this(em, JPAProvider.getTemplates(em), new DefaultQueryMetadata());
-    }
-
-    public AbstractJPAQuery(EntityManager em, JPQLTemplates templates, QueryMetadata metadata) {
-        super(metadata, templates);
-        this.queryHandler = templates.getQueryHandler();
-        this.entityManager = em;
-    }
-
-    @Override
-    public long count() {
-        Query query = createQuery(null, true);
-        reset();
-        return (Long) query.getSingleResult();
-    }
-
-    /**
-     * Expose the original JPA query for the given projection
-     *
-     * @param expr
-     * @return
-     */
-    public Query createQuery(Expression<?> expr) {
-        queryMixin.addProjection(expr);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    /**
-     * Expose the original JPA query for the given projection
-     *
-     * @param expr
-     * @return
-     */
-    public Query createQuery(Expression<?> expr1, Expression<?> expr2, Expression<?>... rest) {
-        queryMixin.addProjection(expr1);
-        queryMixin.addProjection(expr2);
-        queryMixin.addProjection(rest);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    /**
-     * Expose the original JPA query for the given projection
-     *
-     * @param args
-     * @return
-     */
-    public Query createQuery(Expression<?>[] args) {
-        queryMixin.addProjection(args);
-        return createQuery(getMetadata().getModifiers(), false);
-    }
-
-    private Query createQuery(@Nullable QueryModifiers modifiers, boolean forCount) {
-        JPQLSerializer serializer = serialize(forCount);
-        String queryString = serializer.toString();
-        logQuery(queryString);
-        Query query = entityManager.createQuery(queryString);
-        JPAUtil.setConstants(query, serializer.getConstantToLabel(), getMetadata().getParams());
-        if (modifiers != null && modifiers.isRestricting()) {
-            Integer limit = modifiers.getLimitAsInteger();
-            Integer offset = modifiers.getOffsetAsInteger();
-            if (limit != null) {
-                query.setMaxResults(limit.intValue());
-            }
-            if (offset != null) {
-                query.setFirstResult(offset.intValue());
-            }
-        }
-        if (lockMode != null) {
-            query.setLockMode(lockMode);
-        }
-        if (flushMode != null) {
-            query.setFlushMode(flushMode);
-        }
-
-        for (Map.Entry<String, Object> entry : hints.entries()) {
-            query.setHint(entry.getKey(), entry.getValue());
-        }
-
-        // set transformer, if necessary and possible
-        List<? extends Expression<?>> projection = getMetadata().getProjection();
-
-        FactoryExpression<?> wrapped = projection.size() > 1 ? FactoryExpressionUtils.wrap(projection) : null;
-
-        if (!forCount && ((projection.size() == 1 && projection.get(0) instanceof FactoryExpression) || wrapped != null)) {
-            Expression<?> expr = wrapped != null ? wrapped : projection.get(0);
-
-            if (!queryHandler.transform(query, (FactoryExpression<?>)expr)) {
-                this.projection = (FactoryExpression<?>)projection.get(0);
-                if (wrapped != null) {
-                    this.projection = wrapped;
-                    getMetadata().clearProjection();
-                    getMetadata().addProjection(wrapped);
-                }
-            }
-        }
-
-        return query;
-    }
-
-    /**
-     * Transforms results using FactoryExpression if ResultTransformer can't be used
-     *
-     * @param query
-     * @return
-     */
-    private List<?> getResultList(Query query) {
-        // TODO : use lazy list here?
-        if (projection != null) {
-            List<?> results = query.getResultList();
-            List<Object> rv = new ArrayList<Object>(results.size());
-            for (Object o : results) {
-                if (o != null) {
-                    if (!o.getClass().isArray()) {
-                        o = new Object[]{o};
-                    }
-                    rv.add(projection.newInstance((Object[])o));
-                } else {
-                    rv.add(null);
-                }
-            }
-            return rv;
-        } else {
-            return query.getResultList();
-        }
-    }
-
-    /**
-     * Transforms results using FactoryExpression if ResultTransformer can't be used
-     *
-     * @param query
-     * @return
-     */
-    @Nullable
-    private Object getSingleResult(Query query) {
-        if (projection != null) {
-            Object result = query.getSingleResult();
-            if (result != null) {
-                if (!result.getClass().isArray()) {
-                    result = new Object[]{result};
-                }
-                return projection.newInstance((Object[])result);
-            } else {
-                return null;
-            }
-        } else {
-            return query.getSingleResult();
-        }
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        return queryHandler.<RT>iterate(query, projection);
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> List<RT> list(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        try {
-            return (List<RT>) getResultList(query);
-        } finally {
-            reset();
-        }
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        Query countQuery = createQuery(null, true);
-        long total = (Long) countQuery.getSingleResult();
-        if (total > 0) {
-            QueryModifiers modifiers = getMetadata().getModifiers();
-            Query query = createQuery(modifiers, false);
-            @SuppressWarnings("unchecked")
-            List<RT> list = (List<RT>) getResultList(query);
-            reset();
-            return new SearchResults<RT>(list, modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    protected void logQuery(String queryString) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(queryString.replace('\n', ' '));
-        }
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        queryMixin.addProjection(expr);
-        return uniqueResult();
-    }
-
-    @Nullable
-    @SuppressWarnings("unchecked")
-    private <RT> RT  uniqueResult() {
-        Query query = createQuery(getMetadata().getModifiers(), false);
-        try{
-            return (RT) getSingleResult(query);
-        } catch(javax.persistence.NoResultException e) {
-            logger.trace(e.getMessage(),e);
-            return null;
-        } catch(javax.persistence.NonUniqueResultException e) {
-            throw new NonUniqueResultException();
-        } finally {
-            reset();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setLockMode(LockModeType lockMode) {
-        this.lockMode = lockMode;
-        return (Q)this;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setFlushMode(FlushModeType flushMode) {
-        this.flushMode = flushMode;
-        return (Q)this;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setHint(String name, Object value) {
-        hints.put(name, value);
-        return (Q)this;
-    }
-    
-    @Override
-    protected JPQLSerializer createSerializer() {
-        return new JPQLSerializer(getTemplates(), entityManager);
-    }
-
-    protected void clone(Q query) {
-        projection = query.projection;
-        flushMode = query.flushMode;
-        hints.putAll(query.hints);
-        lockMode = query.lockMode;
-    }
-    
-    /**
-     * Clone the state of this query to a new instance with the given EntityManager
-     *
-     * @param entityManager
-     * @return
-     */
-    public abstract Q clone(EntityManager entityManager);
-
-    /**
-     * Clone the state of this query to a new instance
-     *
-     * @return
-     */
-    public Q clone() {
-        return this.clone(this.entityManager);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java
deleted file mode 100644
index 6625e8dba6..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Predicate;
-
-/**
- * DeleteClause implementation for JPA
- *
- * @author tiwe
- *
- */
-public class JPADeleteClause implements DeleteClause<JPADeleteClause> {
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final EntityManager entityManager;
-
-    private final JPQLTemplates templates;
-
-    public JPADeleteClause(EntityManager em, EntityPath<?> entity) {
-        this(em, entity, JPAProvider.getTemplates(em));
-    }
-
-    public JPADeleteClause(EntityManager entityManager, EntityPath<?> entity, JPQLTemplates templates) {
-        this.entityManager = entityManager;
-        this.templates = templates;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    @Override
-    public long execute() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
-        serializer.serializeForDelete(metadata);
-        Map<Object,String> constants = serializer.getConstantToLabel();
-
-        Query query = entityManager.createQuery(serializer.toString());
-        JPAUtil.setConstants(query, constants, metadata.getParams());
-        return query.executeUpdate();
-    }
-    
-    @Override
-    public JPADeleteClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);    
-        }        
-        return this;
-    }
-    
-    @Override
-    public String toString() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
-        serializer.serializeForDelete(metadata);
-        return serializer.toString();
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAProvider.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAProvider.java
deleted file mode 100644
index a3f78070d3..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.jpa.BatooTemplates;
-import com.mysema.query.jpa.DataNucleusTemplates;
-import com.mysema.query.jpa.EclipseLinkTemplates;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.jpa.OpenJPATemplates;
-
-/**
- * JPAProvider provides detection of the JPA provider based on the EntityManager instance
- *
- * @author tiwe
- *
- */
-public final class JPAProvider {
-
-    private static final Map<Class<?>, JPQLTemplates> mappings = Maps.newHashMap();
-
-    private static final Map<String, JPQLTemplates> templatesByName = Maps.newHashMap();
-
-    private static void addMapping(String className, JPQLTemplates templates) {
-        try {
-            mappings.put(Class.forName(className), templates);
-        } catch (Exception e) {}
-    }
-
-    static {
-        addMapping("org.batoo.jpa.core.impl.manager.EntityManagerImpl", BatooTemplates.DEFAULT);
-        addMapping("org.hibernate.Session", HQLTemplates.DEFAULT);
-        addMapping("org.hibernate.ejb.HibernateEntityManager", HQLTemplates.DEFAULT);
-        addMapping("org.eclipse.persistence.jpa.JpaEntityManager", EclipseLinkTemplates.DEFAULT);
-        addMapping("org.apache.openjpa.persistence.OpenJPAEntityManager", OpenJPATemplates.DEFAULT);
-        addMapping("org.datanucleus.jpa.EntityManagerImpl", DataNucleusTemplates.DEFAULT);
-        addMapping("org.datanucleus.ObjectManager", DataNucleusTemplates.DEFAULT);
-        addMapping("org.datanucleus.ObjectManagerImpl", DataNucleusTemplates.DEFAULT);
-
-        templatesByName.put("batoo", BatooTemplates.DEFAULT);
-        templatesByName.put("eclipselink", EclipseLinkTemplates.DEFAULT);
-        templatesByName.put("hibernate", HQLTemplates.DEFAULT);
-        templatesByName.put("openjpa", OpenJPATemplates.DEFAULT);
-        templatesByName.put("datanucleus", DataNucleusTemplates.DEFAULT);
-    }
-
-    public static JPQLTemplates getTemplates(EntityManager em) {
-        // detect by delegate
-        for (Map.Entry<Class<?>, JPQLTemplates> entry : mappings.entrySet()) {
-            if (entry.getKey().isAssignableFrom(em.getDelegate().getClass())) {
-                return entry.getValue();
-            }
-        }
-        // detect by properties
-        for (String key : em.getEntityManagerFactory().getProperties().keySet()) {
-            key = key.toLowerCase();
-            for (Map.Entry<String, JPQLTemplates> entry : templatesByName.entrySet()) {
-                if (key.contains(entry.getKey())) {
-                    return entry.getValue();
-                }
-            }
-        }
-        return JPQLTemplates.DEFAULT;
-    }
-
-    private JPAProvider() {}
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java
deleted file mode 100644
index 0080370764..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import javax.persistence.EntityManager;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.JPQLTemplates;
-
-/**
- * JPAQuery is the default implementation of the JPQLQuery interface for JPA
- *
- * @author tiwe
- *
- */
-public final class JPAQuery extends AbstractJPAQuery<JPAQuery> {
-
-    /**
-     * Creates a new detached query
-     * The query can be attached via the clone method
-     */
-    public JPAQuery() {
-        super(null, JPQLTemplates.DEFAULT, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new EntityManager bound query
-     *
-     * @param em
-     */
-    public JPAQuery(EntityManager em) {
-        super(em, JPAProvider.getTemplates(em), new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new EntityManager bound query
-     *
-     * @param em
-     */
-    public JPAQuery(EntityManager em, QueryMetadata metadata) {
-        super(em, JPAProvider.getTemplates(em), metadata);
-    }
-
-    /**
-     * Creates a new query
-     *
-     * @param em
-     * @param templates
-     */
-    public JPAQuery(EntityManager em, JPQLTemplates templates) {
-        super(em, templates, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Creates a new query
-     *
-     * @param em
-     * @param templates
-     * @param metadata
-     */
-    public JPAQuery(EntityManager em, JPQLTemplates templates, QueryMetadata metadata) {
-        super(em, templates, metadata);
-    }
-
-    public JPAQuery clone(EntityManager entityManager) {
-        JPAQuery q = new JPAQuery(entityManager, JPAProvider.getTemplates(entityManager), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQueryFactory.java
deleted file mode 100644
index 795ea76e57..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQueryFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import javax.annotation.Nullable;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-
-import com.mysema.query.jpa.JPASubQuery;
-import com.mysema.query.jpa.JPQLQueryFactory;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-
-/**
- * Factory class for query and DML clause creation
- *
- * @author tiwe
- *
- */
-public class JPAQueryFactory implements JPQLQueryFactory  {
-
-    @Nullable
-    private final JPQLTemplates templates;
-
-    private final Provider<EntityManager> entityManager;
-
-    public JPAQueryFactory(Provider<EntityManager> entityManager) {
-        this.entityManager = entityManager;
-        this.templates = null;
-    }
-
-    public JPAQueryFactory(JPQLTemplates templates, Provider<EntityManager> entityManager) {
-        this.entityManager = entityManager;
-        this.templates = templates;
-    }
-
-    @Override
-    public JPADeleteClause delete(EntityPath<?> path) {
-        if (templates != null) {
-            return new JPADeleteClause(entityManager.get(), path, templates);    
-        } else {
-            return new JPADeleteClause(entityManager.get(), path);
-        }        
-    }
-
-    @Override
-    public JPAQuery from(EntityPath<?> from) {
-        return query().from(from);
-    }
-
-    @Override
-    public JPAUpdateClause update(EntityPath<?> path) {
-        if (templates != null) {
-            return new JPAUpdateClause(entityManager.get(), path, templates);    
-        } else {
-            return new JPAUpdateClause(entityManager.get(), path);
-        }        
-    }
-
-    @Override
-    public JPAQuery query() {
-        if (templates != null) {
-            return new JPAQuery(entityManager.get(), templates);    
-        } else {
-            return new JPAQuery(entityManager.get());
-        }        
-    }
-
-    @Override
-    public JPASubQuery subQuery() {
-        return new JPASubQuery();
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java
deleted file mode 100644
index 3f0b9eb489..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.jpa.JPQLSerializer;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * UpdateClause implementation for JPA
- *
- * @author tiwe
- *
- */
-public class JPAUpdateClause implements UpdateClause<JPAUpdateClause> {
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final EntityManager entityManager;
-
-    private final JPQLTemplates templates;
-
-    public JPAUpdateClause(EntityManager em, EntityPath<?> entity) {
-        this(em, entity, JPAProvider.getTemplates(em));
-    }
-
-    public JPAUpdateClause(EntityManager em, EntityPath<?> entity, JPQLTemplates templates) {
-        this.entityManager = em;
-        this.templates = templates;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    @Override
-    public long execute() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
-        serializer.serializeForUpdate(metadata);
-        Map<Object,String> constants = serializer.getConstantToLabel();
-
-        Query query = entityManager.createQuery(serializer.toString());
-        JPAUtil.setConstants(query, constants, metadata.getParams());
-        return query.executeUpdate();
-    }
-
-    @Override
-    public <T> JPAUpdateClause set(Path<T> path, T value) {
-        if (value != null) {
-            metadata.addProjection(ExpressionUtils.eqConst(path, value));
-        } else {
-            setNull(path);
-        }
-        return this;
-    }
-    
-    @Override
-    public <T> JPAUpdateClause set(Path<T> path, Expression<? extends T> expression) {
-        if (expression != null) {
-            metadata.addProjection(ExpressionUtils.eq(path, expression));    
-        } else {
-            setNull(path);
-        }        
-        return this;
-    }
-    
-    @Override
-    public <T> JPAUpdateClause setNull(Path<T> path) {
-        metadata.addProjection(ExpressionUtils.eq(path, new NullExpression<T>(path.getType())));
-        return this;
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public JPAUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
-        for (int i = 0; i < paths.size(); i++) {
-            if (values.get(i) != null) {
-                metadata.addProjection(ExpressionUtils.eqConst((Expression)paths.get(i), values.get(i)));
-            } else {
-                metadata.addProjection(ExpressionUtils.eq((Expression)paths.get(i), 
-                        new NullExpression(paths.get(i).getType())));
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public JPAUpdateClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);   
-        }        
-        return this;
-    }
-    
-    @Override
-    public String toString() {
-        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
-        serializer.serializeForUpdate(metadata);
-        return serializer.toString();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return metadata.getProjection().isEmpty();
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
deleted file mode 100644
index fdf68a86bf..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.impl;
-
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import java.util.Map;
-
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.expr.Param;
-import com.mysema.util.MathUtils;
-
-/**
- * JPAUtil provides static utility methods for JPA
- *
- * @author tiwe
- *
- */
-public final class JPAUtil {
-
-    private JPAUtil() {}
-
-    public static void setConstants(Query query, Map<Object,String> constants, Map<ParamExpression<?>, Object> params) {
-        boolean hasParameters = !query.getParameters().isEmpty();
-        for (Map.Entry<Object,String> entry : constants.entrySet()) {
-            String key = entry.getValue();
-            Object val = entry.getKey();
-            if (Param.class.isInstance(val)) {
-                val = params.get(val);
-                if (val == null) {
-                    throw new ParamNotSetException((Param<?>) entry.getKey());
-                }
-            }
-            if (hasParameters) {
-                Parameter parameter = query.getParameter(Integer.valueOf(key));
-                Class parameterType = parameter != null ? parameter.getParameterType() : null;
-                if (parameterType != null && !parameterType.isInstance(val)) {
-                    if (val instanceof Number && Number.class.isAssignableFrom(parameterType)) {
-                        val = MathUtils.cast((Number) val, parameterType);
-                    }
-                }
-            }
-            query.setParameter(Integer.valueOf(key), val);
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/package-info.java
deleted file mode 100644
index 71bb3c085a..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * JPQL for JPA
- */
-package com.mysema.query.jpa.impl;
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/package-info.java
deleted file mode 100644
index a3ac57a349..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Query implementations for HQL and JPAQL
- */
-package com.mysema.query.jpa;
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
deleted file mode 100644
index 1ef72fab90..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/AbstractJPASQLQuery.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.sql;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.*;
-import com.mysema.query.jpa.AbstractSQLQuery;
-import com.mysema.query.jpa.NativeSQLSerializer;
-import com.mysema.query.jpa.QueryHandler;
-import com.mysema.query.jpa.impl.JPAProvider;
-import com.mysema.query.jpa.impl.JPAUtil;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.FactoryExpressionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AbstractJPASQLQuery is the base class for JPA Native SQL queries
- *
- * @author tiwe
- *
- * @param <Q>
- */
-public abstract class AbstractJPASQLQuery<Q extends AbstractJPASQLQuery<Q>> extends AbstractSQLQuery<Q> {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbstractJPASQLQuery.class);
-
-    private final EntityManager entityManager;
-
-    protected final Multimap<String,Object> hints = HashMultimap.create();
-
-    protected final QueryHandler queryHandler;
-
-    @Nullable
-    protected LockModeType lockMode;
-
-    @Nullable
-    protected FlushModeType flushMode;
-
-    @Nullable
-
-    protected FactoryExpression<?> projection;
-
-    public AbstractJPASQLQuery(EntityManager em, Configuration configuration) {
-        this(em, configuration, new DefaultQueryMetadata().noValidate());
-    }
-
-    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryHandler queryHandler) {
-        this(em, configuration, queryHandler, new DefaultQueryMetadata().noValidate());
-    }
-
-    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryMetadata metadata) {
-        this(em, configuration, JPAProvider.getTemplates(em).getQueryHandler(), metadata);
-    }
-
-    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryHandler queryHandler, QueryMetadata metadata) {
-        super(metadata, configuration);
-        this.entityManager = em;
-        this.queryHandler = queryHandler;
-    }
-
-    public Query createQuery(Expression<?>... args) {
-        queryMixin.getMetadata().setValidate(false);
-        queryMixin.addProjection(args);
-        return createQuery(false);
-    }
-
-    private Query createQuery(boolean forCount) {
-        NativeSQLSerializer serializer = (NativeSQLSerializer) serialize(forCount);
-        String queryString = serializer.toString();
-        logQuery(queryString);
-        List<? extends Expression<?>> projection = queryMixin.getMetadata().getProjection();
-        Query query;
-
-        Expression<?> proj = projection.get(0);
-        if (!FactoryExpression.class.isAssignableFrom(proj.getClass()) && isEntityExpression(proj)) {
-            if (projection.size() == 1) {
-                if (queryHandler.createNativeQueryTyped()) {
-                    query = entityManager.createNativeQuery(queryString, proj.getType());
-                } else {
-                    query = entityManager.createNativeQuery(queryString);
-                }
-            } else {
-                throw new IllegalArgumentException("Only single element entity projections are supported");
-            }
-
-        } else {
-            query = entityManager.createNativeQuery(queryString);
-        }
-        if (!forCount) {
-            Map<Expression<?>, String> aliases = serializer.getAliases();
-            if (proj instanceof FactoryExpression) {
-                for (Expression<?> expr : ((FactoryExpression<?>)proj).getArgs()) {
-                    if (isEntityExpression(expr)) {
-                        queryHandler.addEntity(query, extractEntityExpression(expr).toString(), expr.getType());
-                    } else if (aliases.containsKey(expr)) {
-                        queryHandler.addScalar(query, aliases.get(expr), expr.getType());
-                    }
-                }
-            } else if (isEntityExpression(proj)) {
-                queryHandler.addEntity(query, extractEntityExpression(proj).toString(), proj.getType());
-            } else if (aliases.containsKey(proj)) {
-                queryHandler.addScalar(query, aliases.get(proj), proj.getType());
-            }
-        }
-
-        if (lockMode != null) {
-            query.setLockMode(lockMode);
-        }
-        if (flushMode != null) {
-            query.setFlushMode(flushMode);
-        }
-
-        for (Map.Entry<String, Object> entry : hints.entries()) {
-            query.setHint(entry.getKey(), entry.getValue());
-        }
-
-
-        // set constants
-        JPAUtil.setConstants(query, serializer.getConstantToLabel(), queryMixin.getMetadata().getParams());
-
-        FactoryExpression<?> wrapped = projection.size() > 1 ? FactoryExpressionUtils.wrap(projection) : null;
-        if ((projection.size() == 1 && projection.get(0) instanceof FactoryExpression) || wrapped != null) {
-            Expression<?> expr = wrapped != null ? wrapped : projection.get(0);
-
-            if (!queryHandler.transform(query, (FactoryExpression<?>)expr)) {
-                this.projection = (FactoryExpression<?>)projection.get(0);
-                if (wrapped != null) {
-                    this.projection = wrapped;
-                    getMetadata().clearProjection();
-                    getMetadata().addProjection(wrapped);
-                }
-            }
-        }
-
-        return query;
-    }
-
-    @Override
-    protected SQLSerializer createSerializer() {
-        return new NativeSQLSerializer(configuration, queryHandler.wrapEntityProjections());
-    }
-
-    /**
-     * Transforms results using FactoryExpression if ResultTransformer can't be used
-     *
-     * @param query
-     * @return
-     */
-    private List<?> getResultList(Query query) {
-        // TODO : use lazy list here?
-        if (projection != null) {
-            List<?> results = query.getResultList();
-            List<Object> rv = new ArrayList<Object>(results.size());
-            for (Object o : results) {
-                if (o != null) {
-                    Object[] arr;
-                    if (!o.getClass().isArray()) {
-                        arr = new Object[]{o};
-                    } else {
-                        arr = (Object[])o;
-                    }
-                    if (projection.getArgs().size() < arr.length) {
-                        Object[] shortened = new Object[projection.getArgs().size()];
-                        System.arraycopy(arr, 0, shortened, 0, shortened.length);
-                        arr = shortened;
-                    }
-                    rv.add(projection.newInstance(arr));
-                } else {
-                    rv.add(null);
-                }
-            }
-            return rv;
-        } else {
-            return query.getResultList();
-        }
-    }
-
-    /**
-     * Transforms results using FactoryExpression if ResultTransformer can't be used
-     *
-     * @param query
-     * @return
-     */
-    @Nullable
-    private Object getSingleResult(Query query) {
-        if (projection != null) {
-            Object result = query.getSingleResult();
-            if (result != null) {
-                if (!result.getClass().isArray()) {
-                    result = new Object[]{result};
-                }
-                return projection.newInstance((Object[])result);
-            } else {
-                return null;
-            }
-        } else {
-            return query.getSingleResult();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> List<RT> list(Expression<RT> projection) {
-        Query query = createQuery(projection);
-        return (List<RT>) getResultList(query);
-    }
-
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        return queryHandler.<RT>iterate(query, null);
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> projection) {
-        // TODO : handle entity projections as well
-        queryMixin.addProjection(projection);
-        Query query = createQuery(true);
-        long total = ((Number)query.getSingleResult()).longValue();
-        if (total > 0) {
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            query = createQuery(false);
-            @SuppressWarnings("unchecked")
-            List<RT> list = (List<RT>) getResultList(query);
-            reset();
-            return new SearchResults<RT>(list, modifiers, total);
-        } else {
-            reset();
-            return SearchResults.emptyResults();
-        }
-    }
-
-    protected void logQuery(String queryString) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(queryString.replace('\n', ' '));
-        }
-    }
-
-    protected void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        Query query = createQuery(expr);
-        return (RT)uniqueResult(query);
-    }
-
-    @Nullable
-    private Object uniqueResult(Query query) {
-        try{
-            return getSingleResult(query);
-        } catch(javax.persistence.NoResultException e) {
-            logger.trace(e.getMessage(),e);
-            return null;
-        } catch(javax.persistence.NonUniqueResultException e) {
-            throw new NonUniqueResultException();
-        } finally {
-            reset();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setLockMode(LockModeType lockMode) {
-        this.lockMode = lockMode;
-        return (Q)this;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setFlushMode(FlushModeType flushMode) {
-        this.flushMode = flushMode;
-        return (Q)this;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q setHint(String name, Object value) {
-        hints.put(name, value);
-        return (Q)this;
-    }
-
-    @Override
-    protected void clone(Q query) {
-        super.clone(query);
-        flushMode = query.flushMode;
-        hints.putAll(query.hints);
-        lockMode = query.lockMode;
-        projection = query.projection;
-    }
-    
-    public abstract Q clone(EntityManager entityManager);
-    
-    @Override
-    public Q clone() {
-        return this.clone(this.entityManager);
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
deleted file mode 100644
index 8b1f611013..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.sql;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.QueryHandler;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLTemplates;
-
-import javax.persistence.EntityManager;
-
-/**
- * JPASQLQuery is an SQLQuery implementation that uses JPA Native SQL functionality
- * to execute queries
- *
- * @author tiwe
- *
- */
-public final class JPASQLQuery extends AbstractJPASQLQuery<JPASQLQuery> {
-
-    public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates) {
-        super(entityManager, new Configuration(sqlTemplates));
-    }
-
-    public JPASQLQuery(EntityManager entityManager, Configuration conf) {
-        super(entityManager, conf);
-    }
-
-    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryHandler queryHandler) {
-        super(entityManager, conf, queryHandler);
-    }
-
-    public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates, QueryMetadata metadata) {
-        super(entityManager, new Configuration(sqlTemplates), metadata);
-    }
-
-    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryMetadata metadata) {
-        super(entityManager, conf, metadata);
-    }
-
-    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryHandler queryHandler, QueryMetadata metadata) {
-        super(entityManager, conf, queryHandler, metadata);
-    }
-
-    @Override
-    public JPASQLQuery clone(EntityManager entityManager) {
-        JPASQLQuery q = new JPASQLQuery(entityManager, configuration, queryHandler, getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/package-info.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/package-info.java
deleted file mode 100644
index a106f7c961..0000000000
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.jpa.sql;
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/AbstractSQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/AbstractSQLQuery.java
new file mode 100644
index 0000000000..1371a23607
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/AbstractSQLQuery.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import javax.persistence.Entity;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.TemplateExpression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.ProjectableSQLQuery;
+
+/**
+ * Abstract super class for SQLQuery implementation for JPA and Hibernate
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractSQLQuery<T, Q extends AbstractSQLQuery<T, Q>> extends ProjectableSQLQuery<T, Q> {
+
+    private static final class NativeQueryMixin<T> extends QueryMixin<T> {
+        private NativeQueryMixin(QueryMetadata metadata) {
+            super(metadata, false);
+        }
+
+        @Override
+        public <RT> Expression<RT> convert(Expression<RT> expr, Role role) {
+            return Conversions.convertForNativeQuery(super.convert(expr, role));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public AbstractSQLQuery(QueryMetadata metadata, Configuration configuration) {
+        super(new NativeQueryMixin<Q>(metadata), configuration);
+        this.queryMixin.setSelf((Q) this);
+    }
+
+    protected boolean isEntityExpression(Expression<?> expr) {
+        return expr instanceof EntityPath || expr.getType().isAnnotationPresent(Entity.class);
+    }
+
+    protected Expression<?> extractEntityExpression(Expression<?> expr) {
+        if (expr instanceof Operation) {
+            return ((Operation<?>) expr).getArg(0);
+        } else if (expr instanceof TemplateExpression) {
+            return (Expression<?>) ((TemplateExpression<?>) expr).getArg(0);
+        } else {
+            return expr;
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/BatooTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/BatooTemplates.java
similarity index 82%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/BatooTemplates.java
rename to querydsl-jpa/src/main/java/com/querydsl/jpa/BatooTemplates.java
index 32771f829d..5ef2178148 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/BatooTemplates.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/BatooTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
-
-import com.mysema.query.types.Ops;
+package com.querydsl.jpa;
 
+import com.querydsl.core.types.Ops;
 
+/**
+ * {@code BatooTemplates} extends {@link JPQLTemplates} with Batoo specific extensions
+ *
+ */
 public class BatooTemplates extends JPQLTemplates {
 
     public static final BatooTemplates DEFAULT = new BatooTemplates();
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
new file mode 100644
index 0000000000..11cfd93771
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Entity;
+
+import com.querydsl.core.support.ConstantHidingExpression;
+import com.querydsl.core.support.EnumConversion;
+import com.querydsl.core.support.NumberConversion;
+import com.querydsl.core.support.NumberConversions;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLOps;
+
+/**
+ * {@code Conversions} provides module specific projection conversion functionality
+ *
+ * @author tiwe
+ *
+ */
+public final class Conversions {
+
+    public static <RT> Expression<RT> convert(Expression<RT> expr) {
+        if (expr instanceof FactoryExpression) {
+            FactoryExpression<RT> factoryExpr = (FactoryExpression<RT>) expr;
+            for (Expression<?> e: factoryExpr.getArgs()) {
+                if (needsConstantRemoval(e)) {
+                    return convert(new ConstantHidingExpression<RT>(factoryExpr));
+                }
+            }
+            for (Expression<?> e : factoryExpr.getArgs()) {
+                if (needsNumberConversion(e)) {
+                    return new NumberConversions<RT>(factoryExpr);
+                }
+            }
+        } else if (needsNumberConversion(expr)) {
+            return new NumberConversion<RT>(expr);
+        }
+        return expr;
+    }
+
+    private static boolean needsConstantRemoval(Expression<?> expr) {
+        expr = ExpressionUtils.extract(expr);
+        return expr instanceof Constant || expr.equals(Expressions.TRUE) || expr.equals(Expressions.FALSE) ||
+              (expr instanceof Operation && ((Operation<?>) expr).getOperator() == Ops.ALIAS
+                  && needsConstantRemoval(((Operation<?>) expr).getArg(0)));
+    }
+
+    private static boolean needsNumberConversion(Expression<?> expr) {
+        expr = ExpressionUtils.extract(expr);
+        return Number.class.isAssignableFrom(expr.getType()) && !Path.class.isInstance(expr);
+    }
+
+    private static boolean isEntityPathAndNeedsWrapping(Expression<?> expr) {
+        if ((expr instanceof Path && expr.getType().isAnnotationPresent(Entity.class)) ||
+            (expr instanceof EntityPath && !RelationalPath.class.isInstance(expr))) {
+            Path<?> path = (Path<?>) expr;
+            if (path.getMetadata().getParent() == null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static <RT> FactoryExpression<RT> createEntityPathConversions(FactoryExpression<RT> factoryExpr) {
+        List<Expression<?>> conversions = new ArrayList<>();
+        for (Expression<?> e : factoryExpr.getArgs()) {
+            if (isEntityPathAndNeedsWrapping(e)) {
+                conversions.add(ExpressionUtils.operation(e.getType(), SQLOps.ALL, e));
+            } else {
+                conversions.add(e);
+            }
+        }
+        return FactoryExpressionUtils.wrap(factoryExpr, conversions);
+    }
+
+    public static <RT> Expression<RT> convertForNativeQuery(Expression<RT> expr) {
+        if (isEntityPathAndNeedsWrapping(expr)) {
+            return ExpressionUtils.operation(expr.getType(), SQLOps.ALL, expr);
+        } else if (Number.class.isAssignableFrom(expr.getType())) {
+            return new NumberConversion<RT>(expr);
+        } else if (Enum.class.isAssignableFrom(expr.getType())) {
+            return new EnumConversion<RT>(expr);
+        } else if (expr instanceof FactoryExpression) {
+            FactoryExpression<RT> factoryExpr = (FactoryExpression<RT>) expr;
+            boolean numberConversions = false;
+            boolean hasEntityPath = false;
+            for (Expression<?> e : factoryExpr.getArgs()) {
+                if (isEntityPathAndNeedsWrapping(e)) {
+                    hasEntityPath = true;
+                } else if (Number.class.isAssignableFrom(e.getType())) {
+                    numberConversions = true;
+                } else if (Enum.class.isAssignableFrom(e.getType())) {
+                    numberConversions = true;
+                }
+            }
+            if (hasEntityPath) {
+                factoryExpr = createEntityPathConversions(factoryExpr);
+            }
+            if (numberConversions) {
+                factoryExpr = new NumberConversions<RT>(factoryExpr);
+            }
+            return factoryExpr;
+        }
+        return expr;
+    }
+
+    private Conversions() { }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/DataNucleusTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/DataNucleusTemplates.java
similarity index 85%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/DataNucleusTemplates.java
rename to querydsl-jpa/src/main/java/com/querydsl/jpa/DataNucleusTemplates.java
index 1da0767a15..7a418ec7d6 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/DataNucleusTemplates.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/DataNucleusTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
-
-import com.mysema.query.types.Ops;
+package com.querydsl.jpa;
 
+import com.querydsl.core.types.Ops;
 
+/**
+ * {@code DataNucleusTemplates} extends {@link JPQLTemplates} with DataNucleus specific extensions
+ */
 public class DataNucleusTemplates extends JPQLTemplates {
 
     public static final DataNucleusTemplates DEFAULT = new DataNucleusTemplates();
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
new file mode 100644
index 0000000000..c90e93c79d
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.Iterator;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.types.FactoryExpression;
+
+/**
+ * {@code DefaultQueryHandler} is the default implementation of the {@link QueryHandler} interface
+ *
+ * @author tiwe
+ *
+ */
+public final class DefaultQueryHandler implements QueryHandler {
+
+    public static final QueryHandler DEFAULT = new DefaultQueryHandler();
+
+    @Override
+    public void addEntity(Query query, String alias, Class<?> type) {
+        // do nothing
+    }
+
+    @Override
+    public void addScalar(Query query, String alias, Class<?> type) {
+        // do nothing
+    }
+
+    @Override
+    public boolean createNativeQueryTyped() {
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> CloseableIterator<T> iterate(Query query, @Nullable final FactoryExpression<?> projection) {
+        Iterator<T> iterator = query.getResultList().iterator();
+        if (projection != null) {
+            return new TransformingIterator<T>(iterator, projection);
+        } else {
+            return new IteratorAdapter<T>(iterator);
+        }
+    }
+
+    @Override
+    public <T> Stream<T> stream(Query query, @Nullable FactoryExpression<?> projection) {
+        final Stream resultStream = query.getResultStream();
+        if (projection != null) {
+            return resultStream.map(element -> projection.newInstance((Object[]) (element.getClass().isArray() ? element : new Object[] {element})));
+        }
+        return resultStream;
+    }
+
+    @Override
+    public boolean transform(Query query, FactoryExpression<?> projection) {
+        return false;
+    }
+
+    @Override
+    public boolean wrapEntityProjections() {
+        return false;
+    }
+
+    private DefaultQueryHandler() { }
+
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java
new file mode 100644
index 0000000000..1c949da817
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkHandler.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.stream.Stream;
+
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.eclipse.persistence.config.HintValues;
+import org.eclipse.persistence.config.QueryHints;
+import org.eclipse.persistence.jpa.JpaQuery;
+import org.eclipse.persistence.queries.Cursor;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.types.FactoryExpression;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code EclipseLinkHandler} is the {@link QueryHandler} implementation for EclipseLink
+ *
+ * @author tiwe
+ *
+ */
+class EclipseLinkHandler implements QueryHandler {
+
+    @Override
+    public void addEntity(Query query, String alias, Class<?> type) {
+        // do nothing
+    }
+
+    @Override
+    public void addScalar(Query query, String alias, Class<?> type) {
+        // do nothing
+    }
+
+    @Override
+    public boolean createNativeQueryTyped() {
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
+        boolean canUseCursor = false;
+        try {
+            canUseCursor = query.unwrap(Query.class) instanceof JpaQuery;
+        } catch (PersistenceException e) { } // can't unwrap, just ignore the exception
+
+        Iterator<T> iterator = null;
+        Closeable closeable = null;
+        if (canUseCursor) {
+            query.setHint(QueryHints.CURSOR, HintValues.TRUE);
+            final Cursor cursor = (Cursor) query.getSingleResult();
+            final int pageSize = cursor.getPageSize();
+            closeable = new Closeable() {
+                @Override
+                public void close() throws IOException {
+                    cursor.close();
+                }
+            };
+            iterator = new Iterator<T>() {
+                private int rowsSinceLastClear = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return cursor.hasNext();
+                }
+
+                @Override
+                public T next() {
+                    if (rowsSinceLastClear++ == pageSize) {
+                        rowsSinceLastClear = 0;
+                        cursor.clear();
+                    }
+                    return (T) cursor.next();
+                }
+            };
+        } else {
+            iterator = query.getResultList().iterator();
+        }
+        if (projection != null) {
+            return new TransformingIterator<T>(iterator, closeable, projection);
+        } else {
+            return new IteratorAdapter<T>(iterator, closeable);
+        }
+    }
+
+    @Override
+    public <T> Stream<T> stream(Query query, @Nullable FactoryExpression<?> projection) {
+        final Stream resultStream = query.getResultStream();
+        if (projection != null) {
+            return resultStream.map(element -> projection.newInstance((Object[]) (element.getClass().isArray() ? element : new Object[] {element})));
+        }
+        return resultStream;
+    }
+
+    @Override
+    public boolean transform(Query query, FactoryExpression<?> projection) {
+        return false;
+    }
+
+    @Override
+    public boolean wrapEntityProjections() {
+        return false;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java
new file mode 100644
index 0000000000..5e1593986c
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code EclipseLinkTemplates} extends {@link JPQLTemplates} with EclipseLink specific extensions
+ *
+ * @author tiwe
+ *
+ */
+public class EclipseLinkTemplates extends JPQLTemplates {
+
+    private static final QueryHandler QUERY_HANDLER;
+
+    static {
+        QueryHandler instance;
+        try {
+            instance = (QueryHandler) Class.forName("com.querydsl.jpa.EclipseLinkHandler").newInstance();
+        } catch (NoClassDefFoundError | Exception e) {
+            instance = DefaultQueryHandler.DEFAULT;
+        }
+        QUERY_HANDLER = instance;
+    }
+
+
+    public static final EclipseLinkTemplates DEFAULT = new EclipseLinkTemplates();
+
+    private final Map<Class<?>, String> typeNames;
+
+    public EclipseLinkTemplates() {
+        this(DEFAULT_ESCAPE);
+    }
+
+    public EclipseLinkTemplates(char escape) {
+        super(escape, QUERY_HANDLER);
+
+        Map<Class<?>, String> builder = new HashMap<>();
+        builder.put(Short.class, "short");
+        builder.put(Integer.class, "integer");
+        builder.put(Long.class, "bigint");
+        builder.put(BigInteger.class, "bigint");
+        builder.put(Float.class, "float");
+        builder.put(Double.class, "double");
+        builder.put(BigDecimal.class, "double");
+        typeNames = Collections.unmodifiableMap(builder);
+
+        add(Ops.CHAR_AT, "substring({0},{1+'1'},1)");
+        add(JPQLOps.CAST, "cast({0} {1s})");
+        add(Ops.STRING_CAST, "trim(cast({0} char(128)))");
+        add(Ops.NUMCAST, "cast({0} {1s})");
+
+        // datetime
+        add(Ops.DateTimeOps.MILLISECOND, "extract(millisecond from {0})");
+        add(Ops.DateTimeOps.SECOND, "extract(second from {0})");
+        add(Ops.DateTimeOps.MINUTE, "extract(minute from {0})");
+        add(Ops.DateTimeOps.HOUR, "extract(hour from {0})");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "extract(day_of_week from {0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "extract(day from {0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "extract(day_of_year from {0})");
+        add(Ops.DateTimeOps.WEEK, "extract(week from {0})");
+        add(Ops.DateTimeOps.MONTH, "extract(month from {0})");
+        add(Ops.DateTimeOps.YEAR, "extract(year from {0})");
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "extract(year from {0}) * 100 + extract(month from {0})");
+        add(Ops.DateTimeOps.YEAR_WEEK, "extract(year from {0}) * 100 + extract(week from {0})");
+
+    }
+
+    @Override
+    public String getTypeForCast(Class<?> cl) {
+        return typeNames.get(cl);
+    }
+
+    @Override
+    public boolean isPathInEntitiesSupported() {
+        return false;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/FactoryExpressionTransformer.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/FactoryExpressionTransformer.java
similarity index 84%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/FactoryExpressionTransformer.java
rename to querydsl-jpa/src/main/java/com/querydsl/jpa/FactoryExpressionTransformer.java
index 3476e8cfd4..631626a258 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/FactoryExpressionTransformer.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/FactoryExpressionTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
 import java.util.List;
 
 import org.hibernate.transform.ResultTransformer;
 
-import com.mysema.query.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpression;
 
 /**
- * FactoryExpressionTransformer is a ResultTransformer implementation using FactoryExpression for transformation
+ * {@code FactoryExpressionTransformer} is a ResultTransformer implementation using
+ * FactoryExpression instances for transformation
  *
  * @author tiwe
  *
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
new file mode 100644
index 0000000000..04b21ef0c4
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+
+/**
+ * HQLTemplates extends {@link JPQLTemplates} with Hibernate specific extensions
+ *
+ * @author tiwe
+ */
+public class HQLTemplates extends JPQLTemplates {
+
+    private static final QueryHandler QUERY_HANDLER;
+
+    static {
+        QueryHandler instance;
+        try {
+            instance = (QueryHandler) Class.forName("com.querydsl.jpa.HibernateHandler").newInstance();
+        } catch (NoClassDefFoundError | Exception e) {
+            instance = DefaultQueryHandler.DEFAULT;
+        }
+        QUERY_HANDLER = instance;
+    }
+
+    private static final List<Operator> wrapElements = Arrays.<Operator> asList(
+            Ops.QuantOps.ALL,
+            Ops.QuantOps.ANY,
+            Ops.QuantOps.AVG_IN_COL,
+            Ops.EXISTS);
+
+    public static final HQLTemplates DEFAULT = new HQLTemplates();
+
+    private final Map<Class<?>, String> typeNames;
+
+    public HQLTemplates() {
+        this(DEFAULT_ESCAPE);
+    }
+
+    @SuppressWarnings("unchecked")
+    public HQLTemplates(char escape) {
+        super(escape, QUERY_HANDLER);
+
+        Map<Class<?>, String> builder = new HashMap<>();
+        builder.put(Byte.class, "byte");
+        builder.put(Short.class, "short");
+        builder.put(Integer.class, "integer");
+        builder.put(Long.class, "long");
+        builder.put(BigInteger.class, "big_integer");
+        builder.put(Float.class, "float");
+        builder.put(Double.class, "double");
+        builder.put(BigDecimal.class, "big_decimal");
+        typeNames = Collections.unmodifiableMap(builder);
+
+        // add Hibernate Spatial mappings, if on classpath
+        try {
+            Class cl = Class.forName("com.querydsl.spatial.hibernate.HibernateSpatialSupport");
+            add((Map) cl.getMethod("getSpatialOps").invoke(null));
+        } catch (Exception e) {
+            // do nothing
+        }
+    }
+
+    @Override
+    public boolean wrapElements(Operator operator) {
+        // For example: JPaIntegration.docoExamples98_12
+        return wrapElements.contains(operator);
+    }
+
+    @Override
+    public String getTypeForCast(Class<?> cl) {
+        String typeName = typeNames.get(cl);
+        if (typeName == null) {
+            return super.getTypeForCast(cl);
+        }
+        return typeName;
+    }
+
+    @Override
+    public String getExistsProjection() {
+        // TODO Required / supported just for Hibernate?
+        return "1";
+    }
+
+    @Override
+    public boolean wrapConstant(Object constant) {
+        // related : https://hibernate.onjira.com/browse/HHH-6913
+        Class<?> type = constant.getClass();
+        return type.isArray() || Collection.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public boolean isWithForOn() {
+        return true;
+    }
+
+    @Override
+    public boolean isCaseWithLiterals() {
+        return true;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/Hibernate5Templates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/Hibernate5Templates.java
new file mode 100644
index 0000000000..54191e652e
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/Hibernate5Templates.java
@@ -0,0 +1,32 @@
+package com.querydsl.jpa;
+
+/**
+ * Hibernate5Templates extends {@link JPQLTemplates} with Hibernate specific extensions
+ *
+ * @author Jan-Willem Gmelig Meyling
+ *
+ */
+public class Hibernate5Templates extends HQLTemplates {
+
+    public static final Hibernate5Templates DEFAULT = new Hibernate5Templates();
+
+    public Hibernate5Templates() {
+    }
+
+    public Hibernate5Templates(char escape) {
+        super(escape);
+    }
+
+    @Override
+    public boolean wrapConstant(Object constant) {
+        // HHH-6913 is fixed in 5.0, default to JPA behaviour
+        return false;
+    }
+
+    @Override
+    public boolean isWithForOn() {
+        // Hibernate supports the on-clause since 5.0, and the ON clause is actually mandatory for entity joins
+        return true;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
new file mode 100644
index 0000000000..b47e4f2920
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.Iterator;
+import java.util.stream.Stream;
+
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.transform.ResultTransformer;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.types.FactoryExpression;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code HibernateHandler} is the {@link QueryHandler} implementation for Hibernate
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateHandler implements QueryHandler {
+
+    @Override
+    public void addEntity(Query query, String alias, Class<?> type) {
+        query.unwrap(NativeQuery.class).addEntity(alias, type);
+    }
+
+    @Override
+    public void addScalar(Query query, String alias, Class<?> type) {
+        query.unwrap(NativeQuery.class).addScalar(alias);
+    }
+
+    @Override
+    public boolean createNativeQueryTyped() {
+        return false;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
+        try {
+            org.hibernate.query.Query<?> unwrappedQuery = query.unwrap(org.hibernate.query.Query.class);
+            ScrollableResults results = unwrappedQuery.scroll(ScrollMode.FORWARD_ONLY);
+            CloseableIterator<T> iterator = new ScrollableResultsIterator<T>(results);
+            if (projection != null) {
+                iterator = new TransformingIterator<T>(iterator, projection);
+            }
+            return iterator;
+        } catch (PersistenceException e) {
+            Iterator<T> iterator = query.getResultList().iterator();
+            if (projection != null) {
+                return new TransformingIterator<T>(iterator, projection);
+            } else {
+                return new IteratorAdapter<T>(iterator);
+            }
+        }
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public <T> Stream<T> stream(Query query, @Nullable FactoryExpression<?> projection) {
+        final Stream resultStream = query.getResultStream();
+        if (projection != null) {
+            return resultStream.map(element -> projection.newInstance((Object[]) (element.getClass().isArray() ? element : new Object[] {element})));
+        }
+        return resultStream;
+    }
+
+    @Override
+    public boolean transform(Query query, FactoryExpression<?> projection) {
+        try {
+            ResultTransformer transformer = new FactoryExpressionTransformer(projection);
+            query.unwrap(org.hibernate.query.Query.class).setResultTransformer(transformer);
+            return true;
+        } catch (PersistenceException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean wrapEntityProjections() {
+        return true;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPACollectionAnyVisitor.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPACollectionAnyVisitor.java
new file mode 100644
index 0000000000..61b1e4e801
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPACollectionAnyVisitor.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import javax.persistence.Entity;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.CollectionAnyVisitor;
+import com.querydsl.core.support.Context;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimplePath;
+
+/**
+ * {@code JPACollectionAnyVisitor} extends the {@link CollectionAnyVisitor} class with module specific
+ * extensions
+ *
+ * @author tiwe
+ *
+ */
+class JPACollectionAnyVisitor extends CollectionAnyVisitor {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected Predicate exists(Context c, Predicate condition) {
+        JPAQueryMixin<?> query = new JPAQueryMixin<Object>();
+        query.setProjection(Expressions.ONE);
+        for (int i = 0; i < c.paths.size(); i++) {
+            Path<?> child = c.paths.get(i).getMetadata().getParent();
+            EntityPath<Object> replacement = (EntityPath<Object>) c.replacements.get(i);
+            if (c.paths.get(i).getType().isAnnotationPresent(Entity.class)) {
+                query.addJoin(i == 0 ? JoinType.DEFAULT : JoinType.INNERJOIN, Expressions.as(
+                        Expressions.listPath((Class) c.paths.get(i).getType(), SimplePath.class,
+                                child.getMetadata()), replacement));
+            } else {
+                // join via parent
+                Path<?> parent = child.getMetadata().getParent();
+                EntityPathBase<Object> newParent = new EntityPathBase<Object>(parent.getType(),
+                        ExpressionUtils.createRootVariable(parent, Math.abs(condition.hashCode())));
+                EntityPath<Object> newChild = new EntityPathBase<Object>(child.getType(),
+                        PathMetadataFactory.forProperty(newParent, child.getMetadata().getName()));
+                query.from(newParent);
+                query.addJoin(JoinType.INNERJOIN, Expressions.as(newChild, replacement));
+                query.where(ExpressionUtils.eq(newParent, parent));
+            }
+        }
+        c.clear();
+        query.where(condition);
+        return ExpressionUtils.predicate(Ops.EXISTS, asExpression(query.getMetadata()));
+    }
+
+    private Expression<?> asExpression(QueryMetadata metadata) {
+        return new SubQueryExpressionImpl<Object>(metadata.getProjection().getType(), metadata);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
new file mode 100644
index 0000000000..2044e2a7f1
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.CollectionExpression;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionException;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathType;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.ComparableExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringExpression;
+
+import javax.persistence.Entity;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
+
+/**
+ * {@code JPAExpressions} provides factory methods for JPQL specific operations
+ * elements.
+ *
+ * @author tiwe
+ */
+@SuppressWarnings("unchecked")
+public final class JPAExpressions {
+
+    /**
+     * Create a new detached JPQLQuery instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(expr)
+     */
+    public static <T> JPQLQuery<T> select(Expression<T> expr) {
+        return new JPASubQuery<Void>().select(expr);
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    public static JPQLQuery<Tuple> select(Expression<?>... exprs) {
+        return new JPASubQuery<Void>().select(exprs);
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(distinct expr)
+     */
+    public static <T> JPQLQuery<T> selectDistinct(Expression<T> expr) {
+        return new JPASubQuery<Void>().select(expr).distinct();
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(distinct expr)
+     */
+    public static JPQLQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return new JPASubQuery<Void>().select(exprs).distinct();
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the projection zero
+     *
+     * @return select(0)
+     */
+    public static JPQLQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the projection one
+     *
+     * @return select(1)
+     */
+    public static JPQLQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    /**
+     * Create a new detached JPQLQuery instance with the given projection
+     *
+     * @param expr projection and source
+     * @param <T>
+     * @return select(expr).from(expr)
+     */
+    public static <T> JPQLQuery<T> selectFrom(EntityPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+    /**
+     * Create a JPA 2.1 treated path.
+     *
+     * @param path The path to apply the treat operation on
+     * @param subtype subtype class
+     * @param <U> the subtype class
+     * @param <T> the expression type
+     * @return subtype instance with the same identity
+     */
+    public static <U extends BeanPath<? extends T>, T> U treat(BeanPath<? extends T> path, Class<U> subtype)  {
+        try {
+            Class<? extends T> entitySubType = getConcreteEntitySubType(subtype);
+            PathMetadata pathMetadata = new PathMetadata(path, getEntityName(entitySubType), PathType.TREATED_PATH);
+            return subtype.getConstructor(PathMetadata.class).newInstance(pathMetadata);
+        } catch (InstantiationException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        } catch (IllegalAccessException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        } catch (InvocationTargetException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        } catch (NoSuchMethodException e) {
+            throw new ExpressionException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Create a avg(col) expression
+     *
+     * @param col collection
+     * @return avg(col)
+     */
+    public static <A extends Comparable<? super A>> ComparableExpression<A> avg(CollectionExpression<?,A> col) {
+        return Expressions.comparableOperation((Class) col.getParameter(0), Ops.QuantOps.AVG_IN_COL, (Expression<?>) col);
+    }
+
+    /**
+     * Create a max(col) expression
+     *
+     * @param left collection
+     * @return max(col)
+     */
+    public static <A extends Comparable<? super A>> ComparableExpression<A> max(CollectionExpression<?,A> left) {
+        return Expressions.comparableOperation((Class) left.getParameter(0), Ops.QuantOps.MAX_IN_COL, (Expression<?>) left);
+    }
+
+    /**
+     * Create a min(col) expression
+     *
+     * @param left collection
+     * @return min(col)
+     */
+    public static <A extends Comparable<? super A>> ComparableExpression<A> min(CollectionExpression<?,A> left) {
+        return Expressions.comparableOperation((Class) left.getParameter(0), Ops.QuantOps.MIN_IN_COL, (Expression<?>) left);
+    }
+
+    /**
+     * Create a type(path) expression
+     *
+     * @param path entity
+     * @return type(path)
+     */
+    public static StringExpression type(EntityPath<?> path) {
+        return Expressions.stringOperation(JPQLOps.TYPE, path);
+    }
+
+    private static String getEntityName(Class<?> clazz) {
+        final Entity entityAnnotation = clazz.getAnnotation(Entity.class);
+        if (entityAnnotation != null && entityAnnotation.name().length() > 0) {
+            return entityAnnotation.name();
+        } else if (clazz.getPackage() != null) {
+            String pn = clazz.getPackage().getName();
+            return clazz.getName().substring(pn.length() + 1);
+        } else {
+            return clazz.getName();
+        }
+    }
+
+    private static <U extends BeanPath<? extends T>, T> Class<? extends T> getConcreteEntitySubType(Class<U> subtype) {
+        return (Class<? extends T>) ((ParameterizedType) subtype.getGenericSuperclass()).getActualTypeArguments()[0];
+    }
+
+    private JPAExpressions() { }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAListAccessVisitor.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAListAccessVisitor.java
new file mode 100644
index 0000000000..87ee9b2cfe
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAListAccessVisitor.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.ReplaceVisitor;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+
+class JPAListAccessVisitor extends ReplaceVisitor<Void> {
+
+    private final QueryMetadata metadata;
+
+    private final Map<Expression<?>, Path<?>> aliases;
+
+    private final Map<Path<?>, Path<?>> replacements = new HashMap<>();
+
+    JPAListAccessVisitor(QueryMetadata metadata, Map<Expression<?>, Path<?>> aliases) {
+        this.metadata = metadata;
+        this.aliases = aliases;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Expression<?> visit(Path<?> expr, @Nullable Void context) {
+        expr = (Path<?>) super.visit(expr, null);
+        PathMetadata pathMetadata = expr.getMetadata();
+        if (pathMetadata.getPathType() == PathType.LISTVALUE
+                || pathMetadata.getPathType() == PathType.LISTVALUE_CONSTANT) {
+            Path<?> replacement = replacements.get(expr);
+            if (replacement == null) {
+                // join parent as path123 on index(path123) = ...
+                Path parent = shorten(pathMetadata.getParent(), true);
+                replacement = ExpressionUtils.path(expr.getType(),
+                        ExpressionUtils.createRootVariable(parent, replacements.size()));
+                metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(parent, replacement));
+                metadata.addJoinCondition(ExpressionUtils.eq(
+                        (Expression) Expressions.operation(Integer.class, JPQLOps.INDEX, replacement),
+                        ExpressionUtils.toExpression(pathMetadata.getElement())));
+                replacements.put(expr, replacement);
+            }
+            return replacement;
+        } else {
+            return super.visit(expr, context);
+        }
+    }
+
+    /**
+     * Shorten the parent path to a length of max 2 elements
+     */
+    private Path<?> shorten(Path<?> path, boolean outer) {
+        if (aliases.containsKey(path)) {
+            return aliases.get(path);
+        } else if (path.getMetadata().isRoot()) {
+            return path;
+        } else if (path.getMetadata().getParent().getMetadata().isRoot() && outer) {
+            return path;
+        } else {
+            Class<?> type = JPAQueryMixin.getElementTypeOrType(path);
+            Path<?> parent = shorten(path.getMetadata().getParent(), false);
+            Path oldPath = ExpressionUtils.path(path.getType(),
+                    new PathMetadata(parent, path.getMetadata().getElement(), path.getMetadata().getPathType()));
+            if (oldPath.getMetadata().getParent().getMetadata().isRoot() && outer) {
+                return oldPath;
+            } else {
+                Path newPath = ExpressionUtils.path(type, ExpressionUtils.createRootVariable(oldPath));
+                aliases.put(path, newPath);
+                metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(oldPath, newPath));
+                return newPath;
+            }
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java
new file mode 100644
index 0000000000..a574e88625
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.ReplaceVisitor;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+
+class JPAMapAccessVisitor extends ReplaceVisitor<Void> {
+
+    private final QueryMetadata metadata;
+
+    private final Map<Expression<?>, Path<?>> aliases;
+
+    private final Map<Path<?>, Path<?>> replacements = new HashMap<>();
+
+    JPAMapAccessVisitor(QueryMetadata metadata, Map<Expression<?>, Path<?>> aliases) {
+        this.metadata = metadata;
+        this.aliases = aliases;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Expression<?> visit(Operation<?> expr, @Nullable Void context) {
+        if (expr.getOperator() == Ops.CONTAINS_KEY) {
+            ParameterizedExpression map = (ParameterizedExpression<?>) expr.getArg(0);
+            Expression key = expr.getArg(1);
+            Path replacement = ExpressionUtils.path(map.getParameter(1),
+                    ExpressionUtils.createRootVariable((Path<?>) map, Math.abs(expr.hashCode())));
+            metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(map, replacement));
+            metadata.addJoinCondition(ExpressionUtils.eq(
+                    Expressions.operation(map.getParameter(0), JPQLOps.KEY, replacement),
+                    key));
+            return ExpressionUtils.isNotNull(replacement);
+        } else if (expr.getOperator() == Ops.CONTAINS_VALUE) {
+            ParameterizedExpression<?> map = (ParameterizedExpression<?>) expr.getArg(0);
+            Expression<?> value = expr.getArg(1);
+            return Expressions.predicate(JPQLOps.MEMBER_OF, value, map);
+        } else {
+            return super.visit(expr, context);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Expression<?> visit(Path<?> expr, @Nullable Void context) {
+        expr = (Path<?>) super.visit(expr, null);
+        PathMetadata pathMetadata = expr.getMetadata();
+        if (pathMetadata.getPathType() == PathType.MAPVALUE
+         || pathMetadata.getPathType() == PathType.MAPVALUE_CONSTANT) {
+            Path<?> replacement = replacements.get(expr);
+            if (replacement == null) {
+                // join parent as path123 on key(path123) = ...
+                Path parent = shorten(pathMetadata.getParent(), true);
+                ParameterizedExpression parExpr = (ParameterizedExpression) pathMetadata.getParent();
+                replacement = ExpressionUtils.path(parExpr.getParameter(1),
+                        ExpressionUtils.createRootVariable(parent, replacements.size()));
+                metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(parent, replacement));
+                metadata.addJoinCondition(ExpressionUtils.eq(
+                        Expressions.operation(parExpr.getParameter(0), JPQLOps.KEY, replacement),
+                        ExpressionUtils.toExpression(pathMetadata.getElement())));
+                replacements.put(expr, replacement);
+            }
+            return replacement;
+        } else {
+            return super.visit(expr, context);
+        }
+    }
+
+    /**
+     * Shorten the parent path to a length of max 2 elements
+     */
+    private Path<?> shorten(Path<?> path, boolean outer) {
+        if (aliases.containsKey(path)) {
+            return aliases.get(path);
+        } else if (path.getMetadata().isRoot()) {
+            return path;
+        } else if (path.getMetadata().getParent().getMetadata().isRoot() && outer) {
+            return path;
+        } else {
+            Class<?> type = JPAQueryMixin.getElementTypeOrType(path);
+            Path<?> parent = shorten(path.getMetadata().getParent(), false);
+            Path oldPath = ExpressionUtils.path(path.getType(),
+                    new PathMetadata(parent, path.getMetadata().getElement(), path.getMetadata().getPathType()));
+            if (oldPath.getMetadata().getParent().getMetadata().isRoot() && outer) {
+                return oldPath;
+            } else {
+                Path newPath = ExpressionUtils.path(type, ExpressionUtils.createRootVariable(oldPath));
+                aliases.put(path, newPath);
+                metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(oldPath, newPath));
+                return newPath;
+            }
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryBase.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryBase.java
new file mode 100644
index 0000000000..ab84866658
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryBase.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.FetchableSubQueryBase;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code JPAQueryBase} is a base Query class for JPA queries
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class JPAQueryBase<T, Q extends JPAQueryBase<T, Q>> extends FetchableSubQueryBase<T, Q> implements JPQLQuery<T> {
+
+    protected final JPAQueryMixin<Q> queryMixin;
+
+    private final JPQLTemplates templates;
+
+    @SuppressWarnings("unchecked")
+    public JPAQueryBase(QueryMetadata md, JPQLTemplates templates) {
+        super(new JPAQueryMixin<Q>(md));
+        super.queryMixin.setSelf((Q) this);
+        this.queryMixin = (JPAQueryMixin<Q>) super.queryMixin;
+        this.templates = templates;
+    }
+
+    protected JPQLTemplates getTemplates() {
+        return templates;
+    }
+
+    protected abstract JPQLSerializer createSerializer();
+
+    protected JPQLSerializer serialize(boolean forCountRow) {
+        return serialize(forCountRow, true);
+    }
+
+    protected JPQLSerializer serialize(boolean forCountRow, boolean validate) {
+        if (validate) {
+            if (queryMixin.getMetadata().getJoins().isEmpty()) {
+                throw new IllegalArgumentException("No sources given");
+            }
+        }
+        JPQLSerializer serializer = createSerializer();
+        serializer.serialize(queryMixin.getMetadata(), forCountRow, null);
+        return serializer;
+    }
+
+    protected abstract void reset();
+
+    @Override
+    public Q fetchJoin() {
+        return queryMixin.fetchJoin();
+    }
+
+    @Override
+    public Q fetchAll() {
+        return queryMixin.fetchAll();
+    }
+
+    public Q from(EntityPath<?> arg) {
+        return queryMixin.from(arg);
+    }
+
+    @Override
+    public Q from(EntityPath<?>... args) {
+        return queryMixin.from(args);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <P> Q from(CollectionExpression<?,P> target, Path<P> alias) {
+        return (Q) queryMixin.from((Expression) Expressions.as((Path) target, alias));
+    }
+
+    @Override
+    public <P> Q innerJoin(CollectionExpression<?,P> target) {
+        return queryMixin.innerJoin(target);
+    }
+
+    @Override
+    public <P> Q innerJoin(CollectionExpression<?,P>target, Path<P> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q innerJoin(EntityPath<P> target) {
+        return queryMixin.innerJoin(target);
+    }
+
+    @Override
+    public <P> Q innerJoin(EntityPath<P> target, Path<P> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q innerJoin(MapExpression<?,P> target) {
+        return queryMixin.innerJoin(target);
+    }
+
+    @Override
+    public <P> Q innerJoin(MapExpression<?,P> target, Path<P> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q join(CollectionExpression<?,P> target) {
+        return queryMixin.join(target);
+    }
+
+    @Override
+    public <P> Q join(CollectionExpression<?,P> target, Path<P> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public <P> Q join(EntityPath<P> target) {
+        return queryMixin.join(target);
+    }
+
+    @Override
+    public <P> Q join(EntityPath<P> target, Path<P> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public <P> Q join(MapExpression<?,P> target) {
+        return queryMixin.join(target);
+    }
+
+    @Override
+    public <P> Q join(MapExpression<?,P> target, Path<P> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public <P> Q leftJoin(CollectionExpression<?,P> target) {
+        return queryMixin.leftJoin(target);
+    }
+
+    @Override
+    public <P> Q leftJoin(CollectionExpression<?,P> target, Path<P> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q leftJoin(EntityPath<P> target) {
+        return queryMixin.leftJoin(target);
+    }
+
+    @Override
+    public <P> Q leftJoin(EntityPath<P> target, Path<P> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q leftJoin(MapExpression<?,P> target) {
+        return queryMixin.leftJoin(target);
+    }
+
+    @Override
+    public <P> Q leftJoin(MapExpression<?,P> target, Path<P> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q rightJoin(CollectionExpression<?,P> target) {
+        return queryMixin.rightJoin(target);
+    }
+
+    @Override
+    public <P> Q rightJoin(CollectionExpression<?,P> target, Path<P> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q rightJoin(EntityPath<P> target) {
+        return queryMixin.rightJoin(target);
+    }
+
+    @Override
+    public <P> Q rightJoin(EntityPath<P> target, Path<P> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    @Override
+    public <P> Q rightJoin(MapExpression<?,P> target) {
+        return queryMixin.rightJoin(target);
+    }
+
+    @Override
+    public <P> Q rightJoin(MapExpression<?,P> target, Path<P> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    public Q on(Predicate condition) {
+        return queryMixin.on(condition);
+    }
+
+    @Override
+    public Q on(Predicate... conditions) {
+        return queryMixin.on(conditions);
+    }
+
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = serialize(false, false);
+        return serializer.toString().trim();
+    }
+
+    @Override
+    public abstract Q clone();
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryMixin.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryMixin.java
new file mode 100644
index 0000000000..ea494407a7
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryMixin.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.Entity;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.Context;
+import com.querydsl.core.support.PathsExtractor;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.support.ReplaceVisitor;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.CollectionPathBase;
+
+/**
+ * {@code JPAQueryMixin} extends {@link QueryMixin} to support JPQL join construction
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JPAQueryMixin<T> extends QueryMixin<T> {
+
+    private final Set<Path<?>> paths = new HashSet<>();
+
+    private final Map<Expression<?>, Path<?>> aliases = new HashMap<>();
+
+    private final JPAMapAccessVisitor mapAccessVisitor;
+
+    private final JPAListAccessVisitor listAccessVisitor;
+
+    private final JPACollectionAnyVisitor collectionAnyVisitor;
+
+    private final ReplaceVisitor<Void> replaceVisitor =  new ReplaceVisitor<Void>() {
+        @Override
+        public Expression<?> visit(Path<?> expr, Void context) {
+            return convertPathForOrder(expr);
+        }
+        @Override
+        public Expression<?> visit(SubQueryExpression<?> expr, @Nullable Void context) {
+            // don't shorten paths inside subquery expressions
+            return expr;
+        }
+    };
+
+
+    public static final JoinFlag FETCH = new JoinFlag("fetch ");
+
+    public static final JoinFlag FETCH_ALL_PROPERTIES = new JoinFlag(" fetch all properties");
+
+    public JPAQueryMixin() {
+        this(null, new DefaultQueryMetadata());
+    }
+
+    public JPAQueryMixin(QueryMetadata metadata) {
+        this(null, metadata);
+    }
+
+    public JPAQueryMixin(T self, QueryMetadata metadata) {
+        super(self, metadata);
+        mapAccessVisitor = new JPAMapAccessVisitor(metadata, aliases);
+        listAccessVisitor = new JPAListAccessVisitor(metadata, aliases);
+        collectionAnyVisitor = new JPACollectionAnyVisitor();
+    }
+
+    public T fetchJoin() {
+        addJoinFlag(FETCH);
+        return getSelf();
+    }
+
+    public T fetchAll() {
+        addJoinFlag(FETCH_ALL_PROPERTIES);
+        return getSelf();
+    }
+
+    @Override
+    protected <D> Expression<D> createAlias(Expression<?> expr, Path<D> alias) {
+        aliases.put(expr, alias);
+        return super.createAlias(expr, alias);
+    }
+
+    static boolean isEntityPath(Path<?> path) {
+        if (path instanceof CollectionPathBase) {
+            return isEntityPath((Path<?>) ((CollectionPathBase) path).any());
+        } else {
+            return path instanceof EntityPath
+                || path.getType().isAnnotationPresent(Entity.class);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> Class<T> getElementTypeOrType(Path<T> path) {
+        if (path instanceof CollectionExpression) {
+            return ((CollectionExpression) path).getParameter(0);
+        } else {
+            return (Class<T>) path.getType();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> Path<T> shorten(Path<T> path, List<Path<?>> paths) {
+        PathMetadata metadata = path.getMetadata();
+        if (metadata.isRoot() || paths.contains(path)) {
+            return path;
+        } else if (aliases.containsKey(path)) {
+            return (Path<T>) aliases.get(path);
+        } else if (metadata.getPathType() == PathType.COLLECTION_ANY) {
+            return (Path<T>) shorten(metadata.getParent(), paths);
+        } else if (!isEntityPath(path)) {
+            Path<?> parent = shorten(metadata.getParent(), paths);
+            if (parent.equals(metadata.getParent())) {
+                return path;
+            } else {
+                return ExpressionUtils.path(path.getType(),
+                        new PathMetadata(parent, metadata.getElement(), metadata.getPathType()));
+            }
+        } else if (metadata.getParent().getMetadata().isRoot()) {
+            Class<T> type = getElementTypeOrType(path);
+            Path<T> newPath = ExpressionUtils.path(type, ExpressionUtils.createRootVariable(path));
+            leftJoin(path, newPath);
+            return newPath;
+        } else {
+            Class<T> type = getElementTypeOrType(path);
+            Path<?> parent = shorten(metadata.getParent(), paths);
+            Path<T> oldPath = ExpressionUtils.path(path.getType(),
+                    new PathMetadata(parent, metadata.getElement(), metadata.getPathType()));
+            Path<T> newPath = ExpressionUtils.path(type, ExpressionUtils.createRootVariable(oldPath));
+            aliases.put(path, newPath);
+            leftJoin(oldPath, newPath);
+            return newPath;
+        }
+    }
+
+    private <T> Path<T> convertPathForOrder(Path<T> path) {
+        PathMetadata metadata = path.getMetadata();
+        // at least three levels
+        if (metadata.getParent() != null && !metadata.getParent().getMetadata().isRoot()) {
+            Set<Expression<?>> exprs = new HashSet<>();
+            QueryMetadata md = getMetadata();
+            exprs.addAll(md.getGroupBy());
+            if (md.getProjection() != null) {
+                exprs.add(md.getProjection());
+            }
+            if (md.getWhere() != null) {
+                exprs.add(md.getWhere());
+            }
+            if (md.getHaving() != null) {
+                exprs.add(md.getHaving());
+            }
+            List<Path<?>> paths = new ArrayList<>();
+            // extract paths
+            PathsExtractor.DEFAULT.visit(exprs, paths);
+
+            if (!paths.contains(path) && !paths.contains(metadata.getParent())) {
+                Path<?> shortened = shorten(metadata.getParent(), paths);
+                return ExpressionUtils.path(path.getType(),
+                        new PathMetadata(shortened, metadata.getElement(), metadata.getPathType()));
+            } else {
+                return path;
+            }
+        } else {
+            return path;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <RT> Expression<RT> convert(Expression<RT> expr, Role role) {
+        expr = (Expression<RT>) expr.accept(mapAccessVisitor, null);
+        expr = (Expression<RT>) expr.accept(listAccessVisitor, null);
+        if (role == Role.ORDER_BY) {
+            if (expr instanceof Path) {
+                expr = convertPathForOrder((Path) expr);
+            } else {
+                expr = (Expression<RT>) expr.accept(replaceVisitor, null);
+            }
+        }
+        return Conversions.convert(super.convert(expr, role));
+    }
+
+    @Override
+    protected Predicate convert(Predicate predicate, Role role) {
+        if (predicate != null) {
+            predicate = (Predicate) ExpressionUtils.extract(predicate);
+        }
+        if (predicate != null) {
+            predicate = (Predicate) predicate.accept(mapAccessVisitor, null);
+            predicate = (Predicate) predicate.accept(listAccessVisitor, null);
+        }
+        if (predicate != null) {
+            // transform any usage
+            predicate = (Predicate) predicate.accept(collectionAnyVisitor, new Context());
+            return predicate;
+        } else {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void addCondition(Context context, int i, Path<?> path, boolean where) {
+        paths.add(path);
+        EntityPath<?> alias = context.replacements.get(i);
+        leftJoin((Expression) path.getMetadata().getParent(), context.replacements.get(i));
+        Expression index = ExpressionUtils.operation(Integer.class, JPQLOps.INDEX, alias);
+        Object element = path.getMetadata().getElement();
+        if (!(element instanceof Expression)) {
+            element = ConstantImpl.create(element);
+        }
+        Predicate condition = ExpressionUtils.eq(index, (Expression) element);
+        if (where) {
+            super.where(condition);
+        } else {
+            super.having(condition);
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
new file mode 100644
index 0000000000..563accf253
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+
+class JPASubQuery<T> extends JPAQueryBase<T, JPASubQuery<T>> {
+
+    JPASubQuery() {
+        super(new DefaultQueryMetadata(), JPQLTemplates.DEFAULT);
+    }
+
+    JPASubQuery(QueryMetadata metadata) {
+        super(metadata, JPQLTemplates.DEFAULT);
+    }
+
+    @Override
+    protected JPQLSerializer createSerializer() {
+        return new JPQLSerializer(getTemplates(), null);
+    }
+
+    @Override
+    protected void reset() {
+        // do nothing
+    }
+
+    @Override
+    public JPASubQuery<T> clone() {
+        return new JPASubQuery<T>(getMetadata().clone());
+    }
+
+    @Override
+    public <U> JPASubQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPASubQuery<U> newType = (JPASubQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public JPASubQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPASubQuery<Tuple> newType = (JPASubQuery<Tuple>) this;
+        return newType;
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long fetchCount() {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLOps.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLOps.java
new file mode 100644
index 0000000000..57c1c910c7
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLOps.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * {@code JPQLOps} provides JPQL specific operators
+ *
+ * @author tiwe
+ *
+ */
+public enum JPQLOps implements Operator {
+    TREAT(Object.class),
+    INDEX(Integer.class),
+    TYPE(String.class),
+    CAST(Object.class),
+    MEMBER_OF(Boolean.class),
+    NOT_MEMBER_OF(Boolean.class),
+    KEY(Object.class),
+    VALUE(Object.class);
+
+    private final Class<?> type;
+
+    JPQLOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java
new file mode 100644
index 0000000000..34d3b71c24
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQuery.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.Query;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.support.ExtendedSubQuery;
+import com.querydsl.core.types.*;
+
+/**
+ * Query interface for JPQL queries
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ *
+ */
+public interface JPQLQuery<T> extends FetchableQuery<T, JPQLQuery<T>>, Query<JPQLQuery<T>>, ExtendedSubQuery<T> {
+
+    /**
+     * Add sources to this query
+     *
+     * @param sources sources
+     * @return the current object
+     */
+    JPQLQuery<T> from(EntityPath<?>... sources);
+
+    /**
+     * Add a query source
+     *
+     * @param target collection
+     * @param alias alias
+     * @param <P>
+     * @return the current object
+     */
+    <P> JPQLQuery<T> from(CollectionExpression<?,P> target, Path<P> alias);
+
+    /**
+     * Create a inner join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(EntityPath<P> target);
+
+    /**
+     * Create a inner join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(EntityPath<P> target, Path<P> alias);
+
+    /**
+     * Create a inner join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(CollectionExpression<?, P> target);
+
+    /**
+     * Create a inner join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(CollectionExpression<?,P> target, Path<P> alias);
+
+    /**
+     * Create a inner join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(MapExpression<?, P> target);
+
+    /**
+     * Create a inner join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> innerJoin(MapExpression<?, P> target, Path<P> alias);
+
+    /**
+     * Create a join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(EntityPath<P> target);
+
+    /**
+     * Create a join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(EntityPath<P> target, Path<P> alias);
+
+    /**
+     * Create a join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(CollectionExpression<?,P> target);
+
+    /**
+     * Create a join with the given target
+     * Use fetchJoin() to add the fetchJoin parameter to this join
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(CollectionExpression<?,P> target, Path<P> alias);
+
+    /**
+     * Create a join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(MapExpression<?, P> target);
+
+    /**
+     * Create a join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> join(MapExpression<?, P> target, Path<P> alias);
+
+    /**
+     * Create a left join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(EntityPath<P> target);
+
+    /**
+     * Create a left join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(EntityPath<P> target, Path<P> alias);
+
+    /**
+     * Create a left join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(CollectionExpression<?,P> target);
+
+    /**
+     * Create a left join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(CollectionExpression<?,P> target, Path<P> alias);
+
+    /**
+     * Create a left join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(MapExpression<?, P> target);
+
+    /**
+     * Create a left join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> leftJoin(MapExpression<?, P> target, Path<P> alias);
+
+    /**
+     * Create a right join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(EntityPath<P> target);
+
+    /**
+     * Create a right join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(EntityPath<P> target, Path<P> alias);
+
+    /**
+     * Create a right join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(CollectionExpression<?,P> target);
+
+    /**
+     * Create a right join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(CollectionExpression<?,P> target, Path<P> alias);
+
+    /**
+     * Create a right join with the given target.
+     * Use fetchJoin() to add the fetchJoin parameter to this join.
+     *
+     * @param <P>
+     * @param target target
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(MapExpression<?, P> target);
+
+    /**
+     * Create a right join with the given target and alias.
+     *
+     * @param <P>
+     * @param target target
+     * @param alias alias
+     * @return the current object
+     */
+    <P> JPQLQuery<T> rightJoin(MapExpression<?, P> target, Path<P> alias);
+
+    /**
+     * Add join conditions to the last added join
+     *
+     * @param condition join conditions
+     * @return the current object
+     */
+    JPQLQuery<T> on(Predicate... condition);
+
+    /**
+     * Add the "fetchJoin" flag to the last defined join
+     *
+     * Mind that collection joins might result in duplicate rows and that "inner join fetchJoin"
+     * will restrict your result set.
+     *
+     * @return the current object
+     */
+    JPQLQuery<T> fetchJoin();
+
+    /**
+      * Add the "fetchJoin all properties" flag to the last defined join.
+      * @return the current object
+       */
+    JPQLQuery<T> fetchAll();
+
+    @Override
+    <U> JPQLQuery<U> select(Expression<U> expr);
+
+    @Override
+    JPQLQuery<Tuple> select(Expression<?>... exprs);
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java
new file mode 100644
index 0000000000..4c18b87da1
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLQueryFactory.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.QueryFactory;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.dml.InsertClause;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+
+/**
+ * Common interface for JPA related QueryFactory implementations
+ *
+ * @author tiwe
+ *
+ */
+public interface JPQLQueryFactory extends QueryFactory<JPQLQuery<?>> {
+
+    /**
+     * Create a new DELETE clause
+     *
+     * @param path entity to delete from
+     * @return delete clause
+     */
+    DeleteClause<?> delete(EntityPath<?> path);
+
+    /**
+     * Create a new JPQLQuery instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(expr)
+     */
+    <T> JPQLQuery<T> select(Expression<T> expr);
+
+    /**
+     * Create a new JPQLQuery instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    JPQLQuery<Tuple> select(Expression<?>... exprs);
+
+    /**
+     * Create a new JPQLQuery instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(distinct expr)
+     */
+    <T> JPQLQuery<T> selectDistinct(Expression<T> expr);
+
+    /**
+     * Create a new JPQLQuery instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(distinct exprs)
+     */
+    JPQLQuery<Tuple> selectDistinct(Expression<?>... exprs);
+
+    /**
+     * Create a new JPQLQuery instance with the projection one
+     *
+     * @return select(1)
+     */
+    JPQLQuery<Integer> selectOne();
+
+    /**
+     * Create a new JPQLQuery instance with the projection zero
+     *
+     * @return select(0)
+     */
+    JPQLQuery<Integer> selectZero();
+
+    /**
+     * Create a new JPQLQuery instance with the given source and projection
+     *
+     * @param from projection and source
+     * @param <T>
+     * @return select(from).from(from)
+     */
+    <T> JPQLQuery<T> selectFrom(EntityPath<T> from);
+
+    /**
+     * Create a new Query with the given source
+     *
+     * @param from from
+     * @return from(from)
+     */
+    JPQLQuery<?> from(EntityPath<?> from);
+
+    /**
+     * Create a new Query with the given source
+     *
+     * @param from from
+     * @return from(from)
+     */
+    JPQLQuery<?> from(EntityPath<?>... from);
+
+    /**
+     * Create a new UPDATE clause
+     *
+     * @param path entity to update
+     * @return update clause
+     */
+    UpdateClause<?> update(EntityPath<?> path);
+
+    /**
+     * Create a new INSERT clause
+     *
+     * @param path entity to insert to
+     * @return insert clause
+     */
+    InsertClause<?> insert(EntityPath<?> path);
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java
new file mode 100644
index 0000000000..06c0a1c759
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.*;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.Metamodel;
+import javax.persistence.metamodel.SingularAttribute;
+
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.SerializerBase;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.MathUtils;
+
+/**
+ * {@code JPQLSerializer} serializes Querydsl expressions into JPQL syntax.
+ *
+ * @author tiwe
+ */
+public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
+
+    private static final Set<? extends Operator> NUMERIC = Collections.unmodifiableSet(EnumSet.of(
+            Ops.ADD, Ops.SUB, Ops.MULT, Ops.DIV,
+            Ops.LT, Ops.LOE, Ops.GT, Ops.GOE, Ops.BETWEEN));
+
+    private static final Set<? extends Operator> CASE_OPS = Collections.unmodifiableSet(EnumSet.of(
+            Ops.CASE_EQ_ELSE, Ops.CASE_ELSE));
+
+    private static final String COMMA = ", ";
+
+    private static final String DELETE = "delete from ";
+
+    private static final String FROM = "from ";
+
+    private static final String GROUP_BY = "\ngroup by ";
+
+    private static final String HAVING = "\nhaving ";
+
+    private static final String ORDER_BY = "\norder by ";
+
+    private static final String SELECT = "select ";
+
+    private static final String SELECT_COUNT = "select count(";
+
+    private static final String SELECT_COUNT_DISTINCT = "select count(distinct ";
+
+    private static final String SELECT_DISTINCT = "select distinct ";
+
+    private static final String SET = "\nset ";
+
+    private static final String UPDATE = "update ";
+
+    private static final String INSERT = "insert into ";
+
+    private static final String VALUES = "\nvalues ";
+
+    private static final String WHERE = "\nwhere ";
+
+    private static final String WITH = " with ";
+
+    private static final String ON = " on ";
+
+    private static final Map<JoinType, String> joinTypes = new EnumMap<JoinType, String>(JoinType.class);
+
+    private final JPQLTemplates templates;
+
+    private final EntityManager entityManager;
+
+    private boolean inProjection = false;
+
+    private boolean inCaseOperation = false;
+
+    static {
+        joinTypes.put(JoinType.DEFAULT, COMMA);
+        joinTypes.put(JoinType.FULLJOIN, "\n  full join ");
+        joinTypes.put(JoinType.INNERJOIN, "\n  inner join ");
+        joinTypes.put(JoinType.JOIN, "\n  inner join ");
+        joinTypes.put(JoinType.LEFTJOIN, "\n  left join ");
+        joinTypes.put(JoinType.RIGHTJOIN, "\n  right join ");
+    }
+
+    private boolean wrapElements = false;
+
+    public JPQLSerializer(JPQLTemplates templates) {
+        this(templates, null);
+    }
+
+    public JPQLSerializer(JPQLTemplates templates, EntityManager em) {
+        super(templates);
+        this.templates = templates;
+        this.entityManager = em;
+    }
+
+    private String getEntityName(Class<?> clazz) {
+        final Entity entityAnnotation = clazz.getAnnotation(Entity.class);
+        if (entityAnnotation != null && entityAnnotation.name().length() > 0) {
+            return entityAnnotation.name();
+        } else if (clazz.getPackage() != null && clazz.getPackage().getName().length() > 0) {
+            String pn = clazz.getPackage().getName();
+            return clazz.getName().substring(pn.length() + 1);
+        } else {
+            return clazz.getName();
+        }
+    }
+
+    private void handleJoinTarget(JoinExpression je) {
+        // type specifier
+        if (je.getTarget() instanceof EntityPath<?>) {
+            final EntityPath<?> pe = (EntityPath<?>) je.getTarget();
+            if (pe.getMetadata().isRoot()) {
+                append(getEntityName(pe.getType()));
+                append(" ");
+            }
+            handle(je.getTarget());
+        } else if (je.getTarget() instanceof Operation) {
+            Operation<?> op = (Operation) je.getTarget();
+            if (op.getOperator() == Ops.ALIAS) {
+                boolean treat = false;
+                if (Collection.class.isAssignableFrom(op.getArg(0).getType())) {
+                    if (op.getArg(0) instanceof CollectionExpression) {
+                        Class<?> par = ((CollectionExpression) op.getArg(0)).getParameter(0);
+                        treat = !par.equals(op.getArg(1).getType());
+                    }
+                } else if (Map.class.isAssignableFrom(op.getArg(0).getType())) {
+                    if (op.getArg(0) instanceof MapExpression) {
+                        Class<?> par = ((MapExpression) op.getArg(0)).getParameter(1);
+                        treat = !par.equals(op.getArg(1).getType());
+                    }
+                } else {
+                    treat = !op.getArg(0).getType().equals(op.getArg(1).getType());
+                }
+                if (treat) {
+                    Expression<?> entityName = ConstantImpl.create(getEntityName(op.getArg(1).getType()));
+                    Expression<?> t = ExpressionUtils.operation(op.getType(), JPQLOps.TREAT, op.getArg(0), entityName);
+                    op = ExpressionUtils.operation(op.getType(), Ops.ALIAS, t, op.getArg(1));
+                }
+            }
+            handle(op);
+        } else {
+            handle(je.getTarget());
+        }
+    }
+
+    public void serialize(QueryMetadata metadata, boolean forCountRow, @Nullable String projection) {
+        final Expression<?> select = metadata.getProjection();
+        final List<JoinExpression> joins = metadata.getJoins();
+        final Predicate where = metadata.getWhere();
+        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
+        final Predicate having = metadata.getHaving();
+        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
+
+        // select
+        boolean inProjectionOrig = inProjection;
+        inProjection = true;
+        if (projection != null) {
+            append(SELECT).append(projection).append("\n");
+
+        } else if (forCountRow) {
+            if (!groupBy.isEmpty()) {
+                append(SELECT_COUNT_DISTINCT);
+                handle(", ", groupBy);
+            } else {
+                if (!metadata.isDistinct()) {
+                    append(SELECT_COUNT);
+                } else {
+                    append(SELECT_COUNT_DISTINCT);
+                }
+                if (select != null) {
+                    if (select instanceof FactoryExpression) {
+                        handle(joins.get(0).getTarget());
+                    } else {
+                        // TODO : make sure this works
+                        handle(select);
+                    }
+                } else {
+                    handle(joins.get(0).getTarget());
+                }
+            }
+            append(")\n");
+
+        } else if (select != null || !joins.isEmpty()) {
+            if (!metadata.isDistinct()) {
+                append(SELECT);
+            } else {
+                append(SELECT_DISTINCT);
+            }
+            if (select != null) {
+                handle(select);
+            } else {
+                handle(joins.get(0).getTarget());
+            }
+            append("\n");
+
+        }
+        inProjection = inProjectionOrig;
+
+        // from
+        if (!joins.isEmpty()) {
+            append(FROM);
+            serializeSources(forCountRow, joins);
+        }
+
+        // where
+        if (where != null) {
+            append(WHERE).handle(where);
+        }
+
+        // group by
+        if (!groupBy.isEmpty() && !forCountRow) {
+            append(GROUP_BY).handle(COMMA, groupBy);
+        }
+
+        // having
+        if (having != null) {
+            append(HAVING).handle(having);
+        }
+
+        // order by
+        if (!orderBy.isEmpty() && !forCountRow) {
+            append(ORDER_BY);
+            boolean first = true;
+            for (final OrderSpecifier<?> os : orderBy) {
+                if (!first) {
+                    append(COMMA);
+                }
+                handle(os.getTarget());
+                append(os.getOrder() == Order.ASC ? " asc" : " desc");
+                if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
+                    append(" nulls first");
+                } else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
+                    append(" nulls last");
+                }
+                first = false;
+            }
+        }
+    }
+
+    public void serializeForDelete(QueryMetadata md) {
+        append(DELETE);
+        handleJoinTarget(md.getJoins().get(0));
+        if (md.getWhere() != null) {
+            append(WHERE).handle(md.getWhere());
+        }
+    }
+
+    private static String relativePathString(Expression<?> root, Path<?> path) {
+        StringBuilder pathString = new StringBuilder(path.getMetadata().getName().length());
+        while (path.getMetadata().getParent() != null && !path.equals(root)) {
+            if (pathString.length() > 0) {
+                pathString.insert(0, '.');
+            }
+            pathString.insert(0, path.getMetadata().getName());
+            path = path.getMetadata().getParent();
+        }
+        return pathString.toString();
+    }
+
+    public void serializeForInsert(QueryMetadata md, Collection<Path<?>> columns, List<Object> values, SubQueryExpression<?> query, Map<Path<?>, Expression<?>> inserts) {
+        append(INSERT);
+        final JoinExpression root = md.getJoins().get(0);
+        append(getEntityName(root.getTarget().getType()));
+        append(" (");
+        boolean first = true;
+        for (Path<?> path : columns) {
+            if (!first) {
+                append(", ");
+            }
+
+            append(relativePathString(root.getTarget(), path));
+            first = false;
+        }
+        append(")\n");
+
+        if (values != null && values.size() > 0) {
+            append(VALUES);
+            append(" (");
+            first = true;
+            for (Object value : values) {
+                if (!first) {
+                    append(", ");
+                }
+                handle(value);
+                first = false;
+            }
+            append(")");
+        } else if (inserts != null && inserts.entrySet().size() > 0) {
+            first = true;
+            for (Map.Entry<Path<?>, Expression<?>> entry : inserts.entrySet()) {
+                if (!first) {
+                    append(", ");
+                }
+                handle(entry.getKey());
+                append(" = ");
+                handle(entry.getValue());
+                first = false;
+            }
+        } else {
+            serialize(query.getMetadata(), false, null);
+        }
+    }
+
+    public void serializeForUpdate(QueryMetadata md, Map<Path<?>, Expression<?>> updates) {
+        append(UPDATE);
+        handleJoinTarget(md.getJoins().get(0));
+        append(SET);
+        boolean first = true;
+        for (Map.Entry<Path<?>, Expression<?>> entry : updates.entrySet()) {
+            if (!first) {
+                append(", ");
+            }
+            handle(entry.getKey());
+            append(" = ");
+            handle(entry.getValue());
+            first = false;
+        }
+        if (md.getWhere() != null) {
+            append(WHERE).handle(md.getWhere());
+        }
+    }
+
+    private void serializeSources(boolean forCountRow, List<JoinExpression> joins) {
+        for (int i = 0; i < joins.size(); i++) {
+            final JoinExpression je = joins.get(i);
+            if (i > 0) {
+                append(joinTypes.get(je.getType()));
+            }
+            if (je.hasFlag(JPAQueryMixin.FETCH) && !forCountRow) {
+                handle(JPAQueryMixin.FETCH);
+            }
+            handleJoinTarget(je);
+            // XXX Hibernate specific flag
+            if (je.hasFlag(JPAQueryMixin.FETCH_ALL_PROPERTIES) && !forCountRow) {
+                handle(JPAQueryMixin.FETCH_ALL_PROPERTIES);
+            }
+
+            if (je.getCondition() != null) {
+                append(templates.isWithForOn() ? WITH : ON);
+                handle(je.getCondition());
+            }
+        }
+    }
+
+    @Override
+    public void visitConstant(Object constant) {
+        if (inCaseOperation && templates.isCaseWithLiterals()) {
+            if (constant instanceof Collection) {
+                append("(");
+                boolean first = true;
+                for (Object o : (Collection) constant) {
+                    if (!first) {
+                        append(", ");
+                    }
+                    visitLiteral(o);
+                    first = false;
+                }
+                append(")");
+            } else {
+                visitLiteral(constant);
+            }
+        } else {
+            boolean wrap = templates.wrapConstant(constant);
+            if (wrap) {
+                append("(");
+            }
+            super.visitConstant(constant);
+            if (wrap) {
+                append(")");
+            }
+        }
+    }
+
+    public void visitLiteral(Object constant) {
+        append(templates.asLiteral(constant));
+    }
+
+    @Override
+    protected void serializeConstant(int parameterIndex, String constantLabel) {
+        append("?");
+        append(Integer.toString(parameterIndex));
+    }
+
+    @Override
+    public Void visit(SubQueryExpression<?> query, Void context) {
+        append("(");
+        serialize(query.getMetadata(), false, null);
+        append(")");
+        return null;
+    }
+
+    @Override
+    public Void visit(Path<?> expr, Void context) {
+        // only wrap a PathCollection, if it the pathType is PROPERTY
+        boolean wrap = wrapElements
+        && (Collection.class.isAssignableFrom(expr.getType()) || Map.class.isAssignableFrom(expr.getType()))
+        && expr.getMetadata().getPathType().equals(PathType.PROPERTY);
+        if (wrap) {
+            append("elements(");
+        }
+        super.visit(expr, context);
+        if (wrap) {
+            append(")");
+        }
+        return null;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void visitOperation(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        boolean oldInCaseOperation = inCaseOperation;
+        inCaseOperation = CASE_OPS.contains(operator);
+        boolean oldWrapElements = wrapElements;
+        wrapElements = templates.wrapElements(operator);
+
+        if (operator == Ops.EQ && args.get(1) instanceof Operation &&
+                ((Operation) args.get(1)).getOperator() == Ops.QuantOps.ANY) {
+            args = Arrays.<Expression<?>> asList(args.get(0), ((Operation) args.get(1)).getArg(0));
+            visitOperation(type, Ops.IN, args);
+
+        } else if (operator == Ops.NE && args.get(1) instanceof Operation &&
+                ((Operation) args.get(1)).getOperator() == Ops.QuantOps.ANY) {
+            args = Arrays.<Expression<?>> asList(args.get(0), ((Operation) args.get(1)).getArg(0));
+            visitOperation(type, Ops.NOT_IN, args);
+
+        } else if (operator == Ops.IN || operator == Ops.NOT_IN) {
+            if (args.get(1) instanceof Path) {
+                visitAnyInPath(type, operator, args);
+            } else if (args.get(0) instanceof Path && args.get(1) instanceof Constant<?>) {
+                visitPathInCollection(type, operator, args);
+            } else {
+                super.visitOperation(type, operator, args);
+            }
+
+        } else if (operator == Ops.NUMCAST) {
+            visitNumCast(args);
+
+        } else if (operator == Ops.EXISTS && args.get(0) instanceof SubQueryExpression) {
+            final SubQueryExpression subQuery = (SubQueryExpression) args.get(0);
+            append("exists (");
+            serialize(subQuery.getMetadata(), false, templates.getExistsProjection());
+            append(")");
+
+        } else if (operator == Ops.MATCHES || operator == Ops.MATCHES_IC) {
+            super.visitOperation(type, Ops.LIKE,
+                    Arrays.asList(args.get(0), ExpressionUtils.regexToLike((Expression<String>) args.get(1))));
+
+        } else if (operator == Ops.LIKE && args.get(1) instanceof Constant<?>) {
+            final String escape = String.valueOf(templates.getEscapeChar());
+            final String escaped = args.get(1).toString().replace(escape, escape + escape);
+            super.visitOperation(String.class, Ops.LIKE,
+                    Arrays.asList(args.get(0), ConstantImpl.create(escaped)));
+
+        } else if (NUMERIC.contains(operator)) {
+            super.visitOperation(type, operator, normalizeNumericArgs(args));
+
+        } else if (operator == Ops.ALIAS) {
+            if (args.get(1) instanceof Path && !((Path<?>) args.get(1)).getMetadata().isRoot()) {
+                Path<?> path = (Path<?>) args.get(1);
+                args = Arrays.asList(args.get(0),
+                        ExpressionUtils.path(path.getType(), path.getMetadata().getName()));
+            }
+            super.visitOperation(type, operator, args);
+
+        } else {
+            try {
+                super.visitOperation(type, operator, args);
+            } catch (IllegalArgumentException e) {
+                if (operator.getClass().getName().endsWith("SQLOps")) {
+                    throw new IllegalArgumentException(String.format("SQL Expressions like %s are not supported in JPQL - the query language for JPA. " +
+                            "SQLExpressions.* can only be used in JPQL queries when these functions are registered as custom function in your ORM.%n" +
+                            "\tTo fix this issue, you have three options:%n" +
+                            "\t1) If you do want to use advanced, dialect specific, SQL functions within JPQL, make sure to make these functions available to " +
+                            "your ORM through custom functions and register these with your JPATemplates instance.%n" +
+                            "\t2) Use JPASQLQuery instead. This allows you to generate a pure SQL query based on your JPA metamodel.%n" +
+                            "\t3) Consider using the Blaze-Persistence QueryDSL integration. Blaze-Persistence is an extension on top of " +
+                            "JPA that makes various SQL specific functions like window functions available to JPQL.", operator.name()), e);
+                } else {
+                    throw e;
+                }
+            }
+        }
+
+        inCaseOperation = oldInCaseOperation;
+        wrapElements = oldWrapElements;
+    }
+
+    private void visitNumCast(List<? extends Expression<?>> args) {
+        @SuppressWarnings("unchecked") //this is the second argument's type
+        Constant<Class<?>> rightArg = (Constant<Class<?>>) args.get(1);
+
+        final Class<?> targetType = rightArg.getConstant();
+        final String typeName = templates.getTypeForCast(targetType);
+        visitOperation(targetType, JPQLOps.CAST, Arrays.asList(args.get(0), ConstantImpl.create(typeName)));
+    }
+
+    private void visitPathInCollection(Class<?> type, Operator operator,
+            List<? extends Expression<?>> args) {
+        Path<?> lhs = (Path<?>) args.get(0);
+        @SuppressWarnings("unchecked")
+        Constant<? extends Collection<?>> rhs = (Constant<? extends Collection<?>>) args.get(1);
+        if (rhs.getConstant().isEmpty()) {
+            operator = operator == Ops.IN ? Ops.EQ : Ops.NE;
+            args = Arrays.<Expression<?>> asList(Expressions.ONE, Expressions.TWO);
+        } else if (entityManager != null && !templates.isPathInEntitiesSupported() && args.get(0).getType().isAnnotationPresent(Entity.class)) {
+            final Metamodel metamodel = entityManager.getMetamodel();
+            final PersistenceUnitUtil util = entityManager.getEntityManagerFactory().getPersistenceUnitUtil();
+            final EntityType<?> entityType = metamodel.entity(args.get(0).getType());
+            if (entityType.hasSingleIdAttribute()) {
+                SingularAttribute<?,?> id = getIdProperty(entityType);
+                // turn lhs into id path
+                lhs = ExpressionUtils.path(id.getJavaType(), lhs, id.getName());
+                // turn rhs into id collection
+                Set<Object> ids = new HashSet<Object>();
+                for (Object entity : rhs.getConstant()) {
+                    ids.add(util.getIdentifier(entity));
+                }
+                rhs = ConstantImpl.create(ids);
+                args = Arrays.asList(lhs, rhs);
+            }
+        }
+
+        super.visitOperation(type, operator, args);
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private SingularAttribute<?,?> getIdProperty(EntityType entity) {
+        final Set<SingularAttribute> singularAttributes = entity.getSingularAttributes();
+        for (final SingularAttribute singularAttribute : singularAttributes) {
+            if (singularAttribute.isId()) {
+                return singularAttribute;
+            }
+        }
+        return null;
+    }
+
+    private void visitAnyInPath(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        super.visitOperation(type,
+                operator == Ops.IN ? JPQLOps.MEMBER_OF : JPQLOps.NOT_MEMBER_OF,
+                args);
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<? extends Expression<?>> normalizeNumericArgs(List<? extends Expression<?>> args) {
+        //we do not yet let it produce these types
+        //we verify the types with isAssignableFrom()
+        @SuppressWarnings("unchecked")
+        List<? extends Expression<? extends Number>> potentialArgs =
+                (List<? extends Expression<? extends Number>>) args;
+        boolean hasConstants = false;
+        Class<? extends Number> numType = null;
+        for (Expression<? extends Number> arg : potentialArgs) {
+            if (Number.class.isAssignableFrom(arg.getType())) {
+                if (arg instanceof Constant<?>) {
+                    hasConstants = true;
+                } else {
+                    numType = arg.getType();
+                }
+            }
+        }
+        if (hasConstants && numType != null) {
+            //now we do let the potentialArgs help us
+            final List<Expression<?>> newArgs = new ArrayList<Expression<?>>(args.size());
+            for (final Expression<? extends Number> arg : potentialArgs) {
+                if (arg instanceof Constant<?> && Number.class.isAssignableFrom(arg.getType())
+                        && !arg.getType().equals(numType)) {
+                    final Number number = ((Constant<? extends Number>) arg).getConstant();
+                    newArgs.add(ConstantImpl.create(MathUtils.cast(number, numType)));
+                } else {
+                    newArgs.add(arg);
+                }
+            }
+            return newArgs;
+        } else {
+            //the types are all non-constants, or not Number expressions
+            return potentialArgs;
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java
new file mode 100644
index 0000000000..8988a7d327
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.PathType;
+import com.querydsl.core.types.Templates;
+
+/**
+ * {@code JPQLTemplates} extends {@link Templates} to provide operator patterns for JPQL
+ * serialization
+ *
+ * @author tiwe
+ * @see HQLTemplates
+ * @see EclipseLinkTemplates
+ */
+public class JPQLTemplates extends Templates {
+
+    public static final char DEFAULT_ESCAPE = '!';
+
+    protected static final Set<? extends Operator> OTHER_LIKE_CASES
+            = Collections.unmodifiableSet(EnumSet.of(Ops.MATCHES, Ops.MATCHES_IC,
+                    Ops.ENDS_WITH, Ops.ENDS_WITH_IC,
+                    Ops.LIKE_IC, Ops.LIKE_ESCAPE_IC,
+                    Ops.STARTS_WITH, Ops.STARTS_WITH_IC,
+                    Ops.STRING_CONTAINS, Ops.STRING_CONTAINS_IC));
+
+    public static final JPQLTemplates DEFAULT = new JPQLTemplates();
+
+    private final QueryHandler queryHandler;
+
+    protected JPQLTemplates() {
+        this(DEFAULT_ESCAPE, DefaultQueryHandler.DEFAULT);
+    }
+
+    protected JPQLTemplates(char escape) {
+        this(escape, DefaultQueryHandler.DEFAULT);
+    }
+
+    protected JPQLTemplates(char escape, QueryHandler queryHandler) {
+        super(escape);
+        this.queryHandler = queryHandler;
+
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.NE, Ops.EQ_IGNORE_CASE,
+                Ops.BETWEEN, Ops.COL_IS_EMPTY);
+
+        // other like cases
+        setPrecedence(Precedence.COMPARISON, OTHER_LIKE_CASES);
+
+        add(Ops.CASE, "case {0} end");
+        add(Ops.CASE_WHEN,  "when {0} then {1} {2}", 0);
+        add(Ops.CASE_ELSE,  "else {0}", 0);
+
+        //CHECKSTYLE:OFF
+        // boolean
+        add(Ops.AND, "{0} and {1}");
+        add(Ops.NOT, "not {0}", Precedence.NOT);
+        add(Ops.OR, "{0} or {1}");
+        add(Ops.XNOR, "{0} xnor {1}");
+        add(Ops.XOR, "{0} xor {1}");
+
+        // comparison
+        add(Ops.BETWEEN, "{0} between {1} and {2}");
+
+        // numeric
+        add(Ops.MathOps.SQRT, "sqrt({0})");
+        add(Ops.MOD, "mod({0},{1})", -1);
+
+        // various
+        add(Ops.NE, "{0} <> {1}");
+        add(Ops.IS_NULL, "{0} is null");
+        add(Ops.IS_NOT_NULL, "{0} is not null");
+        add(JPQLOps.CAST, "cast({0} as {1s})");
+        add(Ops.NUMCAST, "cast({0} as {1s})");
+
+        // collection
+        add(JPQLOps.MEMBER_OF, "{0} member of {1}", Precedence.COMPARISON);
+        add(JPQLOps.NOT_MEMBER_OF, "{0} not member of {1}", Precedence.COMPARISON);
+
+        add(Ops.IN, "{0} in {1}");
+        add(Ops.NOT_IN, "{0} not in {1}");
+        add(Ops.COL_IS_EMPTY, "{0} is empty");
+        add(Ops.COL_SIZE, "size({0})");
+        add(Ops.ARRAY_SIZE, "size({0})");
+
+        // string
+        add(Ops.LIKE, "{0} like {1} escape '" + escape + "'");
+        add(Ops.CONCAT, "concat({0},{1})", -1);
+        add(Ops.MATCHES, "{0} like {1}  escape '" + escape + "'"); // TODO : support real regexes
+        add(Ops.MATCHES_IC, "{0} like {1} escape '" + escape + "'"); // TODO : support real regexes
+        add(Ops.LOWER, "lower({0})");
+        add(Ops.SUBSTR_1ARG, "substring({0},{1+'1's})");
+        add(Ops.SUBSTR_2ARGS, "substring({0},{1+'1's},{2-1s})");
+        add(Ops.TRIM, "trim({0})");
+        add(Ops.UPPER, "upper({0})");
+        add(Ops.EQ_IGNORE_CASE, "{0l} = {1l}");
+        add(Ops.CHAR_AT, "cast(substring({0},{1+'1's},1) as char)", Precedence.ARITH_LOW);
+        add(Ops.STRING_IS_EMPTY, "length({0}) = 0");
+
+        add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '" + escape + "'");
+        add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '" + escape + "'");
+        add(Ops.ENDS_WITH, "{0} like {%1} escape '" + escape + "'");
+        add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '" + escape + "'");
+        add(Ops.STARTS_WITH, "{0} like {1%} escape '" + escape + "'");
+        add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '" + escape + "'");
+        add(Ops.INDEX_OF, "locate({1},{0})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "locate({1},{0},{2+'1's})-1", Precedence.ARITH_LOW);
+
+        // date time
+        add(Ops.DateTimeOps.SYSDATE, "sysdate");
+        add(Ops.DateTimeOps.CURRENT_DATE, "current_date");
+        add(Ops.DateTimeOps.CURRENT_TIME, "current_time");
+        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp");
+
+        add(Ops.DateTimeOps.MILLISECOND, "0"); // NOT supported in HQL
+        add(Ops.DateTimeOps.SECOND, "second({0})");
+        add(Ops.DateTimeOps.MINUTE, "minute({0})");
+        add(Ops.DateTimeOps.HOUR, "hour({0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
+        add(Ops.DateTimeOps.MONTH, "month({0})");
+        add(Ops.DateTimeOps.YEAR, "year({0})");
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "year({0}) * 100 + month({0})", Precedence.ARITH_LOW);
+        add(Ops.DateTimeOps.YEAR_WEEK, "year({0}) * 100 + week({0})", Precedence.ARITH_LOW);
+
+        // path types
+        add(PathType.PROPERTY, "{0}.{1s}");
+        add(PathType.VARIABLE, "{0s}");
+        add(PathType.TREATED_PATH, "treat({0} as {1s})");
+
+        // case for eq
+        add(Ops.CASE_EQ, "case {1} end");
+        add(Ops.CASE_EQ_WHEN,  "when {0} = {1} then {2} {3}", 0);
+        add(Ops.CASE_EQ_ELSE,  "else {0}", 0);
+
+        add(Ops.INSTANCE_OF, "type({0}) = {1}");
+        add(JPQLOps.TYPE, "type({0})");
+        add(JPQLOps.INDEX, "index({0})");
+        add(JPQLOps.TREAT, "treat({0} as {1s})");
+        add(JPQLOps.KEY, "key({0})");
+        add(JPQLOps.VALUE, "value({0})");
+
+        //CHECKSTYLE:ON
+    }
+
+    public boolean wrapElements(Operator operator) {
+        return false;
+    }
+
+    public String getTypeForCast(Class<?> cl) {
+        return cl.getSimpleName().toLowerCase();
+    }
+
+    @Deprecated // kept for backwards compatibility
+    public boolean isEnumInPathSupported() {
+        return true;
+    }
+
+    public boolean isPathInEntitiesSupported() {
+        return true;
+    }
+
+    @Nullable
+    public String getExistsProjection() {
+        return null;
+    }
+
+    public boolean wrapConstant(Object constant) {
+        // related : https://hibernate.onjira.com/browse/HHH-6913
+        return false;
+    }
+
+    public boolean isWithForOn() {
+        return false;
+    }
+
+    public QueryHandler getQueryHandler() {
+        return queryHandler;
+    }
+
+    public boolean isCaseWithLiterals() {
+        return false;
+    }
+
+    public String asLiteral(Object constant) {
+        if (constant instanceof Boolean) {
+            return constant.toString();
+        } else if (constant instanceof Number) {
+            return constant.toString();
+        } else if (constant instanceof String) {
+            return "'" + escapeLiteral(constant.toString()) + "'";
+        } else if (constant instanceof Enum) {
+            return constant.getClass().getName() + "." + ((Enum) constant).name();
+        } else {
+            return "'" + constant.toString() + "'";
+        }
+    }
+
+    private String escapeLiteral(String str) {
+        StringBuilder builder = new StringBuilder();
+        for (char ch : str.toCharArray()) {
+            if (ch == '\n') {
+                builder.append("\\n");
+                continue;
+            } else if (ch == '\r') {
+                builder.append("\\r");
+                continue;
+            } else if (ch == '\'') {
+                builder.append("''");
+                continue;
+            }
+            builder.append(ch);
+        }
+        return builder.toString();
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/NativeSQLSerializer.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/NativeSQLSerializer.java
new file mode 100644
index 0000000000..6f2f24a57a
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/NativeSQLSerializer.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.*;
+import com.querydsl.sql.*;
+
+/**
+ * {@code NativeSQLSerializer} extends {@link SQLSerializer} to extract referenced entity paths and change
+ * some serialization formats
+ *
+ * @author tiwe
+ *
+ */
+public final class NativeSQLSerializer extends SQLSerializer {
+
+    private final Map<Expression<?>, List<String>> aliases = new HashMap<>();
+
+    private final boolean wrapEntityProjections;
+
+    public NativeSQLSerializer(Configuration configuration) {
+        this(configuration, false);
+    }
+
+    public NativeSQLSerializer(Configuration configuration, boolean wrapEntityProjections) {
+        super(configuration);
+        this.wrapEntityProjections = wrapEntityProjections;
+    }
+
+    @Override
+    protected void appendAsColumnName(Path<?> path, boolean precededByDot) {
+        if (path.getAnnotatedElement().isAnnotationPresent(Column.class)) {
+            Column column = path.getAnnotatedElement().getAnnotation(Column.class);
+            if (!column.name().isEmpty()) {
+                append(getTemplates().quoteIdentifier(column.name(), precededByDot));
+            } else {
+                super.appendAsColumnName(path, precededByDot);
+            }
+        } else {
+            super.appendAsColumnName(path, precededByDot);
+        }
+    }
+
+    @Override
+    protected void handleJoinTarget(JoinExpression je) {
+        SQLTemplates templates = getTemplates();
+        Class<?> type = je.getTarget().getType();
+        if (type.isAnnotationPresent(Table.class) && templates.isSupportsAlias()) {
+            Table table = type.getAnnotation(Table.class);
+            boolean precededByDot;
+            if (!table.schema().isEmpty() && templates.isPrintSchema()) {
+                appendSchemaName(table.schema());
+                append(".");
+                precededByDot = true;
+            } else {
+                precededByDot = false;
+            }
+            appendTableName(table.name(), precededByDot);
+            append(templates.getTableAlias());
+        }
+        super.handleJoinTarget(je);
+    }
+
+    private boolean isAlias(Expression<?> expr) {
+        return expr instanceof Operation && ((Operation<?>) expr).getOperator() == Ops.ALIAS;
+    }
+
+    public Map<Expression<?>, List<String>> getAliases() {
+        return aliases;
+    }
+
+    private boolean isAllExpression(Expression<?> expr) {
+        if (expr instanceof Operation) {
+            return ((Operation<?>) expr).getOperator() == SQLOps.ALL;
+        } else if (expr instanceof TemplateExpression) {
+            return ((TemplateExpression<?>) expr).getTemplate().toString().equals("*");
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow) {
+        // TODO get rid of this wrapping when Hibernate doesn't require unique aliases anymore
+        boolean modified = false;
+        Set<String> used = new HashSet<String>();
+        Expression<?> projection = metadata.getProjection();
+        if (projection instanceof Path) {
+            Path<?> path = (Path<?>) projection;
+            if (!used.add(path.getMetadata().getName())) {
+                String alias = "col_1";
+                aliases.computeIfAbsent(projection, NativeSQLSerializer::createArrayList).add(alias);
+                projection = ExpressionUtils.as(projection, alias);
+                modified = true;
+            } else if (path.getAnnotatedElement().isAnnotationPresent(Column.class)) {
+                Column column = path.getAnnotatedElement().getAnnotation(Column.class);
+                if (!column.name().isEmpty()) {
+                    aliases.computeIfAbsent(projection, NativeSQLSerializer::createArrayList).add(column.name());
+                } else {
+                    aliases.computeIfAbsent(projection, NativeSQLSerializer::createArrayList).add(ColumnMetadata.getName(path));
+                }
+            } else {
+                aliases.computeIfAbsent(projection, NativeSQLSerializer::createArrayList).add(ColumnMetadata.getName(path));
+            }
+        } else if (projection instanceof FactoryExpression) {
+            FactoryExpression<?> factoryExpr = (FactoryExpression<?>) projection;
+            List<Expression<?>> fargs = new ArrayList<>(factoryExpr.getArgs());
+            for (int j = 0; j < fargs.size(); j++) {
+                if (fargs.get(j) instanceof Path) {
+                    Path<?> path = (Path<?>) fargs.get(j);
+                    String columnName;
+                    if (path.getAnnotatedElement().isAnnotationPresent(Column.class)) {
+                        Column column = path.getAnnotatedElement().getAnnotation(Column.class);
+                        if (!column.name().isEmpty()) {
+                            columnName = column.name();
+                        } else {
+                            columnName = ColumnMetadata.getName(path);
+                        }
+                    } else {
+                        columnName = ColumnMetadata.getName(path);
+                    }
+                    if (!used.add(columnName)) {
+                        String alias = "col_" + (j + 1);
+                        aliases.computeIfAbsent(path, NativeSQLSerializer::createArrayList).add(alias);
+                        fargs.set(j, ExpressionUtils.as(fargs.get(j), alias));
+                    } else {
+                        aliases.computeIfAbsent(path, NativeSQLSerializer::createArrayList).add(columnName);
+                    }
+                } else if (isAlias(fargs.get(j))) {
+                    Operation<?> operation = (Operation<?>) fargs.get(j);
+                    aliases.computeIfAbsent(operation, NativeSQLSerializer::createArrayList).add(operation.getArg(1).toString());
+                } else if (!isAllExpression(fargs.get(j))) {
+                    String alias = "col_" + (j + 1);
+                    aliases.computeIfAbsent(fargs.get(j), NativeSQLSerializer::createArrayList).add(alias);
+                    fargs.set(j, ExpressionUtils.as(fargs.get(j), alias));
+                }
+            }
+            projection = Projections.tuple(new ArrayList<>(fargs));
+            modified = true;
+        } else if (isAlias(projection)) {
+            Operation<?> operation = (Operation<?>) projection;
+            aliases.computeIfAbsent(operation, NativeSQLSerializer::createArrayList).add(operation.getArg(1).toString());
+        } else {
+            // https://github.com/querydsl/querydsl/issues/80
+            if (!isAllExpression(projection)) {
+                String alias = "col_1";
+                aliases.computeIfAbsent(projection, NativeSQLSerializer::createArrayList).add(alias);
+                projection = ExpressionUtils.as(projection, alias);
+                modified = true;
+            }
+        }
+        if (modified) {
+            metadata = metadata.clone();
+            metadata.setProjection(projection);
+        }
+        super.serialize(metadata, forCountRow);
+    }
+
+    private static <T> ArrayList<T> createArrayList(Object key) {
+        return new ArrayList<T>();
+    }
+
+    @Override
+    public void visitConstant(Object constant) {
+        if (constant instanceof Collection<?>) {
+            append("(");
+            boolean first = true;
+            for (Object element : ((Collection<?>) constant)) {
+                if (!first) {
+                    append(", ");
+                }
+                visitConstant(element);
+                first = false;
+            }
+            append(")");
+        } else {
+            super.visitConstant(constant);
+        }
+    }
+
+    @Override
+    protected void serializeConstant(int parameterIndex, String constantLabel) {
+        append("?");
+        append(Integer.toString(parameterIndex));
+    }
+
+    @Override
+    protected void visitOperation(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        if (operator == SQLOps.ALL
+                && !(args.get(0) instanceof RelationalPath)
+                && wrapEntityProjections) {
+            append("{");
+            super.visitOperation(type, operator, args);
+            append("}");
+        } else {
+            super.visitOperation(type, operator, args);
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/OpenJPATemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/OpenJPATemplates.java
new file mode 100644
index 0000000000..15654a973e
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/OpenJPATemplates.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.PathType;
+
+/**
+ * {@code OpenJPATemplates} extends {@link JPQLTemplates} with OpenJPA specific extensions
+ *
+ * @author tiwe
+ *
+ */
+public class OpenJPATemplates extends JPQLTemplates {
+
+    public static final OpenJPATemplates DEFAULT = new OpenJPATemplates();
+
+    public OpenJPATemplates() {
+        this(DEFAULT_ESCAPE);
+        add(PathType.VARIABLE, "{0s}_");
+        add(Ops.ALIAS, "{0} {1}");
+        add(Ops.NEGATE, "-1 * {0}", 7);
+    }
+
+    public OpenJPATemplates(char escape) {
+        super(escape);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java
new file mode 100644
index 0000000000..9001421b42
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/QueryHandler.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.types.FactoryExpression;
+
+import java.util.stream.Stream;
+
+/**
+ * {@code QueryHandle}r provides injection of provider specific functionality into the query logic
+ *
+ * @author tiwe
+ *
+ */
+public interface QueryHandler {
+
+    /**
+     * Return whether native queries should be created as typed queries
+     *
+     * @return whether native queries should be created as typed queries
+     */
+    boolean createNativeQueryTyped();
+
+    /**
+     * Iterate the results with the optional projection
+     *
+     * @param query query
+     * @return iterator
+     */
+    <T> CloseableIterator<T> iterate(Query query, @Nullable FactoryExpression<?> projection);
+
+    /**
+     * Stream the results with the optional projection
+     *
+     * @param query query
+     * @return stream
+     */
+    <T> Stream<T> stream(Query query, @Nullable FactoryExpression<?> projection);
+
+    /**
+     * Add the given scalar to the given native query
+     *
+     * @param query query
+     * @param alias alias
+     * @param type type
+     */
+    void addScalar(Query query, String alias, Class<?> type);
+
+    /**
+     * Add the given entity to the given native query
+     *
+     * @param query query
+     * @param alias alias
+     * @param type type
+     */
+    void addEntity(Query query, String alias, Class<?> type);
+
+    /**
+     * Transform the results of the given query using the given factory expression
+     *
+     * @param query query
+     * @param projection projection
+     * @return true, if query as been modified
+     */
+    boolean transform(Query query, FactoryExpression<?> projection);
+
+    /**
+     * Return whether entity projections need to be wrapped
+     *
+     * @return whether entity projections need to be wrapped
+     */
+    boolean wrapEntityProjections();
+
+}
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/ScrollableResultsIterator.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
similarity index 88%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/ScrollableResultsIterator.java
rename to querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
index b8793a0644..d6f7087e99 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/ScrollableResultsIterator.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/ScrollableResultsIterator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
 import java.util.NoSuchElementException;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import org.hibernate.ScrollableResults;
 
 import com.mysema.commons.lang.CloseableIterator;
 
 /**
- * ScrollableResultsIterator is an {@link CloseableIterator} adapter for ScrollableResults
+ * {@code ScrollableResultsIterator} is a {@link CloseableIterator} adapter for ScrollableResults
  *
  * @author tiwe
  *
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/TransformingIterator.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
similarity index 83%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/TransformingIterator.java
rename to querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
index e0df10158d..a6d2c8848c 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/TransformingIterator.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/TransformingIterator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2013, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Iterator;
 
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.types.FactoryExpression;
+import com.querydsl.core.types.FactoryExpression;
 
 /**
+ * {@code TransformingIterator} is a CloseableIterator adapter that transforms via a {@link FactoryExpression} instance
+ *
  * @author tiwe
  *
  * @param <T>
@@ -28,28 +30,29 @@
 public class TransformingIterator<T> implements CloseableIterator<T> {
 
     private final Iterator<T> iterator;
-    
+
     private final Closeable closeable;
-    
+
     private final FactoryExpression<?> projection;
-    
+
     public TransformingIterator(Iterator<T> iterator, FactoryExpression<?> projection) {
         this.iterator = iterator;
         this.projection = projection;
-        this.closeable = iterator instanceof Closeable ? (Closeable)iterator : null;
+        this.closeable = iterator instanceof Closeable ? (Closeable) iterator : null;
     }
-    
+
     public TransformingIterator(Iterator<T> iterator, Closeable closeable, FactoryExpression<?> projection) {
         this.iterator = iterator;
         this.projection = projection;
         this.closeable = closeable;
     }
-    
+
     @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public T next() {
         Object result = iterator.next();
@@ -57,10 +60,10 @@ public T next() {
             if (!result.getClass().isArray()) {
                 result = new Object[]{result};
             }
-            return (T)projection.newInstance((Object[])result);    
+            return (T) projection.newInstance((Object[]) result);
         } else {
             return null;
-        }  
+        }
     }
 
     @Override
@@ -76,8 +79,8 @@ public void close() {
             } catch (IOException e) {
                 throw new RuntimeException(e.getMessage(), e);
             }
-        }        
+        }
     }
 
-    
+
 }
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
new file mode 100644
index 0000000000..2039447174
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.hibernate.*;
+import org.hibernate.query.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.jpa.*;
+
+/**
+ * Abstract base class for Hibernate API based implementations of the JPQL interface
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractHibernateQuery<T, Q extends AbstractHibernateQuery<T, Q>> extends JPAQueryBase<T, Q> {
+
+    private static final Logger logger = Logger.getLogger(HibernateQuery.class.getName());
+
+    @Nullable
+    protected Boolean cacheable, readOnly;
+
+    @Nullable
+    protected String cacheRegion, comment;
+
+    protected int fetchSize = 0;
+
+    protected final Map<Path<?>,LockMode> lockModes = new HashMap<Path<?>,LockMode>();
+
+    @Nullable
+    protected FlushMode flushMode;
+
+    private final SessionHolder session;
+
+    protected int timeout = 0;
+
+    public AbstractHibernateQuery(Session session) {
+        this(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    public AbstractHibernateQuery(SessionHolder session, JPQLTemplates patterns, QueryMetadata metadata) {
+        super(metadata, patterns);
+        this.session = session;
+    }
+
+    @Override
+    public long fetchCount() {
+        QueryModifiers modifiers = getMetadata().getModifiers();
+        try {
+            Query query = createQuery(modifiers, true);
+            Long rv = (Long) query.uniqueResult();
+            if (rv != null) {
+                return rv;
+            } else {
+                throw new QueryException("Query returned null");
+            }
+        } finally {
+            reset();
+        }
+    }
+
+    /**
+     * Expose the original Hibernate query for the given projection
+     *
+     * @return query
+     */
+    public Query createQuery() {
+        return createQuery(getMetadata().getModifiers(), false);
+    }
+
+    private Query createQuery(@Nullable QueryModifiers modifiers, boolean forCount) {
+        JPQLSerializer serializer = serialize(forCount);
+        String queryString = serializer.toString();
+        logQuery(queryString);
+        Query query = session.createQuery(queryString);
+        HibernateUtil.setConstants(query, serializer.getConstants(),
+                getMetadata().getParams());
+        if (fetchSize > 0) {
+            query.setFetchSize(fetchSize);
+        }
+        if (timeout > 0) {
+            query.setTimeout(timeout);
+        }
+        if (cacheable != null) {
+            query.setCacheable(cacheable);
+        }
+        if (cacheRegion != null) {
+            query.setCacheRegion(cacheRegion);
+        }
+        if (comment != null) {
+            query.setComment(comment);
+        }
+        if (readOnly != null) {
+            query.setReadOnly(readOnly);
+        }
+        for (Map.Entry<Path<?>, LockMode> entry : lockModes.entrySet()) {
+            query.setLockMode(entry.getKey().toString(), entry.getValue());
+        }
+        if (flushMode != null) {
+            query.setFlushMode(flushMode);
+        }
+
+        if (modifiers != null && modifiers.isRestricting()) {
+            Integer limit = modifiers.getLimitAsInteger();
+            Integer offset = modifiers.getOffsetAsInteger();
+            if (limit != null) {
+                query.setMaxResults(limit);
+            }
+            if (offset != null) {
+                query.setFirstResult(offset);
+            }
+        }
+
+        // set transformer, if necessary
+        Expression<?> projection = getMetadata().getProjection();
+        if (!forCount && projection instanceof FactoryExpression) {
+            query.setResultTransformer(new FactoryExpressionTransformer((FactoryExpression<?>) projection));
+        }
+        return query;
+    }
+
+
+    /**
+     * Return the query results as an {@code Iterator}. If the query
+     * contains multiple results pre row, the results are returned in
+     * an instance of {@code Object[]}.<br>
+     * <br>
+     * Entities returned as results are initialized on demand. The first
+     * SQL query returns identifiers only.<br>
+     */
+    @Override
+    public CloseableIterator<T> iterate() {
+        try {
+            Query query = createQuery();
+            ScrollableResults results = query.scroll(ScrollMode.FORWARD_ONLY);
+            return new ScrollableResultsIterator<T>(results);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public Stream<T> stream() {
+        try {
+            Query query = createQuery();
+            return query.getResultStream();
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<T> fetch() {
+        try {
+            return createQuery().list();
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        try {
+            Query countQuery = createQuery(null, true);
+            long total = (Long) countQuery.uniqueResult();
+
+            if (total > 0) {
+                QueryModifiers modifiers = getMetadata().getModifiers();
+                Query query = createQuery(modifiers, false);
+                @SuppressWarnings("unchecked")
+                List<T> list = query.list();
+                return new QueryResults<T>(list, modifiers, total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } finally {
+            reset();
+        }
+    }
+
+    protected void logQuery(String queryString) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    @Override
+    protected void reset() {
+    }
+
+    /**
+     * Return the query results as {@code ScrollableResults}. The
+     * scrollability of the returned results depends upon JDBC driver
+     * support for scrollable {@code ResultSet}s.<br>
+     *
+     * @param mode scroll mode
+     * @return scrollable results
+     */
+    public ScrollableResults scroll(ScrollMode mode) {
+        try {
+            return createQuery().scroll(mode);
+        } finally {
+            reset();
+        }
+    }
+
+    /**
+     * Enable caching of this query result set.
+     * @param cacheable Should the query results be cacheable?
+     */
+    @SuppressWarnings("unchecked")
+    public Q setCacheable(boolean cacheable) {
+        this.cacheable = cacheable;
+        return (Q) this;
+    }
+
+    /**
+     * Set the name of the cache region.
+     * @param cacheRegion the name of a query cache region, or {@code null}
+     * for the default query cache
+     */
+    @SuppressWarnings("unchecked")
+    public Q setCacheRegion(String cacheRegion) {
+        this.cacheRegion = cacheRegion;
+        return (Q) this;
+    }
+
+    /**
+     * Add a comment to the generated SQL.
+     * @param comment comment
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q setComment(String comment) {
+        this.comment = comment;
+        return (Q) this;
+    }
+
+    /**
+     * Set a fetchJoin size for the underlying JDBC query.
+     * @param fetchSize the fetchJoin size
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q setFetchSize(int fetchSize) {
+        this.fetchSize = fetchSize;
+        return (Q) this;
+    }
+
+    /**
+     * Set the lock mode for the given path.
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q setLockMode(Path<?> path, LockMode lockMode) {
+        lockModes.put(path, lockMode);
+        return (Q) this;
+    }
+
+    /**
+     * Override the current session flush mode, just for this query.
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q setFlushMode(FlushMode flushMode) {
+        this.flushMode = flushMode;
+        return (Q) this;
+    }
+
+    /**
+     * Entities retrieved by this query will be loaded in
+     * a read-only mode where Hibernate will never dirty-check
+     * them or make changes persistent.
+     *
+     * @return the current object
+     *
+     */
+    @SuppressWarnings("unchecked")
+    public Q setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
+        return (Q) this;
+    }
+
+    /**
+     * Set a timeout for the underlying JDBC query.
+     * @param timeout the timeout in seconds
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q setTimeout(int timeout) {
+        this.timeout = timeout;
+        return (Q) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        try {
+            QueryModifiers modifiers = getMetadata().getModifiers();
+            Query query = createQuery(modifiers, false);
+            try {
+                return (T) query.uniqueResult();
+            } catch (org.hibernate.NonUniqueResultException e) {
+                throw new NonUniqueResultException(e);
+            }
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    protected JPQLSerializer createSerializer() {
+        return new JPQLSerializer(getTemplates());
+    }
+
+    protected void clone(Q query) {
+        cacheable = query.cacheable;
+        cacheRegion = query.cacheRegion;
+        fetchSize = query.fetchSize;
+        flushMode = query.flushMode;
+        lockModes.putAll(query.lockModes);
+        readOnly = query.readOnly;
+        timeout = query.timeout;
+    }
+
+    protected abstract Q clone(SessionHolder sessionHolder);
+
+    /**
+     * Clone the state of this query to a new instance with the given Session
+     *
+     * @param session session
+     * @return cloned query
+     */
+    public Q clone(Session session) {
+        return this.clone(new DefaultSessionHolder(session));
+    }
+
+    /**
+     * Clone the state of this query to a new instance with the given StatelessSession
+     *
+     * @param session session
+     * @return cloned query
+     */
+    public Q clone(StatelessSession session) {
+        return this.clone(new StatelessSessionHolder(session));
+    }
+
+    /**
+     * Clone the state of this query to a new instance
+     *
+     * @return closed query
+     */
+    @Override
+    public Q clone() {
+        return this.clone(this.session);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/DefaultSessionHolder.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/DefaultSessionHolder.java
new file mode 100644
index 0000000000..9fa9e49fd5
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/DefaultSessionHolder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.Session;
+
+/**
+ * {@code DefaultSessionHolder} is the default implementation of the {@link SessionHolder} interface
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultSessionHolder implements SessionHolder {
+
+    private final Session session;
+
+    public DefaultSessionHolder(Session session) {
+        this.session = session;
+    }
+
+    @Override
+    public Query<?> createQuery(String queryString) {
+        return session.createQuery(queryString);
+    }
+
+    @Override
+    public NativeQuery<?> createSQLQuery(String queryString) {
+        return session.createSQLQuery(queryString);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateDeleteClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateDeleteClause.java
new file mode 100644
index 0000000000..efc563fec4
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateDeleteClause.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+import org.hibernate.LockMode;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
+import org.hibernate.query.Query;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * DeleteClause implementation for Hibernate
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateDeleteClause implements DeleteClause<HibernateDeleteClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final SessionHolder session;
+
+    private final JPQLTemplates templates;
+
+    private final Map<Path<?>,LockMode> lockModes = new HashMap<Path<?>,LockMode>();
+
+    public HibernateDeleteClause(Session session, EntityPath<?> entity) {
+        this(new DefaultSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateDeleteClause(StatelessSession session, EntityPath<?> entity) {
+        this(new StatelessSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateDeleteClause(Session session, EntityPath<?> entity, JPQLTemplates templates) {
+        this(new DefaultSessionHolder(session), entity, templates);
+    }
+
+    public HibernateDeleteClause(SessionHolder session, EntityPath<?> entity, JPQLTemplates templates) {
+        this.session = session;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForDelete(queryMixin.getMetadata());
+
+        Query query = session.createQuery(serializer.toString());
+        for (Map.Entry<Path<?>, LockMode> entry : lockModes.entrySet()) {
+            query.setLockMode(entry.getKey().toString(), entry.getValue());
+        }
+        HibernateUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    @Override
+    public HibernateDeleteClause where(Predicate... o) {
+        for (Predicate p : o) {
+            queryMixin.where(p);
+        }
+        return this;
+    }
+
+    /**
+     * Set the lock mode for the given path.
+     */
+    @SuppressWarnings("unchecked")
+    public HibernateDeleteClause setLockMode(Path<?> path, LockMode lockMode) {
+        lockModes.put(path, lockMode);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForDelete(queryMixin.getMetadata());
+        return serializer.toString();
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java
new file mode 100644
index 0000000000..9a9dd9af63
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.LockMode;
+import org.hibernate.query.Query;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.InsertClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * UpdateClause implementation for Hibernate
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateInsertClause implements
+        InsertClause<HibernateInsertClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final Map<Path<?>, Expression<?>> inserts = new LinkedHashMap<>();
+
+    private final List<Path<?>> columns = new ArrayList<Path<?>>();
+
+    private final List<Object> values = new ArrayList<Object>();
+
+    private SubQueryExpression<?> subQuery;
+
+    private final SessionHolder session;
+
+    private final JPQLTemplates templates;
+
+    private final Map<Path<?>,LockMode> lockModes = new HashMap<Path<?>,LockMode>();
+
+    public HibernateInsertClause(Session session, EntityPath<?> entity) {
+        this(new DefaultSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateInsertClause(StatelessSession session, EntityPath<?> entity) {
+        this(new StatelessSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateInsertClause(Session session, EntityPath<?> entity, JPQLTemplates templates) {
+        this(new DefaultSessionHolder(session), entity, templates);
+    }
+
+    public HibernateInsertClause(SessionHolder session, EntityPath<?> entity,
+            JPQLTemplates templates) {
+        this.session = session;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForInsert(queryMixin.getMetadata(), inserts.isEmpty() ? columns : inserts.keySet(), values, subQuery, inserts);
+
+        Query query = session.createQuery(serializer.toString());
+        for (Map.Entry<Path<?>, LockMode> entry : lockModes.entrySet()) {
+            query.setLockMode(entry.getKey().toString(), entry.getValue());
+        }
+        HibernateUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    @Override
+    public HibernateInsertClause columns(Path<?>... columns) {
+        this.columns.addAll(Arrays.asList(columns));
+        return this;
+    }
+
+    @Override
+    public HibernateInsertClause select(SubQueryExpression<?> sq) {
+        subQuery = sq;
+        return this;
+    }
+
+    /**
+     * Set the lock mode for the given path.
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public HibernateInsertClause setLockMode(Path<?> path, LockMode lockMode) {
+        lockModes.put(path, lockMode);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForInsert(queryMixin.getMetadata(), inserts.isEmpty() ? columns : inserts.keySet(), values, subQuery, inserts);
+        return serializer.toString();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return columns.isEmpty();
+    }
+
+    @Override
+    public <T> HibernateInsertClause set(Path<T> path, T value) {
+        if (value != null) {
+            inserts.put(path, Expressions.constant(value));
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> HibernateInsertClause set(Path<T> path, Expression<? extends T> expression) {
+        if (expression != null) {
+            inserts.put(path, expression);
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> HibernateInsertClause setNull(Path<T> path) {
+        inserts.put(path, Expressions.nullExpression(path));
+        return this;
+    }
+
+    @Override
+    public HibernateInsertClause values(Object... v)  {
+        this.values.addAll(Arrays.asList(v));
+        return this;
+    }
+
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQuery.java
new file mode 100644
index 0000000000..02a36bd15a
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQuery.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.JPQLQuery;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * {@code HibernateQuery} is the default implementation of the JPQLQuery interface for Hibernate
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public class HibernateQuery<T> extends AbstractHibernateQuery<T, HibernateQuery<T>> implements JPQLQuery<T> {
+
+    /**
+     * Creates a detached query
+     * The query can be attached via the clone method
+     */
+    public HibernateQuery() {
+        super(NoSessionHolder.DEFAULT, HQLTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new Session bound query
+     *
+     * @param session session
+     */
+    public HibernateQuery(Session session) {
+        super(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new Session bound query
+     *
+     * @param session session
+     */
+    public HibernateQuery(Session session, QueryMetadata metadata) {
+        super(new DefaultSessionHolder(session), HQLTemplates.DEFAULT, metadata);
+    }
+
+    /**
+     * Creates a new Session bound query
+     *
+     * @param session session
+     * @param templates templates
+     */
+    public HibernateQuery(Session session, JPQLTemplates templates) {
+        super(new DefaultSessionHolder(session), templates, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new Stateless session bound query
+     *
+     * @param session session
+     */
+    public HibernateQuery(StatelessSession session) {
+        super(new StatelessSessionHolder(session), HQLTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new Session bound query
+     *
+     * @param session session
+     * @param templates templates
+     */
+    public HibernateQuery(SessionHolder session, JPQLTemplates templates) {
+        super(session, templates, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new Session bound query
+     *
+     * @param session session
+     * @param templates templates
+     * @param metadata query metadata
+     */
+    public HibernateQuery(SessionHolder session, JPQLTemplates templates, QueryMetadata metadata) {
+        super(session, templates, metadata);
+    }
+
+    @Override
+    protected HibernateQuery<T> clone(SessionHolder sessionHolder) {
+        HibernateQuery<T> q = new HibernateQuery<T>(sessionHolder,
+                getTemplates(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> HibernateQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        HibernateQuery<U> newType = (HibernateQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public HibernateQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        HibernateQuery<Tuple> newType = (HibernateQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java
new file mode 100644
index 0000000000..a16b49ff20
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateQueryFactory.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.Session;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.JPQLQueryFactory;
+import com.querydsl.jpa.JPQLTemplates;
+
+import java.util.function.Supplier;
+
+/**
+ * Factory class for query and DML clause creation
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateQueryFactory implements JPQLQueryFactory {
+
+    private final JPQLTemplates templates;
+
+    private final Supplier<Session> session;
+
+    public HibernateQueryFactory(Session session) {
+        this(HQLTemplates.DEFAULT, session);
+    }
+
+    public HibernateQueryFactory(JPQLTemplates templates, final Session session) {
+        this.session = () -> session;
+        this.templates = templates;
+    }
+
+    public HibernateQueryFactory(Supplier<Session> session) {
+        this(HQLTemplates.DEFAULT, session);
+    }
+
+    public HibernateQueryFactory(JPQLTemplates templates, Supplier<Session> session) {
+        this.session = session;
+        this.templates = templates;
+    }
+
+    @Override
+    public HibernateDeleteClause delete(EntityPath<?> path) {
+        return new HibernateDeleteClause(session.get(), path, templates);
+    }
+
+    @Override
+    public <T> HibernateQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public HibernateQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> HibernateQuery<T> selectDistinct(Expression<T> expr) {
+        return select(expr).distinct();
+    }
+
+    @Override
+    public HibernateQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return select(exprs).distinct();
+    }
+
+    @Override
+    public HibernateQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public HibernateQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public <T> HibernateQuery<T> selectFrom(EntityPath<T> from) {
+        return select(from).from(from);
+    }
+
+    @Override
+    public HibernateQuery<?> from(EntityPath<?> from) {
+        return query().from(from);
+    }
+
+    @Override
+    public HibernateQuery<?> from(EntityPath<?>... from) {
+        return query().from(from);
+    }
+
+    @Override
+    public HibernateUpdateClause update(EntityPath<?> path) {
+        return new HibernateUpdateClause(session.get(), path, templates);
+    }
+
+    @Override
+    public HibernateInsertClause insert(EntityPath<?> path) {
+        return new HibernateInsertClause(session.get(), path, templates);
+    }
+
+    @Override
+    public HibernateQuery<?> query() {
+        return new HibernateQuery<Void>(session.get(), templates);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUpdateClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUpdateClause.java
new file mode 100644
index 0000000000..5e8a951f39
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUpdateClause.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+import org.hibernate.LockMode;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
+import org.hibernate.query.Query;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * UpdateClause implementation for Hibernate
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateUpdateClause implements
+        UpdateClause<HibernateUpdateClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final Map<Path<?>, Expression<?>> updates = new LinkedHashMap<>();
+
+    private final SessionHolder session;
+
+    private final JPQLTemplates templates;
+
+    private final Map<Path<?>,LockMode> lockModes = new HashMap<Path<?>,LockMode>();
+
+    public HibernateUpdateClause(Session session, EntityPath<?> entity) {
+        this(new DefaultSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateUpdateClause(StatelessSession session, EntityPath<?> entity) {
+        this(new StatelessSessionHolder(session), entity, HQLTemplates.DEFAULT);
+    }
+
+    public HibernateUpdateClause(Session session, EntityPath<?> entity, JPQLTemplates templates) {
+        this(new DefaultSessionHolder(session), entity, templates);
+    }
+
+    public HibernateUpdateClause(SessionHolder session, EntityPath<?> entity,
+            JPQLTemplates templates) {
+        this.session = session;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForUpdate(queryMixin.getMetadata(), updates);
+
+        Query query = session.createQuery(serializer.toString());
+        for (Map.Entry<Path<?>, LockMode> entry : lockModes.entrySet()) {
+            query.setLockMode(entry.getKey().toString(), entry.getValue());
+        }
+        HibernateUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    @Override
+    public <T> HibernateUpdateClause set(Path<T> path, T value) {
+        if (value != null) {
+            updates.put(path, Expressions.constant(value));
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> HibernateUpdateClause set(Path<T> path, Expression<? extends T> expression) {
+        if (expression != null) {
+            updates.put(path, expression);
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> HibernateUpdateClause setNull(Path<T> path) {
+        updates.put(path, Expressions.nullExpression(path));
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public HibernateUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
+        for (int i = 0; i < paths.size(); i++) {
+            if (values.get(i) != null) {
+                updates.put(paths.get(i), Expressions.constant(values.get(i)));
+            } else {
+                updates.put(paths.get(i), Expressions.nullExpression(paths.get(i)));
+            }
+
+        }
+        return this;
+    }
+
+    @Override
+    public HibernateUpdateClause where(Predicate... o) {
+        for (Predicate p : o) {
+            queryMixin.where(p);
+        }
+        return this;
+    }
+
+    /**
+     * Set the lock mode for the given path.
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public HibernateUpdateClause setLockMode(Path<?> path, LockMode lockMode) {
+        lockModes.put(path, lockMode);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, null);
+        serializer.serializeForUpdate(queryMixin.getMetadata(), updates);
+        return serializer.toString();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return updates.isEmpty();
+    }
+
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUtil.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUtil.java
new file mode 100644
index 0000000000..7a1adc4270
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateUtil.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
+import org.hibernate.type.*;
+
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.dsl.Param;
+
+/**
+ * {@code HibernateUtil} provides static utility methods for Hibernate
+ *
+ * @author tiwe
+ */
+public final class HibernateUtil {
+
+    private static final Set<Class<?>> BUILT_IN = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(Boolean.class, Byte.class,
+            Character.class, Double.class, Float.class, Integer.class, Long.class, Short.class,
+            String.class, BigDecimal.class, byte[].class, Byte[].class, java.util.Date.class,
+            java.util.Calendar.class, java.sql.Date.class, java.sql.Time.class, java.sql.Timestamp.class,
+            java.util.Locale.class, java.util.TimeZone.class, java.util.Currency.class, Class.class,
+            java.io.Serializable.class, java.sql.Blob.class, java.sql.Clob.class)));
+
+    private static final Map<Class<?>, Type> TYPES;
+
+    static {
+        Map<Class<?>, Type> builder = new HashMap<>();
+        builder.put(Byte.class, new ByteType());
+        builder.put(Short.class, new ShortType());
+        builder.put(Integer.class, new IntegerType());
+        builder.put(Long.class, new LongType());
+        builder.put(BigInteger.class, new BigIntegerType());
+        builder.put(Double.class, new DoubleType());
+        builder.put(Float.class, new FloatType());
+        builder.put(BigDecimal.class, new BigDecimalType());
+        builder.put(String.class, new StringType());
+        builder.put(Character.class, new CharacterType());
+        builder.put(Date.class, new DateType());
+        builder.put(Boolean.class, new BooleanType());
+        TYPES = Collections.unmodifiableMap(builder);
+    }
+
+    private HibernateUtil() {
+    }
+
+    public static void setConstants(
+            org.hibernate.query.Query<?> query,
+            List<Object> constants,
+            Map<ParamExpression<?>, Object> params
+    ) {
+        for (int i = 0; i < constants.size(); i++) {
+            Object val = constants.get(i);
+
+            if (val instanceof Param) {
+                Param<?> param = (Param<?>) val;
+                val = params.get(val);
+                if (val == null) {
+                    throw new ParamNotSetException(param);
+                }
+            }
+
+            setValueWithNumberedLabel(query, i + 1, val);
+        }
+    }
+
+    private static void setValueWithNumberedLabel(org.hibernate.query.Query<?> query, Integer key, Object val) {
+        if (val instanceof Collection<?>) {
+            query.setParameterList(key, (Collection<?>) val);
+        } else if (val instanceof Object[] && !BUILT_IN.contains(val.getClass())) {
+            query.setParameterList(key, (Object[]) val);
+        } else if (val instanceof Number && TYPES.containsKey(val.getClass())) {
+            query.setParameter(key, val, getType(val.getClass()));
+        } else {
+            query.setParameter(key, val);
+        }
+    }
+
+    public static Type getType(Class<?> clazz) {
+        return TYPES.get(clazz);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/NoSessionHolder.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/NoSessionHolder.java
new file mode 100644
index 0000000000..1ec65c735f
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/NoSessionHolder.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
+
+/**
+ * {@code NoSessionHolder} is a session holder for detached {@link HibernateQuery} usage
+ *
+ * @author tiwe
+ *
+ */
+public final class NoSessionHolder implements SessionHolder {
+
+    public static final SessionHolder DEFAULT = new NoSessionHolder();
+
+    private NoSessionHolder() { }
+
+    @Override
+    public Query<?> createQuery(String queryString) {
+        throw new UnsupportedOperationException("No session in detached Query available");
+    }
+
+    @Override
+    public NativeQuery<?> createSQLQuery(String queryString) {
+        throw new UnsupportedOperationException("No session in detached Query available");
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/SessionHolder.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/SessionHolder.java
new file mode 100644
index 0000000000..b15b52f088
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/SessionHolder.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
+
+/**
+ * Abstraction for different Hibernate Session signatures
+ *
+ * @author tiwe
+ *
+ */
+public interface SessionHolder {
+
+    /**
+     * Create a JPQL query for the given query string
+     *
+     * @param queryString JPQL query string
+     * @return query
+     */
+    Query<?> createQuery(String queryString);
+
+    /**
+     * Create an SQL query for the given query string
+     *
+     * @param queryString JPQL query string
+     * @return query
+     */
+    NativeQuery<?> createSQLQuery(String queryString);
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/StatelessSessionHolder.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/StatelessSessionHolder.java
new file mode 100644
index 0000000000..c42a43b4b6
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/StatelessSessionHolder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate;
+
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.StatelessSession;
+
+/**
+ * SessionHolder implementation using StatelessSession
+ *
+ * @author tiwe
+ *
+ */
+public class StatelessSessionHolder implements SessionHolder {
+
+    private final StatelessSession session;
+
+    public StatelessSessionHolder(StatelessSession session) {
+        this.session = session;
+    }
+
+    @Override
+    public Query<?> createQuery(String queryString) {
+        return session.createQuery(queryString);
+    }
+
+    @Override
+    public NativeQuery<?> createSQLQuery(String queryString) {
+        return session.createSQLQuery(queryString);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/package-info.java
new file mode 100644
index 0000000000..cb7c2b7846
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JPQL for Hibernate
+ */
+package com.querydsl.jpa.hibernate;
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
new file mode 100644
index 0000000000..ccb1bca5e5
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate.sql;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.hibernate.query.Query;
+import org.hibernate.*;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.jpa.AbstractSQLQuery;
+import com.querydsl.jpa.FactoryExpressionTransformer;
+import com.querydsl.jpa.NativeSQLSerializer;
+import com.querydsl.jpa.ScrollableResultsIterator;
+import com.querydsl.jpa.hibernate.DefaultSessionHolder;
+import com.querydsl.jpa.hibernate.HibernateUtil;
+import com.querydsl.jpa.hibernate.SessionHolder;
+import com.querydsl.jpa.hibernate.StatelessSessionHolder;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLSerializer;
+
+/**
+ * {@code AbstractHibernateSQLQuery} is the base class for Hibernate Native SQL queries
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractHibernateSQLQuery<T, Q extends AbstractHibernateSQLQuery<T, Q>> extends AbstractSQLQuery<T, Q> {
+
+    private static final Logger logger = Logger.getLogger(AbstractHibernateSQLQuery.class.getName());
+
+    protected Boolean cacheable, readOnly;
+
+    protected String cacheRegion;
+
+    protected int fetchSize = 0;
+
+    private final SessionHolder session;
+
+    protected int timeout = 0;
+
+    public AbstractHibernateSQLQuery(Session session, Configuration conf) {
+        this(new DefaultSessionHolder(session), conf, new DefaultQueryMetadata());
+    }
+
+    public AbstractHibernateSQLQuery(StatelessSession session, Configuration conf) {
+        this(new StatelessSessionHolder(session), conf, new DefaultQueryMetadata());
+    }
+
+    public AbstractHibernateSQLQuery(SessionHolder session, Configuration conf, QueryMetadata metadata) {
+        super(metadata, conf);
+        this.session = session;
+    }
+
+    public Query createQuery() {
+        return createQuery(false);
+    }
+
+    private Query createQuery(boolean forCount) {
+        NativeSQLSerializer serializer = (NativeSQLSerializer) serialize(forCount);
+        String queryString = serializer.toString();
+        logQuery(queryString);
+        org.hibernate.query.NativeQuery query = session.createSQLQuery(queryString);
+        // set constants
+        HibernateUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+
+        if (!forCount) {
+            Map<Expression<?>, List<String>> aliases = serializer.getAliases();
+            Set<String> used = new HashSet<>();
+            // set entity paths
+            Expression<?> projection = queryMixin.getMetadata().getProjection();
+            if (projection instanceof FactoryExpression) {
+                for (Expression<?> expr : ((FactoryExpression<?>) projection).getArgs()) {
+                    if (isEntityExpression(expr)) {
+                        query.addEntity(extractEntityExpression(expr).toString(), expr.getType());
+                    } else if (aliases.containsKey(expr)) {
+                        for (String scalar : aliases.get(expr)) {
+                            if (!used.contains(scalar)) {
+                                query.addScalar(scalar);
+                                used.add(scalar);
+                                break;
+                            }
+                        }
+                    }
+                }
+            } else if (isEntityExpression(projection)) {
+                query.addEntity(extractEntityExpression(projection).toString(), projection.getType());
+            } else if (aliases.containsKey(projection)) {
+                for (String scalar : aliases.get(projection)) {
+                    if (!used.contains(scalar)) {
+                        query.addScalar(scalar);
+                        used.add(scalar);
+                        break;
+                    }
+                }
+            }
+
+            // set result transformer, if projection is a FactoryExpression instance
+            if (projection instanceof FactoryExpression) {
+                query.setResultTransformer(new FactoryExpressionTransformer((FactoryExpression<?>) projection));
+            }
+        }
+
+        if (fetchSize > 0) {
+            query.setFetchSize(fetchSize);
+        }
+        if (timeout > 0) {
+            query.setTimeout(timeout);
+        }
+        if (cacheable != null) {
+            query.setCacheable(cacheable);
+        }
+        if (cacheRegion != null) {
+            query.setCacheRegion(cacheRegion);
+        }
+        if (readOnly != null) {
+            query.setReadOnly(readOnly);
+        }
+        return query;
+    }
+
+    @Override
+    protected SQLSerializer createSerializer() {
+        return new NativeSQLSerializer(configuration, true);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<T> fetch() {
+        try {
+            return createQuery().list();
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        try {
+            Query query = createQuery();
+            ScrollableResults results = query.scroll(ScrollMode.FORWARD_ONLY);
+            return new ScrollableResultsIterator<T>(results);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public Stream<T> stream() {
+        try {
+            Query query = createQuery();
+            return query.getResultStream();
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        // TODO : handle entity projections as well
+        try {
+            Query query = createQuery(true);
+            long total = ((Number) query.uniqueResult()).longValue();
+            if (total > 0) {
+                QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+                query = createQuery(false);
+                @SuppressWarnings("unchecked")
+                List<T> list = query.list();
+                return new QueryResults<T>(list, modifiers, total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } finally {
+            reset();
+        }
+    }
+
+    protected void logQuery(String queryString) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    protected void reset() {
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        try {
+            Query query = createQuery();
+            return (T) uniqueResult(query);
+        } finally {
+            reset();
+        }
+    }
+
+    @Nullable
+    private Object uniqueResult(Query query) {
+        try {
+            return query.uniqueResult();
+        } catch (org.hibernate.NonUniqueResultException e) {
+            throw new NonUniqueResultException(e);
+        }
+    }
+
+    /**
+     * Enable caching of this query result set.
+     * @param cacheable Should the query results be cacheable?
+     */
+    @SuppressWarnings("unchecked")
+    public Q setCacheable(boolean cacheable) {
+        this.cacheable = cacheable;
+        return (Q) this;
+    }
+
+    /**
+     * Set the name of the cache region.
+     * @param cacheRegion the name of a query cache region, or {@code null}
+     * for the default query cache
+     */
+    @SuppressWarnings("unchecked")
+    public Q setCacheRegion(String cacheRegion) {
+        this.cacheRegion = cacheRegion;
+        return (Q) this;
+    }
+
+    /**
+     * Set a fetchJoin size for the underlying JDBC query.
+     * @param fetchSize the fetchJoin size
+     */
+    @SuppressWarnings("unchecked")
+    public Q setFetchSize(int fetchSize) {
+        this.fetchSize = fetchSize;
+        return (Q) this;
+    }
+
+    /**
+     * Entities retrieved by this query will be loaded in
+     * a read-only mode where Hibernate will never dirty-check
+     * them or make changes persistent.
+     *
+     */
+    @SuppressWarnings("unchecked")
+    public Q setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
+        return (Q) this;
+    }
+
+    /**
+     * Set a timeout for the underlying JDBC query.
+     * @param timeout the timeout in seconds
+     */
+    @SuppressWarnings("unchecked")
+    public Q setTimeout(int timeout) {
+        this.timeout = timeout;
+        return (Q) this;
+    }
+
+    @Override
+    protected void clone(Q query) {
+        super.clone(query);
+        cacheable = query.cacheable;
+        cacheRegion = query.cacheRegion;
+        fetchSize = query.fetchSize;
+        readOnly = query.readOnly;
+        timeout = query.timeout;
+    }
+
+    protected abstract Q clone(SessionHolder session);
+
+    public Q clone(Session session) {
+        return this.clone(new DefaultSessionHolder(session));
+    }
+
+    public Q clone(StatelessSession statelessSession) {
+        return this.clone(new StatelessSessionHolder(statelessSession));
+    }
+
+    @Override
+    public Q clone() {
+        return this.clone(this.session);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/HibernateSQLQuery.java
new file mode 100644
index 0000000000..0e73aeb221
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/HibernateSQLQuery.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.hibernate.sql;
+
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.hibernate.SessionHolder;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code HibernateSQLQuery} is an SQLQuery implementation that uses Hibernate's Native SQL functionality
+ * to execute queries
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ *
+ */
+public class HibernateSQLQuery<T> extends AbstractHibernateSQLQuery<T, HibernateSQLQuery<T>> {
+
+    public HibernateSQLQuery(Session session, SQLTemplates sqlTemplates) {
+        super(session, new Configuration(sqlTemplates));
+    }
+
+    public HibernateSQLQuery(Session session, Configuration conf) {
+        super(session, conf);
+    }
+
+    public HibernateSQLQuery(StatelessSession session, SQLTemplates sqlTemplates) {
+        super(session, new Configuration(sqlTemplates));
+    }
+
+    public HibernateSQLQuery(StatelessSession session, Configuration conf) {
+        super(session, conf);
+    }
+
+    public HibernateSQLQuery(SessionHolder session, SQLTemplates sqlTemplates, QueryMetadata metadata) {
+        super(session, new Configuration(sqlTemplates), metadata);
+    }
+
+    public HibernateSQLQuery(SessionHolder session, Configuration conf, QueryMetadata metadata) {
+        super(session, conf, metadata);
+    }
+
+    @Override
+    protected HibernateSQLQuery<T> clone(SessionHolder sessionHolder) {
+        HibernateSQLQuery<T> q = new HibernateSQLQuery<T>(sessionHolder, configuration, getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> HibernateSQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        HibernateSQLQuery<U> newType = (HibernateSQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public HibernateSQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        HibernateSQLQuery<Tuple> newType = (HibernateSQLQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/package-info.java
new file mode 100644
index 0000000000..5063dff5fe
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Native queries for Hibernate
+ */
+package com.querydsl.jpa.hibernate.sql;
+
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
new file mode 100644
index 0000000000..0305391fd8
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.jpa.JPAQueryBase;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+import com.querydsl.jpa.QueryHandler;
+
+/**
+ * Abstract base class for JPA API based implementations of the JPQLQuery interface
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractJPAQuery<T, Q extends AbstractJPAQuery<T, Q>> extends JPAQueryBase<T, Q> {
+
+    private static final Logger logger = Logger.getLogger(JPAQuery.class.getName());
+
+    protected final Map<String, Object> hints = new LinkedHashMap<>();
+
+    protected final EntityManager entityManager;
+
+    protected final QueryHandler queryHandler;
+
+    @Nullable
+    protected LockModeType lockMode;
+
+    @Nullable
+    protected FlushModeType flushMode;
+
+    @Nullable
+    protected FactoryExpression<?> projection;
+
+    public AbstractJPAQuery(EntityManager em) {
+        this(em, JPAProvider.getTemplates(em), new DefaultQueryMetadata());
+    }
+
+    public AbstractJPAQuery(EntityManager em, JPQLTemplates templates, QueryMetadata metadata) {
+        super(metadata, templates);
+        this.queryHandler = templates.getQueryHandler();
+        this.entityManager = em;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated {@code fetchCount} requires a count query to be computed. In {@code querydsl-sql}, this is done
+     * by wrapping the query in a subquery, like so: {@code SELECT COUNT(*) FROM (&lt;original query&gt;)}. Unfortunately,
+     * JPQL - the query language of JPA - does not allow queries to project from subqueries. As a result there isn't a
+     * universal way to express count queries in JPQL. Historically QueryDSL attempts at producing a modified query
+     * to compute the number of results instead.
+     *
+     * However, this approach only works for simple queries. Specifically
+     * queries with multiple group by clauses and queries with a having clause turn out to be problematic. This is because
+     * {@code COUNT(DISTINCT a, b, c)}, while valid SQL in most dialects, is not valid JPQL. Furthermore, a having
+     * clause may refer select elements or aggregate functions and therefore cannot be emulated by moving the predicate
+     * to the where clause instead.
+     *
+     * In order to support {@code fetchCount} for queries with multiple group by elements or a having clause, we
+     * generate the count in memory instead. This means that the method simply falls back to returning the size of
+     * {@link #fetch()}. For large result sets this may come at a severe performance penalty.
+     *
+     * For very specific domain models where {@link #fetchCount()} has to be used in conjunction with complex queries
+     * containing multiple group by elements and/or a having clause, we recommend using the
+     * <a href="https://persistence.blazebit.com/documentation/1.5/core/manual/en_US/index.html#querydsl-integration">Blaze-Persistence</a>
+     * integration for QueryDSL. Among other advanced query features, Blaze-Persistence makes it possible to select
+     * from subqueries in JPQL. As a result the {@code BlazeJPAQuery} provided with the integration, implements
+     * {@code fetchCount} properly and always executes a proper count query.
+     */
+    @Override
+    @Deprecated
+    public long fetchCount() {
+        try {
+            if (getMetadata().getGroupBy().size() > 1 || getMetadata().getHaving() != null) {
+                logger.warning("Fetchable#fetchCount() was computed in memory! See the Javadoc for AbstractJPAQuery#fetchCount for more details.");
+                Query query = createQuery(null, false);
+                return query.getResultList().size();
+            }
+
+            Query query = createQuery(null, true);
+            return (Long) query.getSingleResult();
+        } finally {
+            reset();
+        }
+    }
+
+    /**
+     * Expose the original JPA query for the given projection
+     *
+     * @return query
+     */
+    public Query createQuery() {
+        return createQuery(getMetadata().getModifiers(), false);
+    }
+
+    protected Query createQuery(@Nullable QueryModifiers modifiers, boolean forCount) {
+        JPQLSerializer serializer = serialize(forCount);
+        String queryString = serializer.toString();
+        logQuery(queryString);
+        Query query = entityManager.createQuery(queryString);
+        JPAUtil.setConstants(query, serializer.getConstants(), getMetadata().getParams());
+        if (modifiers != null && modifiers.isRestricting()) {
+            Integer limit = modifiers.getLimitAsInteger();
+            Integer offset = modifiers.getOffsetAsInteger();
+            if (limit != null) {
+                query.setMaxResults(limit);
+            }
+            if (offset != null) {
+                query.setFirstResult(offset);
+            }
+        }
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+        if (flushMode != null) {
+            query.setFlushMode(flushMode);
+        }
+
+        for (Map.Entry<String, Object> entry : hints.entrySet()) {
+            query.setHint(entry.getKey(), entry.getValue());
+        }
+
+        // set transformer, if necessary and possible
+        Expression<?> projection = getMetadata().getProjection();
+        this.projection = null; // necessary when query is reused
+
+        if (!forCount && projection instanceof FactoryExpression) {
+            if (!queryHandler.transform(query, (FactoryExpression<?>) projection)) {
+                this.projection = (FactoryExpression) projection;
+            }
+        }
+
+        return query;
+    }
+
+    /**
+     * Transforms results using FactoryExpression if ResultTransformer can't be used
+     *
+     * @param query query
+     * @return results
+     */
+    private List<?> getResultList(Query query) {
+        // TODO : use lazy fetch here?
+        if (projection != null) {
+            List<?> results = query.getResultList();
+            List<Object> rv = new ArrayList<Object>(results.size());
+            for (Object o : results) {
+                if (o != null) {
+                    if (!o.getClass().isArray()) {
+                        o = new Object[]{o};
+                    }
+                    rv.add(projection.newInstance((Object[]) o));
+                } else {
+                    rv.add(projection.newInstance(new Object[] {null}));
+                }
+            }
+            return rv;
+        } else {
+            return query.getResultList();
+        }
+    }
+
+    /**
+     * Transforms results using FactoryExpression if ResultTransformer can't be used
+     *
+     * @param query query
+     * @return single result
+     */
+    @Nullable
+    private Object getSingleResult(Query query) {
+        if (projection != null) {
+            Object result = query.getSingleResult();
+            if (result != null) {
+                if (!result.getClass().isArray()) {
+                    result = new Object[]{result};
+                }
+                return projection.newInstance((Object[]) result);
+            } else {
+                return null;
+            }
+        } else {
+            return query.getSingleResult();
+        }
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        try {
+            Query query = createQuery();
+            return queryHandler.iterate(query, projection);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public Stream<T> stream() {
+        try {
+            Query query = createQuery();
+            return queryHandler.stream(query, projection);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<T> fetch() {
+        try {
+            Query query = createQuery();
+            return (List<T>) getResultList(query);
+        } finally {
+            reset();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated {@code fetchResults} requires a count query to be computed. In {@code querydsl-sql}, this is done
+     * by wrapping the query in a subquery, like so: {@code SELECT COUNT(*) FROM (&lt;original query&gt;)}. Unfortunately,
+     * JPQL - the query language of JPA - does not allow queries to project from subqueries. As a result there isn't a
+     * universal way to express count queries in JPQL. Historically QueryDSL attempts at producing a modified query
+     * to compute the number of results instead.
+     *
+     * However, this approach only works for simple queries. Specifically
+     * queries with multiple group by clauses and queries with a having clause turn out to be problematic. This is because
+     * {@code COUNT(DISTINCT a, b, c)}, while valid SQL in most dialects, is not valid JPQL. Furthermore, a having
+     * clause may refer select elements or aggregate functions and therefore cannot be emulated by moving the predicate
+     * to the where clause instead.
+     *
+     * In order to support {@code fetchResults} for queries with multiple group by elements or a having clause, we
+     * generate the count in memory instead. This means that the method simply falls back to returning the size of
+     * {@link #fetch()}. For large result sets this may come at a severe performance penalty.
+     *
+     * For very specific domain models where {@link #fetchResults()} has to be used in conjunction with complex queries
+     * containing multiple group by elements and/or a having clause, we recommend using the
+     * <a href="https://persistence.blazebit.com/documentation/1.5/core/manual/en_US/index.html#querydsl-integration">Blaze-Persistence</a>
+     * integration for QueryDSL. Among other advanced query features, Blaze-Persistence makes it possible to select
+     * from subqueries in JPQL. As a result the {@code BlazeJPAQuery} provided with the integration, implements
+     * {@code fetchResults} properly and always executes a proper count query.
+     *
+     * Mind that for any scenario where the count is not strictly needed separately, we recommend to use {@link #fetch()}
+     * instead.
+     */
+    @Override
+    @Deprecated
+    public QueryResults<T> fetchResults() {
+        try {
+            QueryModifiers modifiers = getMetadata().getModifiers();
+            if (getMetadata().getGroupBy().size() > 1 || getMetadata().getHaving() != null) {
+                logger.warning("Fetchable#fetchResults() was computed in memory! See the Javadoc for AbstractJPAQuery#fetchResults for more details.");
+                Query query = createQuery(null, false);
+                @SuppressWarnings("unchecked")
+                List<T> resultList = query.getResultList();
+                int offset = modifiers.getOffsetAsInteger() == null ? 0 : modifiers.getOffsetAsInteger();
+                int limit = modifiers.getLimitAsInteger() == null ? resultList.size() : modifiers.getLimitAsInteger();
+                return new QueryResults<T>(resultList.subList(offset, Math.min(resultList.size(), offset + limit)), modifiers, resultList.size());
+            }
+
+            Query countQuery = createQuery(null, true);
+            long total = (Long) countQuery.getSingleResult();
+            if (total > 0) {
+                Query query = createQuery(modifiers, false);
+                @SuppressWarnings("unchecked")
+                List<T> list = (List<T>) getResultList(query);
+                return new QueryResults<T>(list, modifiers, total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } finally {
+            reset();
+        }
+
+    }
+
+    protected void logQuery(String queryString) {
+        if (logger.isLoggable(Level.FINEST)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.finest(normalizedQuery);
+        }
+    }
+
+    @Override
+    protected void reset() {
+    }
+
+    @Nullable
+    @SuppressWarnings("unchecked")
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        try {
+            Query query = createQuery(getMetadata().getModifiers(), false);
+            return (T) getSingleResult(query);
+        } catch (javax.persistence.NoResultException e) {
+            logger.log(Level.FINEST, e.getMessage(), e);
+            return null;
+        } catch (javax.persistence.NonUniqueResultException e) {
+            throw new NonUniqueResultException(e);
+        } finally {
+            reset();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setLockMode(LockModeType lockMode) {
+        this.lockMode = lockMode;
+        return (Q) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setFlushMode(FlushModeType flushMode) {
+        this.flushMode = flushMode;
+        return (Q) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setHint(String name, Object value) {
+        hints.put(name, value);
+        return (Q) this;
+    }
+
+    @Override
+    protected JPQLSerializer createSerializer() {
+        return new JPQLSerializer(getTemplates(), entityManager);
+    }
+
+    protected void clone(Q query) {
+        projection = query.projection;
+        flushMode = query.flushMode;
+        hints.putAll(query.hints);
+        lockMode = query.lockMode;
+    }
+
+    /**
+     * Clone the state of this query to a new instance with the given EntityManager
+     *
+     * @param entityManager entity manager
+     * @return cloned query
+     */
+    public abstract Q clone(EntityManager entityManager);
+
+    /**
+     * Clone the state of this query to a new instance with the given EntityManager
+     * and the specified templates
+     *
+     * @param entityManager entity manager
+     * @param templates templates
+     * @return cloned query
+     */
+    public abstract Q clone(EntityManager entityManager, JPQLTemplates templates);
+
+    /**
+     * Clone the state of this query to a new instance
+     *
+     * @return cloned query
+     */
+    @Override
+    public Q clone() {
+        return clone(entityManager, getTemplates());
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPADeleteClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPADeleteClause.java
new file mode 100644
index 0000000000..ad4de0af26
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPADeleteClause.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * DeleteClause implementation for JPA
+ *
+ * @author tiwe
+ *
+ */
+public class JPADeleteClause implements DeleteClause<JPADeleteClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final EntityManager entityManager;
+
+    private final JPQLTemplates templates;
+
+    @Nullable
+    private LockModeType lockMode;
+
+    public JPADeleteClause(EntityManager em, EntityPath<?> entity) {
+        this(em, entity, JPAProvider.getTemplates(em));
+    }
+
+    public JPADeleteClause(EntityManager entityManager, EntityPath<?> entity, JPQLTemplates templates) {
+        this.entityManager = entityManager;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForDelete(queryMixin.getMetadata());
+
+        Query query = entityManager.createQuery(serializer.toString());
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+        JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    @Override
+    public JPADeleteClause where(Predicate... o) {
+        for (Predicate p : o) {
+            queryMixin.where(p);
+        }
+        return this;
+    }
+
+    public JPADeleteClause setLockMode(LockModeType lockMode) {
+        this.lockMode = lockMode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForDelete(queryMixin.getMetadata());
+        return serializer.toString();
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java
new file mode 100644
index 0000000000..2c5d6dc9a1
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.InsertClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * UpdateClause implementation for JPA
+ *
+ * @author tiwe
+ *
+ */
+public class JPAInsertClause implements InsertClause<JPAInsertClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final Map<Path<?>, Expression<?>> inserts = new LinkedHashMap<>();
+
+    private final List<Path<?>> columns = new ArrayList<Path<?>>();
+
+    private final List<Object> values = new ArrayList<Object>();
+
+    private final EntityManager entityManager;
+
+    private final JPQLTemplates templates;
+
+    private SubQueryExpression<?> subQuery;
+
+    @Nullable
+    private LockModeType lockMode;
+
+    public JPAInsertClause(EntityManager em, EntityPath<?> entity) {
+        this(em, entity, JPAProvider.getTemplates(em));
+    }
+
+    public JPAInsertClause(EntityManager em, EntityPath<?> entity, JPQLTemplates templates) {
+        this.entityManager = em;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForInsert(queryMixin.getMetadata(), inserts.isEmpty() ? columns : inserts.keySet(), values, subQuery, inserts);
+
+        Query query = entityManager.createQuery(serializer.toString());
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+        JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    public JPAInsertClause setLockMode(LockModeType lockMode) {
+        this.lockMode = lockMode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForInsert(queryMixin.getMetadata(), inserts.isEmpty() ? columns : inserts.keySet(), values, subQuery, inserts);
+        return serializer.toString();
+    }
+
+    @Override
+    public JPAInsertClause columns(Path<?>... columns) {
+        this.columns.addAll(Arrays.asList(columns));
+        return this;
+    }
+
+    @Override
+    public JPAInsertClause select(SubQueryExpression<?> sq) {
+        subQuery = sq;
+        return this;
+    }
+
+    @Override
+    public JPAInsertClause values(Object... v) {
+        this.values.addAll(Arrays.asList(v));
+        return this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return columns.isEmpty();
+    }
+
+    @Override
+    public <T> JPAInsertClause set(Path<T> path, T value) {
+        if (value != null) {
+            inserts.put(path, Expressions.constant(value));
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> JPAInsertClause set(Path<T> path, Expression<? extends T> expression) {
+        if (expression != null) {
+            inserts.put(path, expression);
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> JPAInsertClause setNull(Path<T> path) {
+        inserts.put(path, Expressions.nullExpression(path));
+        return this;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAProvider.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAProvider.java
new file mode 100644
index 0000000000..522c6417d5
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAProvider.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import com.querydsl.jpa.BatooTemplates;
+import com.querydsl.jpa.DataNucleusTemplates;
+import com.querydsl.jpa.EclipseLinkTemplates;
+import com.querydsl.jpa.HQLTemplates;
+import com.querydsl.jpa.Hibernate5Templates;
+import com.querydsl.jpa.JPQLTemplates;
+import com.querydsl.jpa.OpenJPATemplates;
+
+/**
+ * {@code JPAProvider} provides detection of the JPA provider based on the EntityManager instance
+ *
+ * @author tiwe
+ *
+ */
+public final class JPAProvider {
+
+    private static final Map<Class<?>, JPQLTemplates> mappings = new HashMap<>();
+
+    private static final Map<String, JPQLTemplates> templatesByName = new HashMap<>();
+
+    private static void addMapping(String className, JPQLTemplates templates) {
+        try {
+            mappings.put(Class.forName(className), templates);
+        } catch (Exception e) { }
+    }
+
+    static {
+        boolean hibernate5;
+
+        try {
+            String version = Class.forName("org.hibernate.Session").getPackage().getImplementationVersion();
+            String[] versionParts = version.split("\\.");
+            int major = Integer.parseInt(versionParts[0]);
+            hibernate5 = major >= 5;
+        } catch (Exception e) {
+            hibernate5 = true;
+        }
+
+        JPQLTemplates hibernateTemplates = hibernate5 ? Hibernate5Templates.DEFAULT : HQLTemplates.DEFAULT;
+
+        addMapping("org.batoo.jpa.core.impl.manager.EntityManagerImpl", BatooTemplates.DEFAULT);
+        addMapping("org.hibernate.Session", hibernateTemplates);
+        addMapping("org.hibernate.ejb.HibernateEntityManager", hibernateTemplates);
+        addMapping("org.hibernate.jpa.HibernateEntityManager", hibernateTemplates);
+        addMapping("org.eclipse.persistence.jpa.JpaEntityManager", EclipseLinkTemplates.DEFAULT);
+        addMapping("org.apache.openjpa.persistence.OpenJPAEntityManager", OpenJPATemplates.DEFAULT);
+        addMapping("org.datanucleus.jpa.EntityManagerImpl", DataNucleusTemplates.DEFAULT);
+        addMapping("org.datanucleus.ObjectManager", DataNucleusTemplates.DEFAULT);
+        addMapping("org.datanucleus.ObjectManagerImpl", DataNucleusTemplates.DEFAULT);
+
+        templatesByName.put("batoo", BatooTemplates.DEFAULT);
+        templatesByName.put("eclipselink", EclipseLinkTemplates.DEFAULT);
+        templatesByName.put("hibernate4", HQLTemplates.DEFAULT);
+        templatesByName.put("hibernate", Hibernate5Templates.DEFAULT);
+        templatesByName.put("openjpa", OpenJPATemplates.DEFAULT);
+        templatesByName.put("datanucleus", DataNucleusTemplates.DEFAULT);
+    }
+
+    public static JPQLTemplates getTemplates(EntityManager em) {
+        for (Map.Entry<Class<?>, JPQLTemplates> entry : mappings.entrySet()) {
+            Class<?> entityManagerClass = entry.getKey();
+            try {
+                if (entityManagerClass.isInstance(em.unwrap(entityManagerClass))) {
+                    return entry.getValue();
+                }
+            } catch (Exception e) { // The PersistenceException is wrapped in an InvocationException for EclipseLink
+                // detect by delegate
+                if (entityManagerClass.isAssignableFrom(em.getDelegate().getClass())) {
+                    return entry.getValue();
+                }
+            }
+        }
+        // detect by properties
+        for (String key : em.getEntityManagerFactory().getProperties().keySet()) {
+            key = key.toLowerCase();
+            for (Map.Entry<String, JPQLTemplates> entry : templatesByName.entrySet()) {
+                if (key.contains(entry.getKey())) {
+                    return entry.getValue();
+                }
+            }
+        }
+        return JPQLTemplates.DEFAULT;
+    }
+
+    private JPAProvider() { }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java
new file mode 100644
index 0000000000..3dcc03e1e5
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQuery.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import javax.persistence.EntityManager;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.JPQLQuery;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * {@code JPAQuery} is the default implementation of the {@link JPQLQuery} interface for JPA
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public class JPAQuery<T> extends AbstractJPAQuery<T, JPAQuery<T>> {
+
+    /**
+     * Creates a new detached query
+     * The query can be attached via the clone method
+     */
+    public JPAQuery() {
+        super(null, JPQLTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new EntityManager bound query
+     *
+     * @param em entity manager
+     */
+    public JPAQuery(EntityManager em) {
+        super(em, JPAProvider.getTemplates(em), new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new EntityManager bound query
+     *
+     * @param em entity manager
+     * @param metadata query metadata
+     */
+    public JPAQuery(EntityManager em, QueryMetadata metadata) {
+        super(em, JPAProvider.getTemplates(em), metadata);
+    }
+
+    /**
+     * Creates a new query
+     *
+     * @param em entity manager
+     * @param templates templates
+     */
+    public JPAQuery(EntityManager em, JPQLTemplates templates) {
+        super(em, templates, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Creates a new query
+     *
+     * @param em entity manager
+     * @param templates templates
+     * @param metadata query metadata
+     */
+    public JPAQuery(EntityManager em, JPQLTemplates templates, QueryMetadata metadata) {
+        super(em, templates, metadata);
+    }
+
+    @Override
+    public JPAQuery<T> clone(EntityManager entityManager, JPQLTemplates templates) {
+        JPAQuery<T> q = new JPAQuery<T>(entityManager, templates, getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public JPAQuery<T> clone(EntityManager entityManager) {
+        return clone(entityManager, JPAProvider.getTemplates(entityManager));
+    }
+
+    @Override
+    public <U> JPAQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPAQuery<U> newType = (JPAQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public JPAQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPAQuery<Tuple> newType = (JPAQuery<Tuple>) this;
+        return newType;
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java
new file mode 100644
index 0000000000..1919369c0e
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAQueryFactory.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPQLQueryFactory;
+import com.querydsl.jpa.JPQLTemplates;
+
+import java.util.function.Supplier;
+
+/**
+ * Factory class for query and DML clause creation
+ *
+ * @author tiwe
+ *
+ */
+public class JPAQueryFactory implements JPQLQueryFactory  {
+
+    @Nullable
+    private final JPQLTemplates templates;
+
+    private final Supplier<EntityManager> entityManager;
+
+    public JPAQueryFactory(final EntityManager entityManager) {
+        this.entityManager = () -> entityManager;
+        this.templates = null;
+    }
+
+    public JPAQueryFactory(JPQLTemplates templates, final EntityManager entityManager) {
+        this.entityManager = () -> entityManager;
+        this.templates = templates;
+    }
+
+    public JPAQueryFactory(Supplier<EntityManager> entityManager) {
+        this.entityManager = entityManager;
+        this.templates = null;
+    }
+
+    public JPAQueryFactory(JPQLTemplates templates, Supplier<EntityManager> entityManager) {
+        this.entityManager = entityManager;
+        this.templates = templates;
+    }
+
+    @Override
+    public JPADeleteClause delete(EntityPath<?> path) {
+        if (templates != null) {
+            return new JPADeleteClause(entityManager.get(), path, templates);
+        } else {
+            return new JPADeleteClause(entityManager.get(), path);
+        }
+    }
+
+    @Override
+    public <T> JPAQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public JPAQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> JPAQuery<T> selectDistinct(Expression<T> expr) {
+        return select(expr).distinct();
+    }
+
+    @Override
+    public JPAQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return select(exprs).distinct();
+    }
+
+    @Override
+    public JPAQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public JPAQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public <T> JPAQuery<T> selectFrom(EntityPath<T> from) {
+        return select(from).from(from);
+    }
+
+    @Override
+    public JPAQuery<?> from(EntityPath<?> from) {
+        return query().from(from);
+    }
+
+    @Override
+    public JPAQuery<?> from(EntityPath<?>... from) {
+        return query().from(from);
+    }
+
+    @Override
+    public JPAUpdateClause update(EntityPath<?> path) {
+        if (templates != null) {
+            return new JPAUpdateClause(entityManager.get(), path, templates);
+        } else {
+            return new JPAUpdateClause(entityManager.get(), path);
+        }
+    }
+
+    @Override
+    public JPAInsertClause insert(EntityPath<?> path) {
+        if (templates != null) {
+            return new JPAInsertClause(entityManager.get(), path, templates);
+        } else {
+            return new JPAInsertClause(entityManager.get(), path);
+        }
+    }
+
+    @Override
+    public JPAQuery<?> query() {
+        if (templates != null) {
+            return new JPAQuery<Void>(entityManager.get(), templates);
+        } else {
+            return new JPAQuery<Void>(entityManager.get());
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUpdateClause.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUpdateClause.java
new file mode 100644
index 0000000000..7e508867c4
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUpdateClause.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.JPAQueryMixin;
+import com.querydsl.jpa.JPQLSerializer;
+import com.querydsl.jpa.JPQLTemplates;
+
+/**
+ * UpdateClause implementation for JPA
+ *
+ * @author tiwe
+ *
+ */
+public class JPAUpdateClause implements UpdateClause<JPAUpdateClause> {
+
+    private final QueryMixin<?> queryMixin = new JPAQueryMixin<Void>();
+
+    private final Map<Path<?>, Expression<?>> updates = new LinkedHashMap<>();
+
+    private final EntityManager entityManager;
+
+    private final JPQLTemplates templates;
+
+    @Nullable
+    private LockModeType lockMode;
+
+    public JPAUpdateClause(EntityManager em, EntityPath<?> entity) {
+        this(em, entity, JPAProvider.getTemplates(em));
+    }
+
+    public JPAUpdateClause(EntityManager em, EntityPath<?> entity, JPQLTemplates templates) {
+        this.entityManager = em;
+        this.templates = templates;
+        queryMixin.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    @Override
+    public long execute() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForUpdate(queryMixin.getMetadata(), updates);
+
+        Query query = entityManager.createQuery(serializer.toString());
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+        JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        return query.executeUpdate();
+    }
+
+    @Override
+    public <T> JPAUpdateClause set(Path<T> path, T value) {
+        if (value != null) {
+            updates.put(path, Expressions.constant(value));
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> JPAUpdateClause set(Path<T> path, Expression<? extends T> expression) {
+        if (expression != null) {
+            updates.put(path, expression);
+        } else {
+            setNull(path);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> JPAUpdateClause setNull(Path<T> path) {
+        updates.put(path, Expressions.nullExpression(path));
+        return this;
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public JPAUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
+        for (int i = 0; i < paths.size(); i++) {
+            if (values.get(i) != null) {
+                updates.put(paths.get(i), Expressions.constant(values.get(i)));
+            } else {
+                updates.put(paths.get(i), Expressions.nullExpression(paths.get(i)));
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public JPAUpdateClause where(Predicate... o) {
+        for (Predicate p : o) {
+            queryMixin.where(p);
+        }
+        return this;
+    }
+
+    public JPAUpdateClause setLockMode(LockModeType lockMode) {
+        this.lockMode = lockMode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        JPQLSerializer serializer = new JPQLSerializer(templates, entityManager);
+        serializer.serializeForUpdate(queryMixin.getMetadata(), updates);
+        return serializer.toString();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return updates.isEmpty();
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUtil.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUtil.java
new file mode 100644
index 0000000000..36b26c13f0
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAUtil.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.Parameter;
+import javax.persistence.Query;
+
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.util.MathUtils;
+
+/**
+ * JPAUtil provides static utility methods for JPA
+ *
+ * @author tiwe
+ *
+ */
+public final class JPAUtil {
+
+    private JPAUtil() { }
+
+    public static void setConstants(Query query, List<Object> constants, Map<ParamExpression<?>, Object> params) {
+        boolean hasParameters = !query.getParameters().isEmpty();
+
+        for (int i = 0; i < constants.size(); i++) {
+            Object val = constants.get(i);
+
+            if (val instanceof Param) {
+                Param<?> param = (Param<?>) val;
+                val = params.get(val);
+                if (val == null) {
+                    throw new ParamNotSetException(param);
+                }
+            }
+
+            if (hasParameters) {
+                Parameter parameter = query.getParameter(i + 1);
+                Class parameterType = parameter != null ? parameter.getParameterType() : null;
+                if (parameterType != null && !parameterType.isInstance(val)) {
+                    if (val instanceof Number && Number.class.isAssignableFrom(parameterType)) {
+                        val = MathUtils.cast((Number) val, parameterType);
+                    }
+                }
+            }
+
+            query.setParameter(i + 1, val);
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/package-info.java
new file mode 100644
index 0000000000..9cd84e949c
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JPQL for JPA
+ */
+package com.querydsl.jpa.impl;
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/package-info.java
new file mode 100644
index 0000000000..9cc94c55e8
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JPA support
+ */
+package com.querydsl.jpa;
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
new file mode 100644
index 0000000000..1431d54e72
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.sql;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.jpa.AbstractSQLQuery;
+import com.querydsl.jpa.NativeSQLSerializer;
+import com.querydsl.jpa.QueryHandler;
+import com.querydsl.jpa.impl.JPAProvider;
+import com.querydsl.jpa.impl.JPAUtil;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLSerializer;
+
+/**
+ * {@code AbstractJPASQLQuery} is the base class for JPA Native SQL queries
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe*
+ */
+public abstract class AbstractJPASQLQuery<T, Q extends AbstractJPASQLQuery<T, Q>> extends AbstractSQLQuery<T, Q> {
+
+    private static final Logger logger = Logger.getLogger(AbstractJPASQLQuery.class.getName());
+
+    private final EntityManager entityManager;
+
+    protected final Map<String, Object> hints = new LinkedHashMap<>();
+
+    protected final QueryHandler queryHandler;
+
+    @Nullable
+    protected LockModeType lockMode;
+
+    @Nullable
+    protected FlushModeType flushMode;
+
+    @Nullable
+
+    protected FactoryExpression<?> projection;
+
+    public AbstractJPASQLQuery(EntityManager em, Configuration configuration) {
+        this(em, configuration, new DefaultQueryMetadata());
+    }
+
+    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryHandler queryHandler) {
+        this(em, configuration, queryHandler, new DefaultQueryMetadata());
+    }
+
+    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryMetadata metadata) {
+        this(em, configuration, JPAProvider.getTemplates(em).getQueryHandler(), metadata);
+    }
+
+    public AbstractJPASQLQuery(EntityManager em, Configuration configuration, QueryHandler queryHandler, QueryMetadata metadata) {
+        super(metadata, configuration);
+        this.entityManager = em;
+        this.queryHandler = queryHandler;
+    }
+
+    public Query createQuery() {
+        return createQuery(false);
+    }
+
+    private Query createQuery(boolean forCount) {
+        NativeSQLSerializer serializer = (NativeSQLSerializer) serialize(forCount);
+        String queryString = serializer.toString();
+        logQuery(queryString);
+        Expression<?> projection = queryMixin.getMetadata().getProjection();
+        Query query;
+
+        if (!FactoryExpression.class.isAssignableFrom(projection.getClass()) && isEntityExpression(projection)) {
+            if (queryHandler.createNativeQueryTyped()) {
+                query = entityManager.createNativeQuery(queryString, projection.getType());
+            } else {
+                query = entityManager.createNativeQuery(queryString);
+            }
+
+        } else {
+            query = entityManager.createNativeQuery(queryString);
+        }
+        if (!forCount) {
+            Map<Expression<?>, List<String>> aliases = serializer.getAliases();
+            Set<String> used = new HashSet<>();
+            if (projection instanceof FactoryExpression) {
+                for (Expression<?> expr : ((FactoryExpression<?>) projection).getArgs()) {
+                    if (isEntityExpression(expr)) {
+                        queryHandler.addEntity(query, extractEntityExpression(expr).toString(), expr.getType());
+                    } else if (aliases.containsKey(expr)) {
+                        for (String scalar : aliases.get(expr)) {
+                            if (!used.contains(scalar)) {
+                                queryHandler.addScalar(query, scalar, expr.getType());
+                                used.add(scalar);
+                                break;
+                            }
+
+                        }
+                    }
+                }
+            } else if (isEntityExpression(projection)) {
+                queryHandler.addEntity(query, extractEntityExpression(projection).toString(), projection.getType());
+            } else if (aliases.containsKey(projection)) {
+                for (String scalar : aliases.get(projection)) {
+                    if (!used.contains(scalar)) {
+                        queryHandler.addScalar(query, scalar, projection.getType());
+                        used.add(scalar);
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (lockMode != null) {
+            query.setLockMode(lockMode);
+        }
+        if (flushMode != null) {
+            query.setFlushMode(flushMode);
+        }
+
+        for (Map.Entry<String, Object> entry : hints.entrySet()) {
+            query.setHint(entry.getKey(), entry.getValue());
+        }
+
+
+        // set constants
+        JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams());
+        this.projection = null; // necessary when query is reused
+
+        if (!forCount && projection instanceof FactoryExpression) {
+            if (!queryHandler.transform(query, (FactoryExpression<?>) projection)) {
+                this.projection = (FactoryExpression<?>) projection;
+            }
+        }
+
+        return query;
+    }
+
+    @Override
+    protected SQLSerializer createSerializer() {
+        return new NativeSQLSerializer(configuration, queryHandler.wrapEntityProjections());
+    }
+
+    /**
+     * Transforms results using FactoryExpression if ResultTransformer can't be used
+     *
+     * @param query query
+     * @return results
+     */
+    private List<?> getResultList(Query query) {
+        // TODO : use lazy fetch here?
+        if (projection != null) {
+            List<?> results = query.getResultList();
+            List<Object> rv = new ArrayList<Object>(results.size());
+            for (Object o : results) {
+                if (o != null) {
+                    Object[] arr;
+                    if (!o.getClass().isArray()) {
+                        arr = new Object[]{o};
+                    } else {
+                        arr = (Object[]) o;
+                    }
+                    if (projection.getArgs().size() < arr.length) {
+                        Object[] shortened = new Object[projection.getArgs().size()];
+                        System.arraycopy(arr, 0, shortened, 0, shortened.length);
+                        arr = shortened;
+                    }
+                    rv.add(projection.newInstance(arr));
+                } else {
+                    rv.add(null);
+                }
+            }
+            return rv;
+        } else {
+            return query.getResultList();
+        }
+    }
+
+    /**
+     * Transforms results using FactoryExpression if ResultTransformer can't be used
+     *
+     * @param query query
+     * @return single result
+     */
+    @Nullable
+    private Object getSingleResult(Query query) {
+        if (projection != null) {
+            Object result = query.getSingleResult();
+            if (result != null) {
+                if (!result.getClass().isArray()) {
+                    result = new Object[]{result};
+                }
+                return projection.newInstance((Object[]) result);
+            } else {
+                return null;
+            }
+        } else {
+            return query.getSingleResult();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<T> fetch() {
+        try {
+            Query query = createQuery();
+            return (List<T>) getResultList(query);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        try {
+            Query query = createQuery();
+            return queryHandler.iterate(query, null);
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Stream<T> stream() {
+        try {
+            Query query = createQuery();
+            return query.getResultStream();
+        } finally {
+            reset();
+        }
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        // TODO : handle entity projections as well
+        try {
+            Query countQuery = createQuery(true);
+            long total = ((Number) countQuery.getSingleResult()).longValue();
+            if (total > 0) {
+                QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+                Query query = createQuery(false);
+                @SuppressWarnings("unchecked")
+                List<T> list = (List<T>) getResultList(query);
+                return new QueryResults<T>(list, modifiers, total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } finally {
+            reset();
+        }
+
+    }
+
+    protected void logQuery(String queryString) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    protected void reset() {
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T fetchOne() throws NonUniqueResultException {
+        Query query = createQuery();
+        return (T) uniqueResult(query);
+    }
+
+    @Nullable
+    private Object uniqueResult(Query query) {
+        try {
+            return getSingleResult(query);
+        } catch (javax.persistence.NoResultException e) {
+            logger.log(Level.FINEST, e.getMessage(),e);
+            return null;
+        } catch (javax.persistence.NonUniqueResultException e) {
+            throw new NonUniqueResultException(e);
+        } finally {
+            reset();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setLockMode(LockModeType lockMode) {
+        this.lockMode = lockMode;
+        return (Q) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setFlushMode(FlushModeType flushMode) {
+        this.flushMode = flushMode;
+        return (Q) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q setHint(String name, Object value) {
+        hints.put(name, value);
+        return (Q) this;
+    }
+
+    @Override
+    protected void clone(Q query) {
+        super.clone(query);
+        flushMode = query.flushMode;
+        hints.putAll(query.hints);
+        lockMode = query.lockMode;
+        projection = query.projection;
+    }
+
+    public abstract Q clone(EntityManager entityManager);
+
+    @Override
+    public Q clone() {
+        return this.clone(this.entityManager);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/JPASQLQuery.java
new file mode 100644
index 0000000000..a0aee81b3c
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/JPASQLQuery.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.sql;
+
+import javax.persistence.EntityManager;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.QueryHandler;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code JPASQLQuery} is an SQLQuery implementation that uses JPA Native SQL functionality
+ * to execute queries
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ *
+ */
+public class JPASQLQuery<T> extends AbstractJPASQLQuery<T, JPASQLQuery<T>> {
+
+    public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates) {
+        super(entityManager, new Configuration(sqlTemplates));
+    }
+
+    public JPASQLQuery(EntityManager entityManager, Configuration conf) {
+        super(entityManager, conf);
+    }
+
+    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryHandler queryHandler) {
+        super(entityManager, conf, queryHandler);
+    }
+
+    public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates, QueryMetadata metadata) {
+        super(entityManager, new Configuration(sqlTemplates), metadata);
+    }
+
+    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryMetadata metadata) {
+        super(entityManager, conf, metadata);
+    }
+
+    public JPASQLQuery(EntityManager entityManager, Configuration conf, QueryHandler queryHandler, QueryMetadata metadata) {
+        super(entityManager, conf, queryHandler, metadata);
+    }
+
+    @Override
+    public JPASQLQuery<T> clone(EntityManager entityManager) {
+        JPASQLQuery<T> q = new JPASQLQuery<T>(entityManager, configuration, queryHandler, getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> JPASQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPASQLQuery<U> newType = (JPASQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public JPASQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        JPASQLQuery<Tuple> newType = (JPASQLQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/package-info.java
new file mode 100644
index 0000000000..0240203041
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/sql/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Native queries for JPA
+ */
+package com.querydsl.jpa.sql;
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java
new file mode 100644
index 0000000000..04e7676afe
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.dialect.function.SQLFunction;
+import org.hibernate.dialect.function.SQLFunctionTemplate;
+import org.hibernate.type.Type;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Template;
+import com.querydsl.jpa.hibernate.HibernateUtil;
+import com.querydsl.sql.SQLTemplates;
+
+final class DialectSupport {
+
+    private DialectSupport() { }
+
+    public static Map<String, SQLFunction> createFunctions(SQLTemplates templates) {
+        Map<String, SQLFunction> functions = new HashMap<>();
+        functions.put("second", createFunction(templates, Ops.DateTimeOps.SECOND));
+        functions.put("minute", createFunction(templates, Ops.DateTimeOps.MINUTE));
+        functions.put("hour", createFunction(templates, Ops.DateTimeOps.HOUR));
+        functions.put("day", createFunction(templates, Ops.DateTimeOps.DAY_OF_MONTH));
+        functions.put("week", createFunction(templates, Ops.DateTimeOps.WEEK));
+        functions.put("month", createFunction(templates, Ops.DateTimeOps.MONTH));
+        functions.put("year", createFunction(templates, Ops.DateTimeOps.YEAR));
+        return functions;
+    }
+
+    public static SQLFunction createFunction(SQLTemplates templates, Operator operator) {
+        Template template = templates.getTemplate(operator);
+        Type type = HibernateUtil.getType(operator.getType());
+        return new SQLFunctionTemplate(type, convert(template));
+    }
+
+    public static String convert(Template template) {
+        StringBuilder builder = new StringBuilder();
+        for (Template.Element element : template.getElements()) {
+            if (element instanceof Template.AsString) {
+                builder.append("?").append(((Template.AsString) element).getIndex() + 1);
+            } else if (element instanceof Template.ByIndex) {
+                builder.append("?").append(((Template.ByIndex) element).getIndex() + 1);
+            } else if (element instanceof Template.Transformed) {
+                builder.append("?").append(((Template.Transformed) element).getIndex() + 1);
+            } else if (element instanceof Template.StaticText) {
+                builder.append(((Template.StaticText) element).getText());
+            } else {
+                throw new IllegalStateException("Unsupported element " + element);
+            }
+        }
+        return builder.toString();
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/JPAPathBuilderValidator.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/JPAPathBuilderValidator.java
new file mode 100644
index 0000000000..1f1c84301d
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/JPAPathBuilderValidator.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import javax.persistence.EntityManager;
+import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.ManagedType;
+import javax.persistence.metamodel.Metamodel;
+import javax.persistence.metamodel.PluralAttribute;
+
+import com.querydsl.core.types.dsl.PathBuilderValidator;
+import com.querydsl.core.util.PrimitiveUtils;
+
+/**
+ * JPAPathBuilderValidator implements PathBuilderValidator using a JPA Metamodel instance
+ */
+public class JPAPathBuilderValidator implements PathBuilderValidator {
+
+    private final Metamodel metamodel;
+
+    public JPAPathBuilderValidator(EntityManager entityManager) {
+        this.metamodel = entityManager.getMetamodel();
+    }
+
+    public JPAPathBuilderValidator(Metamodel metamodel) {
+        this.metamodel = metamodel;
+    }
+
+    @Override
+    public Class<?> validate(Class<?> parent, String property, Class<?> propertyType) {
+        try {
+            ManagedType managedType = metamodel.managedType(parent);
+            Attribute attribute = managedType.getAttribute(property);
+            if (attribute instanceof PluralAttribute) {
+                return ((PluralAttribute) attribute).getElementType().getJavaType();
+            } else {
+                return PrimitiveUtils.wrap(attribute.getJavaType());
+            }
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QDerbyDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QDerbyDialect.java
new file mode 100644
index 0000000000..6593ae2df1
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QDerbyDialect.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.dialect.function.CastFunction;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.type.Type;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.DerbyTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QDerbyDialect} extends {@code DerbyDialect} with additional functions
+ */
+public class QDerbyDialect extends DerbyDialect {
+
+    private static final CastFunction castFunction = new CastFunction() {
+        @Override
+        public String render(Type columnType, List args, SessionFactoryImplementor factory) {
+            if (args.get(1).equals("string")) {
+                return super.render(columnType, Arrays.asList("char(" + args.get(0) + ")", args.get(1)), factory);
+            } else {
+                return super.render(columnType, args, factory);
+            }
+        }
+    };
+
+    public QDerbyDialect() {
+        SQLTemplates templates = DerbyTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+        registerFunction("concat", DialectSupport.createFunction(templates, Ops.CONCAT));
+        registerFunction("cast", castFunction);
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QH2Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QH2Dialect.java
new file mode 100644
index 0000000000..69b2a188ae
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QH2Dialect.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.H2Dialect;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QH2Dialect} extends {@code H2Dialect} with additional functions
+ */
+public class QH2Dialect extends H2Dialect {
+
+    public QH2Dialect() {
+        SQLTemplates templates = H2Templates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QHSQLDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QHSQLDialect.java
new file mode 100644
index 0000000000..0602a6ff33
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QHSQLDialect.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.HSQLDialect;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.HSQLDBTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QHSQLDialect} extends {@code HSQLDialect} with additional functions
+ */
+public class QHSQLDialect extends HSQLDialect {
+
+    public QHSQLDialect() {
+        SQLTemplates templates = HSQLDBTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+        registerFunction("trim", DialectSupport.createFunction(templates, Ops.TRIM));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL57InnoDBDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL57InnoDBDialect.java
new file mode 100644
index 0000000000..5ed6bdb55e
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL57InnoDBDialect.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.MySQL57InnoDBDialect;
+
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QMySQL57InnoDBDialect} extends {@code MySQL57InnoDBDialect} with additional functions
+ */
+public class QMySQL57InnoDBDialect extends MySQL57InnoDBDialect {
+
+    public QMySQL57InnoDBDialect() {
+        SQLTemplates templates = MySQLTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5Dialect.java
new file mode 100644
index 0000000000..e1a0b66a2b
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5Dialect.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.MySQL5Dialect;
+
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QMySQL5Dialect} extends {@code MySQL5Dialect} with additional functions
+ */
+public class QMySQL5Dialect extends MySQL5Dialect {
+
+    public QMySQL5Dialect() {
+        SQLTemplates templates = MySQLTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5InnoDBDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5InnoDBDialect.java
new file mode 100644
index 0000000000..920228b21b
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QMySQL5InnoDBDialect.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.MySQL5InnoDBDialect;
+
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QMySQL5InnoDBDialect} extends {@code MySQL5InnoDBDialect} with additional functions
+ */
+public class QMySQL5InnoDBDialect extends MySQL5InnoDBDialect {
+
+    public QMySQL5InnoDBDialect() {
+        SQLTemplates templates = MySQLTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QOracle10gDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QOracle10gDialect.java
new file mode 100644
index 0000000000..c6eb0793d2
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QOracle10gDialect.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.Oracle10gDialect;
+
+import com.querydsl.sql.OracleTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QOracle10gDialect} extends {@code Oracle10gDialect} with additional functions
+ */
+public class QOracle10gDialect extends Oracle10gDialect {
+
+    public QOracle10gDialect() {
+        SQLTemplates templates = OracleTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQL9Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQL9Dialect.java
new file mode 100644
index 0000000000..dbe0075319
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQL9Dialect.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.PostgreSQL9Dialect;
+
+import com.querydsl.sql.PostgreSQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QPostgreSQL9Dialect} extends {@code PostgreSQL9Dialect} with additional functions
+ */
+public class QPostgreSQL9Dialect extends PostgreSQL9Dialect {
+
+    public QPostgreSQL9Dialect() {
+        SQLTemplates templates = PostgreSQLTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQLDialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQLDialect.java
new file mode 100644
index 0000000000..1b5ffb8ba2
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QPostgreSQLDialect.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.PostgreSQLDialect;
+
+import com.querydsl.sql.PostgreSQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QPostgreSQLDialect} extends {@code PostgreSQLDialect} with additional functions
+ */
+public class QPostgreSQLDialect extends PostgreSQLDialect {
+
+    public QPostgreSQLDialect() {
+        SQLTemplates templates = PostgreSQLTemplates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2005Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2005Dialect.java
new file mode 100644
index 0000000000..54c90eae12
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2005Dialect.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.SQLServer2005Dialect;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.SQLServer2005Templates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QSQLServer2005Dialect} extends {@code SQLServer2005Dialect} with additional functions
+ */
+public class QSQLServer2005Dialect extends SQLServer2005Dialect {
+
+    public QSQLServer2005Dialect() {
+        SQLTemplates templates = SQLServer2005Templates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+        registerFunction("current_date",
+                DialectSupport.createFunction(templates, Ops.DateTimeOps.CURRENT_DATE));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2008Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2008Dialect.java
new file mode 100644
index 0000000000..a7f47cf9ee
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2008Dialect.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.SQLServer2008Dialect;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.SQLServer2008Templates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QSQLServer2008Dialect} extends {@code SQLServer2008Dialect} with additional functions
+ */
+public class QSQLServer2008Dialect extends SQLServer2008Dialect {
+
+    public QSQLServer2008Dialect() {
+        SQLTemplates templates = SQLServer2008Templates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+        registerFunction("current_date",
+                DialectSupport.createFunction(templates, Ops.DateTimeOps.CURRENT_DATE));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2012Dialect.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2012Dialect.java
new file mode 100644
index 0000000000..94e8396b58
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServer2012Dialect.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.support;
+
+import org.hibernate.dialect.SQLServer2012Dialect;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.SQLServer2012Templates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code QSQLServer2012Dialect} extends {@code SQLServer2012Dialect} with additional functions
+ */
+public class QSQLServer2012Dialect extends SQLServer2012Dialect {
+
+    public QSQLServer2012Dialect() {
+        SQLTemplates templates = SQLServer2012Templates.DEFAULT;
+        getFunctions().putAll(DialectSupport.createFunctions(templates));
+        registerFunction("current_date",
+                DialectSupport.createFunction(templates, Ops.DateTimeOps.CURRENT_DATE));
+    }
+}
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/support/package-info.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/package-info.java
new file mode 100644
index 0000000000..c826785f90
--- /dev/null
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/support/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Support classes
+ */
+package com.querydsl.jpa.support;
diff --git a/querydsl-jpa/src/test/java/PackagelessEntityTest.java b/querydsl-jpa/src/test/java/PackagelessEntityTest.java
index 2d35309bae..684db1f583 100644
--- a/querydsl-jpa/src/test/java/PackagelessEntityTest.java
+++ b/querydsl-jpa/src/test/java/PackagelessEntityTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,22 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import static com.querydsl.jpa.JPAExpressions.select;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.jpa.JPASubQuery;
-import com.mysema.query.types.path.PathBuilder;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.jpa.JPQLQuery;
 
 
 public class PackagelessEntityTest {
-    
+
     @SuppressWarnings("unchecked")
     @Test
-    public void PackageLess_Path() {
-        JPASubQuery query = new JPASubQuery();
-        PathBuilder builder = new PathBuilder(PackagelessEntityTest.class,"entity");
-        query.from(builder);
+    public void packageLess_path() {
+        PathBuilder<PackagelessEntityTest> builder = new PathBuilder(PackagelessEntityTest.class,"entity");
+        JPQLQuery<?> query = select(builder).from(builder);
         assertEquals("select entity\nfrom PackagelessEntityTest entity", query.toString());
     }
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
deleted file mode 100644
index 773c319048..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
+++ /dev/null
@@ -1,1471 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.Calendar;
-import java.util.Map.Entry;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.group.Group;
-import com.mysema.query.group.GroupBy;
-import com.mysema.query.group.QPair;
-import com.mysema.query.jpa.JPAExpressions;
-import com.mysema.query.jpa.JPASubQuery;
-import com.mysema.query.jpa.JPQLQuery;
-import com.mysema.query.jpa.domain.*;
-import com.mysema.query.jpa.domain.Company.Rating;
-import com.mysema.query.jpa.domain4.QBookMark;
-import com.mysema.query.jpa.domain4.QBookVersion;
-import com.mysema.query.jpa.hibernate.HibernateSubQuery;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.*;
-import com.mysema.query.types.path.*;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static com.mysema.query.Target.*;
-import static org.junit.Assert.*;
-
-/**
- * @author tiwe
- *
- */
-public abstract class AbstractJPATest {
-
-    private static final Expression<?>[] NO_EXPRESSIONS = new Expression[0];
-
-    private static final QCompany company = QCompany.company;
-
-    private static final QAnimal animal = QAnimal.animal;
-
-    private static final QCat cat = QCat.cat;
-
-    private static final QCat otherCat = new QCat("otherCat");
-
-    private static final BooleanExpression cond1 = cat.name.length().gt(0);
-
-    private static final BooleanExpression cond2 = otherCat.name.length().gt(0);
-
-    private static final Predicate condition = ExpressionUtils.and(
-            (Predicate)ExpressionUtils.extract(cond1),
-            (Predicate)ExpressionUtils.extract(cond2));
-
-    private static final Date birthDate;
-
-    private static final java.sql.Date date;
-
-    private static final java.sql.Time time;
-
-    private final List<Cat> savedCats = new ArrayList<Cat>();
-
-    static {
-        Calendar cal = Calendar.getInstance();
-        cal.set(2000, 1, 2, 3, 4);
-        cal.set(Calendar.MILLISECOND, 0);
-        birthDate = cal.getTime();
-        date = new java.sql.Date(cal.getTimeInMillis());
-        time = new java.sql.Time(cal.getTimeInMillis());
-    }
-
-    protected Target getTarget() {
-        return Mode.target.get();
-    }
-
-    protected abstract JPQLQuery query();
-
-    protected abstract JPQLQuery testQuery();
-
-    protected JPASubQuery subQuery() {
-        return new JPASubQuery();
-    }
-
-    protected abstract void save(Object entity);
-
-    @Before
-    public void setUp() {
-        if (query().from(cat).exists()) {
-            savedCats.addAll(query().from(cat).orderBy(cat.id.asc()).list(cat));
-            return;
-        }
-
-        Cat prev = null;
-        for (Cat cat : Arrays.asList(
-                new Cat("Bob123", 1, 1.0),
-                new Cat("Ruth123", 2, 2.0),
-                new Cat("Felix123", 3, 3.0),
-                new Cat("Allen123", 4, 4.0),
-                new Cat("Mary_123", 5, 5.0))) {
-            if (prev != null) {
-                cat.addKitten(prev);
-            }
-            cat.setBirthdate(birthDate);
-            cat.setDateField(date);
-            cat.setTimeField(time);
-            cat.setColor(Color.BLACK);
-            save(cat);
-            savedCats.add(cat);
-            prev = cat;
-        }
-
-        Animal animal = new Animal(10);
-        animal.setBodyWeight(10.5);
-        save(animal);
-
-        Cat cat = new Cat("Some", 6, 6.0);
-        cat.setBirthdate(birthDate);
-        save(cat);
-        savedCats.add(cat);
-
-        Show show = new Show(1);
-        show.acts = new HashMap<String,String>();
-        show.acts.put("a","A");
-        show.acts.put("b","B");
-        save(show);
-
-        Company company = new Company();
-        company.name = "1234567890123456789012345678901234567890"; // 40
-        company.id = 1;
-        company.ratingOrdinal = Company.Rating.A;
-        company.ratingString = Company.Rating.AA;
-        save(company);
-
-        Employee employee = new Employee();
-        employee.id = 1;
-        employee.lastName = "Smith";
-        employee.jobFunctions.add(JobFunction.CODER);
-        save(employee);
-
-        Employee employee2 = new Employee();
-        employee2.id = 2;
-        employee2.lastName = "Doe";
-        employee2.jobFunctions.add(JobFunction.CODER);
-        employee2.jobFunctions.add(JobFunction.CONSULTANT);
-        employee2.jobFunctions.add(JobFunction.CONTROLLER);
-        save(employee2);
-
-        save(new Entity1(1));
-        save(new Entity1(2));
-        save(new Entity2(3));
-
-        Foo foo = new Foo();
-        foo.id = 1;
-        foo.names = Arrays.asList("a","b");
-        foo.bar = "München";
-        save(foo);
-
-        Numeric numeric = new Numeric();
-        numeric.setValue(BigDecimal.valueOf(26.9));
-        save(numeric);
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Add_BigDecimal() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
-        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
-
-        query().from(entity, entity2)
-               .where(bigd1.add(bigd2).loe(new BigDecimal("1.00")))
-               .list(entity);
-    }
-
-    @Test
-    public void Aggregates_List_Max() {
-        assertEquals(Integer.valueOf(6), query().from(cat).list(cat.id.max()).get(0));
-    }
-
-    @Test
-    public void Aggregates_List_Min() {
-        assertEquals(Integer.valueOf(1), query().from(cat).list(cat.id.min()).get(0));
-    }
-
-    @Test
-    public void Aggregates_UniqueResult_Max() {
-        assertEquals(Integer.valueOf(6), query().from(cat).uniqueResult(cat.id.max()));
-    }
-
-    @Test
-    public void Aggregates_UniqueResult_Min() {
-        assertEquals(Integer.valueOf(1), query().from(cat).uniqueResult(cat.id.min()));
-    }
-
-    @Test
-    public void Any_And_Gt() {
-        assertEquals(0, query().from(cat).where(
-                cat.kittens.any().name.eq("Ruth123"),
-                cat.kittens.any().bodyWeight.gt(10.0)).count());
-    }
-
-    @Test
-    public void Any_And_Lt() {
-        assertEquals(1, query().from(cat).where(
-                cat.kittens.any().name.eq("Ruth123"),
-                cat.kittens.any().bodyWeight.lt(10.0)).count());
-    }
-
-    @Test
-    public void Any_In_Order() {
-        assertFalse(query().from(cat).orderBy(cat.kittens.any().name.asc()).list(cat).isEmpty());
-    }
-
-    @Test
-    public void Any_In_Projection() {
-        assertFalse(query().from(cat).list(cat.kittens.any()).isEmpty());
-    }
-
-    @Test
-    public void Any_In_Projection2() {
-        assertFalse(query().from(cat).list(cat.kittens.any().name).isEmpty());
-    }
-
-    @Test
-    public void Any_In1() {
-        //select cat from Cat cat where exists (
-        //  select cat_kittens from Cat cat_kittens where cat_kittens member of cat.kittens and cat_kittens in ?1)
-        assertFalse(query().from(cat).where(cat.kittens.any().in(savedCats)).list(cat).isEmpty());
-    }
-
-    @Test
-    public void Any_In11() {
-        List<Integer> ids = Lists.newArrayList();
-        for (Cat cat : savedCats) ids.add(cat.getId());
-        assertFalse(query().from(cat).where(cat.kittens.any().id.in(ids)).list(cat).isEmpty());
-    }
-
-    @Test
-    public void Any_In2() {
-        assertFalse(query().from(cat).where(
-                cat.kittens.any().in(savedCats),
-                cat.kittens.any().in(savedCats.subList(0, 1)).not())
-            .list(cat).isEmpty());
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Any_In3() {
-        QEmployee employee = QEmployee.employee;
-        assertFalse(query().from(employee).where(
-                employee.jobFunctions.any().in(JobFunction.CODER, JobFunction.CONSULTANT))
-                .list(employee).isEmpty());
-    }
-
-    @Test
-    public void Any_Simple() {
-        assertEquals(1, query().from(cat).where(cat.kittens.any().name.eq("Ruth123")).count());
-    }
-
-    @Test
-    public void Any_Usage() {
-        assertEquals(1, query().from(cat).where(cat.kittens.any().name.eq("Ruth123")).count());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void ArrayProjection() {
-        List<String[]> results = query().from(cat)
-                .list(new ArrayConstructorExpression<String>(String[].class, cat.name));
-        assertFalse(results.isEmpty());
-        for (String[] result : results) {
-            assertNotNull(result[0]);
-        }
-    }
-
-    @Test
-    public void As() {
-        assertTrue(query().from(QAnimal.animal.as(QCat.class)).count() > 0);
-    }
-
-    @Test
-    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-4700
-    @NoBatooJPA
-    public void Case() {
-        query().from(cat).list(cat.name.when("Bob").then(1).otherwise(2));
-    }
-
-    @Test(expected=ClassCastException.class)
-    @NoEclipseLink
-    @NoBatooJPA
-    public void Case_Hibernate() {
-        query().from(cat).list(cat.name.when("Bob").then(1).otherwise(2));
-    }
-
-    @Test
-    public void Case2() {
-        query().from(cat)
-            .list(Expressions.cases().when(cat.toes.eq(2)).then(cat.id.multiply(2))
-                                     .when(cat.toes.eq(3)).then(cat.id.multiply(3))
-                                     .otherwise(4));
-    }
-
-    @Test
-    public void Cast() {
-        List<Cat> cats = query().from(cat).list(cat);
-        List<Integer> weights = query().from(cat).list(cat.bodyWeight.castToNum(Integer.class));
-        for (int i = 0; i < cats.size(); i++) {
-            assertEquals(Integer.valueOf((int)(cats.get(i).getBodyWeight())), weights.get(i));
-        }
-    }
-
-    @Test
-    public void Collection_Predicates() {
-        ListPath<Cat, QCat> path = cat.kittens;
-        List<Predicate> predicates = Arrays.<Predicate>asList(
-//            path.eq(savedCats),
-//            path.in(savedCats),
-//            path.isNotNull(),
-//            path.isNull(),
-//            path.ne(savedCats),
-//            path.notIn(savedCats)
-//            path.when(other)
-        );
-        for (Predicate pred : predicates) {
-            System.err.println(pred);
-            query().from(cat).where(pred).list(cat);
-        }
-    }
-
-    @Test
-    public void Collection_Projections() {
-        ListPath<Cat, QCat> path = cat.kittens;
-        List<Expression<?>> projections = Arrays.<Expression<?>>asList(
-//            path.count(),
-//            path.countDistinct()
-        );
-        for (Expression<?> proj : projections) {
-            System.err.println(proj);
-            query().from(cat).list(proj);
-        }
-    }
-
-    @Test
-    @NoHibernate // https://github.com/mysema/querydsl/issues/290
-    public void Constant() {
-        //select cat.id, ?1 as const from Cat cat
-        List<Cat> cats = query().from(cat).list(cat);
-        Path<String> path = new StringPath("const");
-        List<Tuple> tuples = query().from(cat).list(new QTuple(cat.id, Expressions.constantAs("abc", path)));
-        for (int i = 0; i < cats.size(); i++) {
-            assertEquals(Integer.valueOf(cats.get(i).getId()), tuples.get(i).get(cat.id));
-            assertEquals("abc", tuples.get(i).get(path));
-        }
-    }
-
-    @Test(expected=ClassCastException.class)
-    @NoEclipseLink
-    @NoBatooJPA
-    public void Constant_Hibernate() {
-        //select cat.id, ?1 as const from Cat cat
-        query().from(cat).list(new QTuple(cat.id, Expressions.constantAs("abc", new StringPath("const"))));
-    }
-
-    @Test
-    @NoHibernate // https://github.com/mysema/querydsl/issues/290
-    public void Constant2() {
-        assertFalse(query().from(cat).map(cat.id, Expressions.constant("name")).isEmpty());
-    }
-
-    @Test
-    public void ConstructorProjection() {
-        List<Projection> projections = query().from(cat)
-                .list(ConstructorExpression.create(Projection.class, cat.name, cat));
-        assertFalse(projections.isEmpty());
-        for (Projection projection : projections) {
-            assertNotNull(projection);
-        }
-    }
-
-    @Test
-    public void ConstructorProjection2() {
-        List<Projection> projections = query().from(cat).list(new QProjection(cat.name, cat));
-        assertFalse(projections.isEmpty());
-        for (Projection projection : projections) {
-            assertNotNull(projection);
-        }
-    }
-
-    @Test
-    public void Contains_Ic() {
-        QFoo foo = QFoo.foo;
-        assertEquals(1, query().from(foo).where(foo.bar.containsIgnoreCase("München")).count());
-    }
-
-    @Test
-    public void Contains1() {
-        assertEquals(1, query().from(cat).where(cat.name.contains("eli")).count());
-    }
-
-    @Test
-    public void Contains2() {
-        assertEquals(1l, query().from(cat).where(cat.kittens.contains(savedCats.get(0))).count());
-    }
-
-    @Test
-    public void Contains3() {
-        assertEquals(1l, query().from(cat).where(cat.name.contains("_")).count());
-    }
-
-    @Test
-    public void Contains4() {
-        QEmployee employee = QEmployee.employee;
-        query().from(employee)
-               .where(
-                   employee.jobFunctions.contains(JobFunction.CODER),
-                   employee.jobFunctions.contains(JobFunction.CONSULTANT),
-                   employee.jobFunctions.size().eq(2))
-               .list(employee);
-    }
-
-    @Test
-    public void Count() {
-        QShow show = QShow.show;
-        assertTrue(query().from(show).count() > 0);
-    }
-
-    @Test
-    public void Count_Distinct() {
-        QCat cat = QCat.cat;
-        query().from(cat)
-            .groupBy(cat.id)
-            .list(cat.id, cat.breed.countDistinct());
-    }
-
-    @Test
-    @NoBatooJPA
-    @NoHibernate
-    public void Count_Distinct2() {
-        QCat cat = QCat.cat;
-        query().from(cat)
-            .groupBy(cat.id)
-            .list(cat.id, cat.birthdate.dayOfMonth().countDistinct());
-    }
-
-    @Test
-    public void DistinctResults() {
-        System.out.println("-- list results");
-        SearchResults<Date> res = query().from(cat).limit(2).listResults(cat.birthdate);
-        assertEquals(2, res.getResults().size());
-        assertEquals(6l, res.getTotal());
-        System.out.println();
-
-        System.out.println("-- list distinct results");
-        res = query().from(cat).limit(2).distinct().listResults(cat.birthdate);
-        assertEquals(1, res.getResults().size());
-        assertEquals(1l, res.getTotal());
-        System.out.println();
-
-        System.out.println("-- list distinct");
-        assertEquals(1, query().from(cat).distinct().list(cat.birthdate).size());
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Divide() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-
-        query().from(entity, entity2)
-               .where(entity.ddouble.divide(entity2.ddouble).loe(2.0))
-               .list(entity);
-
-        query().from(entity, entity2)
-                .where(entity.ddouble.divide(entity2.iint).loe(2.0))
-                .list(entity);
-
-        query().from(entity, entity2)
-                .where(entity.iint.divide(entity2.ddouble).loe(2.0))
-                .list(entity);
-
-        query().from(entity, entity2)
-                .where(entity.iint.divide(entity2.iint).loe(2))
-                .list(entity);
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Divide_BigDecimal() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
-        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
-
-        query().from(entity, entity2)
-               .where(bigd1.divide(bigd2).loe(new BigDecimal("1.00")))
-               .list(entity);
-
-        query().from(entity, entity2)
-               .where(entity.ddouble.divide(bigd2).loe(new BigDecimal("1.00")))
-               .list(entity);
-
-        query().from(entity, entity2)
-               .where(bigd1.divide(entity.ddouble).loe(new BigDecimal("1.00")))
-               .list(entity);
-    }
-
-    @Test
-    public void EndsWith() {
-        assertEquals(1, query().from(cat).where(cat.name.endsWith("h123")).count());
-    }
-
-    @Test
-    public void EndsWith_IgnoreCase() {
-        assertEquals(1, query().from(cat).where(cat.name.endsWithIgnoreCase("H123")).count());
-    }
-
-    @Test
-    public void EndsWith2() {
-        assertEquals(0, query().from(cat).where(cat.name.endsWith("X")).count());
-    }
-
-    @Test
-    public void EndsWith3() {
-        assertEquals(1, query().from(cat).where(cat.name.endsWith("_123")).count());
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Enum_in() {
-        assertEquals(1, query().from(company).where(company.ratingOrdinal.in(Rating.A, Rating.AA)).count());
-        assertEquals(1, query().from(company).where(company.ratingString.in(Rating.A, Rating.AA)).count());
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Enum_In() {
-        QEmployee employee = QEmployee.employee;
-
-        JPQLQuery query = query();
-        query.from(employee).where(employee.lastName.eq("Smith"), employee.jobFunctions
-                .contains(JobFunction.CODER));
-        assertEquals(1l, query.count());
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query().from(cat).where(cat.kittens.any().name.eq("Ruth123")).exists());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Fetch() {
-        QMammal mammal = QMammal.mammal;
-        QHuman human = new QHuman("mammal");
-        query().from(mammal)
-            .leftJoin(human.hairs).fetch()
-            .list(mammal);
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Fetch2() {
-        QWorld world = QWorld.world;
-        QMammal mammal = QMammal.mammal;
-        QHuman human = new QHuman("mammal");
-        query().from(world)
-            .leftJoin(world.mammals, mammal).fetch()
-            .leftJoin(human.hairs).fetch()
-            .list(world);
-    }
-
-    @Test
-    @ExcludeIn({MYSQL, DERBY})
-    @NoBatooJPA
-    public void GroupBy() {
-        QAuthor author = QAuthor.author;
-        QBook book = QBook.book;
-
-        for (int i = 0; i < 10; i++) {
-            Author a = new Author();
-            a.setName(String.valueOf(i));
-            save(a);
-            for (int j = 0; j < 2; j++) {
-                Book b = new Book();
-                b.setTitle(String.valueOf(i)+" "+String.valueOf(j));
-                b.setAuthor(a);
-                save(b);
-            }
-        }
-
-        Map<Long, List<Pair<Long, String>>> map = query()
-            .from(author)
-            .join(author.books, book)
-            .transform(GroupBy
-                .groupBy(author.id)
-                .as(GroupBy.list(QPair.create(book.id, book.title))));
-
-        for (Entry<Long, List<Pair<Long, String>>> entry : map.entrySet()) {
-            System.out.println("author = " + entry.getKey());
-
-            for (Pair<Long,String> pair : entry.getValue()) {
-                System.out.println("  book = " + pair.getFirst() + "," + pair.getSecond());
-            }
-        }
-    }
-
-    @Test
-    public void GroupBy2() {
-//        select cat0_.name as col_0_0_, cat0_.breed as col_1_0_, sum(cat0_.bodyWeight) as col_2_0_
-//        from animal_ cat0_ where cat0_.DTYPE in ('C', 'DC') and cat0_.bodyWeight>?
-//        group by cat0_.name , cat0_.breed
-        query().from(cat)
-            .where(cat.bodyWeight.gt(0))
-            .groupBy(cat.name, cat.breed)
-            .list(cat.name, cat.breed, cat.bodyWeight.sum());
-    }
-
-    @Test
-    @NoEclipseLink
-    public void GroupBy_YearMonth() {
-        query().from(cat)
-               .groupBy(cat.birthdate.yearMonth())
-               .orderBy(cat.birthdate.yearMonth().asc())
-               .list(cat.id.count());
-    }
-
-    @Test
-    public void In() {
-        assertEquals(3l, query().from(cat).where(cat.name.in("Bob123", "Ruth123", "Felix123")).count());
-
-        query().from(cat).where(cat.id.in(Arrays.asList(1,2,3))).count();
-        query().from(cat).where(cat.name.in(Arrays.asList("A","B","C"))).count();
-    }
-
-    @Test
-    public void In2() {
-        query().from(cat).where(cat.id.in(1,2,3)).count();
-        query().from(cat).where(cat.name.in("A","B","C")).count();
-    }
-
-    @Test
-    public void In3() {
-        query().from(cat).where(cat.name.in("A,B,C".split(","))).count();
-    }
-
-    @Test
-    public void In4() {
-        //$.parameterRelease.id.eq(releaseId).and($.parameterGroups.any().id.in(filter.getGroups()));
-        query().from(cat).where(cat.id.eq(1), cat.kittens.any().id.in(1,2,3)).list(cat);
-    }
-
-    @Test
-    public void In5() {
-        query().from(cat).where(cat.mate.in(savedCats)).count();
-    }
-
-    @Test
-    @Ignore
-    public void In6() {
-        //query().from(cat).where(cat.kittens.in(savedCats)).count();
-    }
-
-    @Test
-    public void In7() {
-        query().from(cat).where(cat.kittens.any().in(savedCats)).count();
-    }
-
-    @Test
-    @IncludeIn(Target.H2)
-    @NoBatooJPA
-    public void In_Empty() {
-        query().from(cat).where(cat.name.in(Collections.<String>emptyList())).count();
-    }
-
-    @Test
-    @NoOpenJPA
-    public void IndexOf() {
-        assertEquals(Integer.valueOf(0), query().from(cat).where(cat.name.eq("Bob123"))
-                .uniqueResult(cat.name.indexOf("B")));
-    }
-
-    @Test
-    @NoOpenJPA
-    public void IndexOf2() {
-        assertEquals(Integer.valueOf(1), query().from(cat).where(cat.name.eq("Bob123"))
-                .uniqueResult(cat.name.indexOf("o")));
-    }
-
-    @Test
-    public void InstanceOf_Cat() {
-        assertEquals(6l, query().from(cat).where(cat.instanceOf(Cat.class)).count());
-    }
-
-    @Test
-    public void InstanceOf_DomesticCat() {
-        assertEquals(0l, query().from(cat).where(cat.instanceOf(DomesticCat.class)).count());
-    }
-
-    @Test
-    public void InstanceOf_Entity1() {
-        QEntity1 entity1 = QEntity1.entity1;
-        assertEquals(2l, query().from(entity1).where(entity1.instanceOf(Entity1.class)).count());
-    }
-
-    @Test
-    public void InstanceOf_Entity2() {
-        QEntity1 entity1 = QEntity1.entity1;
-        assertEquals(1l, query().from(entity1).where(entity1.instanceOf(Entity2.class)).count());
-    }
-
-    @Test
-    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-6686
-    public void IsEmpty_ElementCollection() {
-        QEmployee employee = QEmployee.employee;
-        query().from(employee).where(employee.jobFunctions.isEmpty()).count();
-    }
-
-    @Test
-    public void IsEmpty_Relation() {
-        query().from(cat).where(cat.kittensSet.isEmpty()).count();
-    }
-
-    @Test
-    @NoEclipseLink
-    @ExcludeIn({ORACLE, TERADATA})
-    public void JoinEmbeddable() {
-        QBookVersion bookVersion = QBookVersion.bookVersion;
-        QBookMark bookMark = QBookMark.bookMark;
-
-        query().from(bookVersion)
-            .join(bookVersion.definition.bookMarks, bookMark)
-            .where(
-                bookVersion.definition.bookMarks.size().eq(1),
-                bookMark.page.eq(2357L).or(bookMark.page.eq(2356L)))
-            .list(bookVersion);
-    }
-
-    @Test
-    public void Length() {
-        assertEquals(6, query().from(cat).where(cat.name.length().gt(0)).count());
-    }
-
-    @Test
-    public void Like() {
-        query().from(cat).where(cat.name.like("!")).count();
-        query().from(cat).where(cat.name.like("\\")).count();
-    }
-
-    @Test
-    public void Limit() {
-        List<String> names1 = Arrays.asList("Allen123","Bob123");
-        assertEquals(names1, query().from(cat).orderBy(cat.name.asc()).limit(2).list(cat.name));
-    }
-
-    @Test
-    public void Limit_and_offset() {
-        List<String> names3 = Arrays.asList("Felix123","Mary_123");
-        assertEquals(names3, query().from(cat).orderBy(cat.name.asc()).limit(2).offset(2).list(cat.name));
-    }
-
-    @Test
-    public void Limit2() {
-        assertEquals(Collections.singletonList("Allen123"),
-                query().from(cat).orderBy(cat.name.asc()).limit(1).list(cat.name));
-    }
-
-    @Test
-    public void Limit3() {
-        assertEquals(6, query().from(cat).limit(Long.MAX_VALUE).list(cat).size());
-    }
-
-    @Test
-    public void List_ElementCollection_Of_Enum() {
-        QEmployee employee = QEmployee.employee;
-        //QJobFunction jobFunction = QJobFunction.jobFunction;
-        EnumPath<JobFunction> jobFunction = new EnumPath<JobFunction>(JobFunction.class, "jf");
-
-        List<JobFunction> jobFunctions = query().from(employee)
-                .innerJoin(employee.jobFunctions, jobFunction).list(jobFunction);
-        assertEquals(4, jobFunctions.size());
-    }
-
-    @Test
-    @NoBatooJPA
-    public void List_ElementCollection_Of_String() {
-        QFoo foo = QFoo.foo;
-        StringPath str = new StringPath("str");
-
-        List<String> strings = query().from(foo).innerJoin(foo.names, str).list(str);
-        assertEquals(2, strings.size());
-        assertTrue(strings.contains("a"));
-        assertTrue(strings.contains("b"));
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsKey() {
-        QShow show = QShow.show;
-        assertEquals(1l, query().from(show).where(show.acts.containsKey("a")).count());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsKey2() {
-        QShow show = QShow.show;
-        assertEquals(1l, query().from(show).where(show.acts.containsKey("b")).count());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsKey3() {
-        QShow show = QShow.show;
-        assertEquals(0l, query().from(show).where(show.acts.containsKey("c")).count());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsValue() {
-        QShow show = QShow.show;
-        assertEquals(1l, query().from(show).where(show.acts.containsValue("A")).count());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsValue2() {
-        QShow show = QShow.show;
-        assertEquals(1l, query().from(show).where(show.acts.containsValue("B")).count());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void Map_ContainsValue3() {
-        QShow show = QShow.show;
-        assertEquals(0l, query().from(show).where(show.acts.containsValue("C")).count());
-    }
-
-    @Test
-    @Ignore
-    public void Map_Join() {
-        //select m.text from Show s join s.acts a where key(a) = 'B'
-        QShow show = QShow.show;
-        StringPath act = new StringPath("act");
-        query().from(show).join(show.acts, act);
-    }
-
-    @Test
-    public void Max() {
-        query().from(cat).uniqueResult(cat.bodyWeight.max());
-    }
-
-    @Test
-    public void Min() {
-        query().from(cat).uniqueResult(cat.bodyWeight.min());
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Multiply() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-        query().from(entity, entity2)
-               .where(entity.ddouble.multiply(entity2.ddouble).loe(2.0))
-               .list(entity);
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Multiply_BigDecimal() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
-        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
-
-        query().from(entity, entity2)
-               .where(bigd1.multiply(bigd2).loe(new BigDecimal("1.00")))
-               .list(entity);
-    }
-
-    @Test
-    public void NestedProjection() {
-        Concatenation concat = new Concatenation(cat.name, cat.name);
-        List<Tuple> tuples = query().from(cat).list(new QTuple(cat.name, concat));
-        assertFalse(tuples.isEmpty());
-        for (Tuple tuple : tuples) {
-            assertEquals(
-                tuple.get(concat),
-                tuple.get(cat.name)+tuple.get(cat.name));
-        }
-    }
-
-    @Test
-    public void Not_Exists() {
-        assertTrue(query().from(cat).where(cat.kittens.any().name.eq("XXX")).notExists());
-    }
-
-    @Test
-    public void Not_In() {
-        long all = query().from(cat).count();
-        assertEquals(all - 3l, query().from(cat).where(cat.name.notIn("Bob123", "Ruth123", "Felix123")).count());
-
-        query().from(cat).where(cat.id.notIn(1,2,3)).count();
-        query().from(cat).where(cat.name.notIn("A","B","C")).count();
-    }
-
-    @Test
-    @IncludeIn(Target.H2)
-    @NoBatooJPA
-    public void Not_In_Empty() {
-        query().from(cat).where(cat.name.notIn(Collections.<String>emptyList())).count();
-    }
-
-    @Test
-    public void Null_as_uniqueResult() {
-        assertNull(query().from(cat).where(cat.name.eq(UUID.randomUUID().toString()))
-                .uniqueResult(cat));
-    }
-
-    @Test
-    @NoEclipseLink
-    public void Numeric() {
-        QNumeric numeric = QNumeric.numeric;
-        BigDecimal singleResult = query().from(numeric).singleResult(numeric.value);
-        assertEquals(26.9, singleResult.doubleValue(), 0.001);
-    }
-
-    @Test
-    @NoOpenJPA
-    @NoBatooJPA // FIXME
-    public void Offset1() {
-        List<String> names2 = Arrays.asList("Bob123", "Felix123", "Mary_123", "Ruth123", "Some");
-        assertEquals(names2, query().from(cat).orderBy(cat.name.asc()).offset(1).list(cat.name));
-    }
-
-    @Test
-    @NoOpenJPA
-    @NoBatooJPA // FIXME
-    public void Offset2() {
-        List<String> names2 = Arrays.asList("Felix123", "Mary_123", "Ruth123", "Some");
-        assertEquals(names2, query().from(cat).orderBy(cat.name.asc()).offset(2).list(cat.name));
-    }
-
-    @Test
-    public void One_To_One() {
-        QEmployee employee = QEmployee.employee;
-        QUser user = QUser.user;
-
-        JPQLQuery query = query();
-        query.from(employee);
-        query.innerJoin(employee.user, user);
-        query.list(employee);
-    }
-
-    @Test
-    public void Order() {
-        NumberPath<Double> weight = new NumberPath<Double>(Double.class, "weight");
-        query().from(cat).orderBy(weight.asc()).list(cat.bodyWeight.as(weight));
-    }
-
-    @Test
-    public void Order_By_Count() {
-        NumberPath<Long> count = Expressions.numberPath(Long.class, "c");
-        query().from(cat)
-            .groupBy(cat.id)
-            .orderBy(count.asc())
-            .list(cat.id, cat.id.count().as(count));
-    }
-
-    @Test
-    public void Order_StringValue() {
-        int count = (int)query().from(cat).count();
-        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().asc()).list(cat).size());
-    }
-
-    @Test
-    @NoBatooJPA // can't be parsed
-    public void Order_StringValue_To_Integer() {
-        int count = (int)query().from(cat).count();
-        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(Integer.class).asc()).list(cat).size());
-    }
-
-    @Test
-    @NoBatooJPA // can't be parsed
-    public void Order_StringValue_ToLong() {
-        int count = (int)query().from(cat).count();
-        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(Long.class).asc()).list(cat).size());
-    }
-
-    @Test
-    @NoBatooJPA // can't be parsed
-    public void Order_StringValue_ToBigInteger() {
-        int count = (int)query().from(cat).count();
-        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(BigInteger.class).asc()).list(cat).size());
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Order_NullsFirst() {
-        assertNull(query().from(cat)
-            .orderBy(cat.dateField.asc().nullsFirst())
-            .singleResult(cat.dateField));
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Order_NullsLast() {
-        assertNotNull(query().from(cat)
-            .orderBy(cat.dateField.asc().nullsLast())
-            .singleResult(cat.dateField));
-    }
-
-    @Test
-    public void Params() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Bob123",query().from(cat).where(cat.name.eq(name)).set(name, "Bob123")
-                .uniqueResult(cat.name));
-    }
-
-    @Test
-    public void Params_anon() {
-        Param<String> name = new Param<String>(String.class);
-        assertEquals("Bob123",query().from(cat).where(cat.name.eq(name)).set(name, "Bob123")
-                .uniqueResult(cat.name));
-    }
-
-    @Test(expected=ParamNotSetException.class)
-    public void Params_not_set() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Bob123",query().from(cat).where(cat.name.eq(name)).uniqueResult(cat.name));
-    }
-
-    @Test
-    public void Precedence() {
-        StringPath str = cat.name;
-        Predicate where = str.like("Bob%").and(str.like("%ob123"))
-                      .or(str.like("Ruth%").and(str.like("%uth123")));
-        assertEquals(2l, query().from(cat).where(where).count());
-    }
-
-    @Test
-    public void Precedence2() {
-        StringPath str = cat.name;
-        Predicate where = str.like("Bob%").and(str.like("%ob123")
-                      .or(str.like("Ruth%"))).and(str.like("%uth123"));
-        assertEquals(0l, query().from(cat).where(where).count());
-    }
-
-    @Test
-    public void Precedence3() {
-        Predicate where = cat.name.eq("Bob123").and(cat.id.eq(1))
-                      .or(cat.name.eq("Ruth123").and(cat.id.eq(2)));
-        assertEquals(2l, query().from(cat).where(where).count());
-    }
-
-    @Test
-    public void FactoryExpression_In_GroupBy() {
-        Expression<Cat> catBean = Projections.bean(Cat.class, cat.id, cat.name);
-        assertFalse(query().from(cat).groupBy(catBean).list(catBean).isEmpty());
-    }
-
-    @Test
-    @Ignore
-    public void Size() {
-        // NOT SUPPORTED
-        query().from(cat).list(cat, cat.kittens.size());
-    }
-
-    @Test
-    public void StartsWith() {
-        assertEquals(1, query().from(cat).where(cat.name.startsWith("R")).count());
-    }
-
-    @Test
-    public void StartsWith_IgnoreCase() {
-        assertEquals(1, query().from(cat).where(cat.name.startsWithIgnoreCase("r")).count());
-    }
-
-    @Test
-    public void StartsWith2() {
-        assertEquals(0, query().from(cat).where(cat.name.startsWith("X")).count());
-    }
-
-    @Test
-    public void StartsWith3() {
-        assertEquals(1, query().from(cat).where(cat.name.startsWith("Mary_")).count());
-    }
-
-    @Test
-    @ExcludeIn({MYSQL, TERADATA})
-    @NoOpenJPA
-    public void StringOperations() {
-        // NOTE : locate in MYSQL is case-insensitive
-        assertEquals(0, query().from(cat).where(cat.name.startsWith("r")).count());
-        assertEquals(0, query().from(cat).where(cat.name.endsWith("H123")).count());
-        assertEquals(Integer.valueOf(2), query().from(cat).where(cat.name.eq("Bob123"))
-                .uniqueResult(cat.name.indexOf("b")));
-    }
-
-    @Test
-    public void SubQuery() {
-        QShow show = QShow.show;
-        QShow show2 = new QShow("show2");
-        query().from(show).where(subQuery().from(show2)
-               .where(show2.id.ne(show.id)).count().gt(0)).count();
-    }
-
-    @Test
-    public void SubQuery2() {
-        QCat cat = QCat.cat;
-        QCat other = new QCat("other");
-        List<Cat> cats = query().from(cat)
-            .where(cat.name.in(new HibernateSubQuery().from(other)
-            .groupBy(other.name).list(other.name)))
-            .list(cat);
-        assertNotNull(cats);
-    }
-
-    @Test
-    public void SubQuery3() {
-        QCat cat = QCat.cat;
-        QCat other = new QCat("other");
-        query().from(cat)
-            .where(cat.name.eq(new JPASubQuery().from(other)
-                                       .where(other.name.indexOf("B").eq(0))
-                                       .unique(other.name)))
-            .list(cat);
-    }
-
-    @Test
-    public void Substring() {
-        for (String str : query().from(cat).list(cat.name.substring(1,2))) {
-            assertEquals(1, str.length());
-        }
-    }
-
-    @Test
-    @NoBatooJPA
-    @ExcludeIn(ORACLE)
-    public void Substring2() {
-        QCompany company = QCompany.company;
-        StringExpression name = company.name;
-        Integer companyId = query().from(company).singleResult(company.id);
-        JPQLQuery query = query().from(company).where(company.id.eq(companyId));
-        String str = query.singleResult(company.name);
-
-        assertEquals(Integer.valueOf(29),
-                query.singleResult(name.length().subtract(11)));
-
-        assertEquals(str.substring(0, 7),
-                query.singleResult(name.substring(0, 7)));
-
-        assertEquals(str.substring(15),
-                query.singleResult(name.substring(15)));
-
-        assertEquals(str.substring(str.length()),
-                query.singleResult(name.substring(name.length())));
-
-        assertEquals(str.substring(str.length() - 11),
-                query.singleResult(name.substring(name.length().subtract(11))));
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Substring_From_Right() {
-        query().from(cat)
-            .where(cat.name.substring(-1, 1).eq(cat.name.substring(-2, 1)))
-            .list(cat);
-    }
-
-    @Test
-    @ExcludeIn({HSQLDB, DERBY})
-    public void Substring_From_Right2() {
-        query().from(cat)
-            .where(cat.name.substring(cat.name.length().subtract(1), cat.name.length())
-                    .eq(cat.name.substring(cat.name.length().subtract(2), cat.name.length().subtract(1))))
-            .list(cat);
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Subtract_BigDecimal() {
-        QSimpleTypes entity = new QSimpleTypes("entity1");
-        QSimpleTypes entity2 = new QSimpleTypes("entity2");
-        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
-        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
-
-        query().from(entity, entity2)
-               .where(bigd1.subtract(bigd2).loe(new BigDecimal("1.00")))
-               .list(entity);
-    }
-
-    @Test
-    @Ignore
-    public void Sum() throws RecognitionException, TokenStreamException {
-        // NOT SUPPORTED
-        query().from(cat).list(cat.kittens.size().sum());
-    }
-
-    @Test
-    @Ignore
-    public void Sum_2() throws RecognitionException, TokenStreamException {
-        // NOT SUPPORTED
-        query().from(cat).where(cat.kittens.size().sum().gt(0)).list(cat);
-    }
-
-    @Test
-    public void Sum_3() {
-        query().from(cat).uniqueResult(cat.bodyWeight.sum());
-    }
-
-    @Test
-    public void Sum_3_Projected() {
-        double val = query().from(cat).uniqueResult(cat.bodyWeight.sum());
-        DoubleProjection projection = query().from(cat)
-                .uniqueResult(new QDoubleProjection(cat.bodyWeight.sum()));
-        assertEquals(val, projection.val, 0.001);
-    }
-
-    @Test
-    public void Sum_4() {
-        Double dbl = query().from(cat).uniqueResult(cat.bodyWeight.sum().negate());
-        assertNotNull(dbl);
-    }
-
-    @Test
-    public void Sum_5() {
-        QShow show = QShow.show;
-        Long lng = query().from(show).uniqueResult(show.id.sum());
-        assertNotNull(lng);
-    }
-
-    @Test
-    public void Sum_of_Integer() {
-        QCat cat2 = new QCat("cat2");
-        query().from(cat)
-                .where(new JPASubQuery()
-                        .from(cat2).where(cat2.eq(cat.mate))
-                        .unique(cat2.breed.sum()).gt(0))
-                .list(cat);
-    }
-
-    @Test
-    public void Sum_of_Float() {
-        QCat cat2 = new QCat("cat2");
-        query().from(cat)
-                .where(new JPASubQuery()
-                        .from(cat2).where(cat2.eq(cat.mate))
-                        .unique(cat2.floatProperty.sum()).gt(0.0))
-                .list(cat);
-    }
-
-    @Test
-    public void Sum_of_Double() {
-        QCat cat2 = new QCat("cat2");
-        query().from(cat)
-                .where(new JPASubQuery()
-                        .from(cat2).where(cat2.eq(cat.mate))
-                        .unique(cat2.bodyWeight.sum()).gt(0.0))
-                .list(cat);
-    }
-
-    @Test
-    public void Sum_as_Float() {
-        float val = query().from(cat).uniqueResult(cat.floatProperty.sum());
-        assertTrue(val > 0);
-    }
-
-    @Test
-    public void Sum_as_Float_Projected() {
-        float val = query().from(cat).uniqueResult(cat.floatProperty.sum());
-        FloatProjection projection = query().from(cat)
-                .uniqueResult(new QFloatProjection(cat.floatProperty.sum()));
-        assertEquals(val, projection.val, 0.001);
-    }
-
-    @Test
-    public void Sum_as_Float2() {
-        float val = query().from(cat).uniqueResult(cat.floatProperty.sum().negate());
-        assertTrue(val < 0);
-    }
-
-    @Test
-    public void Sum_Coalesce() {
-        int val = query().from(cat).uniqueResult(cat.weight.sum().coalesce(0));
-        assertTrue(val == 0);
-    }
-
-    @Test
-    public void Sum_NoRows_Double() {
-        query().from(cat)
-            .where(cat.name.eq(UUID.randomUUID().toString()))
-            .uniqueResult(cat.bodyWeight.sum());
-    }
-
-    @Test
-    public void Sum_NoRows_Float() {
-        query().from(cat)
-            .where(cat.name.eq(UUID.randomUUID().toString()))
-            .uniqueResult(cat.floatProperty.sum());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void test() {
-        Cat kitten = savedCats.get(0);
-        Cat noKitten = savedCats.get(savedCats.size()-1);
-
-        ProjectionsFactory projections = new ProjectionsFactory(Module.JPA, getTarget()) {
-            @Override
-            public <A,Q extends SimpleExpression<A>> Collection<Expression<?>> list(ListPath<A,Q> expr,
-                    ListExpression<A,Q> other, A knownElement) {
-                // NOTE : expr.get(0) is only supported in the where clause
-                return Collections.<Expression<?>>singleton(expr.size());
-            }
-        };
-
-        final EntityPath<?>[] sources = new EntityPath[]{cat, otherCat};
-        final Predicate[] conditions = new Predicate[]{condition};
-        final Expression<?>[] projection = new Expression[]{cat.name, otherCat.name};
-
-        QueryExecution standardTest = new QueryExecution(
-                projections,
-                new FilterFactory(projections, Module.JPA, getTarget()),
-                new MatchingFiltersFactory(Module.JPA, getTarget())) {
-
-            @Override
-            protected Pair<Projectable, Expression<?>[]> createQuery() {
-                // NOTE : EclipseLink needs extra conditions cond1 and code2
-                return Pair.of(
-                        (Projectable)testQuery().from(sources).where(conditions),
-                        NO_EXPRESSIONS);
-            }
-
-            @Override
-            protected Pair<Projectable, Expression<?>[]> createQuery(Predicate filter) {
-                // NOTE : EclipseLink needs extra conditions cond1 and code2
-                return Pair.of(
-                        (Projectable)testQuery().from(sources).where(condition, filter),
-                        projection);
-            }
-        };
-
-        // standardTest.runArrayTests(cat.kittensArray, otherCat.kittensArray, kitten, noKitten);
-        standardTest.runBooleanTests(cat.name.isNull(), otherCat.kittens.isEmpty());
-        standardTest.runCollectionTests(cat.kittens, otherCat.kittens, kitten, noKitten);
-        standardTest.runDateTests(cat.dateField, otherCat.dateField, date);
-        standardTest.runDateTimeTests(cat.birthdate, otherCat.birthdate, birthDate);
-        standardTest.runListTests(cat.kittens, otherCat.kittens, kitten, noKitten);
-        // standardTest.mapTests(cat.kittensByName, otherCat.kittensByName, "Kitty", kitten);
-
-        // int
-        standardTest.runNumericCasts(cat.id, otherCat.id, 1);
-        standardTest.runNumericTests(cat.id, otherCat.id, 1);
-
-        // double
-        standardTest.runNumericCasts(cat.bodyWeight, otherCat.bodyWeight, 1.0);
-        standardTest.runNumericTests(cat.bodyWeight, otherCat.bodyWeight, 1.0);
-
-        standardTest.runStringTests(cat.name, otherCat.name, kitten.getName());
-        standardTest.runTimeTests(cat.timeField, otherCat.timeField, time);
-
-        standardTest.report();
-    }
-
-    @Test
-    public void TupleProjection() {
-        List<Tuple> tuples = query().from(cat).list(new QTuple(cat.name, cat));
-        assertFalse(tuples.isEmpty());
-        for (Tuple tuple : tuples) {
-            assertNotNull(tuple.get(cat.name));
-            assertNotNull(tuple.get(cat));
-        }
-    }
-
-    @Test
-    public void TupleProjection_As_SearchResults() {
-        SearchResults<Tuple> tuples = query().from(cat).limit(1)
-                .listResults(new QTuple(cat.name, cat));
-        assertEquals(1, tuples.getResults().size());
-        assertTrue(tuples.getTotal() > 0);
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Transform_GroupBy() {
-        QCat kitten = new QCat("kitten");
-        Map<Integer, Cat> result = query().from(cat).innerJoin(cat.kittens, kitten)
-            .transform(GroupBy.groupBy(cat.id)
-                    .as(Projections.constructor(Cat.class, cat.name, cat.id,
-                            GroupBy.list(Projections.constructor(Cat.class, kitten.name, kitten.id)))));
-
-        for (Cat entry : result.values()) {
-            assertEquals(1, entry.getKittens().size());
-        }
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Transform_GroupBy2() {
-        QCat kitten = new QCat("kitten");
-        Map<List<?>, Group> result = query().from(cat).innerJoin(cat.kittens, kitten)
-            .transform(GroupBy.groupBy(cat.id, kitten.id)
-                    .as(cat, kitten));
-
-        assertFalse(result.isEmpty());
-        for (Tuple row : query().from(cat).innerJoin(cat.kittens, kitten)
-                                .list(cat, kitten)) {
-            assertNotNull(result.get(Arrays.asList(row.get(cat).getId(), row.get(kitten).getId())));
-        }
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Transform_GroupBy_Alias() {
-        QCat kitten = new QCat("kitten");
-        SimplePath<Cat> k = new SimplePath<Cat>(Cat.class, "k");
-        Map<Integer, Group> result = query().from(cat).innerJoin(cat.kittens, kitten)
-            .transform(GroupBy.groupBy(cat.id)
-                    .as(cat.name, cat.id,
-                        GroupBy.list(Projections.constructor(Cat.class, kitten.name, kitten.id).as(k))));
-
-        for (Group entry : result.values()) {
-            assertNotNull(entry.getOne(cat.id));
-            assertNotNull(entry.getOne(cat.name));
-            assertFalse(entry.getList(k).isEmpty());
-        }
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Treat() {
-        QDomesticCat domesticCat = QDomesticCat.domesticCat;
-        query().from(cat)
-               .innerJoin(cat.mate, domesticCat._super)
-               .where(domesticCat.name.eq("Bobby"))
-               .count();
-    }
-
-    @Test
-    @Ignore
-    public void Type() {
-        assertEquals(Arrays.asList("C","C","C","C","C","C","A"),
-                query().from(animal).orderBy(animal.id.asc()).list(JPAExpressions.type(animal)));
-    }
-
-    @Test
-    @NoOpenJPA
-    public void Type_Order() {
-        assertEquals(Arrays.asList(10,1,2,3,4,5,6),
-                query().from(animal).orderBy(JPAExpressions.type(animal).asc(), animal.id.asc())
-                       .list(animal.id));
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/AbstractSQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/AbstractSQLTest.java
deleted file mode 100644
index d10181690b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/AbstractSQLTest.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.jpa.AbstractSQLQuery;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.Color;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Projections;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.testutil.ExcludeIn;
-
-public abstract class AbstractSQLTest {
-
-    protected static final SAnimal cat = new SAnimal("cat");
-
-    protected abstract AbstractSQLQuery<?> query();
-
-    public static class CatDTO {
-
-        Cat cat;
-
-        public CatDTO(Cat cat) {
-            this.cat = cat;
-        }
-
-    }
-
-    protected SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-    @Test
-    public void Count() {
-        assertEquals(6l, query().from(cat).where(cat.dtype.eq("C")).count());
-    }
-
-    @Test
-    public void Count_Via_Unique() {
-        assertEquals(Long.valueOf(6), query().from(cat).where(cat.dtype.eq("C"))
-                .uniqueResult(cat.id.count()));
-    }
-
-    @Test
-    public void CountDistinct() {
-        assertEquals(6l, query().from(cat).where(cat.dtype.eq("C")).distinct().count());
-    }
-
-    @Test
-    public void Enum_Binding() {
-        List<Cat> cats = query().from(cat)
-                .list(Projections.bean(Cat.class, QCat.cat.color));
-        assertFalse(cats.isEmpty());
-
-        for (Cat cat : cats) {
-            assertEquals(Color.BLACK, cat.getColor());
-        }
-    }
-
-    @Test
-    @Ignore
-    public void EntityProjections() {
-        List<Cat> cats = query().from(cat).orderBy(cat.name.asc())
-                .list(ConstructorExpression.create(Cat.class, cat.name, cat.id));
-        assertEquals(6, cats.size());
-        for (Cat c : cats) {
-            System.out.println(c.getName());
-        }
-    }
-
-    @Test
-    public void EntityQueries() {
-        QCat catEntity = QCat.cat;
-
-        List<Cat> cats = query().from(cat).orderBy(cat.name.asc()).list(catEntity);
-        assertEquals(6, cats.size());
-        for (Cat c : cats) {
-            System.out.println(c.getName());
-        }
-    }
-
-    @Test
-    public void EntityQueries2() {
-        SAnimal mate = new SAnimal("mate");
-        QCat catEntity = QCat.cat;
-
-        List<Cat> cats = query().from(cat)
-                .innerJoin(mate).on(cat.mateId.eq(mate.id))
-                .where(cat.dtype.eq("C"), mate.dtype.eq("C"))
-                .list(catEntity);
-        assertTrue(cats.isEmpty());
-    }
-
-    @Test
-    public void EntityQueries3() {
-        QCat catEntity = new QCat("animal_");
-        query().from(catEntity).list(catEntity.toes.max());
-    }
-
-    @Test
-    @NoBatooJPA
-    @NoEclipseLink
-    public void EntityQueries4() {
-        QCat catEntity = QCat.cat;
-        List<Tuple> cats = query().from(cat).list(catEntity, cat.name, cat.id);
-        assertEquals(6, cats.size());
-
-        for (Tuple tuple : cats) {
-            assertTrue(tuple.get(catEntity) instanceof Cat);
-            assertTrue(tuple.get(cat.name) instanceof String);
-            assertTrue(tuple.get(cat.id) instanceof Integer);
-        }
-    }
-
-    @Test
-    @NoBatooJPA
-    @NoEclipseLink
-    public void EntityQueries5() {
-        QCat catEntity = QCat.cat;
-        SAnimal otherCat = new SAnimal("otherCat");
-        QCat otherCatEntity = new QCat("otherCat");
-        List<Tuple> cats = query().from(cat, otherCat).list(catEntity, otherCatEntity);
-        assertEquals(36, cats.size());
-
-        for (Tuple tuple : cats) {
-            assertTrue(tuple.get(catEntity) instanceof Cat);
-            assertTrue(tuple.get(otherCatEntity) instanceof Cat);
-        }
-    }
-
-    @Test
-    @NoBatooJPA
-    @NoEclipseLink
-    public void EntityQueries6() {
-        QCat catEntity = QCat.cat;
-        List<CatDTO> results = query().from(cat).list(Projections.constructor(CatDTO.class, catEntity));
-        assertEquals(6, results.size());
-
-        for (CatDTO cat : results) {
-            assertTrue(cat.cat instanceof Cat);
-        }
-    }
-
-    @Test
-    public void In() {
-        assertEquals(6l, query().from(cat).where(cat.dtype.in("C", "CX")).count());
-    }
-
-    @Test
-    public void Limit_Offset() {
-        assertEquals(2, query().from(cat).limit(2).offset(2).list(cat.id, cat.name).size());
-    }
-
-    @Test
-    public void List() {
-        assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).list(cat.id).size());
-    }
-
-    @Test
-    public void List_Limit_And_Offset() {
-        assertEquals(3, query().from(cat).offset(3).limit(3).list(cat.id).size());
-    }
-
-    @Test
-    public void List_Limit_And_Offset2() {
-        List<Tuple> tuples = query().from(cat).offset(3).limit(3).list(cat.id, cat.name);
-        assertEquals(3, tuples.size());
-        assertEquals(2, tuples.get(0).size());
-    }
-
-    @Test
-    public void List_Multiple() {
-        print(query().from(cat).where(cat.dtype.eq("C")).list(cat.id, cat.name, cat.bodyWeight));
-    }
-
-    @Test
-    public void List_Non_Path() {
-        assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).list(
-                cat.birthdate.year(),
-                cat.birthdate.month(),
-                cat.birthdate.dayOfMonth()).size());
-    }
-
-    @Test
-    public void List_Results() {
-        SearchResults<String> results = query().from(cat).limit(3).orderBy(cat.name.asc())
-                .listResults(cat.name);
-        assertEquals(Arrays.asList("Beck","Bobby","Harold"), results.getResults());
-        assertEquals(6l, results.getTotal());
-    }
-
-    @Test
-    @ExcludeIn(Target.H2)
-    public void List_Wildcard() {
-        assertEquals(6l, query().from(cat).where(cat.dtype.eq("C")).list(Wildcard.all).size());
-    }
-
-    @Test
-    public void List_With_Count() {
-        print(query().from(cat).where(cat.dtype.eq("C")).groupBy(cat.name)
-                .list(cat.name, cat.id.count()));
-    }
-
-    @Test
-    public void List_With_Limit() {
-        assertEquals(3, query().from(cat).limit(3).list(cat.id).size());
-    }
-
-    @Test
-    @ExcludeIn({Target.H2, Target.MYSQL})
-    public void List_With_Offset() {
-        assertEquals(3, query().from(cat).offset(3).list(cat.id).size());
-    }
-
-    @Test
-    @ExcludeIn(Target.HSQLDB)
-    public void No_From() {
-        assertNotNull(query().singleResult(DateExpression.currentDate()));
-    }
-
-    @Test
-    public void Null_As_UniqueResult() {
-        assertNull(query().from(cat).where(cat.name.eq(UUID.randomUUID().toString()))
-                .uniqueResult(cat.name));
-    }
-
-    private void print(Iterable<Tuple> rows) {
-        for (Tuple row : rows) {
-            System.out.println(row);
-        }
-    }
-
-    @Test
-    public void Single_Result() {
-        query().from(cat).singleResult(cat.id);
-    }
-
-    @Test
-    public void Single_Result_Multiple() {
-        query().from(cat).singleResult(new Expression[]{cat.id});
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(cat).unique(cat.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(cat).unique(cat.id.min());
-        List<Integer> list = query().union(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union_All() {
-        SubQueryExpression<Integer> sq1 = sq().from(cat).unique(cat.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(cat).unique(cat.id.min());
-        List<Integer> list = query().unionAll(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @Test
-    @ExcludeIn({Target.DERBY, Target.POSTGRES})
-    public void Union2() {
-        List<Tuple> rows = query().union(
-            new SQLSubQuery().from(cat).where(cat.name.eq("Beck")).distinct().list(cat.name, cat.id),
-            new SQLSubQuery().from(cat).where(cat.name.eq("Kate")).distinct().list(cat.name, null))
-        .list();
-
-        assertEquals(2, rows.size());
-        for (Tuple row : rows) {
-            System.err.println(row);
-        }
-    }
-
-    @Test
-    @ExcludeIn(Target.DERBY)
-    public void Union3() {
-        SAnimal cat2 = new SAnimal("cat2");
-        List<Tuple> rows = query().union(
-            new SQLSubQuery().from(cat).innerJoin(cat2).on(cat2.id.eq(cat.id)).list(cat.id, cat2.id),
-            new SQLSubQuery().from(cat).list(cat.id, null))
-        .list();
-
-        assertEquals(12, rows.size());
-        int nulls = 0;
-        for (Tuple row : rows) {
-            System.err.println(Arrays.asList(row));
-            if (row.get(1, Object.class) == null) nulls++;
-        }
-        assertEquals(6, nulls);
-    }
-
-    @Test
-    @ExcludeIn({Target.DERBY, Target.POSTGRES})
-    public void Union4() {
-        query().union(cat,
-            new SQLSubQuery().from(cat).where(cat.name.eq("Beck")).distinct().list(cat.name, cat.id),
-            new SQLSubQuery().from(cat).where(cat.name.eq("Kate")).distinct().list(cat.name, null))
-        .list(cat.name, cat.id);
-    }
-
-    @Test
-    @ExcludeIn({Target.DERBY, Target.ORACLE})
-    public void Union5() {
-        SAnimal cat2 = new SAnimal("cat2");
-        List<Tuple> rows = query().union(
-            new SQLSubQuery().from(cat).join(cat2).on(cat2.id.eq(cat.id.add(1))).list(cat.id, cat2.id),
-            new SQLSubQuery().from(cat).join(cat2).on(cat2.id.eq(cat.id.add(1))).list(cat.id, cat2.id))
-        .list();
-
-        assertEquals(5, rows.size());
-        for (Tuple row : rows) {
-            int first = row.get(cat.id).intValue();
-            int second = row.get(cat2.id).intValue();
-            assertEquals(first + 1, second);
-        }
-    }
-
-    @Test
-    public void Unique_Result() {
-        query().from(cat).limit(1).uniqueResult(cat.id);
-    }
-
-    @Test
-    public void Unique_Result_Multiple() {
-        query().from(cat).limit(1).uniqueResult(new Expression[]{cat.id});
-    }
-
-    @Test
-    @ExcludeIn(Target.H2)
-    public void Wildcard() {
-        List<Tuple> rows = query().from(cat).list(cat.all());
-        assertEquals(6, rows.size());
-        print(rows);
-
-//        rows = query().from(cat).list(cat.id, cat.all());
-//        assertEquals(6, rows.size());
-//        print(rows);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/CustomFinder.java b/querydsl-jpa/src/test/java/com/mysema/query/CustomFinder.java
deleted file mode 100644
index 8a80bd7f0d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/CustomFinder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.path.ComparablePath;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.SimplePath;
-
-/**
- * @author tiwe
- *
- */
-public class CustomFinder {
-    
-    public static <T> List<T> findCustom(EntityManager em, Class<T> entityClass,Map<String,?> filters, String sort) {
-        EntityPath<T> entityPath = new EntityPathBase<T>(entityClass, "entity");
-        BooleanBuilder builder = new BooleanBuilder();
-        for (Map.Entry<String, ?> entry : filters.entrySet()) {
-            SimplePath<Object> property = new SimplePath<Object>(entry.getValue().getClass(), entityPath, entry.getKey()); 
-            builder.and(property.eq(entry.getValue()));
-        }
-        ComparablePath<?> sortProperty = new ComparablePath(Comparable.class, entityPath, sort);
-        return new JPAQuery(em).from(entityPath).where(builder.getValue()).orderBy(sortProperty.asc()).list(entityPath);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/DependenciesTest.java b/querydsl-jpa/src/test/java/com/mysema/query/DependenciesTest.java
deleted file mode 100644
index 6649fbaabc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/DependenciesTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-
-import jdepend.framework.JDepend;
-
-import org.junit.Test;
-
-public class DependenciesTest {
-    
-    @Test
-    public void test() throws IOException{
-        JDepend jdepend = new JDepend();        
-        jdepend.addDirectory("target/classes/com/mysema/query/jpa");
-        jdepend.addDirectory("target/classes/com/mysema/query/jpa/hibernate");
-        jdepend.addDirectory("target/classes/com/mysema/query/jpa/hibernate/sql");
-        jdepend.addDirectory("target/classes/com/mysema/query/jpa/impl");
-        jdepend.addDirectory("target/classes/com/mysema/query/jpa/sql");
-
-        jdepend.analyze();        
-        assertFalse(jdepend.containsCycles());
-
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/HibernateBase.java b/querydsl-jpa/src/test/java/com/mysema/query/HibernateBase.java
deleted file mode 100644
index 6ca8703d5f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/HibernateBase.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.hibernate.LockMode;
-import org.hibernate.Session;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.runner.RunWith;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.jpa.HQLTemplates;
-import com.mysema.query.jpa.JPQLTemplates;
-import com.mysema.query.jpa.ScrollableResultsIterator;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.hibernate.DefaultSessionHolder;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.testutil.HibernateTestRunner;
-
-/**
- * @author tiwe
- *
- */
-@RunWith(HibernateTestRunner.class)
-public class HibernateBase extends AbstractJPATest {
-
-    private static final QCat cat = QCat.cat;
-
-    @Rule
-    public static MethodRule jpaProviderRule = new JPAProviderRule();
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-
-    private Session session;
-
-    @Override
-    protected HibernateQuery query() {
-        return new HibernateQuery(session, getTemplates());
-    }
-
-    @Override
-    protected HibernateQuery testQuery() {
-        return new HibernateQuery(new DefaultSessionHolder(session),
-                getTemplates(), new DefaultQueryMetadata().noValidate());
-    }
-
-    protected JPQLTemplates getTemplates() {
-        return HQLTemplates.DEFAULT;
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-    @Override
-    protected void save(Object entity) {
-        session.save(entity);
-    }
-
-    @Test
-    public void QueryExposure() {
-//        save(new Cat());
-        List<Cat> results = query().from(cat).createQuery(cat).list();
-        assertNotNull(results);
-        assertFalse(results.isEmpty());
-    }
-
-    @Test
-    public void WithComment() {
-        query().from(cat).setComment("my comment").list(cat);
-    }
-
-    @Test
-    public void LockMode() {
-        query().from(cat).setLockMode(cat, LockMode.PESSIMISTIC_WRITE).list(cat);
-    }
-
-    @Test
-    public void FlushMode() {
-        query().from(cat).setFlushMode(org.hibernate.FlushMode.AUTO).list(cat);
-    }
-
-    @Test
-    public void Scroll() throws IOException{
-        CloseableIterator<Cat> cats = new ScrollableResultsIterator<Cat>(query().from(cat)
-                .createQuery(cat).scroll());
-        assertTrue(cats.hasNext());
-        while (cats.hasNext()) {
-            assertNotNull(cats.next());
-        }
-        cats.close();
-    }
-
-    @Test
-    public void ScrollArray() throws IOException{
-        CloseableIterator<Object[]> rows = new ScrollableResultsIterator<Object[]>(query()
-                .from(cat)
-                .createQuery(cat.name, cat.birthdate).scroll(), true);
-        assertTrue(rows.hasNext());
-        while (rows.hasNext()) {
-            Object[] row = rows.next();
-            assertEquals(2, row.length);
-            assertNotNull(row[0]);
-            assertNotNull(row[1]);
-        }
-        rows.close();
-    }
-
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java
deleted file mode 100644
index 44a672802e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.hibernate.Session;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.testutil.HibernateTestRunner;
-
-@Ignore
-@RunWith(HibernateTestRunner.class)
-public class HibernateQueryMutabilityTest{
-
-    private Session session;
-
-    protected HibernateQuery query() {
-        return new HibernateQuery(session);
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-    @Test
-    public void test() throws SecurityException, IllegalArgumentException,
-            NoSuchMethodException, IllegalAccessException,
-            InvocationTargetException, IOException {
-        QCat cat = QCat.cat;
-        HibernateQuery query = query().from(cat);
-        new QueryMutability(query).test(cat, cat.name);
-    }
-
-    @Test
-    public void Clone() {
-        QCat cat = QCat.cat;
-        HibernateQuery query = query().from(cat).where(cat.name.isNotNull());
-        HibernateQuery query2 = query.clone(session);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        query2.list(cat);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/HibernateSQLBase.java b/querydsl-jpa/src/test/java/com/mysema/query/HibernateSQLBase.java
deleted file mode 100644
index f218c54ccf..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/HibernateSQLBase.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.Color;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.HibernateTestRunner;
-
-@RunWith(HibernateTestRunner.class)
-public class HibernateSQLBase extends AbstractSQLTest {
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-
-    private final SQLTemplates templates = Mode.getSQLTemplates();
-
-    private final SAnimal cat = new SAnimal("cat");
-
-    private Session session;
-
-    @Override
-    protected HibernateSQLQuery query() {
-        return new HibernateSQLQuery(session, templates);
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-    @Before
-    public void setUp() {
-        if (query().from(cat).notExists()) {
-            session.save(new Cat("Beck", 1, Color.BLACK));
-            session.save(new Cat("Kate", 2, Color.BLACK));
-            session.save(new Cat("Kitty", 3, Color.BLACK));
-            session.save(new Cat("Bobby", 4, Color.BLACK));
-            session.save(new Cat("Harold", 5, Color.BLACK));
-            session.save(new Cat("Tim", 6, Color.BLACK));
-            session.flush();
-        }
-    }
-
-    @Test
-    public void EntityQueries_CreateQuery() {
-        SAnimal cat = new SAnimal("cat");
-        QCat catEntity = QCat.cat;
-
-        Query query = query().from(cat).createQuery(catEntity);
-        assertEquals(6, query.list().size());
-    }
-
-    @Test
-    @ExcludeIn(Target.MYSQL)
-    public void EntityQueries_CreateQuery2() {
-        SAnimal cat = new SAnimal("CAT");
-        QCat catEntity = QCat.cat;
-
-        Query query = query().from(cat).createQuery(catEntity);
-        assertEquals(6, query.list().size());
-    }
-
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/JPABase.java b/querydsl-jpa/src/test/java/com/mysema/query/JPABase.java
deleted file mode 100644
index 84786d2e8f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/JPABase.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.jpa.JPASubQuery;
-import com.mysema.query.jpa.domain.*;
-import com.mysema.query.jpa.impl.JPADeleteClause;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.JPATestRunner;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.runner.RunWith;
-
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import java.sql.Connection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-/**
- * @author tiwe
- *
- */
-@RunWith(JPATestRunner.class)
-public class JPABase extends AbstractJPATest {
-
-    private static final QCat cat = QCat.cat;
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-
-    @Rule
-    public static MethodRule jpaProviderRule = new JPAProviderRule();
-
-    private EntityManager entityManager;
-
-    @Override
-    protected JPAQuery query() {
-        return new JPAQuery(entityManager);
-    }
-
-    protected JPADeleteClause delete(EntityPath<?> path) {
-        return new JPADeleteClause(entityManager, path);
-    }
-
-    @Override
-    protected JPAQuery testQuery() {
-        return new JPAQuery(entityManager, new DefaultQueryMetadata().noValidate());
-    }
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-    @Override
-    protected void save(Object entity) {
-        entityManager.persist(entity);
-    }
-
-    @Test
-    @NoEclipseLink
-    @NoOpenJPA
-    @NoHibernate
-    public void Connection_Access() {
-        assertNotNull(query().from(cat).createQuery(cat).unwrap(Connection.class));
-    }
-
-    @Test
-    @Ignore
-    public void Delete() {
-        delete(cat).execute();
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Delete_Where() {
-        delete(cat).where(cat.name.eq("XXX")).execute();
-    }
-
-    @Test
-    @NoBatooJPA
-    @ExcludeIn(Target.MYSQL)
-    public void Delete_Where_SubQuery_Exists() {
-        QCat parent = cat;
-        QCat child = new QCat("kitten");
-
-        delete(child)
-            .where(child.id.eq(-100), new JPASubQuery()
-               .from(parent)
-               .where(parent.id.eq(-200),
-                      child.in(parent.kittens)).exists())
-            .execute();
-    }
-
-    @Test
-    @NoBatooJPA
-    public void Delete_Where_SubQuery2() {
-        QChild child = QChild.child;
-        QParent parent = QParent.parent;
-
-        JPASubQuery subQuery = new JPASubQuery()
-            .from(parent)
-            .where(parent.id.eq(2),
-                   child.parent.eq(parent));
-                   //child.in(parent.children));
-
-        delete(child)
-            .where(child.id.eq(1), subQuery.exists())
-            .execute();
-    }
-
-    @Test
-    public void Finder() {
-        Map<String,Object> conditions = new HashMap<String,Object>();
-        conditions.put("name", "Bob123");
-
-        List<Cat> cats = CustomFinder.findCustom(entityManager, Cat.class, conditions, "name");
-        assertEquals(1, cats.size());
-        assertEquals("Bob123", cats.get(0).getName());
-    }
-
-    @Test
-    public void FlushMode() {
-        assertFalse(query().from(cat).setFlushMode(FlushModeType.AUTO).list(cat).isEmpty());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA
-    public void Hint() {
-        javax.persistence.Query query = query().from(cat)
-                .setHint("org.hibernate.cacheable", true)
-                .createQuery(cat);
-
-        assertNotNull(query);
-        assertTrue(query.getHints().containsKey("org.hibernate.cacheable"));
-        assertFalse(query.getResultList().isEmpty());
-    }
-
-    @Test
-    public void Hint2() {
-        assertFalse(query().from(cat).setHint("org.hibernate.cacheable", true)
-                .list(cat).isEmpty());
-    }
-
-    @Test @Ignore
-    @NoHibernate @NoOpenJPA @NoBatooJPA
-    public void Hint3() {
-        javax.persistence.Query query = query().from(cat)
-                .setHint("eclipselink.batch.type", "IN")
-                .setHint("eclipselink.batch", "person.workAddress")
-                .setHint("eclipselink.batch", "person.homeAddress")
-                .createQuery(cat);
-
-        assertNotNull(query);
-        assertEquals("person.homeAddress", query.getHints().get("eclipselink.batch"));
-    }
-
-    @Test
-    @ExcludeIn(Target.DERBY)
-    public void Iterate() {
-        CloseableIterator<Cat> cats = query().from(cat).iterate(cat);
-        while (cats.hasNext()) {
-            Cat cat = cats.next();
-            assertNotNull(cat);
-        }
-        cats.close();
-    }
-
-    @Test
-    public void Limit1_UniqueResult() {
-        assertNotNull(query().from(cat).limit(1).uniqueResult(cat));
-    }
-
-    @Test
-    public void LockMode() {
-        javax.persistence.Query query = query().from(cat)
-                .setLockMode(LockModeType.PESSIMISTIC_READ).createQuery(cat);
-        assertTrue(query.getLockMode().equals(LockModeType.PESSIMISTIC_READ));
-        assertFalse(query.getResultList().isEmpty());
-    }
-
-    @Test
-    public void LockMode2() {
-        assertFalse(query().from(cat).setLockMode(LockModeType.PESSIMISTIC_READ)
-                .list(cat).isEmpty());
-    }
-
-    @Test
-    public void QueryExposure() {
-        //save(new Cat(20));
-        List<Cat> results = query().from(cat).createQuery(cat).getResultList();
-        assertNotNull(results);
-        assertFalse(results.isEmpty());
-    }
-
-    @Test
-    @Ignore // isn't a valid JPQL query
-    public void Subquery_UniqueResult() {
-        QCat cat2 = new QCat("cat2");
-
-        BooleanExpression exists = new JPASubQuery().from(cat2).where(cat2.eyecolor.isNotNull()).exists();
-        assertNotNull(query().from(cat)
-                .where(cat.breed.eq(0).not())
-                .singleResult(new QCatSummary(cat.breed.count(), exists)));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/JPAProviderRule.java b/querydsl-jpa/src/test/java/com/mysema/query/JPAProviderRule.java
deleted file mode 100644
index f38737b2a8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/JPAProviderRule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mysema.query;
-
-import java.lang.annotation.Annotation;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.testutil.EmptyStatement;
-
-/**
- * @author tiwe
- *
- */
-public class JPAProviderRule implements MethodRule {
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        boolean noEclipseLink = hasAnnotation(method, NoEclipseLink.class);
-        boolean noOpenJPA = hasAnnotation(method, NoOpenJPA.class);
-        boolean noBatooJPA = hasAnnotation(method, NoBatooJPA.class);
-        boolean noHibernate = hasAnnotation(method, NoHibernate.class);
-        String mode = Mode.mode.get();
-        if (mode == null) {
-            return base;
-        } else if (noEclipseLink && mode.contains("-eclipselink")) {
-            return EmptyStatement.DEFAULT;
-        } else if (noOpenJPA && mode.contains("-openjpa")) {
-            return EmptyStatement.DEFAULT;
-        } else if (noBatooJPA && mode.contains("-batoo")) {
-            return EmptyStatement.DEFAULT;
-        } else if (noHibernate && !mode.contains("-")) {
-            return EmptyStatement.DEFAULT;
-        } else {
-            return base;
-        }
-    }
-    
-    private <T extends Annotation> boolean hasAnnotation(FrameworkMethod method, Class<T> clazz) {
-        T rv = method.getMethod().getAnnotation(clazz);
-        if (rv == null) {
-            rv = method.getMethod().getDeclaringClass().getAnnotation(clazz);
-        }
-        return rv != null;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java
deleted file mode 100644
index cb29ada3c2..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import javax.persistence.EntityManager;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.testutil.JPATestRunner;
-
-@Ignore
-@RunWith(JPATestRunner.class)
-public class JPAQueryMutabilityTest {
-
-    private EntityManager entityManager;
-
-    protected JPAQuery query() {
-        return new JPAQuery(entityManager);
-    }
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-    @Test
-    public void test() {
-        QCat cat = QCat.cat;
-        JPAQuery query = query().from(cat);
-
-        query.count();
-        assertProjectionEmpty(query);
-        query.distinct().count();
-        assertProjectionEmpty(query);
-
-        query.iterate(cat);
-        assertProjectionEmpty(query);
-        query.iterate(cat,cat);
-        assertProjectionEmpty(query);
-        query.distinct().iterate(cat);
-        assertProjectionEmpty(query);
-        query.distinct().iterate(cat,cat);
-        assertProjectionEmpty(query);
-
-        query.list(cat);
-        assertProjectionEmpty(query);
-        query.list(cat,cat);
-        assertProjectionEmpty(query);
-        query.distinct().list(cat);
-        assertProjectionEmpty(query);
-        query.distinct().list(cat,cat);
-        assertProjectionEmpty(query);
-
-        query.listResults(cat);
-        assertProjectionEmpty(query);
-        query.distinct().listResults(cat);
-        assertProjectionEmpty(query);
-
-        query.map(cat.name, cat);
-        assertProjectionEmpty(query);
-    }
-
-    @Test
-    public void Clone() {
-        QCat cat = QCat.cat;
-        JPAQuery query = query().from(cat).where(cat.name.isNotNull());
-        JPAQuery query2 = query.clone(entityManager);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        query2.list(cat);
-    }
-
-    private void assertProjectionEmpty(JPAQuery query) {
-        assertTrue(query.getMetadata().getProjection().isEmpty());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/JPASQLBase.java b/querydsl-jpa/src/test/java/com/mysema/query/JPASQLBase.java
deleted file mode 100644
index 006a1f186b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/JPASQLBase.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.Color;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.jpa.sql.JPASQLQuery;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.JPATestRunner;
-
-@RunWith(JPATestRunner.class)
-public class JPASQLBase extends AbstractSQLTest {
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-
-    @Rule
-    public static MethodRule hibernateOnly = new JPAProviderRule();
-
-    private final SQLTemplates templates = Mode.getSQLTemplates();
-
-    private EntityManager entityManager;
-
-    @Override
-    protected JPASQLQuery query() {
-        return new JPASQLQuery(entityManager, templates);
-    }
-
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-    @Before
-    public void setUp() {
-        if (query().from(cat).notExists()) {
-            entityManager.persist(new Cat("Beck", 1, Color.BLACK));
-            entityManager.persist(new Cat("Kate", 2, Color.BLACK));
-            entityManager.persist(new Cat("Kitty", 3, Color.BLACK));
-            entityManager.persist(new Cat("Bobby", 4, Color.BLACK));
-            entityManager.persist(new Cat("Harold", 5, Color.BLACK));
-            entityManager.persist(new Cat("Tim", 6, Color.BLACK));
-            entityManager.flush();
-        }
-    }
-
-    @Test
-    public void EntityQueries_CreateQuery() {
-        SAnimal cat = new SAnimal("cat");
-        QCat catEntity = QCat.cat;
-
-        Query query = query().from(cat).createQuery(catEntity);
-        assertEquals(6, query.getResultList().size());
-    }
-
-    @Test
-    @ExcludeIn(Target.MYSQL)
-    public void EntityQueries_CreateQuery2() {
-        SAnimal cat = new SAnimal("CAT");
-        QCat catEntity = QCat.cat;
-
-        Query query = query().from(cat).createQuery(catEntity);
-        assertEquals(6, query.getResultList().size());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/Mode.java b/querydsl-jpa/src/test/java/com/mysema/query/Mode.java
deleted file mode 100644
index c1d8ace308..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/Mode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.sql.CUBRIDTemplates;
-import com.mysema.query.sql.DerbyTemplates;
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.HSQLDBTemplates;
-import com.mysema.query.sql.MySQLTemplates;
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.SQLServerTemplates;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.SQLiteTemplates;
-import com.mysema.query.sql.TeradataTemplates;
-
-/**
- * @author tiwe
- *
- */
-public final class Mode {
-
-    public static final ThreadLocal<String> mode = new ThreadLocal<String>();
-
-    public static final ThreadLocal<Target> target = new ThreadLocal<Target>();
-
-    public static SQLTemplates getSQLTemplates() {
-        switch (target.get()) {
-        case CUBRID:return new CUBRIDTemplates();
-        case DERBY: return new DerbyTemplates();
-        case H2:    return new H2Templates();
-        case HSQLDB:return new HSQLDBTemplates();
-        case SQLSERVER: return new SQLServerTemplates();
-        case MYSQL: return new MySQLTemplates();
-        case ORACLE:return new OracleTemplates();
-        case POSTGRES: return new PostgresTemplates();
-        case SQLITE:return new SQLiteTemplates();
-        case TERADATA: return new TeradataTemplates();
-        }
-        throw new IllegalStateException("Unknown mode " + mode);
-    }
-
-    private Mode() {}
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/NoBatooJPA.java b/querydsl-jpa/src/test/java/com/mysema/query/NoBatooJPA.java
deleted file mode 100644
index f6644dcf97..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/NoBatooJPA.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface NoBatooJPA {
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/NoEclipseLink.java b/querydsl-jpa/src/test/java/com/mysema/query/NoEclipseLink.java
deleted file mode 100644
index 6170d2f75d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/NoEclipseLink.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface NoEclipseLink {
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/NoHibernate.java b/querydsl-jpa/src/test/java/com/mysema/query/NoHibernate.java
deleted file mode 100644
index 065297157d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/NoHibernate.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface NoHibernate {
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/NoOpenJPA.java b/querydsl-jpa/src/test/java/com/mysema/query/NoOpenJPA.java
deleted file mode 100644
index 8909cc00ff..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/NoOpenJPA.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Inherited
-public @interface NoOpenJPA {
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java b/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java
deleted file mode 100644
index 2f09259ca1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.persistence.Entity;
-
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.query.apt.hibernate.HibernateAnnotationProcessor;
-import com.mysema.query.apt.jpa.JPAAnnotationProcessor;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.types.Expression;
-
-public class PackageVerification {
-    
-    @Test
-    public void Verify_Package() throws Exception{
-        String version = System.getProperty("version");
-        verify(new File("target/querydsl-jpa-"+version+"-apt-hibernate-one-jar.jar"), true);
-        verify(new File("target/querydsl-jpa-"+version+"-apt-one-jar.jar"), false);        
-    }
-
-    private void verify(File oneJar, boolean hibernateDeps) throws Exception {
-        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
-        // verify classLoader
-        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
-        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
-        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
-        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
-        oneJarClassLoader.loadClass(Entity.class.getName()); // jpa        
-        Class<?> processor;
-        if (hibernateDeps) {
-            oneJarClassLoader.loadClass(org.hibernate.annotations.Type.class.getName()); // hibernate
-            processor = HibernateAnnotationProcessor.class;
-        } else {
-            processor = JPAAnnotationProcessor.class;
-        }
-        Class cl = oneJarClassLoader.loadClass(processor.getName()); // querydsl-apt
-        cl.newInstance();
-        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
-        assertEquals(processor.getName(), Resources.toString(oneJarClassLoader.findResource(resourceKey), Charsets.UTF_8));
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/Projection.java b/querydsl-jpa/src/test/java/com/mysema/query/Projection.java
deleted file mode 100644
index f0dc71c675..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/Projection.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.jpa.domain.Cat;
-
-public class Projection {
-
-    public Projection(String str, Cat cat) {}
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/QProjection.java b/querydsl-jpa/src/test/java/com/mysema/query/QProjection.java
deleted file mode 100644
index 03e189628e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/QProjection.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.StringExpression;
-
-public class QProjection extends ConstructorExpression<Projection>{
-
-    private static final long serialVersionUID = -5866362075090550839L;
-
-    public QProjection(StringExpression str, QCat cat) {
-        super(Projection.class, 
-                new Class[]{String.class, Cat.class}, new Expression[]{str, cat});
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java b/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java
deleted file mode 100644
index c0df3b55db..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertNotNull;
-
-import javax.persistence.EntityManager;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.testutil.JPATestRunner;
-import com.mysema.testutil.Performance;
-
-@RunWith(JPATestRunner.class)
-@Ignore
-@Category(Performance.class)
-public class QueryPerformanceTest {
-
-    private static final int iterations = 1000;
-
-    private EntityManager entityManager;
-
-    @BeforeClass
-    public static void setUpClass() {
-        Mode.mode.set("h2perf");
-        Mode.target.set(Target.H2);
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-        Mode.mode.remove();
-        Mode.target.remove();
-    }
-
-    private JPAQuery query() {
-        return new JPAQuery(entityManager);
-    }
-
-    @Before
-    public void setUp() {
-        if (query().from(QCat.cat).notExists()) {
-            for (int i = 0; i < iterations; i++) {
-                entityManager.persist(new Cat(String.valueOf(i), i + 100));
-            }
-            entityManager.flush();
-        }
-    }
-
-    @Test
-    public void ById_Raw() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            Cat cat = (Cat)entityManager.createQuery("select cat from Cat cat where id = ?")
-                .setParameter(1, i + 100).getSingleResult();
-            assertNotNull(cat);
-        }
-        System.err.println("by id - raw" + (System.currentTimeMillis() - start));
-    }
-
-    @Test
-    public void ById_Qdsl() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            QCat cat = QCat.cat;
-            Cat c = query().from(cat).where(cat.id.eq(i+100)).uniqueResult(cat);
-            assertNotNull(c);
-        }
-        System.err.println("by id - dsl" + (System.currentTimeMillis() - start));
-    }
-
-    @Test
-    public void ById_TwoCols_Raw() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            Object[] row = (Object[])entityManager.createQuery(
-                    "select cat.id, cat.name from Cat cat where id = ?")
-                .setParameter(1, i + 100).getSingleResult();
-            assertNotNull(row);
-        }
-        System.err.println("by id - 2 cols - raw" + (System.currentTimeMillis() - start));
-    }
-
-    @Test
-    public void ById_TwoCols_Qdsl() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            QCat cat = QCat.cat;
-            Tuple row = query().from(cat).where(cat.id.eq(i+100)).uniqueResult(cat.id, cat.name);
-            assertNotNull(row);
-        }
-        System.err.println("by id - 2 cols - dsl" + (System.currentTimeMillis() - start));
-    }
-
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/SignatureTest.java b/querydsl-jpa/src/test/java/com/mysema/query/SignatureTest.java
deleted file mode 100644
index 13f793cf88..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/SignatureTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.JPQLQuery;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.query.jpa.impl.JPAQuery;
-
-public class SignatureTest {
-    
-    @Test
-    public void test() {
-        meet((JPAQuery)null);
-        meet((HibernateQuery)null);
-        meet((JPQLQuery)null);
-    }
-    
-    public static <T extends FilteredClause<? super T>> T meet(T query) {
-        return null;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/TargetRule.java b/querydsl-jpa/src/test/java/com/mysema/query/TargetRule.java
deleted file mode 100644
index 04db406969..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/TargetRule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mysema.query;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.testutil.EmptyStatement;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-
-/**
- * @author tiwe
- *
- */
-public class TargetRule implements MethodRule {
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object obj) {
-        //Target target = Connections.getTarget();
-        Target target = Mode.target.get();
-        boolean run = target == null || isExecuted(method.getMethod(), target);
-        return run ? base : EmptyStatement.DEFAULT;
-    }
-    
-    private boolean isExecuted(Method method, Target target) {
-        ExcludeIn ex = method.getAnnotation(ExcludeIn.class);
-        if (ex == null) {
-            ex = method.getDeclaringClass().getAnnotation(ExcludeIn.class);
-        }
-        // excluded in given targets
-        if (ex != null && Arrays.asList(ex.value()).contains(target)) {
-            return false;
-        }
-        // included only in given targets
-        IncludeIn in = method.getAnnotation(IncludeIn.class);
-        if (in == null) {
-            in = method.getDeclaringClass().getAnnotation(IncludeIn.class);
-        }
-        if (in != null && !Arrays.asList(in.value()).contains(target)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java
deleted file mode 100644
index e7d9a3bff5..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import com.mysema.query.types.Expression;
-
-public abstract class AbstractQueryTest implements Constants {
-
-    protected QueryHelper query() {
-        return new QueryHelper(HQLTemplates.DEFAULT);
-    }
-
-    protected JPASubQuery sub() {
-        return new JPASubQuery();
-    }
-
-    protected static void assertToString(String expected, Expression<?> expr) {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT, null);
-        assertEquals(expected, serializer.handle(expr).toString().replace("\n", " "));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AggregationTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/AggregationTest.java
deleted file mode 100644
index 8f4cf0d416..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AggregationTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-public class AggregationTest extends AbstractQueryTest{
-
-    @Test
-    public void Max() {
-        assertToString("max(cat.bodyWeight)", cat.bodyWeight.max());
-    }
-    
-    @Test
-    public void Min() {
-        assertToString("min(cat.bodyWeight)", cat.bodyWeight.min());
-    }
-    
-    @Test
-    public void Avg() {
-        assertToString("avg(cat.bodyWeight)", cat.bodyWeight.avg());
-    }
-    
-    @Test
-    public void Count() {
-        assertToString("count(cat)", cat.count());
-    }
-    
-    @Test
-    public void CountDistinct() {
-        assertToString("count(distinct cat)", cat.countDistinct());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Article.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/Article.java
deleted file mode 100644
index a67db8b0fe..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Article.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mysema.query.jpa;
-
-
-public class Article {
-
-    String name;
-
-    Content content;
-
-    Person author;
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java
deleted file mode 100644
index 7ba5ca6272..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.BooleanBuilder;
-
-public class BooleanOperationsTest extends AbstractQueryTest {
-
-    @Test
-    public void BooleanOperations_Or() {
-        assertToString("cust is null or cat is null", cust.isNull().or(cat.isNull()));
-    }
-    
-    @Test
-    public void BooleanOperations_And() {
-        assertToString("cust is null and cat is null", cust.isNull().and(cat.isNull()));
-    }
-    
-    
-    @Test
-    public void BooleanOperations_Not() {
-        assertToString("not (cust is null)", cust.isNull().not());
-    }
-    
-    
-    @Test
-    public void BooleanOperations2_And() {
-        cat.name.eq(cust.name.firstName).and(cat.bodyWeight.eq(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void BooleanOperations2_Or() {
-        cat.name.eq(cust.name.firstName).or(cat.bodyWeight.eq(kitten.bodyWeight));
-    }
-
-    @Test
-    public void LogicalOperations_Or() {
-        assertToString("cat = kitten or kitten = cat", cat.eq(kitten).or(kitten.eq(cat)));
-    }
-    
-    @Test
-    public void LogicalOperations_And() {
-        assertToString("cat = kitten and kitten = cat", cat.eq(kitten).and(kitten.eq(cat)));
-    }
-    
-    @Test
-    public void LogicalOperations_And2() {
-        assertToString("cat is null and (kitten is null or kitten.bodyWeight > ?1)",
-                cat.isNull().and(kitten.isNull().or(kitten.bodyWeight.gt(10))));
-    }
-
-    @Test
-    public void BooleanBuilder1() {
-        BooleanBuilder bb1 = new BooleanBuilder();
-        bb1.and(cat.eq(cat));
-
-        BooleanBuilder bb2 = new BooleanBuilder();
-        bb2.or(cat.eq(cat));
-        bb2.or(cat.eq(cat));
-
-        assertToString("cat = cat and (cat = cat or cat = cat)", bb1.and(bb2));
-    }
-
-    @Test
-    public void BooleanBuilder2() {
-        BooleanBuilder bb1 = new BooleanBuilder();
-        bb1.and(cat.eq(cat));
-
-        BooleanBuilder bb2 = new BooleanBuilder();
-        bb2.or(cat.eq(cat));
-        bb2.or(cat.eq(cat));
-
-        assertToString("cat = cat and (cat = cat or cat = cat)", bb1.and(bb2.getValue()));
-    }
-
-    @Test
-    public void BooleanBuilder_With_Null_In_Where() {
-        assertEquals("select cat\nfrom Cat cat", sub().from(cat).where(new BooleanBuilder()).toString());
-    }
-    
-    @Test
-    public void BooleanBuilder_With_Null_In_Having() {
-        assertEquals("select cat\nfrom Cat cat\ngroup by cat.name",
-                sub().from(cat).groupBy(cat.name).having(new BooleanBuilder()).toString());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CastTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/CastTest.java
deleted file mode 100644
index be5eaea864..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CastTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.NumberPath;
-
-public class CastTest extends AbstractQueryTest {
-
-    private static NumberExpression<Integer> expr = new NumberPath<Integer>(Integer.class,"int");
-
-    @Test
-    public void Byte() {
-        assertEquals(Byte.class, expr.byteValue().getType());
-    }
-    
-    @Test
-    public void Double() {
-        assertEquals(Double.class, expr.doubleValue().getType());
-    }
-    
-    @Test
-    public void Float() {
-        assertEquals(Float.class, expr.floatValue().getType());
-    }
-    
-    @Test
-    public void Integer() {
-        assertEquals(Integer.class, expr.intValue().getType());
-    }
-    
-    @Test
-    public void Long() {
-        assertEquals(Long.class, expr.longValue().getType());
-    }
-    
-    @Test
-    public void Short() {
-        assertEquals(Short.class, expr.shortValue().getType());
-    }
-
-    @Test
-    public void StringCast() {
-        assertEquals(String.class, expr.stringValue().getType());
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CollectionTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/CollectionTest.java
deleted file mode 100644
index 631cd4a20f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CollectionTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.Cat;
-
-public class CollectionTest extends AbstractQueryTest{
-
-    @Test
-    public void Constant_InElements_Set() {
-        assertToString("?1 in elements(cat.kittensSet)", cat.kittensSet.contains(new Cat()));
-    }
-    
-    @Test
-    public void Constant_InElements_List() {
-        assertToString("?1 in elements(cat.kittens)", cat.kittens.contains(new Cat()));
-    }
-
-    @Test
-    public void Path_InElements_List() {
-        assertToString("cat in elements(cat1.kittens)", cat.in(cat1.kittens));
-    }
-    
-    @Test
-    public void Path_InElements_Set() {
-        assertToString("cat in elements(cat1.kittensSet)", cat.in(cat1.kittensSet));
-    }
-
-    
-    @Test
-    public void CollectionOperations() {
-        // HQL functions that take collection-valued path expressions: size(),
-        // minelement(), maxelement(), minindex(), maxindex(), along with the
-        // special elements() and indices functions which may be quantified
-        // using some, all, exists, any, in.
-        cat.kittens.size();
-//        minelement(cat.kittens);
-//        maxelement(cat.kittens);
-//        minindex(cat.kittens);
-//        maxindex(cat.kittens);
-        assertToString("cat.kittens[0]", cat.kittens(0));
-        assertToString("cat.kittens[0]", cat.kittens.get(0));
-
-        // some, all, exists, any, in.
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ComparableTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ComparableTest.java
deleted file mode 100644
index 6ab399d59b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ComparableTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-public class ComparableTest extends AbstractQueryTest{
-
-    @Test
-    public void Eq() {
-        assertToString("cat.bodyWeight = kitten.bodyWeight",  cat.bodyWeight.eq(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void Goe() {
-        assertToString("cat.bodyWeight >= kitten.bodyWeight", cat.bodyWeight.goe(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void Gt() {
-        assertToString("cat.bodyWeight > kitten.bodyWeight",  cat.bodyWeight.gt(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void Loe() {
-        assertToString("cat.bodyWeight <= kitten.bodyWeight", cat.bodyWeight.loe(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void Lt() {
-        assertToString("cat.bodyWeight < kitten.bodyWeight",  cat.bodyWeight.lt(kitten.bodyWeight));
-    }
-    
-    @Test
-    public void Ne() {
-        assertToString("cat.bodyWeight <> kitten.bodyWeight", cat.bodyWeight.ne(kitten.bodyWeight));
-    }
-
-
-
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Constants.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/Constants.java
deleted file mode 100644
index f4599a06df..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Constants.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.jpa.domain.QAccount;
-import com.mysema.query.jpa.domain.QAnimal;
-import com.mysema.query.jpa.domain.QAuditLog;
-import com.mysema.query.jpa.domain.QBar;
-import com.mysema.query.jpa.domain.QCalendar;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.QCatalog;
-import com.mysema.query.jpa.domain.QCompany;
-import com.mysema.query.jpa.domain.QCustomer;
-import com.mysema.query.jpa.domain.QDocument;
-import com.mysema.query.jpa.domain.QDomesticCat;
-import com.mysema.query.jpa.domain.QFoo;
-import com.mysema.query.jpa.domain.QFormula;
-import com.mysema.query.jpa.domain.QItem;
-import com.mysema.query.jpa.domain.QName;
-import com.mysema.query.jpa.domain.QNameList;
-import com.mysema.query.jpa.domain.QNamed;
-import com.mysema.query.jpa.domain.QOrder;
-import com.mysema.query.jpa.domain.QParameter;
-import com.mysema.query.jpa.domain.QPayment;
-import com.mysema.query.jpa.domain.QPerson;
-import com.mysema.query.jpa.domain.QPlayer;
-import com.mysema.query.jpa.domain.QPrice;
-import com.mysema.query.jpa.domain.QProduct;
-import com.mysema.query.jpa.domain.QShow;
-import com.mysema.query.jpa.domain.QStatus;
-import com.mysema.query.jpa.domain.QStatusChange;
-import com.mysema.query.jpa.domain.QStore;
-import com.mysema.query.jpa.domain.QUser;
-
-public interface Constants {
-
-    QAccount account = new QAccount("account");
-
-    QAnimal an = new QAnimal("an");
-
-    QBar bar = new QBar("bar");
-
-    QCalendar calendar = new QCalendar("calendar");
-
-    // QCat
-    QCat cat = new QCat("cat");
-
-    QCat cat1 = new QCat("cat1");
-
-    QCat cat2 = new QCat("cat2");
-
-    QCat cat3 = new QCat("cat3");
-
-    QCat cat4 = new QCat("cat4");
-
-    QCat cat5 = new QCat("cat5");
-
-    // QCatalog
-    QCatalog catalog = new QCatalog("catalog");
-
-    QCat child = new QCat("child");
-    // QCompany
-    QCompany company = new QCompany("company");
-
-    QCompany company1 = new QCompany("company1");
-
-    QCompany company2 = new QCompany("company2");
-
-    QCompany company3 = new QCompany("company3");
-
-    QCompany company4 = new QCompany("company4");
-
-    QCompany company5 = new QCompany("company5");
-
-    // Customer
-    QCustomer cust = new QCustomer("cust");
-
-//    Qdoofus d = new Qdoofus("d");
-
-    // QDocument
-    QDocument doc = new QDocument("doc");
-
-    // DomesticQCat
-    QDomesticCat domesticCat = new QDomesticCat("domesticCat");
-
-    QCat fatcat = new QCat("fatcat");
-
-    QFoo foo = new QFoo("foo");
-
-    QFormula form = new QFormula("form");
-    // QItem
-    QItem item = new QItem("item");
-
-    QCat kit = new QCat("kit");
-
-    QCat kitten = new QCat("kitten");
-
-    QCat kitten2 = new QCat("kitten2");
-
-    QCat kittens = new QCat("kittens");
-
-    QNameList list = new QNameList("list");
-
-    // AuditLog
-    QAuditLog log = new QAuditLog("log");
-
-    QNamed m = new QNamed("m");
-
-    QCat mate = new QCat("mate");
-
-    QCat mother = new QCat("mother");
-
-    QNamed n = new QNamed("n");
-
-    QName name = new QName("name");
-
-    QCat offspr = new QCat("offspr");
-
-    QOrder ord = new QOrder("ord");
-    // Order
-    QOrder order = new QOrder("order");
-
-    QPerson p = new QPerson("p");
-
-    QParameter param = new QParameter("param");
-
-    // Payment
-    QPayment payment = new QPayment("payment");
-
-    QPerson person = new QPerson("person");
-
-    QPlayer player = new QPlayer("player");
-
-    // Price
-    QPrice price = new QPrice("price");
-
-    QProduct prod = new QProduct("prod");
-
-    // Product
-    QProduct product = new QProduct("product");
-
-    QCat qat = new QCat("qat");
-
-    QCat rival = new QCat("rival");
-
-    QShow show = new QShow("show");
-
-    QStatus status = new QStatus("status");
-
-    QStatusChange statusChange = new QStatusChange("statusChange");
-
-    QStore store = new QStore("store");
-
-    // User
-    QUser user = new QUser("user");
-
-    QUser user1 = new QUser("user1");
-
-    QUser user2 = new QUser("user2");
-
-    QUser user3 = new QUser("user3");
-
-    QUser user4 = new QUser("user4");
-
-    QUser user5 = new QUser("user5");
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ConstructorsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ConstructorsTest.java
deleted file mode 100644
index 71f09c6268..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ConstructorsTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-
-public class ConstructorsTest extends AbstractQueryTest{
-
-    public static final class BookmarkDTO {
-
-    }
-
-    public static final class _BookmarkDTO extends ConstructorExpression<BookmarkDTO> {
-
-        private static final long serialVersionUID = 2664671413344744578L;
-
-        public _BookmarkDTO(Expression<java.lang.String> address) {
-            super(BookmarkDTO.class, new Class[] { String.class }, address);
-        }
-    }
-
-    @Test
-    @Ignore
-    public void Constructors() {
-        ConstructorExpression<com.mysema.query.jpa.domain.Cat> c =
-                new ConstructorExpression<com.mysema.query.jpa.domain.Cat>(
-                com.mysema.query.jpa.domain.Cat.class,
-                new Class[]{String.class},
-                cat.name);
-        assertToString("new " + com.mysema.query.jpa.domain.Cat.class.getName()+ "(cat.name)", c);
-        assertToString("new " + getClass().getName() + "$BookmarkDTO(cat.name)",new _BookmarkDTO(cat.name));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Content.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/Content.java
deleted file mode 100644
index b1d7fb9af2..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Content.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa;
-
-
-public class Content {
-
-    Article article;
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java
deleted file mode 100644
index e8d05d2567..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.template.StringTemplate;
-
-public class CustomExpressionsTest extends AbstractQueryTest{
-
-    public static class MyCustomExpr extends StringTemplate {
-
-        private static final long serialVersionUID = 1L;
-
-        public MyCustomExpr(Expression<?>... args) {
-            super(TemplateFactory.DEFAULT.create("myCustom({0},{1})"), ImmutableList.copyOf(args));
-        }
-    }
-
-    @Test
-    public void CustomExpressions() {
-        assertToString("myCustom(cust,cat)", new MyCustomExpr(cust, cat));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/DateTimeTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/DateTimeTest.java
deleted file mode 100644
index 0746605968..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/DateTimeTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.Date;
-
-import org.junit.Test;
-
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.TimeExpression;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-
-public class DateTimeTest extends AbstractQueryTest {
-
-    @Test
-    public void CurrentDate() {
-        assertToString("current_date", DateExpression.currentDate());
-    }
-    
-    @Test
-    public void CurrentDate2() {
-        assertToString("current_date", DateTimeExpression.currentDate());
-    }
-    
-    @Test
-    public void CurrentTime() {
-        assertToString("current_time", TimeExpression.currentTime());   
-    }
-    
-    @Test
-    public void CurrentTimestamp() {
-        assertToString("current_timestamp", DateTimeExpression.currentTimestamp());
-    }
-    
-    @Test
-    public void DayOfMonth() {
-        assertToString("day(date)", new DatePath<Date>(Date.class, "date").dayOfMonth());
-    }
-    
-    @Test
-    public void DayOfMonth2() {
-        assertToString("day(date)", new DateTimePath<Date>(Date.class, "date").dayOfMonth());
-    }
-    
-    @Test
-    public void DateOperations2() {
-//        catalog.effectiveDate.second();
-//        catalog.effectiveDate.minute();
-//        catalog.effectiveDate.hour();
-        catalog.effectiveDate.dayOfMonth();
-        catalog.effectiveDate.month();
-        catalog.effectiveDate.year();
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/DummySessionHolder.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/DummySessionHolder.java
deleted file mode 100644
index e743a80edc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/DummySessionHolder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-
-import com.mysema.query.jpa.hibernate.SessionHolder;
-
-public class DummySessionHolder implements SessionHolder{
-
-    @Override
-    public Query createQuery(String queryString) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public SQLQuery createSQLQuery(String queryString) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/EJBQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/EJBQLTest.java
deleted file mode 100644
index e51dd03980..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/EJBQLTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-public class EJBQLTest extends AbstractQueryTest{
-
-    // Any function or operator defined by EJB-QL 3.0: substring(), trim(),
-    // lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(),
-    // mod()
-    // substring(),
-    // trim(),
-    // lower(),
-    // upper(),
-    // length(),
-    // locate(),
-    // abs(),
-    // sqrt(),
-    // bit_length(),
-    // mod()
-    
-    @Test
-    public void Trim() {
-        assertToString("trim(cat.name)", cat.name.trim());   
-    }
-    
-    @Test
-    public void Lower() {
-        assertToString("lower(cat.name)", cat.name.lower());    
-    }
-    
-    @Test
-    public void Upper() {
-        assertToString("upper(cat.name)", cat.name.upper());   
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ExpressionSerializationTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ExpressionSerializationTest.java
deleted file mode 100644
index e0abe5364b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ExpressionSerializationTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.query.types.Expression;
-
-public class ExpressionSerializationTest {
-
-    private <T> T serialize(T obj) throws ClassNotFoundException, IOException {
-        // serialize
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(baos);
-        out.writeObject(obj);
-        out.close();
-
-        // deserialize
-        ByteArrayInputStream bain = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bain);
-        T obj2 = (T) in.readObject();
-        in.close();
-        return obj2;
-    }
-
-    @Test
-    public void Serialize() throws Exception {
-        //QAdress.adress.name.eq("test"
-        Expression<?> expr = QCat.cat.name.eq("test");
-        Expression<?> expr2 = serialize(expr);
-
-        assertEquals(expr, expr2);
-        assertEquals(expr.hashCode(), expr2.hashCode());
-    }
-
-    @Test
-    public void Query() throws ClassNotFoundException, IOException {
-        JPAQuery query = new JPAQuery();
-        query.from(QCat.cat);
-        query.where(serialize(QCat.cat.name.eq("test")));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryFactoryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryFactoryTest.java
deleted file mode 100644
index b1305459c5..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryFactoryTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertNotNull;
-
-import javax.inject.Provider;
-
-import org.easymock.EasyMock;
-import org.hibernate.Session;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QAnimal;
-import com.mysema.query.jpa.hibernate.HibernateQueryFactory;
-
-public class HibernateQueryFactoryTest {
-
-    private HibernateQueryFactory queryFactory;
-
-    @Before
-    public void setUp() {
-        Provider<Session> provider = new Provider<Session>() {
-            @Override
-            public Session get() {
-                return EasyMock.createNiceMock(Session.class);
-            }
-        };
-        queryFactory = new HibernateQueryFactory(JPQLTemplates.DEFAULT, provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QAnimal.animal));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QAnimal.animal));
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QAnimal.animal));
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryTest.java
deleted file mode 100644
index 76fdbed5b5..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateQueryTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.QEmployee;
-import com.mysema.query.jpa.domain.QUser;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class HibernateQueryTest {
-
-    @Test
-    public void Clone() {
-        QCat cat = QCat.cat;
-        BooleanBuilder emptyBooleanBuilder = new BooleanBuilder();
-        HibernateQuery hq = new HibernateQuery().from(cat).where(cat.name.isNull().and(emptyBooleanBuilder));
-
-        HibernateQuery hq2 = hq.clone();
-        assertNotNull(hq2);
-    }
-
-    @Test
-    public void InnerJoin() {
-        HibernateQuery hqlQuery = new HibernateQuery();
-        QEmployee employee = QEmployee.employee;
-        hqlQuery.from(employee);
-        hqlQuery.innerJoin(employee.user, QUser.user);
-        assertEquals("select employee\nfrom Employee employee\n  inner join employee.user as user", hqlQuery.toString());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/IntegrationBase.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/IntegrationBase.java
deleted file mode 100644
index 32f080fb2a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/IntegrationBase.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.hibernate.HibernateDeleteClause;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.query.jpa.hibernate.HibernateUpdateClause;
-import com.mysema.query.jpa.hibernate.HibernateUtil;
-import com.mysema.query.types.EntityPath;
-import com.mysema.testutil.HibernateTestRunner;
-import org.hibernate.Query;
-import org.hibernate.ScrollMode;
-import org.hibernate.ScrollableResults;
-import org.hibernate.Session;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(HibernateTestRunner.class)
-public class IntegrationBase extends ParsingTest {
-
-    private Session session;
-
-    @Override
-    protected QueryHelper query() {
-        return new QueryHelper(HQLTemplates.DEFAULT) {
-            @Override
-            public void parse() throws RecognitionException, TokenStreamException {
-                try {
-                    System.out.println("query : " + toString().replace('\n', ' '));
-                    JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-                    serializer.serialize(getMetadata(), false, null);
-                    Query query = session.createQuery(serializer.toString());
-                    HibernateUtil.setConstants(query, serializer.getConstantToLabel(), getMetadata().getParams());
-                    query.list();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw new RuntimeException(e);
-                } finally {
-                    System.out.println();
-                }
-            }
-        };
-    }
-
-    @Override
-    @Test
-    public void GroupBy() throws Exception {
-        // NOTE : commented out, because HQLSDB doesn't support these queries
-    }
-    
-    @Override
-    @Test
-    public void GroupBy_2() throws Exception {
-        // NOTE : commented out, because HQLSDB doesn't support these queries
-    }
-
-    @Override
-    @Test
-    public void OrderBy() throws Exception {
-        // NOTE : commented out, because HQLSDB doesn't support these queries
-    }
-
-    @Override
-    @Test
-    public void DocoExamples910() throws Exception {
-        // NOTE : commented out, because HQLSDB doesn't support these queries
-    }
-
-    private HibernateDeleteClause delete(EntityPath<?> entity) {
-        return new HibernateDeleteClause(session, entity);
-    }
-
-    private HibernateUpdateClause update(EntityPath<?> entity) {
-        return new HibernateUpdateClause(session, entity);
-    }
-
-    @Test
-    public void Scroll() {
-        session.save(new Cat("Bob",10));
-        session.save(new Cat("Steve",11));
-
-        QCat cat = QCat.cat;
-        HibernateQuery query = new HibernateQuery(session);
-        ScrollableResults results = query.from(cat).scroll(ScrollMode.SCROLL_INSENSITIVE, cat);
-        while (results.next()) {
-            System.out.println(results.get(0));
-        }
-        results.close();
-    }
-
-    @Test
-    public void Update() {
-        session.save(new Cat("Bob",10));
-        session.save(new Cat("Steve",11));
-
-        QCat cat = QCat.cat;
-        long amount = update(cat).where(cat.name.eq("Bob"))
-            .set(cat.name, "Bobby")
-            .set(cat.alive, false)
-            .execute();
-        assertEquals(1, amount);
-
-        assertEquals(0l, query().from(cat).where(cat.name.eq("Bob")).count());
-    }
-
-    @Test
-    public void Update_with_null() {
-        session.save(new Cat("Bob",10));
-        session.save(new Cat("Steve",11));
-
-        QCat cat = QCat.cat;
-        long amount = update(cat).where(cat.name.eq("Bob"))
-            .set(cat.name, (String)null)
-            .set(cat.alive, false)
-            .execute();
-        assertEquals(1, amount);
-    }
-
-    @Test
-    public void Delete() {
-        session.save(new Cat("Bob",10));
-        session.save(new Cat("Steve",11));
-
-        QCat cat = QCat.cat;
-        long amount = delete(cat).where(cat.name.eq("Bob"))
-            .execute();
-        assertEquals(1, amount);
-    }
-
-    @Test
-    public void Collection() throws Exception{
-        List<Cat> cats = Arrays.asList(new Cat("Bob",10), new Cat("Steve",11));
-        for (Cat cat : cats) {
-            session.save(cat);
-        }
-
-        query().from(cat)
-            .innerJoin(cat.kittens, kitten)
-            .where(kitten.in(cats))
-            .parse();
-
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPACollectionAnyVisitorTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPACollectionAnyVisitorTest.java
deleted file mode 100644
index d2d149db37..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPACollectionAnyVisitorTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.JobFunction;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.QDomesticCat;
-import com.mysema.query.jpa.domain.QEmployee;
-import com.mysema.query.support.Context;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-
-public class JPACollectionAnyVisitorTest {
-
-    private QCat cat = QCat.cat;
-
-    @Test
-    public void Path() {
-        assertMatches("cat_kittens.*", serialize(cat.kittens.any()));
-    }
-
-    @Test
-    public void Longer_Path() {
-        assertMatches("cat_kittens.*\\.name", serialize(cat.kittens.any().name));
-    }
-
-    @Test
-    public void Simple_BooleanOperation() {
-        Predicate predicate = cat.kittens.any().name.eq("Ruth123");
-        assertMatches("exists \\(select 1\n" +
-                "from Cat cat_kittens.*\n" +
-                "where cat_kittens.* in elements\\(cat\\.kittens\\) and cat_kittens.*\\.name = \\?1\\)", serialize(predicate));
-    }
-
-    @Test
-    public void Simple_BooleanOperation_ElementCollection() {
-        QEmployee employee = QEmployee.employee;
-        Predicate predicate = employee.jobFunctions.any().eq(JobFunction.CODER);
-        assertMatches("exists \\(select 1\n" +
-        	"from Employee employee.*\n" +
-        	"  inner join employee.*.jobFunctions as employee_jobFunctions.*\n" +
-        	"where employee.* = employee and employee_jobFunctions.* = \\?1\\)", serialize(predicate));
-    }
-
-    @Test
-    public void Simple_StringOperation() {
-        Predicate predicate = cat.kittens.any().name.substring(1).eq("uth123");
-        assertMatches("exists \\(select 1\n"+
-                "from Cat cat_kittens.*\n" +
-                "where cat_kittens.* in elements\\(cat.kittens\\) and substring\\(cat_kittens.*\\.name,2\\) = \\?1\\)", serialize(predicate));
-    }
-
-    @Test
-    public void And_Operation() {
-        Predicate predicate = cat.kittens.any().name.eq("Ruth123").and(cat.kittens.any().bodyWeight.gt(10.0));
-        assertMatches("exists \\(select 1\n"+
-                "from Cat cat_kittens.*\n" +
-                "where cat_kittens.* in elements\\(cat.kittens\\) and cat_kittens.*\\.name = \\?1\\) and exists \\(select 1\n" +
-                "from Cat cat_kittens.*\n" +
-                "where cat_kittens.* in elements\\(cat.kittens\\) and cat_kittens.*\\.bodyWeight > \\?2\\)", serialize(predicate));
-    }
-
-    @Test
-    public void Template() {
-        Expression<Boolean> templateExpr = TemplateExpressionImpl.create(Boolean.class, "{0} = {1}",
-                cat.kittens.any().name, ConstantImpl.create("Ruth123"));
-        assertMatches("exists \\(select 1\n" +
-                "from Cat cat_kittens.*\n" +
-                "where cat_kittens.* in elements\\(cat\\.kittens\\) and cat_kittens.*\\.name = \\?1\\)", serialize(templateExpr));
-    }
-
-    @Test
-    public void Cast() {
-//        JPAQuery query = new JPAQuery(em).from(QPerson.person);
-//        QDog anyDog = QPerson.person.animals.any().as(QDog.class);
-//        query.where(anyDog.gender.eq("M"));
-//        List<Person> foundOwners = query.list(QPerson.person);
-
-        QDomesticCat anyCat = QCat.cat.kittens.any().as(QDomesticCat.class);
-        Predicate predicate = anyCat.name.eq("X");
-
-        assertMatches("exists \\(select 1\n" +
-            "from DomesticCat cat_kittens.*\n" +
-            "where cat_kittens.* in elements\\(cat.kittens\\) and cat_kittens.*\\.name = \\?1\\)", serialize(predicate));
-    }
-
-    private String serialize(Expression<?> expression) {
-        Expression<?> transformed = expression.accept(JPACollectionAnyVisitor.DEFAULT, new Context());
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT, null);
-        serializer.handle(transformed);
-        return serializer.toString();
-    }
-
-    private static void assertMatches(String str1, String str2) {
-        assertTrue(str2, str2.matches(str1));
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAIntegrationBase.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAIntegrationBase.java
deleted file mode 100644
index be18c06d42..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAIntegrationBase.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import com.mysema.query.JPAProviderRule;
-import com.mysema.query.TargetRule;
-import com.mysema.query.jpa.impl.JPAProvider;
-import com.mysema.query.jpa.impl.JPAUtil;
-import com.mysema.testutil.JPATestRunner;
-import org.junit.Rule;
-import org.junit.rules.MethodRule;
-import org.junit.runner.RunWith;
-
-@RunWith(JPATestRunner.class)
-public class JPAIntegrationBase extends ParsingTest {
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-    
-    @Rule
-    public static MethodRule hibernateOnly = new JPAProviderRule();
-        
-    private EntityManager em;
-
-    private JPQLTemplates templates;
-    
-    @Override
-    protected QueryHelper query() {
-        return new QueryHelper(templates) {
-            @Override
-            public void parse() throws RecognitionException, TokenStreamException {
-                try {
-                    //System.out.println("query : " + toString().replace('\n', ' '));
-
-                    // create Query and execute it
-                    JPQLSerializer serializer = new JPQLSerializer(templates);
-                    serializer.serialize(getMetadata(), false, null);
-                    Query query = em.createQuery(serializer.toString());
-                    JPAUtil.setConstants(query, serializer.getConstantToLabel(), getMetadata().getParams());
-                    try {
-                        query.getResultList();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new RuntimeException(e);
-                    }
-                } finally {
-                    //System.out.println();
-                }
-            }
-        };
-    }
-
-    public void setEntityManager(EntityManager em) {
-        this.em = em;
-        this.templates = JPAProvider.getTemplates(em);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryFactoryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryFactoryTest.java
deleted file mode 100644
index eb3d7c7dd0..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryFactoryTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Date;
-import java.util.Map;
-
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.jpa.domain.QAnimal;
-import com.mysema.query.jpa.impl.JPAQueryFactory;
-
-public class JPAQueryFactoryTest {
-
-    private EntityManagerFactory factoryMock;
-
-    private EntityManager mock;
-
-    private JPAQueryFactory queryFactory;
-
-    private JPQLQueryFactory queryFactory2;
-
-    private JPAQueryFactory queryFactory3;
-
-    private Map<String, Object> properties = Maps.newHashMap();
-
-    @Before
-    public void setUp() {
-        factoryMock = EasyMock.createMock(EntityManagerFactory.class);
-        mock = EasyMock.createMock(EntityManager.class);
-        Provider<EntityManager> provider = new Provider<EntityManager>() {
-            @Override
-            public EntityManager get() {
-                return mock;
-            }
-        };
-        queryFactory = new JPAQueryFactory(JPQLTemplates.DEFAULT, provider);
-        queryFactory2 = queryFactory;
-
-        queryFactory3 = new JPAQueryFactory(provider);
-
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void Query2() {
-        queryFactory2.query().from(QAnimal.animal);
-    }
-
-    @Test
-    public void Query3() {
-        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
-        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
-        EasyMock.expect(mock.getDelegate()).andReturn(mock).atLeastOnce();
-        EasyMock.replay(mock, factoryMock);
-
-        queryFactory3.query().from(QAnimal.animal);
-
-        EasyMock.verify(mock, factoryMock);
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void SubQuery2() {
-        queryFactory2.subQuery().from(QAnimal.animal);
-    }
-
-    @Test
-    public void SubQuery3() {
-        queryFactory3.subQuery().from(QAnimal.animal);
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QAnimal.animal));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QAnimal.animal));
-    }
-
-    @Test
-    public void Delete2() {
-        queryFactory2.delete(QAnimal.animal)
-            .where(QAnimal.animal.bodyWeight.gt(0));
-    }
-
-    @Test
-    public void Delete3() {
-        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
-        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
-        EasyMock.expect(mock.getDelegate()).andReturn(mock).atLeastOnce();
-        EasyMock.replay(mock, factoryMock);
-
-        assertNotNull(queryFactory3.delete(QAnimal.animal));
-
-        EasyMock.verify(mock, factoryMock);
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QAnimal.animal));
-    }
-
-    @Test
-    public void Update2() {
-        queryFactory2.update(QAnimal.animal)
-            .set(QAnimal.animal.birthdate, new Date())
-            .where(QAnimal.animal.birthdate.isNull());
-    }
-
-    @Test
-    public void Update3() {
-        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
-        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
-        EasyMock.expect(mock.getDelegate()).andReturn(mock).atLeastOnce();
-        EasyMock.replay(mock, factoryMock);
-
-        assertNotNull(queryFactory3.update(QAnimal.animal));
-
-        EasyMock.verify(mock, factoryMock);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMixinTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMixinTest.java
deleted file mode 100644
index 91684b9501..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMixinTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.mysema.query.jpa;
-
-import java.util.Arrays;
-
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain4.QBookMark;
-import com.mysema.query.jpa.domain4.QBookVersion;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class JPAQueryMixinTest {
-
-    private JPAQueryMixin mixin = new JPAQueryMixin();
-
-    @Test
-    public void Where_Null() {
-        mixin.where((Predicate)null);
-    }
-
-    @Test
-    public void OrderBy() {
-        QCat cat = QCat.cat;
-        QCat cat_mate = new QCat("cat_mate");
-        mixin.from(cat);
-        mixin.orderBy(cat.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, cat),
-                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(cat_mate))),
-                md.getJoins());
-        assertEquals(Arrays.asList(cat_mate.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Where() {
-        QCat cat = QCat.cat;
-        mixin.from(cat);
-        mixin.where(cat.mate.name.isNotNull());
-        mixin.orderBy(cat.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, cat)), md.getJoins());
-        assertEquals(Arrays.asList(cat.mate.name.asc()), md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_GroupBy() {
-        QCat cat = QCat.cat;
-        mixin.from(cat);
-        mixin.groupBy(cat.mate.name);
-        mixin.orderBy(cat.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, cat)), md.getJoins());
-        assertEquals(Arrays.asList(cat.mate.name.asc()), md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Operation() {
-        QCat cat = QCat.cat;
-        QCat cat_mate = new QCat("cat_mate");
-        mixin.from(cat);
-        mixin.orderBy(cat.mate.name.lower().asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                        new JoinExpression(JoinType.DEFAULT, cat),
-                        new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(cat_mate))),
-                md.getJoins());
-        assertEquals(Arrays.asList(cat_mate.name.lower().asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Long() {
-        QCat cat = QCat.cat;
-        QCat catMate = new QCat(PathMetadataFactory.forProperty(cat, "mate"));
-        QCat cat_mate = new QCat("cat_mate");
-        QCat cat_mate_mate = new QCat("cat_mate_mate");
-        mixin.from(cat);
-        mixin.orderBy(cat.mate.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, cat),
-                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(cat_mate)),
-                new JoinExpression(JoinType.LEFTJOIN, cat_mate.mate.as(cat_mate_mate))),
-                md.getJoins());
-        assertEquals(Arrays.asList(cat_mate_mate.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Reuse() {
-        QCat cat = QCat.cat;
-        QCat mate = new QCat("mate");
-        mixin.from(cat);
-        mixin.leftJoin(cat.mate, mate);
-        mixin.orderBy(cat.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, cat),
-                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(mate))),
-                md.getJoins());
-        assertEquals(Arrays.asList(mate.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Long_Reuse() {
-        QCat cat = QCat.cat;
-        QCat mate = new QCat("mate");
-        QCat mate_mate = new QCat("mate_mate");
-        mixin.from(cat);
-        mixin.leftJoin(cat.mate, mate);
-        mixin.orderBy(cat.mate.mate.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, cat),
-                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(mate)),
-                new JoinExpression(JoinType.LEFTJOIN, mate.mate.as(mate_mate))),
-                md.getJoins());
-        assertEquals(Arrays.asList(mate_mate.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Any() {
-        QCat cat = QCat.cat;
-        QCat cat_kittens = new QCat("cat_kittens");
-        mixin.from(cat);
-        mixin.orderBy(cat.kittens.any().name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, cat),
-                new JoinExpression(JoinType.LEFTJOIN, cat.kittens.as(cat_kittens))),
-                md.getJoins());
-        assertEquals(Arrays.asList(cat_kittens.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Embeddable() {
-        QBookVersion bookVersion = QBookVersion.bookVersion;
-        mixin.from(bookVersion);
-        mixin.orderBy(bookVersion.definition.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, bookVersion)),
-                md.getJoins());
-        assertEquals(Arrays.asList(bookVersion.definition.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Embeddable2() {
-        QArticle article = QArticle.article;
-        QArticle article_content_article = new QArticle("article_content_article");
-        mixin.from(article);
-        mixin.orderBy(article.content.article.name.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(
-                new JoinExpression(JoinType.DEFAULT, article),
-                new JoinExpression(JoinType.LEFTJOIN, article.content.article.as(article_content_article))),
-                md.getJoins());
-        assertEquals(Arrays.asList(article_content_article.name.asc()),
-                md.getOrderBy());
-    }
-
-    @Test
-    public void OrderBy_Embeddable_Colllection() {
-        QBookVersion bookVersion = QBookVersion.bookVersion;
-        QBookMark bookMark = new QBookMark("bookVersion_definition_bookMarks");
-        mixin.from(bookVersion);
-        mixin.orderBy(bookVersion.definition.bookMarks.any().comment.asc());
-
-        QueryMetadata md = mixin.getMetadata();
-        assertEquals(Arrays.asList(new JoinExpression(JoinType.DEFAULT, bookVersion)),
-                md.getJoins());
-        assertEquals(Arrays.asList(new StringPath(bookVersion.definition.bookMarks, "comment").asc()),
-                md.getOrderBy());
-
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMutabilityTest.java
deleted file mode 100644
index 54bb4254c6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAQueryMutabilityTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.persistence.EntityManager;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.QueryMutability;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.jpa.sql.JPASQLQuery;
-import com.mysema.query.sql.DerbyTemplates;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.testutil.JPATestRunner;
-
-@Ignore
-@RunWith(JPATestRunner.class)
-public class JPAQueryMutabilityTest{
-
-    private static final SQLTemplates derbyTemplates = new DerbyTemplates();
-
-    private EntityManager entityManager;
-
-    protected JPASQLQuery query() {
-        return new JPASQLQuery(entityManager, derbyTemplates);
-    }
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-
-    @Test
-    public void test() throws SecurityException, IllegalArgumentException,
-            NoSuchMethodException, IllegalAccessException,
-            InvocationTargetException, IOException {
-        entityManager.persist(new Cat("Beck", 1));
-        entityManager.flush();
-
-        SAnimal cat = new SAnimal("cat");
-        JPASQLQuery query = query().from(cat);
-        new QueryMutability(query).test(cat.id, cat.name);
-    }
-
-    @Test
-    public void Clone() {
-        SAnimal cat = new SAnimal("cat");
-        JPASQLQuery query = query().from(cat).where(cat.name.isNotNull());
-        JPASQLQuery query2 = query.clone(entityManager);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        query2.list(cat.id);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPASubQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPASubQueryTest.java
deleted file mode 100644
index c14dc66bb1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPASubQueryTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QCat;
-
-public class JPASubQueryTest {
-
-    @Test
-    public void Multiple_Projections() {
-        QCat cat = QCat.cat;
-        JPASubQuery query = new JPASubQuery();
-        query.from(cat);
-        assertEquals(1, query.list(cat).getMetadata().getProjection().size());
-        assertEquals(1, query.list(cat).getMetadata().getProjection().size());
-    }
-
-    @Test
-    public void Via_Interface() {
-        QCat cat = QCat.cat;
-        JPQLSubQuery query = new JPASubQuery();
-        query.from(cat);
-        assertEquals(1, query.list(cat).getMetadata().getProjection().size());
-        assertEquals(1, query.list(cat).getMetadata().getProjection().size());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java
deleted file mode 100644
index fd54d3c5bc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLQueryTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-
-public class JPQLQueryTest {
-
-    private QCat cat = QCat.cat;
-    
-    private HibernateQuery query = new HibernateQuery();
-    
-    @Before
-    public void setUp() {
-        query.from(cat);
-    }
-    
-    @Test(expected=IllegalArgumentException.class)
-    public void InnerJoinPEntityOfPPEntityOfP() {
-        query.innerJoin(cat.mate, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void InnerJoinPathOfQextendsCollectionOfPPathOfP() {
-        query.innerJoin(cat.kittens, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void JoinPEntityOfPPEntityOfP() {
-        query.join(cat.mate, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void JoinPathOfQextendsCollectionOfPPathOfP() {
-        query.join(cat.kittens, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void LeftJoinPEntityOfPPEntityOfP() {
-        query.leftJoin(cat.mate, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void LeftJoinPathOfQextendsCollectionOfPPathOfP() {
-        query.leftJoin(cat.kittens, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void FullJoinPEntityOfPPEntityOfP() {
-        query.fullJoin(cat.mate, cat.mate);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void FullJoinPathOfQextendsCollectionOfPPathOfP() {
-        query.fullJoin(cat.kittens, cat.mate);
-    }
-
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java
deleted file mode 100644
index b2068f9d11..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLSerializerTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import java.util.Arrays;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.domain.QCat;
-import com.mysema.query.jpa.domain.Location;
-import com.mysema.query.jpa.domain.QDomesticCat;
-import com.mysema.query.jpa.domain.QEmployee;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class JPQLSerializerTest {
-
-    @Test
-    public void And_Or() {
-        //A.a.id.eq(theId).and(B.b.on.eq(false).or(B.b.id.eq(otherId)));
-        QCat cat = QCat.cat;
-        Predicate pred = cat.id.eq(1).and(cat.name.eq("Kitty").or(cat.name.eq("Boris")));
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        serializer.handle(pred);
-        assertEquals("cat.id = ?1 and (cat.name = ?2 or cat.name = ?3)", serializer.toString());
-        assertEquals("cat.id = 1 && (cat.name = Kitty || cat.name = Boris)", pred.toString());
-    }
-
-    @Test
-    public void Case() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(2)
-                .when(cat.toes.eq(3)).then(3)
-                .otherwise(4);
-        serializer.handle(expr);
-        assertEquals("case when (cat.toes = ?1) then ?1 when (cat.toes = ?2) then ?2 else ?3 end", serializer.toString());
-    }
-
-
-    @Test
-    public void Case2() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(cat.id.multiply(2))
-                .when(cat.toes.eq(3)).then(cat.id.multiply(3))
-                .otherwise(4);
-        serializer.handle(expr);
-        assertEquals("case when (cat.toes = ?1) then (cat.id * ?1) when (cat.toes = ?2) then (cat.id * ?2) else ?3 end", serializer.toString());
-    }
-
-    @Test
-    public void FromWithCustomEntityName() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        EntityPath<Location> entityPath = new EntityPathBase<Location>(Location.class, "entity");
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, entityPath);
-        serializer.serialize(md, false, null);
-        assertEquals("select entity\nfrom Location2 entity", serializer.toString());
-    }
-
-    @Test
-    public void Join_With() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addJoin(JoinType.INNERJOIN, cat.mate);
-        md.addJoinCondition(cat.mate.alive);
-        serializer.serialize(md, false, null);
-        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate with cat.mate.alive", serializer.toString());
-    }
-
-    @Test
-    public void NormalizeNumericArgs() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        NumberPath<Double> doublePath = new NumberPath<Double>(Double.class, "doublePath");
-        serializer.handle(doublePath.add(1));
-        serializer.handle(doublePath.between((float)1.0, 1l));
-        serializer.handle(doublePath.lt((byte)1));
-        for (Object constant : serializer.getConstantToLabel().keySet()) {
-            assertEquals(Double.class, constant.getClass());
-        }
-    }
-
-    @Test
-    public void Delete_Clause_Uses_DELETE_FROM() {
-        QEmployee employee = QEmployee.employee;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, employee);
-        md.addWhere(employee.lastName.isNull());
-        serializer.serializeForDelete(md);
-        assertEquals("delete from Employee employee\nwhere employee.lastName is null", serializer.toString());
-    }
-
-    @Test
-    public void Delete_With_SubQuery() {
-        QCat parent = QCat.cat;
-        QCat child = new QCat("kitten");
-
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, child);
-        md.addWhere(
-            child.id.eq(1)
-            .and(new JPASubQuery()
-                .from(parent)
-                .where(parent.id.eq(2), child.in(parent.kittens)).exists()));
-        serializer.serializeForDelete(md);
-        assertEquals("delete from Cat kitten\n" +
-                "where kitten.id = ?1 and exists (select 1\n" +
-        	"from Cat cat\nwhere cat.id = ?2 and kitten in elements(cat.kittens))", serializer.toString());
-    }
-
-    @Test
-    public void In() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        serializer.handle(new NumberPath<Integer>(Integer.class, "id").in(Arrays.asList(1, 2)));
-        assertEquals("id in (?1)", serializer.toString());
-    }
-
-    @Test
-    public void Not_In() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        serializer.handle(new NumberPath<Integer>(Integer.class, "id").notIn(Arrays.asList(1, 2)));
-        assertEquals("id not in (?1)", serializer.toString());
-    }
-
-    @Test
-    public void Like() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        serializer.handle(new StringPath("str").contains("abc!"));
-        assertEquals("str like ?1 escape '!'", serializer.toString());
-        assertEquals("%abc!!%", serializer.getConstantToLabel().keySet().iterator().next().toString());
-    }
-
-    @Test
-    public void StringContainsIc() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        serializer.handle(new StringPath("str").containsIgnoreCase("ABc!"));
-        assertEquals("lower(str) like ?1 escape '!'", serializer.toString());
-        assertEquals("%abc!!%", serializer.getConstantToLabel().keySet().iterator().next().toString());
-    }
-
-    @Test
-    public void Substring() {
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QCat cat = QCat.cat;
-        serializer.handle(cat.name.substring(cat.name.length().subtract(1), 1));
-        assertEquals("substring(cat.name,(length(cat.name) - ?1)+1,1-(length(cat.name) - ?1))", serializer.toString());
-    }
-
-    @Test
-    public void NullsFirst() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addOrderBy(cat.name.asc().nullsFirst());
-        serializer.serialize(md, false, null);
-        assertEquals("select cat\n" +
-        	     "from Cat cat\n" +
-        	     "order by cat.name asc nulls first", serializer.toString());
-    }
-
-    @Test
-    public void NullsLast() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addOrderBy(cat.name.asc().nullsLast());
-        serializer.serialize(md, false, null);
-        assertEquals("select cat\n" +
-                     "from Cat cat\n" +
-                     "order by cat.name asc nulls last", serializer.toString());
-    }
-
-    @Test
-    public void Treat() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addJoin(JoinType.JOIN, cat.mate.as((Path) QDomesticCat.domesticCat));
-        md.addProjection(QDomesticCat.domesticCat);
-        serializer.serialize(md, false, null);
-        assertEquals("select domesticCat\n" +
-                "from Cat cat\n" +
-                "  inner join treat(cat.mate as DomesticCat) as domesticCat", serializer.toString());
-    }
-
-    @Test
-    public void OpenJPA_Variables() {
-        QCat cat = QCat.cat;
-        JPQLSerializer serializer = new JPQLSerializer(OpenJPATemplates.DEFAULT);
-        QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addJoin(JoinType.INNERJOIN, cat.mate);
-        md.addJoinCondition(cat.mate.alive);
-        serializer.serialize(md, false, null);
-        assertEquals("select cat_\nfrom Cat cat_\n  inner join cat_.mate on cat_.mate.alive",
-                serializer.toString());
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLTemplatesTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLTemplatesTest.java
deleted file mode 100644
index c0cfb041a1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPQLTemplatesTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Templates;
-
-public class JPQLTemplatesTest {
-
-    @Test
-    public void Escape() {
-        List<Templates> templates = Arrays.<Templates>asList(
-            new JPQLTemplates(), new HQLTemplates(),
-            new EclipseLinkTemplates(), new OpenJPATemplates()
-        );
-        
-        for (Templates t : templates) {
-            assertEquals("{0} like {1} escape '!'", t.getTemplate(Ops.LIKE).toString());
-        }
-    }
-
-    
-    @Test
-    public void Custom_Escape() {
-        List<Templates> templates = Arrays.<Templates>asList(
-            new JPQLTemplates('X'), new HQLTemplates('X'),
-            new EclipseLinkTemplates('X'), new OpenJPATemplates('X')
-        );
-        
-        for (Templates t : templates) {
-            assertEquals("{0} like {1} escape 'X'", t.getTemplate(Ops.LIKE).toString());
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java
deleted file mode 100644
index f76ddcffe8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-
-public class JoinFlagsTest extends AbstractQueryTest{
-
-    @Test
-    public void FetchAll() {
-        QueryHelper query1 = query().from(cat).fetchAll().where(cat.name.isNotNull());
-        assertEquals("select cat\nfrom Cat cat fetch all properties\nwhere cat.name is not null", query1.toString());
-    }
-    
-    @Test
-    public void FetchAll2() {
-        QueryHelper query2 = query().from(cat).fetchAll().from(cat1).fetchAll();
-        assertEquals("select cat\nfrom Cat cat fetch all properties, Cat cat1 fetch all properties", query2.toString());
-    }
-
-    @Test
-    public void Fetch() {
-        QueryHelper query = query().from(cat).innerJoin(cat.mate, cat1).fetch();
-        assertEquals("select cat\nfrom Cat cat\n  inner join fetch cat.mate as cat1", query.toString());
-    }
-
-    @Test
-    public void RightJoin() {
-        QueryHelper query = query().from(cat).rightJoin(cat.mate, cat1);
-        assertEquals("select cat\nfrom Cat cat\n  right join cat.mate as cat1", query.toString());
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinTest.java
deleted file mode 100644
index 481edad017..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JoinTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static com.mysema.query.alias.Alias.$;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.alias.Alias;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.query.types.path.StringPath;
-
-public class JoinTest {
-
-    public interface Entity{
-
-        List<String> getNames();
-    }
-    
-    private final Entity alias = Alias.alias(Entity.class);
-
-    private final StringPath path = new StringPath("path");
-    private final JPASubQuery subQuery = new JPASubQuery();
-    private final HibernateQuery query = new HibernateQuery(new DummySessionHolder(), HQLTemplates.DEFAULT);
-
-    
-    @Test
-    public void SubQuery_FullJoin() {
-        subQuery.from($(alias));
-        subQuery.fullJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void SubQuery_InnerJoin() {
-        subQuery.from($(alias));
-        subQuery.innerJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void SubQuery_Join() {
-        subQuery.from($(alias));
-        subQuery.join($(alias.getNames()), path);
-        // TODO : assertions
-    }
-
-    @Test
-    public void SubQuery_LeftJoin() {
-        subQuery.from($(alias));
-        subQuery.leftJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void Query_FullJoin() {
-        query.from($(alias));
-        query.fullJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void Query_InnerJoin() {
-        query.from($(alias));
-        query.innerJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void Query_Join() {
-        query.from($(alias));
-        query.join($(alias.getNames()), path);
-        // TODO : assertions
-    }
-    
-    @Test
-    public void Query_LeftJoin() {
-        query.from($(alias));
-        query.leftJoin($(alias.getNames()), path);
-        // TODO : assertions
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/MapTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/MapTest.java
deleted file mode 100644
index 7259f5818b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/MapTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QShow;
-
-public class MapTest extends AbstractQueryTest {
-
-    private QShow show = QShow.show;
-    
-    @Test
-    public void Contains() {
-        assertToString("show.acts[?1] = ?2", show.acts.contains("x", "y"));
-    }
-    
-    @Test
-    public void Contains_Key() {
-        assertToString("?1 in indices(show.acts)", show.acts.containsKey("x"));
-    }
-    
-    @Test
-    public void Contains_Value() {
-        assertToString("?1 in elements(show.acts)", show.acts.containsValue("y"));
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/MathTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/MathTest.java
deleted file mode 100644
index 55665d1664..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/MathTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.types.path.NumberPath;
-
-public class MathTest extends AbstractQueryTest{
-
-    @Test
-    public void test() {
-        NumberPath<Double> path = QCat.cat.bodyWeight;
-        assertToString("(cat.bodyWeight - sum(cat.bodyWeight)) * cat.bodyWeight", path.subtract(path.sum()).multiply(path));
-    }
-
-    @Test
-    public void Add() {
-        assertToString("cat.bodyWeight + ?1", cat.bodyWeight.add(10));
-    }
-    
-    @Test
-    public void Subtract() {
-        assertToString("cat.bodyWeight - ?1", cat.bodyWeight.subtract(10));
-    }
-    
-    @Test
-    public void Multiply() {
-        assertToString("cat.bodyWeight * ?1", cat.bodyWeight.multiply(10));
-    }
-    
-    @Test
-    public void Divide() {
-        assertToString("cat.bodyWeight / ?1", cat.bodyWeight.divide(10));   
-    }
-        
-    @Test
-    public void Add_And_Compare() {
-        assertToString("cat.bodyWeight + ?1 < ?1", cat.bodyWeight.add(10.0).lt(10.0));
-    }
-    
-    @Test
-    public void Subtract_And_Compare() {
-        assertToString("cat.bodyWeight - ?1 < ?1", cat.bodyWeight.subtract(10.0).lt(10.0));    
-    }
-    
-    @Test
-    public void Multiply_And_Compare() {
-        assertToString("cat.bodyWeight * ?1 < ?1", cat.bodyWeight.multiply(10.0).lt(10.0));   
-    }
-    
-    @Test
-    public void Divide_And_Compare() {
-        assertToString("cat.bodyWeight / ?1 < ?2", cat.bodyWeight.divide(10.0).lt(20.0));
-    }
-    
-    @Test
-    public void Add_And_Multiply() {
-        assertToString("(cat.bodyWeight + ?1) * ?2", cat.bodyWeight.add(10).multiply(20));
-    }
-    
-    @Test
-    public void Subtract_And_Multiply() {
-        assertToString("(cat.bodyWeight - ?1) * ?2", cat.bodyWeight.subtract(10).multiply(20));
-    }
-    
-    
-    @Test
-    public void Multiply_And_Add() {
-        assertToString("cat.bodyWeight * ?1 + ?2", cat.bodyWeight.multiply(10).add(20));
-    }
-    
-    
-    @Test
-    public void Multiply_And_Subtract() {
-        assertToString("cat.bodyWeight * ?1 - ?2", cat.bodyWeight.multiply(10).subtract(20));
-    }
-    
-    
-    @Test
-    public void Arithmetic_And_Arithmetic2() {
-        QCat c1 = new QCat("c1");
-        QCat c2 = new QCat("c2");
-        QCat c3 = new QCat("c3");
-        assertToString("c1.id + c2.id * c3.id", c1.id.add(c2.id.multiply(c3.id)));
-        assertToString("c1.id * (c2.id + c3.id)", c1.id.multiply(c2.id.add(c3.id)));
-        assertToString("(c1.id + c2.id) * c3.id", c1.id.add(c2.id).multiply(c3.id));   
-    }
-    
-    @Test
-    public void MathematicalOperations() {
-        // mathematical operators +, -, *, /
-        cat.bodyWeight.add(kitten.bodyWeight);
-        cat.bodyWeight.subtract(kitten.bodyWeight);
-        cat.bodyWeight.multiply(kitten.bodyWeight);
-        cat.bodyWeight.divide(kitten.bodyWeight);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java
deleted file mode 100644
index 6978045932..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.MySQLTemplates;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-
-public class NativeSQLSerializerTest {
-
-    @Test
-    public void In() {
-        Configuration conf = new Configuration(new MySQLTemplates());
-        NativeSQLSerializer serializer = new NativeSQLSerializer(conf, true);
-        DefaultQueryMetadata md = new DefaultQueryMetadata();
-        SAnimal cat = SAnimal.animal_;
-        md.addJoin(JoinType.DEFAULT, cat);
-        md.addWhere(cat.name.in("X", "Y"));
-        md.addProjection(cat.id);
-        serializer.serialize(md, false);
-        assertEquals("select animal_.id\n" +
-        	"from animal_ animal_\n" +
-        	"where animal_.name in (?1, ?2)", serializer.toString());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelper.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelper.java
deleted file mode 100644
index 22fef2eabf..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa;
-
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.path.PathBuilder;
-
-public class OrderHelper {
-
-    private static final Pattern DOT = Pattern.compile("\\.");
-
-    public static PathBuilder<?> join(JPACommonQuery<?> query, PathBuilder<?> builder, Map<String, PathBuilder<?>> joins, String path) {
-        PathBuilder<?> rv = joins.get(path);
-        if (rv == null) {
-            if (path.contains(".")) {
-                String[] tokens = DOT.split(path);
-                String[] parent = new String[tokens.length - 1];
-                System.arraycopy(tokens, 0, parent, 0, tokens.length - 1);
-                String parentKey = StringUtils.join(parent, ".");
-                builder = join(query, builder, joins, parentKey);
-                rv = new PathBuilder(Object.class, StringUtils.join(tokens, "_"));
-                query.leftJoin((EntityPath)builder.get(tokens[tokens.length - 1]), rv);
-            } else {
-                rv = new PathBuilder(Object.class, path);
-                query.leftJoin((EntityPath)builder.get(path), rv);
-            }
-            joins.put(path, rv);
-        }
-        return rv;
-    }
-
-    public static void orderBy(JPACommonQuery<?> query, EntityPath<?> entity, List<String> order) {
-        PathBuilder<?> builder = new PathBuilder(entity.getType(), entity.getMetadata());
-        Map<String, PathBuilder<?>> joins = Maps.newHashMap();
-
-        for (String entry : order) {
-            String[] tokens = DOT.split(entry);
-            if (tokens.length > 1) {
-                String[] parent = new String[tokens.length - 1];
-                System.arraycopy(tokens, 0, parent, 0, tokens.length - 1);
-                PathBuilder<?> parentAlias = join(query, builder, joins, StringUtils.join(parent, "."));
-                query.orderBy(parentAlias.getString(tokens[tokens.length - 1]).asc());
-            } else {
-                query.orderBy(builder.getString(tokens[0]).asc());
-            }
-        }
-    }
-
-}
-
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelperTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelperTest.java
deleted file mode 100644
index 543a73648d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderHelperTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.types.path.PathBuilder;
-
-public class OrderHelperTest {
-
-    @Test
-    public void Order() {
-        PathBuilder<Object> entity = new PathBuilder<Object>(Object.class, "project");
-        List<String> order = Lists.newArrayList();
-        order.add("customer.name");
-        order.add("department.superior.name");
-        order.add("customer.company.name");
-        order.add("previousProject.customer.company.name");
-        order.add("department.name");
-
-        JPASubQuery query = new JPASubQuery();
-        query.from(entity);
-        OrderHelper.orderBy(query, entity, order);
-        assertEquals("select project\n" +
-        	"from Object project\n" +
-        	"  left join project.customer as customer\n" +
-        	"  left join project.department as department\n" +
-        	"  left join department.superior as department_superior\n" +
-        	"  left join customer.company as customer_company\n" +
-        	"  left join project.previousProject as previousProject\n" +
-        	"  left join previousProject.customer as previousProject_customer\n" +
-        	"  left join previousProject_customer.company as previousProject_customer_company\n" +
-        	"order by customer.name asc, department_superior.name asc, customer_company.name asc," +
-        	    " previousProject_customer_company.name asc, department.name asc",
-        	query.toString());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
deleted file mode 100644
index b473741f68..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static com.mysema.query.Target.DERBY;
-import static com.mysema.query.Target.H2;
-import static com.mysema.query.Target.HSQLDB;
-import static com.mysema.query.Target.MYSQL;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.Target.POSTGRES;
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-
-import com.mysema.query.NoBatooJPA;
-import com.mysema.query.NoEclipseLink;
-import com.mysema.query.NoOpenJPA;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.Catalog;
-import com.mysema.query.jpa.domain.Color;
-import com.mysema.query.jpa.domain.Customer;
-import com.mysema.query.jpa.domain.DomesticCat;
-import com.mysema.query.jpa.domain.Payment;
-import com.mysema.query.jpa.domain.Product;
-import com.mysema.query.jpa.domain.QFamily;
-import com.mysema.query.jpa.domain.QFooDTO;
-import com.mysema.query.jpa.domain.QItem;
-import com.mysema.query.jpa.domain.QProduct;
-import com.mysema.query.types.expr.ComparableExpression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.testutil.ExcludeIn;
-
-public class ParsingTest extends AbstractQueryTest {
-
-    @Test
-    @Ignore
-    public void ArrayExpr() throws Exception {
-        query().from(ord).where(ord.items(0).id.eq(1234l)).parse();
-    }
-
-    @Test
-    public void Basic() throws RecognitionException, TokenStreamException{
-        query().from(cat, fatcat).select(cat.name, fatcat.name).parse();
-    }
-
-    @Test
-    public void BeforeAndAfter() throws RecognitionException, TokenStreamException {
-        ComparableExpression<java.util.Date> ed = catalog.effectiveDate;
-        query()
-            .from(catalog)
-            .where(
-                ed.gt(DateExpression.currentDate()), 
-                ed.goe(DateExpression.currentDate()),
-                ed.lt(DateExpression.currentDate()), 
-                ed.loe(DateExpression.currentDate()))
-            .select(catalog).parse();
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void ComplexConstructor() throws Exception {
-        query().from(bar).select(new QFooDTO(bar.count())).parse();
-    }
-
-    @Test
-    public void DocoExamples910() throws Exception {
-        query().from(cat)
-               .groupBy(cat.color)
-               .select(cat.color, cat.weight.sum(), cat.count()).parse();
-    }
-
-    @Test
-    public void DocoExamples910_2() throws Exception {
-        query().from(cat)
-               .groupBy(cat.color)
-               .having(cat.color.in(Color.TABBY, Color.BLACK))
-               .select(cat.color, cat.weight.sum(), cat.count()).parse();
-    }
-
-    @Test
-    @Ignore
-    public void DocoExamples910_3() throws Exception {
-        query().from(cat).join(cat.kittens, kitten)
-               .groupBy(cat)
-               .having(kitten.weight.avg().gt(100.0))
-               .orderBy(kitten.count().asc(), kitten.weight.sum().desc())
-               .select(cat)
-               .parse();
-    }
-
-    @Test
-    public void DocoExamples911() throws Exception {
-        query().from(fatcat).where(
-                fatcat.weight.gt(sub().from(cat).unique(cat.weight.avg())))
-                .parse();
-    }
-
-    @Test
-    public void DocoExamples911_2() throws Exception {
-        query().from(cat).where(
-                cat.name.eqAny(sub().from(name).list(name.nickName)))
-                .parse();
-    }
-    
-    @Test
-    public void DocoExamples911_3() throws Exception {
-        query().from(cat).where(
-                sub().from(mate).where(mate.mate.eq(cat)).list(mate).notExists())
-                .parse();
-    }
-    
-    @Test
-    public void DocoExamples911_4() throws Exception {
-        query().from(cat).where(
-                sub().from(mate).where(mate.mate.eq(cat)).exists())
-                .parse();
-    }
-    
-    @Test
-    public void DocoExamples911_5() throws Exception {
-        query().from(cat).where(
-                cat.name.notIn(sub().from(name).list(name.nickName)))
-                .parse();
-    }
-    
-    @Test
-    public void DocoExamples912() throws Exception {
-        query().from(ord, cust)
-                .join(ord.lineItems, item).join(item.product, product)
-                .from(catalog).join(catalog.prices, price).where(
-                        ord.paid.not().and(ord.customer.eq(cust)).and(
-                                price.product.eq(product)).and(
-                                catalog.effectiveDate.gt(DateExpression.currentDate())).and(
-                                catalog.effectiveDate.gtAny(
-                                        sub().from(catalog).where(
-                                                catalog.effectiveDate.lt(DateExpression.currentDate()))
-                                             .list(catalog.effectiveDate))))
-                .groupBy(ord).having(price.amount.sum().gt(0l))
-                .orderBy(price.amount.sum().desc())
-                .select(ord.id, price.amount.sum(), item.count());
-
-        Customer c1 = new Customer();
-        Catalog c2 = new Catalog();
-
-        query().from(ord)
-               .join(ord.lineItems, item).join(item.product, product)
-               .from(catalog).join(catalog.prices, price).where(
-                        ord.paid.not().and(ord.customer.eq(c1)).and(
-                                price.product.eq(product)).and(catalog.eq(c2)))
-                .groupBy(ord).having(price.amount.sum().gt(0l))
-                .orderBy(price.amount.sum().desc())
-                .select(ord.id, price.amount.sum(), item.count());
-
-    }
-
-    @Test
-    public void DocoExamples92() throws Exception {
-        query().from(cat).parse();
-    }
-    
-    @Test
-    public void DocoExamples92_2() throws Exception {
-        query().from(cat).parse();
-    }
-    
-    @Test
-    public void DocoExamples92_3() throws Exception {
-        query().from(form, param).parse();
-    }
-    
-    @Test
-    public void DocoExamples93() throws Exception {
-        query().from(cat).innerJoin(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();
-    }
-    
-    @Test
-    public void DocoExamples93_2() throws Exception {
-        query().from(cat).leftJoin(cat.mate.kittens, kitten).parse();                
-    }
-    
-    @Test
-    public void DocoExamples93_3() throws Exception {
-        query().from(cat).join(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();        
-    }
-    
-    @Test
-    public void DocoExamples93_4() throws Exception {
-        query().from(cat).innerJoin(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();
-    }
-
-    @Test
-    public void DocoExamples93_viaAlias() throws Exception {
-        Cat c = alias(Cat.class, "cat");
-        Cat k = alias(Cat.class, "kittens");
-        Cat m = alias(Cat.class, "mate");
-
-        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();
-    }
-    
-    @Test
-    public void DocoExamples93_viaAlias2() throws Exception {
-        Cat c = alias(Cat.class, "cat");
-        Cat k = alias(Cat.class, "kittens");
-        
-        query().from($(c)).leftJoin($(c.getMate().getKittens()),$(k)).parse();
-    }
-    
-    @Test
-    public void DocoExamples93_viaAlias3() throws Exception {
-        Cat c = alias(Cat.class, "cat");
-        Cat k = alias(Cat.class, "kittens");
-        Cat m = alias(Cat.class, "mate");
-     
-        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();
-    }
-    
-    @Test
-    public void DocoExamples93_viaAlias4() throws Exception {
-        Cat c = alias(Cat.class, "cat");
-        Cat k = alias(Cat.class, "kittens");
-        Cat m = alias(Cat.class, "mate");
-        
-        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();        
-    }    
-
-    @Test
-    public void DocoExamples94() throws Exception {
-        query().from(cat).innerJoin(cat.mate, mate).select(cat.mate).parse();
-    }
-    
-    @Test
-    public void DocoExamples94_2() throws Exception {
-        query().from(cat).select(cat.mate).parse();
-    }
-    
-    @Test
-    @NoOpenJPA @NoBatooJPA
-    public void DocoExamples94_3() throws Exception {
-        query().from(cat).select(cat.kittens).parse();
-    }
-    
-    @Test
-    public void DocoExamples94_4() throws Exception {
-        query().from(cust).select(cust.name.firstName).parse();
-    }
-    
-    @Test
-    public void DocoExamples94_5() throws Exception {
-        query().from(mother)
-        .innerJoin(mother.mate, mate)
-        .leftJoin(mother.kittens, offspr)
-        .select(mother, offspr, mate).parse();
-    }
-    
-    @Test
-    public void DocoExamples94_6() throws Exception {
-        query().from(mother)
-        .innerJoin(mother.mate, mate)
-        .leftJoin(mother.kittens, kitten)
-        .select(new QFamily(mother, mate, kitten)).parse();
-    }
-
-    @Test
-    public void DocoExamples95() throws Exception {
-        query().from(cat)
-               .select(cat.weight.avg(), cat.weight.sum(), cat.weight.max(), cat.count())
-               .parse();
-    }
-
-    @Test
-    public void DocoExamples96() throws Exception {
-        query().from(cat).parse();
-    }
-    
-    @Test
-    public void DocoExamples96_2() throws Exception {
-        query().from(m, n).where(n.name.eq(m.name)).parse();
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void DocoExamples97() throws Exception {
-        query().from(foo, bar).where(foo.startDate.eq(bar.date)).select(foo).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_2() throws Exception {
-        query().from(cat).where(cat.mate.name.isNotNull()).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_3() throws Exception {
-        query().from(cat, rival).where(cat.mate.eq(rival.mate)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_4() throws Exception {
-        query().from(cat, mate).where(cat.mate.eq(mate)).select(cat, mate).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_5() throws Exception {
-        query().from(cat).where(cat.id.eq(123)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_6() throws Exception {
-        query().from(cat).where(cat.mate.id.eq(69)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_7() throws Exception {
-        query().from(person).where(
-                person.pid.country.eq("AU"),
-                person.pid.medicareNumber.eq(123456)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_8() throws Exception {
-        query().from(account).where(account.owner.pid.medicareNumber.eq(123456)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_9() throws Exception {
-        query().from(cat).where(cat.instanceOf(DomesticCat.class)).parse();
-    }
-    
-    @Test
-    @Ignore
-    //@NoEclipseLink
-    public void DocoExamples97_10() throws Exception {
-        query().from(log, payment).where(
-                log.item.instanceOf(Payment.class),
-                log.item.id.eq(payment.id)).parse();
-    }
-    
-    @Test
-    public void DocoExamples97_10_2() throws Exception {
-        query().from(log, payment).innerJoin(log.item, item).where(
-                item.instanceOf(Payment.class),
-                item.id.eq(payment.id)).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_1() throws Exception {
-        query().from(cat).where(cat.name.between("A", "B")).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_2() throws Exception {
-        query().from(cat).where(cat.name.in("Foo", "Bar", "Baz")).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_3() throws Exception {
-        query().from(cat).where(cat.name.notBetween("A", "B")).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_4() throws Exception {
-        query().from(cat).where(cat.name.notIn("Foo", "Bar", "Baz")).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_5() throws Exception {
-        query().from(cat).where(cat.kittens.size().gt(0)).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_6() throws Exception {
-        query().from(mother, kit).select(mother).where(kit.in(mother.kittens)).parse();
-    }
-    
-    @Test
-    @NoEclipseLink
-    public void DocoExamples98_7() throws Exception {
-        query().from(list, p).select(p).where(p.name.eqAny(list.names)).parse();
-    }
-    
-    @Test
-    public void DocoExamples98_8() throws Exception {
-        query().from(cat).where(cat.kittens.isNotEmpty()).parse();
-    }
-    
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void DocoExamples98_9() throws Exception {
-        query().from(person, calendar).select(person).where(
-                calendar.holidays("national holiday").eq(person.birthDay),
-                person.nationality.calendar.eq(calendar)).parse();
-    }
-    
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    @ExcludeIn({DERBY, HSQLDB, ORACLE})
-    public void DocoExamples98_10() throws Exception {
-        query().from(item, ord).select(item).where(
-                ord.items(ord.deliveredItemIndices(0)).eq(item),
-                ord.id.eq(1l)).parse();
-    }
-    
-    @Test
-    @NoEclipseLink
-    @ExcludeIn({DERBY, HSQLDB, H2, MYSQL, ORACLE, POSTGRES})
-    @Ignore
-    public void DocoExamples98_11() throws Exception {
-        query().from(item, ord).select(item).where(
-                ord.items(ord.items.size().subtract(1)).eq(item))
-                .parse();
-    }
-    
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    @ExcludeIn({DERBY, HSQLDB, ORACLE})
-    public void DocoExamples98_12() throws Exception {
-        query()        
-        .from(prod, store)        
-        .innerJoin(store.customers, cust)
-        .select(cust)
-        .where(
-            prod.name.eq("widget"),
-            store.location.name.in("Melbourne", "Sydney"),
-            prod.eqAll(cust.currentOrder.lineItems))
-        .parse();
-
-    }    
-
-    @Test
-    public void DocoExamples98() throws Exception {
-        prod.eq(new Product());
-        prod.eq(new QProduct("p"));
-        prod.eq(new QItem("p"));
-
-    }
-
-    @Test
-    public void DocoExamples99() throws Exception {
-        query().from(cat).orderBy(cat.name.asc(), cat.weight.desc(),
-                cat.birthdate.asc()).parse();
-    }
-
-    @Test
-    public void DoubleLiteral() throws Exception {
-        query().from(cat).where(cat.weight.lt((int) 3.1415)).parse();
-    }
-    
-    @Test
-    public void DoubleLiteral2() throws Exception {
-        query().from(cat).where(cat.weight.gt((int) 3.1415e3)).parse();
-    }
-
-    @Test
-    @NoOpenJPA
-    public void Fetch() throws RecognitionException, TokenStreamException{
-        query().from(cat).innerJoin(cat.mate, mate).fetch().parse();               
-    }
-    
-    @Test
-    @NoOpenJPA
-    public void Fetch2() throws RecognitionException, TokenStreamException{
-        query().from(cat).innerJoin(cat.mate, mate).fetch().fetch().parse();
-    }
-
-    @Test
-    public void In() throws Exception {
-        query().from(foo).where(foo.bar.in("a", "b", "c")).parse();        
-    }
-    
-    @Test
-    public void NotIn() throws Exception {
-        query().from(foo).where(foo.bar.notIn("a", "b", "c")).parse();
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA 
-    public void JoinFlags1() throws RecognitionException, TokenStreamException{
-        query().from(cat).fetchAll().parse();
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void JoinFlags2() throws RecognitionException, TokenStreamException{
-        query().from(cat).fetchAll().from(cat1).fetchAll().parse();
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA @NoBatooJPA
-    public void JoinFlags3() throws RecognitionException, TokenStreamException{
-        query().from(cat).fetchAll().from(cat1).fetchAll().parse();
-    }
-
-    @Test
-    public void Joins() throws RecognitionException, TokenStreamException{
-        query().from(cat).join(cat.mate, mate).select(cat).parse();
-    }
-    
-    @Test
-    public void InnerJoin() throws RecognitionException, TokenStreamException{
-        query().from(cat).innerJoin(cat.mate, mate).select(cat).parse();
-    }
-
-    @Test
-    public void LeftJoin()  throws RecognitionException, TokenStreamException{
-        query().from(cat).leftJoin(cat.mate, mate).select(cat).parse();
-    }
-    
-    @Test 
-    @NoOpenJPA @NoBatooJPA
-    public void Joins2() throws RecognitionException, TokenStreamException{
-        query().from(cat).join(cat.mate, mate).on(mate.name.eq("Bob")).parse();
-    }
-
-    @Test
-    public void MultipleFromClasses() throws Exception {
-        query().from(qat, foo).parse();
-    }
-
-    @Test
-    public void Serialization() {
-        QueryHelper query = query();
-
-        query.from(cat);
-        assertEquals("select cat\nfrom Cat cat", query.toString());
-
-        query.from(fatcat);
-        assertEquals("select cat\nfrom Cat cat, Cat fatcat", query.toString());
-    }
-
-    @Test
-    @NoEclipseLink @NoOpenJPA
-    @ExcludeIn(MYSQL)
-    public void Casts_Byte() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.byteValue()).parse();     
-    }
-    
-    @Test
-    @NoOpenJPA
-    public void Casts_Double() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.doubleValue()).parse();     
-    }
-    
-    @Test
-    @NoOpenJPA
-    @ExcludeIn(MYSQL)
-    public void Casts_Float() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.floatValue()).parse();     
-    }
-    
-    @Test
-    @NoOpenJPA
-    @ExcludeIn(MYSQL)
-    public void Casts_Int() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.intValue()).parse();     
-    }
-    
-    @Test
-    @NoOpenJPA
-    @ExcludeIn({DERBY, HSQLDB, MYSQL})
-    public void Casts_Long() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.longValue()).parse();     
-    }
-    
-    @Test
-    @NoEclipseLink @NoOpenJPA
-    @ExcludeIn(MYSQL)
-    public void Casts_Short() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.shortValue()).parse();     
-    }
-    
-    @Test
-    @NoOpenJPA
-    @ExcludeIn({DERBY, HSQLDB, MYSQL})
-    public void Casts_String() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.stringValue()).parse();     
-    }
-    
-    @Test
-    @NoEclipseLink @NoOpenJPA
-    @ExcludeIn(MYSQL)
-    public void Casts_2() throws Exception {
-        NumberExpression<Double> bw = cat.bodyWeight;
-        query().from(cat).select(bw.castToNum(Byte.class)).parse();   
-    }
-
-    @Test
-    @Ignore
-    public void GroupBy() throws Exception {
-        query().from(qat).groupBy(qat.breed).parse();
-    }
-    
-    @Test
-    @Ignore
-    public void GroupBy_2() throws Exception {
-        query().from(qat).groupBy(qat.breed, qat.eyecolor).parse();   
-    }
-
-    @Test
-    public void Not() throws Exception {
-        query().from(cat).where(cat.kittens.size().lt(1).not()).parse();
-    }
-    
-    @Test
-    public void Not_2() throws Exception {
-        query().from(cat).where(cat.kittens.size().gt(1).not()).parse();   
-    }
-    
-    @Test
-    public void Not_3() throws Exception {
-        query().from(cat).where(cat.kittens.size().goe(1).not()).parse();
-    }
-    
-    @Test
-    public void Not_4() throws Exception {
-        query().from(cat).where(cat.kittens.size().loe(1).not()).parse();
-    }
-    
-    @Test
-    public void Not_5() throws Exception {
-        query().from(cat).where(cat.name.between("A", "B").not()).parse();
-    }
-    
-    @Test
-    public void Not_6() throws Exception {
-        query().from(cat).where(cat.name.notBetween("A", "B").not()).parse();
-    }
-    
-    @Test
-    public void Not_7() throws Exception {
-        query().from(cat).where(cat.kittens.size().loe(1).not().not()).parse();
-    }
-    
-    @Test
-    public void Not_8() throws Exception {
-        query().from(cat).where(cat.kittens.size().loe(1).not().not().not()).parse();
-    }
-
-        
-    @Test
-    @Ignore
-    public void OrderBy() throws Exception {
-        // NOT SUPPORTED
-        query().from(qat).orderBy(qat.toes.avg().asc()).parse();
-    }
-   
-    @Test
-    @NoOpenJPA
-    public void OrderBy_2() throws Exception {
-        query().from(an).orderBy(an.bodyWeight.sqrt().divide(2.0).asc()).parse();
-    }
-
-    @Test
-    public void Select() throws Exception {
-//        query().select(Ops.AggOps.COUNT_ALL_AGG_EXPR).from(qat).parse();
-
-        query().from(qat).select(qat.weight.avg()).parse();
-    }
-
-    @Test
-    @Ignore
-    public void Sum() throws RecognitionException, TokenStreamException {
-        // NOT SUPPORTED
-        query().from(cat).select(cat.kittens.size().sum()).parse();
-    }
-
-    @Test
-    @Ignore
-    public void Sum_2() throws RecognitionException, TokenStreamException {
-        // NOT SUPPORTED
-        query().from(cat).where(cat.kittens.size().sum().gt(0)).select(cat).parse();
-    }
-    
-    @Test
-    public void Sum_3() throws RecognitionException, TokenStreamException {
-        query().from(cat).where(cat.kittens.isEmpty()).select(cat).parse();
-    }
-    
-    @Test
-    public void Sum_4() throws RecognitionException, TokenStreamException {
-        query().from(cat).where(cat.kittens.isNotEmpty()).select(cat).parse();
-    }
-    
-    @Test
-    public void Where() throws Exception {
-        query().from(qat).where(qat.name.in("crater", "bean", "fluffy")).parse();
-    }
-    
-    @Test
-    public void Where_2() throws Exception {
-        query().from(qat).where(qat.name.notIn("crater", "bean", "fluffy")).parse();
-    }
-    
-    @Test
-    public void Where_3() throws Exception {
-        query().from(an).where(an.bodyWeight.sqrt().gt(10.0)).parse();
-    }
-    
-    @Test
-    public void Where_4() throws Exception {
-        query().from(an).where(an.bodyWeight.sqrt().divide(2d).gt(10.0)).parse();
-    }
-    
-    @Test
-    public void Where_5() throws Exception {
-        query().from(an).where(
-                an.bodyWeight.gt(10),
-                an.bodyWeight.lt(100).or(an.bodyWeight.isNull()))
-            .parse();
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Person.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/Person.java
deleted file mode 100644
index 3b42637fa7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/Person.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mysema.query.jpa;
-
-
-public class Person {
-
-    String firstName, lastName;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QArticle.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/QArticle.java
deleted file mode 100644
index 67a05b63fd..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QArticle.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mysema.query.jpa;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.path.PathInits;
-
-
-/**
- * QArticle is a Querydsl query type for Article
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QArticle extends EntityPathBase<Article> {
-
-    private static final long serialVersionUID = 1732636838L;
-
-    private static final PathInits INITS = PathInits.DIRECT2;
-
-    public static final QArticle article = new QArticle("article");
-
-    public final QPerson author;
-
-    public final QContent content;
-
-    public final StringPath name = createString("name");
-
-    public QArticle(String variable) {
-        this(Article.class, forVariable(variable), INITS);
-    }
-
-    public QArticle(Path<? extends Article> path) {
-        this(path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QArticle(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QArticle(PathMetadata<?> metadata, PathInits inits) {
-        this(Article.class, metadata, inits);
-    }
-
-    public QArticle(Class<? extends Article> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.author = inits.isInitialized("author") ? new QPerson(forProperty("author")) : null;
-        this.content = inits.isInitialized("content") ? new QContent(forProperty("content"), inits.get("content")) : null;
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QContent.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/QContent.java
deleted file mode 100644
index 3ecf0a9f69..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QContent.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mysema.query.jpa;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.path.PathInits;
-
-
-/**
- * QContent is a Querydsl query type for Content
- */
-@Generated("com.mysema.query.codegen.EmbeddableSerializer")
-public class QContent extends BeanPath<Content> {
-
-    private static final long serialVersionUID = -878421975L;
-
-    private static final PathInits INITS = PathInits.DIRECT2;
-
-    public static final QContent content = new QContent("content");
-
-    public final QArticle article;
-
-    public QContent(String variable) {
-        this(Content.class, forVariable(variable), INITS);
-    }
-
-    public QContent(Path<? extends Content> path) {
-        this(path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QContent(PathMetadata<?> metadata) {
-        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
-    }
-
-    public QContent(PathMetadata<?> metadata, PathInits inits) {
-        this(Content.class, metadata, inits);
-    }
-
-    public QContent(Class<? extends Content> type, PathMetadata<?> metadata, PathInits inits) {
-        super(type, metadata, inits);
-        this.article = inits.isInitialized("article") ? new QArticle(forProperty("article"), inits.get("article")) : null;
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QPerson.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/QPerson.java
deleted file mode 100644
index 5352d3ebec..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QPerson.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.jpa;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-
-/**
- * QPerson is a Querydsl query type for Person
- */
-@Generated("com.mysema.query.codegen.EntitySerializer")
-public class QPerson extends EntityPathBase<Person> {
-
-    private static final long serialVersionUID = -219463259L;
-
-    public static final QPerson person = new QPerson("person");
-
-    public final StringPath firstName = createString("firstName");
-
-    public final StringPath lastName = createString("lastName");
-
-    public QPerson(String variable) {
-        super(Person.class, forVariable(variable));
-    }
-
-    public QPerson(Path<? extends Person> path) {
-        super(path.getType(), path.getMetadata());
-    }
-
-    public QPerson(PathMetadata<?> metadata) {
-        super(Person.class, metadata);
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHelper.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHelper.java
deleted file mode 100644
index 2957dd0ab8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHelper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import javax.annotation.Nullable;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import antlr.collections.AST;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.SearchResults;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.Expression;
-import org.hibernate.hql.internal.ast.HqlParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-
-class QueryHelper extends JPAQueryBase<QueryHelper> {
-
-    private static final Logger logger = LoggerFactory.getLogger(QueryHelper.class);
-
-    public QueryHelper(JPQLTemplates templates) {
-        this(new DefaultQueryMetadata(), templates);
-    }
-    
-    public QueryHelper(QueryMetadata metadata, JPQLTemplates templates) {
-        super(metadata, templates);
-    }
-
-    @Override
-    protected JPQLSerializer createSerializer() {
-        return new JPQLSerializer(getTemplates());
-    }
-
-    public long count() {
-        return 0;
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Nullable
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> projection) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Nullable
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        throw new UnsupportedOperationException();
-    }
-    
-    @Nullable
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void parse() throws RecognitionException, TokenStreamException {
-        try {
-            String input = toString();
-            logger.debug("input: " + input.replace('\n', ' '));
-            HqlParser parser = HqlParser.getInstance(input);
-            parser.setFilter(false);
-            parser.statement();
-            AST ast = parser.getAST();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            parser.showAst(ast, new PrintStream(baos));
-            assertEquals("At least one error occurred during parsing " + input,
-                    0, parser.getParseErrorHandler().getErrorCount());
-        } finally {
-            // clear();
-        }
-    }
-
-    public QueryHelper select(Expression<?>... exprs) {
-        queryMixin.addProjection(exprs);
-        return this;
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> projection) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public QueryHelper clone() {
-        return new QueryHelper(getMetadata().clone(), getTemplates());
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryMutabilityTest.java
deleted file mode 100644
index 2f20b2e0ae..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryMutabilityTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.hibernate.Session;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.QueryMutability;
-import com.mysema.query.jpa.domain.sql.SAnimal;
-import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery;
-import com.mysema.query.sql.DerbyTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-public class QueryMutabilityTest{
-
-    private static final SQLTemplates derbyTemplates = new DerbyTemplates();
-
-    private Session session;
-
-    protected HibernateSQLQuery query() {
-        return new HibernateSQLQuery(session, derbyTemplates);
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-    @Test
-    @Ignore
-    public void QueryMutability() throws SecurityException, IllegalArgumentException,
-            NoSuchMethodException, IllegalAccessException,
-            InvocationTargetException, IOException {
-        SAnimal cat = new SAnimal("cat");
-        HibernateSQLQuery query = query().from(cat);
-        new QueryMutability(query).test(cat.id, cat.name);
-    }
-
-    @Test
-    public void Clone() {
-        SAnimal cat = new SAnimal("cat");
-        HibernateSQLQuery query = query().from(cat).where(cat.name.isNotNull());
-        HibernateSQLQuery query2 = query.clone(session);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        //query2.list(cat.id);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/RelationalFunctionCallTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/RelationalFunctionCallTest.java
deleted file mode 100644
index bfb46d0845..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/RelationalFunctionCallTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalFunctionCall;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLServerTemplates;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-
-public class RelationalFunctionCallTest {
-
-//    @Schema("PUBLIC")
-//    @Table("SURVEY")
-    public class QSurvey extends RelationalPathBase<QSurvey>{
-
-        private static final long serialVersionUID = -7427577079709192842L;
-
-        public final StringPath name = createString("NAME");
-
-        public QSurvey(String path) {
-            super(QSurvey.class, PathMetadataFactory.forVariable(path), "PUBLIC", "SURVEY");
-        }
-
-    }
-
-    @Test
-    public void FunctionCall() {
-        //select tab.col from Table tab join TableValuedFunction('parameter') func on tab.col not like func.col
-
-        QSurvey table = new QSurvey("SURVEY");
-        RelationalFunctionCall<String> func = RelationalFunctionCall.create(String.class, "TableValuedFunction", "parameter");
-        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
-        SQLSubQuery sq = new SQLSubQuery();
-        SubQueryExpression<?> expr = sq.from(table)
-            .join(func, funcAlias).on(table.name.like(funcAlias.getString("prop")).not()).list(table.name);
-
-        Configuration conf = new Configuration(new SQLServerTemplates());
-        SQLSerializer serializer = new NativeSQLSerializer(conf, true);
-        serializer.serialize(expr.getMetadata(), false);
-        assertEquals("select SURVEY.NAME\n" +
-                "from SURVEY SURVEY\n" +
-                "join TableValuedFunction(?1) as tokFunc\n" +
-                "on not SURVEY.NAME like tokFunc.prop escape '\\'", serializer.toString());
-
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SerializationBase.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/SerializationBase.java
deleted file mode 100644
index e1e9576063..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SerializationBase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import javax.persistence.EntityManager;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.impl.JPAQuery;
-import com.mysema.testutil.JPATestRunner;
-
-@RunWith(JPATestRunner.class)
-public class SerializationBase {
-    
-    private QCat cat = QCat.cat;
-    
-    private EntityManager entityManager;
-    
-    @Test
-    public void test() throws IOException, ClassNotFoundException{
-        // create query
-        JPAQuery query = new JPAQuery(entityManager);
-        query.from(cat).where(cat.name.eq("Kate")).list(cat);
-        
-        // get metadata
-        QueryMetadata metadata = query.getMetadata();
-        assertFalse(metadata.getJoins().isEmpty());
-        assertTrue(metadata.getWhere() != null);
-        assertTrue(metadata.getProjection().isEmpty());
-        
-        // serialize metadata
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(baos);
-        out.writeObject(metadata);
-        out.close();
-        
-        // deserialize metadata
-        ByteArrayInputStream bain = new ByteArrayInputStream(baos.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bain);
-        QueryMetadata  metadata2 = (QueryMetadata) in.readObject();
-        in.close();
-        
-        // validate it
-        assertEquals(metadata.getJoins(), metadata2.getJoins());
-        assertEquals(metadata.getWhere(), metadata2.getWhere());
-        assertEquals(metadata.getProjection(), metadata2.getProjection());
-        
-        // create new query
-        JPAQuery query2 = new JPAQuery(entityManager, metadata2);
-        assertEquals("select cat\nfrom Cat cat\nwhere cat.name = ?1", query2.toString());
-        query2.list(cat);        
-    }
-
-    public void setEntityManager(EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/StringOperationsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/StringOperationsTest.java
deleted file mode 100644
index d7d48c0ed8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/StringOperationsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import org.junit.Test;
-
-import com.mysema.query.domain.QCat;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.expr.StringOperation;
-import com.mysema.query.types.path.StringPath;
-
-public class StringOperationsTest extends AbstractQueryTest{
-
-    @Test
-    public void StringConcatenations() {
-        assertToString("concat(cat.name,kitten.name)", cat.name.concat(kitten.name));
-    }
-
-    @Test
-    public void StringConversionOperations() {
-        assertToString("str(cat.bodyWeight)", cat.bodyWeight.stringValue());
-    }
-
-    @Test
-    public void StringOperationsInFunctionalWay() {
-        assertToString("concat(cat.name,cust.name.firstName)", cat.name.concat(cust.name.firstName));
-        assertToString("lower(cat.name)", cat.name.lower());
-    }
-
-    @Test
-    @SuppressWarnings("rawtypes")
-    public void IndexOf() {        
-        Path path = QCat.cat.name;
-        Expression startIndex = Expressions.constant(0);
-        Expression endIndex = NumberOperation.create(Integer.class, Ops.INDEX_OF, path, Expressions.constant("x"));
-        Expression substr = StringOperation.create(Ops.SUBSTR_2ARGS, path, startIndex, endIndex);
-        assertToString("substring(cat.name,1,locate(?1,cat.name)-1)", substr);
-    }
-    
-    @Test
-    public void IndexOf2() {
-        StringPath str = QCat.cat.name;
-        assertToString("substring(cat.name,1,locate(?1,cat.name)-1)", str.substring(0, str.indexOf("x")));
-    }
-    
-    @Test
-    public void IndexOf3() {
-        assertToString("substring(cat.name,2,1)", QCat.cat.name.substring(1,2));
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java
deleted file mode 100644
index 964b888841..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.domain.QCat;
-import com.mysema.query.jpa.domain.QEmployee;
-import com.mysema.query.jpa.domain.QUser;
-
-public class SubQueryTest extends AbstractQueryTest{
-
-    @Test(expected=IllegalArgumentException.class)
-    public void WrongUsage() {
-        sub().exists();
-    }
-
-    @Test
-    public void Single_Source() {
-        JPASubQuery query = sub();
-        query.from(cat);
-        assertEquals("select cat\nfrom Cat cat", query.toString());
-    }
-    
-    @Test
-    public void Multiple_Sources() {
-        JPASubQuery query = sub();
-        query.from(cat);
-        query.from(fatcat);
-        assertEquals("select cat\nfrom Cat cat, Cat fatcat", 
-                query.toString());
-    }
-    
-    @Test
-    public void In() {
-        cat.in(sub().from(cat).list(cat));
-    }
-        
-    @Test
-    public void InnerJoin() {
-        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate", 
-                sub().from(cat).innerJoin(cat.mate).toString());
-    }
-    
-    @Test
-    public void InnerJoin2() {
-        QEmployee employee = QEmployee.employee;
-        QUser user = QUser.user;
-        assertEquals("select employee\nfrom Employee employee\n  inner join employee.user as user", 
-                sub().from(employee).innerJoin(employee.user, user).toString());
-    }
-        
-    @Test
-    public void LeftJoin() {
-        assertEquals("select cat\nfrom Cat cat\n  left join cat.mate", 
-                sub().from(cat).leftJoin(cat.mate).toString());
-    }
-    
-    @Test
-    public void FullJoin() {
-        assertEquals("select cat\nfrom Cat cat\n  full join cat.mate", 
-                sub().from(cat).fullJoin(cat.mate).toString());
-    }
-    
-    @Test
-    public void Join() {
-        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate", 
-                sub().from(cat).join(cat.mate).toString());
-    }
-
-    @Test
-    public void UniqueProjection() {
-        assertToString("(select cat from Cat cat)", 
-                sub().from(cat).unique(cat));
-    }
-
-    @Test
-    public void ListProjection() {
-        assertToString("(select cat from Cat cat)", 
-                sub().from(cat).list(cat));
-    }
-    
-    @Test
-    public void ListContains() {
-        assertToString("cat1 in (select cat from Cat cat)", 
-                sub().from(cat).list(cat).contains(cat1));
-    }
-    
-    @Test
-    public void Exists() {
-        assertToString("exists (select 1 from Cat cat)",                        
-                sub().from(cat).exists());
-    }
-    
-    @Test
-    public void Exists_Where() {
-        assertToString("exists (select 1 from Cat cat where cat.weight < ?1)", 
-                sub().from(cat).where(cat.weight.lt(1)).exists());
-    }
-    
-    @Test
-    public void Exists_Via_Unique() {
-        assertToString("exists (select 1 from Cat cat where cat.weight < ?1)", 
-                sub().from(cat).where(cat.weight.lt(1)).unique(cat).exists());
-    }
-    
-    @Test
-    public void NotExists() {
-        assertToString("not exists (select 1 from Cat cat)",                        
-                sub().from(cat).notExists());            
-    }
-    
-    @Test
-    public void NotExists_Where() {
-        assertToString("not exists (select 1 from Cat cat where cat.weight < ?1)",
-                sub().from(cat).where(cat.weight.lt(1)).notExists());    
-    }
-    
-    @Test
-    public void NotExists_Via_Unique() {
-        assertToString("not exists (select 1 from Cat cat where cat.weight < ?1)", 
-                sub().from(cat).where(cat.weight.lt(1)).unique(cat).notExists());   
-    }
-
-    @Test
-    public void Count() {
-        assertToString("(select count(cat) from Cat cat)",                        
-                sub().from(cat).count());        
-    }
-    
-    @Test
-    public void Count_Via_List() {
-        assertToString("(select count(cat) from Cat cat)",                        
-                sub().from(cat).list(cat).count());
-    }
-    
-    @Test
-    public void Count_Name() {
-        assertToString("(select count(cat.name) from Cat cat)",                   
-                sub().from(cat).list(cat.name).count());
-    }
-
-    @Test
-    public void Count_Multiple_Sources() {
-        QCat other = new QCat("other");
-        assertToString("(select count(cat, other) from Cat cat, Cat other)",     
-                sub().from(cat, other).count());
-    }
-    
-    @Test
-    public void Count_Multiple_Sources_Via_List() {
-        QCat other = new QCat("other");
-        assertToString("(select count(cat, other) from Cat cat, Cat other)",      
-                sub().from(cat, other).list(cat, other).count());
-    }
-
-    @Test
-    public void Indexed_Access() {
-        assertToString("(select count(cat) from Cat cat   " +
-        		"left join cat.kittens as cat_kittens_0 " +
-        		"where index(cat_kittens_0) = ?1 and cat_kittens_0.name = ?2)", 
-        		                                                          
-        		sub().from(cat).where(cat.kittens.get(0).name.eq("Kate")).count());
-    }
-    
-    @Test
-    public void Indexed_Access_Without_Constant() {
-        assertToString("(select count(cat) from Cat cat   " +
-                        "left join cat.kittens as cat_kittens_cat_id " +
-                        "where index(cat_kittens_cat_id) = cat.id and cat_kittens_cat_id.name = ?1)", 
-                                                                                  
-                        sub().from(cat).where(cat.kittens.get(cat.id).name.eq("Kate")).count());
-    }
-    
-    @Test
-    public void IndexOf() {
-        assertToString("(select count(cat) from Cat cat where locate(?1,cat.name)-1 = ?2)",                
-                        sub().from(cat).where(cat.name.indexOf("a").eq(1)).count());
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/TupleTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/TupleTest.java
deleted file mode 100644
index 1db3dc74f7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/TupleTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.hibernate.HibernateSubQuery;
-import com.mysema.query.types.QTuple;
-import com.mysema.query.types.SubQueryExpression;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class TupleTest extends AbstractQueryTest {
-        
-    @Test
-    @Ignore // FIXME
-    public void test() {
-        QCat cat = QCat.cat;
-        
-        SubQueryExpression<?> subQuery = subQuery().from(cat)
-        .where(subQuery()
-           .from(cat)
-           .groupBy(cat.mate)
-           .list(new QTuple(cat.mate, cat.birthdate.max()))
-             .contains(new QTuple(cat.mate, cat.birthdate)))
-        .list(new QTuple(cat.birthdate, cat.name, cat.mate));
-        
-        assertToString(
-                "(select cat.birthdate, cat.name, cat.mate from Cat cat " +
-                "where (cat.mate, cat.birthdate) in " +
-                    "(select cat.mate, max(cat.birthdate) from Cat cat group by cat.mate))", subQuery);
-    }
-
-    private HibernateSubQuery subQuery() {
-        return new HibernateSubQuery();
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/TypeCastTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/TypeCastTest.java
deleted file mode 100644
index c40a07db84..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/TypeCastTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.jpa.domain.Animal;
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.domain.InheritedProperties;
-import com.mysema.query.jpa.domain.QAnimal;
-import com.mysema.query.jpa.domain.QCat;
-import com.mysema.query.jpa.domain.QInheritedProperties;
-import com.mysema.query.jpa.domain.QSuperclass;
-
-public class TypeCastTest {
-
-    @Test
-    public void MappedSuperclass() {
-        QInheritedProperties subClass = QInheritedProperties.inheritedProperties;
-        QSuperclass superClass = subClass._super;
-
-        assertEquals(InheritedProperties.class, superClass.getType());
-//        assertEquals(InheritedProperties.class.getSimpleName(), superClass.getEntityName());
-        assertEquals("inheritedProperties", superClass.toString());
-    }
-
-//    @Test
-//    public void mappedSuperclass2() {
-//        QInheritedProperties subClass = QInheritedProperties.inheritedProperties;
-//        QSuperclass superClass = new QSuperclass(subClass.getMetadata());
-//
-//        assertEquals(Superclass.class, superClass.getType());
-//        assertEquals(Superclass.class.getSimpleName(), superClass.getEntityName());
-//        assertEquals("inheritedProperties", superClass.toString());
-//    }
-
-    @Test
-    public void SubClassToSuper() {
-        QCat cat = QCat.cat;
-        QAnimal animal = new QAnimal(cat);
-
-        assertEquals(Cat.class, animal.getType());
-//        assertEquals(Cat.class.getSimpleName(), animal.getEntityName());
-        assertEquals("cat", animal.toString());
-    }
-
-    @Test
-    public void SubClassToSuper2() {
-        QCat cat = QCat.cat;
-        QAnimal animal = new QAnimal(cat.getMetadata());
-
-        assertEquals(Animal.class, animal.getType());
-//        assertEquals(Animal.class.getSimpleName(), animal.getEntityName());
-        assertEquals("cat", animal.toString());
-    }
-
-    @Test
-    public void SuperClassToSub() {
-        QAnimal animal = QAnimal.animal;
-        QCat cat = new QCat(animal.getMetadata());
-
-        assertEquals(Cat.class, cat.getType());
-//        assertEquals(Cat.class.getSimpleName(), cat.getEntityName());
-        assertEquals("animal", cat.toString());
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java
deleted file mode 100644
index d8fc8bb97f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa;
-
-import static com.mysema.query.jpa.domain.QCat.cat;
-import static org.junit.Assert.assertEquals;
-
-import org.hibernate.Session;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.jpa.domain.Cat;
-import com.mysema.query.jpa.hibernate.HibernateQuery;
-import com.mysema.testutil.HibernateTestRunner;
-
-@Ignore
-@RunWith(HibernateTestRunner.class)
-public class UniqueResultsTest {
-
-    private Session session;
-
-    @Test
-    public void test() {
-        session.save(new Cat("Bob1", 1));
-        session.save(new Cat("Bob2", 2));
-        session.save(new Cat("Bob3", 3));
-
-        assertEquals(Integer.valueOf(1), query().from(cat).orderBy(cat.name.asc()).offset(0).limit(1).uniqueResult(cat.id));
-        assertEquals(Integer.valueOf(2), query().from(cat).orderBy(cat.name.asc()).offset(1).limit(1).uniqueResult(cat.id));
-        assertEquals(Integer.valueOf(3), query().from(cat).orderBy(cat.name.asc()).offset(2).limit(1).uniqueResult(cat.id));
-
-        assertEquals(Long.valueOf(3), query().from(cat).uniqueResult(cat.count()));
-    }
-
-    private HibernateQuery query() {
-        return new HibernateQuery(session);
-    }
-
-    public void setSession(Session session) {
-        this.session = session;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Account.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Account.java
deleted file mode 100644
index 3132fd0c5b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Account.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import static org.junit.Assert.fail;
-
-import java.io.Serializable;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.junit.Test;
-
-import com.mysema.query.annotations.QueryInit;
-
-/**
- * The Class Account.
- */
-@SuppressWarnings("serial")
-@Entity
-@Table(name="account_")
-public class Account implements Serializable{
-
-    @Transient
-    public int transientField;
-
-    @Id
-    long id;
-
-    @ManyToOne
-    @QueryInit("pid")
-    Person owner;
-
-    @Embedded
-    EmbeddedType embeddedData;
-
-    @Test
-    public void test() {
-        try {
-            QAccount.class.getField("serialVersionUID");
-            fail("Got serialVersionUID");
-        } catch (Exception e) {
-            // expected
-        }
-        try {
-            QAccount.class.getField("transientField");
-            fail("Got transientField");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Animal.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Animal.java
deleted file mode 100644
index cd079ec290..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Animal.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.Date;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.hibernate.annotations.Type;
-
-/**
- * The Class Animal.
- */
-@Entity
-@Table(name="animal_")
-@DiscriminatorValue("A")
-public class Animal {
-    private boolean alive;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    private java.util.Date birthdate;
-
-    private int weight, toes;
-
-    // needed for JPA tests
-    @Type(type="com.mysema.query.ExtDoubleType")
-    private double bodyWeight;
-    
-    private float floatProperty;
-
-    private Color color;
-
-//    @Temporal(TemporalType.DATE)
-    private java.sql.Date dateField;
-
-    @Id
-    private int id;
-
-    private String name;
-
-    private java.sql.Time timeField;
-
-    public Animal() {}
-    
-    public Animal(int id) {
-        setId(id);
-    }
-    
-    public java.util.Date getBirthdate() {
-        return new Date(birthdate.getTime());
-    }
-
-    public double getBodyWeight() {
-        return bodyWeight;
-    }
-
-    public Color getColor() {
-        return color;
-    }
-
-    public java.sql.Date getDateField() {
-        return new java.sql.Date(dateField.getTime());
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public java.sql.Time getTimeField() {
-        return timeField;
-    }
-
-    public int getToes() {
-        return toes;
-    }
-
-    public int getWeight() {
-        return weight;
-    }
-
-    public boolean isAlive() {
-        return alive;
-    }
-
-    public void setAlive(boolean alive) {
-        this.alive = alive;
-    }
-
-    public void setBirthdate(java.util.Date birthdate) {
-        this.birthdate = new java.util.Date(birthdate.getTime());
-    }
-
-    public void setBodyWeight(double bodyWeight) {
-        this.bodyWeight = bodyWeight;
-    }
-
-    public void setColor(Color color) {
-        this.color = color;
-    }
-
-    public void setDateField(java.sql.Date dateField) {
-        this.dateField = new java.sql.Date(dateField.getTime());
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setTimeField(java.sql.Time timeField) {
-        this.timeField = timeField;
-    }
-
-    public void setToes(int toes) {
-        this.toes = toes;
-    }
-
-    public void setWeight(int weight) {
-        this.weight = weight;
-    }
-
-    public float getFloatProperty() {
-        return floatProperty;
-    }
-
-    public void setFloatProperty(float floatProperty) {
-        this.floatProperty = floatProperty;
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Author.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Author.java
deleted file mode 100644
index 54a081cb3f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Author.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="author_")
-public class Author implements Serializable {
-
-    private static final long serialVersionUID = -1893968697250846661L;
-
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @OneToMany(mappedBy = "author")
-    @OrderBy("title")
-    private Set<Book> books;
-
-    public Set<Book> getBooks() {
-        return books;
-    }
-
-    public void setBooks(Set<Book> books) {
-        this.books = books;
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Bar.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Bar.java
deleted file mode 100644
index a6769c3a9b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Bar.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * The Class Bar.
- */
-@Entity
-@Table(name="bar_")
-public class Bar {
-    @Temporal(TemporalType.DATE)
-    java.util.Date date;
-
-    @Id
-    int id;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Book.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Book.java
deleted file mode 100644
index b390e3b337..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Book.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="book_")
-public class Book implements Serializable {
-
-    private static final long serialVersionUID = -9029792723035681319L;
-
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    private String title;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    @ManyToOne
-    @JoinColumn(name = "AUTHOR_ID")
-    private Author author;
-
-    public Author getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(Author author) {
-        this.author = author;
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java
deleted file mode 100644
index cb88c8701b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.io.Serializable;
-import java.util.Map;
-
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-
-
-/**
- * The Class Calendar.
- */
-@SuppressWarnings("serial")
-@Entity
-@Table(name="calendar_")
-public class Calendar implements Serializable{
-    @ElementCollection
-    @Temporal(TemporalType.DATE)
-    @MapKeyColumn(name="holidays_key")
-    Map<String, java.util.Date> holidays;
-
-    @Id
-    int id;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java
deleted file mode 100644
index 0006125652..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
-import org.hibernate.annotations.IndexColumn;
-
-/**
- * The Class Cat.
- */
-@Entity
-@DiscriminatorValue("C")
-public class Cat extends Animal {
-
-    private int breed;
-
-    private Color eyecolor;
-
-    @OneToMany
-    @JoinTable(name = "kittens", joinColumns = @JoinColumn(name = "cat_id"), inverseJoinColumns = @JoinColumn(name = "kitten_id"))
-    @IndexColumn(name = "ind")
-    private List<Cat> kittens = new ArrayList<Cat>();
-
-    @OneToMany
-    @JoinTable(name = "kittens_set", joinColumns = @JoinColumn(name = "cat_id"), inverseJoinColumns = @JoinColumn(name = "kitten_id"))
-    private Set<Cat> kittensSet;
-
-//    @OneToMany
-//    @JoinTable(name="kittens_array")
-//    @IndexColumn(name = "arrayIndex")
-//    private Cat[] kittensArray = new Cat[0];
-
-    @ManyToOne
-    private Cat mate;
-
-    public Cat() {}
-
-    public Cat(int id) {
-        setId(id);
-    }
-
-    public Cat(String name, int id) {
-        setId(id);
-        setName( name);
-    }
-
-    public Cat(String name, int id, Color color) {
-        setId(id);
-        setName( name);
-        setColor(color);
-    }
-
-    public Cat(String name, int id, List<Cat> k) {
-        setId(id);
-        setName( name);
-        kittens.addAll(k);
-    }
-
-    public Cat(String name, int id, double bodyWeight) {
-        this(name, id);
-        setBodyWeight(bodyWeight);
-        setFloatProperty((float)bodyWeight);
-    }
-
-    public int getBreed() {
-        return breed;
-    }
-
-    public Color getEyecolor() {
-        return eyecolor;
-    }
-
-    public List<Cat> getKittens() {
-        return kittens;
-    }
-
-    public Cat getMate() {
-        return mate;
-    }
-
-//    public Cat[] getKittensArray() {
-//        return kittensArray;
-//    }
-
-    public void addKitten(Cat kitten) {
-        kittens.add(kitten);
-//        kittensArray = new Cat[]{kitten};
-    }
-
-    public Set<Cat> getKittensSet() {
-        return kittensSet;
-    }
-
-    public void setKittensSet(Set<Cat> kittensSet) {
-        this.kittensSet = kittensSet;
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Catalog.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Catalog.java
deleted file mode 100644
index f563f87a0a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Catalog.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * The Class Catalog.
- */
-@Entity
-@Table(name="catalog_")
-public class Catalog {
-    @Temporal(TemporalType.DATE)
-    Date effectiveDate;
-
-    @Id
-    int id;
-
-    @OneToMany
-    Set<Price> prices;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Child.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Child.java
deleted file mode 100644
index e60d1c64fa..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Child.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
-@Entity(name="Child2")
-public class Child {
-    
-    @Id
-    int id;
-    
-    @ManyToOne
-    Parent parent;
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Color.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Color.java
deleted file mode 100644
index 49431dd917..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Color.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-/**
- * The Enum Color.
- */
-public enum Color {
-    BLACK, TABBY
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Company.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Company.java
deleted file mode 100644
index 1a510d3795..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Company.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.batoo.jpa.annotations.Index;
-
-/**
- * The Class Company.
- */
-@Entity
-@Table(name="company_")
-public class Company {
-    
-    public enum Rating { A, AA, AAA }
-    
-    @Enumerated
-    public Rating ratingOrdinal; 
-    
-    @Enumerated(EnumType.STRING)
-    public Rating ratingString;
-    
-    @ManyToOne
-    public Employee ceo;
-
-    @OneToMany
-    @Index(name = "_index")
-    public List<Department> departments;
-
-    @Id
-    public int id;
-
-    public String name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Customer.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Customer.java
deleted file mode 100644
index 01e03f7161..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Customer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * The Class Customer.
- */
-@Entity
-@Table(name="customer_")
-public class Customer {
-    @ManyToOne
-    Order currentOrder;
-
-    @Id
-    int id;
-
-    @ManyToOne
-    Name name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Department.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Department.java
deleted file mode 100644
index d7c8c8b8d6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Department.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.batoo.jpa.annotations.Index;
-
-/**
- * The Class Department.
- */
-@Entity
-@Table(name="department_")
-public class Department {
-    @ManyToOne
-    Company company;
-
-    @OneToMany
-    @Index(name = "_index")
-    List<Employee> employees;
-
-    @Id
-    int id;
-    
-    String name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Document.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Document.java
deleted file mode 100644
index 488c4d6f4c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Document.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * The Class Document.
- */
-@Entity
-@Table(name="document_")
-public class Document {
-    @Id
-    int id;
-
-    String name;
-
-    @Temporal(TemporalType.DATE)
-    Date validTo;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Dolphin.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Dolphin.java
deleted file mode 100644
index 78f84a6c37..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Dolphin.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Dolphin extends Mammal {
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DoubleProjection.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DoubleProjection.java
deleted file mode 100644
index d7db43b1eb..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DoubleProjection.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import com.mysema.query.annotations.QueryProjection;
-
-public class DoubleProjection {
-    
-    public double val;
-    
-    @QueryProjection
-    public DoubleProjection(double val) {
-        this.val = val;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java
deleted file mode 100644
index 5fdb7cdd30..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Embeddable;
-
-@SuppressWarnings("serial")
-@Embeddable
-public class EmbeddedType implements Serializable{
-
-    String someData;
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Employee.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Employee.java
deleted file mode 100644
index 2db1928408..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Employee.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-/**
- * The Class Employee.
- */
-@Entity
-@Table(name="employee_")
-public class Employee {
-    @ManyToOne
-    public Company company;
-
-    @OneToOne
-    public User user;
-    
-    public String firstName, lastName;
-
-    @Id
-    public int id;
-    
-    @Enumerated(EnumType.STRING)
-    @Column(name = "jobfunction")
-    @ElementCollection (fetch = FetchType.EAGER)
-    public Collection<JobFunction> jobFunctions = new HashSet<JobFunction>();
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity1.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity1.java
deleted file mode 100644
index 662bc44c0b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity1.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Entity1 {
-    
-    public Entity1() {}
-    
-    public Entity1(int id) {
-        this.id = id;
-    }
-
-    @Id
-    public int id;
-    
-    public String property;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity2.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity2.java
deleted file mode 100644
index 94a6ffb8be..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Entity2.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Entity2 extends Entity1 {
-    
-    public Entity2() {}
-    
-    public Entity2(int id) {
-        this.id = id;
-    }
-
-    public String property2;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FloatProjection.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FloatProjection.java
deleted file mode 100644
index 049df79d2c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FloatProjection.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import com.mysema.query.annotations.QueryProjection;
-
-public class FloatProjection {
-    
-    public float val;
-    
-    @QueryProjection
-    public FloatProjection(float val) {
-        this.val = val;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java
deleted file mode 100644
index 57a204b422..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.List;
-
-import javax.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * The Class Foo.
- */
-@Entity
-@Table(name="foo_")
-public class Foo {
-    public String bar;
-
-    @Id
-    //@GeneratedValue(strategy=GenerationType.AUTO)
-    public int id;
-
-    @ElementCollection
-    @CollectionTable(name = "foo_names", joinColumns = {@JoinColumn(name="foo_id")})    
-    public List<String> names;
-
-    @Temporal(TemporalType.DATE)
-    public java.util.Date startDate;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Item.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Item.java
deleted file mode 100644
index c37b059cdd..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Item.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * The Class Item.
- */
-@Entity
-@Table(name="item_")
-public class Item {
-    @Id
-    long id;
-
-    @ManyToOne
-    Product product;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Location.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Location.java
deleted file mode 100644
index af4ddfa735..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Location.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * The Class Location.
- */
-@Entity(name="Location2")
-@Table(name="location_")
-public class Location {
-    @Id
-    long id;
-
-    String name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Mammal.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Mammal.java
deleted file mode 100644
index b3f9dd04c4..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Mammal.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class Mammal {
-    
-    @Id
-    Long id;
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java
deleted file mode 100644
index 881ab9bb4d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.List;
-
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.IndexColumn;
-
-/**
- * The Class Order.
- */
-@Entity
-@Table(name="order_")
-public class Order {
-    @ManyToOne
-    Customer customer;
-
-    @ElementCollection
-    @IndexColumn(name = "_index")
-    List<Integer> deliveredItemIndices;
-
-    @Id
-    long id;
-
-    @OneToMany
-    @IndexColumn(name = "_index")
-    List<Item> items;
-  
-    @OneToMany
-    @JoinTable(name = "LineItems")
-    @IndexColumn(name = "_index")
-    List<Item> lineItems;
-
-    boolean paid;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parameter.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parameter.java
deleted file mode 100644
index 62ced9a8ed..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parameter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * The Class Parameter.
- */
-@Entity
-@Table(name="parameter_")
-public class Parameter {
-    @Id
-    long id;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parent.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parent.java
deleted file mode 100644
index e72db69244..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Parent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.jpa.domain;
-
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
-@Entity(name="Parent2")
-public class Parent {
-
-    @Id
-    int id;
-    
-    @OneToMany(mappedBy = "parent")  
-    Set<Child> children;
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Person.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Person.java
deleted file mode 100644
index 43b5505a9c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Person.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import com.mysema.query.annotations.QueryInit;
-
-/**
- * The Class Person.
- */
-@SuppressWarnings("serial")
-@Entity
-@Table(name="person_")
-public class Person implements Serializable{
-    @Temporal(TemporalType.DATE)
-    java.util.Date birthDay;
-
-    @Id
-    long i;
-
-    @ManyToOne
-    PersonId pid;
-
-    String name;
-
-    @ManyToOne
-    @QueryInit("calendar")
-    Nationality nationality;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Product.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Product.java
deleted file mode 100644
index e74f463283..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Product.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-
-/**
- * The Class Product.
- */
-@Entity
-public class Product extends Item {
-    // @Id long id;
-    String name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Show.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Show.java
deleted file mode 100644
index 35368de2dc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Show.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.Map;
-
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
-
-/**
- * The Class Show.
- */
-@Entity
-@Table(name="show_")
-public class Show {
-
-    @Id
-    long id;
-
-    @ElementCollection
-    @MapKeyColumn(name="acts_key")
-    public Map<String, String> acts;
-
-    public Show() {}
-
-    public Show(int id) {
-        this.id = id;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Status.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Status.java
deleted file mode 100644
index ac2f31176e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Status.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * The Class Status.
- */
-@Entity
-@Table(name="status_")
-public class Status {
-    @Id
-    long id;
-
-    String name;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/StatusChange.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/StatusChange.java
deleted file mode 100644
index 4316f81db1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/StatusChange.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * The Class StatusChange.
- */
-@Entity
-@Table(name="statuschange_")
-public class StatusChange {
-    @Id
-    long id;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    java.util.Date timeStamp;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Store.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Store.java
deleted file mode 100644
index 9ae589ef3e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Store.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-/**
- * The Class Store.
- */
-@Entity
-@Table(name="store_")
-public class Store {
-    @OneToMany
-    List<Customer> customers;
-
-    @Id
-    long id;
-
-    @ManyToOne
-    Location location;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Superclass.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Superclass.java
deleted file mode 100644
index 92f9cd995d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Superclass.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.MappedSuperclass;
-
-import com.mysema.query.annotations.PropertyType;
-import com.mysema.query.annotations.QueryType;
-
-@MappedSuperclass
-public class Superclass {
-    String superclassProperty;
-
-    @QueryType(PropertyType.SIMPLE)
-    private String stringAsSimple;
-
-    public String getStringAsSimple() {
-        return stringAsSimple;
-    }
-
-    public void setStringAsSimple(String stringAsSimple) {
-        this.stringAsSimple = stringAsSimple;
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/User.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/User.java
deleted file mode 100644
index 5d01d05a4f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/User.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-/**
- * The Class User.
- */
-@Entity
-@Table(name="user_")
-public class User {
-    @ManyToOne
-    Company company;
-
-    @Id
-    long id;
-
-    String userName, firstName, lastName;
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java
deleted file mode 100644
index 5da2082310..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2009 Mysema Ltd.
- * All rights reserved.
- *
- */
-@Config(listAccessors=true, mapAccessors=true)
-package com.mysema.query.jpa.domain;
-import com.mysema.query.annotations.Config;
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java
deleted file mode 100644
index 7814707998..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SAccount is a Querydsl query type for SAccount
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SAccount extends com.mysema.query.sql.RelationalPathBase<SAccount> {
-
-    private static final long serialVersionUID = -1514613821;
-
-    public static final SAccount account_ = new SAccount("account_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<Long> ownerI = createNumber("ownerI", Long.class);
-
-    public final StringPath someData = createString("someData");
-
-    public final com.mysema.query.sql.PrimaryKey<SAccount> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SPerson> fk809dbbd28cfac74 = createForeignKey(ownerI, "i");
-
-    public SAccount(String variable) {
-        super(SAccount.class, forVariable(variable), "null", "account_");
-        addMetadata();
-    }
-
-    public SAccount(String variable, String schema, String table) {
-        super(SAccount.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SAccount(Path<? extends SAccount> path) {
-        super(path.getType(), path.getMetadata(), "null", "account_");
-        addMetadata();
-    }
-
-    public SAccount(PathMetadata<?> metadata) {
-        super(SAccount.class, metadata, "null", "account_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(ownerI, ColumnMetadata.named("owner_i").withIndex(3).ofType(-5).withSize(19));
-        addMetadata(someData, ColumnMetadata.named("someData").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java
deleted file mode 100644
index ce9844546e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SAnimal is a Querydsl query type for SAnimal
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SAnimal extends com.mysema.query.sql.RelationalPathBase<SAnimal> {
-
-    private static final long serialVersionUID = 1795545042;
-
-    public static final SAnimal animal_ = new SAnimal("animal_");
-
-    public final BooleanPath alive = createBoolean("alive");
-
-    public final DateTimePath<java.sql.Timestamp> birthdate = createDateTime("birthdate", java.sql.Timestamp.class);
-
-    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
-
-    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
-
-    public final NumberPath<Integer> color = createNumber("color", Integer.class);
-
-    public final DatePath<java.sql.Date> dateField = createDate("dateField", java.sql.Date.class);
-
-    public final StringPath dtype = createString("dtype");
-
-    public final NumberPath<Integer> eyecolor = createNumber("eyecolor", Integer.class);
-
-    public final NumberPath<Float> floatProperty = createNumber("floatProperty", Float.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Integer> mateId = createNumber("mateId", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final TimePath<java.sql.Time> timeField = createTime("timeField", java.sql.Time.class);
-
-    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
-
-    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SAnimal> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> fkccec31e312a37469 = createForeignKey(mateId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SKittens> _fkd60087cc3881aaa7 = createInvForeignKey(id, "kitten_id");
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> _fkccec31e312a37469 = createInvForeignKey(id, "mate_id");
-
-    public final com.mysema.query.sql.ForeignKey<SKittensSet> _fk4fccad6f8f00fdf8 = createInvForeignKey(id, "cat_id");
-
-    public final com.mysema.query.sql.ForeignKey<SKittens> _fkd60087cc8f00fdf8 = createInvForeignKey(id, "cat_id");
-
-    public final com.mysema.query.sql.ForeignKey<SKittensSet> _fk4fccad6f3881aaa7 = createInvForeignKey(id, "kitten_id");
-
-    public SAnimal(String variable) {
-        super(SAnimal.class, forVariable(variable), "null", "animal_");
-        addMetadata();
-    }
-
-    public SAnimal(String variable, String schema, String table) {
-        super(SAnimal.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SAnimal(Path<? extends SAnimal> path) {
-        super(path.getType(), path.getMetadata(), "null", "animal_");
-        addMetadata();
-    }
-
-    public SAnimal(PathMetadata<?> metadata) {
-        super(SAnimal.class, metadata, "null", "animal_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(alive, ColumnMetadata.named("alive").withIndex(3).ofType(-7).notNull());
-        addMetadata(birthdate, ColumnMetadata.named("birthdate").withIndex(4).ofType(93).withSize(19));
-        addMetadata(bodyWeight, ColumnMetadata.named("bodyWeight").withIndex(5).ofType(8).withSize(22).notNull());
-        addMetadata(breed, ColumnMetadata.named("breed").withIndex(13).ofType(4).withSize(10));
-        addMetadata(color, ColumnMetadata.named("color").withIndex(6).ofType(4).withSize(10));
-        addMetadata(dateField, ColumnMetadata.named("dateField").withIndex(7).ofType(91).withSize(10));
-        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
-        addMetadata(eyecolor, ColumnMetadata.named("eyecolor").withIndex(14).ofType(4).withSize(10));
-        addMetadata(floatProperty, ColumnMetadata.named("floatProperty").withIndex(8).ofType(7).withSize(12).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(4).withSize(10).notNull());
-        addMetadata(mateId, ColumnMetadata.named("mate_id").withIndex(15).ofType(4).withSize(10));
-        addMetadata(name, ColumnMetadata.named("name").withIndex(9).ofType(12).withSize(255));
-        addMetadata(timeField, ColumnMetadata.named("timeField").withIndex(10).ofType(92).withSize(8));
-        addMetadata(toes, ColumnMetadata.named("toes").withIndex(11).ofType(4).withSize(10).notNull());
-        addMetadata(weight, ColumnMetadata.named("weight").withIndex(12).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java
deleted file mode 100644
index 7aeec671d6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SAuditlog is a Querydsl query type for SAuditlog
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SAuditlog extends com.mysema.query.sql.RelationalPathBase<SAuditlog> {
-
-    private static final long serialVersionUID = -1982799323;
-
-    public static final SAuditlog auditlog_ = new SAuditlog("auditlog_");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Long> itemId = createNumber("itemId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SAuditlog> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fkb88fbf6ae26109c = createForeignKey(itemId, "id");
-
-    public SAuditlog(String variable) {
-        super(SAuditlog.class, forVariable(variable), "null", "auditlog_");
-        addMetadata();
-    }
-
-    public SAuditlog(String variable, String schema, String table) {
-        super(SAuditlog.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SAuditlog(Path<? extends SAuditlog> path) {
-        super(path.getType(), path.getMetadata(), "null", "auditlog_");
-        addMetadata();
-    }
-
-    public SAuditlog(PathMetadata<?> metadata) {
-        super(SAuditlog.class, metadata, "null", "auditlog_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(itemId, ColumnMetadata.named("item_id").withIndex(2).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuthor.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuthor.java
deleted file mode 100644
index 4e10f626bd..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SAuthor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SAuthor is a Querydsl query type for SAuthor
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SAuthor extends com.mysema.query.sql.RelationalPathBase<SAuthor> {
-
-    private static final long serialVersionUID = 2005972515;
-
-    public static final SAuthor author_ = new SAuthor("author_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SAuthor> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SBook> _fk599229686eaf51c = createInvForeignKey(id, "AUTHOR_ID");
-
-    public SAuthor(String variable) {
-        super(SAuthor.class, forVariable(variable), "null", "author_");
-        addMetadata();
-    }
-
-    public SAuthor(String variable, String schema, String table) {
-        super(SAuthor.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SAuthor(Path<? extends SAuthor> path) {
-        super(path.getType(), path.getMetadata(), "null", "author_");
-        addMetadata();
-    }
-
-    public SAuthor(PathMetadata<?> metadata) {
-        super(SAuthor.class, metadata, "null", "author_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java
deleted file mode 100644
index ae2c5e253a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SBar is a Querydsl query type for SBar
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SBar extends com.mysema.query.sql.RelationalPathBase<SBar> {
-
-    private static final long serialVersionUID = -1389576419;
-
-    public static final SBar bar_ = new SBar("bar_");
-
-    public final DatePath<java.sql.Date> date = createDate("date", java.sql.Date.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SBar> primary = createPrimaryKey(id);
-
-    public SBar(String variable) {
-        super(SBar.class, forVariable(variable), "null", "bar_");
-        addMetadata();
-    }
-
-    public SBar(String variable, String schema, String table) {
-        super(SBar.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SBar(Path<? extends SBar> path) {
-        super(path.getType(), path.getMetadata(), "null", "bar_");
-        addMetadata();
-    }
-
-    public SBar(PathMetadata<?> metadata) {
-        super(SBar.class, metadata, "null", "bar_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(date, ColumnMetadata.named("date").withIndex(2).ofType(91).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBook.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBook.java
deleted file mode 100644
index 574121e5f9..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBook.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SBook is a Querydsl query type for SBook
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SBook extends com.mysema.query.sql.RelationalPathBase<SBook> {
-
-    private static final long serialVersionUID = -126781371;
-
-    public static final SBook book_ = new SBook("book_");
-
-    public final NumberPath<Long> authorId = createNumber("authorId", Long.class);
-
-    public final StringPath dtype = createString("dtype");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath title = createString("title");
-
-    public final com.mysema.query.sql.PrimaryKey<SBook> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SAuthor> fk599229686eaf51c = createForeignKey(authorId, "id");
-
-    public SBook(String variable) {
-        super(SBook.class, forVariable(variable), "null", "book_");
-        addMetadata();
-    }
-
-    public SBook(String variable, String schema, String table) {
-        super(SBook.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SBook(Path<? extends SBook> path) {
-        super(path.getType(), path.getMetadata(), "null", "book_");
-        addMetadata();
-    }
-
-    public SBook(PathMetadata<?> metadata) {
-        super(SBook.class, metadata, "null", "book_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(authorId, ColumnMetadata.named("AUTHOR_ID").withIndex(4).ofType(-5).withSize(19));
-        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(title, ColumnMetadata.named("title").withIndex(3).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookBookmarks.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookBookmarks.java
deleted file mode 100644
index 030623dd86..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookBookmarks.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import java.util.*;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SBookBookmarks is a Querydsl query type for SBookBookmarks
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SBookBookmarks extends com.mysema.query.sql.RelationalPathBase<SBookBookmarks> {
-
-    private static final long serialVersionUID = -312126525;
-
-    public static final SBookBookmarks bookBookmarks = new SBookBookmarks("book_bookmarks");
-
-    public final NumberPath<Integer> bookMarksORDER = createNumber("bookMarksORDER", Integer.class);
-
-    public final NumberPath<Long> bookVersionBookIDIdentity = createNumber("bookVersionBookIDIdentity", Long.class);
-
-    public final NumberPath<Long> bookVersionLibraryIdentity = createNumber("bookVersionLibraryIdentity", Long.class);
-
-    public final StringPath comment = createString("comment");
-
-    public final NumberPath<Long> page = createNumber("page", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SBookBookmarks> primary = createPrimaryKey(bookVersionBookIDIdentity, bookVersionLibraryIdentity, bookMarksORDER);
-
-    public final com.mysema.query.sql.ForeignKey<SBookversion> fk94026827e33d3be4 = createForeignKey(Arrays.asList(bookVersionBookIDIdentity, bookVersionLibraryIdentity), Arrays.asList("bookID_identity", "library_identity"));
-
-    public SBookBookmarks(String variable) {
-        super(SBookBookmarks.class, forVariable(variable), "null", "book_bookmarks");
-        addMetadata();
-    }
-
-    public SBookBookmarks(String variable, String schema, String table) {
-        super(SBookBookmarks.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SBookBookmarks(Path<? extends SBookBookmarks> path) {
-        super(path.getType(), path.getMetadata(), "null", "book_bookmarks");
-        addMetadata();
-    }
-
-    public SBookBookmarks(PathMetadata<?> metadata) {
-        super(SBookBookmarks.class, metadata, "null", "book_bookmarks");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(bookMarksORDER, ColumnMetadata.named("bookMarks_ORDER").withIndex(5).ofType(4).withSize(10).notNull());
-        addMetadata(bookVersionBookIDIdentity, ColumnMetadata.named("BookVersion_bookID_identity").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(bookVersionLibraryIdentity, ColumnMetadata.named("BookVersion_library_identity").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(comment, ColumnMetadata.named("comment").withIndex(3).ofType(12).withSize(255));
-        addMetadata(page, ColumnMetadata.named("page").withIndex(4).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookid.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookid.java
deleted file mode 100644
index 13bc351255..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookid.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SBookid is a Querydsl query type for SBookid
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SBookid extends com.mysema.query.sql.RelationalPathBase<SBookid> {
-
-    private static final long serialVersionUID = -1577800438;
-
-    public static final SBookid bookid_ = new SBookid("bookid_");
-
-    public final NumberPath<Long> identity = createNumber("identity", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SBookid> primary = createPrimaryKey(identity);
-
-    public final com.mysema.query.sql.ForeignKey<SBookversion> _fkef4bc0704dd5d6c3 = createInvForeignKey(identity, "bookID_identity");
-
-    public SBookid(String variable) {
-        super(SBookid.class, forVariable(variable), "null", "bookid_");
-        addMetadata();
-    }
-
-    public SBookid(String variable, String schema, String table) {
-        super(SBookid.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SBookid(Path<? extends SBookid> path) {
-        super(path.getType(), path.getMetadata(), "null", "bookid_");
-        addMetadata();
-    }
-
-    public SBookid(PathMetadata<?> metadata) {
-        super(SBookid.class, metadata, "null", "bookid_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(identity, ColumnMetadata.named("identity").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookversion.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookversion.java
deleted file mode 100644
index 202f89af5c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SBookversion.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import java.util.*;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SBookversion is a Querydsl query type for SBookversion
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SBookversion extends com.mysema.query.sql.RelationalPathBase<SBookversion> {
-
-    private static final long serialVersionUID = 1615296481;
-
-    public static final SBookversion bookversion_ = new SBookversion("bookversion_");
-
-    public final NumberPath<Long> bookIDIdentity = createNumber("bookIDIdentity", Long.class);
-
-    public final StringPath description = createString("description");
-
-    public final NumberPath<Long> libraryIdentity = createNumber("libraryIdentity", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SBookversion> primary = createPrimaryKey(bookIDIdentity, libraryIdentity);
-
-    public final com.mysema.query.sql.ForeignKey<SBookid> fkef4bc0704dd5d6c3 = createForeignKey(bookIDIdentity, "identity");
-
-    public final com.mysema.query.sql.ForeignKey<SLibrary> fkef4bc070e364cd17 = createForeignKey(libraryIdentity, "identity");
-
-    public final com.mysema.query.sql.ForeignKey<SBookBookmarks> _fk94026827e33d3be4 = createInvForeignKey(Arrays.asList(bookIDIdentity, libraryIdentity), Arrays.asList("BookVersion_bookID_identity", "BookVersion_library_identity"));
-
-    public SBookversion(String variable) {
-        super(SBookversion.class, forVariable(variable), "null", "bookversion_");
-        addMetadata();
-    }
-
-    public SBookversion(String variable, String schema, String table) {
-        super(SBookversion.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SBookversion(Path<? extends SBookversion> path) {
-        super(path.getType(), path.getMetadata(), "null", "bookversion_");
-        addMetadata();
-    }
-
-    public SBookversion(PathMetadata<?> metadata) {
-        super(SBookversion.class, metadata, "null", "bookversion_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(bookIDIdentity, ColumnMetadata.named("bookID_identity").withIndex(3).ofType(-5).withSize(19).notNull());
-        addMetadata(description, ColumnMetadata.named("description").withIndex(1).ofType(12).withSize(255));
-        addMetadata(libraryIdentity, ColumnMetadata.named("library_identity").withIndex(4).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java
deleted file mode 100644
index fa8e2fe665..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-
-import javax.annotation.Generated;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-
-/**
- * SCalendar is a Querydsl query type for SCalendar
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCalendar extends com.mysema.query.sql.RelationalPathBase<SCalendar> {
-
-    private static final long serialVersionUID = 885543696;
-
-    public static final SCalendar calendar_ = new SCalendar("calendar_");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCalendar> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCalendarHolidays> _fk31ce1edc591ebbc = createInvForeignKey(id, "Calendar_id");
-
-    public final com.mysema.query.sql.ForeignKey<SNationality> _fkab8efa23591ebbc = createInvForeignKey(id, "calendar_id");
-
-    public SCalendar(String variable) {
-        super(SCalendar.class, forVariable(variable), "null", "calendar_");
-        addMetadata();
-    }
-
-    public SCalendar(String variable, String schema, String table) {
-        super(SCalendar.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCalendar(Path<? extends SCalendar> path) {
-        super(path.getType(), path.getMetadata(), "null", "calendar_");
-        addMetadata();
-    }
-
-    public SCalendar(PathMetadata<?> metadata) {
-        super(SCalendar.class, metadata, "null", "calendar_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java
deleted file mode 100644
index 3b9fe385f6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCalendarHolidays is a Querydsl query type for SCalendarHolidays
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCalendarHolidays extends com.mysema.query.sql.RelationalPathBase<SCalendarHolidays> {
-
-    private static final long serialVersionUID = 850508650;
-
-    public static final SCalendarHolidays CalendarHolidays = new SCalendarHolidays("Calendar_holidays");
-
-    public final NumberPath<Integer> calendarId = createNumber("calendarId", Integer.class);
-
-    public final DatePath<java.sql.Date> holidays = createDate("holidays", java.sql.Date.class);
-
-    public final StringPath holidaysKEY = createString("holidaysKEY");
-
-    public final com.mysema.query.sql.PrimaryKey<SCalendarHolidays> primary = createPrimaryKey(calendarId, holidaysKEY);
-
-    public final com.mysema.query.sql.ForeignKey<SCalendar> fk31ce1edc591ebbc = createForeignKey(calendarId, "id");
-
-    public SCalendarHolidays(String variable) {
-        super(SCalendarHolidays.class, forVariable(variable), "null", "Calendar_holidays");
-        addMetadata();
-    }
-
-    public SCalendarHolidays(String variable, String schema, String table) {
-        super(SCalendarHolidays.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCalendarHolidays(Path<? extends SCalendarHolidays> path) {
-        super(path.getType(), path.getMetadata(), "null", "Calendar_holidays");
-        addMetadata();
-    }
-
-    public SCalendarHolidays(PathMetadata<?> metadata) {
-        super(SCalendarHolidays.class, metadata, "null", "Calendar_holidays");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(calendarId, ColumnMetadata.named("Calendar_id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(holidays, ColumnMetadata.named("holidays").withIndex(2).ofType(91).withSize(10));
-        addMetadata(holidaysKEY, ColumnMetadata.named("holidays_KEY").withIndex(3).ofType(12).withSize(255).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java
deleted file mode 100644
index df33c7c8a7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCatalog is a Querydsl query type for SCatalog
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCatalog extends com.mysema.query.sql.RelationalPathBase<SCatalog> {
-
-    private static final long serialVersionUID = 669498199;
-
-    public static final SCatalog catalog_ = new SCatalog("catalog_");
-
-    public final DatePath<java.sql.Date> effectiveDate = createDate("effectiveDate", java.sql.Date.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCatalog> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCatalog_price> _fkaa04532fbb9021ab = createInvForeignKey(id, "catalog__id");
-
-    public SCatalog(String variable) {
-        super(SCatalog.class, forVariable(variable), "null", "catalog_");
-        addMetadata();
-    }
-
-    public SCatalog(String variable, String schema, String table) {
-        super(SCatalog.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCatalog(Path<? extends SCatalog> path) {
-        super(path.getType(), path.getMetadata(), "null", "catalog_");
-        addMetadata();
-    }
-
-    public SCatalog(PathMetadata<?> metadata) {
-        super(SCatalog.class, metadata, "null", "catalog_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(effectiveDate, ColumnMetadata.named("effectiveDate").withIndex(2).ofType(91).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog_price.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog_price.java
deleted file mode 100644
index 09eab12675..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog_price.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCatalog_price is a Querydsl query type for SCatalog_price
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCatalog_price extends com.mysema.query.sql.RelationalPathBase<SCatalog_price> {
-
-    private static final long serialVersionUID = 1271141965;
-
-    public static final SCatalog_price catalog_price_ = new SCatalog_price("catalog__price_");
-
-    public final NumberPath<Integer> catalog_id = createNumber("catalog_id", Integer.class);
-
-    public final NumberPath<Long> pricesId = createNumber("pricesId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCatalog_price> primary = createPrimaryKey(catalog_id, pricesId);
-
-    public final com.mysema.query.sql.ForeignKey<SCatalog> fkaa04532fbb9021ab = createForeignKey(catalog_id, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SPrice> fkaa04532f5222eaf7 = createForeignKey(pricesId, "id");
-
-    public SCatalog_price(String variable) {
-        super(SCatalog_price.class, forVariable(variable), "null", "catalog__price_");
-        addMetadata();
-    }
-
-    public SCatalog_price(String variable, String schema, String table) {
-        super(SCatalog_price.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCatalog_price(Path<? extends SCatalog_price> path) {
-        super(path.getType(), path.getMetadata(), "null", "catalog__price_");
-        addMetadata();
-    }
-
-    public SCatalog_price(PathMetadata<?> metadata) {
-        super(SCatalog_price.class, metadata, "null", "catalog__price_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(catalog_id, ColumnMetadata.named("catalog__id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(pricesId, ColumnMetadata.named("prices_id").withIndex(2).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory.java
deleted file mode 100644
index 773a0704f8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-import javax.annotation.Generated;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-
-/**
- * SCategory is a Querydsl query type for SCategory
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCategory extends com.mysema.query.sql.RelationalPathBase<SCategory> {
-
-    private static final long serialVersionUID = -610481840;
-
-    public static final SCategory category_ = new SCategory("category_");
-
-    public final StringPath categoryDescription = createString("categoryDescription");
-
-    public final StringPath categoryName = createString("categoryName");
-
-    public final NumberPath<Double> createdBy = createNumber("createdBy", Double.class);
-
-    public final DateTimePath<java.sql.Timestamp> creationDate = createDateTime("creationDate", java.sql.Timestamp.class);
-
-    public final DateTimePath<java.sql.Timestamp> deleteDate = createDateTime("deleteDate", java.sql.Timestamp.class);
-
-    public final NumberPath<Double> deletedBy = createNumber("deletedBy", Double.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final DateTimePath<java.sql.Timestamp> modificationDate = createDateTime("modificationDate", java.sql.Timestamp.class);
-
-    public final NumberPath<Double> modifiedBy = createNumber("modifiedBy", Double.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCategory> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCategory_category> _fkc4e60b83561378ab = createInvForeignKey(id, "parentId");
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop_category> _fk851f48d37ab543e8 = createInvForeignKey(id, "childCategories_id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory_categoryprop> _fk8543a2802974945f = createInvForeignKey(id, "category__id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory_category> _fkc4e60b833c83109d = createInvForeignKey(id, "childId");
-
-    public SCategory(String variable) {
-        super(SCategory.class, forVariable(variable), "null", "category_");
-        addMetadata();
-    }
-
-    public SCategory(String variable, String schema, String table) {
-        super(SCategory.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCategory(Path<? extends SCategory> path) {
-        super(path.getType(), path.getMetadata(), "null", "category_");
-        addMetadata();
-    }
-
-    public SCategory(PathMetadata<?> metadata) {
-        super(SCategory.class, metadata, "null", "category_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(categoryDescription, ColumnMetadata.named("categoryDescription").withIndex(2).ofType(12).withSize(255));
-        addMetadata(categoryName, ColumnMetadata.named("categoryName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(createdBy, ColumnMetadata.named("createdBy").withIndex(4).ofType(8).withSize(22).notNull());
-        addMetadata(creationDate, ColumnMetadata.named("creationDate").withIndex(5).ofType(93).withSize(19));
-        addMetadata(deleteDate, ColumnMetadata.named("deleteDate").withIndex(6).ofType(93).withSize(19));
-        addMetadata(deletedBy, ColumnMetadata.named("deletedBy").withIndex(7).ofType(8).withSize(22).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(modificationDate, ColumnMetadata.named("modificationDate").withIndex(8).ofType(93).withSize(19));
-        addMetadata(modifiedBy, ColumnMetadata.named("modifiedBy").withIndex(9).ofType(8).withSize(22).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_category.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_category.java
deleted file mode 100644
index 411225ed64..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_category.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-
-import javax.annotation.Generated;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-
-/**
- * SCategory_category_ is a Querydsl query type for SCategory_category_
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCategory_category extends com.mysema.query.sql.RelationalPathBase<SCategory_category> {
-
-    private static final long serialVersionUID = -771910703;
-
-    public static final SCategory_category category_category_ = new SCategory_category("category__category_");
-
-    public final NumberPath<Long> childId = createNumber("childId", Long.class);
-
-    public final NumberPath<Long> parentId = createNumber("parentId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCategory_category> primary = createPrimaryKey(childId, parentId);
-
-    public final com.mysema.query.sql.ForeignKey<SCategory> fkc4e60b83561378ab = createForeignKey(parentId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory> fkc4e60b833c83109d = createForeignKey(childId, "id");
-
-    public SCategory_category(String variable) {
-        super(SCategory_category.class, forVariable(variable), "null", "category__category_");
-        addMetadata();
-    }
-
-    public SCategory_category(String variable, String schema, String table) {
-        super(SCategory_category.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCategory_category(Path<? extends SCategory_category> path) {
-        super(path.getType(), path.getMetadata(), "null", "category__category_");
-        addMetadata();
-    }
-
-    public SCategory_category(PathMetadata<?> metadata) {
-        super(SCategory_category.class, metadata, "null", "category__category_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(childId, ColumnMetadata.named("childId").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(parentId, ColumnMetadata.named("parentId").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_categoryprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_categoryprop.java
deleted file mode 100644
index 1a2b29bd2c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategory_categoryprop.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCategory_categoryprop is a Querydsl query type for SCategory_categoryprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCategory_categoryprop extends com.mysema.query.sql.RelationalPathBase<SCategory_categoryprop> {
-
-    private static final long serialVersionUID = -1348316210;
-
-    public static final SCategory_categoryprop category_categoryprop_ = new SCategory_categoryprop("category__categoryprop_");
-
-    public final NumberPath<Long> category_id = createNumber("category_id", Long.class);
-
-    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCategory_categoryprop> primary = createPrimaryKey(category_id, propertiesId);
-
-    public final com.mysema.query.sql.ForeignKey<SCategoryprop> fk8543a280fd94cd90 = createForeignKey(propertiesId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory> fk8543a2802974945f = createForeignKey(category_id, "id");
-
-    public SCategory_categoryprop(String variable) {
-        super(SCategory_categoryprop.class, forVariable(variable), "null", "category__categoryprop_");
-        addMetadata();
-    }
-
-    public SCategory_categoryprop(String variable, String schema, String table) {
-        super(SCategory_categoryprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCategory_categoryprop(Path<? extends SCategory_categoryprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "category__categoryprop_");
-        addMetadata();
-    }
-
-    public SCategory_categoryprop(PathMetadata<?> metadata) {
-        super(SCategory_categoryprop.class, metadata, "null", "category__categoryprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(category_id, ColumnMetadata.named("category__id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategoryprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategoryprop.java
deleted file mode 100644
index cf0b1cbed8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCategoryprop.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCategoryprop is a Querydsl query type for SCategoryprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCategoryprop extends com.mysema.query.sql.RelationalPathBase<SCategoryprop> {
-
-    private static final long serialVersionUID = -1013141043;
-
-    public static final SCategoryprop categoryprop_ = new SCategoryprop("categoryprop_");
-
-    public final NumberPath<Long> categoryId = createNumber("categoryId", Long.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath propName = createString("propName");
-
-    public final StringPath propValue = createString("propValue");
-
-    public final com.mysema.query.sql.PrimaryKey<SCategoryprop> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop_categoryprop> _fke0fdb7d0fd94cd90 = createInvForeignKey(id, "properties_id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory_categoryprop> _fk8543a280fd94cd90 = createInvForeignKey(id, "properties_id");
-
-    public SCategoryprop(String variable) {
-        super(SCategoryprop.class, forVariable(variable), "null", "categoryprop_");
-        addMetadata();
-    }
-
-    public SCategoryprop(String variable, String schema, String table) {
-        super(SCategoryprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCategoryprop(Path<? extends SCategoryprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "categoryprop_");
-        addMetadata();
-    }
-
-    public SCategoryprop(PathMetadata<?> metadata) {
-        super(SCategoryprop.class, metadata, "null", "categoryprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(categoryId, ColumnMetadata.named("categoryId").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(propName, ColumnMetadata.named("propName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(propValue, ColumnMetadata.named("propValue").withIndex(4).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SChild2.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SChild2.java
deleted file mode 100644
index 837a877c5d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SChild2.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SChild2 is a Querydsl query type for SChild2
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SChild2 extends com.mysema.query.sql.RelationalPathBase<SChild2> {
-
-    private static final long serialVersionUID = 386731719;
-
-    public static final SChild2 Child2 = new SChild2("Child2");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Integer> parentId = createNumber("parentId", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SChild2> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SParent2> fk783f9ab6c2dbacbc = createForeignKey(parentId, "id");
-
-    public SChild2(String variable) {
-        super(SChild2.class, forVariable(variable), "null", "Child2");
-        addMetadata();
-    }
-
-    public SChild2(String variable, String schema, String table) {
-        super(SChild2.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SChild2(Path<? extends SChild2> path) {
-        super(path.getType(), path.getMetadata(), "null", "Child2");
-        addMetadata();
-    }
-
-    public SChild2(PathMetadata<?> metadata) {
-        super(SChild2.class, metadata, "null", "Child2");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(parentId, ColumnMetadata.named("parent_id").withIndex(2).ofType(4).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java
deleted file mode 100644
index 29c5c04e73..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCompany is a Querydsl query type for SCompany
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCompany extends com.mysema.query.sql.RelationalPathBase<SCompany> {
-
-    private static final long serialVersionUID = 22768499;
-
-    public static final SCompany company_ = new SCompany("company_");
-
-    public final NumberPath<Integer> ceoId = createNumber("ceoId", Integer.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final NumberPath<Integer> ratingOrdinal = createNumber("ratingOrdinal", Integer.class);
-
-    public final StringPath ratingString = createString("ratingString");
-
-    public final com.mysema.query.sql.PrimaryKey<SCompany> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SEmployee> fkdc405382edf003bd = createForeignKey(ceoId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEmployee> _fk9d39ef71dc953998 = createInvForeignKey(id, "company_id");
-
-    public final com.mysema.query.sql.ForeignKey<SUser> _fk6a68df4dc953998 = createInvForeignKey(id, "company_id");
-
-    public final com.mysema.query.sql.ForeignKey<SCompany_department> _fk100ba610f0d30873 = createInvForeignKey(id, "company__id");
-
-    public final com.mysema.query.sql.ForeignKey<SDepartment> _fk1f3a274ddc953998 = createInvForeignKey(id, "company_id");
-
-    public SCompany(String variable) {
-        super(SCompany.class, forVariable(variable), "null", "company_");
-        addMetadata();
-    }
-
-    public SCompany(String variable, String schema, String table) {
-        super(SCompany.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCompany(Path<? extends SCompany> path) {
-        super(path.getType(), path.getMetadata(), "null", "company_");
-        addMetadata();
-    }
-
-    public SCompany(PathMetadata<?> metadata) {
-        super(SCompany.class, metadata, "null", "company_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(ceoId, ColumnMetadata.named("ceo_id").withIndex(5).ofType(4).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-        addMetadata(ratingOrdinal, ColumnMetadata.named("ratingOrdinal").withIndex(3).ofType(4).withSize(10));
-        addMetadata(ratingString, ColumnMetadata.named("ratingString").withIndex(4).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany_department.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany_department.java
deleted file mode 100644
index d01d8d66ef..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCompany_department.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCompany_department is a Querydsl query type for SCompany_department
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCompany_department extends com.mysema.query.sql.RelationalPathBase<SCompany_department> {
-
-    private static final long serialVersionUID = -68475398;
-
-    public static final SCompany_department company_department_ = new SCompany_department("company__department_");
-
-    public final NumberPath<Integer> company_id = createNumber("company_id", Integer.class);
-
-    public final NumberPath<Integer> departmentsId = createNumber("departmentsId", Integer.class);
-
-    public final com.mysema.query.sql.ForeignKey<SDepartment> fk100ba6107d36c84d = createForeignKey(departmentsId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCompany> fk100ba610f0d30873 = createForeignKey(company_id, "id");
-
-    public SCompany_department(String variable) {
-        super(SCompany_department.class, forVariable(variable), "null", "company__department_");
-        addMetadata();
-    }
-
-    public SCompany_department(String variable, String schema, String table) {
-        super(SCompany_department.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCompany_department(Path<? extends SCompany_department> path) {
-        super(path.getType(), path.getMetadata(), "null", "company__department_");
-        addMetadata();
-    }
-
-    public SCompany_department(PathMetadata<?> metadata) {
-        super(SCompany_department.class, metadata, "null", "company__department_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(company_id, ColumnMetadata.named("company__id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(departmentsId, ColumnMetadata.named("departments_id").withIndex(2).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java
deleted file mode 100644
index c4d8e51d26..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SCustomer is a Querydsl query type for SCustomer
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SCustomer extends com.mysema.query.sql.RelationalPathBase<SCustomer> {
-
-    private static final long serialVersionUID = -564764048;
-
-    public static final SCustomer customer_ = new SCustomer("customer_");
-
-    public final NumberPath<Long> currentOrderId = createNumber("currentOrderId", Long.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Long> nameId = createNumber("nameId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SCustomer> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SName> fk600e7c4196a83d9c = createForeignKey(nameId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrder> fk600e7c419cc457f1 = createForeignKey(currentOrderId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SStore_customer> _fk82ba2ce051f3c3e5 = createInvForeignKey(id, "customers_id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrder> _fkc3df62d1b29c27bc = createInvForeignKey(id, "customer_id");
-
-    public SCustomer(String variable) {
-        super(SCustomer.class, forVariable(variable), "null", "customer_");
-        addMetadata();
-    }
-
-    public SCustomer(String variable, String schema, String table) {
-        super(SCustomer.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SCustomer(Path<? extends SCustomer> path) {
-        super(path.getType(), path.getMetadata(), "null", "customer_");
-        addMetadata();
-    }
-
-    public SCustomer(PathMetadata<?> metadata) {
-        super(SCustomer.class, metadata, "null", "customer_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(currentOrderId, ColumnMetadata.named("currentOrder_id").withIndex(2).ofType(-5).withSize(19));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(nameId, ColumnMetadata.named("name_id").withIndex(3).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDateTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDateTest.java
deleted file mode 100644
index fa6cfcab3e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDateTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SDateTest is a Querydsl query type for SDateTest
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDateTest extends com.mysema.query.sql.RelationalPathBase<SDateTest> {
-
-    private static final long serialVersionUID = -1879688879;
-
-    public static final SDateTest dateTest1 = new SDateTest("DATE_TEST");
-
-    public final DatePath<java.sql.Date> dateTest = createDate("dateTest", java.sql.Date.class);
-
-    public SDateTest(String variable) {
-        super(SDateTest.class, forVariable(variable), "null", "DATE_TEST");
-        addMetadata();
-    }
-
-    public SDateTest(String variable, String schema, String table) {
-        super(SDateTest.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SDateTest(Path<? extends SDateTest> path) {
-        super(path.getType(), path.getMetadata(), "null", "DATE_TEST");
-        addMetadata();
-    }
-
-    public SDateTest(PathMetadata<?> metadata) {
-        super(SDateTest.class, metadata, "null", "DATE_TEST");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(dateTest, ColumnMetadata.named("DATE_TEST").withIndex(1).ofType(91).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java
deleted file mode 100644
index 8d169e30c2..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SDepartment is a Querydsl query type for SDepartment
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDepartment extends com.mysema.query.sql.RelationalPathBase<SDepartment> {
-
-    private static final long serialVersionUID = 723598780;
-
-    public static final SDepartment department_ = new SDepartment("department_");
-
-    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SDepartment> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCompany> fk1f3a274ddc953998 = createForeignKey(companyId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCompany_department> _fk100ba6107d36c84d = createInvForeignKey(id, "departments_id");
-
-    public final com.mysema.query.sql.ForeignKey<SDepartment_employee> _fkc33a14ff7d2db0e1 = createInvForeignKey(id, "department__id");
-
-    public SDepartment(String variable) {
-        super(SDepartment.class, forVariable(variable), "null", "department_");
-        addMetadata();
-    }
-
-    public SDepartment(String variable, String schema, String table) {
-        super(SDepartment.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SDepartment(Path<? extends SDepartment> path) {
-        super(path.getType(), path.getMetadata(), "null", "department_");
-        addMetadata();
-    }
-
-    public SDepartment(PathMetadata<?> metadata) {
-        super(SDepartment.class, metadata, "null", "department_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(3).ofType(4).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment_employee.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment_employee.java
deleted file mode 100644
index 48b4d88c3f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment_employee.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SDepartment_employee is a Querydsl query type for SDepartment_employee
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDepartment_employee extends com.mysema.query.sql.RelationalPathBase<SDepartment_employee> {
-
-    private static final long serialVersionUID = 1293706549;
-
-    public static final SDepartment_employee department_employee_ = new SDepartment_employee("department__employee_");
-
-    public final NumberPath<Integer> department_id = createNumber("department_id", Integer.class);
-
-    public final NumberPath<Integer> employeesId = createNumber("employeesId", Integer.class);
-
-    public final com.mysema.query.sql.ForeignKey<SEmployee> fkc33a14ffd846a985 = createForeignKey(employeesId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SDepartment> fkc33a14ff7d2db0e1 = createForeignKey(department_id, "id");
-
-    public SDepartment_employee(String variable) {
-        super(SDepartment_employee.class, forVariable(variable), "null", "department__employee_");
-        addMetadata();
-    }
-
-    public SDepartment_employee(String variable, String schema, String table) {
-        super(SDepartment_employee.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SDepartment_employee(Path<? extends SDepartment_employee> path) {
-        super(path.getType(), path.getMetadata(), "null", "department__employee_");
-        addMetadata();
-    }
-
-    public SDepartment_employee(PathMetadata<?> metadata) {
-        super(SDepartment_employee.class, metadata, "null", "department__employee_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(department_id, ColumnMetadata.named("department__id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(employeesId, ColumnMetadata.named("employees_id").withIndex(2).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java
deleted file mode 100644
index 5e5de2f5bc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SDocument is a Querydsl query type for SDocument
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDocument extends com.mysema.query.sql.RelationalPathBase<SDocument> {
-
-    private static final long serialVersionUID = -1232783149;
-
-    public static final SDocument document_ = new SDocument("document_");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final DatePath<java.sql.Date> validTo = createDate("validTo", java.sql.Date.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SDocument> primary = createPrimaryKey(id);
-
-    public SDocument(String variable) {
-        super(SDocument.class, forVariable(variable), "null", "document_");
-        addMetadata();
-    }
-
-    public SDocument(String variable, String schema, String table) {
-        super(SDocument.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SDocument(Path<? extends SDocument> path) {
-        super(path.getType(), path.getMetadata(), "null", "document_");
-        addMetadata();
-    }
-
-    public SDocument(PathMetadata<?> metadata) {
-        super(SDocument.class, metadata, "null", "document_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-        addMetadata(validTo, ColumnMetadata.named("validTo").withIndex(3).ofType(91).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocumentprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocumentprop.java
deleted file mode 100644
index 4aedd46a03..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocumentprop.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SDocumentprop is a Querydsl query type for SDocumentprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDocumentprop extends com.mysema.query.sql.RelationalPathBase<SDocumentprop> {
-
-    private static final long serialVersionUID = 233547728;
-
-    public static final SDocumentprop documentprop_ = new SDocumentprop("documentprop_");
-
-    public final NumberPath<Double> documentId = createNumber("documentId", Double.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath propName = createString("propName");
-
-    public final StringPath propValue = createString("propValue");
-
-    public final StringPath propValueDetails = createString("propValueDetails");
-
-    public final com.mysema.query.sql.PrimaryKey<SDocumentprop> primary = createPrimaryKey(id);
-
-    public SDocumentprop(String variable) {
-        super(SDocumentprop.class, forVariable(variable), "null", "documentprop_");
-        addMetadata();
-    }
-
-    public SDocumentprop(String variable, String schema, String table) {
-        super(SDocumentprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SDocumentprop(Path<? extends SDocumentprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "documentprop_");
-        addMetadata();
-    }
-
-    public SDocumentprop(PathMetadata<?> metadata) {
-        super(SDocumentprop.class, metadata, "null", "documentprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(documentId, ColumnMetadata.named("documentId").withIndex(2).ofType(8).withSize(22).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(propName, ColumnMetadata.named("propName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(propValue, ColumnMetadata.named("propValue").withIndex(4).ofType(12).withSize(255));
-        addMetadata(propValueDetails, ColumnMetadata.named("propValueDetails").withIndex(5).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java
deleted file mode 100644
index 3487e44af6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-import javax.annotation.Generated;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-
-/**
- * SEmployee is a Querydsl query type for SEmployee
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SEmployee extends com.mysema.query.sql.RelationalPathBase<SEmployee> {
-
-    private static final long serialVersionUID = 461493664;
-
-    public static final SEmployee employee_ = new SEmployee("employee_");
-
-    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
-
-    public final StringPath firstName = createString("firstName");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath lastName = createString("lastName");
-
-    public final NumberPath<Long> userId = createNumber("userId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SEmployee> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCompany> fk9d39ef71dc953998 = createForeignKey(companyId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SUser> fk9d39ef712743b59c = createForeignKey(userId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCompany> _fkdc405382edf003bd = createInvForeignKey(id, "ceo_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEmployeeJobFunctions> _fk49690e2f75b8f5bc = createInvForeignKey(id, "Employee_id");
-
-    public final com.mysema.query.sql.ForeignKey<SDepartment_employee> _fkc33a14ffd846a985 = createInvForeignKey(id, "employees_id");
-
-    public SEmployee(String variable) {
-        super(SEmployee.class, forVariable(variable), "null", "employee_");
-        addMetadata();
-    }
-
-    public SEmployee(String variable, String schema, String table) {
-        super(SEmployee.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SEmployee(Path<? extends SEmployee> path) {
-        super(path.getType(), path.getMetadata(), "null", "employee_");
-        addMetadata();
-    }
-
-    public SEmployee(PathMetadata<?> metadata) {
-        super(SEmployee.class, metadata, "null", "employee_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(4).ofType(4).withSize(10));
-        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(userId, ColumnMetadata.named("user_id").withIndex(5).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployeeJobFunctions.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployeeJobFunctions.java
deleted file mode 100644
index 4eb302c428..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEmployeeJobFunctions.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SEmployeeJobFunctions is a Querydsl query type for SEmployeeJobFunctions
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SEmployeeJobFunctions extends com.mysema.query.sql.RelationalPathBase<SEmployeeJobFunctions> {
-
-    private static final long serialVersionUID = -666645347;
-
-    public static final SEmployeeJobFunctions EmployeeJobFunctions = new SEmployeeJobFunctions("Employee_jobFunctions");
-
-    public final NumberPath<Integer> employeeId = createNumber("employeeId", Integer.class);
-
-    public final StringPath jobfunction = createString("jobfunction");
-
-    public final com.mysema.query.sql.ForeignKey<SEmployee> fk49690e2f75b8f5bc = createForeignKey(employeeId, "id");
-
-    public SEmployeeJobFunctions(String variable) {
-        super(SEmployeeJobFunctions.class, forVariable(variable), "null", "Employee_jobFunctions");
-        addMetadata();
-    }
-
-    public SEmployeeJobFunctions(String variable, String schema, String table) {
-        super(SEmployeeJobFunctions.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SEmployeeJobFunctions(Path<? extends SEmployeeJobFunctions> path) {
-        super(path.getType(), path.getMetadata(), "null", "Employee_jobFunctions");
-        addMetadata();
-    }
-
-    public SEmployeeJobFunctions(PathMetadata<?> metadata) {
-        super(SEmployeeJobFunctions.class, metadata, "null", "Employee_jobFunctions");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(employeeId, ColumnMetadata.named("Employee_id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(jobfunction, ColumnMetadata.named("jobfunction").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEntity1.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEntity1.java
deleted file mode 100644
index 88a757847c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEntity1.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SEntity1 is a Querydsl query type for SEntity1
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SEntity1 extends com.mysema.query.sql.RelationalPathBase<SEntity1> {
-
-    private static final long serialVersionUID = 1060650653;
-
-    public static final SEntity1 Entity1 = new SEntity1("Entity1");
-
-    public final StringPath dtype = createString("dtype");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath property = createString("property");
-
-    public final StringPath property2 = createString("property2");
-
-    public final com.mysema.query.sql.PrimaryKey<SEntity1> primary = createPrimaryKey(id);
-
-    public SEntity1(String variable) {
-        super(SEntity1.class, forVariable(variable), "null", "Entity1");
-        addMetadata();
-    }
-
-    public SEntity1(String variable, String schema, String table) {
-        super(SEntity1.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SEntity1(Path<? extends SEntity1> path) {
-        super(path.getType(), path.getMetadata(), "null", "Entity1");
-        addMetadata();
-    }
-
-    public SEntity1(PathMetadata<?> metadata) {
-        super(SEntity1.class, metadata, "null", "Entity1");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(4).withSize(10).notNull());
-        addMetadata(property, ColumnMetadata.named("property").withIndex(3).ofType(12).withSize(255));
-        addMetadata(property2, ColumnMetadata.named("property2").withIndex(4).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEviltype.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEviltype.java
deleted file mode 100644
index af2302f344..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SEviltype.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SEviltype is a Querydsl query type for SEviltype
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SEviltype extends com.mysema.query.sql.RelationalPathBase<SEviltype> {
-
-    private static final long serialVersionUID = 1348954496;
-
-    public static final SEviltype eviltype_ = new SEviltype("eviltype_");
-
-    public final NumberPath<Integer> _asc = createNumber("_asc", Integer.class);
-
-    public final NumberPath<Integer> _desc = createNumber("_desc", Integer.class);
-
-    public final NumberPath<Integer> getClassId = createNumber("getClassId", Integer.class);
-
-    public final NumberPath<Integer> getId = createNumber("getId", Integer.class);
-
-    public final NumberPath<Integer> getMetadataId = createNumber("getMetadataId", Integer.class);
-
-    public final NumberPath<Integer> getTypeId = createNumber("getTypeId", Integer.class);
-
-    public final NumberPath<Integer> hashCodeId = createNumber("hashCodeId", Integer.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Integer> isnotnullId = createNumber("isnotnullId", Integer.class);
-
-    public final NumberPath<Integer> isnullId = createNumber("isnullId", Integer.class);
-
-    public final NumberPath<Integer> notifyAllId = createNumber("notifyAllId", Integer.class);
-
-    public final NumberPath<Integer> notifyId = createNumber("notifyId", Integer.class);
-
-    public final NumberPath<Integer> toStringId = createNumber("toStringId", Integer.class);
-
-    public final NumberPath<Integer> waitId = createNumber("waitId", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SEviltype> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f83516787cd9e = createForeignKey(toStringId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f835114c0ad20 = createForeignKey(_desc, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f835151e065d5 = createForeignKey(waitId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f83517e62bab2 = createForeignKey(notifyAllId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351c4df9054 = createForeignKey(getId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f835112489019 = createForeignKey(isnullId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351b09c8448 = createForeignKey(getClassId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f835180b69f81 = createForeignKey(notifyId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351b71279da = createForeignKey(getTypeId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351226ee98f = createForeignKey(hashCodeId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351f5ec12fa = createForeignKey(isnotnullId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f8351f839f62 = createForeignKey(_asc, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> fkd21f83512d7708c5 = createForeignKey(getMetadataId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f83516787cd9e = createInvForeignKey(id, "toString_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f835114c0ad20 = createInvForeignKey(id, "_desc");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f835151e065d5 = createInvForeignKey(id, "wait_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f83517e62bab2 = createInvForeignKey(id, "notifyAll_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351c4df9054 = createInvForeignKey(id, "get_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f835112489019 = createInvForeignKey(id, "isnull_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351b09c8448 = createInvForeignKey(id, "getClass_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f835180b69f81 = createInvForeignKey(id, "notify_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351b71279da = createInvForeignKey(id, "getType_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351226ee98f = createInvForeignKey(id, "hashCode_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351f5ec12fa = createInvForeignKey(id, "isnotnull_id");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f8351f839f62 = createInvForeignKey(id, "_asc");
-
-    public final com.mysema.query.sql.ForeignKey<SEviltype> _fkd21f83512d7708c5 = createInvForeignKey(id, "getMetadata_id");
-
-    public SEviltype(String variable) {
-        super(SEviltype.class, forVariable(variable), "null", "eviltype_");
-        addMetadata();
-    }
-
-    public SEviltype(String variable, String schema, String table) {
-        super(SEviltype.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SEviltype(Path<? extends SEviltype> path) {
-        super(path.getType(), path.getMetadata(), "null", "eviltype_");
-        addMetadata();
-    }
-
-    public SEviltype(PathMetadata<?> metadata) {
-        super(SEviltype.class, metadata, "null", "eviltype_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(_asc, ColumnMetadata.named("_asc").withIndex(2).ofType(4).withSize(10));
-        addMetadata(_desc, ColumnMetadata.named("_desc").withIndex(3).ofType(4).withSize(10));
-        addMetadata(getClassId, ColumnMetadata.named("getClass_id").withIndex(5).ofType(4).withSize(10));
-        addMetadata(getId, ColumnMetadata.named("get_id").withIndex(4).ofType(4).withSize(10));
-        addMetadata(getMetadataId, ColumnMetadata.named("getMetadata_id").withIndex(6).ofType(4).withSize(10));
-        addMetadata(getTypeId, ColumnMetadata.named("getType_id").withIndex(7).ofType(4).withSize(10));
-        addMetadata(hashCodeId, ColumnMetadata.named("hashCode_id").withIndex(8).ofType(4).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(isnotnullId, ColumnMetadata.named("isnotnull_id").withIndex(9).ofType(4).withSize(10));
-        addMetadata(isnullId, ColumnMetadata.named("isnull_id").withIndex(10).ofType(4).withSize(10));
-        addMetadata(notifyAllId, ColumnMetadata.named("notifyAll_id").withIndex(12).ofType(4).withSize(10));
-        addMetadata(notifyId, ColumnMetadata.named("notify_id").withIndex(11).ofType(4).withSize(10));
-        addMetadata(toStringId, ColumnMetadata.named("toString_id").withIndex(13).ofType(4).withSize(10));
-        addMetadata(waitId, ColumnMetadata.named("wait_id").withIndex(14).ofType(4).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java
deleted file mode 100644
index ec8c739361..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SFoo is a Querydsl query type for SFoo
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SFoo extends com.mysema.query.sql.RelationalPathBase<SFoo> {
-
-    private static final long serialVersionUID = -1389443894;
-
-    public static final SFoo foo_ = new SFoo("foo_");
-
-    public final StringPath bar = createString("bar");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final DatePath<java.sql.Date> startDate = createDate("startDate", java.sql.Date.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SFoo> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SFooNames> _fkb6129a8f94e297f8 = createInvForeignKey(id, "foo_id");
-
-    public SFoo(String variable) {
-        super(SFoo.class, forVariable(variable), "null", "foo_");
-        addMetadata();
-    }
-
-    public SFoo(String variable, String schema, String table) {
-        super(SFoo.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SFoo(Path<? extends SFoo> path) {
-        super(path.getType(), path.getMetadata(), "null", "foo_");
-        addMetadata();
-    }
-
-    public SFoo(PathMetadata<?> metadata) {
-        super(SFoo.class, metadata, "null", "foo_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(bar, ColumnMetadata.named("bar").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(startDate, ColumnMetadata.named("startDate").withIndex(3).ofType(91).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFooNames.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFooNames.java
deleted file mode 100644
index 4a3b5f1486..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFooNames.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SFooNames is a Querydsl query type for SFooNames
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SFooNames extends com.mysema.query.sql.RelationalPathBase<SFooNames> {
-
-    private static final long serialVersionUID = 982089235;
-
-    public static final SFooNames fooNames = new SFooNames("foo_names");
-
-    public final NumberPath<Integer> fooId = createNumber("fooId", Integer.class);
-
-    public final StringPath names = createString("names");
-
-    public final com.mysema.query.sql.ForeignKey<SFoo> fkb6129a8f94e297f8 = createForeignKey(fooId, "id");
-
-    public SFooNames(String variable) {
-        super(SFooNames.class, forVariable(variable), "null", "foo_names");
-        addMetadata();
-    }
-
-    public SFooNames(String variable, String schema, String table) {
-        super(SFooNames.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SFooNames(Path<? extends SFooNames> path) {
-        super(path.getType(), path.getMetadata(), "null", "foo_names");
-        addMetadata();
-    }
-
-    public SFooNames(PathMetadata<?> metadata) {
-        super(SFooNames.class, metadata, "null", "foo_names");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(fooId, ColumnMetadata.named("foo_id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(names, ColumnMetadata.named("names").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java
deleted file mode 100644
index 439559f290..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SFormula is a Querydsl query type for SFormula
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SFormula extends com.mysema.query.sql.RelationalPathBase<SFormula> {
-
-    private static final long serialVersionUID = 1097200554;
-
-    public static final SFormula formula_ = new SFormula("formula_");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final NumberPath<Long> parameterId = createNumber("parameterId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SFormula> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SParameter> fk1c4adbb924189298 = createForeignKey(parameterId, "id");
-
-    public SFormula(String variable) {
-        super(SFormula.class, forVariable(variable), "null", "formula_");
-        addMetadata();
-    }
-
-    public SFormula(String variable, String schema, String table) {
-        super(SFormula.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SFormula(Path<? extends SFormula> path) {
-        super(path.getType(), path.getMetadata(), "null", "formula_");
-        addMetadata();
-    }
-
-    public SFormula(PathMetadata<?> metadata) {
-        super(SFormula.class, metadata, "null", "formula_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(parameterId, ColumnMetadata.named("parameter_id").withIndex(2).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SGeneratedKeys.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SGeneratedKeys.java
deleted file mode 100644
index 3c98229115..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SGeneratedKeys.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SGeneratedKeys is a Querydsl query type for SGeneratedKeys
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SGeneratedKeys extends com.mysema.query.sql.RelationalPathBase<SGeneratedKeys> {
-
-    private static final long serialVersionUID = 379851474;
-
-    public static final SGeneratedKeys generatedKeys = new SGeneratedKeys("GENERATED_KEYS");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SGeneratedKeys> primary = createPrimaryKey(id);
-
-    public SGeneratedKeys(String variable) {
-        super(SGeneratedKeys.class, forVariable(variable), "null", "GENERATED_KEYS");
-        addMetadata();
-    }
-
-    public SGeneratedKeys(String variable, String schema, String table) {
-        super(SGeneratedKeys.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SGeneratedKeys(Path<? extends SGeneratedKeys> path) {
-        super(path.getType(), path.getMetadata(), "null", "GENERATED_KEYS");
-        addMetadata();
-    }
-
-    public SGeneratedKeys(PathMetadata<?> metadata) {
-        super(SGeneratedKeys.class, metadata, "null", "GENERATED_KEYS");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(name, ColumnMetadata.named("NAME").withIndex(2).ofType(12).withSize(30));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SHumanHairs.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SHumanHairs.java
deleted file mode 100644
index f72df061a1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SHumanHairs.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SHumanHairs is a Querydsl query type for SHumanHairs
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SHumanHairs extends com.mysema.query.sql.RelationalPathBase<SHumanHairs> {
-
-    private static final long serialVersionUID = 1372028757;
-
-    public static final SHumanHairs HumanHairs = new SHumanHairs("Human_hairs");
-
-    public final NumberPath<Integer> hairs = createNumber("hairs", Integer.class);
-
-    public final NumberPath<Long> humanId = createNumber("humanId", Long.class);
-
-    public final com.mysema.query.sql.ForeignKey<SMammal> fk6649531ff097e318 = createForeignKey(humanId, "id");
-
-    public SHumanHairs(String variable) {
-        super(SHumanHairs.class, forVariable(variable), "null", "Human_hairs");
-        addMetadata();
-    }
-
-    public SHumanHairs(String variable, String schema, String table) {
-        super(SHumanHairs.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SHumanHairs(Path<? extends SHumanHairs> path) {
-        super(path.getType(), path.getMetadata(), "null", "Human_hairs");
-        addMetadata();
-    }
-
-    public SHumanHairs(PathMetadata<?> metadata) {
-        super(SHumanHairs.class, metadata, "null", "Human_hairs");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(hairs, ColumnMetadata.named("hairs").withIndex(2).ofType(4).withSize(10));
-        addMetadata(humanId, ColumnMetadata.named("Human_id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java
deleted file mode 100644
index 6254246453..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SInheritedproperties is a Querydsl query type for SInheritedproperties
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SInheritedproperties extends com.mysema.query.sql.RelationalPathBase<SInheritedproperties> {
-
-    private static final long serialVersionUID = -992601885;
-
-    public static final SInheritedproperties inheritedproperties_ = new SInheritedproperties("inheritedproperties_");
-
-    public final StringPath classProperty = createString("classProperty");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath stringAsSimple = createString("stringAsSimple");
-
-    public final StringPath superclassProperty = createString("superclassProperty");
-
-    public final com.mysema.query.sql.PrimaryKey<SInheritedproperties> primary = createPrimaryKey(id);
-
-    public SInheritedproperties(String variable) {
-        super(SInheritedproperties.class, forVariable(variable), "null", "inheritedproperties_");
-        addMetadata();
-    }
-
-    public SInheritedproperties(String variable, String schema, String table) {
-        super(SInheritedproperties.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SInheritedproperties(Path<? extends SInheritedproperties> path) {
-        super(path.getType(), path.getMetadata(), "null", "inheritedproperties_");
-        addMetadata();
-    }
-
-    public SInheritedproperties(PathMetadata<?> metadata) {
-        super(SInheritedproperties.class, metadata, "null", "inheritedproperties_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(classProperty, ColumnMetadata.named("classProperty").withIndex(4).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(stringAsSimple, ColumnMetadata.named("stringAsSimple").withIndex(2).ofType(12).withSize(255));
-        addMetadata(superclassProperty, ColumnMetadata.named("superclassProperty").withIndex(3).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java
deleted file mode 100644
index 539a95e40a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SItem is a Querydsl query type for SItem
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SItem extends com.mysema.query.sql.RelationalPathBase<SItem> {
-
-    private static final long serialVersionUID = -120177317;
-
-    public static final SItem item_ = new SItem("item_");
-
-    public final NumberPath<Long> currentStatusId = createNumber("currentStatusId", Long.class);
-
-    public final StringPath dtype = createString("dtype");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final NumberPath<Integer> paymentStatus = createNumber("paymentStatus", Integer.class);
-
-    public final NumberPath<Long> productId = createNumber("productId", Long.class);
-
-    public final NumberPath<Long> statusId = createNumber("statusId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SItem> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SStatus> fk5fde7acd23307bc = createForeignKey(statusId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SStatus> fk5fde7ac9ea26263 = createForeignKey(currentStatusId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fk5fde7ac2c7f0c58 = createForeignKey(productId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SAuditlog> _fkb88fbf6ae26109c = createInvForeignKey(id, "item_id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem> _fk5fde7ac2c7f0c58 = createInvForeignKey(id, "product_id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrder_item> _fk1b5e8cbe7640c8cf = createInvForeignKey(id, "items_id");
-
-    public final com.mysema.query.sql.ForeignKey<SPrice> _fkc59678362c7f0c58 = createInvForeignKey(id, "product_id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem_statuschange> _fkcb99fb2aedc50192 = createInvForeignKey(id, "item__id");
-
-    public final com.mysema.query.sql.ForeignKey<SLineItems> _fkb2e400c3d8e44c3 = createInvForeignKey(id, "lineItems_id");
-
-    public SItem(String variable) {
-        super(SItem.class, forVariable(variable), "null", "item_");
-        addMetadata();
-    }
-
-    public SItem(String variable, String schema, String table) {
-        super(SItem.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SItem(Path<? extends SItem> path) {
-        super(path.getType(), path.getMetadata(), "null", "item_");
-        addMetadata();
-    }
-
-    public SItem(PathMetadata<?> metadata) {
-        super(SItem.class, metadata, "null", "item_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(currentStatusId, ColumnMetadata.named("currentStatus_id").withIndex(6).ofType(-5).withSize(19));
-        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(4).ofType(12).withSize(255));
-        addMetadata(paymentStatus, ColumnMetadata.named("paymentStatus").withIndex(3).ofType(4).withSize(10));
-        addMetadata(productId, ColumnMetadata.named("product_id").withIndex(5).ofType(-5).withSize(19));
-        addMetadata(statusId, ColumnMetadata.named("status_id").withIndex(7).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem_statuschange.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem_statuschange.java
deleted file mode 100644
index 8fc74603cc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SItem_statuschange.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SItem_statuschange is a Querydsl query type for SItem_statuschange
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SItem_statuschange extends com.mysema.query.sql.RelationalPathBase<SItem_statuschange> {
-
-    private static final long serialVersionUID = 210676994;
-
-    public static final SItem_statuschange item_statuschange_ = new SItem_statuschange("item__statuschange_");
-
-    public final NumberPath<Long> item_id = createNumber("item_id", Long.class);
-
-    public final NumberPath<Long> statusChangesId = createNumber("statusChangesId", Long.class);
-
-    public final com.mysema.query.sql.ForeignKey<SStatuschange> fkcb99fb2ab2bd098d = createForeignKey(statusChangesId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fkcb99fb2aedc50192 = createForeignKey(item_id, "id");
-
-    public SItem_statuschange(String variable) {
-        super(SItem_statuschange.class, forVariable(variable), "null", "item__statuschange_");
-        addMetadata();
-    }
-
-    public SItem_statuschange(String variable, String schema, String table) {
-        super(SItem_statuschange.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SItem_statuschange(Path<? extends SItem_statuschange> path) {
-        super(path.getType(), path.getMetadata(), "null", "item__statuschange_");
-        addMetadata();
-    }
-
-    public SItem_statuschange(PathMetadata<?> metadata) {
-        super(SItem_statuschange.class, metadata, "null", "item__statuschange_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(item_id, ColumnMetadata.named("item__id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(statusChangesId, ColumnMetadata.named("statusChanges_id").withIndex(2).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java
deleted file mode 100644
index 8451c3be5e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SKittens is a Querydsl query type for SKittens
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SKittens extends com.mysema.query.sql.RelationalPathBase<SKittens> {
-
-    private static final long serialVersionUID = 1947872699;
-
-    public static final SKittens kittens = new SKittens("kittens");
-
-    public final NumberPath<Integer> catId = createNumber("catId", Integer.class);
-
-    public final NumberPath<Integer> ind = createNumber("ind", Integer.class);
-
-    public final NumberPath<Integer> kittenId = createNumber("kittenId", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SKittens> primary = createPrimaryKey(catId, ind);
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> fkd60087cc3881aaa7 = createForeignKey(kittenId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> fkd60087cc8f00fdf8 = createForeignKey(catId, "id");
-
-    public SKittens(String variable) {
-        super(SKittens.class, forVariable(variable), "null", "kittens");
-        addMetadata();
-    }
-
-    public SKittens(String variable, String schema, String table) {
-        super(SKittens.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SKittens(Path<? extends SKittens> path) {
-        super(path.getType(), path.getMetadata(), "null", "kittens");
-        addMetadata();
-    }
-
-    public SKittens(PathMetadata<?> metadata) {
-        super(SKittens.class, metadata, "null", "kittens");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(catId, ColumnMetadata.named("cat_id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(ind, ColumnMetadata.named("ind").withIndex(3).ofType(4).withSize(10).notNull());
-        addMetadata(kittenId, ColumnMetadata.named("kitten_id").withIndex(2).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java
deleted file mode 100644
index a10b9fc028..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SKittensSet is a Querydsl query type for SKittensSet
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SKittensSet extends com.mysema.query.sql.RelationalPathBase<SKittensSet> {
-
-    private static final long serialVersionUID = -227477337;
-
-    public static final SKittensSet kittensSet = new SKittensSet("kittens_set");
-
-    public final NumberPath<Integer> catId = createNumber("catId", Integer.class);
-
-    public final NumberPath<Integer> kittenId = createNumber("kittenId", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SKittensSet> primary = createPrimaryKey(catId, kittenId);
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> fk4fccad6f8f00fdf8 = createForeignKey(catId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SAnimal> fk4fccad6f3881aaa7 = createForeignKey(kittenId, "id");
-
-    public SKittensSet(String variable) {
-        super(SKittensSet.class, forVariable(variable), "null", "kittens_set");
-        addMetadata();
-    }
-
-    public SKittensSet(String variable, String schema, String table) {
-        super(SKittensSet.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SKittensSet(Path<? extends SKittensSet> path) {
-        super(path.getType(), path.getMetadata(), "null", "kittens_set");
-        addMetadata();
-    }
-
-    public SKittensSet(PathMetadata<?> metadata) {
-        super(SKittensSet.class, metadata, "null", "kittens_set");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(catId, ColumnMetadata.named("cat_id").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(kittenId, ColumnMetadata.named("kitten_id").withIndex(2).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLibrary.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLibrary.java
deleted file mode 100644
index 1240ca9963..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLibrary.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SLibrary is a Querydsl query type for SLibrary
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SLibrary extends com.mysema.query.sql.RelationalPathBase<SLibrary> {
-
-    private static final long serialVersionUID = 1480035061;
-
-    public static final SLibrary library_ = new SLibrary("library_");
-
-    public final NumberPath<Long> identity = createNumber("identity", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SLibrary> primary = createPrimaryKey(identity);
-
-    public final com.mysema.query.sql.ForeignKey<SBookversion> _fkef4bc070e364cd17 = createInvForeignKey(identity, "library_identity");
-
-    public SLibrary(String variable) {
-        super(SLibrary.class, forVariable(variable), "null", "library_");
-        addMetadata();
-    }
-
-    public SLibrary(String variable, String schema, String table) {
-        super(SLibrary.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SLibrary(Path<? extends SLibrary> path) {
-        super(path.getType(), path.getMetadata(), "null", "library_");
-        addMetadata();
-    }
-
-    public SLibrary(PathMetadata<?> metadata) {
-        super(SLibrary.class, metadata, "null", "library_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(identity, ColumnMetadata.named("identity").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLineItems.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLineItems.java
deleted file mode 100644
index 9d5ec7f4de..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLineItems.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SLineItems is a Querydsl query type for SLineItems
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SLineItems extends com.mysema.query.sql.RelationalPathBase<SLineItems> {
-
-    private static final long serialVersionUID = 302253659;
-
-    public static final SLineItems LineItems = new SLineItems("LineItems");
-
-    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
-
-    public final NumberPath<Long> lineItemsId = createNumber("lineItemsId", Long.class);
-
-    public final NumberPath<Long> order_id = createNumber("order_id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SLineItems> primary = createPrimaryKey(_index, order_id);
-
-    public final com.mysema.query.sql.ForeignKey<SOrder> fkb2e400cb968f515 = createForeignKey(order_id, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fkb2e400c3d8e44c3 = createForeignKey(lineItemsId, "id");
-
-    public SLineItems(String variable) {
-        super(SLineItems.class, forVariable(variable), "null", "LineItems");
-        addMetadata();
-    }
-
-    public SLineItems(String variable, String schema, String table) {
-        super(SLineItems.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SLineItems(Path<? extends SLineItems> path) {
-        super(path.getType(), path.getMetadata(), "null", "LineItems");
-        addMetadata();
-    }
-
-    public SLineItems(PathMetadata<?> metadata) {
-        super(SLineItems.class, metadata, "null", "LineItems");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
-        addMetadata(lineItemsId, ColumnMetadata.named("lineItems_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(order_id, ColumnMetadata.named("order__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java
deleted file mode 100644
index c1db61cc0f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SLocation is a Querydsl query type for SLocation
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SLocation extends com.mysema.query.sql.RelationalPathBase<SLocation> {
-
-    private static final long serialVersionUID = 921451897;
-
-    public static final SLocation location_ = new SLocation("location_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SLocation> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SStore> _fkcad4239e8a55845c = createInvForeignKey(id, "location_id");
-
-    public SLocation(String variable) {
-        super(SLocation.class, forVariable(variable), "null", "location_");
-        addMetadata();
-    }
-
-    public SLocation(String variable, String schema, String table) {
-        super(SLocation.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SLocation(Path<? extends SLocation> path) {
-        super(path.getType(), path.getMetadata(), "null", "location_");
-        addMetadata();
-    }
-
-    public SLocation(PathMetadata<?> metadata) {
-        super(SLocation.class, metadata, "null", "location_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SMammal.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SMammal.java
deleted file mode 100644
index b544c220aa..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SMammal.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SMammal is a Querydsl query type for SMammal
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SMammal extends com.mysema.query.sql.RelationalPathBase<SMammal> {
-
-    private static final long serialVersionUID = 666678672;
-
-    public static final SMammal Mammal = new SMammal("Mammal");
-
-    public final StringPath dtype = createString("dtype");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SMammal> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SHumanHairs> _fk6649531ff097e318 = createInvForeignKey(id, "Human_id");
-
-    public final com.mysema.query.sql.ForeignKey<SWorldMammal> _fk4070aeece01c8ee7 = createInvForeignKey(id, "mammals_id");
-
-    public SMammal(String variable) {
-        super(SMammal.class, forVariable(variable), "null", "Mammal");
-        addMetadata();
-    }
-
-    public SMammal(String variable, String schema, String table) {
-        super(SMammal.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SMammal(Path<? extends SMammal> path) {
-        super(path.getType(), path.getMetadata(), "null", "Mammal");
-        addMetadata();
-    }
-
-    public SMammal(PathMetadata<?> metadata) {
-        super(SMammal.class, metadata, "null", "Mammal");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SName.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SName.java
deleted file mode 100644
index a89072cb9a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SName.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SName is a Querydsl query type for SName
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SName extends com.mysema.query.sql.RelationalPathBase<SName> {
-
-    private static final long serialVersionUID = -116118301;
-
-    public static final SName name_ = new SName("name_");
-
-    public final StringPath firstName = createString("firstName");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath lastName = createString("lastName");
-
-    public final StringPath nickName = createString("nickName");
-
-    public final com.mysema.query.sql.PrimaryKey<SName> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCustomer> _fk600e7c4196a83d9c = createInvForeignKey(id, "name_id");
-
-    public SName(String variable) {
-        super(SName.class, forVariable(variable), "null", "name_");
-        addMetadata();
-    }
-
-    public SName(String variable, String schema, String table) {
-        super(SName.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SName(Path<? extends SName> path) {
-        super(path.getType(), path.getMetadata(), "null", "name_");
-        addMetadata();
-    }
-
-    public SName(PathMetadata<?> metadata) {
-        super(SName.class, metadata, "null", "name_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(nickName, ColumnMetadata.named("nickName").withIndex(4).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNameListNames.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNameListNames.java
deleted file mode 100644
index 790cf767fa..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNameListNames.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SNameListNames is a Querydsl query type for SNameListNames
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SNameListNames extends com.mysema.query.sql.RelationalPathBase<SNameListNames> {
-
-    private static final long serialVersionUID = 150303150;
-
-    public static final SNameListNames NameListNames = new SNameListNames("NameList_names");
-
-    public final NumberPath<Long> nameListId = createNumber("nameListId", Long.class);
-
-    public final StringPath names = createString("names");
-
-    public final com.mysema.query.sql.ForeignKey<SNamelist> fkd6c82d7217b6c3fc = createForeignKey(nameListId, "id");
-
-    public SNameListNames(String variable) {
-        super(SNameListNames.class, forVariable(variable), "null", "NameList_names");
-        addMetadata();
-    }
-
-    public SNameListNames(String variable, String schema, String table) {
-        super(SNameListNames.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SNameListNames(Path<? extends SNameListNames> path) {
-        super(path.getType(), path.getMetadata(), "null", "NameList_names");
-        addMetadata();
-    }
-
-    public SNameListNames(PathMetadata<?> metadata) {
-        super(SNameListNames.class, metadata, "null", "NameList_names");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(nameListId, ColumnMetadata.named("NameList_id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(names, ColumnMetadata.named("names").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java
deleted file mode 100644
index cb51ed2087..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SNamed is a Querydsl query type for SNamed
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SNamed extends com.mysema.query.sql.RelationalPathBase<SNamed> {
-
-    private static final long serialVersionUID = 695300215;
-
-    public static final SNamed named_ = new SNamed("named_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SNamed> primary = createPrimaryKey(id);
-
-    public SNamed(String variable) {
-        super(SNamed.class, forVariable(variable), "null", "named_");
-        addMetadata();
-    }
-
-    public SNamed(String variable, String schema, String table) {
-        super(SNamed.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SNamed(Path<? extends SNamed> path) {
-        super(path.getType(), path.getMetadata(), "null", "named_");
-        addMetadata();
-    }
-
-    public SNamed(PathMetadata<?> metadata) {
-        super(SNamed.class, metadata, "null", "named_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java
deleted file mode 100644
index c8dccc82b7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SNamelist is a Querydsl query type for SNamelist
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SNamelist extends com.mysema.query.sql.RelationalPathBase<SNamelist> {
-
-    private static final long serialVersionUID = -930763259;
-
-    public static final SNamelist namelist_ = new SNamelist("namelist_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SNamelist> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SNameListNames> _fkd6c82d7217b6c3fc = createInvForeignKey(id, "NameList_id");
-
-    public SNamelist(String variable) {
-        super(SNamelist.class, forVariable(variable), "null", "namelist_");
-        addMetadata();
-    }
-
-    public SNamelist(String variable, String schema, String table) {
-        super(SNamelist.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SNamelist(Path<? extends SNamelist> path) {
-        super(path.getType(), path.getMetadata(), "null", "namelist_");
-        addMetadata();
-    }
-
-    public SNamelist(PathMetadata<?> metadata) {
-        super(SNamelist.class, metadata, "null", "namelist_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java
deleted file mode 100644
index 13dee5532b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SNationality is a Querydsl query type for SNationality
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SNationality extends com.mysema.query.sql.RelationalPathBase<SNationality> {
-
-    private static final long serialVersionUID = 478851476;
-
-    public static final SNationality nationality_ = new SNationality("nationality_");
-
-    public final NumberPath<Integer> calendarId = createNumber("calendarId", Integer.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SNationality> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCalendar> fkab8efa23591ebbc = createForeignKey(calendarId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SPerson> _fkd78fcfaaf6578e38 = createInvForeignKey(id, "nationality_id");
-
-    public SNationality(String variable) {
-        super(SNationality.class, forVariable(variable), "null", "nationality_");
-        addMetadata();
-    }
-
-    public SNationality(String variable, String schema, String table) {
-        super(SNationality.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SNationality(Path<? extends SNationality> path) {
-        super(path.getType(), path.getMetadata(), "null", "nationality_");
-        addMetadata();
-    }
-
-    public SNationality(PathMetadata<?> metadata) {
-        super(SNationality.class, metadata, "null", "nationality_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(calendarId, ColumnMetadata.named("calendar_id").withIndex(2).ofType(4).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNumeric.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNumeric.java
deleted file mode 100644
index 0ec9525598..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SNumeric.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SNumeric is a Querydsl query type for SNumeric
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SNumeric extends com.mysema.query.sql.RelationalPathBase<SNumeric> {
-
-    private static final long serialVersionUID = -1260757277;
-
-    public static final SNumeric numeric_ = new SNumeric("numeric_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<java.math.BigDecimal> value = createNumber("value", java.math.BigDecimal.class);
-
-    public final NumberPath<java.math.BigDecimal> value_ = createNumber("value_", java.math.BigDecimal.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SNumeric> primary = createPrimaryKey(id);
-
-    public SNumeric(String variable) {
-        super(SNumeric.class, forVariable(variable), "null", "numeric_");
-        addMetadata();
-    }
-
-    public SNumeric(String variable, String schema, String table) {
-        super(SNumeric.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SNumeric(Path<? extends SNumeric> path) {
-        super(path.getType(), path.getMetadata(), "null", "numeric_");
-        addMetadata();
-    }
-
-    public SNumeric(PathMetadata<?> metadata) {
-        super(SNumeric.class, metadata, "null", "numeric_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(value, ColumnMetadata.named("value").withIndex(2).ofType(3).withSize(19).withDigits(2));
-        addMetadata(value_, ColumnMetadata.named("value_").withIndex(3).ofType(3).withSize(19).withDigits(2));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java
deleted file mode 100644
index 2833fa7952..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SOrder is a Querydsl query type for SOrder
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SOrder extends com.mysema.query.sql.RelationalPathBase<SOrder> {
-
-    private static final long serialVersionUID = 739361538;
-
-    public static final SOrder order_ = new SOrder("order_");
-
-    public final NumberPath<Integer> customerId = createNumber("customerId", Integer.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final BooleanPath paid = createBoolean("paid");
-
-    public final com.mysema.query.sql.PrimaryKey<SOrder> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCustomer> fkc3df62d1b29c27bc = createForeignKey(customerId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrder_item> _fk1b5e8cbeb968f515 = createInvForeignKey(id, "order__id");
-
-    public final com.mysema.query.sql.ForeignKey<SCustomer> _fk600e7c419cc457f1 = createInvForeignKey(id, "currentOrder_id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrderDeliveredItemIndices> _fk30cbd6611a4d2378 = createInvForeignKey(id, "Order_id");
-
-    public final com.mysema.query.sql.ForeignKey<SLineItems> _fkb2e400cb968f515 = createInvForeignKey(id, "order__id");
-
-    public SOrder(String variable) {
-        super(SOrder.class, forVariable(variable), "null", "order_");
-        addMetadata();
-    }
-
-    public SOrder(String variable, String schema, String table) {
-        super(SOrder.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SOrder(Path<? extends SOrder> path) {
-        super(path.getType(), path.getMetadata(), "null", "order_");
-        addMetadata();
-    }
-
-    public SOrder(PathMetadata<?> metadata) {
-        super(SOrder.class, metadata, "null", "order_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(customerId, ColumnMetadata.named("customer_id").withIndex(3).ofType(4).withSize(10));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(paid, ColumnMetadata.named("paid").withIndex(2).ofType(-7).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrderDeliveredItemIndices.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrderDeliveredItemIndices.java
deleted file mode 100644
index 0ec3dcc8b6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrderDeliveredItemIndices.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SOrderDeliveredItemIndices is a Querydsl query type for SOrderDeliveredItemIndices
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SOrderDeliveredItemIndices extends com.mysema.query.sql.RelationalPathBase<SOrderDeliveredItemIndices> {
-
-    private static final long serialVersionUID = 860822157;
-
-    public static final SOrderDeliveredItemIndices OrderDeliveredItemIndices = new SOrderDeliveredItemIndices("Order_deliveredItemIndices");
-
-    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
-
-    public final NumberPath<Integer> deliveredItemIndices = createNumber("deliveredItemIndices", Integer.class);
-
-    public final NumberPath<Long> orderId = createNumber("orderId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SOrderDeliveredItemIndices> primary = createPrimaryKey(orderId, _index);
-
-    public final com.mysema.query.sql.ForeignKey<SOrder> fk30cbd6611a4d2378 = createForeignKey(orderId, "id");
-
-    public SOrderDeliveredItemIndices(String variable) {
-        super(SOrderDeliveredItemIndices.class, forVariable(variable), "null", "Order_deliveredItemIndices");
-        addMetadata();
-    }
-
-    public SOrderDeliveredItemIndices(String variable, String schema, String table) {
-        super(SOrderDeliveredItemIndices.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SOrderDeliveredItemIndices(Path<? extends SOrderDeliveredItemIndices> path) {
-        super(path.getType(), path.getMetadata(), "null", "Order_deliveredItemIndices");
-        addMetadata();
-    }
-
-    public SOrderDeliveredItemIndices(PathMetadata<?> metadata) {
-        super(SOrderDeliveredItemIndices.class, metadata, "null", "Order_deliveredItemIndices");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
-        addMetadata(deliveredItemIndices, ColumnMetadata.named("deliveredItemIndices").withIndex(2).ofType(4).withSize(10));
-        addMetadata(orderId, ColumnMetadata.named("Order_id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder_item.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder_item.java
deleted file mode 100644
index d8f7206f1b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SOrder_item.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SOrder_item is a Querydsl query type for SOrder_item
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SOrder_item extends com.mysema.query.sql.RelationalPathBase<SOrder_item> {
-
-    private static final long serialVersionUID = -2131249686;
-
-    public static final SOrder_item order_item_ = new SOrder_item("order__item_");
-
-    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
-
-    public final NumberPath<Long> itemsId = createNumber("itemsId", Long.class);
-
-    public final NumberPath<Long> order_id = createNumber("order_id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SOrder_item> primary = createPrimaryKey(_index, order_id);
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fk1b5e8cbe7640c8cf = createForeignKey(itemsId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SOrder> fk1b5e8cbeb968f515 = createForeignKey(order_id, "id");
-
-    public SOrder_item(String variable) {
-        super(SOrder_item.class, forVariable(variable), "null", "order__item_");
-        addMetadata();
-    }
-
-    public SOrder_item(String variable, String schema, String table) {
-        super(SOrder_item.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SOrder_item(Path<? extends SOrder_item> path) {
-        super(path.getType(), path.getMetadata(), "null", "order__item_");
-        addMetadata();
-    }
-
-    public SOrder_item(PathMetadata<?> metadata) {
-        super(SOrder_item.class, metadata, "null", "order__item_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
-        addMetadata(itemsId, ColumnMetadata.named("items_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(order_id, ColumnMetadata.named("order__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java
deleted file mode 100644
index 368bc77790..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SParameter is a Querydsl query type for SParameter
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SParameter extends com.mysema.query.sql.RelationalPathBase<SParameter> {
-
-    private static final long serialVersionUID = 1712103815;
-
-    public static final SParameter parameter_ = new SParameter("parameter_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SParameter> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SFormula> _fk1c4adbb924189298 = createInvForeignKey(id, "parameter_id");
-
-    public SParameter(String variable) {
-        super(SParameter.class, forVariable(variable), "null", "parameter_");
-        addMetadata();
-    }
-
-    public SParameter(String variable, String schema, String table) {
-        super(SParameter.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SParameter(Path<? extends SParameter> path) {
-        super(path.getType(), path.getMetadata(), "null", "parameter_");
-        addMetadata();
-    }
-
-    public SParameter(PathMetadata<?> metadata) {
-        super(SParameter.class, metadata, "null", "parameter_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent.java
deleted file mode 100644
index e2149f173d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SParent is a Querydsl query type for SParent
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SParent extends com.mysema.query.sql.RelationalPathBase<SParent> {
-
-    private static final long serialVersionUID = 1859105508;
-
-    public static final SParent parent_ = new SParent("parent_");
-
-    public final StringPath childName = createString("childName");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SParent> primary = createPrimaryKey(id);
-
-    public SParent(String variable) {
-        super(SParent.class, forVariable(variable), "null", "parent_");
-        addMetadata();
-    }
-
-    public SParent(String variable, String schema, String table) {
-        super(SParent.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SParent(Path<? extends SParent> path) {
-        super(path.getType(), path.getMetadata(), "null", "parent_");
-        addMetadata();
-    }
-
-    public SParent(PathMetadata<?> metadata) {
-        super(SParent.class, metadata, "null", "parent_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(childName, ColumnMetadata.named("childName").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(3).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent2.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent2.java
deleted file mode 100644
index cfb7077e39..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SParent2.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SParent2 is a Querydsl query type for SParent2
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SParent2 extends com.mysema.query.sql.RelationalPathBase<SParent2> {
-
-    private static final long serialVersionUID = 1859105463;
-
-    public static final SParent2 Parent2 = new SParent2("Parent2");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SParent2> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SChild2> _fk783f9ab6c2dbacbc = createInvForeignKey(id, "parent_id");
-
-    public SParent2(String variable) {
-        super(SParent2.class, forVariable(variable), "null", "Parent2");
-        addMetadata();
-    }
-
-    public SParent2(String variable, String schema, String table) {
-        super(SParent2.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SParent2(Path<? extends SParent2> path) {
-        super(path.getType(), path.getMetadata(), "null", "Parent2");
-        addMetadata();
-    }
-
-    public SParent2(PathMetadata<?> metadata) {
-        super(SParent2.class, metadata, "null", "Parent2");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java
deleted file mode 100644
index bfb5404954..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SPerson is a Querydsl query type for SPerson
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SPerson extends com.mysema.query.sql.RelationalPathBase<SPerson> {
-
-    private static final long serialVersionUID = 1974039961;
-
-    public static final SPerson person_ = new SPerson("person_");
-
-    public final DatePath<java.sql.Date> birthDay = createDate("birthDay", java.sql.Date.class);
-
-    public final NumberPath<Long> i = createNumber("i", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final NumberPath<Long> nationalityId = createNumber("nationalityId", Long.class);
-
-    public final NumberPath<Long> pidId = createNumber("pidId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SPerson> primary = createPrimaryKey(i);
-
-    public final com.mysema.query.sql.ForeignKey<SPersonid> fkd78fcfaad7999e61 = createForeignKey(pidId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SNationality> fkd78fcfaaf6578e38 = createForeignKey(nationalityId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SAccount> _fk809dbbd28cfac74 = createInvForeignKey(i, "owner_i");
-
-    public SPerson(String variable) {
-        super(SPerson.class, forVariable(variable), "null", "person_");
-        addMetadata();
-    }
-
-    public SPerson(String variable, String schema, String table) {
-        super(SPerson.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SPerson(Path<? extends SPerson> path) {
-        super(path.getType(), path.getMetadata(), "null", "person_");
-        addMetadata();
-    }
-
-    public SPerson(PathMetadata<?> metadata) {
-        super(SPerson.class, metadata, "null", "person_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(birthDay, ColumnMetadata.named("birthDay").withIndex(2).ofType(91).withSize(10));
-        addMetadata(i, ColumnMetadata.named("i").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(3).ofType(12).withSize(255));
-        addMetadata(nationalityId, ColumnMetadata.named("nationality_id").withIndex(4).ofType(-5).withSize(19));
-        addMetadata(pidId, ColumnMetadata.named("pid_id").withIndex(5).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java
deleted file mode 100644
index 196a295547..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SPersonid is a Querydsl query type for SPersonid
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SPersonid extends com.mysema.query.sql.RelationalPathBase<SPersonid> {
-
-    private static final long serialVersionUID = -1323129506;
-
-    public static final SPersonid personid_ = new SPersonid("personid_");
-
-    public final StringPath country = createString("country");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<Integer> medicareNumber = createNumber("medicareNumber", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SPersonid> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SPerson> _fkd78fcfaad7999e61 = createInvForeignKey(id, "pid_id");
-
-    public SPersonid(String variable) {
-        super(SPersonid.class, forVariable(variable), "null", "personid_");
-        addMetadata();
-    }
-
-    public SPersonid(String variable, String schema, String table) {
-        super(SPersonid.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SPersonid(Path<? extends SPersonid> path) {
-        super(path.getType(), path.getMetadata(), "null", "personid_");
-        addMetadata();
-    }
-
-    public SPersonid(PathMetadata<?> metadata) {
-        super(SPersonid.class, metadata, "null", "personid_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(country, ColumnMetadata.named("country").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(medicareNumber, ColumnMetadata.named("medicareNumber").withIndex(3).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java
deleted file mode 100644
index 986aecdaea..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SPlayer is a Querydsl query type for SPlayer
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SPlayer extends com.mysema.query.sql.RelationalPathBase<SPlayer> {
-
-    private static final long serialVersionUID = -2136053875;
-
-    public static final SPlayer player_ = new SPlayer("player_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SPlayer> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SPlayerScores> _fkd5dc571fd8736d5c = createInvForeignKey(id, "Player_id");
-
-    public SPlayer(String variable) {
-        super(SPlayer.class, forVariable(variable), "null", "player_");
-        addMetadata();
-    }
-
-    public SPlayer(String variable, String schema, String table) {
-        super(SPlayer.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SPlayer(Path<? extends SPlayer> path) {
-        super(path.getType(), path.getMetadata(), "null", "player_");
-        addMetadata();
-    }
-
-    public SPlayer(PathMetadata<?> metadata) {
-        super(SPlayer.class, metadata, "null", "player_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java
deleted file mode 100644
index 984b36a1e0..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SPlayerScores is a Querydsl query type for SPlayerScores
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SPlayerScores extends com.mysema.query.sql.RelationalPathBase<SPlayerScores> {
-
-    private static final long serialVersionUID = 1627547091;
-
-    public static final SPlayerScores PlayerScores = new SPlayerScores("Player_scores");
-
-    public final NumberPath<Long> playerId = createNumber("playerId", Long.class);
-
-    public final NumberPath<Integer> scores = createNumber("scores", Integer.class);
-
-    public final com.mysema.query.sql.ForeignKey<SPlayer> fkd5dc571fd8736d5c = createForeignKey(playerId, "id");
-
-    public SPlayerScores(String variable) {
-        super(SPlayerScores.class, forVariable(variable), "null", "Player_scores");
-        addMetadata();
-    }
-
-    public SPlayerScores(String variable, String schema, String table) {
-        super(SPlayerScores.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SPlayerScores(Path<? extends SPlayerScores> path) {
-        super(path.getType(), path.getMetadata(), "null", "Player_scores");
-        addMetadata();
-    }
-
-    public SPlayerScores(PathMetadata<?> metadata) {
-        super(SPlayerScores.class, metadata, "null", "Player_scores");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(playerId, ColumnMetadata.named("Player_id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(scores, ColumnMetadata.named("scores").withIndex(2).ofType(4).withSize(10));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java
deleted file mode 100644
index de1fdb5a81..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SPrice is a Querydsl query type for SPrice
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SPrice extends com.mysema.query.sql.RelationalPathBase<SPrice> {
-
-    private static final long serialVersionUID = 768137319;
-
-    public static final SPrice price_ = new SPrice("price_");
-
-    public final NumberPath<Long> amount = createNumber("amount", Long.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<Long> productId = createNumber("productId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SPrice> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SItem> fkc59678362c7f0c58 = createForeignKey(productId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCatalog_price> _fkaa04532f5222eaf7 = createInvForeignKey(id, "prices_id");
-
-    public SPrice(String variable) {
-        super(SPrice.class, forVariable(variable), "null", "price_");
-        addMetadata();
-    }
-
-    public SPrice(String variable, String schema, String table) {
-        super(SPrice.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SPrice(Path<? extends SPrice> path) {
-        super(path.getType(), path.getMetadata(), "null", "price_");
-        addMetadata();
-    }
-
-    public SPrice(PathMetadata<?> metadata) {
-        super(SPrice.class, metadata, "null", "price_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(amount, ColumnMetadata.named("amount").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(productId, ColumnMetadata.named("product_id").withIndex(3).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShapes.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShapes.java
deleted file mode 100644
index 39553e0fe1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShapes.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SShapes is a Querydsl query type for SShapes
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SShapes extends com.mysema.query.sql.RelationalPathBase<SShapes> {
-
-    private static final long serialVersionUID = 844563747;
-
-    public static final SShapes shapes = new SShapes("SHAPES");
-
-    public final SimplePath<byte[]> geometry = createSimple("geometry", byte[].class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SShapes> primary = createPrimaryKey(id);
-
-    public SShapes(String variable) {
-        super(SShapes.class, forVariable(variable), "null", "SHAPES");
-        addMetadata();
-    }
-
-    public SShapes(String variable, String schema, String table) {
-        super(SShapes.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SShapes(Path<? extends SShapes> path) {
-        super(path.getType(), path.getMetadata(), "null", "SHAPES");
-        addMetadata();
-    }
-
-    public SShapes(PathMetadata<?> metadata) {
-        super(SShapes.class, metadata, "null", "SHAPES");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(geometry, ColumnMetadata.named("GEOMETRY").withIndex(2).ofType(-2));
-        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java
deleted file mode 100644
index 746bed1393..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SShow is a Querydsl query type for SShow
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SShow extends com.mysema.query.sql.RelationalPathBase<SShow> {
-
-    private static final long serialVersionUID = -111289679;
-
-    public static final SShow show_ = new SShow("show_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SShow> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SShowActs> _fk5f6ee03ab40105c = createInvForeignKey(id, "Show_id");
-
-    public SShow(String variable) {
-        super(SShow.class, forVariable(variable), "null", "show_");
-        addMetadata();
-    }
-
-    public SShow(String variable, String schema, String table) {
-        super(SShow.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SShow(Path<? extends SShow> path) {
-        super(path.getType(), path.getMetadata(), "null", "show_");
-        addMetadata();
-    }
-
-    public SShow(PathMetadata<?> metadata) {
-        super(SShow.class, metadata, "null", "show_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java
deleted file mode 100644
index 4cbe881f98..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SShowActs is a Querydsl query type for SShowActs
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SShowActs extends com.mysema.query.sql.RelationalPathBase<SShowActs> {
-
-    private static final long serialVersionUID = 283130543;
-
-    public static final SShowActs ShowActs = new SShowActs("Show_acts");
-
-    public final StringPath acts = createString("acts");
-
-    public final StringPath actsKEY = createString("actsKEY");
-
-    public final NumberPath<Long> showId = createNumber("showId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SShowActs> primary = createPrimaryKey(showId, actsKEY);
-
-    public final com.mysema.query.sql.ForeignKey<SShow> fk5f6ee03ab40105c = createForeignKey(showId, "id");
-
-    public SShowActs(String variable) {
-        super(SShowActs.class, forVariable(variable), "null", "Show_acts");
-        addMetadata();
-    }
-
-    public SShowActs(String variable, String schema, String table) {
-        super(SShowActs.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SShowActs(Path<? extends SShowActs> path) {
-        super(path.getType(), path.getMetadata(), "null", "Show_acts");
-        addMetadata();
-    }
-
-    public SShowActs(PathMetadata<?> metadata) {
-        super(SShowActs.class, metadata, "null", "Show_acts");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(acts, ColumnMetadata.named("acts").withIndex(2).ofType(12).withSize(255));
-        addMetadata(actsKEY, ColumnMetadata.named("acts_KEY").withIndex(3).ofType(12).withSize(255).notNull());
-        addMetadata(showId, ColumnMetadata.named("Show_id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java
deleted file mode 100644
index d6029aced9..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SStatus is a Querydsl query type for SStatus
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SStatus extends com.mysema.query.sql.RelationalPathBase<SStatus> {
-
-    private static final long serialVersionUID = 755356828;
-
-    public static final SStatus status_ = new SStatus("status_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<SStatus> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SItem> _fk5fde7acd23307bc = createInvForeignKey(id, "status_id");
-
-    public final com.mysema.query.sql.ForeignKey<SItem> _fk5fde7ac9ea26263 = createInvForeignKey(id, "currentStatus_id");
-
-    public SStatus(String variable) {
-        super(SStatus.class, forVariable(variable), "null", "status_");
-        addMetadata();
-    }
-
-    public SStatus(String variable, String schema, String table) {
-        super(SStatus.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SStatus(Path<? extends SStatus> path) {
-        super(path.getType(), path.getMetadata(), "null", "status_");
-        addMetadata();
-    }
-
-    public SStatus(PathMetadata<?> metadata) {
-        super(SStatus.class, metadata, "null", "status_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java
deleted file mode 100644
index 94da6dbeb0..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SStatuschange is a Querydsl query type for SStatuschange
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SStatuschange extends com.mysema.query.sql.RelationalPathBase<SStatuschange> {
-
-    private static final long serialVersionUID = 87971116;
-
-    public static final SStatuschange statuschange_ = new SStatuschange("statuschange_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final DateTimePath<java.sql.Timestamp> timeStamp = createDateTime("timeStamp", java.sql.Timestamp.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SStatuschange> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SItem_statuschange> _fkcb99fb2ab2bd098d = createInvForeignKey(id, "statusChanges_id");
-
-    public SStatuschange(String variable) {
-        super(SStatuschange.class, forVariable(variable), "null", "statuschange_");
-        addMetadata();
-    }
-
-    public SStatuschange(String variable, String schema, String table) {
-        super(SStatuschange.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SStatuschange(Path<? extends SStatuschange> path) {
-        super(path.getType(), path.getMetadata(), "null", "statuschange_");
-        addMetadata();
-    }
-
-    public SStatuschange(PathMetadata<?> metadata) {
-        super(SStatuschange.class, metadata, "null", "statuschange_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(timeStamp, ColumnMetadata.named("timeStamp").withIndex(2).ofType(93).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java
deleted file mode 100644
index 0649575905..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SStore is a Querydsl query type for SStore
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SStore extends com.mysema.query.sql.RelationalPathBase<SStore> {
-
-    private static final long serialVersionUID = 856064975;
-
-    public static final SStore store_ = new SStore("store_");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final NumberPath<Long> locationId = createNumber("locationId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SStore> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SLocation> fkcad4239e8a55845c = createForeignKey(locationId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SStore_customer> _fk82ba2ce035d2d6bb = createInvForeignKey(id, "store__id");
-
-    public SStore(String variable) {
-        super(SStore.class, forVariable(variable), "null", "store_");
-        addMetadata();
-    }
-
-    public SStore(String variable, String schema, String table) {
-        super(SStore.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SStore(Path<? extends SStore> path) {
-        super(path.getType(), path.getMetadata(), "null", "store_");
-        addMetadata();
-    }
-
-    public SStore(PathMetadata<?> metadata) {
-        super(SStore.class, metadata, "null", "store_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(locationId, ColumnMetadata.named("location_id").withIndex(2).ofType(-5).withSize(19));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore_customer.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore_customer.java
deleted file mode 100644
index 9043fc462f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SStore_customer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SStore_customer is a Querydsl query type for SStore_customer
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SStore_customer extends com.mysema.query.sql.RelationalPathBase<SStore_customer> {
-
-    private static final long serialVersionUID = 1343082834;
-
-    public static final SStore_customer store_customer_ = new SStore_customer("store__customer_");
-
-    public final NumberPath<Integer> customersId = createNumber("customersId", Integer.class);
-
-    public final NumberPath<Long> store_id = createNumber("store_id", Long.class);
-
-    public final com.mysema.query.sql.ForeignKey<SStore> fk82ba2ce035d2d6bb = createForeignKey(store_id, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCustomer> fk82ba2ce051f3c3e5 = createForeignKey(customersId, "id");
-
-    public SStore_customer(String variable) {
-        super(SStore_customer.class, forVariable(variable), "null", "store__customer_");
-        addMetadata();
-    }
-
-    public SStore_customer(String variable, String schema, String table) {
-        super(SStore_customer.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SStore_customer(Path<? extends SStore_customer> path) {
-        super(path.getType(), path.getMetadata(), "null", "store__customer_");
-        addMetadata();
-    }
-
-    public SStore_customer(PathMetadata<?> metadata) {
-        super(SStore_customer.class, metadata, "null", "store__customer_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(customersId, ColumnMetadata.named("customers_id").withIndex(2).ofType(4).withSize(10).notNull());
-        addMetadata(store_id, ColumnMetadata.named("store__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSurvey.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSurvey.java
deleted file mode 100644
index 1ed537616e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSurvey.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SSurvey is a Querydsl query type for SSurvey
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SSurvey extends com.mysema.query.sql.RelationalPathBase<SSurvey> {
-
-    private static final long serialVersionUID = 857081739;
-
-    public static final SSurvey survey = new SSurvey("SURVEY");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath name = createString("name");
-
-    public final StringPath name2 = createString("name2");
-
-    public final com.mysema.query.sql.PrimaryKey<SSurvey> primary = createPrimaryKey(id);
-
-    public SSurvey(String variable) {
-        super(SSurvey.class, forVariable(variable), "null", "SURVEY");
-        addMetadata();
-    }
-
-    public SSurvey(String variable, String schema, String table) {
-        super(SSurvey.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SSurvey(Path<? extends SSurvey> path) {
-        super(path.getType(), path.getMetadata(), "null", "SURVEY");
-        addMetadata();
-    }
-
-    public SSurvey(PathMetadata<?> metadata) {
-        super(SSurvey.class, metadata, "null", "SURVEY");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
-        addMetadata(name, ColumnMetadata.named("NAME").withIndex(2).ofType(12).withSize(30));
-        addMetadata(name2, ColumnMetadata.named("NAME2").withIndex(3).ofType(12).withSize(30));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STest.java
deleted file mode 100644
index 874b45ec3d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * STest is a Querydsl query type for STest
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class STest extends com.mysema.query.sql.RelationalPathBase<STest> {
-
-    private static final long serialVersionUID = -1389036285;
-
-    public static final STest test = new STest("TEST");
-
-    public final StringPath name = createString("name");
-
-    public STest(String variable) {
-        super(STest.class, forVariable(variable), "null", "TEST");
-        addMetadata();
-    }
-
-    public STest(String variable, String schema, String table) {
-        super(STest.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public STest(Path<? extends STest> path) {
-        super(path.getType(), path.getMetadata(), "null", "TEST");
-        addMetadata();
-    }
-
-    public STest(PathMetadata<?> metadata) {
-        super(STest.class, metadata, "null", "TEST");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(name, ColumnMetadata.named("NAME").withIndex(1).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STimeTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STimeTest.java
deleted file mode 100644
index 3c5cd1182e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/STimeTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * STimeTest is a Querydsl query type for STimeTest
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class STimeTest extends com.mysema.query.sql.RelationalPathBase<STimeTest> {
-
-    private static final long serialVersionUID = -1454836496;
-
-    public static final STimeTest timeTest1 = new STimeTest("TIME_TEST");
-
-    public final TimePath<java.sql.Time> timeTest = createTime("timeTest", java.sql.Time.class);
-
-    public STimeTest(String variable) {
-        super(STimeTest.class, forVariable(variable), "null", "TIME_TEST");
-        addMetadata();
-    }
-
-    public STimeTest(String variable, String schema, String table) {
-        super(STimeTest.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public STimeTest(Path<? extends STimeTest> path) {
-        super(path.getType(), path.getMetadata(), "null", "TIME_TEST");
-        addMetadata();
-    }
-
-    public STimeTest(PathMetadata<?> metadata) {
-        super(STimeTest.class, metadata, "null", "TIME_TEST");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(timeTest, ColumnMetadata.named("TIME_TEST").withIndex(1).ofType(92).withSize(8));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java
deleted file mode 100644
index 58b536778c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SUser is a Querydsl query type for SUser
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUser extends com.mysema.query.sql.RelationalPathBase<SUser> {
-
-    private static final long serialVersionUID = -109124701;
-
-    public static final SUser user_ = new SUser("user_");
-
-    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
-
-    public final StringPath firstName = createString("firstName");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath lastName = createString("lastName");
-
-    public final StringPath userName = createString("userName");
-
-    public final com.mysema.query.sql.PrimaryKey<SUser> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SCompany> fk6a68df4dc953998 = createForeignKey(companyId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SEmployee> _fk9d39ef712743b59c = createInvForeignKey(id, "user_id");
-
-    public SUser(String variable) {
-        super(SUser.class, forVariable(variable), "null", "user_");
-        addMetadata();
-    }
-
-    public SUser(String variable, String schema, String table) {
-        super(SUser.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SUser(Path<? extends SUser> path) {
-        super(path.getType(), path.getMetadata(), "null", "user_");
-        addMetadata();
-    }
-
-    public SUser(PathMetadata<?> metadata) {
-        super(SUser.class, metadata, "null", "user_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(5).ofType(4).withSize(10));
-        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(userName, ColumnMetadata.named("userName").withIndex(4).ofType(12).withSize(255));
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2_userprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2_userprop.java
deleted file mode 100644
index e0f9aa9cc7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2_userprop.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SUser2_userprop is a Querydsl query type for SUser2_userprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUser2_userprop extends com.mysema.query.sql.RelationalPathBase<SUser2_userprop> {
-
-    private static final long serialVersionUID = -598341912;
-
-    public static final SUser2_userprop user2_userprop_ = new SUser2_userprop("user2__userprop_");
-
-    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
-
-    public final NumberPath<Long> user2_id = createNumber("user2_id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SUser2_userprop> primary = createPrimaryKey(propertiesId, user2_id);
-
-    public final com.mysema.query.sql.ForeignKey<SUser2> fk4611b46af21971a1 = createForeignKey(user2_id, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop> fk4611b46aa56541dd = createForeignKey(propertiesId, "id");
-
-    public SUser2_userprop(String variable) {
-        super(SUser2_userprop.class, forVariable(variable), "null", "user2__userprop_");
-        addMetadata();
-    }
-
-    public SUser2_userprop(String variable, String schema, String table) {
-        super(SUser2_userprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SUser2_userprop(Path<? extends SUser2_userprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "user2__userprop_");
-        addMetadata();
-    }
-
-    public SUser2_userprop(PathMetadata<?> metadata) {
-        super(SUser2_userprop.class, metadata, "null", "user2__userprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(user2_id, ColumnMetadata.named("user2__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop.java
deleted file mode 100644
index cbeecdc023..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SUserprop is a Querydsl query type for SUserprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUserprop extends com.mysema.query.sql.RelationalPathBase<SUserprop> {
-
-    private static final long serialVersionUID = -1821152608;
-
-    public static final SUserprop userprop_ = new SUserprop("userprop_");
-
-    public final StringPath categoryDescription = createString("categoryDescription");
-
-    public final StringPath categoryName = createString("categoryName");
-
-    public final NumberPath<Double> createdBy = createNumber("createdBy", Double.class);
-
-    public final DateTimePath<java.sql.Timestamp> creationDate = createDateTime("creationDate", java.sql.Timestamp.class);
-
-    public final DateTimePath<java.sql.Timestamp> deleteDate = createDateTime("deleteDate", java.sql.Timestamp.class);
-
-    public final NumberPath<Double> deletedBy = createNumber("deletedBy", Double.class);
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final DateTimePath<java.sql.Timestamp> modificationDate = createDateTime("modificationDate", java.sql.Timestamp.class);
-
-    public final NumberPath<Double> modifiedBy = createNumber("modifiedBy", Double.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SUserprop> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop_category> _fk851f48d3904c19df = createInvForeignKey(id, "userprop__id");
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop_categoryprop> _fke0fdb7d0904c19df = createInvForeignKey(id, "userprop__id");
-
-    public final com.mysema.query.sql.ForeignKey<SUser2_userprop> _fk4611b46aa56541dd = createInvForeignKey(id, "properties_id");
-
-    public SUserprop(String variable) {
-        super(SUserprop.class, forVariable(variable), "null", "userprop_");
-        addMetadata();
-    }
-
-    public SUserprop(String variable, String schema, String table) {
-        super(SUserprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SUserprop(Path<? extends SUserprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "userprop_");
-        addMetadata();
-    }
-
-    public SUserprop(PathMetadata<?> metadata) {
-        super(SUserprop.class, metadata, "null", "userprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(categoryDescription, ColumnMetadata.named("categoryDescription").withIndex(2).ofType(12).withSize(255));
-        addMetadata(categoryName, ColumnMetadata.named("categoryName").withIndex(3).ofType(12).withSize(255));
-        addMetadata(createdBy, ColumnMetadata.named("createdBy").withIndex(4).ofType(8).withSize(22).notNull());
-        addMetadata(creationDate, ColumnMetadata.named("creationDate").withIndex(5).ofType(93).withSize(19));
-        addMetadata(deleteDate, ColumnMetadata.named("deleteDate").withIndex(6).ofType(93).withSize(19));
-        addMetadata(deletedBy, ColumnMetadata.named("deletedBy").withIndex(7).ofType(8).withSize(22).notNull());
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-        addMetadata(modificationDate, ColumnMetadata.named("modificationDate").withIndex(8).ofType(93).withSize(19));
-        addMetadata(modifiedBy, ColumnMetadata.named("modifiedBy").withIndex(9).ofType(8).withSize(22).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_category.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_category.java
deleted file mode 100644
index b0f1cbf4c9..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_category.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SUserprop_category is a Querydsl query type for SUserprop_category
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUserprop_category extends com.mysema.query.sql.RelationalPathBase<SUserprop_category> {
-
-    private static final long serialVersionUID = 301952129;
-
-    public static final SUserprop_category userprop_category_ = new SUserprop_category("userprop__category_");
-
-    public final NumberPath<Long> childCategoriesId = createNumber("childCategoriesId", Long.class);
-
-    public final NumberPath<Long> userprop_id = createNumber("userprop_id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SUserprop_category> primary = createPrimaryKey(childCategoriesId, userprop_id);
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop> fk851f48d3904c19df = createForeignKey(userprop_id, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SCategory> fk851f48d37ab543e8 = createForeignKey(childCategoriesId, "id");
-
-    public SUserprop_category(String variable) {
-        super(SUserprop_category.class, forVariable(variable), "null", "userprop__category_");
-        addMetadata();
-    }
-
-    public SUserprop_category(String variable, String schema, String table) {
-        super(SUserprop_category.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SUserprop_category(Path<? extends SUserprop_category> path) {
-        super(path.getType(), path.getMetadata(), "null", "userprop__category_");
-        addMetadata();
-    }
-
-    public SUserprop_category(PathMetadata<?> metadata) {
-        super(SUserprop_category.class, metadata, "null", "userprop__category_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(childCategoriesId, ColumnMetadata.named("childCategories_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(userprop_id, ColumnMetadata.named("userprop__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_categoryprop.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_categoryprop.java
deleted file mode 100644
index 05ba82c95f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUserprop_categoryprop.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-
-/**
- * SUserprop_categoryprop is a Querydsl query type for SUserprop_categoryprop
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUserprop_categoryprop extends com.mysema.query.sql.RelationalPathBase<SUserprop_categoryprop> {
-
-    private static final long serialVersionUID = -190294914;
-
-    public static final SUserprop_categoryprop userprop_categoryprop_ = new SUserprop_categoryprop("userprop__categoryprop_");
-
-    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
-
-    public final NumberPath<Long> userprop_id = createNumber("userprop_id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SUserprop_categoryprop> primary = createPrimaryKey(propertiesId, userprop_id);
-
-    public final com.mysema.query.sql.ForeignKey<SCategoryprop> fke0fdb7d0fd94cd90 = createForeignKey(propertiesId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SUserprop> fke0fdb7d0904c19df = createForeignKey(userprop_id, "id");
-
-    public SUserprop_categoryprop(String variable) {
-        super(SUserprop_categoryprop.class, forVariable(variable), "null", "userprop__categoryprop_");
-        addMetadata();
-    }
-
-    public SUserprop_categoryprop(String variable, String schema, String table) {
-        super(SUserprop_categoryprop.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SUserprop_categoryprop(Path<? extends SUserprop_categoryprop> path) {
-        super(path.getType(), path.getMetadata(), "null", "userprop__categoryprop_");
-        addMetadata();
-    }
-
-    public SUserprop_categoryprop(PathMetadata<?> metadata) {
-        super(SUserprop_categoryprop.class, metadata, "null", "userprop__categoryprop_");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(userprop_id, ColumnMetadata.named("userprop__id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorld.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorld.java
deleted file mode 100644
index fbf268949f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorld.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SWorld is a Querydsl query type for SWorld
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SWorld extends com.mysema.query.sql.RelationalPathBase<SWorld> {
-
-    private static final long serialVersionUID = -107384511;
-
-    public static final SWorld World = new SWorld("World");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SWorld> primary = createPrimaryKey(id);
-
-    public final com.mysema.query.sql.ForeignKey<SWorldMammal> _fk4070aeecd3538cf8 = createInvForeignKey(id, "World_id");
-
-    public SWorld(String variable) {
-        super(SWorld.class, forVariable(variable), "null", "World");
-        addMetadata();
-    }
-
-    public SWorld(String variable, String schema, String table) {
-        super(SWorld.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SWorld(Path<? extends SWorld> path) {
-        super(path.getType(), path.getMetadata(), "null", "World");
-        addMetadata();
-    }
-
-    public SWorld(PathMetadata<?> metadata) {
-        super(SWorld.class, metadata, "null", "World");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorldMammal.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorldMammal.java
deleted file mode 100644
index eb5c423795..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SWorldMammal.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.jpa.domain.sql;
-
-import static com.mysema.query.types.PathMetadataFactory.*;
-
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
-import javax.annotation.Generated;
-import com.mysema.query.types.Path;
-
-import com.mysema.query.sql.ColumnMetadata;
-
-import java.io.*;
-
-import java.io.File;
-
-
-/**
- * SWorldMammal is a Querydsl query type for SWorldMammal
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SWorldMammal extends com.mysema.query.sql.RelationalPathBase<SWorldMammal> {
-
-    private static final long serialVersionUID = 979697152;
-
-    public static final SWorldMammal WorldMammal = new SWorldMammal("World_Mammal");
-
-    public final NumberPath<Long> mammalsId = createNumber("mammalsId", Long.class);
-
-    public final NumberPath<Long> worldId = createNumber("worldId", Long.class);
-
-    public final com.mysema.query.sql.PrimaryKey<SWorldMammal> primary = createPrimaryKey(worldId, mammalsId);
-
-    public final com.mysema.query.sql.ForeignKey<SMammal> fk4070aeece01c8ee7 = createForeignKey(mammalsId, "id");
-
-    public final com.mysema.query.sql.ForeignKey<SWorld> fk4070aeecd3538cf8 = createForeignKey(worldId, "id");
-
-    public SWorldMammal(String variable) {
-        super(SWorldMammal.class, forVariable(variable), "null", "World_Mammal");
-        addMetadata();
-    }
-
-    public SWorldMammal(String variable, String schema, String table) {
-        super(SWorldMammal.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public SWorldMammal(Path<? extends SWorldMammal> path) {
-        super(path.getType(), path.getMetadata(), "null", "World_Mammal");
-        addMetadata();
-    }
-
-    public SWorldMammal(PathMetadata<?> metadata) {
-        super(SWorldMammal.class, metadata, "null", "World_Mammal");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(mammalsId, ColumnMetadata.named("mammals_id").withIndex(2).ofType(-5).withSize(19).notNull());
-        addMetadata(worldId, ColumnMetadata.named("World_id").withIndex(1).ofType(-5).withSize(19).notNull());
-    }
-
-}
-
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Child.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Child.java
deleted file mode 100644
index 23c507d565..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Child.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain2;
-
-import javax.persistence.Embeddable;
-
-@Embeddable
-public class Child {
-
-    private String childName;
-
-    public String getChildName() {
-        return childName;
-    }
-
-    public void setChildName(String childName) {
-        this.childName = childName;
-    }
-
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Contact.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Contact.java
deleted file mode 100644
index a61b726379..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Contact.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain2;
-
-public class Contact {
-    
-    private long id;
-    
-    private String firstName, lastName, email;
-    
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Parent.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Parent.java
deleted file mode 100644
index 68071dfca8..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Parent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain2;
-
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="parent_")
-public class Parent {
-
-    @Id
-    private long id;
-    
-    private String name;
-    
-    @Embedded
-    private Child child;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Child getChild() {
-        return child;
-    }
-
-    public void setChild(Child child) {
-        this.child = child;
-    }
-    
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/Store.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/Store.java
deleted file mode 100644
index 1c4001bd47..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/Store.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain3;
-
-import java.io.Serializable;
-
-public class Store implements Serializable {
-
-    private static final long serialVersionUID = 7221730732392000227L;
-
-    private String code;
-
-    private String name;
-
-    private String address;
-
-    private String city;
-
-    private String phoneDetails;
-
-    private String faxDetails;
-
-    private String zipCode;
-
-    private String chainCode;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getPhoneDetails() {
-        return phoneDetails;
-    }
-
-    public void setPhoneDetails(String phoneDetails) {
-        this.phoneDetails = phoneDetails;
-    }
-
-    public String getFaxDetails() {
-        return faxDetails;
-    }
-
-    public void setFaxDetails(String faxDetails) {
-        this.faxDetails = faxDetails;
-    }
-
-    public String getZipCode() {
-        return zipCode;
-    }
-
-    public void setZipCode(String zipCode) {
-        this.zipCode = zipCode;
-    }
-
-    public String getChainCode() {
-        return chainCode;
-    }
-
-    public void setChainCode(String chainCode) {
-        this.chainCode = chainCode;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookDefinition.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookDefinition.java
deleted file mode 100644
index bc56336fb6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookDefinition.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Basic;
-import javax.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embeddable;
-import javax.persistence.OrderColumn;
-
-@Embeddable
-@Access(AccessType.PROPERTY)
-public class BookDefinition implements Serializable {
-
-    private static final long serialVersionUID = 3570098308959717614L;
-
-    private String name;
-
-    private String description;
-
-    private List<BookMark> bookMarks;
-
-    @Basic
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Basic
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @ElementCollection()
-    @CollectionTable(name = "book_bookmarks")
-    @OrderColumn()
-    public List<BookMark> getBookMarks() {
-        return bookMarks;
-    }
-
-    public void setBookMarks(List<BookMark> bookMarks) {
-        this.bookMarks = bookMarks;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BookDefinition that = (BookDefinition) o;
-
-        if (name != null ? !name.equals(that.name) : that.name != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return name != null ? name.hashCode() : 0;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookID.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookID.java
deleted file mode 100644
index 7f5f37cdb1..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookID.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "bookid_")
-@Access(AccessType.PROPERTY)
-public class BookID implements Serializable {
-
-    private static final long serialVersionUID = -3205025118656391776L;
-
-    private Long identity;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public Long getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(Long identity) {
-        this.identity = identity;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BookID bookID = (BookID) o;
-
-        if (identity != null ? !identity.equals(bookID.identity)
-                : bookID.identity != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return identity != null ? identity.hashCode() : 0;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookMark.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookMark.java
deleted file mode 100644
index 7a0bffeb85..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookMark.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Basic;
-import javax.persistence.Embeddable;
-
-@Embeddable
-@Access(AccessType.PROPERTY)
-public class BookMark implements Serializable {
-
-    private static final long serialVersionUID = 8027009758015834551L;
-
-    private Long page;
-
-    private String comment;
-
-    @Basic
-    public Long getPage() {
-        return page;
-    }
-
-    public void setPage(Long page) {
-        this.page = page;
-    }
-
-    @Basic
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BookMark bookMark = (BookMark) o;
-
-        if (page != null ? !page.equals(bookMark.page) : bookMark.page != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return page != null ? page.hashCode() : 0;
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersion.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersion.java
deleted file mode 100644
index 60d2ef27d7..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersion.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.CascadeType;
-import javax.persistence.Embedded;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapsId;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "bookversion_")
-@Access(AccessType.PROPERTY)
-public class BookVersion implements Serializable {
-
-    private static final long serialVersionUID = -1697470794339057030L;
-
-    private BookID bookID;
-
-    private BookVersionPK pk = new BookVersionPK();
-
-    private Library library;
-
-    private BookDefinition definition;
-
-    @EmbeddedId
-    public BookVersionPK getPk() {
-        return pk;
-    }
-
-    public void setPk(BookVersionPK pk) {
-        this.pk = pk;
-    }
-
-    @MapsId("bookID")
-    @ManyToOne(cascade = CascadeType.ALL)
-    public BookID getBookID() {
-        return bookID;
-    }
-
-    public void setBookID(BookID bookID) {
-        this.bookID = bookID;
-    }
-
-    @MapsId("library")
-    @ManyToOne(cascade = CascadeType.ALL)
-    public Library getLibrary() {
-        return library;
-    }
-
-    public void setLibrary(Library library) {
-        this.library = library;
-    }
-
-    @Embedded
-    public BookDefinition getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(BookDefinition definition) {
-        this.definition = definition;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BookVersion that = (BookVersion) o;
-
-        if (bookID != null ? !bookID.equals(that.bookID) : that.bookID != null)
-            return false;
-        if (library != null ? !library.equals(that.library)
-                : that.library != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = bookID != null ? bookID.hashCode() : 0;
-        result = 31 * result + (library != null ? library.hashCode() : 0);
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersionPK.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersionPK.java
deleted file mode 100644
index d0f3680492..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/BookVersionPK.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-
-import javax.persistence.Embeddable;
-
-@Embeddable
-public class BookVersionPK implements Serializable {
-
-    private static final long serialVersionUID = 8483495681236266676L;
-
-    private Long bookID;
-
-    private Long library;
-
-    public Long getBookID() {
-        return bookID;
-    }
-
-    public void setBookID(Long bookID) {
-        this.bookID = bookID;
-    }
-
-    public Long getLibrary() {
-        return library;
-    }
-
-    public void setLibrary(Long library) {
-        this.library = library;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BookVersionPK that = (BookVersionPK) o;
-
-        if (bookID != null ? !bookID.equals(that.bookID) : that.bookID != null)
-            return false;
-        if (library != null ? !library.equals(that.library)
-                : that.library != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = bookID != null ? bookID.hashCode() : 0;
-        result = 31 * result + (library != null ? library.hashCode() : 0);
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/Library.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/Library.java
deleted file mode 100644
index bbbb3cc736..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain4/Library.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.domain4;
-
-import java.io.Serializable;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "library_")
-@Access(AccessType.PROPERTY)
-public class Library implements Serializable {
-
-    private static final long serialVersionUID = 6360420736014459567L;
-
-    private Long identity;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public Long getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(Long identity) {
-        this.identity = identity;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        Library library = (Library) o;
-
-        if (identity != null ? !identity.equals(library.identity)
-                : library.identity != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return identity != null ? identity.hashCode() : 0;
-    }
-}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java
deleted file mode 100644
index d808a7a4f9..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.support;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.dialect.function.CastFunction;
-import org.hibernate.dialect.function.VarArgsSQLFunction;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.Type;
-
-/**
- * @author tiwe
- *
- */
-public class ExtendedDerbyDialect extends DerbyDialect{
-
-    private static final CastFunction castFunction = new CastFunction() {
-        @Override
-        public String render(Type columnType, List args, SessionFactoryImplementor factory) {
-            if (args.get(1).equals("string")) {
-                return super.render(columnType, Arrays.<Object>asList("char("+args.get(0)+")",args.get(1)), factory);
-            } else {
-                return super.render(columnType, args, factory);
-            }
-        }
-    };
-
-    public ExtendedDerbyDialect() {
-        registerFunction( "concat", new VarArgsSQLFunction( StandardBasicTypes.STRING, "cast ((","||",") as varchar(128))" ) );
-        registerFunction( "cast", castFunction );
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java
deleted file mode 100644
index 34820e6668..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.jpa.support;
-
-import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.type.StandardBasicTypes;
-
-/**
- * @author tiwe
- *
- */
-public class ExtendedHSQLDialect extends HSQLDialect{
-
-    public ExtendedHSQLDialect() {
-        registerFunction( "trim", new SQLFunctionTemplate( StandardBasicTypes.STRING, "trim(both from ?1)" ) );
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedOracleDialect.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedOracleDialect.java
deleted file mode 100644
index d1750a8b06..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/ExtendedOracleDialect.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mysema.query.jpa.support;
-
-import org.hibernate.dialect.Oracle10gDialect;
-import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.type.StandardBasicTypes;
-
-/**
- * @author tiwe
- *
- */
-public class ExtendedOracleDialect extends Oracle10gDialect {
-    
-    public ExtendedOracleDialect() {
-        // there fail otherwise with the time datatype
-        registerFunction( "second", new SQLFunctionTemplate(StandardBasicTypes.INTEGER, "to_number(to_char(?1,'SS'))") );
-        registerFunction( "minute", new SQLFunctionTemplate(StandardBasicTypes.INTEGER, "to_number(to_char(?1,'MI'))") );
-        registerFunction( "hour", new SQLFunctionTemplate(StandardBasicTypes.INTEGER, "to_number(to_char(?1,'HH24'))") );
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractJPASuite.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractJPASuite.java
deleted file mode 100644
index 3a6d9df574..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractJPASuite.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.AfterClass;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.Mode;
-import com.mysema.testutil.CustomSuite;
-
-@RunWith(CustomSuite.class)
-public abstract class AbstractJPASuite {
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        Mode.mode.remove();
-        Mode.target.remove();
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractSuite.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractSuite.java
deleted file mode 100644
index c0b6309102..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/AbstractSuite.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.AfterClass;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.Mode;
-import com.mysema.testutil.CustomSuite;
-
-@RunWith(CustomSuite.class)
-public abstract class AbstractSuite {
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        Mode.mode.remove();
-        Mode.target.remove();
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbyEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbyEclipseLinkTest.java
deleted file mode 100644
index 88189abb5b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbyEclipseLinkTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class DerbyEclipseLinkTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {
-        @Override
-        public void Order_StringValue() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_To_Integer() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_ToLong() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_ToBigInteger() {
-            // not supported in MySQL/EclipseLink
-        }
-    }
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("derby-eclipselink");
-        Mode.target.set(Target.DERBY);
-    }
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbySuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbySuiteTest.java
deleted file mode 100644
index 23dd6f3999..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/DerbySuiteTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class DerbySuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("derby");
-        Mode.target.set(Target.DERBY);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java
deleted file mode 100644
index 36d57e423c..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class H2BatooTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("h2-batoo");
-        Mode.target.set(Target.H2);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2EclipseLinkTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2EclipseLinkTest.java
deleted file mode 100644
index 4b001d60df..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2EclipseLinkTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class H2EclipseLinkTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("h2-eclipselink");
-        Mode.target.set(Target.H2);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2OpenJPATest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2OpenJPATest.java
deleted file mode 100644
index b742577ccc..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2OpenJPATest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-@Ignore
-public class H2OpenJPATest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("h2-openjpa");
-        Mode.target.set(Target.H2);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2SuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2SuiteTest.java
deleted file mode 100644
index 66b7975936..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2SuiteTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class H2SuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("h2");
-        Mode.target.set(Target.H2);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBEclipseLinkTest.java
deleted file mode 100644
index 91935a724b..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBEclipseLinkTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class HSQLDBEclipseLinkTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("hsqldb-eclipselink");
-        Mode.target.set(Target.HSQLDB);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBSuiteTest.java
deleted file mode 100644
index 29b3b0e07d..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/HSQLDBSuiteTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-
-public class HSQLDBSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("hsqldb");
-        Mode.target.set(Target.HSQLDB);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java
deleted file mode 100644
index 54ccc59f8e..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MSSQLSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("mssql");
-        Mode.target.set(Target.SQLSERVER);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLEclipseLinkTest.java
deleted file mode 100644
index 603312932f..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLEclipseLinkTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MySQLEclipseLinkTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {
-        @Override
-        public void Cast() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_To_Integer() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_ToLong() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_StringValue_ToBigInteger() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_NullsFirst() {
-            // not supported in MySQL/EclipseLink
-        }
-        @Override
-        public void Order_NullsLast() {
-            // not supported in MySQL/EclipseLink
-        }
-    }
-
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("mysql-eclipselink");
-        Mode.target.set(Target.MYSQL);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java
deleted file mode 100644
index ff529228e6..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MySQLSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {
-        @Override
-        public void Order_StringValue_ToLong() {
-            // not supported
-        }
-    }
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {
-        @Override
-        public void Order_StringValue_ToLong() {
-            // not supported
-        }
-    }
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("mysql");
-        Mode.target.set(Target.MYSQL);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/OracleSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/OracleSuiteTest.java
deleted file mode 100644
index 944a17fd18..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/OracleSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class OracleSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("oracle");
-        Mode.target.set(Target.ORACLE);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresEclipseLinkSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresEclipseLinkSuiteTest.java
deleted file mode 100644
index df5d9be9b3..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresEclipseLinkSuiteTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class PostgresEclipseLinkSuiteTest extends AbstractJPASuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("postgres-eclipselink");
-        Mode.target.set(Target.POSTGRES);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresSuiteTest.java
deleted file mode 100644
index 69f1ffa81a..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/PostgresSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class PostgresSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("postgres");
-        Mode.target.set(Target.POSTGRES);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/Teradata.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/Teradata.java
deleted file mode 100644
index 2c58546768..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/Teradata.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mysema.query.suites;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-public class Teradata {
-
-    public static void main(String[] args) {
-        EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("teradata");
-        try {
-            EntityManager entityManager = entityManagerFactory.createEntityManager();
-            try {
-                entityManager.getTransaction().begin();
-                entityManager.getTransaction().commit();
-            } finally {
-                entityManager.close();
-            }
-        } finally {
-            entityManagerFactory.close();
-        }
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java
deleted file mode 100644
index ec417fac25..0000000000
--- a/querydsl-jpa/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.HibernateBase;
-import com.mysema.query.HibernateSQLBase;
-import com.mysema.query.JPABase;
-import com.mysema.query.JPASQLBase;
-import com.mysema.query.Mode;
-import com.mysema.query.Target;
-import com.mysema.query.jpa.JPAIntegrationBase;
-import com.mysema.query.jpa.SerializationBase;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class TeradataSuiteTest extends AbstractSuite {
-
-    public static class JPA extends JPABase {}
-    public static class JPASQL extends JPASQLBase {}
-    public static class JPAIntegration extends JPAIntegrationBase {}
-    public static class Serialization extends SerializationBase {}
-    public static class Hibernate extends HibernateBase {}
-    public static class HibernateSQL extends HibernateSQLBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Mode.mode.set("teradata");
-        Mode.target.set(Target.TERADATA);
-    }
-
-}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
new file mode 100644
index 0000000000..942e6f2174
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
@@ -0,0 +1,1833 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.jpa.JPAExpressions.select;
+import static org.junit.Assert.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+import java.util.Calendar;
+import java.util.Map.Entry;
+
+import org.hamcrest.Matchers;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.*;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.group.QPair;
+import com.querydsl.core.group.MockTuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.jpa.domain.*;
+import com.querydsl.jpa.domain.Company.Rating;
+import com.querydsl.jpa.domain4.QBookMark;
+import com.querydsl.jpa.domain4.QBookVersion;
+
+/**
+ * @author tiwe
+ *
+ */
+public abstract class AbstractJPATest {
+
+    private static final Expression<?>[] NO_EXPRESSIONS = new Expression<?>[0];
+
+    private static final QCompany company = QCompany.company;
+
+    private static final QAnimal animal = QAnimal.animal;
+
+    private static final QCat cat = QCat.cat;
+
+    private static final QCat otherCat = new QCat("otherCat");
+
+    private static final BooleanExpression cond1 = cat.name.length().gt(0);
+
+    private static final BooleanExpression cond2 = otherCat.name.length().gt(0);
+
+    private static final Predicate condition = ExpressionUtils.and(
+            (Predicate) ExpressionUtils.extract(cond1),
+            (Predicate) ExpressionUtils.extract(cond2));
+
+    private static final Date birthDate;
+
+    private static final java.sql.Date date;
+
+    private static final java.sql.Time time;
+
+    private final List<Cat> savedCats = new ArrayList<Cat>();
+
+    static {
+        Calendar cal = Calendar.getInstance();
+        cal.set(2000, 1, 2, 3, 4);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        birthDate = cal.getTime();
+        date = new java.sql.Date(cal.getTimeInMillis());
+        time = new java.sql.Time(cal.getTimeInMillis());
+    }
+
+    protected Target getTarget() {
+        return Mode.target.get();
+    }
+
+    protected abstract JPQLQuery<?> query();
+
+    protected abstract JPQLQuery<?> testQuery();
+
+    protected abstract void save(Object entity);
+
+    @Before
+    public void setUp() {
+        if (query().from(cat).fetchCount() > 0) {
+            savedCats.addAll(query().from(cat).orderBy(cat.id.asc()).select(cat).fetch());
+            return;
+        }
+
+        Cat prev = null;
+        for (Cat cat : Arrays.asList(
+                new Cat("Bob123", 1, 1.0),
+                new Cat("Ruth123", 2, 2.0),
+                new Cat("Felix123", 3, 3.0),
+                new Cat("Allen123", 4, 4.0),
+                new Cat("Mary_123", 5, 5.0))) {
+            if (prev != null) {
+                cat.addKitten(prev);
+            }
+            cat.setBirthdate(birthDate);
+            cat.setDateField(date);
+            cat.setTimeField(time);
+            cat.setColor(Color.BLACK);
+            cat.setMate(prev);
+            save(cat);
+            savedCats.add(cat);
+            prev = cat;
+        }
+
+        Animal animal = new Animal(10);
+        animal.setBodyWeight(10.5);
+        save(animal);
+
+        Cat cat = new Cat("Some", 6, 6.0);
+        cat.setBirthdate(birthDate);
+        save(cat);
+        savedCats.add(cat);
+
+        Show show = new Show(1);
+        show.acts = new HashMap<String,String>();
+        show.acts.put("a","A");
+        show.acts.put("b","B");
+        save(show);
+
+        Company company = new Company();
+        company.name = "1234567890123456789012345678901234567890"; // 40
+        company.id = 1;
+        company.ratingOrdinal = Company.Rating.A;
+        company.ratingString = Company.Rating.AA;
+        save(company);
+
+        Employee employee = new Employee();
+        employee.id = 1;
+        employee.lastName = "Smith";
+        employee.jobFunctions.add(JobFunction.CODER);
+        save(employee);
+
+        Employee employee2 = new Employee();
+        employee2.id = 2;
+        employee2.lastName = "Doe";
+        employee2.jobFunctions.add(JobFunction.CODER);
+        employee2.jobFunctions.add(JobFunction.CONSULTANT);
+        employee2.jobFunctions.add(JobFunction.CONTROLLER);
+        save(employee2);
+
+        save(new Entity1(1));
+        save(new Entity1(2));
+        save(new Entity2(3));
+
+        Foo foo = new Foo();
+        foo.id = 1;
+        foo.names = Arrays.asList("a","b");
+        foo.bar = "München";
+        save(foo);
+
+        Numeric numeric = new Numeric();
+        numeric.setValue(BigDecimal.valueOf(26.9));
+        save(numeric);
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void add_bigDecimal() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
+        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                        .where(bigd1.add(bigd2).loe(new BigDecimal("1.00")))
+                        .select(entity).fetch());
+    }
+
+    @Test
+    public void aggregates_list_max() {
+        assertEquals(Integer.valueOf(6), query().from(cat).select(cat.id.max()).fetchFirst());
+    }
+
+    @Test
+    public void aggregates_list_min() {
+        assertEquals(Integer.valueOf(1), query().from(cat).select(cat.id.min()).fetchFirst());
+    }
+
+    @Test
+    public void aggregates_uniqueResult_max() {
+        assertEquals(Integer.valueOf(6), query().from(cat).select(cat.id.max()).fetchFirst());
+    }
+
+    @Test
+    public void aggregates_uniqueResult_min() {
+        assertEquals(Integer.valueOf(1), query().from(cat).select(cat.id.min()).fetchFirst());
+    }
+
+    @Test
+    public void alias() {
+        assertEquals(6, query().from(cat).select(cat.id.as(cat.id)).fetch().size());
+    }
+
+    @Test
+    public void any_and_gt() {
+        assertEquals(0, query().from(cat).where(
+                cat.kittens.any().name.eq("Ruth123"),
+                cat.kittens.any().bodyWeight.gt(10.0)).fetchCount());
+    }
+
+    @Test
+    public void any_and_lt() {
+        assertEquals(1, query().from(cat).where(
+                cat.kittens.any().name.eq("Ruth123"),
+                cat.kittens.any().bodyWeight.lt(10.0)).fetchCount());
+    }
+
+    @Test
+    public void any_in_order() {
+        assertFalse(query().from(cat).orderBy(cat.kittens.any().name.asc()).select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in_projection() {
+        assertFalse(query().from(cat).select(cat.kittens.any()).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in_projection2() {
+        assertFalse(query().from(cat).select(cat.kittens.any().name).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in_projection3() {
+        assertFalse(query().from(cat).select(cat.kittens.any().name, cat.kittens.any().bodyWeight).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in1() {
+        //select cat from Cat cat where exists (
+        //  select cat_kittens from Cat cat_kittens where cat_kittens member of cat.kittens and cat_kittens in ?1)
+        assertFalse(query().from(cat).where(cat.kittens.any().in(savedCats)).select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in11() {
+        List<Integer> ids = new ArrayList<>();
+        for (Cat cat : savedCats) {
+            ids.add(cat.getId());
+        }
+        assertFalse(query().from(cat).where(cat.kittens.any().id.in(ids)).select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_in2() {
+        assertFalse(query().from(cat).where(
+                cat.kittens.any().in(savedCats),
+                cat.kittens.any().in(savedCats.subList(0, 1)).not())
+                .select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void any_in3() {
+        QEmployee employee = QEmployee.employee;
+        assertFalse(query().from(employee).where(
+                employee.jobFunctions.any().in(JobFunction.CODER, JobFunction.CONSULTANT))
+                .select(employee).fetch().isEmpty());
+    }
+
+    @Test
+    public void any_simple() {
+        assertEquals(1, query().from(cat).where(cat.kittens.any().name.eq("Ruth123")).fetchCount());
+    }
+
+    @Test
+    public void any_any() {
+        assertEquals(1, query().from(cat).where(cat.kittens.any().kittens.any().name.eq("Ruth123")).fetchCount());
+    }
+
+    @Test
+    public void arrayProjection() {
+        List<String[]> results = query().from(cat)
+                .select(new ArrayConstructorExpression<String>(String[].class, cat.name)).fetch();
+        assertFalse(results.isEmpty());
+        for (String[] result : results) {
+            assertNotNull(result[0]);
+        }
+    }
+
+    @Test
+    public void as() {
+        assertTrue(query().from(QAnimal.animal.as(QCat.class)).fetchCount() > 0);
+    }
+
+    @Test
+    public void between() {
+        assertEquals(Arrays.asList(2, 3, 4, 5),
+                query().from(cat).where(cat.id.between(2, 5)).orderBy(cat.id.asc()).select(cat.id).fetch());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void case1() {
+        assertEquals(Arrays.asList(1, 2, 2, 2, 2, 2),
+                query().from(cat).orderBy(cat.id.asc())
+                        .select(cat.name.when("Bob123").then(1).otherwise(2)).fetch());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void case1_long() {
+        assertEquals(Arrays.asList(1L, 2L, 2L, 2L, 2L, 2L),
+                query().from(cat).orderBy(cat.id.asc())
+                        .select(cat.name.when("Bob123").then(1L).otherwise(2L)).fetch());
+        List<Integer> rv = query().from(cat).select(cat.name.when("Bob").then(1).otherwise(2)).fetch();
+        assertInstancesOf(Integer.class, rv);
+    }
+
+    @Test
+    @NoEclipseLink
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    public void case1_date() {
+        List<LocalDate> rv = query().from(cat).select(cat.name.when("Bob").then(new LocalDate())
+                .otherwise(new LocalDate().plusDays(1))).fetch();
+        assertInstancesOf(LocalDate.class, rv);
+    }
+
+    @Test
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    @NoEclipseLink({MYSQL, POSTGRESQL})
+    public void case1_date2() {
+        List<java.sql.Date> rv = query().from(cat).select(cat.name.when("Bob").then(new java.sql.Date(0))
+                .otherwise(new java.sql.Date(0))).fetch();
+        assertInstancesOf(java.sql.Date.class, rv);
+    }
+
+    @Test
+    @NoEclipseLink
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    public void case1_time() {
+        List<LocalTime> rv = query().from(cat).select(cat.name.when("Bob").then(new LocalTime())
+                .otherwise(new LocalTime().plusHours(1))).fetch();
+        assertInstancesOf(LocalTime.class, rv);
+    }
+
+    @Test
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    @NoEclipseLink({MYSQL, POSTGRESQL})
+    public void case1_time2() {
+        List<java.sql.Time> rv = query().from(cat).select(cat.name.when("Bob").then(new java.sql.Time(0))
+                .otherwise(new java.sql.Time(0))).fetch();
+        assertInstancesOf(java.sql.Time.class, rv);
+    }
+
+    @Test
+    @NoEclipseLink
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    public void case1_timestamp() {
+        List<DateTime> rv = query().from(cat).select(cat.name.when("Bob").then(new DateTime())
+                .otherwise(new DateTime().plusHours(1))).fetch();
+        assertInstancesOf(DateTime.class, rv);
+    }
+
+    @Test
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-8653
+    @NoEclipseLink({MYSQL, POSTGRESQL})
+    public void case1_timestamp2() {
+        List<java.sql.Timestamp> rv = query().from(cat).select(cat.name.when("Bob").then(new java.sql.Timestamp(0))
+                .otherwise(new java.sql.Timestamp(0))).fetch();
+        assertInstancesOf(java.sql.Timestamp.class, rv);
+    }
+
+    @Test
+    public void case2() {
+        assertEquals(Arrays.asList(4, 4, 4, 4, 4, 4),
+                query().from(cat)
+                        .select(Expressions.cases().when(cat.toes.eq(2)).then(cat.id.multiply(2))
+                                .when(cat.toes.eq(3)).then(cat.id.multiply(3))
+                                .otherwise(4)).fetch());
+    }
+
+    @Test
+    public void case3() {
+        assertEquals(Arrays.asList(4, 4, 4, 4, 4, 4),
+                query().from(cat).select(Expressions.cases()
+                        .when(cat.toes.in(2, 3)).then(cat.id.multiply(cat.toes))
+                        .otherwise(4)).fetch());
+    }
+
+    @Test
+    @ExcludeIn(MYSQL) // doesn't work in Eclipselink
+    public void case4() {
+        NumberExpression<Float> numExpression = cat.bodyWeight.floatValue().divide(otherCat.bodyWeight.floatValue()).multiply(100);
+        NumberExpression<Float> numExpression2 = cat.id.when(0).then(0.0F).otherwise(numExpression);
+        assertEquals(Arrays.asList(200, 150, 133, 125, 120),
+                query().from(cat, otherCat)
+                        .where(cat.id.eq(otherCat.id.add(1)))
+                        .orderBy(cat.id.asc(), otherCat.id.asc())
+                        .select(numExpression2.intValue()).fetch());
+    }
+
+    @Test
+    public void case5() {
+        assertEquals(Arrays.asList(1, 0, 1, 1, 1, 1),
+                query().from(cat).orderBy(cat.id.asc())
+                        .select(cat.mate.when(savedCats.get(0)).then(0).otherwise(1)).fetch());
+    }
+
+    private static <T> void assertInstancesOf(Class<T> clazz, Iterable<T> rows) {
+        for (T row : rows) {
+            assertEquals(row.toString(), clazz, row.getClass());
+        }
+    }
+
+    @Test
+    public void caseBuilder() {
+        QCat cat2 = new QCat("cat2");
+        NumberExpression<Integer> casex = new CaseBuilder()
+                .when(cat.weight.isNull().and(cat.weight.isNull())).then(0)
+                .when(cat.weight.isNull()).then(cat2.weight)
+                .when(cat2.weight.isNull()).then(cat.weight)
+                .otherwise(cat.weight.add(cat2.weight));
+
+        query().from(cat, cat2).orderBy(casex.asc()).select(cat.id, cat2.id).fetch();
+        query().from(cat, cat2).orderBy(casex.desc()).select(cat.id, cat2.id).fetch();
+    }
+
+    @Test
+    public void cast() {
+        List<Cat> cats = query().from(cat).select(cat).fetch();
+        List<Integer> weights = query().from(cat).select(cat.bodyWeight.castToNum(Integer.class)).fetch();
+        for (int i = 0; i < cats.size(); i++) {
+            assertEquals(Integer.valueOf((int) (cats.get(i).getBodyWeight())), weights.get(i));
+        }
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void cast_toString() {
+        for (Tuple tuple : query().from(cat).select(cat.breed, cat.breed.stringValue()).fetch()) {
+            assertEquals(
+                    tuple.get(cat.breed).toString(),
+                    tuple.get(cat.breed.stringValue()));
+        }
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void cast_toString_append() {
+        for (Tuple tuple : query().from(cat).select(cat.breed, cat.breed.stringValue().append("test")).fetch()) {
+            assertEquals(
+                    tuple.get(cat.breed).toString() + "test",
+                    tuple.get(cat.breed.stringValue().append("test")));
+        }
+    }
+
+    @Test
+    public void collection_predicates() {
+        ListPath<Cat, QCat> path = cat.kittens;
+        //            path.eq(savedCats),
+        //            path.in(savedCats),
+        //            path.isNotNull(),
+        //            path.isNull(),
+        //            path.ne(savedCats),
+        //            path.notIn(savedCats)
+        //            path.when(other)
+        List<Predicate> predicates = Collections.emptyList();
+        for (Predicate pred : predicates) {
+            System.err.println(pred);
+            query().from(cat).where(pred).select(cat).fetch();
+        }
+    }
+
+    @Test
+    public void collection_projections() {
+        ListPath<Cat, QCat> path = cat.kittens;
+        //            path.fetchCount(),
+        //            path.countDistinct()
+        List<Expression<?>> projections = Collections.emptyList();
+        for (Expression<?> proj : projections) {
+            System.err.println(proj);
+            query().from(cat).select(proj).fetch();
+        }
+    }
+
+    @Test
+    public void constant() {
+        //select cat.id, ?1 as const from Cat cat
+        List<Cat> cats = query().from(cat).select(cat).fetch();
+        Path<String> path = Expressions.stringPath("const");
+        List<Tuple> tuples = query().from(cat).select(cat.id, Expressions.constantAs("abc", path)).fetch();
+        for (int i = 0; i < cats.size(); i++) {
+            assertEquals(Integer.valueOf(cats.get(i).getId()), tuples.get(i).get(cat.id));
+            assertEquals("abc", tuples.get(i).get(path));
+        }
+    }
+
+    @Test
+    public void constant2() {
+        assertFalse(query().from(cat).select(cat.id, Expressions.constant("name")).fetch().isEmpty());
+    }
+
+    @Test
+    public void constructorProjection() {
+        List<Projection> projections = query().from(cat)
+                .select(Projections.constructor(Projection.class, cat.name, cat)).fetch();
+        assertFalse(projections.isEmpty());
+        for (Projection projection : projections) {
+            assertNotNull(projection);
+        }
+    }
+
+    @Test
+    public void constructorProjection2() {
+        List<Projection> projections = query().from(cat).select(new QProjection(cat.name, cat)).fetch();
+        assertFalse(projections.isEmpty());
+        for (Projection projection : projections) {
+            assertNotNull(projection);
+        }
+    }
+
+    @Test
+    public void constructorProjection3() {
+        List<Projection> projections = query().from(cat).select(new QProjection(cat.id, Expressions.FALSE)).fetch();
+        assertFalse(projections.isEmpty());
+        for (Projection projection : projections) {
+            assertNotNull(projection);
+        }
+    }
+
+    @Test
+    public void contains_ic() {
+        QFoo foo = QFoo.foo;
+        assertEquals(1, query().from(foo).where(foo.bar.containsIgnoreCase("München")).fetchCount());
+    }
+
+    @Test
+    public void contains1() {
+        assertEquals(1, query().from(cat).where(cat.name.contains("eli")).fetchCount());
+    }
+
+    @Test
+    public void contains2() {
+        assertEquals(1L, query().from(cat).where(cat.kittens.contains(savedCats.get(0))).fetchCount());
+    }
+
+    @Test
+    public void contains3() {
+        assertEquals(1L, query().from(cat).where(cat.name.contains("_")).fetchCount());
+    }
+
+    @Test
+    public void contains4() {
+        QEmployee employee = QEmployee.employee;
+        assertEquals(Collections.emptyList(),
+                query().from(employee)
+                        .where(
+                                employee.jobFunctions.contains(JobFunction.CODER),
+                                employee.jobFunctions.contains(JobFunction.CONSULTANT),
+                                employee.jobFunctions.size().eq(2))
+                        .select(employee).fetch());
+    }
+
+    @Test
+    public void count() {
+        QShow show = QShow.show;
+        assertTrue(query().from(show).fetchCount() > 0);
+    }
+
+    @Test
+    public void count_distinct() {
+        QCat cat = QCat.cat;
+        query().from(cat)
+               .groupBy(cat.id)
+               .select(cat.id, cat.breed.countDistinct()).fetch();
+    }
+
+    @Test
+    @NoBatooJPA
+    @NoHibernate
+    public void count_distinct2() {
+        QCat cat = QCat.cat;
+        query().from(cat)
+               .groupBy(cat.id)
+               .select(cat.id, cat.birthdate.dayOfMonth().countDistinct()).fetch();
+    }
+
+    @Test
+    @NoEclipseLink
+    @ExcludeIn(SQLSERVER)
+    public void distinct_orderBy() {
+        QCat cat = QCat.cat;
+        List<Tuple> result = query().select(cat.id, cat.mate.id)
+                .distinct()
+                .from(cat)
+                .orderBy(
+                        cat.mate.id.asc().nullsFirst(),
+                        cat.id.asc().nullsFirst()
+                ).fetch();
+        assertThat(result, Matchers.<Tuple>contains(
+                new MockTuple(new Object[]{1, null}),
+                new MockTuple(new Object[]{6, null}),
+                new MockTuple(new Object[]{2, 1}),
+                new MockTuple(new Object[]{3, 2}),
+                new MockTuple(new Object[]{4, 3}),
+                new MockTuple(new Object[]{5, 4})
+        ));
+    }
+
+    @Test
+    @NoHibernate
+    @ExcludeIn(MYSQL)
+    public void distinct_orderBy2() {
+        QCat cat = QCat.cat;
+        List<Tuple> result = query().select(cat.id, cat.mate.id)
+                .distinct()
+                .from(cat)
+                .orderBy(cat.mate.id.asc().nullsFirst()).fetch();
+        assertThat(result, Matchers.<Tuple>contains(
+                new MockTuple(new Object[]{2, 1}),
+                new MockTuple(new Object[]{3, 2}),
+                new MockTuple(new Object[]{4, 3}),
+                new MockTuple(new Object[]{5, 4})
+        ));
+    }
+
+    @Test
+    @NoEclipseLink(HSQLDB)
+    public void count_distinct3() {
+        QCat kitten = new QCat("kitten");
+        assertEquals(4, query().from(cat).leftJoin(cat.kittens, kitten).select(kitten.countDistinct()).fetchOne().intValue());
+        assertEquals(6, query().from(cat).leftJoin(cat.kittens, kitten).select(kitten.countDistinct()).fetchCount());
+    }
+
+    @Test
+    public void distinctResults() {
+        System.out.println("-- fetch results");
+        QueryResults<Date> res = query().from(cat).limit(2).select(cat.birthdate).fetchResults();
+        assertEquals(2, res.getResults().size());
+        assertEquals(6L, res.getTotal());
+        System.out.println();
+
+        System.out.println("-- fetch distinct results");
+        res = query().from(cat).limit(2).distinct().select(cat.birthdate).fetchResults();
+        assertEquals(1, res.getResults().size());
+        assertEquals(1L, res.getTotal());
+        System.out.println();
+
+        System.out.println("-- fetch distinct");
+        assertEquals(1, query().from(cat).distinct().select(cat.birthdate).fetch().size());
+    }
+
+    @Test
+    public void date() {
+        assertEquals(2000, query().from(cat).select(cat.birthdate.year()).fetchFirst().intValue());
+        assertEquals(200002, query().from(cat).select(cat.birthdate.yearMonth()).fetchFirst().intValue());
+        assertEquals(2, query().from(cat).select(cat.birthdate.month()).fetchFirst().intValue());
+        assertEquals(2, query().from(cat).select(cat.birthdate.dayOfMonth()).fetchFirst().intValue());
+        assertEquals(3, query().from(cat).select(cat.birthdate.hour()).fetchFirst().intValue());
+        assertEquals(4, query().from(cat).select(cat.birthdate.minute()).fetchFirst().intValue());
+        assertEquals(0, query().from(cat).select(cat.birthdate.second()).fetchFirst().intValue());
+    }
+
+    @Test
+    @NoEclipseLink({DERBY, HSQLDB})
+    @NoHibernate({DERBY, POSTGRESQL, SQLSERVER})
+    public void date_yearWeek() {
+        int value = query().from(cat).select(cat.birthdate.yearWeek()).fetchFirst();
+        assertTrue(value == 200006 || value == 200005);
+    }
+
+    @Test
+    @NoEclipseLink({DERBY, HSQLDB})
+    @NoHibernate({DERBY, POSTGRESQL, SQLSERVER})
+    public void date_week() {
+        int value = query().from(cat).select(cat.birthdate.week()).fetchFirst();
+        assertTrue(value == 6 || value == 5);
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void divide() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                .where(entity.ddouble.divide(entity2.ddouble).loe(2.0))
+                .select(entity).fetch());
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                .where(entity.ddouble.divide(entity2.iint).loe(2.0))
+                .select(entity).fetch());
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                .where(entity.iint.divide(entity2.ddouble).loe(2.0))
+                .select(entity).fetch());
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                        .where(entity.iint.divide(entity2.iint).loe(2))
+                        .select(entity).fetch());
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void divide_bigDecimal() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
+        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                        .where(bigd1.divide(bigd2).loe(new BigDecimal("1.00")))
+                        .select(entity).fetch());
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                .where(entity.ddouble.divide(bigd2).loe(new BigDecimal("1.00")))
+                .select(entity).fetch());
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                .where(bigd1.divide(entity.ddouble).loe(new BigDecimal("1.00")))
+                .select(entity).fetch());
+    }
+
+    @Test
+    public void endsWith() {
+        assertEquals(1, query().from(cat).where(cat.name.endsWith("h123")).fetchCount());
+    }
+
+    @Test
+    public void endsWith_ignoreCase() {
+        assertEquals(1, query().from(cat).where(cat.name.endsWithIgnoreCase("H123")).fetchCount());
+    }
+
+    @Test
+    public void endsWith2() {
+        assertEquals(0, query().from(cat).where(cat.name.endsWith("X")).fetchCount());
+    }
+
+    @Test
+    public void endsWith3() {
+        assertEquals(1, query().from(cat).where(cat.name.endsWith("_123")).fetchCount());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void enum_eq() {
+        assertEquals(1, query().from(company).where(company.ratingOrdinal.eq(Rating.A)).fetchCount());
+        assertEquals(1, query().from(company).where(company.ratingString.eq(Rating.AA)).fetchCount());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void enum_in() {
+        assertEquals(1, query().from(company).where(company.ratingOrdinal.in(Rating.A, Rating.AA)).fetchCount());
+        assertEquals(1, query().from(company).where(company.ratingString.in(Rating.A, Rating.AA)).fetchCount());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void enum_in2() {
+        QEmployee employee = QEmployee.employee;
+
+        JPQLQuery<?> query = query();
+        query.from(employee).where(employee.lastName.eq("Smith"), employee.jobFunctions
+                .contains(JobFunction.CODER));
+        assertEquals(1L, query.fetchCount());
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void enum_startsWith() {
+        assertEquals(1, query().from(company).where(company.ratingString.stringValue().startsWith("A")).fetchCount());
+    }
+
+    @Test
+    @NoEclipseLink(HSQLDB)
+    public void factoryExpressions() {
+        QCat cat = QCat.cat;
+        QCat cat2 = new QCat("cat2");
+        QCat kitten = new QCat("kitten");
+        JPQLQuery<Tuple> query = query().from(cat)
+                .leftJoin(cat.mate, cat2)
+                .leftJoin(cat2.kittens, kitten)
+                .select(Projections.tuple(cat.id, new QFamily(cat, cat2, kitten).skipNulls()));
+        assertEquals(6, query.fetch().size());
+        assertNotNull(query.limit(1).fetchOne());
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    public void fetch() {
+        QMammal mammal = QMammal.mammal;
+        QHuman human = new QHuman("mammal");
+        query().from(mammal)
+            .leftJoin(human.hairs).fetchJoin()
+            .select(mammal).fetch();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    public void fetch2() {
+        QWorld world = QWorld.world;
+        QMammal mammal = QMammal.mammal;
+        QHuman human = new QHuman("mammal");
+        query().from(world)
+            .leftJoin(world.mammals, mammal).fetchJoin()
+            .leftJoin(human.hairs).fetchJoin()
+            .select(world).fetch();
+    }
+
+    @Test
+    @ExcludeIn({MYSQL, DERBY})
+    @NoBatooJPA
+    public void groupBy() {
+        QAuthor author = QAuthor.author;
+        QBook book = QBook.book;
+
+        for (int i = 0; i < 10; i++) {
+            Author a = new Author();
+            a.setName(String.valueOf(i));
+            save(a);
+            for (int j = 0; j < 2; j++) {
+                Book b = new Book();
+                b.setTitle(String.valueOf(i) + " " + String.valueOf(j));
+                b.setAuthor(a);
+                save(b);
+            }
+        }
+
+        Map<Long, List<Pair<Long, String>>> map = query()
+            .from(author)
+            .join(author.books, book)
+            .transform(GroupBy
+                    .groupBy(author.id)
+                    .as(GroupBy.list(QPair.create(book.id, book.title))));
+
+        for (Entry<Long, List<Pair<Long, String>>> entry : map.entrySet()) {
+            System.out.println("author = " + entry.getKey());
+
+            for (Pair<Long,String> pair : entry.getValue()) {
+                System.out.println("  book = " + pair.getFirst() + "," + pair.getSecond());
+            }
+        }
+    }
+
+    @Test
+    public void groupBy2() {
+//        select cat0_.name as col_0_0_, cat0_.breed as col_1_0_, sum(cat0_.bodyWeight) as col_2_0_
+//        from animal_ cat0_ where cat0_.DTYPE in ('C', 'DC') and cat0_.bodyWeight>?
+//        group by cat0_.name, cat0_.breed
+        query().from(cat)
+            .where(cat.bodyWeight.gt(0))
+            .groupBy(cat.name, cat.breed)
+            .select(cat.name, cat.breed, cat.bodyWeight.sum()).fetch();
+    }
+
+    @Test
+    @NoEclipseLink
+    public void groupBy_yearMonth() {
+        query().from(cat)
+               .groupBy(cat.birthdate.yearMonth())
+               .orderBy(cat.birthdate.yearMonth().asc())
+               .select(cat.id.count()).fetch();
+    }
+
+    @Test
+    @Ignore // FIXME
+    public void groupBy_count() {
+        List<Integer> ids = query().from(cat).groupBy(cat.id).select(cat.id).fetch();
+        long count = query().from(cat).groupBy(cat.id).fetchCount();
+        QueryResults<Integer> results = query().from(cat).groupBy(cat.id)
+                .limit(1).select(cat.id).fetchResults();
+
+        long catCount = query().from(cat).fetchCount();
+        assertEquals(catCount, ids.size());
+        assertEquals(catCount, count);
+        assertEquals(catCount, results.getResults().size());
+        assertEquals(catCount, results.getTotal());
+    }
+
+    @Test
+    @Ignore // FIXME
+    public void groupBy_distinct_count() {
+        List<Integer> ids = query().from(cat).groupBy(cat.id).distinct().select(Expressions.ONE).fetch();
+        QueryResults<Integer> results = query().from(cat).groupBy(cat.id)
+                .limit(1).distinct().select(Expressions.ONE).fetchResults();
+
+        assertEquals(1, ids.size());
+        assertEquals(1, results.getResults().size());
+        assertEquals(1, results.getTotal());
+    }
+
+    @Test
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-1902
+    public void groupBy_select() {
+        // select length(my_column) as column_size from my_table group by column_size
+        NumberPath<Integer> length = Expressions.numberPath(Integer.class, "len");
+        assertEquals(Arrays.asList(4, 6, 7, 8),
+                query().select(cat.name.length().as(length)).from(cat).orderBy(length.asc()).groupBy(length).fetch());
+    }
+
+    @Test
+    public void groupBy_results() {
+        QueryResults<Integer> results = query().from(cat).groupBy(cat.id).select(cat.id).fetchResults();
+        assertEquals(6, results.getTotal());
+        assertEquals(6, results.getResults().size());
+    }
+
+    @Test
+    public void groupBy_results2() {
+        QueryResults<Integer> results = query().from(cat).groupBy(cat.birthdate).select(cat.id.max()).fetchResults();
+        assertEquals(1, results.getTotal());
+        assertEquals(1, results.getResults().size());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(3L, query().from(cat).where(cat.name.in("Bob123", "Ruth123", "Felix123")).fetchCount());
+        assertEquals(3L, query().from(cat).where(cat.id.in(Arrays.asList(1, 2, 3))).fetchCount());
+        assertEquals(0L, query().from(cat).where(cat.name.in(Arrays.asList("A", "B", "C"))).fetchCount());
+    }
+
+    @Test
+    public void in2() {
+        assertEquals(3L, query().from(cat).where(cat.id.in(1, 2, 3)).fetchCount());
+        assertEquals(0L, query().from(cat).where(cat.name.in("A", "B", "C")).fetchCount());
+    }
+
+    @Test
+    public void in3() {
+        assertEquals(0, query().from(cat).where(cat.name.in("A,B,C".split(","))).fetchCount());
+    }
+
+    @Test
+    public void in4() {
+        //$.parameterRelease.id.eq(releaseId).and($.parameterGroups.any().id.in(filter.getGroups()));
+        assertEquals(Collections.emptyList(),
+                query().from(cat).where(cat.id.eq(1), cat.kittens.any().id.in(1, 2, 3)).select(cat).fetch());
+    }
+
+    @Test
+    public void in5() {
+        assertEquals(4L, query().from(cat).where(cat.mate.in(savedCats)).fetchCount());
+    }
+
+    @Test
+    @Ignore
+    public void in6() {
+        //query().from(cat).where(cat.kittens.in(savedCats)).fetchCount();
+    }
+
+    @Test
+    public void in7() {
+        assertEquals(4L, query().from(cat).where(cat.kittens.any().in(savedCats)).fetchCount());
+    }
+
+    @Test
+    public void in_empty() {
+        assertEquals(0, query().from(cat).where(cat.name.in(Collections.emptyList())).fetchCount());
+    }
+
+    @Test
+    @NoOpenJPA
+    public void indexOf() {
+        assertEquals(Integer.valueOf(0), query().from(cat).where(cat.name.eq("Bob123"))
+                .select(cat.name.indexOf("B")).fetchFirst());
+    }
+
+    @Test
+    @NoOpenJPA
+    public void indexOf2() {
+        assertEquals(Integer.valueOf(1), query().from(cat).where(cat.name.eq("Bob123"))
+                .select(cat.name.indexOf("o")).fetchFirst());
+    }
+
+    @Test
+    public void instanceOf_cat() {
+        assertEquals(6L, query().from(cat).where(cat.instanceOf(Cat.class)).fetchCount());
+    }
+
+    @Test
+    public void instanceOf_domesticCat() {
+        assertEquals(0L, query().from(cat).where(cat.instanceOf(DomesticCat.class)).fetchCount());
+    }
+
+    @Test
+    public void instanceOf_entity1() {
+        QEntity1 entity1 = QEntity1.entity1;
+        assertEquals(2L, query().from(entity1).where(entity1.instanceOf(Entity1.class)).fetchCount());
+    }
+
+    @Test
+    public void instanceOf_entity2() {
+        QEntity1 entity1 = QEntity1.entity1;
+        assertEquals(1L, query().from(entity1).where(entity1.instanceOf(Entity2.class)).fetchCount());
+    }
+
+    @Test
+    @NoHibernate // https://hibernate.atlassian.net/browse/HHH-6686
+    public void isEmpty_elementCollection() {
+        QEmployee employee = QEmployee.employee;
+        assertEquals(0, query().from(employee).where(employee.jobFunctions.isEmpty()).fetchCount());
+    }
+
+    @Test
+    public void isEmpty_relation() {
+        assertEquals(6L, query().from(cat).where(cat.kittensSet.isEmpty()).fetchCount());
+    }
+
+    @Test
+    @NoEclipseLink
+    @ExcludeIn({ORACLE, TERADATA})
+    public void joinEmbeddable() {
+        QBookVersion bookVersion = QBookVersion.bookVersion;
+        QBookMark bookMark = QBookMark.bookMark;
+
+        assertEquals(Collections.emptyList(),
+                query().from(bookVersion)
+                        .join(bookVersion.definition.bookMarks, bookMark)
+                        .where(
+                                bookVersion.definition.bookMarks.size().eq(1),
+                                bookMark.page.eq(2357L).or(bookMark.page.eq(2356L)))
+                        .select(bookVersion).fetch());
+    }
+
+    @Test
+    public void length() {
+        assertEquals(6, query().from(cat).where(cat.name.length().gt(0)).fetchCount());
+    }
+
+    @Test
+    public void like() {
+        assertEquals(0, query().from(cat).where(cat.name.like("!")).fetchCount());
+        assertEquals(0, query().from(cat).where(cat.name.like("\\")).fetchCount());
+    }
+
+    @Test
+    public void limit() {
+        List<String> names1 = Arrays.asList("Allen123","Bob123");
+        assertEquals(names1, query().from(cat).orderBy(cat.name.asc()).limit(2).select(cat.name).fetch());
+    }
+
+    @Test
+    public void limit_and_offset() {
+        List<String> names3 = Arrays.asList("Felix123", "Mary_123");
+        assertEquals(names3, query().from(cat).orderBy(cat.name.asc()).limit(2).offset(2).select(cat.name).fetch());
+    }
+
+    @Test
+    public void limit2() {
+        assertEquals(Collections.singletonList("Allen123"),
+                query().from(cat).orderBy(cat.name.asc()).limit(1).select(cat.name).fetch());
+    }
+
+    @Test
+    public void limit3() {
+        assertEquals(6, query().from(cat).limit(Long.MAX_VALUE).select(cat).fetch().size());
+    }
+
+    @Test
+    public void list_elementCollection_of_enum() {
+        QEmployee employee = QEmployee.employee;
+        //QJobFunction jobFunction = QJobFunction.jobFunction;
+        EnumPath<JobFunction> jobFunction = Expressions.enumPath(JobFunction.class, "jf");
+
+        List<JobFunction> jobFunctions = query().from(employee)
+                .innerJoin(employee.jobFunctions, jobFunction).select(jobFunction).fetch();
+        assertEquals(4, jobFunctions.size());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void list_elementCollection_of_string() {
+        QFoo foo = QFoo.foo;
+        StringPath str = Expressions.stringPath("str");
+
+        List<String> strings = query().from(foo).innerJoin(foo.names, str).select(str).fetch();
+        assertEquals(2, strings.size());
+        assertTrue(strings.contains("a"));
+        assertTrue(strings.contains("b"));
+    }
+
+    @Test
+    @NoEclipseLink(HSQLDB)
+    public void list_order_get() {
+        QCat cat = QCat.cat;
+        assertEquals(6, query().from(cat).orderBy(cat.kittens.get(0).name.asc()).fetch().size());
+    }
+
+    @Test
+    @NoEclipseLink(HSQLDB)
+    public void list_order_get2() {
+        QCat cat = QCat.cat;
+        assertEquals(6, query().from(cat).orderBy(cat.mate.kittens.get(0).name.asc()).fetch().size());
+    }
+
+    @Test
+    public void map_get() {
+        QShow show = QShow.show;
+        assertEquals(Collections.singletonList("A"), query().from(show).select(show.acts.get("a")).fetch());
+    }
+
+    @Test
+    @NoHibernate
+    public void map_get2() {
+        QShow show = QShow.show;
+        assertEquals(1, query().from(show).where(show.acts.get("a").eq("A")).fetchCount());
+    }
+
+    @Test
+    @NoEclipseLink
+    public void map_order_get() {
+        QShow show = QShow.show;
+        assertEquals(1, query().from(show).orderBy(show.parent.acts.get("A").asc()).fetch().size());
+    }
+
+    @Test
+    @NoEclipseLink
+    public void map_order_get2() {
+        QShow show = QShow.show;
+        QShow parent = new QShow("parent");
+        assertEquals(1, query().from(show).leftJoin(show.parent, parent)
+                .orderBy(parent.acts.get("A").asc()).fetch().size());
+    }
+
+    @Test
+    public void map_containsKey() {
+        QShow show = QShow.show;
+        assertEquals(1L, query().from(show).where(show.acts.containsKey("a")).fetchCount());
+    }
+
+    @Test
+    public void map_containsKey2() {
+        QShow show = QShow.show;
+        assertEquals(1L, query().from(show).where(show.acts.containsKey("b")).fetchCount());
+    }
+
+    @Test
+    public void map_containsKey3() {
+        QShow show = QShow.show;
+        assertEquals(0L, query().from(show).where(show.acts.containsKey("c")).fetchCount());
+    }
+
+    @Test
+    public void map_containsValue() {
+        QShow show = QShow.show;
+        assertEquals(1L, query().from(show).where(show.acts.containsValue("A")).fetchCount());
+    }
+
+    @Test
+    public void map_containsValue2() {
+        QShow show = QShow.show;
+        assertEquals(1L, query().from(show).where(show.acts.containsValue("B")).fetchCount());
+    }
+
+    @Test
+    public void map_containsValue3() {
+        QShow show = QShow.show;
+        assertEquals(0L, query().from(show).where(show.acts.containsValue("C")).fetchCount());
+    }
+
+    @Test
+    public void map_contains() {
+        QShow show = QShow.show;
+        assertEquals(1L, query().from(show).where(show.acts.contains("a", "A")).fetchCount());
+        assertEquals(0L, query().from(show).where(show.acts.contains("X", "X")).fetchCount());
+    }
+
+    @Test
+    public void map_groupBy() {
+      QShow show = QShow.show;
+      assertEquals(1, query().from(show).select(show.acts.get("X")).groupBy(show.acts.get("a")).fetchCount());
+    }
+
+    @Test
+    @Ignore
+    public void map_join() {
+        //select m.text from Show s join s.acts a where key(a) = 'B'
+        QShow show = QShow.show;
+        StringPath act = Expressions.stringPath("act");
+        assertEquals(Collections.emptyList(), query().from(show).join(show.acts, act).select(act).fetch());
+    }
+
+    @Test
+    public void max() {
+        assertEquals(6.0, query().from(cat).select(cat.bodyWeight.max()).fetchFirst(), 0.0001);
+    }
+
+    @Test
+    public void min() {
+        assertEquals(1.0, query().from(cat).select(cat.bodyWeight.min()).fetchFirst(), 0.0001);
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void multiply() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                        .where(entity.ddouble.multiply(entity2.ddouble).loe(2.0))
+                        .select(entity).fetch());
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void multiply_bigDecimal() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
+        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
+
+        assertEquals(Collections.emptyList(),
+                query().from(entity, entity2)
+                        .where(bigd1.multiply(bigd2).loe(new BigDecimal("1.00")))
+                        .select(entity).fetch());
+    }
+
+    @Test
+    public void nestedProjection() {
+        Concatenation concat = new Concatenation(cat.name, cat.name);
+        List<Tuple> tuples = query().from(cat).select(cat.name, concat).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Tuple tuple : tuples) {
+            assertEquals(
+                tuple.get(concat),
+                tuple.get(cat.name) + tuple.get(cat.name));
+        }
+    }
+
+    @Test
+    public void not_in() {
+        long all = query().from(cat).fetchCount();
+        assertEquals(all - 3L, query().from(cat).where(cat.name.notIn("Bob123", "Ruth123", "Felix123")).fetchCount());
+
+        assertEquals(3L, query().from(cat).where(cat.id.notIn(1, 2, 3)).fetchCount());
+        assertEquals(6L, query().from(cat).where(cat.name.notIn("A", "B", "C")).fetchCount());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void not_in_empty() {
+        long count = query().from(cat).fetchCount();
+        assertEquals(count, query().from(cat).where(cat.name.notIn(Collections.<String>emptyList())).fetchCount());
+    }
+
+    @Test
+    public void null_as_uniqueResult() {
+        assertNull(query().from(cat).where(cat.name.eq(UUID.randomUUID().toString()))
+                .select(cat).fetchFirst());
+    }
+
+    @Test
+    @NoEclipseLink
+    public void numeric() {
+        QNumeric numeric = QNumeric.numeric;
+        BigDecimal singleResult = query().from(numeric).select(numeric.value).fetchFirst();
+        assertEquals(26.9, singleResult.doubleValue(), 0.001);
+    }
+
+    @Test
+    @NoOpenJPA
+    @NoBatooJPA // FIXME
+    public void offset1() {
+        List<String> names2 = Arrays.asList("Bob123", "Felix123", "Mary_123", "Ruth123", "Some");
+        assertEquals(names2, query().from(cat).orderBy(cat.name.asc()).offset(1).select(cat.name).fetch());
+    }
+
+    @Test
+    @NoOpenJPA
+    @NoBatooJPA // FIXME
+    public void offset2() {
+        List<String> names2 = Arrays.asList("Felix123", "Mary_123", "Ruth123", "Some");
+        assertEquals(names2, query().from(cat).orderBy(cat.name.asc()).offset(2).select(cat.name).fetch());
+    }
+
+    @Test
+    public void one_to_one() {
+        QEmployee employee = QEmployee.employee;
+        QUser user = QUser.user;
+
+        JPQLQuery<?> query = query();
+        query.from(employee);
+        query.innerJoin(employee.user, user);
+        query.select(employee).fetch();
+    }
+
+    @Test
+    public void order() {
+        NumberPath<Double> weight = Expressions.numberPath(Double.class, "weight");
+        assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0, 5.0, 6.0),
+                query().from(cat).orderBy(weight.asc()).select(cat.bodyWeight.as(weight)).fetch());
+    }
+
+    @Test
+    public void order_by_count() {
+        NumberPath<Long> count = Expressions.numberPath(Long.class, "c");
+        query().from(cat)
+            .groupBy(cat.id)
+            .orderBy(count.asc())
+            .select(cat.id, cat.id.count().as(count)).fetch();
+    }
+
+    @Test
+    public void order_stringValue() {
+        int count = (int) query().from(cat).fetchCount();
+        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().asc()).select(cat).fetch().size());
+    }
+
+    @Test
+    @NoBatooJPA // can't be parsed
+    public void order_stringValue_to_integer() {
+        int count = (int) query().from(cat).fetchCount();
+        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(Integer.class).asc()).select(cat).fetch().size());
+    }
+
+    @Test
+    @NoBatooJPA // can't be parsed
+    public void order_stringValue_toLong() {
+        int count = (int) query().from(cat).fetchCount();
+        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(Long.class).asc()).select(cat).fetch().size());
+    }
+
+    @Test
+    @NoBatooJPA // can't be parsed
+    public void order_stringValue_toBigInteger() {
+        int count = (int) query().from(cat).fetchCount();
+        assertEquals(count, query().from(cat).orderBy(cat.id.stringValue().castToNum(BigInteger.class).asc()).select(cat).fetch().size());
+    }
+
+    @Test
+    @NoBatooJPA
+    @ExcludeIn(SQLSERVER)
+    public void order_nullsFirst() {
+        assertNull(query().from(cat)
+                .orderBy(cat.dateField.asc().nullsFirst())
+                .select(cat.dateField).fetchFirst());
+    }
+
+    @Test
+    @NoBatooJPA
+    @ExcludeIn(SQLSERVER)
+    public void order_nullsLast() {
+        assertNotNull(query().from(cat)
+                .orderBy(cat.dateField.asc().nullsLast())
+                .select(cat.dateField).fetchFirst());
+    }
+
+    @Test
+    public void params() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Bob123", query().from(cat).where(cat.name.eq(name)).set(name, "Bob123")
+                .select(cat.name).fetchFirst());
+    }
+
+    @Test
+    public void params_anon() {
+        Param<String> name = new Param<String>(String.class);
+        assertEquals("Bob123",query().from(cat).where(cat.name.eq(name)).set(name, "Bob123")
+                .select(cat.name).fetchFirst());
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void params_not_set() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Bob123", query().from(cat).where(cat.name.eq(name)).select(cat.name).fetchFirst());
+    }
+
+    @Test
+    public void precedence() {
+        StringPath str = cat.name;
+        Predicate where = str.like("Bob%").and(str.like("%ob123"))
+                      .or(str.like("Ruth%").and(str.like("%uth123")));
+        assertEquals(2L, query().from(cat).where(where).fetchCount());
+    }
+
+    @Test
+    public void precedence2() {
+        StringPath str = cat.name;
+        Predicate where = str.like("Bob%").and(str.like("%ob123")
+                      .or(str.like("Ruth%"))).and(str.like("%uth123"));
+        assertEquals(0L, query().from(cat).where(where).fetchCount());
+    }
+
+    @Test
+    public void precedence3() {
+        Predicate where = cat.name.eq("Bob123").and(cat.id.eq(1))
+                      .or(cat.name.eq("Ruth123").and(cat.id.eq(2)));
+        assertEquals(2L, query().from(cat).where(where).fetchCount());
+    }
+
+    @Test
+    public void factoryExpression_in_groupBy() {
+        Expression<Cat> catBean = Projections.bean(Cat.class, cat.id, cat.name);
+        assertFalse(query().from(cat).groupBy(catBean).select(catBean).fetch().isEmpty());
+    }
+
+    @Test
+    @Ignore
+    public void size() {
+        // NOT SUPPORTED
+        query().from(cat).select(cat, cat.kittens.size()).fetch();
+    }
+
+    @Test
+    public void startsWith() {
+        assertEquals(1, query().from(cat).where(cat.name.startsWith("R")).fetchCount());
+    }
+
+    @Test
+    public void startsWith_ignoreCase() {
+        assertEquals(1, query().from(cat).where(cat.name.startsWithIgnoreCase("r")).fetchCount());
+    }
+
+    @Test
+    public void startsWith2() {
+        assertEquals(0, query().from(cat).where(cat.name.startsWith("X")).fetchCount());
+    }
+
+    @Test
+    public void startsWith3() {
+        assertEquals(1, query().from(cat).where(cat.name.startsWith("Mary_")).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn({MYSQL, SQLSERVER, TERADATA})
+    @NoOpenJPA
+    public void stringOperations() {
+        // NOTE : locate in MYSQL is case-insensitive
+        assertEquals(0, query().from(cat).where(cat.name.startsWith("r")).fetchCount());
+        assertEquals(0, query().from(cat).where(cat.name.endsWith("H123")).fetchCount());
+        assertEquals(Integer.valueOf(2), query().from(cat).where(cat.name.eq("Bob123"))
+                .select(cat.name.indexOf("b")).fetchFirst());
+    }
+
+    @Test
+    public void subQuery() {
+        QShow show = QShow.show;
+        QShow show2 = new QShow("show2");
+        assertEquals(0,
+                query().from(show).where(select(show2.count()).from(show2)
+                        .where(show2.id.ne(show.id)).gt(0L)).fetchCount());
+    }
+
+    @Test
+    public void subQuery2() {
+        QCat cat = QCat.cat;
+        QCat other = new QCat("other");
+        assertEquals(savedCats, query().from(cat)
+                .where(cat.name.in(select(other.name).from(other)
+                        .groupBy(other.name)))
+                .orderBy(cat.id.asc())
+                .select(cat).fetch());
+    }
+
+    @Test
+    public void subQuery3() {
+        QCat cat = QCat.cat;
+        QCat other = new QCat("other");
+        assertEquals(savedCats.subList(0, 1), query().from(cat)
+                .where(cat.name.eq(select(other.name).from(other)
+                        .where(other.name.indexOf("B").eq(0))))
+                .select(cat).fetch());
+    }
+
+    @Test
+    public void subQuery4() {
+        QCat cat = QCat.cat;
+        QCat other = new QCat("other");
+        query().from(cat)
+                .select(cat.name, select(other.count()).from(other).where(other.name.eq(cat.name))).fetch();
+    }
+
+    @Test
+    public void subQuery5() {
+        QEmployee employee = QEmployee.employee;
+        QEmployee employee2 = new QEmployee("e2");
+        assertEquals(2, query().from(employee)
+                .where(select(employee2.id.count()).from(employee2).gt(1L))
+                .fetchCount());
+    }
+
+    @Test
+    public void substring() {
+        for (String str : query().from(cat).select(cat.name.substring(1,2)).fetch()) {
+            assertEquals(1, str.length());
+        }
+    }
+
+    @Test
+    @NoBatooJPA
+    @ExcludeIn({ORACLE, SQLSERVER, HSQLDB})
+    public void substring2() {
+        QCompany company = QCompany.company;
+        StringExpression name = company.name;
+        Integer companyId = query().from(company).select(company.id).fetchFirst();
+        JPQLQuery<?> query = query().from(company).where(company.id.eq(companyId));
+        String str = query.select(company.name).fetchFirst();
+
+        assertEquals(Integer.valueOf(29),
+                query.select(name.length().subtract(11)).fetchFirst());
+
+        assertEquals(str.substring(0, 7),
+                query.select(name.substring(0, 7)).fetchFirst());
+
+        assertEquals(str.substring(15),
+                query.select(name.substring(15)).fetchFirst());
+
+        assertEquals(str.substring(str.length()),
+                query.select(name.substring(name.length())).fetchFirst());
+
+        assertEquals(str.substring(str.length() - 11),
+                query.select(name.substring(name.length().subtract(11))).fetchFirst());
+    }
+
+    @Test
+    @Ignore // FIXME
+    @ExcludeIn(DERBY)
+    public void substring_from_right() {
+        assertEquals(Collections.emptyList(), query().from(cat)
+                .where(cat.name.substring(-1, 1).eq(cat.name.substring(-2, 1)))
+                .select(cat).fetch());
+    }
+
+    @Test
+    @ExcludeIn({HSQLDB, DERBY})
+    public void substring_from_right2() {
+        assertEquals(Collections.emptyList(), query().from(cat)
+                .where(cat.name.substring(cat.name.length().subtract(1), cat.name.length())
+                        .eq(cat.name.substring(cat.name.length().subtract(2), cat.name.length().subtract(1))))
+                .select(cat).fetch());
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void subtract_bigDecimal() {
+        QSimpleTypes entity = new QSimpleTypes("entity1");
+        QSimpleTypes entity2 = new QSimpleTypes("entity2");
+        NumberPath<BigDecimal> bigd1 = entity.bigDecimal;
+        NumberPath<BigDecimal> bigd2 = entity2.bigDecimal;
+
+        assertEquals(Collections.emptyList(), query().from(entity, entity2)
+                .where(bigd1.subtract(bigd2).loe(new BigDecimal("1.00")))
+                .select(entity).fetch());
+    }
+
+    @Test
+    @Ignore
+    public void sum() {
+        // NOT SUPPORTED
+        query().from(cat).select(cat.kittens.size().sum()).fetch();
+    }
+
+    @Test
+    @Ignore
+    public void sum_2() {
+        // NOT SUPPORTED
+        query().from(cat).where(cat.kittens.size().sum().gt(0)).select(cat).fetch();
+    }
+
+    @Test
+    public void sum_3() {
+        assertEquals(21.0, query().from(cat).select(cat.bodyWeight.sum()).fetchFirst(), 0.0001);
+    }
+
+    @Test
+    public void sum_3_projected() {
+        double val = query().from(cat).select(cat.bodyWeight.sum()).fetchFirst();
+        DoubleProjection projection = query().from(cat)
+                .select(new QDoubleProjection(cat.bodyWeight.sum())).fetchFirst();
+        assertEquals(val, projection.val, 0.001);
+    }
+
+    @Test
+    public void sum_4() {
+        Double dbl = query().from(cat).select(cat.bodyWeight.sum().negate()).fetchFirst();
+        assertNotNull(dbl);
+    }
+
+    @Test
+    public void sum_5() {
+        QShow show = QShow.show;
+        Long lng = query().from(show).select(show.id.sum()).fetchFirst();
+        assertNotNull(lng);
+    }
+
+    @Test
+    public void sum_of_integer() {
+        QCat cat2 = new QCat("cat2");
+        assertEquals(Collections.emptyList(), query().from(cat)
+                .where(select(cat2.breed.sum())
+                        .from(cat2).where(cat2.eq(cat.mate)).gt(0))
+                .select(cat).fetch());
+    }
+
+    @Test
+    public void sum_of_float() {
+        QCat cat2 = new QCat("cat2");
+        query().from(cat)
+               .where(select(cat2.floatProperty.sum())
+                      .from(cat2).where(cat2.eq(cat.mate)).gt(0.0f))
+               .select(cat).fetch();
+    }
+
+    @Test
+    public void sum_of_double() {
+        QCat cat2 = new QCat("cat2");
+        query().from(cat)
+               .where(select(cat2.bodyWeight.sum())
+                      .from(cat2).where(cat2.eq(cat.mate)).gt(0.0))
+               .select(cat).fetch();
+    }
+
+    @Test
+    public void sum_as_float() {
+        float val = query().from(cat).select(cat.floatProperty.sum()).fetchFirst();
+        assertTrue(val > 0);
+    }
+
+    @Test
+    public void sum_as_float_projected() {
+        float val = query().from(cat).select(cat.floatProperty.sum()).fetchFirst();
+        FloatProjection projection = query().from(cat)
+                .select(new QFloatProjection(cat.floatProperty.sum())).fetchFirst();
+        assertEquals(val, projection.val, 0.001);
+    }
+
+    @Test
+    public void sum_as_float2() {
+        float val = query().from(cat).select(cat.floatProperty.sum().negate()).fetchFirst();
+        assertTrue(val < 0);
+    }
+
+    @Test
+    public void sum_coalesce() {
+        int val = query().from(cat).select(cat.weight.sum().coalesce(0)).fetchFirst();
+        assertEquals(0, val);
+    }
+
+    @Test
+    public void sum_noRows_double() {
+        assertNull(query().from(cat)
+                .where(cat.name.eq(UUID.randomUUID().toString()))
+                .select(cat.bodyWeight.sum()).fetchFirst());
+    }
+
+    @Test
+    public void sum_noRows_float() {
+        assertNull(query().from(cat)
+                .where(cat.name.eq(UUID.randomUUID().toString()))
+                .select(cat.floatProperty.sum()).fetchFirst());
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    @ExcludeIn({ORACLE, SQLSERVER})
+    public void test() {
+        Cat kitten = savedCats.get(0);
+        Cat noKitten = savedCats.get(savedCats.size() - 1);
+
+        ProjectionsFactory projections = new ProjectionsFactory(QuerydslModule.JPA, getTarget()) {
+            @Override
+            public <A,Q extends SimpleExpression<A>> Collection<Expression<?>> list(ListPath<A,Q> expr,
+                    ListExpression<A,Q> other, A knownElement) {
+                // NOTE : expr.get(0) is only supported in the where clause
+                return Collections.<Expression<?>>singleton(expr.size());
+            }
+        };
+
+        final EntityPath<?>[] sources = {cat, otherCat};
+        final Predicate[] conditions = {condition};
+        final Expression<?>[] projection = {cat.name, otherCat.name};
+
+        QueryExecution standardTest = new QueryExecution(
+                projections,
+                new FilterFactory(projections, QuerydslModule.JPA, getTarget()),
+                new MatchingFiltersFactory(QuerydslModule.JPA, getTarget())) {
+
+            @Override
+            protected Fetchable<?> createQuery() {
+                // NOTE : EclipseLink needs extra conditions cond1 and code2
+                return testQuery().from(sources).where(conditions);
+            }
+
+            @Override
+            protected Fetchable<?> createQuery(Predicate filter) {
+                // NOTE : EclipseLink needs extra conditions cond1 and code2
+                return testQuery().from(sources).where(condition, filter).select(projection);
+            }
+        };
+
+        // standardTest.runArrayTests(cat.kittensArray, otherCat.kittensArray, kitten, noKitten);
+        standardTest.runBooleanTests(cat.name.isNull(), otherCat.kittens.isEmpty());
+        standardTest.runCollectionTests(cat.kittens, otherCat.kittens, kitten, noKitten);
+        standardTest.runDateTests(cat.dateField, otherCat.dateField, date);
+        standardTest.runDateTimeTests(cat.birthdate, otherCat.birthdate, birthDate);
+        standardTest.runListTests(cat.kittens, otherCat.kittens, kitten, noKitten);
+        // standardTest.mapTests(cat.kittensByName, otherCat.kittensByName, "Kitty", kitten);
+
+        // int
+        standardTest.runNumericCasts(cat.id, otherCat.id, 1);
+        standardTest.runNumericTests(cat.id, otherCat.id, 1);
+
+        // double
+        standardTest.runNumericCasts(cat.bodyWeight, otherCat.bodyWeight, 1.0);
+        standardTest.runNumericTests(cat.bodyWeight, otherCat.bodyWeight, 1.0);
+
+        standardTest.runStringTests(cat.name, otherCat.name, kitten.getName());
+        standardTest.runTimeTests(cat.timeField, otherCat.timeField, time);
+
+        standardTest.report();
+    }
+
+    @Test
+    public void tupleProjection() {
+        List<Tuple> tuples = query().from(cat).select(cat.name, cat).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple.get(cat.name));
+            assertNotNull(tuple.get(cat));
+        }
+    }
+
+    @Test
+    public void tupleProjection_as_queryResults() {
+        QueryResults<Tuple> tuples = query().from(cat).limit(1)
+                .select(cat.name, cat).fetchResults();
+        assertEquals(1, tuples.getResults().size());
+        assertTrue(tuples.getTotal() > 0);
+    }
+
+    @Test
+    @ExcludeIn(DERBY)
+    public void transform_groupBy() {
+        QCat kitten = new QCat("kitten");
+        Map<Integer, Cat> result = query().from(cat).innerJoin(cat.kittens, kitten)
+            .transform(GroupBy.groupBy(cat.id)
+                    .as(Projections.constructor(Cat.class, cat.name, cat.id,
+                            GroupBy.list(Projections.constructor(Cat.class, kitten.name, kitten.id)))));
+
+        for (Cat entry : result.values()) {
+            assertEquals(1, entry.getKittens().size());
+        }
+    }
+
+    @Test
+    @ExcludeIn(DERBY)
+    public void transform_groupBy2() {
+        QCat kitten = new QCat("kitten");
+        Map<List<?>, Group> result = query().from(cat).innerJoin(cat.kittens, kitten)
+            .transform(GroupBy.groupBy(cat.id, kitten.id)
+                    .as(cat, kitten));
+
+        assertFalse(result.isEmpty());
+        for (Tuple row : query().from(cat).innerJoin(cat.kittens, kitten)
+                .select(cat, kitten).fetch()) {
+            assertNotNull(result.get(Arrays.asList(row.get(cat).getId(), row.get(kitten).getId())));
+        }
+    }
+
+    @Test
+    @ExcludeIn(DERBY)
+    public void transform_groupBy_alias() {
+        QCat kitten = new QCat("kitten");
+        SimplePath<Cat> k = Expressions.path(Cat.class, "k");
+        Map<Integer, Group> result = query().from(cat).innerJoin(cat.kittens, kitten)
+            .transform(GroupBy.groupBy(cat.id)
+                    .as(cat.name, cat.id,
+                        GroupBy.list(Projections.constructor(Cat.class, kitten.name, kitten.id).as(k))));
+
+        for (Group entry : result.values()) {
+            assertNotNull(entry.getOne(cat.id));
+            assertNotNull(entry.getOne(cat.name));
+            assertFalse(entry.getList(k).isEmpty());
+        }
+    }
+
+    @Test
+    @NoBatooJPA
+    public void treat() {
+        QDomesticCat domesticCat = QDomesticCat.domesticCat;
+        assertEquals(0, query().from(cat)
+                .innerJoin(cat.mate, domesticCat._super)
+                .where(domesticCat.name.eq("Bobby"))
+                .fetchCount());
+    }
+
+    @Test
+    @Ignore
+    public void type() {
+        assertEquals(Arrays.asList("C","C","C","C","C","C","A"),
+                query().from(animal).orderBy(animal.id.asc()).select(JPAExpressions.type(animal)).fetch());
+    }
+
+    @Test
+    @NoOpenJPA
+    public void type_order() {
+        assertEquals(Arrays.asList(10, 1, 2, 3, 4, 5, 6),
+                query().from(animal).orderBy(JPAExpressions.type(animal).asc(), animal.id.asc())
+                        .select(animal.id).fetch());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, ORACLE})
+    public void byte_array() {
+        QSimpleTypes simpleTypes = QSimpleTypes.simpleTypes;
+        assertEquals(Collections.emptyList(), query().from(simpleTypes)
+                .where(simpleTypes.byteArray.eq(new byte[]{0, 1})).select(simpleTypes).fetch());
+    }
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractQueryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractQueryTest.java
new file mode 100644
index 0000000000..6140589ef4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractQueryTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.querydsl.core.types.Expression;
+
+public abstract class AbstractQueryTest {
+
+    protected QueryHelper<?> query() {
+        return new QueryHelper<Void>(HQLTemplates.DEFAULT);
+    }
+
+    protected static void assertToString(String expected, Expression<?> expr) {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT, null);
+        assertEquals(expected, serializer.handle(expr).toString().replace("\n", " "));
+    }
+
+    protected static void assertMatches(String expected, Expression<?> expr) {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT, null);
+        String str = serializer.handle(expr).toString().replace("\n", " ");
+        assertTrue(expected + "\n!=\n" + str, str.matches(expected));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java
new file mode 100644
index 0000000000..95e78da9b3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java
@@ -0,0 +1,387 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.*;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Target;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Wildcard;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.Color;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.QCompany;
+import com.querydsl.jpa.domain.sql.SAnimal;
+
+public abstract class AbstractSQLTest {
+
+    protected static final SAnimal cat = new SAnimal("cat");
+
+    protected abstract AbstractSQLQuery<?,?> query();
+
+    public static class CatDTO {
+
+        Cat cat;
+
+        public CatDTO(Cat cat) {
+            this.cat = cat;
+        }
+
+    }
+
+    @Test
+    public void count() {
+        assertEquals(6L, query().from(cat).where(cat.dtype.eq("C")).fetchCount());
+    }
+
+    @Test
+    public void count_via_unique() {
+        assertEquals(Long.valueOf(6), query().from(cat).where(cat.dtype.eq("C"))
+                .select(cat.id.count()).fetchFirst());
+    }
+
+    @Test
+    public void countDistinct() {
+        assertEquals(6L, query().from(cat).where(cat.dtype.eq("C")).distinct().fetchCount());
+    }
+
+    @Test
+    public void enum_binding() {
+        List<Cat> cats = query().from(cat)
+                .select(Projections.bean(Cat.class, QCat.cat.color)).fetch();
+        assertFalse(cats.isEmpty());
+
+        for (Cat cat : cats) {
+            assertEquals(Color.BLACK, cat.getColor());
+        }
+    }
+
+    @Test
+    @Ignore
+    public void entityProjections() {
+        List<Cat> cats = query().from(cat).orderBy(cat.name.asc())
+                .select(Projections.constructor(Cat.class, cat.name, cat.id)).fetch();
+        assertEquals(6, cats.size());
+        for (Cat c : cats) {
+            assertNotNull(c.getName());
+            assertTrue(c.getId() > 0);
+        }
+    }
+
+    @Test
+    public void entityQueries() {
+        QCat catEntity = QCat.cat;
+
+        List<Cat> cats = query().from(cat).orderBy(cat.name.asc()).select(catEntity).fetch();
+        assertEquals(6, cats.size());
+        for (Cat c : cats) {
+            assertNotNull(c.getName());
+        }
+    }
+
+    @Test
+    public void entityQueries2() {
+        SAnimal mate = new SAnimal("mate");
+        QCat catEntity = QCat.cat;
+
+        List<Cat> cats = query().from(cat)
+                .innerJoin(mate).on(cat.mateId.eq(mate.id))
+                .where(cat.dtype.eq("C"), mate.dtype.eq("C"))
+                .select(catEntity).fetch();
+        assertTrue(cats.isEmpty());
+    }
+
+    @Test
+    public void entityQueries3() {
+        QCat catEntity = new QCat("animal_");
+        assertEquals(0, query().from(catEntity).select(catEntity.toes.max()).fetchFirst().intValue());
+    }
+
+    @Test
+    @NoBatooJPA
+    @NoEclipseLink
+    public void entityQueries4() {
+        QCat catEntity = QCat.cat;
+        List<Tuple> cats = query().from(cat).select(catEntity, cat.name, cat.id).fetch();
+        assertEquals(6, cats.size());
+
+        for (Tuple tuple : cats) {
+            assertTrue(tuple.get(catEntity) instanceof Cat);
+            assertTrue(tuple.get(cat.name) instanceof String);
+            assertTrue(tuple.get(cat.id) instanceof Integer);
+        }
+    }
+
+    @Test
+    @NoBatooJPA
+    @NoEclipseLink
+    public void entityQueries5() {
+        QCat catEntity = QCat.cat;
+        SAnimal otherCat = new SAnimal("otherCat");
+        QCat otherCatEntity = new QCat("otherCat");
+        List<Tuple> cats = query().from(cat, otherCat).select(catEntity, otherCatEntity).fetch();
+        assertEquals(36, cats.size());
+
+        for (Tuple tuple : cats) {
+            assertTrue(tuple.get(catEntity) instanceof Cat);
+            assertTrue(tuple.get(otherCatEntity) instanceof Cat);
+        }
+    }
+
+    @Test
+    @NoBatooJPA
+    @NoEclipseLink
+    public void entityQueries6() {
+        QCat catEntity = QCat.cat;
+        List<CatDTO> results = query().from(cat).select(Projections.constructor(CatDTO.class, catEntity)).fetch();
+        assertEquals(6, results.size());
+
+        for (CatDTO cat : results) {
+            assertTrue(cat.cat instanceof Cat);
+        }
+    }
+
+    @Test
+    public void entityQueries7() {
+        QCompany company = QCompany.company;
+        assertEquals(Collections.emptyList(),
+                query().from(company).select(company.officialName).fetch());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(6L, query().from(cat).where(cat.dtype.in("C", "CX")).fetchCount());
+    }
+
+    @Test
+    public void limit_offset() {
+        assertEquals(2, query().from(cat).orderBy(cat.id.asc()).limit(2).offset(2).select(cat.id, cat.name).fetch().size());
+    }
+
+    @Test
+    public void list() {
+        assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).select(cat.id).fetch().size());
+    }
+
+    @Test
+    public void list_limit_and_offset() {
+        assertEquals(3, query().from(cat).orderBy(cat.id.asc()).offset(3).limit(3).select(cat.id).fetch().size());
+    }
+
+    @Test
+    public void list_limit_and_offset2() {
+        List<Tuple> tuples = query().from(cat).orderBy(cat.id.asc()).offset(3).limit(3).select(cat.id, cat.name).fetch();
+        assertEquals(3, tuples.size());
+        assertEquals(2, tuples.get(0).size());
+    }
+
+    @Test
+    public void list_limit_and_offset3() {
+        List<Tuple> tuples = query().from(cat).orderBy(cat.id.asc()).offset(3).limit(3).select(Projections.tuple(cat.id, cat.name)).fetch();
+        assertEquals(3, tuples.size());
+        assertEquals(2, tuples.get(0).size());
+    }
+
+    @Test
+    public void list_multiple() {
+        print(query().from(cat).where(cat.dtype.eq("C")).select(cat.id, cat.name, cat.bodyWeight).fetch());
+    }
+
+    @Test
+    public void list_non_path() {
+        assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).select(
+                cat.birthdate.year(),
+                cat.birthdate.month(),
+                cat.birthdate.dayOfMonth()).fetch().size());
+    }
+
+    @Test
+    public void list_results() {
+        QueryResults<String> results = query().from(cat).limit(3).orderBy(cat.name.asc())
+                .select(cat.name).fetchResults();
+        assertEquals(Arrays.asList("Beck","Bobby","Harold"), results.getResults());
+        assertEquals(6L, results.getTotal());
+    }
+
+    @Test
+    @ExcludeIn(Target.H2)
+    public void list_wildcard() {
+        assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).select(Wildcard.all).fetch().size());
+    }
+
+    @Test
+    public void list_with_count() {
+        print(query().from(cat).where(cat.dtype.eq("C")).groupBy(cat.name)
+                .select(cat.name, cat.id.count()).fetch());
+    }
+
+    @Test
+    public void list_with_limit() {
+        assertEquals(3, query().from(cat).limit(3).select(cat.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn({Target.H2, Target.MYSQL})
+    public void list_with_offset() {
+        assertEquals(3, query().from(cat).orderBy(cat.id.asc()).offset(3).select(cat.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn(Target.HSQLDB)
+    public void no_from() {
+        assertNotNull(query().select(DateExpression.currentDate()).fetchFirst());
+    }
+
+    @Test
+    public void null_as_uniqueResult() {
+        assertNull(query().from(cat).where(cat.name.eq(UUID.randomUUID().toString()))
+                .select(cat.name).fetchOne());
+    }
+
+    private void print(Iterable<Tuple> rows) {
+        for (Tuple row : rows) {
+            System.out.println(row);
+        }
+    }
+
+    @Test
+    public void projections_duplicateColumns() {
+        SAnimal cat = new SAnimal("cat");
+        assertEquals(1, query().from(cat).select(Projections.list(cat.count(), cat.count())).fetch().size());
+    }
+
+    @Test
+    public void single_result() {
+        query().from(cat).select(cat.id).fetchFirst();
+    }
+
+    @Test
+    public void single_result_multiple() {
+        assertEquals(1, query().from(cat).orderBy(cat.id.asc()).select(new Expression<?>[]{cat.id}).fetchFirst().get(cat.id).intValue());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union() throws SQLException {
+        SubQueryExpression<Integer> sq1 = select(cat.id.max()).from(cat);
+        SubQueryExpression<Integer> sq2 = select(cat.id.min()).from(cat);
+        List<Integer> list = query().union(sq1, sq2).list();
+        assertFalse(list.isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union_all() {
+        SubQueryExpression<Integer> sq1 = select(cat.id.max()).from(cat);
+        SubQueryExpression<Integer> sq2 = select(cat.id.min()).from(cat);
+        List<Integer> list = query().unionAll(sq1, sq2).list();
+        assertFalse(list.isEmpty());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({Target.DERBY, Target.POSTGRESQL})
+    @Ignore // FIXME
+    public void union2() {
+        List<Tuple> rows = query().union(
+                select(cat.name, cat.id).from(cat).where(cat.name.eq("Beck")).distinct(),
+                select(cat.name, null).from(cat).where(cat.name.eq("Kate")).distinct())
+        .list();
+
+        assertEquals(2, rows.size());
+        for (Tuple row : rows) {
+            System.err.println(row);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn(Target.DERBY)
+    @Ignore // FIXME
+    public void union3() {
+        SAnimal cat2 = new SAnimal("cat2");
+        List<Tuple> rows = query().union(
+                select(cat.id, cat2.id).from(cat).innerJoin(cat2).on(cat2.id.eq(cat.id)),
+                select(cat.id, null).from(cat))
+        .list();
+
+        assertEquals(12, rows.size());
+        int nulls = 0;
+        for (Tuple row : rows) {
+            System.err.println(Collections.singletonList(row));
+            if (row.get(1, Object.class) == null) {
+                nulls++;
+            }
+        }
+        assertEquals(6, nulls);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({Target.DERBY, Target.POSTGRESQL})
+    @Ignore // FIXME
+    public void union4() {
+        query().union(cat,
+                select(cat.name, cat.id).from(cat).where(cat.name.eq("Beck")).distinct(),
+                select(cat.name, null).from(cat).where(cat.name.eq("Kate")).distinct())
+        .select(cat.name, cat.id).fetch();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({Target.DERBY, Target.ORACLE})
+    public void union5() {
+        SAnimal cat2 = new SAnimal("cat2");
+        List<Tuple> rows = query().union(
+                select(cat.id, cat2.id).from(cat).join(cat2).on(cat2.id.eq(cat.id.add(1))),
+                select(cat.id, cat2.id).from(cat).join(cat2).on(cat2.id.eq(cat.id.add(1))))
+        .list();
+
+        assertEquals(5, rows.size());
+        for (Tuple row : rows) {
+            int first = row.get(cat.id);
+            int second = row.get(cat2.id);
+            assertEquals(first + 1, second);
+        }
+    }
+
+    @Test
+    public void unique_result() {
+        assertEquals(1,
+                query().from(cat).orderBy(cat.id.asc()).limit(1).select(cat.id).fetchOne().intValue());
+    }
+
+    @Test
+    public void unique_result_multiple() {
+        assertEquals(1,
+                query().from(cat).orderBy(cat.id.asc()).limit(1).select(new Expression<?>[]{cat.id}).fetchOne().get(cat.id).intValue());
+    }
+
+    @Test
+    @ExcludeIn(Target.H2)
+    public void wildcard() {
+        List<Tuple> rows = query().from(cat).select(cat.all()).fetch();
+        assertEquals(6, rows.size());
+        print(rows);
+
+//        rows = query().from(cat).fetch(cat.id, cat.all());
+//        assertEquals(6, rows.size());
+//        print(rows);
+    }
+
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java
new file mode 100644
index 0000000000..ccc82bcd16
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+public class AggregationTest extends AbstractQueryTest {
+
+    @Test
+    public void max() {
+        assertToString("max(cat.bodyWeight)", cat.bodyWeight.max());
+    }
+
+    @Test
+    public void min() {
+        assertToString("min(cat.bodyWeight)", cat.bodyWeight.min());
+    }
+
+    @Test
+    public void avg() {
+        assertToString("avg(cat.bodyWeight)", cat.bodyWeight.avg());
+    }
+
+    @Test
+    public void count() {
+        assertToString("count(cat)", cat.count());
+    }
+
+    @Test
+    public void countDistinct() {
+        assertToString("count(distinct cat)", cat.countDistinct());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Article.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Article.java
new file mode 100644
index 0000000000..5481e6c689
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Article.java
@@ -0,0 +1,12 @@
+package com.querydsl.jpa;
+
+
+public class Article {
+
+    String name;
+
+    Content content;
+
+    Person author;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java
new file mode 100644
index 0000000000..75e4116046
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.JPAExpressions.selectFrom;
+import static com.querydsl.jpa.Constants.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+
+public class BooleanOperationsTest extends AbstractQueryTest {
+
+    @Test
+    public void booleanOperations_or() {
+        assertToString("cust is null or cat is null", cust.isNull().or(cat.isNull()));
+    }
+
+    @Test
+    public void booleanOperations_and() {
+        assertToString("cust is null and cat is null", cust.isNull().and(cat.isNull()));
+    }
+
+
+    @Test
+    public void booleanOperations_not() {
+        assertToString("not cust is null", cust.isNull().not());
+    }
+
+
+    @Test
+    public void booleanOperations2_and() {
+        cat.name.eq(cust.name.firstName).and(cat.bodyWeight.eq(kitten.bodyWeight));
+    }
+
+    @Test
+    public void booleanOperations2_or() {
+        cat.name.eq(cust.name.firstName).or(cat.bodyWeight.eq(kitten.bodyWeight));
+    }
+
+    @Test
+    public void logicalOperations_or() {
+        assertToString("cat = kitten or kitten = cat", cat.eq(kitten).or(kitten.eq(cat)));
+    }
+
+    @Test
+    public void logicalOperations_and() {
+        assertToString("cat = kitten and kitten = cat", cat.eq(kitten).and(kitten.eq(cat)));
+    }
+
+    @Test
+    public void logicalOperations_and2() {
+        assertToString("cat is null and (kitten is null or kitten.bodyWeight > ?1)",
+                cat.isNull().and(kitten.isNull().or(kitten.bodyWeight.gt(10))));
+    }
+
+    @Test
+    public void booleanBuilder1() {
+        BooleanBuilder bb1 = new BooleanBuilder();
+        bb1.and(cat.eq(cat));
+
+        BooleanBuilder bb2 = new BooleanBuilder();
+        bb2.or(cat.eq(cat));
+        bb2.or(cat.eq(cat));
+
+        assertToString("cat = cat and (cat = cat or cat = cat)", bb1.and(bb2));
+    }
+
+    @Test
+    public void booleanBuilder2() {
+        BooleanBuilder bb1 = new BooleanBuilder();
+        bb1.and(cat.eq(cat));
+
+        BooleanBuilder bb2 = new BooleanBuilder();
+        bb2.or(cat.eq(cat));
+        bb2.or(cat.eq(cat));
+
+        assertToString("cat = cat and (cat = cat or cat = cat)", bb1.and(bb2.getValue()));
+    }
+
+    @Test
+    public void booleanBuilder_with_null_in_where() {
+        assertEquals("select cat\nfrom Cat cat", selectFrom(cat).where(new BooleanBuilder()).toString());
+    }
+
+    @Test
+    public void booleanBuilder_with_null_in_having() {
+        assertEquals("select cat\nfrom Cat cat\ngroup by cat.name",
+                selectFrom(cat).groupBy(cat.name).having(new BooleanBuilder()).toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java
new file mode 100644
index 0000000000..19a26f34a3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public class CastTest extends AbstractQueryTest {
+
+    private static NumberExpression<Integer> expr = Expressions.numberPath(Integer.class, "int");
+
+    @Test
+    public void bytes() {
+        assertEquals(Byte.class, expr.byteValue().getType());
+    }
+
+    @Test
+    public void doubles() {
+        assertEquals(Double.class, expr.doubleValue().getType());
+    }
+
+    @Test
+    public void floats() {
+        assertEquals(Float.class, expr.floatValue().getType());
+    }
+
+    @Test
+    public void integers() {
+        assertEquals(Integer.class, expr.intValue().getType());
+    }
+
+    @Test
+    public void longs() {
+        assertEquals(Long.class, expr.longValue().getType());
+    }
+
+    @Test
+    public void shorts() {
+        assertEquals(Short.class, expr.shortValue().getType());
+    }
+
+    @Test
+    public void stringCast() {
+        assertEquals(String.class, expr.stringValue().getType());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java
new file mode 100644
index 0000000000..dc7a46db10
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.Cat;
+
+public class CollectionTest extends AbstractQueryTest {
+
+    @Test
+    public void constant_inElements_set() {
+        assertToString("?1 member of cat.kittensSet", cat.kittensSet.contains(new Cat()));
+    }
+
+    @Test
+    public void constant_inElements_list() {
+        assertToString("?1 member of cat.kittens", cat.kittens.contains(new Cat()));
+    }
+
+    @Test
+    public void path_inElements_list() {
+        assertToString("cat member of cat1.kittens", cat.in(cat1.kittens));
+    }
+
+    @Test
+    public void path_inElements_set() {
+        assertToString("cat member of cat1.kittensSet", cat.in(cat1.kittensSet));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java
new file mode 100644
index 0000000000..3f99593915
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+public class ComparableTest extends AbstractQueryTest {
+
+    @Test
+    public void eq() {
+        assertToString("cat.bodyWeight = kitten.bodyWeight",  cat.bodyWeight.eq(kitten.bodyWeight));
+    }
+
+    @Test
+    public void goe() {
+        assertToString("cat.bodyWeight >= kitten.bodyWeight", cat.bodyWeight.goe(kitten.bodyWeight));
+    }
+
+    @Test
+    public void gt() {
+        assertToString("cat.bodyWeight > kitten.bodyWeight",  cat.bodyWeight.gt(kitten.bodyWeight));
+    }
+
+    @Test
+    public void loe() {
+        assertToString("cat.bodyWeight <= kitten.bodyWeight", cat.bodyWeight.loe(kitten.bodyWeight));
+    }
+
+    @Test
+    public void lt() {
+        assertToString("cat.bodyWeight < kitten.bodyWeight",  cat.bodyWeight.lt(kitten.bodyWeight));
+    }
+
+    @Test
+    public void ne() {
+        assertToString("cat.bodyWeight <> kitten.bodyWeight", cat.bodyWeight.ne(kitten.bodyWeight));
+    }
+
+
+
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Constants.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Constants.java
new file mode 100644
index 0000000000..c20bef949f
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Constants.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.jpa.domain.*;
+import com.querydsl.jpa.domain.QPerson;
+
+public final class Constants {
+
+    private Constants() { }
+
+    static final QAccount account = new QAccount("account");
+
+    static final QAnimal an = new QAnimal("an");
+
+    static final QBar bar = new QBar("bar");
+
+    static final QCalendar calendar = new QCalendar("calendar");
+
+    // QCat
+    static final QCat cat = new QCat("cat");
+
+    static final QCat cat1 = new QCat("cat1");
+
+    static final QCat cat2 = new QCat("cat2");
+
+    static final QCat cat3 = new QCat("cat3");
+
+    static final QCat cat4 = new QCat("cat4");
+
+    static final QCat cat5 = new QCat("cat5");
+
+    // QCatalog
+    static final QCatalog catalog = new QCatalog("catalog");
+
+    static final QCat child = new QCat("child");
+    // QCompany
+    static final QCompany company = new QCompany("company");
+
+    static final QCompany company1 = new QCompany("company1");
+
+    static final QCompany company2 = new QCompany("company2");
+
+    static final QCompany company3 = new QCompany("company3");
+
+    static final QCompany company4 = new QCompany("company4");
+
+    static final QCompany company5 = new QCompany("company5");
+
+    // Customer
+    static final QCustomer cust = new QCustomer("cust");
+
+//    Qdoofus d = new Qdoofus("d");
+
+    // QDocument
+    static final QDocument doc = new QDocument("doc");
+
+    // DomesticQCat
+    static final QDomesticCat domesticCat = new QDomesticCat("domesticCat");
+
+    static final QCat fatcat = new QCat("fatcat");
+
+    static final QFoo foo = new QFoo("foo");
+
+    static final QFormula form = new QFormula("form");
+    // QItem
+    static final QItem item = new QItem("item");
+
+    static final QCat kit = new QCat("kit");
+
+    static final QCat kitten = new QCat("kitten");
+
+    static final QCat kitten2 = new QCat("kitten2");
+
+    static final QCat kittens = new QCat("kittens");
+
+    static final QNameList list = new QNameList("list");
+
+    // AuditLog
+    static final QAuditLog log = new QAuditLog("log");
+
+    static final QNamed m = new QNamed("m");
+
+    static final QCat mate = new QCat("mate");
+
+    static final QCat mother = new QCat("mother");
+
+    static final QNamed n = new QNamed("n");
+
+    static final QName name = new QName("name");
+
+    static final QCat offspr = new QCat("offspr");
+
+    static final QOrder ord = new QOrder("ord");
+    // Order
+    static final QOrder order = new QOrder("order");
+
+    static final QPerson p = new QPerson("p");
+
+    static final QParameter param = new QParameter("param");
+
+    // Payment
+    static final QPayment payment = new QPayment("payment");
+
+    static final QPerson person = new QPerson("person");
+
+    static final QPlayer player = new QPlayer("player");
+
+    // Price
+    static final QPrice price = new QPrice("price");
+
+    static final QProduct prod = new QProduct("prod");
+
+    // Product
+    static final QProduct product = new QProduct("product");
+
+    static final QCat qat = new QCat("qat");
+
+    static final QCat rival = new QCat("rival");
+
+    static final QShow show = new QShow("show");
+
+    static final QStatus status = new QStatus("status");
+
+    static final QStatusChange statusChange = new QStatusChange("statusChange");
+
+    static final QStore store = new QStore("store");
+
+    // User
+    static final QUser user = new QUser("user");
+
+    static final QUser user1 = new QUser("user1");
+
+    static final QUser user2 = new QUser("user2");
+
+    static final QUser user3 = new QUser("user3");
+
+    static final QUser user4 = new QUser("user4");
+
+    static final QUser user5 = new QUser("user5");
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java
new file mode 100644
index 0000000000..4c3110a6c4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+
+public class ConstructorsTest extends AbstractQueryTest {
+
+    public static final class BookmarkDTO {
+
+    }
+
+    public static final class QBookmarkDTO extends ConstructorExpression<BookmarkDTO> {
+
+        private static final long serialVersionUID = 2664671413344744578L;
+
+        public QBookmarkDTO(Expression<java.lang.String> address) {
+            super(BookmarkDTO.class, new Class<?>[] {String.class}, address);
+        }
+    }
+
+    @Test
+    @Ignore
+    public void constructors() {
+        ConstructorExpression<com.querydsl.jpa.domain.Cat> c =
+                Projections.constructor(
+                        com.querydsl.jpa.domain.Cat.class,
+                        new Class<?>[]{String.class},
+                        cat.name);
+        assertToString("new " + com.querydsl.jpa.domain.Cat.class.getName() + "(cat.name)", c);
+        assertToString("new " + getClass().getName() + "$BookmarkDTO(cat.name)",new QBookmarkDTO(cat.name));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Content.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Content.java
new file mode 100644
index 0000000000..cb96e86055
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Content.java
@@ -0,0 +1,8 @@
+package com.querydsl.jpa;
+
+
+public class Content {
+
+    Article article;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java
new file mode 100644
index 0000000000..b6a1462cc5
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.TemplateFactory;
+import com.querydsl.core.types.dsl.StringTemplate;
+
+import java.util.Arrays;
+
+public class CustomExpressionsTest extends AbstractQueryTest {
+
+    public static class MyCustomExpr extends StringTemplate {
+
+        private static final long serialVersionUID = 1L;
+
+        public MyCustomExpr(Expression<?>... args) {
+            super(TemplateFactory.DEFAULT.create("myCustom({0},{1})"), Arrays.asList(args));
+        }
+    }
+
+    @Test
+    public void customExpressions() {
+        assertToString("myCustom(cust,cat)", new MyCustomExpr(cust, cat));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomFinder.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomFinder.java
new file mode 100644
index 0000000000..627603e2f9
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomFinder.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.dsl.ComparablePath;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.jpa.impl.JPAQuery;
+
+/**
+ * @author tiwe
+ *
+ */
+public final class CustomFinder {
+
+    private CustomFinder() { }
+
+    @SuppressWarnings("unchecked")
+    public static <T> List<T> findCustom(EntityManager em, Class<T> entityClass,Map<String,?> filters, String sort) {
+        EntityPath<T> entityPath = new EntityPathBase<T>(entityClass, "entity");
+        BooleanBuilder builder = new BooleanBuilder();
+        for (Map.Entry<String, ?> entry : filters.entrySet()) {
+            SimplePath<Object> property = Expressions.path((Class) entry.getValue().getClass(), entityPath, entry.getKey());
+            builder.and(property.eq(entry.getValue()));
+        }
+        ComparablePath<?> sortProperty = Expressions.comparablePath(Comparable.class, entityPath, sort);
+        return new JPAQuery<Void>(em).from(entityPath).where(builder.getValue())
+                .orderBy(sortProperty.asc()).select(entityPath).fetch();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java
new file mode 100644
index 0000000000..5ef6376ab8
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import java.util.Date;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.DateTimeExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.TimeExpression;
+
+public class DateTimeTest extends AbstractQueryTest {
+
+    @Test
+    public void currentDate() {
+        assertToString("current_date", DateExpression.currentDate());
+    }
+
+    @Test
+    public void currentDate2() {
+        assertToString("current_date", DateTimeExpression.currentDate());
+    }
+
+    @Test
+    public void currentTime() {
+        assertToString("current_time", TimeExpression.currentTime());
+    }
+
+    @Test
+    public void currentTimestamp() {
+        assertToString("current_timestamp", DateTimeExpression.currentTimestamp());
+    }
+
+    @Test
+    public void dayOfMonth() {
+        assertToString("day(date)", Expressions.datePath(Date.class, "date").dayOfMonth());
+    }
+
+    @Test
+    public void dayOfMonth2() {
+        assertToString("day(date)", Expressions.dateTimePath(Date.class, "date").dayOfMonth());
+    }
+
+    @Test
+    public void dateOperations2() {
+//        catalog.effectiveDate.second();
+//        catalog.effectiveDate.minute();
+//        catalog.effectiveDate.hour();
+        catalog.effectiveDate.dayOfMonth();
+        catalog.effectiveDate.month();
+        catalog.effectiveDate.year();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java
new file mode 100644
index 0000000000..bb0459898d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import jdepend.framework.JDepend;
+
+public class DependenciesTest {
+
+    @Test
+    public void test() throws IOException {
+        JDepend jdepend = new JDepend();
+        jdepend.addDirectory("target/classes/com/querydsl/jpa");
+        jdepend.addDirectory("target/classes/com/querydsl/jpa/hibernate");
+        jdepend.addDirectory("target/classes/com/querydsl/jpa/hibernate/sql");
+        jdepend.addDirectory("target/classes/com/querydsl/jpa/impl");
+        jdepend.addDirectory("target/classes/com/querydsl/jpa/sql");
+
+        jdepend.analyze();
+        assertFalse(jdepend.containsCycles());
+
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/DummySessionHolder.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/DummySessionHolder.java
new file mode 100644
index 0000000000..055f647e64
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/DummySessionHolder.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import org.hibernate.query.Query;
+import org.hibernate.query.NativeQuery;
+
+import com.querydsl.jpa.hibernate.SessionHolder;
+
+public class DummySessionHolder implements SessionHolder {
+
+    @Override
+    public Query<?> createQuery(String queryString) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public NativeQuery<?> createSQLQuery(String queryString) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java
new file mode 100644
index 0000000000..063a210af4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+public class EJBQLTest extends AbstractQueryTest {
+
+    // Any function or operator defined by EJB-QL 3.0: substring(), trim(),
+    // lower(), upper(), length(), locate(), abs(), sqrt(), bit_length(),
+    // mod()
+    // substring(),
+    // trim(),
+    // lower(),
+    // upper(),
+    // length(),
+    // locate(),
+    // abs(),
+    // sqrt(),
+    // bit_length(),
+    // mod()
+
+    @Test
+    public void trim() {
+        assertToString("trim(cat.name)", cat.name.trim());
+    }
+
+    @Test
+    public void lower() {
+        assertToString("lower(cat.name)", cat.name.lower());
+    }
+
+    @Test
+    public void upper() {
+        assertToString("upper(cat.name)", cat.name.upper());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java
new file mode 100644
index 0000000000..b9eacb3475
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.core.testutil.Serialization.serialize;
+import static com.querydsl.jpa.JPAExpressions.selectFrom;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.domain.QCat;
+
+public class ExpressionSerializationTest {
+
+    @Test
+    public void serialize1() throws Exception {
+        Expression<?> expr = QCat.cat.name.eq("test");
+        Expression<?> expr2 = serialize(expr);
+
+        assertEquals(expr, expr2);
+        assertEquals(expr.hashCode(), expr2.hashCode());
+    }
+
+    @Test
+    public void query() throws ClassNotFoundException, IOException {
+        selectFrom(QCat.cat).where(serialize(QCat.cat.name.eq("test")));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/ExtDoubleType.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExtDoubleType.java
similarity index 84%
rename from querydsl-jpa/src/test/java/com/mysema/query/ExtDoubleType.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/ExtDoubleType.java
index 39c4273e8c..71f86159f0 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/ExtDoubleType.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ExtDoubleType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,16 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.jpa;
 
 import org.hibernate.type.DoubleType;
 
 @SuppressWarnings("serial")
-public class ExtDoubleType extends DoubleType{
+public class ExtDoubleType extends DoubleType {
 
 //    @Override
 //    public void set(PreparedStatement st, Object value, int index) throws SQLException {
 //        st.setDouble( index, ( (Number) value ).doubleValue() );
 //    }
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/FeaturesTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java
similarity index 79%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/FeaturesTest.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java
index 0fac8a307e..bac490f86f 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/FeaturesTest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,85 +11,85 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
+import static com.querydsl.jpa.Constants.*;
 
 import org.junit.Test;
 
-import com.mysema.query.jpa.domain.QAccount;
-import com.mysema.query.jpa.domain.QInheritedProperties;
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.jpa.domain.QAccount;
+import com.querydsl.jpa.domain.QInheritedProperties;
 
 public class FeaturesTest extends AbstractQueryTest {
 
     @Test
-    public void DomainConstruction() {
+    public void domainConstruction() {
         QInheritedProperties i = new QInheritedProperties("i");
         assertNotNull(i.superclassProperty);
         assertNotNull(i.classProperty);
     }
-    
+
     @Test
-    public void DomainConstruction2() {
+    public void domainConstruction2() {
         QAccount a = new QAccount("a");
         assertNotNull(a.embeddedData.someData);
     }
 
     @Test
-    public void BasicStructure() {
+    public void basicStructure() {
         assertNull(cat.getMetadata().getParent());
     }
-    
+
     @Test
-    public void BasicStructure2() {
-        assertEquals(cat, cat.alive.getMetadata().getParent());        
+    public void basicStructure2() {
+        assertEquals(cat, cat.alive.getMetadata().getParent());
     }
-    
+
     @Test
-    public void BasicStructure3() {
+    public void basicStructure3() {
         assertEquals("cat", cat.getMetadata().getName());
     }
 
     @Test
-    public void ArgumentHandling() {
+    public void argumentHandling() {
         // Kitty is reused, so it should be used via one named parameter
         assertToString(
-                "cat.name = ?1 or cust.name.firstName = ?2 or kitten.name = ?1",
+                "cat.name = ?1 or cust.name.firstName = ?2 or kitten.name = ?3",
                 cat.name.eq("Kitty").or(cust.name.firstName.eq("Hans")).or(kitten.name.eq("Kitty")));
     }
 
     @Test
-    public void BasicOperations() {
+    public void basicOperations() {
         assertToString("cat.bodyWeight = kitten.bodyWeight", cat.bodyWeight.eq(kitten.bodyWeight));
     }
-    
+
     @Test
-    public void BasicOperations2() {
+    public void basicOperations2() {
         assertToString("cat.bodyWeight <> kitten.bodyWeight", cat.bodyWeight.ne(kitten.bodyWeight));
     }
-    
+
     @Test
-    public void BasicOperations3() {
+    public void basicOperations3() {
         assertToString(
                 "cat.bodyWeight + kitten.bodyWeight = kitten.bodyWeight",
-                cat.bodyWeight.add(kitten.bodyWeight).eq(kitten.bodyWeight));   
+                cat.bodyWeight.add(kitten.bodyWeight).eq(kitten.bodyWeight));
     }
 
     @Test
-    public void EqualsAndNotEqualsForAllExpressions() {
-        assertToString("cat.name = cust.name.firstName", cat.name.eq(cust.name.firstName));        
+    public void equalsAndNotEqualsForAllExpressions() {
+        assertToString("cat.name = cust.name.firstName", cat.name.eq(cust.name.firstName));
     }
-    
+
     @Test
-    public void EqualsAndNotEqualsForAllExpressions2() {
+    public void equalsAndNotEqualsForAllExpressions2() {
         assertToString("cat.name <> cust.name.firstName", cat.name.ne(cust.name.firstName));
     }
 
     @Test
-    public void GroupingOperationsAndNullChecks() {
+    public void groupingOperationsAndNullChecks() {
         // in, not in, between, is null, is not null, is empty, is not empty,
         // member of and not member of
         // in,
@@ -111,7 +111,7 @@ public void GroupingOperationsAndNullChecks() {
     }
 
     @Test
-    public void ToString() {
+    public void toString_() {
         assertToString("cat", cat);
         assertToString("cat.alive", cat.alive);
         assertToString("cat.bodyWeight", cat.bodyWeight);
@@ -129,7 +129,7 @@ public void ToString() {
 
         // toString("cat.bodyWeight as bw", cat.bodyWeight.as("bw"));
 
-        assertToString("kitten in elements(cat.kittens)", kitten.in(cat.kittens));
+        assertToString("kitten member of cat.kittens", kitten.in(cat.kittens));
 
         // toString("distinct cat.bodyWeight", distinct(cat.bodyWeight));
     }
@@ -140,7 +140,7 @@ public void ToString() {
 //     */
 //    @SuppressWarnings("unchecked")
 //    @Test
-//    public void Bug326650() {
+//    public void bug326650() {
 //        assertEquals(Long.class, sum(var(Byte.class)).getType());
 //        assertEquals(Long.class, sum(var(Short.class)).getType());
 //        assertEquals(Long.class, sum(var(Integer.class)).getType());
@@ -165,7 +165,7 @@ public void ToString() {
 //    }
 
     private <D extends Number & Comparable<?>> NumberPath<D> var(Class<D> cl) {
-        return new NumberPath<D>(cl, "var");
+        return Expressions.numberPath(cl, "var");
     }
 
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java
new file mode 100644
index 0000000000..be46c43930
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.hibernate.LockMode;
+import org.hibernate.Session;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.QGroup;
+import com.querydsl.jpa.hibernate.DefaultSessionHolder;
+import com.querydsl.jpa.hibernate.HibernateDeleteClause;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.testutil.HibernateTestRunner;
+
+/**
+ * @author tiwe
+ *
+ */
+@RunWith(HibernateTestRunner.class)
+public class HibernateBase extends AbstractJPATest implements HibernateTest {
+
+    private static final QCat cat = QCat.cat;
+
+    @Rule
+    @ClassRule
+    public static TestRule jpaProviderRule = new JPAProviderRule();
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    private Session session;
+
+    @Override
+    protected HibernateQuery<?> query() {
+        return new HibernateQuery<Void>(session, getTemplates());
+    }
+
+    protected HibernateDeleteClause delete(EntityPath<?> path) {
+        return new HibernateDeleteClause(session, path);
+    }
+
+    @Override
+    protected HibernateQuery<?> testQuery() {
+        return new HibernateQuery<Void>(new DefaultSessionHolder(session),
+                getTemplates(), new DefaultQueryMetadata());
+    }
+
+    protected JPQLTemplates getTemplates() {
+        return HQLTemplates.DEFAULT;
+    }
+
+    @Override
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+    @Override
+    protected void save(Object entity) {
+        session.save(entity);
+    }
+
+    @Test
+    public void query_exposure() {
+//        save(new Cat());
+        List<Cat> results = query().from(cat).select(cat).createQuery().list();
+        assertNotNull(results);
+        assertFalse(results.isEmpty());
+    }
+
+    @Test
+    public void delete() {
+        assertEquals(0, delete(QGroup.group).execute());
+    }
+
+    @Test
+    public void with_comment() {
+        query().from(cat).setComment("my comment").select(cat).fetch();
+    }
+
+    @Test
+    public void lockMode() {
+        query().from(cat).setLockMode(cat, LockMode.PESSIMISTIC_WRITE).select(cat).fetch();
+    }
+
+    @Test
+    public void flushMode() {
+        query().from(cat).setFlushMode(org.hibernate.FlushMode.AUTO).select(cat).fetch();
+    }
+
+    @Test
+    public void scroll() throws IOException {
+        CloseableIterator<Cat> cats = new ScrollableResultsIterator<Cat>(query().from(cat)
+                .select(cat).createQuery().scroll());
+        assertTrue(cats.hasNext());
+        while (cats.hasNext()) {
+            assertNotNull(cats.next());
+        }
+        cats.close();
+    }
+
+    @Test
+    public void scrollTuple() throws IOException {
+        CloseableIterator<Tuple> rows = new ScrollableResultsIterator<Tuple>(query()
+                .from(cat)
+                .select(cat.name, cat.birthdate).createQuery().scroll());
+        assertTrue(rows.hasNext());
+        while (rows.hasNext()) {
+            Tuple row = rows.next();
+            assertEquals(2, row.size());
+        }
+        rows.close();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void createQuery() {
+        List<Tuple> rows = query().from(cat).select(cat.id, cat.name).createQuery().list();
+        for (Tuple row : rows) {
+            assertEquals(2, row.size());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void createQuery2() {
+        List<Tuple> rows = query().from(cat).select(new Expression[]{cat.id, cat.name}).createQuery().list();
+        for (Tuple row : rows) {
+            assertEquals(2, row.size());
+        }
+    }
+
+    @Test
+    public void createQuery3() {
+        List<String> rows = query().from(cat).select(cat.name).createQuery().list();
+        for (String row : rows) {
+            assertTrue(row instanceof String);
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java
new file mode 100644
index 0000000000..8f02b61a66
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java
@@ -0,0 +1,149 @@
+package com.querydsl.jpa;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.batoo.jpa.core.impl.criteria.QueryImpl;
+import org.eclipse.persistence.internal.localization.ExceptionLocalization;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.query.spi.ScrollableResultsImplementor;
+import org.hibernate.transform.ResultTransformer;
+import org.junit.Test;
+
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.jpa.domain4.Library;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hibernate.ScrollMode.FORWARD_ONLY;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class HibernateHandlerTest {
+
+    private final HibernateHandler hibernateHandler = new HibernateHandler();
+    private final NativeQuery nativeQuery = createMock(NativeQuery.class);
+    private final String alias = "library";
+    private final Class<Library> classType = Library.class;
+
+    @Test
+    public void should_add_entity() {
+        expect(nativeQuery.unwrap(NativeQuery.class)).andReturn(nativeQuery);
+        expect(nativeQuery.addEntity(alias, classType)).andReturn(nativeQuery);
+        replay(nativeQuery);
+
+        hibernateHandler.addEntity(nativeQuery, alias, classType);
+
+        verify(nativeQuery);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void addEntity_should_throw_persistence_exception_when_invalid_query_type() {
+        Query notSupportedQuery = createMock(QueryImpl.class);
+        PersistenceException expectedThrow =
+            new PersistenceException(ExceptionLocalization.buildMessage("unable_to_unwrap_jpa",
+                                                                        new String[]{Query.class.getName(), NativeQuery.class.getName()}));
+
+        expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow);
+        replay(notSupportedQuery);
+
+        hibernateHandler.addEntity(notSupportedQuery, alias, classType);
+    }
+
+    @Test
+    public void should_add_scalar() {
+        expect(nativeQuery.unwrap(NativeQuery.class)).andReturn(nativeQuery);
+        expect(nativeQuery.addScalar(alias)).andReturn(nativeQuery);
+        replay(nativeQuery);
+
+        hibernateHandler.addScalar(nativeQuery, alias, classType);
+
+        verify(nativeQuery);
+    }
+
+    @Test(expected = PersistenceException.class)
+    public void addScalar_should_throw_persistence_exception_when_invalid_query_type() {
+        Query notSupportedQuery = createMock(QueryImpl.class);
+        PersistenceException expectedThrow =
+            new PersistenceException(ExceptionLocalization.buildMessage("unable_to_unwrap_jpa",
+                                                                        new String[]{Query.class.getName(), NativeQuery.class.getName()}));
+
+        expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow);
+        replay(notSupportedQuery);
+
+        hibernateHandler.addScalar(notSupportedQuery, alias, classType);
+    }
+
+    @Test
+    public void should_get_false_when_check_native_query_type() {
+        assertFalse(hibernateHandler.createNativeQueryTyped());
+    }
+
+    @Test
+    public void should_get_true_when_check_wrap_entity_projections_for_hibernate_query_syntax_by_using_curly_braces() {
+        assertTrue(hibernateHandler.wrapEntityProjections());
+    }
+
+    @Test
+    public void should_return_transforming_iterator_when_call_iterate_function() {
+        ScrollableResultsImplementor scrollableResultsImplementor = createMock(ScrollableResultsImplementor.class);
+        FactoryExpression<?> factoryExpression = createMock(FactoryExpression.class);
+
+        expect(nativeQuery.unwrap(org.hibernate.query.Query.class)).andReturn(nativeQuery);
+        expect(nativeQuery.scroll(FORWARD_ONLY)).andReturn(scrollableResultsImplementor);
+        replay(nativeQuery);
+
+        assertThat(hibernateHandler.iterate(nativeQuery, factoryExpression), instanceOf(TransformingIterator.class));
+    }
+
+    @Test
+    public void should_return_iterator_adapter_when_call_iterate_function() {
+        Query query = createMock(Query.class);
+        List queryResultList = createMock(List.class);
+        Iterator iterator = createMock(Iterator.class);
+
+        expect(query.unwrap(org.hibernate.query.Query.class)).andThrow(new PersistenceException("Cannot unwrap Query"));
+        expect(query.getResultList()).andReturn(queryResultList);
+        expect(queryResultList.iterator()).andReturn(iterator);
+        replay(query);
+
+        assertEquals(IteratorAdapter.class, hibernateHandler.iterate(query, null).getClass());
+    }
+
+    @Test
+    public void should_ReturnTransformingIterator_when_other_query_implementor() {
+        Query query = createMock(Query.class);
+        FactoryExpression<?> factoryExpression = createMock(FactoryExpression.class);
+        List queryResultList = createMock(List.class);
+        Iterator iterator = createMock(Iterator.class);
+
+        expect(query.unwrap(org.hibernate.query.Query.class)).andThrow(new PersistenceException("Cannot unwrap Query"));
+        expect(query.getResultList()).andReturn(queryResultList);
+        expect(queryResultList.iterator()).andReturn(iterator);
+        replay(query);
+
+        assertEquals(TransformingIterator.class, hibernateHandler.iterate(query, factoryExpression).getClass());
+    }
+
+    @Test
+    public void should_transform() {
+        FactoryExpression<?> projection = createMock(FactoryExpression.class);
+
+        expect(nativeQuery.unwrap(org.hibernate.query.Query.class)).andReturn(nativeQuery);
+        expect(nativeQuery.setResultTransformer(anyObject(ResultTransformer.class))).andReturn(nativeQuery);
+        replay(nativeQuery);
+
+        assertTrue(hibernateHandler.transform(nativeQuery, projection));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java
new file mode 100644
index 0000000000..c891677b79
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.easymock.EasyMock;
+import org.hibernate.Session;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.QAnimal;
+import com.querydsl.jpa.hibernate.HibernateQueryFactory;
+
+import java.util.function.Supplier;
+
+public class HibernateQueryFactoryTest {
+
+    private HibernateQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<Session> provider = () -> EasyMock.<Session> createNiceMock(Session.class);
+        queryFactory = new HibernateQueryFactory(JPQLTemplates.DEFAULT, provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QAnimal.animal));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QAnimal.animal));
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QAnimal.animal));
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QAnimal.animal));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java
new file mode 100644
index 0000000000..b28c0ee082
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.QueryMutability;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.testutil.HibernateTestRunner;
+
+@Ignore
+@RunWith(HibernateTestRunner.class)
+public class HibernateQueryMutabilityTest implements HibernateTest {
+
+    private Session session;
+
+    protected HibernateQuery<?> query() {
+        return new HibernateQuery<Void>(session);
+    }
+
+    @Override
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+    @Test
+    public void test() throws SecurityException, IllegalArgumentException,
+            NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException, IOException {
+        QCat cat = QCat.cat;
+        HibernateQuery<?> query = query().from(cat);
+        new QueryMutability(query).test(cat, cat.name);
+    }
+
+    @Test
+    public void clone_() {
+        QCat cat = QCat.cat;
+        HibernateQuery<?> query = query().from(cat).where(cat.name.isNotNull());
+        HibernateQuery<?> query2 = query.clone(session);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        query2.select(cat).fetch();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java
new file mode 100644
index 0000000000..10aaca634d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.QEmployee;
+import com.querydsl.jpa.domain.QUser;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+
+public class HibernateQueryTest {
+
+    @Test
+    public void clone_() {
+        QCat cat = QCat.cat;
+        BooleanBuilder emptyBooleanBuilder = new BooleanBuilder();
+        HibernateQuery<?> hq = new HibernateQuery<Void>().from(cat).where(cat.name.isNull().and(emptyBooleanBuilder));
+        HibernateQuery<?> hq2 = hq.clone();
+        assertNotNull(hq2);
+    }
+
+    @Test
+    public void innerJoin() {
+        HibernateQuery<?> hqlQuery = new HibernateQuery<Void>();
+        QEmployee employee = QEmployee.employee;
+        hqlQuery.from(employee);
+        hqlQuery.innerJoin(employee.user, QUser.user);
+        assertEquals("select employee\nfrom Employee employee\n  inner join employee.user as user", hqlQuery.toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java
new file mode 100644
index 0000000000..ac8ebe8efc
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import org.hibernate.query.Query;
+import org.hibernate.Session;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.Color;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.hibernate.sql.HibernateSQLQuery;
+import com.querydsl.jpa.testutil.HibernateTestRunner;
+import com.querydsl.sql.SQLTemplates;
+
+@RunWith(HibernateTestRunner.class)
+public class HibernateSQLBase extends AbstractSQLTest implements HibernateTest {
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    private final SQLTemplates templates = Mode.getSQLTemplates();
+
+    private final SAnimal cat = new SAnimal("cat");
+
+    private Session session;
+
+    @Override
+    protected HibernateSQLQuery<?> query() {
+        return new HibernateSQLQuery<Void>(session, templates);
+    }
+
+    @Override
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+    @Before
+    public void setUp() {
+        if (query().from(cat).fetchCount() == 0) {
+            session.save(new Cat("Beck", 1, Color.BLACK));
+            session.save(new Cat("Kate", 2, Color.BLACK));
+            session.save(new Cat("Kitty", 3, Color.BLACK));
+            session.save(new Cat("Bobby", 4, Color.BLACK));
+            session.save(new Cat("Harold", 5, Color.BLACK));
+            session.save(new Cat("Tim", 6, Color.BLACK));
+            session.flush();
+        }
+    }
+
+    @Test
+    public void entityQueries_createQuery() {
+        SAnimal cat = new SAnimal("cat");
+        QCat catEntity = QCat.cat;
+
+        Query query = query().from(cat).select(catEntity).createQuery();
+        assertEquals(6, query.list().size());
+    }
+
+    @Test
+    @ExcludeIn(Target.MYSQL)
+    public void entityQueries_createQuery2() {
+        SAnimal cat = new SAnimal("CAT");
+        QCat catEntity = QCat.cat;
+
+        Query query = query().from(cat).select(catEntity).createQuery();
+        assertEquals(6, query.list().size());
+    }
+
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateTest.java
new file mode 100644
index 0000000000..b6b8c7612a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import org.hibernate.Session;
+
+/**
+ *
+ * @author Shredder121
+ */
+public interface HibernateTest {
+
+    void setSession(Session session);
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java
new file mode 100644
index 0000000000..6c3c04847d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static com.querydsl.jpa.Constants.*;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.hibernate.query.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.Session;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.hibernate.HibernateDeleteClause;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.hibernate.HibernateInsertClause;
+import com.querydsl.jpa.hibernate.HibernateUpdateClause;
+import com.querydsl.jpa.hibernate.HibernateUtil;
+import com.querydsl.jpa.testutil.HibernateTestRunner;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+@RunWith(HibernateTestRunner.class)
+public class IntegrationBase extends ParsingTest implements HibernateTest {
+
+    private Session session;
+
+    @Override
+    protected QueryHelper<?> query() {
+        return new QueryHelper<Void>(HQLTemplates.DEFAULT) {
+            @Override
+            public void parse() throws RecognitionException, TokenStreamException {
+                try {
+                    System.out.println("query : " + toString().replace('\n', ' '));
+                    JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+                    serializer.serialize(getMetadata(), false, null);
+                    Query query = session.createQuery(serializer.toString());
+                    HibernateUtil.setConstants(query, serializer.getConstants(), getMetadata().getParams());
+                    query.list();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                } finally {
+                    System.out.println();
+                }
+            }
+        };
+    }
+
+    @Override
+    @Test
+    public void groupBy() throws Exception {
+        // NOTE : commented out, because HQLSDB doesn't support these queries
+    }
+
+    @Override
+    @Test
+    public void groupBy_2() throws Exception {
+        // NOTE : commented out, because HQLSDB doesn't support these queries
+    }
+
+    @Override
+    @Test
+    public void orderBy() throws Exception {
+        // NOTE : commented out, because HQLSDB doesn't support these queries
+    }
+
+    @Override
+    @Test
+    public void docoExamples910() throws Exception {
+        // NOTE : commented out, because HQLSDB doesn't support these queries
+    }
+
+    private HibernateDeleteClause delete(EntityPath<?> entity) {
+        return new HibernateDeleteClause(session, entity);
+    }
+
+    private HibernateUpdateClause update(EntityPath<?> entity) {
+        return new HibernateUpdateClause(session, entity);
+    }
+
+    private HibernateInsertClause insert(EntityPath<?> entity) {
+        return new HibernateInsertClause(session, entity);
+    }
+
+
+    @Test
+    public void scroll() {
+        session.save(new Cat("Bob",10));
+        session.save(new Cat("Steve",11));
+
+        QCat cat = QCat.cat;
+        HibernateQuery<?> query = new HibernateQuery<Void>(session);
+        ScrollableResults results = query.from(cat).select(cat).scroll(ScrollMode.SCROLL_INSENSITIVE);
+        while (results.next()) {
+            assertNotNull(results.get(0));
+        }
+        results.close();
+    }
+
+    @Test
+    public void insert() {
+        session.save(new Cat("Bob",10));
+
+        QCat cat = QCat.cat;
+        long amount = insert(cat)
+            .set(cat.name, "Bobby")
+            .set(cat.alive, false)
+            .execute();
+        assertEquals(1, amount);
+
+        assertEquals(1L, query().from(cat).where(cat.name.eq("Bobby")).fetchCount());
+    }
+
+    @Test
+    public void insert2() {
+        session.save(new Cat("Bob",10));
+
+        QCat cat = QCat.cat;
+        long amount = insert(cat).columns(cat.name, cat.alive)
+            .values("Bobby", false)
+            .execute();
+        assertEquals(1, amount);
+
+        assertEquals(1L, query().from(cat).where(cat.name.eq("Bobby")).fetchCount());
+    }
+
+    @Test
+    public void insert3() {
+        session.save(new Cat("Bob",10));
+
+        QCat cat = QCat.cat;
+        QCat bob = new QCat("Bob");
+
+        long amount = insert(cat)
+                .columns(cat.name, cat.alive)
+                .select(JPAExpressions.select(bob.name, bob.alive).from(bob))
+                .execute();
+        assertEquals(1, amount);
+
+        assertEquals(1L, query().from(cat).where(cat.name.eq("Bobby")).fetchCount());
+    }
+
+    @Test
+    public void update() {
+        session.save(new Cat("Bob",10));
+        session.save(new Cat("Steve",11));
+
+        QCat cat = QCat.cat;
+        long amount = update(cat).where(cat.name.eq("Bob"))
+            .set(cat.name, "Bobby")
+            .set(cat.alive, false)
+            .execute();
+        assertEquals(1, amount);
+
+        assertEquals(0L, query().from(cat).where(cat.name.eq("Bob")).fetchCount());
+    }
+
+    @Test
+    public void update_with_null() {
+        session.save(new Cat("Bob",10));
+        session.save(new Cat("Steve",11));
+
+        QCat cat = QCat.cat;
+        long amount = update(cat).where(cat.name.eq("Bob"))
+            .set(cat.name, (String) null)
+            .set(cat.alive, false)
+            .execute();
+        assertEquals(1, amount);
+    }
+
+    @Test
+    public void delete() {
+        session.save(new Cat("Bob",10));
+        session.save(new Cat("Steve",11));
+
+        QCat cat = QCat.cat;
+        long amount = delete(cat).where(cat.name.eq("Bob"))
+            .execute();
+        assertEquals(1, amount);
+    }
+
+    @Test
+    public void collection() throws Exception {
+        List<Cat> cats = Arrays.asList(new Cat("Bob",10), new Cat("Steve",11));
+        for (Cat cat : cats) {
+            session.save(cat);
+        }
+
+        query().from(cat)
+            .innerJoin(cat.kittens, kitten)
+            .where(kitten.in(cats))
+            .parse();
+
+    }
+
+    @Override
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java
new file mode 100644
index 0000000000..6e58551b23
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.JPAExpressions.selectFrom;
+import static com.querydsl.jpa.JPAExpressions.selectOne;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.domain.*;
+import com.querydsl.jpa.impl.JPADeleteClause;
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+
+/**
+ * @author tiwe
+ *
+ */
+@RunWith(JPATestRunner.class)
+public class JPABase extends AbstractJPATest implements JPATest {
+
+    private static final QCat cat = QCat.cat;
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    @Rule
+    @ClassRule
+    public static TestRule jpaProviderRule = new JPAProviderRule();
+
+    private EntityManager entityManager;
+
+    @Override
+    protected JPAQuery<?> query() {
+        return new JPAQuery<Void>(entityManager);
+    }
+
+    protected JPADeleteClause delete(EntityPath<?> path) {
+        return new JPADeleteClause(entityManager, path);
+    }
+
+    @Override
+    protected JPAQuery<?> testQuery() {
+        return new JPAQuery<Void>(entityManager, new DefaultQueryMetadata());
+    }
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+    @Override
+    protected void save(Object entity) {
+        entityManager.persist(entity);
+    }
+
+    @Test
+    @NoEclipseLink
+    @NoOpenJPA
+    @NoHibernate
+    public void connection_access() {
+        assertNotNull(query().from(cat).select(cat).createQuery().unwrap(Connection.class));
+    }
+
+    @Test
+    @Ignore
+    public void delete() {
+        delete(cat).execute();
+    }
+
+    @Test
+    public void delete2() {
+        assertEquals(0, delete(QGroup.group).execute());
+    }
+
+    @Test
+    @NoBatooJPA
+    public void delete_where() {
+        delete(cat).where(cat.name.eq("XXX")).execute();
+    }
+
+    @Test
+    @ExcludeIn(Target.MYSQL)
+    public void delete_where_any() {
+        delete(cat).where(cat.kittens.any().name.eq("XXX")).execute();
+    }
+
+    @Test
+    @NoBatooJPA
+    @ExcludeIn(Target.MYSQL)
+    public void delete_where_subQuery_exists() {
+        QCat parent = cat;
+        QCat child = new QCat("kitten");
+
+        delete(child)
+            .where(child.id.eq(-100), selectOne().from(parent)
+               .where(parent.id.eq(-200),
+                      child.in(parent.kittens)).exists())
+            .execute();
+    }
+
+    @Test
+    @NoBatooJPA
+    public void delete_where_subQuery2() {
+        QChild child = QChild.child;
+        QParent parent = QParent.parent;
+
+        JPQLQuery<?> subQuery = selectFrom(parent)
+            .where(parent.id.eq(2),
+                    child.parent.eq(parent));
+                   //child.in(parent.children));
+
+        delete(child)
+            .where(child.id.eq(1), subQuery.exists())
+            .execute();
+    }
+
+    @Test
+    public void finder() {
+        Map<String,Object> conditions = new HashMap<String,Object>();
+        conditions.put("name", "Bob123");
+
+        List<Cat> cats = CustomFinder.findCustom(entityManager, Cat.class, conditions, "name");
+        assertEquals(1, cats.size());
+        assertEquals("Bob123", cats.get(0).getName());
+    }
+
+    @Test
+    public void flushMode() {
+        assertFalse(query().from(cat).setFlushMode(FlushModeType.AUTO).select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA
+    public void hint() {
+        javax.persistence.Query query = query().from(cat)
+                .setHint("org.hibernate.cacheable", true)
+                .select(cat).createQuery();
+
+        assertNotNull(query);
+        assertTrue(query.getHints().containsKey("org.hibernate.cacheable"));
+        assertFalse(query.getResultList().isEmpty());
+    }
+
+    @Test
+    public void hint2() {
+        assertFalse(query().from(cat).setHint("org.hibernate.cacheable", true)
+                .select(cat).fetch().isEmpty());
+    }
+
+    @Test @Ignore
+    @NoHibernate @NoOpenJPA @NoBatooJPA
+    public void hint3() {
+        javax.persistence.Query query = query().from(cat)
+                .setHint("eclipselink.batch.type", "IN")
+                .setHint("eclipselink.batch", "person.workAddress")
+                .setHint("eclipselink.batch", "person.homeAddress")
+                .select(cat).createQuery();
+
+        assertNotNull(query);
+        assertEquals("person.homeAddress", query.getHints().get("eclipselink.batch"));
+    }
+
+    @Test
+    @ExcludeIn(Target.DERBY)
+    public void iterate() {
+        CloseableIterator<Cat> cats = query().from(cat).select(cat).iterate();
+        while (cats.hasNext()) {
+            Cat cat = cats.next();
+            assertNotNull(cat);
+        }
+        cats.close();
+    }
+
+    @Test
+    public void limit1_uniqueResult() {
+        assertNotNull(query().from(cat).limit(1).select(cat).fetchOne());
+    }
+
+    @Test
+    public void lockMode() {
+        javax.persistence.Query query = query().from(cat)
+                .setLockMode(LockModeType.PESSIMISTIC_READ)
+                .select(cat).createQuery();
+        assertEquals(query.getLockMode(), LockModeType.PESSIMISTIC_READ);
+        assertFalse(query.getResultList().isEmpty());
+    }
+
+    @Test
+    public void lockMode2() {
+        assertFalse(query().from(cat).setLockMode(LockModeType.PESSIMISTIC_READ)
+                .select(cat).fetch().isEmpty());
+    }
+
+    @Test
+    public void queryExposure() {
+        //save(new Cat(20));
+        List<Cat> results = query().from(cat).select(cat).createQuery().getResultList();
+        assertNotNull(results);
+        assertFalse(results.isEmpty());
+    }
+
+    @Test
+    @Ignore // isn't a valid JPQL query
+    public void subquery_uniqueResult() {
+        QCat cat2 = new QCat("cat2");
+
+        BooleanExpression exists = selectOne().from(cat2).where(cat2.eyecolor.isNotNull()).exists();
+        assertNotNull(query().from(cat)
+                .where(cat.breed.eq(0).not())
+                .select(new QCatSummary(cat.breed.count(), exists)).fetchOne());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @NoEclipseLink
+    @NoBatooJPA
+    public void createQuery() {
+        List<Tuple> rows = query().from(cat)
+                .select(cat.id, cat.name).createQuery().getResultList();
+        for (Tuple row : rows) {
+            assertEquals(2, row.size());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @NoEclipseLink
+    @NoBatooJPA
+    public void createQuery2() {
+        List<Tuple> rows = query().from(cat)
+                .select(cat.id, cat.name).createQuery().getResultList();
+        for (Tuple row : rows) {
+            assertEquals(2, row.size());
+        }
+    }
+
+    @Test
+    public void createQuery3() {
+        List<String> rows = query().from(cat).select(cat.name).createQuery().getResultList();
+        for (String row : rows) {
+            assertNotNull(row);
+        }
+    }
+
+    @Test
+    @NoHibernate
+    @ExcludeIn(Target.DERBY)
+    public void createQuery4() {
+        List<Tuple> rows = query().from(cat).select(new Expression<?>[] {Expressions.nullExpression()}).fetch();
+        for (Tuple row : rows) {
+            assertNotNull(row);
+            assertEquals(1, row.size());
+            assertNull(row.get(Expressions.nullExpression()));
+        }
+    }
+
+    @Test
+    public void fetchCountResultsGroupByWithMultipleFields() {
+        QueryResults<Tuple> results = query().from(cat)
+                .groupBy(cat.alive, cat.breed)
+                .select(cat.alive, cat.breed, cat.id.sum())
+                .fetchResults();
+
+        assertEquals(1, results.getTotal());
+    }
+
+    @Test
+    public void fetchCountResultsGroupByWithHaving() {
+        QueryResults<Tuple> results = query().from(cat)
+                .groupBy(cat.alive)
+                .having(cat.id.sum().gt(5))
+                .select(cat.alive, cat.id.sum())
+                .fetchResults();
+
+        assertEquals(1, results.getTotal());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java
new file mode 100644
index 0000000000..f513ca37fc
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.support.Context;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.QCompany;
+import com.querydsl.jpa.domain.QDomesticCat;
+import com.querydsl.jpa.domain.QEmployee;
+
+
+public class JPACollectionAnyVisitorTest {
+
+    private QCat cat = QCat.cat;
+
+    @Test
+    public void path() {
+        assertEquals("cat_kittens_0", serialize(cat.kittens.any()));
+    }
+
+    @Test
+    public void longer_path() {
+        assertEquals("cat_kittens_0.name", serialize(cat.kittens.any().name));
+    }
+
+    @Test
+    public void nested_any_booleanOperation() {
+        QCompany company = QCompany.company;
+        Predicate predicate = company.departments.any().employees.any().firstName.eq("Bob");
+        assertEquals("exists (select 1\n" +
+                "from company.departments as company_departments_0\n" +
+                "  inner join company_departments_0.employees as company_departments_0_employees_1\n" +
+                "where company_departments_0_employees_1.firstName = ?1)", serialize(predicate));
+    }
+
+    @Test
+    public void simple_booleanOperation() {
+        Predicate predicate = cat.kittens.any().name.eq("Ruth123");
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "where cat_kittens_0.name = ?1)", serialize(predicate));
+    }
+
+    @Test
+    public void simple_booleanOperation_longPath() {
+        Predicate predicate = cat.kittens.any().kittens.any().name.eq("Ruth123");
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "  inner join cat_kittens_0.kittens as cat_kittens_0_kittens_1\n" +
+                "where cat_kittens_0_kittens_1.name = ?1)", serialize(predicate));
+    }
+
+    @Test
+    public void simple_booleanOperation_elementCollection() {
+        QEmployee employee = QEmployee.employee;
+        Predicate predicate = employee.jobFunctions.any().stringValue().eq("CODER");
+        assertEquals("exists (select 1\n" +
+                "from Employee employee_1463394548\n" +
+                "  inner join employee_1463394548.jobFunctions as employee_jobFunctions_0\n" +
+                "where employee_1463394548 = employee and str(employee_jobFunctions_0) = ?1)", serialize(predicate));
+    }
+
+    @Test
+    public void simple_stringOperation() {
+        Predicate predicate = cat.kittens.any().name.substring(1).eq("uth123");
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "where substring(cat_kittens_0.name,2) = ?1)", serialize(predicate));
+    }
+
+    @Test
+    public void and_operation() {
+        Predicate predicate = cat.kittens.any().name.eq("Ruth123").and(cat.kittens.any().bodyWeight.gt(10.0));
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "where cat_kittens_0.name = ?1) and exists (select 1\n" +
+                "from cat.kittens as cat_kittens_1\n" +
+                "where cat_kittens_1.bodyWeight > ?2)", serialize(predicate));
+    }
+
+    @Test
+    public void template() {
+        Expression<Boolean> templateExpr = ExpressionUtils.template(Boolean.class, "{0} = {1}",
+                cat.kittens.any().name, ConstantImpl.create("Ruth123"));
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "where cat_kittens_0.name = ?1)", serialize(templateExpr));
+    }
+
+    @Test
+    public void cast() {
+//        JPAQuery query = new JPAQuery(em).from(QPerson.person);
+//        QDog anyDog = QPerson.person.animals.any().as(QDog.class);
+//        query.where(anyDog.gender.eq("M"));
+//        List<Person> foundOwners = query.fetch(QPerson.person);
+
+        QDomesticCat anyCat = QCat.cat.kittens.any().as(QDomesticCat.class);
+        Predicate predicate = anyCat.name.eq("X");
+
+        assertEquals("exists (select 1\n" +
+                "from cat.kittens as cat_kittens_0\n" +
+                "where cat_kittens_0.name = ?1)", serialize(predicate));
+    }
+
+    private String serialize(Expression<?> expression) {
+        Expression<?> transformed = expression.accept(new JPACollectionAnyVisitor(), new Context());
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT, null);
+        serializer.handle(transformed);
+        return serializer.toString();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java
new file mode 100644
index 0000000000..44efa70f29
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import com.querydsl.jpa.impl.JPAProvider;
+import com.querydsl.jpa.impl.JPAUtil;
+import com.querydsl.jpa.testutil.JPATestRunner;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+@RunWith(JPATestRunner.class)
+public class JPAIntegrationBase extends ParsingTest implements JPATest {
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    @Rule
+    @ClassRule
+    public static TestRule hibernateOnly = new JPAProviderRule();
+
+    private EntityManager em;
+
+    private JPQLTemplates templates;
+
+    @Override
+    protected QueryHelper<?> query() {
+        return new QueryHelper<Void>(templates) {
+            @Override
+            public void parse() throws RecognitionException, TokenStreamException {
+                JPQLSerializer serializer = new JPQLSerializer(templates);
+                serializer.serialize(getMetadata(), false, null);
+                Query query = em.createQuery(serializer.toString());
+                JPAUtil.setConstants(query, serializer.getConstants(), getMetadata().getParams());
+                try {
+                    query.getResultList();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    @Override
+    public void setEntityManager(EntityManager em) {
+        this.em = em;
+        this.templates = JPAProvider.getTemplates(em);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java
new file mode 100644
index 0000000000..ab7578ff99
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java
@@ -0,0 +1,43 @@
+package com.querydsl.jpa;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.EmptyStatement;
+
+import java.util.Arrays;
+
+/**
+ * @author tiwe
+ *
+ */
+public class JPAProviderRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        NoEclipseLink noEclipseLink = description.getAnnotation(NoEclipseLink.class);
+        NoOpenJPA noOpenJPA = description.getAnnotation(NoOpenJPA.class);
+        NoBatooJPA noBatooJPA = description.getAnnotation(NoBatooJPA.class);
+        NoHibernate noHibernate = description.getAnnotation(NoHibernate.class);
+        String mode = Mode.mode.get();
+        if (mode == null) {
+            return base;
+        } else if (noEclipseLink != null && applies(noEclipseLink.value()) && mode.contains("-eclipselink")) {
+            return EmptyStatement.DEFAULT;
+        } else if (noOpenJPA != null && applies(noOpenJPA.value()) && mode.contains("-openjpa")) {
+            return EmptyStatement.DEFAULT;
+        } else if (noBatooJPA != null && applies(noBatooJPA.value()) && mode.contains("-batoo")) {
+            return EmptyStatement.DEFAULT;
+        } else if (noHibernate != null && applies(noHibernate.value()) && !mode.contains("-")) {
+            return EmptyStatement.DEFAULT;
+        } else {
+            return base;
+        }
+    }
+
+    private boolean applies(Target[] targets) {
+        return targets.length == 0 || Arrays.asList(targets).contains(Mode.target.get());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAProviderTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java
similarity index 85%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAProviderTest.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java
index 6e1b9f1585..0afa1321a3 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/JPAProviderTest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
 import static org.junit.Assert.assertEquals;
 
@@ -14,7 +14,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.query.jpa.impl.JPAProvider;
+import com.querydsl.jpa.impl.JPAProvider;
 
 // 5.664
 public class JPAProviderTest {
@@ -34,15 +34,15 @@ public void tearDown() {
     }
 
     @Test
-    public void Hibernate() {
+    public void hibernate() {
         factory = Persistence.createEntityManagerFactory("h2");
         em = factory.createEntityManager();
         System.out.println(em.getDelegate().getClass());
-        assertEquals(HQLTemplates.DEFAULT, JPAProvider.getTemplates(em));
+        assertEquals(Hibernate5Templates.DEFAULT, JPAProvider.getTemplates(em));
     }
 
     @Test
-    public void Hibernate_For_Proxy() {
+    public void hibernate_for_proxy() {
         factory = Persistence.createEntityManagerFactory("h2");
         em = factory.createEntityManager();
         InvocationHandler handler = new InvocationHandler() {
@@ -53,13 +53,13 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         };
         EntityManager proxy = (EntityManager) Proxy.newProxyInstance(
                 Thread.currentThread().getContextClassLoader(),
-                new Class[]{EntityManager.class},
+                new Class<?>[]{EntityManager.class},
                 handler);
-        assertEquals(HQLTemplates.DEFAULT, JPAProvider.getTemplates(proxy));
+        assertEquals(Hibernate5Templates.DEFAULT, JPAProvider.getTemplates(proxy));
     }
 
     @Test
-    public void EclipseLink() {
+    public void eclipseLink() {
         factory = Persistence.createEntityManagerFactory("h2-eclipselink");
         em = factory.createEntityManager();
         System.out.println(em.getDelegate().getClass());
@@ -68,7 +68,7 @@ public void EclipseLink() {
     }
 
     @Test
-    public void EclipseLink_For_Proxy() {
+    public void eclipseLink_for_proxy() {
         factory = Persistence.createEntityManagerFactory("h2-eclipselink");
         em = factory.createEntityManager();
         InvocationHandler handler = new InvocationHandler() {
@@ -79,14 +79,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         };
         EntityManager proxy = (EntityManager) Proxy.newProxyInstance(
                 Thread.currentThread().getContextClassLoader(),
-                new Class[]{EntityManager.class},
+                new Class<?>[]{EntityManager.class},
                 handler);
         assertEquals(EclipseLinkTemplates.DEFAULT, JPAProvider.getTemplates(proxy));
     }
 
     @Test
     @Ignore // doesn't work on JDK 7
-    public void OpenJPA() {
+    public void openJPA() {
         factory = Persistence.createEntityManagerFactory("derby-openjpa");
         em = factory.createEntityManager();
         System.out.println(em.getDelegate().getClass());
@@ -96,7 +96,7 @@ public void OpenJPA() {
 
     @Test
     @Ignore // temporarily ignored, since Batoo hangs on EntityManager creation
-    public void Batoo() {
+    public void batoo() {
         factory = Persistence.createEntityManagerFactory("h2-batoo");
         em = factory.createEntityManager();
         System.out.println(em.getDelegate().getClass());
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java
new file mode 100644
index 0000000000..0de6d42131
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.QAnimal;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import com.querydsl.sql.SQLExpressions;
+
+public class JPAQueryFactoryTest {
+
+    private EntityManagerFactory factoryMock;
+
+    private EntityManager mock;
+
+    private JPAQueryFactory queryFactory;
+
+    private JPQLQueryFactory queryFactory2;
+
+    private JPAQueryFactory queryFactory3;
+
+    private Map<String, Object> properties = new HashMap<>();
+
+    @Before
+    public void setUp() {
+        factoryMock = EasyMock.createMock(EntityManagerFactory.class);
+        mock = EasyMock.createMock(EntityManager.class);
+        Supplier<EntityManager> provider = () -> mock;
+        queryFactory = new JPAQueryFactory(JPQLTemplates.DEFAULT, provider);
+        queryFactory2 = queryFactory;
+
+        queryFactory3 = new JPAQueryFactory(provider);
+
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void query2() {
+        queryFactory2.query().from(QAnimal.animal);
+    }
+
+    @Test
+    public void query3() {
+        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
+        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
+        EasyMock.expect(mock.unwrap(EasyMock.anyObject(Class.class))).andReturn(mock).atLeastOnce();
+
+        EasyMock.replay(mock, factoryMock);
+
+        queryFactory3.query().from(QAnimal.animal);
+
+        EasyMock.verify(mock, factoryMock);
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QAnimal.animal));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QAnimal.animal));
+    }
+
+    @Test
+    public void delete2() {
+        queryFactory2.delete(QAnimal.animal)
+            .where(QAnimal.animal.bodyWeight.gt(0));
+    }
+
+    @Test
+    public void delete3() {
+        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
+        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
+        EasyMock.expect(mock.unwrap(EasyMock.anyObject(Class.class))).andReturn(mock).atLeastOnce();
+        EasyMock.replay(mock, factoryMock);
+
+        assertNotNull(queryFactory3.delete(QAnimal.animal));
+
+        EasyMock.verify(mock, factoryMock);
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QAnimal.animal));
+    }
+
+    @Test
+    public void update2() {
+        queryFactory2.update(QAnimal.animal)
+            .set(QAnimal.animal.birthdate, new Date())
+            .where(QAnimal.animal.birthdate.isNull());
+    }
+
+    @Test
+    public void update3() {
+        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
+        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
+        EasyMock.expect(mock.unwrap(EasyMock.anyObject(Class.class))).andReturn(mock).atLeastOnce();
+        EasyMock.replay(mock, factoryMock);
+
+        assertNotNull(queryFactory3.update(QAnimal.animal));
+
+        EasyMock.verify(mock, factoryMock);
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QAnimal.animal));
+    }
+
+    @Test
+    public void insert2() {
+        queryFactory2.insert(QAnimal.animal)
+        .set(QAnimal.animal.birthdate, new Date());
+    }
+
+    @Test
+    public void insert3() {
+        EasyMock.expect(mock.getEntityManagerFactory()).andReturn(factoryMock);
+        EasyMock.expect(factoryMock.getProperties()).andReturn(properties);
+        EasyMock.expect(mock.unwrap(EasyMock.anyObject(Class.class))).andReturn(mock).atLeastOnce();
+        EasyMock.replay(mock, factoryMock);
+
+        assertNotNull(queryFactory3.insert(QAnimal.animal));
+
+        EasyMock.verify(mock, factoryMock);
+    }
+
+    @Test
+    public void insert4() {
+        queryFactory.insert(QAnimal.animal).columns(QAnimal.animal.id, QAnimal.animal.birthdate)
+        .select(SQLExpressions.select(QAnimal.animal.id, QAnimal.animal.birthdate).from(QAnimal.animal));
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java
new file mode 100644
index 0000000000..9ff248a8df
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java
@@ -0,0 +1,230 @@
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.QCompany;
+import com.querydsl.jpa.domain.QDepartment;
+import com.querydsl.jpa.domain.QEmployee;
+import com.querydsl.jpa.domain4.QBookMark;
+import com.querydsl.jpa.domain4.QBookVersion;
+
+public class JPAQueryMixinTest {
+
+    private JPAQueryMixin<?> mixin = new JPAQueryMixin<Object>();
+
+    @Test
+    public void where_null() {
+        mixin.where((Predicate) null);
+    }
+
+    @Test
+    public void orderBy() {
+        QCat cat = QCat.cat;
+        QCat catMate = new QCat("cat_mate");
+        mixin.from(cat);
+        mixin.orderBy(cat.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, cat),
+                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(catMate))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(catMate.name.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_nonRoot_twice() {
+        QDepartment department = QDepartment.department;
+        QCompany departmentCompany = new QCompany("department_company");
+        QEmployee departmentCompanyCeo = new QEmployee("department_company_ceo");
+        mixin.from(department);
+        mixin.orderBy(department.company.ceo.firstName.asc(), department.company.ceo.lastName.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                        new JoinExpression(JoinType.DEFAULT, department),
+                        new JoinExpression(JoinType.LEFTJOIN, department.company.as(departmentCompany)),
+                        new JoinExpression(JoinType.LEFTJOIN, departmentCompany.ceo.as(departmentCompanyCeo))),
+                md.getJoins());
+        assertEquals(Arrays.asList(departmentCompanyCeo.firstName.asc(), departmentCompanyCeo.lastName.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_where() {
+        QCat cat = QCat.cat;
+        mixin.from(cat);
+        mixin.where(cat.mate.name.isNotNull());
+        mixin.orderBy(cat.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, cat)), md.getJoins());
+        assertEquals(Collections.singletonList(cat.mate.name.asc()), md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_groupBy() {
+        QCat cat = QCat.cat;
+        mixin.from(cat);
+        mixin.groupBy(cat.mate.name);
+        mixin.orderBy(cat.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, cat)), md.getJoins());
+        assertEquals(Collections.singletonList(cat.mate.name.asc()), md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_operation() {
+        QCat cat = QCat.cat;
+        QCat catMate = new QCat("cat_mate");
+        mixin.from(cat);
+        mixin.orderBy(cat.mate.name.lower().asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                        new JoinExpression(JoinType.DEFAULT, cat),
+                        new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(catMate))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(catMate.name.lower().asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_long() {
+        QCat cat = QCat.cat;
+        QCat catMate = new QCat("cat_mate");
+        QCat catMateMate = new QCat("cat_mate_mate");
+        mixin.from(cat);
+        mixin.orderBy(cat.mate.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, cat),
+                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(catMate)),
+                new JoinExpression(JoinType.LEFTJOIN, catMate.mate.as(catMateMate))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(catMateMate.name.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_reuse() {
+        QCat cat = QCat.cat;
+        QCat mate = new QCat("mate");
+        mixin.from(cat);
+        mixin.leftJoin(cat.mate, mate);
+        mixin.orderBy(cat.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, cat),
+                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(mate))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(mate.name.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_long_reuse() {
+        QCat cat = QCat.cat;
+        QCat mate = new QCat("mate");
+        QCat mateMate = new QCat("mate_mate");
+        mixin.from(cat);
+        mixin.leftJoin(cat.mate, mate);
+        mixin.orderBy(cat.mate.mate.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, cat),
+                new JoinExpression(JoinType.LEFTJOIN, cat.mate.as(mate)),
+                new JoinExpression(JoinType.LEFTJOIN, mate.mate.as(mateMate))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(mateMate.name.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_any() {
+        QCat cat = QCat.cat;
+        QCat catKittens = new QCat("cat_kittens");
+        mixin.from(cat);
+        mixin.orderBy(cat.kittens.any().name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, cat),
+                new JoinExpression(JoinType.LEFTJOIN, cat.kittens.as(catKittens))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(catKittens.name.asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_embeddable() {
+        QBookVersion bookVersion = QBookVersion.bookVersion;
+        mixin.from(bookVersion);
+        mixin.orderBy(bookVersion.definition.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, bookVersion)),
+                md.getJoins());
+        assertEquals(Collections.singletonList(bookVersion.definition.name.asc()),
+                md.getOrderBy());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void orderBy_embeddable2() {
+        QArticle article = QArticle.article;
+        QArticle articleContentArticle = new QArticle("article_content_article");
+        mixin.from(article);
+        mixin.orderBy(article.content.article.name.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Arrays.asList(
+                new JoinExpression(JoinType.DEFAULT, article),
+                new JoinExpression(JoinType.LEFTJOIN, article.content.article.as(articleContentArticle))),
+                md.getJoins());
+        assertEquals(Collections.singletonList(articleContentArticle.name.asc()),
+                md.getOrderBy());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void orderBy_embeddable_collection() {
+        QBookVersion bookVersion = QBookVersion.bookVersion;
+        QBookMark bookMark = new QBookMark("bookVersion_definition_bookMarks");
+        mixin.from(bookVersion);
+        mixin.orderBy(bookVersion.definition.bookMarks.any().comment.asc());
+
+        QueryMetadata md = mixin.getMetadata();
+        assertEquals(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, bookVersion)),
+                md.getJoins());
+        assertEquals(Collections.singletonList(Expressions.stringPath(bookVersion.definition.bookMarks, "comment").asc()),
+                md.getOrderBy());
+    }
+
+    @Test
+    public void orderBy_nullsLast() {
+        QCat cat = QCat.cat;
+        mixin.from(cat);
+        mixin.orderBy(cat.mate.name.asc().nullsLast());
+        assertEquals(
+                OrderSpecifier.NullHandling.NullsLast,
+                mixin.getMetadata().getOrderBy().get(0).getNullHandling());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java
new file mode 100644
index 0000000000..73ebe32040
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.core.types.dsl.Expressions.numberOperation;
+import static org.junit.Assert.assertEquals;
+
+import javax.persistence.EntityManager;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+
+@RunWith(JPATestRunner.class)
+public class JPAQueryMutability2Test implements JPATest {
+
+    private EntityManager entityManager;
+
+    private final Operator customOperator = new Operator() {
+        public String name() {
+            return "custom";
+        }
+        public String toString() {
+            return name();
+        }
+        public Class<?> getType() {
+            return Object.class;
+        }
+    };
+
+    private final JPQLTemplates customTemplates = new HQLTemplates() {
+        {
+            add(customOperator, "sign({0})");
+        }
+    };
+
+    protected JPAQuery<?> query() {
+        return new JPAQuery<Void>(entityManager);
+    }
+
+    protected JPAQuery<?> query(JPQLTemplates templates) {
+        return new JPAQuery<Void>(entityManager, templates);
+    }
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+    @Test
+    public void test() {
+        QCat cat = QCat.cat;
+        JPAQuery<?> query = query().from(cat);
+
+        query.fetchCount();
+        query.distinct().fetchCount();
+
+        query.select(cat).iterate();
+        query.select(cat, cat).iterate();
+        query.distinct().select(cat).iterate();
+        query.distinct().select(cat, cat).iterate();
+
+        query.select(cat).fetch();
+        query.select(cat, cat).fetch();
+        query.distinct().select(cat).fetch();
+        query.distinct().select(cat, cat).fetch();
+
+        query.select(cat).fetchResults();
+        query.distinct().select(cat).fetchResults();
+    }
+
+    @Test
+    public void clone_() {
+        QCat cat = QCat.cat;
+        JPAQuery<?> query = query().from(cat).where(cat.name.isNotNull());
+        JPAQuery<?> query2 = query.clone(entityManager);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        query2.select(cat).fetch();
+    }
+
+    @Test
+    public void clone_custom_templates() {
+        QCat cat = QCat.cat;
+        JPAQuery<?> query = query().from(cat);
+        //attach using the custom templates
+        query.clone(entityManager, customTemplates)
+                .select(numberOperation(Integer.class, customOperator, cat.floatProperty)).fetchOne();
+    }
+
+    @Test
+    public void clone_keep_templates() {
+        QCat cat = QCat.cat;
+        JPAQuery<?> query = query(customTemplates).from(cat);
+        //keep the original templates
+        query.clone()
+                .select(numberOperation(Integer.class, customOperator, cat.floatProperty)).fetchOne();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void clone_lose_templates() {
+        QCat cat = QCat.cat;
+        JPAQuery<?> query = query(customTemplates).from(cat);
+        //clone using the entitymanager's default templates
+        query.clone(entityManager)
+                .select(numberOperation(Integer.class, customOperator, cat.floatProperty)).fetchOne();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java
new file mode 100644
index 0000000000..d8de457521
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.persistence.EntityManager;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.QueryMutability;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.sql.JPASQLQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+import com.querydsl.sql.DerbyTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+@Ignore
+@RunWith(JPATestRunner.class)
+public class JPAQueryMutabilityTest implements JPATest {
+
+    private static final SQLTemplates derbyTemplates = new DerbyTemplates();
+
+    private EntityManager entityManager;
+
+    protected JPASQLQuery<?> query() {
+        return new JPASQLQuery<Void>(entityManager, derbyTemplates);
+    }
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+    @Test
+    public void test() throws SecurityException, IllegalArgumentException,
+            NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException, IOException {
+        entityManager.persist(new Cat("Beck", 1));
+        entityManager.flush();
+
+        SAnimal cat = new SAnimal("cat");
+        JPASQLQuery<?> query = query().from(cat);
+        new QueryMutability(query).test(cat.id, cat.name);
+    }
+
+    @Test
+    public void clone_() {
+        SAnimal cat = new SAnimal("cat");
+        JPASQLQuery<?> query = query().from(cat).where(cat.name.isNotNull());
+        JPASQLQuery<?> query2 = query.clone(entityManager);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        query2.select(cat.id).fetch();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java
new file mode 100644
index 0000000000..e57053f376
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.Color;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.sql.JPASQLQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+import com.querydsl.sql.SQLTemplates;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(JPATestRunner.class)
+public class JPASQLBase extends AbstractSQLTest implements JPATest {
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    @Rule
+    @ClassRule
+    public static TestRule hibernateOnly = new JPAProviderRule();
+
+    private final SQLTemplates templates = Mode.getSQLTemplates();
+
+    private EntityManager entityManager;
+
+    private final SAnimal cat = new SAnimal("cat");
+    private final QCat catEntity = QCat.cat;
+
+    @Override
+    protected JPASQLQuery<?> query() {
+        return new JPASQLQuery<Void>(entityManager, templates);
+    }
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+    @Before
+    public void setUp() {
+        if (query().from(cat).fetchCount() == 0) {
+            entityManager.persist(new Cat("Beck", 1, Color.BLACK));
+            entityManager.persist(new Cat("Kate", 2, Color.BLACK));
+            entityManager.persist(new Cat("Kitty", 3, Color.BLACK));
+            entityManager.persist(new Cat("Bobby", 4, Color.BLACK));
+            entityManager.persist(new Cat("Harold", 5, Color.BLACK));
+            entityManager.persist(new Cat("Tim", 6, Color.BLACK));
+            entityManager.flush();
+        }
+    }
+
+    private <T> void insertEntitiesForTest(final List<T> entities) {
+        for (T entity: entities) {
+            entityManager.persist(entity);
+        }
+        entityManager.flush();
+    }
+
+    private <T> void removeEntitiesForTest(final List<T> entities) {
+        for (T entity: entities) {
+            entityManager.remove(entity);
+        }
+        entityManager.flush();
+    }
+
+    @Test
+    public void entityQueries_createQuery() {
+        Query query = query().from(cat).select(catEntity).createQuery();
+        assertEquals(6, query.getResultList().size());
+    }
+
+    @Test
+    @ExcludeIn(Target.MYSQL)
+    public void entityQueries_createQuery2() {
+        SAnimal cat = new SAnimal("CAT");
+
+        Query query = query().from(cat).select(catEntity).createQuery();
+        assertEquals(6, query.getResultList().size());
+    }
+
+    @Test
+    public void should_fetch_results_with_factory_expression() {
+        final long expectedTotalResultCount = 6;
+        final HashMap<String, Expression<?>> bindings = new HashMap<String, Expression<?>>();
+        bindings.put("name", cat.name);
+
+        final long actualTotalResultCount = query().from(cat)
+                                                   .select(Projections.bean(Cat.class, bindings))
+                                                   .fetchResults()
+                                                   .getTotal();
+
+        assertEquals(expectedTotalResultCount, actualTotalResultCount);
+    }
+
+    @Test
+    public void should_get_grouped_list_by_using_fetch_results() {
+        final long expectedCatColorKindCount = 1;
+
+        final long actualCatColorKindCount = query().from(cat)
+                                                    .select(catEntity.color)
+                                                    .groupBy(catEntity.color)
+                                                    .fetchResults()
+                                                    .getTotal();
+
+        assertEquals(expectedCatColorKindCount, actualCatColorKindCount);
+    }
+
+    @Test
+    public void should_get_black_cat_count_by_using_group_by_and_having() {
+        final long expectedTabbyCatCount = 2L;
+        final Cat tabbyColorCatFoo = new Cat("Foo", 7, Color.TABBY);
+        final Cat tabbyColorCatBar = new Cat("Bar", 8, Color.TABBY);
+
+        insertEntitiesForTest(Arrays.asList(tabbyColorCatFoo, tabbyColorCatBar));
+
+        final long actualTabbyCatCount = query().from(cat)
+                                                .select(catEntity.name.count())
+                                                .groupBy(catEntity.color)
+                                                .having(catEntity.name.count().eq(2L))
+                                                .fetchOne();
+
+        removeEntitiesForTest(Arrays.asList(tabbyColorCatFoo, tabbyColorCatBar));
+
+        assertEquals(expectedTabbyCatCount, actualTabbyCatCount);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPATest.java
new file mode 100644
index 0000000000..ee1f0149b4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPATest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import javax.persistence.EntityManager;
+
+/**
+ *
+ * @author Shredder121
+ */
+public interface JPATest {
+
+    void setEntityManager(EntityManager entityManager);
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java
new file mode 100644
index 0000000000..14133534b1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.impl.JPAQuery;
+
+public class JPQLQueryTest {
+
+    private QCat cat = QCat.cat;
+
+    private HibernateQuery<?> query = new HibernateQuery<Void>();
+
+    @Before
+    public void setUp() {
+        query.from(cat);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void innerJoinPEntityOfPPEntityOfP() {
+        query.innerJoin(cat.mate, cat.mate);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void innerJoinPathOfQextendsCollectionOfPPathOfP() {
+        query.innerJoin(cat.kittens, cat.mate);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void joinPEntityOfPPEntityOfP() {
+        query.join(cat.mate, cat.mate);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void joinPathOfQextendsCollectionOfPPathOfP() {
+        query.join(cat.kittens, cat.mate);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void leftJoinPEntityOfPPEntityOfP() {
+        query.leftJoin(cat.mate, cat.mate);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void leftJoinPathOfQextendsCollectionOfPPathOfP() {
+        query.leftJoin(cat.kittens, cat.mate);
+    }
+
+    @Test
+    public void toString_() {
+        assertEquals("", new HibernateQuery<Void>().toString());
+        assertEquals("", new JPAQuery<Void>().toString());
+        assertEquals("select cat", new HibernateQuery<Void>().select(cat).toString());
+        assertEquals("select cat", new JPAQuery<Void>().select(cat).toString());
+        assertEquals("select cat\nfrom Cat cat", new HibernateQuery<Void>().from(cat).toString());
+        assertEquals("select cat\nfrom Cat cat", new JPAQuery<Void>().from(cat).toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java
new file mode 100644
index 0000000000..e50a621f4e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.JPAExpressions.selectOne;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.domain.QAnimal;
+import com.querydsl.core.domain.QCat;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.jpa.domain.JobFunction;
+import com.querydsl.jpa.domain.Location;
+import com.querydsl.jpa.domain.QDomesticCat;
+import com.querydsl.jpa.domain.QEmployee;
+
+public class JPQLSerializerTest {
+
+    @Test
+    public void and_or() {
+        //A.a.id.eq(theId).and(B.b.on.eq(false).or(B.b.id.eq(otherId)));
+        QCat cat = QCat.cat;
+        Predicate pred = cat.id.eq(1).and(cat.name.eq("Kitty").or(cat.name.eq("Boris")));
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.handle(pred);
+        assertEquals("cat.id = ?1 and (cat.name = ?2 or cat.name = ?3)", serializer.toString());
+        assertEquals("cat.id = 1 && (cat.name = Kitty || cat.name = Boris)", pred.toString());
+    }
+
+    @Test
+    public void case1() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(JPQLTemplates.DEFAULT);
+        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(2)
+                .when(cat.toes.eq(3)).then(3)
+                .otherwise(4);
+        serializer.handle(expr);
+        assertEquals("case when (cat.toes = ?1) then ?2 when (cat.toes = ?3) then ?4 else ?5 end", serializer.toString());
+    }
+
+    @Test
+    public void case1_hibernate() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(2)
+                .when(cat.toes.eq(3)).then(3)
+                .otherwise(4);
+        serializer.handle(expr);
+        assertEquals("case when (cat.toes = ?1) then ?2 when (cat.toes = ?3) then ?4 else 4 end", serializer.toString());
+    }
+
+    @Test
+    public void case2() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(JPQLTemplates.DEFAULT);
+        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(cat.id.multiply(2))
+                .when(cat.toes.eq(3)).then(cat.id.multiply(3))
+                .otherwise(4);
+        serializer.handle(expr);
+        assertEquals("case when (cat.toes = ?1) then (cat.id * ?2) when (cat.toes = ?3) then (cat.id * ?4) else ?5 end", serializer.toString());
+    }
+
+    @Test
+    public void case2_hibernate() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        Expression<?> expr = Expressions.cases().when(cat.toes.eq(2)).then(cat.id.multiply(2))
+                .when(cat.toes.eq(3)).then(cat.id.multiply(3))
+                .otherwise(4);
+        serializer.handle(expr);
+        assertEquals("case when (cat.toes = ?1) then (cat.id * ?2) when (cat.toes = ?3) then (cat.id * ?4) else 4 end", serializer.toString());
+    }
+
+    @Test
+    public void count() {
+        QCat cat = QCat.cat;
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.setProjection(cat.mate.countDistinct());
+        JPQLSerializer serializer1 = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer1.serialize(md, true, null);
+        assertEquals("select count(count(distinct cat.mate))\n" +
+                "from Cat cat",  serializer1.toString());
+
+        JPQLSerializer serializer2 = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer2.serialize(md, false, null);
+        assertEquals("select count(distinct cat.mate)\n" +
+                "from Cat cat", serializer2.toString());
+    }
+
+    @Test
+    public void fromWithCustomEntityName() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        EntityPath<Location> entityPath = new EntityPathBase<Location>(Location.class, "entity");
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, entityPath);
+        serializer.serialize(md, false, null);
+        assertEquals("select entity\nfrom Location2 entity", serializer.toString());
+    }
+
+    @Test
+    public void join_with() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addJoin(JoinType.INNERJOIN, cat.mate);
+        md.addJoinCondition(cat.mate.alive);
+        serializer.serialize(md, false, null);
+        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate with cat.mate.alive", serializer.toString());
+    }
+
+    @Test
+    public void normalizeNumericArgs() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        NumberPath<Double> doublePath = Expressions.numberPath(Double.class, "doublePath");
+        serializer.handle(doublePath.add(1));
+        serializer.handle(doublePath.between((float) 1.0, 1L));
+        serializer.handle(doublePath.lt((byte) 1));
+        for (Object constant : serializer.getConstants()) {
+            assertEquals(Double.class, constant.getClass());
+        }
+    }
+
+    @Test
+    public void delete_clause_uses_dELETE_fROM() {
+        QEmployee employee = QEmployee.employee;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, employee);
+        md.addWhere(employee.lastName.isNull());
+        serializer.serializeForDelete(md);
+        assertEquals("delete from Employee employee\nwhere employee.lastName is null", serializer.toString());
+    }
+
+    @Test
+    public void delete_with_subQuery() {
+        QCat parent = QCat.cat;
+        QCat child = new QCat("kitten");
+
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, child);
+        md.addWhere(
+            child.id.eq(1)
+            .and(selectOne()
+                .from(parent)
+                .where(parent.id.eq(2), child.in(parent.kittens)).exists()));
+        serializer.serializeForDelete(md);
+        assertEquals("delete from Cat kitten\n" +
+                "where kitten.id = ?1 and exists (select 1\n" +
+            "from Cat cat\nwhere cat.id = ?2 and kitten member of cat.kittens)", serializer.toString());
+    }
+
+    @Test
+    public void in() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.handle(Expressions.numberPath(Integer.class, "id").in(Arrays.asList(1, 2)));
+        assertEquals("id in (?1)", serializer.toString());
+    }
+
+    @Test
+    public void not_in() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.handle(Expressions.numberPath(Integer.class, "id").notIn(Arrays.asList(1, 2)));
+        assertEquals("id not in (?1)", serializer.toString());
+    }
+
+    @Test
+    public void like() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.handle(Expressions.stringPath("str").contains("abc!"));
+        assertEquals("str like ?1 escape '!'", serializer.toString());
+        assertEquals("%abc!!%", serializer.getConstants().get(0).toString());
+    }
+
+    @Test
+    public void stringContainsIc() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.handle(Expressions.stringPath("str").containsIgnoreCase("ABc!"));
+        assertEquals("lower(str) like ?1 escape '!'", serializer.toString());
+        assertEquals("%abc!!%", serializer.getConstants().get(0).toString());
+    }
+
+    @Test
+    public void substring() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QCat cat = QCat.cat;
+        serializer.handle(cat.name.substring(cat.name.length().subtract(1), 1));
+        assertEquals("substring(cat.name,length(cat.name) + ?1,?2 - (length(cat.name) - ?3))", serializer.toString());
+    }
+
+    @Test
+    public void nullsFirst() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addOrderBy(cat.name.asc().nullsFirst());
+        serializer.serialize(md, false, null);
+        assertEquals("select cat\n" +
+                 "from Cat cat\n" +
+                 "order by cat.name asc nulls first", serializer.toString());
+    }
+
+    @Test
+    public void nullsLast() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addOrderBy(cat.name.asc().nullsLast());
+        serializer.serialize(md, false, null);
+        assertEquals("select cat\n" +
+                     "from Cat cat\n" +
+                     "order by cat.name asc nulls last", serializer.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void treat() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addJoin(JoinType.JOIN, cat.mate.as((Path) QDomesticCat.domesticCat));
+        md.setProjection(QDomesticCat.domesticCat);
+        serializer.serialize(md, false, null);
+        assertEquals("select domesticCat\n" +
+                "from Cat cat\n" +
+                "  inner join treat(cat.mate as DomesticCat) as domesticCat", serializer.toString());
+    }
+
+    @Test
+    public void treated_path() {
+        QAnimal animal = QAnimal.animal;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, animal);
+
+        md.addWhere(JPAExpressions.treat(animal, QCat.class).breed.eq(1));
+        md.setProjection(animal);
+        serializer.serialize(md, false, null);
+        assertEquals("select animal\n" +
+                "from Animal animal\n" +
+                "where treat(animal as Cat).breed = ?1", serializer.toString());
+    }
+
+    @Test
+    public void openJPA_variables() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(OpenJPATemplates.DEFAULT);
+        QueryMetadata md = new DefaultQueryMetadata();
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addJoin(JoinType.INNERJOIN, cat.mate);
+        md.addJoinCondition(cat.mate.alive);
+        serializer.serialize(md, false, null);
+        assertEquals("select cat_\nfrom Cat cat_\n  inner join cat_.mate on cat_.mate.alive",
+                serializer.toString());
+    }
+
+    @Test
+    public void visitLiteral_boolean() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.visitLiteral(Boolean.TRUE);
+        assertEquals("true", serializer.toString());
+    }
+
+    @Test
+    public void visitLiteral_number() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.visitLiteral(1.543);
+        assertEquals("1.543", serializer.toString());
+    }
+
+    @Test
+    public void visitLiteral_string() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.visitLiteral("abc''def");
+        assertEquals("'abc''''def'", serializer.toString());
+    }
+
+    @Test
+    public void visitLiteral_enum() {
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        serializer.visitLiteral(JobFunction.MANAGER);
+        assertEquals("com.querydsl.jpa.domain.JobFunction.MANAGER", serializer.toString());
+    }
+
+    @Test
+    public void substring_indexOf() {
+        QCat cat = QCat.cat;
+        JPQLSerializer serializer = new JPQLSerializer(HQLTemplates.DEFAULT);
+        cat.name.substring(cat.name.indexOf("")).accept(serializer, null);
+        assertEquals("substring(cat.name,locate(?1,cat.name)-1 + ?2)", serializer.toString());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java
new file mode 100644
index 0000000000..a1cafe64ec
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java
@@ -0,0 +1,85 @@
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Templates;
+import com.querydsl.core.types.TemplatesTestUtils;
+
+public class JPQLTemplatesTest {
+
+    @Test
+    public void escape() {
+        List<Templates> templates = Arrays.<Templates>asList(
+            new JPQLTemplates(), new HQLTemplates(),
+            new EclipseLinkTemplates(), new OpenJPATemplates()
+        );
+
+        for (Templates t : templates) {
+            assertEquals("{0} like {1} escape '!'", t.getTemplate(Ops.LIKE).toString());
+        }
+    }
+
+    @Test
+    public void custom_escape() {
+        List<Templates> templates = Arrays.<Templates>asList(
+            new JPQLTemplates('X'), new HQLTemplates('X'),
+            new EclipseLinkTemplates('X'), new OpenJPATemplates('X')
+        );
+
+        for (Templates t : templates) {
+            assertEquals("{0} like {1} escape 'X'", t.getTemplate(Ops.LIKE).toString());
+        }
+    }
+
+    @Test
+    public void precedence() {
+        // Navigation operator (.)
+        // +, - unary *,
+        int p1 = getPrecedence(Ops.NEGATE);
+        // / multiplication and division
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV);
+        // +, - addition and subtraction
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        // Comparison operators : =, >, >=, <, <=, <> (not equal), [NOT] BETWEEN, [NOT] LIKE, [NOT] IN, IS [NOT] NULL, IS [NOT] EMPTY, [NOT] MEMBER [OF]
+        int p4 = getPrecedence(Ops.EQ, Ops.GT, Ops.GOE, Ops.LT, Ops.LOE, Ops.NE, Ops.BETWEEN, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.IN,
+                Ops.IS_NULL, Ops.IS_NOT_NULL, JPQLOps.MEMBER_OF, JPQLOps.NOT_MEMBER_OF);
+        // NOT
+        int p5 = getPrecedence(Ops.NOT);
+        // AND
+        int p6 = getPrecedence(Ops.AND);
+        // OR
+        int p7 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+    }
+
+    protected int getPrecedence(Operator... ops) {
+        int precedence = JPQLTemplates.DEFAULT.getPrecedence(ops[0]);
+        for (int i = 1; i < ops.length; i++) {
+            assertEquals(ops[i].name(), precedence, JPQLTemplates.DEFAULT.getPrecedence(ops[i]));
+        }
+        return precedence;
+    }
+
+    @Test
+    public void generic_precedence() {
+        for (JPQLTemplates templates : Arrays.asList(
+                JPQLTemplates.DEFAULT, HQLTemplates.DEFAULT, EclipseLinkTemplates.DEFAULT)) {
+            TemplatesTestUtils.testPrecedence(templates);
+        }
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java
new file mode 100644
index 0000000000..073eb13172
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+public class JoinFlagsTest extends AbstractQueryTest {
+
+    @Test
+    public void fetchAll() {
+        QueryHelper query1 = query().from(cat).fetchAll().where(cat.name.isNotNull());
+        assertEquals("select cat\nfrom Cat cat fetch all properties\nwhere cat.name is not null", query1.toString());
+    }
+
+    @Test
+    public void fetchAll2() {
+        QueryHelper query2 = query().from(cat).fetchAll().from(cat1).fetchAll();
+        assertEquals("select cat\nfrom Cat cat fetch all properties, Cat cat1 fetch all properties", query2.toString());
+    }
+
+    @Test
+    public void fetch() {
+        QueryHelper query = query().from(cat).innerJoin(cat.mate, cat1).fetchJoin();
+        assertEquals("select cat\nfrom Cat cat\n  inner join fetch cat.mate as cat1", query.toString());
+    }
+
+    @Test
+    public void rightJoin() {
+        QueryHelper query = query().from(cat).rightJoin(cat.mate, cat1);
+        assertEquals("select cat\nfrom Cat cat\n  right join cat.mate as cat1", query.toString());
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java
new file mode 100644
index 0000000000..60a8be2362
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.jpa.JPAExpressions.selectOne;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.alias.Alias;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+
+public class JoinTest {
+
+    public interface Entity {
+
+        List<String> getNames();
+    }
+
+    private final Entity alias = Alias.alias(Entity.class);
+
+    private final StringPath path = Expressions.stringPath("path");
+    private final JPQLQuery<?> subQuery = selectOne();
+    private final HibernateQuery<?> query = new HibernateQuery<Void>(new DummySessionHolder(), HQLTemplates.DEFAULT);
+
+    @Test
+    public void subQuery_innerJoin() {
+        subQuery.from($(alias));
+        subQuery.innerJoin($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+    @Test
+    public void subQuery_join() {
+        subQuery.from($(alias));
+        subQuery.join($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+    @Test
+    public void subQuery_leftJoin() {
+        subQuery.from($(alias));
+        subQuery.leftJoin($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+    @Test
+    public void query_innerJoin() {
+        query.from($(alias));
+        query.innerJoin($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+    @Test
+    public void query_join() {
+        query.from($(alias));
+        query.join($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+    @Test
+    public void query_leftJoin() {
+        query.from($(alias));
+        query.leftJoin($(alias.getNames()), path);
+        // TODO : assertions
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java
new file mode 100644
index 0000000000..3d405a3954
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.jpa.impl.JPAQuery;
+
+public class MapOperationsTest extends AbstractQueryTest {
+
+    @Test
+    public void map_with_groupBy() {
+        assertEquals("select show_acts_0\nfrom Show show\n  left join show.acts as show_acts_0 on key(show_acts_0) = ?1\ngroup by show_acts_0", new JPAQuery<Void>().from(show).select(show.acts.get("A")).groupBy(show.acts.get("A")).toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java
new file mode 100644
index 0000000000..3fdcf8fc7e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.jpa.domain.QCat;
+
+public class MathTest extends AbstractQueryTest {
+
+    @Test
+    public void test() {
+        NumberPath<Double> path = QCat.cat.bodyWeight;
+        assertToString("(cat.bodyWeight - sum(cat.bodyWeight)) * cat.bodyWeight", path.subtract(path.sum()).multiply(path));
+    }
+
+    @Test
+    public void add() {
+        assertToString("cat.bodyWeight + ?1", cat.bodyWeight.add(10));
+    }
+
+    @Test
+    public void subtract() {
+        assertToString("cat.bodyWeight - ?1", cat.bodyWeight.subtract(10));
+    }
+
+    @Test
+    public void multiply() {
+        assertToString("cat.bodyWeight * ?1", cat.bodyWeight.multiply(10));
+    }
+
+    @Test
+    public void divide() {
+        assertToString("cat.bodyWeight / ?1", cat.bodyWeight.divide(10));
+    }
+
+    @Test
+    public void add_and_compare() {
+        assertToString("cat.bodyWeight + ?1 < ?2", cat.bodyWeight.add(10.0).lt(10.0));
+    }
+
+    @Test
+    public void subtract_and_compare() {
+        assertToString("cat.bodyWeight - ?1 < ?2", cat.bodyWeight.subtract(10.0).lt(10.0));
+    }
+
+    @Test
+    public void multiply_and_compare() {
+        assertToString("cat.bodyWeight * ?1 < ?2", cat.bodyWeight.multiply(10.0).lt(10.0));
+    }
+
+    @Test
+    public void divide_and_compare() {
+        assertToString("cat.bodyWeight / ?1 < ?2", cat.bodyWeight.divide(10.0).lt(20.0));
+    }
+
+    @Test
+    public void add_and_multiply() {
+        assertToString("(cat.bodyWeight + ?1) * ?2", cat.bodyWeight.add(10).multiply(20));
+    }
+
+    @Test
+    public void subtract_and_multiply() {
+        assertToString("(cat.bodyWeight - ?1) * ?2", cat.bodyWeight.subtract(10).multiply(20));
+    }
+
+
+    @Test
+    public void multiply_and_add() {
+        assertToString("cat.bodyWeight * ?1 + ?2", cat.bodyWeight.multiply(10).add(20));
+    }
+
+
+    @Test
+    public void multiply_and_subtract() {
+        assertToString("cat.bodyWeight * ?1 - ?2", cat.bodyWeight.multiply(10).subtract(20));
+    }
+
+
+    @Test
+    public void arithmetic_and_arithmetic2() {
+        QCat c1 = new QCat("c1");
+        QCat c2 = new QCat("c2");
+        QCat c3 = new QCat("c3");
+        assertToString("c1.id + c2.id * c3.id", c1.id.add(c2.id.multiply(c3.id)));
+        assertToString("c1.id * (c2.id + c3.id)", c1.id.multiply(c2.id.add(c3.id)));
+        assertToString("(c1.id + c2.id) * c3.id", c1.id.add(c2.id).multiply(c3.id));
+    }
+
+    @Test
+    public void mathematicalOperations() {
+        // mathematical operators +, -, *, /
+        cat.bodyWeight.add(kitten.bodyWeight);
+        cat.bodyWeight.subtract(kitten.bodyWeight);
+        cat.bodyWeight.multiply(kitten.bodyWeight);
+        cat.bodyWeight.divide(kitten.bodyWeight);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java
new file mode 100644
index 0000000000..e01433cedb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java
@@ -0,0 +1,34 @@
+package com.querydsl.jpa;
+
+import com.querydsl.core.Target;
+import com.querydsl.sql.*;
+
+/**
+ * @author tiwe
+ *
+ */
+public final class Mode {
+
+    public static final ThreadLocal<String> mode = new ThreadLocal<String>();
+
+    public static final ThreadLocal<Target> target = new ThreadLocal<Target>();
+
+    public static SQLTemplates getSQLTemplates() {
+        switch (target.get()) {
+        case CUBRID:    return new CUBRIDTemplates();
+        case DERBY:     return new DerbyTemplates();
+        case H2:        return new H2Templates();
+        case HSQLDB:    return new HSQLDBTemplates();
+        case SQLSERVER: return new SQLServer2008Templates();
+        case MYSQL:     return new MySQLTemplates();
+        case ORACLE:    return new OracleTemplates();
+        case POSTGRESQL: return new PostgreSQLTemplates();
+        case SQLITE:    return new SQLiteTemplates();
+        case TERADATA:  return new TeradataTemplates();
+        }
+        throw new IllegalStateException("Unknown mode " + mode);
+    }
+
+    private Mode() { }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java
new file mode 100644
index 0000000000..5cbf27f6ac
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.persistence.Column;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.MySQLTemplates;
+
+
+public class NativeSQLSerializerTest {
+
+    public static class Entity {
+        @Column
+        private String name;
+
+        @Column(name = "first_name")
+        private String firstName;
+    }
+
+    @Test
+    public void in() {
+        Configuration conf = new Configuration(new MySQLTemplates());
+        NativeSQLSerializer serializer = new NativeSQLSerializer(conf, true);
+        DefaultQueryMetadata md = new DefaultQueryMetadata();
+        SAnimal cat = SAnimal.animal_;
+        md.addJoin(JoinType.DEFAULT, cat);
+        md.addWhere(cat.name.in("X", "Y"));
+        md.setProjection(cat.id);
+        serializer.serialize(md, false);
+        assertEquals("select animal_.id\n" +
+            "from animal_ animal_\n" +
+            "where animal_.name in (?1, ?2)", serializer.toString());
+    }
+
+    @Test
+    public void path_column() {
+        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class,"entity");
+        Configuration conf = new Configuration(new MySQLTemplates());
+        NativeSQLSerializer serializer = new NativeSQLSerializer(conf, true);
+        serializer.handle(entity.get("name"));
+        assertEquals("entity.name", serializer.toString());
+    }
+
+    @Test
+    public void path_column2() {
+        PathBuilder<Entity> entity = new PathBuilder<Entity>(Entity.class,"entity");
+        Configuration conf = new Configuration(new MySQLTemplates());
+        NativeSQLSerializer serializer = new NativeSQLSerializer(conf, true);
+        serializer.handle(entity.get("firstName"));
+        assertEquals("entity.first_name", serializer.toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/NoBatooJPA.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoBatooJPA.java
new file mode 100644
index 0000000000..70951b4fd2
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoBatooJPA.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface NoBatooJPA {
+
+    com.querydsl.core.Target[] value() default {};
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/NoEclipseLink.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoEclipseLink.java
new file mode 100644
index 0000000000..b19f206c14
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoEclipseLink.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface NoEclipseLink {
+
+    com.querydsl.core.Target[] value() default {};
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/NoHibernate.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoHibernate.java
new file mode 100644
index 0000000000..93d8537136
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoHibernate.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface NoHibernate {
+
+    com.querydsl.core.Target[] value() default {};
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/NoOpenJPA.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoOpenJPA.java
new file mode 100644
index 0000000000..a38d53470f
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/NoOpenJPA.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Inherited
+public @interface NoOpenJPA {
+
+    com.querydsl.core.Target[] value() default {};
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java
similarity index 79%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java
index 1423366a00..ade33aad2b 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
 
 import org.junit.Test;
 
 public class OrderExpressionsTest extends AbstractQueryTest {
 
     @Test
-    public void OrderExpressionInFunctionalWay() {
+    public void orderExpressionInFunctionalWay() {
         cat.bodyWeight.asc();
         cat.bodyWeight.add(kitten.bodyWeight).asc();
     }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelper.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelper.java
new file mode 100644
index 0000000000..eaa07578ff
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelper.java
@@ -0,0 +1,60 @@
+package com.querydsl.jpa;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.dsl.PathBuilder;
+
+public final class OrderHelper {
+
+    private OrderHelper() { }
+
+    private static final Pattern DOT = Pattern.compile("\\.");
+
+    @SuppressWarnings("unchecked")
+    public static PathBuilder<?> join(JPQLQuery<?> query, PathBuilder<?> builder, Map<String, PathBuilder<?>> joins, String path) {
+        PathBuilder<?> rv = joins.get(path);
+        if (rv == null) {
+            if (path.contains(".")) {
+                String[] tokens = DOT.split(path);
+                String[] parent = new String[tokens.length - 1];
+                System.arraycopy(tokens, 0, parent, 0, tokens.length - 1);
+                String parentKey = StringUtils.join(parent, ".");
+                builder = join(query, builder, joins, parentKey);
+                rv = new PathBuilder(Object.class, StringUtils.join(tokens, "_"));
+                query.leftJoin((EntityPath) builder.get(tokens[tokens.length - 1]), rv);
+            } else {
+                rv = new PathBuilder(Object.class, path);
+                query.leftJoin((EntityPath) builder.get(path), rv);
+            }
+            joins.put(path, rv);
+        }
+        return rv;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void orderBy(JPQLQuery<?> query, EntityPath<?> entity, List<String> order) {
+        PathBuilder<?> builder = new PathBuilder(entity.getType(), entity.getMetadata());
+        Map<String, PathBuilder<?>> joins = new HashMap<>();
+
+        for (String entry : order) {
+            String[] tokens = DOT.split(entry);
+            if (tokens.length > 1) {
+                String[] parent = new String[tokens.length - 1];
+                System.arraycopy(tokens, 0, parent, 0, tokens.length - 1);
+                PathBuilder<?> parentAlias = join(query, builder, joins, StringUtils.join(parent, "."));
+                query.orderBy(parentAlias.getString(tokens[tokens.length - 1]).asc());
+            } else {
+                query.orderBy(builder.getString(tokens[0]).asc());
+            }
+        }
+    }
+
+}
+
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java
new file mode 100644
index 0000000000..8891580ed8
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java
@@ -0,0 +1,42 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.JPAExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.PathBuilder;
+
+public class OrderHelperTest {
+
+    @Test
+    public void order() {
+        PathBuilder<Object> entity = new PathBuilder<Object>(Object.class, "project");
+        List<String> order = new ArrayList<>();
+        order.add("customer.name");
+        order.add("department.superior.name");
+        order.add("customer.company.name");
+        order.add("previousProject.customer.company.name");
+        order.add("department.name");
+
+        JPQLQuery<?> query = select(entity);
+        query.from(entity);
+        OrderHelper.orderBy(query, entity, order);
+        assertEquals("select project\n" +
+            "from Object project\n" +
+            "  left join project.customer as customer\n" +
+            "  left join project.department as department\n" +
+            "  left join department.superior as department_superior\n" +
+            "  left join customer.company as customer_company\n" +
+            "  left join project.previousProject as previousProject\n" +
+            "  left join previousProject.customer as previousProject_customer\n" +
+            "  left join previousProject_customer.company as previousProject_customer_company\n" +
+            "order by customer.name asc, department_superior.name asc, customer_company.name asc," +
+                " previousProject_customer_company.name asc, department.name asc",
+            query.toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java
new file mode 100644
index 0000000000..961139ff4c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Scanner;
+
+import javax.persistence.Entity;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.apt.hibernate.HibernateAnnotationProcessor;
+import com.querydsl.apt.jpa.JPAAnnotationProcessor;
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.core.types.Expression;
+
+public class PackageVerification {
+
+    @Test
+    public void verify_package() throws Exception {
+        String version = System.getProperty("version");
+        verify(new File("target/querydsl-jpa-" + version + "-apt-hibernate-one-jar.jar"), true);
+        verify(new File("target/querydsl-jpa-" + version + "-apt-one-jar.jar"), false);
+    }
+
+    private void verify(File oneJar, boolean hibernateDeps) throws Exception {
+        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
+        // verify classLoader
+        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
+        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
+        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
+        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
+        oneJarClassLoader.loadClass(Entity.class.getName()); // jpa
+        Class<?> processor;
+        if (hibernateDeps) {
+            oneJarClassLoader.loadClass(org.hibernate.annotations.Type.class.getName()); // hibernate
+            processor = HibernateAnnotationProcessor.class;
+        } else {
+            processor = JPAAnnotationProcessor.class;
+        }
+        Class cl = oneJarClassLoader.loadClass(processor.getName()); // querydsl-apt
+        cl.newInstance();
+        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
+        assertEquals(processor.getName(), new Scanner(oneJarClassLoader.findResource(resourceKey).openStream()).nextLine());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java
new file mode 100644
index 0000000000..fb8bcd74d0
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java
@@ -0,0 +1,719 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.core.alias.Alias.$;
+import static com.querydsl.core.alias.Alias.alias;
+import static com.querydsl.jpa.JPAExpressions.select;
+import static com.querydsl.jpa.JPAExpressions.selectFrom;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.dsl.ComparableExpression;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.jpa.domain.*;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+public class ParsingTest extends AbstractQueryTest {
+
+    @Test
+    @Ignore
+    public void arrayExpr() throws Exception {
+        query().from(ord).where(ord.items(0).id.eq(1234L)).parse();
+    }
+
+    @Test
+    public void basic() throws RecognitionException, TokenStreamException {
+        query().from(cat, fatcat).select(cat.name, fatcat.name).parse();
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void beforeAndAfter() throws RecognitionException, TokenStreamException {
+        ComparableExpression<java.util.Date> ed = catalog.effectiveDate;
+        query()
+            .from(catalog)
+            .where(
+                ed.gt(DateExpression.currentDate()),
+                ed.goe(DateExpression.currentDate()),
+                ed.lt(DateExpression.currentDate()),
+                ed.loe(DateExpression.currentDate()))
+            .select(catalog).parse();
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void complexConstructor() throws Exception {
+        query().from(bar).select(new QFooDTO(bar.count())).parse();
+    }
+
+    @Test
+    public void docoExamples910() throws Exception {
+        query().from(cat)
+               .groupBy(cat.color)
+               .select(cat.color, cat.weight.sum(), cat.count()).parse();
+    }
+
+    @Test
+    public void docoExamples910_2() throws Exception {
+        query().from(cat)
+               .groupBy(cat.color)
+               .having(cat.color.in(Color.TABBY, Color.BLACK))
+               .select(cat.color, cat.weight.sum(), cat.count()).parse();
+    }
+
+    @Test
+    @Ignore
+    public void docoExamples910_3() throws Exception {
+        query().from(cat).join(cat.kittens, kitten)
+               .groupBy(cat)
+               .having(kitten.weight.avg().gt(100.0))
+               .orderBy(kitten.count().asc(), kitten.weight.sum().desc())
+               .select(cat)
+               .parse();
+    }
+
+    @Test
+    public void docoExamples911() throws Exception {
+        query().from(fatcat).where(
+                fatcat.weight.gt(select(cat.weight.avg()).from(cat)))
+                .parse();
+    }
+
+    @Test
+    public void docoExamples911_2() throws Exception {
+        query().from(cat).where(
+                cat.name.eqAny(select(name.nickName).from(name)))
+                .parse();
+    }
+
+    @Test
+    public void docoExamples911_3() throws Exception {
+        query().from(cat).where(
+                select(mate).from(mate).where(mate.mate.eq(cat)).notExists())
+                .parse();
+    }
+
+    @Test
+    public void docoExamples911_4() throws Exception {
+        query().from(cat).where(
+                selectFrom(mate).where(mate.mate.eq(cat)).exists())
+                .parse();
+    }
+
+    @Test
+    public void docoExamples911_5() throws Exception {
+        query().from(cat).where(
+                cat.name.notIn(select(name.nickName).from(name)))
+                .parse();
+    }
+
+    @Test
+    public void docoExamples912() throws Exception {
+        query().from(ord, cust)
+                .join(ord.lineItems, item).join(item.product, product)
+                .from(catalog).join(catalog.prices, price).where(
+                        ord.paid.not().and(ord.customer.eq(cust)).and(
+                                price.product.eq(product)).and(
+                                catalog.effectiveDate.gt(DateExpression.currentDate())).and(
+                                catalog.effectiveDate.gtAny(
+                                        select(catalog.effectiveDate).from(catalog).where(
+                                                catalog.effectiveDate.lt(DateExpression.currentDate())))))
+                .groupBy(ord).having(price.amount.sum().gt(0L))
+                .orderBy(price.amount.sum().desc())
+                .select(ord.id, price.amount.sum(), item.count());
+
+        Customer c1 = new Customer();
+        Catalog c2 = new Catalog();
+
+        query().from(ord)
+               .join(ord.lineItems, item).join(item.product, product)
+               .from(catalog).join(catalog.prices, price).where(
+                        ord.paid.not().and(ord.customer.eq(c1)).and(
+                                price.product.eq(product)).and(catalog.eq(c2)))
+                .groupBy(ord).having(price.amount.sum().gt(0L))
+                .orderBy(price.amount.sum().desc())
+                .select(ord.id, price.amount.sum(), item.count());
+
+    }
+
+    @Test
+    public void docoExamples92() throws Exception {
+        query().from(cat).parse();
+    }
+
+    @Test
+    public void docoExamples92_2() throws Exception {
+        query().from(cat).parse();
+    }
+
+    @Test
+    public void docoExamples92_3() throws Exception {
+        query().from(form, param).parse();
+    }
+
+    @Test
+    public void docoExamples93() throws Exception {
+        query().from(cat).innerJoin(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();
+    }
+
+    @Test
+    public void docoExamples93_2() throws Exception {
+        query().from(cat).leftJoin(cat.mate.kittens, kitten).parse();
+    }
+
+    @Test
+    public void docoExamples93_3() throws Exception {
+        query().from(cat).join(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();
+    }
+
+    @Test
+    public void docoExamples93_4() throws Exception {
+        query().from(cat).innerJoin(cat.mate, mate).leftJoin(cat.kittens, kitten).parse();
+    }
+
+    @Test
+    public void docoExamples93_viaAlias() throws Exception {
+        Cat c = alias(Cat.class, "cat");
+        Cat k = alias(Cat.class, "kittens");
+        Cat m = alias(Cat.class, "mate");
+
+        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();
+    }
+
+    @Test
+    public void docoExamples93_viaAlias2() throws Exception {
+        Cat c = alias(Cat.class, "cat");
+        Cat k = alias(Cat.class, "kittens");
+
+        query().from($(c)).leftJoin($(c.getMate().getKittens()),$(k)).parse();
+    }
+
+    @Test
+    public void docoExamples93_viaAlias3() throws Exception {
+        Cat c = alias(Cat.class, "cat");
+        Cat k = alias(Cat.class, "kittens");
+        Cat m = alias(Cat.class, "mate");
+
+        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();
+    }
+
+    @Test
+    public void docoExamples93_viaAlias4() throws Exception {
+        Cat c = alias(Cat.class, "cat");
+        Cat k = alias(Cat.class, "kittens");
+        Cat m = alias(Cat.class, "mate");
+
+        query().from($(c)).innerJoin($(c.getMate()),$(m)).leftJoin($(c.getKittens()),$(k)).parse();
+    }
+
+    @Test
+    public void docoExamples94() throws Exception {
+        query().from(cat).innerJoin(cat.mate, mate).select(cat.mate).parse();
+    }
+
+    @Test
+    public void docoExamples94_2() throws Exception {
+        query().from(cat).select(cat.mate).parse();
+    }
+
+    @Test
+    @NoOpenJPA @NoBatooJPA
+    public void docoExamples94_3() throws Exception {
+        query().from(cat).select(cat.kittens).parse();
+    }
+
+    @Test
+    public void docoExamples94_4() throws Exception {
+        query().from(cust).select(cust.name.firstName).parse();
+    }
+
+    @Test
+    public void docoExamples94_5() throws Exception {
+        query().from(mother)
+        .innerJoin(mother.mate, mate)
+        .leftJoin(mother.kittens, offspr)
+        .select(mother, offspr, mate).parse();
+    }
+
+    @Test
+    public void docoExamples94_6() throws Exception {
+        query().from(mother)
+        .innerJoin(mother.mate, mate)
+        .leftJoin(mother.kittens, kitten)
+        .select(new QFamily(mother, mate, kitten)).parse();
+    }
+
+    @Test
+    public void docoExamples95() throws Exception {
+        query().from(cat)
+               .select(cat.weight.avg(), cat.weight.sum(), cat.weight.max(), cat.count())
+               .parse();
+    }
+
+    @Test
+    public void docoExamples96() throws Exception {
+        query().from(cat).parse();
+    }
+
+    @Test
+    public void docoExamples96_2() throws Exception {
+        query().from(m, n).where(n.name.eq(m.name)).parse();
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void docoExamples97() throws Exception {
+        query().from(foo, bar).where(foo.startDate.eq(bar.date)).select(foo).parse();
+    }
+
+    @Test
+    public void docoExamples97_2() throws Exception {
+        query().from(cat).where(cat.mate.name.isNotNull()).parse();
+    }
+
+    @Test
+    public void docoExamples97_3() throws Exception {
+        query().from(cat, rival).where(cat.mate.eq(rival.mate)).parse();
+    }
+
+    @Test
+    public void docoExamples97_4() throws Exception {
+        query().from(cat, mate).where(cat.mate.eq(mate)).select(cat, mate).parse();
+    }
+
+    @Test
+    public void docoExamples97_5() throws Exception {
+        query().from(cat).where(cat.id.eq(123)).parse();
+    }
+
+    @Test
+    public void docoExamples97_6() throws Exception {
+        query().from(cat).where(cat.mate.id.eq(69)).parse();
+    }
+
+    @Test
+    public void docoExamples97_7() throws Exception {
+        query().from(person).where(
+                person.pid.country.eq("AU"),
+                person.pid.medicareNumber.eq(123456)).parse();
+    }
+
+    @Test
+    public void docoExamples97_8() throws Exception {
+        query().from(account).where(account.owner.pid.medicareNumber.eq(123456)).parse();
+    }
+
+    @Test
+    public void docoExamples97_9() throws Exception {
+        query().from(cat).where(cat.instanceOf(DomesticCat.class)).parse();
+    }
+
+    @Test
+    @Ignore
+    //@NoEclipseLink
+    public void docoExamples97_10() throws Exception {
+        query().from(log, payment).where(
+                log.item.instanceOf(Payment.class),
+                log.item.id.eq(payment.id)).parse();
+    }
+
+    @Test
+    public void docoExamples97_10_2() throws Exception {
+        query().from(log, payment).innerJoin(log.item, item).where(
+                item.instanceOf(Payment.class),
+                item.id.eq(payment.id)).parse();
+    }
+
+    @Test
+    public void docoExamples98_1() throws Exception {
+        query().from(cat).where(cat.name.between("A", "B")).parse();
+    }
+
+    @Test
+    public void docoExamples98_2() throws Exception {
+        query().from(cat).where(cat.name.in("Foo", "Bar", "Baz")).parse();
+    }
+
+    @Test
+    public void docoExamples98_3() throws Exception {
+        query().from(cat).where(cat.name.notBetween("A", "B")).parse();
+    }
+
+    @Test
+    public void docoExamples98_4() throws Exception {
+        query().from(cat).where(cat.name.notIn("Foo", "Bar", "Baz")).parse();
+    }
+
+    @Test
+    public void docoExamples98_5() throws Exception {
+        query().from(cat).where(cat.kittens.size().gt(0)).parse();
+    }
+
+    @Test
+    public void docoExamples98_6() throws Exception {
+        query().from(mother, kit).select(mother).where(kit.in(mother.kittens)).parse();
+    }
+
+    @Test
+    @NoEclipseLink
+    public void docoExamples98_7() throws Exception {
+        query().from(list, p).select(p).where(p.name.eqAny(list.names)).parse();
+    }
+
+    @Test
+    public void docoExamples98_8() throws Exception {
+        query().from(cat).where(cat.kittens.isNotEmpty()).parse();
+    }
+
+    @Test
+    public void docoExamples98_9() throws Exception {
+        query().from(person, calendar).select(person).where(
+                calendar.holidays("national holiday").eq(person.birthDay),
+                person.nationality.calendar.eq(calendar)).parse();
+    }
+
+    @Test
+    @ExcludeIn({DERBY, HSQLDB, ORACLE})
+    public void docoExamples98_10() throws Exception {
+        query().from(item, ord).select(item).where(
+                ord.items(ord.deliveredItemIndices(0)).eq(item),
+                ord.id.eq(1L)).parse();
+    }
+
+    @Test
+    @NoEclipseLink
+    @ExcludeIn({DERBY, HSQLDB, H2, MYSQL, ORACLE, POSTGRESQL})
+    @Ignore
+    public void docoExamples98_11() throws Exception {
+        query().from(item, ord).select(item).where(
+                ord.items(ord.items.size().subtract(1)).eq(item))
+                .parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    @ExcludeIn({DERBY, HSQLDB, ORACLE})
+    public void docoExamples98_12() throws Exception {
+        query()
+        .from(prod, store)
+        .innerJoin(store.customers, cust)
+        .select(cust)
+        .where(
+            prod.name.eq("widget"),
+            store.location.name.in("Melbourne", "Sydney"),
+            prod.eqAll(cust.currentOrder.lineItems))
+        .parse();
+
+    }
+
+    @Test
+    public void docoExamples98() throws Exception {
+        prod.eq(new Product());
+        prod.eq(new QProduct("p"));
+        prod.eq(new QItem("p"));
+
+    }
+
+    @Test
+    public void docoExamples99() throws Exception {
+        query().from(cat).orderBy(cat.name.asc(), cat.weight.desc(),
+                cat.birthdate.asc()).parse();
+    }
+
+    @Test
+    public void doubleLiteral() throws Exception {
+        query().from(cat).where(cat.weight.lt((int) 3.1415)).parse();
+    }
+
+    @Test
+    public void doubleLiteral2() throws Exception {
+        query().from(cat).where(cat.weight.gt((int) 3.1415e3)).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    public void fetch() throws RecognitionException, TokenStreamException {
+        query().from(cat).innerJoin(cat.mate, mate).fetchJoin().parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    public void fetch2() throws RecognitionException, TokenStreamException {
+        query().from(cat).innerJoin(cat.mate, mate).fetchJoin().fetchJoin().parse();
+    }
+
+    @Test
+    public void in() throws Exception {
+        query().from(foo).where(foo.bar.in("a", "b", "c")).parse();
+    }
+
+    @Test
+    public void notIn() throws Exception {
+        query().from(foo).where(foo.bar.notIn("a", "b", "c")).parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA
+    public void joinFlags1() throws RecognitionException, TokenStreamException {
+        query().from(cat).fetchAll().parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    public void joinFlags2() throws RecognitionException, TokenStreamException {
+        query().from(cat).fetchAll().from(cat1).fetchAll().parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA @NoBatooJPA
+    public void joinFlags3() throws RecognitionException, TokenStreamException {
+        query().from(cat).fetchAll().from(cat1).fetchAll().parse();
+    }
+
+    @Test
+    public void joins() throws RecognitionException, TokenStreamException {
+        query().from(cat).join(cat.mate, mate).select(cat).parse();
+    }
+
+    @Test
+    public void innerJoin() throws RecognitionException, TokenStreamException {
+        query().from(cat).innerJoin(cat.mate, mate).select(cat).parse();
+    }
+
+    @Test
+    public void leftJoin()  throws RecognitionException, TokenStreamException {
+        query().from(cat).leftJoin(cat.mate, mate).select(cat).parse();
+    }
+
+    @Test
+    @NoOpenJPA @NoBatooJPA
+    public void joins2() throws RecognitionException, TokenStreamException {
+        query().from(cat).join(cat.mate, mate).on(mate.name.eq("Bob")).parse();
+    }
+
+    @Test
+    public void multipleFromClasses() throws Exception {
+        query().from(qat, foo).parse();
+    }
+
+    @Test
+    public void serialization() {
+        QueryHelper query = query();
+
+        query.from(cat);
+        assertEquals("select cat\nfrom Cat cat", query.toString());
+
+        query.from(fatcat);
+        assertEquals("select cat\nfrom Cat cat, Cat fatcat", query.toString());
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA
+    @ExcludeIn(MYSQL)
+    public void casts_byte() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.byteValue()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    public void casts_double() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.doubleValue()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    @ExcludeIn(MYSQL)
+    public void casts_float() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.floatValue()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    @ExcludeIn(MYSQL)
+    public void casts_int() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.intValue()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    @ExcludeIn({DERBY, HSQLDB, MYSQL})
+    public void casts_long() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.longValue()).parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA
+    @ExcludeIn(MYSQL)
+    public void casts_short() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.shortValue()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    @ExcludeIn({DERBY, HSQLDB, MYSQL})
+    public void casts_string() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.stringValue()).parse();
+    }
+
+    @Test
+    @NoEclipseLink @NoOpenJPA
+    @ExcludeIn(MYSQL)
+    public void casts_2() throws Exception {
+        NumberExpression<Double> bw = cat.bodyWeight;
+        query().from(cat).select(bw.castToNum(Byte.class)).parse();
+    }
+
+    @Test
+    @Ignore
+    public void groupBy() throws Exception {
+        query().from(qat).groupBy(qat.breed).parse();
+    }
+
+    @Test
+    @Ignore
+    public void groupBy_2() throws Exception {
+        query().from(qat).groupBy(qat.breed, qat.eyecolor).parse();
+    }
+
+    @Test
+    public void not() throws Exception {
+        query().from(cat).where(cat.kittens.size().lt(1).not()).parse();
+    }
+
+    @Test
+    public void not_2() throws Exception {
+        query().from(cat).where(cat.kittens.size().gt(1).not()).parse();
+    }
+
+    @Test
+    public void not_3() throws Exception {
+        query().from(cat).where(cat.kittens.size().goe(1).not()).parse();
+    }
+
+    @Test
+    public void not_4() throws Exception {
+        query().from(cat).where(cat.kittens.size().loe(1).not()).parse();
+    }
+
+    @Test
+    public void not_5() throws Exception {
+        query().from(cat).where(cat.name.between("A", "B").not()).parse();
+    }
+
+    @Test
+    public void not_6() throws Exception {
+        query().from(cat).where(cat.name.notBetween("A", "B").not()).parse();
+    }
+
+    @Test
+    public void not_7() throws Exception {
+        query().from(cat).where(cat.kittens.size().loe(1).not().not()).parse();
+    }
+
+    @Test
+    public void not_8() throws Exception {
+        query().from(cat).where(cat.kittens.size().loe(1).not().not().not()).parse();
+    }
+
+
+    @Test
+    @Ignore
+    public void orderBy() throws Exception {
+        // NOT SUPPORTED
+        query().from(qat).orderBy(qat.toes.avg().asc()).parse();
+    }
+
+    @Test
+    @NoOpenJPA
+    public void orderBy_2() throws Exception {
+        query().from(an).orderBy(an.bodyWeight.sqrt().divide(2.0).asc()).parse();
+    }
+
+    @Test
+    public void select1() throws Exception {
+//        query().select(Ops.AggOps.COUNT_ALL_AGG_EXPR).from(qat).parse();
+
+        query().from(qat).select(qat.weight.avg()).parse();
+    }
+
+    @Test
+    @Ignore
+    public void sum() throws RecognitionException, TokenStreamException {
+        // NOT SUPPORTED
+        query().from(cat).select(cat.kittens.size().sum()).parse();
+    }
+
+    @Test
+    @Ignore
+    public void sum_2() throws RecognitionException, TokenStreamException {
+        // NOT SUPPORTED
+        query().from(cat).where(cat.kittens.size().sum().gt(0)).select(cat).parse();
+    }
+
+    @Test
+    public void sum_3() throws RecognitionException, TokenStreamException {
+        query().from(cat).where(cat.kittens.isEmpty()).select(cat).parse();
+    }
+
+    @Test
+    public void sum_4() throws RecognitionException, TokenStreamException {
+        query().from(cat).where(cat.kittens.isNotEmpty()).select(cat).parse();
+    }
+
+    @Test
+    public void where() throws Exception {
+        query().from(qat).where(qat.name.in("crater", "bean", "fluffy")).parse();
+    }
+
+    @Test
+    public void where_2() throws Exception {
+        query().from(qat).where(qat.name.notIn("crater", "bean", "fluffy")).parse();
+    }
+
+    @Test
+    public void where_3() throws Exception {
+        query().from(an).where(an.bodyWeight.sqrt().gt(10.0)).parse();
+    }
+
+    @Test
+    public void where_4() throws Exception {
+        query().from(an).where(an.bodyWeight.sqrt().divide(2d).gt(10.0)).parse();
+    }
+
+    @Test
+    public void where_5() throws Exception {
+        query().from(an).where(
+                an.bodyWeight.gt(10),
+                an.bodyWeight.lt(100).or(an.bodyWeight.isNull()))
+            .parse();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Person.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Person.java
new file mode 100644
index 0000000000..f3476a96b3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Person.java
@@ -0,0 +1,7 @@
+package com.querydsl.jpa;
+
+
+public class Person {
+
+    String firstName, lastName;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/Projection.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/Projection.java
new file mode 100644
index 0000000000..7db9108c7d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/Projection.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa;
+
+import com.querydsl.jpa.domain.Cat;
+
+public class Projection {
+
+    public Projection(String str, Cat cat) { }
+
+    public Projection(int i, boolean b) { }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QArticle.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QArticle.java
new file mode 100644
index 0000000000..9b48d6056d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QArticle.java
@@ -0,0 +1,55 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.PathInits;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QArticle is a Querydsl query type for Article
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QArticle extends EntityPathBase<Article> {
+
+    private static final long serialVersionUID = 1732636838L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QArticle article = new QArticle("article");
+
+    public final QPerson author;
+
+    public final QContent content;
+
+    public final StringPath name = createString("name");
+
+    public QArticle(String variable) {
+        this(Article.class, forVariable(variable), INITS);
+    }
+
+    public QArticle(Path<? extends Article> path) {
+        this(path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QArticle(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QArticle(PathMetadata metadata, PathInits inits) {
+        this(Article.class, metadata, inits);
+    }
+
+    public QArticle(Class<? extends Article> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.author = inits.isInitialized("author") ? new QPerson(forProperty("author")) : null;
+        this.content = inits.isInitialized("content") ? new QContent(forProperty("content"), inits.get("content")) : null;
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QContent.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QContent.java
new file mode 100644
index 0000000000..1ef2c49df1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QContent.java
@@ -0,0 +1,49 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QContent is a Querydsl query type for Content
+ */
+@Generated("com.querydsl.codegen.EmbeddableSerializer")
+public class QContent extends BeanPath<Content> {
+
+    private static final long serialVersionUID = -878421975L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QContent content = new QContent("content");
+
+    public final QArticle article;
+
+    public QContent(String variable) {
+        this(Content.class, forVariable(variable), INITS);
+    }
+
+    public QContent(Path<? extends Content> path) {
+        this(path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QContent(PathMetadata metadata) {
+        this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);
+    }
+
+    public QContent(PathMetadata metadata, PathInits inits) {
+        this(Content.class, metadata, inits);
+    }
+
+    public QContent(Class<? extends Content> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.article = inits.isInitialized("article") ? new QArticle(forProperty("article"), inits.get("article")) : null;
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QPerson.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QPerson.java
new file mode 100644
index 0000000000..c760fc4613
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QPerson.java
@@ -0,0 +1,40 @@
+package com.querydsl.jpa;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QPerson is a Querydsl query type for Person
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QPerson extends EntityPathBase<Person> {
+
+    private static final long serialVersionUID = -219463259L;
+
+    public static final QPerson person = new QPerson("person");
+
+    public final StringPath firstName = createString("firstName");
+
+    public final StringPath lastName = createString("lastName");
+
+    public QPerson(String variable) {
+        super(Person.class, forVariable(variable));
+    }
+
+    public QPerson(Path<? extends Person> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QPerson(PathMetadata metadata) {
+        super(Person.class, metadata);
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QProjection.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QProjection.java
new file mode 100644
index 0000000000..1c48505621
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QProjection.java
@@ -0,0 +1,25 @@
+package com.querydsl.jpa;
+
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.QCat;
+
+public class QProjection extends ConstructorExpression<Projection> {
+
+    private static final long serialVersionUID = -5866362075090550839L;
+
+    public QProjection(StringExpression str, QCat cat) {
+        super(Projection.class,
+                new Class<?>[]{String.class, Cat.class}, new Expression[]{str, cat});
+    }
+
+    public QProjection(NumberExpression<Integer> i, BooleanExpression b) {
+        super(Projection.class,
+                new Class<?>[]{int.class, boolean.class}, new Expression[]{i, b});
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHandlerTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java
similarity index 87%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHandlerTest.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java
index 5b48f887d1..04e1e23ebb 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/QueryHandlerTest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java
@@ -1,13 +1,13 @@
-package com.mysema.query.jpa;
+package com.querydsl.jpa;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 public class QueryHandlerTest {
-    
+
     @Test
-    public void Types() {
+    public void types() {
         assertEquals(EclipseLinkHandler.class, EclipseLinkTemplates.DEFAULT.getQueryHandler().getClass());
         assertEquals(HibernateHandler.class, HQLTemplates.DEFAULT.getQueryHandler().getClass());
         assertEquals(DefaultQueryHandler.class, JPQLTemplates.DEFAULT.getQueryHandler().getClass());
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
new file mode 100644
index 0000000000..0c8b26e48d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.logging.Logger;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.hibernate.hql.internal.ast.HqlParser;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+import antlr.collections.AST;
+
+class QueryHelper<T> extends JPAQueryBase<T, QueryHelper<T>> {
+
+    private static final Logger logger = Logger.getLogger(QueryHelper.class.getName());
+
+    QueryHelper(JPQLTemplates templates) {
+        this(new DefaultQueryMetadata(), templates);
+    }
+
+    QueryHelper(QueryMetadata metadata, JPQLTemplates templates) {
+        super(metadata, templates);
+    }
+
+    @Override
+    protected JPQLSerializer createSerializer() {
+        return new JPQLSerializer(getTemplates());
+    }
+
+    @Override
+    protected void reset() {
+        // do nothing
+    }
+
+    public long fetchCount() {
+        return 0;
+    }
+
+
+    @Nullable
+    public CloseableIterator<T> iterate() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Nullable
+    public QueryResults<T> fetchResults() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void parse() throws RecognitionException, TokenStreamException {
+        String input = toString();
+        logger.fine("input: " + input.replace('\n', ' '));
+        HqlParser parser = HqlParser.getInstance(input);
+        parser.setFilter(false);
+        parser.statement();
+        AST ast = parser.getAST();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        parser.showAst(ast, new PrintStream(baos));
+        assertEquals("At least one error occurred during parsing " + input,
+                0, parser.getParseErrorHandler().getErrorCount());
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public QueryHelper<T> clone() {
+        return new QueryHelper<T>(getMetadata().clone(), getTemplates());
+    }
+
+
+    @Override
+    public <U> QueryHelper<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        QueryHelper<U> newType = (QueryHelper<U>) this;
+        return newType;
+    }
+
+    @Override
+    public QueryHelper<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        QueryHelper<Tuple> newType = (QueryHelper<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java
new file mode 100644
index 0000000000..2aaa446545
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.QueryMutability;
+import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.hibernate.sql.HibernateSQLQuery;
+import com.querydsl.sql.DerbyTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+public class QueryMutabilityTest {
+
+    private static final SQLTemplates derbyTemplates = new DerbyTemplates();
+
+    private Session session;
+
+    protected HibernateSQLQuery<?> query() {
+        return new HibernateSQLQuery<Void>(session, derbyTemplates);
+    }
+
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+    @Test
+    @Ignore
+    public void queryMutability() throws SecurityException, IllegalArgumentException,
+            NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException, IOException {
+        SAnimal cat = new SAnimal("cat");
+        HibernateSQLQuery<?> query = query().from(cat);
+        new QueryMutability(query).test(cat.id, cat.name);
+    }
+
+    @Test
+    public void clone_() {
+        SAnimal cat = new SAnimal("cat");
+        HibernateSQLQuery<?> query = query().from(cat).where(cat.name.isNotNull());
+        HibernateSQLQuery<?> query2 = query.clone(session);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        //query2.fetch(cat.id);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java
new file mode 100644
index 0000000000..cbc79d3710
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java
@@ -0,0 +1,106 @@
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertNotNull;
+
+import javax.persistence.EntityManager;
+
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.Performance;
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+
+@RunWith(JPATestRunner.class)
+@Ignore
+@Category(Performance.class)
+public class QueryPerformanceTest implements JPATest {
+
+    private static final int iterations = 1000;
+
+    private EntityManager entityManager;
+
+    @BeforeClass
+    public static void setUpClass() {
+        Mode.mode.set("h2perf");
+        Mode.target.set(Target.H2);
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        Mode.mode.remove();
+        Mode.target.remove();
+    }
+
+    private JPAQuery<?> query() {
+        return new JPAQuery<Void>(entityManager);
+    }
+
+    @Before
+    public void setUp() {
+        if (query().from(QCat.cat).fetchCount() == 0) {
+            for (int i = 0; i < iterations; i++) {
+                entityManager.persist(new Cat(String.valueOf(i), i + 100));
+            }
+            entityManager.flush();
+        }
+    }
+
+    @Test
+    public void byId_raw() {
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            Cat cat = (Cat) entityManager.createQuery("select cat from Cat cat where id = ?")
+                .setParameter(1, i + 100).getSingleResult();
+            assertNotNull(cat);
+        }
+        System.err.println("by id - raw" + (System.currentTimeMillis() - start));
+    }
+
+    @Test
+    public void byId_qdsl() {
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            QCat cat = QCat.cat;
+            Cat c = query().from(cat).where(cat.id.eq(i + 100)).select(cat).fetchOne();
+            assertNotNull(c);
+        }
+        System.err.println("by id - dsl" + (System.currentTimeMillis() - start));
+    }
+
+    @Test
+    public void byId_twoCols_raw() {
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            Object[] row = (Object[]) entityManager.createQuery(
+                    "select cat.id, cat.name from Cat cat where id = ?")
+                .setParameter(1, i + 100).getSingleResult();
+            assertNotNull(row);
+        }
+        System.err.println("by id - 2 cols - raw" + (System.currentTimeMillis() - start));
+    }
+
+    @Test
+    public void byId_twoCols_qdsl() {
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            QCat cat = QCat.cat;
+            Tuple row = query().from(cat).where(cat.id.eq(i + 100)).select(cat.id, cat.name).fetchOne();
+            assertNotNull(row);
+        }
+        System.err.println("by id - 2 cols - dsl" + (System.currentTimeMillis() - start));
+    }
+
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java
new file mode 100644
index 0000000000..400d9631a1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.*;
+
+public class RelationalFunctionCallTest {
+
+//    @Schema("PUBLIC")
+//    @Table("SURVEY")
+    public class QSurvey extends RelationalPathBase<QSurvey> {
+
+        private static final long serialVersionUID = -7427577079709192842L;
+
+        public final StringPath name = createString("NAME");
+
+        public QSurvey(String path) {
+            super(QSurvey.class, PathMetadataFactory.forVariable(path), "PUBLIC", "SURVEY");
+        }
+
+    }
+
+    @Test
+    public void functionCall() {
+        //select tab.col from Table tab join TableValuedFunction('parameter') func on tab.col not like func.col
+
+        QSurvey table = new QSurvey("SURVEY");
+        RelationalFunctionCall<String> func = SQLExpressions.relationalFunctionCall(String.class, "TableValuedFunction", "parameter");
+        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
+        SubQueryExpression<?> expr = select(table.name).from(table)
+            .join(func, funcAlias).on(table.name.like(funcAlias.getString("prop")).not());
+
+        Configuration conf = new Configuration(new SQLServerTemplates());
+        SQLSerializer serializer = new NativeSQLSerializer(conf, true);
+        serializer.serialize(expr.getMetadata(), false);
+        assertEquals("select SURVEY.NAME\n" +
+                "from SURVEY SURVEY\n" +
+                "join TableValuedFunction(?1) as tokFunc\n" +
+                "on not (SURVEY.NAME like tokFunc.prop escape '\\')", serializer.toString());
+
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java
new file mode 100644
index 0000000000..5b8c8c196e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.*;
+
+import java.io.*;
+
+import javax.persistence.EntityManager;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.domain.QCat;
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.testutil.JPATestRunner;
+
+@RunWith(JPATestRunner.class)
+public class SerializationBase implements JPATest {
+
+    private QCat cat = QCat.cat;
+
+    private EntityManager entityManager;
+
+    @Test
+    public void test() throws IOException, ClassNotFoundException {
+        // create query
+        JPAQuery<?> query = query();
+        query.from(cat).where(cat.name.eq("Kate")).select(cat).fetch();
+
+        QueryMetadata metadata = query.getMetadata();
+        assertFalse(metadata.getJoins().isEmpty());
+        assertTrue(metadata.getWhere() != null);
+        assertTrue(metadata.getProjection() != null);
+        QueryMetadata metadata2 = Serialization.serialize(metadata);
+
+        // validate it
+        assertEquals(metadata.getJoins(), metadata2.getJoins());
+        assertEquals(metadata.getWhere(), metadata2.getWhere());
+        assertEquals(metadata.getProjection(), metadata2.getProjection());
+
+        // create new query
+        JPAQuery<?> query2 = new JPAQuery<Void>(entityManager, metadata2);
+        assertEquals("select cat\nfrom Cat cat\nwhere cat.name = ?1", query2.toString());
+        query2.select(cat).fetch();
+    }
+
+    @Test
+    public void any_serialized() throws Exception {
+        Predicate where = cat.kittens.any().name.eq("Ruth234");
+        Predicate where2 = Serialization.serialize(where);
+
+        assertEquals(0, query().from(cat).where(where).fetchCount());
+        assertEquals(0, query().from(cat).where(where2).fetchCount());
+    }
+
+    @Test
+    public void any_serialized2() throws Exception {
+        Predicate where = cat.kittens.any().name.eq("Ruth234");
+
+        File file = new File("target", "predicate.ser");
+        if (!file.exists()) {
+            // serialize predicate on first run
+            FileOutputStream fileOutputStream = new FileOutputStream(file);
+            ObjectOutputStream out = new ObjectOutputStream(fileOutputStream);
+            out.writeObject(where);
+            out.close();
+            assertEquals(0, query().from(cat).where(where).fetchCount());
+        } else {
+            // deserialize predicate on second run
+            FileInputStream fileInputStream = new FileInputStream(file);
+            ObjectInputStream in = new ObjectInputStream(fileInputStream);
+            Predicate where2 = (Predicate) in.readObject();
+            in.close();
+            assertEquals(0, query().from(cat).where(where2).fetchCount());
+        }
+    }
+
+    private JPAQuery<?> query() {
+        return new JPAQuery<Void>(entityManager);
+    }
+
+    @Override
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java
new file mode 100644
index 0000000000..3bc5f24873
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import org.junit.Test;
+
+import com.querydsl.core.FilteredClause;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.impl.JPAQuery;
+
+public class SignatureTest {
+
+    @Test
+    public void test() {
+        meet((JPAQuery) null);
+        meet((HibernateQuery) null);
+        meet((JPQLQuery) null);
+    }
+
+    public static <T extends FilteredClause<? super T>> T meet(T query) {
+        return null;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java
new file mode 100644
index 0000000000..87697bb38d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.domain.QCat;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class StringOperationsTest extends AbstractQueryTest {
+
+    @Test
+    public void stringConcatenations() {
+        assertToString("concat(cat.name,kitten.name)", cat.name.concat(kitten.name));
+    }
+
+    @Test
+    public void stringConversionOperations() {
+        assertToString("str(cat.bodyWeight)", cat.bodyWeight.stringValue());
+    }
+
+    @Test
+    public void stringOperationsInFunctionalWay() {
+        assertToString("concat(cat.name,cust.name.firstName)", cat.name.concat(cust.name.firstName));
+        assertToString("lower(cat.name)", cat.name.lower());
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void indexOf() {
+        Path path = QCat.cat.name;
+        Expression startIndex = Expressions.constant(0);
+        Expression endIndex = Expressions.numberOperation(Integer.class, Ops.INDEX_OF, path, Expressions.constant("x"));
+        Expression substr = Expressions.stringOperation(Ops.SUBSTR_2ARGS, path, startIndex, endIndex);
+        assertToString("substring(cat.name,1,locate(?1,cat.name)-1 - ?2)", substr);
+    }
+
+    @Test
+    public void indexOf2() {
+        StringPath str = QCat.cat.name;
+        assertToString("substring(cat.name,1,locate(?1,cat.name)-1 - ?2)", str.substring(0, str.indexOf("x")));
+    }
+
+    @Test
+    public void indexOf3() {
+        assertToString("substring(cat.name,2,1)", QCat.cat.name.substring(1,2));
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java
new file mode 100644
index 0000000000..6c580f11ac
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.Constants.*;
+import static com.querydsl.jpa.JPAExpressions.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.domain.QCat;
+import com.querydsl.jpa.domain.QEmployee;
+import com.querydsl.jpa.domain.QUser;
+
+public class SubQueryTest extends AbstractQueryTest {
+
+    @Test
+    public void single_source() {
+        JPQLQuery<?> query = selectFrom(cat);
+        assertEquals("select cat\nfrom Cat cat", query.toString());
+    }
+
+    @Test
+    public void multiple_sources() {
+        JPQLQuery<?> query = select(cat).from(cat, fatcat);
+        assertEquals("select cat\nfrom Cat cat, Cat fatcat",
+                query.toString());
+    }
+
+    @Test
+    public void in() {
+        cat.in(selectFrom(cat));
+    }
+
+    @Test
+    public void innerJoin() {
+        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate",
+                selectFrom(cat).innerJoin(cat.mate).toString());
+    }
+
+    @Test
+    public void innerJoin2() {
+        QEmployee employee = QEmployee.employee;
+        QUser user = QUser.user;
+        assertEquals("select employee\nfrom Employee employee\n  inner join employee.user as user",
+                selectFrom(employee).innerJoin(employee.user, user).toString());
+    }
+
+    @Test
+    public void leftJoin() {
+        assertEquals("select cat\nfrom Cat cat\n  left join cat.mate",
+                selectFrom(cat).leftJoin(cat.mate).toString());
+    }
+
+    @Test
+    public void join() {
+        assertEquals("select cat\nfrom Cat cat\n  inner join cat.mate",
+                selectFrom(cat).join(cat.mate).toString());
+    }
+
+    @Test
+    public void uniqueProjection() {
+        assertToString("(select cat from Cat cat)",
+                selectFrom(cat));
+    }
+
+    @Test
+    public void listProjection() {
+        assertToString("(select cat from Cat cat)",
+                selectFrom(cat));
+    }
+
+    @Test
+    public void listContains() {
+        assertToString("cat in (select cat from Cat cat)",
+                cat.in(selectFrom(cat)));
+    }
+
+    @Test
+    public void exists() {
+        assertToString("exists (select 1 from Cat cat)",
+                selectOne().from(cat).exists());
+    }
+
+    @Test
+    public void exists_where() {
+        assertToString("exists (select 1 from Cat cat where cat.weight < ?1)",
+                selectFrom(cat).where(cat.weight.lt(1)).exists());
+    }
+
+    @Test
+    public void exists_via_unique() {
+        assertToString("exists (select 1 from Cat cat where cat.weight < ?1)",
+                selectOne().from(cat).where(cat.weight.lt(1)).exists());
+    }
+
+    @Test
+    public void notExists() {
+        assertToString("not exists (select 1 from Cat cat)",
+                selectOne().from(cat).notExists());
+    }
+
+    @Test
+    public void notExists_where() {
+        assertToString("not exists (select 1 from Cat cat where cat.weight < ?1)",
+                selectOne().from(cat).where(cat.weight.lt(1)).notExists());
+    }
+
+    @Test
+    public void notExists_via_unique() {
+        assertToString("not exists (select 1 from Cat cat where cat.weight < ?1)",
+                selectOne().from(cat).where(cat.weight.lt(1)).notExists());
+    }
+
+    @Test
+    public void count() {
+        assertToString("(select count(cat) from Cat cat)",
+                select(cat.count()).from(cat));
+    }
+
+    @Test
+    public void count_via_list() {
+        assertToString("(select count(cat) from Cat cat)",
+                select(cat.count()).from(cat));
+    }
+
+    @Test
+    public void count_name() {
+        assertToString("(select count(cat.name) from Cat cat)",
+                select(cat.name.count()).from(cat));
+    }
+
+    @Test
+    public void count_multiple_sources() {
+        QCat other = new QCat("other");
+        assertToString("(select count(cat) from Cat cat, Cat other)",
+
+                select(cat.count()).from(cat, other));
+    }
+
+    @Test
+    public void count_multiple_sources_via_list() {
+        QCat other = new QCat("other");
+        assertToString("(select count(cat) from Cat cat, Cat other)",
+
+                select(cat.count()).from(cat, other));
+    }
+
+    @Test
+    public void indexed_access() {
+        assertMatches("\\(select count\\(cat\\) from Cat cat   " +
+                "left join cat.kittens as cat_kittens_\\w+ " +
+                "with index\\(cat_kittens_\\w+\\) = \\?1 where cat_kittens_\\w+.name = \\?2\\)",
+
+                select(cat.count()).from(cat).where(cat.kittens.get(0).name.eq("Kate")));
+    }
+
+    @Test
+    public void indexed_access_without_constant() {
+        assertMatches("\\(select count\\(cat\\) from Cat cat   " +
+                        "left join cat.kittens as cat_kittens_\\w+ " +
+                        "with index\\(cat_kittens_\\w+\\) = cat.id where cat_kittens_\\w+.name = \\?1\\)",
+
+                select(cat.count()).from(cat).where(cat.kittens.get(cat.id).name.eq("Kate")));
+    }
+
+    @Test
+    public void indexOf() {
+        assertToString("(select count(cat) from Cat cat where locate(?1,cat.name)-1 = ?2)",
+                select(cat.count()).from(cat).where(cat.name.indexOf("a").eq(1)));
+    }
+
+//    @Test
+//    public void orderBy() {
+//        JPQLQuery<Void> query = query().from(cat1).where(cat1.alive);
+//        SubQueryExpression<Double> subquery = sub().from(cat).where(cat.mate.id.eq(cat1.id)).select(cat.floatProperty.avg());
+//        query.orderBy(subquery.subtract(-1.0f).asc());
+//
+//        assertEquals("select cat1 from Cat cat1 where cat1.alive order by (select avg(cat.floatProperty) from Cat cat where cat.mate.id = cat1.id) - ?1 asc",
+//                query.toString().replace("\n", " "));
+//    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java
new file mode 100644
index 0000000000..07755bf889
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java
@@ -0,0 +1,41 @@
+package com.querydsl.jpa;
+
+import java.util.Arrays;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.EmptyStatement;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+
+/**
+ * @author tiwe
+ *
+ */
+public class TargetRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        Target target = Mode.target.get();
+        boolean run = target == null || isExecuted(description, target);
+        return run ? base : EmptyStatement.DEFAULT;
+    }
+
+    private boolean isExecuted(Description description, Target target) {
+        ExcludeIn ex = description.getAnnotation(ExcludeIn.class);
+        // excluded in given targets
+        if (ex != null && Arrays.asList(ex.value()).contains(target)) {
+            return false;
+        }
+        // included only in given targets
+        IncludeIn in = description.getAnnotation(IncludeIn.class);
+        if (in != null && !Arrays.asList(in.value()).contains(target)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/TemplatesTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/TemplatesTest.java
new file mode 100644
index 0000000000..9360228cde
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/TemplatesTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import com.querydsl.core.TemplatesTestBase;
+
+public class TemplatesTest extends TemplatesTestBase {
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java
new file mode 100644
index 0000000000..8249fa94be
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.JPAExpressions.select;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.jpa.domain.QCat;
+
+public class TupleTest extends AbstractQueryTest {
+
+    @Test
+    @Ignore // FIXME
+    public void test() {
+        QCat cat = QCat.cat;
+
+        SubQueryExpression<?> subQuery = select(cat.birthdate, cat.name, cat.mate).from(cat)
+        .where(select(cat.mate, cat.birthdate.max())
+                .from(cat)
+                .groupBy(cat.mate)
+                .contains(Projections.tuple(cat.mate, cat.birthdate)));
+
+        assertToString(
+                "(select cat.birthdate, cat.name, cat.mate from Cat cat " +
+                "where (cat.mate, cat.birthdate) in " +
+                    "(select cat.mate, max(cat.birthdate) from Cat cat group by cat.mate))", subQuery);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java
new file mode 100644
index 0000000000..b6d744d10a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.*;
+
+public class TypeCastTest {
+
+    @Test
+    public void mappedSuperclass() {
+        QInheritedProperties subClass = QInheritedProperties.inheritedProperties;
+        QSuperclass superClass = subClass._super;
+
+        assertEquals(InheritedProperties.class, superClass.getType());
+//        assertEquals(InheritedProperties.class.getSimpleName(), superClass.getEntityName());
+        assertEquals("inheritedProperties", superClass.toString());
+    }
+
+//    @Test
+//    public void mappedSuperclass2() {
+//        QInheritedProperties subClass = QInheritedProperties.inheritedProperties;
+//        QSuperclass superClass = new QSuperclass(subClass.getMetadata());
+//
+//        assertEquals(Superclass.class, superClass.getType());
+//        assertEquals(Superclass.class.getSimpleName(), superClass.getEntityName());
+//        assertEquals("inheritedProperties", superClass.toString());
+//    }
+
+    @Test
+    public void subClassToSuper() {
+        QCat cat = QCat.cat;
+        QAnimal animal = new QAnimal(cat);
+
+        assertEquals(Cat.class, animal.getType());
+//        assertEquals(Cat.class.getSimpleName(), animal.getEntityName());
+        assertEquals("cat", animal.toString());
+    }
+
+    @Test
+    public void subClassToSuper2() {
+        QCat cat = QCat.cat;
+        QAnimal animal = new QAnimal(cat.getMetadata());
+
+        assertEquals(Animal.class, animal.getType());
+//        assertEquals(Animal.class.getSimpleName(), animal.getEntityName());
+        assertEquals("cat", animal.toString());
+    }
+
+    @Test
+    public void superClassToSub() {
+        QAnimal animal = QAnimal.animal;
+        QCat cat = new QCat(animal.getMetadata());
+
+        assertEquals(Cat.class, cat.getType());
+//        assertEquals(Cat.class.getSimpleName(), cat.getEntityName());
+        assertEquals("animal", cat.toString());
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java
new file mode 100644
index 0000000000..4c400688e7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa;
+
+import static com.querydsl.jpa.domain.QCat.cat;
+import static org.junit.Assert.assertEquals;
+
+import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.querydsl.jpa.domain.Cat;
+import com.querydsl.jpa.hibernate.HibernateQuery;
+import com.querydsl.jpa.testutil.HibernateTestRunner;
+
+@Ignore
+@RunWith(HibernateTestRunner.class)
+public class UniqueResultsTest implements HibernateTest {
+
+    private Session session;
+
+    @Test
+    public void test() {
+        session.save(new Cat("Bob1", 1));
+        session.save(new Cat("Bob2", 2));
+        session.save(new Cat("Bob3", 3));
+
+        assertEquals(Integer.valueOf(1), query().from(cat).orderBy(cat.name.asc()).offset(0).limit(1).select(cat.id).fetchOne());
+        assertEquals(Integer.valueOf(2), query().from(cat).orderBy(cat.name.asc()).offset(1).limit(1).select(cat.id).fetchOne());
+        assertEquals(Integer.valueOf(3), query().from(cat).orderBy(cat.name.asc()).offset(2).limit(1).select(cat.id).fetchOne());
+
+        assertEquals(Long.valueOf(3), query().from(cat).select(cat.count()).fetchOne());
+    }
+
+    private HibernateQuery<?> query() {
+        return new HibernateQuery<Void>(session);
+    }
+
+    @Override
+    public void setSession(Session session) {
+        this.session = session;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java
new file mode 100644
index 0000000000..3c2ade9269
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.annotations.QueryInit;
+
+/**
+ * The Class Account.
+ */
+@SuppressWarnings("serial")
+@Entity
+@Table(name = "account_")
+public class Account implements Serializable {
+
+    @Transient
+    public int transientField;
+
+    @Id
+    long id;
+
+    @ManyToOne
+    @QueryInit("pid")
+    Person owner;
+
+    @Embedded
+    EmbeddedType embeddedData;
+
+    @Test
+    public void test() {
+        try {
+            QAccount.class.getField("serialVersionUID");
+            fail("Got serialVersionUID");
+        } catch (Exception e) {
+            // expected
+        }
+        try {
+            QAccount.class.getField("transientField");
+            fail("Got transientField");
+        } catch (Exception e) {
+            // expected
+        }
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Animal.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Animal.java
new file mode 100644
index 0000000000..980450d6d6
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Animal.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.hibernate.annotations.Type;
+
+/**
+ * The Class Animal.
+ */
+@Entity
+@Table(name = "animal_")
+@DiscriminatorValue("A")
+public class Animal {
+    private boolean alive;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    private java.util.Date birthdate;
+
+    private int weight, toes;
+
+    // needed for JPA tests
+    @Type(type = "com.querydsl.jpa.ExtDoubleType")
+    private double bodyWeight;
+
+    private float floatProperty;
+
+    private Color color;
+
+//    @Temporal(TemporalType.DATE)
+    private java.sql.Date dateField;
+
+    @Id
+    private int id;
+
+    private String name;
+
+    private java.sql.Time timeField;
+
+    public Animal() { }
+
+    public Animal(int id) {
+        setId(id);
+    }
+
+    public java.util.Date getBirthdate() {
+        return new Date(birthdate.getTime());
+    }
+
+    public double getBodyWeight() {
+        return bodyWeight;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    public java.sql.Date getDateField() {
+        return new java.sql.Date(dateField.getTime());
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public java.sql.Time getTimeField() {
+        return timeField;
+    }
+
+    public int getToes() {
+        return toes;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public boolean isAlive() {
+        return alive;
+    }
+
+    public void setAlive(boolean alive) {
+        this.alive = alive;
+    }
+
+    public void setBirthdate(java.util.Date birthdate) {
+        this.birthdate = new java.util.Date(birthdate.getTime());
+    }
+
+    public void setBodyWeight(double bodyWeight) {
+        this.bodyWeight = bodyWeight;
+    }
+
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    public void setDateField(java.sql.Date dateField) {
+        this.dateField = new java.sql.Date(dateField.getTime());
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setTimeField(java.sql.Time timeField) {
+        this.timeField = timeField;
+    }
+
+    public void setToes(int toes) {
+        this.toes = toes;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public float getFloatProperty() {
+        return floatProperty;
+    }
+
+    public void setFloatProperty(float floatProperty) {
+        this.floatProperty = floatProperty;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/AuditLog.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/AuditLog.java
similarity index 85%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/AuditLog.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/AuditLog.java
index 57a129186e..a515e1720e 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/AuditLog.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/AuditLog.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -22,7 +22,7 @@
  * The Class AuditLog.
  */
 @Entity
-@Table(name="auditlog_")
+@Table(name = "auditlog_")
 public class AuditLog {
     @Id
     int id;
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Author.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Author.java
new file mode 100644
index 0000000000..0104376c0a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Author.java
@@ -0,0 +1,47 @@
+package com.querydsl.jpa.domain;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "author_")
+public class Author implements Serializable {
+
+    private static final long serialVersionUID = -1893968697250846661L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @OneToMany(mappedBy = "author")
+    @OrderBy("title")
+    private Set<Book> books;
+
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Bar.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Bar.java
new file mode 100644
index 0000000000..969ff52670
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Bar.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.*;
+
+/**
+ * The Class Bar.
+ */
+@Entity
+@Table(name = "bar_")
+public class Bar {
+    @Temporal(TemporalType.DATE)
+    java.util.Date date;
+
+    @Id
+    int id;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Book.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Book.java
new file mode 100644
index 0000000000..a2ddd40184
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Book.java
@@ -0,0 +1,46 @@
+package com.querydsl.jpa.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "book_")
+public class Book implements Serializable {
+
+    private static final long serialVersionUID = -9029792723035681319L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "AUTHOR_ID")
+    private Author author;
+
+    public Author getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Calendar.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Calendar.java
new file mode 100644
index 0000000000..00617f87ab
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Calendar.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.persistence.*;
+
+
+
+/**
+ * The Class Calendar.
+ */
+@SuppressWarnings("serial")
+@Entity
+@Table(name = "calendar_")
+public class Calendar implements Serializable {
+    @ElementCollection
+    @Temporal(TemporalType.DATE)
+    @MapKeyColumn(name = "holidays_key")
+    Map<String, java.util.Date> holidays;
+
+    @Id
+    int id;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Cat.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Cat.java
new file mode 100644
index 0000000000..67b3a0a5f8
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Cat.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.*;
+
+/**
+ * The Class Cat.
+ */
+@Entity
+@DiscriminatorValue("C")
+public class Cat extends Animal {
+
+    private int breed;
+
+    private Color eyecolor;
+
+    @OneToMany
+    @JoinTable(name = "kittens", joinColumns = @JoinColumn(name = "cat_id"), inverseJoinColumns = @JoinColumn(name = "kitten_id"))
+    @OrderColumn(name = "ind")
+    private List<Cat> kittens = new ArrayList<Cat>();
+
+    @OneToMany
+    @JoinTable(name = "kittens_set", joinColumns = @JoinColumn(name = "cat_id"), inverseJoinColumns = @JoinColumn(name = "kitten_id"))
+    private Set<Cat> kittensSet;
+
+//    @OneToMany
+//    @JoinTable(name="kittens_array")
+//    @IndexColumn(name = "arrayIndex")
+//    private Cat[] kittensArray = new Cat[0];
+
+    @ManyToOne
+    private Cat mate;
+
+    public Cat() { }
+
+    public Cat(int id) {
+        setId(id);
+    }
+
+    public Cat(String name, int id) {
+        setId(id);
+        setName(name);
+    }
+
+    public Cat(String name, int id, Color color) {
+        setId(id);
+        setName(name);
+        setColor(color);
+    }
+
+    public Cat(String name, int id, List<Cat> k) {
+        setId(id);
+        setName(name);
+        kittens.addAll(k);
+    }
+
+    public Cat(String name, int id, double bodyWeight) {
+        this(name, id);
+        setBodyWeight(bodyWeight);
+        setFloatProperty((float) bodyWeight);
+    }
+
+    public int getBreed() {
+        return breed;
+    }
+
+    public Color getEyecolor() {
+        return eyecolor;
+    }
+
+    public List<Cat> getKittens() {
+        return kittens;
+    }
+
+    public Cat getMate() {
+        return mate;
+    }
+
+//    public Cat[] getKittensArray() {
+//        return kittensArray;
+//    }
+
+    public void addKitten(Cat kitten) {
+        kittens.add(kitten);
+//        kittensArray = new Cat[]{kitten};
+    }
+
+    public Set<Cat> getKittensSet() {
+        return kittensSet;
+    }
+
+    public void setKittensSet(Set<Cat> kittensSet) {
+        this.kittensSet = kittensSet;
+    }
+
+    public void setMate(Cat mate) {
+        this.mate = mate;
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/CatSummary.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/CatSummary.java
similarity index 87%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/CatSummary.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/CatSummary.java
index 9f18bd708e..e758c719c0 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/CatSummary.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/CatSummary.java
@@ -1,6 +1,6 @@
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
-import com.mysema.query.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryProjection;
 
 public class CatSummary {
 
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Catalog.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Catalog.java
new file mode 100644
index 0000000000..5caa676610
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Catalog.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.Date;
+import java.util.Set;
+
+import javax.persistence.*;
+
+/**
+ * The Class Catalog.
+ */
+@Entity
+@Table(name = "catalog_")
+public class Catalog {
+    @Temporal(TemporalType.DATE)
+    Date effectiveDate;
+
+    @Id
+    int id;
+
+    @OneToMany
+    Set<Price> prices;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Child.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Child.java
new file mode 100644
index 0000000000..2b309a91a6
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Child.java
@@ -0,0 +1,16 @@
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity(name = "Child2")
+public class Child {
+
+    @Id
+    int id;
+
+    @ManyToOne
+    Parent parent;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Color.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Color.java
new file mode 100644
index 0000000000..9777ece6ca
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Color.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+/**
+ * The Enum Color.
+ */
+public enum Color {
+    BLACK, TABBY
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Company.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Company.java
new file mode 100644
index 0000000000..e42fb01e1a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Company.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+import org.batoo.jpa.annotations.Index;
+
+/**
+ * The Class Company.
+ */
+@Entity
+@Table(name = "company_")
+public class Company {
+
+    public enum Rating { A, AA, AAA }
+
+    @Enumerated
+    public Rating ratingOrdinal;
+
+    @Enumerated(EnumType.STRING)
+    public Rating ratingString;
+
+    @ManyToOne
+    public Employee ceo;
+
+    @OneToMany
+    @Index(name = "_index")
+    public List<Department> departments;
+
+    @Id
+    public int id;
+
+    public String name;
+
+    @Column(name = "official_name")
+    public String officialName;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Customer.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Customer.java
new file mode 100644
index 0000000000..609fedb460
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Customer.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * The Class Customer.
+ */
+@Entity
+@Table(name = "customer_")
+public class Customer {
+    @ManyToOne
+    Order currentOrder;
+
+    @Id
+    int id;
+
+    @ManyToOne
+    Name name;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Department.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Department.java
new file mode 100644
index 0000000000..4bc584fea0
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Department.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+import org.batoo.jpa.annotations.Index;
+
+/**
+ * The Class Department.
+ */
+@Entity
+@Table(name = "department_")
+public class Department {
+    @ManyToOne
+    Company company;
+
+    @OneToMany
+    @Index(name = "_index")
+    List<Employee> employees;
+
+    @Id
+    int id;
+
+    String name;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Document.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Document.java
new file mode 100644
index 0000000000..0455563cf7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Document.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+/**
+ * The Class Document.
+ */
+@Entity
+@Table(name = "document_")
+public class Document {
+    @Id
+    int id;
+
+    String name;
+
+    @Temporal(TemporalType.DATE)
+    Date validTo;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Dolphin.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Dolphin.java
new file mode 100644
index 0000000000..e1762acd08
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Dolphin.java
@@ -0,0 +1,8 @@
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Dolphin extends Mammal {
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Domain.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
similarity index 76%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Domain.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
index f544fabfbb..b072a5f93d 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Domain.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.mysema.query.jpa.domain4.BookID;
-import com.mysema.query.jpa.domain4.BookMark;
-import com.mysema.query.jpa.domain4.BookVersion;
-import com.mysema.query.jpa.domain4.Library;
+import com.querydsl.jpa.domain4.BookID;
+import com.querydsl.jpa.domain4.BookMark;
+import com.querydsl.jpa.domain4.BookVersion;
+import com.querydsl.jpa.domain4.Library;
+import com.querydsl.jpa.domain5.MyEmbeddedAttribute;
+import com.querydsl.jpa.domain5.MyEntity;
+import com.querydsl.jpa.domain5.MyMappedSuperclass;
+import com.querydsl.jpa.domain5.MyOtherEntity;
 
 public final class Domain {
 
-    private Domain() {}
+    private Domain() { }
 
     public static final List<Class<?>> classes = Arrays.<Class<?>>asList(
             Account.class,
@@ -51,6 +55,7 @@ private Domain() {}
             Family.class,
             Foo.class,
             Formula.class,
+            Group.class,
             Human.class,
             InheritedProperties.class,
             Item.class,
@@ -84,6 +89,11 @@ private Domain() {}
             BookID.class,
             BookMark.class,
             BookVersion.class,
-            Library.class
+            Library.class,
+
+            MyEmbeddedAttribute.class,
+            MyEntity.class,
+            MyMappedSuperclass.class,
+            MyOtherEntity.class
     );
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DomesticCat.java
similarity index 87%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DomesticCat.java
index ca0aec218b..d28a280a10 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DomesticCat.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DoubleProjection.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DoubleProjection.java
new file mode 100644
index 0000000000..ab0fff0e06
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/DoubleProjection.java
@@ -0,0 +1,14 @@
+package com.querydsl.jpa.domain;
+
+import com.querydsl.core.annotations.QueryProjection;
+
+public class DoubleProjection {
+
+    public double val;
+
+    @QueryProjection
+    public DoubleProjection(double val) {
+        this.val = val;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EmbeddedType.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EmbeddedType.java
new file mode 100644
index 0000000000..36bb9f5f01
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EmbeddedType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Embeddable;
+
+@SuppressWarnings("serial")
+@Embeddable
+public class EmbeddedType implements Serializable {
+
+    String someData;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Employee.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Employee.java
new file mode 100644
index 0000000000..ab00f89dfb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Employee.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.persistence.*;
+
+/**
+ * The Class Employee.
+ */
+@Entity
+@Table(name = "employee_")
+public class Employee {
+    @ManyToOne
+    public Company company;
+
+    @OneToOne
+    public User user;
+
+    public String firstName, lastName;
+
+    @Id
+    public int id;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "jobfunction")
+    @ElementCollection (fetch = FetchType.EAGER)
+    public Collection<JobFunction> jobFunctions = new HashSet<JobFunction>();
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity1.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity1.java
new file mode 100644
index 0000000000..3f86c20928
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity1.java
@@ -0,0 +1,19 @@
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Entity1 {
+
+    public Entity1() { }
+
+    public Entity1(int id) {
+        this.id = id;
+    }
+
+    @Id
+    public int id;
+
+    public String property;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity2.java
new file mode 100644
index 0000000000..eb79dfa651
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Entity2.java
@@ -0,0 +1,15 @@
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Entity2 extends Entity1 {
+
+    public Entity2() { }
+
+    public Entity2(int id) {
+        this.id = id;
+    }
+
+    public String property2;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EvilType.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EvilType.java
similarity index 77%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EvilType.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EvilType.java
index 57f3d60351..db8dd5a3a4 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/EvilType.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/EvilType.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,19 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * The Class EvilType.
  */
 @Entity
-@Table(name="eviltype_")
+@Table(name = "eviltype_")
 public class EvilType {
     @ManyToOne
     @JoinColumn(name = "_asc")
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Family.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Family.java
similarity index 81%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Family.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Family.java
index 61d8bc563e..58423b6373 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Family.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Family.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
-import com.mysema.query.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryProjection;
 
 /**
  * The Class Family.
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FloatProjection.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FloatProjection.java
new file mode 100644
index 0000000000..aded5a0eb0
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FloatProjection.java
@@ -0,0 +1,14 @@
+package com.querydsl.jpa.domain;
+
+import com.querydsl.core.annotations.QueryProjection;
+
+public class FloatProjection {
+
+    public float val;
+
+    @QueryProjection
+    public FloatProjection(float val) {
+        this.val = val;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Foo.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Foo.java
new file mode 100644
index 0000000000..0887aa6e9d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Foo.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+/**
+ * The Class Foo.
+ */
+@Entity
+@Table(name = "foo_")
+public class Foo {
+    public String bar;
+
+    @Id
+    //@GeneratedValue(strategy=GenerationType.AUTO)
+    public int id;
+
+    @ElementCollection
+    @CollectionTable(name = "foo_names", joinColumns = {@JoinColumn(name = "foo_id")})
+    public List<String> names;
+
+    @Temporal(TemporalType.DATE)
+    public java.util.Date startDate;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FooDTO.java
similarity index 86%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FooDTO.java
index 11d0dccddf..30e6bb0648 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/FooDTO.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.List;
 
@@ -20,7 +20,7 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import com.mysema.query.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryProjection;
 
 public class FooDTO {
     String bar;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Formula.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Formula.java
similarity index 87%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Formula.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Formula.java
index 7c95edd231..8e47727f0d 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Formula.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Formula.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -22,7 +22,7 @@
  * The Class Formula.
  */
 @Entity
-@Table(name="formula_")
+@Table(name = "formula_")
 public class Formula {
     @Id
     int id;
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Group.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Group.java
new file mode 100644
index 0000000000..e32bc68e4a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Group.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "group_")
+public class Group {
+    @Id
+    int id;
+
+    String name;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Human.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Human.java
similarity index 83%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Human.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Human.java
index c76b6188e6..2a3af1e3c4 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Human.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Human.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.Collection;
 
@@ -10,5 +10,5 @@ public class Human extends Mammal {
 
     @ElementCollection
     Collection<Integer> hairs;
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/InheritedProperties.java
similarity index 84%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/InheritedProperties.java
index 57f464d5d7..efe5b746ad 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/InheritedProperties.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="inheritedproperties_")
+@Table(name = "inheritedproperties_")
 public class InheritedProperties extends Superclass {
     @Id
     long id;
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Item.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Item.java
new file mode 100644
index 0000000000..570027ecee
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Item.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * The Class Item.
+ */
+@Entity
+@Table(name = "item_")
+public class Item {
+    @Id
+    long id;
+
+    @ManyToOne
+    Product product;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/JobFunction.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/JobFunction.java
similarity index 85%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/JobFunction.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/JobFunction.java
index d5d09e0030..fe44f9e771 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/JobFunction.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/JobFunction.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 public enum JobFunction {
 
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Location.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Location.java
new file mode 100644
index 0000000000..09901e3962
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Location.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * The Class Location.
+ */
+@Entity(name = "Location2")
+@Table(name = "location_")
+public class Location {
+    @Id
+    long id;
+
+    String name;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Mammal.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Mammal.java
new file mode 100644
index 0000000000..d0529f1aac
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Mammal.java
@@ -0,0 +1,12 @@
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Mammal {
+
+    @Id
+    Long id;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Name.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Name.java
similarity index 85%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Name.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Name.java
index 60ad26a379..257636df66 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Name.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Name.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -21,7 +21,7 @@
  * The Class Name.
  */
 @Entity
-@Table(name="name_")
+@Table(name = "name_")
 public class Name {
     String firstName, lastName, nickName;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/NameList.java
similarity index 86%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/NameList.java
index 903ed8912d..bb4f1af576 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/NameList.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.Collection;
 
@@ -24,11 +24,11 @@
  * The Class NameList.
  */
 @Entity
-@Table(name="namelist_")
+@Table(name = "namelist_")
 public class NameList {
     @Id
     long id;
-    
+
     @ElementCollection
     Collection<String> names;
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Named.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Named.java
similarity index 85%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Named.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Named.java
index de2fa04f46..220d3e4e49 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Named.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Named.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -21,7 +21,7 @@
  * The Class Named.
  */
 @Entity
-@Table(name="named_")
+@Table(name = "named_")
 public class Named {
     @Id
     long id;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Nationality.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Nationality.java
similarity index 82%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Nationality.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Nationality.java
index 5083c177c9..30e37913ef 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Nationality.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Nationality.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.io.Serializable;
 
@@ -25,8 +25,8 @@
  */
 @SuppressWarnings("serial")
 @Entity
-@Table(name="nationality_")
-public class Nationality implements Serializable{
+@Table(name = "nationality_")
+public class Nationality implements Serializable {
     @ManyToOne
     Calendar calendar;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Novel.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Novel.java
similarity index 76%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Novel.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Novel.java
index a8f0c5e49a..09ebef91d9 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Novel.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Novel.java
@@ -1,10 +1,10 @@
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 
 @Entity
 public class Novel extends Book {
 
-    private static final long serialVersionUID = 4711598115423737544L; 
+    private static final long serialVersionUID = 4711598115423737544L;
 
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Numeric.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Numeric.java
similarity index 91%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Numeric.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Numeric.java
index afcf3f6a86..bcb865a4c2 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Numeric.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Numeric.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -9,7 +9,7 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name="numeric_")
+@Table(name = "numeric_")
 public class Numeric implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Order.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Order.java
new file mode 100644
index 0000000000..c37ea0cece
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Order.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.*;
+
+/**
+ * The Class Order.
+ */
+@Entity
+@Table(name = "order_")
+public class Order {
+    @ManyToOne
+    Customer customer;
+
+    @ElementCollection
+    @OrderColumn(name = "_index")
+    List<Integer> deliveredItemIndices;
+
+    @Id
+    long id;
+
+    @OneToMany
+    @OrderColumn(name = "_index")
+    List<Item> items;
+
+    @OneToMany
+    @JoinTable(name = "LineItems")
+    @OrderColumn(name = "_index")
+    List<Item> lineItems;
+
+    @OneToMany
+    @JoinTable(name = "LineItems2")
+    @MapKey(name = "id")
+    Map<Integer, Item> lineItemsMap;
+
+    boolean paid;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parameter.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parameter.java
new file mode 100644
index 0000000000..4985a99696
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parameter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * The Class Parameter.
+ */
+@Entity
+@Table(name = "parameter_")
+public class Parameter {
+    @Id
+    long id;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parent.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parent.java
new file mode 100644
index 0000000000..1d97452d74
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Parent.java
@@ -0,0 +1,18 @@
+package com.querydsl.jpa.domain;
+
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity(name = "Parent2")
+public class Parent {
+
+    @Id
+    int id;
+
+    @OneToMany(mappedBy = "parent")
+    Set<Child> children;
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Payment.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Payment.java
similarity index 90%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Payment.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Payment.java
index 63e22a5818..3f07efb7dd 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Payment.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Payment.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.Collection;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PaymentStatus.java
similarity index 86%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PaymentStatus.java
index c6c44a64c8..d53c7cc38b 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PaymentStatus.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 /**
  * The Enum PaymentStatus.
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Person.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Person.java
new file mode 100644
index 0000000000..b8998c3903
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Person.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+import com.querydsl.core.annotations.QueryInit;
+
+/**
+ * The Class Person.
+ */
+@SuppressWarnings("serial")
+@Entity
+@Table(name = "person_")
+public class Person implements Serializable {
+    @Temporal(TemporalType.DATE)
+    java.util.Date birthDay;
+
+    @Id
+    long i;
+
+    @ManyToOne
+    PersonId pid;
+
+    String name;
+
+    @ManyToOne
+    @QueryInit("calendar")
+    Nationality nationality;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PersonId.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PersonId.java
similarity index 81%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PersonId.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PersonId.java
index 29e08bfa4e..64663db21a 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/PersonId.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/PersonId.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.io.Serializable;
 
@@ -24,8 +24,8 @@
  */
 @SuppressWarnings("serial")
 @Entity
-@Table(name="personid_")
-public class PersonId implements Serializable{
+@Table(name = "personid_")
+public class PersonId implements Serializable {
     String country;
 
     @Id
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Player.java
similarity index 86%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Player.java
index 14385d6a46..3f50ab56e0 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Player.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@
  * The Class Player.
  */
 @Entity
-@Table(name="player_")
+@Table(name = "player_")
 public class Player {
     @Id
     long id;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Price.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Price.java
similarity index 84%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Price.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Price.java
index 393966d1c6..3c92d6c41e 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Price.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Price.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -22,8 +22,8 @@
  * The Class Price.
  */
 @Entity
-@Table(name="price_")
-public class Price{
+@Table(name = "price_")
+public class Price {
     long amount;
 
     @Id
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Product.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Product.java
new file mode 100644
index 0000000000..c2db3c9694
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Product.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+
+/**
+ * The Class Product.
+ */
+@Entity
+public class Product extends Item {
+    // @Id long id;
+    String name;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Show.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Show.java
new file mode 100644
index 0000000000..be6e9e1697
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Show.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.Map;
+
+import javax.persistence.*;
+
+/**
+ * The Class Show.
+ */
+@Entity
+@Table(name = "show_")
+public class Show {
+
+    @Id
+    long id;
+
+    @ElementCollection
+    @MapKeyColumn(name = "acts_key")
+    public Map<String, String> acts;
+
+    @ManyToOne
+    public Show parent;
+
+    public Show() { }
+
+    public Show(int id) {
+        this.id = id;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/SimpleTypes.java
similarity index 81%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/SimpleTypes.java
index d1bb413f21..5da707c061 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/SimpleTypes.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,20 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Locale;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 
 @Entity
-@Table(name="simpletypes_")
+@Table(name = "simpletypes_")
 public class SimpleTypes {
     transient int test;
     @Id
@@ -68,4 +64,6 @@ public class SimpleTypes {
 
 //    @Temporal(TemporalType.TIMESTAMP)
     java.sql.Timestamp timestamp;
+
+    byte[] byteArray;
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Status.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Status.java
new file mode 100644
index 0000000000..5b5092db3c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Status.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * The Class Status.
+ */
+@Entity
+@Table(name = "status_")
+public class Status {
+    @Id
+    long id;
+
+    String name;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/StatusChange.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/StatusChange.java
new file mode 100644
index 0000000000..20384e000f
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/StatusChange.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.*;
+
+/**
+ * The Class StatusChange.
+ */
+@Entity
+@Table(name = "statuschange_")
+public class StatusChange {
+    @Id
+    long id;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    java.util.Date timeStamp;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Store.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Store.java
new file mode 100644
index 0000000000..47982a0694
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Store.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+/**
+ * The Class Store.
+ */
+@Entity
+@Table(name = "store_")
+public class Store {
+    @OneToMany
+    List<Customer> customers;
+
+    @Id
+    long id;
+
+    @ManyToOne
+    Location location;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Superclass.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Superclass.java
new file mode 100644
index 0000000000..29366dcb04
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Superclass.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.MappedSuperclass;
+
+import com.querydsl.core.annotations.PropertyType;
+import com.querydsl.core.annotations.QueryType;
+
+@MappedSuperclass
+public class Superclass {
+    String superclassProperty;
+
+    @QueryType(PropertyType.SIMPLE)
+    private String stringAsSimple;
+
+    public String getStringAsSimple() {
+        return stringAsSimple;
+    }
+
+    public void setStringAsSimple(String stringAsSimple) {
+        this.stringAsSimple = stringAsSimple;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/User.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/User.java
new file mode 100644
index 0000000000..33cdceeacb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/User.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * The Class User.
+ */
+@Entity
+@Table(name = "user_")
+public class User {
+    @ManyToOne
+    Company company;
+
+    @Id
+    long id;
+
+    String userName, firstName, lastName;
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/World.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/World.java
similarity index 82%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/World.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/World.java
index 158f78cab4..3f741b4a7f 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/World.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/World.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jpa.domain;
+package com.querydsl.jpa.domain;
 
 import java.util.Set;
 
@@ -11,8 +11,8 @@ public class World {
 
     @Id
     Long id;
-    
+
     @OneToMany
     Set<Mammal> mammals;
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/package-info.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/package-info.java
new file mode 100644
index 0000000000..0a6f9de574
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/package-info.java
@@ -0,0 +1,4 @@
+@Config(listAccessors = true, mapAccessors = true)
+package com.querydsl.jpa.domain;
+import com.querydsl.core.annotations.Config;
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAccount.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAccount.java
new file mode 100644
index 0000000000..3063d2afcb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAccount.java
@@ -0,0 +1,61 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SAccount is a Querydsl query type for SAccount
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SAccount extends com.querydsl.sql.RelationalPathBase<SAccount> {
+
+    private static final long serialVersionUID = -1514613821;
+
+    public static final SAccount account_ = new SAccount("account_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> ownerI = createNumber("ownerI", Long.class);
+
+    public final StringPath someData = createString("someData");
+
+    public final com.querydsl.sql.PrimaryKey<SAccount> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SPerson> fk809dbbd28cfac74 = createForeignKey(ownerI, "i");
+
+    public SAccount(String variable) {
+        super(SAccount.class, forVariable(variable), "", "account_");
+        addMetadata();
+    }
+
+    public SAccount(String variable, String schema, String table) {
+        super(SAccount.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SAccount(Path<? extends SAccount> path) {
+        super(path.getType(), path.getMetadata(), "", "account_");
+        addMetadata();
+    }
+
+    public SAccount(PathMetadata metadata) {
+        super(SAccount.class, metadata, "", "account_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(ownerI, ColumnMetadata.named("owner_i").withIndex(3).ofType(-5).withSize(19));
+        addMetadata(someData, ColumnMetadata.named("someData").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAnimal.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAnimal.java
new file mode 100644
index 0000000000..fd5e002fb0
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAnimal.java
@@ -0,0 +1,110 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SAnimal is a Querydsl query type for SAnimal
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SAnimal extends com.querydsl.sql.RelationalPathBase<SAnimal> {
+
+    private static final long serialVersionUID = 1795545042;
+
+    public static final SAnimal animal_ = new SAnimal("animal_");
+
+    public final BooleanPath alive = createBoolean("alive");
+
+    public final DateTimePath<Timestamp> birthdate = createDateTime("birthdate", java.sql.Timestamp.class);
+
+    public final NumberPath<Double> bodyWeight = createNumber("bodyWeight", Double.class);
+
+    public final NumberPath<Integer> breed = createNumber("breed", Integer.class);
+
+    public final NumberPath<Integer> color = createNumber("color", Integer.class);
+
+    public final DatePath<Date> dateField = createDate("dateField", java.sql.Date.class);
+
+    public final StringPath dtype = createString("dtype");
+
+    public final NumberPath<Integer> eyecolor = createNumber("eyecolor", Integer.class);
+
+    public final NumberPath<Float> floatProperty = createNumber("floatProperty", Float.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> mateId = createNumber("mateId", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final TimePath<Time> timeField = createTime("timeField", java.sql.Time.class);
+
+    public final NumberPath<Integer> toes = createNumber("toes", Integer.class);
+
+    public final NumberPath<Integer> weight = createNumber("weight", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SAnimal> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> fkccec31e312a37469 = createForeignKey(mateId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SKittens> _fkd60087cc3881aaa7 = createInvForeignKey(id, "kitten_id");
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> _fkccec31e312a37469 = createInvForeignKey(id, "mate_id");
+
+    public final com.querydsl.sql.ForeignKey<SKittensSet> _fk4fccad6f8f00fdf8 = createInvForeignKey(id, "cat_id");
+
+    public final com.querydsl.sql.ForeignKey<SKittens> _fkd60087cc8f00fdf8 = createInvForeignKey(id, "cat_id");
+
+    public final com.querydsl.sql.ForeignKey<SKittensSet> _fk4fccad6f3881aaa7 = createInvForeignKey(id, "kitten_id");
+
+    public SAnimal(String variable) {
+        super(SAnimal.class, forVariable(variable), "", "animal_");
+        addMetadata();
+    }
+
+    public SAnimal(String variable, String schema, String table) {
+        super(SAnimal.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SAnimal(Path<? extends SAnimal> path) {
+        super(path.getType(), path.getMetadata(), "", "animal_");
+        addMetadata();
+    }
+
+    public SAnimal(PathMetadata metadata) {
+        super(SAnimal.class, metadata, "", "animal_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(alive, ColumnMetadata.named("alive").withIndex(3).ofType(-7).notNull());
+        addMetadata(birthdate, ColumnMetadata.named("birthdate").withIndex(4).ofType(93).withSize(19));
+        addMetadata(bodyWeight, ColumnMetadata.named("bodyWeight").withIndex(5).ofType(8).withSize(22).notNull());
+        addMetadata(breed, ColumnMetadata.named("breed").withIndex(13).ofType(4).withSize(10));
+        addMetadata(color, ColumnMetadata.named("color").withIndex(6).ofType(4).withSize(10));
+        addMetadata(dateField, ColumnMetadata.named("dateField").withIndex(7).ofType(91).withSize(10));
+        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
+        addMetadata(eyecolor, ColumnMetadata.named("eyecolor").withIndex(14).ofType(4).withSize(10));
+        addMetadata(floatProperty, ColumnMetadata.named("floatProperty").withIndex(8).ofType(7).withSize(12).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(4).withSize(10).notNull());
+        addMetadata(mateId, ColumnMetadata.named("mate_id").withIndex(15).ofType(4).withSize(10));
+        addMetadata(name, ColumnMetadata.named("name").withIndex(9).ofType(12).withSize(255));
+        addMetadata(timeField, ColumnMetadata.named("timeField").withIndex(10).ofType(92).withSize(8));
+        addMetadata(toes, ColumnMetadata.named("toes").withIndex(11).ofType(4).withSize(10).notNull());
+        addMetadata(weight, ColumnMetadata.named("weight").withIndex(12).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuditlog.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuditlog.java
new file mode 100644
index 0000000000..6452f3f43e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuditlog.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SAuditlog is a Querydsl query type for SAuditlog
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SAuditlog extends com.querydsl.sql.RelationalPathBase<SAuditlog> {
+
+    private static final long serialVersionUID = -1982799323;
+
+    public static final SAuditlog auditlog_ = new SAuditlog("auditlog_");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Long> itemId = createNumber("itemId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SAuditlog> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SItem> fkb88fbf6ae26109c = createForeignKey(itemId, "id");
+
+    public SAuditlog(String variable) {
+        super(SAuditlog.class, forVariable(variable), "", "auditlog_");
+        addMetadata();
+    }
+
+    public SAuditlog(String variable, String schema, String table) {
+        super(SAuditlog.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SAuditlog(Path<? extends SAuditlog> path) {
+        super(path.getType(), path.getMetadata(), "", "auditlog_");
+        addMetadata();
+    }
+
+    public SAuditlog(PathMetadata metadata) {
+        super(SAuditlog.class, metadata, "", "auditlog_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(itemId, ColumnMetadata.named("item_id").withIndex(2).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuthor.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuthor.java
new file mode 100644
index 0000000000..8f0bbcc537
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SAuthor.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SAuthor is a Querydsl query type for SAuthor
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SAuthor extends com.querydsl.sql.RelationalPathBase<SAuthor> {
+
+    private static final long serialVersionUID = 2005972515;
+
+    public static final SAuthor author_ = new SAuthor("author_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SAuthor> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SBook> _fk599229686eaf51c = createInvForeignKey(id, "AUTHOR_ID");
+
+    public SAuthor(String variable) {
+        super(SAuthor.class, forVariable(variable), "", "author_");
+        addMetadata();
+    }
+
+    public SAuthor(String variable, String schema, String table) {
+        super(SAuthor.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SAuthor(Path<? extends SAuthor> path) {
+        super(path.getType(), path.getMetadata(), "", "author_");
+        addMetadata();
+    }
+
+    public SAuthor(PathMetadata metadata) {
+        super(SAuthor.class, metadata, "", "author_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBar.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBar.java
new file mode 100644
index 0000000000..9f766be25e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBar.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SBar is a Querydsl query type for SBar
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SBar extends com.querydsl.sql.RelationalPathBase<SBar> {
+
+    private static final long serialVersionUID = -1389576419;
+
+    public static final SBar bar_ = new SBar("bar_");
+
+    public final DatePath<java.sql.Date> date = createDate("date", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SBar> primary = createPrimaryKey(id);
+
+    public SBar(String variable) {
+        super(SBar.class, forVariable(variable), "", "bar_");
+        addMetadata();
+    }
+
+    public SBar(String variable, String schema, String table) {
+        super(SBar.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SBar(Path<? extends SBar> path) {
+        super(path.getType(), path.getMetadata(), "", "bar_");
+        addMetadata();
+    }
+
+    public SBar(PathMetadata metadata) {
+        super(SBar.class, metadata, "", "bar_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(date, ColumnMetadata.named("date").withIndex(2).ofType(91).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBook.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBook.java
new file mode 100644
index 0000000000..880c5a72b6
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBook.java
@@ -0,0 +1,64 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SBook is a Querydsl query type for SBook
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SBook extends com.querydsl.sql.RelationalPathBase<SBook> {
+
+    private static final long serialVersionUID = -126781371;
+
+    public static final SBook book_ = new SBook("book_");
+
+    public final NumberPath<Long> authorId = createNumber("authorId", Long.class);
+
+    public final StringPath dtype = createString("dtype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath title = createString("title");
+
+    public final com.querydsl.sql.PrimaryKey<SBook> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SAuthor> fk599229686eaf51c = createForeignKey(authorId, "id");
+
+    public SBook(String variable) {
+        super(SBook.class, forVariable(variable), "", "book_");
+        addMetadata();
+    }
+
+    public SBook(String variable, String schema, String table) {
+        super(SBook.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SBook(Path<? extends SBook> path) {
+        super(path.getType(), path.getMetadata(), "", "book_");
+        addMetadata();
+    }
+
+    public SBook(PathMetadata metadata) {
+        super(SBook.class, metadata, "", "book_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(authorId, ColumnMetadata.named("AUTHOR_ID").withIndex(4).ofType(-5).withSize(19));
+        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(title, ColumnMetadata.named("title").withIndex(3).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookBookmarks.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookBookmarks.java
new file mode 100644
index 0000000000..6b17b53134
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookBookmarks.java
@@ -0,0 +1,69 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.util.Arrays;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SBookBookmarks is a Querydsl query type for SBookBookmarks
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SBookBookmarks extends com.querydsl.sql.RelationalPathBase<SBookBookmarks> {
+
+    private static final long serialVersionUID = -312126525;
+
+    public static final SBookBookmarks bookBookmarks = new SBookBookmarks("book_bookmarks");
+
+    public final NumberPath<Integer> bookMarksORDER = createNumber("bookMarksORDER", Integer.class);
+
+    public final NumberPath<Long> bookVersionBookIDIdentity = createNumber("bookVersionBookIDIdentity", Long.class);
+
+    public final NumberPath<Long> bookVersionLibraryIdentity = createNumber("bookVersionLibraryIdentity", Long.class);
+
+    public final StringPath comment = createString("comment");
+
+    public final NumberPath<Long> page = createNumber("page", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SBookBookmarks> primary = createPrimaryKey(bookVersionBookIDIdentity, bookVersionLibraryIdentity, bookMarksORDER);
+
+    public final com.querydsl.sql.ForeignKey<SBookversion> fk94026827e33d3be4 = createForeignKey(Arrays.asList(bookVersionBookIDIdentity, bookVersionLibraryIdentity), Arrays.asList("bookID_identity", "library_identity"));
+
+    public SBookBookmarks(String variable) {
+        super(SBookBookmarks.class, forVariable(variable), "", "book_bookmarks");
+        addMetadata();
+    }
+
+    public SBookBookmarks(String variable, String schema, String table) {
+        super(SBookBookmarks.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SBookBookmarks(Path<? extends SBookBookmarks> path) {
+        super(path.getType(), path.getMetadata(), "", "book_bookmarks");
+        addMetadata();
+    }
+
+    public SBookBookmarks(PathMetadata metadata) {
+        super(SBookBookmarks.class, metadata, "", "book_bookmarks");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(bookMarksORDER, ColumnMetadata.named("bookMarks_ORDER").withIndex(5).ofType(4).withSize(10).notNull());
+        addMetadata(bookVersionBookIDIdentity, ColumnMetadata.named("BookVersion_bookID_identity").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(bookVersionLibraryIdentity, ColumnMetadata.named("BookVersion_library_identity").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(comment, ColumnMetadata.named("comment").withIndex(3).ofType(12).withSize(255));
+        addMetadata(page, ColumnMetadata.named("page").withIndex(4).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookid.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookid.java
new file mode 100644
index 0000000000..495a04f65f
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookid.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SBookid is a Querydsl query type for SBookid
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SBookid extends com.querydsl.sql.RelationalPathBase<SBookid> {
+
+    private static final long serialVersionUID = -1577800438;
+
+    public static final SBookid bookid_ = new SBookid("bookid_");
+
+    public final NumberPath<Long> identity = createNumber("identity", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SBookid> primary = createPrimaryKey(identity);
+
+    public final com.querydsl.sql.ForeignKey<SBookversion> _fkef4bc0704dd5d6c3 = createInvForeignKey(identity, "bookID_identity");
+
+    public SBookid(String variable) {
+        super(SBookid.class, forVariable(variable), "", "bookid_");
+        addMetadata();
+    }
+
+    public SBookid(String variable, String schema, String table) {
+        super(SBookid.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SBookid(Path<? extends SBookid> path) {
+        super(path.getType(), path.getMetadata(), "", "bookid_");
+        addMetadata();
+    }
+
+    public SBookid(PathMetadata metadata) {
+        super(SBookid.class, metadata, "", "bookid_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(identity, ColumnMetadata.named("identity").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookversion.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookversion.java
new file mode 100644
index 0000000000..a6bb0ffb42
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SBookversion.java
@@ -0,0 +1,70 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.util.Arrays;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SBookversion is a Querydsl query type for SBookversion
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SBookversion extends com.querydsl.sql.RelationalPathBase<SBookversion> {
+
+    private static final long serialVersionUID = 1615296481;
+
+    public static final SBookversion bookversion_ = new SBookversion("bookversion_");
+
+    public final NumberPath<Long> bookIDIdentity = createNumber("bookIDIdentity", Long.class);
+
+    public final StringPath description = createString("description");
+
+    public final NumberPath<Long> libraryIdentity = createNumber("libraryIdentity", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SBookversion> primary = createPrimaryKey(bookIDIdentity, libraryIdentity);
+
+    public final com.querydsl.sql.ForeignKey<SBookid> fkef4bc0704dd5d6c3 = createForeignKey(bookIDIdentity, "identity");
+
+    public final com.querydsl.sql.ForeignKey<SLibrary> fkef4bc070e364cd17 = createForeignKey(libraryIdentity, "identity");
+
+    public final com.querydsl.sql.ForeignKey<SBookBookmarks> _fk94026827e33d3be4 = createInvForeignKey(Arrays.asList(bookIDIdentity, libraryIdentity), Arrays.asList("BookVersion_bookID_identity", "BookVersion_library_identity"));
+
+    public SBookversion(String variable) {
+        super(SBookversion.class, forVariable(variable), "", "bookversion_");
+        addMetadata();
+    }
+
+    public SBookversion(String variable, String schema, String table) {
+        super(SBookversion.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SBookversion(Path<? extends SBookversion> path) {
+        super(path.getType(), path.getMetadata(), "", "bookversion_");
+        addMetadata();
+    }
+
+    public SBookversion(PathMetadata metadata) {
+        super(SBookversion.class, metadata, "", "bookversion_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(bookIDIdentity, ColumnMetadata.named("bookID_identity").withIndex(3).ofType(-5).withSize(19).notNull());
+        addMetadata(description, ColumnMetadata.named("description").withIndex(1).ofType(12).withSize(255));
+        addMetadata(libraryIdentity, ColumnMetadata.named("library_identity").withIndex(4).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendar.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendar.java
new file mode 100644
index 0000000000..3c1c83d11d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendar.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCalendar is a Querydsl query type for SCalendar
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCalendar extends com.querydsl.sql.RelationalPathBase<SCalendar> {
+
+    private static final long serialVersionUID = 885543696;
+
+    public static final SCalendar calendar_ = new SCalendar("calendar_");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCalendar> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCalendarHolidays> _fk31ce1edc591ebbc = createInvForeignKey(id, "Calendar_id");
+
+    public final com.querydsl.sql.ForeignKey<SNationality> _fkab8efa23591ebbc = createInvForeignKey(id, "calendar_id");
+
+    public SCalendar(String variable) {
+        super(SCalendar.class, forVariable(variable), "", "calendar_");
+        addMetadata();
+    }
+
+    public SCalendar(String variable, String schema, String table) {
+        super(SCalendar.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCalendar(Path<? extends SCalendar> path) {
+        super(path.getType(), path.getMetadata(), "", "calendar_");
+        addMetadata();
+    }
+
+    public SCalendar(PathMetadata metadata) {
+        super(SCalendar.class, metadata, "", "calendar_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendarHolidays.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendarHolidays.java
new file mode 100644
index 0000000000..1bd6864afc
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCalendarHolidays.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCalendarHolidays is a Querydsl query type for SCalendarHolidays
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCalendarHolidays extends com.querydsl.sql.RelationalPathBase<SCalendarHolidays> {
+
+    private static final long serialVersionUID = 850508650;
+
+    public static final SCalendarHolidays CalendarHolidays = new SCalendarHolidays("Calendar_holidays");
+
+    public final NumberPath<Integer> calendarId = createNumber("calendarId", Integer.class);
+
+    public final DatePath<java.sql.Date> holidays = createDate("holidays", java.sql.Date.class);
+
+    public final StringPath holidaysKEY = createString("holidaysKEY");
+
+    public final com.querydsl.sql.PrimaryKey<SCalendarHolidays> primary = createPrimaryKey(calendarId, holidaysKEY);
+
+    public final com.querydsl.sql.ForeignKey<SCalendar> fk31ce1edc591ebbc = createForeignKey(calendarId, "id");
+
+    public SCalendarHolidays(String variable) {
+        super(SCalendarHolidays.class, forVariable(variable), "", "Calendar_holidays");
+        addMetadata();
+    }
+
+    public SCalendarHolidays(String variable, String schema, String table) {
+        super(SCalendarHolidays.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCalendarHolidays(Path<? extends SCalendarHolidays> path) {
+        super(path.getType(), path.getMetadata(), "", "Calendar_holidays");
+        addMetadata();
+    }
+
+    public SCalendarHolidays(PathMetadata metadata) {
+        super(SCalendarHolidays.class, metadata, "", "Calendar_holidays");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(calendarId, ColumnMetadata.named("Calendar_id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(holidays, ColumnMetadata.named("holidays").withIndex(2).ofType(91).withSize(10));
+        addMetadata(holidaysKEY, ColumnMetadata.named("holidays_KEY").withIndex(3).ofType(12).withSize(255).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog.java
new file mode 100644
index 0000000000..cfb7e80c78
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCatalog is a Querydsl query type for SCatalog
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCatalog extends com.querydsl.sql.RelationalPathBase<SCatalog> {
+
+    private static final long serialVersionUID = 669498199;
+
+    public static final SCatalog catalog_ = new SCatalog("catalog_");
+
+    public final DatePath<java.sql.Date> effectiveDate = createDate("effectiveDate", java.sql.Date.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCatalog> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCatalog_price> _fkaa04532fbb9021ab = createInvForeignKey(id, "catalog__id");
+
+    public SCatalog(String variable) {
+        super(SCatalog.class, forVariable(variable), "", "catalog_");
+        addMetadata();
+    }
+
+    public SCatalog(String variable, String schema, String table) {
+        super(SCatalog.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCatalog(Path<? extends SCatalog> path) {
+        super(path.getType(), path.getMetadata(), "", "catalog_");
+        addMetadata();
+    }
+
+    public SCatalog(PathMetadata metadata) {
+        super(SCatalog.class, metadata, "", "catalog_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(effectiveDate, ColumnMetadata.named("effectiveDate").withIndex(2).ofType(91).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog_price.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog_price.java
new file mode 100644
index 0000000000..cada9216a3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCatalog_price.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCatalog_price is a Querydsl query type for SCatalog_price
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCatalog_price extends com.querydsl.sql.RelationalPathBase<SCatalog_price> {
+
+    private static final long serialVersionUID = 1271141965;
+
+    public static final SCatalog_price catalog_price_ = new SCatalog_price("catalog__price_");
+
+    public final NumberPath<Integer> catalog_id = createNumber("catalog_id", Integer.class);
+
+    public final NumberPath<Long> pricesId = createNumber("pricesId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCatalog_price> primary = createPrimaryKey(catalog_id, pricesId);
+
+    public final com.querydsl.sql.ForeignKey<SCatalog> fkaa04532fbb9021ab = createForeignKey(catalog_id, "id");
+
+    public final com.querydsl.sql.ForeignKey<SPrice> fkaa04532f5222eaf7 = createForeignKey(pricesId, "id");
+
+    public SCatalog_price(String variable) {
+        super(SCatalog_price.class, forVariable(variable), "", "catalog__price_");
+        addMetadata();
+    }
+
+    public SCatalog_price(String variable, String schema, String table) {
+        super(SCatalog_price.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCatalog_price(Path<? extends SCatalog_price> path) {
+        super(path.getType(), path.getMetadata(), "", "catalog__price_");
+        addMetadata();
+    }
+
+    public SCatalog_price(PathMetadata metadata) {
+        super(SCatalog_price.class, metadata, "", "catalog__price_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(catalog_id, ColumnMetadata.named("catalog__id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(pricesId, ColumnMetadata.named("prices_id").withIndex(2).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory.java
new file mode 100644
index 0000000000..b34d7c40b5
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory.java
@@ -0,0 +1,86 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCategory is a Querydsl query type for SCategory
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCategory extends com.querydsl.sql.RelationalPathBase<SCategory> {
+
+    private static final long serialVersionUID = -610481840;
+
+    public static final SCategory category_ = new SCategory("category_");
+
+    public final StringPath categoryDescription = createString("categoryDescription");
+
+    public final StringPath categoryName = createString("categoryName");
+
+    public final NumberPath<Double> createdBy = createNumber("createdBy", Double.class);
+
+    public final DateTimePath<java.sql.Timestamp> creationDate = createDateTime("creationDate", java.sql.Timestamp.class);
+
+    public final DateTimePath<java.sql.Timestamp> deleteDate = createDateTime("deleteDate", java.sql.Timestamp.class);
+
+    public final NumberPath<Double> deletedBy = createNumber("deletedBy", Double.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final DateTimePath<java.sql.Timestamp> modificationDate = createDateTime("modificationDate", java.sql.Timestamp.class);
+
+    public final NumberPath<Double> modifiedBy = createNumber("modifiedBy", Double.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCategory> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCategory_category> _fkc4e60b83561378ab = createInvForeignKey(id, "parentId");
+
+    public final com.querydsl.sql.ForeignKey<SUserprop_category> _fk851f48d37ab543e8 = createInvForeignKey(id, "childCategories_id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory_categoryprop> _fk8543a2802974945f = createInvForeignKey(id, "category__id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory_category> _fkc4e60b833c83109d = createInvForeignKey(id, "childId");
+
+    public SCategory(String variable) {
+        super(SCategory.class, forVariable(variable), "", "category_");
+        addMetadata();
+    }
+
+    public SCategory(String variable, String schema, String table) {
+        super(SCategory.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCategory(Path<? extends SCategory> path) {
+        super(path.getType(), path.getMetadata(), "", "category_");
+        addMetadata();
+    }
+
+    public SCategory(PathMetadata metadata) {
+        super(SCategory.class, metadata, "", "category_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(categoryDescription, ColumnMetadata.named("categoryDescription").withIndex(2).ofType(12).withSize(255));
+        addMetadata(categoryName, ColumnMetadata.named("categoryName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(createdBy, ColumnMetadata.named("createdBy").withIndex(4).ofType(8).withSize(22).notNull());
+        addMetadata(creationDate, ColumnMetadata.named("creationDate").withIndex(5).ofType(93).withSize(19));
+        addMetadata(deleteDate, ColumnMetadata.named("deleteDate").withIndex(6).ofType(93).withSize(19));
+        addMetadata(deletedBy, ColumnMetadata.named("deletedBy").withIndex(7).ofType(8).withSize(22).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(modificationDate, ColumnMetadata.named("modificationDate").withIndex(8).ofType(93).withSize(19));
+        addMetadata(modifiedBy, ColumnMetadata.named("modifiedBy").withIndex(9).ofType(8).withSize(22).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_category.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_category.java
new file mode 100644
index 0000000000..3a9dae7325
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_category.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCategory_category_ is a Querydsl query type for SCategory_category_
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCategory_category extends com.querydsl.sql.RelationalPathBase<SCategory_category> {
+
+    private static final long serialVersionUID = -771910703;
+
+    public static final SCategory_category category_category_ = new SCategory_category("category__category_");
+
+    public final NumberPath<Long> childId = createNumber("childId", Long.class);
+
+    public final NumberPath<Long> parentId = createNumber("parentId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCategory_category> primary = createPrimaryKey(childId, parentId);
+
+    public final com.querydsl.sql.ForeignKey<SCategory> fkc4e60b83561378ab = createForeignKey(parentId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory> fkc4e60b833c83109d = createForeignKey(childId, "id");
+
+    public SCategory_category(String variable) {
+        super(SCategory_category.class, forVariable(variable), "", "category__category_");
+        addMetadata();
+    }
+
+    public SCategory_category(String variable, String schema, String table) {
+        super(SCategory_category.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCategory_category(Path<? extends SCategory_category> path) {
+        super(path.getType(), path.getMetadata(), "", "category__category_");
+        addMetadata();
+    }
+
+    public SCategory_category(PathMetadata metadata) {
+        super(SCategory_category.class, metadata, "", "category__category_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(childId, ColumnMetadata.named("childId").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(parentId, ColumnMetadata.named("parentId").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_categoryprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_categoryprop.java
new file mode 100644
index 0000000000..4273074ce3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategory_categoryprop.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCategory_categoryprop is a Querydsl query type for SCategory_categoryprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCategory_categoryprop extends com.querydsl.sql.RelationalPathBase<SCategory_categoryprop> {
+
+    private static final long serialVersionUID = -1348316210;
+
+    public static final SCategory_categoryprop category_categoryprop_ = new SCategory_categoryprop("category__categoryprop_");
+
+    public final NumberPath<Long> category_id = createNumber("category_id", Long.class);
+
+    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCategory_categoryprop> primary = createPrimaryKey(category_id, propertiesId);
+
+    public final com.querydsl.sql.ForeignKey<SCategoryprop> fk8543a280fd94cd90 = createForeignKey(propertiesId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory> fk8543a2802974945f = createForeignKey(category_id, "id");
+
+    public SCategory_categoryprop(String variable) {
+        super(SCategory_categoryprop.class, forVariable(variable), "", "category__categoryprop_");
+        addMetadata();
+    }
+
+    public SCategory_categoryprop(String variable, String schema, String table) {
+        super(SCategory_categoryprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCategory_categoryprop(Path<? extends SCategory_categoryprop> path) {
+        super(path.getType(), path.getMetadata(), "", "category__categoryprop_");
+        addMetadata();
+    }
+
+    public SCategory_categoryprop(PathMetadata metadata) {
+        super(SCategory_categoryprop.class, metadata, "", "category__categoryprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(category_id, ColumnMetadata.named("category__id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategoryprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategoryprop.java
new file mode 100644
index 0000000000..00ae5577b3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCategoryprop.java
@@ -0,0 +1,66 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCategoryprop is a Querydsl query type for SCategoryprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCategoryprop extends com.querydsl.sql.RelationalPathBase<SCategoryprop> {
+
+    private static final long serialVersionUID = -1013141043;
+
+    public static final SCategoryprop categoryprop_ = new SCategoryprop("categoryprop_");
+
+    public final NumberPath<Long> categoryId = createNumber("categoryId", Long.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath propName = createString("propName");
+
+    public final StringPath propValue = createString("propValue");
+
+    public final com.querydsl.sql.PrimaryKey<SCategoryprop> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SUserprop_categoryprop> _fke0fdb7d0fd94cd90 = createInvForeignKey(id, "properties_id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory_categoryprop> _fk8543a280fd94cd90 = createInvForeignKey(id, "properties_id");
+
+    public SCategoryprop(String variable) {
+        super(SCategoryprop.class, forVariable(variable), "", "categoryprop_");
+        addMetadata();
+    }
+
+    public SCategoryprop(String variable, String schema, String table) {
+        super(SCategoryprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCategoryprop(Path<? extends SCategoryprop> path) {
+        super(path.getType(), path.getMetadata(), "", "categoryprop_");
+        addMetadata();
+    }
+
+    public SCategoryprop(PathMetadata metadata) {
+        super(SCategoryprop.class, metadata, "", "categoryprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(categoryId, ColumnMetadata.named("categoryId").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(propName, ColumnMetadata.named("propName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(propValue, ColumnMetadata.named("propValue").withIndex(4).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SChild2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SChild2.java
new file mode 100644
index 0000000000..38f541bbce
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SChild2.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SChild2 is a Querydsl query type for SChild2
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SChild2 extends com.querydsl.sql.RelationalPathBase<SChild2> {
+
+    private static final long serialVersionUID = 386731719;
+
+    public static final SChild2 Child2 = new SChild2("Child2");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> parentId = createNumber("parentId", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SChild2> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SParent2> fk783f9ab6c2dbacbc = createForeignKey(parentId, "id");
+
+    public SChild2(String variable) {
+        super(SChild2.class, forVariable(variable), "", "Child2");
+        addMetadata();
+    }
+
+    public SChild2(String variable, String schema, String table) {
+        super(SChild2.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SChild2(Path<? extends SChild2> path) {
+        super(path.getType(), path.getMetadata(), "", "Child2");
+        addMetadata();
+    }
+
+    public SChild2(PathMetadata metadata) {
+        super(SChild2.class, metadata, "", "Child2");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(parentId, ColumnMetadata.named("parent_id").withIndex(2).ofType(4).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany.java
new file mode 100644
index 0000000000..89674d2f19
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany.java
@@ -0,0 +1,75 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCompany is a Querydsl query type for SCompany
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCompany extends com.querydsl.sql.RelationalPathBase<SCompany> {
+
+    private static final long serialVersionUID = 22768499;
+
+    public static final SCompany company_ = new SCompany("company_");
+
+    public final NumberPath<Integer> ceoId = createNumber("ceoId", Integer.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final NumberPath<Integer> ratingOrdinal = createNumber("ratingOrdinal", Integer.class);
+
+    public final StringPath ratingString = createString("ratingString");
+
+    public final com.querydsl.sql.PrimaryKey<SCompany> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SEmployee> fkdc405382edf003bd = createForeignKey(ceoId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEmployee> _fk9d39ef71dc953998 = createInvForeignKey(id, "company_id");
+
+    public final com.querydsl.sql.ForeignKey<SUser> _fk6a68df4dc953998 = createInvForeignKey(id, "company_id");
+
+    public final com.querydsl.sql.ForeignKey<SCompany_department> _fk100ba610f0d30873 = createInvForeignKey(id, "company__id");
+
+    public final com.querydsl.sql.ForeignKey<SDepartment> _fk1f3a274ddc953998 = createInvForeignKey(id, "company_id");
+
+    public SCompany(String variable) {
+        super(SCompany.class, forVariable(variable), "", "company_");
+        addMetadata();
+    }
+
+    public SCompany(String variable, String schema, String table) {
+        super(SCompany.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCompany(Path<? extends SCompany> path) {
+        super(path.getType(), path.getMetadata(), "", "company_");
+        addMetadata();
+    }
+
+    public SCompany(PathMetadata metadata) {
+        super(SCompany.class, metadata, "", "company_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(ceoId, ColumnMetadata.named("ceo_id").withIndex(5).ofType(4).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+        addMetadata(ratingOrdinal, ColumnMetadata.named("ratingOrdinal").withIndex(3).ofType(4).withSize(10));
+        addMetadata(ratingString, ColumnMetadata.named("ratingString").withIndex(4).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany_department.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany_department.java
new file mode 100644
index 0000000000..7c6f176706
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCompany_department.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCompany_department is a Querydsl query type for SCompany_department
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCompany_department extends com.querydsl.sql.RelationalPathBase<SCompany_department> {
+
+    private static final long serialVersionUID = -68475398;
+
+    public static final SCompany_department company_department_ = new SCompany_department("company__department_");
+
+    public final NumberPath<Integer> company_id = createNumber("company_id", Integer.class);
+
+    public final NumberPath<Integer> departmentsId = createNumber("departmentsId", Integer.class);
+
+    public final com.querydsl.sql.ForeignKey<SDepartment> fk100ba6107d36c84d = createForeignKey(departmentsId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCompany> fk100ba610f0d30873 = createForeignKey(company_id, "id");
+
+    public SCompany_department(String variable) {
+        super(SCompany_department.class, forVariable(variable), "", "company__department_");
+        addMetadata();
+    }
+
+    public SCompany_department(String variable, String schema, String table) {
+        super(SCompany_department.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCompany_department(Path<? extends SCompany_department> path) {
+        super(path.getType(), path.getMetadata(), "", "company__department_");
+        addMetadata();
+    }
+
+    public SCompany_department(PathMetadata metadata) {
+        super(SCompany_department.class, metadata, "", "company__department_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(company_id, ColumnMetadata.named("company__id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(departmentsId, ColumnMetadata.named("departments_id").withIndex(2).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCustomer.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCustomer.java
new file mode 100644
index 0000000000..43ce811947
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SCustomer.java
@@ -0,0 +1,66 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SCustomer is a Querydsl query type for SCustomer
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SCustomer extends com.querydsl.sql.RelationalPathBase<SCustomer> {
+
+    private static final long serialVersionUID = -564764048;
+
+    public static final SCustomer customer_ = new SCustomer("customer_");
+
+    public final NumberPath<Long> currentOrderId = createNumber("currentOrderId", Long.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Long> nameId = createNumber("nameId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SCustomer> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SName> fk600e7c4196a83d9c = createForeignKey(nameId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SOrder> fk600e7c419cc457f1 = createForeignKey(currentOrderId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SStore_customer> _fk82ba2ce051f3c3e5 = createInvForeignKey(id, "customers_id");
+
+    public final com.querydsl.sql.ForeignKey<SOrder> _fkc3df62d1b29c27bc = createInvForeignKey(id, "customer_id");
+
+    public SCustomer(String variable) {
+        super(SCustomer.class, forVariable(variable), "", "customer_");
+        addMetadata();
+    }
+
+    public SCustomer(String variable, String schema, String table) {
+        super(SCustomer.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SCustomer(Path<? extends SCustomer> path) {
+        super(path.getType(), path.getMetadata(), "", "customer_");
+        addMetadata();
+    }
+
+    public SCustomer(PathMetadata metadata) {
+        super(SCustomer.class, metadata, "", "customer_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(currentOrderId, ColumnMetadata.named("currentOrder_id").withIndex(2).ofType(-5).withSize(19));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(nameId, ColumnMetadata.named("name_id").withIndex(3).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDateTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDateTest.java
new file mode 100644
index 0000000000..cf5ef076b4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDateTest.java
@@ -0,0 +1,50 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SDateTest is a Querydsl query type for SDateTest
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDateTest extends com.querydsl.sql.RelationalPathBase<SDateTest> {
+
+    private static final long serialVersionUID = -1879688879;
+
+    public static final SDateTest dateTest1 = new SDateTest("DATE_TEST");
+
+    public final DatePath<java.sql.Date> dateTest = createDate("dateTest", java.sql.Date.class);
+
+    public SDateTest(String variable) {
+        super(SDateTest.class, forVariable(variable), "", "DATE_TEST");
+        addMetadata();
+    }
+
+    public SDateTest(String variable, String schema, String table) {
+        super(SDateTest.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SDateTest(Path<? extends SDateTest> path) {
+        super(path.getType(), path.getMetadata(), "", "DATE_TEST");
+        addMetadata();
+    }
+
+    public SDateTest(PathMetadata metadata) {
+        super(SDateTest.class, metadata, "", "DATE_TEST");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(dateTest, ColumnMetadata.named("DATE_TEST").withIndex(1).ofType(91).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment.java
new file mode 100644
index 0000000000..02a635223f
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment.java
@@ -0,0 +1,65 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SDepartment is a Querydsl query type for SDepartment
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDepartment extends com.querydsl.sql.RelationalPathBase<SDepartment> {
+
+    private static final long serialVersionUID = 723598780;
+
+    public static final SDepartment department_ = new SDepartment("department_");
+
+    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SDepartment> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCompany> fk1f3a274ddc953998 = createForeignKey(companyId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCompany_department> _fk100ba6107d36c84d = createInvForeignKey(id, "departments_id");
+
+    public final com.querydsl.sql.ForeignKey<SDepartment_employee> _fkc33a14ff7d2db0e1 = createInvForeignKey(id, "department__id");
+
+    public SDepartment(String variable) {
+        super(SDepartment.class, forVariable(variable), "", "department_");
+        addMetadata();
+    }
+
+    public SDepartment(String variable, String schema, String table) {
+        super(SDepartment.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SDepartment(Path<? extends SDepartment> path) {
+        super(path.getType(), path.getMetadata(), "", "department_");
+        addMetadata();
+    }
+
+    public SDepartment(PathMetadata metadata) {
+        super(SDepartment.class, metadata, "", "department_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(3).ofType(4).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment_employee.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment_employee.java
new file mode 100644
index 0000000000..4464fef5e2
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDepartment_employee.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SDepartment_employee is a Querydsl query type for SDepartment_employee
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDepartment_employee extends com.querydsl.sql.RelationalPathBase<SDepartment_employee> {
+
+    private static final long serialVersionUID = 1293706549;
+
+    public static final SDepartment_employee department_employee_ = new SDepartment_employee("department__employee_");
+
+    public final NumberPath<Integer> department_id = createNumber("department_id", Integer.class);
+
+    public final NumberPath<Integer> employeesId = createNumber("employeesId", Integer.class);
+
+    public final com.querydsl.sql.ForeignKey<SEmployee> fkc33a14ffd846a985 = createForeignKey(employeesId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SDepartment> fkc33a14ff7d2db0e1 = createForeignKey(department_id, "id");
+
+    public SDepartment_employee(String variable) {
+        super(SDepartment_employee.class, forVariable(variable), "", "department__employee_");
+        addMetadata();
+    }
+
+    public SDepartment_employee(String variable, String schema, String table) {
+        super(SDepartment_employee.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SDepartment_employee(Path<? extends SDepartment_employee> path) {
+        super(path.getType(), path.getMetadata(), "", "department__employee_");
+        addMetadata();
+    }
+
+    public SDepartment_employee(PathMetadata metadata) {
+        super(SDepartment_employee.class, metadata, "", "department__employee_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(department_id, ColumnMetadata.named("department__id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(employeesId, ColumnMetadata.named("employees_id").withIndex(2).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument.java
new file mode 100644
index 0000000000..35a4adefd1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument.java
@@ -0,0 +1,60 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SDocument is a Querydsl query type for SDocument
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDocument extends com.querydsl.sql.RelationalPathBase<SDocument> {
+
+    private static final long serialVersionUID = -1232783149;
+
+    public static final SDocument document_ = new SDocument("document_");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final DatePath<java.sql.Date> validTo = createDate("validTo", java.sql.Date.class);
+
+    public final com.querydsl.sql.PrimaryKey<SDocument> primary = createPrimaryKey(id);
+
+    public SDocument(String variable) {
+        super(SDocument.class, forVariable(variable), "", "document_");
+        addMetadata();
+    }
+
+    public SDocument(String variable, String schema, String table) {
+        super(SDocument.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SDocument(Path<? extends SDocument> path) {
+        super(path.getType(), path.getMetadata(), "", "document_");
+        addMetadata();
+    }
+
+    public SDocument(PathMetadata metadata) {
+        super(SDocument.class, metadata, "", "document_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+        addMetadata(validTo, ColumnMetadata.named("validTo").withIndex(3).ofType(91).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument2.java
similarity index 79%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument2.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument2.java
index 9333895c9b..3a680da13a 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SDocument2.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocument2.java
@@ -1,21 +1,22 @@
-package com.mysema.query.jpa.domain.sql;
+package com.querydsl.jpa.domain.sql;
 
-import static com.mysema.query.types.PathMetadataFactory.*;
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
 import javax.annotation.Generated;
-import com.mysema.query.types.Path;
 
-import com.mysema.query.sql.ColumnMetadata;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
 
 
 /**
  * SDocument2 is a Querydsl query type for SDocument2
  */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SDocument2 extends com.mysema.query.sql.RelationalPathBase<SDocument2> {
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDocument2 extends com.querydsl.sql.RelationalPathBase<SDocument2> {
 
     private static final long serialVersionUID = 438426745;
 
@@ -47,10 +48,10 @@ public class SDocument2 extends com.mysema.query.sql.RelationalPathBase<SDocumen
 
     public final NumberPath<Double> modifiedBy = createNumber("modifiedBy", Double.class);
 
-    public final com.mysema.query.sql.PrimaryKey<SDocument2> primary = createPrimaryKey(id);
+    public final com.querydsl.sql.PrimaryKey<SDocument2> primary = createPrimaryKey(id);
 
     public SDocument2(String variable) {
-        super(SDocument2.class, forVariable(variable), "null", "document2_");
+        super(SDocument2.class, forVariable(variable), "", "document2_");
         addMetadata();
     }
 
@@ -60,12 +61,12 @@ public SDocument2(String variable, String schema, String table) {
     }
 
     public SDocument2(Path<? extends SDocument2> path) {
-        super(path.getType(), path.getMetadata(), "null", "document2_");
+        super(path.getType(), path.getMetadata(), "", "document2_");
         addMetadata();
     }
 
-    public SDocument2(PathMetadata<?> metadata) {
-        super(SDocument2.class, metadata, "null", "document2_");
+    public SDocument2(PathMetadata metadata) {
+        super(SDocument2.class, metadata, "", "document2_");
         addMetadata();
     }
 
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocumentprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocumentprop.java
new file mode 100644
index 0000000000..d8ffd45dd4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SDocumentprop.java
@@ -0,0 +1,65 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SDocumentprop is a Querydsl query type for SDocumentprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SDocumentprop extends com.querydsl.sql.RelationalPathBase<SDocumentprop> {
+
+    private static final long serialVersionUID = 233547728;
+
+    public static final SDocumentprop documentprop_ = new SDocumentprop("documentprop_");
+
+    public final NumberPath<Double> documentId = createNumber("documentId", Double.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath propName = createString("propName");
+
+    public final StringPath propValue = createString("propValue");
+
+    public final StringPath propValueDetails = createString("propValueDetails");
+
+    public final com.querydsl.sql.PrimaryKey<SDocumentprop> primary = createPrimaryKey(id);
+
+    public SDocumentprop(String variable) {
+        super(SDocumentprop.class, forVariable(variable), "", "documentprop_");
+        addMetadata();
+    }
+
+    public SDocumentprop(String variable, String schema, String table) {
+        super(SDocumentprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SDocumentprop(Path<? extends SDocumentprop> path) {
+        super(path.getType(), path.getMetadata(), "", "documentprop_");
+        addMetadata();
+    }
+
+    public SDocumentprop(PathMetadata metadata) {
+        super(SDocumentprop.class, metadata, "", "documentprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(documentId, ColumnMetadata.named("documentId").withIndex(2).ofType(8).withSize(22).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(propName, ColumnMetadata.named("propName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(propValue, ColumnMetadata.named("propValue").withIndex(4).ofType(12).withSize(255));
+        addMetadata(propValueDetails, ColumnMetadata.named("propValueDetails").withIndex(5).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployee.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployee.java
new file mode 100644
index 0000000000..f2efb024b8
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployee.java
@@ -0,0 +1,75 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SEmployee is a Querydsl query type for SEmployee
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SEmployee extends com.querydsl.sql.RelationalPathBase<SEmployee> {
+
+    private static final long serialVersionUID = 461493664;
+
+    public static final SEmployee employee_ = new SEmployee("employee_");
+
+    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
+
+    public final StringPath firstName = createString("firstName");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath lastName = createString("lastName");
+
+    public final NumberPath<Long> userId = createNumber("userId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SEmployee> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCompany> fk9d39ef71dc953998 = createForeignKey(companyId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SUser> fk9d39ef712743b59c = createForeignKey(userId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCompany> _fkdc405382edf003bd = createInvForeignKey(id, "ceo_id");
+
+    public final com.querydsl.sql.ForeignKey<SEmployeeJobFunctions> _fk49690e2f75b8f5bc = createInvForeignKey(id, "Employee_id");
+
+    public final com.querydsl.sql.ForeignKey<SDepartment_employee> _fkc33a14ffd846a985 = createInvForeignKey(id, "employees_id");
+
+    public SEmployee(String variable) {
+        super(SEmployee.class, forVariable(variable), "", "employee_");
+        addMetadata();
+    }
+
+    public SEmployee(String variable, String schema, String table) {
+        super(SEmployee.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SEmployee(Path<? extends SEmployee> path) {
+        super(path.getType(), path.getMetadata(), "", "employee_");
+        addMetadata();
+    }
+
+    public SEmployee(PathMetadata metadata) {
+        super(SEmployee.class, metadata, "", "employee_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(4).ofType(4).withSize(10));
+        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(userId, ColumnMetadata.named("user_id").withIndex(5).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployeeJobFunctions.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployeeJobFunctions.java
new file mode 100644
index 0000000000..82c1978b49
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEmployeeJobFunctions.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SEmployeeJobFunctions is a Querydsl query type for SEmployeeJobFunctions
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SEmployeeJobFunctions extends com.querydsl.sql.RelationalPathBase<SEmployeeJobFunctions> {
+
+    private static final long serialVersionUID = -666645347;
+
+    public static final SEmployeeJobFunctions EmployeeJobFunctions = new SEmployeeJobFunctions("Employee_jobFunctions");
+
+    public final NumberPath<Integer> employeeId = createNumber("employeeId", Integer.class);
+
+    public final StringPath jobfunction = createString("jobfunction");
+
+    public final com.querydsl.sql.ForeignKey<SEmployee> fk49690e2f75b8f5bc = createForeignKey(employeeId, "id");
+
+    public SEmployeeJobFunctions(String variable) {
+        super(SEmployeeJobFunctions.class, forVariable(variable), "", "Employee_jobFunctions");
+        addMetadata();
+    }
+
+    public SEmployeeJobFunctions(String variable, String schema, String table) {
+        super(SEmployeeJobFunctions.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SEmployeeJobFunctions(Path<? extends SEmployeeJobFunctions> path) {
+        super(path.getType(), path.getMetadata(), "", "Employee_jobFunctions");
+        addMetadata();
+    }
+
+    public SEmployeeJobFunctions(PathMetadata metadata) {
+        super(SEmployeeJobFunctions.class, metadata, "", "Employee_jobFunctions");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(employeeId, ColumnMetadata.named("Employee_id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(jobfunction, ColumnMetadata.named("jobfunction").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEntity1.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEntity1.java
new file mode 100644
index 0000000000..01fb772b08
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEntity1.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SEntity1 is a Querydsl query type for SEntity1
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SEntity1 extends com.querydsl.sql.RelationalPathBase<SEntity1> {
+
+    private static final long serialVersionUID = 1060650653;
+
+    public static final SEntity1 Entity1 = new SEntity1("Entity1");
+
+    public final StringPath dtype = createString("dtype");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath property = createString("property");
+
+    public final StringPath property2 = createString("property2");
+
+    public final com.querydsl.sql.PrimaryKey<SEntity1> primary = createPrimaryKey(id);
+
+    public SEntity1(String variable) {
+        super(SEntity1.class, forVariable(variable), "", "Entity1");
+        addMetadata();
+    }
+
+    public SEntity1(String variable, String schema, String table) {
+        super(SEntity1.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SEntity1(Path<? extends SEntity1> path) {
+        super(path.getType(), path.getMetadata(), "", "Entity1");
+        addMetadata();
+    }
+
+    public SEntity1(PathMetadata metadata) {
+        super(SEntity1.class, metadata, "", "Entity1");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(4).withSize(10).notNull());
+        addMetadata(property, ColumnMetadata.named("property").withIndex(3).ofType(12).withSize(255));
+        addMetadata(property2, ColumnMetadata.named("property2").withIndex(4).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEviltype.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEviltype.java
new file mode 100644
index 0000000000..01ef815754
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SEviltype.java
@@ -0,0 +1,143 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SEviltype is a Querydsl query type for SEviltype
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SEviltype extends com.querydsl.sql.RelationalPathBase<SEviltype> {
+
+    private static final long serialVersionUID = 1348954496;
+
+    public static final SEviltype eviltype_ = new SEviltype("eviltype_");
+
+    public final NumberPath<Integer> _asc = createNumber("_asc", Integer.class);
+
+    public final NumberPath<Integer> _desc = createNumber("_desc", Integer.class);
+
+    public final NumberPath<Integer> getClassId = createNumber("getClassId", Integer.class);
+
+    public final NumberPath<Integer> getId = createNumber("getId", Integer.class);
+
+    public final NumberPath<Integer> getMetadataId = createNumber("getMetadataId", Integer.class);
+
+    public final NumberPath<Integer> getTypeId = createNumber("getTypeId", Integer.class);
+
+    public final NumberPath<Integer> hashCodeId = createNumber("hashCodeId", Integer.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Integer> isnotnullId = createNumber("isnotnullId", Integer.class);
+
+    public final NumberPath<Integer> isnullId = createNumber("isnullId", Integer.class);
+
+    public final NumberPath<Integer> notifyAllId = createNumber("notifyAllId", Integer.class);
+
+    public final NumberPath<Integer> notifyId = createNumber("notifyId", Integer.class);
+
+    public final NumberPath<Integer> toStringId = createNumber("toStringId", Integer.class);
+
+    public final NumberPath<Integer> waitId = createNumber("waitId", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SEviltype> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f83516787cd9e = createForeignKey(toStringId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f835114c0ad20 = createForeignKey(_desc, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f835151e065d5 = createForeignKey(waitId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f83517e62bab2 = createForeignKey(notifyAllId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351c4df9054 = createForeignKey(getId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f835112489019 = createForeignKey(isnullId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351b09c8448 = createForeignKey(getClassId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f835180b69f81 = createForeignKey(notifyId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351b71279da = createForeignKey(getTypeId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351226ee98f = createForeignKey(hashCodeId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351f5ec12fa = createForeignKey(isnotnullId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f8351f839f62 = createForeignKey(_asc, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> fkd21f83512d7708c5 = createForeignKey(getMetadataId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f83516787cd9e = createInvForeignKey(id, "toString_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f835114c0ad20 = createInvForeignKey(id, "_desc");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f835151e065d5 = createInvForeignKey(id, "wait_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f83517e62bab2 = createInvForeignKey(id, "notifyAll_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351c4df9054 = createInvForeignKey(id, "get_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f835112489019 = createInvForeignKey(id, "isnull_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351b09c8448 = createInvForeignKey(id, "getClass_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f835180b69f81 = createInvForeignKey(id, "notify_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351b71279da = createInvForeignKey(id, "getType_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351226ee98f = createInvForeignKey(id, "hashCode_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351f5ec12fa = createInvForeignKey(id, "isnotnull_id");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f8351f839f62 = createInvForeignKey(id, "_asc");
+
+    public final com.querydsl.sql.ForeignKey<SEviltype> _fkd21f83512d7708c5 = createInvForeignKey(id, "getMetadata_id");
+
+    public SEviltype(String variable) {
+        super(SEviltype.class, forVariable(variable), "", "eviltype_");
+        addMetadata();
+    }
+
+    public SEviltype(String variable, String schema, String table) {
+        super(SEviltype.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SEviltype(Path<? extends SEviltype> path) {
+        super(path.getType(), path.getMetadata(), "", "eviltype_");
+        addMetadata();
+    }
+
+    public SEviltype(PathMetadata metadata) {
+        super(SEviltype.class, metadata, "", "eviltype_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(_asc, ColumnMetadata.named("_asc").withIndex(2).ofType(4).withSize(10));
+        addMetadata(_desc, ColumnMetadata.named("_desc").withIndex(3).ofType(4).withSize(10));
+        addMetadata(getClassId, ColumnMetadata.named("getClass_id").withIndex(5).ofType(4).withSize(10));
+        addMetadata(getId, ColumnMetadata.named("get_id").withIndex(4).ofType(4).withSize(10));
+        addMetadata(getMetadataId, ColumnMetadata.named("getMetadata_id").withIndex(6).ofType(4).withSize(10));
+        addMetadata(getTypeId, ColumnMetadata.named("getType_id").withIndex(7).ofType(4).withSize(10));
+        addMetadata(hashCodeId, ColumnMetadata.named("hashCode_id").withIndex(8).ofType(4).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(isnotnullId, ColumnMetadata.named("isnotnull_id").withIndex(9).ofType(4).withSize(10));
+        addMetadata(isnullId, ColumnMetadata.named("isnull_id").withIndex(10).ofType(4).withSize(10));
+        addMetadata(notifyAllId, ColumnMetadata.named("notifyAll_id").withIndex(12).ofType(4).withSize(10));
+        addMetadata(notifyId, ColumnMetadata.named("notify_id").withIndex(11).ofType(4).withSize(10));
+        addMetadata(toStringId, ColumnMetadata.named("toString_id").withIndex(13).ofType(4).withSize(10));
+        addMetadata(waitId, ColumnMetadata.named("wait_id").withIndex(14).ofType(4).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFoo.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFoo.java
new file mode 100644
index 0000000000..924656ba21
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFoo.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SFoo is a Querydsl query type for SFoo
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SFoo extends com.querydsl.sql.RelationalPathBase<SFoo> {
+
+    private static final long serialVersionUID = -1389443894;
+
+    public static final SFoo foo_ = new SFoo("foo_");
+
+    public final StringPath bar = createString("bar");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final DatePath<java.sql.Date> startDate = createDate("startDate", java.sql.Date.class);
+
+    public final com.querydsl.sql.PrimaryKey<SFoo> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SFooNames> _fkb6129a8f94e297f8 = createInvForeignKey(id, "foo_id");
+
+    public SFoo(String variable) {
+        super(SFoo.class, forVariable(variable), "", "foo_");
+        addMetadata();
+    }
+
+    public SFoo(String variable, String schema, String table) {
+        super(SFoo.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SFoo(Path<? extends SFoo> path) {
+        super(path.getType(), path.getMetadata(), "", "foo_");
+        addMetadata();
+    }
+
+    public SFoo(PathMetadata metadata) {
+        super(SFoo.class, metadata, "", "foo_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(bar, ColumnMetadata.named("bar").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(startDate, ColumnMetadata.named("startDate").withIndex(3).ofType(91).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFooNames.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFooNames.java
new file mode 100644
index 0000000000..cf11c23edb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFooNames.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SFooNames is a Querydsl query type for SFooNames
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SFooNames extends com.querydsl.sql.RelationalPathBase<SFooNames> {
+
+    private static final long serialVersionUID = 982089235;
+
+    public static final SFooNames fooNames = new SFooNames("foo_names");
+
+    public final NumberPath<Integer> fooId = createNumber("fooId", Integer.class);
+
+    public final StringPath names = createString("names");
+
+    public final com.querydsl.sql.ForeignKey<SFoo> fkb6129a8f94e297f8 = createForeignKey(fooId, "id");
+
+    public SFooNames(String variable) {
+        super(SFooNames.class, forVariable(variable), "", "foo_names");
+        addMetadata();
+    }
+
+    public SFooNames(String variable, String schema, String table) {
+        super(SFooNames.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SFooNames(Path<? extends SFooNames> path) {
+        super(path.getType(), path.getMetadata(), "", "foo_names");
+        addMetadata();
+    }
+
+    public SFooNames(PathMetadata metadata) {
+        super(SFooNames.class, metadata, "", "foo_names");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(fooId, ColumnMetadata.named("foo_id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(names, ColumnMetadata.named("names").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFormula.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFormula.java
new file mode 100644
index 0000000000..3499b98074
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SFormula.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SFormula is a Querydsl query type for SFormula
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SFormula extends com.querydsl.sql.RelationalPathBase<SFormula> {
+
+    private static final long serialVersionUID = 1097200554;
+
+    public static final SFormula formula_ = new SFormula("formula_");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final NumberPath<Long> parameterId = createNumber("parameterId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SFormula> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SParameter> fk1c4adbb924189298 = createForeignKey(parameterId, "id");
+
+    public SFormula(String variable) {
+        super(SFormula.class, forVariable(variable), "", "formula_");
+        addMetadata();
+    }
+
+    public SFormula(String variable, String schema, String table) {
+        super(SFormula.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SFormula(Path<? extends SFormula> path) {
+        super(path.getType(), path.getMetadata(), "", "formula_");
+        addMetadata();
+    }
+
+    public SFormula(PathMetadata metadata) {
+        super(SFormula.class, metadata, "", "formula_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(parameterId, ColumnMetadata.named("parameter_id").withIndex(2).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SGeneratedKeys.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SGeneratedKeys.java
new file mode 100644
index 0000000000..c932818f7a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SGeneratedKeys.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SGeneratedKeys is a Querydsl query type for SGeneratedKeys
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SGeneratedKeys extends com.querydsl.sql.RelationalPathBase<SGeneratedKeys> {
+
+    private static final long serialVersionUID = 379851474;
+
+    public static final SGeneratedKeys generatedKeys = new SGeneratedKeys("GENERATED_KEYS");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SGeneratedKeys> primary = createPrimaryKey(id);
+
+    public SGeneratedKeys(String variable) {
+        super(SGeneratedKeys.class, forVariable(variable), "", "GENERATED_KEYS");
+        addMetadata();
+    }
+
+    public SGeneratedKeys(String variable, String schema, String table) {
+        super(SGeneratedKeys.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SGeneratedKeys(Path<? extends SGeneratedKeys> path) {
+        super(path.getType(), path.getMetadata(), "", "GENERATED_KEYS");
+        addMetadata();
+    }
+
+    public SGeneratedKeys(PathMetadata metadata) {
+        super(SGeneratedKeys.class, metadata, "", "GENERATED_KEYS");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(name, ColumnMetadata.named("NAME").withIndex(2).ofType(12).withSize(30));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SHumanHairs.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SHumanHairs.java
new file mode 100644
index 0000000000..be0a7cf7b7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SHumanHairs.java
@@ -0,0 +1,55 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SHumanHairs is a Querydsl query type for SHumanHairs
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SHumanHairs extends com.querydsl.sql.RelationalPathBase<SHumanHairs> {
+
+    private static final long serialVersionUID = 1372028757;
+
+    public static final SHumanHairs HumanHairs = new SHumanHairs("Human_hairs");
+
+    public final NumberPath<Integer> hairs = createNumber("hairs", Integer.class);
+
+    public final NumberPath<Long> humanId = createNumber("humanId", Long.class);
+
+    public final com.querydsl.sql.ForeignKey<SMammal> fk6649531ff097e318 = createForeignKey(humanId, "id");
+
+    public SHumanHairs(String variable) {
+        super(SHumanHairs.class, forVariable(variable), "", "Human_hairs");
+        addMetadata();
+    }
+
+    public SHumanHairs(String variable, String schema, String table) {
+        super(SHumanHairs.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SHumanHairs(Path<? extends SHumanHairs> path) {
+        super(path.getType(), path.getMetadata(), "", "Human_hairs");
+        addMetadata();
+    }
+
+    public SHumanHairs(PathMetadata metadata) {
+        super(SHumanHairs.class, metadata, "", "Human_hairs");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(hairs, ColumnMetadata.named("hairs").withIndex(2).ofType(4).withSize(10));
+        addMetadata(humanId, ColumnMetadata.named("Human_id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SInheritedproperties.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SInheritedproperties.java
new file mode 100644
index 0000000000..fe6a272ad3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SInheritedproperties.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SInheritedproperties is a Querydsl query type for SInheritedproperties
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SInheritedproperties extends com.querydsl.sql.RelationalPathBase<SInheritedproperties> {
+
+    private static final long serialVersionUID = -992601885;
+
+    public static final SInheritedproperties inheritedproperties_ = new SInheritedproperties("inheritedproperties_");
+
+    public final StringPath classProperty = createString("classProperty");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath stringAsSimple = createString("stringAsSimple");
+
+    public final StringPath superclassProperty = createString("superclassProperty");
+
+    public final com.querydsl.sql.PrimaryKey<SInheritedproperties> primary = createPrimaryKey(id);
+
+    public SInheritedproperties(String variable) {
+        super(SInheritedproperties.class, forVariable(variable), "", "inheritedproperties_");
+        addMetadata();
+    }
+
+    public SInheritedproperties(String variable, String schema, String table) {
+        super(SInheritedproperties.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SInheritedproperties(Path<? extends SInheritedproperties> path) {
+        super(path.getType(), path.getMetadata(), "", "inheritedproperties_");
+        addMetadata();
+    }
+
+    public SInheritedproperties(PathMetadata metadata) {
+        super(SInheritedproperties.class, metadata, "", "inheritedproperties_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(classProperty, ColumnMetadata.named("classProperty").withIndex(4).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(stringAsSimple, ColumnMetadata.named("stringAsSimple").withIndex(2).ofType(12).withSize(255));
+        addMetadata(superclassProperty, ColumnMetadata.named("superclassProperty").withIndex(3).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem.java
new file mode 100644
index 0000000000..c006b2e24a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem.java
@@ -0,0 +1,89 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SItem is a Querydsl query type for SItem
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SItem extends com.querydsl.sql.RelationalPathBase<SItem> {
+
+    private static final long serialVersionUID = -120177317;
+
+    public static final SItem item_ = new SItem("item_");
+
+    public final NumberPath<Long> currentStatusId = createNumber("currentStatusId", Long.class);
+
+    public final StringPath dtype = createString("dtype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final NumberPath<Integer> paymentStatus = createNumber("paymentStatus", Integer.class);
+
+    public final NumberPath<Long> productId = createNumber("productId", Long.class);
+
+    public final NumberPath<Long> statusId = createNumber("statusId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SItem> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SStatus> fk5fde7acd23307bc = createForeignKey(statusId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SStatus> fk5fde7ac9ea26263 = createForeignKey(currentStatusId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SItem> fk5fde7ac2c7f0c58 = createForeignKey(productId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SAuditlog> _fkb88fbf6ae26109c = createInvForeignKey(id, "item_id");
+
+    public final com.querydsl.sql.ForeignKey<SItem> _fk5fde7ac2c7f0c58 = createInvForeignKey(id, "product_id");
+
+    public final com.querydsl.sql.ForeignKey<SOrder_item> _fk1b5e8cbe7640c8cf = createInvForeignKey(id, "items_id");
+
+    public final com.querydsl.sql.ForeignKey<SPrice> _fkc59678362c7f0c58 = createInvForeignKey(id, "product_id");
+
+    public final com.querydsl.sql.ForeignKey<SItem_statuschange> _fkcb99fb2aedc50192 = createInvForeignKey(id, "item__id");
+
+    public final com.querydsl.sql.ForeignKey<SLineItems> _fkb2e400c3d8e44c3 = createInvForeignKey(id, "lineItems_id");
+
+    public SItem(String variable) {
+        super(SItem.class, forVariable(variable), "", "item_");
+        addMetadata();
+    }
+
+    public SItem(String variable, String schema, String table) {
+        super(SItem.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SItem(Path<? extends SItem> path) {
+        super(path.getType(), path.getMetadata(), "", "item_");
+        addMetadata();
+    }
+
+    public SItem(PathMetadata metadata) {
+        super(SItem.class, metadata, "", "item_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(currentStatusId, ColumnMetadata.named("currentStatus_id").withIndex(6).ofType(-5).withSize(19));
+        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(4).ofType(12).withSize(255));
+        addMetadata(paymentStatus, ColumnMetadata.named("paymentStatus").withIndex(3).ofType(4).withSize(10));
+        addMetadata(productId, ColumnMetadata.named("product_id").withIndex(5).ofType(-5).withSize(19));
+        addMetadata(statusId, ColumnMetadata.named("status_id").withIndex(7).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem_statuschange.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem_statuschange.java
new file mode 100644
index 0000000000..29fab8e749
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SItem_statuschange.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SItem_statuschange is a Querydsl query type for SItem_statuschange
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SItem_statuschange extends com.querydsl.sql.RelationalPathBase<SItem_statuschange> {
+
+    private static final long serialVersionUID = 210676994;
+
+    public static final SItem_statuschange item_statuschange_ = new SItem_statuschange("item__statuschange_");
+
+    public final NumberPath<Long> item_id = createNumber("item_id", Long.class);
+
+    public final NumberPath<Long> statusChangesId = createNumber("statusChangesId", Long.class);
+
+    public final com.querydsl.sql.ForeignKey<SStatuschange> fkcb99fb2ab2bd098d = createForeignKey(statusChangesId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SItem> fkcb99fb2aedc50192 = createForeignKey(item_id, "id");
+
+    public SItem_statuschange(String variable) {
+        super(SItem_statuschange.class, forVariable(variable), "", "item__statuschange_");
+        addMetadata();
+    }
+
+    public SItem_statuschange(String variable, String schema, String table) {
+        super(SItem_statuschange.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SItem_statuschange(Path<? extends SItem_statuschange> path) {
+        super(path.getType(), path.getMetadata(), "", "item__statuschange_");
+        addMetadata();
+    }
+
+    public SItem_statuschange(PathMetadata metadata) {
+        super(SItem_statuschange.class, metadata, "", "item__statuschange_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(item_id, ColumnMetadata.named("item__id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(statusChangesId, ColumnMetadata.named("statusChanges_id").withIndex(2).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittens.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittens.java
new file mode 100644
index 0000000000..624480f79a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittens.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SKittens is a Querydsl query type for SKittens
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SKittens extends com.querydsl.sql.RelationalPathBase<SKittens> {
+
+    private static final long serialVersionUID = 1947872699;
+
+    public static final SKittens kittens = new SKittens("kittens");
+
+    public final NumberPath<Integer> catId = createNumber("catId", Integer.class);
+
+    public final NumberPath<Integer> ind = createNumber("ind", Integer.class);
+
+    public final NumberPath<Integer> kittenId = createNumber("kittenId", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SKittens> primary = createPrimaryKey(catId, ind);
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> fkd60087cc3881aaa7 = createForeignKey(kittenId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> fkd60087cc8f00fdf8 = createForeignKey(catId, "id");
+
+    public SKittens(String variable) {
+        super(SKittens.class, forVariable(variable), "", "kittens");
+        addMetadata();
+    }
+
+    public SKittens(String variable, String schema, String table) {
+        super(SKittens.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SKittens(Path<? extends SKittens> path) {
+        super(path.getType(), path.getMetadata(), "", "kittens");
+        addMetadata();
+    }
+
+    public SKittens(PathMetadata metadata) {
+        super(SKittens.class, metadata, "", "kittens");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(catId, ColumnMetadata.named("cat_id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(ind, ColumnMetadata.named("ind").withIndex(3).ofType(4).withSize(10).notNull());
+        addMetadata(kittenId, ColumnMetadata.named("kitten_id").withIndex(2).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittensSet.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittensSet.java
new file mode 100644
index 0000000000..d3d2ca93ec
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SKittensSet.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SKittensSet is a Querydsl query type for SKittensSet
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SKittensSet extends com.querydsl.sql.RelationalPathBase<SKittensSet> {
+
+    private static final long serialVersionUID = -227477337;
+
+    public static final SKittensSet kittensSet = new SKittensSet("kittens_set");
+
+    public final NumberPath<Integer> catId = createNumber("catId", Integer.class);
+
+    public final NumberPath<Integer> kittenId = createNumber("kittenId", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SKittensSet> primary = createPrimaryKey(catId, kittenId);
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> fk4fccad6f8f00fdf8 = createForeignKey(catId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SAnimal> fk4fccad6f3881aaa7 = createForeignKey(kittenId, "id");
+
+    public SKittensSet(String variable) {
+        super(SKittensSet.class, forVariable(variable), "", "kittens_set");
+        addMetadata();
+    }
+
+    public SKittensSet(String variable, String schema, String table) {
+        super(SKittensSet.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SKittensSet(Path<? extends SKittensSet> path) {
+        super(path.getType(), path.getMetadata(), "", "kittens_set");
+        addMetadata();
+    }
+
+    public SKittensSet(PathMetadata metadata) {
+        super(SKittensSet.class, metadata, "", "kittens_set");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(catId, ColumnMetadata.named("cat_id").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(kittenId, ColumnMetadata.named("kitten_id").withIndex(2).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLibrary.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLibrary.java
new file mode 100644
index 0000000000..932ff4988c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLibrary.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SLibrary is a Querydsl query type for SLibrary
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SLibrary extends com.querydsl.sql.RelationalPathBase<SLibrary> {
+
+    private static final long serialVersionUID = 1480035061;
+
+    public static final SLibrary library_ = new SLibrary("library_");
+
+    public final NumberPath<Long> identity = createNumber("identity", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SLibrary> primary = createPrimaryKey(identity);
+
+    public final com.querydsl.sql.ForeignKey<SBookversion> _fkef4bc070e364cd17 = createInvForeignKey(identity, "library_identity");
+
+    public SLibrary(String variable) {
+        super(SLibrary.class, forVariable(variable), "", "library_");
+        addMetadata();
+    }
+
+    public SLibrary(String variable, String schema, String table) {
+        super(SLibrary.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SLibrary(Path<? extends SLibrary> path) {
+        super(path.getType(), path.getMetadata(), "", "library_");
+        addMetadata();
+    }
+
+    public SLibrary(PathMetadata metadata) {
+        super(SLibrary.class, metadata, "", "library_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(identity, ColumnMetadata.named("identity").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLineItems.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLineItems.java
new file mode 100644
index 0000000000..806285ed6b
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLineItems.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SLineItems is a Querydsl query type for SLineItems
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SLineItems extends com.querydsl.sql.RelationalPathBase<SLineItems> {
+
+    private static final long serialVersionUID = 302253659;
+
+    public static final SLineItems LineItems = new SLineItems("LineItems");
+
+    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
+
+    public final NumberPath<Long> lineItemsId = createNumber("lineItemsId", Long.class);
+
+    public final NumberPath<Long> order_id = createNumber("order_id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SLineItems> primary = createPrimaryKey(_index, order_id);
+
+    public final com.querydsl.sql.ForeignKey<SOrder> fkb2e400cb968f515 = createForeignKey(order_id, "id");
+
+    public final com.querydsl.sql.ForeignKey<SItem> fkb2e400c3d8e44c3 = createForeignKey(lineItemsId, "id");
+
+    public SLineItems(String variable) {
+        super(SLineItems.class, forVariable(variable), "", "LineItems");
+        addMetadata();
+    }
+
+    public SLineItems(String variable, String schema, String table) {
+        super(SLineItems.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SLineItems(Path<? extends SLineItems> path) {
+        super(path.getType(), path.getMetadata(), "", "LineItems");
+        addMetadata();
+    }
+
+    public SLineItems(PathMetadata metadata) {
+        super(SLineItems.class, metadata, "", "LineItems");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
+        addMetadata(lineItemsId, ColumnMetadata.named("lineItems_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(order_id, ColumnMetadata.named("order__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLocation.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLocation.java
new file mode 100644
index 0000000000..026eaf493d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SLocation.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SLocation is a Querydsl query type for SLocation
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SLocation extends com.querydsl.sql.RelationalPathBase<SLocation> {
+
+    private static final long serialVersionUID = 921451897;
+
+    public static final SLocation location_ = new SLocation("location_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SLocation> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SStore> _fkcad4239e8a55845c = createInvForeignKey(id, "location_id");
+
+    public SLocation(String variable) {
+        super(SLocation.class, forVariable(variable), "", "location_");
+        addMetadata();
+    }
+
+    public SLocation(String variable, String schema, String table) {
+        super(SLocation.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SLocation(Path<? extends SLocation> path) {
+        super(path.getType(), path.getMetadata(), "", "location_");
+        addMetadata();
+    }
+
+    public SLocation(PathMetadata metadata) {
+        super(SLocation.class, metadata, "", "location_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SMammal.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SMammal.java
new file mode 100644
index 0000000000..afdef21a20
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SMammal.java
@@ -0,0 +1,60 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SMammal is a Querydsl query type for SMammal
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SMammal extends com.querydsl.sql.RelationalPathBase<SMammal> {
+
+    private static final long serialVersionUID = 666678672;
+
+    public static final SMammal Mammal = new SMammal("Mammal");
+
+    public final StringPath dtype = createString("dtype");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SMammal> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SHumanHairs> _fk6649531ff097e318 = createInvForeignKey(id, "Human_id");
+
+    public final com.querydsl.sql.ForeignKey<SWorldMammal> _fk4070aeece01c8ee7 = createInvForeignKey(id, "mammals_id");
+
+    public SMammal(String variable) {
+        super(SMammal.class, forVariable(variable), "", "Mammal");
+        addMetadata();
+    }
+
+    public SMammal(String variable, String schema, String table) {
+        super(SMammal.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SMammal(Path<? extends SMammal> path) {
+        super(path.getType(), path.getMetadata(), "", "Mammal");
+        addMetadata();
+    }
+
+    public SMammal(PathMetadata metadata) {
+        super(SMammal.class, metadata, "", "Mammal");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(dtype, ColumnMetadata.named("DTYPE").withIndex(1).ofType(12).withSize(31).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(2).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SName.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SName.java
new file mode 100644
index 0000000000..acc6c42f8a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SName.java
@@ -0,0 +1,64 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SName is a Querydsl query type for SName
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SName extends com.querydsl.sql.RelationalPathBase<SName> {
+
+    private static final long serialVersionUID = -116118301;
+
+    public static final SName name_ = new SName("name_");
+
+    public final StringPath firstName = createString("firstName");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath lastName = createString("lastName");
+
+    public final StringPath nickName = createString("nickName");
+
+    public final com.querydsl.sql.PrimaryKey<SName> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCustomer> _fk600e7c4196a83d9c = createInvForeignKey(id, "name_id");
+
+    public SName(String variable) {
+        super(SName.class, forVariable(variable), "", "name_");
+        addMetadata();
+    }
+
+    public SName(String variable, String schema, String table) {
+        super(SName.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SName(Path<? extends SName> path) {
+        super(path.getType(), path.getMetadata(), "", "name_");
+        addMetadata();
+    }
+
+    public SName(PathMetadata metadata) {
+        super(SName.class, metadata, "", "name_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(nickName, ColumnMetadata.named("nickName").withIndex(4).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNameListNames.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNameListNames.java
new file mode 100644
index 0000000000..df457ebea3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNameListNames.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SNameListNames is a Querydsl query type for SNameListNames
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SNameListNames extends com.querydsl.sql.RelationalPathBase<SNameListNames> {
+
+    private static final long serialVersionUID = 150303150;
+
+    public static final SNameListNames NameListNames = new SNameListNames("NameList_names");
+
+    public final NumberPath<Long> nameListId = createNumber("nameListId", Long.class);
+
+    public final StringPath names = createString("names");
+
+    public final com.querydsl.sql.ForeignKey<SNamelist> fkd6c82d7217b6c3fc = createForeignKey(nameListId, "id");
+
+    public SNameListNames(String variable) {
+        super(SNameListNames.class, forVariable(variable), "", "NameList_names");
+        addMetadata();
+    }
+
+    public SNameListNames(String variable, String schema, String table) {
+        super(SNameListNames.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SNameListNames(Path<? extends SNameListNames> path) {
+        super(path.getType(), path.getMetadata(), "", "NameList_names");
+        addMetadata();
+    }
+
+    public SNameListNames(PathMetadata metadata) {
+        super(SNameListNames.class, metadata, "", "NameList_names");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(nameListId, ColumnMetadata.named("NameList_id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(names, ColumnMetadata.named("names").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamed.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamed.java
new file mode 100644
index 0000000000..d1411fbe04
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamed.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SNamed is a Querydsl query type for SNamed
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SNamed extends com.querydsl.sql.RelationalPathBase<SNamed> {
+
+    private static final long serialVersionUID = 695300215;
+
+    public static final SNamed named_ = new SNamed("named_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SNamed> primary = createPrimaryKey(id);
+
+    public SNamed(String variable) {
+        super(SNamed.class, forVariable(variable), "", "named_");
+        addMetadata();
+    }
+
+    public SNamed(String variable, String schema, String table) {
+        super(SNamed.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SNamed(Path<? extends SNamed> path) {
+        super(path.getType(), path.getMetadata(), "", "named_");
+        addMetadata();
+    }
+
+    public SNamed(PathMetadata metadata) {
+        super(SNamed.class, metadata, "", "named_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamelist.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamelist.java
new file mode 100644
index 0000000000..39295e4407
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNamelist.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SNamelist is a Querydsl query type for SNamelist
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SNamelist extends com.querydsl.sql.RelationalPathBase<SNamelist> {
+
+    private static final long serialVersionUID = -930763259;
+
+    public static final SNamelist namelist_ = new SNamelist("namelist_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SNamelist> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SNameListNames> _fkd6c82d7217b6c3fc = createInvForeignKey(id, "NameList_id");
+
+    public SNamelist(String variable) {
+        super(SNamelist.class, forVariable(variable), "", "namelist_");
+        addMetadata();
+    }
+
+    public SNamelist(String variable, String schema, String table) {
+        super(SNamelist.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SNamelist(Path<? extends SNamelist> path) {
+        super(path.getType(), path.getMetadata(), "", "namelist_");
+        addMetadata();
+    }
+
+    public SNamelist(PathMetadata metadata) {
+        super(SNamelist.class, metadata, "", "namelist_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNationality.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNationality.java
new file mode 100644
index 0000000000..7c24728631
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNationality.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SNationality is a Querydsl query type for SNationality
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SNationality extends com.querydsl.sql.RelationalPathBase<SNationality> {
+
+    private static final long serialVersionUID = 478851476;
+
+    public static final SNationality nationality_ = new SNationality("nationality_");
+
+    public final NumberPath<Integer> calendarId = createNumber("calendarId", Integer.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SNationality> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCalendar> fkab8efa23591ebbc = createForeignKey(calendarId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SPerson> _fkd78fcfaaf6578e38 = createInvForeignKey(id, "nationality_id");
+
+    public SNationality(String variable) {
+        super(SNationality.class, forVariable(variable), "", "nationality_");
+        addMetadata();
+    }
+
+    public SNationality(String variable, String schema, String table) {
+        super(SNationality.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SNationality(Path<? extends SNationality> path) {
+        super(path.getType(), path.getMetadata(), "", "nationality_");
+        addMetadata();
+    }
+
+    public SNationality(PathMetadata metadata) {
+        super(SNationality.class, metadata, "", "nationality_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(calendarId, ColumnMetadata.named("calendar_id").withIndex(2).ofType(4).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNumeric.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNumeric.java
new file mode 100644
index 0000000000..bcdc9c3f99
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SNumeric.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SNumeric is a Querydsl query type for SNumeric
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SNumeric extends com.querydsl.sql.RelationalPathBase<SNumeric> {
+
+    private static final long serialVersionUID = -1260757277;
+
+    public static final SNumeric numeric_ = new SNumeric("numeric_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<java.math.BigDecimal> value = createNumber("value", java.math.BigDecimal.class);
+
+    public final NumberPath<java.math.BigDecimal> value_ = createNumber("value_", java.math.BigDecimal.class);
+
+    public final com.querydsl.sql.PrimaryKey<SNumeric> primary = createPrimaryKey(id);
+
+    public SNumeric(String variable) {
+        super(SNumeric.class, forVariable(variable), "", "numeric_");
+        addMetadata();
+    }
+
+    public SNumeric(String variable, String schema, String table) {
+        super(SNumeric.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SNumeric(Path<? extends SNumeric> path) {
+        super(path.getType(), path.getMetadata(), "", "numeric_");
+        addMetadata();
+    }
+
+    public SNumeric(PathMetadata metadata) {
+        super(SNumeric.class, metadata, "", "numeric_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(value, ColumnMetadata.named("value").withIndex(2).ofType(3).withSize(19).withDigits(2));
+        addMetadata(value_, ColumnMetadata.named("value_").withIndex(3).ofType(3).withSize(19).withDigits(2));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder.java
new file mode 100644
index 0000000000..fba9be5ba0
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder.java
@@ -0,0 +1,69 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BooleanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SOrder is a Querydsl query type for SOrder
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SOrder extends com.querydsl.sql.RelationalPathBase<SOrder> {
+
+    private static final long serialVersionUID = 739361538;
+
+    public static final SOrder order_ = new SOrder("order_");
+
+    public final NumberPath<Integer> customerId = createNumber("customerId", Integer.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final BooleanPath paid = createBoolean("paid");
+
+    public final com.querydsl.sql.PrimaryKey<SOrder> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCustomer> fkc3df62d1b29c27bc = createForeignKey(customerId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SOrder_item> _fk1b5e8cbeb968f515 = createInvForeignKey(id, "order__id");
+
+    public final com.querydsl.sql.ForeignKey<SCustomer> _fk600e7c419cc457f1 = createInvForeignKey(id, "currentOrder_id");
+
+    public final com.querydsl.sql.ForeignKey<SOrderDeliveredItemIndices> _fk30cbd6611a4d2378 = createInvForeignKey(id, "Order_id");
+
+    public final com.querydsl.sql.ForeignKey<SLineItems> _fkb2e400cb968f515 = createInvForeignKey(id, "order__id");
+
+    public SOrder(String variable) {
+        super(SOrder.class, forVariable(variable), "", "order_");
+        addMetadata();
+    }
+
+    public SOrder(String variable, String schema, String table) {
+        super(SOrder.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SOrder(Path<? extends SOrder> path) {
+        super(path.getType(), path.getMetadata(), "", "order_");
+        addMetadata();
+    }
+
+    public SOrder(PathMetadata metadata) {
+        super(SOrder.class, metadata, "", "order_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(customerId, ColumnMetadata.named("customer_id").withIndex(3).ofType(4).withSize(10));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(paid, ColumnMetadata.named("paid").withIndex(2).ofType(-7).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrderDeliveredItemIndices.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrderDeliveredItemIndices.java
new file mode 100644
index 0000000000..1c12a71c90
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrderDeliveredItemIndices.java
@@ -0,0 +1,60 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SOrderDeliveredItemIndices is a Querydsl query type for SOrderDeliveredItemIndices
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SOrderDeliveredItemIndices extends com.querydsl.sql.RelationalPathBase<SOrderDeliveredItemIndices> {
+
+    private static final long serialVersionUID = 860822157;
+
+    public static final SOrderDeliveredItemIndices OrderDeliveredItemIndices = new SOrderDeliveredItemIndices("Order_deliveredItemIndices");
+
+    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
+
+    public final NumberPath<Integer> deliveredItemIndices = createNumber("deliveredItemIndices", Integer.class);
+
+    public final NumberPath<Long> orderId = createNumber("orderId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SOrderDeliveredItemIndices> primary = createPrimaryKey(orderId, _index);
+
+    public final com.querydsl.sql.ForeignKey<SOrder> fk30cbd6611a4d2378 = createForeignKey(orderId, "id");
+
+    public SOrderDeliveredItemIndices(String variable) {
+        super(SOrderDeliveredItemIndices.class, forVariable(variable), "", "Order_deliveredItemIndices");
+        addMetadata();
+    }
+
+    public SOrderDeliveredItemIndices(String variable, String schema, String table) {
+        super(SOrderDeliveredItemIndices.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SOrderDeliveredItemIndices(Path<? extends SOrderDeliveredItemIndices> path) {
+        super(path.getType(), path.getMetadata(), "", "Order_deliveredItemIndices");
+        addMetadata();
+    }
+
+    public SOrderDeliveredItemIndices(PathMetadata metadata) {
+        super(SOrderDeliveredItemIndices.class, metadata, "", "Order_deliveredItemIndices");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
+        addMetadata(deliveredItemIndices, ColumnMetadata.named("deliveredItemIndices").withIndex(2).ofType(4).withSize(10));
+        addMetadata(orderId, ColumnMetadata.named("Order_id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder_item.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder_item.java
new file mode 100644
index 0000000000..3f99a58a36
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SOrder_item.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SOrder_item is a Querydsl query type for SOrder_item
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SOrder_item extends com.querydsl.sql.RelationalPathBase<SOrder_item> {
+
+    private static final long serialVersionUID = -2131249686;
+
+    public static final SOrder_item order_item_ = new SOrder_item("order__item_");
+
+    public final NumberPath<Integer> _index = createNumber("_index", Integer.class);
+
+    public final NumberPath<Long> itemsId = createNumber("itemsId", Long.class);
+
+    public final NumberPath<Long> order_id = createNumber("order_id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SOrder_item> primary = createPrimaryKey(_index, order_id);
+
+    public final com.querydsl.sql.ForeignKey<SItem> fk1b5e8cbe7640c8cf = createForeignKey(itemsId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SOrder> fk1b5e8cbeb968f515 = createForeignKey(order_id, "id");
+
+    public SOrder_item(String variable) {
+        super(SOrder_item.class, forVariable(variable), "", "order__item_");
+        addMetadata();
+    }
+
+    public SOrder_item(String variable, String schema, String table) {
+        super(SOrder_item.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SOrder_item(Path<? extends SOrder_item> path) {
+        super(path.getType(), path.getMetadata(), "", "order__item_");
+        addMetadata();
+    }
+
+    public SOrder_item(PathMetadata metadata) {
+        super(SOrder_item.class, metadata, "", "order__item_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(_index, ColumnMetadata.named("_index").withIndex(3).ofType(4).withSize(10).notNull());
+        addMetadata(itemsId, ColumnMetadata.named("items_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(order_id, ColumnMetadata.named("order__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParameter.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParameter.java
new file mode 100644
index 0000000000..a4dcda3c26
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParameter.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SParameter is a Querydsl query type for SParameter
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SParameter extends com.querydsl.sql.RelationalPathBase<SParameter> {
+
+    private static final long serialVersionUID = 1712103815;
+
+    public static final SParameter parameter_ = new SParameter("parameter_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SParameter> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SFormula> _fk1c4adbb924189298 = createInvForeignKey(id, "parameter_id");
+
+    public SParameter(String variable) {
+        super(SParameter.class, forVariable(variable), "", "parameter_");
+        addMetadata();
+    }
+
+    public SParameter(String variable, String schema, String table) {
+        super(SParameter.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SParameter(Path<? extends SParameter> path) {
+        super(path.getType(), path.getMetadata(), "", "parameter_");
+        addMetadata();
+    }
+
+    public SParameter(PathMetadata metadata) {
+        super(SParameter.class, metadata, "", "parameter_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent.java
new file mode 100644
index 0000000000..5a438d8d2c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SParent is a Querydsl query type for SParent
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SParent extends com.querydsl.sql.RelationalPathBase<SParent> {
+
+    private static final long serialVersionUID = 1859105508;
+
+    public static final SParent parent_ = new SParent("parent_");
+
+    public final StringPath childName = createString("childName");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SParent> primary = createPrimaryKey(id);
+
+    public SParent(String variable) {
+        super(SParent.class, forVariable(variable), "", "parent_");
+        addMetadata();
+    }
+
+    public SParent(String variable, String schema, String table) {
+        super(SParent.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SParent(Path<? extends SParent> path) {
+        super(path.getType(), path.getMetadata(), "", "parent_");
+        addMetadata();
+    }
+
+    public SParent(PathMetadata metadata) {
+        super(SParent.class, metadata, "", "parent_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(childName, ColumnMetadata.named("childName").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(3).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent2.java
new file mode 100644
index 0000000000..b1d6e4eec5
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SParent2.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SParent2 is a Querydsl query type for SParent2
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SParent2 extends com.querydsl.sql.RelationalPathBase<SParent2> {
+
+    private static final long serialVersionUID = 1859105463;
+
+    public static final SParent2 Parent2 = new SParent2("Parent2");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SParent2> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SChild2> _fk783f9ab6c2dbacbc = createInvForeignKey(id, "parent_id");
+
+    public SParent2(String variable) {
+        super(SParent2.class, forVariable(variable), "", "Parent2");
+        addMetadata();
+    }
+
+    public SParent2(String variable, String schema, String table) {
+        super(SParent2.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SParent2(Path<? extends SParent2> path) {
+        super(path.getType(), path.getMetadata(), "", "Parent2");
+        addMetadata();
+    }
+
+    public SParent2(PathMetadata metadata) {
+        super(SParent2.class, metadata, "", "Parent2");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPerson.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPerson.java
new file mode 100644
index 0000000000..2b7178aac7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPerson.java
@@ -0,0 +1,72 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SPerson is a Querydsl query type for SPerson
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SPerson extends com.querydsl.sql.RelationalPathBase<SPerson> {
+
+    private static final long serialVersionUID = 1974039961;
+
+    public static final SPerson person_ = new SPerson("person_");
+
+    public final DatePath<java.sql.Date> birthDay = createDate("birthDay", java.sql.Date.class);
+
+    public final NumberPath<Long> i = createNumber("i", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final NumberPath<Long> nationalityId = createNumber("nationalityId", Long.class);
+
+    public final NumberPath<Long> pidId = createNumber("pidId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SPerson> primary = createPrimaryKey(i);
+
+    public final com.querydsl.sql.ForeignKey<SPersonid> fkd78fcfaad7999e61 = createForeignKey(pidId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SNationality> fkd78fcfaaf6578e38 = createForeignKey(nationalityId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SAccount> _fk809dbbd28cfac74 = createInvForeignKey(i, "owner_i");
+
+    public SPerson(String variable) {
+        super(SPerson.class, forVariable(variable), "", "person_");
+        addMetadata();
+    }
+
+    public SPerson(String variable, String schema, String table) {
+        super(SPerson.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SPerson(Path<? extends SPerson> path) {
+        super(path.getType(), path.getMetadata(), "", "person_");
+        addMetadata();
+    }
+
+    public SPerson(PathMetadata metadata) {
+        super(SPerson.class, metadata, "", "person_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(birthDay, ColumnMetadata.named("birthDay").withIndex(2).ofType(91).withSize(10));
+        addMetadata(i, ColumnMetadata.named("i").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(3).ofType(12).withSize(255));
+        addMetadata(nationalityId, ColumnMetadata.named("nationality_id").withIndex(4).ofType(-5).withSize(19));
+        addMetadata(pidId, ColumnMetadata.named("pid_id").withIndex(5).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPersonid.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPersonid.java
new file mode 100644
index 0000000000..e31d2c84ff
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPersonid.java
@@ -0,0 +1,61 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SPersonid is a Querydsl query type for SPersonid
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SPersonid extends com.querydsl.sql.RelationalPathBase<SPersonid> {
+
+    private static final long serialVersionUID = -1323129506;
+
+    public static final SPersonid personid_ = new SPersonid("personid_");
+
+    public final StringPath country = createString("country");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Integer> medicareNumber = createNumber("medicareNumber", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SPersonid> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SPerson> _fkd78fcfaad7999e61 = createInvForeignKey(id, "pid_id");
+
+    public SPersonid(String variable) {
+        super(SPersonid.class, forVariable(variable), "", "personid_");
+        addMetadata();
+    }
+
+    public SPersonid(String variable, String schema, String table) {
+        super(SPersonid.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SPersonid(Path<? extends SPersonid> path) {
+        super(path.getType(), path.getMetadata(), "", "personid_");
+        addMetadata();
+    }
+
+    public SPersonid(PathMetadata metadata) {
+        super(SPersonid.class, metadata, "", "personid_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(country, ColumnMetadata.named("country").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(medicareNumber, ColumnMetadata.named("medicareNumber").withIndex(3).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayer.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayer.java
new file mode 100644
index 0000000000..9e830dd07e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayer.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SPlayer is a Querydsl query type for SPlayer
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SPlayer extends com.querydsl.sql.RelationalPathBase<SPlayer> {
+
+    private static final long serialVersionUID = -2136053875;
+
+    public static final SPlayer player_ = new SPlayer("player_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SPlayer> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SPlayerScores> _fkd5dc571fd8736d5c = createInvForeignKey(id, "Player_id");
+
+    public SPlayer(String variable) {
+        super(SPlayer.class, forVariable(variable), "", "player_");
+        addMetadata();
+    }
+
+    public SPlayer(String variable, String schema, String table) {
+        super(SPlayer.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SPlayer(Path<? extends SPlayer> path) {
+        super(path.getType(), path.getMetadata(), "", "player_");
+        addMetadata();
+    }
+
+    public SPlayer(PathMetadata metadata) {
+        super(SPlayer.class, metadata, "", "player_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayerScores.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayerScores.java
new file mode 100644
index 0000000000..2f9070e43b
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPlayerScores.java
@@ -0,0 +1,55 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SPlayerScores is a Querydsl query type for SPlayerScores
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SPlayerScores extends com.querydsl.sql.RelationalPathBase<SPlayerScores> {
+
+    private static final long serialVersionUID = 1627547091;
+
+    public static final SPlayerScores PlayerScores = new SPlayerScores("Player_scores");
+
+    public final NumberPath<Long> playerId = createNumber("playerId", Long.class);
+
+    public final NumberPath<Integer> scores = createNumber("scores", Integer.class);
+
+    public final com.querydsl.sql.ForeignKey<SPlayer> fkd5dc571fd8736d5c = createForeignKey(playerId, "id");
+
+    public SPlayerScores(String variable) {
+        super(SPlayerScores.class, forVariable(variable), "", "Player_scores");
+        addMetadata();
+    }
+
+    public SPlayerScores(String variable, String schema, String table) {
+        super(SPlayerScores.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SPlayerScores(Path<? extends SPlayerScores> path) {
+        super(path.getType(), path.getMetadata(), "", "Player_scores");
+        addMetadata();
+    }
+
+    public SPlayerScores(PathMetadata metadata) {
+        super(SPlayerScores.class, metadata, "", "Player_scores");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(playerId, ColumnMetadata.named("Player_id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(scores, ColumnMetadata.named("scores").withIndex(2).ofType(4).withSize(10));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPrice.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPrice.java
new file mode 100644
index 0000000000..c5862a160c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SPrice.java
@@ -0,0 +1,62 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SPrice is a Querydsl query type for SPrice
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SPrice extends com.querydsl.sql.RelationalPathBase<SPrice> {
+
+    private static final long serialVersionUID = 768137319;
+
+    public static final SPrice price_ = new SPrice("price_");
+
+    public final NumberPath<Long> amount = createNumber("amount", Long.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> productId = createNumber("productId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SPrice> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SItem> fkc59678362c7f0c58 = createForeignKey(productId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCatalog_price> _fkaa04532f5222eaf7 = createInvForeignKey(id, "prices_id");
+
+    public SPrice(String variable) {
+        super(SPrice.class, forVariable(variable), "", "price_");
+        addMetadata();
+    }
+
+    public SPrice(String variable, String schema, String table) {
+        super(SPrice.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SPrice(Path<? extends SPrice> path) {
+        super(path.getType(), path.getMetadata(), "", "price_");
+        addMetadata();
+    }
+
+    public SPrice(PathMetadata metadata) {
+        super(SPrice.class, metadata, "", "price_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(amount, ColumnMetadata.named("amount").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(productId, ColumnMetadata.named("product_id").withIndex(3).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShapes.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShapes.java
new file mode 100644
index 0000000000..d07778b3ef
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShapes.java
@@ -0,0 +1,56 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SShapes is a Querydsl query type for SShapes
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SShapes extends com.querydsl.sql.RelationalPathBase<SShapes> {
+
+    private static final long serialVersionUID = 844563747;
+
+    public static final SShapes shapes = new SShapes("SHAPES");
+
+    public final SimplePath<byte[]> geometry = createSimple("geometry", byte[].class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<SShapes> primary = createPrimaryKey(id);
+
+    public SShapes(String variable) {
+        super(SShapes.class, forVariable(variable), "", "SHAPES");
+        addMetadata();
+    }
+
+    public SShapes(String variable, String schema, String table) {
+        super(SShapes.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SShapes(Path<? extends SShapes> path) {
+        super(path.getType(), path.getMetadata(), "", "SHAPES");
+        addMetadata();
+    }
+
+    public SShapes(PathMetadata metadata) {
+        super(SShapes.class, metadata, "", "SHAPES");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(geometry, ColumnMetadata.named("GEOMETRY").withIndex(2).ofType(-2));
+        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShow.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShow.java
new file mode 100644
index 0000000000..273b14dffb
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShow.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SShow is a Querydsl query type for SShow
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SShow extends com.querydsl.sql.RelationalPathBase<SShow> {
+
+    private static final long serialVersionUID = -111289679;
+
+    public static final SShow show_ = new SShow("show_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SShow> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SShowActs> _fk5f6ee03ab40105c = createInvForeignKey(id, "Show_id");
+
+    public SShow(String variable) {
+        super(SShow.class, forVariable(variable), "", "show_");
+        addMetadata();
+    }
+
+    public SShow(String variable, String schema, String table) {
+        super(SShow.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SShow(Path<? extends SShow> path) {
+        super(path.getType(), path.getMetadata(), "", "show_");
+        addMetadata();
+    }
+
+    public SShow(PathMetadata metadata) {
+        super(SShow.class, metadata, "", "show_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShowActs.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShowActs.java
new file mode 100644
index 0000000000..a8d470b8f2
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SShowActs.java
@@ -0,0 +1,61 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SShowActs is a Querydsl query type for SShowActs
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SShowActs extends com.querydsl.sql.RelationalPathBase<SShowActs> {
+
+    private static final long serialVersionUID = 283130543;
+
+    public static final SShowActs ShowActs = new SShowActs("Show_acts");
+
+    public final StringPath acts = createString("acts");
+
+    public final StringPath actsKEY = createString("actsKEY");
+
+    public final NumberPath<Long> showId = createNumber("showId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SShowActs> primary = createPrimaryKey(showId, actsKEY);
+
+    public final com.querydsl.sql.ForeignKey<SShow> fk5f6ee03ab40105c = createForeignKey(showId, "id");
+
+    public SShowActs(String variable) {
+        super(SShowActs.class, forVariable(variable), "", "Show_acts");
+        addMetadata();
+    }
+
+    public SShowActs(String variable, String schema, String table) {
+        super(SShowActs.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SShowActs(Path<? extends SShowActs> path) {
+        super(path.getType(), path.getMetadata(), "", "Show_acts");
+        addMetadata();
+    }
+
+    public SShowActs(PathMetadata metadata) {
+        super(SShowActs.class, metadata, "", "Show_acts");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(acts, ColumnMetadata.named("acts").withIndex(2).ofType(12).withSize(255));
+        addMetadata(actsKEY, ColumnMetadata.named("acts_KEY").withIndex(3).ofType(12).withSize(255).notNull());
+        addMetadata(showId, ColumnMetadata.named("Show_id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSimpletypes.java
similarity index 77%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSimpletypes.java
index 0c9246a985..e5db358299 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSimpletypes.java
@@ -1,21 +1,24 @@
-package com.mysema.query.jpa.domain.sql;
+package com.querydsl.jpa.domain.sql;
 
-import static com.mysema.query.types.PathMetadataFactory.*;
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import com.mysema.query.types.path.*;
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
 
-import com.mysema.query.types.PathMetadata;
 import javax.annotation.Generated;
-import com.mysema.query.types.Path;
 
-import com.mysema.query.sql.ColumnMetadata;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.ColumnMetadata;
 
 
 /**
  * SSimpletypes is a Querydsl query type for SSimpletypes
  */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SSimpletypes extends com.mysema.query.sql.RelationalPathBase<SSimpletypes> {
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SSimpletypes extends com.querydsl.sql.RelationalPathBase<SSimpletypes> {
 
     private static final long serialVersionUID = 1466962601;
 
@@ -31,7 +34,7 @@ public class SSimpletypes extends com.mysema.query.sql.RelationalPathBase<SSimpl
 
     public final StringPath cchar2 = createString("cchar2");
 
-    public final DatePath<java.sql.Date> date = createDate("date", java.sql.Date.class);
+    public final DatePath<Date> date = createDate("date", java.sql.Date.class);
 
     public final NumberPath<Double> ddouble = createNumber("ddouble", Double.class);
 
@@ -55,14 +58,14 @@ public class SSimpletypes extends com.mysema.query.sql.RelationalPathBase<SSimpl
 
     public final StringPath sstring = createString("sstring");
 
-    public final TimePath<java.sql.Time> time = createTime("time", java.sql.Time.class);
+    public final TimePath<Time> time = createTime("time", java.sql.Time.class);
 
-    public final DateTimePath<java.sql.Timestamp> timestamp = createDateTime("timestamp", java.sql.Timestamp.class);
+    public final DateTimePath<Timestamp> timestamp = createDateTime("timestamp", java.sql.Timestamp.class);
 
-    public final com.mysema.query.sql.PrimaryKey<SSimpletypes> primary = createPrimaryKey(id);
+    public final com.querydsl.sql.PrimaryKey<SSimpletypes> primary = createPrimaryKey(id);
 
     public SSimpletypes(String variable) {
-        super(SSimpletypes.class, forVariable(variable), "null", "simpletypes_");
+        super(SSimpletypes.class, forVariable(variable), "", "simpletypes_");
         addMetadata();
     }
 
@@ -72,12 +75,12 @@ public SSimpletypes(String variable, String schema, String table) {
     }
 
     public SSimpletypes(Path<? extends SSimpletypes> path) {
-        super(path.getType(), path.getMetadata(), "null", "simpletypes_");
+        super(path.getType(), path.getMetadata(), "", "simpletypes_");
         addMetadata();
     }
 
-    public SSimpletypes(PathMetadata<?> metadata) {
-        super(SSimpletypes.class, metadata, "null", "simpletypes_");
+    public SSimpletypes(PathMetadata metadata) {
+        super(SSimpletypes.class, metadata, "", "simpletypes_");
         addMetadata();
     }
 
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatus.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatus.java
new file mode 100644
index 0000000000..67cced11d1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatus.java
@@ -0,0 +1,60 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SStatus is a Querydsl query type for SStatus
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SStatus extends com.querydsl.sql.RelationalPathBase<SStatus> {
+
+    private static final long serialVersionUID = 755356828;
+
+    public static final SStatus status_ = new SStatus("status_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<SStatus> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SItem> _fk5fde7acd23307bc = createInvForeignKey(id, "status_id");
+
+    public final com.querydsl.sql.ForeignKey<SItem> _fk5fde7ac9ea26263 = createInvForeignKey(id, "currentStatus_id");
+
+    public SStatus(String variable) {
+        super(SStatus.class, forVariable(variable), "", "status_");
+        addMetadata();
+    }
+
+    public SStatus(String variable, String schema, String table) {
+        super(SStatus.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SStatus(Path<? extends SStatus> path) {
+        super(path.getType(), path.getMetadata(), "", "status_");
+        addMetadata();
+    }
+
+    public SStatus(PathMetadata metadata) {
+        super(SStatus.class, metadata, "", "status_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(name, ColumnMetadata.named("name").withIndex(2).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatuschange.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatuschange.java
new file mode 100644
index 0000000000..e33e86e55e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStatuschange.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SStatuschange is a Querydsl query type for SStatuschange
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SStatuschange extends com.querydsl.sql.RelationalPathBase<SStatuschange> {
+
+    private static final long serialVersionUID = 87971116;
+
+    public static final SStatuschange statuschange_ = new SStatuschange("statuschange_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final DateTimePath<java.sql.Timestamp> timeStamp = createDateTime("timeStamp", java.sql.Timestamp.class);
+
+    public final com.querydsl.sql.PrimaryKey<SStatuschange> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SItem_statuschange> _fkcb99fb2ab2bd098d = createInvForeignKey(id, "statusChanges_id");
+
+    public SStatuschange(String variable) {
+        super(SStatuschange.class, forVariable(variable), "", "statuschange_");
+        addMetadata();
+    }
+
+    public SStatuschange(String variable, String schema, String table) {
+        super(SStatuschange.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SStatuschange(Path<? extends SStatuschange> path) {
+        super(path.getType(), path.getMetadata(), "", "statuschange_");
+        addMetadata();
+    }
+
+    public SStatuschange(PathMetadata metadata) {
+        super(SStatuschange.class, metadata, "", "statuschange_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(timeStamp, ColumnMetadata.named("timeStamp").withIndex(2).ofType(93).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore.java
new file mode 100644
index 0000000000..f3d09d3007
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SStore is a Querydsl query type for SStore
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SStore extends com.querydsl.sql.RelationalPathBase<SStore> {
+
+    private static final long serialVersionUID = 856064975;
+
+    public static final SStore store_ = new SStore("store_");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> locationId = createNumber("locationId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SStore> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SLocation> fkcad4239e8a55845c = createForeignKey(locationId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SStore_customer> _fk82ba2ce035d2d6bb = createInvForeignKey(id, "store__id");
+
+    public SStore(String variable) {
+        super(SStore.class, forVariable(variable), "", "store_");
+        addMetadata();
+    }
+
+    public SStore(String variable, String schema, String table) {
+        super(SStore.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SStore(Path<? extends SStore> path) {
+        super(path.getType(), path.getMetadata(), "", "store_");
+        addMetadata();
+    }
+
+    public SStore(PathMetadata metadata) {
+        super(SStore.class, metadata, "", "store_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(locationId, ColumnMetadata.named("location_id").withIndex(2).ofType(-5).withSize(19));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore_customer.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore_customer.java
new file mode 100644
index 0000000000..0f2a63d530
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SStore_customer.java
@@ -0,0 +1,57 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SStore_customer is a Querydsl query type for SStore_customer
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SStore_customer extends com.querydsl.sql.RelationalPathBase<SStore_customer> {
+
+    private static final long serialVersionUID = 1343082834;
+
+    public static final SStore_customer store_customer_ = new SStore_customer("store__customer_");
+
+    public final NumberPath<Integer> customersId = createNumber("customersId", Integer.class);
+
+    public final NumberPath<Long> store_id = createNumber("store_id", Long.class);
+
+    public final com.querydsl.sql.ForeignKey<SStore> fk82ba2ce035d2d6bb = createForeignKey(store_id, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCustomer> fk82ba2ce051f3c3e5 = createForeignKey(customersId, "id");
+
+    public SStore_customer(String variable) {
+        super(SStore_customer.class, forVariable(variable), "", "store__customer_");
+        addMetadata();
+    }
+
+    public SStore_customer(String variable, String schema, String table) {
+        super(SStore_customer.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SStore_customer(Path<? extends SStore_customer> path) {
+        super(path.getType(), path.getMetadata(), "", "store__customer_");
+        addMetadata();
+    }
+
+    public SStore_customer(PathMetadata metadata) {
+        super(SStore_customer.class, metadata, "", "store__customer_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(customersId, ColumnMetadata.named("customers_id").withIndex(2).ofType(4).withSize(10).notNull());
+        addMetadata(store_id, ColumnMetadata.named("store__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSurvey.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSurvey.java
new file mode 100644
index 0000000000..1742264cc6
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SSurvey.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SSurvey is a Querydsl query type for SSurvey
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SSurvey extends com.querydsl.sql.RelationalPathBase<SSurvey> {
+
+    private static final long serialVersionUID = 857081739;
+
+    public static final SSurvey survey = new SSurvey("SURVEY");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath name = createString("name");
+
+    public final StringPath name2 = createString("name2");
+
+    public final com.querydsl.sql.PrimaryKey<SSurvey> primary = createPrimaryKey(id);
+
+    public SSurvey(String variable) {
+        super(SSurvey.class, forVariable(variable), "", "SURVEY");
+        addMetadata();
+    }
+
+    public SSurvey(String variable, String schema, String table) {
+        super(SSurvey.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SSurvey(Path<? extends SSurvey> path) {
+        super(path.getType(), path.getMetadata(), "", "SURVEY");
+        addMetadata();
+    }
+
+    public SSurvey(PathMetadata metadata) {
+        super(SSurvey.class, metadata, "", "SURVEY");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("ID").withIndex(1).ofType(4).withSize(10).notNull());
+        addMetadata(name, ColumnMetadata.named("NAME").withIndex(2).ofType(12).withSize(30));
+        addMetadata(name2, ColumnMetadata.named("NAME2").withIndex(3).ofType(12).withSize(30));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STest.java
new file mode 100644
index 0000000000..3819213b8e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STest.java
@@ -0,0 +1,50 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * STest is a Querydsl query type for STest
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class STest extends com.querydsl.sql.RelationalPathBase<STest> {
+
+    private static final long serialVersionUID = -1389036285;
+
+    public static final STest test = new STest("TEST");
+
+    public final StringPath name = createString("name");
+
+    public STest(String variable) {
+        super(STest.class, forVariable(variable), "", "TEST");
+        addMetadata();
+    }
+
+    public STest(String variable, String schema, String table) {
+        super(STest.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public STest(Path<? extends STest> path) {
+        super(path.getType(), path.getMetadata(), "", "TEST");
+        addMetadata();
+    }
+
+    public STest(PathMetadata metadata) {
+        super(STest.class, metadata, "", "TEST");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(name, ColumnMetadata.named("NAME").withIndex(1).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STimeTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STimeTest.java
new file mode 100644
index 0000000000..ee14827c12
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/STimeTest.java
@@ -0,0 +1,50 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.TimePath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * STimeTest is a Querydsl query type for STimeTest
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class STimeTest extends com.querydsl.sql.RelationalPathBase<STimeTest> {
+
+    private static final long serialVersionUID = -1454836496;
+
+    public static final STimeTest timeTest1 = new STimeTest("TIME_TEST");
+
+    public final TimePath<java.sql.Time> timeTest = createTime("timeTest", java.sql.Time.class);
+
+    public STimeTest(String variable) {
+        super(STimeTest.class, forVariable(variable), "", "TIME_TEST");
+        addMetadata();
+    }
+
+    public STimeTest(String variable, String schema, String table) {
+        super(STimeTest.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public STimeTest(Path<? extends STimeTest> path) {
+        super(path.getType(), path.getMetadata(), "", "TIME_TEST");
+        addMetadata();
+    }
+
+    public STimeTest(PathMetadata metadata) {
+        super(STimeTest.class, metadata, "", "TIME_TEST");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(timeTest, ColumnMetadata.named("TIME_TEST").withIndex(1).ofType(92).withSize(8));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser.java
new file mode 100644
index 0000000000..d1cceff6b7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser.java
@@ -0,0 +1,69 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SUser is a Querydsl query type for SUser
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUser extends com.querydsl.sql.RelationalPathBase<SUser> {
+
+    private static final long serialVersionUID = -109124701;
+
+    public static final SUser user_ = new SUser("user_");
+
+    public final NumberPath<Integer> companyId = createNumber("companyId", Integer.class);
+
+    public final StringPath firstName = createString("firstName");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath lastName = createString("lastName");
+
+    public final StringPath userName = createString("userName");
+
+    public final com.querydsl.sql.PrimaryKey<SUser> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SCompany> fk6a68df4dc953998 = createForeignKey(companyId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SEmployee> _fk9d39ef712743b59c = createInvForeignKey(id, "user_id");
+
+    public SUser(String variable) {
+        super(SUser.class, forVariable(variable), "", "user_");
+        addMetadata();
+    }
+
+    public SUser(String variable, String schema, String table) {
+        super(SUser.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SUser(Path<? extends SUser> path) {
+        super(path.getType(), path.getMetadata(), "", "user_");
+        addMetadata();
+    }
+
+    public SUser(PathMetadata metadata) {
+        super(SUser.class, metadata, "", "user_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(companyId, ColumnMetadata.named("company_id").withIndex(5).ofType(4).withSize(10));
+        addMetadata(firstName, ColumnMetadata.named("firstName").withIndex(2).ofType(12).withSize(255));
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(lastName, ColumnMetadata.named("lastName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(userName, ColumnMetadata.named("userName").withIndex(4).ofType(12).withSize(255));
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2.java
similarity index 76%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2.java
index 601d8ed1bd..bd811368c3 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/sql/SUser2.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2.java
@@ -1,21 +1,22 @@
-package com.mysema.query.jpa.domain.sql;
+package com.querydsl.jpa.domain.sql;
 
-import static com.mysema.query.types.PathMetadataFactory.*;
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import com.mysema.query.types.path.*;
-
-import com.mysema.query.types.PathMetadata;
 import javax.annotation.Generated;
-import com.mysema.query.types.Path;
 
-import com.mysema.query.sql.ColumnMetadata;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
 
 
 /**
  * SUser2 is a Querydsl query type for SUser2
  */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class SUser2 extends com.mysema.query.sql.RelationalPathBase<SUser2> {
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUser2 extends com.querydsl.sql.RelationalPathBase<SUser2> {
 
     private static final long serialVersionUID = 912100265;
 
@@ -45,12 +46,12 @@ public class SUser2 extends com.mysema.query.sql.RelationalPathBase<SUser2> {
 
     public final StringPath userPassword = createString("userPassword");
 
-    public final com.mysema.query.sql.PrimaryKey<SUser2> primary = createPrimaryKey(id);
+    public final com.querydsl.sql.PrimaryKey<SUser2> primary = createPrimaryKey(id);
 
-    public final com.mysema.query.sql.ForeignKey<SUser2_userprop> _fk4611b46af21971a1 = createInvForeignKey(id, "user2__id");
+    public final com.querydsl.sql.ForeignKey<SUser2_userprop> _fk4611b46af21971a1 = createInvForeignKey(id, "user2__id");
 
     public SUser2(String variable) {
-        super(SUser2.class, forVariable(variable), "null", "user2_");
+        super(SUser2.class, forVariable(variable), "", "user2_");
         addMetadata();
     }
 
@@ -60,12 +61,12 @@ public SUser2(String variable, String schema, String table) {
     }
 
     public SUser2(Path<? extends SUser2> path) {
-        super(path.getType(), path.getMetadata(), "null", "user2_");
+        super(path.getType(), path.getMetadata(), "", "user2_");
         addMetadata();
     }
 
-    public SUser2(PathMetadata<?> metadata) {
-        super(SUser2.class, metadata, "null", "user2_");
+    public SUser2(PathMetadata metadata) {
+        super(SUser2.class, metadata, "", "user2_");
         addMetadata();
     }
 
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2_userprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2_userprop.java
new file mode 100644
index 0000000000..d76154eba1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUser2_userprop.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SUser2_userprop is a Querydsl query type for SUser2_userprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUser2_userprop extends com.querydsl.sql.RelationalPathBase<SUser2_userprop> {
+
+    private static final long serialVersionUID = -598341912;
+
+    public static final SUser2_userprop user2_userprop_ = new SUser2_userprop("user2__userprop_");
+
+    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
+
+    public final NumberPath<Long> user2_id = createNumber("user2_id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SUser2_userprop> primary = createPrimaryKey(propertiesId, user2_id);
+
+    public final com.querydsl.sql.ForeignKey<SUser2> fk4611b46af21971a1 = createForeignKey(user2_id, "id");
+
+    public final com.querydsl.sql.ForeignKey<SUserprop> fk4611b46aa56541dd = createForeignKey(propertiesId, "id");
+
+    public SUser2_userprop(String variable) {
+        super(SUser2_userprop.class, forVariable(variable), "", "user2__userprop_");
+        addMetadata();
+    }
+
+    public SUser2_userprop(String variable, String schema, String table) {
+        super(SUser2_userprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SUser2_userprop(Path<? extends SUser2_userprop> path) {
+        super(path.getType(), path.getMetadata(), "", "user2__userprop_");
+        addMetadata();
+    }
+
+    public SUser2_userprop(PathMetadata metadata) {
+        super(SUser2_userprop.class, metadata, "", "user2__userprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(user2_id, ColumnMetadata.named("user2__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop.java
new file mode 100644
index 0000000000..9d962a79ba
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop.java
@@ -0,0 +1,84 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SUserprop is a Querydsl query type for SUserprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUserprop extends com.querydsl.sql.RelationalPathBase<SUserprop> {
+
+    private static final long serialVersionUID = -1821152608;
+
+    public static final SUserprop userprop_ = new SUserprop("userprop_");
+
+    public final StringPath categoryDescription = createString("categoryDescription");
+
+    public final StringPath categoryName = createString("categoryName");
+
+    public final NumberPath<Double> createdBy = createNumber("createdBy", Double.class);
+
+    public final DateTimePath<java.sql.Timestamp> creationDate = createDateTime("creationDate", java.sql.Timestamp.class);
+
+    public final DateTimePath<java.sql.Timestamp> deleteDate = createDateTime("deleteDate", java.sql.Timestamp.class);
+
+    public final NumberPath<Double> deletedBy = createNumber("deletedBy", Double.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final DateTimePath<java.sql.Timestamp> modificationDate = createDateTime("modificationDate", java.sql.Timestamp.class);
+
+    public final NumberPath<Double> modifiedBy = createNumber("modifiedBy", Double.class);
+
+    public final com.querydsl.sql.PrimaryKey<SUserprop> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SUserprop_category> _fk851f48d3904c19df = createInvForeignKey(id, "userprop__id");
+
+    public final com.querydsl.sql.ForeignKey<SUserprop_categoryprop> _fke0fdb7d0904c19df = createInvForeignKey(id, "userprop__id");
+
+    public final com.querydsl.sql.ForeignKey<SUser2_userprop> _fk4611b46aa56541dd = createInvForeignKey(id, "properties_id");
+
+    public SUserprop(String variable) {
+        super(SUserprop.class, forVariable(variable), "", "userprop_");
+        addMetadata();
+    }
+
+    public SUserprop(String variable, String schema, String table) {
+        super(SUserprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SUserprop(Path<? extends SUserprop> path) {
+        super(path.getType(), path.getMetadata(), "", "userprop_");
+        addMetadata();
+    }
+
+    public SUserprop(PathMetadata metadata) {
+        super(SUserprop.class, metadata, "", "userprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(categoryDescription, ColumnMetadata.named("categoryDescription").withIndex(2).ofType(12).withSize(255));
+        addMetadata(categoryName, ColumnMetadata.named("categoryName").withIndex(3).ofType(12).withSize(255));
+        addMetadata(createdBy, ColumnMetadata.named("createdBy").withIndex(4).ofType(8).withSize(22).notNull());
+        addMetadata(creationDate, ColumnMetadata.named("creationDate").withIndex(5).ofType(93).withSize(19));
+        addMetadata(deleteDate, ColumnMetadata.named("deleteDate").withIndex(6).ofType(93).withSize(19));
+        addMetadata(deletedBy, ColumnMetadata.named("deletedBy").withIndex(7).ofType(8).withSize(22).notNull());
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+        addMetadata(modificationDate, ColumnMetadata.named("modificationDate").withIndex(8).ofType(93).withSize(19));
+        addMetadata(modifiedBy, ColumnMetadata.named("modifiedBy").withIndex(9).ofType(8).withSize(22).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_category.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_category.java
new file mode 100644
index 0000000000..e2518d3c23
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_category.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SUserprop_category is a Querydsl query type for SUserprop_category
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUserprop_category extends com.querydsl.sql.RelationalPathBase<SUserprop_category> {
+
+    private static final long serialVersionUID = 301952129;
+
+    public static final SUserprop_category userprop_category_ = new SUserprop_category("userprop__category_");
+
+    public final NumberPath<Long> childCategoriesId = createNumber("childCategoriesId", Long.class);
+
+    public final NumberPath<Long> userprop_id = createNumber("userprop_id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SUserprop_category> primary = createPrimaryKey(childCategoriesId, userprop_id);
+
+    public final com.querydsl.sql.ForeignKey<SUserprop> fk851f48d3904c19df = createForeignKey(userprop_id, "id");
+
+    public final com.querydsl.sql.ForeignKey<SCategory> fk851f48d37ab543e8 = createForeignKey(childCategoriesId, "id");
+
+    public SUserprop_category(String variable) {
+        super(SUserprop_category.class, forVariable(variable), "", "userprop__category_");
+        addMetadata();
+    }
+
+    public SUserprop_category(String variable, String schema, String table) {
+        super(SUserprop_category.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SUserprop_category(Path<? extends SUserprop_category> path) {
+        super(path.getType(), path.getMetadata(), "", "userprop__category_");
+        addMetadata();
+    }
+
+    public SUserprop_category(PathMetadata metadata) {
+        super(SUserprop_category.class, metadata, "", "userprop__category_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(childCategoriesId, ColumnMetadata.named("childCategories_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(userprop_id, ColumnMetadata.named("userprop__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_categoryprop.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_categoryprop.java
new file mode 100644
index 0000000000..4a8f0c5450
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SUserprop_categoryprop.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SUserprop_categoryprop is a Querydsl query type for SUserprop_categoryprop
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SUserprop_categoryprop extends com.querydsl.sql.RelationalPathBase<SUserprop_categoryprop> {
+
+    private static final long serialVersionUID = -190294914;
+
+    public static final SUserprop_categoryprop userprop_categoryprop_ = new SUserprop_categoryprop("userprop__categoryprop_");
+
+    public final NumberPath<Long> propertiesId = createNumber("propertiesId", Long.class);
+
+    public final NumberPath<Long> userprop_id = createNumber("userprop_id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SUserprop_categoryprop> primary = createPrimaryKey(propertiesId, userprop_id);
+
+    public final com.querydsl.sql.ForeignKey<SCategoryprop> fke0fdb7d0fd94cd90 = createForeignKey(propertiesId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SUserprop> fke0fdb7d0904c19df = createForeignKey(userprop_id, "id");
+
+    public SUserprop_categoryprop(String variable) {
+        super(SUserprop_categoryprop.class, forVariable(variable), "", "userprop__categoryprop_");
+        addMetadata();
+    }
+
+    public SUserprop_categoryprop(String variable, String schema, String table) {
+        super(SUserprop_categoryprop.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SUserprop_categoryprop(Path<? extends SUserprop_categoryprop> path) {
+        super(path.getType(), path.getMetadata(), "", "userprop__categoryprop_");
+        addMetadata();
+    }
+
+    public SUserprop_categoryprop(PathMetadata metadata) {
+        super(SUserprop_categoryprop.class, metadata, "", "userprop__categoryprop_");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(propertiesId, ColumnMetadata.named("properties_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(userprop_id, ColumnMetadata.named("userprop__id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorld.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorld.java
new file mode 100644
index 0000000000..f3d8dc8ed1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorld.java
@@ -0,0 +1,54 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SWorld is a Querydsl query type for SWorld
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SWorld extends com.querydsl.sql.RelationalPathBase<SWorld> {
+
+    private static final long serialVersionUID = -107384511;
+
+    public static final SWorld World = new SWorld("World");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SWorld> primary = createPrimaryKey(id);
+
+    public final com.querydsl.sql.ForeignKey<SWorldMammal> _fk4070aeecd3538cf8 = createInvForeignKey(id, "World_id");
+
+    public SWorld(String variable) {
+        super(SWorld.class, forVariable(variable), "", "World");
+        addMetadata();
+    }
+
+    public SWorld(String variable, String schema, String table) {
+        super(SWorld.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SWorld(Path<? extends SWorld> path) {
+        super(path.getType(), path.getMetadata(), "", "World");
+        addMetadata();
+    }
+
+    public SWorld(PathMetadata metadata) {
+        super(SWorld.class, metadata, "", "World");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorldMammal.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorldMammal.java
new file mode 100644
index 0000000000..2da2164931
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/sql/SWorldMammal.java
@@ -0,0 +1,59 @@
+package com.querydsl.jpa.domain.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+
+
+/**
+ * SWorldMammal is a Querydsl query type for SWorldMammal
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class SWorldMammal extends com.querydsl.sql.RelationalPathBase<SWorldMammal> {
+
+    private static final long serialVersionUID = 979697152;
+
+    public static final SWorldMammal WorldMammal = new SWorldMammal("World_Mammal");
+
+    public final NumberPath<Long> mammalsId = createNumber("mammalsId", Long.class);
+
+    public final NumberPath<Long> worldId = createNumber("worldId", Long.class);
+
+    public final com.querydsl.sql.PrimaryKey<SWorldMammal> primary = createPrimaryKey(worldId, mammalsId);
+
+    public final com.querydsl.sql.ForeignKey<SMammal> fk4070aeece01c8ee7 = createForeignKey(mammalsId, "id");
+
+    public final com.querydsl.sql.ForeignKey<SWorld> fk4070aeecd3538cf8 = createForeignKey(worldId, "id");
+
+    public SWorldMammal(String variable) {
+        super(SWorldMammal.class, forVariable(variable), "", "World_Mammal");
+        addMetadata();
+    }
+
+    public SWorldMammal(String variable, String schema, String table) {
+        super(SWorldMammal.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public SWorldMammal(Path<? extends SWorldMammal> path) {
+        super(path.getType(), path.getMetadata(), "", "World_Mammal");
+        addMetadata();
+    }
+
+    public SWorldMammal(PathMetadata metadata) {
+        super(SWorldMammal.class, metadata, "", "World_Mammal");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(mammalsId, ColumnMetadata.named("mammals_id").withIndex(2).ofType(-5).withSize(19).notNull());
+        addMetadata(worldId, ColumnMetadata.named("World_id").withIndex(1).ofType(-5).withSize(19).notNull());
+    }
+
+}
+
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Category.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Category.java
similarity index 88%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Category.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Category.java
index fe2bd47b06..da36a8b945 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Category.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Category.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,50 +11,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 
 @Entity
-@Table(name="category_")
+@Table(name = "category_")
 public class Category {
 
     @Id
     private long id;
-    
+
     private String categoryName;
-    
+
     private String categoryDescription;
-    
+
     private double createdBy;
-    
+
     private double modifiedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date creationDate;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date modificationDate;
-    
+
     private double deletedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date deleteDate;
-    
+
     @OneToMany
     @JoinTable(joinColumns = @JoinColumn(name = "parentId"), inverseJoinColumns = @JoinColumn(name = "childId"))
     private Set<Category> childCategories;
-    
+
     @OneToMany
     private Set<CategoryProp> properties;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/CategoryProp.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/CategoryProp.java
similarity index 90%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/CategoryProp.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/CategoryProp.java
index cc3d6cbbcb..494a31046b 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/CategoryProp.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/CategoryProp.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,23 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="categoryprop_")
+@Table(name = "categoryprop_")
 public class CategoryProp {
 
     @Id
     private long id;
-    
+
     private long categoryId;
-    
+
     private String propName;
-    
+
     private String propValue;
 
     public long getId() {
@@ -61,5 +61,5 @@ public String getPropValue() {
     public void setPropValue(String propValue) {
         this.propValue = propValue;
     }
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Child.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Child.java
new file mode 100644
index 0000000000..de148c35b9
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Child.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain2;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class Child {
+
+    private String childName;
+
+    public String getChildName() {
+        return childName;
+    }
+
+    public void setChildName(String childName) {
+        this.childName = childName;
+    }
+
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Contact.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Contact.java
new file mode 100644
index 0000000000..b58a868aae
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Contact.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain2;
+
+public class Contact {
+
+    private long id;
+
+    private String firstName, lastName, email;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Document2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Document2.java
similarity index 91%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Document2.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Document2.java
index 07314f0737..6115e5679f 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Document2.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Document2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,50 +11,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import java.util.Date;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 
 @Entity
-@Table(name="document2_")
+@Table(name = "document2_")
 public class Document2 {
-    
+
     @Id
     private long id;
-    
+
     private String documentTitle;
-    
+
     private String documentBody;
-    
+
     private String documentSummary;
-    
+
     private double createdBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date creationDate;
-    
+
     private double modifiedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date modificationDate;
-    
+
     private double deletedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date deletedDate;
-    
+
     private double documentVersion;
 
     private double documentStatus;
-    
+
     private double entryId;
-    
+
     public long getId() {
         return id;
     }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/DocumentProp.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/DocumentProp.java
similarity index 91%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/DocumentProp.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/DocumentProp.java
index 0b63548d14..0746e96447 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/DocumentProp.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/DocumentProp.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,23 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(name="documentprop_")
+@Table(name = "documentprop_")
 public class DocumentProp {
 
     @Id
     private long id;
-    
+
     private double documentId;
-    
+
     private String propName, propValue, propValueDetails;
-    
+
     public long getId() {
         return id;
     }
@@ -67,5 +67,5 @@ public String getPropValueDetails() {
     public void setPropValueDetails(String propValueDetails) {
         this.propValueDetails = propValueDetails;
     }
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Domain2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Domain2.java
similarity index 76%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Domain2.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Domain2.java
index 00b4a655d4..541b3ba4ca 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/Domain2.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Domain2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,22 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import java.util.Arrays;
 import java.util.List;
 
 public final class Domain2 {
-    
-    private Domain2() {}
+
+    private Domain2() { }
 
     public static final List<Class<?>> classes = Arrays.<Class<?>>asList(
-            Category.class, 
-            CategoryProp.class, 
+            Category.class,
+            CategoryProp.class,
             Contact.class,
-            Document2.class, 
+            Document2.class,
             DocumentProp.class,
-            User2.class, 
+            User2.class,
             UserProp.class);
 
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Parent.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Parent.java
new file mode 100644
index 0000000000..919c27d759
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/Parent.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain2;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "parent_")
+public class Parent {
+
+    @Id
+    private long id;
+
+    private String name;
+
+    @Embedded
+    private Child child;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Child getChild() {
+        return child;
+    }
+
+    public void setChild(Child child) {
+        this.child = child;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/User2.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/User2.java
similarity index 90%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/User2.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/User2.java
index b7f5659830..6d3f99411a 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/User2.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/User2.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,45 +11,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 
 @Entity
-@Table(name="user2_")
+@Table(name = "user2_")
 public class User2 {
 
     @Id
     private long id;
-    
+
     private String userName, userPassword, userFirstName, userEmail, userLastName;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date creationDate;
-    
+
     private double createdBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date modificationDate;
-    
+
     private double modifiedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date deleteDate;
-    
+
     private double deletedBy;
-    
+
     @OneToMany
     private Set<UserProp> properties;
-    
+
     public long getId() {
         return id;
     }
@@ -154,5 +149,5 @@ public void setProperties(Set<UserProp> properties) {
         this.properties = properties;
     }
 
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/UserProp.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/UserProp.java
similarity index 89%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/UserProp.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/UserProp.java
index f83aa5b42b..67e282ab83 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain2/UserProp.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain2/UserProp.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,48 +11,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain2;
+package com.querydsl.jpa.domain2;
 
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 
 @Entity
-@Table(name="userprop_")
+@Table(name = "userprop_")
 public class UserProp {
-    
+
     @Id
     private long id;
 
     private String categoryName, categoryDescription;
-    
+
     private double createdBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date creationDate;
-    
+
     private double modifiedBy;
-    
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date modificationDate;
-    
+
     private double deletedBy;
 
     @Temporal(TemporalType.TIMESTAMP)
     private Date deleteDate;
-    
+
     @OneToMany
     private Set<Category> childCategories;
-    
+
     @OneToMany
     private Set<CategoryProp> properties;
-    
+
     public long getId() {
         return id;
     }
@@ -140,6 +135,6 @@ public Set<CategoryProp> getProperties() {
     public void setProperties(Set<CategoryProp> properties) {
         this.properties = properties;
     }
-    
-}    
+
+}
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/HardwareStore.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/HardwareStore.java
similarity index 84%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/HardwareStore.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/HardwareStore.java
index 4c6f8e388e..74437b389d 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain3/HardwareStore.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/HardwareStore.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.jpa.domain3;
+package com.querydsl.jpa.domain3;
+
+public class HardwareStore extends Store {
 
-public class HardwareStore extends Store{
-    
     private static final long serialVersionUID = 2725944536560445206L;
-    
+
     private String storeCode;
 
     public String getStoreCode() {
@@ -26,5 +26,5 @@ public String getStoreCode() {
     public void setStoreCode(String storeCode) {
         this.storeCode = storeCode;
     }
-    
+
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/Store.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/Store.java
new file mode 100644
index 0000000000..f15e3d43c4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain3/Store.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain3;
+
+import java.io.Serializable;
+
+public class Store implements Serializable {
+
+    private static final long serialVersionUID = 7221730732392000227L;
+
+    private String code;
+
+    private String name;
+
+    private String address;
+
+    private String city;
+
+    private String phoneDetails;
+
+    private String faxDetails;
+
+    private String zipCode;
+
+    private String chainCode;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getPhoneDetails() {
+        return phoneDetails;
+    }
+
+    public void setPhoneDetails(String phoneDetails) {
+        this.phoneDetails = phoneDetails;
+    }
+
+    public String getFaxDetails() {
+        return faxDetails;
+    }
+
+    public void setFaxDetails(String faxDetails) {
+        this.faxDetails = faxDetails;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public String getChainCode() {
+        return chainCode;
+    }
+
+    public void setChainCode(String chainCode) {
+        this.chainCode = chainCode;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookDefinition.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookDefinition.java
new file mode 100644
index 0000000000..a4e25cd126
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookDefinition.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.*;
+
+@Embeddable
+@Access(AccessType.PROPERTY)
+public class BookDefinition implements Serializable {
+
+    private static final long serialVersionUID = 3570098308959717614L;
+
+    private String name;
+
+    private String description;
+
+    private List<BookMark> bookMarks;
+
+    @Basic
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Basic
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @ElementCollection()
+    @CollectionTable(name = "book_bookmarks")
+    @OrderColumn()
+    public List<BookMark> getBookMarks() {
+        return bookMarks;
+    }
+
+    public void setBookMarks(List<BookMark> bookMarks) {
+        this.bookMarks = bookMarks;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookID.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookID.java
new file mode 100644
index 0000000000..2fb13f4dc7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookID.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "bookid_")
+@Access(AccessType.PROPERTY)
+public class BookID implements Serializable {
+
+    private static final long serialVersionUID = -3205025118656391776L;
+
+    private Long identity;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public Long getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Long identity) {
+        this.identity = identity;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookMark.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookMark.java
new file mode 100644
index 0000000000..3dad83088a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookMark.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Basic;
+import javax.persistence.Embeddable;
+
+@Embeddable
+@Access(AccessType.PROPERTY)
+public class BookMark implements Serializable {
+
+    private static final long serialVersionUID = 8027009758015834551L;
+
+    private Long page;
+
+    private String comment;
+
+    @Basic
+    public Long getPage() {
+        return page;
+    }
+
+    public void setPage(Long page) {
+        this.page = page;
+    }
+
+    @Basic
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersion.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersion.java
new file mode 100644
index 0000000000..5b69aa2d1c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersion.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "bookversion_")
+@Access(AccessType.PROPERTY)
+public class BookVersion implements Serializable {
+
+    private static final long serialVersionUID = -1697470794339057030L;
+
+    private BookID bookID;
+
+    private BookVersionPK pk = new BookVersionPK();
+
+    private Library library;
+
+    private BookDefinition definition;
+
+    @EmbeddedId
+    public BookVersionPK getPk() {
+        return pk;
+    }
+
+    public void setPk(BookVersionPK pk) {
+        this.pk = pk;
+    }
+
+    @MapsId("bookID")
+    @ManyToOne(cascade = CascadeType.ALL)
+    public BookID getBookID() {
+        return bookID;
+    }
+
+    public void setBookID(BookID bookID) {
+        this.bookID = bookID;
+    }
+
+    @MapsId("library")
+    @ManyToOne(cascade = CascadeType.ALL)
+    public Library getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(Library library) {
+        this.library = library;
+    }
+
+    @Embedded
+    public BookDefinition getDefinition() {
+        return definition;
+    }
+
+    public void setDefinition(BookDefinition definition) {
+        this.definition = definition;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersionPK.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersionPK.java
new file mode 100644
index 0000000000..3719a302c1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/BookVersionPK.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class BookVersionPK implements Serializable {
+
+    private static final long serialVersionUID = 8483495681236266676L;
+
+    private Long bookID;
+
+    private Long library;
+
+    public Long getBookID() {
+        return bookID;
+    }
+
+    public void setBookID(Long bookID) {
+        this.bookID = bookID;
+    }
+
+    public Long getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(Long library) {
+        this.library = library;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/Library.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/Library.java
new file mode 100644
index 0000000000..d583587998
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain4/Library.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.jpa.domain4;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "library_")
+@Access(AccessType.PROPERTY)
+public class Library implements Serializable {
+
+    private static final long serialVersionUID = 6360420736014459567L;
+
+    private Long identity;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public Long getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(Long identity) {
+        this.identity = identity;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java
new file mode 100644
index 0000000000..dd0215c46b
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java
@@ -0,0 +1,9 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.*;
+
+@Embeddable
+public class MyEmbeddedAttribute {
+    @ManyToOne
+    private MyOtherEntity attributeWithInitProblem;
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java
new file mode 100644
index 0000000000..cb3e786d6d
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java
@@ -0,0 +1,18 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import com.querydsl.core.annotations.QueryInit;
+
+@Entity
+public class MyEntity extends MyMappedSuperclass {
+
+    @Id
+    private int id;
+
+    @Embedded
+    @QueryInit("*")
+    private MyEmbeddedAttribute embeddedAttribute;
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java
new file mode 100644
index 0000000000..d23b284954
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java
@@ -0,0 +1,8 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class MyMappedSuperclass {
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java
new file mode 100644
index 0000000000..3b47b32ff3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyOtherEntity {
+
+    @Id
+    private int id;
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java
new file mode 100644
index 0000000000..efc617ee83
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java
@@ -0,0 +1,18 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.AfterClass;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import com.querydsl.jpa.Mode;
+
+@RunWith(Enclosed.class)
+public abstract class AbstractJPASuite {
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        Mode.mode.remove();
+        Mode.target.remove();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java
new file mode 100644
index 0000000000..ab5b32e3e7
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java
@@ -0,0 +1,18 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.AfterClass;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import com.querydsl.jpa.Mode;
+
+@RunWith(Enclosed.class)
+public abstract class AbstractSuite {
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        Mode.mode.remove();
+        Mode.target.remove();
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java
new file mode 100644
index 0000000000..be1db4bdc1
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java
@@ -0,0 +1,40 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.jpa.*;
+
+@Category(Derby.class)
+public class DerbyEclipseLinkTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase {
+        @Override
+        public void order_stringValue() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_to_integer() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_toLong() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_toBigInteger() {
+            // not supported in MySQL/EclipseLink
+        }
+    }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("derby-eclipselink");
+        Mode.target.set(Target.DERBY);
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java
new file mode 100644
index 0000000000..17c9ccc244
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.jpa.*;
+
+@Category(Derby.class)
+public class DerbySuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("derby");
+        Mode.target.set(Target.DERBY);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java
new file mode 100644
index 0000000000..f66a20afab
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.jpa.*;
+
+@Ignore
+@Category(H2.class)
+public class H2BatooTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("h2-batoo");
+        Mode.target.set(Target.H2);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java
new file mode 100644
index 0000000000..d630a36866
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.jpa.*;
+
+@Category(H2.class)
+public class H2EclipseLinkTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("h2-eclipselink");
+        Mode.target.set(Target.H2);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java
new file mode 100644
index 0000000000..13a7003375
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.jpa.*;
+
+@Ignore
+@Category(H2.class)
+public class H2OpenJPATest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("h2-openjpa");
+        Mode.target.set(Target.H2);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java
new file mode 100644
index 0000000000..8e47b8951a
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.jpa.*;
+
+@Category(H2.class)
+public class H2SuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("h2");
+        Mode.target.set(Target.H2);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java
new file mode 100644
index 0000000000..3c90589825
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.HSQLDB;
+import com.querydsl.jpa.*;
+
+@Category(HSQLDB.class)
+public class HSQLDBEclipseLinkTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("hsqldb-eclipselink");
+        Mode.target.set(Target.HSQLDB);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java
new file mode 100644
index 0000000000..4158032174
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.HSQLDB;
+import com.querydsl.jpa.*;
+
+@Category(HSQLDB.class)
+public class HSQLDBSuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("hsqldb");
+        Mode.target.set(Target.HSQLDB);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java
new file mode 100644
index 0000000000..efe1448c8e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.jpa.*;
+
+@Category(SQLServer.class)
+public class MSSQLSuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("mssql");
+        Mode.target.set(Target.SQLSERVER);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java
new file mode 100644
index 0000000000..022fcfd905
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java
@@ -0,0 +1,58 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.jpa.*;
+
+@Category(MySQL.class)
+public class MySQLEclipseLinkTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase {
+        @Override
+        public void cast() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void enum_startsWith() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_to_integer() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_toLong() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_stringValue_toBigInteger() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_nullsFirst() {
+            // not supported in MySQL/EclipseLink
+        }
+        @Override
+        public void order_nullsLast() {
+            // not supported in MySQL/EclipseLink
+        }
+    }
+
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("mysql-eclipselink");
+        Mode.target.set(Target.MYSQL);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java
new file mode 100644
index 0000000000..ff980b8fa4
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java
@@ -0,0 +1,36 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.jpa.*;
+
+@Category(MySQL.class)
+public class MySQLSuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase {
+        @Override
+        public void order_stringValue_toLong() {
+            // not supported
+        }
+    }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase {
+        @Override
+        public void order_stringValue_toLong() {
+            // not supported
+        }
+    }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("mysql");
+        Mode.target.set(Target.MYSQL);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
new file mode 100644
index 0000000000..1533578bb3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java
@@ -0,0 +1,42 @@
+package com.querydsl.jpa.suites;
+
+import java.util.TimeZone;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.Oracle;
+import com.querydsl.jpa.*;
+
+@Category(Oracle.class)
+public class OracleSuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    private static TimeZone defaultZone;
+    
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("oracle");
+        Mode.target.set(Target.ORACLE);
+        
+        // change time zone to work around ORA-01882
+        // see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
+        // the test may work fine on your machine without this, but it fails when the GitHub runner executes it
+        defaultZone = TimeZone.getDefault();
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+    
+    @AfterClass
+    public static void tearDown() {
+        TimeZone.setDefault(defaultZone);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java
new file mode 100644
index 0000000000..464c70d41b
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.jpa.*;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLEclipseLinkSuiteTest extends AbstractJPASuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("postgresql-eclipselink");
+        Mode.target.set(Target.POSTGRESQL);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java
new file mode 100644
index 0000000000..00aea8148e
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java
@@ -0,0 +1,26 @@
+package com.querydsl.jpa.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.jpa.*;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLSuiteTest extends AbstractSuite {
+
+    public static class JPA extends JPABase { }
+    public static class JPASQL extends JPASQLBase { }
+    public static class JPAIntegration extends JPAIntegrationBase { }
+    public static class Serialization extends SerializationBase { }
+    public static class Hibernate extends HibernateBase { }
+    public static class HibernateSQL extends HibernateSQLBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Mode.mode.set("postgresql");
+        Mode.target.set(Target.POSTGRESQL);
+    }
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java
new file mode 100644
index 0000000000..5391cbaa9c
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java
@@ -0,0 +1,20 @@
+package com.querydsl.jpa.support;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Template;
+import com.querydsl.sql.HSQLDBTemplates;
+
+public class DialectSupportTest {
+
+    @Test
+    public void convert() {
+        Template trim = HSQLDBTemplates.DEFAULT.getTemplate(Ops.TRIM);
+        assertEquals("trim(both from ?1)", DialectSupport.convert(trim));
+        Template concat = HSQLDBTemplates.DEFAULT.getTemplate(Ops.CONCAT);
+        assertEquals("?1 || ?2", DialectSupport.convert(concat));
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java
new file mode 100644
index 0000000000..6387607dd3
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java
@@ -0,0 +1,40 @@
+package com.querydsl.jpa.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Collection;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.jpa.domain.Cat;
+
+public class JPAPathBuilderValidatorTest {
+
+    private EntityManagerFactory entityManagerFactory;
+
+    @Before
+    public void setUp() {
+        entityManagerFactory = Persistence.createEntityManagerFactory("h2");
+    }
+
+    @After
+    public void tearDown() {
+        entityManagerFactory.close();
+    }
+
+    @Test
+    public void validate() {
+        JPAPathBuilderValidator validator = new JPAPathBuilderValidator(entityManagerFactory.getMetamodel());
+        assertEquals(String.class, validator.validate(Cat.class, "name", String.class));
+        assertEquals(Cat.class, validator.validate(Cat.class, "kittens", Collection.class));
+        assertEquals(Cat.class, validator.validate(Cat.class, "mate", Cat.class));
+        assertNull(validator.validate(Cat.class, "xxx", String.class));
+        assertNull(validator.validate(Object.class, "name", String.class));
+    }
+}
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/TeradataDialect.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/TeradataDialect.java
similarity index 81%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/support/TeradataDialect.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/support/TeradataDialect.java
index 75cac04001..78ad1544da 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/support/TeradataDialect.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/TeradataDialect.java
@@ -1,424 +1,376 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
- *
- */
-package com.mysema.query.jpa.support;
-
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-
-import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.dialect.function.VarArgsSQLFunction;
-import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtracter;
-import org.hibernate.exception.spi.ViolatedConstraintNameExtracter;
-import org.hibernate.type.StandardBasicTypes;
-
-/**
- * A dialect for the Teradata database created by MCR as part of the dialect
- * certification process.
- *
- * @author Jay Nance
- */
-public class TeradataDialect extends Dialect {
-
-    /**
-     * Constructor
-     */
-    public TeradataDialect() {
-        super();
-        // registerColumnType data types
-        registerColumnType(Types.NUMERIC, "NUMERIC($p,$s)");
-        registerColumnType(Types.DOUBLE, "DOUBLE PRECISION");
-        registerColumnType(Types.BIGINT, "NUMERIC(18,0)");
-        registerColumnType(Types.BIT, "BYTEINT");
-        registerColumnType(Types.TINYINT, "BYTEINT");
-        registerColumnType(Types.VARBINARY, "VARBYTE($l)");
-        registerColumnType(Types.BINARY, "BYTEINT");
-        registerColumnType(Types.LONGVARCHAR, "LONG VARCHAR");
-        registerColumnType(Types.CHAR, "CHAR(1)");
-        registerColumnType(Types.DECIMAL, "DECIMAL");
-        registerColumnType(Types.INTEGER, "INTEGER");
-        registerColumnType(Types.SMALLINT, "SMALLINT");
-        registerColumnType(Types.FLOAT, "FLOAT");
-        registerColumnType(Types.VARCHAR, "VARCHAR($l)");
-        registerColumnType(Types.DATE, "DATE");
-        registerColumnType(Types.TIME, "TIME");
-        registerColumnType(Types.TIMESTAMP, "TIMESTAMP");
-        registerColumnType(Types.BOOLEAN, "BYTEINT"); // hibernate seems to
-                                                      // ignore this type...
-        registerColumnType(Types.BLOB, "BLOB");
-        registerColumnType(Types.CLOB, "CLOB");
-
-        registerFunction("year", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
-                "extract(year from ?1)"));
-        registerFunction("length", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
-                "character_length(?1)"));
-        registerFunction("concat",
-                new VarArgsSQLFunction(StandardBasicTypes.STRING, "(", "||", ")"));
-        registerFunction("substring", new SQLFunctionTemplate(StandardBasicTypes.STRING,
-                "substring(?1 from ?2 for ?3)"));
-        registerFunction("locate", new SQLFunctionTemplate(StandardBasicTypes.STRING,
-                "position(?1 in ?2)"));
-        registerFunction("mod", new SQLFunctionTemplate(StandardBasicTypes.STRING, "?1 mod ?2"));
-        registerFunction("str", new SQLFunctionTemplate(StandardBasicTypes.STRING,
-                "cast(?1 as varchar(255))"));
-
-        // bit_length feels a bit broken to me. We have to cast to char in order
-        // to
-        // pass when a numeric value is supplied. But of course the answers
-        // given will
-        // be wildly different for these two datatypes. 1234.5678 will be 9
-        // bytes as
-        // a char string but will be 8 or 16 bytes as a true numeric.
-        // Jay Nance 2006-09-22
-        registerFunction("bit_length", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
-                "octet_length(cast(?1 as char))*4"));
-
-        // The preference here would be
-        // SQLFunctionTemplate( Hibernate.TIMESTAMP, "current_timestamp(?1)",
-        // false)
-        // but this appears not to work.
-        // Jay Nance 2006-09-22
-        registerFunction("current_timestamp", new SQLFunctionTemplate(StandardBasicTypes.TIMESTAMP,
-                "current_timestamp"));
-        registerFunction("current_time", new SQLFunctionTemplate(StandardBasicTypes.TIME,
-                "current_time"));
-        registerFunction("current_date", new SQLFunctionTemplate(StandardBasicTypes.DATE,
-                "current_date"));
-        // IBID for current_time and current_date
-
-        registerKeyword("account");
-        registerKeyword("alias");
-        registerKeyword("class");
-        registerKeyword("column");
-        registerKeyword("first");
-        registerKeyword("map");
-        registerKeyword("month");
-        registerKeyword("password");
-        registerKeyword("role");
-        registerKeyword("summary");
-        registerKeyword("title");
-        registerKeyword("type");
-        registerKeyword("value");
-        registerKeyword("year");
-
-        // Tell hibernate to use getBytes instead of getBinaryStream
-        getDefaultProperties().setProperty(Environment.USE_STREAMS_FOR_BINARY, "false");
-        // No batch statements
-        getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, NO_BATCH);
-    }
-
-    /**
-     * Does this dialect support the <tt>FOR UPDATE</tt> syntax?
-     *
-     * @return empty string ... Teradata does not support
-     *         <tt>FOR UPDATE<tt> syntax
-     */
-    @Override
-    public String getForUpdateString() {
-        return "";
-    }
-
-    @Override
-    public boolean supportsIdentityColumns() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsSequences() {
-        return false;
-    }
-
-    @Override
-    public String getAddColumnString() {
-        return "Add";
-    }
-
-    @Override
-    public boolean supportsTemporaryTables() {
-        return true;
-    }
-
-    @Override
-    public String getCreateTemporaryTableString() {
-        return "create global temporary table";
-    }
-
-    @Override
-    public String getCreateTemporaryTablePostfix() {
-        return " on commit preserve rows";
-    }
-
-    @Override
-    public Boolean performTemporaryTableDDLInIsolation() {
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public boolean dropTemporaryTableAfterUse() {
-        return false;
-    }
-
-    /**
-     * Get the name of the database type associated with the given
-     * <tt>java.sql.Types</tt> typecode.
-     *
-     * @param code
-     *            <tt>java.sql.Types</tt> typecode
-     * @param length
-     *            the length or precision of the column
-     * @param precision
-     *            the precision of the column
-     * @param scale
-     *            the scale of the column
-     *
-     * @return the database type name
-     *
-     * @throws HibernateException
-     */
-    public String getTypeName(int code, int length, int precision, int scale)
-            throws HibernateException {
-        /*
-         * We might want a special case for 19,2. This is very common for money
-         * types and here it is converted to 18,1
-         */
-        float f = precision > 0 ? (float) scale / (float) precision : 0;
-        int p = (precision > 18 ? 18 : precision);
-        int s = (precision > 18 ? (int) (18.0 * f) : (scale > 18 ? 18 : scale));
-
-        return super.getTypeName(code, length, p, s);
-    }
-
-    @Override
-    public boolean supportsCascadeDelete() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsCircularCascadeDeleteConstraints() {
-        return false;
-    }
-
-    @Override
-    public boolean areStringComparisonsCaseInsensitive() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsEmptyInList() {
-        return false;
-    }
-
-    @Override
-    public String getSelectClauseNullString(int sqlType) {
-        String v = "null";
-
-        switch (sqlType) {
-        case Types.BIT:
-        case Types.TINYINT:
-        case Types.SMALLINT:
-        case Types.INTEGER:
-        case Types.BIGINT:
-        case Types.FLOAT:
-        case Types.REAL:
-        case Types.DOUBLE:
-        case Types.NUMERIC:
-        case Types.DECIMAL:
-            v = "cast(null as decimal)";
-            break;
-        case Types.CHAR:
-        case Types.VARCHAR:
-        case Types.LONGVARCHAR:
-            v = "cast(null as varchar(255))";
-            break;
-        case Types.DATE:
-        case Types.TIME:
-        case Types.TIMESTAMP:
-            v = "cast(null as timestamp)";
-            break;
-        case Types.BINARY:
-        case Types.VARBINARY:
-        case Types.LONGVARBINARY:
-        case Types.NULL:
-        case Types.OTHER:
-        case Types.JAVA_OBJECT:
-        case Types.DISTINCT:
-        case Types.STRUCT:
-        case Types.ARRAY:
-        case Types.BLOB:
-        case Types.CLOB:
-        case Types.REF:
-        case Types.DATALINK:
-        case Types.BOOLEAN:
-            break;
-        }
-        return v;
-    }
-
-    @Override
-    public String getCreateMultisetTableString() {
-        return "create multiset table ";
-    }
-
-    @Override
-    public boolean supportsLobValueChangePropogation() {
-        return false;
-    }
-
-    @Override
-    public boolean doesReadCommittedCauseWritersToBlockReaders() {
-        return true;
-    }
-
-    @Override
-    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsBindAsCallableArgument() {
-        return false;
-    }
-
-    @Override
-    public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() {
-        return EXTRACTER;
-    }
-
-    private static ViolatedConstraintNameExtracter EXTRACTER = new TemplatedViolatedConstraintNameExtracter() {
-
-        /**
-         * Extract the name of the violated constraint from the given
-         * SQLException.
-         *
-         * @param sqle
-         *            The exception that was the result of the constraint
-         *            violation.
-         * @return The extracted constraint name.
-         */
-        @Override
-        public String extractConstraintName(SQLException sqle) {
-            String constraintName = null;
-
-            int errorCode = sqle.getErrorCode();
-            if (errorCode == 27003) {
-                constraintName = extractUsingTemplate("Unique constraint (", ") violated.",
-                        sqle.getMessage());
-            }
-
-            if (constraintName != null) {
-                int i = constraintName.indexOf('.');
-                if (i != -1) {
-                    constraintName = constraintName.substring(i + 1);
-                }
-            }
-            return constraintName;
-        }
-    };
-
-    @Override
-    public boolean supportsNotNullUnique() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsExpectedLobUsagePattern() {
-        return true;
-    }
-
-    @Override
-    public boolean supportsUnboundedLobLocatorMaterialization() {
-        return false;
-    }
-
-    public boolean supportsDropPreProcess() {
-        return true;
-    }
-
-    public String performDropPreProcess(Statement stmt, String dropSql) throws SQLException {
-
-        String alterStr = "alter";
-        String tableStr = "table";
-        String dropStr = "drop";
-        String constraintStr = "constraint";
-
-        java.util.StringTokenizer st = new java.util.StringTokenizer(dropSql);
-        if (alterStr.equalsIgnoreCase(st.nextToken()) && tableStr.equalsIgnoreCase(st.nextToken())) {
-            String tableName = st.nextToken();
-
-            if ((tableName.startsWith("\"")) && (!tableName.endsWith("\""))) {
-                String next = null;
-                while (true) {
-                    next = st.nextToken();
-                    tableName += " " + next;
-                    if (next.endsWith("\\\"")) {
-                        continue;
-                    }
-                    if (next.endsWith("\"")) {
-                        break;
-                    }
-                }
-
-            }
-            if (dropStr.equalsIgnoreCase(st.nextToken())
-                    && constraintStr.equalsIgnoreCase(st.nextToken())) {
-                String constraintName = st.nextToken();
-
-                // Table name might have whitespace characters within name so
-                // just take whatever lies between
-                // "alter table " and "drop constraint"
-
-                int idx_start = dropSql.indexOf(tableStr, 0) + 5;
-                int idx_end = dropSql.lastIndexOf(dropStr);
-                tableName = dropSql.substring(idx_start, idx_end).trim();
-
-                if (tableName.startsWith("\"") && tableName.endsWith("\"")) {
-                    tableName = tableName.substring(1, tableName.length() - 1);
-                }
-
-                String arrStr = null;
-                String queryStr = "sel IndexId, ChildTable, IndexName from dbc.RI_Distinct_ChildrenV where IndexName = '"
-                        + constraintName + "'";
-                java.sql.ResultSet rs = stmt.executeQuery(queryStr);
-
-                if (rs.next()) {
-                    arrStr = "drop table \"" + tableName + "_" + rs.getString(1) + "\"";
-                    rs.close();
-                    return arrStr;
-                }
-            }
-        }
-        return null;
-    }
-
-    public void performDropPostProcess(Statement stmt, String dropSql) throws SQLException {
-        if (dropSql == null) {
-            return;
-        }
-        stmt.executeUpdate(dropSql);
-    }
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ *
+ */
+package com.querydsl.jpa.support;
+
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+
+import org.hibernate.HibernateException;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.SQLFunctionTemplate;
+import org.hibernate.dialect.function.VarArgsSQLFunction;
+import org.hibernate.type.StandardBasicTypes;
+
+/**
+ * A dialect for the Teradata database created by MCR as part of the dialect
+ * certification process.
+ *
+ * @author Jay Nance
+ */
+public class TeradataDialect extends Dialect {
+
+    /**
+     * Constructor
+     */
+    public TeradataDialect() {
+        super();
+        // registerColumnType data types
+        registerColumnType(Types.NUMERIC, "NUMERIC($p,$s)");
+        registerColumnType(Types.DOUBLE, "DOUBLE PRECISION");
+        registerColumnType(Types.BIGINT, "NUMERIC(18,0)");
+        registerColumnType(Types.BIT, "BYTEINT");
+        registerColumnType(Types.TINYINT, "BYTEINT");
+        registerColumnType(Types.VARBINARY, "VARBYTE($l)");
+        registerColumnType(Types.BINARY, "BYTEINT");
+        registerColumnType(Types.LONGVARCHAR, "LONG VARCHAR");
+        registerColumnType(Types.CHAR, "CHAR(1)");
+        registerColumnType(Types.DECIMAL, "DECIMAL");
+        registerColumnType(Types.INTEGER, "INTEGER");
+        registerColumnType(Types.SMALLINT, "SMALLINT");
+        registerColumnType(Types.FLOAT, "FLOAT");
+        registerColumnType(Types.VARCHAR, "VARCHAR($l)");
+        registerColumnType(Types.DATE, "DATE");
+        registerColumnType(Types.TIME, "TIME");
+        registerColumnType(Types.TIMESTAMP, "TIMESTAMP");
+        registerColumnType(Types.BOOLEAN, "BYTEINT"); // hibernate seems to
+                                                      // ignore this type...
+        registerColumnType(Types.BLOB, "BLOB");
+        registerColumnType(Types.CLOB, "CLOB");
+
+        registerFunction("year", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
+                "extract(year from ?1)"));
+        registerFunction("length", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
+                "character_length(?1)"));
+        registerFunction("concat",
+                new VarArgsSQLFunction(StandardBasicTypes.STRING, "(", "||", ")"));
+        registerFunction("substring", new SQLFunctionTemplate(StandardBasicTypes.STRING,
+                "substring(?1 from ?2 for ?3)"));
+        registerFunction("locate", new SQLFunctionTemplate(StandardBasicTypes.STRING,
+                "position(?1 in ?2)"));
+        registerFunction("mod", new SQLFunctionTemplate(StandardBasicTypes.STRING, "?1 mod ?2"));
+        registerFunction("str", new SQLFunctionTemplate(StandardBasicTypes.STRING,
+                "cast(?1 as varchar(255))"));
+
+        // bit_length feels a bit broken to me. We have to cast to char in order
+        // to
+        // pass when a numeric value is supplied. But of course the answers
+        // given will
+        // be wildly different for these two datatypes. 1234.5678 will be 9
+        // bytes as
+        // a char string but will be 8 or 16 bytes as a true numeric.
+        // Jay Nance 2006-09-22
+        registerFunction("bit_length", new SQLFunctionTemplate(StandardBasicTypes.INTEGER,
+                "octet_length(cast(?1 as char))*4"));
+
+        // The preference here would be
+        // SQLFunctionTemplate( Hibernate.TIMESTAMP, "current_timestamp(?1)",
+        // false)
+        // but this appears not to work.
+        // Jay Nance 2006-09-22
+        registerFunction("current_timestamp", new SQLFunctionTemplate(StandardBasicTypes.TIMESTAMP,
+                "current_timestamp"));
+        registerFunction("current_time", new SQLFunctionTemplate(StandardBasicTypes.TIME,
+                "current_time"));
+        registerFunction("current_date", new SQLFunctionTemplate(StandardBasicTypes.DATE,
+                "current_date"));
+        // IBID for current_time and current_date
+
+        registerKeyword("account");
+        registerKeyword("alias");
+        registerKeyword("class");
+        registerKeyword("column");
+        registerKeyword("first");
+        registerKeyword("map");
+        registerKeyword("month");
+        registerKeyword("password");
+        registerKeyword("role");
+        registerKeyword("summary");
+        registerKeyword("title");
+        registerKeyword("type");
+        registerKeyword("value");
+        registerKeyword("year");
+
+        // Tell hibernate to use getBytes instead of getBinaryStream
+        getDefaultProperties().setProperty(Environment.USE_STREAMS_FOR_BINARY, "false");
+        // No batch statements
+        getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, NO_BATCH);
+    }
+
+    /**
+     * Does this dialect support the {@code FOR UPDATE} syntax?
+     *
+     * @return empty string ... Teradata does not support
+     *         {@code FOR UPDATE} syntax
+     */
+    @Override
+    public String getForUpdateString() {
+        return "";
+    }
+
+    @Override
+    public boolean supportsSequences() {
+        return false;
+    }
+
+    @Override
+    public String getAddColumnString() {
+        return "Add";
+    }
+
+    public boolean supportsTemporaryTables() {
+        return true;
+    }
+
+    public String getCreateTemporaryTableString() {
+        return "create global temporary table";
+    }
+
+    public String getCreateTemporaryTablePostfix() {
+        return " on commit preserve rows";
+    }
+
+    public Boolean performTemporaryTableDDLInIsolation() {
+        return Boolean.TRUE;
+    }
+
+    public boolean dropTemporaryTableAfterUse() {
+        return false;
+    }
+
+    /**
+     * Get the name of the database type associated with the given
+     * {@code java.sql.Types} typecode.
+     *
+     * @param code
+     *            {@link java.sql.Types} typecode
+     * @param length
+     *            the length or precision of the column
+     * @param precision
+     *            the precision of the column
+     * @param scale
+     *            the scale of the column
+     *
+     * @return the database type name
+     *
+     * @throws HibernateException
+     */
+    public String getTypeName(int code, int length, int precision, int scale)
+            throws HibernateException {
+        /*
+         * We might want a special case for 19,2. This is very common for money
+         * types and here it is converted to 18,1
+         */
+        float f = precision > 0 ? (float) scale / (float) precision : 0;
+        int p = (precision > 18 ? 18 : precision);
+        int s = (precision > 18 ? (int) (18.0 * f) : (scale > 18 ? 18 : scale));
+
+        return super.getTypeName(code, length, p, s);
+    }
+
+    @Override
+    public boolean supportsCascadeDelete() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCircularCascadeDeleteConstraints() {
+        return false;
+    }
+
+    @Override
+    public boolean areStringComparisonsCaseInsensitive() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsEmptyInList() {
+        return false;
+    }
+
+    @Override
+    public String getSelectClauseNullString(int sqlType) {
+        String v = "null";
+
+        switch (sqlType) {
+        case Types.BIT:
+        case Types.TINYINT:
+        case Types.SMALLINT:
+        case Types.INTEGER:
+        case Types.BIGINT:
+        case Types.FLOAT:
+        case Types.REAL:
+        case Types.DOUBLE:
+        case Types.NUMERIC:
+        case Types.DECIMAL:
+            v = "cast(null as decimal)";
+            break;
+        case Types.CHAR:
+        case Types.VARCHAR:
+        case Types.LONGVARCHAR:
+            v = "cast(null as varchar(255))";
+            break;
+        case Types.DATE:
+        case Types.TIME:
+        case Types.TIMESTAMP:
+            v = "cast(null as timestamp)";
+            break;
+        case Types.BINARY:
+        case Types.VARBINARY:
+        case Types.LONGVARBINARY:
+        case Types.NULL:
+        case Types.OTHER:
+        case Types.JAVA_OBJECT:
+        case Types.DISTINCT:
+        case Types.STRUCT:
+        case Types.ARRAY:
+        case Types.BLOB:
+        case Types.CLOB:
+        case Types.REF:
+        case Types.DATALINK:
+        case Types.BOOLEAN:
+            break;
+        }
+        return v;
+    }
+
+    @Override
+    public String getCreateMultisetTableString() {
+        return "create multiset table ";
+    }
+
+    @Override
+    public boolean supportsLobValueChangePropogation() {
+        return false;
+    }
+
+    @Override
+    public boolean doesReadCommittedCauseWritersToBlockReaders() {
+        return true;
+    }
+
+    @Override
+    public boolean doesRepeatableReadCauseReadersToBlockWriters() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsBindAsCallableArgument() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsNotNullUnique() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsExpectedLobUsagePattern() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsUnboundedLobLocatorMaterialization() {
+        return false;
+    }
+
+    public boolean supportsDropPreProcess() {
+        return true;
+    }
+
+    public String performDropPreProcess(Statement stmt, String dropSql) throws SQLException {
+
+        String alterStr = "alter";
+        String tableStr = "table";
+        String dropStr = "drop";
+        String constraintStr = "constraint";
+
+        java.util.StringTokenizer st = new java.util.StringTokenizer(dropSql);
+        if (alterStr.equalsIgnoreCase(st.nextToken()) && tableStr.equalsIgnoreCase(st.nextToken())) {
+            StringBuilder tableName = new StringBuilder(st.nextToken());
+
+            if ((tableName.toString().startsWith("\"")) && (!tableName.toString().endsWith("\""))) {
+                String next = null;
+                while (true) {
+                    next = st.nextToken();
+                    tableName.append(" ").append(next);
+                    if (next.endsWith("\\\"")) {
+                        continue;
+                    }
+                    if (next.endsWith("\"")) {
+                        break;
+                    }
+                }
+
+            }
+            if (dropStr.equalsIgnoreCase(st.nextToken())
+                    && constraintStr.equalsIgnoreCase(st.nextToken())) {
+                String constraintName = st.nextToken();
+
+                // Table name might have whitespace characters within name so
+                // just take whatever lies between
+                // "alter table " and "drop constraint"
+
+                int idxStart = dropSql.indexOf(tableStr, 0) + 5;
+                int idxEnd = dropSql.lastIndexOf(dropStr);
+                tableName = new StringBuilder(dropSql.substring(idxStart, idxEnd).trim());
+
+                if (tableName.toString().startsWith("\"") && tableName.toString().endsWith("\"")) {
+                    tableName = new StringBuilder(tableName.substring(1, tableName.length() - 1));
+                }
+
+                String arrStr = null;
+                String queryStr = "sel IndexId, ChildTable, IndexName from dbc.RI_Distinct_ChildrenV where IndexName = '"
+                        + constraintName + "'";
+                java.sql.ResultSet rs = stmt.executeQuery(queryStr);
+
+                if (rs.next()) {
+                    arrStr = "drop table \"" + tableName + "_" + rs.getString(1) + "\"";
+                    rs.close();
+                    return arrStr;
+                }
+            }
+        }
+        return null;
+    }
+
+    public void performDropPostProcess(Statement stmt, String dropSql) throws SQLException {
+        if (dropSql == null) {
+            return;
+        }
+        stmt.executeUpdate(dropSql);
+    }
 }
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/mysema/testutil/HibernateTestRunner.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java
similarity index 84%
rename from querydsl-jpa/src/test/java/com/mysema/testutil/HibernateTestRunner.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java
index 699941473e..6e541754fd 100644
--- a/querydsl-jpa/src/test/java/com/mysema/testutil/HibernateTestRunner.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.testutil;
+package com.querydsl.jpa.testutil;
+
+import java.io.InputStream;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Properties;
 
-import com.mysema.query.Mode;
-import com.mysema.query.jpa.domain.Domain;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
 import org.junit.rules.MethodRule;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
@@ -29,12 +33,11 @@
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
 
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Properties;
+import com.querydsl.jpa.HibernateTest;
+import com.querydsl.jpa.Mode;
+import com.querydsl.jpa.domain.Domain;
+
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author tiwe
@@ -46,8 +49,6 @@ public class HibernateTestRunner extends BlockJUnit4ClassRunner {
 
     private Session session;
 
-    private Method setter;
-
     private boolean isDerby = false;
 
     public HibernateTestRunner(Class<?> klass) throws InitializationError {
@@ -56,6 +57,9 @@ public HibernateTestRunner(Class<?> klass) throws InitializationError {
 
     @Override
     protected List<MethodRule> rules(Object test) {
+        assertTrue(String.format("In order to use the %s for %s, it should (directly or indirectly) implement %s",
+                HibernateTestRunner.class.getSimpleName(), test.getClass(), HibernateTest.class), test instanceof HibernateTest);
+
         List<MethodRule> rules = super.rules(test);
         rules.add(new MethodRule() {
             @Override
@@ -63,10 +67,7 @@ public Statement apply(final Statement base, FrameworkMethod method, final Objec
                 return new Statement() {
                     @Override
                     public void evaluate() throws Throwable {
-                        if (setter == null) {
-                            setter = target.getClass().getMethod("setSession", Session.class);
-                        }
-                        setter.invoke(target, session);
+                        ((HibernateTest) target).setSession(session);
                         base.evaluate();
                     }
                 };
@@ -106,7 +107,7 @@ private void start() throws Exception {
             throw new IllegalArgumentException("No configuration available at classpath:" + mode);
         }
         props.load(is);
-        ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
+        ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
             .applySettings(props)
             .build();
         cfg.setProperties(props);
@@ -118,9 +119,7 @@ private void start() throws Exception {
     private void shutdown() {
         if (session != null) {
             try {
-                if (session.getTransaction().isActive()) {
-                    session.getTransaction().rollback();
-                }
+                session.getTransaction().rollback();
             } finally {
                 session.close();
                 session = null;
diff --git a/querydsl-jpa/src/test/java/com/mysema/testutil/JPATestRunner.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java
similarity index 88%
rename from querydsl-jpa/src/test/java/com/mysema/testutil/JPATestRunner.java
rename to querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java
index 18abb629a7..3b1a048f70 100644
--- a/querydsl-jpa/src/test/java/com/mysema/testutil/JPATestRunner.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,9 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.testutil;
+package com.querydsl.jpa.testutil;
 
-import java.lang.reflect.Method;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.List;
@@ -22,6 +21,7 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
+import org.junit.Assert;
 import org.junit.rules.MethodRule;
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
@@ -31,7 +31,8 @@
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
 
-import com.mysema.query.Mode;
+import com.querydsl.jpa.JPATest;
+import com.querydsl.jpa.Mode;
 
 /**
  * @author tiwe
@@ -43,16 +44,17 @@ public class JPATestRunner extends BlockJUnit4ClassRunner {
 
     private EntityManager entityManager;
 
-    private Method setter;
-
     private boolean isDerby;
 
-    public JPATestRunner(Class<?> klass) throws InitializationError{
+    public JPATestRunner(Class<?> klass) throws InitializationError {
         super(klass);
     }
 
     @Override
     protected List<MethodRule> rules(Object test) {
+        Assert.assertTrue(String.format("In order to use the %s for %s, it should (directly or indirectly) implement %s",
+                JPATestRunner.class.getSimpleName(), test.getClass(), JPATest.class), test instanceof JPATest);
+
         List<MethodRule> rules = super.rules(test);
         rules.add(new MethodRule() {
             @Override
@@ -60,10 +62,7 @@ public Statement apply(final Statement base, FrameworkMethod method, final Objec
                 return new Statement() {
                     @Override
                     public void evaluate() throws Throwable {
-                        if (setter == null) {
-                            setter = target.getClass().getMethod("setEntityManager", EntityManager.class);
-                        }
-                        setter.invoke(target, entityManager);
+                        ((JPATest) target).setEntityManager(entityManager);
                         base.evaluate();
                     }
                 };
diff --git a/querydsl-jpa/src/test/resources/META-INF/persistence.xml b/querydsl-jpa/src/test/resources/META-INF/persistence.xml
index 522c545cc7..5ad7132c71 100644
--- a/querydsl-jpa/src/test/resources/META-INF/persistence.xml
+++ b/querydsl-jpa/src/test/resources/META-INF/persistence.xml
@@ -1,292 +1,314 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-   http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-    version="1.0">
-
-    <!-- derby -->
-
-    <persistence-unit name="derby">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="com.mysema.query.jpa.support.ExtendedDerbyDialect" />
-            <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver" />
-            <property name="hibernate.connection.url" value="jdbc:derby:target/derbydb-hibernate;create=true" />
-            <!-- <property name="hibernate.show_sql" value="true"/> -->
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="derby-eclipselink" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:derby:target/derbydb-eclipselink;create=true" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="derby-openjpa" transaction-type="RESOURCE_LOCAL">
-        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:derby:target/derbydb-openjpa;create=true" />
-            <property name="openjpa.RuntimeUnenhancedClasses" value="supported" />
-        </properties>
-    </persistence-unit>
-
-    <!-- hsqldb -->
-
-    <persistence-unit name="hsqldb">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="com.mysema.query.jpa.support.ExtendedHSQLDialect" />
-            <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-            <property name="hibernate.connection.url" value="jdbc:hsqldb:file:target/testdb-hibernate;shutdown=true" />
-            <property name="hibernate.connection.user" value="sa" />
-            <!-- <property name="hibernate.show_sql" value="true"/> -->
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="hsqldb-eclipselink" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:file:target/testdb-eclipselink;shutdown=true" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-        </properties>
-    </persistence-unit>
-
-    <!-- h2 -->
-
-    <persistence-unit name="h2" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
-            <property name="hibernate.connection.url" value="jdbc:h2:~/dbs/h2-hibernate" />
-            <property name="hibernate.connection.user" value="sa" />
-            <property name="hibernate.show_sql" value="false"/>
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name="h2perf" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
-            <property name="hibernate.connection.url" value="jdbc:h2:~/dbs/h2-hibernate-perf" />
-            <property name="hibernate.connection.user" value="sa" />
-            <property name="hibernate.show_sql" value="false"/>
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="h2-eclipselink" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:~/dbs/h2-eclipselink" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name="h2-batoo">
-        <provider>org.batoo.jpa.core.BatooPersistenceProvider</provider>
-        <class>com.mysema.query.jpa.domain.Account</class>
-        <class>com.mysema.query.jpa.domain.Animal</class>
-        <class>com.mysema.query.jpa.domain.AuditLog</class>
-        <class>com.mysema.query.jpa.domain.Author</class>
-        <class>com.mysema.query.jpa.domain.Bar</class>
-        <class>com.mysema.query.jpa.domain.Book</class>     
-        <class>com.mysema.query.jpa.domain.Calendar</class>
-        <class>com.mysema.query.jpa.domain.Cat</class>
-        <class>com.mysema.query.jpa.domain.Catalog</class> 
-        <class>com.mysema.query.jpa.domain.Company</class>
-        <class>com.mysema.query.jpa.domain.Customer</class>
-        <class>com.mysema.query.jpa.domain.Department</class>
-        <class>com.mysema.query.jpa.domain.Document</class>
-        <class>com.mysema.query.jpa.domain.Dolphin</class>
-        <class>com.mysema.query.jpa.domain.DomesticCat</class>
-        <class>com.mysema.query.jpa.domain.EmbeddedType</class>
-        <class>com.mysema.query.jpa.domain.Employee</class>
-        <class>com.mysema.query.jpa.domain.Entity1</class>
-        <class>com.mysema.query.jpa.domain.Entity2</class>
-        <class>com.mysema.query.jpa.domain.EvilType</class>
-        <class>com.mysema.query.jpa.domain.Foo</class>
-        <class>com.mysema.query.jpa.domain.Formula</class>
-        <class>com.mysema.query.jpa.domain.Human</class>
-        <class>com.mysema.query.jpa.domain.InheritedProperties</class>
-        <class>com.mysema.query.jpa.domain.Item</class>
-        <class>com.mysema.query.jpa.domain.Location</class>
-        <class>com.mysema.query.jpa.domain.Mammal</class>
-        <class>com.mysema.query.jpa.domain.Name</class>
-        <class>com.mysema.query.jpa.domain.NameList</class>
-        <class>com.mysema.query.jpa.domain.Named</class>
-        <class>com.mysema.query.jpa.domain.Nationality</class>
-        <class>com.mysema.query.jpa.domain.Novel</class>
-        <class>com.mysema.query.jpa.domain.Numeric</class>
-        <class>com.mysema.query.jpa.domain.Order</class>
-        <class>com.mysema.query.jpa.domain.Parameter</class>
-        <class>com.mysema.query.jpa.domain.Payment</class>
-        <class>com.mysema.query.jpa.domain.Person</class>
-        <class>com.mysema.query.jpa.domain.PersonId</class>
-        <class>com.mysema.query.jpa.domain.Player</class>
-        <class>com.mysema.query.jpa.domain.Price</class>
-        <class>com.mysema.query.jpa.domain.Product</class>
-        <class>com.mysema.query.jpa.domain.Show</class>
-        <class>com.mysema.query.jpa.domain.SimpleTypes</class>
-        <class>com.mysema.query.jpa.domain.Status</class>
-        <class>com.mysema.query.jpa.domain.StatusChange</class>
-        <class>com.mysema.query.jpa.domain.Store</class>
-        <class>com.mysema.query.jpa.domain.Superclass</class>
-        <class>com.mysema.query.jpa.domain.User</class>
-        <class>com.mysema.query.jpa.domain.World</class>
-        <class>com.mysema.query.jpa.domain4.BookDefinition</class>
-        <class>com.mysema.query.jpa.domain4.BookID</class>
-        <class>com.mysema.query.jpa.domain4.BookMark</class>        
-        <class>com.mysema.query.jpa.domain4.BookVersion</class>
-        <class>com.mysema.query.jpa.domain4.BookVersionPK</class>
-        <class>com.mysema.query.jpa.domain4.Library</class>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:~/dbs/h2-batoo" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="org.batoo.jpa.sql_logging" value="NONE"/>
-            <property name="org.batoo.jpa.ddl" value="DROP" />
-        </properties>
-    </persistence-unit>    
-
-    <persistence-unit name="h2-openjpa" transaction-type="RESOURCE_LOCAL">
-        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:~/dbs/h2-openjpa" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-            <property name="openjpa.RuntimeUnenhancedClasses" value="supported" />
-            <property name="openjpa.jdbc.Schemas" value="PUBLIC"/>
-            <property name="openjpa.jdbc.DBDictionary" value="h2(useSchemaName=true)"/>            
-            <!-- 
-            <property name="openjpa.Log" value="DefaultLevel=TRACE,Tool=TRACE"/>
-             -->  
-        </properties>
-    </persistence-unit>
-
-    <!-- mysql -->
-
-    <persistence-unit name="mysql">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
-            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
-            <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/querydsl" />
-            <property name="hibernate.connection.username" value="querydsl" />
-            <property name="hibernate.connection.password" value="querydsl" />
-            <!-- <property name="hibernate.show_sql" value="true"/> -->
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="mysql-eclipselink" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/querydsl2" />
-            <property name="javax.persistence.jdbc.user" value="querydsl" />
-            <property name="javax.persistence.jdbc.password" value="querydsl" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-        </properties>
-    </persistence-unit>
-
-    <!-- postgres -->
-
-    <persistence-unit name="postgres">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
-            <property name="hibernate.connection.driver_class" value="org.postgresql.Driver" />
-            <property name="hibernate.connection.url" value="jdbc:postgresql://localhost:5432/querydsl" />
-            <property name="hibernate.connection.username" value="querydsl" />
-            <property name="hibernate.connection.password" value="querydsl" />
-            <!-- <property name="hibernate.show_sql" value="true"/> -->
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name="postgres-eclipselink" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/querydsl2" />
-            <property name="javax.persistence.jdbc.user" value="querydsl" />
-            <property name="javax.persistence.jdbc.password" value="querydsl" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-        </properties>
-    </persistence-unit>
-
-    <!-- oracle -->
-
-    <persistence-unit name="oracle">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="com.mysema.query.jpa.support.ExtendedOracleDialect" />
-            <property name="hibernate.connection.driver_class" value="oracle.jdbc.driver.OracleDriver" />
-            <property name="hibernate.connection.url" value="jdbc:oracle:thin:@localhost:1521:xe" />
-            <property name="hibernate.connection.username" value="querydsl" />
-            <property name="hibernate.connection.password" value="querydsl" />
-            <property name="hibernate.show_sql" value="true"/>
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-        </properties>
-    </persistence-unit>
-    
-    <!-- teradata -->
-    
-    <persistence-unit name="teradata">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="hibernate.archive.autodetection" value="class" />
-            <property name="hibernate.dialect" value="com.mysema.query.jpa.support.TeradataDialect" />
-            <property name="hibernate.connection.driver_class" value="com.teradata.jdbc.TeraDriver" />
-            <property name="hibernate.connection.url" value="jdbc:teradata://teradata/dbc" />
-            <property name="hibernate.connection.username" value="querydsl" />
-            <property name="hibernate.connection.password" value="querydsl" />
-            <!-- <property name="hibernate.show_sql" value="true"/> -->
-            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-            <property name="hibernate.globally_quoted_identifiers" value="true" />
-        </properties>
-    </persistence-unit>    
-
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+   http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+    version="1.0">
+
+    <!-- derby -->
+
+    <persistence-unit name="derby">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QDerbyDialect" />
+            <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver" />
+            <property name="hibernate.connection.url" value="jdbc:derby:target/derbydb-hibernate;create=true" />
+            <!-- <property name="hibernate.show_sql" value="true"/> -->
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="derby-eclipselink" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:derby:target/derbydb-eclipselink;create=true" />
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+            <property name="eclipselink.ddl-generation.output-mode" value="database" />
+            <property name="eclipselink.logging.level" value="SEVERE"/>
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="derby-openjpa" transaction-type="RESOURCE_LOCAL">
+        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:derby:target/derbydb-openjpa;create=true" />
+            <property name="openjpa.RuntimeUnenhancedClasses" value="supported" />
+        </properties>
+    </persistence-unit>
+
+    <!-- hsqldb -->
+
+    <persistence-unit name="hsqldb">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QHSQLDialect" />
+            <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
+            <property name="hibernate.connection.url" value="jdbc:hsqldb:file:target/testdb-hibernate;shutdown=true" />
+            <property name="hibernate.connection.user" value="sa" />
+            <!-- <property name="hibernate.show_sql" value="true"/> -->
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="hsqldb-eclipselink" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:file:target/testdb-eclipselink;shutdown=true" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+            <property name="eclipselink.ddl-generation.output-mode" value="database" />
+            <property name="eclipselink.logging.level" value="SEVERE"/>
+        </properties>
+    </persistence-unit>
+
+    <!-- h2 -->
+
+    <persistence-unit name="h2" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QH2Dialect" />
+            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
+            <property name="hibernate.connection.url" value="jdbc:h2:./target/h2-hibernate" />
+            <property name="hibernate.connection.user" value="sa" />
+            <property name="hibernate.show_sql" value="false"/>
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+        </properties>
+    </persistence-unit>
+    
+    <persistence-unit name="h2perf" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QH2Dialect" />
+            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
+            <property name="hibernate.connection.url" value="jdbc:h2:./target/h2-hibernate-perf" />
+            <property name="hibernate.connection.user" value="sa" />
+            <property name="hibernate.show_sql" value="false"/>
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="h2-eclipselink" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:./target/h2-eclipselink" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+            <property name="eclipselink.ddl-generation.output-mode" value="database" />
+            <property name="eclipselink.logging.level" value="SEVERE"/>
+        </properties>
+    </persistence-unit>
+    
+    <persistence-unit name="h2-batoo">
+        <provider>org.batoo.jpa.core.BatooPersistenceProvider</provider>
+        <class>com.querydsl.jpa.domain.Account</class>
+        <class>com.querydsl.jpa.domain.Animal</class>
+        <class>com.querydsl.jpa.domain.AuditLog</class>
+        <class>com.querydsl.jpa.domain.Author</class>
+        <class>com.querydsl.jpa.domain.Bar</class>
+        <class>com.querydsl.jpa.domain.Book</class>
+        <class>com.querydsl.jpa.domain.Calendar</class>
+        <class>com.querydsl.jpa.domain.Cat</class>
+        <class>com.querydsl.jpa.domain.Catalog</class>
+        <class>com.querydsl.jpa.domain.Company</class>
+        <class>com.querydsl.jpa.domain.Customer</class>
+        <class>com.querydsl.jpa.domain.Department</class>
+        <class>com.querydsl.jpa.domain.Document</class>
+        <class>com.querydsl.jpa.domain.Dolphin</class>
+        <class>com.querydsl.jpa.domain.DomesticCat</class>
+        <class>com.querydsl.jpa.domain.EmbeddedType</class>
+        <class>com.querydsl.jpa.domain.Employee</class>
+        <class>com.querydsl.jpa.domain.Entity1</class>
+        <class>com.querydsl.jpa.domain.Entity2</class>
+        <class>com.querydsl.jpa.domain.EvilType</class>
+        <class>com.querydsl.jpa.domain.Foo</class>
+        <class>com.querydsl.jpa.domain.Formula</class>
+        <class>com.querydsl.jpa.domain.Human</class>
+        <class>com.querydsl.jpa.domain.InheritedProperties</class>
+        <class>com.querydsl.jpa.domain.Item</class>
+        <class>com.querydsl.jpa.domain.Location</class>
+        <class>com.querydsl.jpa.domain.Mammal</class>
+        <class>com.querydsl.jpa.domain.Name</class>
+        <class>com.querydsl.jpa.domain.NameList</class>
+        <class>com.querydsl.jpa.domain.Named</class>
+        <class>com.querydsl.jpa.domain.Nationality</class>
+        <class>com.querydsl.jpa.domain.Novel</class>
+        <class>com.querydsl.jpa.domain.Numeric</class>
+        <class>com.querydsl.jpa.domain.Order</class>
+        <class>com.querydsl.jpa.domain.Parameter</class>
+        <class>com.querydsl.jpa.domain.Payment</class>
+        <class>com.querydsl.jpa.domain.Person</class>
+        <class>com.querydsl.jpa.domain.PersonId</class>
+        <class>com.querydsl.jpa.domain.Player</class>
+        <class>com.querydsl.jpa.domain.Price</class>
+        <class>com.querydsl.jpa.domain.Product</class>
+        <class>com.querydsl.jpa.domain.Show</class>
+        <class>com.querydsl.jpa.domain.SimpleTypes</class>
+        <class>com.querydsl.jpa.domain.Status</class>
+        <class>com.querydsl.jpa.domain.StatusChange</class>
+        <class>com.querydsl.jpa.domain.Store</class>
+        <class>com.querydsl.jpa.domain.Superclass</class>
+        <class>com.querydsl.jpa.domain.User</class>
+        <class>com.querydsl.jpa.domain.World</class>
+        <class>com.querydsl.jpa.domain4.BookDefinition</class>
+        <class>com.querydsl.jpa.domain4.BookID</class>
+        <class>com.querydsl.jpa.domain4.BookMark</class>
+        <class>com.querydsl.jpa.domain4.BookVersion</class>
+        <class>com.querydsl.jpa.domain4.BookVersionPK</class>
+        <class>com.querydsl.jpa.domain4.Library</class>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:./target/h2-batoo" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="org.batoo.jpa.sql_logging" value="NONE"/>
+            <property name="org.batoo.jpa.ddl" value="DROP" />
+        </properties>
+    </persistence-unit>    
+
+    <persistence-unit name="h2-openjpa" transaction-type="RESOURCE_LOCAL">
+        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:./target/h2-openjpa" />
+            <property name="javax.persistence.jdbc.user" value="sa" />
+            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+            <property name="openjpa.RuntimeUnenhancedClasses" value="supported" />
+            <property name="openjpa.jdbc.Schemas" value="PUBLIC"/>
+            <property name="openjpa.jdbc.DBDictionary" value="h2(useSchemaName=true)"/>            
+            <!-- 
+            <property name="openjpa.Log" value="DefaultLevel=TRACE,Tool=TRACE"/>
+             -->  
+        </properties>
+    </persistence-unit>
+
+    <!-- mysql -->
+
+    <persistence-unit name="mysql">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QMySQL5InnoDBDialect" />
+            <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
+            <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/querydsl" />
+            <property name="hibernate.connection.username" value="querydsl" />
+            <property name="hibernate.connection.password" value="querydsl" />
+            <!-- <property name="hibernate.show_sql" value="true"/> -->
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="update" />
+        </properties>
+    </persistence-unit>
+
+    <persistence-unit name="mysql-eclipselink" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/querydsl2" />
+            <property name="javax.persistence.jdbc.user" value="querydsl" />
+            <property name="javax.persistence.jdbc.password" value="querydsl" />
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+            <property name="eclipselink.ddl-generation.output-mode" value="database" />
+            <property name="eclipselink.logging.level" value="SEVERE"/>
+        </properties>
+    </persistence-unit>
+
+    <!--mssql -->
+
+  <persistence-unit name="mssql">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <properties>
+      <property name="hibernate.archive.autodetection" value="class" />
+      <property name="hibernate.dialect" value="com.querydsl.jpa.support.QSQLServer2008Dialect" />
+      <property name="hibernate.connection.driver_class" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+      <property name="hibernate.connection.url" value="jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true" />
+      <property name="hibernate.connection.username" value="sa" />
+      <property name="hibernate.connection.password" value="Password1!" />
+      <!-- <property name="hibernate.show_sql" value="true"/> -->
+      <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+      <property name="hibernate.hbm2ddl.auto" value="update" />
+    </properties>
+  </persistence-unit>
+
+    <!-- postgresql -->
+
+    <persistence-unit name="postgresql">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QPostgreSQL9Dialect" />
+            <property name="hibernate.connection.driver_class" value="org.postgresql.Driver" />
+            <property name="hibernate.connection.url" value="jdbc:postgresql://localhost:5433/querydsl" />
+            <property name="hibernate.connection.username" value="querydsl" />
+            <property name="hibernate.connection.password" value="querydsl" />
+            <!-- <property name="hibernate.show_sql" value="true"/> -->
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+        </properties>
+    </persistence-unit>
+    
+    <persistence-unit name="postgresql-eclipselink" transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <exclude-unlisted-classes>false</exclude-unlisted-classes>
+        <properties>
+            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5433/querydsl2" />
+            <property name="javax.persistence.jdbc.user" value="querydsl" />
+            <property name="javax.persistence.jdbc.password" value="querydsl" />
+            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+            <property name="eclipselink.ddl-generation.output-mode" value="database" />
+            <property name="eclipselink.logging.level" value="SEVERE"/>
+        </properties>
+    </persistence-unit>
+
+    <!-- oracle -->
+
+    <persistence-unit name="oracle">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.QOracle10gDialect" />
+            <property name="hibernate.connection.driver_class" value="oracle.jdbc.driver.OracleDriver" />
+            <property name="hibernate.connection.url" value="jdbc:oracle:thin:@localhost:1521:xe" />
+            <property name="hibernate.connection.username" value="querydsl" />
+            <property name="hibernate.connection.password" value="querydsl" />
+            <property name="hibernate.show_sql" value="true"/>
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="update" />
+        </properties>
+    </persistence-unit>
+    
+    <!-- teradata -->
+    
+    <persistence-unit name="teradata">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="com.querydsl.jpa.support.TeradataDialect" />
+            <property name="hibernate.connection.driver_class" value="com.teradata.jdbc.TeraDriver" />
+            <property name="hibernate.connection.url" value="jdbc:teradata://teradata/dbc" />
+            <property name="hibernate.connection.username" value="querydsl" />
+            <property name="hibernate.connection.password" value="querydsl" />
+            <!-- <property name="hibernate.show_sql" value="true"/> -->
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="update" />
+            <property name="hibernate.globally_quoted_identifiers" value="true" />
+        </properties>
+    </persistence-unit>    
+
+</persistence>
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/h2.properties b/querydsl-jpa/src/test/resources/com/mysema/testutil/h2.properties
deleted file mode 100644
index 6aa4f0d5b9..0000000000
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/h2.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.connection.driver_class=org.h2.Driver
-hibernate.connection.url=jdbc:h2:~/dbs/h2-jpa1
-hibernate.connection.username=sa
-hibernate.connection.password=
-
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/mssql.properties b/querydsl-jpa/src/test/resources/com/mysema/testutil/mssql.properties
deleted file mode 100644
index 997752c0b1..0000000000
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/mssql.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-## MSSQL
-hibernate.dialect=org.hibernate.dialect.SQLServerDialect
-hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
-hibernate.connection.url=jdbc:jtds:sqlserver://localhost:1433/querydsl
-hibernate.connection.username=querydsl
-hibernate.connection.password=querydsl
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=update
-#hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/oracle.properties b/querydsl-jpa/src/test/resources/com/mysema/testutil/oracle.properties
deleted file mode 100644
index 26248b1a9d..0000000000
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/oracle.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-## MySQL
-#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
-hibernate.dialect=com.mysema.query.jpa.support.ExtendedOracleDialect
-hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
-hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:xe
-hibernate.connection.username=querydsl
-hibernate.connection.password=querydsl
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=update
-#hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/postgres.properties b/querydsl-jpa/src/test/resources/com/mysema/testutil/postgres.properties
deleted file mode 100644
index b78843c01e..0000000000
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/postgres.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-## MySQL
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.url=jdbc:postgresql://localhost:5432/querydsl
-hibernate.connection.username=querydsl
-hibernate.connection.password=querydsl
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=update
-#hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/derby.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/derby.properties
similarity index 81%
rename from querydsl-jpa/src/test/resources/com/mysema/testutil/derby.properties
rename to querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/derby.properties
index 209cbf0650..12588cba01 100644
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/derby.properties
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/derby.properties
@@ -1,11 +1,11 @@
-## Derby
-#hibernate.dialect=org.hibernate.dialect.DerbyDialect
-hibernate.dialect=com.mysema.query.jpa.support.ExtendedDerbyDialect
-hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
-hibernate.connection.url=jdbc:derby:target/derbydb;create=true
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=create-drop
+## Derby
+#hibernate.dialect=org.hibernate.dialect.DerbyDialect
+hibernate.dialect=com.querydsl.jpa.support.QDerbyDialect
+hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
+hibernate.connection.url=jdbc:derby:target/derbydb;create=true
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=create-drop
 #hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/h2.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/h2.properties
new file mode 100644
index 0000000000..0d714abb0c
--- /dev/null
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/h2.properties
@@ -0,0 +1,9 @@
+hibernate.dialect=com.querydsl.jpa.support.QH2Dialect
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:./target/h2-jpa1
+hibernate.connection.username=sa
+hibernate.connection.password=
+
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/hsqldb.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/hsqldb.properties
similarity index 83%
rename from querydsl-jpa/src/test/resources/com/mysema/testutil/hsqldb.properties
rename to querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/hsqldb.properties
index 372403c439..b2dc0c0fec 100644
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/hsqldb.properties
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/hsqldb.properties
@@ -1,13 +1,13 @@
-## HSQL
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.dialect=com.mysema.query.jpa.support.ExtendedHSQLDialect
-hibernate.connection.url=jdbc:hsqldb:file:target/testdb;shutdown=true
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.username=sa
-hibernate.connection.password=
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=create-drop
+## HSQL
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.dialect=com.querydsl.jpa.support.QHSQLDialect
+hibernate.connection.url=jdbc:hsqldb:file:target/testdb;shutdown=true
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.username=sa
+hibernate.connection.password=
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=create-drop
 #hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties
new file mode 100644
index 0000000000..b7b0002044
--- /dev/null
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties
@@ -0,0 +1,12 @@
+## MSSQL
+hibernate.dialect=com.querydsl.jpa.support.QSQLServer2008Dialect
+hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver
+hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true
+hibernate.connection.username=sa
+hibernate.connection.password=Password1!
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=update
+#hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/mysql.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties
similarity index 75%
rename from querydsl-jpa/src/test/resources/com/mysema/testutil/mysql.properties
rename to querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties
index d261199a55..619988c92f 100644
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/mysql.properties
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties
@@ -1,12 +1,12 @@
-## MySQL
-hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-hibernate.connection.driver_class=com.mysql.jdbc.Driver
-hibernate.connection.url=jdbc:mysql://localhost:3306/querydsl
-hibernate.connection.username=querydsl
-hibernate.connection.password=querydsl
-
-## Common properties
-#hibernate.show_sql=true
-hibernate.flushMode=FLUSH_AUTO
-hibernate.hbm2ddl.auto=update
-#hibernate.use_sql_comments=true
\ No newline at end of file
+## MySQL
+hibernate.dialect=com.querydsl.jpa.support.QMySQL5InnoDBDialect
+hibernate.connection.driver_class=com.mysql.jdbc.Driver
+hibernate.connection.url=jdbc:mysql://localhost:3306/querydsl
+hibernate.connection.username=querydsl
+hibernate.connection.password=querydsl
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=update
+#hibernate.use_sql_comments=true
diff --git a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties
new file mode 100644
index 0000000000..389751334f
--- /dev/null
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties
@@ -0,0 +1,13 @@
+## MySQL
+#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+hibernate.dialect=com.querydsl.jpa.support.QOracle10gDialect
+hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
+hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:xe
+hibernate.connection.username=system
+hibernate.connection.password=oracle
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=update
+#hibernate.use_sql_comments=true
diff --git a/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties
new file mode 100644
index 0000000000..fb0dfa1336
--- /dev/null
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties
@@ -0,0 +1,12 @@
+## MySQL
+hibernate.dialect=com.querydsl.jpa.support.QPostgreSQL9Dialect
+hibernate.connection.driver_class=org.postgresql.Driver
+hibernate.connection.url=jdbc:postgresql://localhost:5433/querydsl
+hibernate.connection.username=querydsl
+hibernate.connection.password=querydsl
+
+## Common properties
+#hibernate.show_sql=true
+hibernate.flushMode=FLUSH_AUTO
+hibernate.hbm2ddl.auto=update
+#hibernate.use_sql_comments=true
diff --git a/querydsl-jpa/src/test/resources/com/mysema/testutil/teradata.properties b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/teradata.properties
similarity index 83%
rename from querydsl-jpa/src/test/resources/com/mysema/testutil/teradata.properties
rename to querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/teradata.properties
index a621b98997..82e1bf205a 100644
--- a/querydsl-jpa/src/test/resources/com/mysema/testutil/teradata.properties
+++ b/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/teradata.properties
@@ -1,4 +1,4 @@
-hibernate.dialect=com.mysema.query.jpa.support.TeradataDialect
+hibernate.dialect=com.querydsl.jpa.support.TeradataDialect
 hibernate.connection.driver_class=com.teradata.jdbc.TeraDriver
 hibernate.connection.url=jdbc:teradata://teradata/dbc
 hibernate.connection.username=querydsl
diff --git a/querydsl-jpa/src/test/resources/contact.hbm.xml b/querydsl-jpa/src/test/resources/contact.hbm.xml
index bbe23fcf41..72265d314c 100644
--- a/querydsl-jpa/src/test/resources/contact.hbm.xml
+++ b/querydsl-jpa/src/test/resources/contact.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.mysema.query.jpa.domain2">
+<hibernate-mapping package="com.querydsl.jpa.domain2">
   <class name="Contact" table="CONTACT">
    <id name="id" type="long" column="ID" >
    <generator class="assigned"/>
diff --git a/querydsl-jpa/src/test/resources/contact2.hbm.xml b/querydsl-jpa/src/test/resources/contact2.hbm.xml
index 5d84dc2f6d..49c99a45fe 100644
--- a/querydsl-jpa/src/test/resources/contact2.hbm.xml
+++ b/querydsl-jpa/src/test/resources/contact2.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
-  <class name="com.mysema.query.jpa.domain2.Contact" table="CONTACT">
+  <class name="com.querydsl.jpa.domain2.Contact" table="CONTACT">
    <id name="id" type="long" column="ID" >
    <generator class="assigned"/>
   </id>
diff --git a/querydsl-jpa/src/test/resources/hibernate.cfg.xml b/querydsl-jpa/src/test/resources/hibernate.cfg.xml
index eb1c3b8cf2..77f0d8b63b 100644
--- a/querydsl-jpa/src/test/resources/hibernate.cfg.xml
+++ b/querydsl-jpa/src/test/resources/hibernate.cfg.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE hibernate-configuration PUBLIC
-"-//Hibernate/Hibernate Configuration DTD//EN"
-"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+        "-//Hibernate/Hibernate Configuration DTD//EN"
+        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
-<session-factory>
-	<property name="hibernate.dialect">com.mysema.query.jpa.support.ExtendedDerbyDialect</property>
-	<property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
-	<property name="hibernate.connection.url">jdbc:derby:target/derbydb;create=true</property>
-</session-factory>
+    <session-factory>
+        <property name="hibernate.dialect">com.querydsl.jpa.support.ExtendedDerbyDialect</property>
+        <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
+        <property name="hibernate.connection.url">jdbc:derby:target/derbydb;create=true</property>
+    </session-factory>
 </hibernate-configuration>
diff --git a/querydsl-jpa/src/test/resources/log4j.properties b/querydsl-jpa/src/test/resources/log4j.properties
index 945b555e69..f32b17f209 100644
--- a/querydsl-jpa/src/test/resources/log4j.properties
+++ b/querydsl-jpa/src/test/resources/log4j.properties
@@ -2,7 +2,7 @@
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 #log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m %X%n
 
 ### set log levels - for more verbose logging change 'info' to 'debug' ###
 
@@ -11,6 +11,9 @@ log4j.rootLogger=WARN, stdout
 log4j.appender.querydsl=org.apache.log4j.ConsoleAppender
 log4j.appender.querydsl.layout=org.apache.log4j.PatternLayout
 log4j.appender.querydsl.layout.ConversionPattern=Querydsl : %C#%M - %m%n
- 
-#log4j.logger.com.mysema.query.jpa.hibernate=DEBUG, querydsl
-#log4j.logger.com.mysema.query.jpa.impl=DEBUG, querydsl
\ No newline at end of file
+
+#log4j.logger.com.querydsl.jpa.hibernate=DEBUG, querydsl
+#log4j.logger.com.querydsl.jpa.impl=DEBUG, querydsl
+
+log4j.logger.org.hibernate=ERROR
+log4j.logger.org.hibernate.tool.hbm2ddl=FATAL
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/resources/store.hbm.xml b/querydsl-jpa/src/test/resources/store.hbm.xml
index 09cf3dfd0e..da0b6e537a 100644
--- a/querydsl-jpa/src/test/resources/store.hbm.xml
+++ b/querydsl-jpa/src/test/resources/store.hbm.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 
-	<class name="com.mysema.query.jpa.domain3.Store" table="STORE" discriminator-value="S">
+    <class name="com.querydsl.jpa.domain3.Store" table="STORE" discriminator-value="S">
 
 <!--  
        <discriminator column="subclass" type="character"/>
@@ -39,11 +39,11 @@
             <column name="CHAIN_CODE"/>
         </property>
 
-        <subclass name="com.mysema.query.jpa.domain3.HardwareStore" discriminator-value="D">
+        <subclass name="com.querydsl.jpa.domain3.HardwareStore" discriminator-value="D">
 
-           <property name="storeCode">
-           		<column name="STORE_CODE"/>
-           </property>
+        <property name="storeCode">
+            <column name="STORE_CODE"/>
+        </property>
 
         </subclass>
 
diff --git a/querydsl-jpa/template.mf b/querydsl-jpa/template.mf
deleted file mode 100644
index a4eedfd08b..0000000000
--- a/querydsl-jpa/template.mf
+++ /dev/null
@@ -1,17 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.jpa
-Bundle-Name: Querydsl JPA
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.sql.*;version="${project.version}";resolution:=optional,
-  com.mysema.query.*;version="${project.version}",
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",
-  javax.persistence.*;version="[1.1.0,2.1.0]",
-  javax.xml.stream.*;version="0",
-  org.hibernate.*;version="${hibernate.version}";resolution:=optional,
-  org.eclipse.persistence.*;version="2.4.0";resolution:=optional,
-  org.slf4j.*;version="${slf4j.version}",
-  com.google.common.*;version="${guava.version}"
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/pom.xml b/querydsl-kotlin-codegen/pom.xml
new file mode 100644
index 0000000000..a884a29656
--- /dev/null
+++ b/querydsl-kotlin-codegen/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <parent>
+        <artifactId>querydsl-root</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>querydsl-kotlin-codegen</artifactId>
+    <name>Querydsl - Kotlin codegen support</name>
+
+    <properties>
+        <surefire.useManifestOnlyJar>false</surefire.useManifestOnlyJar>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>kotlinpoet</artifactId>
+            <version>1.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-codegen</artifactId>
+            <version>5.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- test -->
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-scripting-jsr223</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-script-runtime</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt
new file mode 100644
index 0000000000..0c3faacb26
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.codegen.utils.model.Type
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.TypeName
+import com.squareup.kotlinpoet.WildcardTypeName
+import com.squareup.kotlinpoet.asClassName
+import com.squareup.kotlinpoet.asTypeName
+import com.squareup.kotlinpoet.joinToCode
+import kotlin.reflect.KClass
+
+fun Type.asTypeName(): TypeName = asClassName().let { className ->
+    if (parameters.isNotEmpty())
+        className.parameterizedBy(*parameters.map { it.asTypeName() }.toTypedArray()) else className
+}
+
+fun Type.asClassName(): ClassName = when (this.fullName) {
+    "java.lang.Boolean", "boolean" -> Boolean::class.asClassName()
+    "java.lang.Byte", "byte" -> Byte::class.asClassName()
+    "java.lang.Character", "char" -> Char::class.asClassName()
+    "java.lang.Short", "short" -> Short::class.asClassName()
+    "java.lang.Integer", "int" -> Int::class.asClassName()
+    "java.lang.Long", "long" -> Long::class.asClassName()
+    "java.lang.Float", "float" -> Float::class.asClassName()
+    "java.lang.Double", "double" -> Double::class.asClassName()
+    "boolean[]" -> BooleanArray::class.asClassName()
+    "byte[]" -> ByteArray::class.asClassName()
+    "char[]" -> CharArray::class.asClassName()
+    "short[]" -> ShortArray::class.asClassName()
+    "int[]" -> IntArray::class.asClassName()
+    "long[]" -> LongArray::class.asClassName()
+    "float[]" -> FloatArray::class.asClassName()
+    "double[]" -> DoubleArray::class.asClassName()
+    "java.lang.String" -> String::class.asClassName()
+    "java.util.List" -> List::class.asClassName()
+    "java.util.Map" -> Map::class.asClassName()
+    "java.util.Set" -> Set::class.asClassName()
+    else -> ClassName(packageName, *enclosingTypeHierarchy().toTypedArray())
+}
+
+fun Type.asOutTypeName() = WildcardTypeName.producerOf(asTypeName())
+
+private fun Type.enclosingTypeHierarchy(): List<String> {
+    var current: Type? = this
+    return generateSequence { current?.also { current = it.enclosingType }?.simpleName }.toList().asReversed()
+}
+
+fun ClassName.asClassStatement() = CodeBlock.of("%T::class.java", this)
+
+fun Type.asClassNameStatement() = asClassName().asClassStatement()
+
+fun TypeMappings.getPathClassName(type: Type, model: EntityType) = getPathType(type, model, true).asClassName()
+
+fun TypeMappings.getPathTypeName(type: Type, model: EntityType) = getPathType(type, model, false).asTypeName()
+
+fun KClass<*>.parameterizedBy(vararg types: TypeName) = asTypeName().parameterizedBy(*types)
+
+fun KClass<*>.parameterizedBy(vararg types: Type) = asTypeName().parameterizedBy(types.map { it.asTypeName() })
+
+fun Collection<String>.joinToCode(
+        format: String = "%S",
+        separator: CharSequence = ", ",
+        prefix: CharSequence = "",
+        suffix: CharSequence = "") = map { it.asCodeBlock(format) }.joinToCode(separator, prefix, suffix)
+
+fun Any.asCodeBlock(format: String = "%L") = CodeBlock.of(format, this)
+
+fun ParameterSpec.asCodeBlock(format: String = "%N") = (this as Any).asCodeBlock(format)
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinAptExtension.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinAptExtension.kt
new file mode 100644
index 0000000000..c8b733146f
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinAptExtension.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.AbstractModule
+import com.querydsl.codegen.EmbeddableSerializer
+import com.querydsl.codegen.EntitySerializer
+import com.querydsl.codegen.Extension
+import com.querydsl.codegen.Filer
+import com.querydsl.codegen.ProjectionSerializer
+import com.querydsl.codegen.SupertypeSerializer
+import com.querydsl.codegen.TypeMappings
+
+class KotlinAptExtension : Extension {
+    override fun addSupport(module: AbstractModule) {
+        module.bind(EntitySerializer::class.java, KotlinEntitySerializer::class.java)
+        module.bind(EmbeddableSerializer::class.java, KotlinEmbeddableSerializer::class.java)
+        module.bind(SupertypeSerializer::class.java, KotlinSuperSerializer::class.java)
+        module.bind(ProjectionSerializer::class.java, KotlinProjectionSerializer::class.java)
+        module.bind(TypeMappings::class.java, KotlinTypeMappings::class.java)
+        module.bind(Filer::class.java, KotlinFiler::class.java)
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEmbeddableSerializer.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEmbeddableSerializer.kt
new file mode 100644
index 0000000000..4cfbaf50a7
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEmbeddableSerializer.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.CodegenModule
+import com.querydsl.codegen.EmbeddableSerializer
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.core.types.Path
+import com.querydsl.core.types.dsl.BeanPath
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.reflect.KClass
+
+class KotlinEmbeddableSerializer @Inject constructor(
+    mappings: TypeMappings,
+    @Named(CodegenModule.KEYWORDS)
+    keywords: Collection<String>,
+    @Named(CodegenModule.GENERATED_ANNOTATION_CLASS)
+    generatedAnnotationClass: Class<out Annotation> = GeneratedAnnotationResolver.resolveDefault()
+) : KotlinEntitySerializer(mappings, keywords, generatedAnnotationClass), EmbeddableSerializer {
+    override fun defaultSuperType(): KClass<out Path<*>> = BeanPath::class
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt
new file mode 100644
index 0000000000..906e7b70cb
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinEntitySerializer.kt
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.CodegenModule
+import com.querydsl.codegen.EntitySerializer
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.Property
+import com.querydsl.codegen.SerializerConfig
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.codegen.utils.CodeWriter
+import com.querydsl.codegen.utils.model.SimpleType
+import com.querydsl.codegen.utils.model.Type
+import com.querydsl.codegen.utils.model.TypeCategory
+import com.querydsl.core.types.Path
+import com.querydsl.core.types.PathMetadata
+import com.querydsl.core.types.PathMetadataFactory
+import com.querydsl.core.types.dsl.ArrayPath
+import com.querydsl.core.types.dsl.BooleanPath
+import com.querydsl.core.types.dsl.CollectionPath
+import com.querydsl.core.types.dsl.CollectionPathBase
+import com.querydsl.core.types.dsl.ComparablePath
+import com.querydsl.core.types.dsl.DatePath
+import com.querydsl.core.types.dsl.DateTimePath
+import com.querydsl.core.types.dsl.EntityPathBase
+import com.querydsl.core.types.dsl.EnumPath
+import com.querydsl.core.types.dsl.ListPath
+import com.querydsl.core.types.dsl.MapPath
+import com.querydsl.core.types.dsl.NumberPath
+import com.querydsl.core.types.dsl.SetPath
+import com.querydsl.core.types.dsl.StringPath
+import com.querydsl.core.types.dsl.TimePath
+import com.squareup.kotlinpoet.AnnotationSpec
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeName
+import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.WildcardTypeName
+import com.squareup.kotlinpoet.asTypeName
+import com.squareup.kotlinpoet.buildCodeBlock
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.reflect.KClass
+
+open class KotlinEntitySerializer @Inject constructor(
+    private val mappings: TypeMappings,
+    @Named(CodegenModule.KEYWORDS)
+    protected val keywords: Collection<String>,
+    @Named(CodegenModule.GENERATED_ANNOTATION_CLASS)
+    private val generatedAnnotationClass: Class<out Annotation> = GeneratedAnnotationResolver.resolveDefault()
+) : EntitySerializer {
+
+    override fun serialize(model: EntityType, config: SerializerConfig, writer: CodeWriter) {
+        val queryType: Type = mappings.getPathType(model, model, false)
+        FileSpec.builder(queryType.packageName, queryType.simpleName)
+            .addImport(PathMetadataFactory::class, "forVariable", "forProperty")
+            .addType(
+                intro(model, config)
+                    .serializeProperties(model, config)
+                    .constructors(model, config)
+                    .build()
+            )
+            .build()
+            .writeTo(writer)
+    }
+
+    protected open fun intro(model: EntityType, config: SerializerConfig): TypeSpec.Builder {
+        return introClassHeader(model, config)
+            .introJavadoc(model, config)
+            .introSuper(model)
+    }
+
+    protected open fun introClassHeader(model: EntityType, config: SerializerConfig): TypeSpec.Builder {
+        val pathType = if (model.properties.isEmpty()) {
+            when (model.originalCategory) {
+                TypeCategory.COMPARABLE -> ComparablePath::class
+                TypeCategory.ENUM -> EnumPath::class
+                TypeCategory.DATE -> DatePath::class
+                TypeCategory.DATETIME -> DateTimePath::class
+                TypeCategory.TIME -> TimePath::class
+                TypeCategory.NUMERIC -> NumberPath::class
+                TypeCategory.STRING -> StringPath::class
+                TypeCategory.BOOLEAN -> BooleanPath::class
+                else -> defaultSuperType()
+            }
+        } else {
+            defaultSuperType()
+        }
+        val superType = when (model.originalCategory) {
+            TypeCategory.BOOLEAN, TypeCategory.STRING -> pathType.asTypeName()
+            else -> pathType.parameterizedBy(model)
+        }
+        return TypeSpec.classBuilder(mappings.getPathClassName(model, model))
+            .addAnnotations(model.annotations.map { AnnotationSpec.get(it) })
+            .addAnnotation(AnnotationSpec.builder(generatedAnnotationClass).addMember("%S", javaClass.name).build())
+            .superclass(superType)
+            .addType(introCompanion(model, config))
+    }
+
+    protected open fun defaultSuperType(): KClass<out Path<*>> = EntityPathBase::class
+
+    protected open fun introCompanion(model: EntityType, config: SerializerConfig): TypeSpec {
+        return TypeSpec.companionObjectBuilder()
+            .addProperty(PropertySpec.builder("serialVersionUID", Long::class, KModifier.CONST, KModifier.PRIVATE).initializer("%L", model.fullName.hashCode()).build())
+            .let { if (config.createDefaultVariable()) it.introDefaultInstance(model, config.defaultVariableName()) else it }
+            .build()
+    }
+
+    protected open fun TypeSpec.Builder.introJavadoc(model: EntityType, config: SerializerConfig): TypeSpec.Builder = apply {
+        addKdoc("%L is a Querydsl query type for %L", mappings.getPathType(model, model, true).simpleName, model.simpleName)
+    }
+
+    protected open fun TypeSpec.Builder.introDefaultInstance(model: EntityType, defaultName: String): TypeSpec.Builder = apply {
+        val simpleName = defaultName.ifEmpty { model.modifiedSimpleName }
+        val queryType = mappings.getPathClassName(model, model)
+        val alias = if (keywords.contains(simpleName.uppercase(Locale.getDefault()))) "${simpleName}1" else simpleName
+        addProperty(PropertySpec.builder(simpleName, queryType, KModifier.PUBLIC).initializer("%T(%S)", queryType, alias).addAnnotation(JvmField::class).build())
+    }
+
+    protected open fun TypeSpec.Builder.introSuper(model: EntityType): TypeSpec.Builder = apply {
+        val superType = model.superType?.entityType
+        if (superType != null) {
+            val superQueryType = mappings.getPathTypeName(superType, model)
+            addProperty(
+                PropertySpec.builder("_super", superQueryType, KModifier.PUBLIC)
+                    .delegate(buildCodeBlock {
+                        beginControlFlow("lazy")
+                        addStatement("%T(this)", superQueryType)
+                        endControlFlow()
+                    }).build()
+            )
+        }
+    }
+
+    protected open fun TypeSpec.Builder.serializeProperties(model: EntityType, config: SerializerConfig): TypeSpec.Builder = apply {
+        model.properties.forEach { property ->
+            // FIXME : the custom types should have the custom type category
+            if (mappings.isRegistered(property.type) && property.type.category != TypeCategory.CUSTOM && property.type.category != TypeCategory.ENTITY) {
+                customField(model, property, config)
+            } else {
+                // strips of "? extends " etc
+                val queryType = mappings.getPathTypeName(SimpleType(property.type, property.type.parameters), model)
+                val classStatement = property.type.asClassNameStatement()
+
+                when (property.type.category ?: TypeCategory.ENTITY) {
+                    TypeCategory.STRING -> serialize(model, property, queryType, "createString")
+                    TypeCategory.BOOLEAN -> serialize(model, property, queryType, "createBoolean")
+                    TypeCategory.SIMPLE -> serialize(model, property, queryType, "createSimple", classStatement)
+                    TypeCategory.COMPARABLE -> serialize(model, property, queryType, "createComparable", classStatement)
+                    TypeCategory.ENUM -> serialize(model, property, queryType, "createEnum", classStatement)
+                    TypeCategory.DATE -> serialize(model, property, queryType, "createDate", classStatement)
+                    TypeCategory.DATETIME -> serialize(model, property, queryType, "createDateTime", classStatement)
+                    TypeCategory.TIME -> serialize(model, property, queryType, "createTime", classStatement)
+                    TypeCategory.NUMERIC -> serialize(model, property, queryType, "createNumber", classStatement)
+                    TypeCategory.CUSTOM -> customField(model, property, config)
+                    TypeCategory.ARRAY -> serialize(model, property, ArrayPath::class.parameterizedBy(property.type, property.type.componentType), "createArray", classStatement)
+                    TypeCategory.COLLECTION -> collectionField(model, property, "createCollection", CollectionPath::class)
+                    TypeCategory.SET -> collectionField(model, property, "createSet", SetPath::class)
+                    TypeCategory.LIST -> collectionField(model, property, "createList", ListPath::class)
+                    TypeCategory.MAP -> {
+                        val genericQueryType = mappings.getPathType(getRaw(property.getParameter(1)), model, false)
+                        val qType = mappings.getPathClassName(property.getParameter(1), model)
+                        serialize(
+                            model, property, MapPath::class.parameterizedBy(getRaw(property.getParameter(0)), getRaw(property.getParameter(1)), genericQueryType),
+                            CodeBlock.of("this.createMap<%T, %T, %T>", property.getParameter(0).asTypeName(), property.getParameter(1).asTypeName(), genericQueryType.asTypeName()),
+                            property.getParameter(0).asClassNameStatement(), property.getParameter(1).asClassNameStatement(), qType.asClassStatement()
+                        )
+                    }
+                    TypeCategory.ENTITY -> entityField(model, property, config)
+                }
+            }
+        }
+    }
+
+    private fun TypeSpec.Builder.collectionField(model: EntityType, property: Property, factoryMethod: String, pathClass: KClass<out CollectionPathBase<*, *, *>>) {
+        val genericQueryType = mappings.getPathType(getRaw(property.getParameter(0)), model, false)
+        val qType = mappings.getPathClassName(property.getParameter(0), model)
+        serialize(
+            model, property, pathClass.parameterizedBy(getRaw(property.getParameter(0)), genericQueryType),
+            CodeBlock.of("this.%L<%T, %T>", factoryMethod, property.getParameter(0).asTypeName(), genericQueryType.asTypeName()),
+            property.getParameter(0).asClassNameStatement(), qType.asClassStatement(), "null".asCodeBlock()
+        )
+    }
+
+    protected open fun TypeSpec.Builder.customField(model: EntityType, field: Property, config: SerializerConfig) {
+        val queryType = mappings.getPathTypeName(field.type, model)
+        val builder = PropertySpec.builder(field.escapedName, queryType, KModifier.PUBLIC).addKdoc("custom")
+        if (field.isInherited) {
+            builder.addKdoc("inherited")
+            builder.delegate(buildCodeBlock {
+                beginControlFlow("lazy")
+                addStatement("%T(_super.%L)", queryType, field.escapedName)
+                endControlFlow()
+            })
+        } else {
+            builder.initializer("%T(forProperty(%S))", queryType, field.name)
+        }
+        addProperty(builder.build())
+    }
+
+    protected open fun TypeSpec.Builder.serialize(model: EntityType, field: Property, type: TypeName, factoryMethod: Any, vararg args: CodeBlock) {
+        val superType = model.superType
+        val builder = PropertySpec.builder(field.escapedName, type, KModifier.PUBLIC)
+        if (field.isInherited && superType != null) {
+            builder.delegate(buildCodeBlock {
+                beginControlFlow("lazy")
+                addStatement("_super.%L", field.escapedName)
+                endControlFlow()
+            })
+        } else {
+            builder.initializer("%L(%S${", %L".repeat(args.size)})", factoryMethod, field.name, *args)
+        }
+        if (field.isInherited) {
+            builder.addKdoc("inherited")
+        }
+        addProperty(builder.build())
+    }
+
+    private fun getRaw(type: Type): Type {
+        return if (type is EntityType && type.getPackageName().startsWith("ext.java")) {
+            type
+        } else {
+            SimpleType(type, type.parameters)
+        }
+    }
+
+    protected open fun TypeSpec.Builder.entityField(model: EntityType, field: Property, config: SerializerConfig) {
+        val fieldType = mappings.getPathTypeName(field.type, model)
+        val builder = PropertySpec.builder(field.escapedName, fieldType)
+        if (field.isInherited) {
+            builder.addKdoc("inherited")
+        }
+        builder.addModifiers(if (config.useEntityAccessors()) KModifier.PROTECTED else KModifier.PUBLIC)
+        builder.delegate(buildCodeBlock {
+            beginControlFlow("lazy")
+            addStatement("%T(forProperty(%S))", fieldType, field.name)
+            endControlFlow()
+        })
+        addProperty(builder.build())
+    }
+
+    protected open fun TypeSpec.Builder.constructors(model: EntityType, config: SerializerConfig): TypeSpec.Builder {
+        val stringOrBoolean = (model.originalCategory == TypeCategory.STRING || model.originalCategory == TypeCategory.BOOLEAN)
+
+        // String
+        constructorsForVariables(model)
+
+        // Path
+        val path = ParameterSpec.builder("path", if (model.isFinal) Path::class.parameterizedBy(model) else Path::class.parameterizedBy(model.asOutTypeName())).build()
+        val pathConstructor = FunSpec.constructorBuilder().addParameter(path)
+        if (stringOrBoolean) {
+            pathConstructor.callSuperConstructor(CodeBlock.of("%N.metadata", path))
+        } else {
+            pathConstructor.callSuperConstructor(CodeBlock.of("%N.type", path), CodeBlock.of("%N.metadata", path))
+        }
+        pathConstructor.addCode(constructorContent(model))
+        addFunction(pathConstructor.build())
+
+        // PathMetadata
+        val metadata = ParameterSpec.builder("metadata", PathMetadata::class).build()
+        val pathMetadataConstructor = FunSpec.constructorBuilder().addParameter(metadata)
+        if (stringOrBoolean) {
+            pathMetadataConstructor.callSuperConstructor(metadata.asCodeBlock())
+        } else {
+            pathMetadataConstructor.callSuperConstructor(model.asClassNameStatement(), metadata.asCodeBlock())
+        }
+        pathConstructor.addCode(constructorContent(model))
+        addFunction(pathMetadataConstructor.build())
+
+        // Class, PathMetadata
+        val type = ParameterSpec.builder("type", Class::class.asTypeName().parameterizedBy(WildcardTypeName.producerOf(model.asTypeName()))).build()
+        addFunction(
+            FunSpec.constructorBuilder()
+                .addParameter(type)
+                .addParameter(metadata)
+                .callSuperConstructor(type.asCodeBlock(), metadata.asCodeBlock())
+                .addCode(constructorContent(model)).build()
+        )
+        return this
+    }
+
+    protected open fun constructorContent(model: EntityType): CodeBlock {
+        // override in subclasses
+        return CodeBlock.builder().build()
+    }
+
+    protected open fun TypeSpec.Builder.constructorsForVariables(model: EntityType) {
+        val stringOrBoolean = (model.originalCategory == TypeCategory.STRING || model.originalCategory == TypeCategory.BOOLEAN)
+
+        val variable = ParameterSpec.builder("variable", String::class).build()
+        val builder = FunSpec.constructorBuilder().addParameter(variable)
+        if (stringOrBoolean) {
+            builder.callSuperConstructor(CodeBlock.of("forVariable(%N)", variable))
+        } else {
+            builder.callSuperConstructor(model.asClassNameStatement(), CodeBlock.of("forVariable(%N)", variable))
+        }
+        builder.addCode(constructorContent(model))
+        addFunction(builder.build())
+    }
+}
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinFiler.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinFiler.kt
new file mode 100644
index 0000000000..8d85d923cd
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinFiler.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.Filer
+import java.io.File
+import java.io.Writer
+import java.lang.Appendable
+import javax.annotation.processing.ProcessingEnvironment
+import javax.lang.model.element.Element
+
+class KotlinFiler : Filer {
+    override fun createFile(processingEnvironment: ProcessingEnvironment, classname: String, elements: MutableCollection<out Element>): Writer {
+        val file = File("${processingEnvironment.options["kapt.kotlin.generated"]}/${classname.replace(".", "/")}.kt")
+        file.parentFile.mkdirs()
+        return file.writer()
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinProjectionSerializer.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinProjectionSerializer.kt
new file mode 100644
index 0000000000..c3d8bb810d
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinProjectionSerializer.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.CodegenModule
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.ProjectionSerializer
+import com.querydsl.codegen.SerializerConfig
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.codegen.utils.CodeWriter
+import com.querydsl.codegen.utils.model.Type
+import com.querydsl.core.types.ConstructorExpression
+import com.querydsl.core.types.Expression
+import com.squareup.kotlinpoet.AnnotationSpec
+import com.squareup.kotlinpoet.CodeBlock
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.KModifier
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.WildcardTypeName
+import com.squareup.kotlinpoet.asClassName
+import com.squareup.kotlinpoet.joinToCode
+import javax.inject.Inject
+import javax.inject.Named
+
+open class KotlinProjectionSerializer @Inject constructor(
+    private val mappings: TypeMappings,
+    @Named(CodegenModule.GENERATED_ANNOTATION_CLASS)
+    private val generatedAnnotationClass: Class<out Annotation> = GeneratedAnnotationResolver.resolveDefault()
+) : ProjectionSerializer {
+
+    protected open fun intro(model: EntityType): TypeSpec.Builder {
+        val queryType = mappings.getPathClassName(model, model)
+        return TypeSpec.classBuilder(queryType)
+            .superclass(ConstructorExpression::class.parameterizedBy(model))
+            .addKdoc("${queryType.canonicalName} is a Querydsl Projection type for ${model.simpleName}")
+            .addAnnotation(AnnotationSpec.builder(generatedAnnotationClass).addMember("%S", javaClass.name).build())
+            .addType(introCompanion(model))
+    }
+
+    protected open fun introCompanion(model: EntityType): TypeSpec {
+        return TypeSpec.companionObjectBuilder()
+            .addProperty(PropertySpec.builder("serialVersionUID", Long::class, KModifier.CONST, KModifier.PRIVATE).initializer("%L", model.hashCode()).build())
+            .build()
+    }
+
+    protected open fun TypeSpec.Builder.outro(type: EntityType, writer: CodeWriter) {
+        val queryType: Type = mappings.getPathType(type, type, false)
+        FileSpec.builder(queryType.packageName, queryType.simpleName)
+            .addType(build())
+            .build()
+            .writeTo(writer)
+    }
+
+    override fun serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
+        val builder = intro(model)
+        val sizes: MutableSet<Int> = mutableSetOf()
+        for (c in model.constructors) {
+            val asExpr = sizes.add(c.parameters.size)
+            builder.addFunction(
+                FunSpec.constructorBuilder()
+                    .addParameters(c.parameters.map {
+                        ParameterSpec.builder(
+                            it.name, when {
+                                !asExpr -> mappings.getExprType(it.type, model, false, false, true).asTypeName()
+                                it.type.isFinal -> Expression::class.parameterizedBy(it.type.asTypeName())
+                                else -> Expression::class.asClassName().parameterizedBy(WildcardTypeName.producerOf(it.type.asTypeName()))
+                            }
+                        ).build()
+                    })
+                    .callSuperConstructor(model.asClassNameStatement(),
+                        c.parameters.map { it.type.asClassNameStatement() }.joinToCode(", ", "arrayOf(", ")"),
+                        *c.parameters.map { CodeBlock.of("%L", it.name) }.toTypedArray()
+                    )
+                    .build()
+            )
+        }
+        builder.outro(model, writer)
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinSuperSerializer.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinSuperSerializer.kt
new file mode 100644
index 0000000000..a430acd307
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinSuperSerializer.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.SupertypeSerializer
+import com.querydsl.codegen.TypeMappings
+import javax.inject.Inject
+import javax.inject.Named
+
+class KotlinSuperSerializer @Inject constructor(mappings: TypeMappings, @Named("keywords") keyword: Collection<String>) : KotlinEntitySerializer(mappings, keyword),
+    SupertypeSerializer {
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinTypeMappings.kt b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinTypeMappings.kt
new file mode 100644
index 0000000000..a4237f3f05
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/KotlinTypeMappings.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.JavaTypeMappings
+
+class KotlinTypeMappings : JavaTypeMappings()
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/main/resources/META-INF/services/com.querydsl.codegen.Extension b/querydsl-kotlin-codegen/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
new file mode 100644
index 0000000000..7cad3ee661
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
@@ -0,0 +1 @@
+com.querydsl.kotlin.codegen.KotlinAptExtension
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/Entity.kt b/querydsl-kotlin-codegen/src/test/kotlin/Entity.kt
new file mode 100644
index 0000000000..d56c52d853
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/Entity.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Entity {
+    var name: String? = null
+
+    companion object {
+        fun test(o: Any?): String? {
+            return null
+        }
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/Entity2.kt b/querydsl-kotlin-codegen/src/test/kotlin/Entity2.kt
new file mode 100644
index 0000000000..029946eb63
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/Entity2.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Entity2 {
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/CompileUtils.kt b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/CompileUtils.kt
new file mode 100644
index 0000000000..542b03bc3f
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/CompileUtils.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import javax.script.ScriptEngineManager
+
+object CompileUtils {
+    fun assertCompiles(name: String, code: String) {
+        val engine = ScriptEngineManager().getEngineByExtension("kts")!!
+        engine.eval(code)
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt
new file mode 100644
index 0000000000..88589e52e7
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.Delegate
+import com.querydsl.codegen.EntitySerializer
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.Property
+import com.querydsl.codegen.QueryTypeFactory
+import com.querydsl.codegen.QueryTypeFactoryImpl
+import com.querydsl.codegen.SimpleSerializerConfig
+import com.querydsl.codegen.Supertype
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.codegen.utils.JavaWriter
+import com.querydsl.codegen.utils.model.ClassType
+import com.querydsl.codegen.utils.model.SimpleType
+import com.querydsl.codegen.utils.model.TypeCategory
+import com.querydsl.codegen.utils.model.Types
+import com.querydsl.core.annotations.Generated
+import com.querydsl.core.annotations.PropertyType
+import com.querydsl.kotlin.codegen.CompileUtils.assertCompiles
+import org.hamcrest.Matchers
+import org.junit.Assert
+import org.junit.Ignore
+import org.junit.Test
+import java.io.StringWriter
+import java.sql.Time
+import java.util.*
+
+class EmbeddableSerializerTest {
+    private val queryTypeFactory: QueryTypeFactory = QueryTypeFactoryImpl("Q", "", "")
+    private val typeMappings: TypeMappings = KotlinTypeMappings()
+    private val serializer: EntitySerializer = KotlinEmbeddableSerializer(typeMappings, emptySet())
+    private val writer = StringWriter()
+
+    @Test
+    fun properties() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "b", ClassType(TypeCategory.BOOLEAN, Boolean::class.java)))
+        entityType.addProperty(Property(entityType, "c", ClassType(TypeCategory.COMPARABLE, String::class.java)))
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(Property(entityType, "d", ClassType(TypeCategory.DATE, Date::class.java)))
+        entityType.addProperty(Property(entityType, "e", ClassType(TypeCategory.ENUM, PropertyType::class.java)))
+        entityType.addProperty(Property(entityType, "dt", ClassType(TypeCategory.DATETIME, Date::class.java)))
+        entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
+        entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
+        entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun originalCategory() {
+        val categoryToSuperClass: MutableMap<TypeCategory, String> = EnumMap(TypeCategory::class.java)
+        categoryToSuperClass[TypeCategory.COMPARABLE] = "ComparablePath<Entity>"
+        categoryToSuperClass[TypeCategory.ENUM] = "EnumPath<Entity>"
+        categoryToSuperClass[TypeCategory.DATE] = "DatePath<Entity>"
+        categoryToSuperClass[TypeCategory.DATETIME] = "DateTimePath<Entity>"
+        categoryToSuperClass[TypeCategory.TIME] = "TimePath<Entity>"
+        categoryToSuperClass[TypeCategory.NUMERIC] = "NumberPath<Entity>"
+        categoryToSuperClass[TypeCategory.STRING] = "StringPath"
+        categoryToSuperClass[TypeCategory.BOOLEAN] = "BooleanPath"
+        for ((key, value) in categoryToSuperClass) {
+            val w = StringWriter()
+            val type = SimpleType(key, "Entity", "", "Entity", false, false)
+            val entityType = EntityType(type)
+            typeMappings.register(entityType, queryTypeFactory.create(entityType))
+            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(w))
+            Assert.assertTrue("$value is missing from $w", w.toString().contains("class QEntity : $value {"))
+        }
+    }
+
+    @Test
+    fun empty() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun no_package() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("class QEntity : BeanPath<Entity> {"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun correct_superclass() {
+        val type = SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("class QLocale : BeanPath<Locale> {"))
+        assertCompiles("QLocale", writer.toString())
+    }
+
+    @Test
+    fun primitive_array() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "bytes", ClassType(ByteArray::class.java)))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("val bytes: SimplePath<ByteArray>"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun include() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "b", ClassType(TypeCategory.BOOLEAN, Boolean::class.java)))
+        entityType.addProperty(Property(entityType, "c", ClassType(TypeCategory.COMPARABLE, String::class.java)))
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(Property(entityType, "d", ClassType(TypeCategory.DATE, Date::class.java)))
+        entityType.addProperty(Property(entityType, "e", ClassType(TypeCategory.ENUM, PropertyType::class.java)))
+        entityType.addProperty(Property(entityType, "dt", ClassType(TypeCategory.DATETIME, Date::class.java)))
+        entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
+        entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
+        entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        val subType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
+        subType.include(Supertype(type, entityType))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        typeMappings.register(subType, queryTypeFactory.create(subType))
+        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        assertCompiles("QEntity2", writer.toString())
+    }
+
+    @Test
+    fun superType() {
+        val superType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type, setOf(Supertype(superType, superType)))
+        typeMappings.register(superType, queryTypeFactory.create(superType))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("val _super: QEntity2 by lazy {\n    QEntity2(this)\n  }"))
+        //CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+    @Test
+    @Ignore
+    fun delegates() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        val delegate = Delegate(type, type, "test", emptyList(), Types.STRING)
+        entityType.addDelegate(delegate)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("return Entity.test(this);"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun defaultGeneratedAnnotation() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSource = writer.toString()
+        Assert.assertThat(generatedSource, Matchers.containsString("import $generatedAnnotationImport"))
+        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class"))
+        assertCompiles("QEntity", generatedSource)
+    }
+
+    @Test
+    fun customGeneratedAnnotation() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        KotlinEmbeddableSerializer(typeMappings, emptySet(), Generated::class.java).serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSourceCode = writer.toString()
+        Assert.assertThat(generatedSourceCode, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class"))
+        assertCompiles("QEntity", generatedSourceCode)
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt
new file mode 100644
index 0000000000..127096799d
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.Delegate
+import com.querydsl.codegen.EntitySerializer
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.Property
+import com.querydsl.codegen.QueryTypeFactory
+import com.querydsl.codegen.QueryTypeFactoryImpl
+import com.querydsl.codegen.SimpleSerializerConfig
+import com.querydsl.codegen.Supertype
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.codegen.utils.JavaWriter
+import com.querydsl.codegen.utils.model.ClassType
+import com.querydsl.codegen.utils.model.SimpleType
+import com.querydsl.codegen.utils.model.TypeCategory
+import com.querydsl.codegen.utils.model.Types
+import com.querydsl.core.annotations.Generated
+import com.querydsl.core.annotations.PropertyType
+import com.querydsl.kotlin.codegen.CompileUtils.assertCompiles
+import org.junit.Assert
+import org.junit.Ignore
+import org.junit.Test
+import java.io.StringWriter
+import java.sql.Time
+import java.util.*
+
+class EntitySerializerTest {
+    private var queryTypeFactory: QueryTypeFactory = QueryTypeFactoryImpl("Q", "", "")
+    private val typeMappings: TypeMappings = KotlinTypeMappings()
+    private val serializer: EntitySerializer = KotlinEntitySerializer(typeMappings, emptySet())
+    private val writer = StringWriter()
+
+    class Entity
+
+    @Test
+    fun javadocs_for_innerClass() {
+        val entityType = EntityType(ClassType(Entity::class.java))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("QEntitySerializerTest_Entity is a Querydsl query type for Entity"))
+        assertCompiles("QEntitySerializerTest_Entity", writer.toString())
+    }
+
+    @Test
+    fun different_package() {
+        queryTypeFactory = QueryTypeFactoryImpl("Q", "", ".gen")
+        val entityType = EntityType(ClassType(Entity::class.java))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("class QEntitySerializerTest_Entity : EntityPathBase<EntitySerializerTest.Entity>"))
+        assertCompiles("QEntitySerializerTest_Entity", writer.toString())
+    }
+
+    @Test
+    fun no_package() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("class QEntity : EntityPathBase<Entity> {"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun original_category() {
+        val categoryToSuperClass: MutableMap<TypeCategory, String> = EnumMap(TypeCategory::class.java)
+        categoryToSuperClass[TypeCategory.COMPARABLE] = "ComparablePath<Entity>"
+        categoryToSuperClass[TypeCategory.ENUM] = "EnumPath<Entity>"
+        categoryToSuperClass[TypeCategory.DATE] = "DatePath<Entity>"
+        categoryToSuperClass[TypeCategory.DATETIME] = "DateTimePath<Entity>"
+        categoryToSuperClass[TypeCategory.TIME] = "TimePath<Entity>"
+        categoryToSuperClass[TypeCategory.NUMERIC] = "NumberPath<Entity>"
+        categoryToSuperClass[TypeCategory.STRING] = "StringPath"
+        categoryToSuperClass[TypeCategory.BOOLEAN] = "BooleanPath"
+        for (entry in categoryToSuperClass.entries) {
+            val type = SimpleType(entry.key, "Entity", "", "Entity", false, false)
+            val entityType = EntityType(type)
+            typeMappings.register(entityType, queryTypeFactory.create(entityType))
+            serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+            Assert.assertTrue(entry.toString(), writer.toString().contains("class QEntity : " + entry.value + " {"))
+        }
+    }
+
+    @Test
+    fun correct_superclass() {
+        val type = SimpleType(TypeCategory.ENTITY, "java.util.Locale", "java.util", "Locale", false, false)
+        val entityType = EntityType(type)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("class QLocale : EntityPathBase<Locale> {"))
+        assertCompiles("QLocale", writer.toString())
+    }
+
+    @Test
+    fun primitive_array() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "bytes", ClassType(ByteArray::class.java)))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("val bytes: SimplePath<ByteArray>"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun include() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "b", ClassType(TypeCategory.BOOLEAN, Boolean::class.java)))
+        entityType.addProperty(Property(entityType, "c", ClassType(TypeCategory.COMPARABLE, String::class.java)))
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(Property(entityType, "d", ClassType(TypeCategory.DATE, Date::class.java)))
+        entityType.addProperty(Property(entityType, "e", ClassType(TypeCategory.ENUM, PropertyType::class.java)))
+        entityType.addProperty(Property(entityType, "dt", ClassType(TypeCategory.DATETIME, Date::class.java)))
+        entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
+        entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
+        entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        val subType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
+        subType.include(Supertype(type, entityType))
+        typeMappings.register(subType, queryTypeFactory.create(subType))
+        serializer.serialize(subType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        assertCompiles("QEntity2", writer.toString())
+    }
+
+    @Test
+    fun properties() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        entityType.addProperty(Property(entityType, "b", ClassType(TypeCategory.BOOLEAN, Boolean::class.java)))
+        entityType.addProperty(Property(entityType, "c", ClassType(TypeCategory.COMPARABLE, String::class.java)))
+        //entityType.addProperty(new Property(entityType, "cu", new ClassType(TypeCategory.CUSTOM, PropertyType.class)));
+        entityType.addProperty(Property(entityType, "d", ClassType(TypeCategory.DATE, Date::class.java)))
+        entityType.addProperty(Property(entityType, "e", ClassType(TypeCategory.ENUM, PropertyType::class.java)))
+        entityType.addProperty(Property(entityType, "dt", ClassType(TypeCategory.DATETIME, Date::class.java)))
+        entityType.addProperty(Property(entityType, "i", ClassType(TypeCategory.NUMERIC, Int::class.java)))
+        entityType.addProperty(Property(entityType, "s", ClassType(TypeCategory.STRING, String::class.java)))
+        entityType.addProperty(Property(entityType, "t", ClassType(TypeCategory.TIME, Time::class.java)))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun superType() {
+        val superType = EntityType(SimpleType(TypeCategory.ENTITY, "Entity2", "", "Entity2", false, false))
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type, setOf(Supertype(superType, superType)))
+        typeMappings.register(superType, queryTypeFactory.create(superType))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("val _super: QEntity2 by lazy {\n    QEntity2(this)\n  }"))
+        //CompileUtils.assertCompiles("QEntity", writer.toString());
+    }
+
+
+    @Test
+    @Ignore //TODO: Implement delegates. Or document that extensions need to be used instead?
+    fun delegates() {
+        val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false)
+        val entityType = EntityType(type)
+        val delegate = Delegate(type, type, "test", emptyList(), Types.STRING)
+        entityType.addDelegate(delegate)
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("return Entity.test(this)"))
+        assertCompiles("QEntity", writer.toString())
+    }
+
+    @Test
+    fun defaultGeneratedAnnotation() {
+        val entityType = EntityType(ClassType(Entity::class.java))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSourceCode = writer.toString()
+        Assert.assertTrue(generatedSourceCode.contains("import $generatedAnnotationImport"))
+        Assert.assertTrue(generatedSourceCode.contains("@Generated(\"com.querydsl.kotlin.codegen.KotlinEntitySerializer\")\npublic class"))
+        assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode)
+    }
+
+    @Test
+    fun customGeneratedAnnotation() {
+        val entityType = EntityType(ClassType(Entity::class.java))
+        typeMappings.register(entityType, queryTypeFactory.create(entityType))
+        KotlinEntitySerializer(typeMappings, emptySet(), Generated::class.java).serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSourceCode = writer.toString()
+        Assert.assertTrue(generatedSourceCode.contains("import " + Generated::class.java.name))
+        Assert.assertTrue(generatedSourceCode.contains("@${Generated::class.java.simpleName}(\"com.querydsl.kotlin.codegen.KotlinEntitySerializer\")\npublic class"))
+        assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode)
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt
new file mode 100644
index 0000000000..6f313189f6
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.EntityType
+import com.querydsl.codegen.GeneratedAnnotationResolver
+import com.querydsl.codegen.ProjectionSerializer
+import com.querydsl.codegen.SimpleSerializerConfig
+import com.querydsl.codegen.utils.JavaWriter
+import com.querydsl.codegen.utils.model.Constructor
+import com.querydsl.codegen.utils.model.Parameter
+import com.querydsl.codegen.utils.model.SimpleType
+import com.querydsl.codegen.utils.model.Type
+import com.querydsl.codegen.utils.model.TypeCategory
+import com.querydsl.codegen.utils.model.Types
+import com.querydsl.core.annotations.Generated
+import org.hamcrest.Matchers
+import org.junit.Assert
+import org.junit.Test
+import java.io.StringWriter
+import java.io.Writer
+import java.util.*
+
+class ProjectionSerializerTest {
+    @Test
+    fun constructors() {
+        val typeModel: Type = SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false)
+        val type = EntityType(typeModel)
+
+        // constructor
+        val firstName = Parameter("firstName", Types.STRING)
+        val lastName = Parameter("lastName", Types.STRING)
+        val age = Parameter("age", Types.INTEGER)
+        type.addConstructor(Constructor(Arrays.asList(firstName, lastName, age)))
+        val writer: Writer = StringWriter()
+        val serializer: ProjectionSerializer = KotlinProjectionSerializer(KotlinTypeMappings())
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        Assert.assertTrue(writer.toString().contains("firstName: Expression<String>"))
+        Assert.assertTrue(writer.toString().contains("lastName: Expression<String>"))
+        Assert.assertTrue(writer.toString().contains("age: Expression<Int>"))
+    }
+
+    @Test
+    fun defaultGeneratedAnnotation() {
+        val typeModel: Type = SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false)
+        val type = EntityType(typeModel)
+        val writer: Writer = StringWriter()
+        val serializer: ProjectionSerializer = KotlinProjectionSerializer(KotlinTypeMappings())
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSource = writer.toString()
+        Assert.assertThat(generatedSource, Matchers.containsString("import $generatedAnnotationImport"))
+        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class"))
+    }
+
+    @Test
+    fun customGeneratedAnnotation() {
+        val typeModel: Type = SimpleType(TypeCategory.ENTITY, "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false)
+        val type = EntityType(typeModel)
+        val writer: Writer = StringWriter()
+        val serializer: ProjectionSerializer = KotlinProjectionSerializer(KotlinTypeMappings(), Generated::class.java)
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
+        val generatedSource = writer.toString()
+        Assert.assertThat(generatedSource, Matchers.containsString("import com.querydsl.core.annotations.Generated"))
+        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class"))
+    }
+}
\ No newline at end of file
diff --git a/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/utils.kt b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/utils.kt
new file mode 100644
index 0000000000..4bf71bb64d
--- /dev/null
+++ b/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/utils.kt
@@ -0,0 +1,5 @@
+package com.querydsl.kotlin.codegen
+
+import com.querydsl.codegen.GeneratedAnnotationResolver
+
+val generatedAnnotationImport = GeneratedAnnotationResolver.resolveDefault().name.replace("annotation", "`annotation`")
\ No newline at end of file
diff --git a/querydsl-kotlin/pom.xml b/querydsl-kotlin/pom.xml
new file mode 100644
index 0000000000..55fc0090ea
--- /dev/null
+++ b/querydsl-kotlin/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>querydsl-root</artifactId>
+        <groupId>com.querydsl</groupId>
+        <version>5.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>querydsl-kotlin</artifactId>
+    <name>Querydsl - Kotlin extensions</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <configuration>
+                    <compilerPlugins>
+                        <plugin>jpa</plugin>
+                    </compilerPlugins>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>com.querydsl</groupId>
+                            <artifactId>querydsl-apt</artifactId>
+                            <version>${project.version}</version>
+                            <classifier>general</classifier>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-noarg</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/java</sourceDir>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-kapt</id>
+                        <goals>
+                            <goal>test-kapt</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>process-test-sources</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/test/java</sourceDir>
+                                <sourceDir>src/test/kotlin</sourceDir>
+                                <sourceDir>target/generated-sources/kapt/test</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/querydsl-kotlin/src/main/kotlin/com/querydsl/kotlin/ExpressionExtensions.kt b/querydsl-kotlin/src/main/kotlin/com/querydsl/kotlin/ExpressionExtensions.kt
new file mode 100644
index 0000000000..f54daa0a73
--- /dev/null
+++ b/querydsl-kotlin/src/main/kotlin/com/querydsl/kotlin/ExpressionExtensions.kt
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.kotlin
+
+import com.querydsl.core.types.Expression
+import com.querydsl.core.types.Ops
+import com.querydsl.core.types.dsl.*
+import com.querydsl.core.types.dsl.Expressions.constant
+
+/**
+ * Get a negation of this boolean expression
+ *
+ * @return !this
+ */
+operator fun Expression<Boolean>.not() : BooleanExpression {
+    return Expressions.booleanOperation(Ops.NOT, this)
+}
+
+/**
+ * Get an intersection of this and the given expression
+ *
+ * @param predicate right hand side of the union
+ * @return this and right
+ */
+infix fun Expression<Boolean>.and(predicate: Expression<Boolean>) : BooleanExpression {
+    return Expressions.booleanOperation(Ops.AND, this, predicate);
+}
+
+/**
+ * Get a union of this and the given expression
+ *
+ * @param predicate right hand side of the union
+ * @return this || right
+ */
+infix fun Expression<Boolean>.or(predicate: Expression<Boolean>) : BooleanExpression {
+    return Expressions.booleanOperation(Ops.OR, this, predicate);
+}
+
+/**
+ * Get a union of this and the given expression
+ *
+ * @param predicate right hand side of the union
+ * @return this || right
+ */
+infix fun Expression<Boolean>.xor(predicate: Expression<Boolean>) : BooleanExpression {
+    return Expressions.booleanOperation(Ops.XOR, this, predicate);
+}
+
+/**
+ * Get a union of this and the given expression
+ *
+ * @param predicate right hand side of the union
+ * @return this || right
+ */
+infix fun Expression<Boolean>.xnor(predicate: Expression<Boolean>) : BooleanExpression {
+    return Expressions.booleanOperation(Ops.XNOR, this, predicate);
+}
+
+/**
+ * Get the negation of this expression
+ *
+ * @return this * -1
+ */
+operator fun <T> Expression<T>.unaryMinus() : NumberExpression<T> where T : Comparable<*>, T : Number {
+    return Expressions.numberOperation(type, Ops.NEGATE, this);
+}
+
+/**
+ * Get the sum of this and right
+ *
+ * @return this + right
+ */
+operator fun <T, V> Expression<T>.plus(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.ADD, this, other);
+}
+
+/**
+ * Get the difference of this and right
+ *
+ * @return this - right
+ */
+operator fun <T, V> Expression<T>.minus(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.SUB, this, other);
+}
+
+/**
+ * Get the result of the operation this * right
+ *
+ * @return this * right
+ */
+operator fun <T, V> Expression<T>.times(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.MULT, this, other);
+}
+
+/**
+ * Get the result of the operation this / right
+ *
+ * @return this / right
+ */
+operator fun <T, V> Expression<T>.div(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.DIV, this, other);
+}
+
+
+/**
+ * Get the result of the operation this / right
+ *
+ * @return this / right
+ */
+operator fun <T, V> NumberExpression<T>.div(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number, V : Comparable<*> {
+    return this.divide(other);
+}
+
+/**
+ * Get the result of the operation this % right
+ *
+ * @return this % right
+ */
+operator fun <T, V> Expression<T>.rem(other : Expression<V>) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.MOD, this, other);
+}
+
+/**
+ * Get the sum of this and right
+ *
+ * @return this + right
+ */
+operator fun <T, V> Expression<T>.plus(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.ADD, this, constant(other));
+}
+
+/**
+ * Get the difference of this and right
+ *
+ * @return this - right
+ */
+operator fun <T, V> Expression<T>.minus(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.SUB, this, constant(other));
+}
+
+/**
+ * Get the result of the operation this * right
+ *
+ * @return this * right
+ */
+operator fun <T, V> Expression<T>.times(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.MULT, this, constant(other));
+}
+
+/**
+ * Get the result of the operation this / right
+ *
+ * @return this / right
+ */
+operator fun <T, V> Expression<T>.div(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.DIV, this, constant(other));
+}
+
+/**
+ * Get the result of the operation this / right
+ *
+ * @return this / right
+ */
+operator fun <T, V> NumberExpression<T>.div(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number, V : Comparable<*> {
+    return this.divide(other);
+}
+
+/**
+ * Get the result of the operation this % right
+ *
+ * @return this % right
+ */
+operator fun <T, V> Expression<T>.rem(other : V) : NumberExpression<T> where T : Comparable<*>, T : Number, V : Number {
+    return Expressions.numberOperation(type, Ops.MOD, this, constant(other));
+}
+
+/**
+ * Get the concatenation of this and str
+ *
+ * @return this + str
+ */
+operator fun Expression<String>.plus(x : Expression<String>) : StringExpression {
+    return Expressions.stringOperation(Ops.CONCAT, this, x);
+}
+
+/**
+ * Get the concatenation of this and str
+ *
+ * @return this + str
+ */
+operator fun Expression<String>.plus(x : String) : StringExpression {
+    return Expressions.stringOperation(Ops.CONCAT, this, constant(x));
+}
+
+/**
+ * Get the character at the given index
+ *
+ * @param x
+ * @return this.charAt(x)
+ * @see java.lang.String#charAt(int)
+ */
+operator fun Expression<String>.get(x : Expression<Int>) : SimpleExpression<Character> {
+    return Expressions.simpleOperation(Character::class.java, Ops.CHAR_AT, this, x)
+}
+
+/**
+ * Get the character at the given index
+ *
+ * @param x
+ * @return this.charAt(x)
+ * @see java.lang.String#charAt(int)
+ */
+operator fun Expression<String>.get(x : Int) : SimpleExpression<Character> {
+    return Expressions.simpleOperation(Character::class.java, Ops.CHAR_AT, this, constant(x))
+}
diff --git a/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt b/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt
new file mode 100644
index 0000000000..ece4ab4de5
--- /dev/null
+++ b/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.kotlin
+
+import com.querydsl.core.types.dsl.*
+import org.junit.Test
+import java.math.BigDecimal
+import kotlin.test.assertEquals
+
+class CollectionTest {
+
+    @Test
+    fun basicArithmetic() {
+        val someBigDecimal = Expressions.numberPath(BigDecimal::class.java, "a")
+        val someDouble = Expressions.numberPath(Double::class.java, "b");
+        val someInteger = Expressions.numberPath(Int::class.java, "c")
+        val someOtherInteger = Expressions.numberPath(Int::class.java, "d")
+
+        val multiplyResult: NumberExpression<BigDecimal> = someBigDecimal * someDouble / someInteger
+        val expected: NumberExpression<BigDecimal> = someBigDecimal.multiply(someDouble).divide(someInteger)
+        assertEquals(expected, multiplyResult)
+
+        val sumResult : NumberExpression<BigDecimal> = someBigDecimal + someDouble - someInteger;
+        assertEquals(someBigDecimal.add(someDouble).subtract(someInteger), sumResult)
+
+        val moduloResult = someInteger % someOtherInteger
+        assertEquals(someInteger.mod(someOtherInteger), moduloResult)
+    }
+
+
+    @Test
+    fun basicArithmeticWithConstants() {
+        val someBigDecimal = Expressions.numberPath(BigDecimal::class.java, "a")
+        val someInteger = Expressions.numberPath(Int::class.java, "c")
+
+        val constantArithmeticResult = (((someBigDecimal * 2) - 1) / 4) + 1
+        val expectedConstantArithmeticResult = someBigDecimal.multiply(2).subtract(1).divide(4).add(1)
+        assertEquals(expectedConstantArithmeticResult, constantArithmeticResult)
+
+        val moduloResult = someInteger % 5
+        assertEquals(someInteger.mod(5), moduloResult)
+    }
+
+    @Test
+    fun booleanOperators() {
+        val someBoolean = Expressions.booleanPath("a");
+        val someOtherBoolean = Expressions.booleanPath("b");
+
+        val booleanResult = (!someBoolean) or (someBoolean and someOtherBoolean)
+        assertEquals(someBoolean.not().or(someBoolean.and(someOtherBoolean)), booleanResult)
+    }
+
+    @Test
+    fun stringOperators() {
+        val someString = Expressions.stringPath("a");
+        val someOtherString = Expressions.stringPath("b");
+        val someIndex = Expressions.numberPath(Int::class.java, "idx")
+
+        val firstChar = someString[0]
+        assertEquals<SimpleExpression<out Any>?>(someString.charAt(0), firstChar)
+
+        val firstCharExpr = someString[someIndex];
+        assertEquals<SimpleExpression<out Any>?>(someString.charAt(someIndex), firstCharExpr)
+
+        val stringConcat = someString + someOtherString + "c"
+        assertEquals(someString.concat(someOtherString).concat("c"), stringConcat)
+    }
+
+    @Test
+    fun listPathOperators() {
+        val listPath = Expressions.listPath(String::class.java, StringPath::class.java, Expressions.stringPath("a").metadata);
+
+        val someIndex = Expressions.numberPath(Int::class.java, "idx")
+
+        val firstValue = listPath[someIndex]
+        assertEquals(listPath.get(someIndex), firstValue)
+
+        val secondValue = listPath[1]
+        assertEquals(listPath.get(1), secondValue)
+    }
+
+    @Test
+    fun mapPathOperators() {
+        val mapPath = Expressions.mapPath(String::class.java, String::class.java, StringPath::class.java, Expressions.stringPath("a").metadata);
+
+        val someKey = Expressions.stringPath("idx")
+
+        val firstValue = mapPath[someKey]
+        assertEquals(mapPath.get(someKey), firstValue)
+
+        val secondValue = mapPath["second"]
+        assertEquals(mapPath.get("second"), secondValue)
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene3/README.md b/querydsl-lucene3/README.md
index 1aca60249b..cbc694c4d6 100644
--- a/querydsl-lucene3/README.md
+++ b/querydsl-lucene3/README.md
@@ -5,36 +5,33 @@ The Lucene module provides integration with the Lucene 3 indexing library.
 **Maven integration**
 
  Add the following dependencies to your Maven project :
-        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-lucene3</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>
 
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-lucene3</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 **Creating the query types**
 
 With fields year and title a manually created query type could look something like this:
- 
-    public class QDocument extends EntityPathBase<Document>{
-        private static final long serialVersionUID = -4872833626508344081L;
-            
-        public QDocument(String var) {
-            super(Document.class, PathMetadataFactory.forVariable(var));
-        }
-    
-        public final StringPath year = createString("year");
-            
-        public final StringPath title = createString("title");
+
+```JAVA 
+public class QDocument extends EntityPathBase<Document>{
+    private static final long serialVersionUID = -4872833626508344081L;
+        
+    public QDocument(String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
     }
 
+    public final StringPath year = createString("year");
+        
+    public final StringPath title = createString("title");
+}
+```
+
 QDocument represents a Lucene document with the fields year and title.
 
 Code generation is not available for Lucene, since no schema data is available.
@@ -42,17 +39,21 @@ Code generation is not available for Lucene, since no schema data is available.
 **Querying**
 
 Querying with Querydsl Lucene is as simple as this:
- 
-    QDocument doc = new QDocument("doc");
-    
-    IndexSearcher searcher = new IndexSearher(index);
-    LuceneQuery query = new LuceneQuery(true, searcher); 
-    List<Document> documents = query
-        .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
-        .list();
+
+```JAVA 
+QDocument doc = new QDocument("doc");
+
+IndexSearcher searcher = new IndexSearcher(index);
+LuceneQuery query = new LuceneQuery(true, searcher); 
+List<Document> documents = query
+    .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+    .fetch();
+ ```
 
 which is transformed into the following Lucene query :
-     
-    +year:[1800 TO 2000] +title:huckle*
 
-For more information on the Querydsl Lucene module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s04.html    
+```
++year:[1800 TO 2000] +title:huckle*
+```
+
+For more information on the Querydsl Lucene module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s05.html
diff --git a/querydsl-lucene3/pom.xml b/querydsl-lucene3/pom.xml
index 491b21e846..735dca673e 100644
--- a/querydsl-lucene3/pom.xml
+++ b/querydsl-lucene3/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-lucene3</artifactId>
   <name>Querydsl - Lucene 3 support</name>
   <description>Lucene support for Querydsl</description>
@@ -24,9 +24,18 @@
   
   <properties>
     <lucene.version>3.6.2</lucene.version>
+    <osgi.import.package>
+      org.apache.lucene.*;version="[3.6,4)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
   </properties>
   
-  <dependencies>   
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
@@ -40,23 +49,20 @@
       <scope>provided</scope>
     </dependency>            
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     
+    <!-- test -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cglib.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    
-    <!-- test -->
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -66,12 +72,12 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>${jodatime.version}</version>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
      <artifactId>querydsl-apt</artifactId>
      <version>${project.version}</version>
     </dependency>
@@ -80,8 +86,20 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.lucene3</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>   
     
       <plugin>
@@ -95,7 +113,7 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
               <showWarnings>true</showWarnings>
             </configuration>
           </execution>
@@ -103,4 +121,43 @@
       </plugin>
     </plugins>
   </build>
-</project>
+
+  <profiles>
+    <profile>
+      <id>java-21</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>${cglib.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java
deleted file mode 100644
index 2817874324..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.document.MapFieldSelector;
-import org.apache.lucene.search.ChainedFilter;
-import org.apache.lucene.search.DuplicateFilter;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryWrapperFilter;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Sort;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.EmptyCloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleProjectable;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * AbstractLuceneQuery is an abstract super class for Lucene query implementations
- *
- * @author tiwe
- *
- * @param <T> projection type
- * @param <Q> concrete subtype of query
- */
-public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>> implements SimpleQuery<Q>,
-SimpleProjectable<T> {
-
-    private final QueryMixin<Q> queryMixin;
-
-    private final IndexSearcher searcher;
-
-    private final LuceneSerializer serializer;
-
-    private final Function<Document, T> transformer;
-
-    @Nullable
-    private FieldSelector fieldSelector;
-
-    private List<Filter> filters = ImmutableList.of();
-
-    @Nullable
-    private Filter _filter;
-
-    @Nullable
-    private Sort querySort;
-
-    @SuppressWarnings("unchecked")
-    public AbstractLuceneQuery(LuceneSerializer serializer, IndexSearcher searcher,
-            Function<Document, T> transformer) {
-        queryMixin = new QueryMixin<Q>((Q) this, new DefaultQueryMetadata().noValidate());
-        this.serializer = serializer;
-        this.searcher = searcher;
-        this.transformer = transformer;
-    }
-
-    public AbstractLuceneQuery(IndexSearcher searcher, Function<Document, T> transformer) {
-        this(LuceneSerializer.DEFAULT, searcher, transformer);
-    }
-
-    @Override
-    public boolean exists() {
-        return innerCount() > 0;
-    }
-
-    @Override
-    public boolean notExists() {
-        return innerCount() == 0;
-    }
-
-    private long innerCount() {
-        try {
-            final int maxDoc = searcher.maxDoc();
-            if (maxDoc == 0) {
-                return 0;
-            }
-            return searcher.search(createQuery(), getFilter(), maxDoc).totalHits;
-        } catch (IOException e) {
-            throw new QueryException(e);
-        } catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public long count() {
-        return innerCount();
-    }
-
-    protected Query createQuery() {
-        if (queryMixin.getMetadata().getWhere() == null) {
-            return new MatchAllDocsQuery();
-        }
-        return serializer.toQuery(queryMixin.getMetadata().getWhere(), queryMixin.getMetadata());
-    }
-
-    /**
-     * Create a filter for constraints defined in this query
-     *
-     * @return
-     */
-    public Filter asFilter() {
-        return new QueryWrapperFilter(createQuery());
-    }
-
-    @Override
-    public Q distinct() {
-        throw new UnsupportedOperationException("use distinct(path) instead");
-    }
-
-    /**
-     * Add a DuplicateFilter for the field of the given property path
-     *
-     * @param property
-     * @return
-     */
-    public Q distinct(Path<?> property) {
-        return filter(new DuplicateFilter(serializer.toField(property)));
-    }
-
-    /**
-     * Apply the given Lucene filter to the search results
-     *
-     * @param filter
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q filter(Filter filter) {
-        if (filters.isEmpty()) {
-            this._filter = filter;
-            filters = ImmutableList.of(filter);
-        } else {
-            this._filter = null;
-            if (filters.size() == 1) {
-                filters = new ArrayList<Filter>();
-            }
-            filters.add(filter);
-        }
-        return (Q)this;
-    }
-
-    private Filter getFilter() {
-        if (_filter == null && !filters.isEmpty()) {
-            _filter = new ChainedFilter(filters.toArray(new Filter[filters.size()]));
-        }
-        return _filter;
-    }
-
-    @Override
-    public Q limit(long limit) {
-        return queryMixin.limit(limit);
-    }
-
-    @Override
-    public CloseableIterator<T> iterate() {
-        final QueryMetadata metadata = queryMixin.getMetadata();
-        final List<OrderSpecifier<?>> orderBys = metadata.getOrderBy();
-        final Integer queryLimit = metadata.getModifiers().getLimitAsInteger();
-        final Integer queryOffset = metadata.getModifiers().getOffsetAsInteger();
-        Sort sort = querySort;
-        int limit;
-        final int offset = queryOffset != null ? queryOffset.intValue() : 0;
-        try {
-            limit = maxDoc();
-            if (limit == 0) {
-                return new EmptyCloseableIterator<T>();
-            }
-        } catch (IOException e) {
-            throw new QueryException(e);
-        } catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-        if (queryLimit != null && queryLimit.intValue() < limit) {
-            limit = queryLimit.intValue();
-        }
-        if (sort == null && !orderBys.isEmpty()) {
-            sort = serializer.toSort(orderBys);
-        }
-
-        try {
-            ScoreDoc[] scoreDocs;
-            int sumOfLimitAndOffset = limit + offset;
-            if (sumOfLimitAndOffset < 1) {
-                throw new QueryException("The given limit (" + limit + ") and offset (" + offset + ") cause an integer overflow.");
-            }
-            if (sort != null) {
-                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, sort).scoreDocs;
-            } else {
-                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset).scoreDocs;
-            }
-            if (offset < scoreDocs.length) {
-                return new ResultIterator<T>(scoreDocs, offset, searcher, fieldSelector, transformer);
-            }
-            return new EmptyCloseableIterator<T>();
-        } catch (final IOException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    private List<T> innerList() {
-        return new IteratorAdapter<T>(iterate()).asList();
-    }
-
-    @Override
-    public List<T> list() {
-        return innerList();
-    }
-
-    /**
-     * Set the given FieldSelector to the query
-     *
-     * @param fieldSelector
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q load(FieldSelector fieldSelector) {
-        this.fieldSelector = fieldSelector;
-        return (Q)this;
-    }
-
-    /**
-     * Load only the fields of the given paths
-     *
-     * @param paths
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q load(Path<?>... paths) {
-        List<String> fields = new ArrayList<String>(paths.length);
-        for (Path<?> path : paths) {
-            fields.add(serializer.toField(path));
-        }
-        this.fieldSelector = new MapFieldSelector(fields);
-        return (Q)this;
-    }
-
-    @Override
-    public SearchResults<T> listResults() {
-        List<T> documents = innerList();
-        /*
-         * TODO Get rid of count(). It could be implemented by iterating the
-         * list results in list* from n to m.
-         */
-        return new SearchResults<T>(documents, queryMixin.getMetadata().getModifiers(), innerCount());
-    }
-
-    @Override
-    public Q offset(long offset) {
-        return queryMixin.offset(offset);
-    }
-
-    public Q orderBy(OrderSpecifier<?> o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public Q orderBy(OrderSpecifier<?>... o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public Q restrict(QueryModifiers modifiers) {
-        return queryMixin.restrict(modifiers);
-    }
-
-    @Override
-    public <P> Q set(ParamExpression<P> param, P value) {
-        return queryMixin.set(param, value);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q sort(Sort sort) {
-        this.querySort = sort;
-        return (Q)this;
-    }
-
-    @Nullable
-    private T oneResult(boolean unique) {
-        try {
-            int maxDoc = maxDoc();
-            if (maxDoc == 0) {
-                return null;
-            }
-            final ScoreDoc[] scoreDocs = searcher.search(createQuery(), getFilter(), maxDoc).scoreDocs;
-            int index = 0;
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            Long offset = modifiers.getOffset();
-            if (offset != null) {
-                index = offset.intValue();
-            }
-            Long limit = modifiers.getLimit();
-            if (unique && (limit == null ? scoreDocs.length - index > 1 :
-                                           limit > 1 && scoreDocs.length > 1)) {
-                throw new NonUniqueResultException("Unique result requested, but " + scoreDocs.length + " found.");
-            } else if (scoreDocs.length > index) {
-                Document document;
-                if (fieldSelector != null) {
-                    document = searcher.doc(scoreDocs[index].doc, fieldSelector);
-                } else {
-                    document = searcher.doc(scoreDocs[index].doc);
-                }
-                return transformer.apply(document);
-            } else {
-                return null;
-            }
-        } catch (IOException e) {
-            throw new QueryException(e);
-        }  catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public T singleResult() {
-        return oneResult(false);
-    }
-
-    @Override
-    public T uniqueResult() {
-        return oneResult(true);
-    }
-
-    public Q where(Predicate e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public Q where(Predicate... e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public String toString() {
-        return createQuery().toString();
-    }
-
-    private int maxDoc() throws IOException {
-        return searcher.maxDoc();
-    }
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java
deleted file mode 100644
index 987f80d1b4..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-/**
- * @author tiwe
- *
- */
-public class IgnoreCaseUnsupportedException extends UnsupportedOperationException{
-
-    private static final long serialVersionUID = 412913389929530788L;
-
-    public IgnoreCaseUnsupportedException() {
-        super("Ignore case queries are not supported with Lucene");
-    }
-    
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneExpressions.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneExpressions.java
deleted file mode 100644
index ba4e134d5f..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneExpressions.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.FuzzyQuery;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * Utility methods to create filter expressions for Lucene queries that are not covered by the
- * Querydsl standard expression model
- *
- * @author tiwe
- *
- */
-public final class LuceneExpressions {
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term));
-    }
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @param minimumSimilarity
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value, float minimumSimilarity) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term, minimumSimilarity));
-    }
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @param minimumSimilarity
-     * @param prefixLength
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value,
-            float minimumSimilarity, int prefixLength) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term, minimumSimilarity, prefixLength));
-    }
-
-    private LuceneExpressions() {}
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneOps.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneOps.java
deleted file mode 100644
index 7b8f1b7160..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneOps.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class LuceneOps {
-
-    private static final String NS = LuceneOps.class.getName();
-
-    static final Operator<Object> LUCENE_QUERY = new OperatorImpl<Object>(NS, "QUERY");
-
-    static final Operator<String> PHRASE = new OperatorImpl<String>(NS, "PHRASE");
-
-    static final Operator<String> TERM = new OperatorImpl<String>(NS, "TERM");
-
-    private LuceneOps() {}
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneQuery.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneQuery.java
deleted file mode 100644
index 96a6b74646..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneQuery.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
-
-import com.google.common.base.Function;
-
-/**
- * LuceneQuery is a Querydsl query implementation for Lucene queries.
- *
- * @author vema
- */
-public class LuceneQuery extends AbstractLuceneQuery<Document, LuceneQuery> {
-    
-    private static final Function<Document,Document> TRANSFORMER = new Function<Document,Document>() {
-        @Override
-        public Document apply(Document input) {
-            return input;
-        }        
-    };
-  
-    public LuceneQuery(IndexSearcher searcher) {
-        super(searcher, TRANSFORMER);
-    }
-
-    public LuceneQuery(LuceneSerializer luceneSerializer, IndexSearcher searcher) {
-        super(luceneSerializer, searcher, TRANSFORMER);
-    }
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneSerializer.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
deleted file mode 100644
index 64c5c8e17e..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.NumericRangeQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
-import org.apache.lucene.search.WildcardQuery;
-import org.apache.lucene.util.NumericUtils;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathType;
-
-/**
- * Serializes Querydsl queries to Lucene queries.
- *
- * @author vema
- *
- */
-public class LuceneSerializer {
-    private static final Map<Class<?>, Integer> sortFields = new HashMap<Class<?>, Integer>();
-
-    static {
-        sortFields.put(Integer.class, SortField.INT);
-        sortFields.put(Float.class, SortField.FLOAT);
-        sortFields.put(Long.class, SortField.LONG);
-        sortFields.put(Double.class, SortField.DOUBLE);
-        sortFields.put(Short.class, SortField.SHORT);
-        sortFields.put(Byte.class, SortField.BYTE);
-        sortFields.put(BigDecimal.class, SortField.DOUBLE);
-        sortFields.put(BigInteger.class, SortField.LONG);
-    }
-
-    private static final Splitter WS_SPLITTER = Splitter.on(Pattern.compile("\\s+"));
-
-    public static final LuceneSerializer DEFAULT = new LuceneSerializer(false, true);
-
-    private final boolean lowerCase;
-
-    private final boolean splitTerms;
-
-    private final Locale sortLocale;
-
-    public LuceneSerializer(boolean lowerCase, boolean splitTerms) {
-        this(lowerCase, splitTerms, Locale.getDefault());
-    }
-
-    public LuceneSerializer(boolean lowerCase, boolean splitTerms, Locale sortLocale) {
-        this.lowerCase = lowerCase;
-        this.splitTerms = splitTerms;
-        this.sortLocale = sortLocale;
-    }
-
-    private Query toQuery(Operation<?> operation, QueryMetadata metadata) {
-        Operator<?> op = operation.getOperator();
-        if (op == Ops.OR) {
-            return toTwoHandSidedQuery(operation, Occur.SHOULD, metadata);
-        } else if (op == Ops.AND) {
-            return toTwoHandSidedQuery(operation, Occur.MUST, metadata);
-        } else if (op == Ops.NOT) {
-            BooleanQuery bq = new BooleanQuery();
-            bq.add(new BooleanClause(toQuery(operation.getArg(0), metadata), Occur.MUST_NOT));
-            bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-            return bq;
-        } else if (op == Ops.LIKE) {
-            return like(operation, metadata);
-        } else if (op == Ops.EQ) {
-            return eq(operation, metadata, false);
-        } else if (op == Ops.EQ_IGNORE_CASE) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.NE) {
-            return ne(operation, metadata, false);
-        } else if (op == Ops.STARTS_WITH) {
-            return startsWith(metadata, operation, false);
-        } else if (op == Ops.STARTS_WITH_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.ENDS_WITH) {
-            return endsWith(operation, metadata, false);
-        } else if (op == Ops.ENDS_WITH_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.STRING_CONTAINS) {
-            return stringContains(operation, metadata, false);
-        } else if (op == Ops.STRING_CONTAINS_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.BETWEEN) {
-            return between(operation, metadata);
-        } else if (op == Ops.IN) {
-            return in(operation, metadata, false);
-        } else if (op == Ops.NOT_IN) {
-            return notIn(operation, metadata, false);
-        } else if (op == Ops.LT) {
-            return lt(operation, metadata);
-        } else if (op == Ops.GT) {
-            return gt(operation, metadata);
-        } else if (op == Ops.LOE) {
-            return le(operation, metadata);
-        } else if (op == Ops.GOE) {
-            return ge(operation, metadata);
-        } else if (op == LuceneOps.LUCENE_QUERY) {
-            return ((Constant<Query>)operation.getArg(0)).getConstant();
-        }
-        throw new UnsupportedOperationException("Illegal operation " + operation);
-    }
-
-    private Query toTwoHandSidedQuery(Operation<?> operation, Occur occur, QueryMetadata metadata) {
-        Query lhs = toQuery(operation.getArg(0), metadata);
-        Query rhs = toQuery(operation.getArg(1), metadata);
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(createBooleanClause(lhs, occur));
-        bq.add(createBooleanClause(rhs, occur));
-        return bq;
-    }
-
-    /**
-     * If the query is a BooleanQuery and it contains a single Occur.MUST_NOT
-     * clause it will be returned as is. Otherwise it will be wrapped in a
-     * BooleanClause with the given Occur.
-     */
-    private BooleanClause createBooleanClause(Query query, Occur occur) {
-        if (query instanceof BooleanQuery) {
-            BooleanClause[] clauses = ((BooleanQuery) query).getClauses();
-            if (clauses.length == 1 && clauses[0].getOccur().equals(Occur.MUST_NOT)) {
-                return clauses[0];
-            }
-        }
-        return new BooleanClause(query, occur);
-    }
-
-    protected Query like(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convert(path, operation.getArg(1));
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (String s : terms) {
-                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, terms[0]));
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Query eq(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-
-        if (Number.class.isAssignableFrom(operation.getArg(1).getType())) {
-            return new TermQuery(new Term(field, convertNumber(((Constant<Number>) operation
-                    .getArg(1)).getConstant())));
-        }
-
-        return eq(field, convert(path, operation.getArg(1), metadata), ignoreCase);
-    }
-
-
-    private String convertNumber(Number number) {
-        if (Integer.class.isInstance(number)) {
-            return NumericUtils.intToPrefixCoded(number.intValue());
-        } else if (Double.class.isInstance(number)) {
-            return NumericUtils.doubleToPrefixCoded(number.doubleValue());
-        } else if (Long.class.isInstance(number)) {
-            return NumericUtils.longToPrefixCoded(number.longValue());
-        } else if (Float.class.isInstance(number)) {
-            return NumericUtils.floatToPrefixCoded(number.floatValue());
-        } else if (Byte.class.isInstance(number)) {
-            return NumericUtils.intToPrefixCoded(number.intValue());
-        } else if (Short.class.isInstance(number)) {
-            return NumericUtils.intToPrefixCoded(number.intValue());
-        } else if (BigDecimal.class.isInstance(number)) {
-            return NumericUtils.doubleToPrefixCoded(number.doubleValue());
-        } else if (BigInteger.class.isInstance(number)) {
-            return NumericUtils.longToPrefixCoded(number.longValue());
-        } else {
-            throw new IllegalArgumentException("Unsupported numeric type "
-                    + number.getClass().getName());
-        }
-    }
-
-    protected Query eq(String field, String[] terms, boolean ignoreCase) {
-        if (terms.length > 1) {
-            PhraseQuery pq = new PhraseQuery();
-            for (String s : terms) {
-                pq.add(new Term(field, s));
-            }
-            return pq;
-        }
-        return new TermQuery(new Term(field, terms[0]));
-    }
-
-    protected Query in(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        Collection<?> values = (Collection<?>) ((Constant<?>) operation.getArg(1)).getConstant();
-        BooleanQuery bq = new BooleanQuery();
-        for (Object value : values) {
-            String[] str = convert(path, value);
-            bq.add(eq(field, str, ignoreCase), Occur.SHOULD);
-        }
-        return bq;
-    }
-
-    protected Query notIn(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(new BooleanClause(in(operation, metadata, false), Occur.MUST_NOT));
-        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-        return bq;
-    }
-
-    protected Query ne(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(new BooleanClause(eq(operation, metadata, ignoreCase), Occur.MUST_NOT));
-        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-        return bq;
-    }
-
-    protected Query startsWith(QueryMetadata metadata, Operation<?> operation, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (int i = 0; i < terms.length; ++i) {
-                String s = i == 0 ? terms[i] + "*" : "*" + terms[i] + "*";
-                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
-            }
-            return bq;
-        }
-        return new PrefixQuery(new Term(field, terms[0]));
-    }
-
-
-
-    protected Query stringContains(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (String s : terms) {
-                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, "*" + terms[0] + "*"));
-    }
-
-    protected Query endsWith(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (int i = 0; i < terms.length; ++i) {
-                String s = i == terms.length - 1 ? "*" + terms[i] : "*" + terms[i] + "*";
-                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, "*" + terms[0]));
-    }
-
-    protected Query between(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        // TODO Phrase not properly supported
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                operation.getArg(2),
-                true,
-                true,
-                metadata);
-    }
-
-    protected Query lt(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                null,
-                operation.getArg(1),
-                false,
-                false,
-                metadata);
-    }
-
-    protected Query gt(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                null,
-                false,
-                false,
-                metadata);
-    }
-
-    protected Query le(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                null,
-                operation.getArg(1),
-                true,
-                true,
-                metadata);
-    }
-
-    protected Query ge(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                null,
-                true,
-                true,
-                metadata);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    protected Query range(Path<?> leftHandSide, String field, @Nullable Expression<?> min,
-            @Nullable Expression<?> max, boolean minInc, boolean maxInc, QueryMetadata metadata) {
-        if (min != null && Number.class.isAssignableFrom(min.getType()) || max != null
-                && Number.class.isAssignableFrom(max.getType())) {
-            Class<? extends Number> numType = (Class) (min != null ? min.getType() : max.getType());
-            return numericRange((Class) numType, field, (Number) (min == null ? null
-                    : ((Constant) min).getConstant()), (Number) (max == null ? null
-                    : ((Constant) max).getConstant()), minInc, maxInc);
-        }
-        return stringRange(leftHandSide, field, min, max, minInc, maxInc, metadata);
-    }
-
-    protected <N extends Number> NumericRangeQuery<?> numericRange(Class<N> clazz, String field,
-            @Nullable N min, @Nullable N max, boolean minInc, boolean maxInc) {
-        if (clazz.equals(Integer.class)) {
-            return NumericRangeQuery.newIntRange(field, (Integer) min, (Integer) max, minInc, maxInc);
-        } else if (clazz.equals(Double.class)) {
-            return NumericRangeQuery.newDoubleRange(field, (Double) min, (Double) max, minInc, minInc);
-        } else if (clazz.equals(Float.class)) {
-            return NumericRangeQuery.newFloatRange(field, (Float) min, (Float) max, minInc, minInc);
-        } else if (clazz.equals(Long.class)) {
-            return NumericRangeQuery.newLongRange(field, (Long) min, (Long) max, minInc, minInc);
-        } else if (clazz.equals(Byte.class) || clazz.equals(Short.class)) {
-            return NumericRangeQuery.newIntRange(field, min != null ? min.intValue() : null,
-                    max != null ? max.intValue() : null, minInc, maxInc);
-        } else {
-            throw new IllegalArgumentException("Unsupported numeric type " + clazz.getName());
-        }
-    }
-
-    protected Query stringRange(
-            Path<?> leftHandSide,
-            String field,
-            @Nullable Expression<?> min,
-            @Nullable Expression<?> max,
-            boolean minInc,
-            boolean maxInc,
-            QueryMetadata metadata) {
-
-        if (min == null) {
-            return new TermRangeQuery(
-                    field, null, convert(leftHandSide, max, metadata)[0], minInc, maxInc);
-        } else if (max == null) {
-            return new TermRangeQuery(
-                    field, convert(leftHandSide, min, metadata)[0],
-                    null, minInc, maxInc);
-        } else {
-            return new TermRangeQuery(
-                    field, convert(leftHandSide, min, metadata)[0],
-                    convert(leftHandSide, max, metadata)[0],
-                    minInc, maxInc);
-        }
-    }
-
-    private Path<?> getPath(Expression<?> leftHandSide) {
-        if (leftHandSide instanceof Path<?>) {
-            return (Path<?>)leftHandSide;
-        } else if (leftHandSide instanceof Operation<?>) {
-            Operation<?> operation = (Operation<?>) leftHandSide;
-            if (operation.getOperator() == Ops.LOWER || operation.getOperator() == Ops.UPPER) {
-                return (Path<?>)operation.getArg(0);
-            }
-        }
-        throw new IllegalArgumentException("Unable to transform " + leftHandSide + " to path");
-    }
-
-    /**
-     * template method, override to customize
-     *
-     * @param path
-     * @return
-     */
-    protected String toField(Path<?> path) {
-        String rv = path.getMetadata().getName();
-        if (path.getMetadata().getParent() != null) {
-            Path<?> parent = path.getMetadata().getParent();
-            if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
-                rv = toField(parent) + "." + rv;
-            }
-        }
-        return rv;
-    }
-
-    private void verifyArguments(Operation<?> operation) {
-        List<Expression<?>> arguments = operation.getArgs();
-        for (int i = 1; i < arguments.size(); ++i) {
-            if (!(arguments.get(i) instanceof Constant<?>)
-                    && !(arguments.get(i) instanceof ParamExpression<?>)
-                    && !(arguments.get(i) instanceof PhraseElement)
-                    && !(arguments.get(i) instanceof TermElement)) {
-                throw new IllegalArgumentException("operand was of unsupported type "
-                        + arguments.get(i).getClass().getName());
-            }
-        }
-    }
-
-    /**
-     * template method
-     *
-     * @param leftHandSide
-     * @param rightHandSide
-     * @return
-     */
-    protected String[] convert(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
-        if (rightHandSide instanceof Operation) {
-            Operation<?> operation = (Operation<?>)rightHandSide;
-            if (operation.getOperator() == LuceneOps.PHRASE) {
-                return Iterables.toArray(WS_SPLITTER.split(operation.getArg(0).toString()), String.class);
-            } else if (operation.getOperator() == LuceneOps.TERM) {
-                return new String[] { operation.getArg(0).toString() };
-            } else {
-                throw new IllegalArgumentException(rightHandSide.toString());
-            }
-        } else if (rightHandSide instanceof ParamExpression<?>) {
-            Object value = metadata.getParams().get(rightHandSide);
-            if (value == null) {
-                throw new ParamNotSetException((ParamExpression<?>) rightHandSide);
-            }
-            return convert(leftHandSide, value);
-
-        } else if (rightHandSide instanceof Constant<?>) {
-            return convert(leftHandSide, ((Constant<?>)rightHandSide).getConstant());
-        } else {
-            throw new IllegalArgumentException(rightHandSide.toString());
-        }
-    }
-
-    /**
-     * template method
-     *
-     * @param leftHandSide
-     * @param rightHandSide
-     * @return
-     */
-    protected String[] convert(Path<?> leftHandSide, Object rightHandSide) {
-        String str = rightHandSide.toString();
-        if (lowerCase) {
-            str = str.toLowerCase();
-        }
-        if (splitTerms) {
-            if (str.equals("")) {
-                return new String[] { str };
-            } else {
-//                return StringUtils.split(str);
-                return Iterables.toArray(WS_SPLITTER.split(str), String.class);
-            }
-        } else {
-            return new String[] { str };
-        }
-    }
-
-    private String[] convertEscaped(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
-        String[] str = convert(leftHandSide, rightHandSide, metadata);
-        for (int i = 0; i < str.length; i++) {
-            str[i] = QueryParser.escape(str[i]);
-        }
-        return str;
-    }
-
-    public Query toQuery(Expression<?> expr, QueryMetadata metadata) {
-        if (expr instanceof Operation<?>) {
-            return toQuery((Operation<?>) expr, metadata);
-        } else {
-            return toQuery(ExpressionUtils.extract(expr), metadata);
-        }
-    }
-
-    public Sort toSort(List<? extends OrderSpecifier<?>> orderBys) {
-        List<SortField> sorts = new ArrayList<SortField>(orderBys.size());
-        for (OrderSpecifier<?> order : orderBys) {
-            if (!(order.getTarget() instanceof Path<?>)) {
-                throw new IllegalArgumentException("argument was not of type Path.");
-            }
-            Class<?> type = order.getTarget().getType();
-            boolean reverse = !order.isAscending();
-            Path<?> path = getPath(order.getTarget());
-            if (Number.class.isAssignableFrom(type)) {
-                sorts.add(new SortField(toField(path), sortFields.get(type), reverse));
-            } else {
-                sorts.add(new SortField(toField(path), sortLocale, reverse));
-            }
-        }
-        Sort sort = new Sort();
-        sort.setSort(sorts.toArray(new SortField[sorts.size()]));
-        return sort;
-    }
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/PhraseElement.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/PhraseElement.java
deleted file mode 100644
index 6cf5f4d638..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/PhraseElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
- /*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * PhraseElement represents the embedded String as a phrase
- *
- * @author tiwe
- *
- */
-public class PhraseElement extends StringOperation {
-
-    private static final long serialVersionUID = 2350215644019186076L;
-
-    public PhraseElement(String str) {
-        super(LuceneOps.PHRASE, ConstantImpl.create(str));
-    }
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/QueryElement.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/QueryElement.java
deleted file mode 100644
index 6e81e3531e..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/QueryElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.search.Query;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * QueryElement wraps a Lucene Query
- *
- * @author tiwe
- *
- */
-public class QueryElement extends BooleanOperation {
-
-    private static final long serialVersionUID = 470868107363840155L;
-
-    public QueryElement(Query query) {
-        super(LuceneOps.LUCENE_QUERY, ConstantImpl.create(query));
-    }
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/ResultIterator.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/ResultIterator.java
deleted file mode 100644
index a22046cfc2..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/ResultIterator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.io.IOException;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.ScoreDoc;
-
-import com.google.common.base.Function;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.QueryException;
-
-/**
- * ResultIterator is a {@link CloseableIterator} implementation for Lucene query results
- * 
- * @author tiwe
- *
- * @param <T>
- */
-public final class ResultIterator<T> implements CloseableIterator<T> {
-
-    private final ScoreDoc[] scoreDocs;
-
-    private int cursor;
-
-    private final IndexSearcher searcher;
-
-    @Nullable
-    private final FieldSelector fieldSelector;
-
-    private final Function<Document,T> transformer;
-
-    public ResultIterator(ScoreDoc[] scoreDocs, int offset, IndexSearcher searcher, 
-            @Nullable FieldSelector fieldSelector, Function<Document, T> transformer) {
-        this.scoreDocs = scoreDocs.clone();
-        this.cursor = offset;
-        this.searcher = searcher;
-        this.fieldSelector = fieldSelector;
-        this.transformer = transformer;
-    }
-
-    @Override
-    public boolean hasNext() {
-        return cursor != scoreDocs.length;
-    }
-
-    @Override
-    public T next() {
-        try {
-            Document document;
-            if (fieldSelector != null) {
-                document = searcher.doc(scoreDocs[cursor++].doc, fieldSelector);
-            } else {
-                document = searcher.doc(scoreDocs[cursor++].doc);
-            }
-            return transformer.apply(document);
-        } catch (IOException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void close() {
-
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TermElement.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TermElement.java
deleted file mode 100644
index 0309847683..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TermElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * TermElement represents the embedded String as a term
- *
- * @author tiwe
- *
- */
-public class TermElement extends StringOperation {
-
-    private static final long serialVersionUID = 2350215644019186076L;
-
-    public TermElement(String str) {
-        super(LuceneOps.TERM, ConstantImpl.create(str));
-    }
-
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TypedQuery.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TypedQuery.java
deleted file mode 100644
index b6fa4b9884..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/TypedQuery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
-
-import com.google.common.base.Function;
-
-/**
- * TypedQuery is a typed query implementation for Lucene queries.
- * 
- * @author laim
- * @author tiwe
- */
-public class TypedQuery<T> extends AbstractLuceneQuery<T, TypedQuery<T>> {
-
-    public TypedQuery(IndexSearcher searcher, Function<Document, T> transformer) {
-        super(searcher, transformer);
-    }
-
-    public TypedQuery(LuceneSerializer serializer, IndexSearcher searcher, Function<Document, T> transformer) {
-        super(serializer, searcher, transformer);
-    }
-  
-}
diff --git a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/package-info.java b/querydsl-lucene3/src/main/java/com/mysema/query/lucene/package-info.java
deleted file mode 100644
index 0f6c4a03a6..0000000000
--- a/querydsl-lucene3/src/main/java/com/mysema/query/lucene/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.lucene;
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/AbstractLuceneQuery.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/AbstractLuceneQuery.java
new file mode 100644
index 0000000000..5fab24265e
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/AbstractLuceneQuery.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.EmptyCloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.SimpleQuery;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldSelector;
+import org.apache.lucene.document.MapFieldSelector;
+import org.apache.lucene.search.ChainedFilter;
+import org.apache.lucene.search.DuplicateFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryWrapperFilter;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TotalHitCountCollector;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * AbstractLuceneQuery is an abstract super class for Lucene query implementations
+ *
+ * @author tiwe
+ *
+ * @param <T> projection type
+ * @param <Q> concrete subtype of query
+ */
+public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>> implements SimpleQuery<Q>, Fetchable<T> {
+
+    private static final String JAVA_ISO_CONTROL = "[\\p{Cntrl}&&[^\r\n\t]]";
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final IndexSearcher searcher;
+
+    private final LuceneSerializer serializer;
+
+    private final Function<Document, T> transformer;
+
+    @Nullable
+    private FieldSelector fieldSelector;
+
+    private List<Filter> filters = Collections.emptyList();
+
+    @Nullable
+    private Filter filter;
+
+    @Nullable
+    private Sort querySort;
+
+    @SuppressWarnings("unchecked")
+    public AbstractLuceneQuery(LuceneSerializer serializer, IndexSearcher searcher,
+            Function<Document, T> transformer) {
+        queryMixin = new QueryMixin<Q>((Q) this, new DefaultQueryMetadata());
+        this.serializer = serializer;
+        this.searcher = searcher;
+        this.transformer = transformer;
+    }
+
+    public AbstractLuceneQuery(IndexSearcher searcher, Function<Document, T> transformer) {
+        this(LuceneSerializer.DEFAULT, searcher, transformer);
+    }
+
+    private long innerCount() {
+        try {
+            final int maxDoc = searcher.maxDoc();
+            if (maxDoc == 0) {
+                return 0;
+            }
+            TotalHitCountCollector collector = new TotalHitCountCollector();
+            searcher.search(createQuery(), getFilter(), collector);
+            return collector.getTotalHits();
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        return innerCount();
+    }
+
+    protected Query createQuery() {
+        if (queryMixin.getMetadata().getWhere() == null) {
+            return new MatchAllDocsQuery();
+        }
+        return serializer.toQuery(queryMixin.getMetadata().getWhere(), queryMixin.getMetadata());
+    }
+
+    /**
+     * Create a filter for constraints defined in this query
+     *
+     * @return filter
+     */
+    public Filter asFilter() {
+        return new QueryWrapperFilter(createQuery());
+    }
+
+    @Override
+    public Q distinct() {
+        throw new UnsupportedOperationException("use distinct(path) instead");
+    }
+
+    /**
+     * Add a DuplicateFilter for the field of the given property path
+     *
+     * @param property distinct property
+     * @return the current object
+     */
+    public Q distinct(Path<?> property) {
+        return filter(new DuplicateFilter(serializer.toField(property)));
+    }
+
+    /**
+     * Apply the given Lucene filter to the search results
+     *
+     * @param filter filter
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q filter(Filter filter) {
+        if (filters.isEmpty()) {
+            this.filter = filter;
+            filters = Collections.singletonList(filter);
+        } else {
+            this.filter = null;
+            if (filters.size() == 1) {
+                filters = new ArrayList<Filter>();
+            }
+            filters.add(filter);
+        }
+        return (Q) this;
+    }
+
+    private Filter getFilter() {
+        if (filter == null && !filters.isEmpty()) {
+            filter = new ChainedFilter(filters.toArray(new Filter[0]));
+        }
+        return filter;
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        final QueryMetadata metadata = queryMixin.getMetadata();
+        final List<OrderSpecifier<?>> orderBys = metadata.getOrderBy();
+        final Integer queryLimit = metadata.getModifiers().getLimitAsInteger();
+        final Integer queryOffset = metadata.getModifiers().getOffsetAsInteger();
+        Sort sort = querySort;
+        int limit;
+        final int offset = queryOffset != null ? queryOffset : 0;
+        try {
+            limit = maxDoc();
+            if (limit == 0) {
+                return new EmptyCloseableIterator<T>();
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+        if (queryLimit != null && queryLimit < limit) {
+            limit = queryLimit;
+        }
+        if (sort == null && !orderBys.isEmpty()) {
+            sort = serializer.toSort(orderBys);
+        }
+
+        try {
+            ScoreDoc[] scoreDocs;
+            int sumOfLimitAndOffset = limit + offset;
+            if (sumOfLimitAndOffset < 1) {
+                throw new QueryException("The given limit (" + limit + ") and offset (" + offset + ") cause an integer overflow.");
+            }
+            if (sort != null) {
+                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, sort).scoreDocs;
+            } else {
+                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset).scoreDocs;
+            }
+            if (offset < scoreDocs.length) {
+                return new ResultIterator<T>(scoreDocs, offset, searcher, fieldSelector, transformer);
+            }
+            return new EmptyCloseableIterator<T>();
+        } catch (final IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    private List<T> innerList() {
+        return new IteratorAdapter<T>(iterate()).asList();
+    }
+
+    @Override
+    public List<T> fetch() {
+        return innerList();
+    }
+
+    /**
+     * Set the given FieldSelector to the query
+     *
+     * @param fieldSelector field selector
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(FieldSelector fieldSelector) {
+        this.fieldSelector = fieldSelector;
+        return (Q) this;
+    }
+
+    /**
+     * Load only the fields of the given paths
+     *
+     * @param paths fields to load
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(Path<?>... paths) {
+        List<String> fields = new ArrayList<String>(paths.length);
+        for (Path<?> path : paths) {
+            fields.add(serializer.toField(path));
+        }
+        this.fieldSelector = new MapFieldSelector(fields);
+        return (Q) this;
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        List<T> documents = innerList();
+        /*
+         * TODO Get rid of fetchCount(). It could be implemented by iterating the
+         * fetch results in fetch* from n to m.
+         */
+        return new QueryResults<T>(documents, queryMixin.getMetadata().getModifiers(), innerCount());
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    @Override
+    public <P> Q set(ParamExpression<P> param, P value) {
+        return queryMixin.set(param, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q sort(Sort sort) {
+        this.querySort = sort;
+        return (Q) this;
+    }
+
+    @Nullable
+    private T oneResult(boolean unique) {
+        try {
+            int maxDoc = maxDoc();
+            if (maxDoc == 0) {
+                return null;
+            }
+            final ScoreDoc[] scoreDocs = searcher.search(createQuery(), getFilter(), maxDoc).scoreDocs;
+            int index = 0;
+            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+            Long offset = modifiers.getOffset();
+            if (offset != null) {
+                index = offset.intValue();
+            }
+            Long limit = modifiers.getLimit();
+            if (unique && (limit == null ? scoreDocs.length - index > 1 :
+                                           limit > 1 && scoreDocs.length > 1)) {
+                throw new NonUniqueResultException("Unique result requested, but " + scoreDocs.length + " found.");
+            } else if (scoreDocs.length > index) {
+                Document document;
+                if (fieldSelector != null) {
+                    document = searcher.doc(scoreDocs[index].doc, fieldSelector);
+                } else {
+                    document = searcher.doc(scoreDocs[index].doc);
+                }
+                return transformer.apply(document);
+            } else {
+                return null;
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public T fetchFirst() {
+        return oneResult(false);
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        return oneResult(true);
+    }
+
+    public Q where(Predicate e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public String toString() {
+        return createQuery().toString().replaceAll(JAVA_ISO_CONTROL, "_");
+    }
+
+    private int maxDoc() throws IOException {
+        return searcher.maxDoc();
+    }
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/IgnoreCaseUnsupportedException.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/IgnoreCaseUnsupportedException.java
new file mode 100644
index 0000000000..bd2dc7df46
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/IgnoreCaseUnsupportedException.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+/**
+ * Thrown for case ignore usage
+ *
+ * @author tiwe
+ *
+ */
+public class IgnoreCaseUnsupportedException extends UnsupportedOperationException {
+
+    private static final long serialVersionUID = 412913389929530788L;
+
+    public IgnoreCaseUnsupportedException() {
+        super("Ignore case queries are not supported with Lucene");
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneExpressions.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneExpressions.java
new file mode 100644
index 0000000000..433921fe66
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneExpressions.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.FuzzyQuery;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+/**
+ * Utility methods to create filter expressions for Lucene queries that are not covered by the
+ * Querydsl standard expression model
+ *
+ * @author tiwe
+ *
+ */
+public final class LuceneExpressions {
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @param minimumSimilarity a value between 0 and 1 to set the required similarity
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value, float minimumSimilarity) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, minimumSimilarity));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @param minimumSimilarity a value between 0 and 1 to set the required similarity
+     * @param prefixLength length of common (non-fuzzy) prefix
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value,
+            float minimumSimilarity, int prefixLength) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, minimumSimilarity, prefixLength));
+    }
+
+    private LuceneExpressions() { }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneOps.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneOps.java
new file mode 100644
index 0000000000..2a18da4eb6
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneOps.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * Lucene specific operators
+ *
+ * @author tiwe
+ *
+ */
+public enum LuceneOps implements Operator {
+    LUCENE_QUERY(Object.class),
+    PHRASE(String.class),
+    TERM(String.class);
+
+    private final Class<?> type;
+
+    LuceneOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneQuery.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneQuery.java
new file mode 100644
index 0000000000..31cca76a5e
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneQuery.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code LuceneQuery} is a Querydsl query implementation for Lucene queries.
+ *
+ * <p>Example:</p>
+ *
+ * <pre>{@code
+ * QDocument doc = new QDocument("doc");
+ *
+ * IndexSearcher searcher = new IndexSearcher(index);
+ * LuceneQuery query = new LuceneQuery(true, searcher);
+ * List<Document> documents = query
+ *     .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+ *     .fetch();
+ * }</pre>
+ *
+ * @author vema
+ */
+public class LuceneQuery extends AbstractLuceneQuery<Document, LuceneQuery> {
+
+    private static final Function<Document,Document> TRANSFORMER = new Function<Document,Document>() {
+        @Override
+        public Document apply(Document input) {
+            return input;
+        }
+    };
+
+    public LuceneQuery(IndexSearcher searcher) {
+        super(searcher, TRANSFORMER);
+    }
+
+    public LuceneQuery(LuceneSerializer luceneSerializer, IndexSearcher searcher) {
+        super(luceneSerializer, searcher, TRANSFORMER);
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneSerializer.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneSerializer.java
new file mode 100644
index 0000000000..430fe7fa54
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/LuceneSerializer.java
@@ -0,0 +1,561 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.util.NumericUtils;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.*;
+
+/**
+ * Serializes Querydsl queries to Lucene queries.
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializer {
+    private static final Map<Class<?>, Integer> sortFields = new HashMap<Class<?>, Integer>();
+
+    static {
+        sortFields.put(Integer.class, SortField.INT);
+        sortFields.put(Float.class, SortField.FLOAT);
+        sortFields.put(Long.class, SortField.LONG);
+        sortFields.put(Double.class, SortField.DOUBLE);
+        sortFields.put(Short.class, SortField.SHORT);
+        sortFields.put(Byte.class, SortField.BYTE);
+        sortFields.put(BigDecimal.class, SortField.DOUBLE);
+        sortFields.put(BigInteger.class, SortField.LONG);
+    }
+
+    public static final LuceneSerializer DEFAULT = new LuceneSerializer(false, true);
+
+    private final boolean lowerCase;
+
+    private final boolean splitTerms;
+
+    private final Locale sortLocale;
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms) {
+        this(lowerCase, splitTerms, Locale.getDefault());
+    }
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms, Locale sortLocale) {
+        this.lowerCase = lowerCase;
+        this.splitTerms = splitTerms;
+        this.sortLocale = sortLocale;
+    }
+
+    private Query toQuery(Operation<?> operation, QueryMetadata metadata) {
+        Operator op = operation.getOperator();
+        if (op == Ops.OR) {
+            return toTwoHandSidedQuery(operation, Occur.SHOULD, metadata);
+        } else if (op == Ops.AND) {
+            return toTwoHandSidedQuery(operation, Occur.MUST, metadata);
+        } else if (op == Ops.NOT) {
+            BooleanQuery bq = new BooleanQuery();
+            bq.add(new BooleanClause(toQuery(operation.getArg(0), metadata), Occur.MUST_NOT));
+            bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+            return bq;
+        } else if (op == Ops.LIKE) {
+            return like(operation, metadata);
+        } else if (op == Ops.LIKE_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.EQ) {
+            return eq(operation, metadata, false);
+        } else if (op == Ops.EQ_IGNORE_CASE) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.NE) {
+            return ne(operation, metadata, false);
+        } else if (op == Ops.STARTS_WITH) {
+            return startsWith(metadata, operation, false);
+        } else if (op == Ops.STARTS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.ENDS_WITH) {
+            return endsWith(operation, metadata, false);
+        } else if (op == Ops.ENDS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.STRING_CONTAINS) {
+            return stringContains(operation, metadata, false);
+        } else if (op == Ops.STRING_CONTAINS_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.BETWEEN) {
+            return between(operation, metadata);
+        } else if (op == Ops.IN) {
+            return in(operation, metadata, false);
+        } else if (op == Ops.NOT_IN) {
+            return notIn(operation, metadata, false);
+        } else if (op == Ops.LT) {
+            return lt(operation, metadata);
+        } else if (op == Ops.GT) {
+            return gt(operation, metadata);
+        } else if (op == Ops.LOE) {
+            return le(operation, metadata);
+        } else if (op == Ops.GOE) {
+            return ge(operation, metadata);
+        } else if (op == LuceneOps.LUCENE_QUERY) {
+            @SuppressWarnings("unchecked") //This is the expected type
+            Query rv = ((Constant<Query>) operation.getArg(0)).getConstant();
+            return rv;
+        }
+        throw new UnsupportedOperationException("Illegal operation " + operation);
+    }
+
+    private Query toTwoHandSidedQuery(Operation<?> operation, Occur occur, QueryMetadata metadata) {
+        Query lhs = toQuery(operation.getArg(0), metadata);
+        Query rhs = toQuery(operation.getArg(1), metadata);
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(createBooleanClause(lhs, occur));
+        bq.add(createBooleanClause(rhs, occur));
+        return bq;
+    }
+
+    /**
+     * If the query is a BooleanQuery and it contains a single Occur.MUST_NOT
+     * clause it will be returned as is. Otherwise it will be wrapped in a
+     * BooleanClause with the given Occur.
+     */
+    private BooleanClause createBooleanClause(Query query, Occur occur) {
+        if (query instanceof BooleanQuery) {
+            BooleanClause[] clauses = ((BooleanQuery) query).getClauses();
+            if (clauses.length == 1 && clauses[0].getOccur().equals(Occur.MUST_NOT)) {
+                return clauses[0];
+            }
+        }
+        return new BooleanClause(query, occur);
+    }
+
+    protected Query like(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convert(path, operation.getArg(1));
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, terms[0]));
+    }
+
+    protected Query eq(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+
+        if (Number.class.isAssignableFrom(operation.getArg(1).getType())) {
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> rightArg = (Constant<? extends Number>) operation.getArg(1);
+            return new TermQuery(new Term(field, convertNumber(rightArg.getConstant())));
+        }
+
+        return eq(field, convert(path, operation.getArg(1), metadata), ignoreCase);
+    }
+
+
+    private String convertNumber(Number number) {
+        if (Integer.class.isInstance(number)) {
+            return NumericUtils.intToPrefixCoded(number.intValue());
+        } else if (Double.class.isInstance(number)) {
+            return NumericUtils.doubleToPrefixCoded(number.doubleValue());
+        } else if (Long.class.isInstance(number)) {
+            return NumericUtils.longToPrefixCoded(number.longValue());
+        } else if (Float.class.isInstance(number)) {
+            return NumericUtils.floatToPrefixCoded(number.floatValue());
+        } else if (Byte.class.isInstance(number)) {
+            return NumericUtils.intToPrefixCoded(number.intValue());
+        } else if (Short.class.isInstance(number)) {
+            return NumericUtils.intToPrefixCoded(number.intValue());
+        } else if (BigDecimal.class.isInstance(number)) {
+            return NumericUtils.doubleToPrefixCoded(number.doubleValue());
+        } else if (BigInteger.class.isInstance(number)) {
+            return NumericUtils.longToPrefixCoded(number.longValue());
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type "
+                    + number.getClass().getName());
+        }
+    }
+
+    protected Query eq(String field, String[] terms, boolean ignoreCase) {
+        if (terms.length > 1) {
+            PhraseQuery pq = new PhraseQuery();
+            for (String s : terms) {
+                pq.add(new Term(field, s));
+            }
+            return pq;
+        }
+        return new TermQuery(new Term(field, terms[0]));
+    }
+
+    protected Query in(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        @SuppressWarnings("unchecked") //This is the second argument type
+        Constant<Collection<?>> collConstant = (Constant<Collection<?>>) operation.getArg(1);
+        Collection<?> values = collConstant.getConstant();
+        BooleanQuery bq = new BooleanQuery();
+        if (Number.class.isAssignableFrom(path.getType())) {
+            for (Object value : values) {
+                TermQuery eq = new TermQuery(new Term(field, convertNumber((Number) value)));
+                bq.add(eq, Occur.SHOULD);
+            }
+        } else {
+            for (Object value : values) {
+                String[] str = convert(path, value);
+                bq.add(eq(field, str, ignoreCase), Occur.SHOULD);
+            }
+        }
+        return bq;
+    }
+
+    protected Query notIn(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(in(operation, metadata, false), Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query ne(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(eq(operation, metadata, ignoreCase), Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query startsWith(QueryMetadata metadata, Operation<?> operation, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == 0 ? terms[i] + "*" : "*" + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new PrefixQuery(new Term(field, terms[0]));
+    }
+
+
+
+    protected Query stringContains(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0] + "*"));
+    }
+
+    protected Query endsWith(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == terms.length - 1 ? "*" + terms[i] : "*" + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0]));
+    }
+
+    protected Query between(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        // TODO Phrase not properly supported
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                operation.getArg(2),
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query lt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                null,
+                operation.getArg(1),
+                false,
+                false,
+                metadata);
+    }
+
+    protected Query gt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                null,
+                false,
+                false,
+                metadata);
+    }
+
+    protected Query le(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                null,
+                operation.getArg(1),
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query ge(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                null,
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query range(Path<?> leftHandSide, String field, @Nullable Expression<?> min,
+            @Nullable Expression<?> max, boolean minInc, boolean maxInc, QueryMetadata metadata) {
+        if (min != null && Number.class.isAssignableFrom(min.getType()) || max != null
+                && Number.class.isAssignableFrom(max.getType())) {
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> minConstant = (Constant<? extends Number>) min;
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> maxConstant = (Constant<? extends Number>) max;
+
+            Class<? extends Number> numType = minConstant != null ? minConstant.getType() : maxConstant.getType();
+            //this is not necessarily safe, but compile time checking
+            //on the user side mandates these types to be interchangeable
+            @SuppressWarnings("unchecked")
+            Class<Number> unboundedNumType = (Class<Number>) numType;
+            return numericRange(unboundedNumType, field, minConstant == null ? null
+                    : minConstant.getConstant(), maxConstant == null ? null
+                            : maxConstant.getConstant(), minInc, maxInc);
+        }
+        return stringRange(leftHandSide, field, min, max, minInc, maxInc, metadata);
+    }
+
+    protected <N extends Number> NumericRangeQuery<?> numericRange(Class<N> clazz, String field,
+            @Nullable N min, @Nullable N max, boolean minInc, boolean maxInc) {
+        if (clazz.equals(Integer.class)) {
+            return NumericRangeQuery.newIntRange(field, (Integer) min, (Integer) max, minInc, maxInc);
+        } else if (clazz.equals(Double.class)) {
+            return NumericRangeQuery.newDoubleRange(field, (Double) min, (Double) max, minInc, minInc);
+        } else if (clazz.equals(Float.class)) {
+            return NumericRangeQuery.newFloatRange(field, (Float) min, (Float) max, minInc, minInc);
+        } else if (clazz.equals(Long.class)) {
+            return NumericRangeQuery.newLongRange(field, (Long) min, (Long) max, minInc, minInc);
+        } else if (clazz.equals(Byte.class) || clazz.equals(Short.class)) {
+            return NumericRangeQuery.newIntRange(field, min != null ? min.intValue() : null,
+                    max != null ? max.intValue() : null, minInc, maxInc);
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type " + clazz.getName());
+        }
+    }
+
+    protected Query stringRange(
+            Path<?> leftHandSide,
+            String field,
+            @Nullable Expression<?> min,
+            @Nullable Expression<?> max,
+            boolean minInc,
+            boolean maxInc,
+            QueryMetadata metadata) {
+
+        if (min == null) {
+            return new TermRangeQuery(
+                    field, null, convert(leftHandSide, max, metadata)[0], minInc, maxInc);
+        } else if (max == null) {
+            return new TermRangeQuery(
+                    field, convert(leftHandSide, min, metadata)[0],
+                    null, minInc, maxInc);
+        } else {
+            return new TermRangeQuery(
+                    field, convert(leftHandSide, min, metadata)[0],
+                    convert(leftHandSide, max, metadata)[0],
+                    minInc, maxInc);
+        }
+    }
+
+    private Path<?> getPath(Expression<?> leftHandSide) {
+        if (leftHandSide instanceof Path<?>) {
+            return (Path<?>) leftHandSide;
+        } else if (leftHandSide instanceof Operation<?>) {
+            Operation<?> operation = (Operation<?>) leftHandSide;
+            if (operation.getOperator() == Ops.LOWER || operation.getOperator() == Ops.UPPER) {
+                return (Path<?>) operation.getArg(0);
+            }
+        }
+        throw new IllegalArgumentException("Unable to transform " + leftHandSide + " to path");
+    }
+
+    /**
+     * template method, override to customize
+     *
+     * @param path path
+     * @return field name
+     */
+    protected String toField(Path<?> path) {
+        PathMetadata md = path.getMetadata();
+        if (md.getPathType() == PathType.COLLECTION_ANY) {
+            return toField(md.getParent());
+        } else {
+            String rv = md.getName();
+            if (md.getParent() != null) {
+                Path<?> parent = md.getParent();
+                if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
+                    rv = toField(parent) + "." + rv;
+                }
+            }
+            return rv;
+        }
+    }
+
+    private void verifyArguments(Operation<?> operation) {
+        List<Expression<?>> arguments = operation.getArgs();
+        for (int i = 1; i < arguments.size(); ++i) {
+            if (!(arguments.get(i) instanceof Constant<?>)
+                    && !(arguments.get(i) instanceof ParamExpression<?>)
+                    && !(arguments.get(i) instanceof PhraseElement)
+                    && !(arguments.get(i) instanceof TermElement)) {
+                throw new IllegalArgumentException("operand was of unsupported type "
+                        + arguments.get(i).getClass().getName());
+            }
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide left hand side
+     * @param rightHandSide right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
+        if (rightHandSide instanceof Operation) {
+            Operation<?> operation = (Operation<?>) rightHandSide;
+            if (operation.getOperator() == LuceneOps.PHRASE) {
+                return operation.getArg(0).toString().split("\\s+");
+            } else if (operation.getOperator() == LuceneOps.TERM) {
+                return new String[] {operation.getArg(0).toString()};
+            } else {
+                throw new IllegalArgumentException(rightHandSide.toString());
+            }
+        } else if (rightHandSide instanceof ParamExpression<?>) {
+            Object value = metadata.getParams().get(rightHandSide);
+            if (value == null) {
+                throw new ParamNotSetException((ParamExpression<?>) rightHandSide);
+            }
+            return convert(leftHandSide, value);
+
+        } else if (rightHandSide instanceof Constant<?>) {
+            return convert(leftHandSide, ((Constant<?>) rightHandSide).getConstant());
+        } else {
+            throw new IllegalArgumentException(rightHandSide.toString());
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide left hand side
+     * @param rightHandSide right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide, Object rightHandSide) {
+        String str = rightHandSide.toString();
+        if (lowerCase) {
+            str = str.toLowerCase();
+        }
+        if (splitTerms) {
+            if (str.equals("")) {
+                return new String[] {str};
+            } else {
+                return str.split("\\s+");
+            }
+        } else {
+            return new String[] {str};
+        }
+    }
+
+    private String[] convertEscaped(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
+        String[] str = convert(leftHandSide, rightHandSide, metadata);
+        for (int i = 0; i < str.length; i++) {
+            str[i] = QueryParser.escape(str[i]);
+        }
+        return str;
+    }
+
+    public Query toQuery(Expression<?> expr, QueryMetadata metadata) {
+        if (expr instanceof Operation<?>) {
+            return toQuery((Operation<?>) expr, metadata);
+        } else {
+            return toQuery(ExpressionUtils.extract(expr), metadata);
+        }
+    }
+
+    public Sort toSort(List<? extends OrderSpecifier<?>> orderBys) {
+        List<SortField> sorts = new ArrayList<SortField>(orderBys.size());
+        for (OrderSpecifier<?> order : orderBys) {
+            if (!(order.getTarget() instanceof Path<?>)) {
+                throw new IllegalArgumentException("argument was not of type Path.");
+            }
+            Class<?> type = order.getTarget().getType();
+            boolean reverse = !order.isAscending();
+            Path<?> path = getPath(order.getTarget());
+            if (Number.class.isAssignableFrom(type)) {
+                sorts.add(new SortField(toField(path), sortFields.get(type), reverse));
+            } else {
+                sorts.add(new SortField(toField(path), sortLocale, reverse));
+            }
+        }
+        Sort sort = new Sort();
+        sort.setSort(sorts.toArray(new SortField[0]));
+        return sort;
+    }
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/PhraseElement.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/PhraseElement.java
new file mode 100644
index 0000000000..d3f5822997
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/PhraseElement.java
@@ -0,0 +1,33 @@
+ /*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code PhraseElement} represents the embedded String as a phrase
+ *
+ * @author tiwe
+ *
+ */
+public class PhraseElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public PhraseElement(String str) {
+        super(LuceneOps.PHRASE, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/QueryElement.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/QueryElement.java
new file mode 100644
index 0000000000..2ab4d07fdb
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/QueryElement.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.apache.lucene.search.Query;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.BooleanOperation;
+
+/**
+ * {@code QueryElement} wraps a Lucene Query
+ *
+ * @author tiwe
+ *
+ */
+public class QueryElement extends BooleanOperation {
+
+    private static final long serialVersionUID = 470868107363840155L;
+
+    public QueryElement(Query query) {
+        super(LuceneOps.LUCENE_QUERY, ConstantImpl.create(query));
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/ResultIterator.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/ResultIterator.java
new file mode 100644
index 0000000000..1d66d985a9
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/ResultIterator.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.QueryException;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldSelector;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.function.Function;
+
+/**
+ * {@code ResultIterator} is a {@link CloseableIterator} implementation for Lucene query results
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public final class ResultIterator<T> implements CloseableIterator<T> {
+
+    private final ScoreDoc[] scoreDocs;
+
+    private int cursor;
+
+    private final IndexSearcher searcher;
+
+    @Nullable
+    private final FieldSelector fieldSelector;
+
+    private final Function<Document,T> transformer;
+
+    public ResultIterator(ScoreDoc[] scoreDocs, int offset, IndexSearcher searcher,
+            @Nullable FieldSelector fieldSelector, Function<Document, T> transformer) {
+        this.scoreDocs = scoreDocs.clone();
+        this.cursor = offset;
+        this.searcher = searcher;
+        this.fieldSelector = fieldSelector;
+        this.transformer = transformer;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return cursor != scoreDocs.length;
+    }
+
+    @Override
+    public T next() {
+        try {
+            Document document;
+            if (fieldSelector != null) {
+                document = searcher.doc(scoreDocs[cursor++].doc, fieldSelector);
+            } else {
+                document = searcher.doc(scoreDocs[cursor++].doc);
+            }
+            return transformer.apply(document);
+        } catch (IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TermElement.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TermElement.java
new file mode 100644
index 0000000000..9c54e4936c
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TermElement.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code TermElement} represents the embedded String as a term
+ *
+ * @author tiwe
+ *
+ */
+public class TermElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public TermElement(String str) {
+        super(LuceneOps.TERM, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TypedQuery.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TypedQuery.java
new file mode 100644
index 0000000000..0242be9a3e
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/TypedQuery.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code TypedQuery} is a typed query implementation for Lucene queries.
+ *
+ * <p>Converts Lucene documents to typed results via a constructor supplied transformer</p>
+ *
+ * @param <T> result type
+ *
+ * @author laim
+ * @author tiwe
+ */
+public class TypedQuery<T> extends AbstractLuceneQuery<T, TypedQuery<T>> {
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param searcher index searcher
+     * @param transformer transformer to transform Lucene documents to result objects
+     */
+    public TypedQuery(IndexSearcher searcher, Function<Document, T> transformer) {
+        super(searcher, transformer);
+    }
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param serializer serializer
+     * @param searcher index search
+     * @param transformer transformer to transform documents to result objects
+     */
+    public TypedQuery(LuceneSerializer serializer, IndexSearcher searcher, Function<Document, T> transformer) {
+        super(serializer, searcher, transformer);
+    }
+
+}
diff --git a/querydsl-lucene3/src/main/java/com/querydsl/lucene3/package-info.java b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/package-info.java
new file mode 100644
index 0000000000..a91ba33d33
--- /dev/null
+++ b/querydsl-lucene3/src/main/java/com/querydsl/lucene3/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Lucene 3 support
+ */
+package com.querydsl.lucene3;
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
deleted file mode 100644
index f1bce88607..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-import static com.mysema.query.QPerson.person;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.joda.time.LocalDate;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.StringPath;
-
-public class LuceneSerializerNotTokenizedTest {
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-    private LuceneSerializer serializer;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final Person clooney = new Person("actor_1", "George Clooney", new LocalDate(1961, 4, 6));
-    private final Person pitt = new Person("actor_2", "Brad Pitt", new LocalDate(1963, 12, 18));
-
-    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-        assertEquals(expectedQuery, query.toString());
-    }
-
-    private Document createDocument(Person person) {
-        Document doc = new Document();
-        doc.add(new Field("id", person.getId(), Store.YES, Index.NOT_ANALYZED));
-        doc.add(new Field("name", person.getName(), Store.YES, Index.NOT_ANALYZED));
-        doc.add(new Field("birthDate", person.getBirthDate().toString(), Store.YES, Index.NOT_ANALYZED));
-        return doc;
-    }
-
-    @Before
-    public void Before() throws Exception {
-        serializer = new LuceneSerializer(false, false);
-        idx = new RAMDirectory();
-        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31, 
-                new StandardAnalyzer(Version.LUCENE_30))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-        writer = new IndexWriter(idx, config);
-
-        writer.addDocument(createDocument(clooney));
-        writer.addDocument(createDocument(pitt));
-
-        Document document = new Document();
-        for (String movie : Arrays.asList("Interview with the Vampire",
-                                          "Up in the Air")) {
-            document.add(new Field("movie", movie, Store.YES, Index.NOT_ANALYZED));
-        }
-        writer.addDocument(document);
-
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-    }
-
-    @Test
-    public void Equals_By_Id_Matches() throws Exception {
-        testQuery(person.id.eq("actor_1"), "id:actor_1", 1);
-    }
-
-    @Test
-    public void Equals_By_Id_Does_Not_Match() throws Exception {
-        testQuery(person.id.eq("actor_8"), "id:actor_8", 0);
-    }
-
-    @Test
-    public void Equals_By_Name_Matches() throws Exception {
-        testQuery(person.name.eq("George Clooney"), "name:George Clooney", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Equals_By_Name_Ignoring_Case_Does_Not_Match() throws Exception {
-        testQuery(person.name.equalsIgnoreCase("george clooney"), "name:george clooney", 0);
-    }
-
-    @Test
-    public void Equals_By_Name_Does_Not_Match() throws Exception {
-        testQuery(person.name.eq("George Looney"), "name:George Looney", 0);
-    }
-
-    @Test
-    public void Starts_With_Name_Should_Match() throws Exception {
-        testQuery(person.name.startsWith("George C"), "name:George C*", 1);
-    }
-
-    @Test
-    public void Starts_With_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.startsWith("George L"), "name:George L*", 0);
-    }
-
-    @Test
-    public void Ends_With_Name_Should_Match() throws Exception {
-        testQuery(person.name.endsWith("e Clooney"), "name:*e Clooney", 1);
-    }
-
-    @Test
-    public void Ends_With_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.endsWith("e Looney"), "name:*e Looney", 0);
-    }
-
-    @Test
-    public void Contains_Name_Should_Match() throws Exception {
-        testQuery(person.name.contains("oney"), "name:*oney*", 1);
-    }
-
-    @Test
-    public void Contains_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.contains("bloney"), "name:*bloney*", 0);
-    }
-
-    @Test
-    public void In_Names_Should_Match_2() throws Exception {
-        testQuery(person.name.in("Brad Pitt", "George Clooney"), "name:Brad Pitt name:George Clooney", 2);
-    }
-
-    @Test
-    public void Or_By_Name_Should_Match_2() throws Exception {
-        testQuery(    person.name.eq("Brad Pitt")
-                  .or(person.name.eq("George Clooney")), "name:Brad Pitt name:George Clooney", 2);
-    }
-
-    @Test
-    public void Equals_By_Birth_Date() throws Exception {
-        testQuery(person.birthDate.eq(clooney.getBirthDate()), "birthDate:1961-04-06", 1);
-    }
-
-    @Test
-    public void Between_Phrase() throws Exception {
-        testQuery(person.name.between("Brad Pitt","George Clooney"), "name:[Brad Pitt TO George Clooney]", 2);
-    }
-
-    @Test
-    public void Not_Equals_Finds_The_Actors_And_Movies() throws Exception {
-        testQuery(person.name.ne("Michael Douglas"), "-name:Michael Douglas +*:*", 3);
-    }
-
-    @Test
-    public void Not_Equals_Finds_Only_Clooney_And_Movies() throws Exception {
-        testQuery(person.name.ne("Brad Pitt"), "-name:Brad Pitt +*:*", 2);
-    }
-
-    @Test
-    public void And_With_Two_Not_Equals_Doesnt_Find_The_Actors() throws Exception {
-        testQuery(     person.name.ne("Brad Pitt")
-                  .and(person.name.ne("George Clooney")), "+(-name:Brad Pitt +*:*) +(-name:George Clooney +*:*)", 1);
-    }
-
-    @Test
-    public void Or_With_Two_Not_Equals_Finds_Movies_And_Actors() throws Exception {
-        testQuery(    person.name.ne("Brad Pitt")
-                  .or(person.name.ne("George Clooney")), "(-name:Brad Pitt +*:*) (-name:George Clooney +*:*)", 3);
-    }
-
-    @Test
-    public void Negation_Of_Equals_Finds_Movies_And_Actors() throws Exception {
-        testQuery(person.name.eq("Michael Douglas").not(), "-name:Michael Douglas +*:*", 3);
-    }
-
-    @Test
-    public void Negation_Of_Equals_Finds_Pitt_And_Movies() throws Exception {
-        testQuery(person.name.eq("Brad Pitt").not(), "-name:Brad Pitt +*:*", 2);
-    }
-
-    @Test
-    public void Multiple_Field_Search_From_Movies() throws Exception {
-        StringPath movie = new StringPath("movie");
-        testQuery(movie.in("Interview with the Vampire"), "movie:Interview with the Vampire", 1);
-        testQuery(movie.eq("Up in the Air"), "movie:Up in the Air", 1);
-    }
-}
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerTest.java
deleted file mode 100644
index e2c382825f..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/LuceneSerializerTest.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.StringReader;
-import java.util.Arrays;
-
-import com.mysema.query.lucene.LuceneExpressions;
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.lucene.QueryElement;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.NumericField;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.NumericUtils;
-import org.apache.lucene.util.Version;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Tests for LuceneSerializer
- *
- * @author vema
- *
- */
-public class LuceneSerializerTest {
-    private LuceneSerializer serializer;
-    private PathBuilder<Object> entityPath;
-    private StringPath title;
-    private StringPath author;
-    private StringPath text;
-    private StringPath rating;
-    private StringPath publisher;
-    private NumberPath<Integer> year;
-    private NumberPath<Double> gross;
-
-    private NumberPath<Long> longField;
-    private NumberPath<Short> shortField;
-    private NumberPath<Byte> byteField;
-    private NumberPath<Float> floatField;
-
-    private static final String YEAR_PREFIX_CODED = NumericUtils.intToPrefixCoded(1990);
-    private static final String GROSS_PREFIX_CODED = NumericUtils.doubleToPrefixCoded(900.00);
-    private static final String LONG_PREFIX_CODED = NumericUtils.longToPrefixCoded(1);
-    private static final String SHORT_PREFIX_CODED = NumericUtils.intToPrefixCoded(1);
-    private static final String BYTE_PREFIX_CODED = NumericUtils.intToPrefixCoded(1);
-    private static final String FLOAT_PREFIX_CODED = NumericUtils.floatToPrefixCoded((float)1.0);
-
-    private IndexWriterConfig config;
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private Document createDocument() {
-        Document doc = new Document();
-
-        doc.add(new Field("title", new StringReader("Jurassic Park")));
-        doc.add(new Field("author", new StringReader("Michael Crichton")));
-        doc.add(new Field("text", new StringReader("It's a UNIX system! I know this!")));
-        doc.add(new Field("rating", new StringReader("Good")));
-        doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
-        doc.add(new NumericField("year", Store.YES, true).setIntValue(1990));
-        doc.add(new NumericField("gross", Store.YES, true).setDoubleValue(900.00));
-
-        doc.add(new NumericField("longField", Store.YES, true).setLongValue(1));
-        doc.add(new NumericField("shortField", Store.YES, true).setIntValue(1));
-        doc.add(new NumericField("byteField", Store.YES, true).setIntValue(1));
-        doc.add(new NumericField("floatField", Store.YES, true).setFloatValue(1));
-
-        return doc;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        serializer = new LuceneSerializer(true,true);
-        entityPath = new PathBuilder<Object>(Object.class, "obj");
-        title = entityPath.getString("title");
-        author = entityPath.getString("author");
-        text = entityPath.getString("text");
-        publisher = entityPath.getString("publisher");
-        year = entityPath.getNumber("year", Integer.class);
-        rating = entityPath.getString("rating");
-        gross = entityPath.getNumber("gross", Double.class);
-
-        longField = entityPath.getNumber("longField", Long.class);
-        shortField = entityPath.getNumber("shortField", Short.class);
-        byteField = entityPath.getNumber("byteField", Byte.class);
-        floatField = entityPath.getNumber("floatField", Float.class);
-
-        idx = new RAMDirectory();
-        config = new IndexWriterConfig(Version.LUCENE_31, 
-                new StandardAnalyzer(Version.LUCENE_30))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-        writer = new IndexWriter(idx, config);
-
-        writer.addDocument(createDocument());
-
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        searcher.close();
-    }
-
-    private void testQuery(Expression<?> expr, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-    }
-
-    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-        assertEquals(expectedQuery, query.toString());
-    }
-
-    @Test
-    public void QueryElement() throws Exception{
-        Query query1 = serializer.toQuery(author.like("Michael"), metadata);
-        Query query2 = serializer.toQuery(text.like("Text"), metadata);
-
-        BooleanExpression query = BooleanExpression.anyOf(
-            new QueryElement(query1),
-            new QueryElement(query2)
-        );
-        testQuery(query, "author:michael text:text", 1);
-    }
-
-    @Test
-    public void Like() throws Exception {
-        testQuery(author.like("*ichael*"), "author:*ichael*", 1);
-    }
-
-    @Test
-    public void Like_Custom_Wildcard_Single_Character() throws Exception {
-        testQuery(author.like("Mi?hael"), "author:mi?hael", 1);
-    }
-
-    @Test
-    public void Like_Custom_Wildcard_Multiple_Character() throws Exception {
-        testQuery(text.like("*U*X*"), "text:*u*x*", 1);
-    }
-
-    @Test
-    public void Like_Phrase() throws Exception {
-        testQuery(title.like("*rassic Par*"), "+title:**rassic* +title:*par**", 1);
-    }
-
-    @Test
-    public void Like_or_like() throws Exception {
-        testQuery(title.like("House").or(author.like("*ichae*")), "title:house author:*ichae*", 1);
-    }
-
-    @Test
-    public void Like_and_like() throws Exception {
-        testQuery(title.like("*assic*").and(rating.like("G?od")), "+title:*assic* +rating:g?od", 1);
-    }
-
-    @Test
-    public void Eq() throws Exception {
-        testQuery(rating.eq("good"), "rating:good", 1);
-    }
-
-    @Test
-    public void Eq_with_deep_path() throws Exception{
-        StringPath deepPath = entityPath.get("property1", Object.class).getString("property2");
-        testQuery(deepPath.eq("good"), "property1.property2:good", 0);
-    }
-
-    @Test
-    public void FuzzyLike() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good"), "rating:Good~0.5", 1);
-    }
-
-    @Test
-    public void FuzzyLike_with_Similarity() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 0.6f), "rating:Good~0.6", 1);
-    }
-
-    @Test
-    public void FuzzyLike_with_Similarity_and_prefix() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 0.6f, 0), "rating:Good~0.6", 1);
-    }
-
-    @Test
-    public void Eq_Numeric_Integer() throws Exception {
-        testQuery(year.eq(1990), "year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Eq_Numeric_Double() throws Exception {
-        testQuery(gross.eq(900.00), "gross:" + GROSS_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Eq_Numeric() throws Exception{
-        testQuery(longField.eq(1l), "longField:" + LONG_PREFIX_CODED, 1);
-        testQuery(shortField.eq((short)1), "shortField:" + SHORT_PREFIX_CODED, 1);
-        testQuery(byteField.eq((byte)1), "byteField:" + BYTE_PREFIX_CODED, 1);
-        testQuery(floatField.eq((float)1.0), "floatField:" + FLOAT_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Equals_Ignores_Case() throws Exception {
-        testQuery(title.eq("Jurassic"), "title:jurassic", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Title_Equals_Ignore_Case_Or_Year_Equals() throws Exception {
-        testQuery(title.equalsIgnoreCase("House").or(year.eq(1990)), "title:house year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Eq_and_eq() throws Exception {
-        testQuery(title.eq("Jurassic Park").and(year.eq(1990)), "+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Eq_and_Eq_and_eq() throws Exception {
-        testQuery(title.eq("Jurassic Park").and(year.eq(1990)).and(author.eq("Michael Crichton")), "+(+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED + ") +author:\"michael crichton\"", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Equals_Ignore_Case_And_Or() throws Exception {
-        testQuery(title.equalsIgnoreCase("Jurassic Park").and(rating.equalsIgnoreCase("Bad")).or(author.equalsIgnoreCase("Michael Crichton")), "(+title:\"jurassic park\" +rating:bad) author:\"michael crichton\"", 1);
-    }
-
-    @Test
-    public void Eq_or_Eq_and_Eq_Does_Not_Find_Results() throws Exception {
-        testQuery(title.eq("jeeves").or(rating.eq("superb")).and(author.eq("michael crichton")), "+(title:jeeves rating:superb) +author:\"michael crichton\"", 0);
-    }
-
-    @Test
-    public void Eq_Phrase() throws Exception {
-        testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
-    }
-
-    @Test
-    @Ignore("Not easily done in Lucene!")
-    public void Publisher_Equals_Empty_String() throws Exception {
-        testQuery(publisher.eq(""), "publisher:", 1);
-    }
-
-    @Test
-    public void Eq_Phrase_Should_Not_Find_Results_But_LuceNe_Semantics_Differs_From_Querydsls() throws Exception {
-        testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
-    }
-
-    @Test
-    public void Eq_Phrase_Does_Not_Find_Results_Because_Word_In_Middle() throws Exception {
-        testQuery(title.eq("Jurassic Amusement Park"), "title:\"jurassic amusement park\"", 0);
-    }
-
-    @Test
-    public void Like_not_Does_Not_Find_Results() throws Exception {
-        testQuery(title.like("*H*e*").not(), "-title:*h*e* +*:*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Title_Equals_Ignore_Case_Negation_Or_Rating_Equals_Ignore_Case() throws Exception {
-        testQuery(title.equalsIgnoreCase("House").not().or(rating.equalsIgnoreCase("Good")), "-title:house rating:good", 1);
-    }
-
-    @Test
-    public void Eq_not_Does_Not_Find_Results() throws Exception {
-        testQuery(title.eq("Jurassic Park").not(), "-title:\"jurassic park\" +*:*", 0);
-    }
-
-    @Test
-    public void Title_Equals_Not_House() throws Exception {
-        testQuery(title.eq("house").not(), "-title:house +*:*", 1);
-    }
-
-    @Test
-    public void Eq_and_Eq_not_Does_Not_Find_Results_Because_Second_Expression_Finds_Nothing() throws Exception {
-        testQuery(rating.eq("superb").and(title.eq("house").not()), "+rating:superb +(-title:house +*:*)", 0);
-    }
-
-    @Test
-    public void Not_Equals_Finds_One() throws Exception {
-        testQuery(title.ne("house"), "-title:house +*:*", 1);
-    }
-
-    @Test
-    public void Not_Equals_Finds_None() throws Exception {
-        testQuery(title.ne("Jurassic Park"), "-title:\"jurassic park\" +*:*", 0);
-    }
-
-    @Test
-    public void Nothing_Found_With_Not_Equals_Or_Equals() throws Exception {
-        testQuery(title.ne("jurassic park").or(rating.eq("lousy")), "(-title:\"jurassic park\" +*:*) rating:lousy", 0);
-    }
-
-    @Test
-    public void Ne_and_eq() throws Exception {
-        testQuery(title.ne("house").and(rating.eq("good")), "+(-title:house +*:*) +rating:good", 1);
-    }
-
-    @Test
-    public void StartsWith() throws Exception {
-        testQuery(title.startsWith("Jurassi"), "title:jurassi*", 1);
-    }
-
-    @Test
-    public void StartsWith_Phrase() throws Exception {
-        testQuery(title.startsWith("jurassic par"), "+title:jurassic* +title:*par*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Starts_With_Ignore_Case_Phrase_Does_Not_Find_Results() throws Exception {
-        testQuery(title.startsWithIgnoreCase("urassic Par"), "+title:urassic* +title:*par*", 0);
-    }
-
-    @Test
-    public void EndsWith() throws Exception {
-        testQuery(title.endsWith("ark"), "title:*ark", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Ends_With_Ignore_Case_Phrase() throws Exception {
-        testQuery(title.endsWithIgnoreCase("sic Park"), "+title:*sic* +title:*park", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Ends_With_Ignore_Case_Phrase_Does_Not_Find_Results() throws Exception {
-        testQuery(title.endsWithIgnoreCase("sic Par"), "+title:*sic* +title:*par", 0);
-    }
-
-    @Test
-    public void Contains() throws Exception {
-        testQuery(title.contains("rassi"), "title:*rassi*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Contains_Ignore_Case_Phrase() throws Exception {
-        testQuery(title.containsIgnoreCase("rassi Pa"), "+title:*rassi* +title:*pa*", 1);
-    }
-
-    @Test
-    public void Contains_User_Inputted_Wildcards_Dont_Work() throws Exception {
-        testQuery(title.contains("r*i"), "title:*r\\*i*", 0);
-    }
-
-    @Test
-    public void Between() throws Exception {
-        testQuery(title.between("Indiana", "Kundun"), "title:[indiana TO kundun]", 1);
-    }
-
-    @Test
-    public void Between_Numeric_Integer() throws Exception {
-        testQuery(year.between(1980, 2000), "year:[1980 TO 2000]", 1);
-    }
-
-    @Test
-    public void Between_Numeric_Double() throws Exception {
-        testQuery(gross.between(10.00, 19030.00), "gross:[10.0 TO 19030.0]", 1);
-    }
-
-    @Test
-    public void Between_Numeric() throws Exception{
-        testQuery(longField.between(0l,2l), "longField:[0 TO 2]", 1);
-        testQuery(shortField.between((short)0,(short)2), "shortField:[0 TO 2]", 1);
-        testQuery(byteField.between((byte)0,(byte)2), "byteField:[0 TO 2]", 1);
-        testQuery(floatField.between((float)0.0,(float)2.0), "floatField:[0.0 TO 2.0]", 1);
-    }
-
-    @Test
-    public void Between_Is_Inclusive_From_Start() throws Exception {
-        testQuery(title.between("Jurassic", "Kundun"), "title:[jurassic TO kundun]", 1);
-    }
-
-    @Test
-    public void Between_Is_Inclusive_To_End() throws Exception {
-        testQuery(title.between("Indiana", "Jurassic"), "title:[indiana TO jurassic]", 1);
-    }
-
-    @Test
-    public void Between_Does_Not_Find_Results() throws Exception {
-        testQuery(title.between("Indiana", "Jurassib"), "title:[indiana TO jurassib]", 0);
-    }
-
-    @Test
-    public void In() throws Exception {
-        testQuery(title.in(Arrays.asList("jurassic", "park")), "title:jurassic title:park", 1);
-        testQuery(title.in("jurassic","park"), "title:jurassic title:park", 1);
-        testQuery(title.eq("jurassic").or(title.eq("park")), "title:jurassic title:park", 1);
-    }
-
-    @Test
-    public void Lt() throws Exception {
-        testQuery(rating.lt("Superb"), "rating:{* TO superb}", 1);
-    }
-
-    @Test
-    public void Lt_Numeric_Integer() throws Exception {
-        testQuery(year.lt(1991), "year:{* TO 1991}", 1);
-    }
-
-    @Test
-    public void Lt_Numeric_Double() throws Exception {
-        testQuery(gross.lt(10000.0), "gross:{* TO 10000.0}", 1);
-    }
-
-    @Test
-    public void Lt_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(rating.lt("Good"), "rating:{* TO good}", 0);
-    }
-
-    @Test
-    public void Lt_Numeric_Integer_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(year.lt(1990), "year:{* TO 1990}", 0);
-    }
-
-    @Test
-    public void Lt_Numeric_Double_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(gross.lt(900.0), "gross:{* TO 900.0}", 0);
-    }
-
-    @Test
-    public void Loe() throws Exception {
-        testQuery(rating.loe("Superb"), "rating:[* TO superb]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer() throws Exception {
-        testQuery(year.loe(1991), "year:[* TO 1991]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Double() throws Exception {
-        testQuery(gross.loe(903.0), "gross:[* TO 903.0]", 1);
-    }
-
-    @Test
-    public void Loe_Equal() throws Exception {
-        testQuery(rating.loe("Good"), "rating:[* TO good]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer_Equal() throws Exception {
-        testQuery(year.loe(1990), "year:[* TO 1990]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Double_Equal() throws Exception {
-        testQuery(gross.loe(900.0), "gross:[* TO 900.0]", 1);
-    }
-
-    @Test
-    public void Loe_Not_Found() throws Exception {
-        testQuery(rating.loe("Bad"), "rating:[* TO bad]", 0);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer_Not_Found() throws Exception {
-        testQuery(year.loe(1989), "year:[* TO 1989]", 0);
-    }
-
-    @Test
-    public void Loe_Numeric_Double_Not_Found() throws Exception {
-        testQuery(gross.loe(899.9), "gross:[* TO 899.9]", 0);
-    }
-
-    @Test
-    public void Gt() throws Exception {
-        testQuery(rating.gt("Bad"), "rating:{bad TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Numeric_Integer() throws Exception {
-        testQuery(year.gt(1989), "year:{1989 TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Numeric_Double() throws Exception {
-        testQuery(gross.gt(100.00), "gross:{100.0 TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(rating.gt("Good"), "rating:{good TO *}", 0);
-    }
-
-    @Test
-    public void Gt_Numeric_Integer_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(year.gt(1990), "year:{1990 TO *}", 0);
-    }
-
-    @Test
-    public void Gt_Numeric_Double_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(gross.gt(900.00), "gross:{900.0 TO *}", 0);
-    }
-
-    @Test
-    public void Goe() throws Exception {
-        testQuery(rating.goe("Bad"), "rating:[bad TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer() throws Exception {
-        testQuery(year.goe(1989), "year:[1989 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Double() throws Exception {
-        testQuery(gross.goe(320.50), "gross:[320.5 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Equal() throws Exception {
-        testQuery(rating.goe("Good"), "rating:[good TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer_Equal() throws Exception {
-        testQuery(year.goe(1990), "year:[1990 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Double_Equal() throws Exception {
-        testQuery(gross.goe(900.00), "gross:[900.0 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Not_Found() throws Exception {
-        testQuery(rating.goe("Hood"), "rating:[hood TO *]", 0);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer_Not_Found() throws Exception {
-        testQuery(year.goe(1991), "year:[1991 TO *]", 0);
-    }
-
-    @Test
-    public void Goe_Numeric_Double_Not_Found() throws Exception {
-        testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
-    }
-
-    @Test
-    public void Equals_Empty_String() throws Exception {
-        testQuery(title.eq(""), "title:", 0);
-    }
-
-    @Test
-    public void Not_Equals_Empty_String() throws Exception {
-        testQuery(title.ne(""), "-title: +*:*", 1);
-    }
-
-    @Test
-    public void Contains_Empty_String() throws Exception {
-        testQuery(title.contains(""), "title:**", 1);
-    }
-
-    @Test
-    public void Like_Empty_String() throws Exception {
-        testQuery(title.like(""), "title:", 0);
-    }
-
-    @Test
-    public void Starts_With_Empty_String() throws Exception {
-        testQuery(title.startsWith(""), "title:*", 1);
-    }
-
-    @Test
-    public void Ends_With_Empty_String() throws Exception {
-        testQuery(title.endsWith(""), "title:*", 1);
-    }
-
-    @Test
-    public void Between_Empty_Strings() throws Exception {
-        testQuery(title.between("", ""), "title:[ TO ]", 0);
-    }
-
-    @Test
-    public void BooleanBuilder() throws Exception{
-        testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]", 0);
-    }
-
-    @Test
-    @Ignore
-    public void Fuzzy() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    @Test
-    @Ignore
-    public void Proximity() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    @Test
-    @Ignore
-    public void Boost() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    private boolean unsupportedOperation(Predicate filter) {
-        if (filter instanceof Operation<?>) {
-            Operator<?> op = ((Operation<?>) filter).getOperator();
-            if (op == Ops.STARTS_WITH_IC || op == Ops.EQ_IGNORE_CASE || op == Ops.STARTS_WITH_IC
-                || op == Ops.ENDS_WITH_IC || op == Ops.STRING_CONTAINS_IC) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Test
-    public void various() throws Exception{
-        MatchingFiltersFactory filters = new MatchingFiltersFactory(Module.LUCENE, Target.LUCENE);
-        for (Predicate filter : filters.string(title, StringConstant.create("jurassic park"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 1);
-        }
-
-        for (Predicate filter : filters.string(author, StringConstant.create("michael crichton"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 1);
-        }
-
-        for (Predicate filter : filters.string(title, StringConstant.create("1990"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 0);
-        }
-    }
-
-}
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/Person.java b/querydsl-lucene3/src/test/java/com/mysema/query/Person.java
deleted file mode 100644
index 32a1ad42e9..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/Person.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.joda.time.LocalDate;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Person {
-    private final String id;
-    private final String name;
-    private final LocalDate birthDate;
-
-    public Person(String id, String name, LocalDate birthDate) {
-        this.id = id;
-        this.name = name;
-        this.birthDate = birthDate;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public LocalDate getBirthDate() {
-        return birthDate;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
-
-
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
deleted file mode 100644
index 7df9ba7802..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.easymock.EasyMock.createMockBuilder;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.MapFieldSelector;
-import org.apache.lucene.document.NumericField;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.DuplicateFilter;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.expr.Param;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-/**
- * Tests for LuceneQuery
- *
- * @author vema
- *
- */
-public class LuceneQueryTest {
-
-    private LuceneQuery query;
-    private StringPath title;
-    private NumberPath<Integer> year;
-    private NumberPath<Double> gross;
-
-    private final StringPath sort = new StringPath("sort");
-
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-
-    private Document createDocument(final String docTitle,
-            final String docAuthor, final String docText, final int docYear,
-            final double docGross) {
-        final Document doc = new Document();
-
-        doc.add(new Field("title", docTitle, Store.YES, Index.ANALYZED));
-        doc.add(new Field("author", docAuthor, Store.YES, Index.ANALYZED));
-        doc.add(new Field("text", docText, Store.YES, Index.ANALYZED));
-        doc.add(new NumericField("year", Store.YES, true).setIntValue(docYear));
-        doc.add(new NumericField("gross", Store.YES, true)
-                .setDoubleValue(docGross));
-
-        return doc;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        final QDocument entityPath = new QDocument("doc");
-        title = entityPath.title;
-        year = entityPath.year;
-        gross = entityPath.gross;
-
-        
-        idx = new RAMDirectory();
-        writer = createWriter(idx);
-
-        writer.addDocument(createDocument("Jurassic Park", "Michael Crichton",
-                "It's a UNIX system! I know this!", 1990, 90.00));
-        writer.addDocument(createDocument("Nummisuutarit", "Aleksis Kivi",
-                "ESKO. Ja iloitset ja riemuitset?", 1864, 10.00));
-        writer
-                .addDocument(createDocument(
-                        "The Lord of the Rings",
-                        "John R. R. Tolkien",
-                        "One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them",
-                        1954, 89.00));
-        writer
-                .addDocument(createDocument(
-                        "Introduction to Algorithms",
-                        "Thomas H. Cormen, Charles E. Leiserson, Ronald L. Rivest, and Clifford Stein",
-                        "Bubble sort", 1990, 30.50));
-
-        writer.close();
-        
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-    }
-
-    private IndexWriter createWriter(RAMDirectory idx) throws Exception {
-        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31, 
-                new StandardAnalyzer(Version.LUCENE_30))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);        
-        return new IndexWriter(idx, config);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        searcher.close();
-    }
-
-    @Test
-    public void Count_Empty_Where_Clause() {
-        assertEquals(4, query.count());
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query.where(title.eq("Jurassic Park")).exists());
-        assertFalse(query.where(title.eq("Jurassic Park X")).exists());
-    }
-
-    @Test
-    public void NotExists() {
-        assertFalse(query.where(title.eq("Jurassic Park")).notExists());
-        assertTrue(query.where(title.eq("Jurassic Park X")).notExists());
-    }
-
-    @Test
-    public void Count() {
-        query.where(title.eq("Jurassic Park"));
-        assertEquals(1, query.count());
-    }
-
-    @Test(expected = QueryException.class)
-    public void Count_Index_Problem() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andThrow(new IllegalArgumentException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.count();
-        verify(searcher);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void CountDistinct() {
-        query.where(year.between(1900, 3000));
-        assertEquals(3, query.distinct().count());
-    }
-
-    @Test
-    public void List_Sorted_By_Year_Ascending() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted() {
-        query.where(year.between(1800, 2000));
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void Sorted_By_Different_Locales() throws Exception {
-        Document d1 = new Document();
-        Document d2 = new Document();
-        Document d3 = new Document();
-        d1.add(new Field("sort", "a\u00c4",Store.YES, Index.NOT_ANALYZED));
-        d2.add(new Field("sort", "ab",Store.YES, Index.NOT_ANALYZED));
-        d3.add(new Field("sort", "aa",Store.YES, Index.NOT_ANALYZED));
-        writer = createWriter(idx);
-        writer.addDocument(d1);
-        writer.addDocument(d2);
-        writer.addDocument(d3);
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true, Locale.ENGLISH), searcher);
-        assertEquals(3, query.list().size());
-        List<Document> results = query.where(sort.startsWith("a")).orderBy(sort.asc()).list();
-        assertEquals(3, results.size());
-        assertEquals("aa", results.get(0).getFieldable("sort").stringValue());
-        assertEquals("a\u00c4", results.get(1).getFieldable("sort").stringValue());
-        assertEquals("ab", results.get(2).getFieldable("sort").stringValue());
-
-        query = new LuceneQuery(new LuceneSerializer(true, true, new Locale("fi", "FI")), searcher);
-        results = query.where(sort.startsWith("a")).orderBy(sort.asc()).list();
-        assertEquals("aa", results.get(0).getFieldable("sort").stringValue());
-        assertEquals("ab", results.get(1).getFieldable("sort").stringValue());
-        assertEquals("a\u00c4", results.get(2).getFieldable("sort").stringValue());
-
-
-    }
-
-    @Test
-    public void List_Not_Sorted_Limit_2() {
-        query.where(year.between(1800, 2000));
-        query.limit(2);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-    }
-
-    @Test
-    public void List_Sorted_By_Year_Limit_1() {
-        query.where(year.between(1800, 2000));
-        query.limit(1);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(1, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted_Offset_2() {
-        query.where(year.between(1800, 2000));
-        query.offset(2);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year_Offset_2() {
-        query.where(year.between(1800, 2000));
-        query.offset(2);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year_Restrict_Limit_2_Offset_1() {
-        query.where(year.between(1800, 2000));
-        query.restrict(new QueryModifiers(2l, 1l));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-        assertEquals("1954", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1864", documents.get(0).get("year"));
-        assertEquals("1954", documents.get(1).get("year"));
-        assertEquals("1990", documents.get(2).get("year"));
-        assertEquals("1990", documents.get(3).get("year"));
-    }
-    
-
-    @Test
-    public void List_Sort() {
-        Sort sort = LuceneSerializer.DEFAULT.toSort(Collections.singletonList(year.asc()));
-        
-        query.where(year.between(1800, 2000));
-        //query.orderBy(year.asc());
-        query.sort(sort);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1864", documents.get(0).get("year"));
-        assertEquals("1954", documents.get(1).get("year"));
-        assertEquals("1990", documents.get(2).get("year"));
-        assertEquals("1990", documents.get(3).get("year"));
-    }
-
-    @Test
-    public void List_Distinct_Property() {
-        assertEquals(4, query.list().size());
-        assertEquals(3, query.distinct(year).list().size());
-    }
-
-    @Test
-    public void List_With_Filter() {
-        Filter filter = new DuplicateFilter("year");
-        assertEquals(4, query.list().size());
-        assertEquals(3, query.filter(filter).list().size());
-    }
-
-    @Test
-    public void Count_Distinct_Property() {
-        assertEquals(4l, query.count());
-        assertEquals(3l, query.distinct(year).count());
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("1954", documents.get(2).get("year"));
-        assertEquals("1864", documents.get(3).get("year"));
-    }
-    
-
-    @Test
-    public void List_Sorted_Descending_By_Gross() {
-        query.where(gross.between(0.0, 1000.00));
-        query.orderBy(gross.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("90.0", documents.get(0).get("gross"));
-        assertEquals("89.0", documents.get(1).get("gross"));
-        assertEquals("30.5", documents.get(2).get("gross"));
-        assertEquals("10.0", documents.get(3).get("gross"));
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year_And_Ascending_By_Title() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        query.orderBy(title.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("Introduction to Algorithms", documents.get(0)
-                .get("title"));
-        assertEquals("Jurassic Park", documents.get(1).get("title"));
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year_And_Descending_By_Title() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        query.orderBy(title.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("Jurassic Park", documents.get(0).get("title"));
-        assertEquals("Introduction to Algorithms", documents.get(1)
-                .get("title"));
-    }
-
-    @Ignore
-    @Test(expected = QueryException.class)
-    public void List_Index_Problem_In_Max_Doc() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andThrow(new IOException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.list();
-        verify(searcher);
-    }
-
-    @Ignore
-    @Test(expected = QueryException.class)
-    public void List_Sorted_Index_Problem_In_Max_Doc() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andThrow(new IOException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.orderBy(title.asc());
-        query.list();
-        verify(searcher);
-    }
-
-    @Test
-    public void Offset() {
-        assertTrue(query.where(title.eq("Jurassic Park")).offset(30).list()
-                .isEmpty());
-    }
-
-
-    @Test
-    public void Load_List() {
-        Document document = query.where(title.ne("")).load(title).list().get(0);
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_List_FieldSelector() {
-        Document document = query.where(title.ne("")).load(new MapFieldSelector("title")).list().get(0);
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_SingleResult() {
-        Document document = query.where(title.ne("")).load(title).singleResult();
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_SingleResult_FieldSelector() {
-        Document document = query.where(title.ne("")).load(new MapFieldSelector("title")).singleResult();
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void SingleResult() {
-        assertNotNull(query.where(title.ne("")).singleResult());
-    }
-
-    @Test
-    public void Single_Result_Takes_Limit() {
-        assertEquals("Jurassic Park", query
-                                        .where(title.ne(""))
-                                        .limit(1)
-                                        .singleResult().get("title"));
-    }
-
-    @Test
-    public void Single_Result_Considers_Limit_And_Actual_Result_Size() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.limit(3).singleResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void Single_Result_Returns_Null_If_Nothing_Is_In_Range() {
-        query.where(title.startsWith("Nummi"));
-        assertNull(query.offset(10).singleResult());
-    }
-
-    @Test
-    public void Single_Result_Considers_Offset() {
-        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).singleResult().get("title"));
-    }
-
-    @Test
-    public void Single_Result_Considers_Limit_And_Offset() {
-        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).singleResult().get("title"));
-    }
-
-    @Test(expected=NonUniqueResultException.class)
-    public void UniqueResult_Contract() {
-        query.where(title.ne("")).uniqueResult();
-    }
-
-    @Test
-    public void Unique_Result_Takes_Limit() {
-        assertEquals("Jurassic Park", query
-                                        .where(title.ne(""))
-                                        .limit(1)
-                                        .uniqueResult().get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Considers_Limit_And_Actual_Result_Size() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.limit(3).uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Returns_Null_If_Nothing_Is_In_Range() {
-        query.where(title.startsWith("Nummi"));
-        assertNull(query.offset(10).uniqueResult());
-    }
-
-    @Test
-    public void Unique_Result_Considers_Offset() {
-        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).uniqueResult().get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Considers_Limit_And_Offset() {
-        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).uniqueResult().get("title"));
-    }
-
-    @Test
-    public void UniqueResult() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void UniqueResult_With_Param() {
-        final Param<String> param = new Param<String>(String.class, "title");
-        query.set(param, "Nummi");
-        query.where(title.startsWith(param));
-        final Document document = query.uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test(expected = ParamNotSetException.class)
-    public void UniqueResult_Param_Not_Set() {
-        final Param<String> param = new Param<String>(String.class, "title");
-        query.where(title.startsWith(param));
-        query.uniqueResult();
-    }
-
-    @Test(expected = QueryException.class)
-    public void UniqueResult_Finds_More_Than_One_Result() {
-        query.where(year.eq(1990));
-        query.uniqueResult();
-    }
-
-    @Test
-    public void UniqueResult_Finds_No_Results() {
-        query.where(year.eq(2200));
-        assertNull(query.uniqueResult());
-    }
-
-    @Test
-    public void UniqueResult_Finds_No_Results_Because_No_Documents_In_Index()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andReturn(0);
-        replay(searcher);
-        assertNull(query.where(year.eq(3000)).uniqueResult());
-        verify(searcher);
-    }
-
-    @Test(expected = QueryException.class)
-    public void UniqueResult_Sorted_Index_Problem_In_Max_Doc()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andThrow(new IllegalArgumentException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.uniqueResult();
-        verify(searcher);
-    }
-
-    @Test
-    public void Count_Returns_0_Because_No_Documents_In_Index()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.maxDoc()).andReturn(0);
-        replay(searcher);
-        assertEquals(0, query.where(year.eq(3000)).count());
-        verify(searcher);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void ListDistinct() {
-        query.where(year.between(1900, 2000).or(title.startsWith("Jura")));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.distinct().list();
-        assertFalse(documents.isEmpty());
-        assertEquals(3, documents.size());
-    }
-
-    @Test
-    public void ListResults() {
-        query.where(year.between(1800, 2000));
-        query.restrict(new QueryModifiers(2l, 1l));
-        query.orderBy(year.asc());
-        final SearchResults<Document> results = query.listResults();
-        assertFalse(results.isEmpty());
-        assertEquals("1954", results.getResults().get(0).get("year"));
-        assertEquals("1990", results.getResults().get(1).get("year"));
-        assertEquals(2, results.getLimit());
-        assertEquals(1, results.getOffset());
-        assertEquals(4, results.getTotal());
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void ListDistinctResults() {
-        query.where(year.between(1800, 2000).or(
-                title.eq("The Lord of the Rings")));
-        query.restrict(new QueryModifiers(1l, 1l));
-        query.orderBy(year.asc());
-        final SearchResults<Document> results = query.distinct().listResults();
-        assertFalse(results.isEmpty());
-        assertEquals("1954", results.getResults().get(0).get("year"));
-        assertEquals(1, results.getLimit());
-        assertEquals(1, results.getOffset());
-        assertEquals(4, results.getTotal());
-    }
-
-    @Test
-    public void List_All() {
-        final List<Document> results = query.where(title.like("*")).orderBy(
-                title.asc(), year.desc()).list();
-        assertEquals(4, results.size());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Limit_Negative() {
-        query.where(year.between(1800, 2000));
-        query.limit(-1);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Limit_Negative() {
-        query.where(year.between(1800, 2000));
-        query.limit(-1);
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Limit_0() {
-        query.where(year.between(1800, 2000));
-        query.limit(0);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Limit_0() {
-        query.where(year.between(1800, 2000));
-        query.limit(0);
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Offset_Negative() {
-        query.where(year.between(1800, 2000));
-        query.offset(-1);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Offset_Negative() {
-        query.where(year.between(1800, 2000));
-        query.offset(-1);
-        query.list();
-    }
-
-    @Test
-    public void List_Sorted_Ascending_Offset_0() {
-        query.where(year.between(1800, 2000));
-        query.offset(0);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted_Offset_0() {
-        query.where(year.between(1800, 2000));
-        query.offset(0);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void Iterate() {
-        query.where(year.between(1800, 2000));
-        final Iterator<Document> iterator = query.iterate();
-        int count = 0;
-        while (iterator.hasNext()) {
-            iterator.next();
-            ++count;
-        }
-        assertEquals(4, count);
-    }
-
-    @Test
-    public void All_By_Excluding_Where() {
-        assertEquals(4, query.list().size());
-    }
-
-    @Test
-    public void Empty_Index_Should_Return_Empty_List() throws Exception {
-        idx = new RAMDirectory();
-        
-        writer = createWriter(idx);
-        writer.close();
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        assertTrue(query.list().isEmpty());
-    }
-
-    @Test(expected = QueryException.class)
-    public void List_Results_Throws_An_Illegal_Argument_Exception_When_Sum_Of_Limit_And_Offset_Is_Negative() {
-        query.limit(1).offset(Integer.MAX_VALUE).listResults();
-    }
-    
-    @Test
-    public void Limit_Max_Value() {
-        assertEquals(4, query.limit(Long.MAX_VALUE).list().size());
-    }
-}
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/PhraseElementTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/lucene/PhraseElementTest.java
deleted file mode 100644
index 2cad5c07f8..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/PhraseElementTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.path.StringPath;
-
-public class PhraseElementTest {
-
-    @Test
-    public void test() {
-        StringPath title = new StringPath("title");
-        LuceneSerializer serializer = new LuceneSerializer(false,false);
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        assertEquals("title:Hello World", serializer.toQuery(title.eq("Hello World"), metadata).toString());
-        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq(new PhraseElement("Hello World")), metadata).toString());
-    }
-
-    @Test
-    public void Equals() {
-        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x"), el3 = new PhraseElement("y");
-        assertEquals(el1, el2);
-        assertFalse(el1.equals(el3));
-    }
-
-    @Test
-    public void HashCode() {
-        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x");
-        assertEquals(el1.hashCode(), el2.hashCode());
-    }
-
-}
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QDocument.java b/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QDocument.java
deleted file mode 100644
index f8583ca853..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QDocument.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QDocument extends EntityPathBase<Document> {
-
-    private static final long serialVersionUID = -4872833626508344081L;
-
-    public QDocument(final String var) {
-        super(Document.class, PathMetadataFactory.forVariable(var));
-    }
-
-    public final NumberPath<Integer> year = createNumber("year", Integer.class);
-    
-    public final StringPath title = createString("title");
-    
-    public final NumberPath<Double> gross = createNumber("gross", Double.class);
-    
-}
\ No newline at end of file
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QueryElementTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QueryElementTest.java
deleted file mode 100644
index c28949bd0f..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/QueryElementTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.TermQuery;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class QueryElementTest {
-
-    @Test
-    @Ignore
-    public void test() {
-        QueryElement element = new QueryElement(new TermQuery(new Term("str","text")));
-        assertEquals("str:text",element.toString());
-        //assertEquals(element.getQuery().hashCode(), element.hashCode());
-
-        QueryElement element2 = new QueryElement(new TermQuery(new Term("str","text")));
-        assertEquals(element2, element);
-    }
-}
diff --git a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/TermElementTest.java b/querydsl-lucene3/src/test/java/com/mysema/query/lucene/TermElementTest.java
deleted file mode 100644
index 2020cfad62..0000000000
--- a/querydsl-lucene3/src/test/java/com/mysema/query/lucene/TermElementTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.path.StringPath;
-
-public class TermElementTest {
-
-    @Test
-    public void test() {
-        StringPath title = new StringPath("title");
-        LuceneSerializer serializer = new LuceneSerializer(false,true);
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq("Hello World"), metadata).toString());
-        assertEquals("title:Hello World", serializer.toQuery(title.eq(new TermElement("Hello World")), metadata).toString());
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-    TermElement el1 = new TermElement("x"), el2 = new TermElement("x"), el3 = new TermElement("y");
-        assertEquals(el1, el2);
-        assertFalse(el1.equals(el3));
-        assertEquals(el1.hashCode(), el2.hashCode());
-    }
-
-}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneQueryTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneQueryTest.java
new file mode 100644
index 0000000000..b5c356342d
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneQueryTest.java
@@ -0,0 +1,757 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.MapFieldSelector;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.DuplicateFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.types.dsl.StringPath;
+
+/**
+ * Tests for LuceneQuery
+ *
+ * @author vema
+ *
+ */
+public class LuceneQueryTest {
+
+    private LuceneQuery query;
+    private StringPath title;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+
+    private final StringPath sort = Expressions.stringPath("sort");
+
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+
+    private Document createDocument(final String docTitle,
+            final String docAuthor, final String docText, final int docYear,
+            final double docGross) {
+        final Document doc = new Document();
+
+        doc.add(new Field("title", docTitle, Store.YES, Index.ANALYZED));
+        doc.add(new Field("author", docAuthor, Store.YES, Index.ANALYZED));
+        doc.add(new Field("text", docText, Store.YES, Index.ANALYZED));
+        doc.add(new NumericField("year", Store.YES, true).setIntValue(docYear));
+        doc.add(new NumericField("gross", Store.YES, true)
+                .setDoubleValue(docGross));
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        final QDocument entityPath = new QDocument("doc");
+        title = entityPath.title;
+        year = entityPath.year;
+        gross = entityPath.gross;
+
+
+        idx = new RAMDirectory();
+        writer = createWriter(idx);
+
+        writer.addDocument(createDocument("Jurassic Park", "Michael Crichton",
+                "It's a UNIX system! I know this!", 1990, 90.00));
+        writer.addDocument(createDocument("Nummisuutarit", "Aleksis Kivi",
+                "ESKO. Ja iloitset ja riemuitset?", 1864, 10.00));
+        writer
+                .addDocument(createDocument(
+                        "The Lord of the Rings",
+                        "John R. R. Tolkien",
+                        "One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them",
+                        1954, 89.00));
+        writer
+                .addDocument(createDocument(
+                        "Introduction to Algorithms",
+                        "Thomas H. Cormen, Charles E. Leiserson, Ronald L. Rivest, and Clifford Stein",
+                        "Bubble sort", 1990, 30.50));
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+    }
+
+    private IndexWriter createWriter(RAMDirectory idx) throws Exception {
+        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31,
+                new StandardAnalyzer(Version.LUCENE_30))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        return new IndexWriter(idx, config);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.close();
+    }
+
+    @Test
+    public void between() {
+        assertEquals(3, query.where(year.between(1950, 1990)).fetchCount());
+    }
+
+    @Test
+    public void count_empty_where_clause() {
+        assertEquals(4, query.fetchCount());
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(query.where(title.eq("Jurassic Park")).fetchCount() > 0);
+        assertFalse(query.where(title.eq("Jurassic Park X")).fetchCount() > 0);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(query.where(title.eq("Jurassic Park")).fetchCount() == 0);
+        assertTrue(query.where(title.eq("Jurassic Park X")).fetchCount() == 0);
+    }
+
+    @Test
+    public void count() {
+        query.where(title.eq("Jurassic Park"));
+        assertEquals(1, query.fetchCount());
+    }
+
+    @Test(expected = QueryException.class)
+    public void count_index_problem() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andThrow(new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchCount();
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void countDistinct() {
+        query.where(year.between(1900, 3000));
+        assertEquals(3, query.distinct().fetchCount());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(2, query.where(title.in("Jurassic Park", "Nummisuutarit")).fetchCount());
+    }
+
+    @Test
+    public void in2() {
+        assertEquals(3, query.where(year.in(1990, 1864)).fetchCount());
+    }
+
+    @Test
+    public void in_toString() {
+        assertEquals("year:`____F year:`____H", query.where(year.in(1990, 1864)).toString());
+    }
+
+    @Test
+    public void list_sorted_by_year_ascending() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted() {
+        query.where(year.between(1800, 2000));
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void sorted_by_different_locales() throws Exception {
+        Document d1 = new Document();
+        Document d2 = new Document();
+        Document d3 = new Document();
+        d1.add(new Field("sort", "a\u00c4",Store.YES, Index.NOT_ANALYZED));
+        d2.add(new Field("sort", "ab",Store.YES, Index.NOT_ANALYZED));
+        d3.add(new Field("sort", "aa",Store.YES, Index.NOT_ANALYZED));
+        writer = createWriter(idx);
+        writer.addDocument(d1);
+        writer.addDocument(d2);
+        writer.addDocument(d3);
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true, Locale.ENGLISH), searcher);
+        assertEquals(3, query.fetch().size());
+        List<Document> results = query.where(sort.startsWith("a")).orderBy(sort.asc()).fetch();
+        assertEquals(3, results.size());
+        assertEquals("aa", results.get(0).getFieldable("sort").stringValue());
+        assertEquals("a\u00c4", results.get(1).getFieldable("sort").stringValue());
+        assertEquals("ab", results.get(2).getFieldable("sort").stringValue());
+
+        query = new LuceneQuery(new LuceneSerializer(true, true, new Locale("fi", "FI")), searcher);
+        results = query.where(sort.startsWith("a")).orderBy(sort.asc()).fetch();
+        assertEquals("aa", results.get(0).getFieldable("sort").stringValue());
+        assertEquals("ab", results.get(1).getFieldable("sort").stringValue());
+        assertEquals("a\u00c4", results.get(2).getFieldable("sort").stringValue());
+
+
+    }
+
+    @Test
+    public void list_not_sorted_limit_2() {
+        query.where(year.between(1800, 2000));
+        query.limit(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_by_year_limit_1() {
+        query.where(year.between(1800, 2000));
+        query.limit(1);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(1, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_restrict_limit_2_offset_1() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1954", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+
+    @Test
+    public void list_sort() {
+        Sort sort = LuceneSerializer.DEFAULT.toSort(Collections.singletonList(year.asc()));
+
+        query.where(year.between(1800, 2000));
+        //query.orderBy(year.asc());
+        query.sort(sort);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+    @Test
+    public void list_distinct_property() {
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.distinct(year).fetch().size());
+    }
+
+    @Test
+    public void list_with_filter() {
+        Filter filter = new DuplicateFilter("year");
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.filter(filter).fetch().size());
+    }
+
+    @Test
+    public void count_distinct_property() {
+        assertEquals(4L, query.fetchCount());
+        assertEquals(3L, query.distinct(year).fetchCount());
+    }
+
+    @Test
+    public void list_sorted_descending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("1954", documents.get(2).get("year"));
+        assertEquals("1864", documents.get(3).get("year"));
+    }
+
+
+    @Test
+    public void list_sorted_descending_by_gross() {
+        query.where(gross.between(0.0, 1000.00));
+        query.orderBy(gross.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("90.0", documents.get(0).get("gross"));
+        assertEquals("89.0", documents.get(1).get("gross"));
+        assertEquals("30.5", documents.get(2).get("gross"));
+        assertEquals("10.0", documents.get(3).get("gross"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_ascending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Introduction to Algorithms", documents.get(0)
+                .get("title"));
+        assertEquals("Jurassic Park", documents.get(1).get("title"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_descending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Jurassic Park", documents.get(0).get("title"));
+        assertEquals("Introduction to Algorithms", documents.get(1)
+                .get("title"));
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_sorted_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.orderBy(title.asc());
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Test
+    public void offset() {
+        assertTrue(query.where(title.eq("Jurassic Park")).offset(30).fetch()
+                .isEmpty());
+    }
+
+
+    @Test
+    public void load_list() {
+        Document document = query.where(title.ne("")).load(title).fetch().get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_list_fieldSelector() {
+        Document document = query.where(title.ne("")).load(new MapFieldSelector("title")).fetch().get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult() {
+        Document document = query.where(title.ne("")).load(title).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult_fieldSelector() {
+        Document document = query.where(title.ne("")).load(new MapFieldSelector("title")).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void singleResult() {
+        assertNotNull(query.where(title.ne("")).fetchFirst());
+    }
+
+    @Test
+    public void single_result_takes_limit() {
+        assertEquals("Jurassic Park", query
+                                        .where(title.ne(""))
+                                        .limit(1)
+                                        .fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchFirst();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void single_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchFirst());
+    }
+
+    @Test
+    public void single_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).fetchFirst().get("title"));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResult_contract() {
+        query.where(title.ne("")).fetchOne();
+    }
+
+    @Test
+    public void unique_result_takes_limit() {
+        assertEquals("Jurassic Park", query
+                                        .where(title.ne(""))
+                                        .limit(1)
+                                        .fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void unique_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchOne());
+    }
+
+    @Test
+    public void unique_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).fetchOne().get("title"));
+    }
+
+    @Test
+    public void uniqueResult() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void uniqueResult_with_param() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.set(param, "Nummi");
+        query.where(title.startsWith(param));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void uniqueResult_param_not_set() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.where(title.startsWith(param));
+        query.fetchOne();
+    }
+
+    @Test(expected = QueryException.class)
+    public void uniqueResult_finds_more_than_one_result() {
+        query.where(year.eq(1990));
+        query.fetchOne();
+    }
+
+    @Test
+    public void uniqueResult_finds_no_results() {
+        query.where(year.eq(2200));
+        assertNull(query.fetchOne());
+    }
+
+    @Test
+    public void uniqueResult_finds_no_results_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andReturn(0);
+        replay(searcher);
+        assertNull(query.where(year.eq(3000)).fetchOne());
+        verify(searcher);
+    }
+
+    @Test(expected = QueryException.class)
+    public void uniqueResult_sorted_index_problem_in_max_doc()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andThrow(new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchOne();
+        verify(searcher);
+    }
+
+    @Test
+    public void count_returns_0_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.maxDoc()).andReturn(0);
+        replay(searcher);
+        assertEquals(0, query.where(year.eq(3000)).fetchCount());
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinct() {
+        query.where(year.between(1900, 2000).or(title.startsWith("Jura")));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.distinct().fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(3, documents.size());
+    }
+
+    @Test
+    public void listResults() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals("1990", results.getResults().get(1).get("year"));
+        assertEquals(2, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinctResults() {
+        query.where(year.between(1800, 2000).or(
+                title.eq("The Lord of the Rings")));
+        query.restrict(new QueryModifiers(1L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.distinct().fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals(1, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test
+    public void list_all() {
+        final List<Document> results = query.where(title.like("*")).orderBy(
+                title.asc(), year.desc()).fetch();
+        assertEquals(4, results.size());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.fetch();
+    }
+
+    @Test
+    public void list_sorted_ascending_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void iterate() {
+        query.where(year.between(1800, 2000));
+        final Iterator<Document> iterator = query.iterate();
+        int count = 0;
+        while (iterator.hasNext()) {
+            iterator.next();
+            ++count;
+        }
+        assertEquals(4, count);
+    }
+
+    @Test
+    public void all_by_excluding_where() {
+        assertEquals(4, query.fetch().size());
+    }
+
+    @Test
+    public void empty_index_should_return_empty_list() throws Exception {
+        idx = new RAMDirectory();
+
+        writer = createWriter(idx);
+        writer.close();
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        assertTrue(query.fetch().isEmpty());
+    }
+
+    @Test(expected = QueryException.class)
+    public void list_results_throws_an_illegal_argument_exception_when_sum_of_limit_and_offset_is_negative() {
+        query.limit(1).offset(Integer.MAX_VALUE).fetchResults();
+    }
+
+    @Test
+    public void limit_max_value() {
+        assertEquals(4, query.limit(Long.MAX_VALUE).fetch().size());
+    }
+}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerNotTokenizedTest.java
new file mode 100644
index 0000000000..cc7f94bb12
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerNotTokenizedTest.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static com.querydsl.lucene3.QPerson.person;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+import org.joda.time.LocalDate;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class LuceneSerializerNotTokenizedTest {
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+    private LuceneSerializer serializer;
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private final Person clooney = new Person("actor_1", "George Clooney", new LocalDate(1961, 4, 6));
+    private final Person pitt = new Person("actor_2", "Brad Pitt", new LocalDate(1963, 12, 18));
+
+    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    private Document createDocument(Person person) {
+        Document doc = new Document();
+        doc.add(new Field("id", person.getId(), Store.YES, Index.NOT_ANALYZED));
+        doc.add(new Field("name", person.getName(), Store.YES, Index.NOT_ANALYZED));
+        doc.add(new Field("birthDate", person.getBirthDate().toString(), Store.YES, Index.NOT_ANALYZED));
+        return doc;
+    }
+
+    @Before
+    public void before() throws Exception {
+        serializer = new LuceneSerializer(false, false);
+        idx = new RAMDirectory();
+        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31,
+                new StandardAnalyzer(Version.LUCENE_30))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument(clooney));
+        writer.addDocument(createDocument(pitt));
+
+        Document document = new Document();
+        for (String movie : Arrays.asList("Interview with the Vampire",
+                                          "Up in the Air")) {
+            document.add(new Field("movie", movie, Store.YES, Index.NOT_ANALYZED));
+        }
+        writer.addDocument(document);
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @Test
+    public void equals_by_id_matches() throws Exception {
+        testQuery(person.id.eq("actor_1"), "id:actor_1", 1);
+    }
+
+    @Test
+    public void equals_by_id_does_not_match() throws Exception {
+        testQuery(person.id.eq("actor_8"), "id:actor_8", 0);
+    }
+
+    @Test
+    public void equals_by_name_matches() throws Exception {
+        testQuery(person.name.eq("George Clooney"), "name:George Clooney", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_by_name_ignoring_case_does_not_match() throws Exception {
+        testQuery(person.name.equalsIgnoreCase("george clooney"), "name:george clooney", 0);
+    }
+
+    @Test
+    public void equals_by_name_does_not_match() throws Exception {
+        testQuery(person.name.eq("George Looney"), "name:George Looney", 0);
+    }
+
+    @Test
+    public void starts_with_name_should_match() throws Exception {
+        testQuery(person.name.startsWith("George C"), "name:George C*", 1);
+    }
+
+    @Test
+    public void starts_with_name_should_not_match() throws Exception {
+        testQuery(person.name.startsWith("George L"), "name:George L*", 0);
+    }
+
+    @Test
+    public void ends_with_name_should_match() throws Exception {
+        testQuery(person.name.endsWith("e Clooney"), "name:*e Clooney", 1);
+    }
+
+    @Test
+    public void ends_with_name_should_not_match() throws Exception {
+        testQuery(person.name.endsWith("e Looney"), "name:*e Looney", 0);
+    }
+
+    @Test
+    public void contains_name_should_match() throws Exception {
+        testQuery(person.name.contains("oney"), "name:*oney*", 1);
+    }
+
+    @Test
+    public void contains_name_should_not_match() throws Exception {
+        testQuery(person.name.contains("bloney"), "name:*bloney*", 0);
+    }
+
+    @Test
+    public void in_names_should_match_2() throws Exception {
+        testQuery(person.name.in("Brad Pitt", "George Clooney"), "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void or_by_name_should_match_2() throws Exception {
+        testQuery(person.name.eq("Brad Pitt")
+              .or(person.name.eq("George Clooney")), "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void equals_by_birth_date() throws Exception {
+        testQuery(person.birthDate.eq(clooney.getBirthDate()), "birthDate:1961-04-06", 1);
+    }
+
+    @Test
+    public void between_phrase() throws Exception {
+        testQuery(person.name.between("Brad Pitt","George Clooney"), "name:[Brad Pitt TO George Clooney]", 2);
+    }
+
+    @Test
+    public void not_equals_finds_the_actors_and_movies() throws Exception {
+        testQuery(person.name.ne("Michael Douglas"), "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void not_equals_finds_only_clooney_and_movies() throws Exception {
+        testQuery(person.name.ne("Brad Pitt"), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void and_with_two_not_equals_doesnt_find_the_actors() throws Exception {
+        testQuery(person.name.ne("Brad Pitt")
+             .and(person.name.ne("George Clooney")), "+(-name:Brad Pitt +*:*) +(-name:George Clooney +*:*)", 1);
+    }
+
+    @Test
+    public void or_with_two_not_equals_finds_movies_and_actors() throws Exception {
+        testQuery(person.name.ne("Brad Pitt")
+              .or(person.name.ne("George Clooney")), "(-name:Brad Pitt +*:*) (-name:George Clooney +*:*)", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_movies_and_actors() throws Exception {
+        testQuery(person.name.eq("Michael Douglas").not(), "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_pitt_and_movies() throws Exception {
+        testQuery(person.name.eq("Brad Pitt").not(), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void multiple_field_search_from_movies() throws Exception {
+        StringPath movie = Expressions.stringPath("movie");
+        testQuery(movie.in("Interview with the Vampire"), "movie:Interview with the Vampire", 1);
+        testQuery(movie.eq("Up in the Air"), "movie:Up in the Air", 1);
+    }
+}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java
new file mode 100644
index 0000000000..0df20b4452
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/LuceneSerializerTest.java
@@ -0,0 +1,672 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.Version;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.*;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * Tests for LuceneSerializer
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializerTest {
+    private LuceneSerializer serializer;
+    private PathBuilder<Object> entityPath;
+    private StringPath title;
+    private StringPath author;
+    private StringPath text;
+    private StringPath rating;
+    private StringPath publisher;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+    private CollectionPath<String, StringPath> titles;
+
+    private NumberPath<Long> longField;
+    private NumberPath<Short> shortField;
+    private NumberPath<Byte> byteField;
+    private NumberPath<Float> floatField;
+
+    private static final String YEAR_PREFIX_CODED = NumericUtils.intToPrefixCoded(1990);
+    private static final String GROSS_PREFIX_CODED = NumericUtils.doubleToPrefixCoded(900.00);
+    private static final String LONG_PREFIX_CODED = NumericUtils.longToPrefixCoded(1);
+    private static final String SHORT_PREFIX_CODED = NumericUtils.intToPrefixCoded(1);
+    private static final String BYTE_PREFIX_CODED = NumericUtils.intToPrefixCoded(1);
+    private static final String FLOAT_PREFIX_CODED = NumericUtils.floatToPrefixCoded((float) 1.0);
+
+    private IndexWriterConfig config;
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+
+    private static final Set<? extends Operator> UNSUPPORTED_OPERATORS = Collections.unmodifiableSet(EnumSet.of(Ops.STARTS_WITH_IC,
+            Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC));
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private Document createDocument() {
+        Document doc = new Document();
+
+        doc.add(new Field("title", new StringReader("Jurassic Park")));
+        doc.add(new Field("author", new StringReader("Michael Crichton")));
+        doc.add(new Field("text", new StringReader("It's a UNIX system! I know this!")));
+        doc.add(new Field("rating", new StringReader("Good")));
+        doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
+        doc.add(new NumericField("year", Store.YES, true).setIntValue(1990));
+        doc.add(new NumericField("gross", Store.YES, true).setDoubleValue(900.00));
+
+        doc.add(new NumericField("longField", Store.YES, true).setLongValue(1));
+        doc.add(new NumericField("shortField", Store.YES, true).setIntValue(1));
+        doc.add(new NumericField("byteField", Store.YES, true).setIntValue(1));
+        doc.add(new NumericField("floatField", Store.YES, true).setFloatValue(1));
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        serializer = new LuceneSerializer(true,true);
+        entityPath = new PathBuilder<Object>(Object.class, "obj");
+        title = entityPath.getString("title");
+        author = entityPath.getString("author");
+        text = entityPath.getString("text");
+        publisher = entityPath.getString("publisher");
+        year = entityPath.getNumber("year", Integer.class);
+        rating = entityPath.getString("rating");
+        gross = entityPath.getNumber("gross", Double.class);
+        titles = entityPath.getCollection("title", String.class, StringPath.class);
+
+        longField = entityPath.getNumber("longField", Long.class);
+        shortField = entityPath.getNumber("shortField", Short.class);
+        byteField = entityPath.getNumber("byteField", Byte.class);
+        floatField = entityPath.getNumber("floatField", Float.class);
+
+        idx = new RAMDirectory();
+        config = new IndexWriterConfig(Version.LUCENE_31,
+                new StandardAnalyzer(Version.LUCENE_30))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument());
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.close();
+    }
+
+    private void testQuery(Expression<?> expr, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+    }
+
+    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    @Test
+    public void queryElement() throws Exception {
+        Query query1 = serializer.toQuery(author.like("Michael"), metadata);
+        Query query2 = serializer.toQuery(text.like("Text"), metadata);
+
+        BooleanExpression query = Expressions.anyOf(
+                new QueryElement(query1),
+                new QueryElement(query2)
+        );
+        testQuery(query, "author:michael text:text", 1);
+    }
+
+    @Test
+    public void like() throws Exception {
+        testQuery(author.like("*ichael*"), "author:*ichael*", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_single_character() throws Exception {
+        testQuery(author.like("Mi?hael"), "author:mi?hael", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_multiple_character() throws Exception {
+        testQuery(text.like("*U*X*"), "text:*u*x*", 1);
+    }
+
+    @Test
+    public void like_phrase() throws Exception {
+        testQuery(title.like("*rassic Par*"), "+title:**rassic* +title:*par**", 1);
+    }
+
+    @Test
+    public void like_or_like() throws Exception {
+        testQuery(title.like("House").or(author.like("*ichae*")), "title:house author:*ichae*", 1);
+    }
+
+    @Test
+    public void like_and_like() throws Exception {
+        testQuery(title.like("*assic*").and(rating.like("G?od")), "+title:*assic* +rating:g?od", 1);
+    }
+
+    @Test
+    public void eq() throws Exception {
+        testQuery(rating.eq("good"), "rating:good", 1);
+    }
+
+    @Test
+    public void eq_with_deep_path() throws Exception {
+        StringPath deepPath = entityPath.get("property1", Object.class).getString("property2");
+        testQuery(deepPath.eq("good"), "property1.property2:good", 0);
+    }
+
+    @Test
+    public void fuzzyLike() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good"), "rating:Good~0.5", 1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 0.6f), "rating:Good~0.6", 1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity_and_prefix() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 0.6f, 0), "rating:Good~0.6", 1);
+    }
+
+    @Test
+    public void eq_numeric_integer() throws Exception {
+        testQuery(year.eq(1990), "year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void eq_numeric_double() throws Exception {
+        testQuery(gross.eq(900.00), "gross:" + GROSS_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void eq_numeric() throws Exception {
+        testQuery(longField.eq(1L), "longField:" + LONG_PREFIX_CODED, 1);
+        testQuery(shortField.eq((short) 1), "shortField:" + SHORT_PREFIX_CODED, 1);
+        testQuery(byteField.eq((byte) 1), "byteField:" + BYTE_PREFIX_CODED, 1);
+        testQuery(floatField.eq((float) 1.0), "floatField:" + FLOAT_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void equals_ignores_case() throws Exception {
+        testQuery(title.eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_or_year_equals() throws Exception {
+        testQuery(title.equalsIgnoreCase("House").or(year.eq(1990)), "title:house year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void eq_and_eq() throws Exception {
+        testQuery(title.eq("Jurassic Park").and(year.eq(1990)), "+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void eq_and_eq_and_eq() throws Exception {
+        testQuery(title.eq("Jurassic Park").and(year.eq(1990)).and(author.eq("Michael Crichton")), "+(+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED + ") +author:\"michael crichton\"", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_ignore_case_and_or() throws Exception {
+        testQuery(title.equalsIgnoreCase("Jurassic Park").and(rating.equalsIgnoreCase("Bad")).or(author.equalsIgnoreCase("Michael Crichton")), "(+title:\"jurassic park\" +rating:bad) author:\"michael crichton\"", 1);
+    }
+
+    @Test
+    public void eq_or_eq_and_eq_does_not_find_results() throws Exception {
+        testQuery(title.eq("jeeves").or(rating.eq("superb")).and(author.eq("michael crichton")), "+(title:jeeves rating:superb) +author:\"michael crichton\"", 0);
+    }
+
+    @Test
+    public void eq_phrase() throws Exception {
+        testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
+    }
+
+    @Test
+    @Ignore("Not easily done in Lucene!")
+    public void publisher_equals_empty_string() throws Exception {
+        testQuery(publisher.eq(""), "publisher:", 1);
+    }
+
+    @Test
+    public void eq_phrase_should_not_find_results_but_luceNe_semantics_differs_from_querydsls() throws Exception {
+        testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
+    }
+
+    @Test
+    public void eq_phrase_does_not_find_results_because_word_in_middle() throws Exception {
+        testQuery(title.eq("Jurassic Amusement Park"), "title:\"jurassic amusement park\"", 0);
+    }
+
+    @Test
+    public void like_not_does_not_find_results() throws Exception {
+        testQuery(title.like("*H*e*").not(), "-title:*h*e* +*:*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_negation_or_rating_equals_ignore_case() throws Exception {
+        testQuery(title.equalsIgnoreCase("House").not().or(rating.equalsIgnoreCase("Good")), "-title:house rating:good", 1);
+    }
+
+    @Test
+    public void eq_not_does_not_find_results() throws Exception {
+        testQuery(title.eq("Jurassic Park").not(), "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void title_equals_not_house() throws Exception {
+        testQuery(title.eq("house").not(), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void eq_and_eq_not_does_not_find_results_because_second_expression_finds_nothing() throws Exception {
+        testQuery(rating.eq("superb").and(title.eq("house").not()), "+rating:superb +(-title:house +*:*)", 0);
+    }
+
+    @Test
+    public void not_equals_finds_one() throws Exception {
+        testQuery(title.ne("house"), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void not_equals_finds_none() throws Exception {
+        testQuery(title.ne("Jurassic Park"), "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void nothing_found_with_not_equals_or_equals() throws Exception {
+        testQuery(title.ne("jurassic park").or(rating.eq("lousy")), "(-title:\"jurassic park\" +*:*) rating:lousy", 0);
+    }
+
+    @Test
+    public void ne_and_eq() throws Exception {
+        testQuery(title.ne("house").and(rating.eq("good")), "+(-title:house +*:*) +rating:good", 1);
+    }
+
+    @Test
+    public void startsWith() throws Exception {
+        testQuery(title.startsWith("Jurassi"), "title:jurassi*", 1);
+    }
+
+    @Test
+    public void startsWith_phrase() throws Exception {
+        testQuery(title.startsWith("jurassic par"), "+title:jurassic* +title:*par*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void starts_with_ignore_case_phrase_does_not_find_results() throws Exception {
+        testQuery(title.startsWithIgnoreCase("urassic Par"), "+title:urassic* +title:*par*", 0);
+    }
+
+    @Test
+    public void endsWith() throws Exception {
+        testQuery(title.endsWith("ark"), "title:*ark", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase() throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Park"), "+title:*sic* +title:*park", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase_does_not_find_results() throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Par"), "+title:*sic* +title:*par", 0);
+    }
+
+    @Test
+    public void contains() throws Exception {
+        testQuery(title.contains("rassi"), "title:*rassi*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void contains_ignore_case_phrase() throws Exception {
+        testQuery(title.containsIgnoreCase("rassi Pa"), "+title:*rassi* +title:*pa*", 1);
+    }
+
+    @Test
+    public void contains_user_inputted_wildcards_dont_work() throws Exception {
+        testQuery(title.contains("r*i"), "title:*r\\*i*", 0);
+    }
+
+    @Test
+    public void between() throws Exception {
+        testQuery(title.between("Indiana", "Kundun"), "title:[indiana TO kundun]", 1);
+    }
+
+    @Test
+    public void between_numeric_integer() throws Exception {
+        testQuery(year.between(1980, 2000), "year:[1980 TO 2000]", 1);
+    }
+
+    @Test
+    public void between_numeric_double() throws Exception {
+        testQuery(gross.between(10.00, 19030.00), "gross:[10.0 TO 19030.0]", 1);
+    }
+
+    @Test
+    public void between_numeric() throws Exception {
+        testQuery(longField.between(0L,2L), "longField:[0 TO 2]", 1);
+        testQuery(shortField.between((short) 0,(short) 2), "shortField:[0 TO 2]", 1);
+        testQuery(byteField.between((byte) 0,(byte) 2), "byteField:[0 TO 2]", 1);
+        testQuery(floatField.between((float) 0.0,(float) 2.0), "floatField:[0.0 TO 2.0]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_from_start() throws Exception {
+        testQuery(title.between("Jurassic", "Kundun"), "title:[jurassic TO kundun]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_to_end() throws Exception {
+        testQuery(title.between("Indiana", "Jurassic"), "title:[indiana TO jurassic]", 1);
+    }
+
+    @Test
+    public void between_does_not_find_results() throws Exception {
+        testQuery(title.between("Indiana", "Jurassib"), "title:[indiana TO jurassib]", 0);
+    }
+
+    @Test
+    public void in() throws Exception {
+        testQuery(title.in(Arrays.asList("jurassic", "park")), "title:jurassic title:park", 1);
+        testQuery(title.in("jurassic","park"), "title:jurassic title:park", 1);
+        testQuery(title.eq("jurassic").or(title.eq("park")), "title:jurassic title:park", 1);
+    }
+
+    @Test
+    public void lt() throws Exception {
+        testQuery(rating.lt("Superb"), "rating:{* TO superb}", 1);
+    }
+
+    @Test
+    public void lt_numeric_integer() throws Exception {
+        testQuery(year.lt(1991), "year:{* TO 1991}", 1);
+    }
+
+    @Test
+    public void lt_numeric_double() throws Exception {
+        testQuery(gross.lt(10000.0), "gross:{* TO 10000.0}", 1);
+    }
+
+    @Test
+    public void lt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.lt("Good"), "rating:{* TO good}", 0);
+    }
+
+    @Test
+    public void lt_numeric_integer_not_in_range_because_equal() throws Exception {
+        testQuery(year.lt(1990), "year:{* TO 1990}", 0);
+    }
+
+    @Test
+    public void lt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.lt(900.0), "gross:{* TO 900.0}", 0);
+    }
+
+    @Test
+    public void loe() throws Exception {
+        testQuery(rating.loe("Superb"), "rating:[* TO superb]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer() throws Exception {
+        testQuery(year.loe(1991), "year:[* TO 1991]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double() throws Exception {
+        testQuery(gross.loe(903.0), "gross:[* TO 903.0]", 1);
+    }
+
+    @Test
+    public void loe_equal() throws Exception {
+        testQuery(rating.loe("Good"), "rating:[* TO good]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer_equal() throws Exception {
+        testQuery(year.loe(1990), "year:[* TO 1990]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double_equal() throws Exception {
+        testQuery(gross.loe(900.0), "gross:[* TO 900.0]", 1);
+    }
+
+    @Test
+    public void loe_not_found() throws Exception {
+        testQuery(rating.loe("Bad"), "rating:[* TO bad]", 0);
+    }
+
+    @Test
+    public void loe_numeric_integer_not_found() throws Exception {
+        testQuery(year.loe(1989), "year:[* TO 1989]", 0);
+    }
+
+    @Test
+    public void loe_numeric_double_not_found() throws Exception {
+        testQuery(gross.loe(899.9), "gross:[* TO 899.9]", 0);
+    }
+
+    @Test
+    public void gt() throws Exception {
+        testQuery(rating.gt("Bad"), "rating:{bad TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_integer() throws Exception {
+        testQuery(year.gt(1989), "year:{1989 TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_double() throws Exception {
+        testQuery(gross.gt(100.00), "gross:{100.0 TO *}", 1);
+    }
+
+    @Test
+    public void gt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.gt("Good"), "rating:{good TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_integer_not_in_range_because_equal() throws Exception {
+        testQuery(year.gt(1990), "year:{1990 TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.gt(900.00), "gross:{900.0 TO *}", 0);
+    }
+
+    @Test
+    public void goe() throws Exception {
+        testQuery(rating.goe("Bad"), "rating:[bad TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer() throws Exception {
+        testQuery(year.goe(1989), "year:[1989 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double() throws Exception {
+        testQuery(gross.goe(320.50), "gross:[320.5 TO *]", 1);
+    }
+
+    @Test
+    public void goe_equal() throws Exception {
+        testQuery(rating.goe("Good"), "rating:[good TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer_equal() throws Exception {
+        testQuery(year.goe(1990), "year:[1990 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double_equal() throws Exception {
+        testQuery(gross.goe(900.00), "gross:[900.0 TO *]", 1);
+    }
+
+    @Test
+    public void goe_not_found() throws Exception {
+        testQuery(rating.goe("Hood"), "rating:[hood TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_integer_not_found() throws Exception {
+        testQuery(year.goe(1991), "year:[1991 TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_double_not_found() throws Exception {
+        testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
+    }
+
+    @Test
+    public void equals_empty_string() throws Exception {
+        testQuery(title.eq(""), "title:", 0);
+    }
+
+    @Test
+    public void not_equals_empty_string() throws Exception {
+        testQuery(title.ne(""), "-title: +*:*", 1);
+    }
+
+    @Test
+    public void contains_empty_string() throws Exception {
+        testQuery(title.contains(""), "title:**", 1);
+    }
+
+    @Test
+    public void like_empty_string() throws Exception {
+        testQuery(title.like(""), "title:", 0);
+    }
+
+    @Test
+    public void starts_with_empty_string() throws Exception {
+        testQuery(title.startsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void ends_with_empty_string() throws Exception {
+        testQuery(title.endsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void between_empty_strings() throws Exception {
+        testQuery(title.between("", ""), "title:[ TO ]", 0);
+    }
+
+    @Test
+    public void booleanBuilder() throws Exception {
+        testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]", 0);
+    }
+
+    @Test
+    @Ignore
+    public void fuzzy() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void proximity() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void boost() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    public void pathAny() throws Exception {
+        testQuery(titles.any().eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    private boolean unsupportedOperation(Predicate filter) {
+        return UNSUPPORTED_OPERATORS.contains(((Operation<?>) filter).getOperator());
+    }
+
+    @Test
+    public void various() throws Exception {
+        MatchingFiltersFactory filters = new MatchingFiltersFactory(QuerydslModule.LUCENE, Target.LUCENE);
+        for (Predicate filter : filters.string(title, StringConstant.create("jurassic park"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(author, StringConstant.create("michael crichton"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(title, StringConstant.create("1990"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 0);
+        }
+    }
+
+}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/Person.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/Person.java
new file mode 100644
index 0000000000..6623b4fd66
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/Person.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.joda.time.LocalDate;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Person {
+    private final String id;
+    private final String name;
+    private final LocalDate birthDate;
+
+    public Person(String id, String name, LocalDate birthDate) {
+        this.id = id;
+        this.name = name;
+        this.birthDate = birthDate;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
+
+
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/PhraseElementTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/PhraseElementTest.java
new file mode 100644
index 0000000000..2af30bf8db
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/PhraseElementTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class PhraseElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false,false);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:Hello World", serializer.toQuery(title.eq("Hello World"), metadata).toString());
+        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq(new PhraseElement("Hello World")), metadata).toString());
+    }
+
+    @Test
+    public void equals() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x"), el3 = new PhraseElement("y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+    }
+
+    @Test
+    public void hashCode_() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x");
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QDocument.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QDocument.java
new file mode 100644
index 0000000000..e4bea064a6
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QDocument.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import org.apache.lucene.document.Document;
+
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QDocument extends EntityPathBase<Document> {
+
+    private static final long serialVersionUID = -4872833626508344081L;
+
+    public QDocument(final String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public final NumberPath<Integer> year = createNumber("year", Integer.class);
+
+    public final StringPath title = createString("title");
+
+    public final NumberPath<Double> gross = createNumber("gross", Double.class);
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QueryElementTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QueryElementTest.java
new file mode 100644
index 0000000000..6e634c11f8
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/QueryElementTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class QueryElementTest {
+
+    @Test
+    @Ignore
+    public void test() {
+        QueryElement element = new QueryElement(new TermQuery(new Term("str","text")));
+        assertEquals("str:text",element.toString());
+        //assertEquals(element.getQuery().hashCode(), element.hashCode());
+
+        QueryElement element2 = new QueryElement(new TermQuery(new Term("str","text")));
+        assertEquals(element2, element);
+    }
+}
diff --git a/querydsl-lucene3/src/test/java/com/querydsl/lucene3/TermElementTest.java b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/TermElementTest.java
new file mode 100644
index 0000000000..fac308aa0c
--- /dev/null
+++ b/querydsl-lucene3/src/test/java/com/querydsl/lucene3/TermElementTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene3;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class TermElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false,true);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq("Hello World"), metadata).toString());
+        assertEquals("title:Hello World", serializer.toQuery(title.eq(new TermElement("Hello World")), metadata).toString());
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+    TermElement el1 = new TermElement("x"), el2 = new TermElement("x"), el3 = new TermElement("y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene3/src/test/resources/log4j.properties.example b/querydsl-lucene3/src/test/resources/log4j.properties.example
index 2f9467c280..0c3a1143dc 100644
--- a/querydsl-lucene3/src/test/resources/log4j.properties.example
+++ b/querydsl-lucene3/src/test/resources/log4j.properties.example
@@ -1,9 +1,9 @@
-# Configure an appender that logs to console
-log4j.rootLogger=info, A1
-log4j.threshold=debug
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
-
-# Configuration of logging levels for different packages
-log4j.logger.com.mysema.query.lucene=DEBUG
+# Configure an appender that logs to console
+log4j.rootLogger=info, A1
+log4j.threshold=debug
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
+
+# Configuration of logging levels for different packages
+log4j.logger.com.querydsl.lucene3=DEBUG
diff --git a/querydsl-lucene3/template.mf b/querydsl-lucene3/template.mf
deleted file mode 100644
index 1457c332a6..0000000000
--- a/querydsl-lucene3/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.lucene
-Bundle-Name: Querydsl Lucene
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  com.google.common.*;version="${guava.version}",
-  org.apache.lucene.*;version="[3.0.0,3.1.0)",
-  org.slf4j.*;version="${slf4j.version}"
\ No newline at end of file
diff --git a/querydsl-lucene4/README.md b/querydsl-lucene4/README.md
index 0250337fab..c49a988e8f 100644
--- a/querydsl-lucene4/README.md
+++ b/querydsl-lucene4/README.md
@@ -5,36 +5,32 @@ The Lucene module provides integration with the Lucene 4 indexing library.
 **Maven integration**
 
  Add the following dependencies to your Maven project :
-        
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-lucene4</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>   
-
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-lucene4</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 **Creating the query types**
 
 With fields year and title a manually created query type could look something like this:
- 
-    public class QDocument extends EntityPathBase<Document>{
-        private static final long serialVersionUID = -4872833626508344081L;
-            
-        public QDocument(String var) {
-            super(Document.class, PathMetadataFactory.forVariable(var));
-        }
-    
-        public final StringPath year = createString("year");
-            
-        public final StringPath title = createString("title");
+
+```JAVA 
+public class QDocument extends EntityPathBase<Document>{
+    private static final long serialVersionUID = -4872833626508344081L;
+        
+    public QDocument(String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
     }
 
+    public final StringPath year = createString("year");
+
+    public final StringPath title = createString("title");
+}
+```
+
 QDocument represents a Lucene document with the fields year and title.
 
 Code generation is not available for Lucene, since no schema data is available.
@@ -42,17 +38,20 @@ Code generation is not available for Lucene, since no schema data is available.
 **Querying**
 
 Querying with Querydsl Lucene is as simple as this:
- 
-    QDocument doc = new QDocument("doc");
-    
-    IndexSearcher searcher = new IndexSearher(index);
-    LuceneQuery query = new LuceneQuery(true, searcher); 
-    List<Document> documents = query
-        .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
-        .list();
+
+```JAVA
+QDocument doc = new QDocument("doc");
+
+IndexSearcher searcher = new IndexSearcher(index);
+LuceneQuery query = new LuceneQuery(true, searcher); 
+List<Document> documents = query
+    .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+    .fetch();
+```
 
 which is transformed into the following Lucene query :
-     
-    +year:[1800 TO 2000] +title:huckle*
+```
++year:[1800 TO 2000] +title:huckle*
+```
 
-For more information on the Querydsl Lucene module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s04.html    
\ No newline at end of file
+For more information on the Querydsl Lucene module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s05.html
diff --git a/querydsl-lucene4/pom.xml b/querydsl-lucene4/pom.xml
index 06f61e4f6a..b393cb52d9 100644
--- a/querydsl-lucene4/pom.xml
+++ b/querydsl-lucene4/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-lucene4</artifactId>
   <name>Querydsl - Lucene 4 support</name>
   <description>Lucene support for Querydsl</description>
@@ -24,9 +24,18 @@
 
   <properties>
     <lucene.version>4.2.1</lucene.version>
+    <osgi.import.package>
+      org.apache.lucene.*;version="[4,5)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
   </properties>
   
-  <dependencies>   
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
@@ -52,23 +61,14 @@
       <scope>provided</scope>
     </dependency>            
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    
     <!-- test -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -78,12 +78,12 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>${jodatime.version}</version>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
      <artifactId>querydsl-apt</artifactId>
      <version>${project.version}</version>
     </dependency>
@@ -92,8 +92,20 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.lucene4</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>   
     
       <plugin>
@@ -107,7 +119,7 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
               <showWarnings>true</showWarnings>
             </configuration>
           </execution>
@@ -115,4 +127,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java
deleted file mode 100644
index f06e872572..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/AbstractLuceneQuery.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.queries.ChainedFilter;
-import org.apache.lucene.sandbox.queries.DuplicateFilter;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryWrapperFilter;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Sort;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.EmptyCloseableIterator;
-import com.mysema.commons.lang.IteratorAdapter;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleProjectable;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * AbstractLuceneQuery is an abstract super class for Lucene query implementations
- *
- * @author tiwe
- *
- * @param <T> projection type
- * @param <Q> concrete subtype of query
- */
-public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>> implements SimpleQuery<Q>,
-SimpleProjectable<T> {
-
-    private final QueryMixin<Q> queryMixin;
-
-    private final IndexSearcher searcher;
-
-    private final LuceneSerializer serializer;
-
-    private final Function<Document, T> transformer;
-
-    @Nullable
-    private Set<String> fieldsToLoad;
-
-    private List<Filter> filters = ImmutableList.of();
-
-    @Nullable
-    private Filter _filter;
-
-    @Nullable
-    private Sort querySort;
-
-    @SuppressWarnings("unchecked")
-    public AbstractLuceneQuery(LuceneSerializer serializer, IndexSearcher searcher,
-            Function<Document, T> transformer) {
-        queryMixin = new QueryMixin<Q>((Q) this, new DefaultQueryMetadata().noValidate());
-        this.serializer = serializer;
-        this.searcher = searcher;
-        this.transformer = transformer;
-    }
-
-    public AbstractLuceneQuery(IndexSearcher searcher, Function<Document, T> transformer) {
-        this(LuceneSerializer.DEFAULT, searcher, transformer);
-    }
-
-    @Override
-    public boolean exists() {
-        return innerCount() > 0;
-    }
-
-    @Override
-    public boolean notExists() {
-        return innerCount() == 0;
-    }
-
-    private long innerCount() {
-        try {
-            final int maxDoc = searcher.getIndexReader().maxDoc();
-            if (maxDoc == 0) {
-                return 0;
-            }
-            return searcher.search(createQuery(), getFilter(), maxDoc, Sort.INDEXORDER, false, false).totalHits;
-        } catch (IOException e) {
-            throw new QueryException(e);
-        } catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public long count() {
-        return innerCount();
-    }
-
-    protected Query createQuery() {
-        if (queryMixin.getMetadata().getWhere() == null) {
-            return new MatchAllDocsQuery();
-        }
-        return serializer.toQuery(queryMixin.getMetadata().getWhere(), queryMixin.getMetadata());
-    }
-
-    /**
-     * Create a filter for constraints defined in this query
-     *
-     * @return
-     */
-    public Filter asFilter() {
-        return new QueryWrapperFilter(createQuery());
-    }
-
-    @Override
-    public Q distinct() {
-        throw new UnsupportedOperationException("use distinct(path) instead");
-    }
-
-    /**
-     * Add a DuplicateFilter for the field of the given property path
-     *
-     * @param property
-     * @return
-     */
-    public Q distinct(Path<?> property) {
-        return filter(new DuplicateFilter(serializer.toField(property)));
-    }
-
-    /**
-     * Apply the given Lucene filter to the search results
-     *
-     * @param filter
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q filter(Filter filter) {
-        if (filters.isEmpty()) {
-            this._filter = filter;
-            filters = ImmutableList.of(filter);
-        } else {
-            this._filter = null;
-            if (filters.size() == 1) {
-                filters = new ArrayList<Filter>();
-            }
-            filters.add(filter);
-        }
-        return (Q)this;
-    }
-
-    private Filter getFilter() {
-        if (_filter == null && !filters.isEmpty()) {
-            _filter = new ChainedFilter(filters.toArray(new Filter[filters.size()]));
-        }
-        return _filter;
-    }
-
-    @Override
-    public Q limit(long limit) {
-        return queryMixin.limit(limit);
-    }
-
-    @Override
-    public CloseableIterator<T> iterate() {
-        final QueryMetadata metadata = queryMixin.getMetadata();
-        final List<OrderSpecifier<?>> orderBys = metadata.getOrderBy();
-        final Integer queryLimit = metadata.getModifiers().getLimitAsInteger();
-        final Integer queryOffset = metadata.getModifiers().getOffsetAsInteger();
-        Sort sort = querySort;
-        int limit;
-        final int offset = queryOffset != null ? queryOffset.intValue() : 0;
-        try {
-            limit = maxDoc();
-            if (limit == 0) {
-                return new EmptyCloseableIterator<T>();
-            }
-        } catch (IOException e) {
-            throw new QueryException(e);
-        } catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-        if (queryLimit != null && queryLimit.intValue() < limit) {
-            limit = queryLimit.intValue();
-        }
-        if (sort == null && !orderBys.isEmpty()) {
-            sort = serializer.toSort(orderBys);
-        }
-
-        try {
-            ScoreDoc[] scoreDocs;
-            int sumOfLimitAndOffset = limit + offset;
-            if (sumOfLimitAndOffset < 1) {
-                throw new QueryException("The given limit (" + limit + ") and offset (" + offset + ") cause an integer overflow.");
-            }
-            if (sort != null) {
-                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, sort, false, false).scoreDocs;
-            } else {
-                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, Sort.INDEXORDER, false, false).scoreDocs;
-            }
-            if (offset < scoreDocs.length) {
-                return new ResultIterator<T>(scoreDocs, offset, searcher, fieldsToLoad, transformer);
-            }
-            return new EmptyCloseableIterator<T>();
-        } catch (final IOException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    private List<T> innerList() {
-        return new IteratorAdapter<T>(iterate()).asList();
-    }
-
-    @Override
-    public List<T> list() {
-        return innerList();
-    }
-
-    /**
-     * Set the given fields to load
-     *
-     * @param fieldsToLoad
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q load(Set<String> fieldsToLoad) {
-        this.fieldsToLoad = fieldsToLoad;
-        return (Q)this;
-    }
-
-    /**
-     * Load only the fields of the given paths
-     *
-     * @param paths
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public Q load(Path<?>... paths) {
-        Set<String> fields = new HashSet<String>();
-        for (Path<?> path : paths) {
-            fields.add(serializer.toField(path));
-        }
-        this.fieldsToLoad = fields;
-        return (Q)this;
-    }
-
-    @Override
-    public SearchResults<T> listResults() {
-        List<T> documents = innerList();
-        /*
-         * TODO Get rid of count(). It could be implemented by iterating the
-         * list results in list* from n to m.
-         */
-        return new SearchResults<T>(documents, queryMixin.getMetadata().getModifiers(), innerCount());
-    }
-
-    @Override
-    public Q offset(long offset) {
-        return queryMixin.offset(offset);
-    }
-
-    public Q orderBy(OrderSpecifier<?> o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public Q orderBy(OrderSpecifier<?>... o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public Q restrict(QueryModifiers modifiers) {
-        return queryMixin.restrict(modifiers);
-    }
-
-    @Override
-    public <P> Q set(ParamExpression<P> param, P value) {
-        return queryMixin.set(param, value);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Q sort(Sort sort) {
-        this.querySort = sort;
-        return (Q)this;
-    }
-
-    @Nullable
-    private T oneResult(boolean unique) {
-        try {
-            int maxDoc = maxDoc();
-            if (maxDoc == 0) {
-                return null;
-            }
-            final ScoreDoc[] scoreDocs = searcher.search(createQuery(), getFilter(), maxDoc, Sort.INDEXORDER, false, false).scoreDocs;
-            int index = 0;
-            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-            Long offset = modifiers.getOffset();
-            if (offset != null) {
-                index = offset.intValue();
-            }
-            Long limit = modifiers.getLimit();
-            if (unique && (limit == null ? scoreDocs.length - index > 1 :
-                                           limit > 1 && scoreDocs.length > 1)) {
-                throw new NonUniqueResultException("Unique result requested, but " + scoreDocs.length + " found.");
-            } else if (scoreDocs.length > index) {
-                Document document;
-                if (fieldsToLoad != null) {
-                    document = searcher.doc(scoreDocs[index].doc, fieldsToLoad);
-                } else {
-                    document = searcher.doc(scoreDocs[index].doc);
-                }
-                return transformer.apply(document);
-            } else {
-                return null;
-            }
-        } catch (IOException e) {
-            throw new QueryException(e);
-        }  catch (IllegalArgumentException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public T singleResult() {
-        return oneResult(false);
-    }
-
-    @Override
-    public T uniqueResult() {
-        return oneResult(true);
-    }
-
-    public Q where(Predicate e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public Q where(Predicate... e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public String toString() {
-        return createQuery().toString();
-    }
-
-    private int maxDoc() throws IOException {
-        return searcher.getIndexReader().maxDoc();
-    }
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java
deleted file mode 100644
index 987f80d1b4..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/IgnoreCaseUnsupportedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-/**
- * @author tiwe
- *
- */
-public class IgnoreCaseUnsupportedException extends UnsupportedOperationException{
-
-    private static final long serialVersionUID = 412913389929530788L;
-
-    public IgnoreCaseUnsupportedException() {
-        super("Ignore case queries are not supported with Lucene");
-    }
-    
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneExpressions.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneExpressions.java
deleted file mode 100644
index 4f96f18de4..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneExpressions.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.FuzzyQuery;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.BooleanExpression;
-
-/**
- * Utility methods to create filter expressions for Lucene queries that are not covered by the
- * Querydsl standard expression model
- *
- * @author tiwe
- *
- */
-public final class LuceneExpressions {
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term));
-    }
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @param maxEdits
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value, int maxEdits) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term, maxEdits));
-    }
-
-    /**
-     * Create a fuzzy query
-     *
-     * @param path
-     * @param value
-     * @param maxEdits
-     * @param prefixLength
-     * @return
-     */
-    public static BooleanExpression fuzzyLike(Path<String> path, String value,
-            int maxEdits, int prefixLength) {
-        Term term = new Term(path.getMetadata().getName(), value);
-        return new QueryElement(new FuzzyQuery(term, maxEdits, prefixLength));
-    }
-
-    private LuceneExpressions() {}
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneOps.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneOps.java
deleted file mode 100644
index 6aff0aea21..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneOps.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class LuceneOps {
-
-    private static final String NS = LuceneOps.class.getName();
-
-    static final Operator<Object> LUCENE_QUERY = new OperatorImpl<Object>(NS, "QUERY");
-
-    static final Operator<String> PHRASE = new OperatorImpl<String>(NS, "PHRASE");
-
-    static final Operator<String> TERM = new OperatorImpl<String>(NS, "TERM");
-
-    private LuceneOps() {}
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneQuery.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneQuery.java
deleted file mode 100644
index 96a6b74646..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneQuery.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
-
-import com.google.common.base.Function;
-
-/**
- * LuceneQuery is a Querydsl query implementation for Lucene queries.
- *
- * @author vema
- */
-public class LuceneQuery extends AbstractLuceneQuery<Document, LuceneQuery> {
-    
-    private static final Function<Document,Document> TRANSFORMER = new Function<Document,Document>() {
-        @Override
-        public Document apply(Document input) {
-            return input;
-        }        
-    };
-  
-    public LuceneQuery(IndexSearcher searcher) {
-        super(searcher, TRANSFORMER);
-    }
-
-    public LuceneQuery(LuceneSerializer luceneSerializer, IndexSearcher searcher) {
-        super(luceneSerializer, searcher, TRANSFORMER);
-    }
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneSerializer.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
deleted file mode 100644
index 82a3d02a0e..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.NumericRangeQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
-import org.apache.lucene.search.WildcardQuery;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.NumericUtils;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathType;
-
-/**
- * Serializes Querydsl queries to Lucene queries.
- *
- * @author vema
- *
- */
-public class LuceneSerializer {
-    private static final Map<Class<?>, SortField.Type> sortFields = new HashMap<Class<?>, SortField.Type>();
-
-    static {
-        sortFields.put(Integer.class, SortField.Type.INT);
-        sortFields.put(Float.class, SortField.Type.FLOAT);
-        sortFields.put(Long.class, SortField.Type.LONG);
-        sortFields.put(Double.class, SortField.Type.DOUBLE);
-        sortFields.put(Short.class, SortField.Type.SHORT);
-        sortFields.put(Byte.class, SortField.Type.BYTE);
-        sortFields.put(BigDecimal.class, SortField.Type.DOUBLE);
-        sortFields.put(BigInteger.class, SortField.Type.LONG);
-    }
-
-    private static final Splitter WS_SPLITTER = Splitter.on(Pattern.compile("\\s+"));
-
-    public static final LuceneSerializer DEFAULT = new LuceneSerializer(false, true);
-
-    private final boolean lowerCase;
-
-    private final boolean splitTerms;
-
-    private final Locale sortLocale;
-
-    public LuceneSerializer(boolean lowerCase, boolean splitTerms) {
-        this(lowerCase, splitTerms, Locale.getDefault());
-    }
-
-    public LuceneSerializer(boolean lowerCase, boolean splitTerms, Locale sortLocale) {
-        this.lowerCase = lowerCase;
-        this.splitTerms = splitTerms;
-        this.sortLocale = sortLocale;
-    }
-
-    private Query toQuery(Operation<?> operation, QueryMetadata metadata) {
-        Operator<?> op = operation.getOperator();
-        if (op == Ops.OR) {
-            return toTwoHandSidedQuery(operation, Occur.SHOULD, metadata);
-        } else if (op == Ops.AND) {
-            return toTwoHandSidedQuery(operation, Occur.MUST, metadata);
-        } else if (op == Ops.NOT) {
-            BooleanQuery bq = new BooleanQuery();
-            bq.add(new BooleanClause(toQuery(operation.getArg(0), metadata), Occur.MUST_NOT));
-            bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-            return bq;
-        } else if (op == Ops.LIKE) {
-            return like(operation, metadata);
-        } else if (op == Ops.EQ) {
-            return eq(operation, metadata, false);
-        } else if (op == Ops.EQ_IGNORE_CASE) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.NE) {
-            return ne(operation, metadata, false);
-        } else if (op == Ops.STARTS_WITH) {
-            return startsWith(metadata, operation, false);
-        } else if (op == Ops.STARTS_WITH_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.ENDS_WITH) {
-            return endsWith(operation, metadata, false);
-        } else if (op == Ops.ENDS_WITH_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.STRING_CONTAINS) {
-            return stringContains(operation, metadata, false);
-        } else if (op == Ops.STRING_CONTAINS_IC) {
-            throw new IgnoreCaseUnsupportedException();
-        } else if (op == Ops.BETWEEN) {
-            return between(operation, metadata);
-        } else if (op == Ops.IN) {
-            return in(operation, metadata, false);
-        } else if (op == Ops.NOT_IN) {
-            return notIn(operation, metadata, false);
-        } else if (op == Ops.LT) {
-            return lt(operation, metadata);
-        } else if (op == Ops.GT) {
-            return gt(operation, metadata);
-        } else if (op == Ops.LOE) {
-            return le(operation, metadata);
-        } else if (op == Ops.GOE) {
-            return ge(operation, metadata);
-        } else if (op == LuceneOps.LUCENE_QUERY) {
-            return ((Constant<Query>)operation.getArg(0)).getConstant();
-        }
-        throw new UnsupportedOperationException("Illegal operation " + operation);
-    }
-
-    private Query toTwoHandSidedQuery(Operation<?> operation, Occur occur, QueryMetadata metadata) {
-        Query lhs = toQuery(operation.getArg(0), metadata);
-        Query rhs = toQuery(operation.getArg(1), metadata);
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(createBooleanClause(lhs, occur));
-        bq.add(createBooleanClause(rhs, occur));
-        return bq;
-    }
-
-    /**
-     * If the query is a BooleanQuery and it contains a single Occur.MUST_NOT
-     * clause it will be returned as is. Otherwise it will be wrapped in a
-     * BooleanClause with the given Occur.
-     */
-    private BooleanClause createBooleanClause(Query query, Occur occur) {
-        if (query instanceof BooleanQuery) {
-            BooleanClause[] clauses = ((BooleanQuery) query).getClauses();
-            if (clauses.length == 1 && clauses[0].getOccur().equals(Occur.MUST_NOT)) {
-                return clauses[0];
-            }
-        }
-        return new BooleanClause(query, occur);
-    }
-
-    protected Query like(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convert(path, operation.getArg(1));
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (String s : terms) {
-                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, terms[0]));
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Query eq(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-
-        if (Number.class.isAssignableFrom(operation.getArg(1).getType())) {
-            return new TermQuery(new Term(field, convertNumber(((Constant<Number>) operation
-                    .getArg(1)).getConstant())));
-        }
-
-        return eq(field, convert(path, operation.getArg(1), metadata), ignoreCase);
-    }
-
-
-    private BytesRef convertNumber(Number number) {
-        if (Integer.class.isInstance(number) || Byte.class.isInstance(number) || Short.class.isInstance(number)) {
-            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_INT);
-            NumericUtils.intToPrefixCoded(number.intValue(), 0, bytes);
-            return bytes;
-        } else if (Double.class.isInstance(number) || BigDecimal.class.isInstance(number)) {
-            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
-            long l = NumericUtils.doubleToSortableLong(number.doubleValue());
-            NumericUtils.longToPrefixCoded(l, 0, bytes);
-            return bytes;
-        } else if (Long.class.isInstance(number) || BigInteger.class.isInstance(number)) {
-            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
-            NumericUtils.longToPrefixCoded(number.longValue(), 0, bytes);
-            return bytes;
-        } else if (Float.class.isInstance(number)) {
-            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_INT);
-            int i = NumericUtils.floatToSortableInt(number.floatValue());
-            NumericUtils.intToPrefixCoded(i, 0, bytes);
-            return bytes;
-        } else {
-            throw new IllegalArgumentException("Unsupported numeric type "
-                    + number.getClass().getName());
-        }
-    }
-
-    protected Query eq(String field, String[] terms, boolean ignoreCase) {
-        if (terms.length > 1) {
-            PhraseQuery pq = new PhraseQuery();
-            for (String s : terms) {
-                pq.add(new Term(field, s));
-            }
-            return pq;
-        }
-        return new TermQuery(new Term(field, terms[0]));
-    }
-
-    protected Query in(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        Collection<?> values = (Collection<?>) ((Constant<?>) operation.getArg(1)).getConstant();
-        BooleanQuery bq = new BooleanQuery();
-        for (Object value : values) {
-            String[] str = convert(path, value);
-            bq.add(eq(field, str, ignoreCase), Occur.SHOULD);
-        }
-        return bq;
-    }
-
-    protected Query notIn(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(new BooleanClause(in(operation, metadata, false), Occur.MUST_NOT));
-        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-        return bq;
-    }
-
-    protected Query ne(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        BooleanQuery bq = new BooleanQuery();
-        bq.add(new BooleanClause(eq(operation, metadata, ignoreCase), Occur.MUST_NOT));
-        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
-        return bq;
-    }
-
-    protected Query startsWith(QueryMetadata metadata, Operation<?> operation, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (int i = 0; i < terms.length; ++i) {
-                String s = i == 0 ? terms[i] + "*" : "*" + terms[i] + "*";
-                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
-            }
-            return bq;
-        }
-        return new PrefixQuery(new Term(field, terms[0]));
-    }
-
-
-
-    protected Query stringContains(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (String s : terms) {
-                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, "*" + terms[0] + "*"));
-    }
-
-    protected Query endsWith(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        String field = toField(path);
-        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
-        if (terms.length > 1) {
-            BooleanQuery bq = new BooleanQuery();
-            for (int i = 0; i < terms.length; ++i) {
-                String s = i == terms.length - 1 ? "*" + terms[i] : "*" + terms[i] + "*";
-                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
-            }
-            return bq;
-        }
-        return new WildcardQuery(new Term(field, "*" + terms[0]));
-    }
-
-    protected Query between(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        // TODO Phrase not properly supported
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                operation.getArg(2),
-                true,
-                true,
-                metadata);
-    }
-
-    protected Query lt(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                null,
-                operation.getArg(1),
-                false,
-                false,
-                metadata);
-    }
-
-    protected Query gt(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                null,
-                false,
-                false,
-                metadata);
-    }
-
-    protected Query le(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                null,
-                operation.getArg(1),
-                true,
-                true,
-                metadata);
-    }
-
-    protected Query ge(Operation<?> operation, QueryMetadata metadata) {
-        verifyArguments(operation);
-        Path<?> path = getPath(operation.getArg(0));
-        return range(
-                path,
-                toField(path),
-                operation.getArg(1),
-                null,
-                true,
-                true,
-                metadata);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    protected Query range(Path<?> leftHandSide, String field, @Nullable Expression<?> min,
-            @Nullable Expression<?> max, boolean minInc, boolean maxInc, QueryMetadata metadata) {
-        if (min != null && Number.class.isAssignableFrom(min.getType()) || max != null
-                && Number.class.isAssignableFrom(max.getType())) {
-            Class<? extends Number> numType = (Class) (min != null ? min.getType() : max.getType());
-            return numericRange((Class) numType, field, (Number) (min == null ? null
-                    : ((Constant) min).getConstant()), (Number) (max == null ? null
-                    : ((Constant) max).getConstant()), minInc, maxInc);
-        }
-        return stringRange(leftHandSide, field, min, max, minInc, maxInc, metadata);
-    }
-
-    protected <N extends Number> NumericRangeQuery<?> numericRange(Class<N> clazz, String field,
-            @Nullable N min, @Nullable N max, boolean minInc, boolean maxInc) {
-        if (clazz.equals(Integer.class)) {
-            return NumericRangeQuery.newIntRange(field, (Integer) min, (Integer) max, minInc, maxInc);
-        } else if (clazz.equals(Double.class)) {
-            return NumericRangeQuery.newDoubleRange(field, (Double) min, (Double) max, minInc, minInc);
-        } else if (clazz.equals(Float.class)) {
-            return NumericRangeQuery.newFloatRange(field, (Float) min, (Float) max, minInc, minInc);
-        } else if (clazz.equals(Long.class)) {
-            return NumericRangeQuery.newLongRange(field, (Long) min, (Long) max, minInc, minInc);
-        } else if (clazz.equals(Byte.class) || clazz.equals(Short.class)) {
-            return NumericRangeQuery.newIntRange(field, min != null ? min.intValue() : null,
-                    max != null ? max.intValue() : null, minInc, maxInc);
-        } else {
-            throw new IllegalArgumentException("Unsupported numeric type " + clazz.getName());
-        }
-    }
-
-    protected Query stringRange(
-            Path<?> leftHandSide,
-            String field,
-            @Nullable Expression<?> min,
-            @Nullable Expression<?> max,
-            boolean minInc,
-            boolean maxInc,
-            QueryMetadata metadata) {
-
-        if (min == null) {
-            return TermRangeQuery.newStringRange(
-                    field, null, convert(leftHandSide, max, metadata)[0], minInc, maxInc);
-        } else if (max == null) {
-            return TermRangeQuery.newStringRange(
-                    field, convert(leftHandSide, min, metadata)[0],
-                    null, minInc, maxInc);
-        } else {
-            return TermRangeQuery.newStringRange(
-                    field, convert(leftHandSide, min, metadata)[0],
-                    convert(leftHandSide, max, metadata)[0],
-                    minInc, maxInc);
-        }
-    }
-
-    private Path<?> getPath(Expression<?> leftHandSide) {
-        if (leftHandSide instanceof Path<?>) {
-            return (Path<?>)leftHandSide;
-        } else if (leftHandSide instanceof Operation<?>) {
-            Operation<?> operation = (Operation<?>) leftHandSide;
-            if (operation.getOperator() == Ops.LOWER || operation.getOperator() == Ops.UPPER) {
-                return (Path<?>)operation.getArg(0);
-            }
-        }
-        throw new IllegalArgumentException("Unable to transform " + leftHandSide + " to path");
-    }
-
-    /**
-     * template method, override to customize
-     *
-     * @param path
-     * @return
-     */
-    protected String toField(Path<?> path) {
-        String rv = path.getMetadata().getName();
-        if (path.getMetadata().getParent() != null) {
-            Path<?> parent = path.getMetadata().getParent();
-            if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
-                rv = toField(parent) + "." + rv;
-            }
-        }
-        return rv;
-    }
-
-    private void verifyArguments(Operation<?> operation) {
-        List<Expression<?>> arguments = operation.getArgs();
-        for (int i = 1; i < arguments.size(); ++i) {
-            if (!(arguments.get(i) instanceof Constant<?>)
-                    && !(arguments.get(i) instanceof ParamExpression<?>)
-                    && !(arguments.get(i) instanceof PhraseElement)
-                    && !(arguments.get(i) instanceof TermElement)) {
-                throw new IllegalArgumentException("operand was of unsupported type "
-                        + arguments.get(i).getClass().getName());
-            }
-        }
-    }
-
-    /**
-     * template method
-     *
-     * @param leftHandSide
-     * @param rightHandSide
-     * @return
-     */
-    protected String[] convert(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
-        if (rightHandSide instanceof Operation) {
-            Operation<?> operation = (Operation<?>)rightHandSide;
-            if (operation.getOperator() == LuceneOps.PHRASE) {
-                return Iterables.toArray(WS_SPLITTER.split(operation.getArg(0).toString()), String.class);
-            } else if (operation.getOperator() == LuceneOps.TERM) {
-                return new String[] { operation.getArg(0).toString() };
-            } else {
-                throw new IllegalArgumentException(rightHandSide.toString());
-            }
-        } else if (rightHandSide instanceof ParamExpression<?>) {
-            Object value = metadata.getParams().get(rightHandSide);
-            if (value == null) {
-                throw new ParamNotSetException((ParamExpression<?>) rightHandSide);
-            }
-            return convert(leftHandSide, value);
-
-        } else if (rightHandSide instanceof Constant<?>) {
-            return convert(leftHandSide, ((Constant<?>)rightHandSide).getConstant());
-        } else {
-            throw new IllegalArgumentException(rightHandSide.toString());
-        }
-    }
-
-    /**
-     * template method
-     *
-     * @param leftHandSide
-     * @param rightHandSide
-     * @return
-     */
-    protected String[] convert(Path<?> leftHandSide, Object rightHandSide) {
-        String str = rightHandSide.toString();
-        if (lowerCase) {
-            str = str.toLowerCase();
-        }
-        if (splitTerms) {
-            if (str.equals("")) {
-                return new String[] { str };
-            } else {
-                return Iterables.toArray(WS_SPLITTER.split(str), String.class);
-            }
-        } else {
-            return new String[] { str };
-        }
-    }
-
-    private String[] convertEscaped(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
-        String[] str = convert(leftHandSide, rightHandSide, metadata);
-        for (int i = 0; i < str.length; i++) {
-            str[i] = QueryParser.escape(str[i]);
-        }
-        return str;
-    }
-
-    public Query toQuery(Expression<?> expr, QueryMetadata metadata) {
-        if (expr instanceof Operation<?>) {
-            return toQuery((Operation<?>) expr, metadata);
-        } else {
-            return toQuery(ExpressionUtils.extract(expr), metadata);
-        }
-    }
-
-    public Sort toSort(List<? extends OrderSpecifier<?>> orderBys) {
-        List<SortField> sorts = new ArrayList<SortField>(orderBys.size());
-        for (OrderSpecifier<?> order : orderBys) {
-            if (!(order.getTarget() instanceof Path<?>)) {
-                throw new IllegalArgumentException("argument was not of type Path.");
-            }
-            Class<?> type = order.getTarget().getType();
-            boolean reverse = !order.isAscending();
-            Path<?> path = getPath(order.getTarget());
-            if (Number.class.isAssignableFrom(type)) {
-                sorts.add(new SortField(toField(path), sortFields.get(type), reverse));
-            } else {
-                sorts.add(new SortField(toField(path), SortField.Type.STRING, reverse));
-            }
-        }
-        Sort sort = new Sort();
-        sort.setSort(sorts.toArray(new SortField[sorts.size()]));
-        return sort;
-    }
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/PhraseElement.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/PhraseElement.java
deleted file mode 100644
index 6cf5f4d638..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/PhraseElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
- /*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * PhraseElement represents the embedded String as a phrase
- *
- * @author tiwe
- *
- */
-public class PhraseElement extends StringOperation {
-
-    private static final long serialVersionUID = 2350215644019186076L;
-
-    public PhraseElement(String str) {
-        super(LuceneOps.PHRASE, ConstantImpl.create(str));
-    }
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/QueryElement.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/QueryElement.java
deleted file mode 100644
index 6e81e3531e..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/QueryElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.search.Query;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * QueryElement wraps a Lucene Query
- *
- * @author tiwe
- *
- */
-public class QueryElement extends BooleanOperation {
-
-    private static final long serialVersionUID = 470868107363840155L;
-
-    public QueryElement(Query query) {
-        super(LuceneOps.LUCENE_QUERY, ConstantImpl.create(query));
-    }
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/ResultIterator.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/ResultIterator.java
deleted file mode 100644
index 0139920fbe..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/ResultIterator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import java.io.IOException;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.ScoreDoc;
-
-import com.google.common.base.Function;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.QueryException;
-
-/**
- * ResultIterator is a {@link CloseableIterator} implementation for Lucene query results
- * 
- * @author tiwe
- *
- * @param <T>
- */
-public final class ResultIterator<T> implements CloseableIterator<T> {
-
-    private final ScoreDoc[] scoreDocs;
-
-    private int cursor;
-
-    private final IndexSearcher searcher;
-
-    @Nullable
-    private final Set<String> fieldsToLoad;
-
-    private final Function<Document,T> transformer;
-
-    public ResultIterator(ScoreDoc[] scoreDocs, int offset, IndexSearcher searcher, 
-            @Nullable Set<String> fieldsToLoad, Function<Document, T> transformer) {
-        this.scoreDocs = scoreDocs.clone();
-        this.cursor = offset;
-        this.searcher = searcher;
-        this.fieldsToLoad = fieldsToLoad;
-        this.transformer = transformer;
-    }
-
-    @Override
-    public boolean hasNext() {
-        return cursor != scoreDocs.length;
-    }
-
-    @Override
-    public T next() {
-        try {
-            Document document;
-            if (fieldsToLoad != null) {
-                document = searcher.doc(scoreDocs[cursor++].doc, fieldsToLoad);
-            } else {
-                document = searcher.doc(scoreDocs[cursor++].doc);
-            }
-            return transformer.apply(document);
-        } catch (IOException e) {
-            throw new QueryException(e);
-        }
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void close() {
-
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TermElement.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TermElement.java
deleted file mode 100644
index 0309847683..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TermElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * TermElement represents the embedded String as a term
- *
- * @author tiwe
- *
- */
-public class TermElement extends StringOperation {
-
-    private static final long serialVersionUID = 2350215644019186076L;
-
-    public TermElement(String str) {
-        super(LuceneOps.TERM, ConstantImpl.create(str));
-    }
-
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TypedQuery.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TypedQuery.java
deleted file mode 100644
index b6fa4b9884..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/TypedQuery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
-
-import com.google.common.base.Function;
-
-/**
- * TypedQuery is a typed query implementation for Lucene queries.
- * 
- * @author laim
- * @author tiwe
- */
-public class TypedQuery<T> extends AbstractLuceneQuery<T, TypedQuery<T>> {
-
-    public TypedQuery(IndexSearcher searcher, Function<Document, T> transformer) {
-        super(searcher, transformer);
-    }
-
-    public TypedQuery(LuceneSerializer serializer, IndexSearcher searcher, Function<Document, T> transformer) {
-        super(serializer, searcher, transformer);
-    }
-  
-}
diff --git a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/package-info.java b/querydsl-lucene4/src/main/java/com/mysema/query/lucene/package-info.java
deleted file mode 100644
index 0f6c4a03a6..0000000000
--- a/querydsl-lucene4/src/main/java/com/mysema/query/lucene/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.lucene;
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/AbstractLuceneQuery.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/AbstractLuceneQuery.java
new file mode 100644
index 0000000000..83c0218091
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/AbstractLuceneQuery.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.EmptyCloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.SimpleQuery;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.queries.ChainedFilter;
+import org.apache.lucene.sandbox.queries.DuplicateFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryWrapperFilter;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TotalHitCountCollector;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * AbstractLuceneQuery is an abstract super class for Lucene query implementations
+ *
+ * @author tiwe
+ *
+ * @param <T> projection type
+ * @param <Q> concrete subtype of querydsl
+ */
+public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>> implements SimpleQuery<Q>, Fetchable<T> {
+
+    private static final String JAVA_ISO_CONTROL = "[\\p{Cntrl}&&[^\r\n\t]]";
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final IndexSearcher searcher;
+
+    private final LuceneSerializer serializer;
+
+    private final Function<Document, T> transformer;
+
+    @Nullable
+    private Set<String> fieldsToLoad;
+
+    private List<Filter> filters = Collections.emptyList();
+
+    @Nullable
+    private Filter filter;
+
+    @Nullable
+    private Sort querySort;
+
+    @SuppressWarnings("unchecked")
+    public AbstractLuceneQuery(LuceneSerializer serializer, IndexSearcher searcher,
+            Function<Document, T> transformer) {
+        queryMixin = new QueryMixin<Q>((Q) this, new DefaultQueryMetadata());
+        this.serializer = serializer;
+        this.searcher = searcher;
+        this.transformer = transformer;
+    }
+
+    public AbstractLuceneQuery(IndexSearcher searcher, Function<Document, T> transformer) {
+        this(LuceneSerializer.DEFAULT, searcher, transformer);
+    }
+
+    private long innerCount() {
+        try {
+            final int maxDoc = searcher.getIndexReader().maxDoc();
+            if (maxDoc == 0) {
+                return 0;
+            }
+            TotalHitCountCollector collector = new TotalHitCountCollector();
+            searcher.search(createQuery(), getFilter(), collector);
+            return collector.getTotalHits();
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        return innerCount();
+    }
+
+    protected Query createQuery() {
+        if (queryMixin.getMetadata().getWhere() == null) {
+            return new MatchAllDocsQuery();
+        }
+        return serializer.toQuery(queryMixin.getMetadata().getWhere(), queryMixin.getMetadata());
+    }
+
+    /**
+     * Create a filter for constraints defined in this querydsl
+     *
+     * @return filter
+     */
+    public Filter asFilter() {
+        return new QueryWrapperFilter(createQuery());
+    }
+
+    @Override
+    public Q distinct() {
+        throw new UnsupportedOperationException("use distinct(path) instead");
+    }
+
+    /**
+     * Add a DuplicateFilter for the field of the given property path
+     *
+     * @param property distinct property
+     * @return  the current object
+     */
+    public Q distinct(Path<?> property) {
+        return filter(new DuplicateFilter(serializer.toField(property)));
+    }
+
+    /**
+     * Apply the given Lucene filter to the search results
+     *
+     * @param filter filter
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q filter(Filter filter) {
+        if (filters.isEmpty()) {
+            this.filter = filter;
+            filters = Collections.singletonList(filter);
+        } else {
+            this.filter = null;
+            if (filters.size() == 1) {
+                filters = new ArrayList<Filter>();
+            }
+            filters.add(filter);
+        }
+        return (Q) this;
+    }
+
+    private Filter getFilter() {
+        if (filter == null && !filters.isEmpty()) {
+            filter = new ChainedFilter(filters.toArray(new Filter[0]));
+        }
+        return filter;
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        final QueryMetadata metadata = queryMixin.getMetadata();
+        final List<OrderSpecifier<?>> orderBys = metadata.getOrderBy();
+        final Integer queryLimit = metadata.getModifiers().getLimitAsInteger();
+        final Integer queryOffset = metadata.getModifiers().getOffsetAsInteger();
+        Sort sort = querySort;
+        int limit;
+        final int offset = queryOffset != null ? queryOffset : 0;
+        try {
+            limit = maxDoc();
+            if (limit == 0) {
+                return new EmptyCloseableIterator<T>();
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+        if (queryLimit != null && queryLimit < limit) {
+            limit = queryLimit;
+        }
+        if (sort == null && !orderBys.isEmpty()) {
+            sort = serializer.toSort(orderBys);
+        }
+
+        try {
+            ScoreDoc[] scoreDocs;
+            int sumOfLimitAndOffset = limit + offset;
+            if (sumOfLimitAndOffset < 1) {
+                throw new QueryException("The given limit (" + limit + ") and offset (" + offset + ") cause an integer overflow.");
+            }
+            if (sort != null) {
+                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, sort, false, false).scoreDocs;
+            } else {
+                scoreDocs = searcher.search(createQuery(), getFilter(), sumOfLimitAndOffset, Sort.INDEXORDER, false, false).scoreDocs;
+            }
+            if (offset < scoreDocs.length) {
+                return new ResultIterator<T>(scoreDocs, offset, searcher, fieldsToLoad, transformer);
+            }
+            return new EmptyCloseableIterator<T>();
+        } catch (final IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    private List<T> innerList() {
+        return new IteratorAdapter<T>(iterate()).asList();
+    }
+
+    @Override
+    public List<T> fetch() {
+        return innerList();
+    }
+
+    /**
+     * Set the given fields to load
+     *
+     * @param fieldsToLoad fields to load
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(Set<String> fieldsToLoad) {
+        this.fieldsToLoad = fieldsToLoad;
+        return (Q) this;
+    }
+
+    /**
+     * Load only the fields of the given paths
+     *
+     * @param paths fields to load
+     * @return  the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(Path<?>... paths) {
+        Set<String> fields = new HashSet<String>();
+        for (Path<?> path : paths) {
+            fields.add(serializer.toField(path));
+        }
+        this.fieldsToLoad = fields;
+        return (Q) this;
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        List<T> documents = innerList();
+        /*
+         * TODO Get rid of fetchCount(). It could be implemented by iterating the
+         * fetch results in fetch* from n to m.
+         */
+        return new QueryResults<T>(documents, queryMixin.getMetadata().getModifiers(), innerCount());
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    @Override
+    public <P> Q set(ParamExpression<P> param, P value) {
+        return queryMixin.set(param, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q sort(Sort sort) {
+        this.querySort = sort;
+        return (Q) this;
+    }
+
+    @Nullable
+    private T oneResult(boolean unique) {
+        try {
+            int maxDoc = maxDoc();
+            if (maxDoc == 0) {
+                return null;
+            }
+            final ScoreDoc[] scoreDocs = searcher.search(createQuery(), getFilter(), maxDoc, Sort.INDEXORDER, false, false).scoreDocs;
+            int index = 0;
+            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+            Long offset = modifiers.getOffset();
+            if (offset != null) {
+                index = offset.intValue();
+            }
+            Long limit = modifiers.getLimit();
+            if (unique && (limit == null ? scoreDocs.length - index > 1 :
+                                           limit > 1 && scoreDocs.length > 1)) {
+                throw new NonUniqueResultException("Unique result requested, but " + scoreDocs.length + " found.");
+            } else if (scoreDocs.length > index) {
+                Document document;
+                if (fieldsToLoad != null) {
+                    document = searcher.doc(scoreDocs[index].doc, fieldsToLoad);
+                } else {
+                    document = searcher.doc(scoreDocs[index].doc);
+                }
+                return transformer.apply(document);
+            } else {
+                return null;
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public T fetchFirst() {
+        return oneResult(false);
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        return oneResult(true);
+    }
+
+    public Q where(Predicate e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public String toString() {
+        return createQuery().toString().replaceAll(JAVA_ISO_CONTROL, "_");
+    }
+
+    private int maxDoc() throws IOException {
+        return searcher.getIndexReader().maxDoc();
+    }
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/IgnoreCaseUnsupportedException.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/IgnoreCaseUnsupportedException.java
new file mode 100644
index 0000000000..3c534a279b
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/IgnoreCaseUnsupportedException.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+/**
+ * Thrown for case ignore usage
+ *
+ * @author tiwe
+ *
+ */
+public class IgnoreCaseUnsupportedException extends UnsupportedOperationException {
+
+    private static final long serialVersionUID = 412913389929530788L;
+
+    public IgnoreCaseUnsupportedException() {
+        super("Ignore case queries are not supported with Lucene");
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneExpressions.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneExpressions.java
new file mode 100644
index 0000000000..8d4f87c343
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneExpressions.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.FuzzyQuery;
+import org.apache.lucene.util.automaton.LevenshteinAutomata;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+/**
+ * Utility methods to create filter expressions for Lucene queries that are not covered by the
+ * Querydsl standard expression model
+ *
+ * @author tiwe
+ *
+ */
+public final class LuceneExpressions {
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @param maxEdits must be &gt;= 0 and &lt;= {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value, int maxEdits) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, maxEdits));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path path
+     * @param value value to match
+     * @param maxEdits must be &gt;= 0 and &lt;= {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
+     * @param prefixLength length of common (non-fuzzy) prefix
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value,
+            int maxEdits, int prefixLength) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, maxEdits, prefixLength));
+    }
+
+    private LuceneExpressions() { }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneOps.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneOps.java
new file mode 100644
index 0000000000..eacf1742c1
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneOps.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * Lucene specific operators
+ *
+ * @author tiwe
+ *
+ */
+public enum LuceneOps implements Operator {
+    LUCENE_QUERY(Object.class),
+    PHRASE(String.class),
+    TERM(String.class);
+
+    private final Class<?> type;
+
+    LuceneOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneQuery.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneQuery.java
new file mode 100644
index 0000000000..ab1b96cf84
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneQuery.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code LuceneQuery} is a Querydsl query implementation for Lucene queries.
+
+ * <p>Example:</p>
+ *
+ * <pre>{@code
+ * QDocument doc = new QDocument("doc");
+ *
+ * IndexSearcher searcher = new IndexSearcher(index);
+ * LuceneQuery query = new LuceneQuery(true, searcher);
+ * List<Document> documents = query
+ *     .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+ *     .fetch();
+ * }</pre>
+ *
+ * @author vema
+ */
+public class LuceneQuery extends AbstractLuceneQuery<Document, LuceneQuery> {
+
+    private static final Function<Document,Document> TRANSFORMER = new Function<Document,Document>() {
+        @Override
+        public Document apply(Document input) {
+            return input;
+        }
+    };
+
+    public LuceneQuery(IndexSearcher searcher) {
+        super(searcher, TRANSFORMER);
+    }
+
+    public LuceneQuery(LuceneSerializer luceneSerializer, IndexSearcher searcher) {
+        super(luceneSerializer, searcher, TRANSFORMER);
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneSerializer.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneSerializer.java
new file mode 100644
index 0000000000..9cda305400
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/LuceneSerializer.java
@@ -0,0 +1,564 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.NumericUtils;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.*;
+
+/**
+ * Serializes Querydsl queries to Lucene queries.
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializer {
+    private static final Map<Class<?>, SortField.Type> sortFields = new HashMap<Class<?>, SortField.Type>();
+
+    static {
+        sortFields.put(Integer.class, SortField.Type.INT);
+        sortFields.put(Float.class, SortField.Type.FLOAT);
+        sortFields.put(Long.class, SortField.Type.LONG);
+        sortFields.put(Double.class, SortField.Type.DOUBLE);
+        sortFields.put(Short.class, SortField.Type.SHORT);
+        sortFields.put(Byte.class, SortField.Type.BYTE);
+        sortFields.put(BigDecimal.class, SortField.Type.DOUBLE);
+        sortFields.put(BigInteger.class, SortField.Type.LONG);
+    }
+
+    public static final LuceneSerializer DEFAULT = new LuceneSerializer(false, true);
+
+    private final boolean lowerCase;
+
+    private final boolean splitTerms;
+
+    private final Locale sortLocale;
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms) {
+        this(lowerCase, splitTerms, Locale.getDefault());
+    }
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms, Locale sortLocale) {
+        this.lowerCase = lowerCase;
+        this.splitTerms = splitTerms;
+        this.sortLocale = sortLocale;
+    }
+
+    private Query toQuery(Operation<?> operation, QueryMetadata metadata) {
+        Operator op = operation.getOperator();
+        if (op == Ops.OR) {
+            return toTwoHandSidedQuery(operation, Occur.SHOULD, metadata);
+        } else if (op == Ops.AND) {
+            return toTwoHandSidedQuery(operation, Occur.MUST, metadata);
+        } else if (op == Ops.NOT) {
+            BooleanQuery bq = new BooleanQuery();
+            bq.add(new BooleanClause(toQuery(operation.getArg(0), metadata), Occur.MUST_NOT));
+            bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+            return bq;
+        } else if (op == Ops.LIKE) {
+            return like(operation, metadata);
+        } else if (op == Ops.LIKE_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.EQ) {
+            return eq(operation, metadata, false);
+        } else if (op == Ops.EQ_IGNORE_CASE) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.NE) {
+            return ne(operation, metadata, false);
+        } else if (op == Ops.STARTS_WITH) {
+            return startsWith(metadata, operation, false);
+        } else if (op == Ops.STARTS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.ENDS_WITH) {
+            return endsWith(operation, metadata, false);
+        } else if (op == Ops.ENDS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.STRING_CONTAINS) {
+            return stringContains(operation, metadata, false);
+        } else if (op == Ops.STRING_CONTAINS_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.BETWEEN) {
+            return between(operation, metadata);
+        } else if (op == Ops.IN) {
+            return in(operation, metadata, false);
+        } else if (op == Ops.NOT_IN) {
+            return notIn(operation, metadata, false);
+        } else if (op == Ops.LT) {
+            return lt(operation, metadata);
+        } else if (op == Ops.GT) {
+            return gt(operation, metadata);
+        } else if (op == Ops.LOE) {
+            return le(operation, metadata);
+        } else if (op == Ops.GOE) {
+            return ge(operation, metadata);
+        } else if (op == LuceneOps.LUCENE_QUERY) {
+            @SuppressWarnings("unchecked") //this is the expected type
+            Constant<Query> expectedConstant = (Constant<Query>) operation.getArg(0);
+            return expectedConstant.getConstant();
+        }
+        throw new UnsupportedOperationException("Illegal operation " + operation);
+    }
+
+    private Query toTwoHandSidedQuery(Operation<?> operation, Occur occur, QueryMetadata metadata) {
+        Query lhs = toQuery(operation.getArg(0), metadata);
+        Query rhs = toQuery(operation.getArg(1), metadata);
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(createBooleanClause(lhs, occur));
+        bq.add(createBooleanClause(rhs, occur));
+        return bq;
+    }
+
+    /**
+     * If the query is a BooleanQuery and it contains a single Occur.MUST_NOT
+     * clause it will be returned as is. Otherwise it will be wrapped in a
+     * BooleanClause with the given Occur.
+     */
+    private BooleanClause createBooleanClause(Query query, Occur occur) {
+        if (query instanceof BooleanQuery) {
+            BooleanClause[] clauses = ((BooleanQuery) query).getClauses();
+            if (clauses.length == 1 && clauses[0].getOccur().equals(Occur.MUST_NOT)) {
+                return clauses[0];
+            }
+        }
+        return new BooleanClause(query, occur);
+    }
+
+    protected Query like(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convert(path, operation.getArg(1));
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, terms[0]));
+    }
+
+    protected Query eq(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+
+        if (Number.class.isAssignableFrom(operation.getArg(1).getType())) {
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> rightArg = (Constant<? extends Number>) operation.getArg(1);
+            return new TermQuery(new Term(field, convertNumber(rightArg.getConstant())));
+        }
+
+        return eq(field, convert(path, operation.getArg(1), metadata), ignoreCase);
+    }
+
+
+    private BytesRef convertNumber(Number number) {
+        if (Integer.class.isInstance(number) || Byte.class.isInstance(number) || Short.class.isInstance(number)) {
+            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_INT);
+            NumericUtils.intToPrefixCoded(number.intValue(), 0, bytes);
+            return bytes;
+        } else if (Double.class.isInstance(number) || BigDecimal.class.isInstance(number)) {
+            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
+            long l = NumericUtils.doubleToSortableLong(number.doubleValue());
+            NumericUtils.longToPrefixCoded(l, 0, bytes);
+            return bytes;
+        } else if (Long.class.isInstance(number) || BigInteger.class.isInstance(number)) {
+            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
+            NumericUtils.longToPrefixCoded(number.longValue(), 0, bytes);
+            return bytes;
+        } else if (Float.class.isInstance(number)) {
+            BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_INT);
+            int i = NumericUtils.floatToSortableInt(number.floatValue());
+            NumericUtils.intToPrefixCoded(i, 0, bytes);
+            return bytes;
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type "
+                    + number.getClass().getName());
+        }
+    }
+
+    protected Query eq(String field, String[] terms, boolean ignoreCase) {
+        if (terms.length > 1) {
+            PhraseQuery pq = new PhraseQuery();
+            for (String s : terms) {
+                pq.add(new Term(field, s));
+            }
+            return pq;
+        }
+        return new TermQuery(new Term(field, terms[0]));
+    }
+
+    protected Query in(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        @SuppressWarnings("unchecked") //this is the expected type
+        Constant<Collection<?>> expectedConstant = (Constant<Collection<?>>) operation.getArg(1);
+        Collection<?> values = expectedConstant.getConstant();
+        BooleanQuery bq = new BooleanQuery();
+        if (Number.class.isAssignableFrom(path.getType())) {
+            for (Object value : values) {
+                TermQuery eq = new TermQuery(new Term(field, convertNumber((Number) value)));
+                bq.add(eq, Occur.SHOULD);
+            }
+        } else {
+            for (Object value : values) {
+                String[] str = convert(path, value);
+                bq.add(eq(field, str, ignoreCase), Occur.SHOULD);
+            }
+        }
+        return bq;
+    }
+
+    protected Query notIn(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(in(operation, metadata, false), Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query ne(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(eq(operation, metadata, ignoreCase), Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query startsWith(QueryMetadata metadata, Operation<?> operation, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == 0 ? terms[i] + "*" : "*" + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new PrefixQuery(new Term(field, terms[0]));
+    }
+
+
+
+    protected Query stringContains(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0] + "*"));
+    }
+
+    protected Query endsWith(Operation<?> operation, QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == terms.length - 1 ? "*" + terms[i] : "*" + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0]));
+    }
+
+    protected Query between(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        // TODO Phrase not properly supported
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                operation.getArg(2),
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query lt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                null,
+                operation.getArg(1),
+                false,
+                false,
+                metadata);
+    }
+
+    protected Query gt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                null,
+                false,
+                false,
+                metadata);
+    }
+
+    protected Query le(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                null,
+                operation.getArg(1),
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query ge(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(
+                path,
+                toField(path),
+                operation.getArg(1),
+                null,
+                true,
+                true,
+                metadata);
+    }
+
+    protected Query range(Path<?> leftHandSide, String field, @Nullable Expression<?> min,
+            @Nullable Expression<?> max, boolean minInc, boolean maxInc, QueryMetadata metadata) {
+        if (min != null && Number.class.isAssignableFrom(min.getType()) || max != null
+                && Number.class.isAssignableFrom(max.getType())) {
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> minConstant = (Constant<? extends Number>) min;
+            @SuppressWarnings("unchecked") //guarded by previous check
+            Constant<? extends Number> maxConstant = (Constant<? extends Number>) max;
+
+            Class<? extends Number> numType = minConstant != null ? minConstant.getType() : maxConstant.getType();
+            //this is not necessarily safe, but compile time checking
+            //on the user side mandates these types to be interchangeable
+            @SuppressWarnings("unchecked")
+            Class<Number> unboundedNumType = (Class<Number>) numType;
+            return numericRange(unboundedNumType, field, minConstant == null ? null
+                    : minConstant.getConstant(), maxConstant == null ? null
+                            : maxConstant.getConstant(), minInc, maxInc);
+        }
+        return stringRange(leftHandSide, field, min, max, minInc, maxInc, metadata);
+    }
+
+    protected <N extends Number> NumericRangeQuery<?> numericRange(Class<N> clazz, String field,
+            @Nullable N min, @Nullable N max, boolean minInc, boolean maxInc) {
+        if (clazz.equals(Integer.class)) {
+            return NumericRangeQuery.newIntRange(field, (Integer) min, (Integer) max, minInc, maxInc);
+        } else if (clazz.equals(Double.class)) {
+            return NumericRangeQuery.newDoubleRange(field, (Double) min, (Double) max, minInc, minInc);
+        } else if (clazz.equals(Float.class)) {
+            return NumericRangeQuery.newFloatRange(field, (Float) min, (Float) max, minInc, minInc);
+        } else if (clazz.equals(Long.class)) {
+            return NumericRangeQuery.newLongRange(field, (Long) min, (Long) max, minInc, minInc);
+        } else if (clazz.equals(Byte.class) || clazz.equals(Short.class)) {
+            return NumericRangeQuery.newIntRange(field, min != null ? min.intValue() : null,
+                    max != null ? max.intValue() : null, minInc, maxInc);
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type " + clazz.getName());
+        }
+    }
+
+    protected Query stringRange(
+            Path<?> leftHandSide,
+            String field,
+            @Nullable Expression<?> min,
+            @Nullable Expression<?> max,
+            boolean minInc,
+            boolean maxInc,
+            QueryMetadata metadata) {
+
+        if (min == null) {
+            return TermRangeQuery.newStringRange(
+                    field, null, convert(leftHandSide, max, metadata)[0], minInc, maxInc);
+        } else if (max == null) {
+            return TermRangeQuery.newStringRange(
+                    field, convert(leftHandSide, min, metadata)[0],
+                    null, minInc, maxInc);
+        } else {
+            return TermRangeQuery.newStringRange(
+                    field, convert(leftHandSide, min, metadata)[0],
+                    convert(leftHandSide, max, metadata)[0],
+                    minInc, maxInc);
+        }
+    }
+
+    private Path<?> getPath(Expression<?> leftHandSide) {
+        if (leftHandSide instanceof Path<?>) {
+            return (Path<?>) leftHandSide;
+        } else if (leftHandSide instanceof Operation<?>) {
+            Operation<?> operation = (Operation<?>) leftHandSide;
+            if (operation.getOperator() == Ops.LOWER || operation.getOperator() == Ops.UPPER) {
+                return (Path<?>) operation.getArg(0);
+            }
+        }
+        throw new IllegalArgumentException("Unable to transform " + leftHandSide + " to path");
+    }
+
+    /**
+     * template method, override to customize
+     *
+     * @param path path
+     * @return field name
+     */
+    protected String toField(Path<?> path) {
+        PathMetadata md = path.getMetadata();
+        if (md.getPathType() == PathType.COLLECTION_ANY) {
+            return toField(md.getParent());
+        } else {
+            String rv = md.getName();
+            if (md.getParent() != null) {
+                Path<?> parent = md.getParent();
+                if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
+                    rv = toField(parent) + "." + rv;
+                }
+            }
+            return rv;
+        }
+    }
+
+    private void verifyArguments(Operation<?> operation) {
+        List<Expression<?>> arguments = operation.getArgs();
+        for (int i = 1; i < arguments.size(); ++i) {
+            if (!(arguments.get(i) instanceof Constant<?>)
+                    && !(arguments.get(i) instanceof ParamExpression<?>)
+                    && !(arguments.get(i) instanceof PhraseElement)
+                    && !(arguments.get(i) instanceof TermElement)) {
+                throw new IllegalArgumentException("operand was of unsupported type "
+                        + arguments.get(i).getClass().getName());
+            }
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide left hand side
+     * @param rightHandSide right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
+        if (rightHandSide instanceof Operation) {
+            Operation<?> operation = (Operation<?>) rightHandSide;
+            if (operation.getOperator() == LuceneOps.PHRASE) {
+                return operation.getArg(0).toString().split("\\s+");
+            } else if (operation.getOperator() == LuceneOps.TERM) {
+                return new String[] {operation.getArg(0).toString()};
+            } else {
+                throw new IllegalArgumentException(rightHandSide.toString());
+            }
+        } else if (rightHandSide instanceof ParamExpression<?>) {
+            Object value = metadata.getParams().get(rightHandSide);
+            if (value == null) {
+                throw new ParamNotSetException((ParamExpression<?>) rightHandSide);
+            }
+            return convert(leftHandSide, value);
+
+        } else if (rightHandSide instanceof Constant<?>) {
+            return convert(leftHandSide, ((Constant<?>) rightHandSide).getConstant());
+        } else {
+            throw new IllegalArgumentException(rightHandSide.toString());
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide left hand side
+     * @param rightHandSide right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide, Object rightHandSide) {
+        String str = rightHandSide.toString();
+        if (lowerCase) {
+            str = str.toLowerCase();
+        }
+        if (splitTerms) {
+            if (str.equals("")) {
+                return new String[] {str};
+            } else {
+                return str.split("\\s+");
+            }
+        } else {
+            return new String[] {str};
+        }
+    }
+
+    private String[] convertEscaped(Path<?> leftHandSide, Expression<?> rightHandSide, QueryMetadata metadata) {
+        String[] str = convert(leftHandSide, rightHandSide, metadata);
+        for (int i = 0; i < str.length; i++) {
+            str[i] = QueryParser.escape(str[i]);
+        }
+        return str;
+    }
+
+    public Query toQuery(Expression<?> expr, QueryMetadata metadata) {
+        if (expr instanceof Operation<?>) {
+            return toQuery((Operation<?>) expr, metadata);
+        } else {
+            return toQuery(ExpressionUtils.extract(expr), metadata);
+        }
+    }
+
+    public Sort toSort(List<? extends OrderSpecifier<?>> orderBys) {
+        List<SortField> sorts = new ArrayList<SortField>(orderBys.size());
+        for (OrderSpecifier<?> order : orderBys) {
+            if (!(order.getTarget() instanceof Path<?>)) {
+                throw new IllegalArgumentException("argument was not of type Path.");
+            }
+            Class<?> type = order.getTarget().getType();
+            boolean reverse = !order.isAscending();
+            Path<?> path = getPath(order.getTarget());
+            if (Number.class.isAssignableFrom(type)) {
+                sorts.add(new SortField(toField(path), sortFields.get(type), reverse));
+            } else {
+                sorts.add(new SortField(toField(path), SortField.Type.STRING, reverse));
+            }
+        }
+        Sort sort = new Sort();
+        sort.setSort(sorts.toArray(new SortField[0]));
+        return sort;
+    }
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/PhraseElement.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/PhraseElement.java
new file mode 100644
index 0000000000..bf9e323b85
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/PhraseElement.java
@@ -0,0 +1,33 @@
+ /*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code PhraseElement} represents the embedded String as a phrase
+ *
+ * @author tiwe
+ *
+ */
+public class PhraseElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public PhraseElement(String str) {
+        super(LuceneOps.PHRASE, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/QueryElement.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/QueryElement.java
new file mode 100644
index 0000000000..a5e3c2c7db
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/QueryElement.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.apache.lucene.search.Query;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.BooleanOperation;
+
+/**
+ * {@code QueryElement} wraps a Lucene Query
+ *
+ * @author tiwe
+ *
+ */
+public class QueryElement extends BooleanOperation {
+
+    private static final long serialVersionUID = 470868107363840155L;
+
+    public QueryElement(Query query) {
+        super(LuceneOps.LUCENE_QUERY, ConstantImpl.create(query));
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/ResultIterator.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/ResultIterator.java
new file mode 100644
index 0000000000..38b827c66f
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/ResultIterator.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.QueryException;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code ResultIterator} is a {@link CloseableIterator} implementation for Lucene query results
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public final class ResultIterator<T> implements CloseableIterator<T> {
+
+    private final ScoreDoc[] scoreDocs;
+
+    private int cursor;
+
+    private final IndexSearcher searcher;
+
+    @Nullable
+    private final Set<String> fieldsToLoad;
+
+    private final Function<Document,T> transformer;
+
+    public ResultIterator(ScoreDoc[] scoreDocs, int offset, IndexSearcher searcher,
+            @Nullable Set<String> fieldsToLoad, Function<Document, T> transformer) {
+        this.scoreDocs = scoreDocs.clone();
+        this.cursor = offset;
+        this.searcher = searcher;
+        this.fieldsToLoad = fieldsToLoad;
+        this.transformer = transformer;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return cursor != scoreDocs.length;
+    }
+
+    @Override
+    public T next() {
+        try {
+            Document document;
+            if (fieldsToLoad != null) {
+                document = searcher.doc(scoreDocs[cursor++].doc, fieldsToLoad);
+            } else {
+                document = searcher.doc(scoreDocs[cursor++].doc);
+            }
+            return transformer.apply(document);
+        } catch (IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TermElement.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TermElement.java
new file mode 100644
index 0000000000..48a94127e6
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TermElement.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code TermElement} represents the embedded String as a term
+ *
+ * @author tiwe
+ *
+ */
+public class TermElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public TermElement(String str) {
+        super(LuceneOps.TERM, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TypedQuery.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TypedQuery.java
new file mode 100644
index 0000000000..af6855143c
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/TypedQuery.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code TypedQuery} is a typed query implementation for Lucene queries.
+ *
+ * <p>Converts Lucene documents to typed results via a constructor supplied transformer</p>
+ *
+ * @param <T> result type
+ *
+ * @author laim
+ * @author tiwe
+ */
+public class TypedQuery<T> extends AbstractLuceneQuery<T, TypedQuery<T>> {
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param searcher index searcher
+     * @param transformer transformer to transform Lucene documents to result objects
+     */
+    public TypedQuery(IndexSearcher searcher, Function<Document, T> transformer) {
+        super(searcher, transformer);
+    }
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param serializer serializer
+     * @param searcher index searcher
+     * @param transformer transformer to transform Lucene documents to result objects
+     */
+    public TypedQuery(LuceneSerializer serializer, IndexSearcher searcher, Function<Document, T> transformer) {
+        super(serializer, searcher, transformer);
+    }
+
+}
diff --git a/querydsl-lucene4/src/main/java/com/querydsl/lucene4/package-info.java b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/package-info.java
new file mode 100644
index 0000000000..277d096d54
--- /dev/null
+++ b/querydsl-lucene4/src/main/java/com/querydsl/lucene4/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Lucene 4 support
+ */
+package com.querydsl.lucene4;
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
deleted file mode 100644
index f1bce88607..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-import static com.mysema.query.QPerson.person;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.joda.time.LocalDate;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.StringPath;
-
-public class LuceneSerializerNotTokenizedTest {
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-    private LuceneSerializer serializer;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final Person clooney = new Person("actor_1", "George Clooney", new LocalDate(1961, 4, 6));
-    private final Person pitt = new Person("actor_2", "Brad Pitt", new LocalDate(1963, 12, 18));
-
-    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-        assertEquals(expectedQuery, query.toString());
-    }
-
-    private Document createDocument(Person person) {
-        Document doc = new Document();
-        doc.add(new Field("id", person.getId(), Store.YES, Index.NOT_ANALYZED));
-        doc.add(new Field("name", person.getName(), Store.YES, Index.NOT_ANALYZED));
-        doc.add(new Field("birthDate", person.getBirthDate().toString(), Store.YES, Index.NOT_ANALYZED));
-        return doc;
-    }
-
-    @Before
-    public void Before() throws Exception {
-        serializer = new LuceneSerializer(false, false);
-        idx = new RAMDirectory();
-        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31, 
-                new StandardAnalyzer(Version.LUCENE_30))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-        writer = new IndexWriter(idx, config);
-
-        writer.addDocument(createDocument(clooney));
-        writer.addDocument(createDocument(pitt));
-
-        Document document = new Document();
-        for (String movie : Arrays.asList("Interview with the Vampire",
-                                          "Up in the Air")) {
-            document.add(new Field("movie", movie, Store.YES, Index.NOT_ANALYZED));
-        }
-        writer.addDocument(document);
-
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-    }
-
-    @Test
-    public void Equals_By_Id_Matches() throws Exception {
-        testQuery(person.id.eq("actor_1"), "id:actor_1", 1);
-    }
-
-    @Test
-    public void Equals_By_Id_Does_Not_Match() throws Exception {
-        testQuery(person.id.eq("actor_8"), "id:actor_8", 0);
-    }
-
-    @Test
-    public void Equals_By_Name_Matches() throws Exception {
-        testQuery(person.name.eq("George Clooney"), "name:George Clooney", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Equals_By_Name_Ignoring_Case_Does_Not_Match() throws Exception {
-        testQuery(person.name.equalsIgnoreCase("george clooney"), "name:george clooney", 0);
-    }
-
-    @Test
-    public void Equals_By_Name_Does_Not_Match() throws Exception {
-        testQuery(person.name.eq("George Looney"), "name:George Looney", 0);
-    }
-
-    @Test
-    public void Starts_With_Name_Should_Match() throws Exception {
-        testQuery(person.name.startsWith("George C"), "name:George C*", 1);
-    }
-
-    @Test
-    public void Starts_With_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.startsWith("George L"), "name:George L*", 0);
-    }
-
-    @Test
-    public void Ends_With_Name_Should_Match() throws Exception {
-        testQuery(person.name.endsWith("e Clooney"), "name:*e Clooney", 1);
-    }
-
-    @Test
-    public void Ends_With_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.endsWith("e Looney"), "name:*e Looney", 0);
-    }
-
-    @Test
-    public void Contains_Name_Should_Match() throws Exception {
-        testQuery(person.name.contains("oney"), "name:*oney*", 1);
-    }
-
-    @Test
-    public void Contains_Name_Should_Not_Match() throws Exception {
-        testQuery(person.name.contains("bloney"), "name:*bloney*", 0);
-    }
-
-    @Test
-    public void In_Names_Should_Match_2() throws Exception {
-        testQuery(person.name.in("Brad Pitt", "George Clooney"), "name:Brad Pitt name:George Clooney", 2);
-    }
-
-    @Test
-    public void Or_By_Name_Should_Match_2() throws Exception {
-        testQuery(    person.name.eq("Brad Pitt")
-                  .or(person.name.eq("George Clooney")), "name:Brad Pitt name:George Clooney", 2);
-    }
-
-    @Test
-    public void Equals_By_Birth_Date() throws Exception {
-        testQuery(person.birthDate.eq(clooney.getBirthDate()), "birthDate:1961-04-06", 1);
-    }
-
-    @Test
-    public void Between_Phrase() throws Exception {
-        testQuery(person.name.between("Brad Pitt","George Clooney"), "name:[Brad Pitt TO George Clooney]", 2);
-    }
-
-    @Test
-    public void Not_Equals_Finds_The_Actors_And_Movies() throws Exception {
-        testQuery(person.name.ne("Michael Douglas"), "-name:Michael Douglas +*:*", 3);
-    }
-
-    @Test
-    public void Not_Equals_Finds_Only_Clooney_And_Movies() throws Exception {
-        testQuery(person.name.ne("Brad Pitt"), "-name:Brad Pitt +*:*", 2);
-    }
-
-    @Test
-    public void And_With_Two_Not_Equals_Doesnt_Find_The_Actors() throws Exception {
-        testQuery(     person.name.ne("Brad Pitt")
-                  .and(person.name.ne("George Clooney")), "+(-name:Brad Pitt +*:*) +(-name:George Clooney +*:*)", 1);
-    }
-
-    @Test
-    public void Or_With_Two_Not_Equals_Finds_Movies_And_Actors() throws Exception {
-        testQuery(    person.name.ne("Brad Pitt")
-                  .or(person.name.ne("George Clooney")), "(-name:Brad Pitt +*:*) (-name:George Clooney +*:*)", 3);
-    }
-
-    @Test
-    public void Negation_Of_Equals_Finds_Movies_And_Actors() throws Exception {
-        testQuery(person.name.eq("Michael Douglas").not(), "-name:Michael Douglas +*:*", 3);
-    }
-
-    @Test
-    public void Negation_Of_Equals_Finds_Pitt_And_Movies() throws Exception {
-        testQuery(person.name.eq("Brad Pitt").not(), "-name:Brad Pitt +*:*", 2);
-    }
-
-    @Test
-    public void Multiple_Field_Search_From_Movies() throws Exception {
-        StringPath movie = new StringPath("movie");
-        testQuery(movie.in("Interview with the Vampire"), "movie:Interview with the Vampire", 1);
-        testQuery(movie.eq("Up in the Air"), "movie:Up in the Air", 1);
-    }
-}
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerTest.java
deleted file mode 100644
index db9174a082..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/LuceneSerializerTest.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.StringReader;
-import java.util.Arrays;
-
-import com.mysema.query.lucene.LuceneExpressions;
-import com.mysema.query.lucene.LuceneSerializer;
-import com.mysema.query.lucene.QueryElement;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.*;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Tests for LuceneSerializer
- *
- * @author vema
- *
- */
-public class LuceneSerializerTest {
-    private LuceneSerializer serializer;
-    private PathBuilder<Object> entityPath;
-    private StringPath title;
-    private StringPath author;
-    private StringPath text;
-    private StringPath rating;
-    private StringPath publisher;
-    private NumberPath<Integer> year;
-    private NumberPath<Double> gross;
-
-    private NumberPath<Long> longField;
-    private NumberPath<Short> shortField;
-    private NumberPath<Byte> byteField;
-    private NumberPath<Float> floatField;
-
-    private static final String YEAR_PREFIX_CODED = "";
-    private static final String GROSS_PREFIX_CODED = "";
-    private static final String LONG_PREFIX_CODED = "";
-    private static final String SHORT_PREFIX_CODED = "";
-    private static final String BYTE_PREFIX_CODED = "";
-    private static final String FLOAT_PREFIX_CODED = "";
-
-    private IndexWriterConfig config;
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private Document createDocument() {
-        Document doc = new Document();
-
-        doc.add(new Field("title", new StringReader("Jurassic Park")));
-        doc.add(new Field("author", new StringReader("Michael Crichton")));
-        doc.add(new Field("text", new StringReader("It's a UNIX system! I know this!")));
-        doc.add(new Field("rating", new StringReader("Good")));
-        doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
-        doc.add(new IntField("year", 1990, Store.YES));
-        doc.add(new DoubleField("gross", 900.0, Store.YES));
-
-        doc.add(new LongField("longField", 1, Store.YES));
-        doc.add(new IntField("shortField", 1, Store.YES));
-        doc.add(new IntField("byteField", 1, Store.YES));
-        doc.add(new FloatField("floatField", 1, Store.YES));
-
-        return doc;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        serializer = new LuceneSerializer(true,true);
-        entityPath = new PathBuilder<Object>(Object.class, "obj");
-        title = entityPath.getString("title");
-        author = entityPath.getString("author");
-        text = entityPath.getString("text");
-        publisher = entityPath.getString("publisher");
-        year = entityPath.getNumber("year", Integer.class);
-        rating = entityPath.getString("rating");
-        gross = entityPath.getNumber("gross", Double.class);
-
-        longField = entityPath.getNumber("longField", Long.class);
-        shortField = entityPath.getNumber("shortField", Short.class);
-        byteField = entityPath.getNumber("byteField", Byte.class);
-        floatField = entityPath.getNumber("floatField", Float.class);
-
-        idx = new RAMDirectory();
-        config = new IndexWriterConfig(Version.LUCENE_42, 
-                new StandardAnalyzer(Version.LUCENE_42))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-        writer = new IndexWriter(idx, config);
-
-        writer.addDocument(createDocument());
-
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        searcher.getIndexReader().close();
-    }
-
-    private void testQuery(Expression<?> expr, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-    }
-
-    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
-        Query query = serializer.toQuery(expr, metadata);
-        TopDocs docs = searcher.search(query, 100);
-        assertEquals(expectedHits, docs.totalHits);
-        assertEquals(expectedQuery, query.toString());
-    }
-
-    @Test
-    public void QueryElement() throws Exception{
-        Query query1 = serializer.toQuery(author.like("Michael"), metadata);
-        Query query2 = serializer.toQuery(text.like("Text"), metadata);
-
-        BooleanExpression query = BooleanExpression.anyOf(
-            new QueryElement(query1),
-            new QueryElement(query2)
-        );
-        testQuery(query, "author:michael text:text", 1);
-    }
-
-    @Test
-    public void Like() throws Exception {
-        testQuery(author.like("*ichael*"), "author:*ichael*", 1);
-    }
-
-    @Test
-    public void Like_Custom_Wildcard_Single_Character() throws Exception {
-        testQuery(author.like("Mi?hael"), "author:mi?hael", 1);
-    }
-
-    @Test
-    public void Like_Custom_Wildcard_Multiple_Character() throws Exception {
-        testQuery(text.like("*U*X*"), "text:*u*x*", 1);
-    }
-
-    @Test
-    public void Like_Phrase() throws Exception {
-        testQuery(title.like("*rassic Par*"), "+title:**rassic* +title:*par**", 1);
-    }
-
-    @Test
-    public void Like_or_like() throws Exception {
-        testQuery(title.like("House").or(author.like("*ichae*")), "title:house author:*ichae*", 1);
-    }
-
-    @Test
-    public void Like_and_like() throws Exception {
-        testQuery(title.like("*assic*").and(rating.like("G?od")), "+title:*assic* +rating:g?od", 1);
-    }
-
-    @Test
-    public void Eq() throws Exception {
-        testQuery(rating.eq("good"), "rating:good", 1);
-    }
-
-    @Test
-    public void Eq_with_deep_path() throws Exception{
-        StringPath deepPath = entityPath.get("property1", Object.class).getString("property2");
-        testQuery(deepPath.eq("good"), "property1.property2:good", 0);
-    }
-
-    @Test
-    public void FuzzyLike() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good"), "rating:Good~2", 1);
-    }
-
-    @Test
-    public void FuzzyLike_with_Similarity() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2), "rating:Good~2", 1);
-    }
-
-    @Test
-    public void FuzzyLike_with_Similarity_and_prefix() throws Exception{
-        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2, 0), "rating:Good~2", 1);
-    }
-
-    @Test
-    @Ignore
-    public void Eq_Numeric_Integer() throws Exception {
-        testQuery(year.eq(1990), "year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    @Ignore
-    public void Eq_Numeric_Double() throws Exception {
-        testQuery(gross.eq(900.00), "gross:" + GROSS_PREFIX_CODED, 1);
-    }
-
-    @Test
-    @Ignore
-    public void Eq_Numeric() throws Exception{
-        testQuery(longField.eq(1l), "longField:" + LONG_PREFIX_CODED, 1);
-        testQuery(shortField.eq((short)1), "shortField:" + SHORT_PREFIX_CODED, 1);
-        testQuery(byteField.eq((byte)1), "byteField:" + BYTE_PREFIX_CODED, 1);
-        testQuery(floatField.eq((float)1.0), "floatField:" + FLOAT_PREFIX_CODED, 1);
-    }
-
-    @Test
-    public void Equals_Ignores_Case() throws Exception {
-        testQuery(title.eq("Jurassic"), "title:jurassic", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Title_Equals_Ignore_Case_Or_Year_Equals() throws Exception {
-        testQuery(title.equalsIgnoreCase("House").or(year.eq(1990)), "title:house year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    @Ignore
-    public void Eq_and_eq() throws Exception {
-        testQuery(title.eq("Jurassic Park").and(year.eq(1990)), "+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED, 1);
-    }
-
-    @Test
-    @Ignore
-    public void Eq_and_Eq_and_eq() throws Exception {
-        testQuery(title.eq("Jurassic Park").and(year.eq(1990)).and(author.eq("Michael Crichton")), "+(+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED + ") +author:\"michael crichton\"", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Equals_Ignore_Case_And_Or() throws Exception {
-        testQuery(title.equalsIgnoreCase("Jurassic Park").and(rating.equalsIgnoreCase("Bad")).or(author.equalsIgnoreCase("Michael Crichton")), "(+title:\"jurassic park\" +rating:bad) author:\"michael crichton\"", 1);
-    }
-
-    @Test
-    public void Eq_or_Eq_and_Eq_Does_Not_Find_Results() throws Exception {
-        testQuery(title.eq("jeeves").or(rating.eq("superb")).and(author.eq("michael crichton")), "+(title:jeeves rating:superb) +author:\"michael crichton\"", 0);
-    }
-
-    @Test
-    public void Eq_Phrase() throws Exception {
-        testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
-    }
-
-    @Test
-    @Ignore("Not easily done in Lucene!")
-    public void Publisher_Equals_Empty_String() throws Exception {
-        testQuery(publisher.eq(""), "publisher:", 1);
-    }
-
-    @Test
-    public void Eq_Phrase_Should_Not_Find_Results_But_LuceNe_Semantics_Differs_From_Querydsls() throws Exception {
-        testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
-    }
-
-    @Test
-    public void Eq_Phrase_Does_Not_Find_Results_Because_Word_In_Middle() throws Exception {
-        testQuery(title.eq("Jurassic Amusement Park"), "title:\"jurassic amusement park\"", 0);
-    }
-
-    @Test
-    public void Like_not_Does_Not_Find_Results() throws Exception {
-        testQuery(title.like("*H*e*").not(), "-title:*h*e* +*:*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Title_Equals_Ignore_Case_Negation_Or_Rating_Equals_Ignore_Case() throws Exception {
-        testQuery(title.equalsIgnoreCase("House").not().or(rating.equalsIgnoreCase("Good")), "-title:house rating:good", 1);
-    }
-
-    @Test
-    public void Eq_not_Does_Not_Find_Results() throws Exception {
-        testQuery(title.eq("Jurassic Park").not(), "-title:\"jurassic park\" +*:*", 0);
-    }
-
-    @Test
-    public void Title_Equals_Not_House() throws Exception {
-        testQuery(title.eq("house").not(), "-title:house +*:*", 1);
-    }
-
-    @Test
-    public void Eq_and_Eq_not_Does_Not_Find_Results_Because_Second_Expression_Finds_Nothing() throws Exception {
-        testQuery(rating.eq("superb").and(title.eq("house").not()), "+rating:superb +(-title:house +*:*)", 0);
-    }
-
-    @Test
-    public void Not_Equals_Finds_One() throws Exception {
-        testQuery(title.ne("house"), "-title:house +*:*", 1);
-    }
-
-    @Test
-    public void Not_Equals_Finds_None() throws Exception {
-        testQuery(title.ne("Jurassic Park"), "-title:\"jurassic park\" +*:*", 0);
-    }
-
-    @Test
-    public void Nothing_Found_With_Not_Equals_Or_Equals() throws Exception {
-        testQuery(title.ne("jurassic park").or(rating.eq("lousy")), "(-title:\"jurassic park\" +*:*) rating:lousy", 0);
-    }
-
-    @Test
-    public void Ne_and_eq() throws Exception {
-        testQuery(title.ne("house").and(rating.eq("good")), "+(-title:house +*:*) +rating:good", 1);
-    }
-
-    @Test
-    public void StartsWith() throws Exception {
-        testQuery(title.startsWith("Jurassi"), "title:jurassi*", 1);
-    }
-
-    @Test
-    public void StartsWith_Phrase() throws Exception {
-        testQuery(title.startsWith("jurassic par"), "+title:jurassic* +title:*par*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Starts_With_Ignore_Case_Phrase_Does_Not_Find_Results() throws Exception {
-        testQuery(title.startsWithIgnoreCase("urassic Par"), "+title:urassic* +title:*par*", 0);
-    }
-
-    @Test
-    public void EndsWith() throws Exception {
-        testQuery(title.endsWith("ark"), "title:*ark", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Ends_With_Ignore_Case_Phrase() throws Exception {
-        testQuery(title.endsWithIgnoreCase("sic Park"), "+title:*sic* +title:*park", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Ends_With_Ignore_Case_Phrase_Does_Not_Find_Results() throws Exception {
-        testQuery(title.endsWithIgnoreCase("sic Par"), "+title:*sic* +title:*par", 0);
-    }
-
-    @Test
-    public void Contains() throws Exception {
-        testQuery(title.contains("rassi"), "title:*rassi*", 1);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void Contains_Ignore_Case_Phrase() throws Exception {
-        testQuery(title.containsIgnoreCase("rassi Pa"), "+title:*rassi* +title:*pa*", 1);
-    }
-
-    @Test
-    public void Contains_User_Inputted_Wildcards_Dont_Work() throws Exception {
-        testQuery(title.contains("r*i"), "title:*r\\*i*", 0);
-    }
-
-    @Test
-    public void Between() throws Exception {
-        testQuery(title.between("Indiana", "Kundun"), "title:[indiana TO kundun]", 1);
-    }
-
-    @Test
-    public void Between_Numeric_Integer() throws Exception {
-        testQuery(year.between(1980, 2000), "year:[1980 TO 2000]", 1);
-    }
-
-    @Test
-    public void Between_Numeric_Double() throws Exception {
-        testQuery(gross.between(10.00, 19030.00), "gross:[10.0 TO 19030.0]", 1);
-    }
-
-    @Test
-    public void Between_Numeric() throws Exception{
-        testQuery(longField.between(0l,2l), "longField:[0 TO 2]", 1);
-        testQuery(shortField.between((short)0,(short)2), "shortField:[0 TO 2]", 1);
-        testQuery(byteField.between((byte)0,(byte)2), "byteField:[0 TO 2]", 1);
-        testQuery(floatField.between((float)0.0,(float)2.0), "floatField:[0.0 TO 2.0]", 1);
-    }
-
-    @Test
-    public void Between_Is_Inclusive_From_Start() throws Exception {
-        testQuery(title.between("Jurassic", "Kundun"), "title:[jurassic TO kundun]", 1);
-    }
-
-    @Test
-    public void Between_Is_Inclusive_To_End() throws Exception {
-        testQuery(title.between("Indiana", "Jurassic"), "title:[indiana TO jurassic]", 1);
-    }
-
-    @Test
-    public void Between_Does_Not_Find_Results() throws Exception {
-        testQuery(title.between("Indiana", "Jurassib"), "title:[indiana TO jurassib]", 0);
-    }
-
-    @Test
-    public void In() throws Exception {
-        testQuery(title.in(Arrays.asList("jurassic", "park")), "title:jurassic title:park", 1);
-        testQuery(title.in("jurassic","park"), "title:jurassic title:park", 1);
-        testQuery(title.eq("jurassic").or(title.eq("park")), "title:jurassic title:park", 1);
-    }
-
-    @Test
-    public void Lt() throws Exception {
-        testQuery(rating.lt("Superb"), "rating:{* TO superb}", 1);
-    }
-
-    @Test
-    public void Lt_Numeric_Integer() throws Exception {
-        testQuery(year.lt(1991), "year:{* TO 1991}", 1);
-    }
-
-    @Test
-    public void Lt_Numeric_Double() throws Exception {
-        testQuery(gross.lt(10000.0), "gross:{* TO 10000.0}", 1);
-    }
-
-    @Test
-    public void Lt_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(rating.lt("Good"), "rating:{* TO good}", 0);
-    }
-
-    @Test
-    public void Lt_Numeric_Integer_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(year.lt(1990), "year:{* TO 1990}", 0);
-    }
-
-    @Test
-    public void Lt_Numeric_Double_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(gross.lt(900.0), "gross:{* TO 900.0}", 0);
-    }
-
-    @Test
-    public void Loe() throws Exception {
-        testQuery(rating.loe("Superb"), "rating:[* TO superb]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer() throws Exception {
-        testQuery(year.loe(1991), "year:[* TO 1991]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Double() throws Exception {
-        testQuery(gross.loe(903.0), "gross:[* TO 903.0]", 1);
-    }
-
-    @Test
-    public void Loe_Equal() throws Exception {
-        testQuery(rating.loe("Good"), "rating:[* TO good]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer_Equal() throws Exception {
-        testQuery(year.loe(1990), "year:[* TO 1990]", 1);
-    }
-
-    @Test
-    public void Loe_Numeric_Double_Equal() throws Exception {
-        testQuery(gross.loe(900.0), "gross:[* TO 900.0]", 1);
-    }
-
-    @Test
-    public void Loe_Not_Found() throws Exception {
-        testQuery(rating.loe("Bad"), "rating:[* TO bad]", 0);
-    }
-
-    @Test
-    public void Loe_Numeric_Integer_Not_Found() throws Exception {
-        testQuery(year.loe(1989), "year:[* TO 1989]", 0);
-    }
-
-    @Test
-    public void Loe_Numeric_Double_Not_Found() throws Exception {
-        testQuery(gross.loe(899.9), "gross:[* TO 899.9]", 0);
-    }
-
-    @Test
-    public void Gt() throws Exception {
-        testQuery(rating.gt("Bad"), "rating:{bad TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Numeric_Integer() throws Exception {
-        testQuery(year.gt(1989), "year:{1989 TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Numeric_Double() throws Exception {
-        testQuery(gross.gt(100.00), "gross:{100.0 TO *}", 1);
-    }
-
-    @Test
-    public void Gt_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(rating.gt("Good"), "rating:{good TO *}", 0);
-    }
-
-    @Test
-    public void Gt_Numeric_Integer_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(year.gt(1990), "year:{1990 TO *}", 0);
-    }
-
-    @Test
-    public void Gt_Numeric_Double_Not_In_Range_Because_Equal() throws Exception {
-        testQuery(gross.gt(900.00), "gross:{900.0 TO *}", 0);
-    }
-
-    @Test
-    public void Goe() throws Exception {
-        testQuery(rating.goe("Bad"), "rating:[bad TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer() throws Exception {
-        testQuery(year.goe(1989), "year:[1989 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Double() throws Exception {
-        testQuery(gross.goe(320.50), "gross:[320.5 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Equal() throws Exception {
-        testQuery(rating.goe("Good"), "rating:[good TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer_Equal() throws Exception {
-        testQuery(year.goe(1990), "year:[1990 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Numeric_Double_Equal() throws Exception {
-        testQuery(gross.goe(900.00), "gross:[900.0 TO *]", 1);
-    }
-
-    @Test
-    public void Goe_Not_Found() throws Exception {
-        testQuery(rating.goe("Hood"), "rating:[hood TO *]", 0);
-    }
-
-    @Test
-    public void Goe_Numeric_Integer_Not_Found() throws Exception {
-        testQuery(year.goe(1991), "year:[1991 TO *]", 0);
-    }
-
-    @Test
-    public void Goe_Numeric_Double_Not_Found() throws Exception {
-        testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
-    }
-
-    @Test
-    public void Equals_Empty_String() throws Exception {
-        testQuery(title.eq(""), "title:", 0);
-    }
-
-    @Test
-    public void Not_Equals_Empty_String() throws Exception {
-        testQuery(title.ne(""), "-title: +*:*", 1);
-    }
-
-    @Test
-    public void Contains_Empty_String() throws Exception {
-        testQuery(title.contains(""), "title:**", 1);
-    }
-
-    @Test
-    public void Like_Empty_String() throws Exception {
-        testQuery(title.like(""), "title:", 0);
-    }
-
-    @Test
-    public void Starts_With_Empty_String() throws Exception {
-        testQuery(title.startsWith(""), "title:*", 1);
-    }
-
-    @Test
-    public void Ends_With_Empty_String() throws Exception {
-        testQuery(title.endsWith(""), "title:*", 1);
-    }
-
-    @Test
-    public void Between_Empty_Strings() throws Exception {
-        testQuery(title.between("", ""), "title:[ TO ]", 0);
-    }
-
-    @Test
-    public void BooleanBuilder() throws Exception{
-        testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]", 0);
-    }
-
-    @Test
-    @Ignore
-    public void Fuzzy() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    @Test
-    @Ignore
-    public void Proximity() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    @Test
-    @Ignore
-    public void Boost() throws Exception {
-        fail("Not yet implemented!");
-    }
-
-    private boolean unsupportedOperation(Predicate filter) {
-        if (filter instanceof Operation<?>) {
-            Operator<?> op = ((Operation<?>) filter).getOperator();
-            if (op == Ops.STARTS_WITH_IC || op == Ops.EQ_IGNORE_CASE || op == Ops.STARTS_WITH_IC
-                || op == Ops.ENDS_WITH_IC || op == Ops.STRING_CONTAINS_IC) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Test
-    public void various() throws Exception{
-        MatchingFiltersFactory filters = new MatchingFiltersFactory(Module.LUCENE, Target.LUCENE);
-        for (Predicate filter : filters.string(title, StringConstant.create("jurassic park"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 1);
-        }
-
-        for (Predicate filter : filters.string(author, StringConstant.create("michael crichton"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 1);
-        }
-
-        for (Predicate filter : filters.string(title, StringConstant.create("1990"))) {
-            if (unsupportedOperation(filter)) {
-                continue;
-            }
-            testQuery(filter, 0);
-        }
-    }
-
-}
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/Person.java b/querydsl-lucene4/src/test/java/com/mysema/query/Person.java
deleted file mode 100644
index 32a1ad42e9..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/Person.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.joda.time.LocalDate;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@QueryEntity
-public class Person {
-    private final String id;
-    private final String name;
-    private final LocalDate birthDate;
-
-    public Person(String id, String name, LocalDate birthDate) {
-        this.id = id;
-        this.name = name;
-        this.birthDate = birthDate;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public LocalDate getBirthDate() {
-        return birthDate;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
-
-
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
deleted file mode 100644
index e2f2563f0e..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.easymock.EasyMock.createMockBuilder;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.sandbox.queries.DuplicateFilter;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.collect.Sets;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.expr.Param;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-/**
- * Tests for LuceneQuery
- *
- * @author vema
- *
- */
-public class LuceneQueryTest {
-
-    private LuceneQuery query;
-    private StringPath title;
-    private NumberPath<Integer> year;
-    private NumberPath<Double> gross;
-
-    private final StringPath sort = new StringPath("sort");
-
-    private RAMDirectory idx;
-    private IndexWriter writer;
-    private IndexSearcher searcher;
-
-    private Document createDocument(final String docTitle,
-            final String docAuthor, final String docText, final int docYear,
-            final double docGross) {
-        final Document doc = new Document();
-
-        doc.add(new TextField("title", docTitle, Store.YES));
-        doc.add(new TextField("author", docAuthor, Store.YES));
-        doc.add(new TextField("text", docText, Store.YES));
-        doc.add(new IntField("year", docYear, Store.YES));
-        doc.add(new DoubleField("gross", docGross,  Store.YES));
-
-        return doc;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        final QDocument entityPath = new QDocument("doc");
-        title = entityPath.title;
-        year = entityPath.year;
-        gross = entityPath.gross;
-
-        
-        idx = new RAMDirectory();
-        writer = createWriter(idx);
-
-        writer.addDocument(createDocument("Jurassic Park", "Michael Crichton",
-                "It's a UNIX system! I know this!", 1990, 90.00));
-        writer.addDocument(createDocument("Nummisuutarit", "Aleksis Kivi",
-                "ESKO. Ja iloitset ja riemuitset?", 1864, 10.00));
-        writer
-                .addDocument(createDocument(
-                        "The Lord of the Rings",
-                        "John R. R. Tolkien",
-                        "One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them",
-                        1954, 89.00));
-        writer
-                .addDocument(createDocument(
-                        "Introduction to Algorithms",
-                        "Thomas H. Cormen, Charles E. Leiserson, Ronald L. Rivest, and Clifford Stein",
-                        "Bubble sort", 1990, 30.50));
-
-        writer.close();
-        
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-    }
-
-    private IndexWriter createWriter(RAMDirectory idx) throws Exception {
-        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31, 
-                new StandardAnalyzer(Version.LUCENE_42))
-            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);        
-        return new IndexWriter(idx, config);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        searcher.getIndexReader().close();
-    }
-
-    @Test
-    public void Count_Empty_Where_Clause() {
-        assertEquals(4, query.count());
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query.where(title.eq("Jurassic Park")).exists());
-        assertFalse(query.where(title.eq("Jurassic Park X")).exists());
-    }
-
-    @Test
-    public void NotExists() {
-        assertFalse(query.where(title.eq("Jurassic Park")).notExists());
-        assertTrue(query.where(title.eq("Jurassic Park X")).notExists());
-    }
-
-    @Test
-    public void Count() {
-        query.where(title.eq("Jurassic Park"));
-        assertEquals(1, query.count());
-    }
-
-    @Test(expected = QueryException.class)
-    @Ignore
-    public void Count_Index_Problem() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andThrow(new IllegalArgumentException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.count();
-        verify(searcher);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void CountDistinct() {
-        query.where(year.between(1900, 3000));
-        assertEquals(3, query.distinct().count());
-    }
-
-    @Test
-    public void List_Sorted_By_Year_Ascending() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted() {
-        query.where(year.between(1800, 2000));
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    @Ignore // FIXME
-    public void Sorted_By_Different_Locales() throws Exception {
-        Document d1 = new Document();
-        Document d2 = new Document();
-        Document d3 = new Document();
-        d1.add(new Field("sort", "a\u00c4",Store.YES, Index.NOT_ANALYZED));
-        d2.add(new Field("sort", "ab",Store.YES, Index.NOT_ANALYZED));
-        d3.add(new Field("sort", "aa",Store.YES, Index.NOT_ANALYZED));
-        writer = createWriter(idx);
-        writer.addDocument(d1);
-        writer.addDocument(d2);
-        writer.addDocument(d3);
-        writer.close();
-
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true, Locale.ENGLISH), searcher);
-        assertEquals(3, query.list().size());
-        List<Document> results = query.where(sort.startsWith("a")).orderBy(sort.asc()).list();
-        assertEquals(3, results.size());
-        assertEquals("aa", results.get(0).getField("sort").stringValue());
-        assertEquals("a\u00c4", results.get(1).getField("sort").stringValue());
-        assertEquals("ab", results.get(2).getField("sort").stringValue());
-
-        query = new LuceneQuery(new LuceneSerializer(true, true, new Locale("fi", "FI")), searcher);
-        results = query.where(sort.startsWith("a")).orderBy(sort.asc()).list();
-        assertEquals("aa", results.get(0).getField("sort").stringValue());
-        assertEquals("ab", results.get(1).getField("sort").stringValue());
-        assertEquals("a\u00c4", results.get(2).getField("sort").stringValue());
-    }
-
-    @Test
-    public void List_Not_Sorted_Limit_2() {
-        query.where(year.between(1800, 2000));
-        query.limit(2);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-    }
-
-    @Test
-    public void List_Sorted_By_Year_Limit_1() {
-        query.where(year.between(1800, 2000));
-        query.limit(1);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(1, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted_Offset_2() {
-        query.where(year.between(1800, 2000));
-        query.offset(2);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year_Offset_2() {
-        query.where(year.between(1800, 2000));
-        query.offset(2);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year_Restrict_Limit_2_Offset_1() {
-        query.where(year.between(1800, 2000));
-        query.restrict(new QueryModifiers(2l, 1l));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(2, documents.size());
-        assertEquals("1954", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-    }
-
-    @Test
-    public void List_Sorted_Ascending_By_Year() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1864", documents.get(0).get("year"));
-        assertEquals("1954", documents.get(1).get("year"));
-        assertEquals("1990", documents.get(2).get("year"));
-        assertEquals("1990", documents.get(3).get("year"));
-    }
-    
-
-    @Test
-    public void List_Sort() {
-        Sort sort = LuceneSerializer.DEFAULT.toSort(Collections.singletonList(year.asc()));
-        
-        query.where(year.between(1800, 2000));
-        //query.orderBy(year.asc());
-        query.sort(sort);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1864", documents.get(0).get("year"));
-        assertEquals("1954", documents.get(1).get("year"));
-        assertEquals("1990", documents.get(2).get("year"));
-        assertEquals("1990", documents.get(3).get("year"));
-    }
-
-    @Test
-    public void List_Distinct_Property() {
-        assertEquals(4, query.list().size());
-        assertEquals(3, query.distinct(year).list().size());
-    }
-
-    @Test
-    public void List_With_Filter() {
-        Filter filter = new DuplicateFilter("year");
-        assertEquals(4, query.list().size());
-        assertEquals(3, query.filter(filter).list().size());
-    }
-
-    @Test
-    public void Count_Distinct_Property() {
-        assertEquals(4l, query.count());
-        assertEquals(3l, query.distinct(year).count());
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("1954", documents.get(2).get("year"));
-        assertEquals("1864", documents.get(3).get("year"));
-    }
-    
-
-    @Test
-    public void List_Sorted_Descending_By_Gross() {
-        query.where(gross.between(0.0, 1000.00));
-        query.orderBy(gross.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("90.0", documents.get(0).get("gross"));
-        assertEquals("89.0", documents.get(1).get("gross"));
-        assertEquals("30.5", documents.get(2).get("gross"));
-        assertEquals("10.0", documents.get(3).get("gross"));
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year_And_Ascending_By_Title() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        query.orderBy(title.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("Introduction to Algorithms", documents.get(0)
-                .get("title"));
-        assertEquals("Jurassic Park", documents.get(1).get("title"));
-    }
-
-    @Test
-    public void List_Sorted_Descending_By_Year_And_Descending_By_Title() {
-        query.where(year.between(1800, 2000));
-        query.orderBy(year.desc());
-        query.orderBy(title.desc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-        assertEquals("1990", documents.get(0).get("year"));
-        assertEquals("1990", documents.get(1).get("year"));
-        assertEquals("Jurassic Park", documents.get(0).get("title"));
-        assertEquals("Introduction to Algorithms", documents.get(1)
-                .get("title"));
-    }
-
-    @Ignore
-    @Test(expected = QueryException.class)
-    public void List_Index_Problem_In_Max_Doc() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.list();
-        verify(searcher);
-    }
-
-    @Ignore
-    @Test(expected = QueryException.class)
-    public void List_Sorted_Index_Problem_In_Max_Doc() throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.orderBy(title.asc());
-        query.list();
-        verify(searcher);
-    }
-
-    @Test
-    public void Offset() {
-        assertTrue(query.where(title.eq("Jurassic Park")).offset(30).list()
-                .isEmpty());
-    }
-
-
-    @Test
-    public void Load_List() {
-        Document document = query.where(title.ne("")).load(title).list().get(0);
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_List_FieldSelector() {
-        Document document = query.where(title.ne("")).load(Sets.newHashSet("title")).list().get(0);
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_SingleResult() {
-        Document document = query.where(title.ne("")).load(title).singleResult();
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void Load_SingleResult_FieldSelector() {
-        Document document = query.where(title.ne("")).load(Sets.newHashSet("title")).singleResult();
-        assertNotNull(document.get("title"));
-        assertNull(document.get("year"));
-    }
-
-    @Test
-    public void SingleResult() {
-        assertNotNull(query.where(title.ne("")).singleResult());
-    }
-
-    @Test
-    public void Single_Result_Takes_Limit() {
-        assertEquals("Jurassic Park", query
-                                        .where(title.ne(""))
-                                        .limit(1)
-                                        .singleResult().get("title"));
-    }
-
-    @Test
-    public void Single_Result_Considers_Limit_And_Actual_Result_Size() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.limit(3).singleResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void Single_Result_Returns_Null_If_Nothing_Is_In_Range() {
-        query.where(title.startsWith("Nummi"));
-        assertNull(query.offset(10).singleResult());
-    }
-
-    @Test
-    public void Single_Result_Considers_Offset() {
-        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).singleResult().get("title"));
-    }
-
-    @Test
-    public void Single_Result_Considers_Limit_And_Offset() {
-        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).singleResult().get("title"));
-    }
-
-    @Test(expected=NonUniqueResultException.class)
-    public void UniqueResult_Contract() {
-        query.where(title.ne("")).uniqueResult();
-    }
-
-    @Test
-    public void Unique_Result_Takes_Limit() {
-        assertEquals("Jurassic Park", query
-                                        .where(title.ne(""))
-                                        .limit(1)
-                                        .uniqueResult().get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Considers_Limit_And_Actual_Result_Size() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.limit(3).uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Returns_Null_If_Nothing_Is_In_Range() {
-        query.where(title.startsWith("Nummi"));
-        assertNull(query.offset(10).uniqueResult());
-    }
-
-    @Test
-    public void Unique_Result_Considers_Offset() {
-        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).uniqueResult().get("title"));
-    }
-
-    @Test
-    public void Unique_Result_Considers_Limit_And_Offset() {
-        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).uniqueResult().get("title"));
-    }
-
-    @Test
-    public void UniqueResult() {
-        query.where(title.startsWith("Nummi"));
-        final Document document = query.uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test
-    public void UniqueResult_With_Param() {
-        final Param<String> param = new Param<String>(String.class, "title");
-        query.set(param, "Nummi");
-        query.where(title.startsWith(param));
-        final Document document = query.uniqueResult();
-        assertEquals("Nummisuutarit", document.get("title"));
-    }
-
-    @Test(expected = ParamNotSetException.class)
-    public void UniqueResult_Param_Not_Set() {
-        final Param<String> param = new Param<String>(String.class, "title");
-        query.where(title.startsWith(param));
-        query.uniqueResult();
-    }
-
-    @Test(expected = QueryException.class)
-    public void UniqueResult_Finds_More_Than_One_Result() {
-        query.where(year.eq(1990));
-        query.uniqueResult();
-    }
-
-    @Test
-    public void UniqueResult_Finds_No_Results() {
-        query.where(year.eq(2200));
-        assertNull(query.uniqueResult());
-    }
-
-    @Test
-    @Ignore
-    public void UniqueResult_Finds_No_Results_Because_No_Documents_In_Index()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
-        replay(searcher);
-        assertNull(query.where(year.eq(3000)).uniqueResult());
-        verify(searcher);
-    }
-
-    @Test(expected = QueryException.class)
-    @Ignore
-    public void UniqueResult_Sorted_Index_Problem_In_Max_Doc()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andThrow(new IllegalArgumentException());
-        replay(searcher);
-        query.where(title.eq("Jurassic Park"));
-        query.uniqueResult();
-        verify(searcher);
-    }
-
-    @Test
-    @Ignore
-    public void Count_Returns_0_Because_No_Documents_In_Index()
-            throws IOException {
-        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
-                "maxDoc").createMock();
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
-        replay(searcher);
-        assertEquals(0, query.where(year.eq(3000)).count());
-        verify(searcher);
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void ListDistinct() {
-        query.where(year.between(1900, 2000).or(title.startsWith("Jura")));
-        query.orderBy(year.asc());
-        final List<Document> documents = query.distinct().list();
-        assertFalse(documents.isEmpty());
-        assertEquals(3, documents.size());
-    }
-
-    @Test
-    public void ListResults() {
-        query.where(year.between(1800, 2000));
-        query.restrict(new QueryModifiers(2l, 1l));
-        query.orderBy(year.asc());
-        final SearchResults<Document> results = query.listResults();
-        assertFalse(results.isEmpty());
-        assertEquals("1954", results.getResults().get(0).get("year"));
-        assertEquals("1990", results.getResults().get(1).get("year"));
-        assertEquals(2, results.getLimit());
-        assertEquals(1, results.getOffset());
-        assertEquals(4, results.getTotal());
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void ListDistinctResults() {
-        query.where(year.between(1800, 2000).or(
-                title.eq("The Lord of the Rings")));
-        query.restrict(new QueryModifiers(1l, 1l));
-        query.orderBy(year.asc());
-        final SearchResults<Document> results = query.distinct().listResults();
-        assertFalse(results.isEmpty());
-        assertEquals("1954", results.getResults().get(0).get("year"));
-        assertEquals(1, results.getLimit());
-        assertEquals(1, results.getOffset());
-        assertEquals(4, results.getTotal());
-    }
-
-    @Test
-    public void List_All() {
-        final List<Document> results = query.where(title.like("*")).orderBy(
-                title.asc(), year.desc()).list();
-        assertEquals(4, results.size());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Limit_Negative() {
-        query.where(year.between(1800, 2000));
-        query.limit(-1);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Limit_Negative() {
-        query.where(year.between(1800, 2000));
-        query.limit(-1);
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Limit_0() {
-        query.where(year.between(1800, 2000));
-        query.limit(0);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Limit_0() {
-        query.where(year.between(1800, 2000));
-        query.limit(0);
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Sorted_Ascending_Offset_Negative() {
-        query.where(year.between(1800, 2000));
-        query.offset(-1);
-        query.orderBy(year.asc());
-        query.list();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void List_Not_Sorted_Offset_Negative() {
-        query.where(year.between(1800, 2000));
-        query.offset(-1);
-        query.list();
-    }
-
-    @Test
-    public void List_Sorted_Ascending_Offset_0() {
-        query.where(year.between(1800, 2000));
-        query.offset(0);
-        query.orderBy(year.asc());
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void List_Not_Sorted_Offset_0() {
-        query.where(year.between(1800, 2000));
-        query.offset(0);
-        final List<Document> documents = query.list();
-        assertFalse(documents.isEmpty());
-        assertEquals(4, documents.size());
-    }
-
-    @Test
-    public void Iterate() {
-        query.where(year.between(1800, 2000));
-        final Iterator<Document> iterator = query.iterate();
-        int count = 0;
-        while (iterator.hasNext()) {
-            iterator.next();
-            ++count;
-        }
-        assertEquals(4, count);
-    }
-
-    @Test
-    public void All_By_Excluding_Where() {
-        assertEquals(4, query.list().size());
-    }
-
-    @Test
-    public void Empty_Index_Should_Return_Empty_List() throws Exception {
-        idx = new RAMDirectory();
-        
-        writer = createWriter(idx);
-        writer.close();
-        IndexReader reader = IndexReader.open(idx);
-        searcher = new IndexSearcher(reader);
-        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
-        assertTrue(query.list().isEmpty());
-    }
-
-    @Test(expected = QueryException.class)
-    public void List_Results_Throws_An_Illegal_Argument_Exception_When_Sum_Of_Limit_And_Offset_Is_Negative() {
-        query.limit(1).offset(Integer.MAX_VALUE).listResults();
-    }
-    
-    @Test
-    public void Limit_Max_Value() {
-        assertEquals(4, query.limit(Long.MAX_VALUE).list().size());
-    }
-}
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/PhraseElementTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/lucene/PhraseElementTest.java
deleted file mode 100644
index 2cad5c07f8..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/PhraseElementTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.path.StringPath;
-
-public class PhraseElementTest {
-
-    @Test
-    public void test() {
-        StringPath title = new StringPath("title");
-        LuceneSerializer serializer = new LuceneSerializer(false,false);
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        assertEquals("title:Hello World", serializer.toQuery(title.eq("Hello World"), metadata).toString());
-        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq(new PhraseElement("Hello World")), metadata).toString());
-    }
-
-    @Test
-    public void Equals() {
-        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x"), el3 = new PhraseElement("y");
-        assertEquals(el1, el2);
-        assertFalse(el1.equals(el3));
-    }
-
-    @Test
-    public void HashCode() {
-        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x");
-        assertEquals(el1.hashCode(), el2.hashCode());
-    }
-
-}
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QDocument.java b/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QDocument.java
deleted file mode 100644
index f8583ca853..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QDocument.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import org.apache.lucene.document.Document;
-
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-public class QDocument extends EntityPathBase<Document> {
-
-    private static final long serialVersionUID = -4872833626508344081L;
-
-    public QDocument(final String var) {
-        super(Document.class, PathMetadataFactory.forVariable(var));
-    }
-
-    public final NumberPath<Integer> year = createNumber("year", Integer.class);
-    
-    public final StringPath title = createString("title");
-    
-    public final NumberPath<Double> gross = createNumber("gross", Double.class);
-    
-}
\ No newline at end of file
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QueryElementTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QueryElementTest.java
deleted file mode 100644
index c28949bd0f..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/QueryElementTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.TermQuery;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class QueryElementTest {
-
-    @Test
-    @Ignore
-    public void test() {
-        QueryElement element = new QueryElement(new TermQuery(new Term("str","text")));
-        assertEquals("str:text",element.toString());
-        //assertEquals(element.getQuery().hashCode(), element.hashCode());
-
-        QueryElement element2 = new QueryElement(new TermQuery(new Term("str","text")));
-        assertEquals(element2, element);
-    }
-}
diff --git a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/TermElementTest.java b/querydsl-lucene4/src/test/java/com/mysema/query/lucene/TermElementTest.java
deleted file mode 100644
index 2020cfad62..0000000000
--- a/querydsl-lucene4/src/test/java/com/mysema/query/lucene/TermElementTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.lucene;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.path.StringPath;
-
-public class TermElementTest {
-
-    @Test
-    public void test() {
-        StringPath title = new StringPath("title");
-        LuceneSerializer serializer = new LuceneSerializer(false,true);
-        QueryMetadata metadata = new DefaultQueryMetadata();
-        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq("Hello World"), metadata).toString());
-        assertEquals("title:Hello World", serializer.toQuery(title.eq(new TermElement("Hello World")), metadata).toString());
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-    TermElement el1 = new TermElement("x"), el2 = new TermElement("x"), el3 = new TermElement("y");
-        assertEquals(el1, el2);
-        assertFalse(el1.equals(el3));
-        assertEquals(el1.hashCode(), el2.hashCode());
-    }
-
-}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneQueryTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneQueryTest.java
new file mode 100644
index 0000000000..e1b215bdb3
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneQueryTest.java
@@ -0,0 +1,756 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.*;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.sandbox.queries.DuplicateFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.types.dsl.StringPath;
+
+/**
+ * Tests for LuceneQuery
+ *
+ * @author vema
+ *
+ */
+public class LuceneQueryTest {
+
+    private LuceneQuery query;
+    private StringPath title;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+
+    private final StringPath sort = Expressions.stringPath("sort");
+
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+
+    private Document createDocument(final String docTitle,
+            final String docAuthor, final String docText, final int docYear,
+            final double docGross) {
+        final Document doc = new Document();
+
+        doc.add(new TextField("title", docTitle, Store.YES));
+        doc.add(new TextField("author", docAuthor, Store.YES));
+        doc.add(new TextField("text", docText, Store.YES));
+        doc.add(new IntField("year", docYear, Store.YES));
+        doc.add(new DoubleField("gross", docGross,  Store.YES));
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        final QDocument entityPath = new QDocument("doc");
+        title = entityPath.title;
+        year = entityPath.year;
+        gross = entityPath.gross;
+
+
+        idx = new RAMDirectory();
+        writer = createWriter(idx);
+
+        writer.addDocument(createDocument("Jurassic Park", "Michael Crichton",
+                "It's a UNIX system! I know this!", 1990, 90.00));
+        writer.addDocument(createDocument("Nummisuutarit", "Aleksis Kivi",
+                "ESKO. Ja iloitset ja riemuitset?", 1864, 10.00));
+        writer
+                .addDocument(createDocument(
+                        "The Lord of the Rings",
+                        "John R. R. Tolkien",
+                        "One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them",
+                        1954, 89.00));
+        writer
+                .addDocument(createDocument(
+                        "Introduction to Algorithms",
+                        "Thomas H. Cormen, Charles E. Leiserson, Ronald L. Rivest, and Clifford Stein",
+                        "Bubble sort", 1990, 30.50));
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+    }
+
+    private IndexWriter createWriter(RAMDirectory idx) throws Exception {
+        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31,
+                new StandardAnalyzer(Version.LUCENE_42))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        return new IndexWriter(idx, config);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.getIndexReader().close();
+    }
+
+    @Test
+    public void between() {
+        assertEquals(3, query.where(year.between(1950, 1990)).fetchCount());
+    }
+
+    @Test
+    public void count_empty_where_clause() {
+        assertEquals(4, query.fetchCount());
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(query.where(title.eq("Jurassic Park")).fetchCount() > 0);
+        assertFalse(query.where(title.eq("Jurassic Park X")).fetchCount() > 0);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(query.where(title.eq("Jurassic Park")).fetchCount() == 0);
+        assertTrue(query.where(title.eq("Jurassic Park X")).fetchCount() == 0);
+    }
+
+    @Test
+    public void count() {
+        query.where(title.eq("Jurassic Park"));
+        assertEquals(1, query.fetchCount());
+    }
+
+    @Test(expected = QueryException.class)
+    @Ignore
+    public void count_index_problem() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchCount();
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void countDistinct() {
+        query.where(year.between(1900, 3000));
+        assertEquals(3, query.distinct().fetchCount());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(2, query.where(title.in("Jurassic Park", "Nummisuutarit")).fetchCount());
+    }
+
+    @Test
+    public void in2() {
+        assertEquals(3, query.where(year.in(1990, 1864)).fetchCount());
+    }
+
+    @Test
+    public void in_toString() {
+        assertEquals("year:`____F year:`____H", query.where(year.in(1990, 1864)).toString());
+    }
+
+    @Test
+    public void list_sorted_by_year_ascending() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted() {
+        query.where(year.between(1800, 2000));
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    @Ignore // FIXME
+    public void sorted_by_different_locales() throws Exception {
+        Document d1 = new Document();
+        Document d2 = new Document();
+        Document d3 = new Document();
+        d1.add(new Field("sort", "a\u00c4",Store.YES, Index.NOT_ANALYZED));
+        d2.add(new Field("sort", "ab",Store.YES, Index.NOT_ANALYZED));
+        d3.add(new Field("sort", "aa",Store.YES, Index.NOT_ANALYZED));
+        writer = createWriter(idx);
+        writer.addDocument(d1);
+        writer.addDocument(d2);
+        writer.addDocument(d3);
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true, Locale.ENGLISH), searcher);
+        assertEquals(3, query.fetch().size());
+        List<Document> results = query.where(sort.startsWith("a")).orderBy(sort.asc()).fetch();
+        assertEquals(3, results.size());
+        assertEquals("aa", results.get(0).getField("sort").stringValue());
+        assertEquals("a\u00c4", results.get(1).getField("sort").stringValue());
+        assertEquals("ab", results.get(2).getField("sort").stringValue());
+
+        query = new LuceneQuery(new LuceneSerializer(true, true, new Locale("fi", "FI")), searcher);
+        results = query.where(sort.startsWith("a")).orderBy(sort.asc()).fetch();
+        assertEquals("aa", results.get(0).getField("sort").stringValue());
+        assertEquals("ab", results.get(1).getField("sort").stringValue());
+        assertEquals("a\u00c4", results.get(2).getField("sort").stringValue());
+    }
+
+    @Test
+    public void list_not_sorted_limit_2() {
+        query.where(year.between(1800, 2000));
+        query.limit(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_by_year_limit_1() {
+        query.where(year.between(1800, 2000));
+        query.limit(1);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(1, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_restrict_limit_2_offset_1() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1954", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+
+    @Test
+    public void list_sort() {
+        Sort sort = LuceneSerializer.DEFAULT.toSort(Collections.singletonList(year.asc()));
+
+        query.where(year.between(1800, 2000));
+        //query.orderBy(year.asc());
+        query.sort(sort);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+    @Test
+    public void list_distinct_property() {
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.distinct(year).fetch().size());
+    }
+
+    @Test
+    public void list_with_filter() {
+        Filter filter = new DuplicateFilter("year");
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.filter(filter).fetch().size());
+    }
+
+    @Test
+    public void count_distinct_property() {
+        assertEquals(4L, query.fetchCount());
+        assertEquals(3L, query.distinct(year).fetchCount());
+    }
+
+    @Test
+    public void list_sorted_descending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("1954", documents.get(2).get("year"));
+        assertEquals("1864", documents.get(3).get("year"));
+    }
+
+
+    @Test
+    public void list_sorted_descending_by_gross() {
+        query.where(gross.between(0.0, 1000.00));
+        query.orderBy(gross.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("90.0", documents.get(0).get("gross"));
+        assertEquals("89.0", documents.get(1).get("gross"));
+        assertEquals("30.5", documents.get(2).get("gross"));
+        assertEquals("10.0", documents.get(3).get("gross"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_ascending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Introduction to Algorithms", documents.get(0)
+                .get("title"));
+        assertEquals("Jurassic Park", documents.get(1).get("title"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_descending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Jurassic Park", documents.get(0).get("title"));
+        assertEquals("Introduction to Algorithms", documents.get(1)
+                .get("title"));
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_sorted_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.orderBy(title.asc());
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Test
+    public void offset() {
+        assertTrue(query.where(title.eq("Jurassic Park")).offset(30).fetch()
+                .isEmpty());
+    }
+
+
+    @Test
+    public void load_list() {
+        Document document = query.where(title.ne("")).load(title).fetch().get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_list_fieldSelector() {
+        Document document = query.where(title.ne("")).load(Collections.singleton("title")).fetch().get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult() {
+        Document document = query.where(title.ne("")).load(title).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult_fieldSelector() {
+        Document document = query.where(title.ne("")).load(Collections.singleton("title")).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void singleResult() {
+        assertNotNull(query.where(title.ne("")).fetchFirst());
+    }
+
+    @Test
+    public void single_result_takes_limit() {
+        assertEquals("Jurassic Park", query
+                                        .where(title.ne(""))
+                                        .limit(1)
+                                        .fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchFirst();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void single_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchFirst());
+    }
+
+    @Test
+    public void single_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).fetchFirst().get("title"));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResult_contract() {
+        query.where(title.ne("")).fetchOne();
+    }
+
+    @Test
+    public void unique_result_takes_limit() {
+        assertEquals("Jurassic Park", query
+                                        .where(title.ne(""))
+                                        .limit(1)
+                                        .fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void unique_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchOne());
+    }
+
+    @Test
+    public void unique_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne("")).offset(3).fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne("")).limit(1).offset(2).fetchOne().get("title"));
+    }
+
+    @Test
+    public void uniqueResult() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void uniqueResult_with_param() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.set(param, "Nummi");
+        query.where(title.startsWith(param));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void uniqueResult_param_not_set() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.where(title.startsWith(param));
+        query.fetchOne();
+    }
+
+    @Test(expected = QueryException.class)
+    public void uniqueResult_finds_more_than_one_result() {
+        query.where(year.eq(1990));
+        query.fetchOne();
+    }
+
+    @Test
+    public void uniqueResult_finds_no_results() {
+        query.where(year.eq(2200));
+        assertNull(query.fetchOne());
+    }
+
+    @Test
+    @Ignore
+    public void uniqueResult_finds_no_results_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
+        replay(searcher);
+        assertNull(query.where(year.eq(3000)).fetchOne());
+        verify(searcher);
+    }
+
+    @Test(expected = QueryException.class)
+    @Ignore
+    public void uniqueResult_sorted_index_problem_in_max_doc()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchOne();
+        verify(searcher);
+    }
+
+    @Test
+    @Ignore
+    public void count_returns_0_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
+        replay(searcher);
+        assertEquals(0, query.where(year.eq(3000)).fetchCount());
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinct() {
+        query.where(year.between(1900, 2000).or(title.startsWith("Jura")));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.distinct().fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(3, documents.size());
+    }
+
+    @Test
+    public void listResults() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals("1990", results.getResults().get(1).get("year"));
+        assertEquals(2, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinctResults() {
+        query.where(year.between(1800, 2000).or(
+                title.eq("The Lord of the Rings")));
+        query.restrict(new QueryModifiers(1L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.distinct().fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals(1, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test
+    public void list_all() {
+        final List<Document> results = query.where(title.like("*")).orderBy(
+                title.asc(), year.desc()).fetch();
+        assertEquals(4, results.size());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.fetch();
+    }
+
+    @Test
+    public void list_sorted_ascending_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void iterate() {
+        query.where(year.between(1800, 2000));
+        final Iterator<Document> iterator = query.iterate();
+        int count = 0;
+        while (iterator.hasNext()) {
+            iterator.next();
+            ++count;
+        }
+        assertEquals(4, count);
+    }
+
+    @Test
+    public void all_by_excluding_where() {
+        assertEquals(4, query.fetch().size());
+    }
+
+    @Test
+    public void empty_index_should_return_empty_list() throws Exception {
+        idx = new RAMDirectory();
+
+        writer = createWriter(idx);
+        writer.close();
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        assertTrue(query.fetch().isEmpty());
+    }
+
+    @Test(expected = QueryException.class)
+    public void list_results_throws_an_illegal_argument_exception_when_sum_of_limit_and_offset_is_negative() {
+        query.limit(1).offset(Integer.MAX_VALUE).fetchResults();
+    }
+
+    @Test
+    public void limit_max_value() {
+        assertEquals(4, query.limit(Long.MAX_VALUE).fetch().size());
+    }
+}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerNotTokenizedTest.java
new file mode 100644
index 0000000000..65c9ef17aa
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerNotTokenizedTest.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static com.querydsl.lucene4.QPerson.person;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+import org.joda.time.LocalDate;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class LuceneSerializerNotTokenizedTest {
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+    private LuceneSerializer serializer;
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private final Person clooney = new Person("actor_1", "George Clooney", new LocalDate(1961, 4, 6));
+    private final Person pitt = new Person("actor_2", "Brad Pitt", new LocalDate(1963, 12, 18));
+
+    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    private Document createDocument(Person person) {
+        Document doc = new Document();
+        doc.add(new Field("id", person.getId(), Store.YES, Index.NOT_ANALYZED));
+        doc.add(new Field("name", person.getName(), Store.YES, Index.NOT_ANALYZED));
+        doc.add(new Field("birthDate", person.getBirthDate().toString(), Store.YES, Index.NOT_ANALYZED));
+        return doc;
+    }
+
+    @Before
+    public void before() throws Exception {
+        serializer = new LuceneSerializer(false, false);
+        idx = new RAMDirectory();
+        IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31,
+                new StandardAnalyzer(Version.LUCENE_30))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument(clooney));
+        writer.addDocument(createDocument(pitt));
+
+        Document document = new Document();
+        for (String movie : Arrays.asList("Interview with the Vampire",
+                                          "Up in the Air")) {
+            document.add(new Field("movie", movie, Store.YES, Index.NOT_ANALYZED));
+        }
+        writer.addDocument(document);
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @Test
+    public void equals_by_id_matches() throws Exception {
+        testQuery(person.id.eq("actor_1"), "id:actor_1", 1);
+    }
+
+    @Test
+    public void equals_by_id_does_not_match() throws Exception {
+        testQuery(person.id.eq("actor_8"), "id:actor_8", 0);
+    }
+
+    @Test
+    public void equals_by_name_matches() throws Exception {
+        testQuery(person.name.eq("George Clooney"), "name:George Clooney", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_by_name_ignoring_case_does_not_match() throws Exception {
+        testQuery(person.name.equalsIgnoreCase("george clooney"), "name:george clooney", 0);
+    }
+
+    @Test
+    public void equals_by_name_does_not_match() throws Exception {
+        testQuery(person.name.eq("George Looney"), "name:George Looney", 0);
+    }
+
+    @Test
+    public void starts_with_name_should_match() throws Exception {
+        testQuery(person.name.startsWith("George C"), "name:George C*", 1);
+    }
+
+    @Test
+    public void starts_with_name_should_not_match() throws Exception {
+        testQuery(person.name.startsWith("George L"), "name:George L*", 0);
+    }
+
+    @Test
+    public void ends_with_name_should_match() throws Exception {
+        testQuery(person.name.endsWith("e Clooney"), "name:*e Clooney", 1);
+    }
+
+    @Test
+    public void ends_with_name_should_not_match() throws Exception {
+        testQuery(person.name.endsWith("e Looney"), "name:*e Looney", 0);
+    }
+
+    @Test
+    public void contains_name_should_match() throws Exception {
+        testQuery(person.name.contains("oney"), "name:*oney*", 1);
+    }
+
+    @Test
+    public void contains_name_should_not_match() throws Exception {
+        testQuery(person.name.contains("bloney"), "name:*bloney*", 0);
+    }
+
+    @Test
+    public void in_names_should_match_2() throws Exception {
+        testQuery(person.name.in("Brad Pitt", "George Clooney"), "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void or_by_name_should_match_2() throws Exception {
+        testQuery(person.name.eq("Brad Pitt")
+              .or(person.name.eq("George Clooney")), "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void equals_by_birth_date() throws Exception {
+        testQuery(person.birthDate.eq(clooney.getBirthDate()), "birthDate:1961-04-06", 1);
+    }
+
+    @Test
+    public void between_phrase() throws Exception {
+        testQuery(person.name.between("Brad Pitt","George Clooney"), "name:[Brad Pitt TO George Clooney]", 2);
+    }
+
+    @Test
+    public void not_equals_finds_the_actors_and_movies() throws Exception {
+        testQuery(person.name.ne("Michael Douglas"), "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void not_equals_finds_only_clooney_and_movies() throws Exception {
+        testQuery(person.name.ne("Brad Pitt"), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void and_with_two_not_equals_doesnt_find_the_actors() throws Exception {
+        testQuery(person.name.ne("Brad Pitt")
+             .and(person.name.ne("George Clooney")), "+(-name:Brad Pitt +*:*) +(-name:George Clooney +*:*)", 1);
+    }
+
+    @Test
+    public void or_with_two_not_equals_finds_movies_and_actors() throws Exception {
+        testQuery(person.name.ne("Brad Pitt")
+              .or(person.name.ne("George Clooney")), "(-name:Brad Pitt +*:*) (-name:George Clooney +*:*)", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_movies_and_actors() throws Exception {
+        testQuery(person.name.eq("Michael Douglas").not(), "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_pitt_and_movies() throws Exception {
+        testQuery(person.name.eq("Brad Pitt").not(), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void multiple_field_search_from_movies() throws Exception {
+        StringPath movie = Expressions.stringPath("movie");
+        testQuery(movie.in("Interview with the Vampire"), "movie:Interview with the Vampire", 1);
+        testQuery(movie.eq("Up in the Air"), "movie:Up in the Air", 1);
+    }
+}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java
new file mode 100644
index 0000000000..9ff1653d8d
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/LuceneSerializerTest.java
@@ -0,0 +1,674 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.*;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.Version;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.*;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * Tests for LuceneSerializer
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializerTest {
+    private LuceneSerializer serializer;
+    private PathBuilder<Object> entityPath;
+    private StringPath title;
+    private StringPath author;
+    private StringPath text;
+    private StringPath rating;
+    private StringPath publisher;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+    private CollectionPath<String, StringPath> titles;
+
+    private NumberPath<Long> longField;
+    private NumberPath<Short> shortField;
+    private NumberPath<Byte> byteField;
+    private NumberPath<Float> floatField;
+
+    private static final String YEAR_PREFIX_CODED = "";
+    private static final String GROSS_PREFIX_CODED = "";
+    private static final String LONG_PREFIX_CODED = "";
+    private static final String SHORT_PREFIX_CODED = "";
+    private static final String BYTE_PREFIX_CODED = "";
+    private static final String FLOAT_PREFIX_CODED = "";
+
+    private IndexWriterConfig config;
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+
+    private static final Set<? extends Operator> UNSUPPORTED_OPERATORS = Collections.unmodifiableSet(EnumSet.of(Ops.STARTS_WITH_IC,
+            Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC));
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private Document createDocument() {
+        Document doc = new Document();
+
+        doc.add(new Field("title", new StringReader("Jurassic Park")));
+        doc.add(new Field("author", new StringReader("Michael Crichton")));
+        doc.add(new Field("text", new StringReader("It's a UNIX system! I know this!")));
+        doc.add(new Field("rating", new StringReader("Good")));
+        doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
+        doc.add(new IntField("year", 1990, Store.YES));
+        doc.add(new DoubleField("gross", 900.0, Store.YES));
+
+        doc.add(new LongField("longField", 1, Store.YES));
+        doc.add(new IntField("shortField", 1, Store.YES));
+        doc.add(new IntField("byteField", 1, Store.YES));
+        doc.add(new FloatField("floatField", 1, Store.YES));
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        serializer = new LuceneSerializer(true,true);
+        entityPath = new PathBuilder<Object>(Object.class, "obj");
+        title = entityPath.getString("title");
+        author = entityPath.getString("author");
+        text = entityPath.getString("text");
+        publisher = entityPath.getString("publisher");
+        year = entityPath.getNumber("year", Integer.class);
+        rating = entityPath.getString("rating");
+        gross = entityPath.getNumber("gross", Double.class);
+        titles = entityPath.getCollection("title", String.class, StringPath.class);
+
+        longField = entityPath.getNumber("longField", Long.class);
+        shortField = entityPath.getNumber("shortField", Short.class);
+        byteField = entityPath.getNumber("byteField", Byte.class);
+        floatField = entityPath.getNumber("floatField", Float.class);
+
+        idx = new RAMDirectory();
+        config = new IndexWriterConfig(Version.LUCENE_42,
+                new StandardAnalyzer(Version.LUCENE_42))
+            .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument());
+
+        writer.close();
+
+        IndexReader reader = IndexReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.getIndexReader().close();
+    }
+
+    private void testQuery(Expression<?> expr, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+    }
+
+    private void testQuery(Expression<?> expr, String expectedQuery, int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    @Test
+    public void queryElement() throws Exception {
+        Query query1 = serializer.toQuery(author.like("Michael"), metadata);
+        Query query2 = serializer.toQuery(text.like("Text"), metadata);
+
+        BooleanExpression query = Expressions.anyOf(
+                new QueryElement(query1),
+                new QueryElement(query2)
+        );
+        testQuery(query, "author:michael text:text", 1);
+    }
+
+    @Test
+    public void like() throws Exception {
+        testQuery(author.like("*ichael*"), "author:*ichael*", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_single_character() throws Exception {
+        testQuery(author.like("Mi?hael"), "author:mi?hael", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_multiple_character() throws Exception {
+        testQuery(text.like("*U*X*"), "text:*u*x*", 1);
+    }
+
+    @Test
+    public void like_phrase() throws Exception {
+        testQuery(title.like("*rassic Par*"), "+title:**rassic* +title:*par**", 1);
+    }
+
+    @Test
+    public void like_or_like() throws Exception {
+        testQuery(title.like("House").or(author.like("*ichae*")), "title:house author:*ichae*", 1);
+    }
+
+    @Test
+    public void like_and_like() throws Exception {
+        testQuery(title.like("*assic*").and(rating.like("G?od")), "+title:*assic* +rating:g?od", 1);
+    }
+
+    @Test
+    public void eq() throws Exception {
+        testQuery(rating.eq("good"), "rating:good", 1);
+    }
+
+    @Test
+    public void eq_with_deep_path() throws Exception {
+        StringPath deepPath = entityPath.get("property1", Object.class).getString("property2");
+        testQuery(deepPath.eq("good"), "property1.property2:good", 0);
+    }
+
+    @Test
+    public void fuzzyLike() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good"), "rating:Good~2", 1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2), "rating:Good~2", 1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity_and_prefix() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2, 0), "rating:Good~2", 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric_integer() throws Exception {
+        testQuery(year.eq(1990), "year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric_double() throws Exception {
+        testQuery(gross.eq(900.00), "gross:" + GROSS_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric() throws Exception {
+        testQuery(longField.eq(1L), "longField:" + LONG_PREFIX_CODED, 1);
+        testQuery(shortField.eq((short) 1), "shortField:" + SHORT_PREFIX_CODED, 1);
+        testQuery(byteField.eq((byte) 1), "byteField:" + BYTE_PREFIX_CODED, 1);
+        testQuery(floatField.eq((float) 1.0), "floatField:" + FLOAT_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void equals_ignores_case() throws Exception {
+        testQuery(title.eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_or_year_equals() throws Exception {
+        testQuery(title.equalsIgnoreCase("House").or(year.eq(1990)), "title:house year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_and_eq() throws Exception {
+        testQuery(title.eq("Jurassic Park").and(year.eq(1990)), "+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_and_eq_and_eq() throws Exception {
+        testQuery(title.eq("Jurassic Park").and(year.eq(1990)).and(author.eq("Michael Crichton")), "+(+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED + ") +author:\"michael crichton\"", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_ignore_case_and_or() throws Exception {
+        testQuery(title.equalsIgnoreCase("Jurassic Park").and(rating.equalsIgnoreCase("Bad")).or(author.equalsIgnoreCase("Michael Crichton")), "(+title:\"jurassic park\" +rating:bad) author:\"michael crichton\"", 1);
+    }
+
+    @Test
+    public void eq_or_eq_and_eq_does_not_find_results() throws Exception {
+        testQuery(title.eq("jeeves").or(rating.eq("superb")).and(author.eq("michael crichton")), "+(title:jeeves rating:superb) +author:\"michael crichton\"", 0);
+    }
+
+    @Test
+    public void eq_phrase() throws Exception {
+        testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
+    }
+
+    @Test
+    @Ignore("Not easily done in Lucene!")
+    public void publisher_equals_empty_string() throws Exception {
+        testQuery(publisher.eq(""), "publisher:", 1);
+    }
+
+    @Test
+    public void eq_phrase_should_not_find_results_but_luceNe_semantics_differs_from_querydsls() throws Exception {
+        testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
+    }
+
+    @Test
+    public void eq_phrase_does_not_find_results_because_word_in_middle() throws Exception {
+        testQuery(title.eq("Jurassic Amusement Park"), "title:\"jurassic amusement park\"", 0);
+    }
+
+    @Test
+    public void like_not_does_not_find_results() throws Exception {
+        testQuery(title.like("*H*e*").not(), "-title:*h*e* +*:*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_negation_or_rating_equals_ignore_case() throws Exception {
+        testQuery(title.equalsIgnoreCase("House").not().or(rating.equalsIgnoreCase("Good")), "-title:house rating:good", 1);
+    }
+
+    @Test
+    public void eq_not_does_not_find_results() throws Exception {
+        testQuery(title.eq("Jurassic Park").not(), "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void title_equals_not_house() throws Exception {
+        testQuery(title.eq("house").not(), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void eq_and_eq_not_does_not_find_results_because_second_expression_finds_nothing() throws Exception {
+        testQuery(rating.eq("superb").and(title.eq("house").not()), "+rating:superb +(-title:house +*:*)", 0);
+    }
+
+    @Test
+    public void not_equals_finds_one() throws Exception {
+        testQuery(title.ne("house"), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void not_equals_finds_none() throws Exception {
+        testQuery(title.ne("Jurassic Park"), "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void nothing_found_with_not_equals_or_equals() throws Exception {
+        testQuery(title.ne("jurassic park").or(rating.eq("lousy")), "(-title:\"jurassic park\" +*:*) rating:lousy", 0);
+    }
+
+    @Test
+    public void ne_and_eq() throws Exception {
+        testQuery(title.ne("house").and(rating.eq("good")), "+(-title:house +*:*) +rating:good", 1);
+    }
+
+    @Test
+    public void startsWith() throws Exception {
+        testQuery(title.startsWith("Jurassi"), "title:jurassi*", 1);
+    }
+
+    @Test
+    public void startsWith_phrase() throws Exception {
+        testQuery(title.startsWith("jurassic par"), "+title:jurassic* +title:*par*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void starts_with_ignore_case_phrase_does_not_find_results() throws Exception {
+        testQuery(title.startsWithIgnoreCase("urassic Par"), "+title:urassic* +title:*par*", 0);
+    }
+
+    @Test
+    public void endsWith() throws Exception {
+        testQuery(title.endsWith("ark"), "title:*ark", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase() throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Park"), "+title:*sic* +title:*park", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase_does_not_find_results() throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Par"), "+title:*sic* +title:*par", 0);
+    }
+
+    @Test
+    public void contains() throws Exception {
+        testQuery(title.contains("rassi"), "title:*rassi*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void contains_ignore_case_phrase() throws Exception {
+        testQuery(title.containsIgnoreCase("rassi Pa"), "+title:*rassi* +title:*pa*", 1);
+    }
+
+    @Test
+    public void contains_user_inputted_wildcards_dont_work() throws Exception {
+        testQuery(title.contains("r*i"), "title:*r\\*i*", 0);
+    }
+
+    @Test
+    public void between() throws Exception {
+        testQuery(title.between("Indiana", "Kundun"), "title:[indiana TO kundun]", 1);
+    }
+
+    @Test
+    public void between_numeric_integer() throws Exception {
+        testQuery(year.between(1980, 2000), "year:[1980 TO 2000]", 1);
+    }
+
+    @Test
+    public void between_numeric_double() throws Exception {
+        testQuery(gross.between(10.00, 19030.00), "gross:[10.0 TO 19030.0]", 1);
+    }
+
+    @Test
+    public void between_numeric() throws Exception {
+        testQuery(longField.between(0L,2L), "longField:[0 TO 2]", 1);
+        testQuery(shortField.between((short) 0,(short) 2), "shortField:[0 TO 2]", 1);
+        testQuery(byteField.between((byte) 0,(byte) 2), "byteField:[0 TO 2]", 1);
+        testQuery(floatField.between((float) 0.0,(float) 2.0), "floatField:[0.0 TO 2.0]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_from_start() throws Exception {
+        testQuery(title.between("Jurassic", "Kundun"), "title:[jurassic TO kundun]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_to_end() throws Exception {
+        testQuery(title.between("Indiana", "Jurassic"), "title:[indiana TO jurassic]", 1);
+    }
+
+    @Test
+    public void between_does_not_find_results() throws Exception {
+        testQuery(title.between("Indiana", "Jurassib"), "title:[indiana TO jurassib]", 0);
+    }
+
+    @Test
+    public void in() throws Exception {
+        testQuery(title.in(Arrays.asList("jurassic", "park")), "title:jurassic title:park", 1);
+        testQuery(title.in("jurassic","park"), "title:jurassic title:park", 1);
+        testQuery(title.eq("jurassic").or(title.eq("park")), "title:jurassic title:park", 1);
+    }
+
+    @Test
+    public void lt() throws Exception {
+        testQuery(rating.lt("Superb"), "rating:{* TO superb}", 1);
+    }
+
+    @Test
+    public void lt_numeric_integer() throws Exception {
+        testQuery(year.lt(1991), "year:{* TO 1991}", 1);
+    }
+
+    @Test
+    public void lt_numeric_double() throws Exception {
+        testQuery(gross.lt(10000.0), "gross:{* TO 10000.0}", 1);
+    }
+
+    @Test
+    public void lt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.lt("Good"), "rating:{* TO good}", 0);
+    }
+
+    @Test
+    public void lt_numeric_integer_not_in_range_because_equal() throws Exception {
+        testQuery(year.lt(1990), "year:{* TO 1990}", 0);
+    }
+
+    @Test
+    public void lt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.lt(900.0), "gross:{* TO 900.0}", 0);
+    }
+
+    @Test
+    public void loe() throws Exception {
+        testQuery(rating.loe("Superb"), "rating:[* TO superb]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer() throws Exception {
+        testQuery(year.loe(1991), "year:[* TO 1991]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double() throws Exception {
+        testQuery(gross.loe(903.0), "gross:[* TO 903.0]", 1);
+    }
+
+    @Test
+    public void loe_equal() throws Exception {
+        testQuery(rating.loe("Good"), "rating:[* TO good]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer_equal() throws Exception {
+        testQuery(year.loe(1990), "year:[* TO 1990]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double_equal() throws Exception {
+        testQuery(gross.loe(900.0), "gross:[* TO 900.0]", 1);
+    }
+
+    @Test
+    public void loe_not_found() throws Exception {
+        testQuery(rating.loe("Bad"), "rating:[* TO bad]", 0);
+    }
+
+    @Test
+    public void loe_numeric_integer_not_found() throws Exception {
+        testQuery(year.loe(1989), "year:[* TO 1989]", 0);
+    }
+
+    @Test
+    public void loe_numeric_double_not_found() throws Exception {
+        testQuery(gross.loe(899.9), "gross:[* TO 899.9]", 0);
+    }
+
+    @Test
+    public void gt() throws Exception {
+        testQuery(rating.gt("Bad"), "rating:{bad TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_integer() throws Exception {
+        testQuery(year.gt(1989), "year:{1989 TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_double() throws Exception {
+        testQuery(gross.gt(100.00), "gross:{100.0 TO *}", 1);
+    }
+
+    @Test
+    public void gt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.gt("Good"), "rating:{good TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_integer_not_in_range_because_equal() throws Exception {
+        testQuery(year.gt(1990), "year:{1990 TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.gt(900.00), "gross:{900.0 TO *}", 0);
+    }
+
+    @Test
+    public void goe() throws Exception {
+        testQuery(rating.goe("Bad"), "rating:[bad TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer() throws Exception {
+        testQuery(year.goe(1989), "year:[1989 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double() throws Exception {
+        testQuery(gross.goe(320.50), "gross:[320.5 TO *]", 1);
+    }
+
+    @Test
+    public void goe_equal() throws Exception {
+        testQuery(rating.goe("Good"), "rating:[good TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer_equal() throws Exception {
+        testQuery(year.goe(1990), "year:[1990 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double_equal() throws Exception {
+        testQuery(gross.goe(900.00), "gross:[900.0 TO *]", 1);
+    }
+
+    @Test
+    public void goe_not_found() throws Exception {
+        testQuery(rating.goe("Hood"), "rating:[hood TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_integer_not_found() throws Exception {
+        testQuery(year.goe(1991), "year:[1991 TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_double_not_found() throws Exception {
+        testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
+    }
+
+    @Test
+    public void equals_empty_string() throws Exception {
+        testQuery(title.eq(""), "title:", 0);
+    }
+
+    @Test
+    public void not_equals_empty_string() throws Exception {
+        testQuery(title.ne(""), "-title: +*:*", 1);
+    }
+
+    @Test
+    public void contains_empty_string() throws Exception {
+        testQuery(title.contains(""), "title:**", 1);
+    }
+
+    @Test
+    public void like_empty_string() throws Exception {
+        testQuery(title.like(""), "title:", 0);
+    }
+
+    @Test
+    public void starts_with_empty_string() throws Exception {
+        testQuery(title.startsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void ends_with_empty_string() throws Exception {
+        testQuery(title.endsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void between_empty_strings() throws Exception {
+        testQuery(title.between("", ""), "title:[ TO ]", 0);
+    }
+
+    @Test
+    public void booleanBuilder() throws Exception {
+        testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]", 0);
+    }
+
+    @Test
+    @Ignore
+    public void fuzzy() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void proximity() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void boost() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    public void pathAny() throws Exception {
+        testQuery(titles.any().eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    private boolean unsupportedOperation(Predicate filter) {
+        return UNSUPPORTED_OPERATORS.contains(((Operation<?>) filter).getOperator());
+    }
+
+    @Test
+    public void various() throws Exception {
+        MatchingFiltersFactory filters = new MatchingFiltersFactory(QuerydslModule.LUCENE, Target.LUCENE);
+        for (Predicate filter : filters.string(title, StringConstant.create("jurassic park"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(author, StringConstant.create("michael crichton"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(title, StringConstant.create("1990"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 0);
+        }
+    }
+
+}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/Person.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/Person.java
new file mode 100644
index 0000000000..51f59edd6e
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/Person.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.joda.time.LocalDate;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Person {
+    private final String id;
+    private final String name;
+    private final LocalDate birthDate;
+
+    public Person(String id, String name, LocalDate birthDate) {
+        this.id = id;
+        this.name = name;
+        this.birthDate = birthDate;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
+
+
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/PhraseElementTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/PhraseElementTest.java
new file mode 100644
index 0000000000..303d4dfb93
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/PhraseElementTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class PhraseElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false,false);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:Hello World", serializer.toQuery(title.eq("Hello World"), metadata).toString());
+        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq(new PhraseElement("Hello World")), metadata).toString());
+    }
+
+    @Test
+    public void equals() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x"), el3 = new PhraseElement("y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+    }
+
+    @Test
+    public void hashCode_() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x");
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QDocument.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QDocument.java
new file mode 100644
index 0000000000..8d4d31f5e8
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QDocument.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import org.apache.lucene.document.Document;
+
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QDocument extends EntityPathBase<Document> {
+
+    private static final long serialVersionUID = -4872833626508344081L;
+
+    public QDocument(final String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public final NumberPath<Integer> year = createNumber("year", Integer.class);
+
+    public final StringPath title = createString("title");
+
+    public final NumberPath<Double> gross = createNumber("gross", Double.class);
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QueryElementTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QueryElementTest.java
new file mode 100644
index 0000000000..cf3c3e7b1a
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/QueryElementTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class QueryElementTest {
+
+    @Test
+    @Ignore
+    public void test() {
+        QueryElement element = new QueryElement(new TermQuery(new Term("str","text")));
+        assertEquals("str:text",element.toString());
+        //assertEquals(element.getQuery().hashCode(), element.hashCode());
+
+        QueryElement element2 = new QueryElement(new TermQuery(new Term("str","text")));
+        assertEquals(element2, element);
+    }
+}
diff --git a/querydsl-lucene4/src/test/java/com/querydsl/lucene4/TermElementTest.java b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/TermElementTest.java
new file mode 100644
index 0000000000..0f1d4e1e11
--- /dev/null
+++ b/querydsl-lucene4/src/test/java/com/querydsl/lucene4/TermElementTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class TermElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false,true);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:\"Hello World\"", serializer.toQuery(title.eq("Hello World"), metadata).toString());
+        assertEquals("title:Hello World", serializer.toQuery(title.eq(new TermElement("Hello World")), metadata).toString());
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+    TermElement el1 = new TermElement("x"), el2 = new TermElement("x"), el3 = new TermElement("y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene4/src/test/resources/log4j.properties.example b/querydsl-lucene4/src/test/resources/log4j.properties.example
index 2f9467c280..50eef686c1 100644
--- a/querydsl-lucene4/src/test/resources/log4j.properties.example
+++ b/querydsl-lucene4/src/test/resources/log4j.properties.example
@@ -1,9 +1,9 @@
-# Configure an appender that logs to console
-log4j.rootLogger=info, A1
-log4j.threshold=debug
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
-
-# Configuration of logging levels for different packages
-log4j.logger.com.mysema.query.lucene=DEBUG
+# Configure an appender that logs to console
+log4j.rootLogger=info, A1
+log4j.threshold=debug
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
+
+# Configuration of logging levels for different packages
+log4j.logger.com.querydsl.lucene4=DEBUG
diff --git a/querydsl-lucene4/template.mf b/querydsl-lucene4/template.mf
deleted file mode 100644
index faad6033e1..0000000000
--- a/querydsl-lucene4/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.lucene
-Bundle-Name: Querydsl Lucene
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  com.google.common.*;version="${guava.version}",
-  org.apache.lucene.*;version="[4.0.0,5.0.0)",
-  org.slf4j.*;version="${slf4j.version}"
\ No newline at end of file
diff --git a/querydsl-lucene5/README.md b/querydsl-lucene5/README.md
new file mode 100644
index 0000000000..5420d6690c
--- /dev/null
+++ b/querydsl-lucene5/README.md
@@ -0,0 +1,57 @@
+## Querydsl Lucene 5
+
+The Lucene module provides integration with the Lucene 5 indexing library.
+
+**Maven integration**
+
+ Add the following dependencies to your Maven project :
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-lucene5</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
+
+**Creating the query types**
+
+With fields year and title a manually created query type could look something like this:
+
+```JAVA 
+public class QDocument extends EntityPathBase<Document>{
+    private static final long serialVersionUID = -4872833626508344081L;
+        
+    public QDocument(String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public final StringPath year = createString("year");
+
+    public final StringPath title = createString("title");
+}
+```
+
+QDocument represents a Lucene document with the fields year and title.
+
+Code generation is not available for Lucene, since no schema data is available.
+
+**Querying**
+
+Querying with Querydsl Lucene is as simple as this:
+
+```JAVA
+QDocument doc = new QDocument("doc");
+
+IndexSearcher searcher = new IndexSearcher(index);
+LuceneQuery query = new LuceneQuery(true, searcher); 
+List<Document> documents = query
+    .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+    .fetch();
+```
+
+which is transformed into the following Lucene query :
+```
++year:[1800 TO 2000] +title:huckle*
+```
+
+For more information on the Querydsl Lucene module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s05.html
diff --git a/querydsl-lucene5/pom.xml b/querydsl-lucene5/pom.xml
new file mode 100644
index 0000000000..a35f1ea0ee
--- /dev/null
+++ b/querydsl-lucene5/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-lucene5</artifactId>
+  <name>Querydsl - Lucene 5 support</name>
+  <description>Lucene support for Querydsl</description>
+  <url>${project.homepage}</url>
+  <packaging>jar</packaging>
+
+  <scm>
+    <connection>${project.checkout}</connection>
+    <developerConnection>${project.checkout}</developerConnection>
+    <url>${project.githubpage}</url>
+  </scm>
+
+  <properties>
+    <lucene.version>5.1.0</lucene.version>
+    <osgi.import.package>
+      org.apache.lucene.*;version="[5.1.0)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${lucene.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>${lucene.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
+      <version>${lucene.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queries</artifactId>
+      <version>${lucene.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- test -->
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.lucene5</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-process</goal>
+              <goal>add-test-sources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-test-sources/java</outputDirectory>
+              <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+              <showWarnings>true</showWarnings>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/AbstractLuceneQuery.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/AbstractLuceneQuery.java
new file mode 100644
index 0000000000..906968ca4e
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/AbstractLuceneQuery.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.EmptyCloseableIterator;
+import com.mysema.commons.lang.IteratorAdapter;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.SimpleQuery;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.sandbox.queries.DuplicateFilter;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryWrapperFilter;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.TotalHitCountCollector;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * AbstractLuceneQuery is an abstract super class for Lucene query
+ * implementations
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ *            projection type
+ * @param <Q>
+ *            concrete subtype of querydsl
+ */
+public abstract class AbstractLuceneQuery<T, Q extends AbstractLuceneQuery<T, Q>>
+        implements SimpleQuery<Q>, Fetchable<T> {
+
+    private static final String JAVA_ISO_CONTROL = "[\\p{Cntrl}&&[^\r\n\t]]";
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final IndexSearcher searcher;
+
+    private final LuceneSerializer serializer;
+
+    private final Function<Document, T> transformer;
+
+    @Nullable
+    private Set<String> fieldsToLoad;
+
+    private List<Filter> filters = Collections.emptyList();
+
+    @Nullable
+    private Filter filter;
+
+    @Nullable
+    private Sort querySort;
+
+    @SuppressWarnings("unchecked")
+    public AbstractLuceneQuery(LuceneSerializer serializer,
+            IndexSearcher searcher, Function<Document, T> transformer) {
+        queryMixin = new QueryMixin<Q>((Q) this, new DefaultQueryMetadata());
+        this.serializer = serializer;
+        this.searcher = searcher;
+        this.transformer = transformer;
+    }
+
+    public AbstractLuceneQuery(IndexSearcher searcher,
+            Function<Document, T> transformer) {
+        this(LuceneSerializer.DEFAULT, searcher, transformer);
+    }
+
+    private long innerCount() {
+        try {
+            final int maxDoc = searcher.getIndexReader().maxDoc();
+            if (maxDoc == 0) {
+                return 0;
+            }
+            TotalHitCountCollector collector = new TotalHitCountCollector();
+            searcher.search(createQuery(), getFilter(), collector);
+            return collector.getTotalHits();
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        return innerCount();
+    }
+
+    protected Query createQuery() {
+        Query returnedQuery = null;
+        Query originalQuery = null;
+        if (queryMixin.getMetadata().getWhere() == null) {
+            originalQuery = new MatchAllDocsQuery();
+        } else {
+            originalQuery = serializer.toQuery(queryMixin.getMetadata()
+                    .getWhere(), queryMixin.getMetadata());
+        }
+        Filter filter = getFilter();
+        if (filter != null) {
+            BooleanQuery booleanQuery = new BooleanQuery();
+            booleanQuery.add(originalQuery, Occur.MUST);
+            booleanQuery.add(filter, Occur.FILTER);
+            returnedQuery = booleanQuery;
+        } else {
+            returnedQuery = originalQuery;
+        }
+
+        return returnedQuery;
+    }
+
+    /**
+     * Create a filter for constraints defined in this querydsl
+     *
+     * @return filter
+     */
+    public Filter asFilter() {
+        return new QueryWrapperFilter(createQuery());
+    }
+
+    @Override
+    public Q distinct() {
+        throw new UnsupportedOperationException("use distinct(path) instead");
+    }
+
+    /**
+     * Add a DuplicateFilter for the field of the given property path
+     *
+     * @param property
+     *            distinct property
+     * @return the current object
+     */
+    public Q distinct(Path<?> property) {
+        return filter(new DuplicateFilter(serializer.toField(property)));
+    }
+
+    /**
+     * Apply the given Lucene filter to the search results
+     *
+     * @param filter
+     *            filter
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q filter(Filter filter) {
+        if (filters.isEmpty()) {
+            this.filter = filter;
+            filters = Collections.singletonList(filter);
+        } else {
+            this.filter = null;
+            if (filters.size() == 1) {
+                filters = new ArrayList<Filter>();
+            }
+            filters.add(filter);
+        }
+        return (Q) this;
+    }
+
+    private Filter getFilter() {
+        if (filter == null && !filters.isEmpty()) {
+            BooleanQuery filterQuery = new BooleanQuery();
+            for (Filter filter : filters) {
+                filterQuery.add(filter, Occur.SHOULD);
+            }
+            filter = new QueryWrapperFilter(filterQuery);
+        }
+        return filter;
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        final QueryMetadata metadata = queryMixin.getMetadata();
+        final List<OrderSpecifier<?>> orderBys = metadata.getOrderBy();
+        final Integer queryLimit = metadata.getModifiers().getLimitAsInteger();
+        final Integer queryOffset = metadata.getModifiers()
+                .getOffsetAsInteger();
+        Sort sort = querySort;
+        int limit;
+        final int offset = queryOffset != null ? queryOffset : 0;
+        try {
+            limit = maxDoc();
+            if (limit == 0) {
+                return new EmptyCloseableIterator<T>();
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+        if (queryLimit != null && queryLimit < limit) {
+            limit = queryLimit;
+        }
+        if (sort == null && !orderBys.isEmpty()) {
+            sort = serializer.toSort(orderBys);
+        }
+
+        try {
+            ScoreDoc[] scoreDocs;
+            int sumOfLimitAndOffset = limit + offset;
+            if (sumOfLimitAndOffset < 1) {
+                throw new QueryException("The given limit (" + limit
+                        + ") and offset (" + offset
+                        + ") cause an integer overflow.");
+            }
+            if (sort != null) {
+                scoreDocs = searcher.search(createQuery(),
+                // sumOfLimitAndOffset).scoreDocs;
+                        sumOfLimitAndOffset, sort, false, false).scoreDocs;
+            } else {
+                scoreDocs = searcher.search(createQuery(),
+                        sumOfLimitAndOffset, Sort.INDEXORDER, false, false).scoreDocs;
+            }
+            if (offset < scoreDocs.length) {
+                return new ResultIterator<T>(scoreDocs, offset, searcher,
+                        fieldsToLoad, transformer);
+            }
+            return new EmptyCloseableIterator<T>();
+        } catch (final IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    private List<T> innerList() {
+        return new IteratorAdapter<T>(iterate()).asList();
+    }
+
+    @Override
+    public List<T> fetch() {
+        return innerList();
+    }
+
+    /**
+     * Set the given fields to load
+     *
+     * @param fieldsToLoad
+     *            fields to load
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(Set<String> fieldsToLoad) {
+        this.fieldsToLoad = fieldsToLoad;
+        return (Q) this;
+    }
+
+    /**
+     * Load only the fields of the given paths
+     *
+     * @param paths
+     *            fields to load
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public Q load(Path<?>... paths) {
+        Set<String> fields = new HashSet<String>();
+        for (Path<?> path : paths) {
+            fields.add(serializer.toField(path));
+        }
+        this.fieldsToLoad = fields;
+        return (Q) this;
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        List<T> documents = innerList();
+        /*
+         * TODO Get rid of fetchCount(). It could be implemented by iterating
+         * the fetch results in fetch* from n to m.
+         */
+        return new QueryResults<T>(documents, queryMixin.getMetadata()
+                .getModifiers(), innerCount());
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    @Override
+    public <P> Q set(ParamExpression<P> param, P value) {
+        return queryMixin.set(param, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q sort(Sort sort) {
+        this.querySort = sort;
+        return (Q) this;
+    }
+
+    @Nullable
+    private T oneResult(boolean unique) {
+        try {
+            int maxDoc = maxDoc();
+            if (maxDoc == 0) {
+                return null;
+            }
+            final ScoreDoc[] scoreDocs = searcher.search(createQuery(),
+                    maxDoc, Sort.INDEXORDER, false, false).scoreDocs;
+            int index = 0;
+            QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
+            Long offset = modifiers.getOffset();
+            if (offset != null) {
+                index = offset.intValue();
+            }
+            Long limit = modifiers.getLimit();
+            if (unique
+                    && (limit == null ? scoreDocs.length - index > 1
+                            : limit > 1 && scoreDocs.length > 1)) {
+                throw new NonUniqueResultException(
+                        "Unique result requested, but " + scoreDocs.length
+                                + " found.");
+            } else if (scoreDocs.length > index) {
+                Document document;
+                if (fieldsToLoad != null) {
+                    document = searcher.doc(scoreDocs[index].doc, fieldsToLoad);
+                } else {
+                    document = searcher.doc(scoreDocs[index].doc);
+                }
+                return transformer.apply(document);
+            } else {
+                return null;
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public T fetchFirst() {
+        return oneResult(false);
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        return oneResult(true);
+    }
+
+    public Q where(Predicate e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public String toString() {
+        return createQuery().toString().replaceAll(JAVA_ISO_CONTROL, "_");
+    }
+
+    private int maxDoc() throws IOException {
+        return searcher.getIndexReader().maxDoc();
+    }
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/IgnoreCaseUnsupportedException.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/IgnoreCaseUnsupportedException.java
new file mode 100644
index 0000000000..6f778e02a5
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/IgnoreCaseUnsupportedException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+/**
+ * Thrown for case ignore usage
+ *
+ * @author tiwe
+ *
+ */
+public class IgnoreCaseUnsupportedException extends
+        UnsupportedOperationException {
+
+    private static final long serialVersionUID = 412913389929530788L;
+
+    public IgnoreCaseUnsupportedException() {
+        super("Ignore case queries are not supported with Lucene");
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneExpressions.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneExpressions.java
new file mode 100644
index 0000000000..7e3fae4df7
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneExpressions.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.FuzzyQuery;
+import org.apache.lucene.util.automaton.LevenshteinAutomata;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+/**
+ * Utility methods to create filter expressions for Lucene queries that are not
+ * covered by the Querydsl standard expression model
+ *
+ * @author tiwe
+ *
+ */
+public final class LuceneExpressions {
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path
+     *            path
+     * @param value
+     *            value to match
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path
+     *            path
+     * @param value
+     *            value to match
+     * @param maxEdits
+     *            must be &gt;= 0 and &lt;=
+     *            {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value,
+            int maxEdits) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, maxEdits));
+    }
+
+    /**
+     * Create a fuzzy query
+     *
+     * @param path
+     *            path
+     * @param value
+     *            value to match
+     * @param maxEdits
+     *            must be &gt;= 0 and &lt;=
+     *            {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
+     * @param prefixLength
+     *            length of common (non-fuzzy) prefix
+     * @return condition
+     */
+    public static BooleanExpression fuzzyLike(Path<String> path, String value,
+            int maxEdits, int prefixLength) {
+        Term term = new Term(path.getMetadata().getName(), value);
+        return new QueryElement(new FuzzyQuery(term, maxEdits, prefixLength));
+    }
+
+    private LuceneExpressions() {
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneOps.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneOps.java
new file mode 100644
index 0000000000..c53f4f4718
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneOps.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * Lucene specific operators
+ *
+ * @author tiwe
+ *
+ */
+public enum LuceneOps implements Operator {
+    LUCENE_QUERY(Object.class), PHRASE(String.class), TERM(String.class);
+
+    private final Class<?> type;
+
+    LuceneOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneQuery.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneQuery.java
new file mode 100644
index 0000000000..dbf9129243
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneQuery.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code LuceneQuery} is a Querydsl query implementation for Lucene queries.
+ * <p>
+ * Example:
+ * </p>
+ *
+ * <pre>
+ * {@code
+ * QDocument doc = new QDocument("doc");
+ * IndexSearcher searcher = new IndexSearcher(index);
+ * LuceneQuery query = new LuceneQuery(true, searcher);
+ * List<Document> documents = query
+ *     .where(doc.year.between("1800", "2000").and(doc.title.startsWith("Huckle"))
+ *     .fetch();
+ * }
+ * </pre>
+ *
+ * @author vema
+ */
+public class LuceneQuery extends AbstractLuceneQuery<Document, LuceneQuery> {
+
+    private static final Function<Document, Document> TRANSFORMER = new Function<Document, Document>() {
+        @Override
+        public Document apply(Document input) {
+            return input;
+        }
+    };
+
+    public LuceneQuery(IndexSearcher searcher) {
+        super(searcher, TRANSFORMER);
+    }
+
+    public LuceneQuery(LuceneSerializer luceneSerializer, IndexSearcher searcher) {
+        super(luceneSerializer, searcher, TRANSFORMER);
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneSerializer.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneSerializer.java
new file mode 100644
index 0000000000..433b8bad35
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/LuceneSerializer.java
@@ -0,0 +1,608 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.NumericRangeQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
+import org.apache.lucene.search.SortedNumericSortField;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.WildcardQuery;
+import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.BytesRefBuilder;
+import org.apache.lucene.util.NumericUtils;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathType;
+
+/**
+ * Serializes Querydsl queries to Lucene queries.
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializer {
+    private static final Map<Class<?>, SortField.Type> sortFields = new HashMap<Class<?>, SortField.Type>();
+
+    static {
+        sortFields.put(Integer.class, SortField.Type.INT);
+        sortFields.put(Float.class, SortField.Type.FLOAT);
+        sortFields.put(Long.class, SortField.Type.LONG);
+        sortFields.put(Double.class, SortField.Type.DOUBLE);
+        sortFields.put(BigDecimal.class, SortField.Type.DOUBLE);
+        sortFields.put(BigInteger.class, SortField.Type.LONG);
+    }
+
+    public static final LuceneSerializer DEFAULT = new LuceneSerializer(false,
+            true);
+
+    private final boolean lowerCase;
+
+    private final boolean splitTerms;
+
+    private final Locale sortLocale;
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms) {
+        this(lowerCase, splitTerms, Locale.getDefault());
+    }
+
+    public LuceneSerializer(boolean lowerCase, boolean splitTerms,
+            Locale sortLocale) {
+        this.lowerCase = lowerCase;
+        this.splitTerms = splitTerms;
+        this.sortLocale = sortLocale;
+    }
+
+    private Query toQuery(Operation<?> operation, QueryMetadata metadata) {
+        Operator op = operation.getOperator();
+        if (op == Ops.OR) {
+            return toTwoHandSidedQuery(operation, Occur.SHOULD, metadata);
+        } else if (op == Ops.AND) {
+            return toTwoHandSidedQuery(operation, Occur.MUST, metadata);
+        } else if (op == Ops.NOT) {
+            BooleanQuery bq = new BooleanQuery();
+            bq.add(new BooleanClause(toQuery(operation.getArg(0), metadata),
+                    Occur.MUST_NOT));
+            bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+            return bq;
+        } else if (op == Ops.LIKE) {
+            return like(operation, metadata);
+        } else if (op == Ops.LIKE_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.EQ) {
+            return eq(operation, metadata, false);
+        } else if (op == Ops.EQ_IGNORE_CASE) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.NE) {
+            return ne(operation, metadata, false);
+        } else if (op == Ops.STARTS_WITH) {
+            return startsWith(metadata, operation, false);
+        } else if (op == Ops.STARTS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.ENDS_WITH) {
+            return endsWith(operation, metadata, false);
+        } else if (op == Ops.ENDS_WITH_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.STRING_CONTAINS) {
+            return stringContains(operation, metadata, false);
+        } else if (op == Ops.STRING_CONTAINS_IC) {
+            throw new IgnoreCaseUnsupportedException();
+        } else if (op == Ops.BETWEEN) {
+            return between(operation, metadata);
+        } else if (op == Ops.IN) {
+            return in(operation, metadata, false);
+        } else if (op == Ops.NOT_IN) {
+            return notIn(operation, metadata, false);
+        } else if (op == Ops.LT) {
+            return lt(operation, metadata);
+        } else if (op == Ops.GT) {
+            return gt(operation, metadata);
+        } else if (op == Ops.LOE) {
+            return le(operation, metadata);
+        } else if (op == Ops.GOE) {
+            return ge(operation, metadata);
+        } else if (op == LuceneOps.LUCENE_QUERY) {
+            @SuppressWarnings("unchecked")
+            // this is the expected type
+            Constant<Query> expectedConstant = (Constant<Query>) operation
+                    .getArg(0);
+            return expectedConstant.getConstant();
+        }
+        throw new UnsupportedOperationException("Illegal operation "
+                + operation);
+    }
+
+    private Query toTwoHandSidedQuery(Operation<?> operation, Occur occur,
+            QueryMetadata metadata) {
+        Query lhs = toQuery(operation.getArg(0), metadata);
+        Query rhs = toQuery(operation.getArg(1), metadata);
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(createBooleanClause(lhs, occur));
+        bq.add(createBooleanClause(rhs, occur));
+        return bq;
+    }
+
+    /**
+     * If the query is a BooleanQuery and it contains a single Occur.MUST_NOT
+     * clause it will be returned as is. Otherwise it will be wrapped in a
+     * BooleanClause with the given Occur.
+     */
+    private BooleanClause createBooleanClause(Query query, Occur occur) {
+        if (query instanceof BooleanQuery) {
+            BooleanClause[] clauses = ((BooleanQuery) query).getClauses();
+            if (clauses.length == 1
+                    && clauses[0].getOccur().equals(Occur.MUST_NOT)) {
+                return clauses[0];
+            }
+        }
+        return new BooleanClause(query, occur);
+    }
+
+    protected Query like(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convert(path, operation.getArg(1));
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")),
+                        Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, terms[0]));
+    }
+
+    protected Query eq(Operation<?> operation, QueryMetadata metadata,
+            boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+
+        if (Number.class.isAssignableFrom(operation.getArg(1).getType())) {
+            @SuppressWarnings("unchecked")
+            // guarded by previous check
+            Constant<? extends Number> rightArg = (Constant<? extends Number>) operation
+                    .getArg(1);
+            return new TermQuery(new Term(field,
+                    convertNumber(rightArg.getConstant())));
+        }
+
+        return eq(field, convert(path, operation.getArg(1), metadata),
+                ignoreCase);
+    }
+
+    private BytesRef convertNumber(Number number) {
+        if (Integer.class.isInstance(number) || Byte.class.isInstance(number)
+                || Short.class.isInstance(number)) {
+            BytesRefBuilder ref = new BytesRefBuilder();
+            NumericUtils.intToPrefixCoded(number.intValue(), 0, ref);
+            return ref.get();
+        } else if (Double.class.isInstance(number)
+                || BigDecimal.class.isInstance(number)) {
+            BytesRefBuilder ref = new BytesRefBuilder();
+            long l = NumericUtils.doubleToSortableLong(number.doubleValue());
+            NumericUtils.longToPrefixCoded(l, 0, ref);
+            return ref.get();
+        } else if (Long.class.isInstance(number)
+                || BigInteger.class.isInstance(number)) {
+            BytesRefBuilder ref = new BytesRefBuilder();
+            NumericUtils.longToPrefixCoded(number.longValue(), 0, ref);
+            return ref.get();
+        } else if (Float.class.isInstance(number)) {
+            BytesRefBuilder ref = new BytesRefBuilder();
+            int i = NumericUtils.floatToSortableInt(number.floatValue());
+            NumericUtils.intToPrefixCoded(i, 0, ref);
+            return ref.get();
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type "
+                    + number.getClass().getName());
+        }
+    }
+
+    protected Query eq(String field, String[] terms, boolean ignoreCase) {
+        if (terms.length > 1) {
+            PhraseQuery pq = new PhraseQuery();
+            for (String s : terms) {
+                pq.add(new Term(field, s));
+            }
+            return pq;
+        }
+        return new TermQuery(new Term(field, terms[0]));
+    }
+
+    protected Query in(Operation<?> operation, QueryMetadata metadata,
+            boolean ignoreCase) {
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        @SuppressWarnings("unchecked")
+        // this is the expected type
+        Constant<Collection<?>> expectedConstant = (Constant<Collection<?>>) operation
+                .getArg(1);
+        Collection<?> values = expectedConstant.getConstant();
+        BooleanQuery bq = new BooleanQuery();
+        if (Number.class.isAssignableFrom(path.getType())) {
+            for (Object value : values) {
+                TermQuery eq = new TermQuery(new Term(field, convertNumber((Number) value)));
+                bq.add(eq, Occur.SHOULD);
+            }
+        } else {
+            for (Object value : values) {
+                String[] str = convert(path, value);
+                bq.add(eq(field, str, ignoreCase), Occur.SHOULD);
+            }
+        }
+        return bq;
+    }
+
+    protected Query notIn(Operation<?> operation, QueryMetadata metadata,
+            boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(in(operation, metadata, false), Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query ne(Operation<?> operation, QueryMetadata metadata,
+            boolean ignoreCase) {
+        BooleanQuery bq = new BooleanQuery();
+        bq.add(new BooleanClause(eq(operation, metadata, ignoreCase),
+                Occur.MUST_NOT));
+        bq.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+        return bq;
+    }
+
+    protected Query startsWith(QueryMetadata metadata, Operation<?> operation,
+            boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == 0 ? terms[i] + "*" : "*" + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new PrefixQuery(new Term(field, terms[0]));
+    }
+
+    protected Query stringContains(Operation<?> operation,
+            QueryMetadata metadata, boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (String s : terms) {
+                bq.add(new WildcardQuery(new Term(field, "*" + s + "*")),
+                        Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0] + "*"));
+    }
+
+    protected Query endsWith(Operation<?> operation, QueryMetadata metadata,
+            boolean ignoreCase) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        String field = toField(path);
+        String[] terms = convertEscaped(path, operation.getArg(1), metadata);
+        if (terms.length > 1) {
+            BooleanQuery bq = new BooleanQuery();
+            for (int i = 0; i < terms.length; ++i) {
+                String s = i == terms.length - 1 ? "*" + terms[i] : "*"
+                        + terms[i] + "*";
+                bq.add(new WildcardQuery(new Term(field, s)), Occur.MUST);
+            }
+            return bq;
+        }
+        return new WildcardQuery(new Term(field, "*" + terms[0]));
+    }
+
+    protected Query between(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        // TODO Phrase not properly supported
+        return range(path, toField(path), operation.getArg(1),
+                operation.getArg(2), true, true, metadata);
+    }
+
+    protected Query lt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(path, toField(path), null, operation.getArg(1), false,
+                false, metadata);
+    }
+
+    protected Query gt(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(path, toField(path), operation.getArg(1), null, false,
+                false, metadata);
+    }
+
+    protected Query le(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(path, toField(path), null, operation.getArg(1), true,
+                true, metadata);
+    }
+
+    protected Query ge(Operation<?> operation, QueryMetadata metadata) {
+        verifyArguments(operation);
+        Path<?> path = getPath(operation.getArg(0));
+        return range(path, toField(path), operation.getArg(1), null, true,
+                true, metadata);
+    }
+
+    protected Query range(Path<?> leftHandSide, String field,
+            @Nullable Expression<?> min, @Nullable Expression<?> max,
+            boolean minInc, boolean maxInc, QueryMetadata metadata) {
+        if (min != null && Number.class.isAssignableFrom(min.getType())
+                || max != null && Number.class.isAssignableFrom(max.getType())) {
+            @SuppressWarnings("unchecked")
+            // guarded by previous check
+            Constant<? extends Number> minConstant = (Constant<? extends Number>) min;
+            @SuppressWarnings("unchecked")
+            // guarded by previous check
+            Constant<? extends Number> maxConstant = (Constant<? extends Number>) max;
+
+            Class<? extends Number> numType = minConstant != null ? minConstant
+                    .getType() : maxConstant.getType();
+            // this is not necessarily safe, but compile time checking
+            // on the user side mandates these types to be interchangeable
+            @SuppressWarnings("unchecked")
+            Class<Number> unboundedNumType = (Class<Number>) numType;
+            return numericRange(unboundedNumType, field,
+                    minConstant == null ? null : minConstant.getConstant(),
+                    maxConstant == null ? null : maxConstant.getConstant(),
+                    minInc, maxInc);
+        }
+        return stringRange(leftHandSide, field, min, max, minInc, maxInc,
+                metadata);
+    }
+
+    protected <N extends Number> NumericRangeQuery<?> numericRange(
+            Class<N> clazz, String field, @Nullable N min, @Nullable N max,
+            boolean minInc, boolean maxInc) {
+        if (clazz.equals(Integer.class)) {
+            return NumericRangeQuery.newIntRange(field, (Integer) min,
+                    (Integer) max, minInc, maxInc);
+        } else if (clazz.equals(Double.class)) {
+            return NumericRangeQuery.newDoubleRange(field, (Double) min,
+                    (Double) max, minInc, minInc);
+        } else if (clazz.equals(Float.class)) {
+            return NumericRangeQuery.newFloatRange(field, (Float) min,
+                    (Float) max, minInc, minInc);
+        } else if (clazz.equals(Long.class)) {
+            return NumericRangeQuery.newLongRange(field, (Long) min,
+                    (Long) max, minInc, minInc);
+        } else if (clazz.equals(Byte.class) || clazz.equals(Short.class)) {
+            return NumericRangeQuery.newIntRange(field,
+                    min != null ? min.intValue() : null,
+                    max != null ? max.intValue() : null, minInc, maxInc);
+        } else {
+            throw new IllegalArgumentException("Unsupported numeric type "
+                    + clazz.getName());
+        }
+    }
+
+    protected Query stringRange(Path<?> leftHandSide, String field,
+            @Nullable Expression<?> min, @Nullable Expression<?> max,
+            boolean minInc, boolean maxInc, QueryMetadata metadata) {
+
+        if (min == null) {
+            return TermRangeQuery.newStringRange(field, null,
+                    convert(leftHandSide, max, metadata)[0], minInc, maxInc);
+        } else if (max == null) {
+            return TermRangeQuery.newStringRange(field,
+                    convert(leftHandSide, min, metadata)[0], null, minInc,
+                    maxInc);
+        } else {
+            return TermRangeQuery.newStringRange(field,
+                    convert(leftHandSide, min, metadata)[0],
+                    convert(leftHandSide, max, metadata)[0], minInc, maxInc);
+        }
+    }
+
+    private Path<?> getPath(Expression<?> leftHandSide) {
+        if (leftHandSide instanceof Path<?>) {
+            return (Path<?>) leftHandSide;
+        } else if (leftHandSide instanceof Operation<?>) {
+            Operation<?> operation = (Operation<?>) leftHandSide;
+            if (operation.getOperator() == Ops.LOWER
+                    || operation.getOperator() == Ops.UPPER) {
+                return (Path<?>) operation.getArg(0);
+            }
+        }
+        throw new IllegalArgumentException("Unable to transform "
+                + leftHandSide + " to path");
+    }
+
+    /**
+     * template method, override to customize
+     *
+     * @param path
+     *            path
+     * @return field name
+     */
+    protected String toField(Path<?> path) {
+        PathMetadata md = path.getMetadata();
+        if (md.getPathType() == PathType.COLLECTION_ANY) {
+            return toField(md.getParent());
+        } else {
+            String rv = md.getName();
+            if (md.getParent() != null) {
+                Path<?> parent = md.getParent();
+                if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
+                    rv = toField(parent) + "." + rv;
+                }
+            }
+            return rv;
+        }
+    }
+
+    private void verifyArguments(Operation<?> operation) {
+        List<Expression<?>> arguments = operation.getArgs();
+        for (int i = 1; i < arguments.size(); ++i) {
+            if (!(arguments.get(i) instanceof Constant<?>)
+                    && !(arguments.get(i) instanceof ParamExpression<?>)
+                    && !(arguments.get(i) instanceof PhraseElement)
+                    && !(arguments.get(i) instanceof TermElement)) {
+                throw new IllegalArgumentException(
+                        "operand was of unsupported type "
+                                + arguments.get(i).getClass().getName());
+            }
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide
+     *            left hand side
+     * @param rightHandSide
+     *            right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide,
+            Expression<?> rightHandSide, QueryMetadata metadata) {
+        if (rightHandSide instanceof Operation) {
+            Operation<?> operation = (Operation<?>) rightHandSide;
+            if (operation.getOperator() == LuceneOps.PHRASE) {
+                return operation.getArg(0).toString().split("\\s+");
+            } else if (operation.getOperator() == LuceneOps.TERM) {
+                return new String[] {operation.getArg(0).toString() };
+            } else {
+                throw new IllegalArgumentException(rightHandSide.toString());
+            }
+        } else if (rightHandSide instanceof ParamExpression<?>) {
+            Object value = metadata.getParams().get(rightHandSide);
+            if (value == null) {
+                throw new ParamNotSetException(
+                        (ParamExpression<?>) rightHandSide);
+            }
+            return convert(leftHandSide, value);
+
+        } else if (rightHandSide instanceof Constant<?>) {
+            return convert(leftHandSide,
+                    ((Constant<?>) rightHandSide).getConstant());
+        } else {
+            throw new IllegalArgumentException(rightHandSide.toString());
+        }
+    }
+
+    /**
+     * template method
+     *
+     * @param leftHandSide
+     *            left hand side
+     * @param rightHandSide
+     *            right hand side
+     * @return results
+     */
+    protected String[] convert(Path<?> leftHandSide, Object rightHandSide) {
+        String str = rightHandSide.toString();
+        if (lowerCase) {
+            str = str.toLowerCase();
+        }
+        if (splitTerms) {
+            if (str.equals("")) {
+                return new String[] {str };
+            } else {
+                return str.split("\\s+");
+            }
+        } else {
+            return new String[] {str };
+        }
+    }
+
+    private String[] convertEscaped(Path<?> leftHandSide,
+            Expression<?> rightHandSide, QueryMetadata metadata) {
+        String[] str = convert(leftHandSide, rightHandSide, metadata);
+        for (int i = 0; i < str.length; i++) {
+            str[i] = QueryParser.escape(str[i]);
+        }
+        return str;
+    }
+
+    public Query toQuery(Expression<?> expr, QueryMetadata metadata) {
+        if (expr instanceof Operation<?>) {
+            return toQuery((Operation<?>) expr, metadata);
+        } else {
+            return toQuery(ExpressionUtils.extract(expr), metadata);
+        }
+    }
+
+    public Sort toSort(List<? extends OrderSpecifier<?>> orderBys) {
+        List<SortField> sorts = new ArrayList<SortField>(orderBys.size());
+        for (OrderSpecifier<?> order : orderBys) {
+            if (!(order.getTarget() instanceof Path<?>)) {
+                throw new IllegalArgumentException(
+                        "argument was not of type Path.");
+            }
+            Class<?> type = order.getTarget().getType();
+            boolean reverse = !order.isAscending();
+            Path<?> path = getPath(order.getTarget());
+            if (Number.class.isAssignableFrom(type)) {
+                sorts.add(new SortedNumericSortField(toField(path), sortFields.get(type),
+                        reverse));
+            } else {
+                sorts.add(new SortField(toField(path), SortField.Type.STRING,
+                        reverse));
+            }
+        }
+        Sort sort = new Sort();
+        sort.setSort(sorts.toArray(new SortField[0]));
+        return sort;
+    }
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/PhraseElement.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/PhraseElement.java
new file mode 100644
index 0000000000..d3f9f6c49a
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/PhraseElement.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code PhraseElement} represents the embedded String as a phrase
+ *
+ * @author tiwe
+ *
+ */
+public class PhraseElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public PhraseElement(String str) {
+        super(LuceneOps.PHRASE, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/QueryElement.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/QueryElement.java
new file mode 100644
index 0000000000..c7583c5f70
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/QueryElement.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.apache.lucene.search.Query;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.BooleanOperation;
+
+/**
+ * {@code QueryElement} wraps a Lucene Query
+ *
+ * @author tiwe
+ *
+ */
+public class QueryElement extends BooleanOperation {
+
+    private static final long serialVersionUID = 470868107363840155L;
+
+    public QueryElement(Query query) {
+        super(LuceneOps.LUCENE_QUERY, ConstantImpl.create(query));
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/ResultIterator.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/ResultIterator.java
new file mode 100644
index 0000000000..3c6d8ec6bb
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/ResultIterator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.QueryException;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * {@code ResultIterator} is a {@link CloseableIterator} implementation for
+ * Lucene query results
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public final class ResultIterator<T> implements CloseableIterator<T> {
+
+    private final ScoreDoc[] scoreDocs;
+
+    private int cursor;
+
+    private final IndexSearcher searcher;
+
+    @Nullable
+    private final Set<String> fieldsToLoad;
+
+    private final Function<Document, T> transformer;
+
+    public ResultIterator(ScoreDoc[] scoreDocs, int offset,
+            IndexSearcher searcher, @Nullable Set<String> fieldsToLoad,
+            Function<Document, T> transformer) {
+        this.scoreDocs = scoreDocs.clone();
+        this.cursor = offset;
+        this.searcher = searcher;
+        this.fieldsToLoad = fieldsToLoad;
+        this.transformer = transformer;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return cursor != scoreDocs.length;
+    }
+
+    @Override
+    public T next() {
+        try {
+            Document document;
+            if (fieldsToLoad != null) {
+                document = searcher.doc(scoreDocs[cursor++].doc, fieldsToLoad);
+            } else {
+                document = searcher.doc(scoreDocs[cursor++].doc);
+            }
+            return transformer.apply(document);
+        } catch (IOException e) {
+            throw new QueryException(e);
+        }
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TermElement.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TermElement.java
new file mode 100644
index 0000000000..ccd6e28bed
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TermElement.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.dsl.StringOperation;
+
+/**
+ * {@code TermElement} represents the embedded String as a term
+ *
+ * @author tiwe
+ *
+ */
+public class TermElement extends StringOperation {
+
+    private static final long serialVersionUID = 2350215644019186076L;
+
+    public TermElement(String str) {
+        super(LuceneOps.TERM, ConstantImpl.create(str));
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TypedQuery.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TypedQuery.java
new file mode 100644
index 0000000000..cc72eb1e1b
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/TypedQuery.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
+
+import java.util.function.Function;
+
+/**
+ * {@code TypedQuery} is a typed query implementation for Lucene queries.
+ *
+ * <p>
+ * Converts Lucene documents to typed results via a constructor supplied
+ * transformer
+ * </p>
+ *
+ * @param <T> result type
+ *
+ * @author laim
+ * @author tiwe
+ */
+public class TypedQuery<T> extends AbstractLuceneQuery<T, TypedQuery<T>> {
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param searcher
+     *            index searcher
+     * @param transformer
+     *            transformer to transform Lucene documents to result objects
+     */
+    public TypedQuery(IndexSearcher searcher, Function<Document, T> transformer) {
+        super(searcher, transformer);
+    }
+
+    /**
+     * Create a new TypedQuery instance
+     *
+     * @param serializer
+     *            serializer
+     * @param searcher
+     *            index searcher
+     * @param transformer
+     *            transformer to transform Lucene documents to result objects
+     */
+    public TypedQuery(LuceneSerializer serializer, IndexSearcher searcher,
+            Function<Document, T> transformer) {
+        super(serializer, searcher, transformer);
+    }
+
+}
diff --git a/querydsl-lucene5/src/main/java/com/querydsl/lucene5/package-info.java b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/package-info.java
new file mode 100644
index 0000000000..0d4c10ad02
--- /dev/null
+++ b/querydsl-lucene5/src/main/java/com/querydsl/lucene5/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Lucene 5 support
+ */
+package com.querydsl.lucene5;
+
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneQueryTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneQueryTest.java
new file mode 100644
index 0000000000..6dc9697722
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneQueryTest.java
@@ -0,0 +1,838 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static org.easymock.EasyMock.createMockBuilder;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.DoubleDocValuesField;
+import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.NumericDocValuesField;
+import org.apache.lucene.document.SortedDocValuesField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.sandbox.queries.DuplicateFilter;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.BytesRef;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.types.dsl.StringPath;
+
+/**
+ * Tests for LuceneQuery
+ *
+ * @author vema
+ *
+ */
+public class LuceneQueryTest {
+
+    private LuceneQuery query;
+    private StringPath title;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+
+    private final StringPath sort = Expressions.stringPath("sort");
+
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+    private Field titleField = null;
+    private SortedDocValuesField titleSortedField;
+    private TextField authorField = null;
+    private SortedDocValuesField authorSortedField;
+    private TextField textField = null;
+    private IntField yearField = null;
+    private DoubleField grossField = null;
+    private SortedDocValuesField textSortedField;
+    private NumericDocValuesField yearSortedField;
+    private DoubleDocValuesField grossSortedField;
+
+    private Document createDocument(final String docTitle,
+            final String docAuthor, final String docText, final int docYear,
+            final double docGross) {
+        Document doc = new Document();
+        // Reusing field for performance
+        if (titleField == null) {
+            titleField = new TextField("title", docTitle, Store.YES);
+            doc.add(titleField);
+            titleSortedField = new SortedDocValuesField("title", new BytesRef(
+                    docTitle));
+            doc.add(titleSortedField);
+        } else {
+            titleField.setStringValue(docTitle);
+            titleSortedField.setBytesValue(new BytesRef(docTitle));
+            doc.add(titleField);
+            doc.add(titleSortedField);
+        }
+        if (authorField == null) {
+            authorField = new TextField("author", docAuthor, Store.YES);
+            doc.add(authorField);
+            authorSortedField = new SortedDocValuesField("author",
+                    new BytesRef(docAuthor));
+            doc.add(authorSortedField);
+
+        } else {
+            authorField.setStringValue(docAuthor);
+            authorSortedField.setBytesValue(new BytesRef(docAuthor));
+            doc.add(authorField);
+            doc.add(authorSortedField);
+        }
+        if (textField == null) {
+            textField = new TextField("text", docText, Store.YES);
+            doc.add(textField);
+            textSortedField = new SortedDocValuesField("text", new BytesRef(
+                    docText));
+            doc.add(textSortedField);
+        } else {
+            textField.setStringValue(docText);
+            textSortedField.setBytesValue(new BytesRef(docText));
+            doc.add(textField);
+            doc.add(textSortedField);
+        }
+        if (yearField == null) {
+            yearField = new IntField("year", docYear, Store.YES);
+            doc.add(yearField);
+            yearSortedField = new NumericDocValuesField("year", docYear);
+            doc.add(yearSortedField);
+        } else {
+            yearField.setIntValue(docYear);
+            yearSortedField.setLongValue(docYear);
+            doc.add(yearField);
+            doc.add(yearSortedField);
+        }
+
+        if (grossField == null) {
+            grossField = new DoubleField("gross", docGross, Store.YES);
+            doc.add(grossField);
+            grossSortedField = new DoubleDocValuesField("gross", docGross);
+            doc.add(grossSortedField);
+        } else {
+            grossField.setDoubleValue(docGross);
+            grossSortedField.setDoubleValue(docGross);
+            doc.add(grossField);
+            doc.add(grossSortedField);
+        }
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        final QDocument entityPath = new QDocument("doc");
+        title = entityPath.title;
+        year = entityPath.year;
+        gross = entityPath.gross;
+
+        idx = new RAMDirectory();
+        writer = createWriter(idx);
+
+        writer.addDocument(createDocument("Jurassic Park", "Michael Crichton",
+                "It's a UNIX system! I know this!", 1990, 90.00));
+        writer.addDocument(createDocument("Nummisuutarit", "Aleksis Kivi",
+                "ESKO. Ja iloitset ja riemuitset?", 1864, 10.00));
+        writer.addDocument(createDocument(
+                "The Lord of the Rings",
+                "John R. R. Tolkien",
+                "One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them",
+                1954, 89.00));
+        writer.addDocument(createDocument(
+                "Introduction to Algorithms",
+                "Thomas H. Cormen, Charles E. Leiserson, Ronald L. Rivest, and Clifford Stein",
+                "Bubble sort", 1990, 30.50));
+
+        writer.close();
+
+        IndexReader reader = DirectoryReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+    }
+
+    private IndexWriter createWriter(RAMDirectory idx) throws Exception {
+        IndexWriterConfig config = new IndexWriterConfig(new StandardAnalyzer())
+                .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        return new IndexWriter(idx, config);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.getIndexReader().close();
+    }
+
+    @Test
+    public void between() {
+        assertEquals(3, query.where(year.between(1950, 1990)).fetchCount());
+    }
+
+    @Test
+    public void count_empty_where_clause() {
+        assertEquals(4, query.fetchCount());
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(query.where(title.eq("Jurassic Park")).fetchCount() > 0);
+        assertFalse(query.where(title.eq("Jurassic Park X")).fetchCount() > 0);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(query.where(title.eq("Jurassic Park")).fetchCount() == 0);
+        assertTrue(query.where(title.eq("Jurassic Park X")).fetchCount() == 0);
+    }
+
+    @Test
+    public void count() {
+        query.where(title.eq("Jurassic Park"));
+        assertEquals(1, query.fetchCount());
+    }
+
+    @Test(expected = QueryException.class)
+    @Ignore
+    public void count_index_problem() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(
+                new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchCount();
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void countDistinct() {
+        query.where(year.between(1900, 3000));
+        assertEquals(3, query.distinct().fetchCount());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(2, query.where(title.in("Jurassic Park", "Nummisuutarit")).fetchCount());
+    }
+
+    @Test
+    public void in2() {
+        assertEquals(3, query.where(year.in(1990, 1864)).fetchCount());
+    }
+
+    @Test
+    public void in_toString() {
+        assertEquals("year:`____F year:`____H", query.where(year.in(1990, 1864)).toString());
+    }
+
+    @Test
+    public void list_sorted_by_year_ascending() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted() {
+        query.where(year.between(1800, 2000));
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    @Ignore
+    // FIXME
+    public void sorted_by_different_locales() throws Exception {
+        Document d1 = new Document();
+        Document d2 = new Document();
+        Document d3 = new Document();
+        d1.add(new TextField("sort", "a\u00c4", Store.YES));
+        d2.add(new TextField("sort", "ab", Store.YES));
+        d3.add(new TextField("sort", "aa", Store.YES));
+        writer = createWriter(idx);
+        writer.addDocument(d1);
+        writer.addDocument(d2);
+        writer.addDocument(d3);
+        writer.close();
+
+        IndexReader reader = DirectoryReader.open(writer, true);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(
+                new LuceneSerializer(true, true, Locale.ENGLISH), searcher);
+        assertEquals(3, query.fetch().size());
+        List<Document> results = query.where(sort.startsWith("a"))
+                .orderBy(sort.asc()).fetch();
+        assertEquals(3, results.size());
+        assertEquals("aa", results.get(0).getField("sort").stringValue());
+        assertEquals("a\u00c4", results.get(1).getField("sort").stringValue());
+        assertEquals("ab", results.get(2).getField("sort").stringValue());
+
+        query = new LuceneQuery(new LuceneSerializer(true, true, new Locale(
+                "fi", "FI")), searcher);
+        results = query.where(sort.startsWith("a")).orderBy(sort.asc()).fetch();
+        assertEquals("aa", results.get(0).getField("sort").stringValue());
+        assertEquals("ab", results.get(1).getField("sort").stringValue());
+        assertEquals("a\u00c4", results.get(2).getField("sort").stringValue());
+    }
+
+    @Test
+    public void list_not_sorted_limit_2() {
+        query.where(year.between(1800, 2000));
+        query.limit(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_by_year_limit_1() {
+        query.where(year.between(1800, 2000));
+        query.limit(1);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(1, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_offset_2() {
+        query.where(year.between(1800, 2000));
+        query.offset(2);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year_restrict_limit_2_offset_1() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(2, documents.size());
+        assertEquals("1954", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+    }
+
+    @Test
+    public void list_sorted_ascending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+    @Test
+    public void list_sort() {
+        Sort sort = LuceneSerializer.DEFAULT.toSort(Collections
+                .singletonList(year.asc()));
+
+        query.where(year.between(1800, 2000));
+        // query.orderBy(year.asc());
+        query.sort(sort);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1864", documents.get(0).get("year"));
+        assertEquals("1954", documents.get(1).get("year"));
+        assertEquals("1990", documents.get(2).get("year"));
+        assertEquals("1990", documents.get(3).get("year"));
+    }
+
+    @Test
+    public void list_distinct_property() {
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.distinct(year).fetch().size());
+    }
+
+    @Test
+    public void list_with_filter() {
+        Filter filter = new DuplicateFilter("year");
+        assertEquals(4, query.fetch().size());
+        assertEquals(3, query.filter(filter).fetch().size());
+    }
+
+    @Test
+    public void count_distinct_property() {
+        assertEquals(4L, query.fetchCount());
+        assertEquals(3L, query.distinct(year).fetchCount());
+    }
+
+    @Test
+    public void list_sorted_descending_by_year() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("1954", documents.get(2).get("year"));
+        assertEquals("1864", documents.get(3).get("year"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_gross() {
+        query.where(gross.between(0.0, 1000.00));
+        query.orderBy(gross.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("90.0", documents.get(0).get("gross"));
+        assertEquals("89.0", documents.get(1).get("gross"));
+        assertEquals("30.5", documents.get(2).get("gross"));
+        assertEquals("10.0", documents.get(3).get("gross"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_ascending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Introduction to Algorithms", documents.get(0)
+                .get("title"));
+        assertEquals("Jurassic Park", documents.get(1).get("title"));
+    }
+
+    @Test
+    public void list_sorted_descending_by_year_and_descending_by_title() {
+        query.where(year.between(1800, 2000));
+        query.orderBy(year.desc());
+        query.orderBy(title.desc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+        assertEquals("1990", documents.get(0).get("year"));
+        assertEquals("1990", documents.get(1).get("year"));
+        assertEquals("Jurassic Park", documents.get(0).get("title"));
+        assertEquals("Introduction to Algorithms", documents.get(1)
+                .get("title"));
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Ignore
+    @Test(expected = QueryException.class)
+    public void list_sorted_index_problem_in_max_doc() throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class).addMockedMethod(
+                "maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(new IOException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.orderBy(title.asc());
+        query.fetch();
+        verify(searcher);
+    }
+
+    @Test
+    public void offset() {
+        assertTrue(query.where(title.eq("Jurassic Park")).offset(30).fetch()
+                .isEmpty());
+    }
+
+    @Test
+    public void load_list() {
+        Document document = query.where(title.ne("")).load(title).fetch()
+                .get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_list_fieldSelector() {
+        Document document = query.where(title.ne(""))
+                .load(Collections.singleton("title")).fetch().get(0);
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult() {
+        Document document = query.where(title.ne("")).load(title).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void load_singleResult_fieldSelector() {
+        Document document = query.where(title.ne(""))
+                .load(Collections.singleton("title")).fetchFirst();
+        assertNotNull(document.get("title"));
+        assertNull(document.get("year"));
+    }
+
+    @Test
+    public void singleResult() {
+        assertNotNull(query.where(title.ne("")).fetchFirst());
+    }
+
+    @Test
+    public void single_result_takes_limit() {
+        assertEquals("Jurassic Park", query.where(title.ne("")).limit(1)
+                .fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchFirst();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void single_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchFirst());
+    }
+
+    @Test
+    public void single_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne(""))
+                .offset(3).fetchFirst().get("title"));
+    }
+
+    @Test
+    public void single_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne(""))
+                .limit(1).offset(2).fetchFirst().get("title"));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResult_contract() {
+        query.where(title.ne("")).fetchOne();
+    }
+
+    @Test
+    public void unique_result_takes_limit() {
+        assertEquals("Jurassic Park", query.where(title.ne("")).limit(1)
+                .fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_actual_result_size() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.limit(3).fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void unique_result_returns_null_if_nothing_is_in_range() {
+        query.where(title.startsWith("Nummi"));
+        assertNull(query.offset(10).fetchOne());
+    }
+
+    @Test
+    public void unique_result_considers_offset() {
+        assertEquals("Introduction to Algorithms", query.where(title.ne(""))
+                .offset(3).fetchOne().get("title"));
+    }
+
+    @Test
+    public void unique_result_considers_limit_and_offset() {
+        assertEquals("The Lord of the Rings", query.where(title.ne(""))
+                .limit(1).offset(2).fetchOne().get("title"));
+    }
+
+    @Test
+    public void uniqueResult() {
+        query.where(title.startsWith("Nummi"));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test
+    public void uniqueResult_with_param() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.set(param, "Nummi");
+        query.where(title.startsWith(param));
+        final Document document = query.fetchOne();
+        assertEquals("Nummisuutarit", document.get("title"));
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void uniqueResult_param_not_set() {
+        final Param<String> param = new Param<String>(String.class, "title");
+        query.where(title.startsWith(param));
+        query.fetchOne();
+    }
+
+    @Test(expected = QueryException.class)
+    public void uniqueResult_finds_more_than_one_result() {
+        query.where(year.eq(1990));
+        query.fetchOne();
+    }
+
+    @Test
+    public void uniqueResult_finds_no_results() {
+        query.where(year.eq(2200));
+        assertNull(query.fetchOne());
+    }
+
+    @Test
+    @Ignore
+    public void uniqueResult_finds_no_results_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class)
+                .addMockedMethod("maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
+        replay(searcher);
+        assertNull(query.where(year.eq(3000)).fetchOne());
+        verify(searcher);
+    }
+
+    @Test(expected = QueryException.class)
+    @Ignore
+    public void uniqueResult_sorted_index_problem_in_max_doc()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class)
+                .addMockedMethod("maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andThrow(
+                new IllegalArgumentException());
+        replay(searcher);
+        query.where(title.eq("Jurassic Park"));
+        query.fetchOne();
+        verify(searcher);
+    }
+
+    @Test
+    @Ignore
+    public void count_returns_0_because_no_documents_in_index()
+            throws IOException {
+        searcher = createMockBuilder(IndexSearcher.class)
+                .addMockedMethod("maxDoc").createMock();
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        expect(searcher.getIndexReader().maxDoc()).andReturn(0);
+        replay(searcher);
+        assertEquals(0, query.where(year.eq(3000)).fetchCount());
+        verify(searcher);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinct() {
+        query.where(year.between(1900, 2000).or(title.startsWith("Jura")));
+        query.orderBy(year.asc());
+        final List<Document> documents = query.distinct().fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(3, documents.size());
+    }
+
+    @Test
+    public void listResults() {
+        query.where(year.between(1800, 2000));
+        query.restrict(new QueryModifiers(2L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals("1990", results.getResults().get(1).get("year"));
+        assertEquals(2, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void listDistinctResults() {
+        query.where(year.between(1800, 2000).or(
+                title.eq("The Lord of the Rings")));
+        query.restrict(new QueryModifiers(1L, 1L));
+        query.orderBy(year.asc());
+        final QueryResults<Document> results = query.distinct().fetchResults();
+        assertFalse(results.isEmpty());
+        assertEquals("1954", results.getResults().get(0).get("year"));
+        assertEquals(1, results.getLimit());
+        assertEquals(1, results.getOffset());
+        assertEquals(4, results.getTotal());
+    }
+
+    @Test
+    public void list_all() {
+        final List<Document> results = query.where(title.like("*"))
+                .orderBy(title.asc(), year.desc()).fetch();
+        assertEquals(4, results.size());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_negative() {
+        query.where(year.between(1800, 2000));
+        query.limit(-1);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_limit_0() {
+        query.where(year.between(1800, 2000));
+        query.limit(0);
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_sorted_ascending_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.orderBy(year.asc());
+        query.fetch();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void list_not_sorted_offset_negative() {
+        query.where(year.between(1800, 2000));
+        query.offset(-1);
+        query.fetch();
+    }
+
+    @Test
+    public void list_sorted_ascending_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        query.orderBy(year.asc());
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void list_not_sorted_offset_0() {
+        query.where(year.between(1800, 2000));
+        query.offset(0);
+        final List<Document> documents = query.fetch();
+        assertFalse(documents.isEmpty());
+        assertEquals(4, documents.size());
+    }
+
+    @Test
+    public void iterate() {
+        query.where(year.between(1800, 2000));
+        final Iterator<Document> iterator = query.iterate();
+        int count = 0;
+        while (iterator.hasNext()) {
+            iterator.next();
+            ++count;
+        }
+        assertEquals(4, count);
+    }
+
+    @Test
+    public void all_by_excluding_where() {
+        assertEquals(4, query.fetch().size());
+    }
+
+    @Test
+    public void empty_index_should_return_empty_list() throws Exception {
+        idx = new RAMDirectory();
+
+        writer = createWriter(idx);
+        writer.close();
+        IndexReader reader = DirectoryReader.open(idx);
+        searcher = new IndexSearcher(reader);
+        query = new LuceneQuery(new LuceneSerializer(true, true), searcher);
+        assertTrue(query.fetch().isEmpty());
+    }
+
+    @Test(expected = QueryException.class)
+    public void list_results_throws_an_illegal_argument_exception_when_sum_of_limit_and_offset_is_negative() {
+        query.limit(1).offset(Integer.MAX_VALUE).fetchResults();
+    }
+
+    @Test
+    public void limit_max_value() {
+        assertEquals(4, query.limit(Long.MAX_VALUE).fetch().size());
+    }
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerNotTokenizedTest.java
new file mode 100644
index 0000000000..9cff57a372
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerNotTokenizedTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static com.querydsl.lucene5.QPerson.person;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.joda.time.LocalDate;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class LuceneSerializerNotTokenizedTest {
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+    private LuceneSerializer serializer;
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private final Person clooney = new Person("actor_1", "George Clooney",
+            new LocalDate(1961, 4, 6));
+    private final Person pitt = new Person("actor_2", "Brad Pitt",
+            new LocalDate(1963, 12, 18));
+
+    private void testQuery(Expression<?> expr, String expectedQuery,
+            int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    private Document createDocument(Person person) {
+        Document doc = new Document();
+        doc.add(new Field("id", person.getId(), Store.YES, Index.NOT_ANALYZED));
+        doc.add(new Field("name", person.getName(), Store.YES,
+                Index.NOT_ANALYZED));
+        doc.add(new Field("birthDate", person.getBirthDate().toString(),
+                Store.YES, Index.NOT_ANALYZED));
+        return doc;
+    }
+
+    @Before
+    public void before() throws Exception {
+        serializer = new LuceneSerializer(false, false);
+        idx = new RAMDirectory();
+        IndexWriterConfig config = new IndexWriterConfig(new StandardAnalyzer())
+                .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument(clooney));
+        writer.addDocument(createDocument(pitt));
+
+        Document document = new Document();
+        for (String movie : Arrays.asList("Interview with the Vampire",
+                "Up in the Air")) {
+            document.add(new Field("movie", movie, Store.YES,
+                    Index.NOT_ANALYZED));
+        }
+        writer.addDocument(document);
+
+        writer.close();
+
+        IndexReader reader = DirectoryReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @Test
+    public void equals_by_id_matches() throws Exception {
+        testQuery(person.id.eq("actor_1"), "id:actor_1", 1);
+    }
+
+    @Test
+    public void equals_by_id_does_not_match() throws Exception {
+        testQuery(person.id.eq("actor_8"), "id:actor_8", 0);
+    }
+
+    @Test
+    public void equals_by_name_matches() throws Exception {
+        testQuery(person.name.eq("George Clooney"), "name:George Clooney", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_by_name_ignoring_case_does_not_match() throws Exception {
+        testQuery(person.name.equalsIgnoreCase("george clooney"),
+                "name:george clooney", 0);
+    }
+
+    @Test
+    public void equals_by_name_does_not_match() throws Exception {
+        testQuery(person.name.eq("George Looney"), "name:George Looney", 0);
+    }
+
+    @Test
+    public void starts_with_name_should_match() throws Exception {
+        testQuery(person.name.startsWith("George C"), "name:George C*", 1);
+    }
+
+    @Test
+    public void starts_with_name_should_not_match() throws Exception {
+        testQuery(person.name.startsWith("George L"), "name:George L*", 0);
+    }
+
+    @Test
+    public void ends_with_name_should_match() throws Exception {
+        testQuery(person.name.endsWith("e Clooney"), "name:*e Clooney", 1);
+    }
+
+    @Test
+    public void ends_with_name_should_not_match() throws Exception {
+        testQuery(person.name.endsWith("e Looney"), "name:*e Looney", 0);
+    }
+
+    @Test
+    public void contains_name_should_match() throws Exception {
+        testQuery(person.name.contains("oney"), "name:*oney*", 1);
+    }
+
+    @Test
+    public void contains_name_should_not_match() throws Exception {
+        testQuery(person.name.contains("bloney"), "name:*bloney*", 0);
+    }
+
+    @Test
+    public void in_names_should_match_2() throws Exception {
+        testQuery(person.name.in("Brad Pitt", "George Clooney"),
+                "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void or_by_name_should_match_2() throws Exception {
+        testQuery(
+                person.name.eq("Brad Pitt")
+                        .or(person.name.eq("George Clooney")),
+                "name:Brad Pitt name:George Clooney", 2);
+    }
+
+    @Test
+    public void equals_by_birth_date() throws Exception {
+        testQuery(person.birthDate.eq(clooney.getBirthDate()),
+                "birthDate:1961-04-06", 1);
+    }
+
+    @Test
+    public void between_phrase() throws Exception {
+        testQuery(person.name.between("Brad Pitt", "George Clooney"),
+                "name:[Brad Pitt TO George Clooney]", 2);
+    }
+
+    @Test
+    public void not_equals_finds_the_actors_and_movies() throws Exception {
+        testQuery(person.name.ne("Michael Douglas"),
+                "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void not_equals_finds_only_clooney_and_movies() throws Exception {
+        testQuery(person.name.ne("Brad Pitt"), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void and_with_two_not_equals_doesnt_find_the_actors()
+            throws Exception {
+        testQuery(
+                person.name.ne("Brad Pitt").and(
+                        person.name.ne("George Clooney")),
+                "+(-name:Brad Pitt +*:*) +(-name:George Clooney +*:*)", 1);
+    }
+
+    @Test
+    public void or_with_two_not_equals_finds_movies_and_actors()
+            throws Exception {
+        testQuery(
+                person.name.ne("Brad Pitt")
+                        .or(person.name.ne("George Clooney")),
+                "(-name:Brad Pitt +*:*) (-name:George Clooney +*:*)", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_movies_and_actors() throws Exception {
+        testQuery(person.name.eq("Michael Douglas").not(),
+                "-name:Michael Douglas +*:*", 3);
+    }
+
+    @Test
+    public void negation_of_equals_finds_pitt_and_movies() throws Exception {
+        testQuery(person.name.eq("Brad Pitt").not(), "-name:Brad Pitt +*:*", 2);
+    }
+
+    @Test
+    public void multiple_field_search_from_movies() throws Exception {
+        StringPath movie = Expressions.stringPath("movie");
+        testQuery(movie.in("Interview with the Vampire"),
+                "movie:Interview with the Vampire", 1);
+        testQuery(movie.eq("Up in the Air"), "movie:Up in the Air", 1);
+    }
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java
new file mode 100644
index 0000000000..e3a984f416
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/LuceneSerializerTest.java
@@ -0,0 +1,753 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.LongField;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.RAMDirectory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.MatchingFiltersFactory;
+import com.querydsl.core.QuerydslModule;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.StringConstant;
+import com.querydsl.core.Target;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.CollectionPath;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+
+/**
+ * Tests for LuceneSerializer
+ *
+ * @author vema
+ *
+ */
+public class LuceneSerializerTest {
+    private LuceneSerializer serializer;
+    private PathBuilder<Object> entityPath;
+    private StringPath title;
+    private StringPath author;
+    private StringPath text;
+    private StringPath rating;
+    private StringPath publisher;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+    private CollectionPath<String, StringPath> titles;
+
+    private NumberPath<Long> longField;
+    private NumberPath<Short> shortField;
+    private NumberPath<Byte> byteField;
+    private NumberPath<Float> floatField;
+
+    private static final String YEAR_PREFIX_CODED = "";
+    private static final String GROSS_PREFIX_CODED = "";
+    private static final String LONG_PREFIX_CODED = "";
+    private static final String SHORT_PREFIX_CODED = "";
+    private static final String BYTE_PREFIX_CODED = "";
+    private static final String FLOAT_PREFIX_CODED = "";
+
+    private IndexWriterConfig config;
+    private RAMDirectory idx;
+    private IndexWriter writer;
+    private IndexSearcher searcher;
+
+    private static final Set<? extends Operator> UNSUPPORTED_OPERATORS = Collections.unmodifiableSet(EnumSet.of(Ops.STARTS_WITH_IC,
+            Ops.EQ_IGNORE_CASE, Ops.ENDS_WITH_IC, Ops.STRING_CONTAINS_IC));
+
+    private final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    private Document createDocument() {
+        Document doc = new Document();
+
+        doc.add(new Field("title", new StringReader("Jurassic Park")));
+        doc.add(new Field("author", new StringReader("Michael Crichton")));
+        doc.add(new Field("text", new StringReader(
+                "It's a UNIX system! I know this!")));
+        doc.add(new Field("rating", new StringReader("Good")));
+        doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
+        doc.add(new IntField("year", 1990, Store.YES));
+        doc.add(new DoubleField("gross", 900.0, Store.YES));
+
+        doc.add(new LongField("longField", 1, Store.YES));
+        doc.add(new IntField("shortField", 1, Store.YES));
+        doc.add(new IntField("byteField", 1, Store.YES));
+        doc.add(new FloatField("floatField", 1, Store.YES));
+
+        return doc;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        serializer = new LuceneSerializer(true, true);
+        entityPath = new PathBuilder<Object>(Object.class, "obj");
+        title = entityPath.getString("title");
+        author = entityPath.getString("author");
+        text = entityPath.getString("text");
+        publisher = entityPath.getString("publisher");
+        year = entityPath.getNumber("year", Integer.class);
+        rating = entityPath.getString("rating");
+        gross = entityPath.getNumber("gross", Double.class);
+        titles = entityPath.getCollection("title", String.class,
+                StringPath.class);
+
+        longField = entityPath.getNumber("longField", Long.class);
+        shortField = entityPath.getNumber("shortField", Short.class);
+        byteField = entityPath.getNumber("byteField", Byte.class);
+        floatField = entityPath.getNumber("floatField", Float.class);
+
+        idx = new RAMDirectory();
+        config = new IndexWriterConfig(new StandardAnalyzer())
+                .setOpenMode(IndexWriterConfig.OpenMode.CREATE);
+        writer = new IndexWriter(idx, config);
+
+        writer.addDocument(createDocument());
+
+        writer.close();
+
+        IndexReader reader = DirectoryReader.open(idx);
+        searcher = new IndexSearcher(reader);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        searcher.getIndexReader().close();
+    }
+
+    private void testQuery(Expression<?> expr, int expectedHits)
+            throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+    }
+
+    private void testQuery(Expression<?> expr, String expectedQuery,
+            int expectedHits) throws Exception {
+        Query query = serializer.toQuery(expr, metadata);
+        TopDocs docs = searcher.search(query, 100);
+        assertEquals(expectedHits, docs.totalHits);
+        assertEquals(expectedQuery, query.toString());
+    }
+
+    @Test
+    public void queryElement() throws Exception {
+        Query query1 = serializer.toQuery(author.like("Michael"), metadata);
+        Query query2 = serializer.toQuery(text.like("Text"), metadata);
+
+        BooleanExpression query = Expressions.anyOf(new QueryElement(query1),
+                new QueryElement(query2));
+        testQuery(query, "author:michael text:text", 1);
+    }
+
+    @Test
+    public void like() throws Exception {
+        testQuery(author.like("*ichael*"), "author:*ichael*", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_single_character() throws Exception {
+        testQuery(author.like("Mi?hael"), "author:mi?hael", 1);
+    }
+
+    @Test
+    public void like_custom_wildcard_multiple_character() throws Exception {
+        testQuery(text.like("*U*X*"), "text:*u*x*", 1);
+    }
+
+    @Test
+    public void like_phrase() throws Exception {
+        testQuery(title.like("*rassic Par*"), "+title:**rassic* +title:*par**",
+                1);
+    }
+
+    @Test
+    public void like_or_like() throws Exception {
+        testQuery(title.like("House").or(author.like("*ichae*")),
+                "title:house author:*ichae*", 1);
+    }
+
+    @Test
+    public void like_and_like() throws Exception {
+        testQuery(title.like("*assic*").and(rating.like("G?od")),
+                "+title:*assic* +rating:g?od", 1);
+    }
+
+    @Test
+    public void eq() throws Exception {
+        testQuery(rating.eq("good"), "rating:good", 1);
+    }
+
+    @Test
+    public void eq_with_deep_path() throws Exception {
+        StringPath deepPath = entityPath.get("property1", Object.class)
+                .getString("property2");
+        testQuery(deepPath.eq("good"), "property1.property2:good", 0);
+    }
+
+    @Test
+    public void fuzzyLike() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good"), "rating:Good~2",
+                1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2),
+                "rating:Good~2", 1);
+    }
+
+    @Test
+    public void fuzzyLike_with_similarity_and_prefix() throws Exception {
+        testQuery(LuceneExpressions.fuzzyLike(rating, "Good", 2, 0),
+                "rating:Good~2", 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric_integer() throws Exception {
+        testQuery(year.eq(1990), "year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric_double() throws Exception {
+        testQuery(gross.eq(900.00), "gross:" + GROSS_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_numeric() throws Exception {
+        testQuery(longField.eq(1L), "longField:" + LONG_PREFIX_CODED, 1);
+        testQuery(shortField.eq((short) 1), "shortField:" + SHORT_PREFIX_CODED,
+                1);
+        testQuery(byteField.eq((byte) 1), "byteField:" + BYTE_PREFIX_CODED, 1);
+        testQuery(floatField.eq((float) 1.0), "floatField:"
+                + FLOAT_PREFIX_CODED, 1);
+    }
+
+    @Test
+    public void equals_ignores_case() throws Exception {
+        testQuery(title.eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_or_year_equals() throws Exception {
+        testQuery(title.equalsIgnoreCase("House").or(year.eq(1990)),
+                "title:house year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_and_eq() throws Exception {
+        testQuery(title.eq("Jurassic Park").and(year.eq(1990)),
+                "+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED, 1);
+    }
+
+    @Test
+    @Ignore
+    public void eq_and_eq_and_eq() throws Exception {
+        testQuery(
+                title.eq("Jurassic Park").and(year.eq(1990))
+                        .and(author.eq("Michael Crichton")),
+                "+(+title:\"jurassic park\" +year:" + YEAR_PREFIX_CODED
+                        + ") +author:\"michael crichton\"", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void equals_ignore_case_and_or() throws Exception {
+        testQuery(
+                title.equalsIgnoreCase("Jurassic Park")
+                        .and(rating.equalsIgnoreCase("Bad"))
+                        .or(author.equalsIgnoreCase("Michael Crichton")),
+                "(+title:\"jurassic park\" +rating:bad) author:\"michael crichton\"",
+                1);
+    }
+
+    @Test
+    public void eq_or_eq_and_eq_does_not_find_results() throws Exception {
+        testQuery(
+                title.eq("jeeves").or(rating.eq("superb"))
+                        .and(author.eq("michael crichton")),
+                "+(title:jeeves rating:superb) +author:\"michael crichton\"", 0);
+    }
+
+    @Test
+    public void eq_phrase() throws Exception {
+        testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
+    }
+
+    @Test
+    @Ignore("Not easily done in Lucene!")
+    public void publisher_equals_empty_string() throws Exception {
+        testQuery(publisher.eq(""), "publisher:", 1);
+    }
+
+    @Test
+    public void eq_phrase_should_not_find_results_but_luceNe_semantics_differs_from_querydsls()
+            throws Exception {
+        testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
+    }
+
+    @Test
+    public void eq_phrase_does_not_find_results_because_word_in_middle()
+            throws Exception {
+        testQuery(title.eq("Jurassic Amusement Park"),
+                "title:\"jurassic amusement park\"", 0);
+    }
+
+    @Test
+    public void like_not_does_not_find_results() throws Exception {
+        testQuery(title.like("*H*e*").not(), "-title:*h*e* +*:*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void title_equals_ignore_case_negation_or_rating_equals_ignore_case()
+            throws Exception {
+        testQuery(
+                title.equalsIgnoreCase("House").not()
+                        .or(rating.equalsIgnoreCase("Good")),
+                "-title:house rating:good", 1);
+    }
+
+    @Test
+    public void eq_not_does_not_find_results() throws Exception {
+        testQuery(title.eq("Jurassic Park").not(),
+                "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void title_equals_not_house() throws Exception {
+        testQuery(title.eq("house").not(), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void eq_and_eq_not_does_not_find_results_because_second_expression_finds_nothing()
+            throws Exception {
+        testQuery(rating.eq("superb").and(title.eq("house").not()),
+                "+rating:superb +(-title:house +*:*)", 0);
+    }
+
+    @Test
+    public void not_equals_finds_one() throws Exception {
+        testQuery(title.ne("house"), "-title:house +*:*", 1);
+    }
+
+    @Test
+    public void not_equals_finds_none() throws Exception {
+        testQuery(title.ne("Jurassic Park"), "-title:\"jurassic park\" +*:*", 0);
+    }
+
+    @Test
+    public void nothing_found_with_not_equals_or_equals() throws Exception {
+        testQuery(title.ne("jurassic park").or(rating.eq("lousy")),
+                "(-title:\"jurassic park\" +*:*) rating:lousy", 0);
+    }
+
+    @Test
+    public void ne_and_eq() throws Exception {
+        testQuery(title.ne("house").and(rating.eq("good")),
+                "+(-title:house +*:*) +rating:good", 1);
+    }
+
+    @Test
+    public void startsWith() throws Exception {
+        testQuery(title.startsWith("Jurassi"), "title:jurassi*", 1);
+    }
+
+    @Test
+    public void startsWith_phrase() throws Exception {
+        testQuery(title.startsWith("jurassic par"),
+                "+title:jurassic* +title:*par*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void starts_with_ignore_case_phrase_does_not_find_results()
+            throws Exception {
+        testQuery(title.startsWithIgnoreCase("urassic Par"),
+                "+title:urassic* +title:*par*", 0);
+    }
+
+    @Test
+    public void endsWith() throws Exception {
+        testQuery(title.endsWith("ark"), "title:*ark", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase() throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Park"),
+                "+title:*sic* +title:*park", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void ends_with_ignore_case_phrase_does_not_find_results()
+            throws Exception {
+        testQuery(title.endsWithIgnoreCase("sic Par"),
+                "+title:*sic* +title:*par", 0);
+    }
+
+    @Test
+    public void contains() throws Exception {
+        testQuery(title.contains("rassi"), "title:*rassi*", 1);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void contains_ignore_case_phrase() throws Exception {
+        testQuery(title.containsIgnoreCase("rassi Pa"),
+                "+title:*rassi* +title:*pa*", 1);
+    }
+
+    @Test
+    public void contains_user_inputted_wildcards_dont_work() throws Exception {
+        testQuery(title.contains("r*i"), "title:*r\\*i*", 0);
+    }
+
+    @Test
+    public void between() throws Exception {
+        testQuery(title.between("Indiana", "Kundun"),
+                "title:[indiana TO kundun]", 1);
+    }
+
+    @Test
+    public void between_numeric_integer() throws Exception {
+        testQuery(year.between(1980, 2000), "year:[1980 TO 2000]", 1);
+    }
+
+    @Test
+    public void between_numeric_double() throws Exception {
+        testQuery(gross.between(10.00, 19030.00), "gross:[10.0 TO 19030.0]", 1);
+    }
+
+    @Test
+    public void between_numeric() throws Exception {
+        testQuery(longField.between(0L, 2L), "longField:[0 TO 2]", 1);
+        testQuery(shortField.between((short) 0, (short) 2),
+                "shortField:[0 TO 2]", 1);
+        testQuery(byteField.between((byte) 0, (byte) 2), "byteField:[0 TO 2]",
+                1);
+        testQuery(floatField.between((float) 0.0, (float) 2.0),
+                "floatField:[0.0 TO 2.0]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_from_start() throws Exception {
+        testQuery(title.between("Jurassic", "Kundun"),
+                "title:[jurassic TO kundun]", 1);
+    }
+
+    @Test
+    public void between_is_inclusive_to_end() throws Exception {
+        testQuery(title.between("Indiana", "Jurassic"),
+                "title:[indiana TO jurassic]", 1);
+    }
+
+    @Test
+    public void between_does_not_find_results() throws Exception {
+        testQuery(title.between("Indiana", "Jurassib"),
+                "title:[indiana TO jurassib]", 0);
+    }
+
+    @Test
+    public void in() throws Exception {
+        testQuery(title.in(Arrays.asList("jurassic", "park")),
+                "title:jurassic title:park", 1);
+        testQuery(title.in("jurassic", "park"), "title:jurassic title:park", 1);
+        testQuery(title.eq("jurassic").or(title.eq("park")),
+                "title:jurassic title:park", 1);
+    }
+
+    @Test
+    public void lt() throws Exception {
+        testQuery(rating.lt("Superb"), "rating:{* TO superb}", 1);
+    }
+
+    @Test
+    public void lt_numeric_integer() throws Exception {
+        testQuery(year.lt(1991), "year:{* TO 1991}", 1);
+    }
+
+    @Test
+    public void lt_numeric_double() throws Exception {
+        testQuery(gross.lt(10000.0), "gross:{* TO 10000.0}", 1);
+    }
+
+    @Test
+    public void lt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.lt("Good"), "rating:{* TO good}", 0);
+    }
+
+    @Test
+    public void lt_numeric_integer_not_in_range_because_equal()
+            throws Exception {
+        testQuery(year.lt(1990), "year:{* TO 1990}", 0);
+    }
+
+    @Test
+    public void lt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.lt(900.0), "gross:{* TO 900.0}", 0);
+    }
+
+    @Test
+    public void loe() throws Exception {
+        testQuery(rating.loe("Superb"), "rating:[* TO superb]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer() throws Exception {
+        testQuery(year.loe(1991), "year:[* TO 1991]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double() throws Exception {
+        testQuery(gross.loe(903.0), "gross:[* TO 903.0]", 1);
+    }
+
+    @Test
+    public void loe_equal() throws Exception {
+        testQuery(rating.loe("Good"), "rating:[* TO good]", 1);
+    }
+
+    @Test
+    public void loe_numeric_integer_equal() throws Exception {
+        testQuery(year.loe(1990), "year:[* TO 1990]", 1);
+    }
+
+    @Test
+    public void loe_numeric_double_equal() throws Exception {
+        testQuery(gross.loe(900.0), "gross:[* TO 900.0]", 1);
+    }
+
+    @Test
+    public void loe_not_found() throws Exception {
+        testQuery(rating.loe("Bad"), "rating:[* TO bad]", 0);
+    }
+
+    @Test
+    public void loe_numeric_integer_not_found() throws Exception {
+        testQuery(year.loe(1989), "year:[* TO 1989]", 0);
+    }
+
+    @Test
+    public void loe_numeric_double_not_found() throws Exception {
+        testQuery(gross.loe(899.9), "gross:[* TO 899.9]", 0);
+    }
+
+    @Test
+    public void gt() throws Exception {
+        testQuery(rating.gt("Bad"), "rating:{bad TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_integer() throws Exception {
+        testQuery(year.gt(1989), "year:{1989 TO *}", 1);
+    }
+
+    @Test
+    public void gt_numeric_double() throws Exception {
+        testQuery(gross.gt(100.00), "gross:{100.0 TO *}", 1);
+    }
+
+    @Test
+    public void gt_not_in_range_because_equal() throws Exception {
+        testQuery(rating.gt("Good"), "rating:{good TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_integer_not_in_range_because_equal()
+            throws Exception {
+        testQuery(year.gt(1990), "year:{1990 TO *}", 0);
+    }
+
+    @Test
+    public void gt_numeric_double_not_in_range_because_equal() throws Exception {
+        testQuery(gross.gt(900.00), "gross:{900.0 TO *}", 0);
+    }
+
+    @Test
+    public void goe() throws Exception {
+        testQuery(rating.goe("Bad"), "rating:[bad TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer() throws Exception {
+        testQuery(year.goe(1989), "year:[1989 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double() throws Exception {
+        testQuery(gross.goe(320.50), "gross:[320.5 TO *]", 1);
+    }
+
+    @Test
+    public void goe_equal() throws Exception {
+        testQuery(rating.goe("Good"), "rating:[good TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_integer_equal() throws Exception {
+        testQuery(year.goe(1990), "year:[1990 TO *]", 1);
+    }
+
+    @Test
+    public void goe_numeric_double_equal() throws Exception {
+        testQuery(gross.goe(900.00), "gross:[900.0 TO *]", 1);
+    }
+
+    @Test
+    public void goe_not_found() throws Exception {
+        testQuery(rating.goe("Hood"), "rating:[hood TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_integer_not_found() throws Exception {
+        testQuery(year.goe(1991), "year:[1991 TO *]", 0);
+    }
+
+    @Test
+    public void goe_numeric_double_not_found() throws Exception {
+        testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
+    }
+
+    @Test
+    public void equals_empty_string() throws Exception {
+        testQuery(title.eq(""), "title:", 0);
+    }
+
+    @Test
+    public void not_equals_empty_string() throws Exception {
+        testQuery(title.ne(""), "-title: +*:*", 1);
+    }
+
+    @Test
+    public void contains_empty_string() throws Exception {
+        testQuery(title.contains(""), "title:**", 1);
+    }
+
+    @Test
+    public void like_empty_string() throws Exception {
+        testQuery(title.like(""), "title:", 0);
+    }
+
+    @Test
+    public void starts_with_empty_string() throws Exception {
+        testQuery(title.startsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void ends_with_empty_string() throws Exception {
+        testQuery(title.endsWith(""), "title:*", 1);
+    }
+
+    @Test
+    public void between_empty_strings() throws Exception {
+        testQuery(title.between("", ""), "title:[ TO ]", 0);
+    }
+
+    @Test
+    public void booleanBuilder() throws Exception {
+        testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]",
+                0);
+    }
+
+    @Test
+    @Ignore
+    public void fuzzy() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void proximity() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    @Ignore
+    public void boost() throws Exception {
+        fail("Not yet implemented!");
+    }
+
+    @Test
+    public void pathAny() throws Exception {
+        testQuery(titles.any().eq("Jurassic"), "title:jurassic", 1);
+    }
+
+    private boolean unsupportedOperation(Predicate filter) {
+        return UNSUPPORTED_OPERATORS.contains(((Operation<?>) filter).getOperator());
+    }
+
+    @Test
+    public void various() throws Exception {
+        MatchingFiltersFactory filters = new MatchingFiltersFactory(
+                QuerydslModule.LUCENE, Target.LUCENE);
+        for (Predicate filter : filters.string(title,
+                StringConstant.create("jurassic park"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(author,
+                StringConstant.create("michael crichton"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 1);
+        }
+
+        for (Predicate filter : filters.string(title,
+                StringConstant.create("1990"))) {
+            if (unsupportedOperation(filter)) {
+                continue;
+            }
+            testQuery(filter, 0);
+        }
+    }
+
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/Person.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/Person.java
new file mode 100644
index 0000000000..c3f0bb1409
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/Person.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.joda.time.LocalDate;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class Person {
+    private final String id;
+    private final String name;
+    private final LocalDate birthDate;
+
+    public Person(String id, String name, LocalDate birthDate) {
+        this.id = id;
+        this.name = name;
+        this.birthDate = birthDate;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/PhraseElementTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/PhraseElementTest.java
new file mode 100644
index 0000000000..0b6aebc57e
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/PhraseElementTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.lucene5.LuceneSerializer;
+import com.querydsl.lucene5.PhraseElement;
+
+public class PhraseElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false, false);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:Hello World",
+                serializer.toQuery(title.eq("Hello World"), metadata)
+                        .toString());
+        assertEquals(
+                "title:\"Hello World\"",
+                serializer.toQuery(title.eq(new PhraseElement("Hello World")),
+                        metadata).toString());
+    }
+
+    @Test
+    public void equals() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x"), el3 = new PhraseElement(
+                "y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+    }
+
+    @Test
+    public void hashCode_() {
+        PhraseElement el1 = new PhraseElement("x"), el2 = new PhraseElement("x");
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QDocument.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QDocument.java
new file mode 100644
index 0000000000..da2b5e2af6
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QDocument.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import org.apache.lucene.document.Document;
+
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QDocument extends EntityPathBase<Document> {
+
+    private static final long serialVersionUID = -4872833626508344081L;
+
+    public QDocument(final String var) {
+        super(Document.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public final NumberPath<Integer> year = createNumber("year", Integer.class);
+
+    public final StringPath title = createString("title");
+
+    public final NumberPath<Double> gross = createNumber("gross", Double.class);
+
+}
\ No newline at end of file
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QueryElementTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QueryElementTest.java
new file mode 100644
index 0000000000..b014f84776
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/QueryElementTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.lucene5.QueryElement;
+
+public class QueryElementTest {
+
+    @Test
+    @Ignore
+    public void test() {
+        QueryElement element = new QueryElement(new TermQuery(new Term("str",
+                "text")));
+        assertEquals("str:text", element.toString());
+        // assertEquals(element.getQuery().hashCode(), element.hashCode());
+
+        QueryElement element2 = new QueryElement(new TermQuery(new Term("str",
+                "text")));
+        assertEquals(element2, element);
+    }
+}
diff --git a/querydsl-lucene5/src/test/java/com/querydsl/lucene5/TermElementTest.java b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/TermElementTest.java
new file mode 100644
index 0000000000..73fd8bd2fd
--- /dev/null
+++ b/querydsl-lucene5/src/test/java/com/querydsl/lucene5/TermElementTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.lucene5;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.lucene5.LuceneSerializer;
+import com.querydsl.lucene5.TermElement;
+
+public class TermElementTest {
+
+    @Test
+    public void test() {
+        StringPath title = Expressions.stringPath("title");
+        LuceneSerializer serializer = new LuceneSerializer(false, true);
+        QueryMetadata metadata = new DefaultQueryMetadata();
+        assertEquals("title:\"Hello World\"",
+                serializer.toQuery(title.eq("Hello World"), metadata)
+                        .toString());
+        assertEquals(
+                "title:Hello World",
+                serializer.toQuery(title.eq(new TermElement("Hello World")),
+                        metadata).toString());
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        TermElement el1 = new TermElement("x"), el2 = new TermElement("x"), el3 = new TermElement(
+                "y");
+        assertEquals(el1, el2);
+        assertFalse(el1.equals(el3));
+        assertEquals(el1.hashCode(), el2.hashCode());
+    }
+
+}
diff --git a/querydsl-lucene5/src/test/resources/log4j.properties.example b/querydsl-lucene5/src/test/resources/log4j.properties.example
new file mode 100644
index 0000000000..0f193f333c
--- /dev/null
+++ b/querydsl-lucene5/src/test/resources/log4j.properties.example
@@ -0,0 +1,9 @@
+# Configure an appender that logs to console
+log4j.rootLogger=info, A1
+log4j.threshold=debug
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} - %m%n
+
+# Configuration of logging levels for different packages
+log4j.logger.com.querydsl.lucene5=DEBUG
diff --git a/querydsl-maven-plugin/pom.xml b/querydsl-maven-plugin/pom.xml
index acc609708f..29392fadfc 100644
--- a/querydsl-maven-plugin/pom.xml
+++ b/querydsl-maven-plugin/pom.xml
@@ -1,101 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.mysema.querydsl</groupId>
-    <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
-  </parent>
-
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-maven-plugin</artifactId>
-  <name>Querydsl - Maven plugin</name>
-  <description>Querydsl Maven plugin</description>
-  <url>${project.homepage}</url>
-  <packaging>maven-plugin</packaging>
-  
-  <scm>
-    <connection>${project.checkout}</connection>
-    <developerConnection>${project.checkout}</developerConnection>
-    <url>${project.githubpage}</url>
-  </scm>
-  
-  <properties>
-    <mvn.version>2.2.1</mvn.version>
-    <jdo.version>2.3-eb</jdo.version>
-  </properties>  
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mvn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${mvn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>${mvn.version}</version>
-    </dependency>
-      
-    <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-build-api</artifactId>
-      <version>0.0.7</version>
-    </dependency>
-   <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.5.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-sql-codegen</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>    
-    
-    <!-- annotations -->
-    <dependency>
-      <groupId>javax.jdo</groupId>
-      <artifactId>jdo2-api</artifactId>
-      <version>${jdo.version}</version>
-    </dependency>    
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-    </dependency>    
-
-    <!-- test -->
-    
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.2.133</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-core</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>        
-    
-  </dependencies>
-
-</project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-root</artifactId>
+        <version>5.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-maven-plugin</artifactId>
+    <name>Querydsl - Maven plugin</name>
+    <description>Querydsl Maven plugin</description>
+    <url>${project.homepage}</url>
+    <packaging>maven-plugin</packaging>
+
+    <scm>
+        <connection>${project.checkout}</connection>
+        <developerConnection>${project.checkout}</developerConnection>
+        <url>${project.githubpage}</url>
+    </scm>
+
+    <properties>
+        <mvn.version>2.2.1</mvn.version>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.11.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>3.4.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${mvn.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>${mvn.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>${mvn.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.sonatype.plexus</groupId>
+            <artifactId>plexus-build-api</artifactId>
+            <version>0.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-sql-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- annotations -->
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>javax.jdo</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>2.2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- test -->
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${jodatime.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <!-- See http://stackoverflow.com/a/22296107/14731 -->
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java
deleted file mode 100644
index ef7240e000..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractExporterMojo.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.sonatype.plexus.build.incremental.BuildContext;
-
-import com.mysema.query.codegen.GenericExporter;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.codegen.TypeMappings;
-
-/**
- * AbstractExporterMojo calls the {@link GenericExporter} tool using the
- * classpath of the module the plugin is invoked in.
- *
- */
-public abstract class AbstractExporterMojo extends AbstractMojo {
-
-    /**
-     * @parameter required=true
-     */
-    private File targetFolder;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean scala;
-
-    /**
-     * @parameter required=true
-     */
-    private String[] packages;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean handleFields = true;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean handleMethods = true;
-
-    /**
-     * @parameter expression="${project}" readonly=true required=true
-     */
-    private MavenProject project;
-
-    /**
-     * @parameter
-     */
-    private String sourceEncoding;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean testClasspath;
-
-    /**
-     * @component
-     */
-    private BuildContext buildContext;
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        if (testClasspath) {
-            project.addTestCompileSourceRoot(targetFolder.getAbsolutePath());
-        } else {
-            project.addCompileSourceRoot(targetFolder.getAbsolutePath());
-        }
-        if (!hasSourceChanges()) {
-            // Only run if something has changed on the source dirs. This will
-            // avoid m2e entering on a infinite build.
-            return;
-        }
-
-        ClassLoader classLoader = null;
-        try {
-            classLoader = getProjectClassLoader();
-        } catch (MalformedURLException e) {
-            throw new MojoFailureException(e.getMessage(), e);
-        } catch (DependencyResolutionRequiredException e) {
-            throw new MojoFailureException(e.getMessage(), e);
-        }
-
-        Charset charset = sourceEncoding != null ? Charset.forName(sourceEncoding) : Charset.defaultCharset();
-        GenericExporter exporter = new GenericExporter(classLoader, charset);
-        exporter.setTargetFolder(targetFolder);
-
-        if (scala) {
-            try {
-                exporter.setSerializerClass((Class<? extends Serializer>) Class
-                        .forName("com.mysema.query.scala.ScalaEntitySerializer"));
-                exporter.setTypeMappingsClass((Class<? extends TypeMappings>) Class
-                        .forName("com.mysema.query.scala.ScalaTypeMappings"));
-                exporter.setCreateScalaSources(true);
-            } catch (ClassNotFoundException e) {
-                throw new MojoFailureException(e.getMessage(), e);
-            }
-        }
-
-        configure(exporter);
-        exporter.export(packages);
-    }
-
-    /**
-     * Configures the {@link GenericExporter}; subclasses may override if desired.
-     */
-    protected void configure(GenericExporter exporter) {
-        exporter.setHandleFields(handleFields);
-        exporter.setHandleMethods(handleMethods);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected ClassLoader getProjectClassLoader() throws DependencyResolutionRequiredException,
-            MalformedURLException {
-        List<String> classpathElements;
-        if (testClasspath) {
-            classpathElements = project.getTestClasspathElements();
-        } else {
-            classpathElements = project.getCompileClasspathElements();
-        }
-        List<URL> urls = new ArrayList<URL>(classpathElements.size());
-        for (String element : classpathElements) {
-            File file = new File(element);
-            if (file.exists()) {
-                urls.add(file.toURI().toURL());
-            }
-        }
-        return new URLClassLoader(urls.toArray(new URL[urls.size()]), getClass().getClassLoader());
-    }
-
-    @SuppressWarnings("rawtypes")
-    private boolean hasSourceChanges() {
-        if (buildContext != null) {
-            List sourceRoots = testClasspath ? project.getTestCompileSourceRoots() :
-                                               project.getCompileSourceRoots();
-            for (Object path : sourceRoots) {
-                if (buildContext.hasDelta(new File(path.toString()))) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public void setTargetFolder(File targetFolder) {
-        this.targetFolder = targetFolder;
-    }
-
-    public void setScala(boolean scala) {
-        this.scala = scala;
-    }
-
-    public void setPackages(String[] packages) {
-        this.packages = packages;
-    }
-
-    public void setProject(MavenProject project) {
-        this.project = project;
-    }
-
-    public void setSourceEncoding(String sourceEncoding) {
-        this.sourceEncoding = sourceEncoding;
-    }
-
-    public void setTestClasspath(boolean testClasspath) {
-        this.testClasspath = testClasspath;
-    }
-
-    public void setBuildContext(BuildContext buildContext) {
-        this.buildContext = buildContext;
-    }
-
-    public void setHandleFields(boolean handleFields) {
-        this.handleFields = handleFields;
-    }
-
-    public void setHandleMethods(boolean handleMethods) {
-        this.handleMethods = handleMethods;
-    }
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java
deleted file mode 100644
index b56f41c305..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Comparator;
-
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.query.codegen.BeanSerializer;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.MetaDataExporter;
-import com.mysema.query.sql.codegen.NamingStrategy;
-import com.mysema.query.sql.types.Type;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * MetaDataExportMojo is a goal for MetaDataExporter usage
- *
- * @author tiwe
- */
-public class AbstractMetaDataExportMojo extends AbstractMojo{
-
-    /**
-     * @parameter expression="${project}" readonly=true required=true
-     */
-    private MavenProject project;
-
-    /**
-     * JDBC driver class name
-     * @parameter required=true
-     */
-    private String jdbcDriver;
-
-    /**
-     * JDBC connection url
-     * @parameter required=true
-     */
-    private String jdbcUrl;
-
-    /**
-     * JDBC connection username
-     * @parameter
-     */
-    private String jdbcUser;
-
-    /**
-     * JDBC connection password
-     * @parameter
-     */
-    private String jdbcPassword;
-
-    /**
-     * name prefix for query-types (default: "Q")
-     * @parameter default-value="Q"
-     */
-    private String namePrefix;
-
-    /**
-     * name prefix for query-types (default: "")
-     * @parameter default-value=""
-     */
-    private String nameSuffix;
-
-    /**
-     * name prefix for bean types (default: "")
-     * @parameter default-value=""
-     */
-    private String beanPrefix;
-
-    /**
-     * name prefix for bean types (default: "")
-     * @parameter default-value=""
-     */
-    private String beanSuffix;
-
-    /**
-     * package name for sources
-     * @parameter required=true
-     */
-    private String packageName;
-
-    /**
-     * package name for bean sources (default: packageName)
-     * @parameter
-     */
-    private String beanPackageName;
-
-    /**
-     * schemaPattern a schema name pattern; must match the schema name
-     *        as it is stored in the database; "" retrieves those without a schema;
-     *        <code>null</code> means that the schema name should not be used to narrow
-     *        the search (default: null)
-     *
-     * @parameter
-     */
-    private String schemaPattern;
-
-    /**
-     * tableNamePattern a table name pattern; must match the
-    *        table name as it is stored in the database (default: null)
-     *
-     * @parameter
-     */
-    private String tableNamePattern;
-
-    /**
-     * target source folder to create the sources into (e.g. target/generated-sources/java)
-     *
-     * @parameter required=true
-     */
-    private String targetFolder;
-
-    /**
-     * namingstrategy class to override (default: DefaultNamingStrategy)
-     *
-     * @parameter
-     */
-    private String namingStrategyClass;
-
-    /**
-     * @parameter
-     */
-    private String beanSerializerClass;
-
-    /**
-     * @parameter
-     */
-    private String serializerClass;
-
-    /**
-     * serialize beans as well
-     *
-     * @parameter default-value=false
-     */
-    private boolean exportBeans;
-
-    /**
-     * @parameter
-     */
-    private String[] beanInterfaces;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean beanAddToString;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean beanAddFullConstructor;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean beanPrintSupertype;
-
-    /**
-     * wrap key properties into inner classes (default: false)
-     *
-     * @parameter default-value=false
-     */
-    private boolean innerClassesForKeys;
-
-    /**
-     * export validation annotations (default: false)
-     *
-     * @parameter default-value=false
-     */
-    private boolean validationAnnotations;
-
-    /**
-     * export column annotations (default: false)
-     *
-     * @parameter default-value=false
-     */
-    private boolean columnAnnotations;
-
-    /**
-     * @parameter
-     */
-    private String[] customTypes;
-
-    /**
-     * @parameter
-     */
-    private TypeMapping[] typeMappings;
-
-    /**
-     * @parameter
-     */
-    private NumericMapping[] numericMappings;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean createScalaSources;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean schemaToPackage;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean lowerCase;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean exportTables;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean exportViews;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean exportAll;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean exportPrimaryKeys;
-
-    /**
-     * @parameter default-value=true
-     */
-    private boolean exportForeignKeys;
-
-    /**
-     * override default column order (default: alphabetical)
-     * 
-     * @parameter 
-     */
-    private String columnComparatorClass;
-
-    /**
-     * @parameter default-value=false
-     */
-    private boolean spatial;
-    
-    /**
-     * java import added to generated query classes:
-     * com.bar for package (without .* notation)
-     * com.bar.Foo for class
-     *
-     * @parameter
-     */
-    private String[] imports;
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        if (isForTest()) {
-            project.addTestCompileSourceRoot(targetFolder);
-        } else {
-            project.addCompileSourceRoot(targetFolder);
-        }
-
-        try {
-            Configuration configuration = new Configuration(SQLTemplates.DEFAULT);
-            NamingStrategy namingStrategy;
-            if (namingStrategyClass != null) {
-                namingStrategy = (NamingStrategy) Class.forName(namingStrategyClass).newInstance();
-            } else {
-                namingStrategy = new DefaultNamingStrategy();
-            }
-
-            // defaults for Scala
-            if (createScalaSources) {
-                if (serializerClass == null) {
-                    serializerClass = "com.mysema.query.scala.sql.ScalaMetaDataSerializer";
-                }
-                if (exportBeans && beanSerializerClass == null) {
-                    beanSerializerClass = "com.mysema.query.scala.ScalaBeanSerializer";
-                }
-            }
-
-            MetaDataExporter exporter = new MetaDataExporter();
-            if (namePrefix != null) {
-                exporter.setNamePrefix(namePrefix);
-            }
-            if (nameSuffix != null) {
-                exporter.setNameSuffix(nameSuffix);
-            }
-            if (beanPrefix != null) {
-                exporter.setBeanPrefix(beanPrefix);
-            }
-            if (beanSuffix != null) {
-                exporter.setBeanSuffix(beanSuffix);
-            }
-            exporter.setCreateScalaSources(createScalaSources);
-            exporter.setPackageName(packageName);
-            exporter.setBeanPackageName(beanPackageName);
-            exporter.setInnerClassesForKeys(innerClassesForKeys);
-            exporter.setTargetFolder(new File(targetFolder));
-            exporter.setNamingStrategy(namingStrategy);
-            exporter.setSchemaPattern(schemaPattern);
-            exporter.setTableNamePattern(tableNamePattern);
-            exporter.setColumnAnnotations(columnAnnotations);
-            exporter.setValidationAnnotations(validationAnnotations);
-            exporter.setSchemaToPackage(schemaToPackage);
-            exporter.setLowerCase(lowerCase);
-            exporter.setExportTables(exportTables);
-            exporter.setExportViews(exportViews);
-            exporter.setExportAll(exportAll);
-            exporter.setExportPrimaryKeys(exportPrimaryKeys);
-            exporter.setExportForeignKeys(exportForeignKeys);
-            exporter.setSpatial(spatial);
-
-            if (imports != null && imports.length > 0) {
-                exporter.setImports(imports);
-            }
-
-            if (serializerClass != null) {
-                try {
-                    exporter.setSerializerClass((Class)Class.forName(serializerClass));
-                } catch (ClassNotFoundException e) {
-                    getLog().error(e);
-                    throw new MojoExecutionException(e.getMessage(), e);
-                }
-            }
-            if (exportBeans) {
-                if (beanSerializerClass != null) {
-                    exporter.setBeanSerializerClass((Class)Class.forName(beanSerializerClass));
-                } else {
-                    BeanSerializer serializer = new BeanSerializer();
-                    if (beanInterfaces != null) {
-                        for (String iface : beanInterfaces) {
-                            int sepIndex = iface.lastIndexOf('.');
-                            if (sepIndex < 0) {
-                                serializer.addInterface(new SimpleType(iface));
-                            } else {
-                                String packageName = iface.substring(0, sepIndex);
-                                String simpleName = iface.substring(sepIndex + 1);
-                                serializer.addInterface(new SimpleType(iface, packageName, simpleName));
-                            }
-                        }
-                    }
-                    serializer.setAddFullConstructor(beanAddFullConstructor);
-                    serializer.setAddToString(beanAddToString);
-                    serializer.setPrintSupertype(beanPrintSupertype);
-                    exporter.setBeanSerializer(serializer);
-                }
-
-            }
-            String sourceEncoding = (String)project.getProperties().get("project.build.sourceEncoding");
-            if (sourceEncoding != null) {
-                exporter.setSourceEncoding(sourceEncoding);
-            }
-
-            if (customTypes != null) {
-                for (String cl : customTypes) {
-                    configuration.register((Type<?>) Class.forName(cl).newInstance());
-                }
-            }
-            if (typeMappings != null) {
-                for (TypeMapping mapping : typeMappings) {
-                    Class<?> typeClass = Class.forName(mapping.type);
-                    if (Type.class.isAssignableFrom(typeClass)) {
-                        configuration.register(mapping.table, mapping.column, (Type<?>)typeClass.newInstance());
-                    } else {
-                        configuration.register(mapping.table, mapping.column, typeClass);
-                    }
-                }
-            }
-            if (numericMappings != null) {
-                for (NumericMapping mapping : numericMappings) {
-                    int total = Math.max(mapping.size, mapping.total);
-                    int decimal = Math.max(mapping.digits, mapping.decimal);
-                    configuration.registerNumeric(total, decimal, Class.forName(mapping.javaType));
-                }
-            }
-            if (columnComparatorClass != null) {
-                try {
-                    exporter.setColumnComparatorClass( (Class) Class.forName(this.columnComparatorClass).asSubclass(Comparator.class));
-                } catch (ClassNotFoundException e) {
-                    getLog().error(e);
-                    throw new MojoExecutionException(e.getMessage(), e);
-                }
-            }
-
-            exporter.setConfiguration(configuration);
-
-            Class.forName(jdbcDriver);
-            Connection conn = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
-            try{
-                exporter.export(conn.getMetaData());
-            } finally {
-                if (conn != null) {
-                    conn.close();
-                }
-            }
-        } catch (ClassNotFoundException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } catch (SQLException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } catch (InstantiationException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
-            throw new MojoExecutionException(e.getMessage(), e);
-        }
-
-    }
-
-    protected boolean isForTest() {
-        return false;
-    }
-
-    public void setProject(MavenProject project) {
-        this.project = project;
-    }
-
-    public void setJdbcDriver(String jdbcDriver) {
-        this.jdbcDriver = jdbcDriver;
-    }
-
-    public void setJdbcUrl(String jdbcUrl) {
-        this.jdbcUrl = jdbcUrl;
-    }
-
-    public void setJdbcUser(String jdbcUser) {
-        this.jdbcUser = jdbcUser;
-    }
-
-    public void setJdbcPassword(String jdbcPassword) {
-        this.jdbcPassword = jdbcPassword;
-    }
-
-    public void setNamePrefix(String namePrefix) {
-        this.namePrefix = namePrefix;
-    }
-
-    public void setNameSuffix(String nameSuffix) {
-        this.nameSuffix = nameSuffix;
-    }
-
-    public void setBeanInterfaces(String[] beanInterfaces) {
-        this.beanInterfaces = beanInterfaces;
-    }
-
-    public void setBeanPrefix(String beanPrefix) {
-        this.beanPrefix = beanPrefix;
-    }
-
-    public void setBeanSuffix(String beanSuffix) {
-        this.beanSuffix = beanSuffix;
-    }
-
-    public void setPackageName(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public void setBeanPackageName(String beanPackageName) {
-        this.beanPackageName = beanPackageName;
-    }
-
-    public void setSchemaPattern(String schemaPattern) {
-        this.schemaPattern = schemaPattern;
-    }
-
-    public void setTableNamePattern(String tableNamePattern) {
-        this.tableNamePattern = tableNamePattern;
-    }
-
-    public void setTargetFolder(String targetFolder) {
-        this.targetFolder = targetFolder;
-    }
-
-    public void setNamingStrategyClass(String namingStrategyClass) {
-        this.namingStrategyClass = namingStrategyClass;
-    }
-
-    public void setBeanSerializerClass(String beanSerializerClass) {
-        this.beanSerializerClass = beanSerializerClass;
-    }
-
-    public void setSerializerClass(String serializerClass) {
-        this.serializerClass = serializerClass;
-    }
-
-    public void setExportBeans(boolean exportBeans) {
-        this.exportBeans = exportBeans;
-    }
-
-    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
-        this.innerClassesForKeys = innerClassesForKeys;
-    }
-
-    public void setValidationAnnotations(boolean validationAnnotations) {
-        this.validationAnnotations = validationAnnotations;
-    }
-
-    public void setColumnAnnotations(boolean columnAnnotations) {
-        this.columnAnnotations = columnAnnotations;
-    }
-
-    public void setCustomTypes(String[] customTypes) {
-        this.customTypes = customTypes;
-    }
-
-    public void setCreateScalaSources(boolean createScalaSources) {
-        this.createScalaSources = createScalaSources;
-    }
-
-    public void setSchemaToPackage(boolean schemaToPackage) {
-        this.schemaToPackage = schemaToPackage;
-    }
-
-    public void setLowerCase(boolean lowerCase) {
-        this.lowerCase = lowerCase;
-    }
-
-    public void setTypeMappings(TypeMapping[] typeMappings) {
-        this.typeMappings = typeMappings;
-    }
-
-    public void setNumericMappings(NumericMapping[] numericMappings) {
-        this.numericMappings = numericMappings;
-    }
-
-    public void setImports(String[] imports) {
-        this.imports = imports;
-    }
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/GenericExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/GenericExporterMojo.java
deleted file mode 100644
index 56a335d83b..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/GenericExporterMojo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-/**
- * GenericExporterMojo calls the GenericExporter tool using the classpath of the module
- * 
- * @goal generic-export
- * @requiresDependencyResolution test
- */
-public class GenericExporterMojo extends AbstractExporterMojo {
-    
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JPAExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JPAExporterMojo.java
deleted file mode 100644
index 9bd7b07437..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JPAExporterMojo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-
-import com.mysema.query.codegen.GenericExporter;
-
-/**
- * JPAExporterMojo calls the GenericExporter tool using the classpath of the module
- * 
- * @goal jpa-export
- * @requiresDependencyResolution test
- * @author tiwe
- */
-public class JPAExporterMojo extends AbstractExporterMojo {
-
-    @Override
-    protected void configure(GenericExporter exporter) {
-        super.configure(exporter);
-        exporter.setEmbeddableAnnotation(Embeddable.class);
-        exporter.setEmbeddedAnnotation(Embedded.class);
-        exporter.setEntityAnnotation(Entity.class);
-        exporter.setSkipAnnotation(Transient.class);
-        exporter.setSupertypeAnnotation(MappedSuperclass.class);
-    }
-
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/MetadataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/MetadataExportMojo.java
deleted file mode 100644
index f942aacd45..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/MetadataExportMojo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-/**
- * MetadataExportMojo is a goal for MetaDataExporter usage and is bound to the generate-sources phased
- * 
- * @phase generate-sources
- * @goal export
- *
- */
-public class MetadataExportMojo extends AbstractMetaDataExportMojo{
-
-    protected boolean isForTest() {
-        return false;
-    }
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/NumericMapping.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/NumericMapping.java
deleted file mode 100644
index 44ac80a98d..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/NumericMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-/**
- * @author tiwe
- *
- */
-public class NumericMapping {
-
-    @Deprecated
-    public int size, digits;
-
-    public int total, decimal;
-
-    public String javaType;
-
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TestMetadataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TestMetadataExportMojo.java
deleted file mode 100644
index 00b323bd89..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TestMetadataExportMojo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-/**
- * TestMetadataExportMojo is a goal for MetaDataExporter usage and is bound to the generated-sources phase
- * 
- * @phase generate-sources
- * @goal test-export
- *
- */
-public class TestMetadataExportMojo extends AbstractMetaDataExportMojo{
-
-    protected boolean isForTest() {
-        return true;
-    }
-
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TypeMapping.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TypeMapping.java
deleted file mode 100644
index 4bbf3780a5..0000000000
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/TypeMapping.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-/**
- * @author tiwe
- *
- */
-public class TypeMapping {
-
-    public String table;
-
-    public String column;
-
-    public String type;
-
-}
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractExporterMojo.java
new file mode 100644
index 0000000000..fc7a18943d
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractExporterMojo.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.sonatype.plexus.build.incremental.BuildContext;
+
+import com.querydsl.codegen.GenericExporter;
+import com.querydsl.codegen.Serializer;
+import com.querydsl.codegen.TypeMappings;
+
+/**
+ * {@code AbstractExporterMojo} calls {@link GenericExporter} using the
+ * classpath of the module in which the plugin is invoked.
+ *
+ */
+public abstract class AbstractExporterMojo extends AbstractMojo {
+
+    /**
+     * target folder for sources
+     *
+     * @parameter
+     * @required
+     */
+    private File targetFolder;
+
+    /**
+     * switch for scala source generation
+     *
+     * @parameter default-value=false
+     */
+    private boolean scala;
+
+    /**
+     * packages to be exported
+     *
+     * @parameter
+     * @required
+     */
+    private String[] packages;
+
+    /**
+     * switch for inspecting fields
+     *
+     * @parameter default-value=true
+     */
+    private boolean handleFields = true;
+
+    /**
+     * switch for inspecting getters
+     *
+     * @parameter default-value=true
+     */
+    private boolean handleMethods = true;
+
+    /**
+     * switch for usage of field types instead of getter types
+     *
+     * @parameter default-value=false
+     */
+    private boolean useFieldTypes = false;
+
+    /**
+     * maven project
+     *
+     * @parameter default-value="${project}"
+     * @readonly
+     */
+    private MavenProject project;
+
+    /**
+     * source file encoding
+     *
+     * @parameter
+     */
+    private String sourceEncoding;
+
+    /**
+     * test classpath usage switch
+     *
+     * @parameter default-value=false
+     */
+    private boolean testClasspath;
+
+    /**
+     * Whether to skip the exporting execution
+     *
+     * @parameter default-value=false property="maven.querydsl.skip"
+     */
+    private boolean skip;
+
+    /**
+     * The fully qualified class name of the <em>Single-Element Annotation</em> (with <code>String</code> element) to put on the generated sources. Defaults to
+     * <code>javax.annotation.Generated</code> or <code>javax.annotation.processing.Generated</code> depending on the java version.
+     * <em>See also</em> <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     *
+     * @parameter
+     */
+    private String generatedAnnotationClass;
+
+    /**
+     * build context
+     *
+     * @component
+     */
+    private BuildContext buildContext;
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (testClasspath) {
+            project.addTestCompileSourceRoot(targetFolder.getAbsolutePath());
+        } else {
+            project.addCompileSourceRoot(targetFolder.getAbsolutePath());
+        }
+        if (skip || !hasSourceChanges()) {
+            // Only run if something has changed in the source directories. This will
+            // prevent m2e from entering an infinite build cycle.
+            return;
+        }
+
+        ClassLoader classLoader = null;
+        try {
+            classLoader = getProjectClassLoader();
+        } catch (MalformedURLException | DependencyResolutionRequiredException e) {
+            throw new MojoFailureException(e.getMessage(), e);
+        }
+
+        Charset charset = sourceEncoding != null ? Charset.forName(sourceEncoding) : Charset.defaultCharset();
+        GenericExporter exporter = new GenericExporter(classLoader, charset);
+        exporter.setTargetFolder(targetFolder);
+
+        if (scala) {
+            try {
+                exporter.setSerializerClass((Class<? extends Serializer>) Class
+                        .forName("com.querydsl.scala.ScalaEntitySerializer"));
+                exporter.setTypeMappingsClass((Class<? extends TypeMappings>) Class
+                        .forName("com.querydsl.scala.ScalaTypeMappings"));
+                exporter.setCreateScalaSources(true);
+            } catch (ClassNotFoundException e) {
+                throw new MojoFailureException(e.getMessage(), e);
+            }
+        }
+
+        configure(exporter);
+        exporter.export(packages);
+    }
+
+    /**
+     * Configures the {@link GenericExporter}; subclasses may override if desired.
+     */
+    protected void configure(GenericExporter exporter) {
+        exporter.setHandleFields(handleFields);
+        exporter.setHandleMethods(handleMethods);
+        exporter.setUseFieldTypes(useFieldTypes);
+        exporter.setGeneratedAnnotationClass(generatedAnnotationClass);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected ClassLoader getProjectClassLoader() throws DependencyResolutionRequiredException,
+            MalformedURLException {
+        List<String> classpathElements;
+        if (testClasspath) {
+            classpathElements = project.getTestClasspathElements();
+        } else {
+            classpathElements = project.getCompileClasspathElements();
+        }
+        List<URL> urls = new ArrayList<URL>(classpathElements.size());
+        for (String element : classpathElements) {
+            File file = new File(element);
+            if (file.exists()) {
+                urls.add(file.toURI().toURL());
+            }
+        }
+        return new URLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader());
+    }
+
+    @SuppressWarnings("rawtypes")
+    private boolean hasSourceChanges() {
+        if (buildContext != null) {
+            List sourceRoots = testClasspath ? project.getTestCompileSourceRoots() :
+                                               project.getCompileSourceRoots();
+            for (Object path : sourceRoots) {
+                if (buildContext.hasDelta(new File(path.toString()))) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public void setTargetFolder(File targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    public void setScala(boolean scala) {
+        this.scala = scala;
+    }
+
+    public void setPackages(String[] packages) {
+        this.packages = packages;
+    }
+
+    public void setProject(MavenProject project) {
+        this.project = project;
+    }
+
+    public void setSourceEncoding(String sourceEncoding) {
+        this.sourceEncoding = sourceEncoding;
+    }
+
+    public void setTestClasspath(boolean testClasspath) {
+        this.testClasspath = testClasspath;
+    }
+
+    public void setSkip(boolean skip) {
+        this.skip = skip;
+    }
+
+    public void setBuildContext(BuildContext buildContext) {
+        this.buildContext = buildContext;
+    }
+
+    public void setHandleFields(boolean handleFields) {
+        this.handleFields = handleFields;
+    }
+
+    public void setHandleMethods(boolean handleMethods) {
+        this.handleMethods = handleMethods;
+    }
+
+    public void setUseFieldTypes(boolean useFieldTypes) {
+        this.useFieldTypes = useFieldTypes;
+    }
+
+    public void setGeneratedAnnotationClass(String generatedAnnotationClass) {
+        this.generatedAnnotationClass = generatedAnnotationClass;
+    }
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractMetaDataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractMetaDataExportMojo.java
new file mode 100644
index 0000000000..495795e56d
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/AbstractMetaDataExportMojo.java
@@ -0,0 +1,719 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.core.util.StringUtils;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.codegen.DefaultNamingStrategy;
+import com.querydsl.sql.codegen.MetaDataExporter;
+import com.querydsl.sql.codegen.NamingStrategy;
+import com.querydsl.sql.codegen.support.NumericMapping;
+import com.querydsl.sql.codegen.support.RenameMapping;
+import com.querydsl.sql.codegen.support.TypeMapping;
+import com.querydsl.sql.types.Type;
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Comparator;
+import java.util.regex.Pattern;
+
+/**
+ * {@code AbstractMetaDataExportMojo} is the base class for {@link MetaDataExporter} usage
+ *
+ * @author tiwe
+ */
+public class AbstractMetaDataExportMojo extends AbstractMojo {
+
+    /**
+     * maven project
+     *
+     * @parameter default-value="${project}"
+     * @readonly
+     */
+    private MavenProject project;
+
+    /**
+     * The Maven Wagon manager to use when obtaining server authentication details.
+     * @component
+     */
+    private WagonManager wagonManager;
+
+    /**
+     * The server id in settings.xml to use as an alternative to jdbcUser and jdbcPassword
+     * @parameter
+     */
+    private String server;
+
+    /**
+     * JDBC driver class name
+     * @parameter required=true
+     */
+    private String jdbcDriver;
+
+    /**
+     * JDBC connection url
+     * @parameter required=true
+     */
+    private String jdbcUrl;
+
+    /**
+     * JDBC connection username
+     * @parameter
+     */
+    private String jdbcUser;
+
+    /**
+     * JDBC connection password
+     * @parameter
+     */
+    private String jdbcPassword;
+
+    /**
+     * name prefix for querydsl-types (default: "Q")
+     * @parameter default-value="Q"
+     */
+    private String namePrefix;
+
+    /**
+     * name suffix for querydsl-types (default: "")
+     * @parameter default-value=""
+     */
+    private String nameSuffix;
+
+    /**
+     * name prefix for bean types (default: "")
+     * @parameter default-value=""
+     */
+    private String beanPrefix;
+
+    /**
+     * name suffix for bean types (default: "")
+     * @parameter default-value=""
+     */
+    private String beanSuffix;
+
+    /**
+     * package name for sources
+     * @parameter
+     * @required
+     */
+    private String packageName;
+
+    /**
+     * package name for bean sources (default: packageName)
+     * @parameter
+     */
+    private String beanPackageName;
+
+    /**
+     * schemaPattern a schema name pattern; must match the schema name
+     *        as it is stored in the database; "" retrieves those without a schema;
+     *        {@code null} means that the schema name should not be used to narrow
+     *        the search (default: null)
+     *
+     * @parameter
+     */
+    private String schemaPattern;
+
+    /**
+     * a catalog name; must match the catalog name as it
+     *      is stored in the database; "" retrieves those without a catalog;
+     *      <code>null</code> means that the catalog name should not be used to narrow
+     *      the search
+     * @parameter
+     */
+    private String catalogPattern;
+
+    /**
+     * tableNamePattern a table name pattern; must match the
+    *        table name as it is stored in the database (default: null)
+     *
+     * @parameter
+     */
+    private String tableNamePattern;
+
+    /**
+     * target source folder to create the sources into (e.g. target/generated-sources/java)
+     *
+     * @parameter
+     * @required
+     */
+    private String targetFolder;
+
+    /**
+     * target source folder to create the bean sources into
+     *
+     * @parameter
+     */
+    private String beansTargetFolder;
+
+    /**
+     * namingstrategy class to override (default: DefaultNamingStrategy)
+     *
+     * @parameter
+     */
+    private String namingStrategyClass;
+
+    /**
+     * name for bean serializer class
+     *
+     * @parameter
+     */
+    private String beanSerializerClass;
+
+    /**
+     * name for serializer class
+     *
+     * @parameter
+     */
+    private String serializerClass;
+
+    /**
+     * serialize beans as well
+     *
+     * @parameter default-value=false
+     */
+    private boolean exportBeans;
+
+    /**
+     * additional interfaces to be implemented by beans
+     *
+     * @parameter
+     */
+    private String[] beanInterfaces;
+
+    /**
+     * switch for {@code toString} addition
+     *
+     * @parameter default-value=false
+     */
+    private boolean beanAddToString;
+
+    /**
+     * switch for full constructor addition
+     *
+     * @parameter default-value=false
+     */
+    private boolean beanAddFullConstructor;
+
+    /**
+     * switch to print supertype content
+     *
+     * @parameter default-value=false
+     */
+    private boolean beanPrintSupertype;
+
+    /**
+     * wrap key properties into inner classes (default: false)
+     *
+     * @parameter default-value=false
+     */
+    private boolean innerClassesForKeys;
+
+    /**
+     * export validation annotations (default: false)
+     *
+     * @parameter default-value=false
+     */
+    private boolean validationAnnotations;
+
+    /**
+     * export column annotations (default: false)
+     *
+     * @parameter default-value=false
+     */
+    private boolean columnAnnotations;
+
+    /**
+     * custom type classnames to use
+     *
+     * @parameter
+     */
+    private String[] customTypes;
+
+    /**
+     * custom type mappings to use
+     *
+     * @parameter
+     */
+    private TypeMapping[] typeMappings;
+
+    /**
+     * custom numeric mappings
+     *
+     * @parameter
+     */
+    private NumericMapping[] numericMappings;
+
+    /**
+     * custom rename mappings
+     *
+     * @parameter
+     */
+    private RenameMapping[] renameMappings;
+
+    /**
+     * switch for generating scala sources
+     *
+     * @parameter default-value=false
+     */
+    private boolean createScalaSources;
+
+    /**
+     * switch for using schema as suffix in package generation, full package name will be
+     * {@code ${packageName}.${schema}}
+     *
+     * @parameter default-value=false
+     */
+    private boolean schemaToPackage;
+
+    /**
+     * switch to normalize schema, table and column names to lowercase
+     *
+     * @parameter default-value=false
+     */
+    private boolean lowerCase;
+
+    /**
+     * switch to export tables
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportTables;
+
+    /**
+     * switch to export views
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportViews;
+
+    /**
+     * switch to export all types
+     *
+     * @parameter default-value=false
+     */
+    private boolean exportAll;
+
+    /**
+     * switch to export primary keys
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportPrimaryKeys;
+
+    /**
+     * switch to export foreign keys
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportForeignKeys;
+
+    /**
+     * switch to export direct foreign keys
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportDirectForeignKeys;
+
+    /**
+     * switch to export inverse foreign keys
+     *
+     * @parameter default-value=true
+     */
+    private boolean exportInverseForeignKeys;
+
+    /**
+     * override default column order (default: alphabetical)
+     *
+     * @parameter
+     */
+    private String columnComparatorClass;
+
+    /**
+     * switch to enable spatial type support
+     *
+     * @parameter default-value=false
+     */
+    private boolean spatial;
+
+    /**
+     * Comma-separated list of table types to export (allowable values will
+     * depend on JDBC driver). Allows for arbitrary set of types to be exported,
+     * e.g.: "TABLE, MATERIALIZED VIEW". The exportTables and exportViews
+     * parameters will be ignored if this parameter is set. (default: none)
+     *
+     * @parameter
+     */
+    private String tableTypesToExport;
+
+    /**
+     * java import added to generated query classes:
+     * com.bar for package (without .* notation)
+     * com.bar.Foo for class
+     *
+     * @parameter
+     */
+    private String[] imports;
+
+    /**
+     * Whether to skip the exporting execution
+     *
+     * @parameter default-value=false property="maven.querydsl.skip"
+     */
+    private boolean skip;
+
+    /**
+     * The fully qualified class name of the <em>Single-Element Annotation</em> (with <code>String</code> element) to put on the generated sources.Defaults to
+     * <code>javax.annotation.Generated</code> or <code>javax.annotation.processing.Generated</code> depending on the java version.
+     * <em>See also</em> <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     *
+     * @parameter
+     */
+    private String generatedAnnotationClass;
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (isForTest()) {
+            project.addTestCompileSourceRoot(targetFolder);
+        } else {
+            project.addCompileSourceRoot(targetFolder);
+        }
+
+        if (skip) {
+            return;
+        }
+
+        try {
+            Configuration configuration = new Configuration(SQLTemplates.DEFAULT);
+            NamingStrategy namingStrategy;
+            if (namingStrategyClass != null) {
+                namingStrategy = (NamingStrategy) Class.forName(namingStrategyClass).newInstance();
+            } else {
+                namingStrategy = new DefaultNamingStrategy();
+            }
+
+            // defaults for Scala
+            if (createScalaSources) {
+                if (serializerClass == null) {
+                    serializerClass = "com.querydsl.scala.sql.ScalaMetaDataSerializer";
+                }
+                if (exportBeans && beanSerializerClass == null) {
+                    beanSerializerClass = "com.querydsl.scala.ScalaBeanSerializer";
+                }
+            }
+
+            MetaDataExporter exporter = new MetaDataExporter();
+            exporter.setNamePrefix(emptyIfSetToBlank(namePrefix));
+            exporter.setNameSuffix(StringUtils.nullToEmpty(nameSuffix));
+            exporter.setBeanPrefix(StringUtils.nullToEmpty(beanPrefix));
+            exporter.setBeanSuffix(StringUtils.nullToEmpty(beanSuffix));
+            if (beansTargetFolder != null) {
+                exporter.setBeansTargetFolder(new File(beansTargetFolder));
+            }
+            exporter.setCreateScalaSources(createScalaSources);
+            exporter.setPackageName(packageName);
+            exporter.setBeanPackageName(beanPackageName);
+            exporter.setInnerClassesForKeys(innerClassesForKeys);
+            exporter.setTargetFolder(new File(targetFolder));
+            exporter.setNamingStrategy(namingStrategy);
+            exporter.setCatalogPattern(catalogPattern);
+            exporter.setSchemaPattern(processBlankValues(schemaPattern));
+            exporter.setTableNamePattern(tableNamePattern);
+            exporter.setColumnAnnotations(columnAnnotations);
+            exporter.setValidationAnnotations(validationAnnotations);
+            exporter.setSchemaToPackage(schemaToPackage);
+            exporter.setLowerCase(lowerCase);
+            exporter.setExportTables(exportTables);
+            exporter.setExportViews(exportViews);
+            exporter.setExportAll(exportAll);
+            exporter.setTableTypesToExport(tableTypesToExport);
+            exporter.setExportPrimaryKeys(exportPrimaryKeys);
+            exporter.setExportForeignKeys(exportForeignKeys);
+            exporter.setExportDirectForeignKeys(exportDirectForeignKeys);
+            exporter.setExportInverseForeignKeys(exportInverseForeignKeys);
+            exporter.setSpatial(spatial);
+            exporter.setGeneratedAnnotationClass(generatedAnnotationClass);
+
+            if (imports != null && imports.length > 0) {
+                exporter.setImports(imports);
+            }
+
+            if (serializerClass != null) {
+                try {
+                    exporter.setSerializerClass((Class) Class.forName(serializerClass));
+                } catch (ClassNotFoundException e) {
+                    getLog().error(e);
+                    throw new MojoExecutionException(e.getMessage(), e);
+                }
+            }
+            if (exportBeans) {
+                if (beanSerializerClass != null) {
+                    exporter.setBeanSerializerClass((Class) Class.forName(beanSerializerClass));
+                } else {
+                    BeanSerializer serializer = new BeanSerializer();
+                    if (beanInterfaces != null) {
+                        for (String iface : beanInterfaces) {
+                            int sepIndex = iface.lastIndexOf('.');
+                            if (sepIndex < 0) {
+                                serializer.addInterface(new SimpleType(iface));
+                            } else {
+                                String packageName = iface.substring(0, sepIndex);
+                                String simpleName = iface.substring(sepIndex + 1);
+                                serializer.addInterface(new SimpleType(iface, packageName, simpleName));
+                            }
+                        }
+                    }
+                    serializer.setAddFullConstructor(beanAddFullConstructor);
+                    serializer.setAddToString(beanAddToString);
+                    serializer.setPrintSupertype(beanPrintSupertype);
+                    exporter.setBeanSerializer(serializer);
+                }
+
+            }
+            String sourceEncoding = (String) project.getProperties().get("project.build.sourceEncoding");
+            if (sourceEncoding != null) {
+                exporter.setSourceEncoding(sourceEncoding);
+            }
+
+            if (customTypes != null) {
+                for (String cl : customTypes) {
+                    configuration.register((Type<?>) Class.forName(cl).newInstance());
+                }
+            }
+            if (typeMappings != null) {
+                for (TypeMapping mapping : typeMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+            if (numericMappings != null) {
+                for (NumericMapping mapping : numericMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+            if (renameMappings != null) {
+                for (RenameMapping mapping : renameMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+
+            if (columnComparatorClass != null) {
+                try {
+                    exporter.setColumnComparatorClass((Class) Class.forName(this.columnComparatorClass).asSubclass(Comparator.class));
+                } catch (ClassNotFoundException e) {
+                    getLog().error(e);
+                    throw new MojoExecutionException(e.getMessage(), e);
+                }
+            }
+
+            exporter.setConfiguration(configuration);
+
+            Class.forName(jdbcDriver);
+            String user;
+            String password;
+            if (server == null) {
+                user = jdbcUser;
+                password = jdbcPassword;
+            } else {
+                AuthenticationInfo info = wagonManager.getAuthenticationInfo(server);
+                if (info == null) {
+                    throw new MojoExecutionException("No authentication info for server " + server);
+                }
+
+                user = info.getUserName();
+                if (user == null) {
+                    throw new MojoExecutionException("Missing username from server " + server);
+                }
+
+                password = info.getPassword();
+                if (password == null) {
+                    throw new MojoExecutionException("Missing password from server " + server);
+                }
+            }
+            try (Connection conn = DriverManager.getConnection(jdbcUrl, user, password)) {
+                exporter.export(conn.getMetaData());
+            }
+        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | SQLException e) {
+            throw new MojoExecutionException(e.getMessage(), e);
+        }
+
+    }
+
+    protected boolean isForTest() {
+        return false;
+    }
+
+    public void setProject(MavenProject project) {
+        this.project = project;
+    }
+
+    public void setServer(String server) {
+        this.server = server;
+    }
+
+    public void setJdbcDriver(String jdbcDriver) {
+        this.jdbcDriver = jdbcDriver;
+    }
+
+    public void setJdbcUrl(String jdbcUrl) {
+        this.jdbcUrl = jdbcUrl;
+    }
+
+    public void setJdbcUser(String jdbcUser) {
+        this.jdbcUser = jdbcUser;
+    }
+
+    public void setJdbcPassword(String jdbcPassword) {
+        this.jdbcPassword = jdbcPassword;
+    }
+
+    public void setNamePrefix(String namePrefix) {
+        this.namePrefix = namePrefix;
+    }
+
+    public void setNameSuffix(String nameSuffix) {
+        this.nameSuffix = nameSuffix;
+    }
+
+    public void setBeanInterfaces(String[] beanInterfaces) {
+        this.beanInterfaces = beanInterfaces;
+    }
+
+    public void setBeanPrefix(String beanPrefix) {
+        this.beanPrefix = beanPrefix;
+    }
+
+    public void setBeanSuffix(String beanSuffix) {
+        this.beanSuffix = beanSuffix;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setBeanPackageName(String beanPackageName) {
+        this.beanPackageName = beanPackageName;
+    }
+
+    public void setCatalogPattern(String catalogPattern) {
+        this.catalogPattern = catalogPattern;
+    }
+
+    public void setSchemaPattern(String schemaPattern) {
+        this.schemaPattern = schemaPattern;
+    }
+
+    public void setTableNamePattern(String tableNamePattern) {
+        this.tableNamePattern = tableNamePattern;
+    }
+
+    public void setTargetFolder(String targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    public void setNamingStrategyClass(String namingStrategyClass) {
+        this.namingStrategyClass = namingStrategyClass;
+    }
+
+    public void setBeanSerializerClass(String beanSerializerClass) {
+        this.beanSerializerClass = beanSerializerClass;
+    }
+
+    public void setSerializerClass(String serializerClass) {
+        this.serializerClass = serializerClass;
+    }
+
+    public void setExportBeans(boolean exportBeans) {
+        this.exportBeans = exportBeans;
+    }
+
+    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
+        this.innerClassesForKeys = innerClassesForKeys;
+    }
+
+    public void setValidationAnnotations(boolean validationAnnotations) {
+        this.validationAnnotations = validationAnnotations;
+    }
+
+    public void setColumnAnnotations(boolean columnAnnotations) {
+        this.columnAnnotations = columnAnnotations;
+    }
+
+    public void setCustomTypes(String[] customTypes) {
+        this.customTypes = customTypes;
+    }
+
+    public void setCreateScalaSources(boolean createScalaSources) {
+        this.createScalaSources = createScalaSources;
+    }
+
+    public void setSchemaToPackage(boolean schemaToPackage) {
+        this.schemaToPackage = schemaToPackage;
+    }
+
+    public void setLowerCase(boolean lowerCase) {
+        this.lowerCase = lowerCase;
+    }
+
+    public void setTypeMappings(TypeMapping[] typeMappings) {
+        this.typeMappings = typeMappings;
+    }
+
+    public void setNumericMappings(NumericMapping[] numericMappings) {
+        this.numericMappings = numericMappings;
+    }
+
+    public void setRenameMappings(RenameMapping[] renameMappings) {
+        this.renameMappings = renameMappings;
+    }
+
+    public void setImports(String[] imports) {
+        this.imports = imports;
+    }
+
+    public void setSkip(boolean skip) {
+        this.skip = skip;
+    }
+
+    public void setGeneratedAnnotationClass(String generatedAnnotationClass) {
+        this.generatedAnnotationClass = generatedAnnotationClass;
+    }
+
+    private static String emptyIfSetToBlank(String value) {
+        boolean setToBlank = value == null || value.equalsIgnoreCase("BLANK");
+        return setToBlank ? "" : value;
+    }
+
+    private static String processBlankValues(String value) {
+        if (value == null) {
+            return null;
+        }
+        return BLANK_VALUE_PATTERN.matcher(value).replaceAll(BLANK_VALUE_REPLACEMENT);
+    }
+
+    private static final Pattern BLANK_VALUE_PATTERN = Pattern.compile("(^|,)BLANK(,|$)", Pattern.CASE_INSENSITIVE);
+    private static final String BLANK_VALUE_REPLACEMENT = "$1$2";
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/CompileMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/CompileMojo.java
similarity index 92%
rename from querydsl-maven-plugin/src/main/java/com/mysema/query/maven/CompileMojo.java
rename to querydsl-maven-plugin/src/main/java/com/querydsl/maven/CompileMojo.java
index 3bd1097b50..0d6a417bb5 100644
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/CompileMojo.java
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/CompileMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.maven;
+package com.querydsl.maven;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
@@ -36,7 +31,7 @@
 import org.sonatype.plexus.build.incremental.BuildContext;
 
 /**
- * CompilerMojo compiles the sources generated in the other tasks
+ * {@code CompileMojo} compiles the sources generated by other tasks
  *
  * @goal compile
  * @requiresDependencyResolution test
@@ -45,44 +40,62 @@
 public class CompileMojo extends AbstractMojo {
 
     private static final String JAVA_FILE_FILTER = "/*.java";
-    private static final String[] ALL_JAVA_FILES_FILTER = new String[] { "**" + JAVA_FILE_FILTER };
+    private static final String[] ALL_JAVA_FILES_FILTER = new String[] {"**" + JAVA_FILE_FILTER};
 
     /**
-     * @parameter expression="${project}" readonly=true required=true
+     * maven project
+     *
+     * @parameter default-value="${project}"
+     * @readonly
      */
     private MavenProject project;
 
     /**
-     * @parameter required=true
+     * source folder
+     *
+     * @parameter
+     * @required
      */
     private File sourceFolder;
 
     /**
+     * source encoding
+     *
      * @parameter
      */
     private String sourceEncoding;
 
     /**
+     * source option
+     *
      * @parameter
      */
     private String source;
 
     /**
+     * target option
+     *
      * @parameter
      */
     private String target;
 
     /**
+     * test classpath
+     *
      * @parameter default-value=false
      */
     private boolean testClasspath;
 
     /**
+     * compiler options
+     *
      * @parameter
      */
     private Map<String, String> compilerOptions;
 
     /**
+     * build context
+     *
      * @component
      */
     private BuildContext buildContext;
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/GenericExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/GenericExporterMojo.java
new file mode 100644
index 0000000000..551310515c
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/GenericExporterMojo.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import com.querydsl.codegen.GenericExporter;
+
+/**
+ * {@code GenericExporterMojo} calls {@link GenericExporter} using the classpath of the module
+ *
+ * @goal generic-export
+ * @requiresDependencyResolution test
+ */
+public class GenericExporterMojo extends AbstractExporterMojo {
+
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JDOExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JDOExporterMojo.java
similarity index 78%
rename from querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JDOExporterMojo.java
rename to querydsl-maven-plugin/src/main/java/com/querydsl/maven/JDOExporterMojo.java
index 7d9dd7b645..9db87c7905 100644
--- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/JDOExporterMojo.java
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JDOExporterMojo.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.maven;
+package com.querydsl.maven;
 
 import javax.jdo.annotations.EmbeddedOnly;
 import javax.jdo.annotations.NotPersistent;
 import javax.jdo.annotations.PersistenceCapable;
 import javax.persistence.Embedded;
 
-import com.mysema.query.codegen.GenericExporter;
+import com.querydsl.codegen.GenericExporter;
+import com.querydsl.codegen.PropertyHandling;
 
 /**
- * JDOExporterMojo calls the GenericExporter tool using the classpath of the module
- * 
+ * {@code JDOExporterMojo} calls {@link GenericExporter} using the classpath of the module
+ *
  * @goal jdo-export
  * @requiresDependencyResolution test
  * @author tiwe
@@ -36,6 +37,7 @@ protected void configure(GenericExporter exporter) {
         exporter.setEmbeddedAnnotation(Embedded.class);
         exporter.setEntityAnnotation(PersistenceCapable.class);
         exporter.setSkipAnnotation(NotPersistent.class);
+        exporter.setPropertyHandling(PropertyHandling.JDO);
     }
 
 }
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPAExporterMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPAExporterMojo.java
new file mode 100644
index 0000000000..18c4626961
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPAExporterMojo.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import javax.persistence.*;
+
+import com.querydsl.codegen.GenericExporter;
+import com.querydsl.codegen.PropertyHandling;
+
+/**
+ * {@code JPAExporterMojo} calls {@link GenericExporter} using the classpath of the module
+ *
+ * @goal jpa-export
+ * @requiresDependencyResolution test
+ * @author tiwe
+ */
+public class JPAExporterMojo extends AbstractExporterMojo {
+
+    @Override
+    protected void configure(GenericExporter exporter) {
+        super.configure(exporter);
+        exporter.setEmbeddableAnnotation(Embeddable.class);
+        exporter.setEmbeddedAnnotation(Embedded.class);
+        exporter.setEntityAnnotation(Entity.class);
+        exporter.setSkipAnnotation(Transient.class);
+        exporter.setSupertypeAnnotation(MappedSuperclass.class);
+        exporter.setPropertyHandling(PropertyHandling.JPA);
+
+        // AnnotationHelpers to process specific JPA annotations
+        exporter.addAnnotationHelper(JPATemporalAnnotationHelper.INSTANCE);
+    }
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPATemporalAnnotationHelper.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPATemporalAnnotationHelper.java
new file mode 100644
index 0000000000..0a661c4ad8
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/JPATemporalAnnotationHelper.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import java.lang.annotation.Annotation;
+
+import javax.persistence.Temporal;
+
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.AnnotationHelper;
+
+/**
+ * An {@link AnnotationHelper} that handles JPA {@link Temporal} annotation.
+ *
+ * @author dyorgio
+ */
+public final class JPATemporalAnnotationHelper implements AnnotationHelper {
+
+        public static final JPATemporalAnnotationHelper INSTANCE = new JPATemporalAnnotationHelper();
+
+        private JPATemporalAnnotationHelper() {
+        }
+
+        @Override
+        public boolean isSupported(Class<? extends Annotation> annotationClass) {
+            return Temporal.class.isAssignableFrom(annotationClass);
+        }
+
+        @Override
+        public Object getCustomKey(Annotation annotation) {
+            return ((Temporal) annotation).value();
+        }
+
+        @Override
+        public TypeCategory getTypeByAnnotation(Class<?> cl, Annotation annotation) {
+            switch (((Temporal) annotation).value()) {
+                case DATE:
+                    return TypeCategory.DATE;
+                case TIME:
+                    return TypeCategory.TIME;
+                case TIMESTAMP:
+                    return TypeCategory.DATETIME;
+            }
+            return null;
+        }
+    }
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/MetadataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/MetadataExportMojo.java
new file mode 100644
index 0000000000..bbaf813859
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/MetadataExportMojo.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import com.querydsl.sql.codegen.MetaDataExporter;
+
+/**
+ * {@code MetadataExportMojo} is a goal for {@link MetaDataExporter} execution.
+ * It is executed by default in the {@code generate-sources} phase.
+ *
+ * @phase generate-sources
+ * @goal export
+ *
+ */
+public class MetadataExportMojo extends AbstractMetaDataExportMojo {
+
+    @Override
+    protected boolean isForTest() {
+        return false;
+    }
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/TestMetadataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/TestMetadataExportMojo.java
new file mode 100644
index 0000000000..612c22d5aa
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/TestMetadataExportMojo.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import com.querydsl.sql.codegen.MetaDataExporter;
+
+/**
+ * {@code TestMetadataExportMojo} is a goal for {@link MetaDataExporter} usage and is bound to the generated-sources phase
+ *
+ * @phase generate-sources
+ * @goal test-export
+ *
+ */
+public class TestMetadataExportMojo extends AbstractMetaDataExportMojo {
+
+    @Override
+    protected boolean isForTest() {
+        return true;
+    }
+
+}
diff --git a/querydsl-maven-plugin/src/main/java/com/querydsl/maven/package-info.java b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/package-info.java
new file mode 100644
index 0000000000..929eca7705
--- /dev/null
+++ b/querydsl-maven-plugin/src/main/java/com/querydsl/maven/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Maven plugins
+ */
+package com.querydsl.maven;
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/Entity.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/Entity.java
deleted file mode 100644
index be1a11cc88..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/Entity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mysema.query.maven;
-
-import javax.jdo.annotations.PersistenceCapable;
-
-import com.mysema.query.annotations.QueryEntity;
-
-@PersistenceCapable
-@javax.persistence.Entity
-@QueryEntity
-public class Entity {
-
-    String property;
-
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java
deleted file mode 100644
index 0736d686c7..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/GenericExporterMojoTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.maven;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-
-public class GenericExporterMojoTest {
-
-    @Test
-    public void Execute() throws Exception {
-        MavenProject mavenProject = new MavenProject();
-        mavenProject.getBuild().setOutputDirectory("target/classes");
-        
-        GenericExporterMojo mojo = new GenericExporterMojo();
-        mojo.setTargetFolder(new File("target/generated-test-data"));
-        mojo.setPackages(new String[]{"com.mysema.query.maven"});
-        mojo.setProject( mavenProject);
-        mojo.execute();
-        
-        File file = new File("target/generated-test-data/com/mysema/query/maven/QEntity.java"); 
-        assertTrue(file.exists());
-    }
-    
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JDOExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JDOExporterMojoTest.java
deleted file mode 100644
index 543f0ba346..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JDOExporterMojoTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.maven;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-
-public class JDOExporterMojoTest {
-
-    @Test
-    public void Execute() throws Exception {
-        MavenProject mavenProject = new MavenProject();
-        mavenProject.getBuild().setOutputDirectory("target/classes");
-
-        JDOExporterMojo mojo = new JDOExporterMojo();
-        mojo.setTargetFolder(new File("target/generated-test-data3"));
-        mojo.setPackages(new String[]{"com.mysema.query.maven"});
-        mojo.setProject( mavenProject);
-        mojo.execute();
-
-        File file = new File("target/generated-test-data3/com/mysema/query/maven/QEntity.java");
-        assertTrue(file.exists());
-    }
-
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JPAExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JPAExporterMojoTest.java
deleted file mode 100644
index cd54ea08dd..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/JPAExporterMojoTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mysema.query.maven;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-
-public class JPAExporterMojoTest {
-
-    @Test
-    public void Execute() throws Exception {
-        MavenProject mavenProject = new MavenProject();
-        mavenProject.getBuild().setOutputDirectory("target/classes");
-
-        JPAExporterMojo mojo = new JPAExporterMojo();
-        mojo.setTargetFolder(new File("target/generated-test-data2"));
-        mojo.setPackages(new String[]{"com.mysema.query.maven"});
-        mojo.setProject( mavenProject);
-        mojo.execute();
-
-        File file = new File("target/generated-test-data2/com/mysema/query/maven/QEntity.java");
-        assertTrue(file.exists());
-    }
-
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/MetadataExportMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/MetadataExportMojoTest.java
deleted file mode 100644
index 0162e10842..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/MetadataExportMojoTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Collections;
-
-import org.apache.maven.project.MavenProject;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.sql.codegen.ExtendedBeanSerializer;
-import com.mysema.query.sql.codegen.OriginalNamingStrategy;
-import com.mysema.query.sql.types.BytesType;
-import com.mysema.query.sql.types.DateTimeType;
-import com.mysema.query.sql.types.LocalDateType;
-import com.mysema.query.sql.types.LocalTimeType;
-
-public class MetadataExportMojoTest {
-
-    private final String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
-
-    private final MavenProject project = new MavenProject();
-
-    private final MetadataExportMojo mojo = new MetadataExportMojo();
-
-    @Before
-    public void setUp() {
-        mojo.setProject(project);
-        mojo.setJdbcDriver("org.h2.Driver");
-        mojo.setJdbcUrl(url);
-        mojo.setJdbcUser("sa");
-        mojo.setNamePrefix("Q"); // default value
-        mojo.setPackageName("com.example");
-    }
-
-    @Test
-    public void Execute() throws Exception {
-        mojo.setTargetFolder("target/export");
-        mojo.execute();
-
-        assertEquals(Collections.singletonList("target/export"), project.getCompileSourceRoots());
-        assertTrue(new File("target/export").exists());
-    }
-
-    @Test
-    public void Execute_With_CustomTypes() throws Exception {
-        mojo.setTargetFolder("target/export2");
-        mojo.setCustomTypes(new String[]{BytesType.class.getName()});
-        mojo.execute();
-
-        assertEquals(Collections.singletonList("target/export2"), project.getCompileSourceRoots());
-        assertTrue(new File("target/export2").exists());
-    }
-
-    @Test
-    public void Execute_With_JodaTypes() throws Exception {
-        mojo.setTargetFolder("target/export3");
-        mojo.setCustomTypes(new String[]{LocalDateType.class.getName(), LocalTimeType.class.getName(), DateTimeType.class.getName()});
-
-        mojo.execute();
-
-        assertEquals(Collections.singletonList("target/export3"), project.getCompileSourceRoots());
-        assertTrue(new File("target/export3").exists());
-    }
-
-    @Test
-    public void Execute_With_TypeMappings() throws Exception {
-        mojo.setTargetFolder("target/export4");
-        TypeMapping mapping = new TypeMapping();
-        mapping.table = "CATALOGS";
-        mapping.column = "CATALOG_NAME";
-        mapping.type = Object.class.getName();
-        mojo.setTypeMappings(new TypeMapping[]{mapping});
-
-        mojo.execute();
-
-        assertEquals(Collections.singletonList("target/export4"), project.getCompileSourceRoots());
-        assertTrue(new File("target/export4").exists());
-    }
-
-    @Test
-    public void ExecuteWithNumericMappings() throws Exception {
-        mojo.setTargetFolder("target/export5");
-        NumericMapping mapping = new NumericMapping();
-        mapping.size = 1;
-        mapping.digits = 1;
-        mapping.javaType = Number.class.getName();
-        mojo.setNumericMappings(new NumericMapping[]{mapping});
-
-        mojo.execute();
-
-        assertEquals(Collections.singletonList("target/export5"), project.getCompileSourceRoots());
-        assertTrue(new File("target/export5").exists());
-    }
-
-    @Test
-    public void ExecuteWithBeans() throws Exception {
-        mojo.setTargetFolder("target/export6");
-        mojo.setExportBeans(true);
-        mojo.execute();
-
-        assertTrue(new File("target/export6").exists());
-    }
-
-    @Test
-    @Ignore
-    public void ExecuteWithScalaSources() throws Exception {
-        mojo.setTargetFolder("target/export7");
-        mojo.setCreateScalaSources(true);
-        mojo.execute();
-
-        assertTrue(new File("target/export7").exists());
-    }
-
-    @Test
-    public void ExecuteWithNamingStrategy() throws Exception {
-        mojo.setTargetFolder("target/export8");
-        mojo.setNamingStrategyClass(OriginalNamingStrategy.class.getName());
-        mojo.execute();
-
-        assertTrue(new File("target/export8").exists());
-    }
-
-    @Test
-    public void ExecuteWithBeans2() throws Exception {
-        mojo.setTargetFolder("target/export9");
-        mojo.setExportBeans(true);
-        mojo.setBeanSerializerClass(ExtendedBeanSerializer.class.getName());
-        mojo.execute();
-
-        assertTrue(new File("target/export9").exists());
-    }
-
-    @Test
-    public void ExecuteWithBeans3() throws Exception {
-        mojo.setTargetFolder("target/export10");
-        mojo.setExportBeans(true);
-        mojo.setBeanInterfaces(new String[]{Serializable.class.getName()});
-        mojo.execute();
-
-        assertTrue(new File("target/export10").exists());
-    }
-
-    @Test
-    public void ExecuteWithImport1() throws Exception {
-        mojo.setTargetFolder("target/export11");
-        mojo.setImports(new String[]{"com.pck1" , "com.pck2" , "com.Q1" , "com.Q2"});
-        mojo.execute();
-
-        assertTrue(new File("target/export11").exists());
-    }
-
-    @Test
-    public void ExecuteWithImportAndBeans1() throws Exception {
-        mojo.setTargetFolder("target/export12");
-        mojo.setImports(new String[]{"com.pck1" , "com.pck2" , "com.Q1" , "com.Q2"});
-        mojo.setExportBeans(true);
-        mojo.execute();
-
-        assertTrue(new File("target/export12").exists());
-    }
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/TestMetadataExportMojoTest.java b/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/TestMetadataExportMojoTest.java
deleted file mode 100644
index 3f59e59c13..0000000000
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/TestMetadataExportMojoTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.maven;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Collections;
-
-import org.apache.maven.project.MavenProject;
-import org.junit.Test;
-
-
-public class TestMetadataExportMojoTest {
-
-    private final String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
-        
-    @Test
-    public void Execute() throws Exception {
-        MavenProject project = new MavenProject();
-        TestMetadataExportMojo mojo = new TestMetadataExportMojo();
-        mojo.setProject(project);
-        mojo.setJdbcDriver("org.h2.Driver");
-        mojo.setJdbcUrl(url);
-        mojo.setJdbcUser("sa");
-        mojo.setNamePrefix("Q"); // default value
-        mojo.setNameSuffix("");
-        mojo.setBeanPrefix("");
-        mojo.setBeanSuffix("Bean");
-        mojo.setPackageName("com.example");
-        mojo.setTargetFolder("target/export4");
-        mojo.setImports(new String[]{"com.pck1" , "com.pck2" , "com.Q1" , "com.Q2"});
-        mojo.execute();
-
-        //'target/export4' seems to conflict with MetadataExportMojoTest.Execute_With_TypeMappings
-        assertEquals(Collections.singletonList("target/export4"), project.getTestCompileSourceRoots());
-        assertTrue(new File("target/export4").exists());
-    }
-    
-}
diff --git a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/CompileMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java
similarity index 95%
rename from querydsl-maven-plugin/src/test/java/com/mysema/query/maven/CompileMojoTest.java
rename to querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java
index e9bb3af35d..684b26b5e0 100644
--- a/querydsl-maven-plugin/src/test/java/com/mysema/query/maven/CompileMojoTest.java
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.maven;
+package com.querydsl.maven;
 
 import java.io.File;
 
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/Entity.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/Entity.java
new file mode 100644
index 0000000000..39d318eb83
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/Entity.java
@@ -0,0 +1,20 @@
+package com.querydsl.maven;
+
+import java.util.Date;
+
+import javax.jdo.annotations.PersistenceCapable;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@PersistenceCapable
+@javax.persistence.Entity
+@QueryEntity
+public class Entity {
+
+    String property;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    Date annotatedProperty;
+}
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java
new file mode 100644
index 0000000000..d378efcc70
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java
@@ -0,0 +1,63 @@
+package com.querydsl.maven;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.lang.annotation.Annotation;
+
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
+
+import com.querydsl.codegen.GeneratedAnnotationResolver;
+
+public class GenericExporterMojoTest {
+
+    public static final File Q_ENTITY_SOURCE_FILE = new File("target/generated-test-data/com/querydsl/maven/QEntity.java");
+
+    private GenericExporterMojo prepareMojo() {
+        MavenProject mavenProject = new MavenProject();
+        mavenProject.getBuild().setOutputDirectory("target/classes");
+        mavenProject.getBuild().setTestOutputDirectory("target/test-classes");
+
+        GenericExporterMojo mojo = new GenericExporterMojo();
+        mojo.setTargetFolder(new File("target/generated-test-data"));
+        mojo.setPackages(new String[] {"com.querydsl.maven"});
+        mojo.setProject(mavenProject);
+        mojo.setTestClasspath(true);
+        return mojo;
+    }
+
+    @Test
+    public void execute() throws Exception {
+        GenericExporterMojo mojo = prepareMojo();
+        mojo.execute();
+
+        assertTrue(Q_ENTITY_SOURCE_FILE.exists());
+    }
+
+    @Test
+    public void defaultGeneratedAnnotation() throws Exception {
+        GenericExporterMojo mojo = prepareMojo();
+        mojo.execute();
+
+        File file = Q_ENTITY_SOURCE_FILE;
+        String source = FileUtils.fileRead(file);
+        assertThat(source, containsString("@" + GeneratedAnnotationResolver.resolveDefault().getSimpleName()));
+    }
+
+    @Test
+    public void providedGeneratedAnnotation() throws Exception {
+        Class<? extends Annotation> annotationClass = com.querydsl.core.annotations.Generated.class;
+        GenericExporterMojo mojo = prepareMojo();
+        mojo.setGeneratedAnnotationClass(annotationClass.getName());
+        mojo.execute();
+
+        File file = Q_ENTITY_SOURCE_FILE;
+        String source = FileUtils.fileRead(file);
+        assertThat(source, containsString("@" + annotationClass.getSimpleName()));
+    }
+
+}
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JDOExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JDOExporterMojoTest.java
new file mode 100644
index 0000000000..f2252327ba
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JDOExporterMojoTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.maven;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.apache.maven.project.MavenProject;
+import org.junit.Test;
+
+public class JDOExporterMojoTest {
+
+    @Test
+    public void execute() throws Exception {
+        MavenProject mavenProject = new MavenProject();
+        mavenProject.getBuild().setOutputDirectory("target/classes");
+        mavenProject.getBuild().setTestOutputDirectory("target/test-classes");
+
+        JDOExporterMojo mojo = new JDOExporterMojo();
+        mojo.setTargetFolder(new File("target/generated-test-data3"));
+        mojo.setPackages(new String[]{"com.querydsl.maven"});
+        mojo.setProject(mavenProject);
+        mojo.setTestClasspath(true);
+        mojo.execute();
+
+        File file = new File("target/generated-test-data3/com/querydsl/maven/QEntity.java");
+        assertTrue(file.exists());
+    }
+
+}
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java
new file mode 100644
index 0000000000..78125a88a9
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.maven;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.apache.maven.project.MavenProject;
+import org.junit.Test;
+
+public class JPAExporterMojoTest {
+
+    @Test
+    public void execute() throws Exception {
+        MavenProject mavenProject = new MavenProject();
+        mavenProject.getBuild().setOutputDirectory("target/classes");
+        mavenProject.getBuild().setTestOutputDirectory("target/test-classes");
+
+        JPAExporterMojo mojo = new JPAExporterMojo();
+        mojo.setTargetFolder(new File("target/generated-test-data2"));
+        mojo.setPackages(new String[]{"com.querydsl.maven"});
+        mojo.setProject(mavenProject);
+        mojo.setTestClasspath(true);
+        mojo.execute();
+
+        File file = new File("target/generated-test-data2/com/querydsl/maven/QEntity.java");
+        assertTrue(file.exists());
+    }
+
+}
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java
new file mode 100644
index 0000000000..24726333d4
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java
@@ -0,0 +1,440 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Collections;
+
+import org.apache.maven.project.MavenProject;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import com.querydsl.sql.codegen.ExtendedBeanSerializer;
+import com.querydsl.sql.codegen.OriginalNamingStrategy;
+import com.querydsl.sql.codegen.support.NumericMapping;
+import com.querydsl.sql.codegen.support.RenameMapping;
+import com.querydsl.sql.codegen.support.TypeMapping;
+import com.querydsl.sql.types.BytesType;
+import com.querydsl.sql.types.DateTimeType;
+import com.querydsl.sql.types.LocalDateType;
+import com.querydsl.sql.types.LocalTimeType;
+
+public class MetadataExportMojoTest {
+
+    private final String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis() + ";INIT=" +
+            "CREATE TABLE NO_SCHEMA_TABLE (COL1 INT)        \\;" +
+            "CREATE SCHEMA SCHEMA1                          \\;" +
+            "CREATE TABLE SCHEMA1.SCHEMA1_TABLE (COL1 INT)  \\;" +
+            "CREATE SCHEMA SCHEMA2                          \\;" +
+            "CREATE TABLE SCHEMA2.SCHEMA2_TABLE (COL1 INT)  \\;";
+
+    private final MavenProject project = new MavenProject();
+
+    private final MetadataExportMojo mojo = new MetadataExportMojo();
+
+    @Rule
+    public TestName testName = new TestName();
+
+    @Before
+    public void setUp() {
+        mojo.setProject(project);
+        mojo.setJdbcDriver("org.h2.Driver");
+        mojo.setJdbcUrl(url);
+        mojo.setJdbcUser("sa");
+        mojo.setNamePrefix("Q"); // default value
+        mojo.setPackageName("com.example");
+    }
+
+    @Test
+    public void execute() throws Exception {
+        mojo.setTargetFolder("target/export");
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export").exists());
+    }
+
+    @Test
+    public void execute_with_customTypes() throws Exception {
+        mojo.setTargetFolder("target/export2");
+        mojo.setCustomTypes(new String[]{BytesType.class.getName()});
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export2"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export2").exists());
+    }
+
+    @Test
+    public void execute_with_jodaTypes() throws Exception {
+        mojo.setTargetFolder("target/export3");
+        mojo.setCustomTypes(new String[]{LocalDateType.class.getName(), LocalTimeType.class.getName(), DateTimeType.class.getName()});
+
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export3"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export3").exists());
+    }
+
+    @Test
+    public void execute_with_typeMappings() throws Exception {
+        mojo.setTargetFolder("target/export4");
+        TypeMapping mapping = new TypeMapping();
+        mapping.setTable("CATALOGS");
+        mapping.setColumn("CATALOG_NAME");
+        mapping.setType(Object.class.getName());
+        mojo.setTypeMappings(new TypeMapping[]{mapping});
+
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export4"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export4").exists());
+    }
+
+    @Test
+    public void executeWithNumericMappings() throws Exception {
+        mojo.setTargetFolder("target/export5");
+        NumericMapping mapping = new NumericMapping();
+        mapping.setTotal(1);
+        mapping.setDecimal(1);
+        mapping.setJavaType(Number.class.getName());
+        mojo.setNumericMappings(new NumericMapping[]{mapping});
+
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export5"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export5").exists());
+    }
+
+    @Test
+    public void executeWithBeans() throws Exception {
+        mojo.setTargetFolder("target/export6");
+        mojo.setExportBeans(true);
+        mojo.execute();
+
+        assertTrue(new File("target/export6").exists());
+    }
+
+    @Test
+    @Ignore
+    public void executeWithScalaSources() throws Exception {
+        mojo.setTargetFolder("target/export7");
+        mojo.setCreateScalaSources(true);
+        mojo.execute();
+
+        assertTrue(new File("target/export7").exists());
+    }
+
+    @Test
+    public void executeWithNamingStrategy() throws Exception {
+        mojo.setTargetFolder("target/export8");
+        mojo.setNamingStrategyClass(OriginalNamingStrategy.class.getName());
+        mojo.execute();
+
+        assertTrue(new File("target/export8").exists());
+    }
+
+    @Test
+    public void executeWithBeans2() throws Exception {
+        mojo.setTargetFolder("target/export9");
+        mojo.setExportBeans(true);
+        mojo.setBeanSerializerClass(ExtendedBeanSerializer.class.getName());
+        mojo.execute();
+
+        assertTrue(new File("target/export9").exists());
+    }
+
+    @Test
+    public void executeWithBeans3() throws Exception {
+        mojo.setTargetFolder("target/export10");
+        mojo.setExportBeans(true);
+        mojo.setBeanInterfaces(new String[]{Serializable.class.getName()});
+        mojo.execute();
+
+        assertTrue(new File("target/export10").exists());
+    }
+
+    @Test
+    public void executeWithImport1() throws Exception {
+        mojo.setTargetFolder("target/export11");
+        mojo.setImports(new String[]{"com.pck1", "com.pck2", "com.Q1", "com.Q2"});
+        mojo.execute();
+
+        assertTrue(new File("target/export11").exists());
+    }
+
+    @Test
+    public void executeWithImportAndBeans1() throws Exception {
+        mojo.setTargetFolder("target/export12");
+        mojo.setImports(new String[]{"com.pck1", "com.pck2", "com.Q1", "com.Q2"});
+        mojo.setExportBeans(true);
+        mojo.execute();
+
+        assertTrue(new File("target/export12").exists());
+    }
+
+    @Test
+    public void executeWithRenames() throws Exception {
+        RenameMapping mapping = new RenameMapping();
+        mapping.setFromSchema("ABC");
+        mapping.setToSchema("DEF");
+
+        mojo.setTargetFolder("target/export13");
+        mojo.setRenameMappings(new RenameMapping[]{mapping});
+        mojo.execute();
+
+        assertEquals(Collections.singletonList("target/export13"), project.getCompileSourceRoots());
+        assertTrue(new File("target/export13").exists());
+    }
+
+    // region Schema Pattern Matching
+
+    @Test
+    public void executeWithUnsetSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern(null);
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithExactSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithSimilarSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("%EMA1");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMismatchedSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("NON_EXISTENT_SCHEMA");
+        mojo.execute();
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMultipleSchemaPatterns() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,SCHEMA2");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+    }
+
+    // endregion Schema Pattern Matching
+
+    // region Schema Pattern Matching - Empty Values
+
+    @Test
+    public void executeWithEmptySchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMultipleSchemaPatternsAndInterleavedEmpty() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,,SCHEMA2");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMultipleSchemaPatternsAndLeadingEmpty() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern(",SCHEMA2");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+    }
+
+    @Test
+    @Ignore("Trailing empty strings are not handled correctly by the MetaDataExporter")
+    public void executeWithMultipleSchemaPatternsAndTrailingEmpty() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    // endregion Schema Pattern Matching - Empty Values
+
+    // region Schema Pattern Matching - BLANK Values
+
+    @Test
+    public void executeWithBlankUppercaseSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("BLANK");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithBlankLowercaseSchemaPattern() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("blank");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+
+    @Test
+    public void executeWithSchemaPatternContainingBlank() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1BLANK");
+        mojo.execute();
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+    @Test
+    public void executeWithMultipleSchemaPatternsAndInterleavedBlank() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,BLANK,SCHEMA2");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMultipleSchemaPatternsAndLeadingBlank() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("BLANK,SCHEMA2");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+    }
+
+    @Test
+    @Ignore("Trailing empty strings are not handled correctly by the MetaDataExporter")
+    public void executeWithMultipleSchemaPatternsAndTrailingBlank() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,BLANK");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    @Test
+    public void executeWithMultipleSchemaPatternsAndContainingBlank() throws Exception {
+        String targetFolder = "target/" + testName.getMethodName();
+
+        mojo.setTargetFolder(targetFolder);
+        mojo.setSchemaPattern("SCHEMA1,SCHEMA2BLANK");
+        mojo.execute();
+
+        assertTrue(new File(targetFolder + "/com/example/QSchema1Table.java").exists());
+
+        assertFalse(new File(targetFolder + "/com/example/QNoSchemaTable.java").exists());
+        assertFalse(new File(targetFolder + "/com/example/QSchema2Table.java").exists());
+    }
+
+    // endregion Schema Pattern Matching - BLANK Values
+}
diff --git a/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java
new file mode 100644
index 0000000000..baaedfcc76
--- /dev/null
+++ b/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.maven;
+
+import com.querydsl.codegen.GeneratedAnnotationResolver;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
+
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class TestMetadataExportMojoTest {
+
+    private final String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
+
+    private TestMetadataExportMojo setupMojoWith(MavenProject project) {
+        TestMetadataExportMojo mojo = new TestMetadataExportMojo();
+        mojo.setProject(project);
+        mojo.setJdbcDriver("org.h2.Driver");
+        mojo.setJdbcUrl(url);
+        mojo.setJdbcUser("sa");
+        mojo.setNamePrefix("Q"); // default value
+        mojo.setNameSuffix("");
+        mojo.setBeanPrefix("");
+        mojo.setBeanSuffix("Bean");
+        mojo.setPackageName("com.example");
+        mojo.setTargetFolder("target/export4");
+        mojo.setImports(new String[] {"com.pck1", "com.pck2", "com.Q1", "com.Q2"});
+        return mojo;
+    }
+
+    @Test
+    public void execute() throws Exception {
+        MavenProject project = new MavenProject();
+        TestMetadataExportMojo mojo = setupMojoWith(project);
+        mojo.execute();
+
+        //'target/export4' seems to conflict with MetadataExportMojoTest.Execute_With_TypeMappings
+        assertEquals(Collections.singletonList("target/export4"), project.getTestCompileSourceRoots());
+        assertTrue(new File("target/export4").exists());
+    }
+
+    @Test
+    public void defaultGeneratedAnnotation() throws Exception {
+        MavenProject project = new MavenProject();
+        TestMetadataExportMojo mojo = setupMojoWith(project);
+        mojo.execute();
+
+        File sourceFile = new File("target/export4/com/example/QCatalogs.java");
+        String sourceFileContent = FileUtils.fileRead(sourceFile);
+        assertThat(sourceFileContent, containsString("@" + GeneratedAnnotationResolver.resolveDefault().getSimpleName()));
+    }
+
+    @Test
+    public void providedGeneratedAnnotation() throws Exception {
+        Class<? extends Annotation> annotationClass = com.querydsl.core.annotations.Generated.class;
+        MavenProject project = new MavenProject();
+        TestMetadataExportMojo mojo = setupMojoWith(project);
+        mojo.setGeneratedAnnotationClass(annotationClass.getName());
+        mojo.execute();
+
+        File sourceFile = new File("target/export4/com/example/QCatalogs.java");
+        String sourceFileContent = FileUtils.fileRead(sourceFile);
+        assertThat(sourceFileContent, containsString("@" + annotationClass.getSimpleName()));
+    }
+
+}
diff --git a/querydsl-mongodb/README.md b/querydsl-mongodb/README.md
index 6625c74d63..3feb9e2d19 100644
--- a/querydsl-mongodb/README.md
+++ b/querydsl-mongodb/README.md
@@ -6,42 +6,48 @@ The Mongodb module provides integration with the Mongodb API.
 
  Add the following dependencies to your Maven project :
 
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-mongodb</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>    
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-mongodb</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 And now, configure the Maven APT plugin which generates the query types used by Querydsl :
 
-    <plugin>
-      <groupId>com.mysema.maven</groupId>
-      <artifactId>apt-maven-plugin</artifactId>
-      <version>1.0.6</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>process</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>target/generated-sources/java</outputDirectory>
-            <processor>com.mysema.query.mongodb.morphia.MorphiaAnnotationProcessor</processor>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
+```XML
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <version>1.1.3</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-sources/java</outputDirectory>
+              <processor>com.querydsl.mongodb.morphia.MorphiaAnnotationProcessor</processor>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+```
 
 The MorphiaAnnotationProcessor finds domain types annotated with the com.google.code.morphia.annotations.Entity annotation and generates Querydsl query types for them.
 
-Run clean install and you will get your Query types generated into target/generated-sources/java.
+Run `mvn clean install` and you will get your Query types generated into target/generated-sources/java.
 
-If you use Eclipse, run mvn eclipse:eclipse to update your Eclipse project to include target/generated-sources/java as a source folder.
+If you use Eclipse, run `mvn eclipse:eclipse` to update your Eclipse project to include target/generated-sources/java as a source folder.
 
 Now you are able to construct Mongodb queries and instances of the query domain model. 
 
@@ -49,14 +55,16 @@ Now you are able to construct Mongodb queries and instances of the query domain
 
 Querying with Querydsl Mongodb with Morphia is as simple as this : 
 
-    Morphia morphia;
-    Datastore datastore;
-    // ...  
-    QUser user = new QUser("user");
-    MorphiaQuery<User> query = new MorphiaQuery<User>(morphia, datastore, user);
-    List<User> list = query
-        .where(user.firstName.eq("Bob"))
-        .list();
+```JAVA
+Morphia morphia;
+Datastore datastore;
+// ...  
+QUser user = new QUser("user");
+MorphiaQuery<User> query = new MorphiaQuery<User>(morphia, datastore, user);
+List<User> list = query
+    .where(user.firstName.eq("Bob"))
+    .fetch();
+```
 
 
-For more information on the Querydsl Mongodb module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s06.html
\ No newline at end of file
+For more information on the Querydsl Mongodb module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s07.html
diff --git a/querydsl-mongodb/doc/README.txt b/querydsl-mongodb/doc/README.txt
deleted file mode 100644
index 8ad95360fc..0000000000
--- a/querydsl-mongodb/doc/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-- Download and install Mongodb
-- run: mongod --dbpath put/your/path
-
-Now the tests should be runnable
-
diff --git a/querydsl-mongodb/pom.xml b/querydsl-mongodb/pom.xml
index ba74139769..43e5448670 100644
--- a/querydsl-mongodb/pom.xml
+++ b/querydsl-mongodb/pom.xml
@@ -1,26 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-mongodb</artifactId>
   <name>Querydsl - Mongodb support</name>
   <description>Mongodb support for Querydsl</description>
   <packaging>jar</packaging>
 
   <properties>
-    <mongodb.version>2.10.0</mongodb.version>
-    <morphia.version>0.105</morphia.version>
+    <mongodb.version>3.12.11</mongodb.version>
+    <osgi.import.package>
+      com.mongodb;version="0.0.0",
+      org.mongodb.morphia.*;version="1.3.2",
+      org.bson.*;version="0.0.0",
+      ${osgi.import.package.root}
+    </osgi.import.package>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongo-java-driver</artifactId>
@@ -30,7 +40,14 @@
       <groupId>org.mongodb.morphia</groupId>
       <artifactId>morphia</artifactId>
       <version>${morphia.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>mongo-java-driver</artifactId>
+          <groupId>org.mongodb</groupId>
+        </exclusion>
+      </exclusions>
       <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.proxytoys</groupId>
@@ -41,29 +58,20 @@
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-apt</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-
     <!-- test -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -74,8 +82,20 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.mongodb</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
 
       <plugin>
@@ -89,7 +109,7 @@
             </goals>
             <configuration>
               <outputDirectory>target/generated-test-sources/java</outputDirectory>
-              <processor>com.mysema.query.apt.morphia.MorphiaAnnotationProcessor</processor>
+              <processor>com.querydsl.apt.morphia.MorphiaAnnotationProcessor</processor>
               <logOnlyOnError>true</logOnlyOnError>
               <options>
                 <defaultOverwrite>true</defaultOverwrite>
@@ -137,7 +157,7 @@
                 </property>
               </systemProperties>
               <includes>
-                <include>com/mysema/query/PackageVerification.java</include>
+                <include>com/querydsl/jpa/PackageVerification.java</include>
               </includes>
             </configuration>
           </execution>
@@ -148,4 +168,4 @@
   </build>
 
 
-</project>
+</project>
diff --git a/querydsl-mongodb/src/apt/META-INF/services/javax.annotation.processing.Processor b/querydsl-mongodb/src/apt/META-INF/services/javax.annotation.processing.Processor
index 7a4886bc1e..d0b82f8576 100644
--- a/querydsl-mongodb/src/apt/META-INF/services/javax.annotation.processing.Processor
+++ b/querydsl-mongodb/src/apt/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.mysema.query.apt.morphia.MorphiaAnnotationProcessor
\ No newline at end of file
+com.querydsl.apt.morphia.MorphiaAnnotationProcessor
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/apt.xml b/querydsl-mongodb/src/main/apt.xml
index a8b530cb0b..5f792b563f 100644
--- a/querydsl-mongodb/src/main/apt.xml
+++ b/querydsl-mongodb/src/main/apt.xml
@@ -8,12 +8,12 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>			
+      <directory>${project.build.outputDirectory}</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>            
   </fileSets>  
 </assembly>
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/assembly.xml b/querydsl-mongodb/src/main/assembly.xml
index 1c14abc7f4..f663fb239c 100644
--- a/querydsl-mongodb/src/main/assembly.xml
+++ b/querydsl-mongodb/src/main/assembly.xml
@@ -8,14 +8,14 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/apt</directory>	
-	  <outputDirectory>/</outputDirectory>
-	</fileSet>
+      <directory>src/apt</directory>    
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
-      <directory>src/license</directory>	
-	  <outputDirectory>/license</outputDirectory>
-	</fileSet>			
-  </fileSets>	
+      <directory>src/license</directory>    
+      <outputDirectory>/license</outputDirectory>
+    </fileSet>            
+  </fileSets>    
   <dependencySets>
     <dependencySet>
       <unpack>true</unpack>
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/AnyEmbeddedBuilder.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/AnyEmbeddedBuilder.java
deleted file mode 100644
index 6e8dfa7fe9..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/AnyEmbeddedBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import java.util.Collection;
-
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-
-/**
- * AnyEmbeddedBuilder is a builder for constraints on embedded objects
- *
- * @author tiwe
- *
- * @param <K>
- */
-public class AnyEmbeddedBuilder<K> {
-
-    private final QueryMixin<MongodbQuery<K>> queryMixin;
-
-    private final Path<? extends Collection<?>> collection;
-
-    public AnyEmbeddedBuilder(QueryMixin<MongodbQuery<K>> queryMixin,
-            Path<? extends Collection<?>> collection) {
-        this.queryMixin = queryMixin;
-        this.collection = collection;
-    }
-
-    public MongodbQuery<K> on(Predicate... conditions) {
-        return queryMixin.where(PredicateOperation.create(
-                MongodbOps.ELEM_MATCH, collection, ExpressionUtils.allOf(conditions)));
-    }
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/JoinBuilder.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/JoinBuilder.java
deleted file mode 100644
index 5254655d2e..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/JoinBuilder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import com.mysema.query.JoinType;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * JoinBuilder is a builder for join constraints
- *
- * @author tiwe
- *
- * @param <K>
- * @param <T>
- */
-public class JoinBuilder<K, T> {
-
-    private final QueryMixin<MongodbQuery<K>> queryMixin;
-
-    private final Path<?> ref;
-
-    private final Path<T> target;
-
-    public JoinBuilder(QueryMixin<MongodbQuery<K>> queryMixin, Path<?> ref, Path<T> target) {
-        this.queryMixin = queryMixin;
-        this.ref = ref;
-        this.target = target;
-    }
-
-    public MongodbQuery<K> on(Predicate... conditions) {
-        queryMixin.addJoin(JoinType.JOIN, ExpressionUtils.as((Path)ref, target));
-        queryMixin.on(conditions);
-        return queryMixin.getSelf();
-    }
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbExpressions.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbExpressions.java
deleted file mode 100644
index a41e06800a..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbExpressions.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * Mongodb specific operations
- *
- * @author tiwe
- *
- */
-public final class MongodbExpressions {
-
-    private MongodbExpressions() {}
-
-    /**
-     * Finds the closest points relative to the given location and orders the results with decreasing promimity
-     *
-     * @param expr
-     * @param latVal latitude
-     * @param longVal longitude
-     * @return
-     */
-    public static BooleanExpression near(Expression<Double[]> expr, double latVal, double longVal) {
-        return BooleanOperation.create(MongodbOps.NEAR, expr, ConstantImpl.create(new Double[]{latVal, longVal}));
-    }
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbOps.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbOps.java
deleted file mode 100644
index f4fb8c728a..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbOps.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class MongodbOps {
-
-    private static final String NS = MongodbOps.class.getName();
-
-    public static final Operator<Boolean> NEAR = new OperatorImpl<Boolean>(NS, "NEAR");
-
-    public static final Operator<Boolean> ELEM_MATCH = new OperatorImpl<Boolean>(NS, "ELEM_MATCH");
-
-    private MongodbOps() {}
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java
deleted file mode 100644
index 6f761457f9..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.ReadPreference;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.SimpleProjectable;
-import com.mysema.query.SimpleQuery;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.CollectionPathBase;
-
-/**
- * MongodbQuery provides a general Querydsl query implementation with a pluggable DBObject to Bean transformation
- *
- * @author laimw
- *
- * @param <K>
- */
-public abstract class MongodbQuery<K> implements SimpleQuery<MongodbQuery<K>>, SimpleProjectable<K> {
-
-    @SuppressWarnings("serial")
-    private static class NoResults extends RuntimeException {}
-
-    private final MongodbSerializer serializer;
-
-    private final QueryMixin<MongodbQuery<K>> queryMixin;
-
-    private final DBCollection collection;
-
-    private final Function<DBObject, K> transformer;
-
-    private ReadPreference readPreference;
-
-    /**
-     * Create a new MongodbQuery instance
-     *
-     * @param collection
-     * @param transformer
-     * @param serializer
-     */
-    public MongodbQuery(DBCollection collection, Function<DBObject, K> transformer, MongodbSerializer serializer) {
-        this.queryMixin = new QueryMixin<MongodbQuery<K>>(this, new DefaultQueryMetadata().noValidate(), false);
-        this.transformer = transformer;
-        this.collection = collection;
-        this.serializer = serializer;
-    }
-
-    /**
-     * Define a join
-     *
-     * @param ref
-     * @param target
-     * @return
-     */
-    public <T> JoinBuilder<K,T> join(Path<T> ref, Path<T> target) {
-        return new JoinBuilder<K,T>(queryMixin, ref, target);
-    }
-
-    /**
-     * Define a join
-     *
-     * @param ref
-     * @param target
-     * @return
-     */
-    public <T> JoinBuilder<K,T> join(CollectionPathBase<?,T,?> ref, Path<T> target) {
-        return new JoinBuilder<K,T>(queryMixin, ref, target);
-    }
-
-    /**
-     * Define a constraint for an embedded object
-     *
-     * @param collection
-     * @param target
-     * @return
-     */
-    public <T> AnyEmbeddedBuilder<K> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
-        return new AnyEmbeddedBuilder<K>(queryMixin, collection);
-    }
-
-    protected abstract DBCollection getCollection(Class<?> type);
-
-    @Override
-    public boolean exists() {
-        try {
-            QueryMetadata metadata = queryMixin.getMetadata();
-            Predicate filter = createFilter(metadata);
-            return collection.findOne(createQuery(filter)) != null;
-        } catch (NoResults ex) {
-            return false;
-        }
-    }
-
-    @Nullable
-    protected Predicate createFilter(QueryMetadata metadata) {
-        Predicate filter;
-        if (!metadata.getJoins().isEmpty()) {
-            filter = ExpressionUtils.allOf(metadata.getWhere(), createJoinFilter(metadata));
-        } else {
-            filter = metadata.getWhere();
-        }
-        return filter;
-    }
-
-    @Nullable
-    protected Predicate createJoinFilter(QueryMetadata metadata) {
-        Multimap<Expression<?>, Predicate> predicates = HashMultimap.<Expression<?>, Predicate>create();
-        List<JoinExpression> joins = metadata.getJoins();
-        for (int i = joins.size() - 1; i >= 0; i--) {
-            JoinExpression join = joins.get(i);
-            Path source = (Path)((Operation<?>)join.getTarget()).getArg(0);
-            Path target = (Path)((Operation<?>)join.getTarget()).getArg(1);
-            Collection<Predicate> extraFilters = predicates.get(target.getRoot());
-            Predicate filter = ExpressionUtils.allOf(join.getCondition(), allOf(extraFilters));
-            List<Object> ids = getIds(target.getType(), filter);
-            if (ids.isEmpty()) {
-                throw new NoResults();
-            }
-            Path path = new PathImpl<String>(String.class, source, "$id");
-            predicates.put(source.getRoot(), ExpressionUtils.in(path, ids));
-        }
-        Path source = (Path)((Operation)joins.get(0).getTarget()).getArg(0);
-        return allOf(predicates.get(source.getRoot()));
-    }
-
-    private Predicate allOf(Collection<Predicate> predicates) {
-        return predicates != null ? ExpressionUtils.allOf(predicates) : null;
-    }
-
-    protected List<Object> getIds(Class<?> targetType, Predicate condition) {
-        DBCollection collection = getCollection(targetType);
-        // TODO : fetch only ids
-        DBCursor cursor = createCursor(collection, condition, Collections.<Expression<?>>emptyList(),
-                QueryModifiers.EMPTY, Collections.<OrderSpecifier<?>>emptyList());
-        if (cursor.hasNext()) {
-            List<Object> ids = new ArrayList<Object>(cursor.count());
-            for (DBObject obj : cursor) {
-                ids.add(obj.get("_id"));
-            }
-            return ids;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public boolean notExists() {
-        return !exists();
-    }
-
-    @Override
-    public MongodbQuery<K> distinct() {
-        return queryMixin.distinct();
-    }
-
-    public MongodbQuery<K> where(Predicate e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public MongodbQuery<K> where(Predicate... e) {
-        return queryMixin.where(e);
-    }
-
-    @Override
-    public MongodbQuery<K> limit(long limit) {
-        return queryMixin.limit(limit);
-    }
-
-    @Override
-    public MongodbQuery<K> offset(long offset) {
-        return queryMixin.offset(offset);
-    }
-
-    @Override
-    public MongodbQuery<K> restrict(QueryModifiers modifiers) {
-        return queryMixin.restrict(modifiers);
-    }
-
-    public MongodbQuery<K> orderBy(OrderSpecifier<?> o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public MongodbQuery<K> orderBy(OrderSpecifier<?>... o) {
-        return queryMixin.orderBy(o);
-    }
-
-    @Override
-    public <T> MongodbQuery<K> set(ParamExpression<T> param, T value) {
-        return queryMixin.set(param, value);
-    }
-
-    public CloseableIterator<K> iterate(Path<?>... paths) {
-        queryMixin.addProjection(paths);
-        return iterate();
-    }
-
-    @Override
-    public CloseableIterator<K> iterate() {
-        final DBCursor cursor = createCursor();
-        return new CloseableIterator<K>() {
-            @Override
-            public boolean hasNext() {
-                return cursor.hasNext();
-            }
-
-            @Override
-            public K next() {
-                return transformer.apply(cursor.next());
-            }
-
-            @Override
-            public void remove() {
-            }
-
-            @Override
-            public void close() {
-            }
-        };
-    }
-
-    public List<K> list(Path<?>... paths) {
-        queryMixin.addProjection(paths);
-        return list();
-    }
-
-    @Override
-    public List<K> list() {
-        try {
-            DBCursor cursor = createCursor();
-            List<K> results = new ArrayList<K>(cursor.size());
-            for (DBObject dbObject : cursor) {
-                results.add(transformer.apply(dbObject));
-            }
-            return results;
-        } catch (NoResults ex) {
-            return Collections.emptyList();
-        }
-    }
-
-    protected DBCursor createCursor() {
-        QueryMetadata metadata = queryMixin.getMetadata();
-        Predicate filter = createFilter(metadata);
-        return createCursor(collection, filter, metadata.getProjection(), metadata.getModifiers(), metadata.getOrderBy());
-    }
-
-    protected DBCursor createCursor(DBCollection collection, @Nullable Predicate where, List<Expression<?>> projection,
-            QueryModifiers modifiers, List<OrderSpecifier<?>> orderBy) {
-        DBCursor cursor = collection.find(createQuery(where), createProjection(projection));
-        Integer limit = modifiers.getLimitAsInteger();
-        Integer offset = modifiers.getOffsetAsInteger();
-        if (limit != null) {
-            cursor.limit(limit.intValue());
-        }
-        if (offset != null) {
-            cursor.skip(offset.intValue());
-        }
-        if (orderBy.size() > 0) {
-            cursor.sort(serializer.toSort(orderBy));
-        }
-        if (readPreference != null) {
-            cursor.setReadPreference(readPreference);
-        }
-        return cursor;
-    }
-
-    private DBObject createProjection(List<Expression<?>> projection) {
-        if (!projection.isEmpty()) {
-            DBObject obj = new BasicDBObject();
-            for (Expression<?> expr : projection) {
-                obj.put((String)serializer.handle(expr), 1);
-            }
-            return obj;
-        }
-        return null;
-    }
-
-    public K singleResult(Path<?>...paths) {
-        queryMixin.addProjection(paths);
-        return singleResult();
-    }
-
-    @Override
-    public K singleResult() {
-        try {
-            DBCursor c = createCursor().limit(1);
-            if (c.hasNext()) {
-                return transformer.apply(c.next());
-            } else {
-                return null;
-            }
-        } catch (NoResults ex) {
-            return null;
-        }
-    }
-
-    public K uniqueResult(Path<?>... paths) {
-        queryMixin.addProjection(paths);
-        return uniqueResult();
-    }
-
-    @Override
-    public K uniqueResult() {
-        try {
-            Long limit = queryMixin.getMetadata().getModifiers().getLimit();
-            if (limit == null) {
-                limit = 2l;
-            }
-            DBCursor c = createCursor().limit(limit.intValue());
-            if (c.hasNext()) {
-                K rv = transformer.apply(c.next());
-                if (c.hasNext()) {
-                    throw new NonUniqueResultException();
-                }
-                return rv;
-            } else {
-                return null;
-            }
-        } catch (NoResults ex) {
-            return null;
-        }
-    }
-
-    public SearchResults<K> listResults(Path<?>... paths) {
-        queryMixin.addProjection(paths);
-        return listResults();
-    }
-
-    @Override
-    public SearchResults<K> listResults() {
-        try {
-            long total = count();
-            if (total > 0l) {
-                return new SearchResults<K>(list(), queryMixin.getMetadata().getModifiers(), total);
-            } else {
-                return SearchResults.emptyResults();
-            }
-        } catch (NoResults ex) {
-            return SearchResults.emptyResults();
-        }
-    }
-
-    @Override
-    public long count() {
-        try {
-            Predicate filter = createFilter(queryMixin.getMetadata());
-            return collection.count(createQuery(filter));
-        } catch (NoResults ex) {
-            return 0l;
-        }
-    }
-
-    private DBObject createQuery(@Nullable Predicate predicate) {
-        if (predicate != null) {
-            return (DBObject) serializer.handle(predicate);
-        } else {
-            return new BasicDBObject();
-        }
-    }
-
-    public void setReadPreference(ReadPreference readPreference) {
-        this.readPreference = readPreference;
-    }
-
-    @Override
-    public String toString() {
-        return createQuery(queryMixin.getMetadata().getWhere()).toString();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbSerializer.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbSerializer.java
deleted file mode 100644
index 7ed493f1d1..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbSerializer.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.bson.BSONObject;
-import org.bson.types.ObjectId;
-
-import com.google.common.collect.Sets;
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DBRef;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Order;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathType;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.Visitor;
-
-/**
- * Serializes the given Querydsl query to a DBObject query for MongoDB
- *
- * @author laimw
- *
- */
-public abstract class MongodbSerializer implements Visitor<Object, Void> {
-
-    public Object handle(Expression<?> expression) {
-        return expression.accept(this, null);
-    }
-
-    public DBObject toSort(List<OrderSpecifier<?>> orderBys) {
-        BasicDBObject sort = new BasicDBObject();
-        for (OrderSpecifier<?> orderBy : orderBys) {
-            Object key = orderBy.getTarget().accept(this, null);
-            sort.append(key.toString(), orderBy.getOrder() == Order.ASC ? 1 : -1);
-        }
-        return sort;
-    }
-
-    @Override
-    public Object visit(Constant<?> expr, Void context) {
-        if (Enum.class.isAssignableFrom(expr.getType())) {
-            return ((Enum<?>)expr.getConstant()).name();
-        } else {
-            return expr.getConstant();
-        }
-    }
-
-    @Override
-    public Object visit(TemplateExpression<?> expr, Void context) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object visit(FactoryExpression<?> expr, Void context) {
-        throw new UnsupportedOperationException();
-    }
-
-    private String asDBKey(Operation<?> expr, int index) {
-        return (String) asDBValue(expr, index);
-    }
-
-    private Object asDBValue(Operation<?> expr, int index) {
-        return expr.getArg(index).accept(this, null);
-    }
-
-    private String regexValue(Operation<?> expr, int index) {
-        return Pattern.quote(expr.getArg(index).accept(this, null).toString());
-    }
-
-    protected DBObject asDBObject(String key, Object value) {
-        return new BasicDBObject(key, value);
-    }
-
-    @Override
-    public Object visit(Operation<?> expr, Void context) {
-        Operator<?> op = expr.getOperator();
-        if (op == Ops.EQ) {
-            if (expr.getArg(0) instanceof Operation) {
-                Operation<?> lhs = (Operation<?>) expr.getArg(0);
-                if (lhs.getOperator() == Ops.COL_SIZE || lhs.getOperator() == Ops.ARRAY_SIZE) {
-                    return asDBObject(asDBKey(lhs, 0), asDBObject("$size", asDBValue(expr, 1)));
-                } else {
-                    throw new UnsupportedOperationException("Illegal operation " + expr);
-                }
-            } else if (isReference(expr, 0)) {
-                return asDBObject(asDBKey(expr, 0), asReference(expr, 1));
-            } else {
-                return asDBObject(asDBKey(expr, 0), asDBValue(expr, 1));
-            }
-
-        } else if (op == Ops.STRING_IS_EMPTY) {
-            return asDBObject(asDBKey(expr, 0), "");
-
-        } else if (op == Ops.AND) {
-            BSONObject lhs = (BSONObject) handle(expr.getArg(0));
-            BSONObject rhs = (BSONObject) handle(expr.getArg(1));
-            if (Sets.intersection(lhs.keySet(), rhs.keySet()).isEmpty()) {
-                lhs.putAll(rhs);
-                return lhs;
-            } else {
-                BasicDBList list = new BasicDBList();
-                list.add(handle(expr.getArg(0)));
-                list.add(handle(expr.getArg(1)));
-                return asDBObject("$and", list);
-            }
-
-        } else if (op == Ops.NOT) {
-            //Handle the not's child
-            BasicDBObject arg = (BasicDBObject) handle(expr.getArg(0));
-
-            //Only support the first key, let's see if there
-            //is cases where this will get broken
-            String key = arg.keySet().iterator().next();
-            Operation<?> subOperation = (Operation<?>) expr.getArg(0);
-            Operator<?> subOp = subOperation.getOperator();
-            if (subOp == Ops.IN) {
-                return visit(OperationImpl.create(Boolean.class, Ops.NOT_IN, subOperation.getArg(0),
-                        subOperation.getArg(1)), context);
-            } else if (subOp != Ops.EQ && subOp != Ops.STRING_IS_EMPTY) {
-                return asDBObject(key, asDBObject("$not", arg.get(key)));
-            } else {
-                return asDBObject(key, asDBObject("$ne", arg.get(key)));
-            }
-
-        } else if (op == Ops.OR) {
-            BasicDBList list = new BasicDBList();
-            list.add(handle(expr.getArg(0)));
-            list.add(handle(expr.getArg(1)));
-            return asDBObject("$or", list);
-
-        } else if (op == Ops.NE) {
-            if (isReference(expr, 0)) {
-                return asDBObject(asDBKey(expr, 0), asDBObject("$ne", asReference(expr, 1)));
-            } else {
-                return asDBObject(asDBKey(expr, 0), asDBObject("$ne", asDBValue(expr, 1)));
-            }
-
-        } else if (op == Ops.STARTS_WITH) {
-            return asDBObject(asDBKey(expr, 0),
-                    Pattern.compile("^" + regexValue(expr, 1)));
-
-        } else if (op == Ops.STARTS_WITH_IC) {
-            return asDBObject(asDBKey(expr, 0),
-                    Pattern.compile("^" + regexValue(expr, 1), Pattern.CASE_INSENSITIVE));
-
-        } else if (op == Ops.ENDS_WITH) {
-            return asDBObject(asDBKey(expr, 0), Pattern.compile(regexValue(expr, 1) + "$"));
-
-        } else if (op == Ops.ENDS_WITH_IC) {
-            return asDBObject(asDBKey(expr, 0),
-                    Pattern.compile(regexValue(expr, 1) + "$", Pattern.CASE_INSENSITIVE));
-
-        } else if (op == Ops.EQ_IGNORE_CASE) {
-            return asDBObject(asDBKey(expr, 0),
-                    Pattern.compile("^" + regexValue(expr, 1) + "$", Pattern.CASE_INSENSITIVE));
-
-        } else if (op == Ops.STRING_CONTAINS) {
-            return asDBObject(asDBKey(expr, 0), Pattern.compile(".*" + regexValue(expr, 1) + ".*"));
-
-        } else if (op == Ops.STRING_CONTAINS_IC) {
-            return asDBObject(asDBKey(expr, 0),
-                    Pattern.compile(".*" + regexValue(expr, 1) + ".*", Pattern.CASE_INSENSITIVE));
-
-        } else if (op == Ops.MATCHES) {
-            return asDBObject(asDBKey(expr, 0), Pattern.compile(asDBValue(expr, 1).toString()));
-
-        } else if (op == Ops.MATCHES_IC) {
-            return asDBObject(asDBKey(expr, 0), Pattern.compile(asDBValue(expr, 1).toString(), Pattern.CASE_INSENSITIVE));
-
-        } else if (op == Ops.LIKE) {
-            String regex = ExpressionUtils.likeToRegex((Expression)expr.getArg(1)).toString();
-            return asDBObject(asDBKey(expr, 0), Pattern.compile(regex));
-
-        } else if (op == Ops.BETWEEN) {
-            BasicDBObject value = new BasicDBObject("$gte", asDBValue(expr, 1));
-            value.append("$lte", asDBValue(expr, 2));
-            return asDBObject(asDBKey(expr, 0), value);
-
-        } else if (op == Ops.IN) {
-            int constIndex = 0;
-            int exprIndex = 1;
-            if (expr.getArg(1) instanceof Constant<?>) {
-                constIndex = 1;
-                exprIndex = 0;
-            }
-            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
-                Collection<?> values = (Collection<?>) ((Constant<?>) expr.getArg(constIndex)).getConstant();
-                return asDBObject(asDBKey(expr, exprIndex), asDBObject("$in", values.toArray()));
-            } else {
-                if (isReference(expr, exprIndex)) {
-                    return asDBObject(asDBKey(expr, exprIndex), asReference(expr, constIndex));
-                } else {
-                    return asDBObject(asDBKey(expr, exprIndex), asDBValue(expr, constIndex));
-                }
-            }
-
-        } else if (op == Ops.NOT_IN) {
-            int constIndex = 0;
-            int exprIndex = 1;
-            if (expr.getArg(1) instanceof Constant<?>) {
-                constIndex = 1;
-                exprIndex = 0;
-            }
-            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
-                Collection<?> values = (Collection<?>) ((Constant<?>) expr.getArg(constIndex)).getConstant();
-                return asDBObject(asDBKey(expr, exprIndex), asDBObject("$nin", values.toArray()));
-            } else {
-                if (isReference(expr, exprIndex)) {
-                    return asDBObject(asDBKey(expr, exprIndex),
-                            asDBObject("$ne", asReference(expr, constIndex)));
-                } else {
-                    return asDBObject(asDBKey(expr, exprIndex),
-                            asDBObject("$ne", asDBValue(expr, constIndex)));
-                }
-            }
-
-        } else if (op == Ops.COL_IS_EMPTY) {
-            BasicDBList list = new BasicDBList();
-            list.add(asDBObject(asDBKey(expr, 0), new BasicDBList()));
-            list.add(asDBObject(asDBKey(expr, 0), asDBObject("$exists", false)));
-            return asDBObject("$or", list);
-
-        } else if (op == Ops.LT) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$lt", asDBValue(expr, 1)));
-
-        } else if (op == Ops.GT) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$gt", asDBValue(expr, 1)));
-
-        } else if (op == Ops.LOE) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$lte", asDBValue(expr, 1)));
-
-        } else if (op == Ops.GOE) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$gte", asDBValue(expr, 1)));
-
-        } else if (op == Ops.IS_NULL) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$exists", false));
-
-        } else if (op == Ops.IS_NOT_NULL) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$exists", true));
-
-        } else if (op == Ops.CONTAINS_KEY) {
-            Path<?> path = (Path<?>) expr.getArg(0);
-            Expression<?> key = expr.getArg(1);
-            return asDBObject(visit(path, context) + "." + key.toString(), asDBObject("$exists", true));
-
-        } else if (op == MongodbOps.NEAR) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$near", asDBValue(expr, 1)));
-
-        } else if (op == MongodbOps.ELEM_MATCH) {
-            return asDBObject(asDBKey(expr, 0), asDBObject("$elemMatch", asDBValue(expr, 1)));
-        }
-
-        throw new UnsupportedOperationException("Illegal operation " + expr);
-    }
-
-    protected DBRef asReference(Operation<?> expr, int constIndex) {
-        return asReference(((Constant<?>)expr.getArg(constIndex)).getConstant());
-    }
-
-    protected DBRef asReference(Object constant) {
-        // override in subclass
-        throw new UnsupportedOperationException();
-    }
-
-    protected boolean isReference(Operation<?> expr, int exprIndex) {
-        Expression<?> arg = expr.getArg(exprIndex);
-        if (arg instanceof Path) {
-            return isReference((Path<?>) arg);
-        } else {
-            return false;
-        }
-    }
-
-    protected boolean isReference(Path<?> arg) {
-        // override in subclass
-        return false;
-    }
-
-
-    @Override
-    public String visit(Path<?> expr, Void context) {
-        PathMetadata<?> metadata = expr.getMetadata();
-        if (metadata.getParent() != null) {
-            if (metadata.getPathType() == PathType.COLLECTION_ANY) {
-                return visit(metadata.getParent(), context);
-            } else if (metadata.getParent().getMetadata().getPathType() != PathType.VARIABLE) {
-                String rv = getKeyForPath(expr, metadata);
-                return visit(metadata.getParent(), context) + "." + rv;
-            }
-        }
-        return getKeyForPath(expr, metadata);
-    }
-
-    protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
-        if (expr.getType().equals(ObjectId.class)) {
-            return "_id";
-        } else {
-            return metadata.getElement().toString();
-        }
-    }
-
-    @Override
-    public Object visit(SubQueryExpression<?> expr, Void context) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object visit(ParamExpression<?> expr, Void context) {
-        throw new UnsupportedOperationException();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/Point.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/Point.java
deleted file mode 100644
index 82ba097768..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/Point.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.ArrayPath;
-
-/**
- * Point is an adapter type for Double[] arrays to use geo spatial querying features of Mongodb
- *
- * @author tiwe
- *
- */
-public class Point extends ArrayPath<Double[], Double> {
-
-    private static final long serialVersionUID = 1776628530121566388L;
-
-    public Point(String variable) {
-        super(Double[].class, variable);
-    }
-
-    public Point(Path<?> parent, String property) {
-        super(Double[].class, parent, property);
-    }
-
-    public Point(PathMetadata<?> metadata) {
-        super(Double[].class, metadata);
-    }
-
-    /**
-     * Finds the closest points relative to the given location and orders the results with decreasing promimity
-     *
-     * @param latVal latitude
-     * @param longVal longitude
-     * @return
-     */
-    public BooleanExpression near(double latVal, double longVal) {
-        return MongodbExpressions.near(this, latVal, longVal);
-    }
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java
deleted file mode 100644
index be3186bf83..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.morphia;
-
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
-import org.mongodb.morphia.mapping.cache.DefaultEntityCache;
-import org.mongodb.morphia.mapping.cache.EntityCache;
-
-import com.google.common.base.Function;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mysema.query.mongodb.MongodbQuery;
-import com.mysema.query.types.EntityPath;
-
-/**
- * MorphiaQuery extends {@link MongodbQuery} with Morphia specific transformations
- *
- * @author laimw
- * @author tiwe
- *
- */
-public final class MorphiaQuery<K> extends MongodbQuery<K> {
-
-    private final EntityCache cache;
-
-    private final Datastore datastore;
-
-    public MorphiaQuery(Morphia morphia, Datastore datastore, EntityPath<K> entityPath) {
-        this(morphia, datastore, new DefaultEntityCache(), entityPath);
-    }
-
-    public MorphiaQuery(final Morphia morphia, final Datastore datastore,
-            final EntityCache cache, final EntityPath<K> entityPath) {
-        super(datastore.getCollection(entityPath.getType()), new Function<DBObject, K>() {
-            @Override
-            public K apply(DBObject dbObject) {
-                return morphia.fromDBObject(entityPath.getType(), dbObject, cache);
-            }
-        }, new MorphiaSerializer(morphia));
-        this.datastore = datastore;
-        this.cache = cache;
-    }
-
-    @Override
-    protected DBCursor createCursor() {
-        cache.flush();
-        return super.createCursor();
-    }
-
-    @Override
-    protected DBCollection getCollection(Class<?> type) {
-        return datastore.getCollection(type);
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaSerializer.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaSerializer.java
deleted file mode 100644
index 633d034688..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaSerializer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.morphia;
-
-import org.mongodb.morphia.Key;
-import org.mongodb.morphia.Morphia;
-import org.mongodb.morphia.annotations.Property;
-import org.mongodb.morphia.annotations.Reference;
-
-import com.mongodb.DBRef;
-import com.mysema.query.mongodb.MongodbSerializer;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathType;
-
-/**
- * MorphiaSerializer extends {@link MongodbSerializer} with Morphia specific annotation handling
- *
- * @author tiwe
- *
- */
-public class MorphiaSerializer extends MongodbSerializer {
-
-    private final Morphia morphia;
-
-    public MorphiaSerializer(Morphia morphia) {
-        this.morphia = morphia;
-    }
-
-    @Override
-    protected String getKeyForPath(Path<?> expr, PathMetadata<?> metadata) {
-        if (metadata.getPathType() == PathType.PROPERTY && expr.getAnnotatedElement().isAnnotationPresent(Property.class)) {
-            return expr.getAnnotatedElement().getAnnotation(Property.class).value();
-        } else {
-            return super.getKeyForPath(expr, metadata);
-        }
-    }
-
-    @Override
-    protected boolean isReference(Path<?> arg) {
-        return arg.getAnnotatedElement().getAnnotation(Reference.class) != null;
-    }
-
-    @Override
-    protected DBRef asReference(Object constant) {
-        Key<?> key = morphia.getMapper().getKey(constant);
-        return morphia.getMapper().keyToRef(key);
-    }
-
-}
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/package-info.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/package-info.java
deleted file mode 100644
index 55170f6ec0..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.mongodb.morphia;
diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/package-info.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/package-info.java
deleted file mode 100644
index 78e059447b..0000000000
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.mongodb;
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
new file mode 100644
index 0000000000..4b082a9d1f
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.function.Function;
+import com.mongodb.*;
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.CollectionPathBase;
+
+/**
+ * {@code AbstractMongodbQuery} provides a base class for general Querydsl query implementation with a
+ * pluggable DBObject to Bean transformation
+ *
+ * @author laimw
+ *
+ * @param <K> result type
+ * @param <Q> concrete subtype
+ */
+public abstract class AbstractMongodbQuery<K, Q extends AbstractMongodbQuery<K, Q>> implements SimpleQuery<Q>, Fetchable<K> {
+
+    @SuppressWarnings("serial")
+    private static class NoResults extends RuntimeException { }
+
+    private final MongodbSerializer serializer;
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final DBCollection collection;
+
+    private final Function<DBObject, K> transformer;
+
+    private ReadPreference readPreference;
+
+    /**
+     * Create a new MongodbQuery instance
+     *
+     * @param collection collection
+     * @param transformer result transformer
+     * @param serializer serializer
+     */
+    @SuppressWarnings("unchecked")
+    public AbstractMongodbQuery(DBCollection collection, Function<DBObject, K> transformer, MongodbSerializer serializer) {
+        @SuppressWarnings("unchecked") // Q is this plus subclass
+        Q query = (Q) this;
+        this.queryMixin = new QueryMixin<Q>(query, new DefaultQueryMetadata(), false);
+        this.transformer = transformer;
+        this.collection = collection;
+        this.serializer = serializer;
+    }
+
+    /**
+     * Define a join
+     *
+     * @param ref reference
+     * @param target join target
+     * @return join builder
+     */
+    public <T> JoinBuilder<Q, K,T> join(Path<T> ref, Path<T> target) {
+        return new JoinBuilder<Q, K,T>(queryMixin, ref, target);
+    }
+
+    /**
+     * Define a join
+     *
+     * @param ref reference
+     * @param target join target
+     * @return join builder
+     */
+    public <T> JoinBuilder<Q, K,T> join(CollectionPathBase<?,T,?> ref, Path<T> target) {
+        return new JoinBuilder<Q, K,T>(queryMixin, ref, target);
+    }
+
+    /**
+     * Define a constraint for an embedded object
+     *
+     * @param collection collection
+     * @param target target
+     * @return builder
+     */
+    public <T> AnyEmbeddedBuilder<Q, K> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
+        return new AnyEmbeddedBuilder<Q, K>(queryMixin, collection);
+    }
+
+    protected abstract DBCollection getCollection(Class<?> type);
+
+    @Nullable
+    protected Predicate createFilter(QueryMetadata metadata) {
+        Predicate filter;
+        if (!metadata.getJoins().isEmpty()) {
+            filter = ExpressionUtils.allOf(metadata.getWhere(), createJoinFilter(metadata));
+        } else {
+            filter = metadata.getWhere();
+        }
+        return filter;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    protected Predicate createJoinFilter(QueryMetadata metadata) {
+        Map<Expression<?>, Predicate> predicates = new HashMap<>();
+        List<JoinExpression> joins = metadata.getJoins();
+        for (int i = joins.size() - 1; i >= 0; i--) {
+            JoinExpression join = joins.get(i);
+            Path<?> source = (Path) ((Operation<?>) join.getTarget()).getArg(0);
+            Path<?> target = (Path) ((Operation<?>) join.getTarget()).getArg(1);
+
+            final Predicate extraFilters = predicates.get(target.getRoot());
+            Predicate filter = ExpressionUtils.allOf(join.getCondition(), extraFilters);
+            List<? extends Object> ids = getIds(target.getType(), filter);
+            if (ids.isEmpty()) {
+                throw new NoResults();
+            }
+            Path<?> path = ExpressionUtils.path(String.class, source, "$id");
+            predicates.merge(source.getRoot(),  ExpressionUtils.in((Path<Object>) path, ids), ExpressionUtils::and);
+        }
+        Path<?> source = (Path) ((Operation) joins.get(0).getTarget()).getArg(0);
+        return predicates.get(source.getRoot());
+    }
+
+    protected List<Object> getIds(Class<?> targetType, Predicate condition) {
+        DBCollection collection = getCollection(targetType);
+        // TODO : fetch only ids
+        DBCursor cursor = createCursor(collection, condition, null,
+                QueryModifiers.EMPTY, Collections.<OrderSpecifier<?>>emptyList());
+        if (cursor.hasNext()) {
+            List<Object> ids = new ArrayList<Object>(cursor.count());
+            for (DBObject obj : cursor) {
+                ids.add(obj.get("_id"));
+            }
+            return ids;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public Q distinct() {
+        return queryMixin.distinct();
+    }
+
+    public Q where(Predicate e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public <T> Q set(ParamExpression<T> param, T value) {
+        return queryMixin.set(param, value);
+    }
+
+    /**
+     * Iterate with the specific fields
+     *
+     * @param paths fields to return
+     * @return iterator
+     */
+    public CloseableIterator<K> iterate(Path<?>... paths) {
+        queryMixin.setProjection(paths);
+        return iterate();
+    }
+
+    @Override
+    public CloseableIterator<K> iterate() {
+        final DBCursor cursor = createCursor();
+        return new CloseableIterator<K>() {
+            @Override
+            public boolean hasNext() {
+                return cursor.hasNext();
+            }
+
+            @Override
+            public K next() {
+                return transformer.apply(cursor.next());
+            }
+
+            @Override
+            public void remove() {
+            }
+
+            @Override
+            public void close() {
+            }
+        };
+    }
+
+    /**
+     * Fetch with the specific fields
+     *
+     * @param paths fields to return
+     * @return results
+     */
+    public List<K> fetch(Path<?>... paths) {
+        queryMixin.setProjection(paths);
+        return fetch();
+    }
+
+    @Override
+    public List<K> fetch() {
+        try {
+            DBCursor cursor = createCursor();
+            List<K> results = new ArrayList<K>();
+            for (DBObject dbObject : cursor) {
+                results.add(transformer.apply(dbObject));
+            }
+            return results;
+        } catch (NoResults ex) {
+            return Collections.emptyList();
+        }
+    }
+
+    protected DBCursor createCursor() {
+        QueryMetadata metadata = queryMixin.getMetadata();
+        Predicate filter = createFilter(metadata);
+        return createCursor(collection, filter, metadata.getProjection(), metadata.getModifiers(), metadata.getOrderBy());
+    }
+
+    protected DBCursor createCursor(DBCollection collection, @Nullable Predicate where, Expression<?> projection,
+            QueryModifiers modifiers, List<OrderSpecifier<?>> orderBy) {
+        DBCursor cursor = collection.find(createQuery(where), createProjection(projection));
+        Integer limit = modifiers.getLimitAsInteger();
+        Integer offset = modifiers.getOffsetAsInteger();
+        if (limit != null) {
+            cursor.limit(limit);
+        }
+        if (offset != null) {
+            cursor.skip(offset);
+        }
+        if (orderBy.size() > 0) {
+            cursor.sort(serializer.toSort(orderBy));
+        }
+        if (readPreference != null) {
+            cursor.setReadPreference(readPreference);
+        }
+        return cursor;
+    }
+
+    private DBObject createProjection(Expression<?> projection) {
+        if (projection instanceof FactoryExpression) {
+            DBObject obj = new BasicDBObject();
+            for (Object expr : ((FactoryExpression) projection).getArgs()) {
+                if (expr instanceof Expression) {
+                    obj.put((String) serializer.handle((Expression) expr), 1);
+                }
+            }
+            return obj;
+        }
+        return null;
+    }
+
+    /**
+     * Fetch first with the specific fields
+     *
+     * @param paths fields to return
+     * @return first result
+     */
+    public K fetchFirst(Path<?>...paths) {
+        queryMixin.setProjection(paths);
+        return fetchFirst();
+    }
+
+    @Override
+    public K fetchFirst() {
+        try {
+            DBCursor c = createCursor().limit(1);
+            if (c.hasNext()) {
+                return transformer.apply(c.next());
+            } else {
+                return null;
+            }
+        } catch (NoResults ex) {
+            return null;
+        }
+    }
+
+    /**
+     * Fetch one with the specific fields
+     *
+     * @param paths fields to return
+     * @return first result
+     */
+    public K fetchOne(Path<?>... paths) {
+        queryMixin.setProjection(paths);
+        return fetchOne();
+    }
+
+    @Override
+    public K fetchOne() throws NonUniqueResultException {
+        try {
+            Long limit = queryMixin.getMetadata().getModifiers().getLimit();
+            if (limit == null) {
+                limit = 2L;
+            }
+            DBCursor c = createCursor().limit(limit.intValue());
+            if (c.hasNext()) {
+                K rv = transformer.apply(c.next());
+                if (c.hasNext()) {
+                    throw new NonUniqueResultException();
+                }
+                return rv;
+            } else {
+                return null;
+            }
+        } catch (NoResults ex) {
+            return null;
+        }
+    }
+
+    /**
+     * Fetch results with the specific fields
+     *
+     * @param paths fields to return
+     * @return results
+     */
+    public QueryResults<K> fetchResults(Path<?>... paths) {
+        queryMixin.setProjection(paths);
+        return fetchResults();
+    }
+
+    @Override
+    public QueryResults<K> fetchResults() {
+        try {
+            long total = fetchCount();
+            if (total > 0L) {
+                return new QueryResults<K>(fetch(), queryMixin.getMetadata().getModifiers(), total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } catch (NoResults ex) {
+            return QueryResults.emptyResults();
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        try {
+            Predicate filter = createFilter(queryMixin.getMetadata());
+            return collection.count(createQuery(filter));
+        } catch (NoResults ex) {
+            return 0L;
+        }
+    }
+
+    private DBObject createQuery(@Nullable Predicate predicate) {
+        if (predicate != null) {
+            return (DBObject) serializer.handle(predicate);
+        } else {
+            return new BasicDBObject();
+        }
+    }
+
+    /**
+     * Sets the read preference for this query
+     *
+     * @param readPreference read preference
+     */
+    public void setReadPreference(ReadPreference readPreference) {
+        this.readPreference = readPreference;
+    }
+
+    /**
+     * Get the where definition as a DBObject instance
+     *
+     * @return
+     */
+    public DBObject asDBObject() {
+        return createQuery(queryMixin.getMetadata().getWhere());
+    }
+
+    @Override
+    public String toString() {
+        return asDBObject().toString();
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AnyEmbeddedBuilder.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AnyEmbeddedBuilder.java
new file mode 100644
index 0000000000..a09df28223
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AnyEmbeddedBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import java.util.Collection;
+
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code AnyEmbeddedBuilder} is a builder for constraints on embedded objects
+ *
+ * @param <Q> query type
+ * @param <K> result type
+ *
+ * @author tiwe
+ */
+public class AnyEmbeddedBuilder<Q extends AbstractMongodbQuery<K, Q>, K> {
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final Path<? extends Collection<?>> collection;
+
+    public AnyEmbeddedBuilder(QueryMixin<Q> queryMixin,
+            Path<? extends Collection<?>> collection) {
+        this.queryMixin = queryMixin;
+        this.collection = collection;
+    }
+
+    public Q on(Predicate... conditions) {
+        return queryMixin.where(ExpressionUtils.predicate(
+                MongodbOps.ELEM_MATCH, collection, ExpressionUtils.allOf(conditions)));
+    }
+
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/JoinBuilder.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/JoinBuilder.java
new file mode 100644
index 0000000000..5d7d13e771
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/JoinBuilder.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code JoinBuilder} is a builder for join constraints
+ *
+ * @author tiwe
+ *
+ * @param <Q>
+ * @param <K>
+ * @param <T>
+ */
+public class JoinBuilder<Q extends AbstractMongodbQuery<K, Q>, K, T> {
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final Path<?> ref;
+
+    private final Path<T> target;
+
+    public JoinBuilder(QueryMixin<Q> queryMixin, Path<?> ref, Path<T> target) {
+        this.queryMixin = queryMixin;
+        this.ref = ref;
+        this.target = target;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q on(Predicate... conditions) {
+        queryMixin.addJoin(JoinType.JOIN, ExpressionUtils.as((Path) ref, target));
+        queryMixin.on(conditions);
+        return queryMixin.getSelf();
+    }
+
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java
new file mode 100644
index 0000000000..6025a3a771
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbExpressions.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.SimpleExpression;
+
+import java.util.Collection;
+
+/**
+ * Mongodb specific operations
+ *
+ * @author tiwe
+ * @author sangyong choi
+ */
+public final class MongodbExpressions {
+
+    private MongodbExpressions() { }
+
+    /**
+     * Finds the closest points relative to the given location and orders the results with decreasing proximity
+     *
+     * @param expr location
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public static BooleanExpression near(Expression<Double[]> expr, double latVal, double longVal) {
+        return Expressions.booleanOperation(MongodbOps.NEAR, expr, ConstantImpl.create(new Double[]{latVal, longVal}));
+    }
+
+    /**
+     * Finds the closest points relative to the given location on a sphere and orders the results with decreasing proximity
+     *
+     * @param expr location
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public static BooleanExpression nearSphere(Expression<Double[]> expr, double latVal, double longVal) {
+        return Expressions.booleanOperation(MongodbOps.NEAR_SPHERE, expr, ConstantImpl.create(new Double[]{latVal, longVal}));
+    }
+
+    /**
+     * Finds points within bounds of the rectangle
+     *
+     * @param blLatVal bottom left latitude
+     * @param blLongVal bottom left longitude
+     * @param urLatVal upper right latitude
+     * @param urLongVal upper right longitude
+     * @return predicate
+     */
+    public static BooleanExpression withinBox(Expression<Double[]> expr, double blLongVal, double blLatVal, double urLongVal, double urLatVal) {
+        return Expressions.booleanOperation(
+                MongodbOps.GEO_WITHIN_BOX,
+                expr,
+                ConstantImpl.create(new Double[]{blLongVal, blLatVal}),
+                ConstantImpl.create(new Double[]{urLongVal, urLatVal})
+        );
+    }
+
+    /**
+     * Finds documents whose geospatial data intersects
+     *
+     * @param expr location
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public static BooleanExpression geoIntersects(Expression<Double[]> expr, double latVal, double longVal) {
+        return Expressions.booleanOperation(MongodbOps.GEO_INTERSECTS, expr, ConstantImpl.create(new Double[]{latVal, longVal}));
+    }
+
+    /**
+     * Find documents where the value of a field is an array that contains all the specific elements.
+     *
+     * @param expr expression
+     * @param params params
+     */
+    public static <T, Q extends SimpleExpression<? super T>> BooleanExpression all(ListPath<T, Q> expr, Collection<T> params) {
+        return Expressions.booleanOperation(MongodbOps.ALL, expr, ConstantImpl.create(params));
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbOps.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbOps.java
new file mode 100644
index 0000000000..d80833dcf1
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbOps.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * MongoDB specific operators
+ *
+ * @author tiwe
+ * @author sangyong choi
+ */
+public enum MongodbOps implements Operator {
+    NEAR(Boolean.class),
+    GEO_WITHIN_BOX(Boolean.class),
+    ELEM_MATCH(Boolean.class),
+    NO_MATCH(Boolean.class),
+    NEAR_SPHERE(Boolean.class),
+    GEO_INTERSECTS(Boolean.class),
+    ALL(Boolean.class);
+
+    private final Class<?> type;
+
+    MongodbOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbSerializer.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbSerializer.java
new file mode 100644
index 0000000000..a2514b4bbc
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbSerializer.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.DBRef;
+import com.querydsl.core.types.*;
+import org.bson.BSONObject;
+import org.bson.types.ObjectId;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/**
+ * Serializes the given Querydsl query to a DBObject query for MongoDB
+ *
+ * @author laimw
+ * @author sangyong choi
+ */
+public abstract class MongodbSerializer implements Visitor<Object, Void> {
+
+    public Object handle(Expression<?> expression) {
+        return expression.accept(this, null);
+    }
+
+    public DBObject toSort(List<OrderSpecifier<?>> orderBys) {
+        BasicDBObject sort = new BasicDBObject();
+        for (OrderSpecifier<?> orderBy : orderBys) {
+            Object key = orderBy.getTarget().accept(this, null);
+            sort.append(key.toString(), orderBy.getOrder() == Order.ASC ? 1 : -1);
+        }
+        return sort;
+    }
+
+    @Override
+    public Object visit(Constant<?> expr, Void context) {
+        if (Enum.class.isAssignableFrom(expr.getType())) {
+            @SuppressWarnings("unchecked") //Guarded by previous check
+            Constant<? extends Enum<?>> expectedExpr = (Constant<? extends Enum<?>>) expr;
+            return expectedExpr.getConstant().name();
+        } else {
+            return expr.getConstant();
+        }
+    }
+
+    @Override
+    public Object visit(TemplateExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object visit(FactoryExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    protected String asDBKey(Operation<?> expr, int index) {
+        return (String) asDBValue(expr, index);
+    }
+
+    protected Object asDBValue(Operation<?> expr, int index) {
+        return expr.getArg(index).accept(this, null);
+    }
+
+    private String regexValue(Operation<?> expr, int index) {
+        return Pattern.quote(expr.getArg(index).accept(this, null).toString());
+    }
+
+    protected DBObject asDBObject(String key, Object value) {
+        return new BasicDBObject(key, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Object visit(Operation<?> expr, Void context) {
+        Operator op = expr.getOperator();
+        if (op == Ops.EQ) {
+            if (expr.getArg(0) instanceof Operation) {
+                Operation<?> lhs = (Operation<?>) expr.getArg(0);
+                if (lhs.getOperator() == Ops.COL_SIZE || lhs.getOperator() == Ops.ARRAY_SIZE) {
+                    return asDBObject(asDBKey(lhs, 0), asDBObject("$size", asDBValue(expr, 1)));
+                } else {
+                    throw new UnsupportedOperationException("Illegal operation " + expr);
+                }
+            } else if (expr.getArg(0) instanceof Path) {
+                Path<?> path = (Path<?>) expr.getArg(0);
+                Constant<?> constant = (Constant<?>) expr.getArg(1);
+                return asDBObject(asDBKey(expr, 0), convert(path, constant));
+            }
+        } else if (op == Ops.STRING_IS_EMPTY) {
+            return asDBObject(asDBKey(expr, 0), "");
+
+        } else if (op == Ops.AND) {
+            BSONObject lhs = (BSONObject) handle(expr.getArg(0));
+            BSONObject rhs = (BSONObject) handle(expr.getArg(1));
+            if (lhs.keySet().stream().noneMatch(rhs.keySet()::contains)) {
+                lhs.putAll(rhs);
+                return lhs;
+            } else {
+                BasicDBList list = new BasicDBList();
+                list.add(handle(expr.getArg(0)));
+                list.add(handle(expr.getArg(1)));
+                return asDBObject("$and", list);
+            }
+
+        } else if (op == Ops.NOT) {
+            //Handle the not's child
+            Operation<?> subOperation = (Operation<?>) expr.getArg(0);
+            Operator subOp = subOperation.getOperator();
+            if (subOp == Ops.IN) {
+                return visit(ExpressionUtils.operation(Boolean.class, Ops.NOT_IN, subOperation.getArg(0),
+                        subOperation.getArg(1)), context);
+            } else {
+                BasicDBObject arg = (BasicDBObject) handle(expr.getArg(0));
+                return negate(arg);
+            }
+
+        } else if (op == Ops.OR) {
+            BasicDBList list = new BasicDBList();
+            list.add(handle(expr.getArg(0)));
+            list.add(handle(expr.getArg(1)));
+            return asDBObject("$or", list);
+
+        } else if (op == Ops.NE) {
+            Path<?> path = (Path<?>) expr.getArg(0);
+            Constant<?> constant = (Constant<?>) expr.getArg(1);
+            return asDBObject(asDBKey(expr, 0), asDBObject("$ne", convert(path, constant)));
+
+        } else if (op == Ops.STARTS_WITH) {
+            return asDBObject(asDBKey(expr, 0),
+                    Pattern.compile("^" + regexValue(expr, 1)));
+
+        } else if (op == Ops.STARTS_WITH_IC) {
+            return asDBObject(asDBKey(expr, 0),
+                    Pattern.compile("^" + regexValue(expr, 1), Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.ENDS_WITH) {
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(regexValue(expr, 1) + "$"));
+
+        } else if (op == Ops.ENDS_WITH_IC) {
+            return asDBObject(asDBKey(expr, 0),
+                    Pattern.compile(regexValue(expr, 1) + "$", Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.EQ_IGNORE_CASE) {
+            return asDBObject(asDBKey(expr, 0),
+                    Pattern.compile("^" + regexValue(expr, 1) + "$", Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.STRING_CONTAINS) {
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(".*" + regexValue(expr, 1) + ".*"));
+
+        } else if (op == Ops.STRING_CONTAINS_IC) {
+            return asDBObject(asDBKey(expr, 0),
+                    Pattern.compile(".*" + regexValue(expr, 1) + ".*", Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.MATCHES) {
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(asDBValue(expr, 1).toString()));
+
+        } else if (op == Ops.MATCHES_IC) {
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(asDBValue(expr, 1).toString(), Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.LIKE) {
+            String regex = ExpressionUtils.likeToRegex((Expression) expr.getArg(1)).toString();
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(regex));
+
+        } else if (op == Ops.LIKE_IC) {
+            String regex = ExpressionUtils.likeToRegex((Expression) expr.getArg(1)).toString();
+            return asDBObject(asDBKey(expr, 0), Pattern.compile(regex, Pattern.CASE_INSENSITIVE));
+
+        } else if (op == Ops.BETWEEN) {
+            BasicDBObject value = new BasicDBObject("$gte", asDBValue(expr, 1));
+            value.append("$lte", asDBValue(expr, 2));
+            return asDBObject(asDBKey(expr, 0), value);
+
+        } else if (op == Ops.IN) {
+            int constIndex = 0;
+            int exprIndex = 1;
+            if (expr.getArg(1) instanceof Constant<?>) {
+                constIndex = 1;
+                exprIndex = 0;
+            }
+            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
+                @SuppressWarnings("unchecked") //guarded by previous check
+                Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
+                return asDBObject(asDBKey(expr, exprIndex), asDBObject("$in", values.toArray()));
+            } else {
+                Path<?> path = (Path<?>) expr.getArg(exprIndex);
+                Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
+                return asDBObject(asDBKey(expr, exprIndex), convert(path, constant));
+            }
+
+        } else if (op == Ops.NOT_IN) {
+            int constIndex = 0;
+            int exprIndex = 1;
+            if (expr.getArg(1) instanceof Constant<?>) {
+                constIndex = 1;
+                exprIndex = 0;
+            }
+            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
+                @SuppressWarnings("unchecked") //guarded by previous check
+                Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
+                return asDBObject(asDBKey(expr, exprIndex), asDBObject("$nin", values.toArray()));
+            } else {
+                Path<?> path = (Path<?>) expr.getArg(exprIndex);
+                Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
+                return asDBObject(asDBKey(expr, exprIndex), asDBObject("$ne", convert(path, constant)));
+            }
+
+        } else if (op == Ops.COL_IS_EMPTY) {
+            BasicDBList list = new BasicDBList();
+            list.add(asDBObject(asDBKey(expr, 0), new BasicDBList()));
+            list.add(asDBObject(asDBKey(expr, 0), asDBObject("$exists", false)));
+            return asDBObject("$or", list);
+
+        } else if (op == Ops.LT) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$lt", asDBValue(expr, 1)));
+
+        } else if (op == Ops.GT) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$gt", asDBValue(expr, 1)));
+
+        } else if (op == Ops.LOE) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$lte", asDBValue(expr, 1)));
+
+        } else if (op == Ops.GOE) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$gte", asDBValue(expr, 1)));
+
+        } else if (op == Ops.IS_NULL) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$exists", false));
+
+        } else if (op == Ops.IS_NOT_NULL) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$exists", true));
+
+        } else if (op == Ops.CONTAINS_KEY) {
+            Path<?> path = (Path<?>) expr.getArg(0);
+            Expression<?> key = expr.getArg(1);
+            return asDBObject(visit(path, context) + "." + key.toString(), asDBObject("$exists", true));
+
+        } else if (op == MongodbOps.NEAR) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$near", asDBValue(expr, 1)));
+
+        } else if (op == MongodbOps.GEO_WITHIN_BOX) {
+            return asDBObject(asDBKey(expr, 0), asDBObject(
+                    "$geoWithin",
+                    asDBObject("$box", Arrays.asList(asDBValue(expr, 1), asDBValue(expr, 2)))
+            ));
+
+        } else if (op == MongodbOps.NEAR_SPHERE) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$nearSphere", asDBValue(expr, 1)));
+
+        } else if (op == MongodbOps.GEO_INTERSECTS) {
+            return asDBObject(asDBKey(expr, 0), asDBObject(
+                    "$geoIntersects",
+                    asDBObject("$geometry", asDBValue(expr, 1))
+            ));
+        } else if (op == MongodbOps.ALL) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$all", asDBValue(expr, 1)));
+        } else if (op == MongodbOps.ELEM_MATCH) {
+            return asDBObject(asDBKey(expr, 0), asDBObject("$elemMatch", asDBValue(expr, 1)));
+        }
+
+        throw new UnsupportedOperationException("Illegal operation " + expr);
+    }
+
+    private Object negate(BasicDBObject arg) {
+        BasicDBList list = new BasicDBList();
+        for (Map.Entry<String, Object> entry : arg.entrySet()) {
+            if (entry.getKey().equals("$or")) {
+                list.add(asDBObject("$nor", entry.getValue()));
+
+            } else if (entry.getKey().equals("$and")) {
+                BasicDBList list2 = new BasicDBList();
+                for (Object o : ((BasicDBList) entry.getValue())) {
+                    list2.add(negate((BasicDBObject) o));
+                }
+                list.add(asDBObject("$or", list2));
+
+            } else if (entry.getValue() instanceof Pattern) {
+                list.add(asDBObject(entry.getKey(), asDBObject("$not", entry.getValue())));
+
+            } else if (entry.getValue() instanceof BasicDBObject) {
+                list.add(negate(entry.getKey(), (BasicDBObject) entry.getValue()));
+
+            } else {
+                list.add(asDBObject(entry.getKey(), asDBObject("$ne", entry.getValue())));
+            }
+        }
+        return list.size() == 1 ? list.get(0) : asDBObject("$or", list);
+    }
+
+    private Object negate(String key, BasicDBObject value) {
+        if (value.size() == 1) {
+            return asDBObject(key, asDBObject("$not", value));
+
+        } else {
+            BasicDBList list2 = new BasicDBList();
+            for (Map.Entry<String, Object> entry2 : value.entrySet()) {
+                list2.add(asDBObject(key,
+                        asDBObject("$not", asDBObject(entry2.getKey(), entry2.getValue()))));
+            }
+            return asDBObject("$or", list2);
+        }
+    }
+
+    protected Object convert(Path<?> property, Constant<?> constant) {
+        if (isReference(property)) {
+            return asReference(constant.getConstant());
+        } else if (isId(property)) {
+            if (isReference(property.getMetadata().getParent())) {
+                return asReferenceKey(property.getMetadata().getParent().getType(), constant.getConstant());
+            } else if (constant.getType().equals(String.class) && isImplicitObjectIdConversion()) {
+                String id = (String) constant.getConstant();
+                return ObjectId.isValid(id) ? new ObjectId(id) : id;
+            }
+        }
+        return visit(constant, null);
+    }
+
+    protected boolean isImplicitObjectIdConversion() {
+        return true;
+    }
+
+    protected DBRef asReferenceKey(Class<?> entity, Object id) {
+        // TODO override in subclass
+        throw new UnsupportedOperationException();
+    }
+
+    protected abstract DBRef asReference(Object constant);
+
+    protected abstract boolean isReference(Path<?> arg);
+
+    protected boolean isId(Path<?> arg) {
+        // TODO override in subclass
+        return false;
+    }
+
+    @Override
+    public String visit(Path<?> expr, Void context) {
+        PathMetadata metadata = expr.getMetadata();
+        if (metadata.getParent() != null) {
+            Path<?> parent = metadata.getParent();
+            if (parent.getMetadata().getPathType() == PathType.DELEGATE) {
+                parent = parent.getMetadata().getParent();
+            }
+            if (metadata.getPathType() == PathType.COLLECTION_ANY) {
+                return visit(parent, context);
+            } else if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
+                String rv = getKeyForPath(expr, metadata);
+                String parentStr = visit(parent, context);
+                return rv != null ? parentStr + "." + rv : parentStr;
+            }
+        }
+        return getKeyForPath(expr, metadata);
+    }
+
+    protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
+        return metadata.getElement().toString();
+    }
+
+    @Override
+    public Object visit(SubQueryExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object visit(ParamExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java
new file mode 100644
index 0000000000..0263e326c9
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/Point.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.ArrayPath;
+import com.querydsl.core.types.dsl.BooleanExpression;
+
+/**
+ * {@code Point} is an adapter type for Double[] arrays to use geo spatial querying features of Mongodb
+ *
+ * @author tiwe
+ *
+ */
+public class Point extends ArrayPath<Double[], Double> {
+
+    private static final long serialVersionUID = 1776628530121566388L;
+
+    public Point(String variable) {
+        super(Double[].class, variable);
+    }
+
+    public Point(Path<?> parent, String property) {
+        super(Double[].class, parent, property);
+    }
+
+    public Point(PathMetadata metadata) {
+        super(Double[].class, metadata);
+    }
+
+    /**
+     * Finds the closest points relative to the given location and orders the results with decreasing proximity
+     *
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public BooleanExpression near(double latVal, double longVal) {
+        return MongodbExpressions.near(this, latVal, longVal);
+    }
+
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java
new file mode 100644
index 0000000000..590760e7d9
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import org.bson.Document;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * {@link Fetchable} Mongodb query with a pluggable Document to Bean transformation.
+ *
+ * @param <K> result type
+ * @param <Q> concrete subtype
+ * @author Mark Paluch
+ */
+public abstract class AbstractFetchableMongodbQuery<K, Q extends AbstractFetchableMongodbQuery<K, Q>>
+        extends AbstractMongodbQuery<Q> implements Fetchable<K> {
+
+    private final Function<Document, K> transformer;
+
+    private final MongoCollection<Document> collection;
+
+    /**
+     * Create a new MongodbQuery instance
+     * @param collection
+     * @param transformer result transformer
+     * @param serializer serializer
+     */
+    public AbstractFetchableMongodbQuery(MongoCollection<Document> collection, Function<Document, K> transformer, MongodbDocumentSerializer serializer) {
+        super(serializer);
+        this.transformer = transformer;
+        this.collection = collection;
+    }
+
+    /**
+     * Iterate with the specific fields
+     *
+     * @param paths fields to return
+     * @return iterator
+     */
+    public CloseableIterator<K> iterate(Path<?>... paths) {
+        getQueryMixin().setProjection(paths);
+        return iterate();
+    }
+
+    @Override
+    public CloseableIterator<K> iterate() {
+        FindIterable<Document> cursor = createCursor();
+        final MongoCursor<Document> iterator = cursor.iterator();
+
+        return new CloseableIterator<K>() {
+            @Override
+            public boolean hasNext() {
+                return iterator.hasNext();
+            }
+
+            @Override
+            public K next() {
+                return transformer.apply(iterator.next());
+            }
+
+            @Override
+            public void remove() {
+
+            }
+
+            @Override
+            public void close() {
+                iterator.close();
+            }
+        };
+    }
+
+    /**
+     * Fetch with the specific fields
+     *
+     * @param paths fields to return
+     * @return results
+     */
+    public List<K> fetch(Path<?>... paths) {
+        getQueryMixin().setProjection(paths);
+        return fetch();
+    }
+
+    @Override
+    public List<K> fetch() {
+        try {
+            FindIterable<Document> cursor = createCursor();
+            List<K> results = new ArrayList<K>();
+            for (Document document : cursor) {
+                results.add(transformer.apply(document));
+            }
+            return results;
+        } catch (NoResults ex) {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * Fetch first with the specific fields
+     *
+     * @param paths fields to return
+     * @return first result
+     */
+    public K fetchFirst(Path<?>... paths) {
+        getQueryMixin().setProjection(paths);
+        return fetchFirst();
+    }
+
+    @Override
+    public K fetchFirst() {
+        try {
+            FindIterable<Document> c = createCursor().limit(1);
+            MongoCursor<Document> iterator = c.iterator();
+            try {
+
+                if (iterator.hasNext()) {
+                    return transformer.apply(iterator.next());
+                } else {
+                    return null;
+                }
+            } finally {
+                iterator.close();
+            }
+        } catch (NoResults ex) {
+            return null;
+        }
+    }
+
+    /**
+     * Fetch one with the specific fields
+     *
+     * @param paths fields to return
+     * @return first result
+     */
+    public K fetchOne(Path<?>... paths) {
+        getQueryMixin().setProjection(paths);
+        return fetchOne();
+    }
+
+    @Override
+    public K fetchOne() {
+        try {
+            Long limit = getQueryMixin().getMetadata().getModifiers().getLimit();
+            if (limit == null) {
+                limit = 2L;
+            }
+
+            FindIterable<Document> c = createCursor().limit(limit.intValue());
+            MongoCursor<Document> iterator = c.iterator();
+            try {
+
+                if (iterator.hasNext()) {
+                K rv = transformer.apply(iterator.next());
+                if (iterator.hasNext()) {
+                    throw new NonUniqueResultException();
+                }
+                return rv;
+            } else {
+                return null;
+            }
+            } finally {
+                iterator.close();
+            }
+
+
+        } catch (NoResults ex) {
+            return null;
+        }
+    }
+
+    /**
+     * Fetch results with the specific fields
+     *
+     * @param paths fields to return
+     * @return results
+     */
+    public QueryResults<K> fetchResults(Path<?>... paths) {
+        getQueryMixin().setProjection(paths);
+        return fetchResults();
+    }
+
+    @Override
+    public QueryResults<K> fetchResults() {
+        try {
+            long total = fetchCount();
+            if (total > 0L) {
+                return new QueryResults<K>(fetch(), getQueryMixin().getMetadata().getModifiers(), total);
+            } else {
+                return QueryResults.emptyResults();
+            }
+        } catch (NoResults ex) {
+            return QueryResults.emptyResults();
+        }
+    }
+
+    @Override
+    public long fetchCount() {
+        try {
+            Predicate filter = createFilter(getQueryMixin().getMetadata());
+            return collection.count(createQuery(filter));
+        } catch (NoResults ex) {
+            return 0L;
+        }
+    }
+
+    protected FindIterable<Document> createCursor() {
+        QueryMetadata metadata = getQueryMixin().getMetadata();
+        Predicate filter = createFilter(metadata);
+        return createCursor(collection, filter, metadata.getProjection(), metadata.getModifiers(), metadata.getOrderBy());
+    }
+
+    protected FindIterable<Document> createCursor(MongoCollection<Document> collection, @Nullable Predicate where,
+                                                  Expression<?> projection, QueryModifiers modifiers, List<OrderSpecifier<?>> orderBy) {
+
+        ReadPreference readPreference = getReadPreference();
+        MongoCollection<Document> collectionToUse = readPreference != null ? collection
+                .withReadPreference(readPreference) : collection;
+        FindIterable<Document> cursor = collectionToUse.find(createQuery(where))
+                .projection(createProjection(projection));
+        Integer limit = modifiers.getLimitAsInteger();
+        Integer offset = modifiers.getOffsetAsInteger();
+
+        if (limit != null) {
+            cursor = cursor.limit(limit);
+        }
+        if (offset != null) {
+            cursor = cursor.skip(offset);
+        }
+        if (orderBy.size() > 0) {
+            cursor = cursor.sort(getSerializer().toSort(orderBy));
+        }
+        return cursor;
+    }
+
+    protected abstract MongoCollection<Document> getCollection(Class<?> type);
+
+    @Override
+    protected List<Object> getIds(Class<?> targetType, Predicate condition) {
+        MongoCollection<Document> collection = getCollection(targetType);
+        // TODO : fetch only ids
+        FindIterable<Document> cursor = createCursor(collection, condition, null,
+                QueryModifiers.EMPTY, Collections.<OrderSpecifier<?>>emptyList());
+
+        MongoCursor<Document> iterator = cursor.iterator();
+        try {
+
+            if (iterator.hasNext()) {
+                List<Object> ids = new ArrayList<Object>();
+                for (Document obj : cursor) {
+                    ids.add(obj.get("_id"));
+                }
+                return ids;
+            } else {
+                return Collections.emptyList();
+            }
+        } finally {
+           iterator.close();
+        }
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractMongodbQuery.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractMongodbQuery.java
new file mode 100644
index 0000000000..37fb636ab7
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractMongodbQuery.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.bson.Document;
+
+import com.mongodb.ReadPreference;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.SimpleQuery;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.CollectionPathBase;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code AbstractMongodbQuery} provides a base class for general Querydsl query implementation.
+ *
+ * @author Mark Paluch
+ *
+ * @param <Q> concrete subtype
+ */
+public abstract class AbstractMongodbQuery<Q extends AbstractMongodbQuery<Q>> implements SimpleQuery<Q> {
+
+    @SuppressWarnings("serial")
+    static class NoResults extends RuntimeException { }
+
+    private final MongodbDocumentSerializer serializer;
+
+    private final QueryMixin<Q> queryMixin;
+
+    private ReadPreference readPreference;
+
+    /**
+     * Create a new MongodbQuery instance
+     *
+     * @param serializer serializer
+     */
+    @SuppressWarnings("unchecked")
+    public AbstractMongodbQuery(MongodbDocumentSerializer serializer) {
+        @SuppressWarnings("unchecked") // Q is this plus subclass
+        Q query = (Q) this;
+        this.queryMixin = new QueryMixin<Q>(query, new DefaultQueryMetadata(), false);
+        this.serializer = serializer;
+    }
+
+    /**
+     * Define a join
+     *
+     * @param ref reference
+     * @param target join target
+     * @return join builder
+     */
+    public <T> JoinBuilder<Q, T> join(Path<T> ref, Path<T> target) {
+        return new JoinBuilder<Q, T>(queryMixin, ref, target);
+    }
+
+    /**
+     * Define a join
+     *
+     * @param ref reference
+     * @param target join target
+     * @return join builder
+     */
+    public <T> JoinBuilder<Q, T> join(CollectionPathBase<?,T,?> ref, Path<T> target) {
+        return new JoinBuilder<Q, T>(queryMixin, ref, target);
+    }
+
+    /**
+     * Define a constraint for an embedded object
+     *
+     * @param collection collection
+     * @param target target
+     * @return builder
+     */
+    public <T> AnyEmbeddedBuilder<Q> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
+        return new AnyEmbeddedBuilder<Q>(queryMixin, collection);
+    }
+
+    @Nullable
+    protected Predicate createFilter(QueryMetadata metadata) {
+        Predicate filter;
+        if (!metadata.getJoins().isEmpty()) {
+            filter = ExpressionUtils.allOf(metadata.getWhere(), createJoinFilter(metadata));
+        } else {
+            filter = metadata.getWhere();
+        }
+        return filter;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    protected Predicate createJoinFilter(QueryMetadata metadata) {
+        Map<Expression<?>, Predicate> predicates = new HashMap<>();
+        List<JoinExpression> joins = metadata.getJoins();
+        for (int i = joins.size() - 1; i >= 0; i--) {
+            JoinExpression join = joins.get(i);
+            Path<?> source = (Path) ((Operation<?>) join.getTarget()).getArg(0);
+            Path<?> target = (Path) ((Operation<?>) join.getTarget()).getArg(1);
+
+            final Predicate extraFilters = predicates.get(target.getRoot());
+            Predicate filter = ExpressionUtils.allOf(join.getCondition(), extraFilters);
+            List<? extends Object> ids = getIds(target.getType(), filter);
+            if (ids.isEmpty()) {
+                throw new NoResults();
+            }
+            Path<?> path = ExpressionUtils.path(String.class, source, "$id");
+            predicates.merge(source.getRoot(),  ExpressionUtils.in((Path<Object>) path, ids), ExpressionUtils::and);
+        }
+        Path<?> source = (Path) ((Operation) joins.get(0).getTarget()).getArg(0);
+        return predicates.get(source.getRoot());
+    }
+
+    private Predicate allOf(Collection<Predicate> predicates) {
+        return predicates != null ? ExpressionUtils.allOf(predicates) : null;
+    }
+
+    protected abstract List<Object> getIds(Class<?> targetType, Predicate condition);
+
+    @Override
+    public Q distinct() {
+        return queryMixin.distinct();
+    }
+
+    public Q where(Predicate e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q where(Predicate... e) {
+        return queryMixin.where(e);
+    }
+
+    @Override
+    public Q limit(long limit) {
+        return queryMixin.limit(limit);
+    }
+
+    @Override
+    public Q offset(long offset) {
+        return queryMixin.offset(offset);
+    }
+
+    @Override
+    public Q restrict(QueryModifiers modifiers) {
+        return queryMixin.restrict(modifiers);
+    }
+
+    public Q orderBy(OrderSpecifier<?> o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public Q orderBy(OrderSpecifier<?>... o) {
+        return queryMixin.orderBy(o);
+    }
+
+    @Override
+    public <T> Q set(ParamExpression<T> param, T value) {
+        return queryMixin.set(param, value);
+    }
+
+    protected Document createProjection(Expression<?> projection) {
+        if (projection instanceof FactoryExpression) {
+            Document obj = new Document();
+            for (Object expr : ((FactoryExpression) projection).getArgs()) {
+                if (expr instanceof Expression) {
+                    obj.put((String) serializer.handle((Expression) expr), 1);
+                }
+            }
+            return obj;
+        }
+        return null;
+    }
+
+
+    protected Document createQuery(@Nullable Predicate predicate) {
+        if (predicate != null) {
+            return (Document) serializer.handle(predicate);
+        } else {
+            return new Document();
+        }
+    }
+
+
+    /**
+     * Sets the read preference for this query
+     *
+     * @param readPreference read preference
+     */
+    public void setReadPreference(ReadPreference readPreference) {
+        this.readPreference = readPreference;
+    }
+
+    protected QueryMixin<Q> getQueryMixin() {
+        return queryMixin;
+    }
+
+    protected MongodbDocumentSerializer getSerializer() {
+        return serializer;
+    }
+
+    protected ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Get the where definition as a Document instance
+     *
+     * @return
+     */
+    public Document asDocument() {
+        return createQuery(queryMixin.getMetadata().getWhere());
+    }
+
+    @Override
+    public String toString() {
+        return asDocument().toString();
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AnyEmbeddedBuilder.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AnyEmbeddedBuilder.java
new file mode 100644
index 0000000000..a34eba6795
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AnyEmbeddedBuilder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import java.util.Collection;
+
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.mongodb.MongodbOps;
+
+/**
+ * {@code AnyEmbeddedBuilder} is a builder for constraints on embedded objects
+ *
+ * @param <Q> query type
+ *
+ * @author Mark Paluch
+ */
+public class AnyEmbeddedBuilder<Q extends AbstractMongodbQuery<Q>> {
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final Path<? extends Collection<?>> collection;
+
+    public AnyEmbeddedBuilder(QueryMixin<Q> queryMixin,
+            Path<? extends Collection<?>> collection) {
+        this.queryMixin = queryMixin;
+        this.collection = collection;
+    }
+
+    public Q on(Predicate... conditions) {
+        return queryMixin.where(ExpressionUtils.predicate(
+                MongodbOps.ELEM_MATCH, collection, ExpressionUtils.allOf(conditions)));
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/JoinBuilder.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/JoinBuilder.java
new file mode 100644
index 0000000000..8443203867
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/JoinBuilder.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import com.querydsl.core.JoinType;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+
+/**
+ * {@code JoinBuilder} is a builder for join constraints
+ *
+ * @author Mark Paluch
+ *
+ * @param <Q>
+ * @param <T>
+ */
+public class JoinBuilder<Q extends AbstractMongodbQuery<Q>, T> {
+
+    private final QueryMixin<Q> queryMixin;
+
+    private final Path<?> ref;
+
+    private final Path<T> target;
+
+    public JoinBuilder(QueryMixin<Q> queryMixin, Path<?> ref, Path<T> target) {
+        this.queryMixin = queryMixin;
+        this.ref = ref;
+        this.target = target;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Q on(Predicate... conditions) {
+        queryMixin.addJoin(JoinType.JOIN, ExpressionUtils.as((Path) ref, target));
+        queryMixin.on(conditions);
+        return queryMixin.getSelf();
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbDocumentSerializer.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbDocumentSerializer.java
new file mode 100644
index 0000000000..6cf373a32d
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbDocumentSerializer.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import com.mongodb.DBRef;
+import com.querydsl.core.types.*;
+import com.querydsl.mongodb.MongodbOps;
+import org.bson.BsonJavaScript;
+import org.bson.BsonRegularExpression;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+
+/**
+ * Serializes the given Querydsl query to a Document query for MongoDB.
+ *
+ * @author Mark Paluch
+ */
+public abstract class MongodbDocumentSerializer implements Visitor<Object, Void> {
+
+    public Object handle(Expression<?> expression) {
+        return expression.accept(this, null);
+    }
+
+    public Document toSort(List<OrderSpecifier<?>> orderBys) {
+        Document sort = new Document();
+        for (OrderSpecifier<?> orderBy : orderBys) {
+            Object key = orderBy.getTarget().accept(this, null);
+            sort.append(key.toString(), orderBy.getOrder() == Order.ASC ? 1 : -1);
+        }
+        return sort;
+    }
+
+    @Override
+    public Object visit(Constant<?> expr, Void context) {
+        if (Enum.class.isAssignableFrom(expr.getType())) {
+            @SuppressWarnings("unchecked") //Guarded by previous check
+                    Constant<? extends Enum<?>> expectedExpr = (Constant<? extends Enum<?>>) expr;
+            return expectedExpr.getConstant().name();
+        } else {
+            return expr.getConstant();
+        }
+    }
+
+    @Override
+    public Object visit(TemplateExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object visit(FactoryExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    protected String asDBKey(Operation<?> expr, int index) {
+        return (String) asDBValue(expr, index);
+    }
+
+    protected Object asDBValue(Operation<?> expr, int index) {
+        return expr.getArg(index).accept(this, null);
+    }
+
+    private String regexValue(Operation<?> expr, int index) {
+        return Pattern.quote(expr.getArg(index).accept(this, null).toString());
+    }
+
+    protected Document asDocument(String key, Object value) {
+        return new Document(key, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Object visit(Operation<?> expr, Void context) {
+        Operator op = expr.getOperator();
+        if (op == Ops.EQ) {
+            if (expr.getArg(0) instanceof Operation) {
+                Operation<?> lhs = (Operation<?>) expr.getArg(0);
+                if (lhs.getOperator() == Ops.COL_SIZE || lhs.getOperator() == Ops.ARRAY_SIZE) {
+                    return asDocument(asDBKey(lhs, 0), asDocument("$size", asDBValue(expr, 1)));
+                } else {
+                    throw new UnsupportedOperationException("Illegal operation " + expr);
+                }
+            } else if (expr.getArg(0) instanceof Path) {
+                Path<?> path = (Path<?>) expr.getArg(0);
+                Constant<?> constant = (Constant<?>) expr.getArg(1);
+                return asDocument(asDBKey(expr, 0), convert(path, constant));
+            }
+        } else if (op == Ops.STRING_IS_EMPTY) {
+            return asDocument(asDBKey(expr, 0), "");
+
+        } else if (op == Ops.AND) {
+            Queue<Map<Object, Object>> pendingDocuments = collectConnectorArgs("$and", expr);
+            List<Map<Object, Object>> unmergeableDocuments = new ArrayList<Map<Object, Object>>();
+            List<Map<Object, Object>> generatedDocuments = new ArrayList<Map<Object, Object>>();
+
+            while (!pendingDocuments.isEmpty()) {
+
+                Map<Object, Object> lhs = pendingDocuments.poll();
+
+                for (Map<Object, Object> rhs : pendingDocuments) {
+                    Set<Object> lhs2 = new LinkedHashSet<Object>(lhs.keySet());
+                    lhs2.retainAll(rhs.keySet());
+                    if (lhs2.isEmpty()) {
+                        lhs.putAll(rhs);
+                    } else {
+                        unmergeableDocuments.add(rhs);
+                    }
+                }
+
+                generatedDocuments.add(lhs);
+                pendingDocuments = new LinkedList<Map<Object, Object>>(unmergeableDocuments);
+                unmergeableDocuments = new LinkedList<Map<Object, Object>>();
+            }
+
+            return generatedDocuments.size() == 1 ? generatedDocuments.get(0) : asDocument("$and", generatedDocuments);
+        } else if (op == Ops.NOT) {
+            //Handle the not's child
+            Operation<?> subOperation = (Operation<?>) expr.getArg(0);
+            Operator subOp = subOperation.getOperator();
+            if (subOp == Ops.IN) {
+                return visit(ExpressionUtils.operation(Boolean.class, Ops.NOT_IN, subOperation.getArg(0),
+                        subOperation.getArg(1)), context);
+            } else {
+                Document arg = (Document) handle(expr.getArg(0));
+                return negate(arg);
+            }
+
+        } else if (op == Ops.OR) {
+            return asDocument("$or", collectConnectorArgs("$or", expr));
+
+        } else if (op == Ops.NE) {
+            Path<?> path = (Path<?>) expr.getArg(0);
+            Constant<?> constant = (Constant<?>) expr.getArg(1);
+            return asDocument(asDBKey(expr, 0), asDocument("$ne", convert(path, constant)));
+
+        } else if (op == Ops.STARTS_WITH) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1)));
+
+        } else if (op == Ops.STARTS_WITH_IC) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1), "i"));
+
+        } else if (op == Ops.ENDS_WITH) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regexValue(expr, 1) + "$"));
+
+        } else if (op == Ops.ENDS_WITH_IC) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regexValue(expr, 1) + "$", "i"));
+
+        } else if (op == Ops.EQ_IGNORE_CASE) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1) + "$", "i"));
+
+        } else if (op == Ops.STRING_CONTAINS) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(".*" + regexValue(expr, 1) + ".*"));
+
+        } else if (op == Ops.STRING_CONTAINS_IC) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(".*" + regexValue(expr, 1) + ".*", "i"));
+
+        } else if (op == Ops.MATCHES) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(asDBValue(expr, 1).toString()));
+
+        } else if (op == Ops.MATCHES_IC) {
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(asDBValue(expr, 1).toString(), "i"));
+
+        } else if (op == Ops.LIKE) {
+            String regex = ExpressionUtils.likeToRegex((Expression) expr.getArg(1)).toString();
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regex));
+
+        } else if (op == Ops.LIKE_IC) {
+            String regex = ExpressionUtils.likeToRegex((Expression) expr.getArg(1)).toString();
+            return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regex, "i"));
+
+        } else if (op == Ops.BETWEEN) {
+            Document value = new Document("$gte", asDBValue(expr, 1));
+            value.append("$lte", asDBValue(expr, 2));
+            return asDocument(asDBKey(expr, 0), value);
+
+        } else if (op == Ops.IN) {
+            int constIndex = 0;
+            int exprIndex = 1;
+            if (expr.getArg(1) instanceof Constant<?>) {
+                constIndex = 1;
+                exprIndex = 0;
+            }
+            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
+                @SuppressWarnings("unchecked") //guarded by previous check
+                Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
+                return asDocument(asDBKey(expr, exprIndex), asDocument("$in", values));
+            } else {
+                Path<?> path = (Path<?>) expr.getArg(exprIndex);
+                Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
+                return asDocument(asDBKey(expr, exprIndex), convert(path, constant));
+            }
+
+        } else if (op == Ops.NOT_IN) {
+            int constIndex = 0;
+            int exprIndex = 1;
+            if (expr.getArg(1) instanceof Constant<?>) {
+                constIndex = 1;
+                exprIndex = 0;
+            }
+            if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
+                @SuppressWarnings("unchecked") //guarded by previous check
+                Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
+                return asDocument(asDBKey(expr, exprIndex), asDocument("$nin", values));
+            } else {
+                Path<?> path = (Path<?>) expr.getArg(exprIndex);
+                Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
+                return asDocument(asDBKey(expr, exprIndex), asDocument("$ne", convert(path, constant)));
+            }
+
+        } else if (op == Ops.COL_IS_EMPTY) {
+            List<Object> list = new ArrayList<Object>(2);
+            list.add(asDocument(asDBKey(expr, 0), new ArrayList<Object>()));
+            list.add(asDocument(asDBKey(expr, 0), asDocument("$exists", false)));
+            return asDocument("$or", list);
+
+        } else if (op == Ops.LT) {
+            return asDocument(asDBKey(expr, 0), asDocument("$lt", asDBValue(expr, 1)));
+
+        } else if (op == Ops.GT) {
+            return asDocument(asDBKey(expr, 0), asDocument("$gt", asDBValue(expr, 1)));
+
+        } else if (op == Ops.LOE) {
+            return asDocument(asDBKey(expr, 0), asDocument("$lte", asDBValue(expr, 1)));
+
+        } else if (op == Ops.GOE) {
+            return asDocument(asDBKey(expr, 0), asDocument("$gte", asDBValue(expr, 1)));
+
+        } else if (op == Ops.IS_NULL) {
+            return asDocument(asDBKey(expr, 0), asDocument("$exists", false));
+
+        } else if (op == Ops.IS_NOT_NULL) {
+            return asDocument(asDBKey(expr, 0), asDocument("$exists", true));
+
+        } else if (op == Ops.CONTAINS_KEY) {
+            Path<?> path = (Path<?>) expr.getArg(0);
+            Expression<?> key = expr.getArg(1);
+            return asDocument(visit(path, context) + "." + key.toString(), asDocument("$exists", true));
+
+        } else if (op == MongodbOps.NEAR) {
+            return asDocument(asDBKey(expr, 0), asDocument("$near", asDBValue(expr, 1)));
+
+        } else if (op == MongodbOps.NEAR_SPHERE) {
+            return asDocument(asDBKey(expr, 0), asDocument("$nearSphere", asDBValue(expr, 1)));
+
+        } else if (op == MongodbOps.ELEM_MATCH) {
+            return asDocument(asDBKey(expr, 0), asDocument("$elemMatch", asDBValue(expr, 1)));
+        } else if (op == MongodbOps.NO_MATCH) {
+            return new Document("$where", new BsonJavaScript("function() { return false }"));
+        }
+
+        throw new UnsupportedOperationException("Illegal operation " + expr);
+    }
+
+    private Object negate(Document arg) {
+        List<Object> list = new ArrayList<Object>();
+        for (Map.Entry<String, Object> entry : arg.entrySet()) {
+            if (entry.getKey().equals("$or")) {
+                list.add(asDocument("$nor", entry.getValue()));
+
+            } else if (entry.getKey().equals("$and")) {
+                List<Object> list2 = new ArrayList<Object>();
+                for (Object o : ((Collection) entry.getValue())) {
+                    list2.add(negate((Document) o));
+                }
+                list.add(asDocument("$or", list2));
+
+            } else if (entry.getValue() instanceof Pattern || entry.getValue() instanceof BsonRegularExpression) {
+                list.add(asDocument(entry.getKey(), asDocument("$not", entry.getValue())));
+
+            } else if (entry.getValue() instanceof Document) {
+                list.add(negate(entry.getKey(), (Document) entry.getValue()));
+
+            } else {
+                list.add(asDocument(entry.getKey(), asDocument("$ne", entry.getValue())));
+            }
+        }
+        return list.size() == 1 ? list.get(0) : asDocument("$or", list);
+    }
+
+    private Object negate(String key, Document value) {
+        if (value.size() == 1) {
+            return asDocument(key, asDocument("$not", value));
+
+        } else {
+            List<Object> list2 = new ArrayList<Object>();
+            for (Map.Entry<String, Object> entry2 : value.entrySet()) {
+                list2.add(asDocument(key,
+                        asDocument("$not", asDocument(entry2.getKey(), entry2.getValue()))));
+            }
+            return asDocument("$or", list2);
+        }
+    }
+
+    protected Object convert(Path<?> property, Constant<?> constant) {
+        if (isReference(property)) {
+            return asReference(constant.getConstant());
+        } else if (isId(property)) {
+            if (isReference(property.getMetadata().getParent())) {
+                return asReferenceKey(property.getMetadata().getParent().getType(), constant.getConstant());
+            } else if (constant.getType().equals(String.class) && isImplicitObjectIdConversion()) {
+                String id = (String) constant.getConstant();
+                return ObjectId.isValid(id) ? new ObjectId(id) : id;
+            }
+        }
+        return visit(constant, null);
+    }
+
+    protected boolean isImplicitObjectIdConversion() {
+        return true;
+    }
+
+    protected DBRef asReferenceKey(Class<?> entity, Object id) {
+        // TODO override in subclass
+        throw new UnsupportedOperationException();
+    }
+
+    protected abstract DBRef asReference(Object constant);
+
+    protected abstract boolean isReference(Path<?> arg);
+
+    protected boolean isId(Path<?> arg) {
+        // TODO override in subclass
+        return false;
+    }
+
+    @Override
+    public String visit(Path<?> expr, Void context) {
+        PathMetadata metadata = expr.getMetadata();
+        if (metadata.getParent() != null) {
+            Path<?> parent = metadata.getParent();
+            if (parent.getMetadata().getPathType() == PathType.DELEGATE) {
+                parent = parent.getMetadata().getParent();
+            }
+            if (metadata.getPathType() == PathType.COLLECTION_ANY) {
+                return visit(parent, context);
+            } else if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
+                String rv = getKeyForPath(expr, metadata);
+                String parentStr = visit(parent, context);
+                return rv != null ? parentStr + "." + rv : parentStr;
+            }
+        }
+        return getKeyForPath(expr, metadata);
+    }
+
+    protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
+        return metadata.getElement().toString();
+    }
+
+    @Override
+    public Object visit(SubQueryExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object visit(ParamExpression<?> expr, Void context) {
+        throw new UnsupportedOperationException();
+    }
+
+    private Queue<Map<Object, Object>> collectConnectorArgs(String operator, Operation<?> operation) {
+
+        Queue<Map<Object, Object>> pendingDocuments = new LinkedList<Map<Object, Object>>();
+        for (Expression<?> exp : operation.getArgs()) {
+            Map<Object, Object> document = (Map<Object, Object>) handle(exp);
+            if (document.keySet().size() == 1 && document.containsKey(operator)) {
+                pendingDocuments
+                        .addAll((Collection<Map<Object, Object>>) document.get(operator));
+            } else {
+                pendingDocuments.add(document);
+            }
+        }
+        return pendingDocuments;
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbExpressions.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbExpressions.java
new file mode 100644
index 0000000000..28ec72072c
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/MongodbExpressions.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import java.util.Arrays;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.mongodb.MongodbOps;
+
+/**
+ * Mongodb Document-API-specific operations.
+ *
+ * @author tiwe
+ * @author Mark Paluch
+ *
+ */
+public final class MongodbExpressions {
+
+    private MongodbExpressions() { }
+
+    /**
+     * Finds the closest points relative to the given location and orders the results with decreasing proximity
+     *
+     * @param expr location
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public static BooleanExpression near(Expression<Double[]> expr, double latVal, double longVal) {
+        return Expressions.booleanOperation(MongodbOps.NEAR, expr, ConstantImpl.create(Arrays.asList(latVal, longVal)));
+    }
+
+    /**
+     * Finds the closest points relative to the given location on a sphere and orders the results with decreasing proximity
+     *
+     * @param expr location
+     * @param latVal latitude
+     * @param longVal longitude
+     * @return predicate
+     */
+    public static BooleanExpression nearSphere(Expression<Double[]> expr, double latVal, double longVal) {
+        return Expressions.booleanOperation(MongodbOps.NEAR_SPHERE, expr, ConstantImpl.create(Arrays.asList(latVal, longVal)));
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/package-info.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/package-info.java
new file mode 100644
index 0000000000..62b25d0423
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * MongoDB Document API support.
+ */
+package com.querydsl.mongodb.document;
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaQuery.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaQuery.java
new file mode 100644
index 0000000000..8c9ec2c821
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaQuery.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.morphia;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.mongodb.AbstractMongodbQuery;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Morphia;
+import org.mongodb.morphia.mapping.cache.DefaultEntityCache;
+import org.mongodb.morphia.mapping.cache.EntityCache;
+
+import java.util.function.Function;
+
+/**
+ * {@code MorphiaQuery} extends {@link AbstractMongodbQuery} with Morphia specific transformations
+ *
+ * <p>Example</p>
+ *
+ * <pre>{@code
+ * QUser user = QUser.user;
+ * MorphiaQuery<User> query = new MorphiaQuery<User>(morphia, datastore, user);
+ * List<User> list = query
+ *     .where(user.firstName.eq("Bob"))
+ *     .fetch();
+ * }</pre>
+ *
+ * @param <K> result type
+ *
+ * @author laimw
+ * @author tiwe
+ *
+ */
+public class MorphiaQuery<K> extends AbstractMongodbQuery<K, MorphiaQuery<K>> {
+
+    private final EntityCache cache;
+
+    private final Datastore datastore;
+
+    public MorphiaQuery(Morphia morphia, Datastore datastore, EntityPath<K> entityPath) {
+        this(morphia, datastore, new DefaultEntityCache(), entityPath);
+    }
+
+    public MorphiaQuery(Morphia morphia, Datastore datastore, Class<? extends K> entityType) {
+        this(morphia, datastore, new DefaultEntityCache(), entityType);
+    }
+
+    public MorphiaQuery(Morphia morphia, Datastore datastore,
+            EntityCache cache, EntityPath<K> entityPath) {
+        this(morphia, datastore, cache, entityPath.getType());
+    }
+
+    public MorphiaQuery(final Morphia morphia, final Datastore datastore,
+                        final EntityCache cache, final Class<? extends K> entityType) {
+        super(datastore.getCollection(entityType), new Function<DBObject, K>() {
+            @Override
+            public K apply(DBObject dbObject) {
+                return morphia.fromDBObject(datastore, entityType, dbObject, cache);
+            }
+        }, new MorphiaSerializer(morphia));
+        this.datastore = datastore;
+        this.cache = cache;
+    }
+
+
+    @Override
+    protected DBCursor createCursor() {
+        cache.flush();
+        return super.createCursor();
+    }
+
+    @Override
+    protected DBCollection getCollection(Class<?> type) {
+        return datastore.getCollection(type);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaSerializer.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaSerializer.java
new file mode 100644
index 0000000000..803aec320e
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaSerializer.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.morphia;
+
+import java.lang.reflect.AnnotatedElement;
+
+import org.mongodb.morphia.Key;
+import org.mongodb.morphia.Morphia;
+import org.mongodb.morphia.annotations.Id;
+import org.mongodb.morphia.annotations.Property;
+import org.mongodb.morphia.annotations.Reference;
+import org.mongodb.morphia.mapping.Mapper;
+
+import com.mongodb.DBRef;
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.mongodb.MongodbSerializer;
+
+/**
+ * {@code MorphiaSerializer} extends {@link MongodbSerializer} with Morphia specific annotation handling
+ *
+ * @author tiwe
+ *
+ */
+public class MorphiaSerializer extends MongodbSerializer {
+
+    private final Morphia morphia;
+
+    public MorphiaSerializer(Morphia morphia) {
+        this.morphia = morphia;
+    }
+
+    @Override
+    public Object visit(Constant<?> expr, Void context) {
+        Object value = super.visit(expr, context);
+        return morphia.getMapper().toMongoObject(null, null, value);
+    }
+
+    @Override
+    protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
+        AnnotatedElement annotations = expr.getAnnotatedElement();
+        if (annotations.isAnnotationPresent(Id.class)) {
+            Path<?> parent = expr.getMetadata().getParent();
+            if (parent.getAnnotatedElement().isAnnotationPresent(Reference.class)) {
+                return null; // go to parent
+            } else {
+                return "_id";
+            }
+        } else if (annotations.isAnnotationPresent(Property.class)) {
+            Property property = annotations.getAnnotation(Property.class);
+            if (!property.value().equals(Mapper.IGNORED_FIELDNAME)) {
+                return property.value();
+            }
+        } else if (annotations.isAnnotationPresent(Reference.class)) {
+            Reference reference = annotations.getAnnotation(Reference.class);
+            if (!reference.value().equals(Mapper.IGNORED_FIELDNAME)) {
+                return reference.value();
+            }
+        }
+        return super.getKeyForPath(expr, metadata);
+    }
+
+    @Override
+    protected boolean isReference(Path<?> arg) {
+        return arg.getAnnotatedElement().isAnnotationPresent(Reference.class);
+    }
+
+    @Override
+    protected boolean isImplicitObjectIdConversion() {
+        // see https://github.com/mongodb/morphia/wiki/FrequentlyAskedQuestions
+        return false;
+    }
+
+    @Override
+    protected boolean isId(Path<?> arg) {
+        return arg.getAnnotatedElement().isAnnotationPresent(Id.class);
+    }
+
+    @Override
+    protected DBRef asReference(Object constant) {
+        Key<?> key = morphia.getMapper().getKey(constant);
+        return morphia.getMapper().keyToDBRef(key);
+    }
+
+    @Override
+    protected DBRef asReferenceKey(Class<?> entity, Object id) {
+        String collection = morphia.getMapper().getCollectionName(entity);
+        Key<?> key = new Key<Object>(entity, collection, id);
+        return morphia.getMapper().keyToDBRef(key);
+    }
+}
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/package-info.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/package-info.java
new file mode 100644
index 0000000000..43b5a2f4ed
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Morphia bindings
+ */
+package com.querydsl.mongodb.morphia;
diff --git a/querydsl-mongodb/src/main/java/com/querydsl/mongodb/package-info.java b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/package-info.java
new file mode 100644
index 0000000000..0204f2227f
--- /dev/null
+++ b/querydsl-mongodb/src/main/java/com/querydsl/mongodb/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * MongoDB support
+ */
+package com.querydsl.mongodb;
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/PackageVerification.java b/querydsl-mongodb/src/test/java/com/mysema/query/PackageVerification.java
deleted file mode 100644
index 587d5fe05d..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/PackageVerification.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.query.apt.morphia.MorphiaAnnotationProcessor;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.types.Expression;
-
-public class PackageVerification {
-    
-    @Test
-    public void Verify_Package() throws Exception{
-        String version = System.getProperty("version");
-        verify(new File("target/querydsl-mongodb-"+version+"-apt-one-jar.jar"));        
-    }
-
-    private void verify(File oneJar) throws Exception {
-        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
-        // verify classLoader
-        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
-        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
-        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
-        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
-        oneJarClassLoader.loadClass(Entity.class.getName()); // morphia        
-        Class cl = oneJarClassLoader.loadClass(MorphiaAnnotationProcessor.class.getName()); // querydsl-apt
-        cl.newInstance();
-        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
-        assertEquals(MorphiaAnnotationProcessor.class.getName(), Resources.toString(oneJarClassLoader.findResource(resourceKey), Charsets.UTF_8));
-    }
-    
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/GeoSpatialQueryTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/GeoSpatialQueryTest.java
deleted file mode 100644
index fa3d0c1f75..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/GeoSpatialQueryTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import static org.junit.Assert.assertEquals;
-
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import com.mysema.query.mongodb.domain.GeoEntity;
-import com.mysema.query.mongodb.domain.QGeoEntity;
-import com.mysema.query.mongodb.morphia.MorphiaQuery;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class GeoSpatialQueryTest {
-
-    private final String dbname = "geodb";
-    private final Mongo mongo;
-    private final Morphia morphia;
-    private final Datastore ds;
-    private final QGeoEntity geoEntity = new QGeoEntity("geoEntity");
-
-    public GeoSpatialQueryTest() throws UnknownHostException, MongoException {
-        mongo = new Mongo();
-        morphia = new Morphia().map(GeoEntity.class);
-        ds = morphia.createDatastore(mongo, dbname);
-    }
-
-    @Before
-    public void before() {
-        ds.delete(ds.createQuery(GeoEntity.class));
-        ds.getCollection(GeoEntity.class).ensureIndex(new BasicDBObject("location","2d"));;
-    }
-
-    @Test
-    public void Near() {
-        ds.save(new GeoEntity(10.0, 50.0));
-        ds.save(new GeoEntity(20.0, 50.0));
-        ds.save(new GeoEntity(30.0, 50.0));
-
-        List<GeoEntity> entities = query().where(geoEntity.location.near(50.0, 50.0)).list();
-        assertEquals(30.0, entities.get(0).getLocation()[0].doubleValue(), 0.1);
-        assertEquals(20.0, entities.get(1).getLocation()[0].doubleValue(), 0.1);
-        assertEquals(10.0, entities.get(2).getLocation()[0].doubleValue(), 0.1);
-    }
-
-    private MorphiaQuery<GeoEntity> query() {
-        return new MorphiaQuery<GeoEntity>(morphia, ds, geoEntity);
-    }
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java
deleted file mode 100644
index 295bf2d649..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.mysema.query.mongodb;
-
-import java.net.UnknownHostException;
-
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import com.mysema.query.mongodb.domain.Item;
-import com.mysema.query.mongodb.domain.QUser;
-import com.mysema.query.mongodb.domain.User;
-import com.mysema.query.mongodb.morphia.MorphiaQuery;
-import com.mysema.query.types.Predicate;
-import com.mysema.testutil.ExternalDB;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.*;
-
-@Category(ExternalDB.class)
-public class JoinTest {
-
-    private final Mongo mongo;
-    private final Morphia morphia;
-    private final Datastore ds;
-
-    private final String dbname = "testdb";
-    private final QUser user = QUser.user;
-    private final QUser friend = new QUser("friend");
-    private final QUser friend2 = new QUser("friend2");
-    private final QUser enemy = new QUser("enemy");
-
-    public JoinTest() throws UnknownHostException, MongoException {
-        mongo = new Mongo();
-        morphia = new Morphia().map(User.class).map(Item.class);
-        ds = morphia.createDatastore(mongo, dbname);
-    }
-
-    @Before
-    public void before() throws UnknownHostException, MongoException {
-        ds.delete(ds.createQuery(User.class));
-
-        User friend1 = new User("Max", null);
-        User friend2 = new User("Jack", null);
-        User friend3 = new User("Bob", null);
-        ds.save(friend1, friend2, friend3);
-
-        User user1 = new User("Jane", null, friend1);
-        User user2 = new User("Mary", null, user1);
-        User user3 = new User("Ann", null, friend3);
-        ds.save(user1, user2, user3);
-
-        User user4 = new User("Mike", null);
-        user4.setFriend(user2);
-        user4.setEnemy(user3);
-        ds.save(user4);
-
-        User user5 = new User("Bart", null);
-        user5.addFriend(user2);
-        user5.addFriend(user3);
-        ds.save(user5);
-
-    }
-
-    @Test
-    public void Count() {
-        assertEquals(1, where().join(user.friend(), friend).on(friend.firstName.eq("Max")).count());
-        assertEquals(1, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).count());
-        assertEquals(0, where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).count());
-        assertEquals(0, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).count());
-    }
-
-    @Test
-    public void Count_Collection() {
-        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Mary")).count());
-        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Ann")).count());
-        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Ann").or(friend.firstName.eq("Mary"))).count());
-        assertEquals(1, where(user.firstName.eq("Bart")).join(user.friends, friend).on(friend.firstName.eq("Mary")).count());
-        assertEquals(0, where().join(user.friends, friend).on(friend.firstName.eq("Max")).count());
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(where().join(user.friend(), friend).on(friend.firstName.eq("Max")).exists());
-        assertTrue(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).exists());
-        assertFalse(where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).exists());
-        assertFalse(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).exists());
-    }
-
-    @Test
-    public void Exists_Collection() {
-        assertTrue(where().join(user.friends, friend).on(friend.firstName.eq("Mary")).exists());
-        assertTrue(where(user.firstName.eq("Bart")).join(user.friends, friend).on(friend.firstName.eq("Mary")).exists());
-    }
-
-    @Test
-    public void List() {
-        assertEquals(1, where().join(user.friend(), friend).on(friend.firstName.eq("Max")).list().size());
-        assertEquals(1, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).list().size());
-        assertEquals(0, where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).list().size());
-        assertEquals(0, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).list().size());
-    }
-
-    public void List_Collection() {
-        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Mary")).list().size());
-    }
-
-    @Test
-    public void Single() {
-        assertEquals("Jane", where().join(user.friend(), friend).on(friend.firstName.eq("Max")).singleResult().getFirstName());
-        assertEquals("Jane", where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).singleResult().getFirstName());
-        assertNull(where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).singleResult());
-        assertNull(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).singleResult());
-    }
-
-    @Test
-    public void Single_Collection() {
-        assertEquals("Bart", where().join(user.friends, friend).on(friend.firstName.eq("Mary")).singleResult().getFirstName());
-    }
-
-    @Test
-    public void Double() {
-        assertEquals("Mike", where()
-                .join(user.friend(), friend).on(friend.firstName.isNotNull())
-                .join(user.enemy(), enemy).on(enemy.firstName.isNotNull())
-                .singleResult().getFirstName());
-    }
-
-    @Test
-    public void Double2() {
-        assertEquals("Mike", where()
-                .join(user.friend(), friend).on(friend.firstName.eq("Mary"))
-                .join(user.enemy(), enemy).on(enemy.firstName.eq("Ann"))
-                .singleResult().getFirstName());
-    }
-
-    @Test
-    public void Deep() {
-        // Mike -> Mary -> Jane
-        assertEquals("Mike", where()
-                .join(user.friend(), friend).on(friend.firstName.isNotNull())
-                .join(friend.friend(), friend2).on(friend2.firstName.eq("Jane"))
-                .singleResult().getFirstName());
-    }
-
-    private MongodbQuery<User> query() {
-        return new MorphiaQuery<User>(morphia, ds, user);
-    }
-
-    private MongodbQuery<User> where(Predicate ... e) {
-        return query().where(e);
-    }
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java
deleted file mode 100644
index ff12190127..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import java.net.UnknownHostException;
-import java.util.*;
-
-import com.google.common.collect.Lists;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import com.mongodb.ReadPreference;
-import com.mysema.query.NonUniqueResultException;
-import com.mysema.query.SearchResults;
-import com.mysema.query.mongodb.domain.*;
-import com.mysema.query.mongodb.domain.User.Gender;
-import com.mysema.query.mongodb.morphia.MorphiaQuery;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.testutil.ExternalDB;
-import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
-import static java.util.Arrays.asList;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.junit.Assert.*;
-
-@Category(ExternalDB.class)
-public class MongodbQueryTest {
-
-    private final Mongo mongo;
-    private final Morphia morphia;
-    private final Datastore ds;
-
-    private final String dbname = "testdb";
-    private final QUser user = QUser.user;
-    private final QItem item = QItem.item;
-    private final QAddress address = QAddress.address;
-    private final QMapEntity mapEntity = QMapEntity.mapEntity;
-    private final QDates dates = QDates.dates;
-
-    List<User> users = Lists.newArrayList();
-    User u1, u2, u3, u4;
-    City tampere, helsinki;
-
-    public MongodbQueryTest() throws UnknownHostException, MongoException {
-        mongo = new Mongo();
-        morphia = new Morphia().map(User.class).map(Item.class).map(MapEntity.class).map(Dates.class);
-        ds = morphia.createDatastore(mongo, dbname);
-    }
-
-    @Before
-    public void before() throws UnknownHostException, MongoException {
-        ds.delete(ds.createQuery(Item.class));
-        ds.delete(ds.createQuery(User.class));
-        ds.delete(ds.createQuery(MapEntity.class));
-
-        tampere = new City("Tampere", 61.30, 23.50);
-        helsinki= new City("Helsinki", 60.15, 20.03);
-
-        u1 = addUser("Jaakko", "Jantunen", 20, new Address("Aakatu", "00100", helsinki),
-                new Address("Aakatu1", "00100", helsinki),
-                new Address("Aakatu2", "00100", helsinki));
-        u2 = addUser("Jaakki", "Jantunen", 30, new Address("Beekatu", "00200", helsinki));
-        u3 = addUser("Jaana", "Aakkonen", 40, new Address("Ceekatu","00300", tampere));
-        u4 = addUser("Jaana", "BeekkoNen", 50, new Address("Deekatu","00400",tampere));
-    }
-
-    @Test
-    public void List_Keys() {
-        User u = where(user.firstName.eq("Jaakko")).list(user.firstName, user.mainAddress().street).get(0);
-        assertEquals("Jaakko", u.getFirstName());
-        assertNull(u.getLastName());
-        assertEquals("Aakatu", u.getMainAddress().street);
-        assertNull(u.getMainAddress().postCode);
-    }
-
-    @Test
-    public void SingleResult_Keys() {
-        User u = where(user.firstName.eq("Jaakko")).singleResult(user.firstName);
-        assertEquals("Jaakko", u.getFirstName());
-        assertNull(u.getLastName());
-    }
-
-    @Test
-    public void UniqueResult_Keys() {
-        User u = where(user.firstName.eq("Jaakko")).uniqueResult(user.firstName);
-        assertEquals("Jaakko", u.getFirstName());
-        assertNull(u.getLastName());
-    }
-
-    @Test
-    public void List_Deep_Keys() {
-        User u = where(user.firstName.eq("Jaakko")).singleResult(user.addresses.any().street);
-        for (Address a : u.getAddresses()) {
-            assertNotNull(a.street);
-            assertNull(a.city);
-        }
-    }
-
-    @Test
-    public void Contains() {
-        assertQuery(user.friends.contains(u1), u3, u4, u2);
-    }
-
-    @Test
-    public void Contains2() {
-        assertQuery(user.friends.contains(u4));
-    }
-
-    @Test
-    public void NotContains() {
-        assertQuery(user.friends.contains(u1).not(), u1);
-    }
-
-    @Test
-    public void Contains_Key() {
-        MapEntity entity = new MapEntity();
-        entity.getProperties().put("key", "value");
-        ds.save(entity);
-
-        assertTrue(query(mapEntity).where(mapEntity.properties.get("key").isNotNull()).exists());
-        assertFalse(query(mapEntity).where(mapEntity.properties.get("key2").isNotNull()).exists());
-
-        assertTrue(query(mapEntity).where(mapEntity.properties.containsKey("key")).exists());
-        assertFalse(query(mapEntity).where(mapEntity.properties.containsKey("key2")).exists());
-    }
-
-    @Test
-    public void Equals_Ignore_Case() {
-        assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko")).exists());
-        assertFalse(where(user.firstName.equalsIgnoreCase("AaKk")).exists());
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(where(user.firstName.eq("Jaakko")).exists());
-        assertFalse(where(user.firstName.eq("JaakkoX")).exists());
-        assertTrue(where(user.id.eq(u1.getId())).exists());
-    }
-
-    @Test
-    public void Find_By_Id() {
-        assertNotNull(where(user.id.eq(u1.getId())).singleResult() != null);
-    }
-
-    @Test
-    public void NotExists() {
-        assertFalse(where(user.firstName.eq("Jaakko")).notExists());
-        assertTrue(where(user.firstName.eq("JaakkoX")).notExists());
-    }
-
-    @Test
-    public void UniqueResult() {
-        assertEquals("Jantunen", where(user.firstName.eq("Jaakko")).uniqueResult().getLastName());
-    }
-
-    @Test(expected=NonUniqueResultException.class)
-    public void UniqueResultContract() {
-        where(user.firstName.isNotNull()).uniqueResult();
-    }
-
-    @Test
-    public void SingleResult() {
-        where(user.firstName.isNotNull()).singleResult();
-    }
-
-    @Test
-    public void LongPath() {
-        assertEquals(2, query().where(user.mainAddress().city().name.eq("Helsinki")).count());
-        assertEquals(2, query().where(user.mainAddress().city().name.eq("Tampere")).count());
-    }
-
-    @Test
-    public void CollectionPath() {
-        assertEquals(1, query().where(user.addresses.any().street.eq("Aakatu1")).count());
-        assertEquals(0, query().where(user.addresses.any().street.eq("akatu")).count());
-    }
-
-    @Test
-    public void Dates() {
-        long current = System.currentTimeMillis();
-        int dayInMillis = 24 * 60 * 60 * 1000;
-        Date start = new Date(current);
-        ds.delete(ds.createQuery(Dates.class));
-        Dates d = new Dates();
-        d.setDate(new Date(current + dayInMillis));
-        ds.save(d);
-        Date end = new Date(current + 2 * dayInMillis);
-
-        assertEquals(d, query(dates).where(dates.date.between(start, end)).singleResult());
-        assertEquals(0, query(dates).where(dates.date.between(new Date(0), start)).count());
-    }
-
-    @Test
-    public void ElemMatch() {
-//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1"}}}
-        assertEquals(1, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1")).count());
-//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1" , "postCode" : "00100"}}}
-        assertEquals(1, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1"), address.postCode.eq("00100")).count());
-//      { "addresses" : { "$elemMatch" : { "street" : "akatu"}}}
-        assertEquals(0, query().anyEmbedded(user.addresses, address).on(address.street.eq("akatu")).count());
-//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1" , "postCode" : "00200"}}}
-        assertEquals(0, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1"), address.postCode.eq("00200")).count());
-    }
-
-    @Test
-    public void IndexedAccess() {
-        assertEquals(1, query().where(user.addresses.get(0).street.eq("Aakatu1")).count());
-        assertEquals(0, query().where(user.addresses.get(1).street.eq("Aakatu1")).count());
-    }
-
-    @Test
-    public void Count() {
-        assertEquals(4, query().count());
-    }
-
-    @Test
-    public void Order() {
-        List<User> users = query().orderBy(user.age.asc()).list();
-        assertEquals(asList(u1, u2, u3, u4), users);
-
-        users = query().orderBy(user.age.desc()).list();
-        assertEquals(asList(u4, u3, u2, u1), users);
-    }
-
-    @Test
-    public void Restrict() {
-        assertEquals(asList(u1, u2), query().limit(2).orderBy(user.age.asc()).list());
-        assertEquals(asList(u2, u3), query().limit(2).offset(1).orderBy(user.age.asc()).list());
-    }
-
-    @Test
-    public void ListResults() {
-        SearchResults<User> results = query().limit(2).orderBy(user.age.asc()).listResults();
-        assertEquals(4l, results.getTotal());
-        assertEquals(2, results.getResults().size());
-
-        results = query().offset(2).orderBy(user.age.asc()).listResults();
-        assertEquals(4l, results.getTotal());
-        assertEquals(2, results.getResults().size());
-    }
-
-    @Test
-    public void EmptyResults() {
-        SearchResults<User> results = query().where(user.firstName.eq("XXX")).listResults();
-        assertEquals(0l, results.getTotal());
-        assertEquals(Collections.emptyList(), results.getResults());
-    }
-
-    @Test
-    public void EqInAndOrderByQueries() {
-        assertQuery(user.firstName.eq("Jaakko"), u1);
-        assertQuery(user.firstName.equalsIgnoreCase("jaakko"), u1);
-        assertQuery(user.lastName.eq("Aakkonen"), u3);
-
-        assertQuery(user.firstName.in("Jaakko","Teppo"), u1);
-        assertQuery(user.lastName.in("Aakkonen","BeekkoNen"), u3, u4);
-
-        assertQuery(user.firstName.eq("Jouko"));
-
-        assertQuery(user.firstName.eq("Jaana"), user.lastName.asc(), u3, u4);
-        assertQuery(user.firstName.eq("Jaana"), user.lastName.desc(), u4, u3);
-        assertQuery(user.lastName.eq("Jantunen"), user.firstName.asc(), u2, u1);
-        assertQuery(user.lastName.eq("Jantunen"), user.firstName.desc(), u1, u2);
-
-        assertQuery(user.firstName.eq("Jaana").and(user.lastName.eq("Aakkonen")), u3);
-        //This shoud produce 'and' also
-        assertQuery(where(user.firstName.eq("Jaana"), user.lastName.eq("Aakkonen")), u3);
-
-        assertQuery(user.firstName.ne("Jaana"), u2, u1);
-
-    }
-
-    @Test
-    public void RegexQueries() {
-        assertQuery(user.firstName.startsWith("Jaan"), u3, u4);
-        assertQuery(user.firstName.startsWith("jaan"));
-        assertQuery(user.firstName.startsWithIgnoreCase("jaan"), u3, u4);
-
-        assertQuery(user.lastName.endsWith("unen"), u2, u1);
-
-        assertQuery(user.lastName.endsWithIgnoreCase("onen"), u3, u4);
-
-        assertQuery(user.lastName.contains("oN"), u4);
-        assertQuery(user.lastName.containsIgnoreCase("on"), u3, u4);
-
-        assertQuery(user.firstName.matches(".*aa.*[^i]$"), u3, u4, u1);
-    }
-
-    @Test
-    public void Like() {
-        assertQuery(user.firstName.like("Jaan"));
-        assertQuery(user.firstName.like("Jaan%"), u3, u4);
-        assertQuery(user.firstName.like("jaan%"));
-
-        assertQuery(user.lastName.like("%unen"), u2, u1);
-    }
-
-    @Test
-    public void IsNotNull() {
-        assertQuery(user.firstName.isNotNull(), u3, u4, u2, u1);
-    }
-
-    @Test
-    public void IsNull() {
-        assertQuery(user.firstName.isNull());
-    }
-
-    @Test
-    public void IsEmpty() {
-        assertQuery(user.firstName.isEmpty());
-    }
-
-    @Test
-    public void isEmpty2() {
-        assertQuery(user.friends.isEmpty(), u1);
-    }
-
-    @Test
-    public void Not() {
-        assertQuery(user.firstName.eq("Jaakko").not(), u3, u4, u2);
-        assertQuery(user.firstName.ne("Jaakko").not(), u1);
-        assertQuery(user.firstName.matches("Jaakko").not(), u3, u4, u2);
-    }
-
-    @Test
-    public void Or() {
-        assertQuery(user.lastName.eq("Aakkonen").or(user.lastName.eq("BeekkoNen")), u3, u4);
-    }
-
-    //This is not supported yet
-//    @Test
-//    public void UniqueResult() {
-//
-//        addUser("Dille", "Duplikaatti");
-//        addUser("Dille", "Duplikaatti");
-//
-//        assertEquals(2, where(user.firstName.eq("Dille")).count());
-//        assertEquals(1, where(user.firstName.eq("Dille")).countDistinct());
-//
-//    }
-
-    @Test
-    public void Iterate() {
-        User a = addUser("A", "A");
-        User b = addUser("A1", "B");
-        User c = addUser("A2", "C");
-
-        Iterator<User> i = where(user.firstName.startsWith("A"))
-                            .orderBy(user.firstName.asc())
-                            .iterate();
-
-        assertEquals(a, i.next());
-        assertEquals(b, i.next());
-        assertEquals(c, i.next());
-        assertEquals(false, i.hasNext());
-    }
-
-    @Test
-    public void UniqueResultAndLimitAndOffset() {
-        MongodbQuery<User> q = query().where(user.firstName.startsWith("Ja")).orderBy(user.age.asc());
-        assertEquals(4, q.list().size());
-        assertEquals(u1, q.list().get(0));
-    }
-
-    @Test
-    public void References() {
-        for (User u : users) {
-            if (u.getFriend() != null) {
-                assertQuery(user.friend().eq(u.getFriend()), u);
-                where(user.friend().ne(u.getFriend())).list();
-            }
-        }
-    }
-
-    @Test
-    public void Various() {
-        StringPath str = user.lastName;
-        List<Predicate> predicates = new ArrayList<Predicate>();
-        predicates.add(str.between("a", "b"));
-        predicates.add(str.contains("a"));
-        predicates.add(str.containsIgnoreCase("a"));
-        predicates.add(str.endsWith("a"));
-        predicates.add(str.endsWithIgnoreCase("a"));
-        predicates.add(str.eq("a"));
-        predicates.add(str.equalsIgnoreCase("a"));
-        predicates.add(str.goe("a"));
-        predicates.add(str.gt("a"));
-        predicates.add(str.in("a","b","c"));
-        predicates.add(str.isEmpty());
-        predicates.add(str.isNotNull());
-        predicates.add(str.isNull());
-//        predicates.add(str.like("a"));
-        predicates.add(str.loe("a"));
-        predicates.add(str.lt("a"));
-        predicates.add(str.matches("a"));
-        predicates.add(str.ne("a"));
-        predicates.add(str.notBetween("a", "b"));
-        predicates.add(str.notIn("a","b","c"));
-        predicates.add(str.startsWith("a"));
-        predicates.add(str.startsWithIgnoreCase("a"));
-
-        for (Predicate predicate : predicates) {
-            where(predicate).count();
-            where(predicate.not()).count();
-        }
-    }
-
-    @Test
-    public void Enum_Eq() {
-        assertQuery(user.gender.eq(Gender.MALE), u3, u4, u2, u1);
-    }
-
-    @Test
-    public void Enum_Ne() {
-        assertQuery(user.gender.ne(Gender.MALE));
-    }
-
-    @Test
-    public void In_ObjectIds() {
-        Item i = new Item();
-        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
-        ds.save(i);
-
-        assertTrue(where(item, item.ctds.contains(i.getCtds().get(0))).count() > 0);
-        assertTrue(where(item, item.ctds.contains(ObjectId.get())).count() == 0);
-    }
-
-    @Test
-    public void In_ObjectIds2() {
-        Item i = new Item();
-        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
-        ds.save(i);
-
-        assertTrue(where(item, item.ctds.any().in(i.getCtds())).count() > 0);
-        assertTrue(where(item, item.ctds.any().in(Arrays.asList(ObjectId.get(), ObjectId.get()))).count() == 0);
-    }
-
-    @Test
-    public void Size() {
-        assertQuery(user.addresses.size().eq(2), u1);
-    }
-
-    @Test
-    public void ReadPreference() {
-        MorphiaQuery<User> query = query();
-        query.setReadPreference(ReadPreference.primary());
-        assertEquals(4, query.count());
-
-    }
-
-    //TODO
-    // - test dates
-    // - test with empty values and nulls
-    // - test more complex ands
-
-    private void assertQuery(Predicate e, User ... expected) {
-        assertQuery(where(e).orderBy(user.lastName.asc(), user.firstName.asc()), expected );
-    }
-
-    private void assertQuery(Predicate e, OrderSpecifier<?> orderBy, User ... expected ) {
-        assertQuery(where(e).orderBy(orderBy), expected);
-    }
-
-    private <T> MongodbQuery<T> where(EntityPath<T> entity, Predicate... e) {
-        return new MorphiaQuery<T>(morphia, ds, entity).where(e);
-    }
-
-    private MongodbQuery<User> where(Predicate ... e) {
-        return query().where(e);
-    }
-
-    private MorphiaQuery<User> query() {
-        return new MorphiaQuery<User>(morphia, ds, user);
-    }
-
-    private <T> MorphiaQuery<T> query(EntityPath<T> path) {
-        return new MorphiaQuery<T>(morphia, ds, path);
-    }
-
-    private void assertQuery(MongodbQuery<User> query, User ... expected ) {
-        //System.out.println(query.toString());
-        List<User> results = query.list();
-
-        assertNotNull(results);
-        if (expected == null ) {
-            assertEquals("Should get empty result", 0, results.size());
-            return;
-        }
-        assertEquals(expected.length, results.size());
-        int i = 0;
-        for (User u : expected) {
-            assertEquals(u, results.get(i++));
-        }
-    }
-
-    private User addUser(String first, String last) {
-        User user = new User(first, last);
-        ds.save(user);
-        return user;
-    }
-
-    private User addUser(String first, String last, int age, Address mainAddress, Address... addresses) {
-        User user = new User(first, last, age, new Date());
-        user.setGender(Gender.MALE);
-        user.setMainAddress(mainAddress);
-        for (Address address : addresses) {
-            user.addAddress(address);
-        }
-        for (User u : users) {
-            user.addFriend(u);
-        }
-        if (!users.isEmpty()) {
-            user.setFriend(users.get(users.size() - 1));
-        }
-        ds.save(user);
-        users.add(user);
-        return user;
-    }
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java
deleted file mode 100644
index 80e79f8091..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb;
-
-import static junit.framework.Assert.assertEquals;
-
-import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mysema.query.mongodb.domain.QDummyEntity;
-import com.mysema.query.mongodb.domain.QUser;
-import com.mysema.query.mongodb.morphia.MorphiaSerializer;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.DateTimePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-
-public class MongodbSerializerTest {
-
-    private PathBuilder<Object> entityPath;
-    private StringPath title;
-    private NumberPath<Integer> year;
-    private NumberPath<Double> gross;
-
-    private NumberPath<Long> longField;
-    private NumberPath<Short> shortField;
-    private NumberPath<Byte> byteField;
-    private NumberPath<Float> floatField;
-
-    private DatePath<Date> date;
-    private final Date dateVal = new Date();
-    private DateTimePath<Timestamp> dateTime;
-    private final Timestamp dateTimeVal = new Timestamp(System.currentTimeMillis());
-
-    private MongodbSerializer serializer;
-
-    @Before
-    public void before() {
-        serializer = new MorphiaSerializer(null);
-        entityPath = new PathBuilder<Object>(Object.class, "obj");
-        title = entityPath.getString("title");
-        year = entityPath.getNumber("year", Integer.class);
-        gross = entityPath.getNumber("gross", Double.class);
-        longField = entityPath.getNumber("longField", Long.class);
-        shortField = entityPath.getNumber("shortField", Short.class);
-        byteField = entityPath.getNumber("byteField", Byte.class);
-        floatField = entityPath.getNumber("floatField", Float.class);
-        date = entityPath.getDate("date", Date.class);
-        dateTime = entityPath.getDateTime("dateTime", Timestamp.class);
-    }
-
-    @Test
-    public void Paths() {
-        QUser user = QUser.user;
-        assertEquals("user", serializer.visit(user, null));
-        assertEquals("addresses", serializer.visit(user.addresses, null));
-        assertEquals("addresses", serializer.visit(user.addresses.any(), null));
-        assertEquals("addresses.street", serializer.visit(user.addresses.any().street, null));
-        assertEquals("firstName", serializer.visit(user.firstName, null));
-    }
-
-    @Test
-    public void PropertyAnnotation() {
-        QDummyEntity entity = QDummyEntity.dummyEntity;
-        assertEquals("prop", serializer.visit(entity.property, null));
-    }
-
-    @Test
-    public void IndexedAccess() {
-        QUser user = QUser.user;
-        assertEquals("addresses.0.street", serializer.visit(user.addresses.get(0).street, null));
-    }
-
-    @Test
-    public void CollectionAny() {
-        QUser user = QUser.user;
-        assertQuery(user.addresses.any().street.eq("Aakatu"), dbo("addresses.street","Aakatu"));
-    }
-
-    @Test
-    public void Equals() {
-        assertQuery(title.eq("A"), dbo("title","A"));
-        assertQuery(year.eq(1), dbo("year",1));
-        assertQuery(gross.eq(1.0D), dbo("gross", 1.0D));
-        assertQuery(longField.eq(1L), dbo("longField", 1L));
-        assertQuery(shortField.eq((short)1), dbo("shortField", 1));
-        assertQuery(byteField.eq((byte)1), dbo("byteField", 1L));
-        assertQuery(floatField.eq(1.0F), dbo("floatField", 1.0F));
-
-        assertQuery(date.eq(dateVal), dbo("date", dateVal));
-        assertQuery(dateTime.eq(dateTimeVal), dbo("dateTime", dateTimeVal));
-    }
-
-    @Test
-    public void EqAndEq() {
-        assertQuery(
-            title.eq("A").and(year.eq(1)),
-            dbo("title","A").append("year", 1)
-        );
-
-        assertQuery(
-            title.eq("A").and(year.eq(1).and(gross.eq(1.0D))),
-            dbo("title","A").append("year", 1).append("gross", 1.0D)
-        );
-    }
-
-    @Test
-    public void NotEq() {
-        assertQuery(title.ne("A"), dbo("title", dbo("$ne", "A")));
-    }
-
-    @Test
-    public void Between() {
-        System.err.println(dbo("year", dbo("$gte", 1).append("$lte", 10)));
-        assertQuery(year.between(1, 10), dbo("year", dbo("$gte", 1).append("$lte", 10)));
-    }
-
-    @Test
-    public void LessAndGreaterAndBetween() {
-        assertQuery(title.lt("A"), dbo("title", dbo("$lt", "A")));
-        assertQuery(year.gt(1), dbo("year", dbo("$gt", 1)));
-
-        assertQuery(title.loe("A"), dbo("title", dbo("$lte", "A")));
-        assertQuery(year.goe(1), dbo("year", dbo("$gte", 1)));
-
-        assertQuery(
-                year.gt(1).and(year.lt(10)),
-                dbo("$and", dblist(
-                  dbo("year", dbo("$gt", 1)),
-                  dbo("year", dbo("$lt", 10))))
-        );
-
-        assertQuery(
-                year.between(1, 10),
-                dbo("year", dbo("$gte", 1).append("$lte", 10))
-        );
-    }
-
-    @Test
-    public void In() {
-        assertQuery(year.in(1,2,3), dbo("year", dbo("$in", 1,2,3)));
-    }
-
-    @Test
-    public void OrderBy() {
-        DBObject orderBy = serializer.toSort(sortList(year.asc()));
-        assertEquals(dbo("year", 1), orderBy);
-
-        orderBy = serializer.toSort(sortList(year.desc()));
-        assertEquals(dbo("year", -1), orderBy);
-
-        orderBy = serializer.toSort(sortList(year.desc(), title.asc()));
-        assertEquals(dbo("year", -1).append("title", 1), orderBy);
-    }
-
-    @Test
-    public void Regexcases() {
-        assertQuery(title.startsWith("A"),
-                dbo("title", dbo("$regex", "^\\QA\\E")));
-        assertQuery(title.startsWithIgnoreCase("A"),
-                dbo("title", dbo("$regex", "^\\QA\\E").append("$options", "i")));
-
-        assertQuery(title.endsWith("A"),
-                dbo("title", dbo("$regex", "\\QA\\E$")));
-        assertQuery(title.endsWithIgnoreCase("A"),
-                dbo("title", dbo("$regex", "\\QA\\E$").append("$options", "i")));
-
-        assertQuery(title.equalsIgnoreCase("A"),
-                dbo("title", dbo("$regex", "^\\QA\\E$").append("$options", "i")));
-
-        assertQuery(title.contains("A"),
-                dbo("title", dbo("$regex", ".*\\QA\\E.*")));
-        assertQuery(title.containsIgnoreCase("A"),
-                dbo("title", dbo("$regex", ".*\\QA\\E.*").append("$options", "i")));
-
-        assertQuery(title.matches(".*A^"),
-                dbo("title", dbo("$regex", ".*A^")));
-
-    }
-
-    @Test
-    public void And() {
-        assertQuery(
-            title.startsWithIgnoreCase("a").and(title.endsWithIgnoreCase("b")),
-
-            dbo("$and", dblist(
-                dbo("title", dbo("$regex", "^\\Qa\\E").append("$options", "i")),
-                dbo("title", dbo("$regex", "\\Qb\\E$").append("$options", "i")))));
-
-    }
-
-    @Test
-    public void Not() {
-        assertQuery(title.eq("A").not(), dbo("title", dbo("$ne","A")));
-
-        assertQuery(title.lt("A").not().and(year.ne(1800)),
-                dbo("title", dbo("$not", dbo("$lt","A"))).
-                append("year", dbo("$ne", 1800)));
-    }
-
-
-    private List<OrderSpecifier<?>> sortList(OrderSpecifier<?> ... order) {
-        return Arrays.asList(order);
-    }
-
-    private void assertQuery(Expression<?> e, BasicDBObject expected) {
-        BasicDBObject result = (BasicDBObject) serializer.handle(e);
-        assertEquals(expected.toString(), result.toString());
-    }
-
-    public static BasicDBObject dbo(String key, Object... value) {
-        if (value.length == 1) {
-            return new BasicDBObject(key, value[0]);
-        }
-        return new BasicDBObject(key, value);
-    }
-
-    public static BasicDBList dblist(Object... contents) {
-        BasicDBList list = new BasicDBList();
-        for (Object o : contents) {
-            list.add(o);
-        }
-        return list;
-    }
-
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/AbstractEntity.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/AbstractEntity.java
deleted file mode 100644
index dc50cede1d..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/AbstractEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.mongodb.domain;
-
-import com.mysema.query.annotations.QuerySupertype;
-import org.bson.types.ObjectId;
-import org.mongodb.morphia.annotations.Id;
-
-@QuerySupertype
-public abstract class AbstractEntity {
-
-    private @Id ObjectId id;
-
-    public ObjectId getId() {
-        return id;
-    }
-
-    public void setId(ObjectId id) {
-        this.id = id;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AbstractEntity other = (AbstractEntity) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
-
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Address.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Address.java
deleted file mode 100644
index 2998992314..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Address.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import org.mongodb.morphia.annotations.Embedded;
-
-public final class Address {
-
-    public Address() {
-        
-    }
-    
-    public Address(String street, String postCode, City city) {
-        this.street = street; this.postCode = postCode; this.city = city;
-    }
-    
-    public String street;
-    
-    public String postCode;
-    
-    @Embedded
-    public City city;
-    
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/City.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/City.java
deleted file mode 100644
index 483477d8f6..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/City.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-
-public final class City {
-
-    public City() {}
-    
-    public City(String name, Double latitude, Double longitude) {
-        this.name = name;
-        this.latitude = latitude;
-        this.longitude = longitude;
-    }
-    
-    public String name;
-    
-    public Double latitude;
-    
-    public Double longitude;
-    
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/DummyEntity.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/DummyEntity.java
deleted file mode 100644
index c7eb33602a..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/DummyEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import org.mongodb.morphia.annotations.Entity;
-import org.mongodb.morphia.annotations.Property;
-
-@Entity
-public class DummyEntity extends AbstractEntity {
-
-    @Property("prop")
-    private String property;
-
-    public String getProperty() {
-        return property;
-    }
-
-    public void setProperty(String property) {
-        this.property = property;
-    }
-    
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/GeoEntity.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/GeoEntity.java
deleted file mode 100644
index 61ce5edc26..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/GeoEntity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import org.mongodb.morphia.annotations.Entity;
-
-@Entity
-public class GeoEntity extends AbstractEntity {
-
-    private Double[] location;
-
-    public GeoEntity(double l1, double l2) {
-        location = new Double[]{l1, l2};
-    }
-
-    public GeoEntity() {}
-
-    public Double[] getLocation() {
-        return location;
-    }
-
-    public void setLocation(Double[] location) {
-        this.location = location;
-    }
-
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Item.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Item.java
deleted file mode 100644
index 35331f35e8..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Item.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import java.util.List;
-
-import org.bson.types.ObjectId;
-import org.mongodb.morphia.annotations.Entity;
-
-@Entity
-public class Item extends AbstractEntity {
-
-    private List<ObjectId> ctds;
-
-    public List<ObjectId> getCtds() {
-        return ctds;
-    }
-
-    public void setCtds(List<ObjectId> ctds) {
-        this.ctds = ctds;
-    }
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/User.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/User.java
deleted file mode 100644
index a039b90ab6..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/User.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.mongodb.morphia.annotations.Embedded;
-import org.mongodb.morphia.annotations.Entity;
-import org.mongodb.morphia.annotations.Reference;
-
-@Entity
-public class User extends AbstractEntity {
-
-    public enum Gender { MALE, FEMALE }
-
-    private String firstName;
-
-    private String lastName;
-
-    private Date created;
-
-    private Gender gender;
-
-    @Embedded
-    private final List<Address> addresses = new ArrayList<Address>();
-
-    @Embedded
-    private Address mainAddress;
-
-    @Reference
-    private final List<User> friends = new ArrayList<User>();
-
-    @Reference
-    private User friend;
-
-    @Reference
-    private User enemy;
-
-    private int age;
-
-    public User() {
-    }
-
-    public User(String firstName, String lastName, User friend) {
-        this(firstName, lastName);
-        this.friend = friend;
-    }
-
-    public User(String firstName, String lastName) {
-        this.firstName = firstName; this.lastName = lastName;
-        this.created = new Date();
-    }
-
-    public User(String firstName, String lastName, int age, Date created) {
-        this.firstName = firstName; this.lastName = lastName; this.age = age; this.created = created;
-    }
-
-    @Override
-    public String toString() {
-        return "TestUser [id=" + getId() + ", firstName=" + firstName + ", lastName=" + lastName
-                + "]";
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public Address getMainAddress() {
-        return mainAddress;
-    }
-
-    public void setMainAddress(Address mainAddress) {
-        this.mainAddress = mainAddress;
-    }
-
-    public void setMainAddress(String street, String postCode, City city) {
-        this.mainAddress = new Address(street, postCode, city);
-    }
-
-    public User addAddress(Address address) {
-        addresses.add(address);
-        return this;
-    }
-
-    public User addAddress(String street, String postalCode, City city) {
-        addresses.add(new Address(street, postalCode, city));
-        return this;
-    }
-
-    public List<Address> getAddresses() {
-        return addresses;
-    }
-
-    public User addFriend(User friend) {
-        friends.add(friend);
-        return this;
-    }
-
-    public List<User> getFriends() {
-        return friends;
-    }
-
-    public Gender getGender() {
-        return gender;
-    }
-
-    public void setGender(Gender gender) {
-        this.gender = gender;
-    }
-
-    public User getFriend() {
-        return friend;
-    }
-
-    public void setFriend(User friend) {
-        this.friend = friend;
-    }
-
-    public User getEnemy() {
-        return enemy;
-    }
-
-    public void setEnemy(User enemy) {
-        this.enemy = enemy;
-    }
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/UserTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/UserTest.java
deleted file mode 100644
index 36f4c6d47f..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/UserTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain;
-
-import org.bson.types.ObjectId;
-import org.junit.Test;
-import org.mongodb.morphia.Morphia;
-
-public class UserTest {
-
-    private static final Morphia morphia = new Morphia().map(User.class);
-
-    @Test
-    public void Map() {
-        City tampere = new City("Tampere", 61.30, 23.50);
-
-        User user = new User();
-        user.setAge(12);
-        user.setFirstName("Jaakko");
-        user.addAddress("Aakatu", "00300", tampere);
-
-        System.out.println(morphia.toDBObject(user));
-    }
-
-    @Test
-    public void Friend() {
-        User friend = new User();
-        friend.setId(new ObjectId(1,2,3));
-
-        User user = new User();
-        user.setFriend(friend);
-
-        System.out.println(morphia.toDBObject(user));
-    }
-
-    @Test
-    public void Friends() {
-        User friend = new User();
-        friend.setId(new ObjectId(1,2,3));
-
-        User user = new User();
-        user.addFriend(friend);
-
-        System.out.println(morphia.toDBObject(user));
-    }
-
-}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/package-info.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/package-info.java
deleted file mode 100644
index efe2a7fdc2..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-@Config(entityAccessors=true)
-package com.mysema.query.mongodb.domain;
-
-import com.mysema.query.annotations.Config;
-
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/User.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/User.java
deleted file mode 100644
index a8eed39373..0000000000
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/User.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.mongodb.domain2;
-
-import java.util.Map;
-
-import org.mongodb.morphia.annotations.Embedded;
-import org.mongodb.morphia.annotations.Entity;
-
-@Entity(value = "USER", noClassnameStored = true)
-public class User {
-        
-    @Embedded
-    Map<String, UserAttribute> properties;
-
-}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java
new file mode 100644
index 0000000000..f7a582cbf6
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/GeoSpatialQueryTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Morphia;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.querydsl.core.testutil.MongoDB;
+import com.querydsl.mongodb.domain.GeoEntity;
+import com.querydsl.mongodb.domain.QGeoEntity;
+import com.querydsl.mongodb.morphia.MorphiaQuery;
+
+@Category(MongoDB.class)
+public class GeoSpatialQueryTest {
+
+    private final String dbname = "geodb";
+    private final MongoClient mongo;
+    private final Morphia morphia;
+    private final Datastore ds;
+    private final QGeoEntity geoEntity = new QGeoEntity("geoEntity");
+
+    public GeoSpatialQueryTest() throws UnknownHostException, MongoException {
+        mongo = new MongoClient();
+        morphia = new Morphia().map(GeoEntity.class);
+        ds = morphia.createDatastore(mongo, dbname);
+    }
+
+    @Before
+    public void before() {
+        ds.delete(ds.createQuery(GeoEntity.class));
+        ds.ensureIndexes(GeoEntity.class);
+    }
+
+    @Test
+    public void near() {
+        ds.save(new GeoEntity(10.0, 50.0));
+        ds.save(new GeoEntity(20.0, 50.0));
+        ds.save(new GeoEntity(30.0, 50.0));
+
+        List<GeoEntity> entities = query().where(geoEntity.location.near(50.0, 50.0)).fetch();
+        assertEquals(30.0, entities.get(0).getLocation()[0], 0.1);
+        assertEquals(20.0, entities.get(1).getLocation()[0], 0.1);
+        assertEquals(10.0, entities.get(2).getLocation()[0], 0.1);
+    }
+
+    @Test
+    public void near_sphere() {
+        ds.save(new GeoEntity(10.0, 50.0));
+        ds.save(new GeoEntity(20.0, 50.0));
+        ds.save(new GeoEntity(30.0, 50.0));
+
+        List<GeoEntity> entities = query().where(MongodbExpressions.nearSphere(geoEntity.location, 50.0, 50.0)).fetch();
+        assertEquals(30.0, entities.get(0).getLocation()[0], 0.1);
+        assertEquals(20.0, entities.get(1).getLocation()[0], 0.1);
+        assertEquals(10.0, entities.get(2).getLocation()[0], 0.1);
+    }
+
+    @Test
+    public void geo_within_box() {
+        ds.save(new GeoEntity(10.0, 50.0));
+        ds.save(new GeoEntity(20.0, 50.0));
+        ds.save(new GeoEntity(30.0, 50.0));
+
+        List<GeoEntity> entities = query().where(MongodbExpressions.withinBox(geoEntity.location, 0, 0, 20, 50)).fetch();
+        assertEquals(2, entities.size());
+        assertEquals(10.0, entities.get(0).getLocation()[0], 0.1);
+        assertEquals(20.0, entities.get(1).getLocation()[0], 0.1);
+
+    }
+
+    @Test
+    public void geo_intersects() {
+        ds.save(new GeoEntity(10.0, 50.0));
+        ds.save(new GeoEntity(20.0, 50.0));
+        ds.save(new GeoEntity(30.0, 50.0));
+
+        List<GeoEntity> entities = query().where(MongodbExpressions.geoIntersects(geoEntity.location, 20.0, 50.0)).fetch();
+        assertEquals(1, entities.size());
+        assertEquals(20.0, entities.get(0).getLocation()[0], 0.1);
+    }
+
+    private MorphiaQuery<GeoEntity> query() {
+        return new MorphiaQuery<GeoEntity>(morphia, ds, geoEntity);
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/JoinTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/JoinTest.java
new file mode 100644
index 0000000000..5381fea086
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/JoinTest.java
@@ -0,0 +1,155 @@
+package com.querydsl.mongodb;
+
+import static org.junit.Assert.*;
+
+import java.net.UnknownHostException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Morphia;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.querydsl.core.testutil.MongoDB;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.mongodb.domain.Item;
+import com.querydsl.mongodb.domain.QUser;
+import com.querydsl.mongodb.domain.User;
+import com.querydsl.mongodb.morphia.MorphiaQuery;
+
+@Category(MongoDB.class)
+public class JoinTest {
+
+    private final MongoClient mongo;
+    private final Morphia morphia;
+    private final Datastore ds;
+
+    private final String dbname = "testdb";
+    private final QUser user = QUser.user;
+    private final QUser friend = new QUser("friend");
+    private final QUser friend2 = new QUser("friend2");
+    private final QUser enemy = new QUser("enemy");
+
+    public JoinTest() throws UnknownHostException, MongoException {
+        mongo = new MongoClient();
+        morphia = new Morphia().map(User.class).map(Item.class);
+        ds = morphia.createDatastore(mongo, dbname);
+    }
+
+    @Before
+    public void before() throws UnknownHostException, MongoException {
+        ds.delete(ds.createQuery(User.class));
+
+        User friend1 = new User("Max", null);
+        User friend2 = new User("Jack", null);
+        User friend3 = new User("Bob", null);
+        ds.save(friend1, friend2, friend3);
+
+        User user1 = new User("Jane", null, friend1);
+        User user2 = new User("Mary", null, user1);
+        User user3 = new User("Ann", null, friend3);
+        ds.save(user1, user2, user3);
+
+        User user4 = new User("Mike", null);
+        user4.setFriend(user2);
+        user4.setEnemy(user3);
+        ds.save(user4);
+
+        User user5 = new User("Bart", null);
+        user5.addFriend(user2);
+        user5.addFriend(user3);
+        ds.save(user5);
+
+    }
+
+    @Test
+    public void count() {
+        assertEquals(1, where().join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount());
+        assertEquals(1, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount());
+        assertEquals(0, where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount());
+        assertEquals(0, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).fetchCount());
+    }
+
+    @Test
+    public void count_collection() {
+        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Mary")).fetchCount());
+        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Ann")).fetchCount());
+        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Ann").or(friend.firstName.eq("Mary"))).fetchCount());
+        assertEquals(1, where(user.firstName.eq("Bart")).join(user.friends, friend).on(friend.firstName.eq("Mary")).fetchCount());
+        assertEquals(0, where().join(user.friends, friend).on(friend.firstName.eq("Max")).fetchCount());
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(where().join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount() > 0);
+        assertTrue(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount() > 0);
+        assertFalse(where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchCount() > 0);
+        assertFalse(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).fetchCount() > 0);
+    }
+
+    @Test
+    public void exists_collection() {
+        assertTrue(where().join(user.friends, friend).on(friend.firstName.eq("Mary")).fetchCount() > 0);
+        assertTrue(where(user.firstName.eq("Bart")).join(user.friends, friend).on(friend.firstName.eq("Mary")).fetchCount() > 0);
+    }
+
+    @Test
+    public void list() {
+        assertEquals(1, where().join(user.friend(), friend).on(friend.firstName.eq("Max")).fetch().size());
+        assertEquals(1, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetch().size());
+        assertEquals(0, where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetch().size());
+        assertEquals(0, where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).fetch().size());
+    }
+
+    public void list_collection() {
+        assertEquals(1, where().join(user.friends, friend).on(friend.firstName.eq("Mary")).fetch().size());
+    }
+
+    @Test
+    public void single() {
+        assertEquals("Jane", where().join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchFirst().getFirstName());
+        assertEquals("Jane", where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchFirst().getFirstName());
+        assertNull(where(user.firstName.eq("Mary")).join(user.friend(), friend).on(friend.firstName.eq("Max")).fetchFirst());
+        assertNull(where(user.firstName.eq("Jane")).join(user.friend(), friend).on(friend.firstName.eq("Jack")).fetchFirst());
+    }
+
+    @Test
+    public void single_collection() {
+        assertEquals("Bart", where().join(user.friends, friend).on(friend.firstName.eq("Mary")).fetchFirst().getFirstName());
+    }
+
+    @Test
+    public void double1() {
+        assertEquals("Mike", where()
+                .join(user.friend(), friend).on(friend.firstName.isNotNull())
+                .join(user.enemy(), enemy).on(enemy.firstName.isNotNull())
+                .fetchFirst().getFirstName());
+    }
+
+    @Test
+    public void double2() {
+        assertEquals("Mike", where()
+                .join(user.friend(), friend).on(friend.firstName.eq("Mary"))
+                .join(user.enemy(), enemy).on(enemy.firstName.eq("Ann"))
+                .fetchFirst().getFirstName());
+    }
+
+    @Test
+    public void deep() {
+        // Mike -> Mary -> Jane
+        assertEquals("Mike", where()
+                .join(user.friend(), friend).on(friend.firstName.isNotNull())
+                .join(friend.friend(), friend2).on(friend2.firstName.eq("Jane"))
+                .fetchFirst().getFirstName());
+    }
+
+    private MorphiaQuery<User> query() {
+        return new MorphiaQuery<User>(morphia, ds, user);
+    }
+
+    private MorphiaQuery<User> where(Predicate... e) {
+        return query().where(e);
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java
new file mode 100644
index 0000000000..396549ae8e
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java
@@ -0,0 +1,701 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.*;
+
+import java.net.UnknownHostException;
+import java.util.*;
+
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Morphia;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.mongodb.ReadPreference;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.testutil.MongoDB;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.mongodb.domain.*;
+import com.querydsl.mongodb.domain.User.Gender;
+import com.querydsl.mongodb.morphia.MorphiaQuery;
+
+@Category(MongoDB.class)
+public class MongodbQueryTest {
+
+    private final MongoClient mongo;
+    private final Morphia morphia;
+    private final Datastore ds;
+
+    private final String dbname = "testdb";
+    private final QUser user = QUser.user;
+    private final QItem item = QItem.item;
+    private final QAddress address = QAddress.address;
+    private final QMapEntity mapEntity = QMapEntity.mapEntity;
+    private final QDates dates = QDates.dates;
+    private final QCountry country = QCountry.country;
+
+    List<User> users = new ArrayList<>();
+    User u1, u2, u3, u4;
+    City tampere, helsinki;
+
+    public MongodbQueryTest() throws UnknownHostException, MongoException {
+        mongo = new MongoClient();
+        morphia = new Morphia().map(User.class).map(Item.class).map(MapEntity.class).map(Dates.class);
+        ds = morphia.createDatastore(mongo, dbname);
+    }
+
+    @Before
+    public void before() throws UnknownHostException, MongoException {
+        ds.delete(ds.createQuery(Item.class));
+        ds.delete(ds.createQuery(User.class));
+        ds.delete(ds.createQuery(Country.class));
+        ds.delete(ds.createQuery(MapEntity.class));
+
+        tampere = new City("Tampere", 61.30, 23.50);
+        helsinki = new City("Helsinki", 60.15, 20.03);
+
+        u1 = addUser("Jaakko", "Jantunen", 20, new Address("Aakatu", "00100", helsinki),
+                new Address("Aakatu1", "00100", helsinki),
+                new Address("Aakatu2", "00100", helsinki));
+        u2 = addUser("Jaakki", "Jantunen", 30, new Address("Beekatu", "00200", helsinki));
+        u3 = addUser("Jaana", "Aakkonen", 40, new Address("Ceekatu","00300", tampere));
+        u4 = addUser("Jaana", "BeekkoNen", 50, new Address("Deekatu","00400",tampere));
+
+        // order users by lastname, firstname
+        users = Arrays.asList(u3, u4, u2, u1);
+    }
+
+    @Test
+    public void query1() {
+        assertEquals(4L, query(user).fetchCount());
+        assertEquals(4L, query(User.class).fetchCount());
+    }
+
+    @Test
+    public void list_keys() {
+        User u = where(user.firstName.eq("Jaakko")).fetch(user.firstName, user.mainAddress().street).get(0);
+        assertEquals("Jaakko", u.getFirstName());
+        assertNull(u.getLastName());
+        assertEquals("Aakatu", u.getMainAddress().street);
+        assertNull(u.getMainAddress().postCode);
+    }
+
+    @Test
+    public void singleResult_keys() {
+        User u = where(user.firstName.eq("Jaakko")).fetchFirst(user.firstName);
+        assertEquals("Jaakko", u.getFirstName());
+        assertNull(u.getLastName());
+    }
+
+    @Test
+    public void uniqueResult_keys() {
+        User u = where(user.firstName.eq("Jaakko")).fetchOne(user.firstName);
+        assertEquals("Jaakko", u.getFirstName());
+        assertNull(u.getLastName());
+    }
+
+    @Test
+    public void list_deep_keys() {
+        User u = where(user.firstName.eq("Jaakko")).fetchFirst(user.addresses.any().street);
+        for (Address a : u.getAddresses()) {
+            assertNotNull(a.street);
+            assertNull(a.city);
+        }
+    }
+
+    @Test
+    public void between() {
+        assertQuery(user.age.between(20, 30), u2, u1);
+        assertQuery(user.age.goe(20).and(user.age.loe(30)), u2, u1);
+    }
+
+    @Test
+    public void between_not() {
+        assertQuery(user.age.between(20, 30).not(), u3, u4);
+        assertQuery(user.age.goe(20).and(user.age.loe(30)).not(), u3, u4);
+    }
+
+    @Test
+    public void contains() {
+        assertQuery(user.friends.contains(u1), u3, u4, u2);
+    }
+
+    @Test
+    public void contains2() {
+        assertQuery(user.friends.contains(u4));
+    }
+
+    @Test
+    public void notContains() {
+        assertQuery(user.friends.contains(u1).not(), u1);
+    }
+
+    @Test
+    public void contains_key() {
+        MapEntity entity = new MapEntity();
+        entity.getProperties().put("key", "value");
+        ds.save(entity);
+
+        assertTrue(query(mapEntity).where(mapEntity.properties.get("key").isNotNull()).fetchCount() > 0);
+        assertFalse(query(mapEntity).where(mapEntity.properties.get("key2").isNotNull()).fetchCount() > 0);
+
+        assertTrue(query(mapEntity).where(mapEntity.properties.containsKey("key")).fetchCount() > 0);
+        assertFalse(query(mapEntity).where(mapEntity.properties.containsKey("key2")).fetchCount() > 0);
+    }
+
+    @Test
+    public void contains_key_not() {
+        MapEntity entity = new MapEntity();
+        entity.getProperties().put("key", "value");
+        ds.save(entity);
+
+        assertFalse(query(mapEntity).where(mapEntity.properties.get("key").isNotNull().not()).fetchCount() > 0);
+        assertTrue(query(mapEntity).where(mapEntity.properties.get("key2").isNotNull().not()).fetchCount() > 0);
+
+        assertFalse(query(mapEntity).where(mapEntity.properties.containsKey("key").not()).fetchCount() > 0);
+        assertTrue(query(mapEntity).where(mapEntity.properties.containsKey("key2").not()).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_ignore_case() {
+        assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko")).fetchCount() > 0);
+        assertFalse(where(user.firstName.equalsIgnoreCase("AaKk")).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_ignore_case_not() {
+        assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko").not()).fetchCount() > 0);
+        assertTrue(where(user.firstName.equalsIgnoreCase("AaKk").not()).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_and_between() {
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.between(20, 30)), u2, u1);
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.goe(20).and(user.age.loe(30))), u2, u1);
+    }
+
+    @Test
+    public void equals_and_between_not() {
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.between(20, 30)).not(), u3, u4);
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.goe(20).and(user.age.loe(30))).not(), u3, u4);
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(where(user.firstName.eq("Jaakko")).fetchCount() > 0);
+        assertFalse(where(user.firstName.eq("JaakkoX")).fetchCount() > 0);
+        assertTrue(where(user.id.eq(u1.getId())).fetchCount() > 0);
+    }
+
+    @Test
+    public void find_by_id() {
+        assertNotNull(where(user.id.eq(u1.getId())).fetchFirst() != null);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(where(user.firstName.eq("Jaakko")).fetchCount() == 0);
+        assertTrue(where(user.firstName.eq("JaakkoX")).fetchCount() == 0);
+    }
+
+    @Test
+    public void uniqueResult() {
+        assertEquals("Jantunen", where(user.firstName.eq("Jaakko")).fetchOne().getLastName());
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResultContract() {
+        where(user.firstName.isNotNull()).fetchOne();
+    }
+
+    @Test
+    public void singleResult() {
+        where(user.firstName.isNotNull()).fetchFirst();
+    }
+
+    @Test
+    public void longPath() {
+        assertEquals(2, query().where(user.mainAddress().city().name.eq("Helsinki")).fetchCount());
+        assertEquals(2, query().where(user.mainAddress().city().name.eq("Tampere")).fetchCount());
+    }
+
+    @Test
+    public void collectionPath() {
+        assertEquals(1, query().where(user.addresses.any().street.eq("Aakatu1")).fetchCount());
+        assertEquals(0, query().where(user.addresses.any().street.eq("akatu")).fetchCount());
+    }
+
+    @Test
+    public void dates() {
+        long current = System.currentTimeMillis();
+        int dayInMillis = 24 * 60 * 60 * 1000;
+        Date start = new Date(current);
+        ds.delete(ds.createQuery(Dates.class));
+        Dates d = new Dates();
+        d.setDate(new Date(current + dayInMillis));
+        ds.save(d);
+        Date end = new Date(current + 2 * dayInMillis);
+
+        assertEquals(d, query(dates).where(dates.date.between(start, end)).fetchFirst());
+        assertEquals(0, query(dates).where(dates.date.between(new Date(0), start)).fetchCount());
+    }
+
+    @Test
+    public void elemMatch() {
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1"}}}
+        assertEquals(1, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1", "postCode" : "00100"}}}
+        assertEquals(1, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1"), address.postCode.eq("00100")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "akatu"}}}
+        assertEquals(0, query().anyEmbedded(user.addresses, address).on(address.street.eq("akatu")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1", "postCode" : "00200"}}}
+        assertEquals(0, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1"), address.postCode.eq("00200")).fetchCount());
+    }
+
+    @Test
+    public void indexedAccess() {
+        assertEquals(1, query().where(user.addresses.get(0).street.eq("Aakatu1")).fetchCount());
+        assertEquals(0, query().where(user.addresses.get(1).street.eq("Aakatu1")).fetchCount());
+    }
+
+    @Test
+    public void count() {
+        assertEquals(4, query().fetchCount());
+    }
+
+    @Test
+    public void order() {
+        List<User> users = query().orderBy(user.age.asc()).fetch();
+        assertEquals(asList(u1, u2, u3, u4), users);
+
+        users = query().orderBy(user.age.desc()).fetch();
+        assertEquals(asList(u4, u3, u2, u1), users);
+    }
+
+    @Test
+    public void restrict() {
+        assertEquals(asList(u1, u2), query().limit(2).orderBy(user.age.asc()).fetch());
+        assertEquals(asList(u2, u3), query().limit(2).offset(1).orderBy(user.age.asc()).fetch());
+    }
+
+    @Test
+    public void listResults() {
+        QueryResults<User> results = query().limit(2).orderBy(user.age.asc()).fetchResults();
+        assertEquals(4L, results.getTotal());
+        assertEquals(2, results.getResults().size());
+
+        results = query().offset(2).orderBy(user.age.asc()).fetchResults();
+        assertEquals(4L, results.getTotal());
+        assertEquals(2, results.getResults().size());
+    }
+
+    @Test
+    public void emptyResults() {
+        QueryResults<User> results = query().where(user.firstName.eq("XXX")).fetchResults();
+        assertEquals(0L, results.getTotal());
+        assertEquals(Collections.emptyList(), results.getResults());
+    }
+
+    @Test
+    public void eqInAndOrderByQueries() {
+        assertQuery(user.firstName.eq("Jaakko"), u1);
+        assertQuery(user.firstName.equalsIgnoreCase("jaakko"), u1);
+        assertQuery(user.lastName.eq("Aakkonen"), u3);
+
+        assertQuery(user.firstName.in("Jaakko","Teppo"), u1);
+        assertQuery(user.lastName.in("Aakkonen","BeekkoNen"), u3, u4);
+
+        assertQuery(user.firstName.eq("Jouko"));
+
+        assertQuery(user.firstName.eq("Jaana"), user.lastName.asc(), u3, u4);
+        assertQuery(user.firstName.eq("Jaana"), user.lastName.desc(), u4, u3);
+        assertQuery(user.lastName.eq("Jantunen"), user.firstName.asc(), u2, u1);
+        assertQuery(user.lastName.eq("Jantunen"), user.firstName.desc(), u1, u2);
+
+        assertQuery(user.firstName.eq("Jaana").and(user.lastName.eq("Aakkonen")), u3);
+        //This should produce 'and' also
+        assertQuery(where(user.firstName.eq("Jaana"), user.lastName.eq("Aakkonen")), u3);
+
+        assertQuery(user.firstName.ne("Jaana"), u2, u1);
+    }
+
+    @Test
+    public void regexQueries() {
+        assertQuery(user.firstName.startsWith("Jaan"), u3, u4);
+        assertQuery(user.firstName.startsWith("jaan"));
+        assertQuery(user.firstName.startsWithIgnoreCase("jaan"), u3, u4);
+
+        assertQuery(user.lastName.endsWith("unen"), u2, u1);
+
+        assertQuery(user.lastName.endsWithIgnoreCase("onen"), u3, u4);
+
+        assertQuery(user.lastName.contains("oN"), u4);
+        assertQuery(user.lastName.containsIgnoreCase("on"), u3, u4);
+
+        assertQuery(user.firstName.matches(".*aa.*[^i]$"), u3, u4, u1);
+    }
+
+    @Test
+    public void regexQueries_not() {
+        assertQuery(user.firstName.startsWith("Jaan").not(), u2, u1);
+        assertQuery(user.firstName.startsWith("jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.startsWithIgnoreCase("jaan").not(), u2, u1);
+
+        assertQuery(user.lastName.endsWith("unen").not(), u3, u4);
+
+        assertQuery(user.lastName.endsWithIgnoreCase("onen").not(), u2, u1);
+
+        assertQuery(user.lastName.contains("oN").not(), u3, u2, u1);
+        assertQuery(user.lastName.containsIgnoreCase("on").not(), u2, u1);
+
+        assertQuery(user.firstName.matches(".*aa.*[^i]$").not(), u2);
+    }
+
+    @Test
+    public void like() {
+        assertQuery(user.firstName.like("Jaan"));
+        assertQuery(user.firstName.like("Jaan%"), u3, u4);
+        assertQuery(user.firstName.like("jaan%"));
+
+        assertQuery(user.lastName.like("%unen"), u2, u1);
+    }
+
+    @Test
+    public void like_not() {
+        assertQuery(user.firstName.like("Jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.like("Jaan%").not(), u2, u1);
+        assertQuery(user.firstName.like("jaan%").not(), u3, u4, u2, u1);
+
+        assertQuery(user.lastName.like("%unen").not(), u3, u4);
+    }
+
+    @Test
+    public void likeIgnoreCase() {
+        assertQuery(user.firstName.likeIgnoreCase("JAAN"));
+        assertQuery(user.firstName.likeIgnoreCase("Jaan%"), u3, u4);
+        assertQuery(user.firstName.likeIgnoreCase("JAAN%"), u3, u4);
+        assertQuery(user.firstName.likeIgnoreCase("jaan%"), u3, u4);
+
+        assertQuery(user.lastName.likeIgnoreCase("%unen"), u2, u1);
+        assertQuery(user.lastName.likeIgnoreCase("%UNEN"), u2, u1);
+    }
+
+    @Test
+    public void likeIgnoreCase_not() {
+        assertQuery(user.firstName.likeIgnoreCase("Jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("Jaan%").not(), u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("JAAN%").not(), u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("jaan%").not(), u2, u1);
+
+        assertQuery(user.lastName.likeIgnoreCase("%unen").not(), u3, u4);
+        assertQuery(user.lastName.likeIgnoreCase("%UNEN").not(), u3, u4);
+    }
+
+    @Test
+    public void isNotNull() {
+        assertQuery(user.firstName.isNotNull(), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void isNotNull_not() {
+        assertQuery(user.firstName.isNotNull().not());
+    }
+
+    @Test
+    public void isNull() {
+        assertQuery(user.firstName.isNull());
+    }
+
+    @Test
+    public void isNull_not() {
+        assertQuery(user.firstName.isNull().not(), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void isEmpty() {
+        assertQuery(user.firstName.isEmpty());
+        assertQuery(user.friends.isEmpty(), u1);
+    }
+
+    @Test
+    public void isEmpty_not() {
+        assertQuery(user.firstName.isEmpty().not(), u3, u4, u2, u1);
+        assertQuery(user.friends.isEmpty().not(), u3, u4, u2);
+    }
+
+    @Test
+    public void not() {
+        assertQuery(user.firstName.eq("Jaakko").not(), u3, u4, u2);
+        assertQuery(user.firstName.ne("Jaakko").not(), u1);
+        assertQuery(user.firstName.matches("Jaakko").not(), u3, u4, u2);
+        assertQuery(user.friends.isNotEmpty(), u3, u4, u2);
+    }
+
+    @Test
+    public void or() {
+        assertQuery(user.lastName.eq("Aakkonen").or(user.lastName.eq("BeekkoNen")), u3, u4);
+    }
+
+    @Test
+    public void or_not() {
+        assertQuery(user.lastName.eq("Aakkonen").or(user.lastName.eq("BeekkoNen")).not(), u2, u1);
+    }
+
+    @Test
+    public void iterate() {
+        User a = addUser("A", "A");
+        User b = addUser("A1", "B");
+        User c = addUser("A2", "C");
+
+        Iterator<User> i = where(user.firstName.startsWith("A"))
+                            .orderBy(user.firstName.asc())
+                            .iterate();
+
+        assertEquals(a, i.next());
+        assertEquals(b, i.next());
+        assertEquals(c, i.next());
+        assertEquals(false, i.hasNext());
+    }
+
+    @Test
+    public void uniqueResultAndLimitAndOffset() {
+        MorphiaQuery<User> q = query().where(user.firstName.startsWith("Ja")).orderBy(user.age.asc());
+        assertEquals(4, q.fetch().size());
+        assertEquals(u1, q.fetch().get(0));
+    }
+
+    @Test
+    public void references() {
+        for (User u : users) {
+            if (u.getFriend() != null) {
+                assertQuery(user.friend().eq(u.getFriend()), u);
+                assertQuery(user.friend().id.eq(u.getFriend().getId()), u);
+                assertQuery(user.friend().ne(u.getFriend()), otherUsers(u));
+                assertQuery(user.friend().id.ne(u.getFriend().getId()), otherUsers(u));
+            }
+        }
+    }
+
+    @Test
+    public void references2() {
+        for (User u : users) {
+            if (u.getFriend() != null) {
+                assertQuery(user.enemy().eq(u.getEnemy()), u);
+                assertQuery(user.enemy().id.eq(u.getEnemy().getId()), u);
+                assertQuery(user.enemy().ne(u.getEnemy()), otherUsers(u));
+                assertQuery(user.enemy().id.ne(u.getEnemy().getId()), otherUsers(u));
+            }
+        }
+    }
+
+    private User[] otherUsers(User user) {
+        List<User> list = new ArrayList<>();
+        for (User u : users) {
+            if (!u.equals(user)) {
+                list.add(u);
+            }
+        }
+        return list.toArray(new User[0]);
+    }
+
+    @Test
+    public void various() {
+        ListPath<Address, QAddress> list = user.addresses;
+        StringPath str = user.lastName;
+        List<Predicate> predicates = new ArrayList<Predicate>();
+        predicates.add(str.between("a", "b"));
+        predicates.add(str.contains("a"));
+        predicates.add(str.containsIgnoreCase("a"));
+        predicates.add(str.endsWith("a"));
+        predicates.add(str.endsWithIgnoreCase("a"));
+        predicates.add(str.eq("a"));
+        predicates.add(str.equalsIgnoreCase("a"));
+        predicates.add(str.goe("a"));
+        predicates.add(str.gt("a"));
+        predicates.add(str.in("a","b","c"));
+        predicates.add(str.isEmpty());
+        predicates.add(str.isNotNull());
+        predicates.add(str.isNull());
+        predicates.add(str.like("a"));
+        predicates.add(str.loe("a"));
+        predicates.add(str.lt("a"));
+        predicates.add(str.matches("a"));
+        predicates.add(str.ne("a"));
+        predicates.add(str.notBetween("a", "b"));
+        predicates.add(str.notIn("a","b","c"));
+        predicates.add(str.startsWith("a"));
+        predicates.add(str.startsWithIgnoreCase("a"));
+        predicates.add(list.isEmpty());
+        predicates.add(list.isNotEmpty());
+
+        for (Predicate predicate : predicates) {
+            long count1 = where(predicate).fetchCount();
+            long count2 = where(predicate.not()).fetchCount();
+            assertEquals(predicate.toString(), 4, count1 + count2);
+        }
+    }
+
+    @Test
+    public void enum_eq() {
+        assertQuery(user.gender.eq(Gender.MALE), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void enum_ne() {
+        assertQuery(user.gender.ne(Gender.MALE));
+    }
+
+    @Test
+    public void in_objectIds() {
+        Item i = new Item();
+        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
+        ds.save(i);
+
+        assertTrue(where(item, item.ctds.contains(i.getCtds().get(0))).fetchCount() > 0);
+        assertTrue(where(item, item.ctds.contains(ObjectId.get())).fetchCount() == 0);
+    }
+
+    @Test
+    public void in_objectIds2() {
+        Item i = new Item();
+        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
+        ds.save(i);
+
+        assertTrue(where(item, item.ctds.any().in(i.getCtds())).fetchCount() > 0);
+        assertTrue(where(item, item.ctds.any().in(Arrays.asList(ObjectId.get(), ObjectId.get()))).fetchCount() == 0);
+    }
+
+    @Test
+    public void size() {
+        assertQuery(user.addresses.size().eq(2), u1);
+    }
+
+    @Test
+    public void size_not() {
+        assertQuery(user.addresses.size().eq(2).not(), u3, u4, u2);
+    }
+
+    @Test
+    public void readPreference() {
+        MorphiaQuery<User> query = query();
+        query.setReadPreference(ReadPreference.primary());
+        assertEquals(4, query.fetchCount());
+    }
+
+    @Test
+    public void asDBObject() {
+        MorphiaQuery<User> query = query();
+        query.where(user.firstName.eq("Bob"), user.lastName.eq("Wilson"));
+        assertEquals(
+                new BasicDBObject().append("firstName", "Bob").append("lastName", "Wilson"),
+                query.asDBObject());
+    }
+
+    @Test
+    public void converter() {
+        Country germany = new Country("Germany", Locale.GERMANY);
+        ds.save(germany);
+
+        Country fetchedCountry = query(Country.class).where(country.defaultLocale.eq(Locale.GERMANY)).fetchOne();
+        assertEquals(germany, fetchedCountry);
+    }
+
+    //TODO
+    // - test dates
+    // - test with empty values and nulls
+    // - test more complex ands
+
+    private void assertQuery(Predicate e, User... expected) {
+        assertQuery(where(e).orderBy(user.lastName.asc(), user.firstName.asc()), expected);
+    }
+
+    private void assertQuery(Predicate e, OrderSpecifier<?> orderBy, User... expected) {
+        assertQuery(where(e).orderBy(orderBy), expected);
+    }
+
+    private <T> MorphiaQuery<T> where(EntityPath<T> entity, Predicate... e) {
+        return new MorphiaQuery<T>(morphia, ds, entity).where(e);
+    }
+
+    private MorphiaQuery<User> where(Predicate... e) {
+        return query().where(e);
+    }
+
+    private MorphiaQuery<User> query() {
+        return new MorphiaQuery<User>(morphia, ds, user);
+    }
+
+    private <T> MorphiaQuery<T> query(EntityPath<T> path) {
+        return new MorphiaQuery<T>(morphia, ds, path);
+    }
+
+
+    private <T> MorphiaQuery<T> query(Class<? extends T> clazz) {
+        return new MorphiaQuery<T>(morphia, ds, clazz);
+    }
+
+    private void assertQuery(MorphiaQuery<User> query, User... expected) {
+        String toString = query.toString();
+        List<User> results = query.fetch();
+
+        assertNotNull(toString, results);
+        if (expected == null) {
+            assertEquals("Should get empty result", 0, results.size());
+            return;
+        }
+        assertEquals(toString, expected.length, results.size());
+        int i = 0;
+        for (User u : expected) {
+            assertEquals(toString, u, results.get(i++));
+        }
+    }
+
+    private User addUser(String first, String last) {
+        User user = new User(first, last);
+        ds.save(user);
+        return user;
+    }
+
+    private User addUser(String first, String last, int age, Address mainAddress, Address... addresses) {
+        User user = new User(first, last, age, new Date());
+        user.setGender(Gender.MALE);
+        user.setMainAddress(mainAddress);
+        for (Address address : addresses) {
+            user.addAddress(address);
+        }
+        for (User u : users) {
+            user.addFriend(u);
+        }
+        if (!users.isEmpty()) {
+            user.setFriend(users.get(users.size() - 1));
+            user.setEnemy(users.get(users.size() - 1));
+        }
+        ds.save(user);
+        users.add(user);
+        return user;
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbSerializerTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbSerializerTest.java
new file mode 100644
index 0000000000..11edf23acb
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbSerializerTest.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.mongodb.domain.*;
+import com.querydsl.mongodb.morphia.MorphiaSerializer;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.mongodb.morphia.Morphia;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class MongodbSerializerTest {
+
+    private PathBuilder<Object> entityPath;
+    private StringPath title;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+
+    private NumberPath<Long> longField;
+    private NumberPath<Short> shortField;
+    private NumberPath<Byte> byteField;
+    private NumberPath<Float> floatField;
+
+    private DatePath<Date> date;
+    private final Date dateVal = new Date();
+    private DateTimePath<Timestamp> dateTime;
+    private final Timestamp dateTimeVal = new Timestamp(System.currentTimeMillis());
+
+    private MongodbSerializer serializer;
+
+    @Before
+    public void before() {
+        serializer = new MorphiaSerializer(new Morphia());
+        entityPath = new PathBuilder<Object>(Object.class, "obj");
+        title = entityPath.getString("title");
+        year = entityPath.getNumber("year", Integer.class);
+        gross = entityPath.getNumber("gross", Double.class);
+        longField = entityPath.getNumber("longField", Long.class);
+        shortField = entityPath.getNumber("shortField", Short.class);
+        byteField = entityPath.getNumber("byteField", Byte.class);
+        floatField = entityPath.getNumber("floatField", Float.class);
+        date = entityPath.getDate("date", Date.class);
+        dateTime = entityPath.getDateTime("dateTime", Timestamp.class);
+    }
+
+    @Test
+    public void paths() {
+        QUser user = QUser.user;
+        assertEquals("user", serializer.visit(user, null));
+        assertEquals("addresses", serializer.visit(user.addresses, null));
+        assertEquals("addresses", serializer.visit(user.addresses.any(), null));
+        assertEquals("addresses.street", serializer.visit(user.addresses.any().street, null));
+        assertEquals("firstName", serializer.visit(user.firstName, null));
+    }
+
+    @Test
+    public void propertyAnnotation() {
+        QDummyEntity entity = QDummyEntity.dummyEntity;
+        assertEquals("prop", serializer.visit(entity.property, null));
+    }
+
+    @Test
+    public void indexedAccess() {
+        QUser user = QUser.user;
+        assertEquals("addresses.0.street", serializer.visit(user.addresses.get(0).street, null));
+    }
+
+    @Test
+    public void collectionAny() {
+        QUser user = QUser.user;
+        assertQuery(user.addresses.any().street.eq("Aakatu"), dbo("addresses.street", "Aakatu"));
+    }
+
+    @Test
+    public void collectionIsEmpty() {
+        BasicDBObject expected = dbo("$or",
+                dblist(
+                        dbo("addresses", dblist()),
+                        dbo("addresses",
+                                dbo("$exists", false))));
+        assertQuery(QUser.user.addresses.isEmpty(), expected);
+    }
+
+    @Test
+    public void collectionIsNotEmpty() {
+        BasicDBObject expected = dbo("$nor",
+                dblist(
+                        dbo("addresses", dblist()),
+                        dbo("addresses",
+                                dbo("$exists", false))));
+        assertQuery(QUser.user.addresses.isNotEmpty(), expected);
+    }
+
+    @Test
+    public void equals() {
+        assertQuery(title.eq("A"), dbo("title", "A"));
+        assertQuery(year.eq(1), dbo("year", 1));
+        assertQuery(gross.eq(1.0D), dbo("gross", 1.0D));
+        assertQuery(longField.eq(1L), dbo("longField", 1L));
+        assertQuery(shortField.eq((short) 1), dbo("shortField", 1));
+        assertQuery(byteField.eq((byte) 1), dbo("byteField", (byte) 1));
+        assertQuery(floatField.eq(1.0F), dbo("floatField", 1.0F));
+
+        assertQuery(date.eq(dateVal), dbo("date", dateVal));
+        assertQuery(dateTime.eq(dateTimeVal), dbo("dateTime", dateTimeVal));
+    }
+
+    @Test
+    public void eqAndEq() {
+        assertQuery(
+                title.eq("A").and(year.eq(1)),
+                dbo("title", "A").append("year", 1)
+        );
+
+        assertQuery(
+                title.eq("A").and(year.eq(1).and(gross.eq(1.0D))),
+                dbo("title", "A").append("year", 1).append("gross", 1.0D)
+        );
+    }
+
+    @Test
+    public void notEq() {
+        assertQuery(title.ne("A"), dbo("title", dbo("$ne", "A")));
+    }
+
+    @Test
+    public void between() {
+        assertQuery(year.between(1, 10), dbo("year", dbo("$gte", 1).append("$lte", 10)));
+    }
+
+    @Test
+    public void lessAndGreaterAndBetween() {
+        assertQuery(title.lt("A"), dbo("title", dbo("$lt", "A")));
+        assertQuery(year.gt(1), dbo("year", dbo("$gt", 1)));
+
+        assertQuery(title.loe("A"), dbo("title", dbo("$lte", "A")));
+        assertQuery(year.goe(1), dbo("year", dbo("$gte", 1)));
+
+        assertQuery(
+                year.gt(1).and(year.lt(10)),
+                dbo("$and", dblist(
+                        dbo("year", dbo("$gt", 1)),
+                        dbo("year", dbo("$lt", 10))))
+        );
+
+        assertQuery(
+                year.between(1, 10),
+                dbo("year", dbo("$gte", 1).append("$lte", 10))
+        );
+    }
+
+    @Test
+    public void in() {
+        assertQuery(year.in(1, 2, 3), dbo("year", dbo("$in", 1, 2, 3)));
+    }
+
+    @Test
+    public void notIn() {
+        assertQuery(year.in(1, 2, 3).not(), dbo("year", dbo("$nin", 1, 2, 3)));
+        assertQuery(year.notIn(1, 2, 3), dbo("year", dbo("$nin", 1, 2, 3)));
+    }
+
+    @Test
+    public void orderBy() {
+        DBObject orderBy = serializer.toSort(sortList(year.asc()));
+        assertEquals(dbo("year", 1), orderBy);
+
+        orderBy = serializer.toSort(sortList(year.desc()));
+        assertEquals(dbo("year", -1), orderBy);
+
+        orderBy = serializer.toSort(sortList(year.desc(), title.asc()));
+        assertEquals(dbo("year", -1).append("title", 1), orderBy);
+    }
+
+    @Test
+    public void regexCases() {
+        assertQuery(title.startsWith("A"),
+                dbo("title", dbo("$regex", "^\\QA\\E").append("$options", "")));
+        assertQuery(title.startsWithIgnoreCase("A"),
+                dbo("title", dbo("$regex", "^\\QA\\E").append("$options", "i")));
+
+        assertQuery(title.endsWith("A"),
+                dbo("title", dbo("$regex", "\\QA\\E$").append("$options", "")));
+        assertQuery(title.endsWithIgnoreCase("A"),
+                dbo("title", dbo("$regex", "\\QA\\E$").append("$options", "i")));
+
+        assertQuery(title.equalsIgnoreCase("A"),
+                dbo("title", dbo("$regex", "^\\QA\\E$").append("$options", "i")));
+
+        assertQuery(title.contains("A"),
+                dbo("title", dbo("$regex", ".*\\QA\\E.*").append("$options", "")));
+        assertQuery(title.containsIgnoreCase("A"),
+                dbo("title", dbo("$regex", ".*\\QA\\E.*").append("$options", "i")));
+
+        assertQuery(title.matches(".*A^"),
+                dbo("title", dbo("$regex", ".*A^").append("$options", "")));
+
+    }
+
+    @Test
+    public void and() {
+        assertQuery(
+                title.startsWithIgnoreCase("a").and(title.endsWithIgnoreCase("b")),
+
+                dbo("$and", dblist(
+                        dbo("title", dbo("$regex", "^\\Qa\\E").append("$options", "i")),
+                        dbo("title", dbo("$regex", "\\Qb\\E$").append("$options", "i")))));
+
+    }
+
+    @Test
+    public void near() {
+        assertQuery(MongodbExpressions.near(new Point("point"), 1.0, 2.0),
+                dbo("point", dbo("$near", dblist(1.0, 2.0))));
+    }
+
+    @Test
+    public void near_sphere() {
+        assertQuery(MongodbExpressions.nearSphere(new Point("point"), 1.0, 2.0),
+                dbo("point", dbo("$nearSphere", dblist(1.0, 2.0))));
+    }
+
+    @Test
+    public void all() {
+        QItem item = QItem.item;
+        List<ObjectId> objectIds = new ArrayList<>();
+        ObjectId objectId1 = new ObjectId();
+        ObjectId objectId2 = new ObjectId();
+
+        objectIds.add(objectId1);
+        objectIds.add(objectId2);
+
+        assertQuery(
+                MongodbExpressions.all(item.ctds, objectIds),
+                dbo("ctds", dbo("$all", dblist(objectId1, objectId2)))
+        );
+    }
+
+    @Test
+    public void not() {
+        assertQuery(title.eq("A").not(), dbo("title", dbo("$ne", "A")));
+
+        assertQuery(title.lt("A").not().and(year.ne(1800)),
+                dbo("title", dbo("$not", dbo("$lt", "A"))).
+                        append("year", dbo("$ne", 1800)));
+    }
+
+    @Test
+    public void objectId() {
+        ObjectId id = new ObjectId();
+        QPerson person = QPerson.person;
+        assertQuery(person.id.eq(id), dbo("_id", id));
+        assertQuery(person.addressId.eq(id), dbo("addressId", id));
+    }
+
+    @Test
+    public void path() {
+        QUser user = QUser.user;
+        assertEquals("firstName", serializer.visit(user.firstName, null));
+        assertEquals("firstName", serializer.visit(user.as(QUser.class).firstName, null));
+        assertEquals("mainAddress.street", serializer.visit(user.mainAddress().street, null));
+        assertEquals("mainAddress.street", serializer.visit(user.mainAddress().as(QAddress.class).street, null));
+    }
+
+    private List<OrderSpecifier<?>> sortList(OrderSpecifier<?>... order) {
+        return Arrays.asList(order);
+    }
+
+    private void assertQuery(Expression<?> e, BasicDBObject expected) {
+        BasicDBObject result = (BasicDBObject) serializer.handle(e);
+        assertEquals(expected.toString(), result.toString());
+    }
+
+    public static BasicDBObject dbo(String key, Object... value) {
+        if (value.length == 1) {
+            return new BasicDBObject(key, value[0]);
+        }
+        return new BasicDBObject(key, value);
+    }
+
+    public static BasicDBList dblist(Object... contents) {
+        BasicDBList list = new BasicDBList();
+        list.addAll(Arrays.asList(contents));
+        return list;
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java
new file mode 100644
index 0000000000..ebb791edbf
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.apt.morphia.MorphiaAnnotationProcessor;
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.core.Entity;
+import com.querydsl.core.types.Expression;
+
+public class PackageVerification {
+
+    @Test
+    public void verify_package() throws Exception {
+        String version = System.getProperty("version");
+        verify(new File("target/querydsl-mongodb-" + version + "-apt-one-jar.jar"));
+    }
+
+    private void verify(File oneJar) throws Exception {
+        assertTrue(oneJar.getPath() + " doesn't exist", oneJar.exists());
+        // verify classLoader
+        URLClassLoader oneJarClassLoader = new URLClassLoader(new URL[]{oneJar.toURI().toURL()});
+        oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core
+        oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen
+        oneJarClassLoader.loadClass(CodegenModule.class.getName()).newInstance();
+        oneJarClassLoader.loadClass(Entity.class.getName()); // morphia
+        Class cl = oneJarClassLoader.loadClass(MorphiaAnnotationProcessor.class.getName()); // querydsl-apt
+        cl.newInstance();
+        String resourceKey = "META-INF/services/javax.annotation.processing.Processor";
+        assertEquals(MorphiaAnnotationProcessor.class.getName(), new String(Files.readAllBytes(Paths.get(oneJarClassLoader.findResource(resourceKey).toURI())), StandardCharsets.UTF_8));
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PolymorphicCollectionTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PolymorphicCollectionTest.java
new file mode 100644
index 0000000000..42deb8a15f
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PolymorphicCollectionTest.java
@@ -0,0 +1,79 @@
+package com.querydsl.mongodb;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.UnknownHostException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Morphia;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.querydsl.core.testutil.MongoDB;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.mongodb.domain.*;
+import com.querydsl.mongodb.morphia.MorphiaQuery;
+
+@Category(MongoDB.class)
+public class PolymorphicCollectionTest {
+
+    private final Morphia morphia;
+    private final Datastore ds;
+    private final Fish f1 = new Fish("f1");
+    private final Fish f2 = new Fish("f2");
+    private final Chips c1 = new Chips("c1");
+
+    public PolymorphicCollectionTest() throws UnknownHostException, MongoException {
+        final MongoClient mongo = new MongoClient();
+        morphia = new Morphia().map(Food.class);
+        ds = morphia.createDatastore(mongo, "testdb");
+    }
+
+    @Before
+    public void before() throws UnknownHostException, MongoException {
+        ds.delete(ds.createQuery(Food.class));
+        ds.save(f1, f2, c1);
+    }
+
+    @Test
+    public void basicCount() {
+        assertEquals(where().fetchCount(), 3);
+    }
+
+    @Test
+    public void countFishFromName() {
+        assertEquals(where(QFood.food.name.eq("f1")).fetchCount(), 1);
+    }
+
+    @Test
+    public void countFishFromNameAndBreed() {
+        assertEquals(where(QFood.food.name.eq("f1")
+            .and(QFish.fish.breed.eq("unknown"))).fetchCount(), 1);
+    }
+
+    @Test
+    public void countFishFromNameAndBreedWithCast() {
+        assertEquals(where(QFood.food.name.eq("f1")
+                .and(QFood.food.as(QFish.class).breed.eq("unknown"))).fetchCount(), 1);
+    }
+
+    @Test
+    public void countFishes() {
+        assertEquals(where(isFish()).fetchCount(), 2);
+    }
+
+    private Predicate isFish() {
+        return QFood.food.name.startsWith("f");
+    }
+
+    private MorphiaQuery<Food> query() {
+        return new MorphiaQuery<Food>(morphia, ds, QFood.food);
+    }
+
+    private MorphiaQuery<Food> where(final Predicate... e) {
+        return query().where(e);
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbDocumentSerializerTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbDocumentSerializerTest.java
new file mode 100644
index 0000000000..7d64c92719
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbDocumentSerializerTest.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import static org.junit.Assert.*;
+
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import com.mongodb.DBRef;
+import com.querydsl.core.types.Path;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.mongodb.Point;
+import com.querydsl.mongodb.domain.QAddress;
+import com.querydsl.mongodb.domain.QPerson;
+import com.querydsl.mongodb.domain.QUser;
+
+public class MongodbDocumentSerializerTest {
+
+    private PathBuilder<Object> entityPath;
+    private StringPath title;
+    private NumberPath<Integer> year;
+    private NumberPath<Double> gross;
+
+    private NumberPath<Long> longField;
+    private NumberPath<Short> shortField;
+    private NumberPath<Byte> byteField;
+    private NumberPath<Float> floatField;
+
+    private DatePath<Date> date;
+    private final Date dateVal = new Date();
+    private DateTimePath<Timestamp> dateTime;
+    private final Timestamp dateTimeVal = new Timestamp(System.currentTimeMillis());
+
+    private MongodbDocumentSerializer serializer;
+
+    @Before
+    public void before() {
+        serializer = new MongodbDocumentSerializer() {
+            @Override
+            protected DBRef asReference(Object constant) {
+                return null;
+            }
+
+            @Override
+            protected boolean isReference(Path<?> arg) {
+                return false;
+            }
+        };
+
+        entityPath = new PathBuilder<Object>(Object.class, "obj");
+        title = entityPath.getString("title");
+        year = entityPath.getNumber("year", Integer.class);
+        gross = entityPath.getNumber("gross", Double.class);
+        longField = entityPath.getNumber("longField", Long.class);
+        shortField = entityPath.getNumber("shortField", Short.class);
+        byteField = entityPath.getNumber("byteField", Byte.class);
+        floatField = entityPath.getNumber("floatField", Float.class);
+        date = entityPath.getDate("date", Date.class);
+        dateTime = entityPath.getDateTime("dateTime", Timestamp.class);
+    }
+
+    @Test
+    public void paths() {
+        QUser user = QUser.user;
+        assertEquals("user", serializer.visit(user, null));
+        assertEquals("addresses", serializer.visit(user.addresses, null));
+        assertEquals("addresses", serializer.visit(user.addresses.any(), null));
+        assertEquals("addresses.street", serializer.visit(user.addresses.any().street, null));
+        assertEquals("firstName", serializer.visit(user.firstName, null));
+    }
+
+    @Test
+    public void indexedAccess() {
+        QUser user = QUser.user;
+        assertEquals("addresses.0.street", serializer.visit(user.addresses.get(0).street, null));
+    }
+
+    @Test
+    public void collectionAny() {
+        QUser user = QUser.user;
+        assertQuery(user.addresses.any().street.eq("Aakatu"), document("addresses.street","Aakatu"));
+    }
+
+    @Test
+    public void collectionIsEmpty() {
+        Document expected = document("$or",
+            Arrays.asList(
+                document("addresses", Collections.emptyList()),
+                document("addresses",
+                    document("$exists", false))));
+        assertQuery(QUser.user.addresses.isEmpty(), expected);
+    }
+
+    @Test
+    public void collectionIsNotEmpty() {
+        Document expected = document("$nor",
+            Arrays.asList(
+                document("addresses", Collections.emptyList()),
+                document("addresses",
+                    document("$exists", false))));
+        assertQuery(QUser.user.addresses.isNotEmpty(), expected);
+    }
+
+    @Test
+    public void equals() {
+        assertQuery(title.eq("A"), document("title","A"));
+        assertQuery(year.eq(1), document("year",1));
+        assertQuery(gross.eq(1.0D), document("gross", 1.0D));
+        assertQuery(longField.eq(1L), document("longField", 1L));
+        assertQuery(shortField.eq((short) 1), document("shortField", 1));
+        assertQuery(byteField.eq((byte) 1), document("byteField", 1));
+        assertQuery(floatField.eq(1.0F), document("floatField", 1.0F));
+
+        assertQuery(date.eq(dateVal), document("date", dateVal));
+    }
+
+    @Test
+    public void eqAndEq() {
+        assertQuery(
+            title.eq("A").and(year.eq(1)),
+            document("title","A").append("year", 1)
+        );
+
+        assertQuery(
+            title.eq("A").and(year.eq(1).and(gross.eq(1.0D))),
+            document("title","A").append("year", 1).append("gross", 1.0D)
+        );
+    }
+
+    @Test
+    public void notEq() {
+        assertQuery(title.ne("A"), document("title", document("$ne", "A")));
+    }
+
+    @Test
+    public void between() {
+        assertQuery(year.between(1, 10), document("year", document("$gte", 1).append("$lte", 10)));
+    }
+
+    @Test
+    public void lessAndGreaterAndBetween() {
+        assertQuery(title.lt("A"), document("title", document("$lt", "A")));
+        assertQuery(year.gt(1), document("year", document("$gt", 1)));
+
+        assertQuery(title.loe("A"), document("title", document("$lte", "A")));
+        assertQuery(year.goe(1), document("year", document("$gte", 1)));
+
+        assertQuery(
+                year.gt(1).and(year.lt(10)),
+                document("$and", Arrays.asList(
+                  document("year", document("$gt", 1)),
+                  document("year", document("$lt", 10))))
+        );
+
+        assertQuery(
+                year.between(1, 10),
+                document("year", document("$gte", 1).append("$lte", 10))
+        );
+    }
+
+    @Test
+    public void in() {
+        assertQuery(year.in(1,2,3), document("year", document("$in", Arrays.asList(1,2,3))));
+    }
+
+    @Test
+    public void notIn() {
+        assertQuery(year.in(1,2,3).not(), document("year", document("$nin", Arrays.asList(1,2,3))));
+        assertQuery(year.notIn(1,2,3), document("year", document("$nin", Arrays.asList(1,2,3))));
+    }
+
+    @Test
+    public void orderBy() {
+        Document orderBy = serializer.toSort(sortList(year.asc()));
+        assertEquals(document("year", 1), orderBy);
+
+        orderBy = serializer.toSort(sortList(year.desc()));
+        assertEquals(document("year", -1), orderBy);
+
+        orderBy = serializer.toSort(sortList(year.desc(), title.asc()));
+        assertEquals(document("year", -1).append("title", 1), orderBy);
+    }
+
+    @Test
+    public void regexCases() {
+        assertQuery(title.startsWith("A"),
+                document("title", Pattern.compile("^\\QA\\E")));
+        assertQuery(title.startsWithIgnoreCase("A"),
+                document("title", Pattern.compile("^\\QA\\E", Pattern.CASE_INSENSITIVE)));
+
+        assertQuery(title.endsWith("A"),
+                document("title", Pattern.compile("\\QA\\E$")));
+        assertQuery(title.endsWithIgnoreCase("A"),
+                document("title", Pattern.compile("\\QA\\E$", Pattern.CASE_INSENSITIVE)));
+
+        assertQuery(title.equalsIgnoreCase("A"),
+                document("title", Pattern.compile("^\\QA\\E$", Pattern.CASE_INSENSITIVE)));
+
+        assertQuery(title.contains("A"),
+                document("title", Pattern.compile(".*\\QA\\E.*")));
+        assertQuery(title.containsIgnoreCase("A"),
+                document("title", Pattern.compile(".*\\QA\\E.*", Pattern.CASE_INSENSITIVE)));
+
+        assertQuery(title.matches(".*A^"),
+                document("title", Pattern.compile(".*A^")));
+    }
+
+    @Test
+    public void and() {
+        assertQuery(
+            title.startsWithIgnoreCase("a").and(title.endsWithIgnoreCase("b")),
+
+            document("$and", Arrays.asList(
+                document("title", document("$regex", "^\\Qa\\E").append("$options", "i")),
+                document("title", document("$regex", "\\Qb\\E$").append("$options", "i")))));
+
+    }
+
+    @Test
+    public void near() {
+        assertQuery(MongodbExpressions.near(new Point("point"), 1.0, 2.0),
+                document("point", document("$near", Arrays.asList(1.0, 2.0))));
+    }
+
+    @Test
+    public void near_sphere() {
+        assertQuery(MongodbExpressions.nearSphere(new Point("point"), 1.0, 2.0),
+                document("point", document("$nearSphere", Arrays.asList(1.0, 2.0))));
+    }
+
+    @Test
+    public void not() {
+        assertQuery(title.eq("A").not(), document("title", document("$ne","A")));
+
+        assertQuery(title.lt("A").not().and(year.ne(1800)),
+                document("title", document("$not", document("$lt","A"))).
+                append("year", document("$ne", 1800)));
+    }
+
+    @Test
+    public void objectId() {
+        ObjectId id = new ObjectId();
+        QPerson person = QPerson.person;
+        assertQuery(person.id.eq(id), document("id",id));
+        assertQuery(person.addressId.eq(id), document("addressId",id));
+    }
+
+    @Test
+    public void path() {
+        QUser user = QUser.user;
+        assertEquals("firstName", serializer.visit(user.firstName, null));
+        assertEquals("firstName", serializer.visit(user.as(QUser.class).firstName, null));
+        assertEquals("mainAddress.street", serializer.visit(user.mainAddress().street, null));
+        assertEquals("mainAddress.street", serializer.visit(user.mainAddress().as(QAddress.class).street, null));
+    }
+
+
+    private List<OrderSpecifier<?>> sortList(OrderSpecifier<?>... order) {
+        return Arrays.asList(order);
+    }
+
+    private void assertQuery(Expression<?> e, Document expected) {
+        Document result = (Document) serializer.handle(e);
+        assertEquals(expected.toJson(), result.toJson());
+    }
+
+    public static Document document(String key, Object... value) {
+        if (value.length == 1) {
+            return new Document(key, value[0]);
+        }
+        return new Document(key, value);
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbQueryTest.java
new file mode 100644
index 0000000000..f7f50dd50a
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/document/MongodbQueryTest.java
@@ -0,0 +1,750 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.document;
+
+import com.mongodb.DBRef;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoException;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.testutil.MongoDB;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.ListPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.mongodb.domain.*;
+import com.querydsl.mongodb.domain.User.Gender;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.Key;
+import org.mongodb.morphia.Morphia;
+import org.mongodb.morphia.annotations.Id;
+import org.mongodb.morphia.annotations.Property;
+import org.mongodb.morphia.annotations.Reference;
+import org.mongodb.morphia.mapping.Mapper;
+
+import java.lang.reflect.AnnotatedElement;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.function.Function;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.*;
+
+@Category(MongoDB.class)
+public class MongodbQueryTest {
+
+    private final MongoClient mongo;
+    private final Morphia morphia;
+    private final MongoDatabase database;
+    private final Datastore ds;
+
+    private final String dbname = "testdb";
+    private final QUser user = QUser.user;
+    private final QItem item = QItem.item;
+    private final QAddress address = QAddress.address;
+    private final QMapEntity mapEntity = QMapEntity.mapEntity;
+    private final QDates dates = QDates.dates;
+    private final QCountry country = QCountry.country;
+
+    List<User> users = new ArrayList<>();
+    List<Document> userDocuments = new ArrayList<>();
+    User user1, user2, user3, user4;
+    Document u1, u2, u3, u4;
+    City tampere, helsinki;
+
+    public MongodbQueryTest() throws UnknownHostException, MongoException {
+        mongo = new MongoClient();
+        morphia = new Morphia().map(User.class).map(Item.class).map(MapEntity.class).map(Dates.class);
+        database = mongo.getDatabase(dbname);
+        ds = morphia.createDatastore(mongo, dbname);
+    }
+
+    @Before
+    public void before() throws UnknownHostException, MongoException {
+        ds.delete(ds.createQuery(Item.class));
+        ds.delete(ds.createQuery(User.class));
+        ds.delete(ds.createQuery(Country.class));
+        ds.delete(ds.createQuery(MapEntity.class));
+
+        tampere = new City("Tampere", 61.30, 23.50);
+        helsinki = new City("Helsinki", 60.15, 20.03);
+
+        user1 = addUser("Jaakko", "Jantunen", 20, new Address("Aakatu", "00100", helsinki),
+                new Address("Aakatu1", "00100", helsinki),
+                new Address("Aakatu2", "00100", helsinki));
+        user2 = addUser("Jaakki", "Jantunen", 30, new Address("Beekatu", "00200", helsinki));
+        user3 = addUser("Jaana", "Aakkonen", 40, new Address("Ceekatu", "00300", tampere));
+        user4 = addUser("Jaana", "BeekkoNen", 50, new Address("Deekatu", "00400", tampere));
+
+        u1 = asDocument(user1);
+        u2 = asDocument(user2);
+        u3 = asDocument(user3);
+        u4 = asDocument(user4);
+
+        // order users by lastname, firstname
+        userDocuments = Arrays.asList(u3, u4, u2, u1);
+    }
+
+    @Test
+    public void query1() {
+        assertEquals(4L, query(user).fetchCount());
+        assertEquals(4L, query(User.class).fetchCount());
+    }
+
+    @Test
+    public void list_keys() {
+        Document u = where(user.firstName.eq("Jaakko")).fetch(user.firstName, user.mainAddress().street).get(0);
+        assertEquals("Jaakko", u.get("firstName"));
+        assertNull(u.get("lastName"));
+        assertEquals("Aakatu", u.get("mainAddress", Document.class).get("street"));
+        assertNull(u.get("mainAddress", Document.class).get("postCode"));
+    }
+
+    @Test
+    public void singleResult_keys() {
+        Document u = where(user.firstName.eq("Jaakko")).fetchFirst(user.firstName);
+        assertEquals("Jaakko", u.get("firstName"));
+        assertNull(u.get("lastName"));
+    }
+
+    @Test
+    public void uniqueResult_keys() {
+        Document u = where(user.firstName.eq("Jaakko")).fetchOne(user.firstName);
+        assertEquals("Jaakko", u.get("firstName"));
+        assertNull(u.get("lastName"));
+    }
+
+    @Test
+    public void list_deep_keys() {
+        Document u = where(user.firstName.eq("Jaakko")).fetchFirst(user.addresses.any().street);
+        List<Document> addresses = u.get("addresses", List.class);
+        for (Document a : addresses) {
+            assertNotNull(a.get("street"));
+            assertNull(a.get("city"));
+        }
+    }
+
+    @Test
+    public void between() {
+        assertQuery(user.age.between(20, 30), u2, u1);
+        assertQuery(user.age.goe(20).and(user.age.loe(30)), u2, u1);
+    }
+
+    @Test
+    public void between_not() {
+        assertQuery(user.age.between(20, 30).not(), u3, u4);
+        assertQuery(user.age.goe(20).and(user.age.loe(30)).not(), u3, u4);
+    }
+
+    @Test
+    public void contains_key() {
+        MapEntity entity = new MapEntity();
+        entity.getProperties().put("key", "value");
+        ds.save(entity);
+
+        assertTrue(query(mapEntity).where(mapEntity.properties.get("key").isNotNull()).fetchCount() > 0);
+        assertFalse(query(mapEntity).where(mapEntity.properties.get("key2").isNotNull()).fetchCount() > 0);
+
+        assertTrue(query(mapEntity).where(mapEntity.properties.containsKey("key")).fetchCount() > 0);
+        assertFalse(query(mapEntity).where(mapEntity.properties.containsKey("key2")).fetchCount() > 0);
+    }
+
+    @Test
+    public void contains_key_not() {
+        MapEntity entity = new MapEntity();
+        entity.getProperties().put("key", "value");
+        ds.save(entity);
+
+        assertFalse(query(mapEntity).where(mapEntity.properties.get("key").isNotNull().not()).fetchCount() > 0);
+        assertTrue(query(mapEntity).where(mapEntity.properties.get("key2").isNotNull().not()).fetchCount() > 0);
+
+        assertFalse(query(mapEntity).where(mapEntity.properties.containsKey("key").not()).fetchCount() > 0);
+        assertTrue(query(mapEntity).where(mapEntity.properties.containsKey("key2").not()).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_ignore_case() {
+        assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko")).fetchCount() > 0);
+        assertFalse(where(user.firstName.equalsIgnoreCase("AaKk")).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_ignore_case_not() {
+        assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko").not()).fetchCount() > 0);
+        assertTrue(where(user.firstName.equalsIgnoreCase("AaKk").not()).fetchCount() > 0);
+    }
+
+    @Test
+    public void equals_and_between() {
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.between(20, 30)), u2, u1);
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.goe(20).and(user.age.loe(30))), u2, u1);
+    }
+
+    @Test
+    public void equals_and_between_not() {
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.between(20, 30)).not(), u3, u4);
+        assertQuery(user.firstName.startsWith("Jaa").and(user.age.goe(20).and(user.age.loe(30))).not(), u3, u4);
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(where(user.firstName.eq("Jaakko")).fetchCount() > 0);
+        assertFalse(where(user.firstName.eq("JaakkoX")).fetchCount() > 0);
+    }
+
+    @Test
+    public void find_by_id() {
+        assertNotNull(where(user.id.eq(user1.getId())).fetchFirst() != null);
+    }
+
+    @Test
+    public void notExists() {
+        assertFalse(where(user.firstName.eq("Jaakko")).fetchCount() == 0);
+        assertTrue(where(user.firstName.eq("JaakkoX")).fetchCount() == 0);
+    }
+
+    @Test
+    public void uniqueResult() {
+        assertEquals("Jantunen", where(user.firstName.eq("Jaakko")).fetchOne().get("lastName"));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResultContract() {
+        where(user.firstName.isNotNull()).fetchOne();
+    }
+
+    @Test
+    public void singleResult() {
+        where(user.firstName.isNotNull()).fetchFirst();
+    }
+
+    @Test
+    public void longPath() {
+        assertEquals(2, query().where(user.mainAddress().city().name.eq("Helsinki")).fetchCount());
+        assertEquals(2, query().where(user.mainAddress().city().name.eq("Tampere")).fetchCount());
+    }
+
+    @Test
+    public void collectionPath() {
+        assertEquals(1, query().where(user.addresses.any().street.eq("Aakatu1")).fetchCount());
+        assertEquals(0, query().where(user.addresses.any().street.eq("akatu")).fetchCount());
+    }
+
+    @Test
+    public void dates() {
+        long current = System.currentTimeMillis();
+        int dayInMillis = 24 * 60 * 60 * 1000;
+        Date start = new Date(current);
+        ds.delete(ds.createQuery(Dates.class));
+        Dates d = new Dates();
+        d.setDate(new Date(current + dayInMillis));
+        ds.save(d);
+        Date end = new Date(current + 2 * dayInMillis);
+
+        Document datesDocument = asDocument(d);
+
+        assertEquals(datesDocument, query(dates).where(dates.date.between(start, end)).fetchFirst());
+        assertEquals(0, query(dates).where(dates.date.between(new Date(0), start)).fetchCount());
+    }
+
+    @Test
+    public void elemMatch() {
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1"}}}
+        assertEquals(1, query().anyEmbedded(user.addresses, address).on(address.street.eq("Aakatu1")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1" , "postCode" : "00100"}}}
+        assertEquals(1, query().anyEmbedded(user.addresses, address)
+                .on(address.street.eq("Aakatu1"), address.postCode.eq("00100")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "akatu"}}}
+        assertEquals(0, query().anyEmbedded(user.addresses, address).on(address.street.eq("akatu")).fetchCount());
+//      { "addresses" : { "$elemMatch" : { "street" : "Aakatu1" , "postCode" : "00200"}}}
+        assertEquals(0, query().anyEmbedded(user.addresses, address)
+                .on(address.street.eq("Aakatu1"), address.postCode.eq("00200")).fetchCount());
+    }
+
+    @Test
+    public void indexedAccess() {
+        assertEquals(1, query().where(user.addresses.get(0).street.eq("Aakatu1")).fetchCount());
+        assertEquals(0, query().where(user.addresses.get(1).street.eq("Aakatu1")).fetchCount());
+    }
+
+    @Test
+    public void count() {
+        assertEquals(4, query().fetchCount());
+    }
+
+    @Test
+    public void order() {
+        List<Document> users = query().orderBy(user.age.asc()).fetch();
+        assertEquals(asList(u1, u2, u3, u4), users);
+
+        users = query().orderBy(user.age.desc()).fetch();
+        assertEquals(asList(u4, u3, u2, u1), users);
+    }
+
+    @Test
+    public void restrict() {
+        assertEquals(asList(u1, u2), query().limit(2).orderBy(user.age.asc()).fetch());
+        assertEquals(asList(u2, u3), query().limit(2).offset(1).orderBy(user.age.asc()).fetch());
+    }
+
+    @Test
+    public void listResults() {
+        QueryResults<Document> results = query().limit(2).orderBy(user.age.asc()).fetchResults();
+        assertEquals(4L, results.getTotal());
+        assertEquals(2, results.getResults().size());
+
+        results = query().offset(2).orderBy(user.age.asc()).fetchResults();
+        assertEquals(4L, results.getTotal());
+        assertEquals(2, results.getResults().size());
+    }
+
+    @Test
+    public void emptyResults() {
+        QueryResults<Document> results = query().where(user.firstName.eq("XXX")).fetchResults();
+        assertEquals(0L, results.getTotal());
+        assertEquals(Collections.emptyList(), results.getResults());
+    }
+
+    @Test
+    public void eqInAndOrderByQueries() {
+        assertQuery(user.firstName.eq("Jaakko"), u1);
+        assertQuery(user.firstName.equalsIgnoreCase("jaakko"), u1);
+        assertQuery(user.lastName.eq("Aakkonen"), u3);
+
+        assertQuery(user.firstName.in("Jaakko", "Teppo"), u1);
+        assertQuery(user.lastName.in("Aakkonen", "BeekkoNen"), u3, u4);
+
+        assertQuery(user.firstName.eq("Jouko"));
+
+        assertQuery(user.firstName.eq("Jaana"), user.lastName.asc(), u3, u4);
+        assertQuery(user.firstName.eq("Jaana"), user.lastName.desc(), u4, u3);
+        assertQuery(user.lastName.eq("Jantunen"), user.firstName.asc(), u2, u1);
+        assertQuery(user.lastName.eq("Jantunen"), user.firstName.desc(), u1, u2);
+
+        assertQuery(user.firstName.eq("Jaana").and(user.lastName.eq("Aakkonen")), u3);
+        //This should produce 'and' also
+        assertQuery(where(user.firstName.eq("Jaana"), user.lastName.eq("Aakkonen")), u3);
+
+        assertQuery(user.firstName.ne("Jaana"), u2, u1);
+    }
+
+    @Test
+    public void regexQueries() {
+        assertQuery(user.firstName.startsWith("Jaan"), u3, u4);
+        assertQuery(user.firstName.startsWith("jaan"));
+        assertQuery(user.firstName.startsWithIgnoreCase("jaan"), u3, u4);
+
+        assertQuery(user.lastName.endsWith("unen"), u2, u1);
+
+        assertQuery(user.lastName.endsWithIgnoreCase("onen"), u3, u4);
+
+        assertQuery(user.lastName.contains("oN"), u4);
+        assertQuery(user.lastName.containsIgnoreCase("on"), u3, u4);
+
+        assertQuery(user.firstName.matches(".*aa.*[^i]$"), u3, u4, u1);
+    }
+
+    @Test
+    public void regexQueries_not() {
+        assertQuery(user.firstName.startsWith("Jaan").not(), u2, u1);
+        assertQuery(user.firstName.startsWith("jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.startsWithIgnoreCase("jaan").not(), u2, u1);
+
+        assertQuery(user.lastName.endsWith("unen").not(), u3, u4);
+
+        assertQuery(user.lastName.endsWithIgnoreCase("onen").not(), u2, u1);
+
+        assertQuery(user.lastName.contains("oN").not(), u3, u2, u1);
+        assertQuery(user.lastName.containsIgnoreCase("on").not(), u2, u1);
+
+        assertQuery(user.firstName.matches(".*aa.*[^i]$").not(), u2);
+    }
+
+    @Test
+    public void like() {
+        assertQuery(user.firstName.like("Jaan"));
+        assertQuery(user.firstName.like("Jaan%"), u3, u4);
+        assertQuery(user.firstName.like("jaan%"));
+
+        assertQuery(user.lastName.like("%unen"), u2, u1);
+    }
+
+    @Test
+    public void like_not() {
+        assertQuery(user.firstName.like("Jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.like("Jaan%").not(), u2, u1);
+        assertQuery(user.firstName.like("jaan%").not(), u3, u4, u2, u1);
+
+        assertQuery(user.lastName.like("%unen").not(), u3, u4);
+    }
+
+    @Test
+    public void likeIgnoreCase() {
+        assertQuery(user.firstName.likeIgnoreCase("JAAN"));
+        assertQuery(user.firstName.likeIgnoreCase("Jaan%"), u3, u4);
+        assertQuery(user.firstName.likeIgnoreCase("JAAN%"), u3, u4);
+        assertQuery(user.firstName.likeIgnoreCase("jaan%"), u3, u4);
+
+        assertQuery(user.lastName.likeIgnoreCase("%unen"), u2, u1);
+        assertQuery(user.lastName.likeIgnoreCase("%UNEN"), u2, u1);
+    }
+
+    @Test
+    public void likeIgnoreCase_not() {
+        assertQuery(user.firstName.likeIgnoreCase("Jaan").not(), u3, u4, u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("Jaan%").not(), u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("JAAN%").not(), u2, u1);
+        assertQuery(user.firstName.likeIgnoreCase("jaan%").not(), u2, u1);
+
+        assertQuery(user.lastName.likeIgnoreCase("%unen").not(), u3, u4);
+        assertQuery(user.lastName.likeIgnoreCase("%UNEN").not(), u3, u4);
+    }
+
+    @Test
+    public void isNotNull() {
+        assertQuery(user.firstName.isNotNull(), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void isNotNull_not() {
+        assertQuery(user.firstName.isNotNull().not());
+    }
+
+    @Test
+    public void isNull() {
+        assertQuery(user.firstName.isNull());
+    }
+
+    @Test
+    public void isNull_not() {
+        assertQuery(user.firstName.isNull().not(), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void isEmpty() {
+        assertQuery(user.firstName.isEmpty());
+        assertQuery(user.friends.isEmpty(), u1);
+    }
+
+    @Test
+    public void isEmpty_not() {
+        assertQuery(user.firstName.isEmpty().not(), u3, u4, u2, u1);
+        assertQuery(user.friends.isEmpty().not(), u3, u4, u2);
+    }
+
+    @Test
+    public void not() {
+        assertQuery(user.firstName.eq("Jaakko").not(), u3, u4, u2);
+        assertQuery(user.firstName.ne("Jaakko").not(), u1);
+        assertQuery(user.firstName.matches("Jaakko").not(), u3, u4, u2);
+        assertQuery(user.friends.isNotEmpty(), u3, u4, u2);
+    }
+
+    @Test
+    public void or() {
+        assertQuery(user.lastName.eq("Aakkonen").or(user.lastName.eq("BeekkoNen")), u3, u4);
+    }
+
+    @Test
+    public void or_not() {
+        assertQuery(user.lastName.eq("Aakkonen").or(user.lastName.eq("BeekkoNen")).not(), u2, u1);
+    }
+
+    @Test
+    public void iterate() {
+        User a = addUser("A", "A");
+        User b = addUser("A1", "B");
+        User c = addUser("A2", "C");
+
+        Iterator<Document> i = where(user.firstName.startsWith("A"))
+                .orderBy(user.firstName.asc())
+                .iterate();
+
+        assertEquals(a.getId(), i.next().get("_id"));
+        assertEquals(b.getId(), i.next().get("_id"));
+        assertEquals(c.getId(), i.next().get("_id"));
+        assertEquals(false, i.hasNext());
+    }
+
+    @Test
+    public void uniqueResultAndLimitAndOffset() {
+        SimpleMongodbQuery q = query().where(user.firstName.startsWith("Ja")).orderBy(user.age.asc());
+        assertEquals(4, q.fetch().size());
+        assertEquals(u1, q.fetch().get(0));
+    }
+
+    @Test
+    public void references() {
+        for (User u : users) {
+            if (u.getFriend() != null) {
+                assertQuery(user.friend().eq(u.getFriend()), asDocument(u));
+            }
+        }
+    }
+
+    @Test
+    public void references2() {
+        for (User u : users) {
+            if (u.getFriend() != null) {
+                assertQuery(user.enemy().eq(u.getEnemy()), asDocument(u));
+            }
+        }
+    }
+
+    @Test
+    public void various() {
+        ListPath<Address, QAddress> list = user.addresses;
+        StringPath str = user.lastName;
+        List<Predicate> predicates = new ArrayList<Predicate>();
+        predicates.add(str.between("a", "b"));
+        predicates.add(str.contains("a"));
+        predicates.add(str.containsIgnoreCase("a"));
+        predicates.add(str.endsWith("a"));
+        predicates.add(str.endsWithIgnoreCase("a"));
+        predicates.add(str.eq("a"));
+        predicates.add(str.equalsIgnoreCase("a"));
+        predicates.add(str.goe("a"));
+        predicates.add(str.gt("a"));
+        predicates.add(str.in("a", "b", "c"));
+        predicates.add(str.isEmpty());
+        predicates.add(str.isNotNull());
+        predicates.add(str.isNull());
+        predicates.add(str.like("a"));
+        predicates.add(str.loe("a"));
+        predicates.add(str.lt("a"));
+        predicates.add(str.matches("a"));
+        predicates.add(str.ne("a"));
+        predicates.add(str.notBetween("a", "b"));
+        predicates.add(str.notIn("a", "b", "c"));
+        predicates.add(str.startsWith("a"));
+        predicates.add(str.startsWithIgnoreCase("a"));
+        predicates.add(list.isEmpty());
+        predicates.add(list.isNotEmpty());
+
+        for (Predicate predicate : predicates) {
+            long count1 = where(predicate).fetchCount();
+            long count2 = where(predicate.not()).fetchCount();
+            assertEquals(predicate.toString(), 4, count1 + count2);
+        }
+    }
+
+    @Test
+    public void enum_eq() {
+        assertQuery(user.gender.eq(Gender.MALE), u3, u4, u2, u1);
+    }
+
+    @Test
+    public void enum_ne() {
+        assertQuery(user.gender.ne(Gender.MALE));
+    }
+
+    @Test
+    public void in_objectIds() {
+        Item i = new Item();
+        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
+        ds.save(i);
+
+        assertTrue(where(item, item.ctds.contains(i.getCtds().get(0))).fetchCount() > 0);
+        assertTrue(where(item, item.ctds.contains(ObjectId.get())).fetchCount() == 0);
+    }
+
+    @Test
+    public void in_objectIds2() {
+        Item i = new Item();
+        i.setCtds(Arrays.asList(ObjectId.get(), ObjectId.get(), ObjectId.get()));
+        ds.save(i);
+
+        assertTrue(where(item, item.ctds.any().in(i.getCtds())).fetchCount() > 0);
+        assertTrue(where(item, item.ctds.any().in(Arrays.asList(ObjectId.get(), ObjectId.get()))).fetchCount() == 0);
+    }
+
+    @Test
+    public void size() {
+        assertQuery(user.addresses.size().eq(2), u1);
+    }
+
+    @Test
+    public void size_not() {
+        assertQuery(user.addresses.size().eq(2).not(), u3, u4, u2);
+    }
+
+    @Test
+    public void readPreference() {
+        SimpleMongodbQuery query = query();
+        query.setReadPreference(ReadPreference.primary());
+        assertEquals(4, query.fetchCount());
+    }
+
+    @Test
+    public void asDBObject() {
+        SimpleMongodbQuery query = query();
+        query.where(user.firstName.eq("Bob"), user.lastName.eq("Wilson"));
+        assertEquals(
+                new Document().append("firstName", "Bob").append("lastName", "Wilson"),
+                query.asDocument());
+    }
+
+    private Document asDocument(AbstractEntity entity) {
+        return database.getCollection(ds.getCollection(entity.getClass()).getName())
+                .find(new Document("_id", entity.getId())).first();
+    }
+
+    private void assertQuery(Predicate e, Document... expected) {
+        assertQuery(where(e).orderBy(user.lastName.asc(), user.firstName.asc()), expected);
+    }
+
+    private void assertQuery(Predicate e, OrderSpecifier<?> orderBy, Document... expected) {
+        assertQuery(where(e).orderBy(orderBy), expected);
+    }
+
+    private <T> SimpleMongodbQuery where(EntityPath<T> entity, Predicate... e) {
+        return new SimpleMongodbQuery(morphia, ds, entity.getType(), database).where(e);
+    }
+
+    private SimpleMongodbQuery where(Predicate... e) {
+        return query().where(e);
+    }
+
+    private SimpleMongodbQuery query() {
+        return new SimpleMongodbQuery(morphia, ds, user.getType(), database);
+    }
+
+    private <T> SimpleMongodbQuery query(EntityPath<T> path) {
+        return new SimpleMongodbQuery(morphia, ds, path.getType(), database);
+    }
+
+    private <T> SimpleMongodbQuery query(Class<? extends T> clazz) {
+        return new SimpleMongodbQuery(morphia, ds, clazz, database);
+    }
+
+    private void assertQuery(SimpleMongodbQuery query, Document... expected) {
+        String toString = query.toString();
+        List<Document> results = query.fetch();
+
+        assertNotNull(toString, results);
+        if (expected == null) {
+            assertEquals("Should get empty result", 0, results.size());
+            return;
+        }
+        assertEquals(toString, expected.length, results.size());
+        int i = 0;
+        for (Document u : expected) {
+            assertEquals(toString, u, results.get(i++));
+        }
+    }
+
+    private User addUser(String first, String last) {
+        User user = new User(first, last);
+        ds.save(user);
+        return user;
+    }
+
+    private User addUser(String first, String last, int age, Address mainAddress, Address... addresses) {
+        User user = new User(first, last, age, new Date());
+        user.setGender(Gender.MALE);
+        user.setMainAddress(mainAddress);
+        for (Address address : addresses) {
+            user.addAddress(address);
+        }
+        for (User u : users) {
+            user.addFriend(u);
+        }
+        if (!users.isEmpty()) {
+            user.setFriend(users.get(users.size() - 1));
+            user.setEnemy(users.get(users.size() - 1));
+        }
+        ds.save(user);
+        users.add(user);
+
+        return user;
+    }
+
+    private static class SimpleMongodbQuery extends AbstractFetchableMongodbQuery<Document, SimpleMongodbQuery> {
+
+        private final Datastore datastore;
+        private final MongoDatabase database;
+
+        SimpleMongodbQuery(final Morphia morphia, final Datastore datastore, final Class<?> entityType,
+                           final MongoDatabase database) {
+            super(database.getCollection(datastore.getCollection(entityType).getName()), Function.identity(),
+                    new SampleSerializer(morphia));
+            this.datastore = datastore;
+            this.database = database;
+        }
+
+        @Override
+        protected MongoCollection<Document> getCollection(Class<?> type) {
+            return database.getCollection(datastore.getCollection(type).getName());
+        }
+    }
+
+    static class SampleSerializer extends MongodbDocumentSerializer {
+        private final Morphia morphia;
+
+        SampleSerializer(Morphia morphia) {
+            this.morphia = morphia;
+        }
+
+        @Override
+        protected boolean isReference(Path<?> arg) {
+            return arg.getAnnotatedElement().isAnnotationPresent(Reference.class);
+        }
+
+        @Override
+        protected DBRef asReference(Object constant) {
+            Key<?> key = morphia.getMapper().getKey(constant);
+            return morphia.getMapper().keyToDBRef(key);
+        }
+
+        @Override
+        protected DBRef asReferenceKey(Class<?> entity, Object id) {
+            String collection = morphia.getMapper().getCollectionName(entity);
+            Key<?> key = new Key<Object>(entity, collection, id);
+            return morphia.getMapper().keyToDBRef(key);
+        }
+
+        @Override
+        protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
+            AnnotatedElement annotations = expr.getAnnotatedElement();
+            if (annotations.isAnnotationPresent(Id.class)) {
+                Path<?> parent = expr.getMetadata().getParent();
+                if (parent.getAnnotatedElement().isAnnotationPresent(Reference.class)) {
+                    return null; // go to parent
+                } else {
+                    return "_id";
+                }
+            } else if (annotations.isAnnotationPresent(Property.class)) {
+                Property property = annotations.getAnnotation(Property.class);
+                if (!property.value().equals(Mapper.IGNORED_FIELDNAME)) {
+                    return property.value();
+                }
+            } else if (annotations.isAnnotationPresent(Reference.class)) {
+                Reference reference = annotations.getAnnotation(Reference.class);
+                if (!reference.value().equals(Mapper.IGNORED_FIELDNAME)) {
+                    return reference.value();
+                }
+            }
+            return super.getKeyForPath(expr, metadata);
+        }
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/AbstractEntity.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/AbstractEntity.java
new file mode 100644
index 0000000000..55697a5fc7
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/AbstractEntity.java
@@ -0,0 +1,54 @@
+package com.querydsl.mongodb.domain;
+
+import org.bson.types.ObjectId;
+import org.mongodb.morphia.annotations.Id;
+
+import com.querydsl.core.annotations.QuerySupertype;
+
+@QuerySupertype
+public abstract class AbstractEntity {
+
+    @Id
+    private ObjectId id;
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(ObjectId id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        AbstractEntity other = (AbstractEntity) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        return true;
+    }
+
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Address.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Address.java
new file mode 100644
index 0000000000..19c90ce7b5
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Address.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Embedded;
+
+public final class Address {
+
+    public Address() {
+
+    }
+
+    public Address(String street, String postCode, City city) {
+        this.street = street; this.postCode = postCode; this.city = city;
+    }
+
+    public String street;
+
+    public String postCode;
+
+    @Embedded
+    public City city;
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Chips.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Chips.java
new file mode 100644
index 0000000000..192d819116
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Chips.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity("food")
+public class Chips extends Food {
+
+    public Chips(final String name) {
+        super(name);
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/City.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/City.java
new file mode 100644
index 0000000000..baaba321bf
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/City.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+
+public final class City {
+
+    public City() { }
+
+    public City(String name, Double latitude, Double longitude) {
+        this.name = name;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    public String name;
+
+    public Double latitude;
+
+    public Double longitude;
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Country.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Country.java
new file mode 100644
index 0000000000..afac00143c
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Country.java
@@ -0,0 +1,29 @@
+package com.querydsl.mongodb.domain;
+
+import java.util.Locale;
+
+import org.mongodb.morphia.annotations.Converters;
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity
+@Converters(LocaleConverter.class)
+public class Country extends AbstractEntity {
+    private String name;
+    private Locale defaultLocale;
+
+    Country() { }
+
+    public Country(String name, Locale defaultLocale) {
+        this.name = name;
+        this.defaultLocale = defaultLocale;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Locale getDefaultLocale() {
+        return defaultLocale;
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Dates.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Dates.java
similarity index 87%
rename from querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Dates.java
rename to querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Dates.java
index 1f718b900f..6c4927b35a 100644
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/Dates.java
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Dates.java
@@ -1,4 +1,4 @@
-package com.mysema.query.mongodb.domain;
+package com.querydsl.mongodb.domain;
 
 import java.util.Date;
 
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/DummyEntity.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/DummyEntity.java
new file mode 100644
index 0000000000..cae09a2ed5
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/DummyEntity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Entity;
+import org.mongodb.morphia.annotations.Property;
+
+@Entity
+public class DummyEntity extends AbstractEntity {
+
+    @Property("prop")
+    private String property;
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Fish.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Fish.java
new file mode 100644
index 0000000000..95098dce95
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Fish.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity("food")
+public class Fish extends Food {
+
+    private final String breed;
+
+    public Fish(final String name) {
+        super(name);
+        this.breed = "unknown";
+    }
+
+    public Fish(final String name, final String breed) {
+        super(name);
+        this.breed = breed;
+    }
+
+    public String getBreed() {
+        return breed;
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Food.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Food.java
new file mode 100644
index 0000000000..4bb0f7c43c
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Food.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity("food")
+public class Food extends AbstractEntity {
+    private final String name;
+
+    public Food(final String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/GeoEntity.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/GeoEntity.java
new file mode 100644
index 0000000000..fea700183b
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/GeoEntity.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import org.mongodb.morphia.annotations.Entity;
+import org.mongodb.morphia.annotations.Field;
+import org.mongodb.morphia.annotations.Index;
+import org.mongodb.morphia.annotations.Indexes;
+import org.mongodb.morphia.utils.IndexType;
+
+
+@Entity
+@Indexes({@Index(fields = @Field(value = "location", type = IndexType.GEO2D))})
+public class GeoEntity extends AbstractEntity {
+
+    private Double[] location;
+
+    public GeoEntity(double l1, double l2) {
+        location = new Double[]{l1, l2};
+    }
+
+    public GeoEntity() { }
+
+    public Double[] getLocation() {
+        return location;
+    }
+
+    public void setLocation(Double[] location) {
+        this.location = location;
+    }
+
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Item.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Item.java
new file mode 100644
index 0000000000..1fda09d0c6
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Item.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import java.util.List;
+
+import org.bson.types.ObjectId;
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity
+public class Item extends AbstractEntity {
+
+    private List<ObjectId> ctds;
+
+    public List<ObjectId> getCtds() {
+        return ctds;
+    }
+
+    public void setCtds(List<ObjectId> ctds) {
+        this.ctds = ctds;
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/LocaleConverter.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/LocaleConverter.java
new file mode 100644
index 0000000000..97e2f2c2e4
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/LocaleConverter.java
@@ -0,0 +1,38 @@
+package com.querydsl.mongodb.domain;
+
+import java.util.Locale;
+
+import org.mongodb.morphia.converters.SimpleValueConverter;
+import org.mongodb.morphia.converters.TypeConverter;
+import org.mongodb.morphia.mapping.MappedField;
+import org.mongodb.morphia.mapping.MappingException;
+
+public class LocaleConverter extends TypeConverter implements SimpleValueConverter {
+
+    public LocaleConverter() {
+        super(Locale.class);
+    }
+
+    @Override
+    public final Object encode(Object value, MappedField optionalExtraInfo) throws MappingException {
+        if (value == null) {
+            return null;
+        }
+        if (!(value instanceof Locale)) {
+            throw new MappingException("Unable to convert " + value.getClass().getName());
+        }
+        return ((Locale) value).toLanguageTag();
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public Locale decode(Class targetClass, Object fromDBObject, MappedField optionalExtraInfo) throws MappingException {
+        if (fromDBObject == null) {
+            return null;
+        }
+        if (fromDBObject instanceof String) {
+            return Locale.forLanguageTag((String) fromDBObject);
+        }
+        throw new MappingException("Unable to convert " + fromDBObject.getClass().getName());
+    }
+}
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/MapEntity.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/MapEntity.java
similarity index 91%
rename from querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/MapEntity.java
rename to querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/MapEntity.java
index cd64350564..4a9627990a 100644
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain/MapEntity.java
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/MapEntity.java
@@ -1,4 +1,4 @@
-package com.mysema.query.mongodb.domain;
+package com.querydsl.mongodb.domain;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,5 +19,5 @@ public Map<String, String> getProperties() {
     public void setProperties(Map<String, String> properties) {
         this.properties = properties;
     }
-    
+
 }
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Person.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Person.java
new file mode 100644
index 0000000000..4e3a637fd4
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/Person.java
@@ -0,0 +1,16 @@
+package com.querydsl.mongodb.domain;
+
+import org.bson.types.ObjectId;
+import org.mongodb.morphia.annotations.Entity;
+import org.mongodb.morphia.annotations.Id;
+
+@Entity
+class Person {
+   @Id
+   public ObjectId id;
+
+   public String name;
+
+   // manual reference to an address
+   public ObjectId addressId;
+}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/User.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/User.java
new file mode 100644
index 0000000000..74f693265e
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/User.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.mongodb.morphia.annotations.Embedded;
+import org.mongodb.morphia.annotations.Entity;
+import org.mongodb.morphia.annotations.Reference;
+
+@Entity
+public class User extends AbstractEntity {
+
+    public enum Gender { MALE, FEMALE }
+
+    private String firstName;
+
+    private String lastName;
+
+    private Date created;
+
+    private Gender gender;
+
+    @Embedded
+    private final List<Address> addresses = new ArrayList<Address>();
+
+    @Embedded
+    private Address mainAddress;
+
+    @Reference
+    private final List<User> friends = new ArrayList<User>();
+
+    @Reference
+    private User friend;
+
+    @Reference("enemyRef")
+    private User enemy;
+
+    private int age;
+
+    public User() {
+    }
+
+    public User(String firstName, String lastName, User friend) {
+        this(firstName, lastName);
+        this.friend = friend;
+    }
+
+    public User(String firstName, String lastName) {
+        this.firstName = firstName; this.lastName = lastName;
+        this.created = new Date();
+    }
+
+    public User(String firstName, String lastName, int age, Date created) {
+        this.firstName = firstName; this.lastName = lastName; this.age = age; this.created = created;
+    }
+
+    @Override
+    public String toString() {
+        return "TestUser [id=" + getId() + ", firstName=" + firstName + ", lastName=" + lastName
+                + "]";
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public Address getMainAddress() {
+        return mainAddress;
+    }
+
+    public void setMainAddress(Address mainAddress) {
+        this.mainAddress = mainAddress;
+    }
+
+    public void setMainAddress(String street, String postCode, City city) {
+        this.mainAddress = new Address(street, postCode, city);
+    }
+
+    public User addAddress(Address address) {
+        addresses.add(address);
+        return this;
+    }
+
+    public User addAddress(String street, String postalCode, City city) {
+        addresses.add(new Address(street, postalCode, city));
+        return this;
+    }
+
+    public List<Address> getAddresses() {
+        return addresses;
+    }
+
+    public User addFriend(User friend) {
+        friends.add(friend);
+        return this;
+    }
+
+    public List<User> getFriends() {
+        return friends;
+    }
+
+    public Gender getGender() {
+        return gender;
+    }
+
+    public void setGender(Gender gender) {
+        this.gender = gender;
+    }
+
+    public User getFriend() {
+        return friend;
+    }
+
+    public void setFriend(User friend) {
+        this.friend = friend;
+    }
+
+    public User getEnemy() {
+        return enemy;
+    }
+
+    public void setEnemy(User enemy) {
+        this.enemy = enemy;
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/UserTest.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/UserTest.java
new file mode 100644
index 0000000000..6f13b882c8
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/UserTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.bson.types.ObjectId;
+import org.junit.Test;
+import org.mongodb.morphia.Morphia;
+
+public class UserTest {
+
+    private static final Morphia morphia = new Morphia().map(User.class);
+
+    @Test
+    public void map() {
+        City tampere = new City("Tampere", 61.30, 23.50);
+
+        User user = new User();
+        user.setAge(12);
+        user.setFirstName("Jaakko");
+        user.addAddress("Aakatu", "00300", tampere);
+
+        assertNotNull(morphia.toDBObject(user));
+    }
+
+    @Test
+    public void friend() {
+        User friend = new User();
+        friend.setId(ObjectId.createFromLegacyFormat(1,2,3));
+
+        User user = new User();
+        user.setFriend(friend);
+
+        assertNotNull(morphia.toDBObject(user));
+    }
+
+    @Test
+    public void friends() {
+        User friend = new User();
+        friend.setId(ObjectId.createFromLegacyFormat(1,2,3));
+
+        User user = new User();
+        user.addFriend(friend);
+
+        assertNotNull(morphia.toDBObject(user));
+    }
+
+}
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/package-info.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/package-info.java
new file mode 100644
index 0000000000..f4310476e3
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain/package-info.java
@@ -0,0 +1,5 @@
+@Config(entityAccessors = true)
+package com.querydsl.mongodb.domain;
+
+import com.querydsl.core.annotations.Config;
+
diff --git a/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/User.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/User.java
new file mode 100644
index 0000000000..c9ebb1b184
--- /dev/null
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/User.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.mongodb.domain2;
+
+import java.util.Map;
+
+import org.mongodb.morphia.annotations.Embedded;
+import org.mongodb.morphia.annotations.Entity;
+
+@Entity(value = "USER", noClassnameStored = true)
+public class User {
+
+    @Embedded
+    Map<String, UserAttribute> properties;
+
+}
\ No newline at end of file
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/UserAttribute.java b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/UserAttribute.java
similarity index 86%
rename from querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/UserAttribute.java
rename to querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/UserAttribute.java
index 6723c828c4..3c319c2f9e 100644
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/domain2/UserAttribute.java
+++ b/querydsl-mongodb/src/test/java/com/querydsl/mongodb/domain2/UserAttribute.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.mongodb.domain2;
+package com.querydsl.mongodb.domain2;
 
 import org.mongodb.morphia.annotations.Embedded;
 
@@ -19,5 +19,5 @@
 public class UserAttribute {
 
     //simple property values (String, Object or Date)
-    
+
 }
\ No newline at end of file
diff --git a/querydsl-mongodb/template.mf b/querydsl-mongodb/template.mf
deleted file mode 100644
index 876b62b9b6..0000000000
--- a/querydsl-mongodb/template.mf
+++ /dev/null
@@ -1,15 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.mongodb
-Bundle-Name: Querydsl Mongodb
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:  
-  com.mongodb.*;version="0",
-  org.mongodb.morphia.*;version="${morphia.version}";resolution:=optional,
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.apt;version="${project.version}";resolution:=optional,
-  com.mysema.query.*;version="${project.version}",
-  javax.annotation.*;version="0";resolution:=optional,
-  javax.lang.model.*;version="0",
-  javax.tools.*;version="0",
-  com.google.common.*;version="${guava.version}",
-  org.bson.*;version="0"
diff --git a/querydsl-root/dist.sh b/querydsl-root/dist.sh
deleted file mode 100755
index 28fb0f7958..0000000000
--- a/querydsl-root/dist.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-rm -rf target/dist
-mkdir -p target/dist
-
-echo "Creating javadocs"
-mvn javadoc:aggregate
-
-echo "Creating release bundles"
-for module in apt collections hibernate-search jpa jdo lucene3 lucene4 sql sql-codegen
-do
-  cd ../querydsl-$module
-  mvn -Dtest=X clean assembly:assembly
-done
-
-echo "Creating reference documentation"
-cd ../querydsl-docs
-mkdir -p ../querydsl-root/target/dist/reference
-mvn -Dxslthl.config=http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml clean package
-cp -R target/docbook/publish/en-US/* ../querydsl-root/target/dist/reference/
-mvn -Dxslthl.config=http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml -Dtranslation=ko-KR clean package
-cp -R target/docbook/publish/ko-KR ../querydsl-root/target/dist/reference/
-cd ../querydsl-root
-
-echo "done."
diff --git a/querydsl-root/docs.sh b/querydsl-root/docs.sh
deleted file mode 100755
index d25efa4868..0000000000
--- a/querydsl-root/docs.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "Creating reference documentation"
-cd ../querydsl-docs
-mvn -Dxslthl.config=http://docbook.sourceforge.net/release/xsl/current/highlighting/xslthl-config.xml clean package
-cd ../querydsl-root
-echo "done."
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
deleted file mode 100644
index 3601c7740c..0000000000
--- a/querydsl-root/pom.xml
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.mysema.querydsl</groupId>
-  <artifactId>querydsl-root</artifactId>
-  <version>3.4.1.BUILD-SNAPSHOT</version>
-  <name>Querydsl</name>
-  <description>parent project for Querydsl modules</description>
-  <url>${project.homepage}</url>
-  
-  <parent>
-    <groupId>com.mysema.home</groupId>
-    <artifactId>mysema-source</artifactId>
-    <version>0.3.1</version>
-  </parent>
-  
-  <packaging>pom</packaging>
-
-  <inceptionYear>2007</inceptionYear>
-  
-  <properties>    
-    <failIfNoTests>false</failIfNoTests>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.homepage>http://www.querydsl.com</project.homepage>
-    <project.githubpage>http://github.com/querydsl/querydsl</project.githubpage>
-    <project.checkout>scm:git:git@github.com:querydsl/querydsl.git</project.checkout>
-    
-    <!-- deps -->
-    <derby.version>10.10.1.1</derby.version>
-    <hsqldb.version>2.3.1</hsqldb.version>
-    <h2.version>1.4.178</h2.version>
-    <postgresql.version>9.3-1101-jdbc41</postgresql.version>
-    <oracle.version>11.1.0.7.0</oracle.version>
-    <mysql.version>5.1.30</mysql.version>
-    <jtds.version>1.3.1</jtds.version>
-    <cubrid.version>8.4.0</cubrid.version>
-    <sqlite.version>3.7.2</sqlite.version>
-    <teradata.version>13.10.00.35</teradata.version>
-    
-    <guava.version>14.0</guava.version>
-    <codegen.version>0.6.2</codegen.version>
-    <mysema.lang.version>0.2.4</mysema.lang.version>
-    <cglib.version>2.2.2</cglib.version>    
-    <findbugs.version>1.3.2</findbugs.version>
-    <slf4j.version>1.6.1</slf4j.version>
-  </properties>
-     
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-nodep</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <scm>
-    <connection>${project.checkout}</connection>
-    <developerConnection>${project.checkout}</developerConnection>
-    <url>${project.githubpage}</url>
-  </scm>
-  
-  <developers>
-    <developer>
-      <id>tiwe</id>
-      <name>Timo Westkämper</name>
-      <email>timo.westkamper@gmail.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Project Manager</role>
-        <role>Architect</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sasa</id>
-      <name>Samppa Saarela</name>
-      <email>samppa.saarela@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>vema</id>
-      <name>Vesa Marttila</name>
-      <email>vesa.marttila@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>laim</id>
-      <name>Lassi Immonen</name>
-      <email>lassi.immonen@mysema.com</email>
-      <organization>Mysema Ltd</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>    
-  </developers>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>LICENSE.txt</url>
-    </license>
-  </licenses>
-  
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>com.mysema.maven</groupId>
-          <artifactId>apt-maven-plugin</artifactId>
-          <version>1.0.9</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
-        </plugin>
-        <plugin>
-          <groupId>com.springsource.bundlor</groupId>
-          <artifactId>com.springsource.bundlor.maven</artifactId>
-          <version>1.0.0.RELEASE</version>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <failOnWarnings>true</failOnWarnings> 
-          </configuration>
-        </plugin>
-      </plugins>      
-    </pluginManagement>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
-        <executions>
-          <execution>
-            <id>check</id>
-            <phase>verify</phase> 
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
-                  <compatibilityType>BACKWARD_COMPATIBLE_USER</compatibilityType>
-                  <dumpDetails>true</dumpDetails>
-                  <publicOnly>true</publicOnly>
-                </requireBackwardCompatibility>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.semver</groupId>
-            <artifactId>enforcer-rule</artifactId>
-            <version>0.9.24</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>       
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>../querydsl-root/src/main/assembly.xml</descriptor>
-          </descriptors>
-          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
-        </configuration>
-      </plugin>     
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-          <outputDirectory>${project.build.directory}/dist/apidocs</outputDirectory>
-          <reportOutputDirectory>${project.build.directory}/dist/apidocs</reportOutputDirectory>
-          <groups>
-            <group>
-              <title>Core</title>
-              <packages>com.mysema.query:com.mysema.query.alias:com.mysema.query.annotations:com.mysema.query.codegen:com.mysema.query.dml:com.mysema.query.functions:com.mysema.query.serialization:com.mysema.query.support:com.mysema.query.types*</packages>
-            </group>
-            <group>
-              <title>APT</title>
-              <packages>com.mysema.query.apt*</packages>
-            </group>
-            <group>
-              <title>Spatial</title>
-              <packages>com.mysema.query.spatial*</packages>
-            </group>
-            <group>
-              <title>Collections</title>
-              <packages>com.mysema.query.collections*</packages>
-            </group>
-            <group>
-              <title>JPA</title>
-              <packages>com.mysema.query.jpa*</packages>
-            </group>
-            <group>
-              <title>JDO</title>
-              <packages>com.mysema.query.jdo*</packages>
-            </group>
-            <group>
-              <title>SQL</title>
-              <packages>com.mysema.query.sql*</packages>
-            </group>
-            <group>
-              <title>Spatial</title>
-              <packages>com.mysema.query.spatial*</packages>
-            </group>
-            <group>
-              <title>Lucene</title>
-              <packages>com.mysema.query.lucene</packages>
-            </group>
-            <group>
-              <title>Hibernate Search</title>
-              <packages>com.mysema.query.search</packages>
-            </group>
-            <group>
-              <title>Mongodb</title>
-              <packages>com.mysema.query.mongodb*</packages>        
-            </group>            
-          </groups>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.mysema.maven</groupId>
-        <artifactId>maven-version-plugin</artifactId>
-        <version>0.1.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <targetJdk>1.6</targetJdk>   
-          <includeTests>true</includeTests>     
-        </configuration>
-      </plugin>      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>            
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>  
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <useDefaultManifestFile>true</useDefaultManifestFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=512m</argLine>
-          <excludedGroups>com.mysema.testutil.ExternalDB</excludedGroups>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>2.16</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>jahia</id>
-      <url>http://maven.jahia.org/maven2</url>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </repository>
-    <repository>
-      <id>geoapi</id>
-      <url>http://maven.geotoolkit.org</url>
-    </repository>
-    <repository>
-      <id>opengeo</id>
-      <url>http://repo.opengeo.org</url>
-    </repository>
-    <repository>
-      <id>nexus</id>
-      <url>https://maven.nuxeo.org/nexus/content/groups/public</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>com.springsource.repository.bundles.release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>com.springsource.repository.bundles.external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </pluginRepository>
-  </pluginRepositories>
- 
-  <profiles>
-    <profile>
-      <id>all</id>
-      <activation><activeByDefault>true</activeByDefault></activation>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-spatial</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-collections</module>           
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>        
-        <module>../querydsl-maven-plugin</module>
-        <module>../querydsl-jpa</module>    
-        <module>../querydsl-jpa-codegen</module>
-        <module>../querydsl-jdo</module>
-                
-        <!-- Lucene related -->
-        <module>../querydsl-lucene3</module>
-        <module>../querydsl-lucene4</module>
-        <module>../querydsl-hibernate-search</module>
-        
-        <!-- NoSQL -->
-        <module>../querydsl-mongodb</module>
-        
-        <!-- Languages -->        
-        <module>../querydsl-scala</module>
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>hibernate-search</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-lucene3</module>  
-        <module>../querydsl-hibernate-search</module>        
-      </modules>
-    </profile>   
-
-    <profile>
-      <id>jpa</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-spatial</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-        <module>../querydsl-jpa</module>        
-        <module>../querydsl-jpa-codegen</module>
-      </modules>
-    </profile>    
-    
-    <profile>
-      <id>jdo</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-spatial</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-        <module>../querydsl-jdo</module>
-      </modules>
-    </profile>        
-    
-    <profile>
-      <id>lucene</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-lucene3</module>         
-        <module>../querydsl-lucene4</module>
-      </modules>
-    </profile>     
-    
-    <profile>
-      <id>mongodb</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module> 
-        <module>../querydsl-mongodb</module>        
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>sql</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-spatial</module>
-        <module>../querydsl-sql</module>
-        <module>../querydsl-sql-codegen</module>
-        <module>../querydsl-maven-plugin</module>        
-      </modules>
-    </profile>        
-  
-    <profile>
-      <id>collections</id>
-      <modules>
-        <module>../querydsl-core</module>
-        <module>../querydsl-codegen</module>
-        <module>../querydsl-apt</module>
-        <module>../querydsl-collections</module>
-      </modules>
-    </profile>
-    
-    <profile>
-      <id>jenkins</id>      
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>          
-              <excludedGroups>com.mysema.testutil.DummyInterface</excludedGroups>
-              <excludes>
-                <exclude>**/*$*</exclude>
-                <exclude>**/MSSQLSuiteTest.java</exclude>
-                <exclude>**/TeradataSuiteTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>travis</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludedGroups>com.mysema.testutil.DummyInterface</excludedGroups>
-              <excludes>
-                <exclude>**/*$*</exclude>
-                <exclude>**/ExportOracleTest.java</exclude>
-                <exclude>**/ExportTeradataTest.java</exclude>
-                <exclude>**/OracleSuiteTest.java</exclude>
-                <exclude>**/OracleWithQuotingTest.java</exclude> 
-                <exclude>**/MSSQLSuiteTest.java</exclude>
-                <exclude>**/TeradataSuiteTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-
-  </profiles>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-          <detectJavaApiLink>true</detectJavaApiLink>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>junit-report-maven-plugin</artifactId>
-        <version>devel</version>
-        <configuration>
-          <testFailureIgnore>true</testFailureIgnore>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-</project>
diff --git a/querydsl-scala/pom.xml b/querydsl-scala/pom.xml
index d073535585..3fe168e462 100644
--- a/querydsl-scala/pom.xml
+++ b/querydsl-scala/pom.xml
@@ -1,31 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-scala</artifactId>
   <name>Querydsl - Scala support</name>
   <packaging>jar</packaging>
-  
+
   <properties>
     <character.encoding>UTF-8</character.encoding>
+    <argLine>-Xms256m -Xmx512m -Xss2m</argLine>
+    <checkstyle.skip>true</checkstyle.skip>
 
-    <scala.version>2.10</scala.version>
-    <scala.full.version>2.10.0</scala.full.version>
-    <hibernate.version>3.5.1-Final</hibernate.version>
-    <hibernate.validator.version>4.0.2.GA</hibernate.validator.version>
+    <scala.full.version>2.11.12</scala.full.version>
+    <hibernate.version>3.5.6-Final</hibernate.version>
   </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${scala.full.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   
-  <dependencies>   
+  <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -44,13 +59,13 @@
     
     <!-- provided -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-sql-codegen</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -58,7 +73,7 @@
     
     <!-- test -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -66,39 +81,29 @@
     </dependency>
         
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-jpa</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
-    </dependency>                             
-        
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>${hibernate.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-      </exclusions>      
-      <scope>test</scope>      
-    </dependency>   
+    </dependency>
+
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>${hibernate.version}</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>${hibernate.validator.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>       
     
     <dependency>
@@ -110,16 +115,9 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>
     
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>provided</scope>      
-    </dependency>      
-    
   </dependencies>
   
   <build>
@@ -139,6 +137,7 @@
             <!-- <arg>-target:jvm-1.6</arg> -->
             <arg>-unchecked</arg>
             <arg>-deprecation</arg>
+            <arg>-nobootcp</arg>
             <!-- <arg>-feature</arg> -->
             <!-- <arg>-explaintypes</arg> -->
             <!-- <arg>-verbose</arg> -->
@@ -174,7 +173,7 @@
       </plugin>
     <!--
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
@@ -182,12 +181,12 @@
           <targetFolder>target/genericExporter</targetFolder>
           <scala>true</scala>
           <packages>
-            <package>com.mysema.query.scala</package>
+            <package>com.querydsl.scala</package>
           </packages>
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>com.mysema.querydsl</groupId>
+            <groupId>com.querydsl</groupId>
             <artifactId>querydsl-scala</artifactId>
             <version>${project.version}</version>
           </dependency>
@@ -203,14 +202,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-            <argLine>-Xss2m</argLine>
+            <printSummary>true</printSummary>
         </configuration>                
       </plugin>      
       
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.10</version>
         <configuration>
           <projectnatures>
             <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
@@ -267,4 +266,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>
diff --git a/querydsl-scala/src/main/scala/PlaceHolder.java b/querydsl-scala/src/main/scala/PlaceHolder.java
index b944bc67cb..27dae49b99 100644
--- a/querydsl-scala/src/main/scala/PlaceHolder.java
+++ b/querydsl-scala/src/main/scala/PlaceHolder.java
@@ -1,2 +1,15 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 //hack to generate package javadoc
-public class PlaceHolder {}
+public class PlaceHolder { }
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/BeanSerializer.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/BeanSerializer.scala
deleted file mode 100644
index 2a494edd39..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/BeanSerializer.scala
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import com.mysema.query.codegen._
-import com.mysema.codegen.{ CodeWriter, ScalaWriter }
-import com.mysema.codegen.model.{ Parameter, Type }
-import com.mysema.query
-
-import javax.inject.Inject
-
-import java.util._
-import java.io.IOException
-
-import scala.reflect.BeanProperty
-import scala.collection.JavaConversions._
-import scala.collection.mutable.Set
-
-import Serializer._
-
-/**
- * Serializer contains common functionality used in the Serializer implementations
- */
-object Serializer {
-  
-  /**
-   * 
-   */
-  def writePackage(model: EntityType, writer: ScalaWriter) {
-    if (!model.getPackageName.isEmpty) writer.packageDecl(model.getPackageName)
-  }
-  
-  /**
-   * 
-   */
-  def writeImports(model: EntityType, javaBeanSupport: Boolean, writer: ScalaWriter) {
-    val importedClasses = getAnnotationTypes(model)
-    if (javaBeanSupport)  importedClasses.add("scala.reflect.BeanProperty")    
-    if (model.hasLists()) importedClasses.add(classOf[List[_]].getName)
-    if (model.hasMaps())  importedClasses.add(classOf[Map[_, _]].getName)
-    writer.importClasses(importedClasses.toArray: _*)    
-  }
-  
-  /**
-   * 
-   */
-  def writeCompanionObject(model: EntityType, typeMappings: TypeMappings, writer: ScalaWriter) {
-    val queryType = typeMappings.getPathType(model, model, true)
-    val modelName = writer.getRawName(model)
-    val queryTypeName = writer.getRawName(queryType)    
-    val variable = model.getUncapSimpleName
-    
-    writer.beginObject(modelName + " extends "+queryTypeName+"(\""+variable+"\")")
-    writer.line("override def as(variable: String) = new ", queryTypeName, "(variable)")
-    writer.line("")
-    writer.end()
-  }  
-  
-  private def getAnnotationTypes(model: EntityType): Set[String] = {
-    val imports = Set() ++ model.getAnnotations.map(_.annotationType.getName)
-    // flatMap flattens the results of the map-function.
-    // E.g. List(List(1,2,3), List(4,5,6)).flatMap(_.map(_*3)) ends up as List(3, 6, 9, 12, 15, 18).
-    imports ++ model.getProperties.flatMap(_.getAnnotations.map(_.annotationType.getName))
-  }  
-  
-}
-
-/**
- * Serializer implementation which serializes classes as mutable optionally JavaBean
- * compatible classes
- */
-class ScalaBeanSerializer @Inject() (typeMappings: TypeMappings) extends Serializer {
-
-  var javadocSuffix = " is a Querydsl bean type"
-    
-  var createCompanionObject = true  
-  
-  var javaBeanSupport = false
-  
-  /**
-   * 
-   */
-  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
-    val scalaWriter = writer.asInstanceOf[ScalaWriter]
-    
-    writePackage(model, scalaWriter)
-    writeImports(model, javaBeanSupport, scalaWriter)
-    if (createCompanionObject) {      
-      writeCompanionObject(model, typeMappings, scalaWriter)  
-    }
-    writeClass(model, scalaWriter)
-  }
-    
-  def writeClass(model: EntityType, writer: ScalaWriter) = {
-    writer.javadoc(model.getSimpleName + javadocSuffix)
-    model.getAnnotations foreach(writer.annotation(_))
-    writer.beginClass(model)
-    for (property <- model.getProperties) {
-      property.getAnnotations.foreach(writer.annotation(_))
-      if (javaBeanSupport) writer.line("@BeanProperty")
-      writer.publicField(property.getType(), property.getEscapedName, "_")
-    }
-    writer.end()
-  }
-  
-}
-
-/**
- * Serializer implementation which serializes classes as Scala case classes
- */
-class CaseClassSerializer @Inject() (typeMappings: TypeMappings) extends Serializer {
-  
-  var createCompanionObject = true
-  
-  /**
-   * 
-   */
-  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
-    val scalaWriter = writer.asInstanceOf[ScalaWriter]
-    
-    writePackage(model, scalaWriter)
-    writeImports(model, false, scalaWriter)    
-    if (createCompanionObject) {      
-      writeCompanionObject(model, typeMappings, scalaWriter)  
-    }     
-    writeClass(model, scalaWriter)
-  }
-    
-  def writeClass(model: EntityType, writer: ScalaWriter) = {
-    model.getAnnotations foreach (writer.annotation(_))
-    val parameters = model.getProperties
-      .map(p => new Parameter(p.getEscapedName, p.getType)).toArray
-    writer.caseClass(model.getSimpleName, parameters:_*) 
-  }
-
-}  
- 
-
-
-
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/EntitySerializer.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/EntitySerializer.scala
deleted file mode 100644
index 3003f82633..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/EntitySerializer.scala
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import com.mysema.codegen.CodeWriter
-import com.mysema.codegen.ScalaWriter
-import com.mysema.codegen.model._
-import com.mysema.codegen.model.TypeCategory._
-import com.mysema.codegen.support.ScalaSyntaxUtils
-import com.mysema.query
-import com.mysema.query.codegen._
-import com.mysema.query.sql._
-import com.mysema.query.sql.support._
-import com.mysema.query.types._
-import java.util._
-import java.io.IOException
-import scala.reflect.BeanProperty
-import scala.collection.JavaConversions._
-import scala.collection.mutable.Set
-import scala.collection.immutable.Map
-import javax.inject.Inject
-
-/**
- * EntitySerializer for Scala
- * 
- * @author tiwe
- *
- */
-class ScalaEntitySerializer @Inject()(val typeMappings: TypeMappings) extends Serializer {
-    
-  private val methodNames = Map(ARRAY->"Array", BOOLEAN->"Boolean", COLLECTION->"Collection", 
-      COMPARABLE->"Comparable",DATE->"Date", DATETIME->"DateTime", ENUM->"Enum", 
-      LIST->"List", MAP->"Map", NUMERIC->"Number", SET->"Set", SIMPLE->"Simple", 
-      STRING->"String", TIME->"Time")
-  
-  val classHeaderFormat = "%1$s(cl: Class[_ <: %2$s], md: PathMetadata[_]) extends EntityPathImpl[%2$s](cl, md)"
-    
-  var primitives = true  
-    
-  /**
-   * 
-   */
-  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
-    val scalaWriter = writer.asInstanceOf[ScalaWriter]
-    val simpleName: String = model.getSimpleName
-
-    // package
-    if (!model.getPackageName.isEmpty()) writer.packageDecl(model.getPackageName)
-
-    // imports
-    writer.importPackages("com.mysema.query.types","com.mysema.query.scala")
-    writer.staticimports(classOf[PathMetadataFactory])
-
-    var importedClasses = getAnnotationTypes(model)
-    if (model.hasLists()) importedClasses.add(classOf[java.util.List[_]].getName)
-    if (model.hasMaps())  importedClasses.add(classOf[java.util.Map[_, _]].getName)
-    writer.importClasses(importedClasses.toArray: _*)    
-    
-    writeHeader(model, scalaWriter)    
-    
-    var modelName = writer.getRawName(model)    
-    writeAdditionalFields(model, scalaWriter)
-    writeAdditionalConstructors(modelName, scalaWriter)
-
-    // properties
-    serializeProperties(model, writer, model.getProperties  )
-
-    writeAdditionalProperties(model, scalaWriter)
-    
-    writer.end()
-  }
-  
-  def writeAdditionalConstructors(modelName: String, writer: ScalaWriter) = {
-    writer.line("def this(variable: String) = this(classOf[",
-        modelName,"], forVariable(variable))\n")
-    writer.line("def this(parent: Path[_], variable: String) = this(classOf[",
-        modelName,"], forProperty(parent, variable))\n")
-  }
-  
-  def writeAdditionalFields(model: EntityType, writer: ScalaWriter) = {
-      // override to customize
-  }
-  
-  def writeAdditionalProperties(model: EntityType, writer: ScalaWriter) = {
-      // override to customize
-  }
-  
-  def writeHeader(model: EntityType, writer: ScalaWriter) {
-    val queryType = typeMappings.getPathType(model, model, true)
-    val modelName = writer.getRawName(model)
-    val queryTypeName = writer.getRawName(queryType)
-    val classHeader = String.format(classHeaderFormat, queryTypeName, modelName)
-    
-    writeCompanionObject(model, queryType, writer)
-    
-    // header
-    writeAnnotations(model, queryType, writer)
-    writer.beginClass(classHeader)
-  }
-  
-  def writeCompanionObject(model: EntityType, queryType: Type, writer: ScalaWriter) = {
-    val queryTypeName = writer.getRawName(queryType)    
-    val variable = model.getUncapSimpleName
-    
-    writer.beginObject(queryTypeName + " extends "+queryTypeName+"(\""+variable+"\")")
-    writer.line("override def as(variable: String) = new ", queryTypeName, "(variable)")
-    writer.line("")
-    writer.end()
-  }
-  
-  def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = {
-    model.getAnnotations.foreach(writer.annotation(_))
-  }
-  
-  def writeAdditionalCompanionContent(model: EntityType, writer: ScalaWriter) = {}
-
-  private def getEntityProperties(model: EntityType, writer: CodeWriter, 
-      properties: Collection[Property]) = {
-    for (property <- properties if property.getType.getCategory == ENTITY) yield {
-      val queryType = typeMappings.getPathType(property.getType, model, false)
-      val typeName = writer.getRawName(queryType)
-      val name = escape(property.getEscapedName)
-      String.format("lazy val %1$s = new %2$s(this, \"%1$s\")", name, typeName)
-    }
-  }
-  
-  private def getOtherProperties(model: EntityType, writer: CodeWriter, 
-      properties: Collection[Property]) = {
-    for (property <- properties if property.getType.getCategory != ENTITY) yield { 
-      val name = normalizeProperty(property.getName)
-      val methodName: String = "create" + methodNames(property.getType.getCategory)
-      
-      val value = property.getType.getCategory match {
-        case BOOLEAN | STRING => methodName + "(\"" + name + "\")"
-        case LIST | SET | COLLECTION => {
-          val componentType = writer.getGenericName(true, property.getParameter(0))
-          val queryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false)
-          methodName + "["+componentType+","+
-            writer.getGenericName(true, queryType)+"](\"" + name+ "\")"
-        }
-        case MAP => {
-          val keyType = writer.getGenericName(true, property.getParameter(0))
-          val valueType = writer.getGenericName(true, property.getParameter(1))
-          val queryType = typeMappings.getPathType(getRaw(property.getParameter(1)), model, false)
-          methodName + "["+keyType+","+valueType+","+
-            writer.getGenericName(true, queryType)+"](\"" + name + "\")"      
-        }
-        case _ => methodName + "[" + getName(property.getType, writer) + "](\"" + name + "\")"
-      }
-      (normalizeProperty(property.getEscapedName), value)
-    }
-  }
-  
-  private def normalizeProperty(name: String) = {
-    if (name.contains("$")) name.substring(name.lastIndexOf("$")+1) else name
-  }
-  
-  private def getName(t: Type, writer: CodeWriter) = {
-    if (t == Types.CHARACTER) {
-      "Character" // because createComparable[Char] doesn't work, and the workaround involves implicit params
-    } else if (primitives && Types.PRIMITIVES.containsKey(t)) {
-      writer.getRawName(Types.PRIMITIVES.get(t)) 
-    } else {
-      writer.getGenericName(true, t)
-    }
-  }
-  
-  def serializeProperties(model: EntityType, writer: CodeWriter, properties: Collection[Property]) {
-    // entity properties
-    getEntityProperties(model, writer, properties) foreach (writer.line(_, "\n"))
-    
-    // other properties
-    getOtherProperties(model, writer, properties) foreach { case (propertyName, value) => 
-      writer.line("val ", escape(propertyName), " = ", value, "\n")
-    }
-  }
-  
-  def escape(token: String): String = {
-    if (ScalaSyntaxUtils.isReserved(token)) "`" + token + "`" 
-    else if (token == "count") token + "_" 
-    else token 
-  }
-  
-  def getAnnotationTypes(model: EntityType): Set[String] = {
-    Set() ++ (model.getAnnotations.map(_.annotationType.getName))
-  }
-  
-  private def getRaw(t : Type): Type = {
-    t match {
-      case entityType: EntityType if entityType.getPackageName.startsWith("java") => t
-      case _ => new SimpleType(t, t.getParameters)
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Helpers.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Helpers.scala
deleted file mode 100644
index d9058211a9..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Helpers.scala
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import scala.collection.JavaConversions._
-import com.mysema.query._
-import com.mysema.query.types._
-import com.mysema.query.scala.GroupBy._
-
-import Projections._
-
-/**
- * Helpers provides implicit conversions for Projectable and SimpleProjectable to be
- * more Scala compatible
- */
-object Helpers extends Helpers
-
-trait Helpers extends Projections with GroupBy {
-  
-  implicit def toRichSimpleProjectable[T](p: SimpleProjectable[T]) = new RichSimpleProjectable(p) 
-  
-  implicit def toRichProjectable(p: Projectable) = new RichProjectable(p)  
-}
-
-/**
- * RichSimpleProjectable provides Scala extensions for SimpleProjectable
- * 
- * @author tiwe
- *
- * @param <T>
- */
-class RichSimpleProjectable[T](private val p: SimpleProjectable[T]) {
-  
-  def select: List[T] = p.list.toList
-  
-  def single: Option[T] = Option(p.singleResult())
-  
-  def unique: Option[T] = Option(p.uniqueResult())
-  
-  override def toString: String = p.toString
-  
-}
-
-/**
- * RichProjectable provides Scala extensions for Projectable
- * 
- * @author tiwe
- *
- */
-class RichProjectable(private val p: Projectable) {
-  
-  def select[A](e: Ex[A]): List[A] = p.list(e).toList 
-  
-  def select[A,B](e1: Ex[A], e2: Ex[B]): List[(A,B)] = p.list((e1,e2)).toList 
-  
-  def select[A,B,C](e1: Ex[A], e2: Ex[B], e3: Ex[C]): List[(A,B,C)] = p.list((e1,e2,e3)).toList
-  
-  def select[A,B,C,D](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D]): List[(A,B,C,D)] = {
-    p.list((e1,e2,e3,e4)).toList
-  }
-  
-  def select[A,B,C,D,E](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E]): List[(A,B,C,D,E)] = {
-    p.list((e1,e2,e3,e4,e5)).toList
-  }
-  
-  def select[A,B,C,D,E,F](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F]): List[(A,B,C,D,E,F)] = {
-    p.list((e1,e2,e3,e4,e5,e6)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F], 
-      e7: Ex[G]): List[(A,B,C,D,E,F,G)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F], 
-      e7: Ex[G], e8: Ex[H]): List[(A,B,C,D,E,F,G,H)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F], 
-      e7: Ex[G], e8: Ex[H], e9: Ex[I]): List[(A,B,C,D,E,F,G,H,I)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F], 
-      e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J]): List[(A,B,C,D,E,F,G,H,I,J)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], e6: Ex[F], 
-      e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K]): List[(A,B,C,D,E,F,G,H,I,J,K)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], 
-      e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], 
-      e12: Ex[L]): List[(A,B,C,D,E,F,G,H,I,J,K,L)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], e5: Ex[E], 
-      e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L],
-      e13: Ex[M]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O], e16: Ex[P]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O], e16: Ex[P], 
-      e17: Ex[Q]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O], e16: Ex[P], e17: Ex[Q], 
-      e18: Ex[R]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17,e18)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O], e16: Ex[P], e17: Ex[Q], e18: Ex[R], 
-      e19: Ex[S]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17,e18,e19)).toList
-  }
-  
-  def select[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](e1: Ex[A], e2: Ex[B], e3: Ex[C], e4: Ex[D], 
-      e5: Ex[E], e6: Ex[F], e7: Ex[G], e8: Ex[H], e9: Ex[I], e10: Ex[J], e11: Ex[K], e12: Ex[L], 
-      e13: Ex[M], e14: Ex[N], e15: Ex[O], e16: Ex[P], e17: Ex[Q], e18: Ex[R], e19: Ex[S], 
-      e20: Ex[T]): List[(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T)] = {
-    p.list((e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15,e16,e17,e18,e19,e20)).toList
-  }
-  
-  // TODO : generalize this
-  def selectGrouped[K,T,V](key: Ex[K], parent: Ex[T], child: Ex[V]): List[(T,Set[V])] = {
-    p.transform(groupBy(key).as((parent, set(child)))).values.toList    
-  }  
-  
-  def single[T](expr: Ex[T]): Option[T] = Option(p.singleResult(expr))
-  
-  // TODO : single variants for multiple arguments
-  
-  def unique[T](expr: Ex[T]): Option[T] = Option(p.uniqueResult(expr))
-  
-  // TODO : unique variants for multiple arguments
-  
-  override def toString: String = p.toString
-  
-}
-
-
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Operations.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Operations.scala
deleted file mode 100644
index e564359eb0..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Operations.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import com.mysema.query.types._
-
-/**
- * Factory for Operations
- * 
- * @author tiwe
- *
- */
-object Operations {
-
-  type Op[X] = Operator[X]
-  
-  def dsl[T](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): DslExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with DslExpression[T]
-  }
-  
-  def simple[T](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): SimpleExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with SimpleExpression[T]
-  }
-
-  def comparable[T <: Comparable[_]](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): ComparableExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with ComparableExpression[T]
-  }
-
-  def date[T <: Comparable[_]](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): DateExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with DateExpression[T]
-  }
-
-  def dateTime[T <: Comparable[_]](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): DateTimeExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with DateTimeExpression[T]
-  }
-
-  def time[T <: Comparable[_]](t: Class[_ <: T], op: Op[_ >: T], args: Ex[_]*): TimeExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with TimeExpression[T]
-  }
-
-  def number[T : Numeric](t: Class[_ <: T], op: Op[_], args: Ex[_]*): NumberExpression[T] = 
-      new OperationImpl[T](t, op.asInstanceOf[Operator[T]], args: _*) with NumberExpression[T] {
-        override def negate = if (getOperator == Ops.NEGATE) getArg(0).asInstanceOf[NumberExpression[T]] else super.negate      
-        override def numeric = implicitly[Numeric[T]]
-      }
-
-  def boolean(op: Op[_ >: java.lang.Boolean], args: Ex[_]*): BooleanExpression = {
-    new OperationImpl[java.lang.Boolean](classOf[java.lang.Boolean], op, args: _*) with BooleanExpression
-  }
-
-  def string(op: Op[_ >: String], args: Ex[_]*): StringExpression = {
-    new OperationImpl[String](classOf[String], op, args: _*) with StringExpression
-  }
-
-  def enum[T <: Enum[T]](t: Class[T], op: Op[_ >: T], args: Ex[_]*): EnumExpression[T] = {
-    new OperationImpl[T](t, op, args: _*) with EnumExpression[T]
-  }
-
-}
-
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Paths.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Paths.scala
deleted file mode 100644
index 1d67594f6d..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Paths.scala
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import com.mysema.query.types._
-import com.mysema.query.types.PathMetadataFactory._
-import com.mysema.query.codegen._
-
-import com.mysema.codegen.model.TypeCategory
-
-import com.mysema.scala.ManifestUtils._
-
-
-/**
- * Factory for path expressions
- *
- * @author tiwe
- *
- */
-object Paths {
-
-  type Metadata[X] = PathMetadata[X]
-
-  def array[T <: Array[_]](t: Class[T], md: Metadata[_]) = new ArrayPath[T](t, md)
-
-  def dsl[T](t: Class[_ <: T], md: Metadata[_]) = new DslPath[T](t, md)
-
-  def simple[T](t: Class[_ <: T], md: Metadata[_]) = new SimplePath[T](t, md)
-
-  def entity[T](t: Class[_ <: T], md: Metadata[_]) = new EntityPathImpl[T](t, md)
-
-  def collection[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata[_]) = {
-    new CollectionPath[T,Q](t, q, md)
-  }
-
-  def set[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata[_]) = new SetPath[T,Q](t, q, md)
-
-  def list[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata[_]) = new ListPath[T,Q](t, q, md)
-
-  def map[K, V, Q <: Ex[_ >: V]](k: Class[K], v: Class[V], q: Class[Q], md: Metadata[_]) = {
-    new MapPath[K, V, Q](k, v, q, md)
-  }
-
-  def comparable[T <: Comparable[_]](t: Class[_ <: T], md: Metadata[_]) = new ComparablePath[T](t, md)
-
-  def date[T <: Comparable[_]](t: Class[_ <: T], md: Metadata[_]) = new DatePath[T](t, md)
-
-  def dateTime[T <: Comparable[_]](t: Class[_ <: T], md: Metadata[_]) = new DateTimePath[T](t, md)
-
-  def time[T <: Comparable[_]](t: Class[_ <: T], md: Metadata[_]) = new TimePath[T](t, md)
-
-  def number[T : Numeric](t: Class[T], md: Metadata[_]) = new NumberPath[T](t, md)
-
-  def boolean(md: Metadata[_]) = new BooleanPath(md)
-
-  def string(md: Metadata[_]) = new StringPath(md)
-
-  def enum[T <: Enum[T]](t: Class[T], md: Metadata[_]) = new EnumPath[T](t, md)
-
-  def any[T, Q <: Ex[_ >: T]](parent: Path[_], t: Class[T], q: Class[Q]): Q =  create(t, q, forCollectionAny(parent))
-
-  def create[T, Q <: Ex[_ >: T]](t :Class[T], q: Class[Q], md: Metadata[_]): Q = q match {
-    case _ if q == classOf[StringPath] | q == classOf[BooleanPath] => {
-      q.getConstructor(classOf[PathMetadata[_]]).newInstance(md)
-    }
-    case _ => q.getConstructor(classOf[Class[_]], classOf[PathMetadata[_]]).newInstance(t, md)
-  }
-
-}
-
-class DslPath[T](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with DslExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class SimplePath[T](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with SimpleExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class ArrayPath[T <: Array[_]](t: Class[T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with ArrayExpression[T] {
-
-  def this(t: Class[T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class BeanPath[T](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with SimpleExpression[T] {
-
-  import Paths._
-
-  type Mf[X] = Manifest[X]
-
-  def add[P <: Path[_]](path: P): P = path
-
-  def createArray[T <: Array[_]](property: String)(implicit mf: Mf[T]) = add(array(mf, forProperty(property)))
-
-  def createSimple[T](property: String)(implicit mf: Mf[T]) = add(simple(mf, forProperty(property)))
-
-  def createEntity[T](property: String)(implicit mf: Mf[T]) = add(entity(t, forProperty(property)))
-
-  def createCollection[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(collection(t, q, forProperty(property)))
-
-  def createSet[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(set(t, q, forProperty(property)))
-
-  def createList[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(list(t, q, forProperty(property)))
-
-  def createMap[K, V, Q <: Ex[_ >: V]](property: String)(implicit k: Mf[K], v: Mf[V], q: Mf[Q]) = add(map(k, v, q, forProperty(property)))
-
-  def createComparable[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(comparable(mf, forProperty(property)))
-
-  def createDate[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(date(mf, forProperty(property)))
-
-  def createDateTime[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(dateTime(mf, forProperty(property)))
-
-  def createTime[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(time(mf, forProperty(property)))
-
-  def createNumber[T](property: String)(implicit num: Numeric[T], mf: Mf[T]) = add(number[T](mf, forProperty(property)))
-
-  def createBoolean(property: String) = add(boolean(forProperty(property)))
-
-  def createString(property: String) = add(string(forProperty(property)))
-
-  def createEnum[T <: Enum[T]](property: String)(implicit mf: Mf[T]) = add(enum(mf, forProperty(property)))
-
-  private def forProperty(property: String) = PathMetadataFactory.forProperty(this, property)
-
-}
-
-class EntityPathImpl[T](t: Class[_ <: T], md: PathMetadata[_])
-  extends BeanPath[T](t, md) with EntityPath[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-  def getMetadata(path: Path[_]): AnyRef = null
-
-}
-
-class CollectionPath[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: PathMetadata[_])
-  extends PathImpl[java.util.Collection[T]](classOf[java.util.Collection[T]], md) with CollectionExpression[T,Q] {
-
-  def this(t: Class[T],  q: Class[Q], variable: String) = this(t, q, forVariable(variable))
-
-  def getParameter(i: Int) = t
-
-  lazy val any: Q = Paths.any(this, t, q)
-
-}
-
-class SetPath[T, Q <: Ex[_ >: T]](t: Class[T],  q: Class[Q], md: PathMetadata[_])
-  extends PathImpl[java.util.Set[T]](classOf[java.util.Set[T]], md) with SetExpression[T,Q] {
-
-  def this(t: Class[T], q: Class[Q], variable: String) = this(t, q, forVariable(variable))
-
-  def getParameter(i: Int) = t
-
-  lazy val any: Q = Paths.any(this, t, q)
-
-}
-
-class ListPath[T, Q <: Ex[_ >: T]](t: Class[T],  q: Class[Q], md: PathMetadata[_])
-  extends PathImpl[java.util.List[T]](classOf[java.util.List[T]], md) with ListExpression[T,Q] {
-
-  def this(t: Class[T], q: Class[Q], variable: String) = this(t, q, forVariable(variable))
-
-  def getParameter(i: Int) = t
-
-  lazy val any: Q = Paths.any(this, t, q)
-
-  def get(i: Int): Q = Paths.create(t, q, forListAccess(this, i))
-
-  def get(i: Ex[Integer]): Q = Paths.create(t, q, forListAccess(this, i))
-
-}
-
-class MapPath[K, V, Q <: Ex[_ >: V]](k: Class[K], v: Class[V], q: Class[Q], md: PathMetadata[_])
-  extends PathImpl[java.util.Map[K, V]](classOf[java.util.Map[K, V]], md) with MapExpression[K, V, Q] {
-
-  def this(k: Class[K], v: Class[V], q: Class[Q], variable: String) = this(k, v, q, forVariable(variable))
-
-  def getParameter(i: Int): Class[_] = { if (i == 0) k else v }
-
-  def get(key: K) = Paths.create(v, q, forMapAccess(this, key))
-
-  def get(key: Ex[K]) = Paths.create(v, q, forMapAccess(this, key))
-
-}
-
-class ComparablePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with ComparableExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class NumberPath[T : Numeric](t: Class[T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with NumberExpression[T] {
-
-  def this(t: Class[T], variable: String) = this(t, forVariable(variable))
-  override def numeric = implicitly[Numeric[T]]
-
-}
-
-class BooleanPath(md: PathMetadata[_])
-  extends PathImpl[java.lang.Boolean](classOf[java.lang.Boolean], md) with BooleanExpression {
-
-  def this(variable: String) = this(forVariable(variable))
-
-}
-
-class StringPath(md: PathMetadata[_])
-  extends PathImpl[String](classOf[String], md) with StringExpression {
-
-  def this(variable: String) = this(forVariable(variable))
-
-}
-
-class DatePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with DateExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class DateTimePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with DateTimeExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class TimePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with TimeExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
-
-class EnumPath[T <: Enum[T]](t: Class[_ <: T], md: PathMetadata[_])
-  extends PathImpl[T](t, md) with EnumExpression[T] {
-
-  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
-
-}
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/TypeMappings.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/TypeMappings.scala
deleted file mode 100644
index 89351b01e7..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/TypeMappings.scala
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala
-
-import com.mysema.query.codegen.TypeMappings
-import com.mysema.codegen.model.TypeCategory
-import com.mysema.query.types.Expression
-import com.mysema.query.types.Path
-
-/**
- * Factory for TypeMappings creation
- * 
- * @author tiwe
- *
- */
-object ScalaTypeMappings {
-  
-  def create: TypeMappings = new ScalaTypeMappings();
-  
-}
-
-class ScalaTypeMappings extends TypeMappings {
-  register(TypeCategory.STRING, classOf[StringExpression], classOf[StringPath], classOf[StringTemplate])
-  register(TypeCategory.BOOLEAN, classOf[BooleanExpression], classOf[BooleanPath], classOf[BooleanTemplate])
-  register(TypeCategory.COMPARABLE, classOf[ComparableExpression[_]], classOf[ComparablePath[_]], classOf[ComparableTemplate[_]])
-  register(TypeCategory.ENUM, classOf[EnumExpression[_]], classOf[EnumPath[_]], classOf[EnumTemplate[_]])
-  register(TypeCategory.DATE, classOf[DateExpression[_]], classOf[DatePath[_]], classOf[DateTemplate[_]])
-  register(TypeCategory.DATETIME, classOf[DateTimeExpression[_]], classOf[DateTimePath[_]], classOf[DateTimeTemplate[_]])
-  register(TypeCategory.TIME, classOf[TimeExpression[_]], classOf[TimePath[_]], classOf[TimeTemplate[_]])
-  register(TypeCategory.NUMERIC, classOf[NumberExpression[_]], classOf[NumberPath[_]], classOf[NumberTemplate[_]])
-  register(TypeCategory.SIMPLE, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
-  register(TypeCategory.ARRAY, classOf[Expression[_]], classOf[ArrayPath[_]], classOf[SimpleTemplate[_]])
-    
-  register(TypeCategory.COLLECTION, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
-  register(TypeCategory.SET, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
-  register(TypeCategory.LIST, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
-  register(TypeCategory.MAP, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])    
-  register(TypeCategory.CUSTOM, classOf[Expression[_]], classOf[Path[_]], classOf[SimpleTemplate[_]])
-  register(TypeCategory.ENTITY, classOf[Expression[_]], classOf[Path[_]], classOf[SimpleTemplate[_]]) 
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Paths.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Paths.scala
deleted file mode 100644
index 7efde8dfe1..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Paths.scala
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala.sql
-
-import com.google.common.collect.ImmutableList._
-import com.mysema.commons.lang.Pair
-import com.mysema.scala.ReflectionUtils._
-import com.mysema.query.scala._
-import com.mysema.query.sql._
-import com.mysema.query.types._
-import com.mysema.query.types.PathMetadataFactory._
-import java.util.{List => JavaList, ArrayList, Map => JavaMap, HashMap}
-import java.lang.reflect._
-import scala.reflect.BeanProperty
-
-/**
- * Implementation of RelationalPath for Scala
- *
- * @author tiwe
- *
- */
-class RelationalPathImpl[T](md: PathMetadata[_], schema: String, table: String)(implicit val mf: Manifest[T])
-  extends BeanPath[T](mf.runtimeClass.asInstanceOf[Class[T]], md) with RelationalPath[T] {
-
-  import scala.collection.JavaConversions._
-
-  private var primaryKey: PrimaryKey[T] = _
-
-  private lazy val schemaAndTable = new SchemaAndTable(schema, table)
-
-  @BeanProperty
-  val columns: JavaList[Path[_]] = new ArrayList[Path[_]]
-
-  @BeanProperty
-  val foreignKeys: JavaList[ForeignKey[_]] = new ArrayList[ForeignKey[_]]
-
-  @BeanProperty
-  val inverseForeignKeys: JavaList[ForeignKey[_]] = new ArrayList[ForeignKey[_]]
-
-  @BeanProperty
-  lazy val projection: FactoryExpression[T] = RelationalPathUtils.createProjection(this)
-
-  private val metadata: JavaMap[Path[_], ColumnMetadata] = new HashMap[Path[_], ColumnMetadata]
-
-  def this(variable: String, schema: String, table: String)(implicit mf: Manifest[T]) = {
-    this(forVariable(variable), schema, table)(mf)
-  }
-
-  override def add[P <: Path[_]](p: P): P = {
-    columns.add(p)
-    p
-  }
-
-  protected def addMetadata(path: Path[_], md: ColumnMetadata) {
-    metadata.put(path, md)
-  }
-
-  def createPrimaryKey(cols: Path[_]*): PrimaryKey[T] = {
-    primaryKey = new PrimaryKey[T](this, cols:_*)
-    primaryKey
-  }
-
-  def createForeignKey[F](local: Path[_], foreign: String) = {
-    val foreignKey = new ForeignKey[F](this, local, foreign)
-    foreignKeys.add(foreignKey)
-    foreignKey
-  }
-
-  def createForeignKey[F](local: List[_ <: Path[_]], foreign: List[String]) = {
-    val foreignKey = new ForeignKey[F](this, copyOf(local.iterator), copyOf(foreign.iterator))
-    foreignKeys.add(foreignKey)
-    foreignKey
-  }
-
-  def createInvForeignKey[F](local: Path[_], foreign: String) = {
-    val foreignKey = new ForeignKey[F](this, local, foreign)
-    inverseForeignKeys.add(foreignKey)
-    foreignKey
-  }
-
-  def createInvForeignKey[F](local: List[_ <: Path[_]], foreign: List[String]) = {
-    val foreignKey = new ForeignKey[F](this, copyOf(local.iterator), copyOf(foreign.iterator))
-    inverseForeignKeys.add(foreignKey)
-    foreignKey
-  }
-
-  def getMetadata(path: Path[_]): ColumnMetadata = metadata.get(path)
-
-  def getPrimaryKey = primaryKey
-
-  def getSchemaName = schema
-
-  def getTableName = table
-
-  def getSchemaAndTable = schemaAndTable
-
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Queries.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Queries.scala
deleted file mode 100644
index 9b3dd23b58..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Queries.scala
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala.sql
-
-import scala.collection.JavaConversions._
-
-import com.mysema.query.sql._
-import com.mysema.query._
-import com.mysema.query.types.{ Expression, OrderSpecifier, Predicate }
-
-import com.mysema.query.scala._
-import com.mysema.query.scala.RichProjectable
-import com.mysema.query.scala.Projections._
-
-/**
- * RichSimpleQuery provides a simplified query DSL for Querydsl SQL and Scala
- * 
- * @author tiwe
- *
- * @param <PT>
- * @param <P>
- * @param <T>
- * @param <E>
- */
-class RichSimpleQuery[PT, P <: RelationalPath[PT], T, E <: Ex[T]](path: P, expr: E, qry: SQLQuery) 
-extends RichProjectable(qry) {
-  
-  type FEx[X] = P => Ex[X]
-  
-  def query = this
-      
-  // TODO : simplify these
-  
-  def join[T2, R2 <: RelationalPath[T2], T3, E3 <: Ex[T3]](f : E => ForeignKey[T2], rp: R2) 
-      (implicit e2t: ExprToTarget[T,E,T2,R2,T3,E3]): RichSimpleQuery[PT,P,T3,E3] = join(f(expr), rp)
-  
-  def join[T2, R2 <: RelationalPath[T2], T3, E3 <: Ex[T3]](fk: ForeignKey[T2], rp: R2) 
-      (implicit e2t: ExprToTarget[T,E,T2,R2,T3,E3]): RichSimpleQuery[PT,P,T3,E3] = {    
-    new RichSimpleQuery[PT,P,T3,E3](path, e2t.toTarget(expr, rp), qry.innerJoin(fk, rp))
-  }    
-  
-  def limit(l: Long) = { qry.limit(l); this } 
-  
-  def offset(l: Long) = { qry.offset(l); this }
-  
-  def orderBy(f: P => OrderSpecifier[_]) = { qry.orderBy(f(path)); this }  
-  
-  def orderBy(o: OrderSpecifier[_]*) = { qry.orderBy(o:_*); this }
-  
-  def where(f: P => Predicate) = { qry.where(f(path)); this }
-  
-  def where(predicates: Predicate*) = { qry.where(predicates:_*); this }
-  
-  // projection
-  
-  def all: List[T] = select
-
-  def count = qry.count()
-  
-  def select: List[T] = select(expr)
-  
-  def select[T](f: FEx[T]): List[T] = select(f(path))
-  
-  def select[T,U](f1: FEx[T], f2: FEx[U]): List[(T,U)] =  select(f1(path), f2(path))
-  
-  def select[T,U,V](f1: FEx[T], f2: FEx[U], f3: FEx[V]): List[(T,U,V)] = {
-    select(f1(path), f2(path), f3(path))
-  }
-  
-  def select[T,U,V,W](f1: FEx[T], f2: FEx[U], f3: FEx[V], f4: FEx[W])
-  : List[(T,U,V,W)] = {
-    select(f1(path), f2(path), f3(path), f4(path))
-  }
-  
-  def select[T,U,V,W,X](f1: FEx[T], f2: FEx[U], f3: FEx[V], f4: FEx[W], f5: FEx[X])
-  : List[(T,U,V,W,X)] = {
-    select(f1(path), f2(path), f3(path), f4(path), f5(path))
-  }    
-  
-  def selectGrouped[K,T,V](fkey: FEx[K], fparent: FEx[T], fchild: FEx[V]): List[(T,Set[V])] = {
-    selectGrouped(fkey(path), fparent(path), fchild(path))
-  }  
-  
-  def single: Option[T] = single(expr)
-  
-  def single[T](f: FEx[T]): Option[T] = single(f(path))
-  
-  def unique: Option[T] = unique(expr)  
-  
-  def unique[T](f: FEx[T]): Option[T] = unique(f(path))
-  
-}
-
-object ExprToTarget {
-  
-  type RP[T] = RelationalPath[T]
-  
-  // TODO : use closures instead of ExprToTarget
-  
-  implicit def pathToTuple2[T,E <: RP[T],T2,E2 <: RP[T2]] = {
-    new ExprToTarget[T,E,T2,E2,(T,T2),Tu2Ex[T,T2]]() {
-    def toTarget(e: E, rp: E2) = new Tu2Ex[T,T2](e, rp)
-  }}
-  
-  implicit def tuple2ToTuple3[T1,E1 <: Ex[T1],T2,E2 <: Ex[T2],T3,E3 <: RP[T3]] = {
-    new ExprToTarget[(T1,T2),Tu2Ex[T1,T2],T3,E3,(T1,T2,T3),Tu3Ex[T1,T2,T3]]() {
-    def toTarget(e: Tu2Ex[T1,T2], rp: E3) = new Tu3Ex[T1,T2,T3](e(0), e(1), rp)
-  }}
-  
-  implicit def tuple3ToTuple4[T1,E1 <: Ex[T1],T2,E2 <: Ex[T2],T3,E3 <: Ex[T3],T4,E4 <: RP[T4]] = {
-    new ExprToTarget[(T1,T2,T3),Tu3Ex[T1,T2,T3],T4,E4,(T1,T2,T3,T4),Tu4Ex[T1,T2,T3,T4]]() {
-    def toTarget(e: Tu3Ex[T1,T2,T3], rp: E4) = new Tu4Ex[T1,T2,T3,T4](e(0), e(1), e(2), rp)
-  }}
-  
-  implicit def tuple4ToTuple5[T1,E1 <: Ex[T1],T2,E2 <: Ex[T2],T3,E3 <: Ex[T3],T4,E4 <: Ex[T4],T5,E5 <: RP[T5]] = {
-    new ExprToTarget[(T1,T2,T3,T4),Tu4Ex[T1,T2,T3,T4],T5,E5,(T1,T2,T3,T4,T5),Tu5Ex[T1,T2,T3,T4,T5]]() {
-    def toTarget(e: Tu4Ex[T1,T2,T3,T4], rp: E5) = new Tu5Ex[T1,T2,T3,T4,T5](e(0), e(1), e(2), e(3), rp)
-  }}
-  
-}
-
-// combine E1 and E2 into E3
-trait ExprToTarget[T1,E1 <: Ex[T1],T2,E2 <: Ex[T2],T3,E3 <: Ex[T3]] {
-  
-  def toTarget(expr: E1, rp: E2): E3 
-  
-}
-
-
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala
deleted file mode 100644
index 23849f57b6..0000000000
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mysema.query.scala.sql
-
-import com.mysema.query
-import com.mysema.codegen.{ScalaWriter, CodeWriter}
-import com.mysema.codegen.model._
-import com.mysema.query.codegen._
-import com.mysema.query.scala.ScalaEntitySerializer
-import com.mysema.query.sql._
-import com.mysema.query.sql.codegen._
-import com.mysema.query.sql.support._
-import java.util._
-import scala.collection.JavaConversions._
-
-import javax.inject.Inject
-
-/**
- * MetaDataSerializer implementation for Scala
- *
- * @author tiwe
- *
- */
-class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingStrategy: NamingStrategy)
-    extends ScalaEntitySerializer(typeMappings) {
-
-  override val classHeaderFormat = "%s(md: PathMetadata[_]) extends RelationalPathImpl[%s](md, %s, %s)"
-
-  override def writeHeader(model: EntityType, writer: ScalaWriter) {
-    writer.imports(classOf[RelationalPathImpl[_]])
-    writer.imports(classOf[PrimaryKey[_]].getPackage)
-
-    val queryType = typeMappings.getPathType(model, model, true)
-    val modelName = writer.getRawName(model)
-    val queryTypeName = writer.getRawName(queryType)
-    val schema = model.getData.get("schema") match {
-      case x: String => "\""+x+"\""
-      case _ => "null"
-    }
-    val table = "\""+model.getData.get("table")+"\""
-    val classHeader = String.format(classHeaderFormat, queryTypeName, modelName, schema, table)
-
-    writeCompanionObject(model, queryType, writer)
-
-    // header
-    writer.beginClass(classHeader)
-  }
-
-  override def writeAdditionalConstructors(modelName: String, writer: ScalaWriter) = {
-    writer.line("def this(variable: String) = this(forVariable(variable))\n")
-    writer.line("def this(parent: Path[_], property: String) = this(forProperty(parent, property))\n")
-  }
-
-  override def writeAdditionalProperties(model: EntityType, writer: ScalaWriter) {
-    // primary keys
-    val primaryKeys: Collection[PrimaryKeyData] =
-      model.getData.get(classOf[PrimaryKeyData]).asInstanceOf[Collection[PrimaryKeyData]]
-    if (primaryKeys != null) serializePrimaryKeys(model, writer, primaryKeys)
-
-    // foreign keys
-    val foreignKeys: Collection[ForeignKeyData] =
-      model.getData.get(classOf[ForeignKeyData]).asInstanceOf[Collection[ForeignKeyData]]
-    if (foreignKeys != null) serializeForeignKeys(model, writer, foreignKeys, false)
-
-    // inverse foreign keys
-    val inverseForeignKeys: Collection[InverseForeignKeyData] =
-      model.getData.get(classOf[InverseForeignKeyData]).asInstanceOf[Collection[InverseForeignKeyData]]
-    if (inverseForeignKeys != null) serializeForeignKeys(model, writer, inverseForeignKeys, true)
-
-    // metadata
-    for (property <- model.getProperties) {
-      val name = property.getEscapedName
-      val metadata = property.getData.get("COLUMN").asInstanceOf[ColumnMetadata]
-      val columnMeta = new StringBuilder()
-      columnMeta.append("ColumnMetadata")
-      columnMeta.append(".named(\"" + metadata.getName + "\")")
-      columnMeta.append(".ofType(" + metadata.getJdbcType + ")")
-      if (metadata.hasSize) {
-        columnMeta.append(".withSize(" + metadata.getSize() + ")")
-      }
-      if (metadata.getDigits > 0) {
-        columnMeta.append(".withDigits(" + metadata.getDigits() + ")")
-      }
-      if (!metadata.isNullable) {
-        columnMeta.append(".notNull()")
-      }
-      writer.line("addMetadata(", escape(name), ", ", columnMeta.toString, ")")
-    }
-  }
-
-  override def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = {
-    if (model == queryType) {
-      model.getAnnotations.foreach(writer.annotation(_))
-    }
-  }
-
-  def serializePrimaryKeys(model: EntityType, writer: CodeWriter, primaryKeys: Collection[PrimaryKeyData]) {
-    primaryKeys.foreach { pk =>
-      val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName(), model)
-      val value = pk.getColumns.map(c => escape(namingStrategy.getPropertyName(c, model)))
-          .mkString("createPrimaryKey(", ", ", ")")
-      writer.publicFinal(new ClassType(classOf[PrimaryKey[_]], model), fieldName, value)
-    }
-  }
-
-  def serializeForeignKeys(model: EntityType, writer: CodeWriter,
-      foreignKeys: Collection[_ <: KeyData], inverse: Boolean) {
-    for (fk <- foreignKeys) {
-      val fieldName = if (inverse) {
-        namingStrategy.getPropertyNameForInverseForeignKey(fk.getName, model)
-      } else {
-        namingStrategy.getPropertyNameForForeignKey(fk.getName, model)
-      }
-      val value = new StringBuilder(if (inverse) "createInvForeignKey(" else "createForeignKey(")
-      if (fk.getForeignColumns.size == 1) {
-        value.append(namingStrategy.getPropertyName(fk.getForeignColumns.get(0), model))
-        value.append(", \"" + fk.getParentColumns().get(0) + "\"")
-      } else {
-        val local = fk.getForeignColumns.map(c => escape(namingStrategy.getPropertyName(c, model))).mkString(", ")
-        val foreign = fk.getParentColumns.map("\"" + _ + "\"").mkString(", ")
-        value.append("List(" + local + "), List(" + foreign + ")")
-      }
-      value.append(")")
-      val t = new ClassType(classOf[ForeignKey[_]], fk.getType)
-      writer.publicFinal(t, fieldName, value.toString())
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Expressions.scala
similarity index 87%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/Expressions.scala
index 62a6881f26..3ac5b9047a 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Expressions.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,20 +12,15 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
-
-import com.mysema.query.alias.ManagedObject
-
-import com.mysema.query.types._
-import com.mysema.query.types.PathMetadataFactory._
-import com.mysema.query.types.Ops._
+package com.querydsl.scala
 
+import java.util.Arrays._
 import java.util.Collection
-import java.util.Arrays._;
 
-import Constants._
-import Operations._
-//import Conversions.aliasFactory;
+import com.querydsl.core.types.Ops._
+import com.querydsl.core.types._
+import com.querydsl.scala.Constants._
+import com.querydsl.scala.Operations._
 
 object Constants {
 
@@ -33,23 +28,23 @@ object Constants {
 
   def constant(value: String) = ConstantImpl.create(value)
 
-  def constant[T](value: T) = new ConstantImpl(value)
+  def constant[T](value: T) = ConstantImpl.create(value)
 
 }
 
 trait DslExpression[T] extends Expression[T] {
 
-  def as(right: Path[T]): DslExpression[T] = dsl(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  def as(right: Path[T]): DslExpression[T] = Operations.dsl(getType, ALIAS, this, right)
 
-  def as(alias: String): DslExpression[T] = as(new PathImpl[T](getType, alias))
+  def as(alias: String): DslExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
 trait SimpleExpression[T] extends DslExpression[T] {
 
-  override def as(right: Path[T]): SimpleExpression[T] = simple(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]): SimpleExpression[T] = simple(getType, ALIAS, this, right)
 
-  override def as(alias: String): SimpleExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): SimpleExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
   def eq(right: T): BooleanExpression = eq(constant(right))
 
@@ -75,6 +70,8 @@ trait SimpleExpression[T] extends DslExpression[T] {
 
   def in(right: CollectionExpression[T,_]) = boolean(IN, this, right)
 
+  def in(right: SubQueryExpression[T]) = boolean(IN, this, right)
+
   def countDistinct() = number[Long](classOf[Long], AggOps.COUNT_DISTINCT_AGG, this)
 
   lazy val isNotNull = boolean(IS_NOT_NULL, this)
@@ -87,9 +84,11 @@ trait SimpleExpression[T] extends DslExpression[T] {
 
   def notIn(right: CollectionExpression[T,_]) = in(right).not
 
+  def notIn(right: SubQueryExpression[T]) = in(right).not
+
   def nullif(right: T): SimpleExpression[T] = nullif(constant(right))
 
-  def nullif(right: Expression[T]) = simple[T](getType, NULLIF.asInstanceOf[Operator[T]], this, right)
+  def nullif(right: Expression[T]) = simple[T](getType, NULLIF, this, right)
 
   def is[M <: SimpleExpression[T]](f: M => BooleanExpression): BooleanExpression = {
     if (f == null) isNull else f(this.asInstanceOf[M])
@@ -106,7 +105,7 @@ trait ArrayExpression[T <: Array[_]] extends DslExpression[T] {
 }
 
 trait CollectionExpressionBase[T <: Collection[C], C, Q <: Expression[_ >: C]]
-  extends DslExpression[T] with com.mysema.query.types.CollectionExpression[T,C] {
+  extends DslExpression[T] with com.querydsl.core.types.CollectionExpression[T,C] {
 
   lazy val size = number[Int](classOf[Int], COL_SIZE, this)
 
@@ -139,7 +138,7 @@ trait ListExpression[T, Q <: Expression[_ >: T]] extends CollectionExpressionBas
 }
 
 trait MapExpression[K, V, Q <: Expression[_ >: V]]
-  extends DslExpression[java.util.Map[K, V]] with com.mysema.query.types.MapExpression[K,V] {
+  extends DslExpression[java.util.Map[K, V]] with com.querydsl.core.types.MapExpression[K,V] {
 
   lazy val size = number[Int](classOf[Int], MAP_SIZE, this)
 
@@ -215,9 +214,9 @@ trait ComparableExpression[T <: Comparable[_]] extends ComparableExpressionBase[
 
   def <=(right: Expression[T]) = loe(right)
 
-  override def as(right: Path[T]) = comparable(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]) = comparable(getType, ALIAS, this, right)
 
-  override def as(alias: String): ComparableExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): ComparableExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
@@ -361,7 +360,7 @@ trait NumberExpression[T] extends SimpleExpression[T] {
 
   override def as(right: Path[T]) = number(getType, ALIAS, this, right)
 
-  override def as(alias: String): NumberExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): NumberExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
@@ -391,9 +390,9 @@ trait BooleanExpression extends ComparableExpression[java.lang.Boolean] with Pre
 
   def unary_! = not()
 
-  override def as(right: Path[java.lang.Boolean]) = boolean(ALIAS.asInstanceOf[Operator[java.lang.Boolean]], this, right)
+  override def as(right: Path[java.lang.Boolean]) = boolean(ALIAS, this, right)
 
-  override def as(alias: String): BooleanExpression = as(new PathImpl[java.lang.Boolean](getType, alias))
+  override def as(alias: String): BooleanExpression = as(ExpressionUtils.path[java.lang.Boolean](getType, alias))
 
 }
 
@@ -487,9 +486,9 @@ trait StringExpression extends ComparableExpression[String] {
 
   def startsWithIgnoreCase(right: String): BooleanExpression = startsWithIgnoreCase(constant(right))
 
-  override def as(right: Path[String]) = string(ALIAS.asInstanceOf[Operator[String]], this, right)
+  override def as(right: Path[String]) = string(ALIAS, this, right)
 
-  override def as(alias: String): StringExpression = as(new PathImpl[String](getType, alias))
+  override def as(alias: String): StringExpression = as(ExpressionUtils.path[String](getType, alias))
 
 }
 
@@ -515,9 +514,9 @@ trait TimeExpression[T <: Comparable[_]] extends TemporalExpression[T] {
 
   lazy val milliSecond = number(classOf[Integer], DateTimeOps.MILLISECOND, this)
 
-  override def as(right: Path[T]) = time(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]) = time(getType, ALIAS, this, right)
 
-  override def as(alias: String): TimeExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): TimeExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
@@ -551,9 +550,9 @@ trait DateTimeExpression[T <: Comparable[_]] extends TemporalExpression[T] {
 
   lazy val milliSecond = number(classOf[Integer], DateTimeOps.DAY_OF_YEAR, this)
 
-  override def as(right: Path[T]) = dateTime(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]) = dateTime(getType, ALIAS, this, right)
 
-  override def as(alias: String): DateTimeExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): DateTimeExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
@@ -579,9 +578,9 @@ trait DateExpression[T <: Comparable[_]] extends TemporalExpression[T] {
 
   lazy val yearWeek = year.multiply(100).add(week)
 
-  override def as(right: Path[T]) = date(getType, ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]) = date(getType, ALIAS, this, right)
 
-  override def as(alias: String): DateExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): DateExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
 }
 
@@ -589,9 +588,9 @@ trait EnumExpression[T <: Enum[T]] extends ComparableExpression[T] {
 
   lazy val ordinal = number(classOf[Integer], Ops.ORDINAL, this)
 
-  override def as(right: Path[T]) = enum(getType.asInstanceOf[Class[T]], ALIAS.asInstanceOf[Operator[T]], this, right)
+  override def as(right: Path[T]) = enum(getType.asInstanceOf[Class[T]], ALIAS, this, right)
 
-  override def as(alias: String): EnumExpression[T] = as(new PathImpl[T](getType, alias))
+  override def as(alias: String): EnumExpression[T] = as(ExpressionUtils.path[T](getType, alias))
 
   def mapToId[T <: { def id: java.lang.Long }](events: List[T]) = events groupBy (_.id.longValue) toList
 
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/GroupBy.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/GroupBy.scala
similarity index 87%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/GroupBy.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/GroupBy.scala
index c66b9b1d9f..1df39b739b 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/GroupBy.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/GroupBy.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,55 +12,55 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
+package com.querydsl.scala
+
+import com.querydsl.core.group._
+import com.querydsl.scala.GroupBy._
 
-import com.mysema.query.types._
-import com.mysema.query.group._
 import scala.collection.mutable.Builder
-import GroupBy._
 
 /**
  * Group by result transforming functionality
- * 
+ *
  * @author tiwe
  *
  */
 object GroupBy extends GroupBy {
-  
+
   class BuilderCollector[T,C](builder: Builder[T,C]) extends GroupCollector[T,C]{
     def add(o: T) { builder.+=(o) }
     def get(): C = builder.result()
   }
-  
+
 }
 
 trait GroupBy {
-    
+
   /**
-   * 
+   *
    */
   def groupBy[K](key: Ex[K]) = new GroupByBuilder[K](key)
-  
+
   /**
-   * 
+   *
    */
   def set[T](e: Ex[T]) = new AbstractGroupExpression[T,Set[T]](classOf[Set[T]], e) {
     def createGroupCollector() = new BuilderCollector(Set.newBuilder[T])
   }
-    
+
   /**
-   * 
+   *
    */
   def list[T](e: Ex[T]) = new AbstractGroupExpression[T,List[T]](classOf[List[T]], e) {
     def createGroupCollector = new BuilderCollector(List.newBuilder[T])
   }
-     
+
   /**
-   * 
+   *
    */
   def map[K,V](k: Ex[K], v: Ex[V]) = new AbstractGroupExpression[(K,V),Map[K,V]](
       classOf[Map[K,V]], new Tu2Ex(k,v)) {
     def createGroupCollector = new BuilderCollector(Map.newBuilder[K,V])
   }
-    
+
 }
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/scala/ManifestUtils.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/ManifestUtils.scala
similarity index 75%
rename from querydsl-scala/src/main/scala/com/mysema/scala/ManifestUtils.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/ManifestUtils.scala
index 7d54fa3119..712ccba1ab 100644
--- a/querydsl-scala/src/main/scala/com/mysema/scala/ManifestUtils.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/ManifestUtils.scala
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.mysema.scala
+package com.querydsl.scala
 
 /**
  * @author tiwe
  *
  */
 object ManifestUtils {
-  
-  implicit def toClass[X](mf: Manifest[X]) = mf.runtimeClass.asInstanceOf[Class[X]]
-  
-}
\ No newline at end of file
+
+  implicit def toClass[X](mf: Manifest[X]): Class[X] = mf.runtimeClass.asInstanceOf[Class[X]]
+
+}
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Matchers.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Matchers.scala
similarity index 90%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/Matchers.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/Matchers.scala
index fc47467830..b824596d06 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Matchers.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Matchers.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,38 +12,36 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
-
-import com.mysema.query.types._
+package com.querydsl.scala
 
 /**
  * Various factory methods for Expression DSL
- * 
+ *
  * @author tiwe
  *
  */
 object Matchers {
-    
-  def in[T](values: T*) = (expr: SimpleExpression[T]) => expr.in(values:_*)  
-  
+
+  def in[T](values: T*) = (expr: SimpleExpression[T]) => expr.in(values:_*)
+
   def not(v: Void) = (expr: SimpleExpression[_]) => expr.isNotNull
-    
+
   def between[T <: Comparable[T]](left: T, right: T) = (expr: ComparableExpression[T]) => expr.between(left, right)
-  
+
   def between[U : Numeric](left: U, right: U) = (expr: NumberExpression[_]) => expr.between(left, right)
-    
+
   def like(str: String) = (expr: StringExpression) => expr.like(str)
-  
+
   def matches(str: String) = (expr: StringExpression) => expr.matches(str)
-  
+
   def startsWith(str: String) = (expr: StringExpression) => expr.startsWith(str)
-  
+
   def endsWith(str: String) = (expr: StringExpression) => expr.endsWith(str)
-  
+
   // NOTE : clashes with CollectionExpression.contains
   def contains(str: String) = (expr: StringExpression) => expr.contains(str)
-  
+
   // NOTE : clashes with MapExpression.isEmpty and CollectionExpression.isEmpty
   def empty = (expr: StringExpression) => expr.isEmpty
-      
+
 }
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Numeric.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Numeric.scala
similarity index 81%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/Numeric.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/Numeric.scala
index 0fb5c557bd..c6c694af78 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Numeric.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Numeric.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,25 +12,25 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
+package com.querydsl.scala
 
 object Numeric {
-  implicit val byte = new Numeric[Byte]   
+  implicit val byte = new Numeric[Byte]
   implicit val byte2 = new Numeric[java.lang.Byte]
-  implicit val double = new Numeric[Double]  
+  implicit val double = new Numeric[Double]
   implicit val double2 = new Numeric[java.lang.Double]
-  implicit val float = new Numeric[Float]  
+  implicit val float = new Numeric[Float]
   implicit val float2 = new Numeric[java.lang.Float]
-  implicit val int = new Numeric[Int]  
+  implicit val int = new Numeric[Int]
   implicit val int2 = new Numeric[java.lang.Integer]
-  implicit val long = new Numeric[Long]  
+  implicit val long = new Numeric[Long]
   implicit val long2 = new Numeric[java.lang.Long]
-  implicit val short = new Numeric[Short]        
+  implicit val short = new Numeric[Short]
   implicit val short2 = new Numeric[java.lang.Short]
-    
+
   implicit val bigDecimal = new Numeric[java.math.BigDecimal]
   implicit val bigInteger = new Numeric[java.math.BigInteger]
-  
+
   implicit val richByte = new Numeric[scala.runtime.RichByte]
   implicit val richChar = new Numeric[scala.runtime.RichChar]
   implicit val richDouble = new Numeric[scala.runtime.RichDouble]
@@ -38,9 +38,9 @@ object Numeric {
   implicit val richInt = new Numeric[scala.runtime.RichInt]
   implicit val richLong = new Numeric[scala.runtime.RichLong]
   implicit val richShort = new Numeric[scala.runtime.RichShort]
-  
+
 }
-  
+
 /**
  * Type class for Number types
  */
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/Operations.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Operations.scala
new file mode 100644
index 0000000000..d8c5913053
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Operations.scala
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala
+
+import com.querydsl.core.types._
+
+/**
+ * Factory for Operations
+ *
+ * @author tiwe
+ *
+ */
+object Operations {
+
+  type Op = Operator
+
+  def dsl[T](t: Class[_ <: T], op: Op, args: Ex[_]*): DslExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with DslExpression[T]
+  }
+
+  def simple[T](t: Class[_ <: T], op: Op, args: Ex[_]*): SimpleExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with SimpleExpression[T]
+  }
+
+  def comparable[T <: Comparable[_]](t: Class[_ <: T], op: Op, args: Ex[_]*): ComparableExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with ComparableExpression[T]
+  }
+
+  def date[T <: Comparable[_]](t: Class[_ <: T], op: Op, args: Ex[_]*): DateExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with DateExpression[T]
+  }
+
+  def dateTime[T <: Comparable[_]](t: Class[_ <: T], op: Op, args: Ex[_]*): DateTimeExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with DateTimeExpression[T]
+  }
+
+  def time[T <: Comparable[_]](t: Class[_ <: T], op: Op, args: Ex[_]*): TimeExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with TimeExpression[T]
+  }
+
+  def number[T : Numeric](t: Class[_ <: T], op: Op, args: Ex[_]*): NumberExpression[T] =
+      new OperationImpl[T](t, op, args: _*) with NumberExpression[T] {
+        override def negate = if (getOperator == Ops.NEGATE) getArg(0).asInstanceOf[NumberExpression[T]] else super.negate
+        override def numeric = implicitly[Numeric[T]]
+      }
+
+  def boolean(op: Op, args: Ex[_]*): BooleanExpression = {
+    new OperationImpl[java.lang.Boolean](classOf[java.lang.Boolean], op, args: _*) with BooleanExpression
+  }
+
+  def string(op: Op, args: Ex[_]*): StringExpression = {
+    new OperationImpl[String](classOf[String], op, args: _*) with StringExpression
+  }
+
+  def enum[T <: Enum[T]](t: Class[T], op: Op, args: Ex[_]*): EnumExpression[T] = {
+    new OperationImpl[T](t, op, args: _*) with EnumExpression[T]
+  }
+
+}
+
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/Paths.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Paths.scala
new file mode 100644
index 0000000000..22ffad3dcb
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Paths.scala
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala
+
+import com.querydsl.core.types.PathMetadataFactory._
+import com.querydsl.core.types._
+import com.querydsl.scala.ManifestUtils._
+
+
+/**
+ * Factory for path expressions
+ *
+ * @author tiwe
+ *
+ */
+object Paths {
+
+  type Metadata = PathMetadata
+
+  def array[T <: Array[_]](t: Class[T], md: Metadata) = new ArrayPath[T](t, md)
+
+  def dsl[T](t: Class[_ <: T], md: Metadata) = new DslPath[T](t, md)
+
+  def simple[T](t: Class[_ <: T], md: Metadata) = new SimplePath[T](t, md)
+
+  def entity[T](t: Class[_ <: T], md: Metadata) = new EntityPathImpl[T](t, md)
+
+  def collection[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata) = {
+    new CollectionPath[T,Q](t, q, md)
+  }
+
+  def set[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata) = new SetPath[T,Q](t, q, md)
+
+  def list[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: Metadata) = new ListPath[T,Q](t, q, md)
+
+  def map[K, V, Q <: Ex[_ >: V]](k: Class[K], v: Class[V], q: Class[Q], md: Metadata) = {
+    new MapPath[K, V, Q](k, v, q, md)
+  }
+
+  def comparable[T <: Comparable[_]](t: Class[_ <: T], md: Metadata) = new ComparablePath[T](t, md)
+
+  def date[T <: Comparable[_]](t: Class[_ <: T], md: Metadata) = new DatePath[T](t, md)
+
+  def dateTime[T <: Comparable[_]](t: Class[_ <: T], md: Metadata) = new DateTimePath[T](t, md)
+
+  def time[T <: Comparable[_]](t: Class[_ <: T], md: Metadata) = new TimePath[T](t, md)
+
+  def number[T : Numeric](t: Class[T], md: Metadata) = new NumberPath[T](t, md)
+
+  def boolean(md: Metadata) = new BooleanPath(md)
+
+  def string(md: Metadata) = new StringPath(md)
+
+  def enum[T <: Enum[T]](t: Class[T], md: Metadata) = new EnumPath[T](t, md)
+
+  def any[T, Q <: Ex[_ >: T]](parent: Path[_], t: Class[T], q: Class[Q]): Q =  create(t, q, forCollectionAny(parent))
+
+  def create[T, Q <: Ex[_ >: T]](t :Class[T], q: Class[Q], md: Metadata): Q = q match {
+    case _ if q == classOf[StringPath] | q == classOf[BooleanPath] => {
+      q.getConstructor(classOf[PathMetadata]).newInstance(md)
+    }
+    case _ => q.getConstructor(classOf[Class[_]], classOf[PathMetadata]).newInstance(t, md)
+  }
+
+}
+
+class DslPath[T](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with DslExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class SimplePath[T](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with SimpleExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class ArrayPath[T <: Array[_]](t: Class[T], md: PathMetadata)
+  extends PathImpl[T](t, md) with ArrayExpression[T] {
+
+  def this(t: Class[T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class BeanPath[T](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with SimpleExpression[T] {
+
+  import Paths._
+
+  type Mf[X] = Manifest[X]
+
+  def add[P <: Path[_]](path: P): P = path
+
+  def createArray[T <: Array[_]](property: String)(implicit mf: Mf[T]) = add(array(mf, forProperty(property)))
+
+  def createSimple[T](property: String)(implicit mf: Mf[T]) = add(simple(mf, forProperty(property)))
+
+  def createEntity[T](property: String)(implicit mf: Mf[T]) = add(entity(t, forProperty(property)))
+
+  def createCollection[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(collection(t, q, forProperty(property)))
+
+  def createSet[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(set(t, q, forProperty(property)))
+
+  def createList[T, Q <: Ex[_ >: T]](property: String)(implicit t: Mf[T], q: Mf[Q]) = add(list(t, q, forProperty(property)))
+
+  def createMap[K, V, Q <: Ex[_ >: V]](property: String)(implicit k: Mf[K], v: Mf[V], q: Mf[Q]) = add(map(k, v, q, forProperty(property)))
+
+  def createComparable[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(comparable(mf, forProperty(property)))
+
+  def createDate[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(date(mf, forProperty(property)))
+
+  def createDateTime[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(dateTime(mf, forProperty(property)))
+
+  def createTime[T <: Comparable[_]](property: String)(implicit mf: Mf[T]) = add(time(mf, forProperty(property)))
+
+  def createNumber[T](property: String)(implicit num: Numeric[T], mf: Mf[T]) = add(number[T](mf, forProperty(property)))
+
+  def createBoolean(property: String) = add(boolean(forProperty(property)))
+
+  def createString(property: String) = add(string(forProperty(property)))
+
+  def createEnum[T <: Enum[T]](property: String)(implicit mf: Mf[T]) = add(enum(mf, forProperty(property)))
+
+  private def forProperty(property: String) = PathMetadataFactory.forProperty(this, property)
+
+}
+
+class EntityPathImpl[T](t: Class[_ <: T], md: PathMetadata)
+  extends BeanPath[T](t, md) with EntityPath[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+  def getMetadata(path: Path[_]): AnyRef = null
+
+}
+
+class CollectionPath[T, Q <: Ex[_ >: T]](t: Class[T], q: Class[Q], md: PathMetadata)
+  extends PathImpl[java.util.Collection[T]](classOf[java.util.Collection[T]], md) with CollectionExpression[T,Q] {
+
+  def this(t: Class[T],  q: Class[Q], variable: String) = this(t, q, forVariable(variable))
+
+  def getParameter(i: Int) = t
+
+  lazy val any: Q = Paths.any(this, t, q)
+
+}
+
+class SetPath[T, Q <: Ex[_ >: T]](t: Class[T],  q: Class[Q], md: PathMetadata)
+  extends PathImpl[java.util.Set[T]](classOf[java.util.Set[T]], md) with SetExpression[T,Q] {
+
+  def this(t: Class[T], q: Class[Q], variable: String) = this(t, q, forVariable(variable))
+
+  def getParameter(i: Int) = t
+
+  lazy val any: Q = Paths.any(this, t, q)
+
+}
+
+class ListPath[T, Q <: Ex[_ >: T]](t: Class[T],  q: Class[Q], md: PathMetadata)
+  extends PathImpl[java.util.List[T]](classOf[java.util.List[T]], md) with ListExpression[T,Q] {
+
+  def this(t: Class[T], q: Class[Q], variable: String) = this(t, q, forVariable(variable))
+
+  def getParameter(i: Int) = t
+
+  lazy val any: Q = Paths.any(this, t, q)
+
+  def get(i: Int): Q = Paths.create(t, q, forListAccess(this, i))
+
+  def get(i: Ex[Integer]): Q = Paths.create(t, q, forListAccess(this, i))
+
+}
+
+class MapPath[K, V, Q <: Ex[_ >: V]](k: Class[K], v: Class[V], q: Class[Q], md: PathMetadata)
+  extends PathImpl[java.util.Map[K, V]](classOf[java.util.Map[K, V]], md) with MapExpression[K, V, Q] {
+
+  def this(k: Class[K], v: Class[V], q: Class[Q], variable: String) = this(k, v, q, forVariable(variable))
+
+  def getParameter(i: Int): Class[_] = { if (i == 0) k else v }
+
+  def get(key: K) = Paths.create(v, q, forMapAccess(this, key))
+
+  def get(key: Ex[K]) = Paths.create(v, q, forMapAccess(this, key))
+
+}
+
+class ComparablePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with ComparableExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class NumberPath[T : Numeric](t: Class[T], md: PathMetadata)
+  extends PathImpl[T](t, md) with NumberExpression[T] {
+
+  def this(t: Class[T], variable: String) = this(t, forVariable(variable))
+  override def numeric = implicitly[Numeric[T]]
+
+}
+
+class BooleanPath(md: PathMetadata)
+  extends PathImpl[java.lang.Boolean](classOf[java.lang.Boolean], md) with BooleanExpression {
+
+  def this(variable: String) = this(forVariable(variable))
+
+}
+
+class StringPath(md: PathMetadata)
+  extends PathImpl[String](classOf[String], md) with StringExpression {
+
+  def this(variable: String) = this(forVariable(variable))
+
+}
+
+class DatePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with DateExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class DateTimePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with DateTimeExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class TimePath[T <: Comparable[_]](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with TimeExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
+
+class EnumPath[T <: Enum[T]](t: Class[_ <: T], md: PathMetadata)
+  extends PathImpl[T](t, md) with EnumExpression[T] {
+
+  def this(t: Class[_ <: T], variable: String) = this(t, forVariable(variable))
+
+}
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Projections.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Projections.scala
similarity index 85%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/Projections.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/Projections.scala
index 9d62ae22ab..7640b02e44 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Projections.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Projections.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,370 +12,370 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
+package com.querydsl.scala
+
+import java.util.Arrays
 
-import com.mysema.query.types._
-import com.mysema.query.types.{ Projections => ProjectionsFactory }
-import java.util.{ Arrays }
+import com.querydsl.core.types.{Projections => ProjectionsFactory, _}
 
 object Projections extends Projections
 
 /**
  * Projections provides implicit conversions from tuples to FactoryExpressions
- * 
+ *
  * @author tiwe
  *
  */
 trait Projections {
-  
+
   /**
    * Create a FactoryExpressions for the given type and arguments
-   *  
+   *
    * @param expressions
    * @param mf
    * @return
    */
-  def create[T](expressions: Ex[_]*)(implicit mf: Manifest[T]) = {
+  def create[T](expressions: Ex[_]*)(implicit mf: Manifest[T]): ExpressionBase[_] = {
     val clazz = mf.runtimeClass.asInstanceOf[Class[T]]
     try {
       clazz.getConstructor()
       ProjectionsFactory.fields[T](clazz, expressions:_*)
     } catch { case e: NoSuchMethodException => {
-      ProjectionsFactory.constructor[T](clazz, expressions:_*)   
-    }}    
+      ProjectionsFactory.constructor[T](clazz, expressions:_*)
+    }}
   }
-  
-  implicit def tuple2Expr[A,B](t: (_ <: Ex[A], _ <: Ex[B])) = new Tu2Ex[A,B](t._1, t._2) 
+
+  implicit def tuple2Expr[A,B](t: (_ <: Ex[A], _ <: Ex[B])) = new Tu2Ex[A,B](t._1, t._2)
 
   implicit def tuple3Expr[A,B,C](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C])) = {
-    new Tu3Ex[A,B,C](t._1, t._2, t._3) 
+    new Tu3Ex[A,B,C](t._1, t._2, t._3)
   }
 
   implicit def tuple4Expr[A,B,C,D](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D])) = {
     new Tu4Ex[A,B,C,D](t._1, t._2, t._3, t._4)
   }
-  
-  implicit def tuple5Expr[A,B,C,D,E](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D], 
+
+  implicit def tuple5Expr[A,B,C,D,E](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D],
       _<: Ex[E])) = {
     new Tu5Ex[A,B,C,D,E](t._1, t._2, t._3, t._4, t._5)
   }
-  
-  implicit def tuple6Expr[A,B,C,D,E,F](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D], 
+
+  implicit def tuple6Expr[A,B,C,D,E,F](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D],
       _<: Ex[E], _ <: Ex[F])) = {
     new Tu6Ex[A,B,C,D,E,F](t._1, t._2, t._3, t._4, t._5, t._6)
   }
-  
-  implicit def tuple7Expr[A,B,C,D,E,F,G](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D], 
+
+  implicit def tuple7Expr[A,B,C,D,E,F,G](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D],
       _<: Ex[E], _ <: Ex[F], _ <: Ex[G])) = {
     new Tu7Ex[A,B,C,D,E,F,G](t._1, t._2, t._3, t._4, t._5, t._6, t._7)
   }
-  
-  implicit def tuple8Expr[A,B,C,D,E,F,G,H](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D], 
+
+  implicit def tuple8Expr[A,B,C,D,E,F,G,H](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], _ <: Ex[D],
       _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H])) = {
     new Tu8Ex[A,B,C,D,E,F,G,H](t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)
   }
-  
+
   implicit def tuple9Expr[A,B,C,D,E,F,G,H,I](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C],
       _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I])) = {
     new Tu9Ex[A,B,C,D,E,F,G,H,I](t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8, t._9)
   }
-  
-  implicit def tuple10Expr[A,B,C,D,E,F,G,H,I,J](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C], 
+
+  implicit def tuple10Expr[A,B,C,D,E,F,G,H,I,J](t: (_ <: Ex[A], _ <: Ex[B], _ <: Ex[C],
       _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], _ <: Ex[J])) = {
     new Tu10Ex[A,B,C,D,E,F,G,H,I,J](t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8, t._9, t._10)
   }
-  
-  implicit def tuple11Expr[A,B,C,D,E,F,G,H,I,J,K](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple11Expr[A,B,C,D,E,F,G,H,I,J,K](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K])) = {
-    new Tu11Ex[A,B,C,D,E,F,G,H,I,J,K](t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8, 
+    new Tu11Ex[A,B,C,D,E,F,G,H,I,J,K](t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8,
         t._9, t._10, t._11)
   }
-  
-  implicit def tuple12Expr[A,B,C,D,E,F,G,H,I,J,K,L](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple12Expr[A,B,C,D,E,F,G,H,I,J,K,L](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L])) = {
-    new Tu12Ex[A,B,C,D,E,F,G,H,I,J,K,L](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu12Ex[A,B,C,D,E,F,G,H,I,J,K,L](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12)
   }
-  
-  implicit def tuple13Expr[A,B,C,D,E,F,G,H,I,J,K,L,M](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple13Expr[A,B,C,D,E,F,G,H,I,J,K,L,M](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M])) = {
-    new Tu13Ex[A,B,C,D,E,F,G,H,I,J,K,L,M](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu13Ex[A,B,C,D,E,F,G,H,I,J,K,L,M](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13)
   }
-  
-  implicit def tuple14Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple14Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N])) = {
-    new Tu14Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu14Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14)
   }
-  
-  implicit def tuple15Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple15Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O])) = {
-    new Tu15Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu15Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15)
-  }    
-  
-  implicit def tuple16Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+  }
+
+  implicit def tuple16Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O],
       _ <: Ex[P])) = {
-    new Tu16Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu16Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15, t._16)
   }
-  
-  implicit def tuple17Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple17Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O],
       _ <: Ex[P], _ <: Ex[Q])) = {
-    new Tu17Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu17Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15, t._16, t._17)
   }
-  
-  implicit def tuple18Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple18Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O],
       _ <: Ex[P], _ <: Ex[Q], _ <: Ex[R])) = {
-    new Tu18Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu18Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15, t._16, t._17, t._18)
   }
-  
-  implicit def tuple19Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple19Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O],
       _ <: Ex[P], _ <: Ex[Q], _ <: Ex[R], _ <: Ex[S])) = {
-    new Tu19Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu19Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15, t._16, t._17, t._18, t._19)
   }
-  
-  implicit def tuple20Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](t: (_ <: Ex[A], _ <: Ex[B], 
-      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I], 
+
+  implicit def tuple20Expr[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](t: (_ <: Ex[A], _ <: Ex[B],
+      _ <: Ex[C], _ <: Ex[D], _<: Ex[E], _ <: Ex[F], _ <: Ex[G], _ <: Ex[H], _ <: Ex[I],
       _ <: Ex[J], _ <: Ex[K], _ <: Ex[L], _ <: Ex[M], _ <: Ex[N], _ <: Ex[O],
       _ <: Ex[P], _ <: Ex[Q], _ <: Ex[R], _ <: Ex[S], _ <: Ex[T])) = {
-    new Tu20Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](t._1, t._2, t._3, t._4, t._5, t._6, t._7, 
+    new Tu20Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](t._1, t._2, t._3, t._4, t._5, t._6, t._7,
         t._8, t._9, t._10, t._11, t._12, t._13, t._14, t._15, t._16, t._17, t._18, t._19, t._20)
   }
-       
+
 }
 
-class Tuple2Expression[A,B](args: Ex[_]*) 
-extends FactoryExpressionBase[(A,B)](classOf[Tuple2[A,B]], args:_*) {  
+class Tuple2Expression[A,B](args: Ex[_]*)
+extends FactoryExpressionBase[(A,B)](classOf[Tuple2[A,B]], args:_*) {
   def newInstance(args: AnyRef*): (A,B) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B]) 
-  }     
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B])
+  }
 }
 
-class Tuple3Expression[A,B,C](args: Ex[_]*) 
+class Tuple3Expression[A,B,C](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple3[A,B,C]](classOf[Tuple3[A,B,C]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C) = {
     (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C])
-  }   
+  }
 }
 
-class Tuple4Expression[A,B,C,D](args: Ex[_]*) 
+class Tuple4Expression[A,B,C,D](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple4[A,B,C,D]](classOf[Tuple4[A,B,C,D]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D) = {
     (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], args(3).asInstanceOf[D])
-  }   
+  }
 }
 
-class Tuple5Expression[A,B,C,D,E](args: Ex[_]*) 
+class Tuple5Expression[A,B,C,D,E](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple5[A,B,C,D,E]](classOf[Tuple5[A,B,C,D,E]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E])
-  }   
+  }
 }
 
-class Tuple6Expression[A,B,C,D,E,F](args: Ex[_]*) 
+class Tuple6Expression[A,B,C,D,E,F](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple6[A,B,C,D,E,F]](classOf[Tuple6[A,B,C,D,E,F]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F])
-  }   
+  }
 }
 
-class Tuple7Expression[A,B,C,D,E,F,G](args: Ex[_]*) 
+class Tuple7Expression[A,B,C,D,E,F,G](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple7[A,B,C,D,E,F,G]](classOf[Tuple7[A,B,C,D,E,F,G]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G])
-  }   
+  }
 }
 
-class Tuple8Expression[A,B,C,D,E,F,G,H](args: Ex[_]*) 
+class Tuple8Expression[A,B,C,D,E,F,G,H](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple8[A,B,C,D,E,F,G,H]](classOf[Tuple8[A,B,C,D,E,F,G,H]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H])
-  }   
+  }
 }
 
-class Tuple9Expression[A,B,C,D,E,F,G,H,I](args: Ex[_]*) 
+class Tuple9Expression[A,B,C,D,E,F,G,H,I](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple9[A,B,C,D,E,F,G,H,I]](classOf[Tuple9[A,B,C,D,E,F,G,H,I]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I])
-  }   
+  }
 }
 
-class Tuple10Expression[A,B,C,D,E,F,G,H,I,J](args: Ex[_]*) 
+class Tuple10Expression[A,B,C,D,E,F,G,H,I,J](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple10[A,B,C,D,E,F,G,H,I,J]](classOf[Tuple10[A,B,C,D,E,F,G,H,I,J]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J])
-  }   
+  }
 }
 
-class Tuple11Expression[A,B,C,D,E,F,G,H,I,J,K](args: Ex[_]*) 
+class Tuple11Expression[A,B,C,D,E,F,G,H,I,J,K](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple11[A,B,C,D,E,F,G,H,I,J,K]](classOf[Tuple11[A,B,C,D,E,F,G,H,I,J,K]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K])
-  }   
+  }
 }
 
-class Tuple12Expression[A,B,C,D,E,F,G,H,I,J,K,L](args: Ex[_]*) 
+class Tuple12Expression[A,B,C,D,E,F,G,H,I,J,K,L](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple12[A,B,C,D,E,F,G,H,I,J,K,L]](classOf[Tuple12[A,B,C,D,E,F,G,H,I,J,K,L]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L])
-  }   
+  }
 }
 
-class Tuple13Expression[A,B,C,D,E,F,G,H,I,J,K,L,M](args: Ex[_]*) 
+class Tuple13Expression[A,B,C,D,E,F,G,H,I,J,K,L,M](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple13[A,B,C,D,E,F,G,H,I,J,K,L,M]](classOf[Tuple13[A,B,C,D,E,F,G,H,I,J,K,L,M]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M])
-  }   
+  }
 }
 
-class Tuple14Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N](args: Ex[_]*) 
+class Tuple14Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple14[A,B,C,D,E,F,G,H,I,J,K,L,M,N]](classOf[Tuple14[A,B,C,D,E,F,G,H,I,J,K,L,M,N]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N])
-  }   
+  }
 }
 
-class Tuple15Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](args: Ex[_]*) 
+class Tuple15Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple15[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O]](classOf[Tuple15[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O])
-  }   
+  }
 }
 
-class Tuple16Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](args: Ex[_]*) 
+class Tuple16Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple16[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P]](classOf[Tuple16[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O],
      args(15).asInstanceOf[P])
-  }   
+  }
 }
 
-class Tuple17Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](args: Ex[_]*) 
+class Tuple17Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple17[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q]](classOf[Tuple17[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O],
      args(15).asInstanceOf[P], args(16).asInstanceOf[Q])
-  }   
+  }
 }
 
-class Tuple18Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](args: Ex[_]*) 
+class Tuple18Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple18[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R]](classOf[Tuple18[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O],
      args(15).asInstanceOf[P], args(16).asInstanceOf[Q], args(17).asInstanceOf[R])
-  }   
+  }
 }
 
-class Tuple19Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](args: Ex[_]*) 
+class Tuple19Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple19[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S]](classOf[Tuple19[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O],
      args(15).asInstanceOf[P], args(16).asInstanceOf[Q], args(17).asInstanceOf[R],
      args(18).asInstanceOf[S])
-  }   
+  }
 }
 
-class Tuple20Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](args: Ex[_]*) 
+class Tuple20Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T](args: Ex[_]*)
 extends FactoryExpressionBase[Tuple20[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T]](classOf[Tuple20[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T]], args:_*) {
-  
+
   def newInstance(args: AnyRef*): (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) = {
-    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C], 
+    (args(0).asInstanceOf[A], args(1).asInstanceOf[B], args(2).asInstanceOf[C],
      args(3).asInstanceOf[D], args(4).asInstanceOf[E], args(5).asInstanceOf[F],
      args(6).asInstanceOf[G], args(7).asInstanceOf[H], args(8).asInstanceOf[I],
      args(9).asInstanceOf[J], args(10).asInstanceOf[K], args(11).asInstanceOf[L],
      args(12).asInstanceOf[M], args(13).asInstanceOf[N], args(14).asInstanceOf[O],
      args(15).asInstanceOf[P], args(16).asInstanceOf[Q], args(17).asInstanceOf[R],
      args(18).asInstanceOf[S], args(19).asInstanceOf[T])
-  }   
+  }
 }
 
-abstract class FactoryExpressionBase[T](cl: Class[T], args: Ex[_]*) 
+abstract class FactoryExpressionBase[T](cl: Class[T], args: Ex[_]*)
   extends ExpressionBase[T](cl) with FactoryExpression[T] {
-  
+
   def accept[R,C](v: Visitor[R,C], context: C): R = v.visit(this, context)
-  
-  def getArgs(): java.util.List[Ex[_]] = Arrays.asList(args:_*)
-  
+
+  def getArgs: java.util.List[Ex[_]] = Arrays.asList(args:_*)
+
   def apply(i: Int): Ex[_] = args(i)
-  
-} 
+
+}
diff --git a/querydsl-scala/src/main/scala/com/mysema/scala/ReflectionUtils.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/ReflectionUtils.scala
similarity index 82%
rename from querydsl-scala/src/main/scala/com/mysema/scala/ReflectionUtils.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/ReflectionUtils.scala
index bd3a0b29d8..084fa6b547 100644
--- a/querydsl-scala/src/main/scala/com/mysema/scala/ReflectionUtils.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/ReflectionUtils.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,33 +12,31 @@
  * limitations under the License.
  */
 
-package com.mysema.scala
+package com.querydsl.scala
 
 import java.lang.reflect._
-import javax.annotation.Nullable
-import scala.collection.mutable.ListBuffer
 
 /**
  * @author tiwe
  *
  */
 object ReflectionUtils {
-    
-  def getSuperClasses(cl: Class[_]): List[Class[_]] = { 
+
+  def getSuperClasses(cl: Class[_]): List[Class[_]] = {
     if (cl == null) Nil else cl :: getSuperClasses(cl.getSuperclass)
-  } 
-    
+  }
+
   def getFields(cl: Class[_]): List[Field] = {
     getSuperClasses(cl).flatMap(_.getDeclaredFields)
   }
-  
+
   def getImplementedInterfaces(cl: Class[_]): Set[Class[_]] = {
     getSuperClasses(cl).flatMap(_.getInterfaces).toSet
   }
-  
+
   def getNameAndValue[T](o: AnyRef, field: Field): (String,T) = {
     field.setAccessible(true)
     (field.getName, field.get(o).asInstanceOf[T])
-  }  
-  
+  }
+
 }
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaBeanSerializer.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaBeanSerializer.scala
new file mode 100644
index 0000000000..a4afb0fee7
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaBeanSerializer.scala
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala
+
+import java.util._
+import javax.inject.Inject
+
+import com.querydsl.codegen.utils.model.Parameter
+import com.querydsl.codegen.utils.{CodeWriter, ScalaWriter}
+import com.querydsl.codegen._
+import com.querydsl.scala.Serializer._
+
+import scala.collection.JavaConversions._
+import scala.collection.mutable.Set
+
+/**
+ * Serializer contains common functionality used in the Serializer implementations
+ */
+object Serializer {
+
+  /**
+   *
+   */
+  def writePackage(model: EntityType, writer: ScalaWriter) {
+    if (!model.getPackageName.isEmpty) writer.packageDecl(model.getPackageName)
+  }
+
+  /**
+   *
+   */
+  def writeImports(model: EntityType, javaBeanSupport: Boolean, writer: ScalaWriter) {
+    val importedClasses = getAnnotationTypes(model)
+    if (javaBeanSupport)  importedClasses.add("scala.beans.BeanProperty")
+    if (model.hasLists) importedClasses.add(classOf[List[_]].getName)
+    if (model.hasMaps)  importedClasses.add(classOf[Map[_, _]].getName)
+    writer.importClasses(importedClasses.toArray: _*)
+  }
+
+  /**
+   *
+   */
+  def writeCompanionObject(model: EntityType, typeMappings: TypeMappings, writer: ScalaWriter) {
+    val queryType = typeMappings.getPathType(model, model, true)
+    val modelName = writer.getRawName(model)
+    val queryTypeName = writer.getRawName(queryType)
+    val variable = model.getModifiedSimpleName
+
+    writer.beginObject(modelName + " extends "+queryTypeName+"(\""+variable+"\")")
+    writer.line("override def as(variable: String) = new ", queryTypeName, "(variable)")
+    writer.line("")
+    writer.end()
+  }
+
+  private def getAnnotationTypes(model: EntityType): Set[String] = {
+    val imports = Set() ++ model.getAnnotations.map(_.annotationType.getName)
+    // flatMap flattens the results of the map-function.
+    // E.g. List(List(1,2,3), List(4,5,6)).flatMap(_.map(_*3)) ends up as List(3, 6, 9, 12, 15, 18).
+    imports ++ model.getProperties.flatMap(_.getAnnotations.map(_.annotationType.getName))
+  }
+
+}
+
+/**
+ * Serializer implementation which serializes classes as mutable optionally JavaBean
+ * compatible classes
+ */
+class ScalaBeanSerializer @Inject() (typeMappings: TypeMappings) extends Serializer {
+
+  var javadocSuffix = " is a Querydsl bean type"
+
+  var createCompanionObject = true
+
+  var javaBeanSupport = false
+
+  /**
+   *
+   */
+  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
+    val scalaWriter = writer.asInstanceOf[ScalaWriter]
+
+    writePackage(model, scalaWriter)
+    writeImports(model, javaBeanSupport, scalaWriter)
+    if (createCompanionObject) {
+      writeCompanionObject(model, typeMappings, scalaWriter)
+    }
+    writeClass(model, scalaWriter)
+  }
+
+  def writeClass(model: EntityType, writer: ScalaWriter) = {
+    writer.javadoc(model.getSimpleName + javadocSuffix)
+    model.getAnnotations foreach(writer.annotation)
+    writer.beginClass(model)
+    for (property <- model.getProperties) {
+      property.getAnnotations.foreach(writer.annotation)
+      if (javaBeanSupport) writer.line("@BeanProperty")
+      writer.publicField(property.getType, property.getEscapedName, "_")
+    }
+    writer.end()
+  }
+
+}
+
+/**
+ * Serializer implementation which serializes classes as Scala case classes
+ */
+class CaseClassSerializer @Inject() (typeMappings: TypeMappings) extends Serializer {
+
+  var createCompanionObject = true
+
+  /**
+   *
+   */
+  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
+    val scalaWriter = writer.asInstanceOf[ScalaWriter]
+
+    writePackage(model, scalaWriter)
+    writeImports(model, false, scalaWriter)
+    if (createCompanionObject) {
+      writeCompanionObject(model, typeMappings, scalaWriter)
+    }
+    writeClass(model, scalaWriter)
+  }
+
+  def writeClass(model: EntityType, writer: ScalaWriter) = {
+    model.getAnnotations foreach writer.annotation
+    val parameters = model.getProperties
+      .map(p => new Parameter(p.getEscapedName, p.getType)).toArray
+    writer.caseClass(model.getSimpleName, parameters:_*)
+  }
+
+}
+
+
+
+
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaEntitySerializer.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaEntitySerializer.scala
new file mode 100644
index 0000000000..3b20a7d146
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaEntitySerializer.scala
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala
+
+import java.util._
+import javax.inject.Inject
+
+import com.querydsl.codegen.utils.model.TypeCategory._
+import com.querydsl.codegen.utils.model._
+import com.querydsl.codegen.utils.support.ScalaSyntaxUtils
+import com.querydsl.codegen.utils.{CodeWriter, ScalaWriter}
+import com.querydsl.codegen._
+import com.querydsl.core.types._
+
+import scala.collection.JavaConversions._
+import scala.collection.immutable.Map
+import scala.collection.mutable.Set
+
+/**
+ * EntitySerializer for Scala
+ *
+ * @author tiwe
+ *
+ */
+class ScalaEntitySerializer @Inject()(val typeMappings: TypeMappings) extends Serializer {
+
+  private val methodNames = Map(ARRAY->"Array", BOOLEAN->"Boolean", COLLECTION->"Collection",
+      COMPARABLE->"Comparable",DATE->"Date", DATETIME->"DateTime", ENUM->"Enum",
+      LIST->"List", MAP->"Map", NUMERIC->"Number", SET->"Set", SIMPLE->"Simple",
+      STRING->"String", TIME->"Time")
+
+  val classHeaderFormat = "%1$s(cl: Class[_ <: %2$s], md: PathMetadata) extends EntityPathImpl[%2$s](cl, md)"
+
+  var primitives = true
+
+  /**
+   *
+   */
+  def serialize(model: EntityType, serializerConfig: SerializerConfig, writer: CodeWriter) {
+    val scalaWriter = writer.asInstanceOf[ScalaWriter]
+    val simpleName: String = model.getSimpleName
+
+    // package
+    if (!model.getPackageName.isEmpty) writer.packageDecl(model.getPackageName)
+
+    // imports
+    writer.importPackages("com.querydsl.core.types","com.querydsl.scala")
+    writer.staticimports(classOf[PathMetadataFactory])
+
+    var importedClasses = getAnnotationTypes(model)
+    if (model.hasLists) importedClasses.add(classOf[java.util.List[_]].getName)
+    if (model.hasMaps)  importedClasses.add(classOf[java.util.Map[_, _]].getName)
+    writer.importClasses(importedClasses.toArray: _*)
+
+    writeHeader(model, scalaWriter)
+
+    var modelName = writer.getRawName(model)
+    writeAdditionalFields(model, scalaWriter)
+    writeAdditionalConstructors(modelName, scalaWriter)
+
+    // properties
+    serializeProperties(model, writer, model.getProperties  )
+
+    writeAdditionalProperties(model, scalaWriter)
+
+    writer.end()
+  }
+
+  def writeAdditionalConstructors(modelName: String, writer: ScalaWriter) = {
+    writer.line("def this(variable: String) = this(classOf[",
+        modelName,"], forVariable(variable))\n")
+    writer.line("def this(parent: Path[_], variable: String) = this(classOf[",
+        modelName,"], forProperty(parent, variable))\n")
+  }
+
+  def writeAdditionalFields(model: EntityType, writer: ScalaWriter) = {
+      // override to customize
+  }
+
+  def writeAdditionalProperties(model: EntityType, writer: ScalaWriter) = {
+      // override to customize
+  }
+
+  def writeHeader(model: EntityType, writer: ScalaWriter) {
+    val queryType = typeMappings.getPathType(model, model, true)
+    val modelName = writer.getRawName(model)
+    val queryTypeName = writer.getRawName(queryType)
+    val classHeader = String.format(classHeaderFormat, queryTypeName, modelName)
+
+    writeCompanionObject(model, queryType, writer)
+
+    // header
+    writeAnnotations(model, queryType, writer)
+    writer.beginClass(classHeader)
+  }
+
+  def writeCompanionObject(model: EntityType, queryType: Type, writer: ScalaWriter) = {
+    val queryTypeName = writer.getRawName(queryType)
+    val variable = model.getModifiedSimpleName
+
+    writer.beginObject(queryTypeName + " extends "+queryTypeName+"(\""+variable+"\")")
+    writer.line("override def as(variable: String) = new ", queryTypeName, "(variable)")
+    writer.line("")
+    writer.end()
+  }
+
+  def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = {
+    model.getAnnotations.foreach(writer.annotation)
+  }
+
+  def writeAdditionalCompanionContent(model: EntityType, writer: ScalaWriter) = {}
+
+  private def getEntityProperties(model: EntityType, writer: CodeWriter,
+      properties: Collection[Property]) = {
+    for (property <- properties if property.getType.getCategory == ENTITY) yield {
+      val queryType = typeMappings.getPathType(property.getType, model, false)
+      val typeName = writer.getRawName(queryType)
+      val name = escape(property.getEscapedName)
+      String.format("lazy val %1$s = new %2$s(this, \"%1$s\")", name, typeName)
+    }
+  }
+
+  private def getOtherProperties(model: EntityType, writer: CodeWriter,
+      properties: Collection[Property]) = {
+    for (property <- properties if property.getType.getCategory != ENTITY) yield {
+      val name = normalizeProperty(property.getName)
+      val methodName: String = "create" + methodNames(property.getType.getCategory)
+
+      val value = property.getType.getCategory match {
+        case BOOLEAN | STRING => methodName + "(\"" + name + "\")"
+        case LIST | SET | COLLECTION => {
+          val componentType = writer.getGenericName(true, property.getParameter(0))
+          val queryType = typeMappings.getPathType(getRaw(property.getParameter(0)), model, false)
+          methodName + "["+componentType+","+
+            writer.getGenericName(true, queryType)+"](\"" + name+ "\")"
+        }
+        case MAP => {
+          val keyType = writer.getGenericName(true, property.getParameter(0))
+          val valueType = writer.getGenericName(true, property.getParameter(1))
+          val queryType = typeMappings.getPathType(getRaw(property.getParameter(1)), model, false)
+          methodName + "["+keyType+","+valueType+","+
+            writer.getGenericName(true, queryType)+"](\"" + name + "\")"
+        }
+        case _ => methodName + "[" + getName(property.getType, writer) + "](\"" + name + "\")"
+      }
+      (normalizeProperty(property.getEscapedName), value)
+    }
+  }
+
+  private def normalizeProperty(name: String) = {
+    if (name.contains("$")) name.substring(name.lastIndexOf("$")+1) else name
+  }
+
+  private def getName(t: Type, writer: CodeWriter) = {
+    if (t == Types.CHARACTER) {
+      "Character" // because createComparable[Char] doesn't work, and the workaround involves implicit params
+    } else if (primitives && Types.PRIMITIVES.containsKey(t)) {
+      writer.getRawName(Types.PRIMITIVES.get(t))
+    } else {
+      writer.getGenericName(true, t)
+    }
+  }
+
+  def serializeProperties(model: EntityType, writer: CodeWriter, properties: Collection[Property]) {
+    // entity properties
+    getEntityProperties(model, writer, properties) foreach (writer.line(_, "\n"))
+
+    // other properties
+    getOtherProperties(model, writer, properties) foreach { case (propertyName, value) =>
+      writer.line("val ", escape(propertyName), " = ", value, "\n")
+    }
+  }
+
+  def escape(token: String): String = {
+    if (ScalaSyntaxUtils.isReserved(token)) "`" + token + "`"
+    else if (token == "count") token + "_"
+    else token
+  }
+
+  def getAnnotationTypes(model: EntityType): Set[String] = {
+    Set() ++ model.getAnnotations.map(_.annotationType.getName)
+  }
+
+  private def getRaw(t : Type): Type = {
+    t match {
+      case entityType: EntityType if entityType.getPackageName.startsWith("java") => t
+      case _ => new SimpleType(t, t.getParameters)
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaTypeMappings.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaTypeMappings.scala
new file mode 100644
index 0000000000..694a20bd4e
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/ScalaTypeMappings.scala
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala
+
+import com.querydsl.codegen.utils.model.TypeCategory
+import com.querydsl.codegen.TypeMappings
+import com.querydsl.core.types.{Expression, Path}
+
+/**
+ * Factory for TypeMappings creation
+ *
+ * @author tiwe
+ *
+ */
+object ScalaTypeMappings {
+
+  def create: TypeMappings = new ScalaTypeMappings()
+
+}
+
+class ScalaTypeMappings extends TypeMappings {
+  register(TypeCategory.STRING, classOf[StringExpression], classOf[StringPath], classOf[StringTemplate])
+  register(TypeCategory.BOOLEAN, classOf[BooleanExpression], classOf[BooleanPath], classOf[BooleanTemplate])
+  register(TypeCategory.COMPARABLE, classOf[ComparableExpression[_]], classOf[ComparablePath[_]], classOf[ComparableTemplate[_]])
+  register(TypeCategory.ENUM, classOf[EnumExpression[_]], classOf[EnumPath[_]], classOf[EnumTemplate[_]])
+  register(TypeCategory.DATE, classOf[DateExpression[_]], classOf[DatePath[_]], classOf[DateTemplate[_]])
+  register(TypeCategory.DATETIME, classOf[DateTimeExpression[_]], classOf[DateTimePath[_]], classOf[DateTimeTemplate[_]])
+  register(TypeCategory.TIME, classOf[TimeExpression[_]], classOf[TimePath[_]], classOf[TimeTemplate[_]])
+  register(TypeCategory.NUMERIC, classOf[NumberExpression[_]], classOf[NumberPath[_]], classOf[NumberTemplate[_]])
+  register(TypeCategory.SIMPLE, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.ARRAY, classOf[Expression[_]], classOf[ArrayPath[_]], classOf[SimpleTemplate[_]])
+
+  register(TypeCategory.COLLECTION, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.SET, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.LIST, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.MAP, classOf[Expression[_]], classOf[SimplePath[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.CUSTOM, classOf[Expression[_]], classOf[Path[_]], classOf[SimpleTemplate[_]])
+  register(TypeCategory.ENTITY, classOf[Expression[_]], classOf[Path[_]], classOf[SimpleTemplate[_]])
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Templates.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/Templates.scala
similarity index 92%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/Templates.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/Templates.scala
index ec5363542c..ecb4664537 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Templates.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/Templates.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,17 +12,13 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala
-
-import com.mysema.query.types._
-import com.mysema.query.types.PathMetadataFactory._
-import com.mysema.query.codegen._
+package com.querydsl.scala
 
-import com.mysema.codegen.model.TypeCategory
+import com.querydsl.core.types._
 
 /**
  * Factory for template expressions
- * 
+ *
  * @author tiwe
  *
  */
@@ -31,7 +27,7 @@ object Templates {
   def dsl[T](t: Class[_ <: T], tpl: Template, args: Ex[_]*): DslExpression[T] = {
     new DslTemplate[T](t, tpl, args: _*)
   }
-  
+
   def simple[T](t: Class[_ <: T], tpl: Template, args: Ex[_]*): SimpleExpression[T] = {
     new SimpleTemplate[T](t, tpl, args: _*)
   }
@@ -53,7 +49,7 @@ object Templates {
   }
 
   def number[T : Numeric](t: Class[_ <: T], tpl: Template, args: Ex[_]*): NumberExpression[T] = {
-    new NumberTemplate[T](t, tpl, args: _*) 
+    new NumberTemplate[T](t, tpl, args: _*)
   }
 
   def boolean(tpl: Template, args: Ex[_]*): BooleanExpression = new BooleanTemplate(tpl, args: _*)
@@ -86,11 +82,11 @@ class NumberTemplate[T : Numeric](t: Class[_ <: T], template: Template, args: Ex
 class BooleanTemplate(template: Template, args: Ex[_]*)
   extends TemplateExpressionImpl[java.lang.Boolean](classOf[java.lang.Boolean], template, args:_*) with BooleanExpression
 
-  
+
 class StringTemplate(template: Template, args: Ex[_]*)
   extends TemplateExpressionImpl[String](classOf[String], template, args:_*) with StringExpression
-  
-  
+
+
 class DateTemplate[T <: Comparable[_]](t: Class[_ <: T], template: Template, args: Ex[_]*)
   extends TemplateExpressionImpl[T](t, template, args:_*) with DateExpression[T]
 
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/package.scala
similarity index 93%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/package.scala
index 09528a1101..1972ac7186 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/package.scala
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,53 +12,53 @@
  * limitations under the License.
  */
 
-package com.mysema.query
+package com.querydsl
 
 /**
  * Common definitions used by this querydsl-scala
  */
 package object scala {
 
-  import com.mysema.query.types._
-  
+  import com.querydsl.core.types._
+
   type Ex[T] = Expression[T]
-  
+
   type Tu2Ex[A,B] = Tuple2Expression[A,B]
-  
+
   type Tu3Ex[A,B,C] = Tuple3Expression[A,B,C]
-  
+
   type Tu4Ex[A,B,C,D] = Tuple4Expression[A,B,C,D]
-  
+
   type Tu5Ex[A,B,C,D,E] = Tuple5Expression[A,B,C,D,E]
-  
+
   type Tu6Ex[A,B,C,D,E,F] = Tuple6Expression[A,B,C,D,E,F]
-  
+
   type Tu7Ex[A,B,C,D,E,F,G] = Tuple7Expression[A,B,C,D,E,F,G]
-  
+
   type Tu8Ex[A,B,C,D,E,F,G,H] = Tuple8Expression[A,B,C,D,E,F,G,H]
-  
+
   type Tu9Ex[A,B,C,D,E,F,G,H,I] = Tuple9Expression[A,B,C,D,E,F,G,H,I]
-  
+
   type Tu10Ex[A,B,C,D,E,F,G,H,I,J] = Tuple10Expression[A,B,C,D,E,F,G,H,I,J]
-  
+
   type Tu11Ex[A,B,C,D,E,F,G,H,I,J,K] = Tuple11Expression[A,B,C,D,E,F,G,H,I,J,K]
-  
+
   type Tu12Ex[A,B,C,D,E,F,G,H,I,J,K,L] = Tuple12Expression[A,B,C,D,E,F,G,H,I,J,K,L]
-  
+
   type Tu13Ex[A,B,C,D,E,F,G,H,I,J,K,L,M] = Tuple13Expression[A,B,C,D,E,F,G,H,I,J,K,L,M]
-  
+
   type Tu14Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N] = Tuple14Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N]
-  
+
   type Tu15Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O] = Tuple15Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O]
-  
+
   type Tu16Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P] = Tuple16Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P]
-  
+
   type Tu17Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q] = Tuple17Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q]
-  
+
   type Tu18Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R] = Tuple18Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R]
-  
+
   type Tu19Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S] = Tuple19Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S]
-  
+
   type Tu20Ex[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T] = Tuple20Expression[A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T]
-  
-} 
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/sql/RelationalPathImpl.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/RelationalPathImpl.scala
new file mode 100644
index 0000000000..88d805af07
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/RelationalPathImpl.scala
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala.sql
+
+import java.util.{ArrayList, HashMap, List => JavaList, Map => JavaMap}
+
+import com.querydsl.core.types.PathMetadataFactory._
+import com.querydsl.core.types._
+import com.querydsl.scala._
+import com.querydsl.sql._
+
+import scala.beans.BeanProperty
+
+/**
+ * Implementation of RelationalPath for Scala
+ *
+ * @author tiwe
+ *
+ */
+class RelationalPathImpl[T](md: PathMetadata, schema: String, table: String)(implicit val mf: Manifest[T])
+  extends BeanPath[T](mf.runtimeClass.asInstanceOf[Class[T]], md) with RelationalPath[T] {
+
+  import scala.collection.JavaConversions._
+
+  private var primaryKey: PrimaryKey[T] = _
+
+  private lazy val schemaAndTable = new SchemaAndTable(schema, table)
+
+  @BeanProperty
+  val columns: JavaList[Path[_]] = new ArrayList[Path[_]]
+
+  @BeanProperty
+  val foreignKeys: JavaList[ForeignKey[_]] = new ArrayList[ForeignKey[_]]
+
+  @BeanProperty
+  val inverseForeignKeys: JavaList[ForeignKey[_]] = new ArrayList[ForeignKey[_]]
+
+  @BeanProperty
+  lazy val projection: FactoryExpression[T] = RelationalPathUtils.createProjection(this)
+
+  private val metadata: JavaMap[Path[_], ColumnMetadata] = new HashMap[Path[_], ColumnMetadata]
+
+  def this(variable: String, schema: String, table: String)(implicit mf: Manifest[T]) = {
+    this(forVariable(variable), schema, table)(mf)
+  }
+
+  override def add[P <: Path[_]](p: P): P = {
+    columns.add(p)
+    p
+  }
+
+  protected def addMetadata(path: Path[_], md: ColumnMetadata) {
+    metadata.put(path, md)
+  }
+
+  def createPrimaryKey(cols: Path[_]*): PrimaryKey[T] = {
+    primaryKey = new PrimaryKey[T](this, cols:_*)
+    primaryKey
+  }
+
+  def createForeignKey[F](local: Path[_], foreign: String) = {
+    val foreignKey = new ForeignKey[F](this, local, foreign)
+    foreignKeys.add(foreignKey)
+    foreignKey
+  }
+
+  def createForeignKey[F](local: List[_ <: Path[_]], foreign: List[String]) = {
+    val foreignKey = new ForeignKey[F](this, local, foreign)
+    foreignKeys.add(foreignKey)
+    foreignKey
+  }
+
+  def createInvForeignKey[F](local: Path[_], foreign: String) = {
+    val foreignKey = new ForeignKey[F](this, local, foreign)
+    inverseForeignKeys.add(foreignKey)
+    foreignKey
+  }
+
+  def createInvForeignKey[F](local: List[_ <: Path[_]], foreign: List[String]) = {
+    val foreignKey = new ForeignKey[F](this, local, foreign)
+    inverseForeignKeys.add(foreignKey)
+    foreignKey
+  }
+
+  def getMetadata(path: Path[_]): ColumnMetadata = metadata.get(path)
+
+  def getPrimaryKey = primaryKey
+
+  def getSchemaName = schema
+
+  def getTableName = table
+
+  def getSchemaAndTable = schemaAndTable
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/SQL.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/SQL.scala
similarity index 80%
rename from querydsl-scala/src/main/scala/com/mysema/query/scala/sql/SQL.scala
rename to querydsl-scala/src/main/scala/com/querydsl/scala/sql/SQL.scala
index 0ce0966995..6500dbe27b 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/SQL.scala
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/SQL.scala
@@ -1,7 +1,7 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License")
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,27 +12,24 @@
  * limitations under the License.
  */
 
-package com.mysema.query.scala.sql
+package com.querydsl.scala.sql
 
 import java.sql._
 import javax.sql._
-import com.mysema.query.sql._
-import com.mysema.query.sql.dml._
-import com.mysema.query.types._
+
+import com.querydsl.core.types._
+import com.querydsl.sql._
+import com.querydsl.sql.dml._
 
 /**
  * Implicit conversion from RelationalPath to RichSimpleQuery
  */
 trait SQLHelpers {
-  
+
   def connection: Connection
-  
+
   def templates: SQLTemplates
 
-  implicit def toRichSimpleQuery[T, R <: RelationalPath[T]](p: RelationalPath[T] with R) = {
-    new RichSimpleQuery[T, R, T, R](p, p, new SQLQuery(connection, templates).from(p) )
-  }
-  
 }
 
 /**
@@ -40,24 +37,24 @@ trait SQLHelpers {
  * queries and DML clauses and transactional wrapping of code execution
  */
 trait SQL extends SQLHelpers {
-  
+
   private val connectionHolder = new ThreadLocal[Connection]
-  
+
   val dataSource: DataSource
-  
+
   def connection = connectionHolder.get()
-               
+
   def query() = new SQLQuery(connection, templates)
-  
+
   def from(expr: Expression[_]*) = query.from(expr:_*)
 
   def insert(path: RelationalPath[_]) = new SQLInsertClause(connection, templates, path)
-  
+
   def update(path: RelationalPath[_]) = new SQLUpdateClause(connection, templates, path)
-  
+
   def delete(path: RelationalPath[_]) = new SQLDeleteClause(connection, templates, path)
-     
-  def tx[R](fn: ⇒ R): R = {     
+
+  def tx[R](fn: ⇒ R): R = {
     val conn = dataSource.getConnection
     conn.setAutoCommit(false)
     connectionHolder.set(conn)
@@ -75,5 +72,5 @@ trait SQL extends SQLHelpers {
       connectionHolder.remove()
     }
   }
-  
+
 }
\ No newline at end of file
diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala
new file mode 100644
index 0000000000..ea94e812fc
--- /dev/null
+++ b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.scala.sql
+
+import java.util._
+import javax.inject.Inject
+
+import com.querydsl.codegen.utils.model._
+import com.querydsl.codegen.utils.{CodeWriter, ScalaWriter}
+import com.querydsl.codegen._
+import com.querydsl.scala.ScalaEntitySerializer
+import com.querydsl.sql._
+import com.querydsl.sql.codegen._
+import com.querydsl.sql.codegen.support._
+
+import scala.collection.JavaConversions._
+
+/**
+ * MetaDataSerializer implementation for Scala
+ *
+ * @author tiwe
+ *
+ */
+class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingStrategy: NamingStrategy)
+    extends ScalaEntitySerializer(typeMappings) {
+
+  override val classHeaderFormat = "%s(md: PathMetadata) extends RelationalPathImpl[%s](md, %s, %s)"
+
+  override def writeHeader(model: EntityType, writer: ScalaWriter) {
+    writer.imports(classOf[RelationalPathImpl[_]])
+    writer.imports(classOf[PrimaryKey[_]].getPackage)
+
+    val queryType = typeMappings.getPathType(model, model, true)
+    val modelName = writer.getRawName(model)
+    val queryTypeName = writer.getRawName(queryType)
+    val schema = model.getData.get("schema") match {
+      case x: String => "\""+x+"\""
+      case _ => "null"
+    }
+    val table = "\""+model.getData.get("table")+"\""
+    val classHeader = String.format(classHeaderFormat, queryTypeName, modelName, schema, table)
+
+    writeCompanionObject(model, queryType, writer)
+
+    // header
+    writer.beginClass(classHeader)
+  }
+
+  override def writeAdditionalConstructors(modelName: String, writer: ScalaWriter) = {
+    writer.line("def this(variable: String) = this(forVariable(variable))\n")
+    writer.line("def this(parent: Path[_], property: String) = this(forProperty(parent, property))\n")
+  }
+
+  override def writeAdditionalProperties(model: EntityType, writer: ScalaWriter) {
+    // primary keys
+    val primaryKeys: Collection[PrimaryKeyData] =
+      model.getData.get(classOf[PrimaryKeyData]).asInstanceOf[Collection[PrimaryKeyData]]
+    if (primaryKeys != null) serializePrimaryKeys(model, writer, primaryKeys)
+
+    // foreign keys
+    val foreignKeys: Collection[ForeignKeyData] =
+      model.getData.get(classOf[ForeignKeyData]).asInstanceOf[Collection[ForeignKeyData]]
+    if (foreignKeys != null) serializeForeignKeys(model, writer, foreignKeys, false)
+
+    // inverse foreign keys
+    val inverseForeignKeys: Collection[InverseForeignKeyData] =
+      model.getData.get(classOf[InverseForeignKeyData]).asInstanceOf[Collection[InverseForeignKeyData]]
+    if (inverseForeignKeys != null) serializeForeignKeys(model, writer, inverseForeignKeys, true)
+
+    // metadata
+    for (property <- model.getProperties) {
+      val name = property.getEscapedName
+      val metadata = property.getData.get("COLUMN").asInstanceOf[ColumnMetadata]
+      val columnMeta = new StringBuilder()
+      columnMeta.append("ColumnMetadata")
+      columnMeta.append(".named(\"" + metadata.getName + "\")")
+      columnMeta.append(".ofType(" + metadata.getJdbcType + ")")
+      if (metadata.hasSize) {
+        columnMeta.append(".withSize(" + metadata.getSize + ")")
+      }
+      if (metadata.getDigits > 0) {
+        columnMeta.append(".withDigits(" + metadata.getDigits + ")")
+      }
+      if (!metadata.isNullable) {
+        columnMeta.append(".notNull()")
+      }
+      writer.line("addMetadata(", escape(name), ", ", columnMeta.toString, ")")
+    }
+  }
+
+  override def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = {
+    if (model == queryType) {
+      model.getAnnotations.foreach(writer.annotation)
+    }
+  }
+
+  def serializePrimaryKeys(model: EntityType, writer: CodeWriter, primaryKeys: Collection[PrimaryKeyData]) {
+    primaryKeys.foreach { pk =>
+      val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName, model)
+      val value = pk.getColumns.map(c => escape(namingStrategy.getPropertyName(c, model)))
+          .mkString("createPrimaryKey(", ", ", ")")
+      writer.publicFinal(new ClassType(classOf[PrimaryKey[_]], model), fieldName, value)
+    }
+  }
+
+  def serializeForeignKeys(model: EntityType, writer: CodeWriter,
+      foreignKeys: Collection[_ <: KeyData], inverse: Boolean) {
+    for (fk <- foreignKeys) {
+      val fieldName = if (inverse) {
+        namingStrategy.getPropertyNameForInverseForeignKey(fk.getName, model)
+      } else {
+        namingStrategy.getPropertyNameForForeignKey(fk.getName, model)
+      }
+      val value = new StringBuilder(if (inverse) "createInvForeignKey(" else "createForeignKey(")
+      if (fk.getForeignColumns.size == 1) {
+        value.append(namingStrategy.getPropertyName(fk.getForeignColumns.get(0), model))
+        value.append(", \"" + fk.getParentColumns.get(0) + "\"")
+      } else {
+        val local = fk.getForeignColumns.map(c => escape(namingStrategy.getPropertyName(c, model))).mkString(", ")
+        val foreign = fk.getParentColumns.map("\"" + _ + "\"").mkString(", ")
+        value.append("List(" + local + "), List(" + foreign + ")")
+      }
+      value.append(")")
+      val t = new ClassType(classOf[ForeignKey[_]], fk.getType)
+      writer.publicFinal(t, fieldName, value.toString)
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/public_/DummyClass.scala b/querydsl-scala/src/test/scala/com/mysema/public_/DummyClass.scala
deleted file mode 100644
index 4cf4f754df..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/public_/DummyClass.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.public_
-
-class DummyClass
-
-object Num {
-  implicit val int = new Num[Int]
-  implicit val integer = new Num[java.lang.Integer]
-  implicit val long = new Num[Long]
-}
-
-class Num[T]
-
-object Methods {
-  def number[T : Num](t: T) = t
-}
-
-class Usage {
-  def method(i: java.lang.Integer) = Methods.number(i)
-}
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/BeanSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/BeanSerializerTest.scala
deleted file mode 100644
index e7d9200f0e..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/BeanSerializerTest.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.mysema.query.scala
-
-import com.mysema.codegen._;
-import com.mysema.codegen.model._;
-import com.mysema.query.codegen._;
-
-import java.io.StringWriter;
-
-import org.junit._
-import org.junit.Assert._
-
-import scala.collection.JavaConversions._
-
-class ScalaBeanSerializerTest extends CompileTestUtils {
-
-  val typeMappings = ScalaTypeMappings.create
-  
-  var writer = new StringWriter()
-
-  val entityType = EntityTypes.entityType
-
-  @Test
-  def Print {
-    val serializer = new ScalaBeanSerializer(typeMappings)
-    serializer.javaBeanSupport = true
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    
-    //println(writer.toString)
-    
-    var toMatch = """package com.mysema.query
-    import scala.reflect.BeanProperty
-    import java.util.List
-    import java.util.Map
-    /**
-    * DomainClass is a Querydsl bean type
-    */
-    class DomainClass {
-    @BeanProperty var arrayField: Array[String] = _
-    @BeanProperty var boolean$: java.lang.Boolean = _
-    @BeanProperty var collection: java.util.Collection[DomainClass] = _
-    @BeanProperty var date: java.util.Date = _
-    @BeanProperty var entityField: DomainClass = _
-    @BeanProperty var integer: Integer = _
-    @BeanProperty var listField: List[DomainClass] = _
-    @BeanProperty var mapField: Map[DomainClass, DomainClass] = _
-    @BeanProperty var setField: java.util.Set[DomainClass] = _
-    @BeanProperty var time: java.sql.Time = _"""
-    
-    val str = writer.toString().replaceAll("\\s+", " ")
-    //println(str)
- 
-    toMatch.split("\\n").map(_.trim).foreach { line =>
-      assertTrue(line, str.contains(line));
-    }
-    
-  }
-
-  @Test
-  def Compile {
-    val serializer = new ScalaBeanSerializer(typeMappings)
-    serializer.createCompanionObject = false
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    val str = writer.toString()
-    assertCompileSuccess(str)
-  }
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/CaseClassSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/CaseClassSerializerTest.scala
deleted file mode 100644
index be3e718355..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/CaseClassSerializerTest.scala
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query.scala
-
-import com.mysema.codegen._;
-import com.mysema.codegen.model._;
-import com.mysema.query.codegen._;
-
-import java.io.StringWriter;
-
-import org.junit._
-import org.junit.Assert._
-
-import scala.collection.JavaConversions._
-
-class CaseClassSerializerTest extends CompileTestUtils {
-
-  val typeMappings = ScalaTypeMappings.create
-  
-  var entityType = EntityTypes.entityType
-
-  var writer = new StringWriter()
-  
-  @Test
-  def Print {
-    val serializer = new CaseClassSerializer(typeMappings)
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    
-    //println(writer.toString)
-  }
-  
-  @Test
-  def Compile {
-    val serializer = new CaseClassSerializer(typeMappings)
-    serializer.createCompanionObject = false
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    val str = writer.toString()
-    
-    assertCompileSuccess(str)
-  }  
-  
-}  
-    
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/CompileTestUtils.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/CompileTestUtils.scala
deleted file mode 100644
index 27a3744e3b..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/CompileTestUtils.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mysema.query.scala
-
-import scala.tools.nsc._
-import scala.tools.nsc.interpreter.IR.Success
-import scala.io.Source.fromFile
-import java.io.File
-
-trait CompileTestUtils {
-    
-  private def jarPathOfClass(className: String) = {
-    Class.forName(className).getProtectionDomain.getCodeSource.getLocation
-  }
-
-  def assertCompileSuccess(files: Traversable[File]): Unit = {
-    assertCompileSuccess(files
-                           map (fromFile(_).mkString)
-                           mkString ("\n"))
-  }
-  
-  def assertCompileSuccess(source: String): Unit = {
-    import java.io.File.pathSeparator
-
-    val env = new Settings
-
-    val currentLibraries = (this.getClass.getClassLoader).asInstanceOf[java.net.URLClassLoader].getURLs().toList
-    val cp = jarPathOfClass("scala.tools.nsc.Interpreter") :: jarPathOfClass("scala.ScalaObject") :: currentLibraries
-
-    env.classpath.value = cp.mkString(pathSeparator)
-
-    env.usejavacp.value = true
-
-    val out = new java.io.ByteArrayOutputStream
-    val interpreterWriter = new java.io.PrintWriter(out)
-
-    val interpreter = new Interpreter(env, interpreterWriter)
-    try {
-      val result = interpreter.interpret(source.replaceAll("package", "import"))
-      if (result != Success) {
-        throw new AssertionError("Compile failed, interpreter output:\n" + out.toString("utf-8"))
-      }
-    } finally {
-      interpreterWriter.close
-      interpreter.close
-    }
-  }
-  
-  def recursiveFileList(file: File): Array[File] = {
-    if (file.isDirectory) {
-      file.listFiles.flatMap(recursiveFileList(_))
-    } else {
-      Array(file)
-    }
-  }  
-}
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/EntitySerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/EntitySerializerTest.scala
deleted file mode 100644
index ddf8a9da15..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/EntitySerializerTest.scala
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.mysema.query.scala
-
-import com.mysema.query.types._
-
-import org.junit.{ Test, Before, After, Assert }
-import org.junit.Assert._
-
-import com.mysema.codegen._
-import com.mysema.codegen.model._
-
-import com.mysema.query.codegen._
-import com.mysema.query.sql._
-
-import java.io.StringWriter
-
-class ScalaEntitySerializerTest extends CompileTestUtils {
-
-  var entityType: EntityType = null
-
-  val writer = new StringWriter()
-
-  @Before
-  def setUp() {
-    val typeModel = new ClassType(TypeCategory.ENTITY, classOf[Person])
-    entityType = new EntityType(typeModel)
-    for ( (name, t) <- List(
-        ("scalaInt", Types.INT),
-        ("javaInt", Types.INTEGER),
-        ("javaDouble", Types.DOUBLE),
-        ("scalaDouble", Types.DOUBLE_P),
-        ("firstName", Types.STRING),
-        ("lastName", Types.STRING),
-        ("scalaList", new SimpleType(Types.LIST, Types.STRING)),
-        ("scalaMap", new SimpleType(Types.MAP, Types.STRING, Types.STRING)),
-        ("javaCollection", new SimpleType(Types.COLLECTION, Types.STRING)),
-        ("javaSet", new SimpleType(Types.SET, Types.STRING)),
-        ("javaList", new SimpleType(Types.LIST, Types.STRING)),
-        ("javaMap", new SimpleType(Types.MAP, Types.STRING, Types.STRING)),
-        ("listOfPersons", new SimpleType(Types.LIST, entityType)),
-        ("array", new ClassType(TypeCategory.ARRAY, classOf[Array[String]])),
-        ("other", entityType))) {
-      entityType.addProperty(new Property(entityType, name, t))
-    }
-        
-
-  }
-
-  @Test
-  def Print {
-    val typeMappings = ScalaTypeMappings.create
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    val serializer = new ScalaEntitySerializer(typeMappings)
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    val str = writer.toString()
-    //System.err.println(str)
-    assertTrue(str.contains("class QPerson(cl: Class[_ <: Person], md: PathMetadata[_]) " +
-    		"extends EntityPathImpl[Person](cl, md) {"))
-    assertTrue(str.contains("def this(variable: String) = " +
-    		"this(classOf[Person], forVariable(variable))"))
-    assertTrue(str.contains("def this(parent: Path[_], variable: String) = " +
-    		"this(classOf[Person], forProperty(parent, variable))"))
-  }
-
-  @Test
-  def Compile {
-    val typeMappings = ScalaTypeMappings.create
-    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
-    val serializer = new ScalaEntitySerializer(typeMappings)
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    val str = writer.toString()
-    //System.err.println(str);
-    assertCompileSuccess(str)
-  }
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/EntityTypes.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/EntityTypes.scala
deleted file mode 100644
index 59e96bcf0b..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/EntityTypes.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.scala
-
-import com.mysema.codegen.model._
-import com.mysema.query.codegen._
-import com.google.common.base.CaseFormat
-
-import scala.collection.JavaConversions._
-
-object EntityTypes {
-
-    val typeModel = new SimpleType(TypeCategory.ENTITY, 
-        "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false, false)
-    val entityType = new EntityType(typeModel)
-
-    // properties
-    for ( (name, clazz) <- List( 
-        ("entityField",entityType), 
-        ("collection", new SimpleType(Types.COLLECTION, typeModel)),
-        ("listField",new SimpleType(Types.LIST, typeModel)), ("setField",new SimpleType(Types.SET, typeModel)),
-        ("arrayField", new ClassType(TypeCategory.ARRAY, classOf[Array[String]])),
-        ("mapField", new SimpleType(Types.MAP, typeModel, typeModel)))) {
-      entityType.addProperty(new Property(entityType, name, clazz))
-    }
-    
-    for ( clazz <- List(
-        classOf[java.lang.Boolean], classOf[Boolean], classOf[Array[Byte]],
-        classOf[Integer], classOf[java.util.Date], classOf[java.sql.Date], classOf[java.sql.Time])) {
-      val name = uncapitalize(clazz.getSimpleName + 
-          (if (clazz.isPrimitive) "_p" else "")).replace("[","").replace("]","")
-      entityType.addProperty(new Property(entityType, name, 
-          new ClassType(TypeCategory.get(clazz.getName), clazz)))
-    }
-    
-    // constructor
-    val firstName = new Parameter("firstName", Types.STRING)
-    val lastName = new Parameter("lastName", Types.STRING)
-    
-    entityType.addConstructor(new Constructor(List(firstName, lastName)))
-    
-    def uncapitalize(str: String) = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, str)
-
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterJPATest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterJPATest.scala
deleted file mode 100644
index 621e51fbf2..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterJPATest.scala
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.mysema.query.scala;
-
-import javax.persistence._
-import com.mysema.query.codegen.GenericExporter
-import org.junit.Test
-import io.Source.fromFile
-
-class GenericExporterJPATest extends CompileTestUtils {
-
-  @Test
-  def Export {
-    val exporter = new GenericExporter()
-    exporter.setTargetFolder(new java.io.File("target/gen1-jpa"))
-    exporter.setSerializerClass(classOf[ScalaEntitySerializer])
-    exporter.setTypeMappingsClass(classOf[ScalaTypeMappings])
-    exporter.setEmbeddableAnnotation(classOf[Embeddable])
-    exporter.setEmbeddedAnnotation(classOf[Embedded])
-    exporter.setEntityAnnotation(classOf[Entity])
-    exporter.setSkipAnnotation(classOf[Transient])
-    exporter.setSupertypeAnnotation(classOf[MappedSuperclass])
-    exporter.setCreateScalaSources(true)
-    exporter.export(getClass.getPackage)
-
-    val targetFolder = new java.io.File("target/gen1-jpa/com/mysema/query/scala/")
-    val sources = (targetFolder listFiles ()
-      filter (_.getName.endsWith(".scala"))
-      map (fromFile(_).mkString)
-      mkString ("\n"))
-    assertCompileSuccess(sources)
-  }
-
-}
-
-@MappedSuperclass
-class JPASuperclass {
-
-  var id: Int = _
-
-}
-
-@Entity
-class JPAEscapedWords {
-  
-  var `object`: String = _  
-    
-  var `type`: String = _
-      
-  var `var`: String = _
-    
-  var `val`: String = _
-    
-}
-
-@Entity
-class JPAEntityClass extends JPASuperclass {
-
-  // FIXME
-  //  var comparable: Comparable[_] = _   
-
-  var code: String = _
-
-  var stringList: java.util.List[String] = _
-
-  var embedded: JPAEmbeddableClass = _
-
-}
-
-@Entity
-class JPAEntitySubclass extends JPAEntityClass {
-
-  var property: String = _
-
-}
-
-@Embeddable
-class JPAEmbeddableClass {
-
-  var property: String = _
-
-}
-
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterTest.scala
deleted file mode 100644
index 2d66985452..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/GenericExporterTest.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.scala;
-
-import com.mysema.query.annotations._
-import com.mysema.query.codegen.GenericExporter
-import org.junit.Test
-import io.Source.fromFile
-import java.io.File
-
-class GenericExporterTest extends CompileTestUtils {
-
-  @Test
-  def Export {
-    val exporter = new GenericExporter()
-    exporter.setTargetFolder(new java.io.File("target/gen1"))
-    exporter.setSerializerClass(classOf[ScalaEntitySerializer])
-    exporter.setTypeMappingsClass(classOf[ScalaTypeMappings])
-    exporter.setCreateScalaSources(true)
-    exporter.export(getClass.getPackage)
-
-    val targetFolder = new File("target/gen1/com/mysema/query/scala/")
-    
-    // com.mysema.query.scala 
-    val sources = (targetFolder.listFiles()
-      filter (_.getName.endsWith(".scala"))
-      map (fromFile(_).mkString)
-      mkString ("\n"))
-    assertCompileSuccess(sources)
-    
-    // com.mysema.query.scala.ext
-    val other = (new File(targetFolder, "ext").listFiles()
-      filter (_.getName.endsWith(".scala"))
-      map (fromFile(_).mkString)
-      mkString ("\n"))
-    assertCompileSuccess("import com.mysema.query.scala.ext._\n" + other)
-  }
-  
-}
-
-
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/NegationTest.class b/querydsl-scala/src/test/scala/com/mysema/query/scala/NegationTest.class
deleted file mode 100644
index a1d2c18e9c..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/NegationTest.class
+++ /dev/null
@@ -1 +0,0 @@
-package com.mysema.query.scala
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/QPersonTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/QPersonTest.scala
deleted file mode 100644
index 0d64686c25..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/QPersonTest.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.mysema.query.scala;
-
-import com.mysema.query.types._;
-
-import org.junit.{ Test, Before, After, Assert };
-
-import Matchers._
-
-class QPersonTest {
-
-  val person = QPerson as "person"
-      
-  @Test 
-  def EntityPath {
-    assertEquals("person.other.firstName", person.other.firstName)
-  }
-  
-  @Test 
-  def Collection_Any {  
-    assertEquals("any(person.javaCollection) = Bob", person.javaCollection.any === "Bob")
-  }
-  
-  @Test 
-  def List_Get {
-    assertEquals("person.javaList.get(0) = Bob", person.javaList(0) === "Bob")
-  }
-  
-  @Test
-  def List_Get_EntityPath {
-    assertEquals("person.listOfPersons.get(0).firstName is not null", 
-        person.listOfPersons(0).firstName isNotNull)
-  }
-    
-  def assertEquals(expected: String, actual: Any) {
-    Assert.assertEquals(expected, actual.toString)
-  }  
-
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala
deleted file mode 100644
index 26889670dd..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala
+++ /dev/null
@@ -1,257 +0,0 @@
-package com.mysema.query.scala.sql
-
-import test._
-import com.mysema.query.sql._
-import com.mysema.query.types.path._
-import java.io.File
-
-import java.sql.Connection
-import java.sql.DriverManager
-import java.sql.SQLException
-import java.sql.Statement
-
-import org.junit._
-import org.junit.Assert._
-
-import java.util.Arrays
-
-import com.mysema.query.scala.CompileTestUtils
-
-import com.mysema.query.scala.ScalaBeanSerializer
-import com.mysema.query.scala.ScalaTypeMappings
-
-import com.mysema.query.sql.codegen._
-import com.mysema.query.sql.dml._
-import com.mysema.query.scala.Helpers._
-
-class JDBCIntegrationTest extends CompileTestUtils with SQLHelpers {
-    
-  val survey = QSurvey
-  val employee = QEmployee
-
-  val templates = new HSQLDBTemplates()
-
-  var connection: Connection = _
-
-  var statement: Statement = _
-  
-  @Before
-  def setUp() {
-    Class.forName("org.h2.Driver")
-    val url = "jdbc:h2:~/dbs/h2-scala"
-    
-    connection = DriverManager.getConnection(url, "sa", "")
-    statement = connection.createStatement()
-    statement.execute("drop table employee if exists")
-    statement.execute("drop table survey if exists")
-    statement.execute("drop table date_test if exists")
-    statement.execute("drop table date_time_test if exists")
-
-    statement.execute("""create table survey (
-      id int identity,
-      name varchar(30))""")
-
-    statement.execute("insert into survey (name) values ('abc')")
-    statement.execute("insert into survey (name) values ('def')")
-
-    statement.execute("""create table employee(
-      id INT identity,
-      firstname VARCHAR(50),
-      lastname VARCHAR(50),
-      superior_id int,
-      CONSTRAINT PK_employee PRIMARY KEY (id),
-      CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))""")
-
-    statement.execute("insert into employee (firstname, lastname) values ('Bob', 'Smith')")
-    statement.execute("insert into employee (firstname, lastname) values ('John', 'Doe')")
-    
-    // TODO : create table with multi column primary key
-  }
-
-  @Test
-  def Generation_without_Beantypes {
-    val namingStrategy = new DefaultNamingStrategy()
-    val exporter = new MetaDataExporter()
-    exporter.setNamePrefix("Q")
-    exporter.setPackageName("com.mysema")
-    val directory = new File("target/gensql1")
-    exporter.setTargetFolder(directory)
-    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
-    exporter.setCreateScalaSources(true)
-    exporter.setTypeMappings(ScalaTypeMappings.create)
-    exporter.setSchemaPattern("PUBLIC")
-    exporter.export(connection.getMetaData)
-
-    assertCompileSuccess(recursiveFileList(directory))
-  }
-
-  @Test
-  def Generation_with_Beantypes {
-    val namingStrategy = new DefaultNamingStrategy()
-    //val beanSerializer = new ScalaBeanSerializer()
-    val exporter = new MetaDataExporter()
-    exporter.setNamePrefix("Q")
-    exporter.setPackageName("com.mysema")
-    val directory = new File("target/gensql2")
-    exporter.setTargetFolder(directory)
-    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
-    exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer])
-    exporter.setCreateScalaSources(true)
-    exporter.setTypeMappings(ScalaTypeMappings.create)
-    exporter.setSchemaPattern("PUBLIC")
-    exporter.export(connection.getMetaData)
-    
-    assertCompileSuccess(recursiveFileList(directory))
-  }
-    
-  @Test
-  def Populate_Bean {
-    assertEquals(2, query.from(survey).list(survey) size ())
-  }
-  
-  @Test
-  def Populate_Bean_via_Factory {
-    assertEquals(2, query.from(survey).list(create[Survey](survey.id, survey.name)) size ())
-  }
-  
-  @Test
-  def List {
-    assertEquals(2, query.from(survey).list(survey.id) size ())
-    assertEquals(2, query.from(employee).list(employee.firstname) size ())
-  }
-  
-  @Test
-  def List_2 {
-    assertEquals(2, survey.select(_.id) size)
-    assertEquals(2, employee.select(_.firstname) size)
-  }
-  
-  @Test
-  def Select2 {
-    assertEquals(2, query.from(survey).select(survey.id, survey.name).size)
-  }
-  
-  @Test
-  def Select2_2 {
-    assertEquals(2, survey.select(_.id, _.name) size)
-  }
-  
-  @Test
-  def Select3 {
-    assertEquals(2, query.from(survey).select(survey.id, survey.name, survey.name.substring(0,1)).size)
-  }
-  
-  @Test
-  def Select3_2 {
-    assertEquals(2, survey.select(_.id, _.name, _.name.substring(0,1)) size)
-  }
-  
-  @Test
-  def Select4 {
-    assertEquals(2, query.from(survey).select(survey.id, survey.name, survey.name + "X", survey.name + "Y").size)
-  }
-  
-  @Test
-  def Select4_2 {
-    assertEquals(2, survey.select(_.id, _.name, _.name + "X", _.name + "Y") size)
-  }
-  
-  @Test
-  def Count {
-    assertEquals(2, query.from(survey).count)
-    assertEquals(2, query.from(employee).count)
-  }
-  
-  @Test
-  def Count_2 {
-    assertEquals(2, survey.query.count)
-    assertEquals(2, employee.query.count)
-  }
-  
-  @Test
-  def Order_By {
-    query.from(survey).orderBy(survey.id asc).select(survey)
-  }
-  
-  @Test
-  def Order_By_2 {
-    survey.orderBy(_.id asc).select
-  }
-  
-  @Test
-  def Join {
-    val sup = Employee as "sup"
-    val result: List[(Employee, Employee)] = employee.join(_.superiorFk, sup).select
-  }
-  
-  @Test
-  def Unique_Result {
-    assertEquals("abc", query.from(survey).where(survey.id eq 1).uniqueResult(survey.name))
-    assertEquals("def", query.from(survey).where(survey.id eq 2).uniqueResult(survey.name))
-    assertEquals("Bob", query.from(employee).where(employee.lastname eq "Smith").uniqueResult(employee.firstname))
-    assertEquals("John", query.from(employee).where(employee.lastname eq "Doe").uniqueResult(employee.firstname))
-  }  
-  
-  @Test
-  def Unique {
-    assertEquals("abc", survey.where(_.id eq 1).unique(_.name).get)
-    assertEquals("def", survey.where(_.id eq 2).unique(_.name).get)
-    assertEquals("Bob", employee.where(_.lastname eq "Smith").unique(_.firstname).get)
-    assertEquals("John", employee.where(_.lastname eq "Doe").unique(_.firstname).get)
-  }
-  
-  @Test
-  def Insert {
-    val s = new Survey()
-    s.name = "XXX"
-          
-    val id = insert(survey) populate(s) executeWithKey(survey.id)
-    val sNew = query from survey where (survey.id === id) uniqueResult (survey)
-    assertEquals(s.name, sNew.name)
-  }
-  
-  @Test
-  def Update {
-    val s = new Survey()
-    s.name = "XXX"
-          
-    val id = insert(survey) populate(s) executeWithKey(survey.id)
-    s.id = id
-    s.name = "YYY"
-      
-    val count = update(survey) populate(s) execute()
-    assertTrue(count > 0)
-      
-    val sNew = query from survey where (survey.id === id) uniqueResult (survey)
-    assertEquals(s.name, sNew.name)
-  }
-  
-  @Test
-  def Delete {
-    val s = new Survey()
-    s.name = "XXX"
-          
-    val id = insert(survey) populate(s) executeWithKey(survey.id)      
-    val count = delete(survey) where(survey.id === id) execute()
-    assertTrue(count > 0)
-  }
-  
-
-  @After
-  def tearDown() {
-    try {
-      statement.close()
-    } finally {
-      connection.close()
-    }
-  }
-
-  def query = new SQLQuery(connection, templates)
-
-  def delete(path: RelationalPath[_]) = new SQLDeleteClause(connection, templates, path)
-  
-  def insert(path: RelationalPath[_]) = new SQLInsertClause(connection, templates, path)
-  
-  def update(path: RelationalPath[_]) = new SQLUpdateClause(connection, templates, path)
-  
-}
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala
deleted file mode 100644
index fc95da01dd..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.mysema.query.scala.sql
-
-import com.mysema.codegen._
-import com.mysema.codegen.model._
-
-import com.mysema.query.codegen._
-import com.mysema.query.sql._
-import com.mysema.query.sql.codegen._
-
-import java.io.StringWriter;
-
-import org.junit._
-import org.junit.Assert._
-
-import scala.collection.JavaConversions._
-
-import com.mysema.query.scala._
-
-class MetaDataExporterTest extends CompileTestUtils {
-        
-    var connection: java.sql.Connection = _;
-    
-    @Before
-    def setUp() {
-        Class.forName("org.h2.Driver");
-        val url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
-        connection = java.sql.DriverManager.getConnection(url, "sa", "");
-
-        val stmt = connection.createStatement();
-
-        try{
-            stmt.execute("create table reserved (id int, while int)");
-            stmt.execute("create table underscore (e_id int, c_id int)");
-            stmt.execute("create table beangen1 (\"SEP_Order\" int)");
-            stmt.execute("create table definstance (id int, definstance int, definstance1 int)");
-            stmt.execute("create table pkfk (id int primary key, pk int, fk int)");
-            stmt.execute("create table \"camelCase\" (id int)");
-            stmt.execute("create table \"vwServiceName\" (id int)");
-            stmt.execute("create table date_test (d date)");
-            stmt.execute("create table date_time_test (dt datetime)");
-            stmt.execute("create table survey (id int, name varchar(30))");
-            stmt.execute("create table typetest (type int, constraint pk_typetest primary key(type))");
-            
-            stmt.execute("""create table employee(
-                    id INT, firstname VARCHAR(50), lastname VARCHAR(50), salary DECIMAL(10, 2), 
-                    datefield DATE, timefield TIME, 
-                    superior_id int, survey_id int, survey_name varchar(30), 
-                    CONSTRAINT PK_employee PRIMARY KEY (id), 
-                    CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))""");
-            
-                        
-            // table with count column
-            stmt.execute("create table count_table(count int)");
-            
-            // multi primary key
-            stmt.execute("create table multikey(id INT, id2 VARCHAR, id3 INT," +
-            		" CONSTRAINT pk_multikey PRIMARY KEY (id, id2, id3) )");
-            
-            // multi foreign key
-            stmt.execute("create table multikey2(id INT, id2 INT, id3 INT, id4 INT, id5 INT, id6 INT," +
-            		" CONSTRAINT pk_multikey2 FOREIGN KEY (id4, id5, id6) REFERENCES multikey2(id, id2, id3) )");
-            
-        } finally {
-            stmt.close();
-        }
-    }
-    
-    @Test
-    def Generate_Without_BeanTypes() {
-        val directory = new java.io.File("target/jdbcgen1");
-        val namingStrategy = new DefaultNamingStrategy();
-        val exporter = new MetaDataExporter();
-        exporter.setNamePrefix("Q");
-        exporter.setPackageName("com.mysema");
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setTargetFolder(directory);
-        exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]);
-        exporter.setCreateScalaSources(true);
-        exporter.setTypeMappings(ScalaTypeMappings.create);
-        exporter.export(connection.getMetaData);
-        
-        assertCompileSuccess(recursiveFileList(directory))
-    }
-    
-    @Test
-    def Generate_With_BeanTypes() {
-        val directory = new java.io.File("target/jdbcgen2");
-        val namingStrategy = new DefaultNamingStrategy();
-        //val beanSerializer = new ScalaBeanSerializer();
-        val exporter = new MetaDataExporter();
-        exporter.setNamePrefix("Q");
-        exporter.setPackageName("com.mysema");
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setTargetFolder(directory);
-        exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]);
-        exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer]);
-        exporter.setCreateScalaSources(true);
-        exporter.setTypeMappings(ScalaTypeMappings.create);
-        exporter.export(connection.getMetaData);
-        
-        assertCompileSuccess(recursiveFileList(directory))        
-    }
-    
-    @Test
-    def Generate_With_Schema() {
-        val directory = new java.io.File("target/jdbcgen3");
-        val namingStrategy = new DefaultNamingStrategy();
-        //val beanSerializer = new ScalaBeanSerializer();
-        val exporter = new MetaDataExporter();
-        exporter.setNamePrefix("Q");
-        exporter.setPackageName("com.mysema");
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setSchemaToPackage(true);
-        exporter.setTargetFolder(directory);
-        exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]);
-        exporter.setCreateScalaSources(true);
-        exporter.setTypeMappings(ScalaTypeMappings.create);
-        exporter.export(connection.getMetaData);
-        
-        assertCompileSuccess(recursiveFileList(directory))       
-    }    
-    
-    @Test
-    def Generate_With_BeanTypes_And_Schema() {
-              val directory = new java.io.File("target/jdbcgen4");
-        val namingStrategy = new DefaultNamingStrategy();
-        //val beanSerializer = new ScalaBeanSerializer();
-        val exporter = new MetaDataExporter();
-        exporter.setNamePrefix("Q");
-        exporter.setPackageName("com.mysema");
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setSchemaToPackage(true);
-        exporter.setTargetFolder(directory);
-        exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]);
-        exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer]);
-        exporter.setCreateScalaSources(true);
-        exporter.setTypeMappings(ScalaTypeMappings.create);
-        exporter.export(connection.getMetaData);
-        
-        assertCompileSuccess(recursiveFileList(directory))       
-    }
-    
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala
deleted file mode 100644
index f5127376e2..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mysema.query.scala.sql
-
-import com.mysema.codegen._;
-import com.mysema.codegen.model._;
-
-import com.mysema.query.codegen._;
-import com.mysema.query.sql._
-import com.mysema.query.sql.codegen._
-
-import java.io.StringWriter;
-
-import org.junit._
-import org.junit.Assert._
-
-import scala.collection.JavaConversions._
-
-import com.mysema.query.scala._
-
-class ScalaMetaDataSerializerTest {
-
-  var entityType: EntityType = null
-
-  val writer = new StringWriter()
-
-  @Before
-  def setUp() {
-    // type
-    val typeModel = new SimpleType(TypeCategory.ENTITY, 
-        "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false, false)
-    entityType = new EntityType(typeModel)
-    //entityType.addAnnotation(new TableImpl("DOMAIN_TYPE"))
-    entityType.getData().put("table", "DOMAIN_TYPE")
-
-    // properties
-    List(classOf[java.lang.Boolean], classOf[Comparable[_]], classOf[Integer], 
-         classOf[java.util.Date], classOf[java.sql.Date], classOf[java.sql.Time])
-      .foreach(cl => {
-        val classType = new ClassType(TypeCategory.get(cl.getName), cl)
-        val propertyName = StringUtils.uncapitalize(cl.getSimpleName)
-        var property = new Property(entityType, propertyName, classType)
-        property.getData.put("COLUMN", ColumnMetadata.named(propertyName.toUpperCase).ofType(0))
-        entityType.addProperty(property)
-      })
-  }
-
-  @Test
-  def Print {
-    val typeMappings = ScalaTypeMappings.create
-    val namingStrategy = new DefaultNamingStrategy()
-    val serializer = new ScalaMetaDataSerializer(typeMappings, namingStrategy)
-    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
-    val str = writer.toString()
-    //System.err.println(str)
-    assertTrue("companion object isn't before class", str.indexOf("object") < str.indexOf("class"))
-    //assertTrue("companion object isn't before annotations", str.indexOf("object") < str.indexOf("@Table"))    
-  }
-  
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/PathsTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/PathsTest.scala
deleted file mode 100644
index 9904ca6797..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/PathsTest.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mysema.query.scala.sql
-
-import org.junit._
-import org.junit.Assert._
-import com.mysema.query.sql._
-import com.mysema.query.types._
-import test._
-
-class PathsTest {
-  
-  @Test
-  def Projection {
-    val projection = Employee.getProjection.asInstanceOf[FactoryExpression[_]]
-    assertEquals(4, projection.getArgs.size)
-  }
-  
-}  
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QueriesTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QueriesTest.scala
deleted file mode 100644
index 0c475164ff..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QueriesTest.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.mysema.query.scala.sql
-
-import org.junit._
-import org.junit.Assert._
-import com.mysema.query.sql._
-import com.mysema.query.types._
-import java.sql.Connection
-
-import test._
-
-class QueriesTest extends SQLHelpers {
-  
-  val templates = new H2Templates()
-  
-  def connection: Connection = null
-    
-  @Test
-  def From {
-    assertEquals("from EMPLOYEE employee", Employee.query.toString)
-  }
-  
-  @Test
-  def From_Where {
-    assertEquals("from EMPLOYEE employee\nwhere employee.FIRSTNAME = ?", 
-        Employee.where(_.firstname eq "XXX").toString)
-  }
-  
-  @Test
-  def From_Where_Limit {
-    assertEquals("from EMPLOYEE employee\nwhere employee.FIRSTNAME = ?\nlimit ?", 
-        Employee.where(_.firstname eq "XXX").limit(1).toString)
-  }
-  
-  @Test
-  def From_Join {        
-    val sup = Employee as "sup"
-    assertEquals(
-        "from EMPLOYEE employee\ninner join EMPLOYEE sup\non employee.SUPERIOR_ID = sup.ID", 
-        Employee.join(_.superiorFk, sup).toString)
-  }
-  
-  @Test
-  def From_Join_2x {
-    val sup = Employee as "sup"
-    val sup2 = Employee as "sup2"
-    assertEquals(
-        "from EMPLOYEE employee\ninner join EMPLOYEE sup\non employee.SUPERIOR_ID " +
-        "= sup.ID\ninner join EMPLOYEE sup2\non sup.SUPERIOR_ID = sup2.ID", 
-        Employee.join(_.superiorFk, sup).join(sup.superiorFk, sup2).toString)
-  }
-  
-  @Test
-  def From_Join_Where {  
-    val sup = Employee as "sup"
-    val sup2 = Employee as "sup2"
-    assertEquals(
-        "from EMPLOYEE employee\ninner join EMPLOYEE sup\non employee.SUPERIOR_ID " +
-        "= sup.ID\nwhere employee.ID = ?", 
-        Employee.join(_.superiorFk, sup).where( _.id eq 1).toString)
-  }
-  
-  @Test
-  def From_Join_Where2 {  
-    val sup = Employee as "sup"
-    val sup2 = Employee as "sup2"
-    assertEquals(
-        "from EMPLOYEE employee\ninner join EMPLOYEE sup\non employee.SUPERIOR_ID " +
-        "= sup.ID\nwhere employee.ID = sup.ID", 
-        Employee.join(_.superiorFk, sup).where(_.id eq sup.id).toString)
-  }
-  
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/scala/ReflectionUtilsTest.scala b/querydsl-scala/src/test/scala/com/mysema/scala/ReflectionUtilsTest.scala
deleted file mode 100644
index 0dbb0ced4e..0000000000
--- a/querydsl-scala/src/test/scala/com/mysema/scala/ReflectionUtilsTest.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mysema.scala;
-
-import java.lang.reflect._
-import javax.annotation.Nullable;
-import scala.collection.mutable.ListBuffer
-
-import org.junit._
-import org.junit.Assert._
-
-class ReflectionUtilsTest {
-
-  @Test
-  def getSuperClasses_of_String {
-    assertEquals(List(classOf[String],classOf[AnyRef]), ReflectionUtils.getSuperClasses(classOf[String]))
-  }
-  
-  @Test
-  def getImplementedInterfaces {
-    assertEquals(Set(classOf[java.io.Serializable],classOf[Comparable[_]],classOf[CharSequence]), 
-        ReflectionUtils.getImplementedInterfaces(classOf[String]))
-  }
-  
-  @Test
-  def getFields {
-    assertTrue( ReflectionUtils.getFields(classOf[String]).size > 0)
-  }
-  
-  
-  
-}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala
new file mode 100644
index 0000000000..d7f70ab830
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala
@@ -0,0 +1,37 @@
+package com.querydsl.scala
+
+import java.io.StringWriter
+
+import com.querydsl.codegen.utils._
+import com.querydsl.codegen._
+import org.junit._
+
+class CaseClassSerializerTest {
+
+  val typeMappings = ScalaTypeMappings.create
+
+  var entityType = EntityTypes.entityType
+
+  var writer = new StringWriter()
+
+  @Test
+  def Print {
+    val serializer = new CaseClassSerializer(typeMappings)
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+
+    //println(writer.toString)
+  }
+
+  @Test
+  def Compile {
+    val serializer = new CaseClassSerializer(typeMappings)
+    serializer.createCompanionObject = false
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+    val str = writer.toString
+
+    CompileTestUtils.assertCompileSuccess(str)
+  }
+
+}
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala
new file mode 100644
index 0000000000..7a00580696
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala
@@ -0,0 +1,60 @@
+package com.querydsl.scala
+
+import java.io.{File, FileOutputStream, OutputStreamWriter}
+import java.io.File.pathSeparator
+import java.nio.charset.StandardCharsets
+import io.github.classgraph.ClassGraph
+import scala.tools.nsc._
+import scala.tools.nsc.reporters.ConsoleReporter
+import collection.JavaConverters._
+
+object CompileTestUtils {
+
+  private def jarPathOfClass(className: String) = {
+    Class.forName(className).getProtectionDomain.getCodeSource.getLocation
+  }
+
+  private val currentLibraries = new ClassGraph().getClasspathURLs.asScala.toList
+  private val cp = jarPathOfClass("scala.tools.nsc.Interpreter") :: jarPathOfClass("scala.AnyVal") :: currentLibraries
+
+  private val env = new Settings()
+  env.classpath.value = cp.mkString(pathSeparator)
+  env.usejavacp.value = true
+  //env.d.value = "target"
+  env.stopAfter.value = List("refchecks")
+
+  def assertCompileSuccess(file: File): Unit = {
+    assertCompileSuccess(recursiveFileList(file))
+  }
+
+  def assertCompileSuccess(files: Traversable[File]): Unit = {
+    val reporter = new ConsoleReporter(env)
+    val g = new Global(env, reporter)
+    val run = new g.Run
+    run.compile(files.map(_.getPath).toList)
+    if (reporter.hasErrors) {
+      throw new AssertionError("Compilation failed")
+    }
+  }
+
+  def assertCompileSuccess(source: String): Unit = {
+    val file = File.createTempFile("source", ".scala")
+    try {
+      val writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
+      writer.write(source);
+      writer.flush()
+      writer.close();
+      assertCompileSuccess(file)
+    } finally {
+        file.delete()
+    }
+  }
+
+  private def recursiveFileList(file: File): Array[File] = {
+    if (file.isDirectory) {
+      file.listFiles.flatMap(recursiveFileList)
+    } else {
+      Array(file)
+    }
+  }
+}
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/EntityTypes.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/EntityTypes.scala
new file mode 100644
index 0000000000..263b86b5ec
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/EntityTypes.scala
@@ -0,0 +1,40 @@
+package com.querydsl.scala
+
+import com.querydsl.codegen.utils.model._
+import com.querydsl.codegen._
+import com.querydsl.core.util.StringUtils.uncapitalize
+
+import scala.collection.JavaConversions._
+
+object EntityTypes {
+
+    val typeModel = new SimpleType(TypeCategory.ENTITY,
+        "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false)
+    val entityType = new EntityType(typeModel)
+
+    // properties
+    for ( (name, clazz) <- List(
+        ("entityField",entityType),
+        ("collection", new SimpleType(Types.COLLECTION, typeModel)),
+        ("listField",new SimpleType(Types.LIST, typeModel)), ("setField",new SimpleType(Types.SET, typeModel)),
+        ("arrayField", new ClassType(TypeCategory.ARRAY, classOf[Array[String]])),
+        ("mapField", new SimpleType(Types.MAP, typeModel, typeModel)))) {
+      entityType.addProperty(new Property(entityType, name, clazz))
+    }
+
+    for ( clazz <- List(
+        classOf[java.lang.Boolean], classOf[Boolean], classOf[Array[Byte]],
+        classOf[Integer], classOf[java.util.Date], classOf[java.sql.Date], classOf[java.sql.Time])) {
+      val name = uncapitalize(clazz.getSimpleName +
+          (if (clazz.isPrimitive) "_p" else "")).replace("[","").replace("]","")
+      entityType.addProperty(new Property(entityType, name,
+          new ClassType(TypeCategory.get(clazz.getName), clazz)))
+    }
+
+    // constructor
+    val firstName = new Parameter("firstName", Types.STRING)
+    val lastName = new Parameter("lastName", Types.STRING)
+
+    entityType.addConstructor(new Constructor(List(firstName, lastName)))
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExampleDomain.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ExampleDomain.scala
similarity index 81%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/ExampleDomain.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/ExampleDomain.scala
index c12ba3e80d..113455aed1 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExampleDomain.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ExampleDomain.scala
@@ -1,7 +1,4 @@
-package com.mysema.query.scala;
-
-import com.mysema.query.types._;
-import com.mysema.query.types.PathMetadataFactory._;
+package com.querydsl.scala
 
 class Person {
   var scalaInt: Int = _
@@ -9,7 +6,7 @@ class Person {
   var javaInt: Integer = _
 
   var javaDouble: java.lang.Double = _
-  
+
   var firstName: String = _
 
   var lastName: String = _
@@ -27,16 +24,16 @@ class Person {
   var javaMap: java.util.Map[String, String] = _
 
   var listOfPersons: java.util.List[Person] = _
-  
+
   var array: Array[String] = _
-  
+
   var other: Person = _
-  
+
 }
 
 object Person {
-    
+
   def as(path: String) = new QPerson(path)
-  
+
 }
 
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala
similarity index 94%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala
index bbd434bf86..16d6e2cc33 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala
@@ -1,51 +1,49 @@
-package com.mysema.query.scala;
+package com.querydsl.scala
 
-import com.mysema.query.types._;
-
-import org.junit.{ Test, Before, After, Assert };
-
-import Matchers._
+import com.querydsl.core.types._
+import com.querydsl.scala.Matchers._
+import org.junit.{Assert, Test}
 
 class ExpressionTest {
 
   val person = Person as "person"
-  
+
   def assertEquals(expected: String, actual: Any) {
     Assert.assertEquals(expected, actual.toString)
-  }  
-  
+  }
+
   @Test
   def Double_Negation {
-    assertEquals("person.javaInt", person.javaInt.negate.negate);  
+    assertEquals("person.javaInt", person.javaInt.negate.negate)
   }
-    
+
   @Test
   def Is_Not_Null {
     assertEquals("person.other is not null", person.other isNotNull)
-    assertEquals("person.other is not null", person.other is not(null) )   
+    assertEquals("person.other is not null", person.other is not(null) )
   }
-  
+
   @Test
   def Is_Null {
-    assertEquals("person.other is null", person.other isNull)  
-    assertEquals("person.other is null", person.other is null )  
+    assertEquals("person.other is null", person.other isNull)
+    assertEquals("person.other is null", person.other is null )
   }
-  
+
   @Test
   def Long_Path {
     assertEquals("person.other.firstName = Ben", person.other.firstName eq "Ben")
   }
-  
+
   @Test
   def Long_Path_With_Operators {
     assertEquals("person.other.firstName = Ben", person.other.firstName === "Ben")
   }
-  
+
   @Test
   def Path_Equality {
     assertEquals("person.firstName = person.lastName", person.firstName eq person.lastName)
   }
-  
+
   @Test
   def Path_Equality_With_Operators {
     assertEquals("person.firstName = person.lastName", person.firstName === person.lastName)
@@ -57,14 +55,14 @@ class ExpressionTest {
     assertEquals("person.firstName != Ben", person.firstName ne "Ben")
     assertEquals("person.firstName != Ben", person.firstName ne "Ben")
   }
-  
+
   @Test
   def String_Equality_With_Operators {
     assertEquals("person.firstName = Ben", person.firstName === "Ben")
     assertEquals("person.firstName != Ben", person.firstName !== "Ben")
     assertEquals("person.firstName != Ben", person.firstName !== "Ben")
   }
-    
+
   @Test
   def String_Like {
     assertEquals("person.firstName like Ben", person.firstName like "Ben")
@@ -79,17 +77,17 @@ class ExpressionTest {
   def String_Append {
     assertEquals("person.firstName + x", person.firstName append "x")
   }
-  
+
   @Test
   def String_Append_With_Operators {
     assertEquals("person.firstName + x", person.firstName + "x")
   }
-  
+
   @Test
   def String_Append2 {
     assertEquals("person.firstName +   + person.lastName", person.firstName append " " append person.lastName)
   }
-  
+
   @Test
   def String_Append2_With_Operators {
     assertEquals("person.firstName +   + person.lastName", person.firstName + " " + person.lastName)
@@ -100,7 +98,7 @@ class ExpressionTest {
     val andClause = (person.firstName like "An%") and (person.firstName like "Be%")
     assertEquals("person.firstName like An% && person.firstName like Be%", andClause)
   }
-  
+
   @Test
   def String_And_With_Operators {
     val andClause = (person.firstName like "An%") && (person.firstName like "Be%")
@@ -118,7 +116,7 @@ class ExpressionTest {
     val orClause = (person.firstName like "An%") || (person.firstName like "Be%")
     assertEquals("person.firstName like An% || person.firstName like Be%", orClause)
   }
-  
+
   @Test
   def String_Not {
     assertEquals("!(person.firstName like An%)", (person.firstName like "An%") not)
@@ -128,7 +126,7 @@ class ExpressionTest {
   def String_Not_With_Operators {
     assertEquals("!(person.firstName like An%)", !(person.firstName like "An%"))
   }
-    
+
   @Test
   def String_Trim {
     assertEquals("trim(person.firstName)", person.firstName trim)
@@ -139,7 +137,7 @@ class ExpressionTest {
     assertEquals("empty(person.firstName)", person.firstName isEmpty)
     assertEquals("empty(person.firstName)", person.firstName is empty)
   }
-  
+
   @Test
   def String_Is_Not_Empty {
     assertEquals("!empty(person.firstName)", person.firstName isNotEmpty)
@@ -151,7 +149,7 @@ class ExpressionTest {
   def Number_Comparison {
     assertEquals("person.scalaInt < 5", person.scalaInt lt 5)
     assertEquals("person.scalaInt = 5", person.scalaInt eq 5)
-    
+
     assertEquals("person.javaInt < 5", person.javaInt lt 5)
     assertEquals("person.javaInt > 5", person.javaInt gt 5)
     assertEquals("person.javaInt <= 5", person.javaInt loe 5)
@@ -159,17 +157,17 @@ class ExpressionTest {
     assertEquals("person.javaInt = 5", person.javaInt eq 5.asInstanceOf[Integer]) // FIXME
     assertEquals("person.javaInt != 5", person.javaInt ne 5.asInstanceOf[Integer]) // FIXME
   }
-  
+
   @Test
   def Number_Negation {
-    assertEquals("-person.scalaInt", -person.scalaInt)  
+    assertEquals("-person.scalaInt", -person.scalaInt)
   }
-  
+
   @Test
   def Number_Comparison_With_Operators {
     assertEquals("person.scalaInt < 5", person.scalaInt < 5)
-    assertEquals("person.scalaInt = 5", person.scalaInt === 5) 
-    
+    assertEquals("person.scalaInt = 5", person.scalaInt === 5)
+
     assertEquals("person.javaInt < 5", person.javaInt < 5)
     assertEquals("person.javaInt > 5", person.javaInt > 5)
     assertEquals("person.javaInt <= 5", person.javaInt <= 5)
@@ -177,13 +175,13 @@ class ExpressionTest {
     assertEquals("person.javaInt = 5", person.javaInt === 5)
     assertEquals("person.javaInt != 5", person.javaInt !== 5)
   }
-    
+
   @Test
   def Number_Between {
     assertEquals("person.scalaInt between 2 and 3", person.scalaInt between (2, 3))
     assertEquals("person.javaInt between 2 and 3", person.javaInt between (2, 3))
   }
-  
+
   @Test
   def Number_Not_Between {
     assertEquals("!(person.scalaInt between 2 and 3)", person.scalaInt not between (2, 3))
@@ -212,8 +210,8 @@ class ExpressionTest {
     assertEquals("person.scalaInt * 3", person.scalaInt * 3)
     assertEquals("-person.scalaInt", -person.scalaInt)
     assertEquals("person.scalaInt % 4", person.scalaInt % 4)
-  }  
-  
+  }
+
   @Test
   def Number_Casts {
     assertEquals("cast(person.javaInt,long)", person.javaInt longValue)
@@ -241,7 +239,7 @@ class ExpressionTest {
     assertEquals("person.javaList.get(0) is not null", person.javaList.get(0) isNotNull)
     assertEquals("person.javaMap.get(xxx) is null", person.javaMap.get("xxx") isNull)
   }
-  
+
   @Test
   def Java_Collection_Get_With_Apply {
     assertEquals("person.javaList.get(0) is not null", person.javaList(0) isNotNull)
@@ -251,11 +249,11 @@ class ExpressionTest {
   def Java_Collections_Get_And_Starts_With {
     assertEquals("startsWith(person.javaMap.get(xxx),X)", person.javaMap.get("xxx") startsWith "X")
   }
-  
+
   @Test
   def Java_Collections_Get_With_Apply {
     assertEquals("startsWith(person.javaMap.get(xxx),X)", person.javaMap("xxx") startsWith "X")
-  }  
+  }
 
   @Test
   def Scala_Collections_Size {
@@ -288,7 +286,7 @@ class ExpressionTest {
   }
 
   @Test
-  def Array_Size {   
+  def Array_Size {
     assertEquals("size(person.array)", person.array size)
   }
 
@@ -299,47 +297,47 @@ class ExpressionTest {
          "&& person.javaInt < person.scalaInt " +
          "|| person.javaDouble is null", expr)
   }
-  
+
   @Test
   def Complex_Starts_With_And_Less_Than_And_Is_Null_With_Operators {
     val expr: Predicate = (person.firstName startsWith person.lastName) and (person.javaInt lt person.scalaInt) or (person.javaDouble isNull)
-    assertEquals("startsWith(person.firstName,person.lastName) && person.javaInt < person.scalaInt || person.javaDouble is null", 
+    assertEquals("startsWith(person.firstName,person.lastName) && person.javaInt < person.scalaInt || person.javaDouble is null",
                   person.firstName.startsWith(person.lastName) && person.javaInt < person.scalaInt || person.javaDouble.isNull)
   }
-  
+
   @Test
   def Lt_and_Gt {
     val expr: Predicate = (person.javaInt lt 5) and (person.scalaInt gt 7)
     assertEquals("person.javaInt < 5 && person.scalaInt > 7", expr)
   }
-  
+
   @Test
   def Lt_and_Gt_With_Operators {
     assertEquals("person.javaInt < 5 && person.scalaInt > 7", person.javaInt < 5 && person.scalaInt > 7)
   }
-  
+
   @Test
   def Gt_and_Lt {
     val expr: Predicate = (person.javaInt gt 5) and (person.scalaInt lt 7)
     assertEquals("person.javaInt > 5 && person.scalaInt < 7", expr)
   }
-  
+
   @Test
   def Gt_and_Lt_With_Operators {
     assertEquals("person.javaInt > 5 && person.scalaInt < 7", person.javaInt > 5 && person.scalaInt < 7)
   }
-  
+
   @Test
   def Lt_or_Gt {
     val expr: Predicate = (person.javaInt lt 5) or (person.scalaInt gt 7)
     assertEquals("person.javaInt < 5 || person.scalaInt > 7", expr)
   }
-  
+
   @Test
   def Lt_or_Gt_With_Operators {
     assertEquals("person.javaInt < 5 || person.scalaInt > 7", person.javaInt < 5 || person.scalaInt > 7)
-  }  
-  
+  }
+
   @Test
   def Gt_or_Lt {
     val expr: Predicate = (person.javaInt gt 5) or (person.scalaInt lt 7)
@@ -350,33 +348,33 @@ class ExpressionTest {
   def Gt_or_Lt_With_Operators {
     assertEquals("person.javaInt > 5 || person.scalaInt < 7", person.javaInt > 5 || person.scalaInt < 7)
   }
-  
+
   @Test
   def Starts_with {
     assertEquals("startsWith(person.firstName,amin)",  person.firstName startsWith "amin")
   }
-  
+
   @Test
   def Ends_with {
     assertEquals("endsWith(person.firstName,amin)",  person.firstName endsWith "amin")
   }
-  
+
   @Test
   def String_Negations {
     assertEquals("!(person.firstName like XXX)", person.firstName not like("XXX"))
     assertEquals("!matches(person.firstName,XXX)", person.firstName not matches("XXX"))
-    assertEquals("!startsWith(person.firstName,XXX)", person.firstName not startsWith("XXX"))   
-    assertEquals("!endsWith(person.firstName,XXX)", person.firstName not endsWith("XXX")) 
-    assertEquals("!empty(person.firstName)", person.firstName not empty) 
+    assertEquals("!startsWith(person.firstName,XXX)", person.firstName not startsWith("XXX"))
+    assertEquals("!endsWith(person.firstName,XXX)", person.firstName not endsWith("XXX"))
+    assertEquals("!empty(person.firstName)", person.firstName not empty)
   }
-  
+
   @Test
   def String_Negations2 {
     assertEquals("!(person.firstName like XXX)", !(person.firstName like "XXX"))
-    assertEquals("!matches(person.firstName,XXX)", !(person.firstName matches "XXX")) 
-    assertEquals("!startsWith(person.firstName,XXX)", !(person.firstName startsWith "XXX"))   
-    assertEquals("!endsWith(person.firstName,XXX)", !(person.firstName endsWith "XXX")) 
-    assertEquals("!empty(person.firstName)", !(person.firstName isEmpty)) 
+    assertEquals("!matches(person.firstName,XXX)", !(person.firstName matches "XXX"))
+    assertEquals("!startsWith(person.firstName,XXX)", !(person.firstName startsWith "XXX"))
+    assertEquals("!endsWith(person.firstName,XXX)", !(person.firstName endsWith "XXX"))
+    assertEquals("!empty(person.firstName)", !(person.firstName isEmpty))
   }
 
   @Test
@@ -384,7 +382,7 @@ class ExpressionTest {
     val b1 = new BooleanPath("b1")
     val b2 = new BooleanPath("b2")
     val b3 = new BooleanPath("b3")
-    assertEquals("b1 && b2 && b3", BooleanExpression.allOf(b1, b2, b3))       
+    assertEquals("b1 && b2 && b3", BooleanExpression.allOf(b1, b2, b3))
     assertEquals("b1", BooleanExpression.allOf(b1))
   }
 
@@ -396,7 +394,7 @@ class ExpressionTest {
     assertEquals("b1 || b2 || b3", BooleanExpression.anyOf(b1, b2, b3))
     assertEquals("b1", BooleanExpression.anyOf(b1))
   }
-  
+
 }
 
 
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala
new file mode 100644
index 0000000000..4fbb5e8566
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala
@@ -0,0 +1,78 @@
+package com.querydsl.scala
+
+import javax.persistence._
+
+import com.querydsl.codegen.GenericExporter
+import org.junit.Test
+
+class GenericExporterJPATest {
+
+  @Test
+  def Export {
+    val exporter = new GenericExporter()
+    exporter.setTargetFolder(new java.io.File("target/gen1-jpa"))
+    exporter.setSerializerClass(classOf[ScalaEntitySerializer])
+    exporter.setTypeMappingsClass(classOf[ScalaTypeMappings])
+    exporter.setEmbeddableAnnotation(classOf[Embeddable])
+    exporter.setEmbeddedAnnotation(classOf[Embedded])
+    exporter.setEntityAnnotation(classOf[Entity])
+    exporter.setSkipAnnotation(classOf[Transient])
+    exporter.setSupertypeAnnotation(classOf[MappedSuperclass])
+    exporter.setCreateScalaSources(true)
+    exporter.export(getClass.getPackage)
+
+    val targetFolder = new java.io.File("target/gen1-jpa/com/querydsl/scala/")
+    val sources = targetFolder.listFiles.filter(_.getName.endsWith(".scala"))
+    CompileTestUtils.assertCompileSuccess(sources)
+  }
+
+}
+
+@MappedSuperclass
+class JPASuperclass {
+
+  var id: Int = _
+
+}
+
+@Entity
+class JPAEscapedWords {
+
+  var `object`: String = _
+
+  var `type`: String = _
+
+  var `var`: String = _
+
+  var `val`: String = _
+
+}
+
+@Entity
+class JPAEntityClass extends JPASuperclass {
+
+  // FIXME
+  //  var comparable: Comparable[_] = _
+
+  var code: String = _
+
+  var stringList: java.util.List[String] = _
+
+  var embedded: JPAEmbeddableClass = _
+
+}
+
+@Entity
+class JPAEntitySubclass extends JPAEntityClass {
+
+  var property: String = _
+
+}
+
+@Embeddable
+class JPAEmbeddableClass {
+
+  var property: String = _
+
+}
+
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala
new file mode 100644
index 0000000000..5503ad78e6
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala
@@ -0,0 +1,25 @@
+package com.querydsl.scala
+
+import java.io.File
+
+import com.querydsl.codegen.GenericExporter
+import org.junit.Test
+
+class GenericExporterTest {
+
+  @Test
+  def Export {
+    val exporter = new GenericExporter()
+    exporter.setTargetFolder(new java.io.File("target/gen1"))
+    exporter.setSerializerClass(classOf[ScalaEntitySerializer])
+    exporter.setTypeMappingsClass(classOf[ScalaTypeMappings])
+    exporter.setCreateScalaSources(true)
+    exporter.export(getClass.getPackage)
+
+    val targetFolder = new File("target/gen1")
+    CompileTestUtils.assertCompileSuccess(targetFolder)
+  }
+
+}
+
+
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/QPerson.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/QPerson.scala
similarity index 79%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/QPerson.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/QPerson.scala
index fd0c74ee49..8e056ee8ac 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/QPerson.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/QPerson.scala
@@ -1,18 +1,14 @@
-package com.mysema.query.scala;
+package com.querydsl.scala
 
-import com.mysema.query.types._;
-import com.mysema.query.scala._;
-
-import com.mysema.query.types.PathMetadataFactory._;
-import java.util.List;
-import java.util.Map;
+import com.querydsl.core.types.PathMetadataFactory._
+import com.querydsl.core.types._
 
 object QPerson extends QPerson("person"){
   override def as(variable: String) = new QPerson(variable)
-  
+
 }
 
-class QPerson(cl: Class[_ <: Person], md: PathMetadata[_]) extends EntityPathImpl[Person](cl, md) {
+class QPerson(cl: Class[_ <: Person], md: PathMetadata) extends EntityPathImpl[Person](cl, md) {
   def this(variable: String) = this(classOf[Person], forVariable(variable))
 
   def this(parent: Path[_], variable: String) = this(classOf[Person], forProperty(parent, variable))
@@ -28,7 +24,7 @@ class QPerson(cl: Class[_ <: Person], md: PathMetadata[_]) extends EntityPathImp
   val javaDouble = createNumber[java.lang.Double]("javaDouble")
 
   val javaInt = createNumber[Integer]("javaInt")
-  
+
   val javaList = createList[String,StringPath]("javaList")
 
   val javaMap = createMap[String,String,StringPath]("javaMap")
@@ -40,9 +36,9 @@ class QPerson(cl: Class[_ <: Person], md: PathMetadata[_]) extends EntityPathImp
   val listOfPersons = createList[Person,QPerson]("listOfPersons")
 
   val scalaInt = createNumber[Int]("scalaInt")
-  
+
   val scalaDouble = createNumber[Double]("scalaDouble")
-  
+
   //val num = createNumber[String]("x")
 
   val scalaList = createList[String,StringPath]("scalaList")
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala
new file mode 100644
index 0000000000..cff4d77ece
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala
@@ -0,0 +1,34 @@
+package com.querydsl.scala
+
+import org.junit.{Assert, Test}
+
+class QPersonTest {
+
+  val person = QPerson as "person"
+
+  @Test
+  def EntityPath {
+    assertEquals("person.other.firstName", person.other.firstName)
+  }
+
+  @Test
+  def Collection_Any {
+    assertEquals("any(person.javaCollection) = Bob", person.javaCollection.any === "Bob")
+  }
+
+  @Test
+  def List_Get {
+    assertEquals("person.javaList.get(0) = Bob", person.javaList(0) === "Bob")
+  }
+
+  @Test
+  def List_Get_EntityPath {
+    assertEquals("person.listOfPersons.get(0).firstName is not null",
+        person.listOfPersons(0).firstName isNotNull)
+  }
+
+  def assertEquals(expected: String, actual: Any) {
+    Assert.assertEquals(expected, actual.toString)
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala
new file mode 100644
index 0000000000..4fc520cb9a
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala
@@ -0,0 +1,28 @@
+package com.querydsl.scala
+
+import org.junit.Assert._
+import org.junit._
+
+class ReflectionUtilsTest {
+
+  @Test
+  def getSuperClasses_of_String {
+    assertEquals(List(classOf[String],classOf[AnyRef]), ReflectionUtils.getSuperClasses(classOf[String]))
+  }
+
+  @Test
+  def getImplementedInterfaces {
+    var setToTest = ReflectionUtils.getImplementedInterfaces(classOf[String])
+    assertTrue(setToTest.contains(classOf[java.io.Serializable]))
+    assertTrue(setToTest.contains(classOf[Comparable[_]]))
+    assertTrue(setToTest.contains(classOf[CharSequence]))
+  }
+
+  @Test
+  def getFields {
+    assertTrue( ReflectionUtils.getFields(classOf[String]).size > 0)
+  }
+
+
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala
new file mode 100644
index 0000000000..2e3d6a0d01
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala
@@ -0,0 +1,64 @@
+package com.querydsl.scala
+
+import java.io.StringWriter
+
+import com.querydsl.codegen.utils._
+import com.querydsl.codegen._
+import org.junit.Assert._
+import org.junit._
+
+class ScalaBeanSerializerTest {
+
+  val typeMappings = ScalaTypeMappings.create
+
+  var writer = new StringWriter()
+
+  val entityType = EntityTypes.entityType
+
+  @Test
+  def Print {
+    val serializer = new ScalaBeanSerializer(typeMappings)
+    serializer.javaBeanSupport = true
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+
+    //println(writer.toString)
+
+    var toMatch = """package com.querydsl
+    import scala.beans.BeanProperty
+    import java.util.List
+    import java.util.Map
+    /**
+    * DomainClass is a Querydsl bean type
+    */
+    class DomainClass {
+    @BeanProperty var arrayField: Array[String] = _
+    @BeanProperty var boolean$: java.lang.Boolean = _
+    @BeanProperty var collection: java.util.Collection[DomainClass] = _
+    @BeanProperty var date: java.util.Date = _
+    @BeanProperty var entityField: DomainClass = _
+    @BeanProperty var integer: Integer = _
+    @BeanProperty var listField: List[DomainClass] = _
+    @BeanProperty var mapField: Map[DomainClass, DomainClass] = _
+    @BeanProperty var setField: java.util.Set[DomainClass] = _
+    @BeanProperty var time: java.sql.Time = _"""
+
+    val str = writer.toString.replaceAll("\\s+", " ")
+    //println(str)
+
+    toMatch.split("\\n").map(_.trim).foreach { line =>
+      assertTrue(line, str.contains(line))
+    }
+
+  }
+
+  @Test
+  def Compile {
+    val serializer = new ScalaBeanSerializer(typeMappings)
+    serializer.createCompanionObject = false
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+    val str = writer.toString
+    CompileTestUtils.assertCompileSuccess(str)
+  }
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala
new file mode 100644
index 0000000000..0eb453671f
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala
@@ -0,0 +1,69 @@
+package com.querydsl.scala
+
+import java.io.StringWriter
+
+import com.querydsl.codegen.utils._
+import com.querydsl.codegen.utils.model._
+import com.querydsl.codegen._
+import org.junit.Assert._
+import org.junit.{Before, Test}
+
+class ScalaEntitySerializerTest {
+
+  var entityType: EntityType = null
+
+  val writer = new StringWriter()
+
+  @Before
+  def setUp() {
+    val typeModel = new ClassType(TypeCategory.ENTITY, classOf[Person])
+    entityType = new EntityType(typeModel)
+    for ( (name, t) <- List(
+        ("scalaInt", Types.INT),
+        ("javaInt", Types.INTEGER),
+        ("javaDouble", Types.DOUBLE),
+        ("scalaDouble", Types.DOUBLE_P),
+        ("firstName", Types.STRING),
+        ("lastName", Types.STRING),
+        ("scalaList", new SimpleType(Types.LIST, Types.STRING)),
+        ("scalaMap", new SimpleType(Types.MAP, Types.STRING, Types.STRING)),
+        ("javaCollection", new SimpleType(Types.COLLECTION, Types.STRING)),
+        ("javaSet", new SimpleType(Types.SET, Types.STRING)),
+        ("javaList", new SimpleType(Types.LIST, Types.STRING)),
+        ("javaMap", new SimpleType(Types.MAP, Types.STRING, Types.STRING)),
+        ("listOfPersons", new SimpleType(Types.LIST, entityType)),
+        ("array", new ClassType(TypeCategory.ARRAY, classOf[Array[String]])),
+        ("other", entityType))) {
+      entityType.addProperty(new Property(entityType, name, t))
+    }
+
+
+  }
+
+  @Test
+  def Print {
+    val typeMappings = ScalaTypeMappings.create
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    val serializer = new ScalaEntitySerializer(typeMappings)
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+    val str = writer.toString
+    //System.err.println(str)
+    assertTrue(str.contains("class QPerson(cl: Class[_ <: Person], md: PathMetadata) " +
+            "extends EntityPathImpl[Person](cl, md) {"))
+    assertTrue(str.contains("def this(variable: String) = " +
+            "this(classOf[Person], forVariable(variable))"))
+    assertTrue(str.contains("def this(parent: Path[_], variable: String) = " +
+            "this(classOf[Person], forProperty(parent, variable))"))
+  }
+
+  @Test
+  def Compile {
+    val typeMappings = ScalaTypeMappings.create
+    typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
+    val serializer = new ScalaEntitySerializer(typeMappings)
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+    val str = writer.toString
+    //System.err.println(str);
+    CompileTestUtils.assertCompileSuccess(str)
+  }
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/Types.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/Types.scala
similarity index 75%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/Types.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/Types.scala
index de07de372e..b4d38fa0fb 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/Types.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/Types.scala
@@ -1,6 +1,6 @@
-package com.mysema.query.scala;
+package com.querydsl.scala
 
-import com.mysema.query.annotations._
+import com.querydsl.core.annotations._
 
 @QuerySupertype
 class Superclass {
@@ -11,22 +11,22 @@ class Superclass {
 
 @QueryEntity
 class EscapedWords {
-  
-  var `object`: String = _  
-    
+
+  var `object`: String = _
+
   var `type`: String = _
-      
+
   var `var`: String = _
-    
+
   var `val`: String = _
-    
+
 }
 
 @QueryEntity
 class EntityClass extends Superclass {
 
   // FIXME
-  //  var comparable: Comparable[_] = _   
+  //  var comparable: Comparable[_] = _
 
   var code: String = _
 
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ext/Types2.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ext/Types2.scala
similarity index 82%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/ext/Types2.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/ext/Types2.scala
index c07834d8a3..43309c8a04 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ext/Types2.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ext/Types2.scala
@@ -1,13 +1,14 @@
-package com.mysema.query.scala.ext;
+package com.querydsl.scala.ext
+
+import com.querydsl.core.annotations._
 
-import com.mysema.query.annotations._
 import scala.runtime.RichChar
 
 object WeekDay extends Enumeration {
   type WeekDay = Value
   val Mon, Tue, Wed, Thu, Fri, Sat, Sun = Value
 }
-  
+
 @QueryEntity
 class SomeEntity extends SomeTrait {
   var someStringOption: Option[String] = _
@@ -15,11 +16,11 @@ class SomeEntity extends SomeTrait {
   var someScalaEnum: WeekDay.Value = _
 
   var someChar: Char = _
-    
+
   var someRichChar: RichChar = _
 }
 
 trait SomeTrait {
   private var somePrivateString: String = _
- 
+
 }
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ExampleSchema.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ExampleSchema.scala
similarity index 95%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ExampleSchema.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/sql/ExampleSchema.scala
index 98740403cf..bf59ea5910 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ExampleSchema.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ExampleSchema.scala
@@ -1,8 +1,6 @@
-package com.mysema.query.scala.sql
+package com.querydsl.scala.sql
 
-import com.mysema.query.sql._
-import com.mysema.query.types.path._
-import java.util.{ Arrays, Collections }
+import com.querydsl.sql._
 
 object QUser {
   def as(path: String) = new QUser(path)
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala
new file mode 100644
index 0000000000..f0865840f8
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala
@@ -0,0 +1,170 @@
+package com.querydsl.scala.sql
+
+import java.sql.{Connection, DriverManager, Statement}
+
+import com.querydsl.sql.dml._
+import com.querydsl.sql.{Configuration, HSQLDBTemplates, RelationalPath, SQLQuery}
+import org.junit.Assert._
+import org.junit._
+import test._
+
+object JDBCIntegrationTest {
+
+  private var connection: Connection = _
+  private var statement: Statement = _
+
+  @BeforeClass
+  def setUpClass() {
+    Class.forName("org.h2.Driver")
+    val url = "jdbc:h2:mem:testdb" + System.currentTimeMillis()
+
+    connection = DriverManager.getConnection(url, "sa", "")
+    statement = connection.createStatement()
+    statement.execute("drop table employee if exists")
+    statement.execute("drop table survey if exists")
+    statement.execute("drop table date_test if exists")
+    statement.execute("drop table date_time_test if exists")
+
+    statement.execute("""create table survey (
+      id int identity,
+      name varchar(30))""")
+
+    statement.execute("insert into survey (name) values ('abc')")
+    statement.execute("insert into survey (name) values ('def')")
+
+    statement.execute("""create table employee(
+      id INT identity,
+      firstname VARCHAR(50),
+      lastname VARCHAR(50),
+      superior_id int,
+      CONSTRAINT PK_employee PRIMARY KEY (id),
+      CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))""")
+
+    statement.execute("insert into employee (firstname, lastname) values ('Bob', 'Smith')")
+    statement.execute("insert into employee (firstname, lastname) values ('John', 'Doe')")
+
+    // TODO : create table with multi column primary key
+  }
+
+  @AfterClass
+  def tearDownClass() {
+    try {
+      statement.close()
+    } finally {
+      connection.close()
+    }
+  }
+
+}
+
+class JDBCIntegrationTest extends SQLHelpers {
+
+  val survey = QSurvey
+  val employee = QEmployee
+
+  val templates = new HSQLDBTemplates()
+  val configuration = new Configuration(templates)
+
+  def connection = JDBCIntegrationTest.connection
+
+  @Before
+  def setUp(): Unit = {
+    connection.setAutoCommit(false)
+  }
+
+  @After
+  def tearDown(): Unit = {
+    connection.rollback()
+    connection.setAutoCommit(true)
+  }
+
+  @Test
+  def Populate_Bean {
+    assertEquals(2, query.from(survey).select(survey).fetch() size ())
+  }
+
+  @Test
+  def List {
+    assertEquals(2, query.from(survey).select(survey.id).fetch() size ())
+    assertEquals(2, query.from(employee).select(employee.firstname).fetch() size ())
+  }
+
+  @Test
+  def Select2 {
+    assertEquals(2, query.from(survey).select(survey.id, survey.name).fetch().size)
+  }
+
+  @Test
+  def Select3 {
+    assertEquals(2, query.from(survey).select(survey.id, survey.name, survey.name.substring(0,1)).fetch().size)
+  }
+
+  @Test
+  def Select4 {
+    assertEquals(2, query.from(survey).select(survey.id, survey.name, survey.name + "X", survey.name + "Y").fetch().size)
+  }
+
+  @Test
+  def Count {
+    assertEquals(2, query.from(survey).fetchCount)
+    assertEquals(2, query.from(employee).fetchCount)
+  }
+
+  @Test
+  def Order_By {
+    query.from(survey).orderBy(survey.id asc).select(survey)
+  }
+
+  @Test
+  def Unique_Result {
+    assertEquals("abc", query.from(survey).where(survey.id eq 1).select(survey.name).fetchOne())
+    assertEquals("def", query.from(survey).where(survey.id eq 2).select(survey.name).fetchOne())
+    assertEquals("Bob", query.from(employee).where(employee.lastname eq "Smith").select(employee.firstname).fetchOne())
+    assertEquals("John", query.from(employee).where(employee.lastname eq "Doe").select(employee.firstname).fetchOne())
+  }
+
+  @Test
+  def Insert {
+    val s = new Survey()
+    s.name = "XXX"
+
+    val id = insert(survey) populate(s) executeWithKey(survey.id)
+    val sNew = query from survey where (survey.id === id) select (survey) fetchOne()
+    assertEquals(s.name, sNew.name)
+  }
+
+  @Test
+  def Update {
+    val s = new Survey()
+    s.name = "XXX"
+
+    val id = insert(survey) populate(s) executeWithKey(survey.id)
+    s.id = id
+    s.name = "YYY"
+
+    val count = update(survey) populate(s) execute()
+    assertTrue(count > 0)
+
+    val sNew = query from survey where (survey.id === id) select (survey) fetchOne()
+    assertEquals(s.name, sNew.name)
+  }
+
+  @Test
+  def Delete {
+    val s = new Survey()
+    s.name = "XXX"
+
+    val id = insert(survey) populate(s) executeWithKey(survey.id)
+    val count = delete(survey) where(survey.id === id) execute()
+    assertTrue(count > 0)
+  }
+
+  def query = new SQLQuery[Void](connection, configuration)
+
+  def delete(path: RelationalPath[_]) = new SQLDeleteClause(connection, configuration, path)
+
+  def insert(path: RelationalPath[_]) = new SQLInsertClause(connection, configuration, path)
+
+  def update(path: RelationalPath[_]) = new SQLUpdateClause(connection, configuration, path)
+
+}
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala
new file mode 100644
index 0000000000..d04ca9cbcc
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala
@@ -0,0 +1,134 @@
+package com.querydsl.scala.sql
+
+import com.querydsl.scala._
+import com.querydsl.sql.codegen._
+import org.junit._
+
+object MetaDataExporterTest {
+
+  private var connection: java.sql.Connection = _
+
+  @BeforeClass
+  def setUp() {
+    Class.forName("org.h2.Driver")
+    val url = "jdbc:h2:mem:testdb" + System.currentTimeMillis()
+    connection = java.sql.DriverManager.getConnection(url, "sa", "")
+
+    val stmt = connection.createStatement()
+
+    try {
+      stmt.execute("create table reserved (id int, while int)")
+      stmt.execute("create table underscore (e_id int, c_id int)")
+      stmt.execute("create table beangen1 (\"SEP_Order\" int)")
+      stmt.execute("create table definstance (id int, definstance int, definstance1 int)")
+      stmt.execute("create table pkfk (id int primary key, pk int, fk int)")
+      stmt.execute("create table \"camelCase\" (id int)")
+      stmt.execute("create table \"vwServiceName\" (id int)")
+      stmt.execute("create table date_test (d date)")
+      stmt.execute("create table date_time_test (dt datetime)")
+      stmt.execute("create table survey (id int, name varchar(30))")
+      stmt.execute("create table typetest (type int, constraint pk_typetest primary key(type))")
+
+      stmt.execute("""create table employee(
+                    id INT, firstname VARCHAR(50), lastname VARCHAR(50), salary DECIMAL(10, 2),
+                    datefield DATE, timefield TIME,
+                    superior_id int, survey_id int, survey_name varchar(30),
+                    CONSTRAINT PK_employee PRIMARY KEY (id),
+                    CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))""")
+
+      // table with count column
+      stmt.execute("create table count_table(count int)")
+
+      // multi primary key
+      stmt.execute("create table multikey(id INT, id2 VARCHAR, id3 INT," +
+        " CONSTRAINT pk_multikey PRIMARY KEY (id, id2, id3) )")
+
+      // multi foreign key
+      stmt.execute("create table multikey2(id INT, id2 INT, id3 INT, id4 INT, id5 INT, id6 INT," +
+        " CONSTRAINT pk_multikey2 FOREIGN KEY (id4, id5, id6) REFERENCES multikey2(id, id2, id3) )")
+
+    } finally {
+      stmt.close()
+    }
+  }
+
+  @AfterClass
+  def tearDown() {
+    connection.close()
+  }
+
+
+}
+
+class MetaDataExporterTest {
+  import MetaDataExporterTest._
+
+  @Test
+  def Generate_Without_BeanTypes() {
+    val directory = new java.io.File("target/jdbcgen1")
+    val exporter = new MetaDataExporter()
+    exporter.setNamePrefix("Q")
+    exporter.setPackageName("com.querydsl")
+    exporter.setSchemaPattern("PUBLIC")
+    exporter.setTargetFolder(directory)
+    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
+    exporter.setCreateScalaSources(true)
+    exporter.setTypeMappings(ScalaTypeMappings.create)
+    exporter.export(connection.getMetaData)
+
+    CompileTestUtils.assertCompileSuccess(directory)
+  }
+
+  @Test
+  def Generate_With_BeanTypes() {
+    val directory = new java.io.File("target/jdbcgen2")
+    val exporter = new MetaDataExporter()
+    exporter.setNamePrefix("Q")
+    exporter.setPackageName("com.querydsl")
+    exporter.setSchemaPattern("PUBLIC")
+    exporter.setTargetFolder(directory)
+    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
+    exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer])
+    exporter.setCreateScalaSources(true)
+    exporter.setTypeMappings(ScalaTypeMappings.create)
+    exporter.export(connection.getMetaData)
+
+    CompileTestUtils.assertCompileSuccess(directory)
+  }
+
+  @Test
+  def Generate_With_Schema() {
+    val directory = new java.io.File("target/jdbcgen3")
+    val exporter = new MetaDataExporter()
+    exporter.setNamePrefix("Q")
+    exporter.setPackageName("com.querydsl")
+    exporter.setSchemaPattern("PUBLIC")
+    exporter.setSchemaToPackage(true)
+    exporter.setTargetFolder(directory)
+    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
+    exporter.setCreateScalaSources(true)
+    exporter.setTypeMappings(ScalaTypeMappings.create)
+    exporter.export(connection.getMetaData)
+
+    CompileTestUtils.assertCompileSuccess(directory)
+  }
+
+  @Test
+  def Generate_With_BeanTypes_And_Schema() {
+    val directory = new java.io.File("target/jdbcgen4")
+    val exporter = new MetaDataExporter()
+    exporter.setNamePrefix("Q")
+    exporter.setPackageName("com.querydsl")
+    exporter.setSchemaPattern("PUBLIC")
+    exporter.setSchemaToPackage(true)
+    exporter.setTargetFolder(directory)
+    exporter.setSerializerClass(classOf[ScalaMetaDataSerializer])
+    exporter.setBeanSerializerClass(classOf[ScalaBeanSerializer])
+    exporter.setCreateScalaSources(true)
+    exporter.setTypeMappings(ScalaTypeMappings.create)
+    exporter.export(connection.getMetaData)
+
+    CompileTestUtils.assertCompileSuccess(directory)
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala
new file mode 100644
index 0000000000..8f3a0da018
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala
@@ -0,0 +1,16 @@
+package com.querydsl.scala.sql
+
+import com.querydsl.core.types._
+import org.junit.Assert._
+import org.junit._
+import test._
+
+class PathsTest {
+
+  @Test
+  def Projection {
+    val projection = Employee.getProjection.asInstanceOf[FactoryExpression[_]]
+    assertEquals(4, projection.getArgs.size)
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QuerySyntaxTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala
similarity index 81%
rename from querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QuerySyntaxTest.scala
rename to querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala
index 4ab3b79996..822bfad949 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/QuerySyntaxTest.scala
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala
@@ -1,9 +1,8 @@
-package com.mysema.query.scala.sql
+package com.querydsl.scala.sql
 
-import com.mysema.query.sql._
-
-import org.junit.Test
+import com.querydsl.sql._
 import org.junit.Assert._
+import org.junit.Test
 
 class QuerySyntaxTest {
 
@@ -23,9 +22,9 @@ class QuerySyntaxTest {
   @Test
   def Query_Syntax {
     query from(c) innerJoin(b) from(c1) where (c1.name like "a%") orderBy(c.name asc) //list(c)
-    query from(c) innerJoin(b) list(b.id count)
+    query from(c) innerJoin(b) select (b.id count)
 
-    query from (c) list (c.id, c.name)
+    query from (c) select (c.id, c.name)
   }
 
   @Test
@@ -40,6 +39,6 @@ class QuerySyntaxTest {
     query from(user) innerJoin(user.departmentKey, department) innerJoin(department.companyKey, company)
   }
 
-  def query() = new SQLSubQuery()
+  def query() = new SQLQuery[Void]()
 
 }
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala
new file mode 100644
index 0000000000..443ebb9b38
--- /dev/null
+++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala
@@ -0,0 +1,53 @@
+package com.querydsl.scala.sql
+
+import java.io.StringWriter
+
+import com.querydsl.codegen.utils._
+import com.querydsl.codegen.utils.model._
+import com.querydsl.codegen._
+import com.querydsl.scala._
+import com.querydsl.sql._
+import com.querydsl.sql.codegen._
+import org.junit.Assert._
+import org.junit._
+
+class ScalaMetaDataSerializerTest {
+
+  var entityType: EntityType = null
+
+  val writer = new StringWriter()
+
+  @Before
+  def setUp() {
+    // type
+    val typeModel = new SimpleType(TypeCategory.ENTITY,
+        "com.querydsl.DomainClass", "com.querydsl", "DomainClass", false, false)
+    entityType = new EntityType(typeModel)
+    //entityType.addAnnotation(new TableImpl("DOMAIN_TYPE"))
+    entityType.getData.put("table", "DOMAIN_TYPE")
+
+    // properties
+    List(classOf[java.lang.Boolean], classOf[Comparable[_]], classOf[Integer],
+         classOf[java.util.Date], classOf[java.sql.Date], classOf[java.sql.Time])
+      .foreach(cl => {
+        val classType = new ClassType(TypeCategory.get(cl.getName), cl)
+        val propertyName = StringUtils.uncapitalize(cl.getSimpleName)
+        var property = new Property(entityType, propertyName, classType)
+        property.getData.put("COLUMN", ColumnMetadata.named(propertyName.toUpperCase).ofType(0))
+        entityType.addProperty(property)
+      })
+  }
+
+  @Test
+  def Print {
+    val typeMappings = ScalaTypeMappings.create
+    val namingStrategy = new DefaultNamingStrategy()
+    val serializer = new ScalaMetaDataSerializer(typeMappings, namingStrategy)
+    serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
+    val str = writer.toString
+    //System.err.println(str)
+    assertTrue("companion object isn't before class", str.indexOf("object") < str.indexOf("class"))
+    //assertTrue("companion object isn't before annotations", str.indexOf("object") < str.indexOf("@Table"))
+  }
+
+}
\ No newline at end of file
diff --git a/querydsl-scala/src/test/scala/test/Employee.scala b/querydsl-scala/src/test/scala/test/Employee.scala
index dbbda928d8..32514360f9 100644
--- a/querydsl-scala/src/test/scala/test/Employee.scala
+++ b/querydsl-scala/src/test/scala/test/Employee.scala
@@ -1,24 +1,19 @@
-package test;
+package test
 
-import scala.reflect.BeanProperty;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-import com.mysema.query.sql._;
-
-object Employee extends QEmployee("employee"){
+object Employee extends QEmployee("employee") {
   override def as(variable: String) = new QEmployee(variable)
-  
+
 }
 
 class Employee {
 
-  var firstname: String = _;
+  var firstname: String = _
 
-  var id: Integer = _;
+  var id: Integer = _
 
-  var lastname: String = _;
+  var lastname: String = _
 
-  var superiorId: Integer = _;
+  var superiorId: Integer = _
 
 }
 
diff --git a/querydsl-scala/src/test/scala/test/QEmployee.scala b/querydsl-scala/src/test/scala/test/QEmployee.scala
index 8cb1de5146..bc2175eb08 100644
--- a/querydsl-scala/src/test/scala/test/QEmployee.scala
+++ b/querydsl-scala/src/test/scala/test/QEmployee.scala
@@ -1,20 +1,16 @@
-package test;
+package test
 
-import com.mysema.query.types._;
-import com.mysema.query.scala._;
-
-import com.mysema.query.types.PathMetadataFactory._;
-
-import com.mysema.query.scala.sql.RelationalPathImpl;
-
-import com.mysema.query.sql._;
+import com.querydsl.core.types.PathMetadataFactory._
+import com.querydsl.core.types._
+import com.querydsl.scala.sql.RelationalPathImpl
+import com.querydsl.sql._
 
 object QEmployee extends QEmployee("employee"){
   override def as(variable: String) = new QEmployee(variable)
 
 }
 
-class QEmployee(md: PathMetadata[_]) extends RelationalPathImpl[Employee](md, "PUBLIC", "EMPLOYEE") {
+class QEmployee(md: PathMetadata) extends RelationalPathImpl[Employee](md, "PUBLIC", "EMPLOYEE") {
   def this(variable: String) = this(forVariable(variable))
 
   def this(parent: Path[_], variable: String) = this(forProperty(parent, variable))
@@ -27,11 +23,11 @@ class QEmployee(md: PathMetadata[_]) extends RelationalPathImpl[Employee](md, "P
 
   val superiorId = createNumber[Integer]("superiorId")
 
-  val sysIdx55: PrimaryKey[Employee] = createPrimaryKey(id);
+  val sysIdx55: PrimaryKey[Employee] = createPrimaryKey(id)
 
-  val superiorFk: ForeignKey[Employee] = createForeignKey(superiorId, "ID");
+  val superiorFk: ForeignKey[Employee] = createForeignKey(superiorId, "ID")
 
-  val _superiorFk: ForeignKey[Employee] = createInvForeignKey(id, "SUPERIOR_ID");
+  val _superiorFk: ForeignKey[Employee] = createInvForeignKey(id, "SUPERIOR_ID")
 
   addMetadata(firstname, ColumnMetadata.named("FIRSTNAME"))
   addMetadata(id, ColumnMetadata.named("ID"))
diff --git a/querydsl-scala/src/test/scala/test/QSurvey.scala b/querydsl-scala/src/test/scala/test/QSurvey.scala
index 9147715ef7..df2d180c5a 100644
--- a/querydsl-scala/src/test/scala/test/QSurvey.scala
+++ b/querydsl-scala/src/test/scala/test/QSurvey.scala
@@ -1,19 +1,16 @@
-package test;
+package test
 
-import com.mysema.query.types._;
-import com.mysema.query.scala._;
+import com.querydsl.core.types.PathMetadataFactory._
+import com.querydsl.core.types._
+import com.querydsl.scala.sql.RelationalPathImpl
+import com.querydsl.sql._
 
-import com.mysema.query.types.PathMetadataFactory._;
-import com.mysema.query.scala.sql.RelationalPathImpl;
-
-import com.mysema.query.sql._;
-
-object QSurvey extends QSurvey("survey"){
+object QSurvey extends QSurvey("survey") {
   override def as(variable: String) = new QSurvey(variable)
 
 }
 
-class QSurvey(md: PathMetadata[_]) extends RelationalPathImpl[Survey](md, "PUBLIC", "SURVEY") {
+class QSurvey(md: PathMetadata) extends RelationalPathImpl[Survey](md, "PUBLIC", "SURVEY") {
   def this(variable: String) = this(forVariable(variable))
 
   def this(parent: Path[_], variable: String) = this(forProperty(parent, variable))
@@ -22,7 +19,7 @@ class QSurvey(md: PathMetadata[_]) extends RelationalPathImpl[Survey](md, "PUBLI
 
   val name = createString("name")
 
-  val sysIdx54: PrimaryKey[Survey] = createPrimaryKey(id);
+  val sysIdx54: PrimaryKey[Survey] = createPrimaryKey(id)
 
   addMetadata(id, ColumnMetadata.named("ID"))
   addMetadata(name, ColumnMetadata.named("NAME"))
diff --git a/querydsl-scala/src/test/scala/test/Survey.scala b/querydsl-scala/src/test/scala/test/Survey.scala
index 4fc59419d5..281ae03811 100644
--- a/querydsl-scala/src/test/scala/test/Survey.scala
+++ b/querydsl-scala/src/test/scala/test/Survey.scala
@@ -1,20 +1,15 @@
-package test;
-
-import scala.reflect.BeanProperty;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-import com.mysema.query.sql._;
+package test
 
 object Survey extends QSurvey("survey"){
   override def as(variable: String) = new QSurvey(variable)
-  
+
 }
 
 class Survey {
 
- var id: Integer = _;
+ var id: Integer = _
 
- var name: String = _;
+ var name: String = _
 
 }
 
diff --git a/querydsl-spatial/pom.xml b/querydsl-spatial/pom.xml
index 88fc7a49b3..d3dd975fe2 100644
--- a/querydsl-spatial/pom.xml
+++ b/querydsl-spatial/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-spatial</artifactId>
   <name>Querydsl - Spatial module</name>
   <description>core module for querydsl</description>
@@ -17,31 +17,68 @@
   
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-codegen</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.geolatte</groupId>
       <artifactId>geolatte-geom</artifactId>
-      <version>0.11</version>
     </dependency>
+    <dependency>
+      <groupId>com.vividsolutions</groupId>
+      <artifactId>jts</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+
 
     <!--test -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-apt</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -54,6 +91,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.spatial</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -66,10 +110,25 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.mysema.maven</groupId>
+        <artifactId>apt-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>test-process</goal>
+              <goal>add-test-sources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/generated-test-sources/java</outputDirectory>
+              <processors>
+                <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+              </processors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-  
-  <properties>
-    <bridge-method.version>1.11</bridge-method.version>
-  </properties>
-</project>
+</project>
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/CurveExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/CurveExpression.java
deleted file mode 100644
index b07b1bee63..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/CurveExpression.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.Point;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
- * specifying the form of the interpolation between Points. This standard defines only one subclass of Curve,
- * LineString, which uses linear interpolation between Points.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class CurveExpression<T extends Geometry> extends GeometryExpression<T> {
-
-    private static final long serialVersionUID = 6139188586728676033L;
-
-    @Nullable
-    private volatile NumberExpression<Double> length;
-
-    @Nullable
-    private volatile PointExpression<Point> startPoint, endPoint;
-
-    @Nullable
-    private volatile BooleanExpression closed, ring;
-
-    public CurveExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The length of this Curve in its associated spatial reference.
-     *
-     * @return
-     */
-    public NumberExpression<Double> length() {
-        if (length == null) {
-            length = NumberOperation.create(Double.class, SpatialOps.LENGTH, mixin);
-        }
-        return length;
-    }
-
-    /**
-     * The start Point of this Curve.
-     *
-     * @return
-     */
-    public PointExpression<Point> startPoint() {
-        if (startPoint == null) {
-            startPoint = PointOperation.create(Point.class, SpatialOps.START_POINT, mixin);
-        }
-        return startPoint;
-    }
-
-    /**
-     * The end Point of this Curve.
-     *
-     * @return
-     */
-    public PointExpression<Point> endPoint() {
-        if (endPoint == null) {
-            endPoint = PointOperation.create(Point.class, SpatialOps.END_POINT, mixin);
-        }
-        return endPoint;
-    }
-
-    /**
-     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )].
-     *
-     * @return
-     */
-    public BooleanExpression isClosed() {
-        if (closed == null) {
-            closed = BooleanOperation.create(SpatialOps.IS_CLOSED, mixin);
-        }
-        return closed;
-    }
-
-    /**
-     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )] and this Curve is
-     * simple (does not pass through the same Point more than once).
-     *
-     * @return
-     */
-    public BooleanExpression isRing() {
-        if (ring == null) {
-            ring = BooleanOperation.create(SpatialOps.IS_RING, mixin);
-        }
-        return ring;
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryCollectionExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryCollectionExpression.java
deleted file mode 100644
index 4b88530aac..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryCollectionExpression.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A GeometryCollection is a geometric object that is a collection of some number of geometric objects.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class GeometryCollectionExpression<T extends GeometryCollection> extends GeometryExpression<T> {
-
-    private static final long serialVersionUID = 8874174644259834690L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> numGeometries;
-
-    public GeometryCollectionExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Returns the number of geometries in this GeometryCollection.
-     *
-     * @return
-     */
-    public NumberExpression<Integer> numGeometries() {
-        if (numGeometries == null) {
-            numGeometries = NumberOperation.create(Integer.class, SpatialOps.NUM_GEOMETRIES, mixin);
-        }
-        return numGeometries;
-    }
-
-    /**
-     * Returns the Nth geometry in this GeometryCollection.
-     *
-     * @param n
-     * @return
-     */
-    public GeometryExpression<Geometry> geometryN(Integer n) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.GEOMETRYN, mixin, ConstantImpl.create(n));
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryExpression.java
deleted file mode 100644
index 6183505bc3..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryExpression.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.Geometry;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.StringOperation;
-
-/**
- * Geometry is the root class of the hierarchy. Geometry is an abstract (non-instantiable) class.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class GeometryExpression<T extends Geometry> extends SimpleExpression<T> {
-
-    private static final long serialVersionUID = -1183228394472681995L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> dimension, coordinateDimension, spatialDimension, srid;
-
-    @Nullable
-    private volatile StringExpression geometryType;
-
-    @Nullable
-    private volatile StringExpression text;
-
-    @Nullable
-    private volatile GeometryExpression<Geometry> envelope, boundary, convexHull;
-
-    @Nullable
-    private volatile BooleanExpression empty, simple, threed, measured;
-
-    private volatile SimpleExpression<byte[]> binary;
-
-    public GeometryExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The inherent dimension of this geometric object, which must be less than or equal
-     * to the coordinate dimension. In non-homogeneous collections, this will return the largest topological
-     * dimension of the contained objects.
-     *
-     * @return
-     */
-    public NumberExpression<Integer> dimension() {
-        if (dimension == null) {
-            dimension = NumberOperation.create(Integer.class, SpatialOps.DIMENSION, mixin);
-        }
-        return dimension;
-    }
-
-    /**
-     * Returns the name of the instantiable subtype of Geometry of which this
-     * geometric object is an instantiable member. The name of the subtype of Geometry is returned as a string.
-     *
-     * @return
-     */
-    public StringExpression geometryType() {
-        if (geometryType == null) {
-            geometryType = StringOperation.create(SpatialOps.GEOMETRY_TYPE, mixin);
-        }
-        return geometryType;
-    }
-
-    /**
-     * Returns the Spatial Reference System ID for this geometric object. This will normally be a
-     * foreign key to an index of reference systems stored in either the same or some other datastore.
-     *
-     * @return
-     */
-    public NumberExpression<Integer> srid() {
-        if (srid == null) {
-            srid = NumberOperation.create(Integer.class, SpatialOps.SRID, mixin);
-        }
-        return srid;
-    }
-
-    /**
-     * The minimum bounding box for this Geometry, returned as a Geometry. The
-     * polygon is defined by the corner points of the bounding box [(MINX, MINY), (MAXX, MINY), (MAXX, MAXY),
-     * (MINX, MAXY), (MINX, MINY)]. Minimums for Z and M may be added. The simplest representation of an
-     * Envelope is as two direct positions, one containing all the minimums, and another all the maximums. In some
-     * cases, this coordinate will be outside the range of validity for the Spatial Reference System.
-     *
-     * @return
-     */
-    public GeometryExpression<Geometry> envelope() {
-        if (envelope == null) {
-            envelope = GeometryOperation.create(Geometry.class, SpatialOps.ENVELOPE, mixin);
-        }
-        return envelope;
-    }
-
-    /**
-     * Exports this geometric object to a specific Well-known Text Representation of Geometry.
-     *
-     * @return
-     */
-    public StringExpression asText() {
-        if (text == null) {
-            text = StringOperation.create(SpatialOps.AS_TEXT, mixin);
-        }
-        return text;
-    }
-
-    /**
-     * Exports this geometric object to a specific Well-known Binary Representation of
-     * Geometry.
-     *
-     * @return
-     */
-    public SimpleExpression<byte[]> asBinary() {
-        if (binary == null) {
-            binary = SimpleOperation.create(byte[].class, SpatialOps.AS_BINARY, mixin);
-        }
-        return binary;
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is the empty Geometry. If true, then this
-     * geometric object represents the empty point set ∅ for the coordinate space.
-     *
-     * @return
-     */
-    public BooleanExpression isEmpty() {
-        if (empty == null) {
-            empty = BooleanOperation.create(SpatialOps.IS_EMPTY, mixin);
-        }
-        return empty;
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object has no anomalous geometric points, such
-     * as self intersection or self tangency. The description of each instantiable geometric class
-     * will include the specific conditions that cause an instance of that class to be classified as not simple.
-     *
-     * @return
-     */
-    public BooleanExpression isSimple() {
-        if (simple == null) {
-            simple = BooleanOperation.create(SpatialOps.IS_SIMPLE, mixin);
-        }
-        return simple;
-    }
-
-    /**
-     * Returns the closure of the combinatorial boundary of this geometric object
-     *
-     * @return
-     */
-    public GeometryExpression<Geometry> boundary() {
-        if (boundary == null) {
-            boundary = GeometryOperation.create(Geometry.class, SpatialOps.BOUNDARY, mixin);
-        }
-        return boundary;
-    }
-
-    // query
-
-    /* (non-Javadoc)
-     * @see com.mysema.query.types.expr.SimpleExpression#eq(java.lang.Object)
-     */
-    @Override
-    public BooleanExpression eq(Geometry right) {
-        return eq(ConstantImpl.create(right));
-    }
-
-    /* (non-Javadoc)
-     * @see com.mysema.query.types.expr.SimpleExpression#eq(com.mysema.query.types.Expression)
-     */
-    @Override
-    public BooleanExpression eq(Expression<? super T> right) {
-        return BooleanOperation.create(SpatialOps.EQUALS, mixin, right);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression disjoint(Geometry geometry) {
-        return disjoint(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression disjoint(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.DISJOINT, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression intersects(Geometry geometry) {
-        return intersects(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression intersects(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.INTERSECTS, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression touches(Geometry geometry) {
-        return touches(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression touches(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.TOUCHES, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression crosses(Geometry geometry) {
-         return crosses(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression crosses(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.CROSSES, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression within(Geometry geometry) {
-        return within(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression within(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.WITHIN, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression contains(Geometry geometry) {
-        return contains(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression contains(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.CONTAINS, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression overlaps(Geometry geometry) {
-        return overlaps(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public BooleanExpression overlaps(Expression<? extends Geometry> geometry) {
-        return BooleanOperation.create(SpatialOps.OVERLAPS, mixin, geometry);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
-     * for intersections between the interior, boundary and exterior of the two geometric objects
-     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
-     * tested intersections are empty except exterior (this) intersect exterior (another).
-     *
-     * @param geometry
-     * @param matrix
-     * @return
-     */
-    public BooleanExpression relate(Geometry geometry, String matrix) {
-        return relate(ConstantImpl.create(geometry), matrix);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
-     * for intersections between the interior, boundary and exterior of the two geometric objects
-     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
-     * tested intersections are empty except exterior (this) intersect exterior (another).
-     *
-     * @param geometry
-     * @param matrix
-     * @return
-     */
-    public BooleanExpression relate(Expression<? extends Geometry> geometry, String matrix) {
-        return BooleanOperation.create(SpatialOps.RELATE, mixin, geometry, ConstantImpl.create(matrix));
-    }
-
-    // analysis
-
-    /**
-     * Returns the shortest distance between any two Points in the two geometric objects as
-     * calculated in the spatial reference system of this geometric object. Because the geometries
-     * are closed, it is possible to find a point on each geometric object involved, such that the
-     * distance between these 2 points is the returned distance between their geometric objects.
-     *
-     * @param geometry
-     * @return
-     */
-    public NumberExpression<Double> distance(Geometry geometry) {
-        return distance(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns the shortest distance between any two Points in the two geometric objects as
-     * calculated in the spatial reference system of this geometric object. Because the geometries
-     * are closed, it is possible to find a point on each geometric object involved, such that the
-     * distance between these 2 points is the returned distance between their geometric objects.
-     *
-     * @param geometry
-     * @return
-     */
-    public NumberExpression<Double> distance(Expression<? extends Geometry> geometry) {
-        return NumberOperation.create(Double.class, SpatialOps.DISTANCE, mixin, geometry);
-    }
-
-    // TODO maybe move out
-    public NumberExpression<Double> distanceSphere(Expression<? extends Geometry> geometry) {
-        return NumberOperation.create(Double.class, SpatialOps.DISTANCE_SPHERE, mixin, geometry);
-    }
-
-    // TODO maybe move out
-    public NumberExpression<Double> distanceSpheroid(Expression<? extends Geometry> geometry) {
-        return NumberOperation.create(Double.class, SpatialOps.DISTANCE_SPHEROID, mixin, geometry);
-    }
-
-    /**
-     * Returns a geometric object that represents all Points whose distance from this geometric
-     * object is less than or equal to distance. Calculations are in the spatial reference system
-     * of this geometric object. Because of the limitations of linear interpolation, there will
-     * often be some relatively small error in this distance, but it should be near the resolution
-     * of the coordinates used.
-     *
-     * @param distance
-     * @return
-     */
-    public GeometryExpression<Geometry> buffer(double distance) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.BUFFER, mixin, ConstantImpl.create(distance));
-    }
-
-    /**
-     * Returns a geometric object that represents the convex hull of this geometric object.
-     * Convex hulls, being dependent on straight lines, can be accurately represented in linear
-     * interpolations for any geometry restricted to linear interpolations.
-     *
-     * @return
-     */
-    public GeometryExpression<Geometry> convexHull() {
-        if (convexHull == null) {
-            convexHull = GeometryOperation.create(Geometry.class, SpatialOps.CONVEXHULL, mixin);
-        }
-        return convexHull;
-    }
-
-    /**
-     * Returns a geometric object that represents the Point set intersection of this geometric
-     * object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> intersection(Geometry geometry) {
-        return intersection(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns a geometric object that represents the Point set intersection of this geometric
-     * object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> intersection(Expression<? extends Geometry> geometry) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.INTERSECTION, mixin, geometry);
-    }
-
-    /**
-     * Returns a geometric object that represents the Point set
-     * union of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> union(Geometry geometry) {
-        return union(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns a geometric object that represents the Point set
-     * union of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> union(Expression<? extends Geometry> geometry) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.UNION, mixin, geometry);
-    }
-
-    /**
-     * Returns a geometric object that represents the Point
-     * set difference of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> difference(Geometry geometry) {
-        return difference(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns a geometric object that represents the Point
-     * set difference of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> difference(Expression<? extends Geometry> geometry) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.DIFFERENCE, mixin, geometry);
-    }
-
-    /**
-     * Returns a geometric object that represents the
-     * Point set symmetric difference of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> symDifference(Geometry geometry) {
-        return symDifference(ConstantImpl.create(geometry));
-    }
-
-    /**
-     * Returns a geometric object that represents the
-     * Point set symmetric difference of this geometric object with anotherGeometry.
-     *
-     * @param geometry
-     * @return
-     */
-    public GeometryExpression<Geometry> symDifference(Expression<? extends Geometry> geometry) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.SYMDIFFERENCE, mixin, geometry);
-    }
-
-    public GeometryExpression<Geometry> transform(int srid) {
-        return GeometryOperation.create(Geometry.class, SpatialOps.TRANSFORM, mixin, ConstantImpl.create(srid));
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryOperation.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryOperation.java
deleted file mode 100644
index ccb2d3a767..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/GeometryOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import java.util.List;
-
-import org.geolatte.geom.Geometry;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class GeometryOperation<T extends Geometry> extends GeometryExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 3433471874808633698L;
-
-    public static <D extends Geometry> GeometryOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new GeometryOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <D extends Geometry> GeometryOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new GeometryOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-
-    public static <D extends Geometry> GeometryOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new GeometryOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl< T> opMixin;
-
-    protected GeometryOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected GeometryOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringExpression.java
deleted file mode 100644
index 31f91ad9ae..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringExpression.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.Point;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A LineString is a Curve with linear interpolation between Points. Each consecutive pair of Points defines a Line
- * segment.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class LineStringExpression<T extends LineString> extends CurveExpression<T> {
-
-    private static final long serialVersionUID = -6572984614863252657L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> numPoints;
-
-    public LineStringExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The number of Points in this LineString.
-     *
-     * @return
-     */
-    public NumberExpression<Integer> numPoints() {
-        if (numPoints == null) {
-            numPoints = NumberOperation.create(Integer.class, SpatialOps.NUM_POINTS, mixin);
-        }
-        return numPoints;
-    }
-
-    /**
-     * Returns the specified Point N in this LineString.
-     *
-     * @param idx
-     * @return
-     */
-    public PointExpression<Point> pointN(int idx) {
-        return PointOperation.create(Point.class, SpatialOps.POINTN, mixin, ConstantImpl.create(idx));
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringOperation.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringOperation.java
deleted file mode 100644
index fb8f15f3a2..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineStringOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import java.util.List;
-
-import org.geolatte.geom.LineString;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class LineStringOperation<T extends LineString> extends LineStringExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 3433471874808633698L;
-
-    public static <D extends LineString> LineStringOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new LineStringOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <D extends LineString> LineStringOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new LineStringOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-
-    public static <D extends LineString> LineStringOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new LineStringOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl< T> opMixin;
-
-    protected LineStringOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected LineStringOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiCurveExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiCurveExpression.java
deleted file mode 100644
index 17be357493..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiCurveExpression.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.GeometryCollection;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A MultiCurve is a 1-dimensional GeometryCollection whose elements are Curves.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class MultiCurveExpression<T extends GeometryCollection> extends GeometryCollectionExpression<T> {
-
-    private static final long serialVersionUID = 6983316799469849656L;
-
-    @Nullable
-    private volatile BooleanExpression closed;
-
-    @Nullable
-    private volatile NumberExpression<Double> length;
-
-    public MultiCurveExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Returns 1 (TRUE) if this MultiCurve is closed [StartPoint ( ) = EndPoint ( ) for each
-     * Curve in this MultiCurve].
-     *
-     * @return
-     */
-    public BooleanExpression isClosed() {
-        if (closed == null) {
-            closed = BooleanOperation.create(SpatialOps.IS_CLOSED, mixin);
-        }
-        return closed;
-    }
-
-    /**
-     * The Length of this MultiCurve which is equal to the sum of the lengths of the element
-     * Curves.
-     *
-     * @return
-     */
-    public NumberExpression<Double> length() {
-        if (length == null) {
-            length = NumberOperation.create(Double.class, SpatialOps.LENGTH, mixin);
-        }
-        return length;
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiSurfaceExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiSurfaceExpression.java
deleted file mode 100644
index e81fafee6a..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiSurfaceExpression.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.Point;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A MultiSurface is a 2-dimensional GeometryCollection whose elements are Surfaces, all using coordinates from
- * the same coordinate reference system. The geometric interiors of any two Surfaces in a MultiSurface may not
- * intersect in the full coordinate system. The boundaries of any two coplanar elements in a MultiSurface may
- * intersect, at most, at a finite number of Points. If they were to meet along a curve, they could be merged into a
- * single surface.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class MultiSurfaceExpression<T extends GeometryCollection> extends GeometryCollectionExpression<T> {
-
-    private static final long serialVersionUID = 4133386816772862010L;
-
-    @Nullable
-    private volatile PointExpression<Point> centroid, pointOnSurface;
-
-    @Nullable
-    private volatile NumberExpression<Double> area;
-
-    public MultiSurfaceExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The area of this MultiSurface, as measured in the spatial reference system of this MultiSurface.
-     *
-     * @return
-     */
-    public NumberExpression<Double> area() {
-        if (area == null) {
-            area = NumberOperation.create(Double.class, SpatialOps.AREA, mixin);
-        }
-        return area;
-    }
-
-    /**
-     * The mathematical centroid for this MultiSurface. The result is not guaranteed to be on
-     * this MultiSurface.
-     *
-     * @return
-     */
-    public PointExpression<Point> centroid() {
-        if (centroid == null) {
-            centroid = PointOperation.create(Point.class, SpatialOps.CENTROID, mixin);
-        }
-        return centroid;
-    }
-
-    /**
-     * A Point guaranteed to be on this MultiSurface.
-     *
-     * @return
-     */
-    public PointExpression<Point> pointOnSurface() {
-        if (pointOnSurface == null) {
-            pointOnSurface = PointOperation.create(Point.class, SpatialOps.POINT_ON_SURFACE, mixin);
-        }
-        return pointOnSurface;
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointExpression.java
deleted file mode 100644
index fa6af4ccf7..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointExpression.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.Point;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an
- * x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also
- * have coordinate values for z and m.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class PointExpression<T extends Point> extends GeometryExpression<T> {
-
-    private static final long serialVersionUID = -3549448861390349654L;
-
-    @Nullable
-    private volatile NumberExpression<Double> x, y, z, m;
-
-    public PointExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The x-coordinate value for this Point.
-     *
-     * @return
-     */
-    public NumberExpression<Double> x() {
-        if (x == null) {
-            x = NumberOperation.create(Double.class, SpatialOps.X, mixin);
-        }
-        return x;
-    }
-
-    /**
-     * The y-coordinate value for this Point.
-     *
-     * @return
-     */
-    public NumberExpression<Double> y() {
-        if (y == null) {
-            y = NumberOperation.create(Double.class, SpatialOps.Y, mixin);
-        }
-        return y;
-    }
-
-    /**
-     * The z-coordinate value for this Point, if it has one. Returns NIL otherwise.
-     *
-     * @return
-     */
-    public NumberExpression<Double> z() {
-        if (z == null) {
-            z = NumberOperation.create(Double.class, SpatialOps.Z, mixin);
-        }
-        return z;
-    }
-
-    /**
-     * The m-coordinate value for this Point, if it has one. Returns NIL otherwise.
-     *
-     * @return
-     */
-    public NumberExpression<Double> m() {
-        if (m == null) {
-            m = NumberOperation.create(Double.class, SpatialOps.M, mixin);
-        }
-        return m;
-    }
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointOperation.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointOperation.java
deleted file mode 100644
index ce7f44674d..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PointOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import java.util.List;
-
-import org.geolatte.geom.Point;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class PointOperation<T extends Point> extends PointExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 3433471874808633698L;
-
-    public static <D extends Point> PointOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new PointOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <D extends Point> PointOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new PointOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-
-    public static <D extends Point> PointOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new PointOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl< T> opMixin;
-
-    protected PointOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected PointOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonExpression.java
deleted file mode 100644
index 27544c5d35..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonExpression.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.Polygon;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A Polygon is a planar Surface defined by 1 exterior boundary and 0 or more interior boundaries. Each interior
- * boundary defines a hole in the Polygon. A Triangle is a polygon with 3 distinct, non-collinear vertices and no
- * interior boundary.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class PolygonExpression<T extends Polygon> extends SurfaceExpression<T> {
-
-    private static final long serialVersionUID = 7544382956232485312L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> numInteriorRing;
-
-    @Nullable
-    private volatile LineStringExpression<LineString> exterorRing;
-
-    public PolygonExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Returns the exterior ring of this Polygon.
-     *
-     * @return
-     */
-    public LineStringExpression<?> exteriorRing() {
-        if (exterorRing == null) {
-            exterorRing = LineStringOperation.create(LineString.class, SpatialOps.EXTERIOR_RING, mixin);
-        }
-        return exterorRing;
-    }
-
-    /**
-     * Returns the number of interior rings in this Polygon.
-     *
-     * @return
-     */
-    public NumberExpression<Integer> numInteriorRing() {
-        if (numInteriorRing == null) {
-            numInteriorRing = NumberOperation.create(Integer.class, SpatialOps.NUM_INTERIOR_RING, mixin);
-        }
-        return numInteriorRing;
-    }
-
-    /**
-     * Returns the N th interior ring for this Polygon as a LineString.
-     *
-     * @param idx
-     * @return
-     */
-    public LineStringExpression<LineString> interiorRingN(int idx) {
-        return LineStringOperation.create(LineString.class, SpatialOps.INTERIOR_RINGN, mixin, ConstantImpl.create(idx));
-    }
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonOperation.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonOperation.java
deleted file mode 100644
index 1aecde7182..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolygonOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import java.util.List;
-
-import org.geolatte.geom.Polygon;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class PolygonOperation<T extends Polygon> extends PolygonExpression<T> implements Operation<T> {
-
-    private static final long serialVersionUID = 3433471874808633698L;
-
-    public static <D extends Polygon> PolygonOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one) {
-        return new PolygonOperation<D>(type, op, ImmutableList.<Expression<?>>of(one));
-    }
-
-    public static <D extends Polygon> PolygonOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?> one, Expression<?> two) {
-        return new PolygonOperation<D>(type, op, ImmutableList.of(one, two));
-    }
-
-    public static <D extends Polygon> PolygonOperation<D> create(Class<D> type, Operator<? super D> op, Expression<?>... args) {
-        return new PolygonOperation<D>(type, op, args);
-    }
-
-    private final OperationImpl< T> opMixin;
-
-    protected PolygonOperation(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        this(type, op, ImmutableList.copyOf(args));
-    }
-
-    protected PolygonOperation(Class<T> type, Operator<? super T> op, ImmutableList<Expression<?>> args) {
-        super(new OperationImpl<T>(type, op, args));
-        this.opMixin = (OperationImpl<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(opMixin, context);
-    }
-
-    @Override
-    public Expression<?> getArg(int index) {
-        return opMixin.getArg(index);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return opMixin.getArgs();
-    }
-
-    @Override
-    public Operator<? super T> getOperator() {
-        return opMixin.getOperator();
-    }
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolyhedralSurfaceExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolyhedralSurfaceExpression.java
deleted file mode 100644
index f1cbd076b1..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/PolyhedralSurfaceExpression.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A PolyhedralSurface is a contiguous collection of polygons, which share common boundary segments.
- * For each pair of polygons that “touch”, the common boundary shall be expressible as a finite
- * collection of LineStrings. Each such LineString shall be part of the boundary of at most 2 Polygon
- * patches.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class PolyhedralSurfaceExpression<T extends PolyHedralSurface> extends SurfaceExpression<T> {
-
-    private static final long serialVersionUID = -6732418858467327780L;
-
-    @Nullable
-    private volatile NumberExpression<Integer> numPatches;
-
-    @Nullable
-    private volatile BooleanExpression closed;
-
-    public PolyhedralSurfaceExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * Returns the number of including polygons
-     *
-     * @return
-     */
-    public NumberExpression<Integer> numPatches() {
-        if (numPatches == null) {
-            numPatches = NumberOperation.create(Integer.class, SpatialOps.NUM_SURFACES, mixin);
-        }
-        return numPatches;
-    }
-
-    /**
-     * Returns a polygon in this surface, the order is arbitrary.
-     *
-     * @param n
-     * @return
-     */
-    public PolygonExpression<?> patchN(int n) {
-        return PolygonOperation.create(Polygon.class, SpatialOps.SURFACE, mixin, ConstantImpl.create(n));
-    }
-
-    /**
-     * Returns 1 (True) if the polygon closes on itself, and thus has no boundary and
-     * encloses a solid
-     *
-     * @return
-     */
-    public BooleanExpression isClosed() {
-        if (closed == null) {
-            closed = BooleanOperation.create(SpatialOps.IS_CLOSED, mixin);
-        }
-        return closed;
-    }
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/SpatialOps.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/SpatialOps.java
deleted file mode 100644
index a2ab2afeaf..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/SpatialOps.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class SpatialOps {
-
-        private static final String NS = SpatialOps.class.getName();
-
-        // Geometry
-        public static final Operator<Object> DIMENSION = new OperatorImpl<Object>(NS, "DIMENSION");
-        public static final Operator<Object> GEOMETRY_TYPE = new OperatorImpl<Object>(NS, "GEOMETRY_TYPE");
-        public static final Operator<Object> AS_TEXT = new OperatorImpl<Object>(NS, "AS_TEXT");
-        public static final Operator<Object> AS_BINARY = new OperatorImpl<Object>(NS, "AS_BINARY");
-        public static final Operator<Object> SRID = new OperatorImpl<Object>(NS, "SRID");
-        public static final Operator<Object> SRID2 = new OperatorImpl<Object>(NS, "SRID2");
-        public static final Operator<Object> IS_EMPTY = new OperatorImpl<Object>(NS, "IS_EMPTY");
-        public static final Operator<Object> IS_SIMPLE = new OperatorImpl<Object>(NS, "IS_SIMPLE");
-        public static final Operator<Object> BOUNDARY = new OperatorImpl<Object>(NS, "BOUNDARY");
-        public static final Operator<Object> ENVELOPE = new OperatorImpl<Object>(NS, "ENVELOPE");
-        public static final Operator<Object> WKTTOSQL = new OperatorImpl<Object>(NS, "WKTTOSQL");
-        public static final Operator<Object> WKBTOSQL = new OperatorImpl<Object>(NS, "WKBTOSQL");
-        public static final Operator<Object> EQUALS = new OperatorImpl<Object>(NS, "EQUALS");
-        public static final Operator<Object> DISJOINT = new OperatorImpl<Object>(NS, "DISJOINT");
-        public static final Operator<Object> INTERSECTS = new OperatorImpl<Object>(NS, "INTERSECTS");
-        public static final Operator<Object> TOUCHES = new OperatorImpl<Object>(NS, "TOUCHES");
-        public static final Operator<Object> CROSSES = new OperatorImpl<Object>(NS, "CROSSES");
-        public static final Operator<Object> WITHIN = new OperatorImpl<Object>(NS, "WITHIN");
-        public static final Operator<Object> CONTAINS = new OperatorImpl<Object>(NS, "CONTAINS");
-        public static final Operator<Object> OVERLAPS = new OperatorImpl<Object>(NS, "OVERLAPS");
-        public static final Operator<Object> RELATE = new OperatorImpl<Object>(NS, "RELATE");
-        public static final Operator<Object> DISTANCE = new OperatorImpl<Object>(NS, "DISTANCE");
-        public static final Operator<Object> DISTANCE2 = new OperatorImpl<Object>(NS, "DISTANCE2");
-        public static final Operator<Object> DISTANCE_SPHERE = new OperatorImpl<Object>(NS, "DISTANCE_SPHERE");
-        public static final Operator<Object> DISTANCE_SPHEROID = new OperatorImpl<Object>(NS, "DISTANCE_SPHEROID");
-        public static final Operator<Object> INTERSECTION = new OperatorImpl<Object>(NS, "INTERSECTION");
-        public static final Operator<Object> DIFFERENCE = new OperatorImpl<Object>(NS, "DIFFERENCE");
-        public static final Operator<Object> UNION = new OperatorImpl<Object>(NS, "UNION");
-        public static final Operator<Object> SYMDIFFERENCE = new OperatorImpl<Object>(NS, "SYMDIFFERENCE");
-        public static final Operator<Object> BUFFER = new OperatorImpl<Object>(NS, "BUFFER");
-        public static final Operator<Object> BUFFER2 = new OperatorImpl<Object>(NS, "BUFFER2");
-        public static final Operator<Object> CONVEXHULL = new OperatorImpl<Object>(NS, "CONVEXHULL");
-        public static final Operator<Object> TRANSFORM = new OperatorImpl<Object>(NS, "TRANSFORM");
-
-        // Point
-        public static final Operator<Object> X = new OperatorImpl<Object>(NS, "X");
-        public static final Operator<Object> X2 = new OperatorImpl<Object>(NS, "X2");
-        public static final Operator<Object> Y = new OperatorImpl<Object>(NS, "Y");
-        public static final Operator<Object> Y2 = new OperatorImpl<Object>(NS, "Y2");
-        public static final Operator<Object> Z = new OperatorImpl<Object>(NS, "Z");
-        public static final Operator<Object> Z2 = new OperatorImpl<Object>(NS, "Z2");
-        public static final Operator<Object> M = new OperatorImpl<Object>(NS, "M");
-        public static final Operator<Object> M2 = new OperatorImpl<Object>(NS, "M2");
-
-        // Curve
-        public static final Operator<Object> START_POINT = new OperatorImpl<Object>(NS, "START_POINT");
-        public static final Operator<Object> END_POINT = new OperatorImpl<Object>(NS, "END_POINT");
-        public static final Operator<Object> IS_RING = new OperatorImpl<Object>(NS, "IS_RING");
-        public static final Operator<Object> LENGTH = new OperatorImpl<Object>(NS, "LENGTH");
-        public static final Operator<Object> LENGTH2 = new OperatorImpl<Object>(NS, "LENGTH2");
-
-        //LineString
-        public static final Operator<Object> NUM_POINTS = new OperatorImpl<Object>(NS, "NUM_POINTS");
-        public static final Operator<Object> POINTN = new OperatorImpl<Object>(NS, "POINTN");
-
-        // Surface
-        public static final Operator<Object> AREA = new OperatorImpl<Object>(NS, "AREA");
-        public static final Operator<Object> AREA2 = new OperatorImpl<Object>(NS, "AREA2");
-        public static final Operator<Object> CENTROID = new OperatorImpl<Object>(NS, "CENTROID");
-        public static final Operator<Object> POINT_ON_SURFACE = new OperatorImpl<Object>(NS, "POINT_ON_SURFACE");
-
-        // Polygon
-        public static final Operator<Object> EXTERIOR_RING = new OperatorImpl<Object>(NS, "EXTERIOR_RING");
-        public static final Operator<Object> EXTERIOR_RING2 = new OperatorImpl<Object>(NS, "EXTERIOR_RING2");
-        public static final Operator<Object> INTERIOR_RINGS = new OperatorImpl<Object>(NS, "INTERIOR_RINGS");
-        public static final Operator<Object> INTERIOR_RINGS2 = new OperatorImpl<Object>(NS, "INTERIOR_RINGS2");
-        public static final Operator<Object> NUM_INTERIOR_RING = new OperatorImpl<Object>(NS, "NUM_INTERIOR_RING");
-        public static final Operator<Object> INTERIOR_RINGN = new OperatorImpl<Object>(NS, "INTERIOR_RINGN");
-
-        // Polyhedral Surface
-        public static final Operator<Object> GEOMETRIES = new OperatorImpl<Object>(NS, "GEOMETRIES");
-        public static final Operator<Object> NUM_SURFACES = new OperatorImpl<Object>(NS, "NUM_SURFACES");
-        public static final Operator<Object> SURFACE = new OperatorImpl<Object>(NS, "SURFACE");
-
-        // GeometryCollection
-        public static final Operator<Object> NUM_GEOMETRIES = new OperatorImpl<Object>(NS, "NUM_GEOMETRIES");
-        public static final Operator<Object> GEOMETRYN = new OperatorImpl<Object>(NS, "GEOMETRYN");
-
-        // MultiCurve
-        public static final Operator<Object> IS_CLOSED = new OperatorImpl<Object>(NS, "IS_CLOSED");
-
-    }
\ No newline at end of file
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/SurfaceExpression.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/SurfaceExpression.java
deleted file mode 100644
index e197d28ec3..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/SurfaceExpression.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import javax.annotation.Nullable;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.Point;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-
-/**
- * A Surface is a 2-dimensional geometric object.
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class SurfaceExpression<T extends Geometry> extends GeometryExpression<T> {
-
-    private static final long serialVersionUID = 3534197011234723698L;
-
-    @Nullable
-    private volatile PointExpression<Point> centroid, pointOnSurface;
-
-    @Nullable
-    private volatile NumberExpression<Double> area;
-
-    public SurfaceExpression(Expression<T> mixin) {
-        super(mixin);
-    }
-
-    /**
-     * The area of this Surface, as measured in the spatial reference system of this Surface.
-     *
-     * @return
-     */
-    public NumberExpression<Double> area() {
-        if (area == null) {
-            area = NumberOperation.create(Double.class, SpatialOps.AREA, mixin);
-        }
-        return area;
-    }
-
-    /**
-     * The mathematical centroid for this Surface as a Point. The result is not guaranteed to
-     * be on this Surface.
-     *
-     * @return
-     */
-    public PointExpression<Point> centroid() {
-        if (centroid == null) {
-            centroid = PointOperation.create(Point.class, SpatialOps.CENTROID, mixin);
-        }
-        return centroid;
-    }
-
-    /**
-     * A Point guaranteed to be on this Surface.
-     *
-     * @return
-     */
-    public PointExpression<Point> pointOnSurface() {
-        if (pointOnSurface == null) {
-            pointOnSurface = PointOperation.create(Point.class, SpatialOps.POINT_ON_SURFACE, mixin);
-        }
-        return pointOnSurface;
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPath.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPath.java
deleted file mode 100644
index 64041ee57f..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPath.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-
-import com.mysema.query.spatial.GeometryExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class GeometryPath<T extends Geometry> extends GeometryExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 312776751843333543L;
-
-    private final PathImpl<T> pathMixin;
-
-    private volatile GeometryCollectionPath<GeometryCollection> collection;
-
-    private volatile LinearRingPath<LinearRing> linearRing;
-
-    private volatile LineStringPath<LineString> lineString;
-
-    private volatile MultiLineStringPath<MultiLineString> multiLineString;
-
-    private volatile MultiPointPath<MultiPoint> multiPoint;
-
-    private volatile MultiPolygonPath<MultiPolygon> multiPolygon;
-
-    private volatile PointPath<Point> point;
-
-    private volatile PolygonPath<Polygon> polygon;
-
-    private volatile PolyhedralSurfacePath<PolyHedralSurface> polyhedralSurface;
-
-    public GeometryPath(Path<?> parent, String property) {
-        this((Class<? extends T>) Geometry.class, parent, property);
-    }
-
-    public GeometryPath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public GeometryPath(PathMetadata<?> metadata) {
-        this((Class<? extends T>) Geometry.class, metadata);
-    }
-
-    public GeometryPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public GeometryPath(String var) {
-        this((Class<? extends T>) Geometry.class, PathMetadataFactory.forVariable(var));
-    }
-
-    public GeometryCollectionPath<GeometryCollection> asCollection() {
-        if (collection == null) {
-            collection = new GeometryCollectionPath<GeometryCollection>(pathMixin.getMetadata());
-        }
-        return collection;
-    }
-
-    public LinearRingPath<LinearRing> asLinearRing() {
-        if (linearRing == null) {
-            linearRing = new LinearRingPath<LinearRing>(pathMixin.getMetadata());
-        }
-        return linearRing;
-    }
-
-    public LineStringPath<LineString> asLineString() {
-        if (lineString == null) {
-            lineString = new LineStringPath<LineString>(pathMixin.getMetadata());
-        }
-        return lineString;
-    }
-
-    public MultiLineStringPath<MultiLineString> asMultiLineString() {
-        if (multiLineString == null) {
-            multiLineString = new MultiLineStringPath<MultiLineString>(pathMixin.getMetadata());
-        }
-        return multiLineString;
-    }
-
-    public MultiPointPath<MultiPoint> asMultiPoint() {
-        if (multiPoint == null) {
-            multiPoint = new MultiPointPath<MultiPoint>(pathMixin.getMetadata());
-        }
-        return multiPoint;
-    }
-
-    public MultiPolygonPath<MultiPolygon> asMultiPolygon() {
-        if (multiPolygon == null) {
-            multiPolygon = new MultiPolygonPath<MultiPolygon>(pathMixin.getMetadata());
-        }
-        return multiPolygon;
-    }
-
-    public PointPath<Point> asPoint() {
-        if (point == null) {
-            point = new PointPath<Point>(pathMixin.getMetadata());
-        }
-        return point;
-    }
-
-    public PolygonPath<Polygon> asPolygon() {
-        if (polygon == null) {
-            polygon = new PolygonPath<Polygon>(pathMixin.getMetadata());
-        }
-        return polygon;
-    }
-
-    public PolyhedralSurfacePath<PolyHedralSurface> asPolygHedralSurface() {
-        if (polyhedralSurface == null) {
-            polyhedralSurface = new PolyhedralSurfacePath<PolyHedralSurface>(pathMixin.getMetadata());
-        }
-        return polyhedralSurface;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    public GeometryPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPaths.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPaths.java
deleted file mode 100644
index d9532a7d12..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryPaths.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial.path;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-
-/**
- * @author tiwe
- *
- */
-public interface GeometryPaths {
-
-    <A extends GeometryCollection> GeometryCollectionPath<A> createGeometryCollection(String property, Class<? extends A> type);
-
-    <A extends Geometry> GeometryPath<A> createGeometry(String property, Class<? extends A> type);
-
-    <A extends LinearRing> LinearRingPath<A> createLinearRing(String property, Class<? extends A> type);
-
-    <A extends LineString> LineStringPath<A> createLineString(String property, Class<? extends A> type);
-
-    <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(String property, Class<? extends A> type);
-
-    <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property, Class<? extends A> type);
-
-    <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property, Class<? extends A> type);
-
-    <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type);
-
-    <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type);
-
-    <A extends PolyHedralSurface> PolyhedralSurfacePath<A> createPolyhedralSurface(String property, Class<? extends A> type);
-
-}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolyhedralSurfacePath.java b/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolyhedralSurfacePath.java
deleted file mode 100644
index 77ce84bfb9..0000000000
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolyhedralSurfacePath.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial.path;
-
-import java.lang.reflect.AnnotatedElement;
-
-import org.geolatte.geom.PolyHedralSurface;
-
-import com.mysema.query.spatial.PolyhedralSurfaceExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class PolyhedralSurfacePath<T extends PolyHedralSurface> extends PolyhedralSurfaceExpression<T> implements Path<T> {
-
-    private static final long serialVersionUID = 312776751843333543L;
-
-    private final PathImpl<T> pathMixin;
-
-    public PolyhedralSurfacePath(Path<?> parent, String property) {
-        this((Class<? extends T>) PolyHedralSurface.class, parent, property);
-    }
-
-    public PolyhedralSurfacePath(Class<? extends T> type, Path<?> parent, String property) {
-        this(type, PathMetadataFactory.forProperty(parent, property));
-    }
-
-    public PolyhedralSurfacePath(PathMetadata<?> metadata) {
-        this((Class<? extends T>) PolyHedralSurface.class, metadata);
-    }
-
-    public PolyhedralSurfacePath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
-    }
-
-    public PolyhedralSurfacePath(String var) {
-        this((Class<? extends T>) PolyHedralSurface.class, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(pathMixin, context);
-    }
-
-    public PolyhedralSurfacePath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
-    @Override
-    public PathMetadata<?> getMetadata() {
-        return pathMixin.getMetadata();
-    }
-
-    @Override
-    public Path<?> getRoot() {
-        return pathMixin.getRoot();
-    }
-
-    @Override
-    public AnnotatedElement getAnnotatedElement() {
-        return pathMixin.getAnnotatedElement();
-    }
-
-}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/AbstractGeometryCollectionExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/AbstractGeometryCollectionExpression.java
new file mode 100644
index 0000000000..0c63739b04
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/AbstractGeometryCollectionExpression.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import org.geolatte.geom.AbstractGeometryCollection;
+import org.geolatte.geom.Geometry;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A GeometryCollection is a geometric object that is a collection of some number of geometric objects.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class AbstractGeometryCollectionExpression<T extends AbstractGeometryCollection> extends GeometryExpression<T> {
+
+    private static final long serialVersionUID = 8874174644259834690L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numGeometries;
+
+    public AbstractGeometryCollectionExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the number of geometries in this GeometryCollection.
+     *
+     * @return number of geometries
+     */
+    public NumberExpression<Integer> numGeometries() {
+        if (numGeometries == null) {
+            numGeometries = Expressions.numberOperation(Integer.class, SpatialOps.NUM_GEOMETRIES, mixin);
+        }
+        return numGeometries;
+    }
+
+    /**
+     * Returns the Nth geometry in this GeometryCollection.
+     *
+     * @param n one based index
+     * @return matching geometry
+     */
+    public GeometryExpression<Geometry> geometryN(Integer n) {
+        return GeometryExpressions.geometryOperation(SpatialOps.GEOMETRYN, mixin, ConstantImpl.create(n));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/CurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/CurveExpression.java
new file mode 100644
index 0000000000..2c4b64787b
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/CurveExpression.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.Point;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
+ * specifying the form of the interpolation between Points. This standard defines only one subclass of Curve,
+ * LineString, which uses linear interpolation between Points.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class CurveExpression<T extends Geometry> extends GeometryExpression<T> {
+
+    private static final long serialVersionUID = 6139188586728676033L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    @Nullable
+    private transient volatile PointExpression<Point> startPoint, endPoint;
+
+    @Nullable
+    private transient volatile BooleanExpression closed, ring;
+
+    public CurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The length of this Curve in its associated spatial reference.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+    /**
+     * The start Point of this Curve.
+     *
+     * @return start point
+     */
+    public PointExpression<Point> startPoint() {
+        if (startPoint == null) {
+            startPoint = GeometryExpressions.pointOperation(SpatialOps.START_POINT, mixin);
+        }
+        return startPoint;
+    }
+
+    /**
+     * The end Point of this Curve.
+     *
+     * @return end point
+     */
+    public PointExpression<Point> endPoint() {
+        if (endPoint == null) {
+            endPoint = GeometryExpressions.pointOperation(SpatialOps.END_POINT, mixin);
+        }
+        return endPoint;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )] and this Curve is
+     * simple (does not pass through the same Point more than once).
+     *
+     * @return ring
+     */
+    public BooleanExpression isRing() {
+        if (ring == null) {
+            ring = Expressions.booleanOperation(SpatialOps.IS_RING, mixin);
+        }
+        return ring;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionExpression.java
new file mode 100644
index 0000000000..4aa2e7a292
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionExpression.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.NumberExpression;
+import org.geolatte.geom.GeometryCollection;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A GeometryCollection is a geometric object that is a collection of some number of geometric objects.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class GeometryCollectionExpression<T extends GeometryCollection> extends AbstractGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 8874174644259834690L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numGeometries;
+
+    public GeometryCollectionExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryCollectionPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionPath.java
similarity index 78%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryCollectionPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionPath.java
index 1ff07ae563..a4134c03fc 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/GeometryCollectionPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryCollectionPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.GeometryCollection;
 
-import com.mysema.query.spatial.GeometryCollectionExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code GeometryCollectionPath} extends {@link GeometryCollectionExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class GeometryCollectionPath<T extends GeometryCollection> extends Geomet
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public GeometryCollectionPath(Path<?> parent, String property) {
         this((Class<? extends T>) GeometryCollection.class, parent, property);
     }
@@ -43,15 +42,17 @@ public GeometryCollectionPath(Class<? extends T> type, Path<?> parent, String pr
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public GeometryCollectionPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public GeometryCollectionPath(PathMetadata metadata) {
         this((Class<? extends T>) GeometryCollection.class, metadata);
     }
 
-    public GeometryCollectionPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public GeometryCollectionPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public GeometryCollectionPath(String var) {
         this((Class<? extends T>) GeometryCollection.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public GeometryCollectionPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java
new file mode 100644
index 0000000000..9bc4f71b1a
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpression.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * Geometry is the root class of the hierarchy. Geometry is an abstract (non-instantiable) class.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class GeometryExpression<T extends Geometry> extends SimpleExpression<T> {
+
+    private static final long serialVersionUID = -1183228394472681995L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> dimension, coordinateDimension, spatialDimension, srid;
+
+    @Nullable
+    private transient volatile StringExpression geometryType;
+
+    @Nullable
+    private transient volatile StringExpression text;
+
+    @Nullable
+    private transient volatile GeometryExpression<Geometry> envelope, boundary, convexHull;
+
+    @Nullable
+    private transient volatile BooleanExpression empty, simple, threed, measured;
+
+    private transient volatile SimpleExpression<byte[]> binary;
+
+    public GeometryExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The inherent dimension of this geometric object, which must be less than or equal
+     * to the coordinate dimension. In non-homogeneous collections, this will return the largest topological
+     * dimension of the contained objects.
+     *
+     * @return dimension
+     */
+    public NumberExpression<Integer> dimension() {
+        if (dimension == null) {
+            dimension = Expressions.numberOperation(Integer.class, SpatialOps.DIMENSION, mixin);
+        }
+        return dimension;
+    }
+
+    /**
+     * Returns the name of the instantiable subtype of Geometry of which this
+     * geometric object is an instantiable member. The name of the subtype of Geometry is returned as a string.
+     *
+     * @return geometry type
+     */
+    public StringExpression geometryType() {
+        if (geometryType == null) {
+            geometryType = Expressions.stringOperation(SpatialOps.GEOMETRY_TYPE, mixin);
+        }
+        return geometryType;
+    }
+
+    /**
+     * Returns the Spatial Reference System ID for this geometric object. This will normally be a
+     * foreign key to an index of reference systems stored in either the same or some other datastore.
+     *
+     * @return SRID
+     */
+    public NumberExpression<Integer> srid() {
+        if (srid == null) {
+            srid = Expressions.numberOperation(Integer.class, SpatialOps.SRID, mixin);
+        }
+        return srid;
+    }
+
+    /**
+     * The minimum bounding box for this Geometry, returned as a Geometry. The
+     * polygon is defined by the corner points of the bounding box [(MINX, MINY), (MAXX, MINY), (MAXX, MAXY),
+     * (MINX, MAXY), (MINX, MINY)]. Minimums for Z and M may be added. The simplest representation of an
+     * Envelope is as two direct positions, one containing all the minimums, and another all the maximums. In some
+     * cases, this coordinate will be outside the range of validity for the Spatial Reference System.
+     *
+     * @return envelope
+     */
+    public GeometryExpression<Geometry> envelope() {
+        if (envelope == null) {
+            envelope = GeometryExpressions.geometryOperation(SpatialOps.ENVELOPE, mixin);
+        }
+        return envelope;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Text Representation of Geometry.
+     *
+     * @return text representation
+     */
+    public StringExpression asText() {
+        if (text == null) {
+            text = Expressions.stringOperation(SpatialOps.AS_TEXT, mixin);
+        }
+        return text;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Binary Representation of
+     * Geometry.
+     *
+     * @return binary representation
+     */
+    public SimpleExpression<byte[]> asBinary() {
+        if (binary == null) {
+            binary = Expressions.operation(byte[].class, SpatialOps.AS_BINARY, mixin);
+        }
+        return binary;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is the empty Geometry. If true, then this
+     * geometric object represents the empty point set ∅ for the coordinate space.
+     *
+     * @return empty
+     */
+    public BooleanExpression isEmpty() {
+        if (empty == null) {
+            empty = Expressions.booleanOperation(SpatialOps.IS_EMPTY, mixin);
+        }
+        return empty;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object has no anomalous geometric points, such
+     * as self intersection or self tangency. The description of each instantiable geometric class
+     * will include the specific conditions that cause an instance of that class to be classified as not simple.
+     *
+     * @return simple
+     */
+    public BooleanExpression isSimple() {
+        if (simple == null) {
+            simple = Expressions.booleanOperation(SpatialOps.IS_SIMPLE, mixin);
+        }
+        return simple;
+    }
+
+    /**
+     * Returns the closure of the combinatorial boundary of this geometric object
+     *
+     * @return boundary
+     */
+    public GeometryExpression<Geometry> boundary() {
+        if (boundary == null) {
+            boundary = GeometryExpressions.geometryOperation(SpatialOps.BOUNDARY, mixin);
+        }
+        return boundary;
+    }
+
+    // query
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(java.lang.Object)
+     */
+    @Override
+    public BooleanExpression eq(Geometry right) {
+        return eq(ConstantImpl.create(right));
+    }
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(com.querydsl.core.types.Expression)
+     */
+    @Override
+    public BooleanExpression eq(Expression<? super T> right) {
+        return Expressions.booleanOperation(SpatialOps.EQUALS, mixin, right);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Geometry geometry) {
+        return disjoint(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.DISJOINT, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Geometry geometry) {
+        return intersects(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.INTERSECTS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Geometry geometry) {
+        return touches(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.TOUCHES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return trye, if crosses
+     */
+    public BooleanExpression crosses(Geometry geometry) {
+         return crosses(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if crosses
+     */
+    public BooleanExpression crosses(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CROSSES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Geometry geometry) {
+        return within(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.WITHIN, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Geometry geometry) {
+        return contains(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CONTAINS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Geometry geometry) {
+        return overlaps(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.OVERLAPS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Geometry geometry, String matrix) {
+        return relate(ConstantImpl.create(geometry), matrix);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Expression<? extends Geometry> geometry, String matrix) {
+        return Expressions.booleanOperation(SpatialOps.RELATE, mixin, geometry, ConstantImpl.create(matrix));
+    }
+
+    // analysis
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance between this and the other geometry
+     */
+    public NumberExpression<Double> distance(Geometry geometry) {
+        return distance(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance between this and the other geometry
+     */
+    public NumberExpression<Double> distance(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSphere(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHERE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSpheroid(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHEROID, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents all Points whose distance from this geometric
+     * object is less than or equal to distance. Calculations are in the spatial reference system
+     * of this geometric object. Because of the limitations of linear interpolation, there will
+     * often be some relatively small error in this distance, but it should be near the resolution
+     * of the coordinates used.
+     *
+     * @param distance distance
+     * @return buffer
+     */
+    public GeometryExpression<Geometry> buffer(double distance) {
+        return GeometryExpressions.geometryOperation(SpatialOps.BUFFER, mixin, ConstantImpl.create(distance));
+    }
+
+    /**
+     * Returns a geometric object that represents the convex hull of this geometric object.
+     * Convex hulls, being dependent on straight lines, can be accurately represented in linear
+     * interpolations for any geometry restricted to linear interpolations.
+     *
+     * @return convex hull
+     */
+    public GeometryExpression<Geometry> convexHull() {
+        if (convexHull == null) {
+            convexHull = GeometryExpressions.geometryOperation(SpatialOps.CONVEXHULL, mixin);
+        }
+        return convexHull;
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public GeometryExpression<Geometry> intersection(Geometry geometry) {
+        return intersection(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public GeometryExpression<Geometry> intersection(Expression<? extends Geometry> geometry) {
+        return GeometryExpressions.geometryOperation(SpatialOps.INTERSECTION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public GeometryExpression<Geometry> union(Geometry geometry) {
+        return union(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public GeometryExpression<Geometry> union(Expression<? extends Geometry> geometry) {
+        return GeometryExpressions.geometryOperation(SpatialOps.UNION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public GeometryExpression<Geometry> difference(Geometry geometry) {
+        return difference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public GeometryExpression<Geometry> difference(Expression<? extends Geometry> geometry) {
+        return GeometryExpressions.geometryOperation(SpatialOps.DIFFERENCE, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference between this and the other geometry
+     */
+    public GeometryExpression<Geometry> symDifference(Geometry geometry) {
+        return symDifference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference between this and the geometry
+     */
+    public GeometryExpression<Geometry> symDifference(Expression<? extends Geometry> geometry) {
+        return GeometryExpressions.geometryOperation(SpatialOps.SYMDIFFERENCE, mixin, geometry);
+    }
+
+    public GeometryExpression<Geometry> transform(int srid) {
+        return GeometryExpressions.geometryOperation(SpatialOps.TRANSFORM, mixin, ConstantImpl.create(srid));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpressions.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpressions.java
new file mode 100644
index 0000000000..5072faa662
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryExpressions.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.geolatte.geom.*;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * GeometryExpressions contains static functions for GEO operations
+ */
+public final class GeometryExpressions {
+
+    private GeometryExpressions() { }
+
+    /**
+     * Return a specified ST_Geometry value from Extended Well-Known Text representation (EWKT).
+     *
+     * @param expr geometry
+     * @return serialized form
+     */
+    public static StringExpression asEWKT(GeometryExpression<?> expr) {
+        return Expressions.stringOperation(SpatialOps.AS_EWKT, expr);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static GeometryExpression<?> fromText(String text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, ConstantImpl.create(text));
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static GeometryExpression<?> fromText(Expression<String> text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, text);
+    }
+
+    /**
+     * Sets the SRID on a geometry to a particular integer value.
+     *
+     * @param expr geometry
+     * @param srid SRID
+     * @param <T>
+     * @return converted geometry
+     */
+    public static <T extends Geometry> GeometryExpression<T> setSRID(Expression<T> expr, int srid) {
+        return geometryOperation(expr.getType(), SpatialOps.SET_SRID, expr, ConstantImpl.create(srid));
+    }
+
+    /**
+     * Returns X minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x minima
+     */
+    public static NumberExpression<Double> xmin(GeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMIN, expr);
+    }
+
+    /**
+     * Returns X maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x maxima
+     */
+    public static NumberExpression<Double> xmax(GeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMAX, expr);
+    }
+
+    /**
+     * Returns Y minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y minima
+     */
+    public static NumberExpression<Double> ymin(GeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMIN, expr);
+    }
+
+    /**
+     * Returns Y maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y maxima
+     */
+    public static NumberExpression<Double> ymax(GeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMAX, expr);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if within distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, Expression<Double> distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, distance);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if within distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, double distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, ConstantImpl.create(distance));
+    }
+
+    /**
+     *  Returns the bounding box that bounds rows of geometries.
+     *
+     * @param collection geometry collection
+     * @return bounding box
+     */
+    public static GeometryExpression<?> extent(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.EXTENT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param collection geometry collection
+     * @return geometry collection
+     */
+    public static GeometryExpression<?> collect(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.COLLECT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @return  geometry collection
+     */
+    public static GeometryExpression<?> collect(Expression<? extends Geometry> expr1, Expression<? extends Geometry> expr2) {
+        return geometryOperation(SpatialOps.COLLECT2, expr1, expr2);
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> GeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay));
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param deltaz z offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> GeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay, float deltaz) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE2,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay), ConstantImpl.create(deltaz));
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static GeometryExpression<Geometry> geometryOperation(Operator op, Expression<?>... args) {
+        return new GeometryOperation<Geometry>(Geometry.class, op, args);
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static <T extends Geometry> GeometryExpression<T> geometryOperation(Class<? extends T> type,
+                                                                               Operator op, Expression<?>... args) {
+        return new GeometryOperation<T>(type, op, args);
+    }
+
+    /**
+     * Create a new LineString operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static LineStringExpression<LineString> lineStringOperation(Operator op, Expression<?>... args) {
+        return new LineStringOperation<LineString>(LineString.class, op, args);
+    }
+
+    /**
+     * Create a new Point operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static PointExpression<Point> pointOperation(Operator op, Expression<?>... args) {
+        return new PointOperation<Point>(Point.class, op, args);
+    }
+
+    /**
+     * Create a new Polygon operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static PolygonExpression<Polygon> polygonOperation(Operator op, Expression<?>... args) {
+        return new PolygonOperation<Polygon>(Polygon.class, op, args);
+    }
+
+    /**
+     * Create a new GeometryExpression
+     *
+     * @param expr Expression of type Geometry
+     * @return new GeometryExpression
+     */
+    public static <T extends Geometry> GeometryExpression<T> asGeometry(Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        if (underlyingMixin instanceof PathImpl) {
+            return new GeometryPath<T>((PathImpl<T>) underlyingMixin);
+        } else if (underlyingMixin instanceof OperationImpl) {
+            return new GeometryOperation<T>((OperationImpl<T>) underlyingMixin);
+        } else {
+            return new GeometryExpression<T>(underlyingMixin) {
+
+                private static final long serialVersionUID = -6714044005570420009L;
+
+                @Override
+                public <R, C> R accept(Visitor<R, C> v, C context) {
+                    return this.mixin.accept(v, context);
+                }
+
+            };
+        }
+    }
+
+    /**
+     * Create a new GeometryExpression
+     *
+     * @param value Geometry
+     * @return new GeometryExpression
+     */
+    public static <T extends Geometry> GeometryExpression<T> asGeometry(T value) {
+        return asGeometry(Expressions.constant(value));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryOperation.java
new file mode 100644
index 0000000000..e392aa3289
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.geolatte.geom.Geometry;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code GeometryOperation} extends {@link GeometryCollectionExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class GeometryOperation<T extends Geometry> extends GeometryExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected GeometryOperation(OperationImpl<T> mixin) {
+        super(mixin);
+        this.opMixin = mixin;
+    }
+
+    protected GeometryOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected GeometryOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPath.java
new file mode 100644
index 0000000000..9e4fe380f9
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPath.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import java.lang.reflect.AnnotatedElement;
+
+import org.geolatte.geom.*;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code GeometryPath} extends {@link GeometryExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class GeometryPath<T extends Geometry> extends GeometryExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    private transient volatile GeometryCollectionPath<GeometryCollection> collection;
+
+    private transient volatile LinearRingPath<LinearRing> linearRing;
+
+    private transient volatile LineStringPath<LineString> lineString;
+
+    private transient volatile MultiLineStringPath<MultiLineString> multiLineString;
+
+    private transient volatile MultiPointPath<MultiPoint> multiPoint;
+
+    private transient volatile MultiPolygonPath<MultiPolygon> multiPolygon;
+
+    private transient volatile PointPath<Point> point;
+
+    private transient volatile PolygonPath<Polygon> polygon;
+
+    protected GeometryPath(PathImpl<T> mixin) {
+        super(mixin);
+        this.pathMixin = mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public GeometryPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Geometry.class, parent, property);
+    }
+
+    public GeometryPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public GeometryPath(PathMetadata metadata) {
+        this((Class<? extends T>) Geometry.class, metadata);
+    }
+
+    public GeometryPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public GeometryPath(String var) {
+        this((Class<? extends T>) Geometry.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public GeometryCollectionPath<GeometryCollection> asCollection() {
+        if (collection == null) {
+            collection = new GeometryCollectionPath<GeometryCollection>(pathMixin.getMetadata());
+        }
+        return collection;
+    }
+
+    public LinearRingPath<LinearRing> asLinearRing() {
+        if (linearRing == null) {
+            linearRing = new LinearRingPath<LinearRing>(pathMixin.getMetadata());
+        }
+        return linearRing;
+    }
+
+    public LineStringPath<LineString> asLineString() {
+        if (lineString == null) {
+            lineString = new LineStringPath<LineString>(pathMixin.getMetadata());
+        }
+        return lineString;
+    }
+
+    public MultiLineStringPath<MultiLineString> asMultiLineString() {
+        if (multiLineString == null) {
+            multiLineString = new MultiLineStringPath<MultiLineString>(pathMixin.getMetadata());
+        }
+        return multiLineString;
+    }
+
+    public MultiPointPath<MultiPoint> asMultiPoint() {
+        if (multiPoint == null) {
+            multiPoint = new MultiPointPath<MultiPoint>(pathMixin.getMetadata());
+        }
+        return multiPoint;
+    }
+
+    public MultiPolygonPath<MultiPolygon> asMultiPolygon() {
+        if (multiPolygon == null) {
+            multiPolygon = new MultiPolygonPath<MultiPolygon>(pathMixin.getMetadata());
+        }
+        return multiPolygon;
+    }
+
+    public PointPath<Point> asPoint() {
+        if (point == null) {
+            point = new PointPath<Point>(pathMixin.getMetadata());
+        }
+        return point;
+    }
+
+    public PolygonPath<Polygon> asPolygon() {
+        if (polygon == null) {
+            polygon = new PolygonPath<Polygon>(pathMixin.getMetadata());
+        }
+        return polygon;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public GeometryPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPaths.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPaths.java
new file mode 100644
index 0000000000..a22cf4700a
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/GeometryPaths.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.geolatte.geom.*;
+
+/**
+ * {@code GeometryPaths} provides factory methods for {@link GeometryExpression} creation
+ *
+ * @author tiwe
+ *
+ */
+public interface GeometryPaths {
+
+    <A extends GeometryCollection> GeometryCollectionPath<A> createGeometryCollection(String property, Class<? extends A> type);
+
+    <A extends Geometry> GeometryPath<A> createGeometry(String property, Class<? extends A> type);
+
+    <A extends LinearRing> LinearRingPath<A> createLinearRing(String property, Class<? extends A> type);
+
+    <A extends LineString> LineStringPath<A> createLineString(String property, Class<? extends A> type);
+
+    <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(String property, Class<? extends A> type);
+
+    <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property, Class<? extends A> type);
+
+    <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property, Class<? extends A> type);
+
+    <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type);
+
+    <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type);
+
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineExpression.java
similarity index 86%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/LineExpression.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/LineExpression.java
index 400d17962a..6782ceae81 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LineExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial;
+package com.querydsl.spatial;
 
 import org.geolatte.geom.LineString;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * A Line is a LineString with exactly 2 Points.
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java
new file mode 100644
index 0000000000..d3bdbca3b4
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringExpression.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.Point;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * A LineString is a Curve with linear interpolation between Points. Each consecutive pair of Points defines a Line
+ * segment.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class LineStringExpression<T extends LineString> extends CurveExpression<T> {
+
+    private static final long serialVersionUID = -6572984614863252657L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numPoints;
+
+    public LineStringExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The number of Points in this LineString.
+     *
+     * @return number of points
+     */
+    public NumberExpression<Integer> numPoints() {
+        if (numPoints == null) {
+            numPoints = Expressions.numberOperation(Integer.class, SpatialOps.NUM_POINTS, mixin);
+        }
+        return numPoints;
+    }
+
+    /**
+     * Returns the specified Point N in this LineString.
+     *
+     * @param idx one-based index of element
+     * @return matched element
+     */
+    public PointExpression<Point> pointN(int idx) {
+        return GeometryExpressions.pointOperation(SpatialOps.POINTN, mixin, ConstantImpl.create(idx));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringOperation.java
new file mode 100644
index 0000000000..38c0f2b798
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringOperation.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.geolatte.geom.LineString;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code LineStringOperation} extends {@link LineStringExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class LineStringOperation<T extends LineString> extends LineStringExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected LineStringOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected LineStringOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringPath.java
similarity index 76%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LineStringPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringPath.java
index a83c33de7f..f49d5b4955 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LineStringPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LineStringPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.LineString;
 
-import com.mysema.query.spatial.LineStringExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code LineStringPath} extends {@link LineStringExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class LineStringPath<T extends LineString> extends LineStringExpression<T
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public LineStringPath(Path<?> parent, String property) {
         this((Class<? extends T>) LineString.class, parent, property);
     }
@@ -43,15 +42,17 @@ public LineStringPath(Class<? extends T> type, Path<?> parent, String property)
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public LineStringPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public LineStringPath(PathMetadata metadata) {
         this((Class<? extends T>) LineString.class, metadata);
     }
 
-    public LineStringPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public LineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public LineStringPath(String var) {
         this((Class<? extends T>) LineString.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public LineStringPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LinearRingExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingExpression.java
similarity index 87%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/LinearRingExpression.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingExpression.java
index 865d7f8ebd..ebd87a9c2d 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/LinearRingExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial;
+package com.querydsl.spatial;
 
 import org.geolatte.geom.LineString;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * A LinearRing is a LineString that is both closed and simple.
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LinearRingPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingPath.java
similarity index 76%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LinearRingPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingPath.java
index 3aaaac77a9..a878215497 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/LinearRingPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/LinearRingPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.LinearRing;
 
-import com.mysema.query.spatial.LinearRingExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code LinearRingPath} extends {@link LinearRingExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class LinearRingPath<T extends LinearRing> extends LinearRingExpression<T
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public LinearRingPath(Path<?> parent, String property) {
         this((Class<? extends T>) LinearRing.class, parent, property);
     }
@@ -43,15 +42,17 @@ public LinearRingPath(Class<? extends T> type, Path<?> parent, String property)
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public LinearRingPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public LinearRingPath(PathMetadata metadata) {
         this((Class<? extends T>) LinearRing.class, metadata);
     }
 
-    public LinearRingPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public LinearRingPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public LinearRingPath(String var) {
         this((Class<? extends T>) LinearRing.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public LinearRingPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiCurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiCurveExpression.java
new file mode 100644
index 0000000000..e141657513
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiCurveExpression.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import org.geolatte.geom.AbstractGeometryCollection;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A MultiCurve is a 1-dimensional GeometryCollection whose elements are Curves.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class MultiCurveExpression<T extends AbstractGeometryCollection> extends AbstractGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 6983316799469849656L;
+
+    @Nullable
+    private transient volatile BooleanExpression closed;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    public MultiCurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this MultiCurve is closed [StartPoint ( ) = EndPoint ( ) for each
+     * Curve in this MultiCurve].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * The Length of this MultiCurve which is equal to the sum of the lengths of the element
+     * Curves.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiLineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringExpression.java
similarity index 87%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiLineStringExpression.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringExpression.java
index 42fefa2e8f..fa859351eb 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiLineStringExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial;
+package com.querydsl.spatial;
 
 import org.geolatte.geom.MultiLineString;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * A MultiLineString is a MultiCurve whose elements are LineStrings.
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiLineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringPath.java
similarity index 78%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiLineStringPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringPath.java
index 37f6338f43..d3d72cfb32 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiLineStringPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiLineStringPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.MultiLineString;
 
-import com.mysema.query.spatial.MultiLineStringExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code MultiLineStringPath} extends {@link MultiLineStringExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class MultiLineStringPath<T extends MultiLineString> extends MultiLineStr
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public MultiLineStringPath(Path<?> parent, String property) {
         this((Class<? extends T>) MultiLineString.class, parent, property);
     }
@@ -43,30 +42,32 @@ public MultiLineStringPath(Class<? extends T> type, Path<?> parent, String prope
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public MultiLineStringPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public MultiLineStringPath(PathMetadata metadata) {
         this((Class<? extends T>) MultiLineString.class, metadata);
     }
 
-    public MultiLineStringPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public MultiLineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public MultiLineStringPath(String var) {
         this((Class<? extends T>) MultiLineString.class, PathMetadataFactory.forVariable(var));
     }
 
+    public MultiLineStringPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
     @Override
     public final <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(pathMixin, context);
     }
 
-    public MultiLineStringPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointExpression.java
similarity index 85%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPointExpression.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointExpression.java
index b24c057fcd..434ddf04e9 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPointExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial;
+package com.querydsl.spatial;
 
 import org.geolatte.geom.MultiPoint;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * A MultiPoint is a 0-dimensional GeometryCollection. The elements of a MultiPoint are restricted to Points. The
@@ -26,7 +26,7 @@
  *
  * @param <T>
  */
-public abstract class MultiPointExpression<T extends MultiPoint> extends GeometryCollectionExpression<T> {
+public abstract class MultiPointExpression<T extends MultiPoint> extends AbstractGeometryCollectionExpression<T> {
 
     private static final long serialVersionUID = 7221702165705045865L;
 
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointPath.java
similarity index 76%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPointPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointPath.java
index 27b979cec0..a62436f991 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPointPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPointPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.MultiPoint;
 
-import com.mysema.query.spatial.MultiPointExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code MultiPointPath} extends {@link MultiPointExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class MultiPointPath<T extends MultiPoint> extends MultiPointExpression<T
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public MultiPointPath(Path<?> parent, String property) {
         this((Class<? extends T>) MultiPoint.class, parent, property);
     }
@@ -43,30 +42,32 @@ public MultiPointPath(Class<? extends T> type, Path<?> parent, String property)
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public MultiPointPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public MultiPointPath(PathMetadata metadata) {
         this((Class<? extends T>) MultiPoint.class, metadata);
     }
 
-    public MultiPointPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public MultiPointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public MultiPointPath(String var) {
         this((Class<? extends T>) MultiPoint.class, PathMetadataFactory.forVariable(var));
     }
 
+    public MultiPointPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
     @Override
     public final <R,C> R accept(Visitor<R,C> v, C context) {
         return v.visit(pathMixin, context);
     }
 
-    public MultiPointPath(Class<? extends T> type, String var) {
-        this(type, PathMetadataFactory.forVariable(var));
-    }
-
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonExpression.java
similarity index 87%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPolygonExpression.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonExpression.java
index 95a9da5e0c..301d55368b 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/MultiPolygonExpression.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial;
+package com.querydsl.spatial;
 
 import org.geolatte.geom.MultiPolygon;
 
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.Expression;
 
 /**
  * A MultiPolygon is a MultiSurface whose elements are Polygons.
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonPath.java
similarity index 78%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPolygonPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonPath.java
index d486d177af..517a35b232 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/MultiPolygonPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiPolygonPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.MultiPolygon;
 
-import com.mysema.query.spatial.MultiPolygonExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code MultiPolygonPath} extends {@link MultiPolygonExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class MultiPolygonPath<T extends MultiPolygon> extends MultiPolygonExpres
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public MultiPolygonPath(Path<?> parent, String property) {
         this((Class<? extends T>) MultiPolygon.class, parent, property);
     }
@@ -43,15 +42,17 @@ public MultiPolygonPath(Class<? extends T> type, Path<?> parent, String property
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public MultiPolygonPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public MultiPolygonPath(PathMetadata metadata) {
         this((Class<? extends T>) MultiPolygon.class, metadata);
     }
 
-    public MultiPolygonPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public MultiPolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public MultiPolygonPath(String var) {
         this((Class<? extends T>) MultiPolygon.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public MultiPolygonPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiSurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiSurfaceExpression.java
new file mode 100644
index 0000000000..e11bc21b8e
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/MultiSurfaceExpression.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import org.geolatte.geom.AbstractGeometryCollection;
+import org.geolatte.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A MultiSurface is a 2-dimensional GeometryCollection whose elements are Surfaces, all using coordinates from
+ * the same coordinate reference system. The geometric interiors of any two Surfaces in a MultiSurface may not
+ * intersect in the full coordinate system. The boundaries of any two coplanar elements in a MultiSurface may
+ * intersect, at most, at a finite number of Points. If they were to meet along a curve, they could be merged into a
+ * single surface.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class MultiSurfaceExpression<T extends AbstractGeometryCollection> extends AbstractGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 4133386816772862010L;
+
+    @Nullable
+    private transient volatile PointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public MultiSurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this MultiSurface, as measured in the spatial reference system of this MultiSurface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this MultiSurface. The result is not guaranteed to be on
+     * this MultiSurface.
+     *
+     * @return centroid
+     */
+    public PointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = GeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this MultiSurface.
+     *
+     * @return point on surface
+     */
+    public PointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = GeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/PointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointExpression.java
new file mode 100644
index 0000000000..87dbff6033
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointExpression.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Point;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an
+ * x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also
+ * have coordinate values for z and m.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class PointExpression<T extends Point> extends GeometryExpression<T> {
+
+    private static final long serialVersionUID = -3549448861390349654L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> x, y, z, m;
+
+    public PointExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The x-coordinate value for this Point.
+     *
+     * @return x-coordinate
+     */
+    public NumberExpression<Double> x() {
+        if (x == null) {
+            x = Expressions.numberOperation(Double.class, SpatialOps.X, mixin);
+        }
+        return x;
+    }
+
+    /**
+     * The y-coordinate value for this Point.
+     *
+     * @return y-coordinate
+     */
+    public NumberExpression<Double> y() {
+        if (y == null) {
+            y = Expressions.numberOperation(Double.class, SpatialOps.Y, mixin);
+        }
+        return y;
+    }
+
+    /**
+     * The z-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return z-coordinate
+     */
+    public NumberExpression<Double> z() {
+        if (z == null) {
+            z = Expressions.numberOperation(Double.class, SpatialOps.Z, mixin);
+        }
+        return z;
+    }
+
+    /**
+     * The m-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return m-coordinate
+     */
+    public NumberExpression<Double> m() {
+        if (m == null) {
+            m = Expressions.numberOperation(Double.class, SpatialOps.M, mixin);
+        }
+        return m;
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/PointOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointOperation.java
new file mode 100644
index 0000000000..32e29da228
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointOperation.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.geolatte.geom.Point;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code PointOperation} extends {@link PointExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class PointOperation<T extends Point> extends PointExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected PointOperation(Class<T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected PointOperation(Class<T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointPath.java
similarity index 76%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PointPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/PointPath.java
index e3b78d86f8..21fe55348c 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PointPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PointPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.Point;
 
-import com.mysema.query.spatial.PointExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code PointPath} extends {@link PointExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class PointPath<T extends Point> extends PointExpression<T> implements Pa
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public PointPath(Path<?> parent, String property) {
         this((Class<? extends T>) Point.class, parent, property);
     }
@@ -43,15 +42,17 @@ public PointPath(Class<? extends T> type, Path<?> parent, String property) {
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public PointPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public PointPath(PathMetadata metadata) {
         this((Class<? extends T>) Point.class, metadata);
     }
 
-    public PointPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public PointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public PointPath(String var) {
         this((Class<? extends T>) Point.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public PointPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonExpression.java
new file mode 100644
index 0000000000..7991f3b328
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonExpression.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.Polygon;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * A Polygon is a planar Surface defined by 1 exterior boundary and 0 or more interior boundaries. Each interior
+ * boundary defines a hole in the Polygon. A Triangle is a polygon with 3 distinct, non-collinear vertices and no
+ * interior boundary.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class PolygonExpression<T extends Polygon> extends SurfaceExpression<T> {
+
+    private static final long serialVersionUID = 7544382956232485312L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numInteriorRing;
+
+    @Nullable
+    private transient volatile LineStringExpression<LineString> exterorRing;
+
+    public PolygonExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the exterior ring of this Polygon.
+     *
+     * @return exterior ring
+     */
+    public LineStringExpression<?> exteriorRing() {
+        if (exterorRing == null) {
+            exterorRing = GeometryExpressions.lineStringOperation(SpatialOps.EXTERIOR_RING, mixin);
+        }
+        return exterorRing;
+    }
+
+    /**
+     * Returns the number of interior rings in this Polygon.
+     *
+     * @return number of interior rings
+     */
+    public NumberExpression<Integer> numInteriorRing() {
+        if (numInteriorRing == null) {
+            numInteriorRing = Expressions.numberOperation(Integer.class, SpatialOps.NUM_INTERIOR_RING, mixin);
+        }
+        return numInteriorRing;
+    }
+
+    /**
+     * Returns the N th interior ring for this Polygon as a LineString.
+     *
+     * @param idx one based index
+     * @return interior ring at index
+     */
+    public LineStringExpression<LineString> interiorRingN(int idx) {
+        return GeometryExpressions.lineStringOperation(SpatialOps.INTERIOR_RINGN, mixin, ConstantImpl.create(idx));
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonOperation.java
new file mode 100644
index 0000000000..713cdb2120
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonOperation.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.geolatte.geom.Polygon;
+
+import com.querydsl.core.types.*;
+
+/**
+ * {@code PolygonOperation} extends {@link PolygonExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class PolygonOperation<T extends Polygon> extends PolygonExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected PolygonOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected PolygonOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonPath.java
similarity index 76%
rename from querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolygonPath.java
rename to querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonPath.java
index da0523d120..5578f412c9 100644
--- a/querydsl-spatial/src/main/java/com/mysema/query/spatial/path/PolygonPath.java
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/PolygonPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.spatial.path;
+package com.querydsl.spatial;
 
 import java.lang.reflect.AnnotatedElement;
 
 import org.geolatte.geom.Polygon;
 
-import com.mysema.query.spatial.PolygonExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.types.*;
 
 /**
+ * {@code PolygonPath} extends {@link PolygonExpression} to implement the
+ * {@link Path} interface
+ *
  * @author tiwe
  *
  * @param <T>
@@ -35,6 +33,7 @@ public class PolygonPath<T extends Polygon> extends PolygonExpression<T> impleme
 
     private final PathImpl<T> pathMixin;
 
+    @SuppressWarnings("unchecked")
     public PolygonPath(Path<?> parent, String property) {
         this((Class<? extends T>) Polygon.class, parent, property);
     }
@@ -43,15 +42,17 @@ public PolygonPath(Class<? extends T> type, Path<?> parent, String property) {
         this(type, PathMetadataFactory.forProperty(parent, property));
     }
 
-    public PolygonPath(PathMetadata<?> metadata) {
+    @SuppressWarnings("unchecked")
+    public PolygonPath(PathMetadata metadata) {
         this((Class<? extends T>) Polygon.class, metadata);
     }
 
-    public PolygonPath(Class<? extends T> type, PathMetadata<?> metadata) {
-        super(new PathImpl<T>(type, metadata));
-        this.pathMixin = (PathImpl<T>)mixin;
+    public PolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
     }
 
+    @SuppressWarnings("unchecked")
     public PolygonPath(String var) {
         this((Class<? extends T>) Polygon.class, PathMetadataFactory.forVariable(var));
     }
@@ -66,7 +67,7 @@ public PolygonPath(Class<? extends T> type, String var) {
     }
 
     @Override
-    public PathMetadata<?> getMetadata() {
+    public PathMetadata getMetadata() {
         return pathMixin.getMetadata();
     }
 
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/SpatialOps.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/SpatialOps.java
new file mode 100644
index 0000000000..e5307f95b7
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/SpatialOps.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import com.querydsl.core.types.Operator;
+
+/**
+ * {@code SpatialOps} provides {@link Operator} instances for spatial operations
+ *
+ * @author tiwe
+ *
+ */
+public enum SpatialOps implements Operator {
+
+    // Geometry
+    DIMENSION(Integer.class),
+    GEOMETRY_TYPE(String.class),
+    AS_TEXT(String.class),
+    AS_BINARY(Object.class),
+    SRID(Integer.class),
+    SRID2(Integer.class),
+    IS_EMPTY(Boolean.class),
+    IS_SIMPLE(Boolean.class),
+    BOUNDARY(Object.class),
+    ENVELOPE(Object.class),
+    WKTTOSQL(Object.class),
+    WKBTOSQL(Object.class),
+    EQUALS(Boolean.class),
+    DISJOINT(Boolean.class),
+    INTERSECTS(Boolean.class),
+    TOUCHES(Boolean.class),
+    CROSSES(Boolean.class),
+    WITHIN(Boolean.class),
+    CONTAINS(Boolean.class),
+    OVERLAPS(Boolean.class),
+    RELATE(Boolean.class),
+    DISTANCE(Number.class),
+    DISTANCE2(Number.class),
+    DISTANCE_SPHERE(Number.class),
+    DISTANCE_SPHEROID(Number.class),
+    INTERSECTION(Object.class),
+    DIFFERENCE(Object.class),
+    UNION(Object.class),
+    SYMDIFFERENCE(Object.class),
+    BUFFER(Object.class),
+    BUFFER2(Object.class),
+    CONVEXHULL(Object.class),
+    TRANSFORM(Object.class),
+
+    // Point
+    X(Number.class),
+    X2(Number.class),
+    Y(Number.class),
+    Y2(Number.class),
+    Z(Number.class),
+    Z2(Number.class),
+    M(Number.class),
+    M2(Number.class),
+
+    // Curve
+    START_POINT(Object.class),
+    END_POINT(Object.class),
+    IS_RING(Object.class),
+    LENGTH(Object.class),
+    LENGTH2(Object.class),
+
+    // LineString
+    NUM_POINTS(Integer.class),
+    POINTN(Object.class),
+
+    // Surface
+    AREA(Number.class),
+    AREA2(Number.class),
+    CENTROID(Object.class),
+    POINT_ON_SURFACE(Object.class),
+
+    // Polygon
+    EXTERIOR_RING(Object.class),
+    EXTERIOR_RING2(Object.class),
+    INTERIOR_RINGS(Object.class),
+    INTERIOR_RINGS2(Object.class),
+    NUM_INTERIOR_RING(Integer.class),
+    INTERIOR_RINGN(Object.class),
+
+    // Polyhedral Surface
+    GEOMETRIES(Object.class),
+    NUM_SURFACES(Integer.class),
+    SURFACE(Object.class),
+
+    // GeometryCollection
+    NUM_GEOMETRIES(Integer.class),
+    GEOMETRYN(Object.class),
+
+    // MultiCurve
+    IS_CLOSED(Boolean.class),
+
+    // Extensions
+    AS_EWKT(String.class),
+    GEOM_FROM_TEXT(Object.class),
+    SET_SRID(Object.class),
+    XMIN(Number.class),
+    XMAX(Number.class),
+    YMIN(Number.class),
+    YMAX(Number.class),
+    DWITHIN(Boolean.class),
+    EXTENT(Object.class),
+    COLLECT(Object.class),
+    COLLECT2(Object.class),
+    TRANSLATE(Object.class),
+    TRANSLATE2(Object.class);
+
+    private final Class<?> type;
+
+    SpatialOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+}
\ No newline at end of file
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/SurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/SurfaceExpression.java
new file mode 100644
index 0000000000..a80b07fc23
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/SurfaceExpression.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.Point;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * A Surface is a 2-dimensional geometric object.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class SurfaceExpression<T extends Geometry> extends GeometryExpression<T> {
+
+    private static final long serialVersionUID = 3534197011234723698L;
+
+    @Nullable
+    private transient volatile PointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public SurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this Surface, as measured in the spatial reference system of this Surface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this Surface as a Point. The result is not guaranteed to
+     * be on this Surface.
+     *
+     * @return centroid
+     */
+    public PointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = GeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this Surface.
+     *
+     * @return point on surface
+     */
+    public PointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = GeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/SpatialSupport.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/SpatialSupport.java
new file mode 100644
index 0000000000..b5cca1d804
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/SpatialSupport.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.apt;
+
+import com.querydsl.codegen.Extension;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.AbstractModule;
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.codegen.TypeMappings;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * {@code SpatialSupport} provides support for spatial types in code generation
+ *
+ * @author tiwe
+ *
+ */
+public final class SpatialSupport implements Extension {
+
+    private static void registerTypes(TypeMappings typeMappings) {
+        Map<String, String> additions = new HashMap<>();
+        additions.put("Geometry", "GeometryPath");
+        additions.put("GeometryCollection", "GeometryCollectionPath");
+        additions.put("LinearRing", "LinearRingPath");
+        additions.put("LineString", "LineStringPath");
+        additions.put("MultiLineString", "MultiLineStringPath");
+        additions.put("MultiPoint", "MultiPointPath");
+        additions.put("MultiPolygon", "MultiPolygonPath");
+        additions.put("Point", "PointPath");
+        additions.put("Polygon", "PolygonPath");
+        for (Map.Entry<String, String> entry : additions.entrySet()) {
+            typeMappings.register(
+                    new SimpleType("org.geolatte.geom." + entry.getKey()),
+                    new SimpleType("com.querydsl.spatial." + entry.getValue()));
+        }
+    }
+
+    private static void registerJTSTypes(TypeMappings typeMappings) {
+        Map<String, String> additions = new HashMap<>();
+        additions.put("Geometry", "JTSGeometryPath");
+        additions.put("GeometryCollection", "JTSGeometryCollectionPath");
+        additions.put("LinearRing", "JTSLinearRingPath");
+        additions.put("LineString", "JTSLineStringPath");
+        additions.put("MultiLineString", "JTSMultiLineStringPath");
+        additions.put("MultiPoint", "JTSMultiPointPath");
+        additions.put("MultiPolygon", "JTSMultiPolygonPath");
+        additions.put("Point", "JTSPointPath");
+        additions.put("Polygon", "JTSPolygonPath");
+        for (Map.Entry<String, String> entry : additions.entrySet()) {
+            typeMappings.register(
+                    new SimpleType("com.vividsolutions.jts.geom." + entry.getKey()),
+                    new SimpleType("com.querydsl.spatial.jts." + entry.getValue()));
+            typeMappings.register(
+                    new SimpleType("org.locationtech.jts.geom." + entry.getKey()),
+                    new SimpleType("com.querydsl.spatial.locationtech.jts." + entry.getValue()));
+        }
+    }
+
+    private static void addImports(AbstractModule module, String packageName) {
+        @SuppressWarnings("unchecked")
+        Set<String> imports = module.get(Set.class, CodegenModule.IMPORTS);
+        if (imports.isEmpty()) {
+            imports = Collections.singleton(packageName);
+        } else {
+            Set<String> old = imports;
+            imports = new HashSet<>();
+            imports.addAll(old);
+            imports.add(packageName);
+        }
+        module.bind(CodegenModule.IMPORTS, imports);
+    }
+
+    /**
+     * Register spatial types to the given codegen module
+     *
+     * @param module module to be customized for spatial support
+     */
+    public void addSupport(AbstractModule module) {
+        registerTypes(module.get(TypeMappings.class));
+        addImports(module,"com.querydsl.spatial.path");
+        registerJTSTypes(module.get(TypeMappings.class));
+        addImports(module,"com.querydsl.spatial.jts.path");
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/package-info.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/package-info.java
new file mode 100644
index 0000000000..b2bf88c99f
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/apt/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * APT extension for registering spatial types.
+ */
+package com.querydsl.spatial.apt;
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/HibernateSpatialSupport.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/HibernateSpatialSupport.java
new file mode 100644
index 0000000000..f2be42c520
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/HibernateSpatialSupport.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.hibernate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.spatial.SpatialOps;
+
+/**
+ * {@code HibernateSpatialSupport} provides mappings from operators to serialization templates
+ * to be used in Hibernate Spatial
+ */
+public final class HibernateSpatialSupport {
+
+    private HibernateSpatialSupport() { }
+
+    public static Map<Operator, String> getSpatialOps() {
+        Map<Operator, String> ops = new HashMap<>();
+        ops.put(SpatialOps.DIMENSION, "dimension({0})");
+        ops.put(SpatialOps.GEOMETRY_TYPE, "geometrytype({0}, {1})");
+        ops.put(SpatialOps.SRID, "srid({0})");
+        ops.put(SpatialOps.SRID2, "srid2({0}, {1})");
+        ops.put(SpatialOps.ENVELOPE, "envelope({0})");
+        ops.put(SpatialOps.AS_TEXT, "astext({0})");
+        ops.put(SpatialOps.AS_BINARY, "asbinary({0})");
+        ops.put(SpatialOps.IS_EMPTY, "isempty({0})");
+        ops.put(SpatialOps.IS_SIMPLE, "issimple({0})");
+        ops.put(SpatialOps.BOUNDARY, "boundary({0})");
+        ops.put(SpatialOps.EXTENT, "extent({0})");
+
+        ops.put(SpatialOps.EQUALS, "equals({0}, {1}) = true");
+        ops.put(SpatialOps.DISJOINT, "disjoint({0}, {1}) = true");
+        ops.put(SpatialOps.INTERSECTS, "intersects({0}, {1}) = true");
+        ops.put(SpatialOps.TOUCHES, "touches({0}, {1}) = true");
+        ops.put(SpatialOps.CROSSES, "crosses({0}, {1}) = true");
+        ops.put(SpatialOps.WITHIN, "within({0}, {1}) = true");
+        ops.put(SpatialOps.CONTAINS, "contains({0}, {1}) = true");
+        ops.put(SpatialOps.OVERLAPS, "overlaps({0}, {1}) = true");
+        ops.put(SpatialOps.RELATE, "relate({0}, {1}, {2}) = true");
+
+        ops.put(SpatialOps.DISTANCE, "distance({0}, {1})");
+        ops.put(SpatialOps.DISTANCE2, "distance({0}, {1}, {2})");
+        ops.put(SpatialOps.DISTANCE_SPHERE, "distancesphere({0}, {1})");
+        ops.put(SpatialOps.DISTANCE_SPHEROID, "distancespheroid({0}, {1})");
+
+        ops.put(SpatialOps.BUFFER, "buffer({0}, {1})");
+        ops.put(SpatialOps.BUFFER2, "buffer({0}, {1}, {2})");
+        ops.put(SpatialOps.CONVEXHULL, "convexhull({0})");
+        ops.put(SpatialOps.INTERSECTION, "intersection({0}, {1})");
+        ops.put(SpatialOps.UNION, "geomunion({0}, {1})");
+        ops.put(SpatialOps.DIFFERENCE, "difference({0}, {1})");
+        ops.put(SpatialOps.SYMDIFFERENCE, "symdifference({0}, {1})");
+        ops.put(SpatialOps.DWITHIN, "dwithin({0}, {1}, {2}) = true");
+        ops.put(SpatialOps.TRANSFORM, "transform({0}, {1})");
+
+        // custom
+        ops.put(SpatialOps.WKTTOSQL, "wkttosql({0}, {1})");
+        ops.put(SpatialOps.WKBTOSQL, "wkbtosql({0}, {1})");
+        ops.put(SpatialOps.X, "x({0})");
+        ops.put(SpatialOps.X2, "x({0}, {1})");
+        ops.put(SpatialOps.Y, "y({0})");
+        ops.put(SpatialOps.Y2, "y({0}, {1})");
+        ops.put(SpatialOps.Z, "y({0})");
+        ops.put(SpatialOps.Z2, "y({0}, {1})");
+        ops.put(SpatialOps.M, "y({0})");
+        ops.put(SpatialOps.M2, "y({0}, {1})");
+        ops.put(SpatialOps.START_POINT, "startpoint({0})");
+        ops.put(SpatialOps.END_POINT, "endpoint({0})");
+        ops.put(SpatialOps.IS_RING, "isring({0})");
+        ops.put(SpatialOps.LENGTH, "length({0})");
+        ops.put(SpatialOps.LENGTH2, "length({0}, {1})");
+        ops.put(SpatialOps.NUM_POINTS, "numpoints({0})");
+        ops.put(SpatialOps.POINTN, "pointn({0})");
+        ops.put(SpatialOps.AREA, "area({0})");
+        ops.put(SpatialOps.AREA2, "area({0}, {1})");
+        ops.put(SpatialOps.CENTROID, "centroid({0})");
+        ops.put(SpatialOps.POINT_ON_SURFACE, "pointonsurface({0})");
+        ops.put(SpatialOps.EXTERIOR_RING, "exteriorring({0})");
+        ops.put(SpatialOps.EXTERIOR_RING2, "exteriorring({0}, {1})");
+        ops.put(SpatialOps.INTERIOR_RINGS, "interiorrings({0})");
+        ops.put(SpatialOps.INTERIOR_RINGS2, "interiorrings({0}, {1})");
+        ops.put(SpatialOps.NUM_INTERIOR_RING, "numinteriorring({0})");
+        ops.put(SpatialOps.INTERIOR_RINGN, "interiorringn({0}, {1})");
+        ops.put(SpatialOps.GEOMETRIES, "geometries({0})");
+        ops.put(SpatialOps.NUM_SURFACES, "numsurfaces({0})");
+        ops.put(SpatialOps.SURFACE, "surface({0})");
+        ops.put(SpatialOps.NUM_GEOMETRIES, "numgeometries({0})");
+        ops.put(SpatialOps.GEOMETRYN, "geometryn({0})");
+        ops.put(SpatialOps.IS_CLOSED, "isclosed({0})");
+        ops.put(SpatialOps.AS_EWKT, "asewkt({0})");
+        ops.put(SpatialOps.GEOM_FROM_TEXT, "geomfromtext({0})");
+        ops.put(SpatialOps.SET_SRID, "setsrid({0}, {1})");
+        ops.put(SpatialOps.XMIN, "xmin({0})");
+        ops.put(SpatialOps.XMAX, "xmax({0})");
+        ops.put(SpatialOps.YMIN, "ymin({0})");
+        ops.put(SpatialOps.YMAX, "ymax({0})");
+        ops.put(SpatialOps.COLLECT, "collect({0})");
+        ops.put(SpatialOps.COLLECT2, "collect({0}, {1})");
+        ops.put(SpatialOps.TRANSLATE, "translate({0})");
+        ops.put(SpatialOps.TRANSLATE2, "translate({0}, {1})");
+        return ops;
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/package-info.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/package-info.java
new file mode 100644
index 0000000000..d33071dec7
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/hibernate/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Serialization patterns for Hibernate Spatial
+ */
+package com.querydsl.spatial.hibernate;
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSCurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSCurveExpression.java
new file mode 100644
index 0000000000..087708ebf8
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSCurveExpression.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
+ * specifying the form of the interpolation between Points. This standard defines only one subclass of Curve,
+ * LineString, which uses linear interpolation between Points.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSCurveExpression<T extends Geometry> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 6139188586728676033L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> startPoint, endPoint;
+
+    @Nullable
+    private transient volatile BooleanExpression closed, ring;
+
+    public JTSCurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The length of this Curve in its associated spatial reference.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+    /**
+     * The start Point of this Curve.
+     *
+     * @return start point
+     */
+    public JTSPointExpression<Point> startPoint() {
+        if (startPoint == null) {
+            startPoint = JTSGeometryExpressions.pointOperation(SpatialOps.START_POINT, mixin);
+        }
+        return startPoint;
+    }
+
+    /**
+     * The end Point of this Curve.
+     *
+     * @return end point
+     */
+    public JTSPointExpression<Point> endPoint() {
+        if (endPoint == null) {
+            endPoint = JTSGeometryExpressions.pointOperation(SpatialOps.END_POINT, mixin);
+        }
+        return endPoint;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )] and this Curve is
+     * simple (does not pass through the same Point more than once).
+     *
+     * @return ring
+     */
+    public BooleanExpression isRing() {
+        if (ring == null) {
+            ring = Expressions.booleanOperation(SpatialOps.IS_RING, mixin);
+        }
+        return ring;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionExpression.java
new file mode 100644
index 0000000000..559748105f
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionExpression.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+
+/**
+ * A Geometry collection is a geometric object that is a collection of some number of geometric objects.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSGeometryCollectionExpression<T extends GeometryCollection> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 8874174644259834690L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numGeometries;
+
+    public JTSGeometryCollectionExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the number of geometries in this GeometryCollection.
+     *
+     * @return numbers of geometries
+     */
+    public NumberExpression<Integer> numGeometries() {
+        if (numGeometries == null) {
+            numGeometries = Expressions.numberOperation(Integer.class, SpatialOps.NUM_GEOMETRIES, mixin);
+        }
+        return numGeometries;
+    }
+
+    /**
+     * Returns the Nth geometry in this GeometryCollection.
+     *
+     * @param n one based index
+     * @return matching geometry
+     */
+    public JTSGeometryExpression<Geometry> geometryN(Integer n) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.GEOMETRYN, mixin, ConstantImpl.create(n));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionPath.java
new file mode 100644
index 0000000000..d4e9aab7ce
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryCollectionPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.GeometryCollection;
+
+/**
+ * {@code JTSGeometryCollectionPath} extends {@link JTSGeometryCollectionExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryCollectionPath<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(Path<?> parent, String property) {
+        this((Class<? extends T>) GeometryCollection.class, parent, property);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(PathMetadata metadata) {
+        this((Class<? extends T>) GeometryCollection.class, metadata);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(String var) {
+        this((Class<? extends T>) GeometryCollection.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpression.java
new file mode 100644
index 0000000000..c3bdbfdfda
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpression.java
@@ -0,0 +1,520 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.Geometry;
+
+/**
+ * Geometry is the root class of the hierarchy. Geometry is an abstract (non-instantiable) class.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSGeometryExpression<T extends Geometry> extends SimpleExpression<T> {
+
+    private static final long serialVersionUID = -1183228394472681995L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> dimension, coordinateDimension, spatialDimension, srid;
+
+    @Nullable
+    private transient volatile StringExpression geometryType;
+
+    @Nullable
+    private transient volatile StringExpression text;
+
+    @Nullable
+    private transient volatile JTSGeometryExpression<Geometry> envelope, boundary, convexHull;
+
+    @Nullable
+    private transient volatile BooleanExpression empty, simple, threed, measured;
+
+    private transient volatile SimpleExpression<byte[]> binary;
+
+    public JTSGeometryExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The inherent dimension of this geometric object, which must be less than or equal
+     * to the coordinate dimension. In non-homogeneous collections, this will return the largest topological
+     * dimension of the contained objects.
+     *
+     * @return dimension
+     */
+    public NumberExpression<Integer> dimension() {
+        if (dimension == null) {
+            dimension = Expressions.numberOperation(Integer.class, SpatialOps.DIMENSION, mixin);
+        }
+        return dimension;
+    }
+
+    /**
+     * Returns the name of the instantiable subtype of Geometry of which this
+     * geometric object is an instantiable member. The name of the subtype of Geometry is returned as a string.
+     *
+     * @return geometry type
+     */
+    public StringExpression geometryType() {
+        if (geometryType == null) {
+            geometryType = Expressions.stringOperation(SpatialOps.GEOMETRY_TYPE, mixin);
+        }
+        return geometryType;
+    }
+
+    /**
+     * Returns the Spatial Reference System ID for this geometric object. This will normally be a
+     * foreign key to an index of reference systems stored in either the same or some other datastore.
+     *
+     * @return SRID
+     */
+    public NumberExpression<Integer> srid() {
+        if (srid == null) {
+            srid = Expressions.numberOperation(Integer.class, SpatialOps.SRID, mixin);
+        }
+        return srid;
+    }
+
+    /**
+     * The minimum bounding box for this Geometry, returned as a Geometry. The
+     * polygon is defined by the corner points of the bounding box [(MINX, MINY), (MAXX, MINY), (MAXX, MAXY),
+     * (MINX, MAXY), (MINX, MINY)]. Minimums for Z and M may be added. The simplest representation of an
+     * Envelope is as two direct positions, one containing all the minimums, and another all the maximums. In some
+     * cases, this coordinate will be outside the range of validity for the Spatial Reference System.
+     *
+     * @return envelope
+     */
+    public JTSGeometryExpression<Geometry> envelope() {
+        if (envelope == null) {
+            envelope = JTSGeometryExpressions.geometryOperation(SpatialOps.ENVELOPE, mixin);
+        }
+        return envelope;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Text Representation of Geometry.
+     *
+     * @return text representation
+     */
+    public StringExpression asText() {
+        if (text == null) {
+            text = Expressions.stringOperation(SpatialOps.AS_TEXT, mixin);
+        }
+        return text;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Binary Representation of
+     * Geometry.
+     *
+     * @return binary representation
+     */
+    public SimpleExpression<byte[]> asBinary() {
+        if (binary == null) {
+            binary = Expressions.operation(byte[].class, SpatialOps.AS_BINARY, mixin);
+        }
+        return binary;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is the empty Geometry. If true, then this
+     * geometric object represents the empty point set ∅ for the coordinate space.
+     *
+     * @return empty
+     */
+    public BooleanExpression isEmpty() {
+        if (empty == null) {
+            empty = Expressions.booleanOperation(SpatialOps.IS_EMPTY, mixin);
+        }
+        return empty;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object has no anomalous geometric points, such
+     * as self intersection or self tangency. The description of each instantiable geometric class
+     * will include the specific conditions that cause an instance of that class to be classified as not simple.
+     *
+     * @return simple
+     */
+    public BooleanExpression isSimple() {
+        if (simple == null) {
+            simple = Expressions.booleanOperation(SpatialOps.IS_SIMPLE, mixin);
+        }
+        return simple;
+    }
+
+    /**
+     * Returns the closure of the combinatorial boundary of this geometric object
+     *
+     * @return boundary
+     */
+    public JTSGeometryExpression<Geometry> boundary() {
+        if (boundary == null) {
+            boundary = JTSGeometryExpressions.geometryOperation(SpatialOps.BOUNDARY, mixin);
+        }
+        return boundary;
+    }
+
+    // query
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(java.lang.Object)
+     */
+    @Override
+    public BooleanExpression eq(Geometry right) {
+        return eq(ConstantImpl.create(right));
+    }
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(com.querydsl.core.types.Expression)
+     */
+    @Override
+    public BooleanExpression eq(Expression<? super T> right) {
+        return Expressions.booleanOperation(SpatialOps.EQUALS, mixin, right);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Geometry geometry) {
+        return disjoint(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.DISJOINT, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Geometry geometry) {
+        return intersects(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.INTERSECTS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Geometry geometry) {
+        return touches(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.TOUCHES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if crosses
+     */
+    public BooleanExpression crosses(Geometry geometry) {
+         return crosses(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if crosses
+     */
+    public BooleanExpression crosses(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CROSSES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Geometry geometry) {
+        return within(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.WITHIN, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Geometry geometry) {
+        return contains(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CONTAINS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Geometry geometry) {
+        return overlaps(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.OVERLAPS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Geometry geometry, String matrix) {
+        return relate(ConstantImpl.create(geometry), matrix);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Expression<? extends Geometry> geometry, String matrix) {
+        return Expressions.booleanOperation(SpatialOps.RELATE, mixin, geometry, ConstantImpl.create(matrix));
+    }
+
+    // analysis
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance
+     */
+    public NumberExpression<Double> distance(Geometry geometry) {
+        return distance(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance
+     */
+    public NumberExpression<Double> distance(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSphere(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHERE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSpheroid(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHEROID, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents all Points whose distance from this geometric
+     * object is less than or equal to distance. Calculations are in the spatial reference system
+     * of this geometric object. Because of the limitations of linear interpolation, there will
+     * often be some relatively small error in this distance, but it should be near the resolution
+     * of the coordinates used.
+     *
+     * @param distance distance
+     * @return buffer
+     */
+    public JTSGeometryExpression<Geometry> buffer(double distance) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.BUFFER, mixin, ConstantImpl.create(distance));
+    }
+
+    /**
+     * Returns a geometric object that represents the convex hull of this geometric object.
+     * Convex hulls, being dependent on straight lines, can be accurately represented in linear
+     * interpolations for any geometry restricted to linear interpolations.
+     *
+     * @return convex hull
+     */
+    public JTSGeometryExpression<Geometry> convexHull() {
+        if (convexHull == null) {
+            convexHull = JTSGeometryExpressions.geometryOperation(SpatialOps.CONVEXHULL, mixin);
+        }
+        return convexHull;
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> intersection(Geometry geometry) {
+        return intersection(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> intersection(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.INTERSECTION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> union(Geometry geometry) {
+        return union(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> union(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.UNION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> difference(Geometry geometry) {
+        return difference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> difference(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.DIFFERENCE, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference
+     */
+    public JTSGeometryExpression<Geometry> symDifference(Geometry geometry) {
+        return symDifference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference
+     */
+    public JTSGeometryExpression<Geometry> symDifference(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.SYMDIFFERENCE, mixin, geometry);
+    }
+
+    public JTSGeometryExpression<Geometry> transform(int srid) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.TRANSFORM, mixin, ConstantImpl.create(srid));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpressions.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpressions.java
new file mode 100644
index 0000000000..5f764434f8
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryExpressions.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.*;
+
+/**
+ * GeometryExpressions contains static functions for GEO operations
+ */
+public final class JTSGeometryExpressions {
+
+    private JTSGeometryExpressions() { }
+
+    /**
+     * Return a specified ST_Geometry value from Extended Well-Known Text representation (EWKT).
+     *
+     * @param expr geometry
+     * @return EWKT form
+     */
+    public static StringExpression asEWKT(JTSGeometryExpression<?> expr) {
+        return Expressions.stringOperation(SpatialOps.AS_EWKT, expr);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static JTSGeometryExpression<?> fromText(String text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, ConstantImpl.create(text));
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static JTSGeometryExpression<?> fromText(Expression<String> text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, text);
+    }
+
+    /**
+     * Sets the SRID on a geometry to a particular integer value.
+     *
+     * @param expr geometry
+     * @param srid SRID
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> setSRID(Expression<T> expr, int srid) {
+        return geometryOperation(expr.getType(), SpatialOps.SET_SRID,
+                expr, ConstantImpl.create(srid));
+    }
+
+    /**
+     * Returns X minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x minima
+     */
+    public static NumberExpression<Double> xmin(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMIN, expr);
+    }
+
+    /**
+     * Returns X maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x maxima
+     */
+    public static NumberExpression<Double> xmax(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMAX, expr);
+    }
+
+    /**
+     * Returns Y minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y minima
+     */
+    public static NumberExpression<Double> ymin(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMIN, expr);
+    }
+
+    /**
+     * Returns Y maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y maxima
+     */
+    public static NumberExpression<Double> ymax(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMAX, expr);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if with distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, Expression<Double> distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, distance);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if with distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, double distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, ConstantImpl.create(distance));
+    }
+
+    /**
+     *  Returns the bounding box that bounds rows of geometries.
+     *
+     * @param collection geometry collection
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> extent(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.EXTENT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param collection geometry collection
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> collect(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.COLLECT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> collect(Expression<? extends Geometry> expr1, Expression<? extends Geometry> expr2) {
+        return geometryOperation(SpatialOps.COLLECT2, expr1, expr2);
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay));
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param deltaz z offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay, float deltaz) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE2,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay), ConstantImpl.create(deltaz));
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSGeometryExpression<Geometry> geometryOperation(Operator op, Expression<?>... args) {
+        return new JTSGeometryOperation<Geometry>(Geometry.class, op, args);
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> geometryOperation(Class<? extends T> type,
+                                                                                  Operator op, Expression<?>... args) {
+        return new JTSGeometryOperation<T>(type, op, args);
+    }
+
+    /**
+     * Create a new LineString operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSLineStringExpression<LineString> lineStringOperation(Operator op, Expression<?>... args) {
+        return new JTSLineStringOperation<LineString>(LineString.class, op, args);
+    }
+
+    /**
+     * Create a new Point operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSPointExpression<Point> pointOperation(Operator op, Expression<?>... args) {
+        return new JTSPointOperation<Point>(Point.class, op, args);
+    }
+
+    /**
+     * Create a new Polygon operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSPolygonExpression<Polygon> polygonOperation(Operator op, Expression<?>... args) {
+        return new JTSPolygonOperation<Polygon>(Polygon.class, op, args);
+    }
+
+    /**
+     * Create a new JTSGeometryExpression
+     *
+     * @param expr Expression of type Geometry
+     * @return new JTSGeometryExpression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> asJTSGeometry(
+            Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        return new JTSGeometryExpression<T>(underlyingMixin) {
+
+            private static final long serialVersionUID = -6714044005570420009L;
+
+            @Override
+            public <R, C> R accept(Visitor<R, C> v, C context) {
+                return this.mixin.accept(v, context);
+            }
+
+        };
+    }
+
+    /**
+     * Create a new JTSGeometryExpression
+     *
+     * @param value Geometry
+     * @return new JTSGeometryExpression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> asJTSGeometry(T value) {
+        return asJTSGeometry(Expressions.constant(value));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryOperation.java
new file mode 100644
index 0000000000..9f112ac641
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryOperation.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.Geometry;
+
+/**
+ * {@code JTSGeometryOperation} extends {@link JTSGeometryExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryOperation<T extends Geometry> extends JTSGeometryExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSGeometryOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSGeometryOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPath.java
new file mode 100644
index 0000000000..452549a142
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPath.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.*;
+
+/**
+ * {@code JTSGeometryPath} extends {@link JTSGeometryExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryPath<T extends Geometry> extends JTSGeometryExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    private transient volatile JTSGeometryCollectionPath<GeometryCollection> collection;
+
+    private transient volatile JTSLinearRingPath<LinearRing> linearRing;
+
+    private transient volatile JTSLineStringPath<LineString> lineString;
+
+    private transient volatile JTSMultiLineStringPath<MultiLineString> multiLineString;
+
+    private transient volatile JTSMultiPointPath<MultiPoint> multiPoint;
+
+    private transient volatile JTSMultiPolygonPath<MultiPolygon> multiPolygon;
+
+    private transient volatile JTSPointPath<Point> point;
+
+    private transient volatile JTSPolygonPath<Polygon> polygon;
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Geometry.class, parent, property);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(PathMetadata metadata) {
+        this((Class<? extends T>) Geometry.class, metadata);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(String var) {
+        this((Class<? extends T>) Geometry.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public JTSGeometryCollectionPath<GeometryCollection> asCollection() {
+        if (collection == null) {
+            collection = new JTSGeometryCollectionPath<GeometryCollection>(pathMixin.getMetadata());
+        }
+        return collection;
+    }
+
+    public JTSLinearRingPath<LinearRing> asLinearRing() {
+        if (linearRing == null) {
+            linearRing = new JTSLinearRingPath<LinearRing>(pathMixin.getMetadata());
+        }
+        return linearRing;
+    }
+
+    public JTSLineStringPath<LineString> asLineString() {
+        if (lineString == null) {
+            lineString = new JTSLineStringPath<LineString>(pathMixin.getMetadata());
+        }
+        return lineString;
+    }
+
+    public JTSMultiLineStringPath<MultiLineString> asMultiLineString() {
+        if (multiLineString == null) {
+            multiLineString = new JTSMultiLineStringPath<MultiLineString>(pathMixin.getMetadata());
+        }
+        return multiLineString;
+    }
+
+    public JTSMultiPointPath<MultiPoint> asMultiPoint() {
+        if (multiPoint == null) {
+            multiPoint = new JTSMultiPointPath<MultiPoint>(pathMixin.getMetadata());
+        }
+        return multiPoint;
+    }
+
+    public JTSMultiPolygonPath<MultiPolygon> asMultiPolygon() {
+        if (multiPolygon == null) {
+            multiPolygon = new JTSMultiPolygonPath<MultiPolygon>(pathMixin.getMetadata());
+        }
+        return multiPolygon;
+    }
+
+    public JTSPointPath<Point> asPoint() {
+        if (point == null) {
+            point = new JTSPointPath<Point>(pathMixin.getMetadata());
+        }
+        return point;
+    }
+
+    public JTSPolygonPath<Polygon> asPolygon() {
+        if (polygon == null) {
+            polygon = new JTSPolygonPath<Polygon>(pathMixin.getMetadata());
+        }
+        return polygon;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPaths.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPaths.java
new file mode 100644
index 0000000000..54829fd73c
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSGeometryPaths.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.vividsolutions.jts.geom.*;
+
+/**
+ * {@code JTSGeometryPaths} provides factory methods for {@link JTSGeometryExpression} creation
+ *
+ * @author tiwe
+ *
+ */
+public interface JTSGeometryPaths {
+
+    <A extends GeometryCollection> JTSGeometryCollectionPath<A> createGeometryCollection(String property, Class<? extends A> type);
+
+    <A extends Geometry> JTSGeometryPath<A> createGeometry(String property, Class<? extends A> type);
+
+    <A extends LinearRing> JTSLinearRingPath<A> createLinearRing(String property, Class<? extends A> type);
+
+    <A extends LineString> JTSLineStringPath<A> createLineString(String property, Class<? extends A> type);
+
+    <A extends MultiLineString> JTSMultiLineStringPath<A> createMultiLineString(String property, Class<? extends A> type);
+
+    <A extends MultiPoint> JTSMultiPointPath<A> createMultiPoint(String property, Class<? extends A> type);
+
+    <A extends MultiPolygon> JTSMultiPolygonPath<A> createMultiPolygon(String property, Class<? extends A> type);
+
+    <A extends Point> JTSPointPath<A> createPoint(String property, Class<? extends A> type);
+
+    <A extends Polygon> JTSPolygonPath<A> createPolygon(String property, Class<? extends A> type);
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineExpression.java
new file mode 100644
index 0000000000..50c314ee0f
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.Expression;
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * A Line is a LineString with exactly 2 Points.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLineExpression<T extends LineString> extends JTSLineStringExpression<T> {
+
+    private static final long serialVersionUID = -4849454664355502296L;
+
+    public JTSLineExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringExpression.java
new file mode 100644
index 0000000000..2e28e4815b
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringExpression.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * A LineString is a Curve with linear interpolation between Points. Each consecutive pair of Points defines a Line
+ * segment.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLineStringExpression<T extends LineString> extends JTSCurveExpression<T> {
+
+    private static final long serialVersionUID = -6572984614863252657L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numPoints;
+
+    public JTSLineStringExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The number of Points in this LineString.
+     *
+     * @return number of points
+     */
+    public NumberExpression<Integer> numPoints() {
+        if (numPoints == null) {
+            numPoints = Expressions.numberOperation(Integer.class, SpatialOps.NUM_POINTS, mixin);
+        }
+        return numPoints;
+    }
+
+    /**
+     * Returns the specified Point N in this LineString.
+     *
+     * @param idx one based index
+     * @return point at index
+     */
+    public JTSPointExpression<Point> pointN(int idx) {
+        return JTSGeometryExpressions.pointOperation(SpatialOps.POINTN, mixin, ConstantImpl.create(idx));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringOperation.java
new file mode 100644
index 0000000000..aa9eb624d4
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringOperation.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * {@code JTSLineStringOperation} extends {@link JTSLineStringExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLineStringOperation<T extends LineString> extends JTSLineStringExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl< T> opMixin;
+
+    protected JTSLineStringOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSLineStringOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringPath.java
new file mode 100644
index 0000000000..750d6a8af6
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLineStringPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * {@code JTSLineStringPath} extends {@link JTSLineStringExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLineStringPath<T extends LineString> extends JTSLineStringExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(Path<?> parent, String property) {
+        this((Class<? extends T>) LineString.class, parent, property);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(PathMetadata metadata) {
+        this((Class<? extends T>) LineString.class, metadata);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(String var) {
+        this((Class<? extends T>) LineString.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingExpression.java
new file mode 100644
index 0000000000..259bc598c6
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.Expression;
+import com.vividsolutions.jts.geom.LineString;
+
+/**
+ * A LinearRing is a LineString that is both closed and simple.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLinearRingExpression<T extends LineString> extends JTSLineStringExpression<T> {
+
+    private static final long serialVersionUID = -759466658721392938L;
+
+    public JTSLinearRingExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingPath.java
new file mode 100644
index 0000000000..d2cb1a2de4
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSLinearRingPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.LinearRing;
+
+/**
+ * {@code JTSLinearRingPath} extends {@link JTSLinearRingExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLinearRingPath<T extends LinearRing> extends JTSLinearRingExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(Path<?> parent, String property) {
+        this((Class<? extends T>) LinearRing.class, parent, property);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(PathMetadata metadata) {
+        this((Class<? extends T>) LinearRing.class, metadata);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(String var) {
+        this((Class<? extends T>) LinearRing.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiCurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiCurveExpression.java
new file mode 100644
index 0000000000..3e21bc9ce0
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiCurveExpression.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.GeometryCollection;
+
+/**
+ * A MultiCurve is a 1-dimensional GeometryCollection whose elements are Curves.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiCurveExpression<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 6983316799469849656L;
+
+    @Nullable
+    private transient volatile BooleanExpression closed;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    public JTSMultiCurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this MultiCurve is closed [StartPoint ( ) = EndPoint ( ) for each
+     * Curve in this MultiCurve].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * The Length of this MultiCurve which is equal to the sum of the lengths of the element
+     * Curves.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringExpression.java
new file mode 100644
index 0000000000..b78441e827
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.Expression;
+import com.vividsolutions.jts.geom.MultiLineString;
+
+/**
+ * A MultiLineString is a MultiCurve whose elements are LineStrings.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiLineStringExpression<T extends MultiLineString> extends JTSMultiCurveExpression<T> {
+
+    private static final long serialVersionUID = -3103756880812584473L;
+
+    public JTSMultiLineStringExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringPath.java
new file mode 100644
index 0000000000..bb194345d5
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiLineStringPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.MultiLineString;
+
+/**
+ * {@code JTSMultiLineStringPath} extends {@link JTSMultiLineStringExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiLineStringPath<T extends MultiLineString> extends JTSMultiLineStringExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiLineString.class, parent, property);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiLineString.class, metadata);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(String var) {
+        this((Class<? extends T>) MultiLineString.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointExpression.java
new file mode 100644
index 0000000000..4fd5af8dfc
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointExpression.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.Expression;
+import com.vividsolutions.jts.geom.MultiPoint;
+
+/**
+ * A MultiPoint is a 0-dimensional GeometryCollection. The elements of a MultiPoint are restricted to Points. The
+ * Points are not connected or ordered in any semantically important way (see the discussion at
+ * GeometryCollection).
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiPointExpression<T extends MultiPoint> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 7221702165705045865L;
+
+    public JTSMultiPointExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointPath.java
new file mode 100644
index 0000000000..6d9361ed35
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPointPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.MultiPoint;
+
+/**
+ * {@code JTSMultiPointPath} extends {@link JTSMultiPointExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiPointPath<T extends MultiPoint> extends JTSMultiPointExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiPoint.class, parent, property);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiPoint.class, metadata);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(String var) {
+        this((Class<? extends T>) MultiPoint.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonExpression.java
new file mode 100644
index 0000000000..d0fbc0238c
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.types.Expression;
+import com.vividsolutions.jts.geom.MultiPolygon;
+
+/**
+ * A MultiPolygon is a MultiSurface whose elements are Polygons.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiPolygonExpression<T extends MultiPolygon> extends JTSMultiSurfaceExpression<T> {
+
+    private static final long serialVersionUID = -2285946852207189655L;
+
+    public JTSMultiPolygonExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonPath.java
new file mode 100644
index 0000000000..6d4f795081
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiPolygonPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.MultiPolygon;
+
+/**
+ * {@code JTSMultiPolygonPath} extends {@link JTSMultiPolygonExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiPolygonPath<T extends MultiPolygon> extends JTSMultiPolygonExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiPolygon.class, parent, property);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiPolygon.class, metadata);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(String var) {
+        this((Class<? extends T>) MultiPolygon.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiSurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiSurfaceExpression.java
new file mode 100644
index 0000000000..22ca6468ad
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSMultiSurfaceExpression.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * A MultiSurface is a 2-dimensional GeometryCollection whose elements are Surfaces, all using coordinates from
+ * the same coordinate reference system. The geometric interiors of any two Surfaces in a MultiSurface may not
+ * intersect in the full coordinate system. The boundaries of any two coplanar elements in a MultiSurface may
+ * intersect, at most, at a finite number of Points. If they were to meet along a curve, they could be merged into a
+ * single surface.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiSurfaceExpression<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 4133386816772862010L;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public JTSMultiSurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this MultiSurface, as measured in the spatial reference system of this MultiSurface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this MultiSurface. The result is not guaranteed to be on
+     * this MultiSurface.
+     *
+     * @return centroid
+     */
+    public JTSPointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = JTSGeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this MultiSurface.
+     *
+     * @return point on surface
+     */
+    public JTSPointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = JTSGeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointExpression.java
new file mode 100644
index 0000000000..0659d2ecd1
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointExpression.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an
+ * x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also
+ * have coordinate values for z and m.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSPointExpression<T extends Point> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = -3549448861390349654L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> x, y, z, m;
+
+    public JTSPointExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The x-coordinate value for this Point.
+     *
+     * @return x-coordinate
+     */
+    public NumberExpression<Double> x() {
+        if (x == null) {
+            x = Expressions.numberOperation(Double.class, SpatialOps.X, mixin);
+        }
+        return x;
+    }
+
+    /**
+     * The y-coordinate value for this Point.
+     *
+     * @return y-coordinate
+     */
+    public NumberExpression<Double> y() {
+        if (y == null) {
+            y = Expressions.numberOperation(Double.class, SpatialOps.Y, mixin);
+        }
+        return y;
+    }
+
+    /**
+     * The z-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return z-coordinate
+     */
+    public NumberExpression<Double> z() {
+        if (z == null) {
+            z = Expressions.numberOperation(Double.class, SpatialOps.Z, mixin);
+        }
+        return z;
+    }
+
+    /**
+     * The m-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return m-coordinate
+     */
+    public NumberExpression<Double> m() {
+        if (m == null) {
+            m = Expressions.numberOperation(Double.class, SpatialOps.M, mixin);
+        }
+        return m;
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointOperation.java
new file mode 100644
index 0000000000..562c4dabf0
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointOperation.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * {@code JTSPointOperation} extends {@link JTSPointExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPointOperation<T extends Point> extends JTSPointExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSPointOperation(Class<T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSPointOperation(Class<T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointPath.java
new file mode 100644
index 0000000000..4fc5b28b93
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPointPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * {@code JTSPointPath} extends {@link JTSPointExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPointPath<T extends Point> extends JTSPointExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Point.class, parent, property);
+    }
+
+    public JTSPointPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(PathMetadata metadata) {
+        this((Class<? extends T>) Point.class, metadata);
+    }
+
+    public JTSPointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(String var) {
+        this((Class<? extends T>) Point.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSPointPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java
new file mode 100644
index 0000000000..f086c1e416
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonExpression.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * A Polygon is a planar Surface defined by 1 exterior boundary and 0 or more interior boundaries. Each interior
+ * boundary defines a hole in the Polygon. A Triangle is a polygon with 3 distinct, non-collinear vertices and no
+ * interior boundary.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSPolygonExpression<T extends Polygon> extends JTSSurfaceExpression<T> {
+
+    private static final long serialVersionUID = 7544382956232485312L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numInteriorRing;
+
+    @Nullable
+    private transient volatile JTSLineStringExpression<LineString> exteriorRing;
+
+    public JTSPolygonExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the exterior ring of this Polygon.
+     *
+     * @return exterior ring
+     */
+    public JTSLineStringExpression<?> exteriorRing() {
+        if (exteriorRing == null) {
+            exteriorRing = JTSGeometryExpressions.lineStringOperation(SpatialOps.EXTERIOR_RING, mixin);
+        }
+        return exteriorRing;
+    }
+
+    /**
+     * Returns the number of interior rings in this Polygon.
+     *
+     * @return number of interior rings
+     */
+    public NumberExpression<Integer> numInteriorRing() {
+        if (numInteriorRing == null) {
+            numInteriorRing = Expressions.numberOperation(Integer.class, SpatialOps.NUM_INTERIOR_RING, mixin);
+        }
+        return numInteriorRing;
+    }
+
+    /**
+     * Returns the N th interior ring for this Polygon as a LineString.
+     *
+     * @param idx one based index
+     * @return interior ring at index
+     */
+    public JTSLineStringExpression<LineString> interiorRingN(int idx) {
+        return JTSGeometryExpressions.lineStringOperation(SpatialOps.INTERIOR_RINGN, mixin, ConstantImpl.create(idx));
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonOperation.java
new file mode 100644
index 0000000000..537b79a90d
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonOperation.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * {@code JTSPolygonOperation} extends {@link JTSPolygonExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPolygonOperation<T extends Polygon> extends JTSPolygonExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSPolygonOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSPolygonOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonPath.java
new file mode 100644
index 0000000000..fb390c1f6b
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSPolygonPath.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import java.lang.reflect.AnnotatedElement;
+
+import com.querydsl.core.types.*;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * {@code JTSPolygonPath} extends {@link JTSPolygonExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPolygonPath<T extends Polygon> extends JTSPolygonExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Polygon.class, parent, property);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(PathMetadata metadata) {
+        this((Class<? extends T>) Polygon.class, metadata);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(String var) {
+        this((Class<? extends T>) Polygon.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSSurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSSurfaceExpression.java
new file mode 100644
index 0000000000..8c3afaae65
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/JTSSurfaceExpression.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.jts;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * A Surface is a 2-dimensional geometric object.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSSurfaceExpression<T extends Geometry> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 3534197011234723698L;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public JTSSurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this Surface, as measured in the spatial reference system of this Surface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this Surface as a Point. The result is not guaranteed to
+     * be on this Surface.
+     *
+     * @return centroid
+     */
+    public JTSPointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = JTSGeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this Surface.
+     *
+     * @return point on surface
+     */
+    public JTSPointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = JTSGeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/package-info.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/package-info.java
new file mode 100644
index 0000000000..0e62d747c8
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/jts/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Spatial types using JTS
+ */
+package com.querydsl.spatial.jts;
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSCurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSCurveExpression.java
new file mode 100644
index 0000000000..a6cc0d550b
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSCurveExpression.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
+ * specifying the form of the interpolation between Points. This standard defines only one subclass of Curve,
+ * LineString, which uses linear interpolation between Points.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSCurveExpression<T extends Geometry> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 6139188586728676033L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> startPoint, endPoint;
+
+    @Nullable
+    private transient volatile BooleanExpression closed, ring;
+
+    public JTSCurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The length of this Curve in its associated spatial reference.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+    /**
+     * The start Point of this Curve.
+     *
+     * @return start point
+     */
+    public JTSPointExpression<Point> startPoint() {
+        if (startPoint == null) {
+            startPoint = JTSGeometryExpressions.pointOperation(SpatialOps.START_POINT, mixin);
+        }
+        return startPoint;
+    }
+
+    /**
+     * The end Point of this Curve.
+     *
+     * @return end point
+     */
+    public JTSPointExpression<Point> endPoint() {
+        if (endPoint == null) {
+            endPoint = JTSGeometryExpressions.pointOperation(SpatialOps.END_POINT, mixin);
+        }
+        return endPoint;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this Curve is closed [StartPoint ( ) = EndPoint ( )] and this Curve is
+     * simple (does not pass through the same Point more than once).
+     *
+     * @return ring
+     */
+    public BooleanExpression isRing() {
+        if (ring == null) {
+            ring = Expressions.booleanOperation(SpatialOps.IS_RING, mixin);
+        }
+        return ring;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionExpression.java
new file mode 100644
index 0000000000..c66c68c3d2
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionExpression.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Geometry collection is a geometric object that is a collection of some number of geometric objects.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSGeometryCollectionExpression<T extends GeometryCollection> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 8874174644259834690L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numGeometries;
+
+    public JTSGeometryCollectionExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the number of geometries in this GeometryCollection.
+     *
+     * @return numbers of geometries
+     */
+    public NumberExpression<Integer> numGeometries() {
+        if (numGeometries == null) {
+            numGeometries = Expressions.numberOperation(Integer.class, SpatialOps.NUM_GEOMETRIES, mixin);
+        }
+        return numGeometries;
+    }
+
+    /**
+     * Returns the Nth geometry in this GeometryCollection.
+     *
+     * @param n one based index
+     * @return matching geometry
+     */
+    public JTSGeometryExpression<Geometry> geometryN(Integer n) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.GEOMETRYN, mixin, ConstantImpl.create(n));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionPath.java
new file mode 100644
index 0000000000..b40c05e363
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryCollectionPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.GeometryCollection;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSGeometryCollectionPath} extends {@link JTSGeometryCollectionExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryCollectionPath<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(Path<?> parent, String property) {
+        this((Class<? extends T>) GeometryCollection.class, parent, property);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(PathMetadata metadata) {
+        this((Class<? extends T>) GeometryCollection.class, metadata);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryCollectionPath(String var) {
+        this((Class<? extends T>) GeometryCollection.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSGeometryCollectionPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpression.java
new file mode 100644
index 0000000000..79bda72d88
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpression.java
@@ -0,0 +1,523 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Geometry;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Geometry is the root class of the hierarchy. Geometry is an abstract (non-instantiable) class.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSGeometryExpression<T extends Geometry> extends SimpleExpression<T> {
+
+    private static final long serialVersionUID = -1183228394472681995L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> dimension, coordinateDimension, spatialDimension, srid;
+
+    @Nullable
+    private transient volatile StringExpression geometryType;
+
+    @Nullable
+    private transient volatile StringExpression text;
+
+    @Nullable
+    private transient volatile JTSGeometryExpression<Geometry> envelope, boundary, convexHull;
+
+    @Nullable
+    private transient volatile BooleanExpression empty, simple, threed, measured;
+
+    private transient volatile SimpleExpression<byte[]> binary;
+
+    public JTSGeometryExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The inherent dimension of this geometric object, which must be less than or equal
+     * to the coordinate dimension. In non-homogeneous collections, this will return the largest topological
+     * dimension of the contained objects.
+     *
+     * @return dimension
+     */
+    public NumberExpression<Integer> dimension() {
+        if (dimension == null) {
+            dimension = Expressions.numberOperation(Integer.class, SpatialOps.DIMENSION, mixin);
+        }
+        return dimension;
+    }
+
+    /**
+     * Returns the name of the instantiable subtype of Geometry of which this
+     * geometric object is an instantiable member. The name of the subtype of Geometry is returned as a string.
+     *
+     * @return geometry type
+     */
+    public StringExpression geometryType() {
+        if (geometryType == null) {
+            geometryType = Expressions.stringOperation(SpatialOps.GEOMETRY_TYPE, mixin);
+        }
+        return geometryType;
+    }
+
+    /**
+     * Returns the Spatial Reference System ID for this geometric object. This will normally be a
+     * foreign key to an index of reference systems stored in either the same or some other datastore.
+     *
+     * @return SRID
+     */
+    public NumberExpression<Integer> srid() {
+        if (srid == null) {
+            srid = Expressions.numberOperation(Integer.class, SpatialOps.SRID, mixin);
+        }
+        return srid;
+    }
+
+    /**
+     * The minimum bounding box for this Geometry, returned as a Geometry. The
+     * polygon is defined by the corner points of the bounding box [(MINX, MINY), (MAXX, MINY), (MAXX, MAXY),
+     * (MINX, MAXY), (MINX, MINY)]. Minimums for Z and M may be added. The simplest representation of an
+     * Envelope is as two direct positions, one containing all the minimums, and another all the maximums. In some
+     * cases, this coordinate will be outside the range of validity for the Spatial Reference System.
+     *
+     * @return envelope
+     */
+    public JTSGeometryExpression<Geometry> envelope() {
+        if (envelope == null) {
+            envelope = JTSGeometryExpressions.geometryOperation(SpatialOps.ENVELOPE, mixin);
+        }
+        return envelope;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Text Representation of Geometry.
+     *
+     * @return text representation
+     */
+    public StringExpression asText() {
+        if (text == null) {
+            text = Expressions.stringOperation(SpatialOps.AS_TEXT, mixin);
+        }
+        return text;
+    }
+
+    /**
+     * Exports this geometric object to a specific Well-known Binary Representation of
+     * Geometry.
+     *
+     * @return binary representation
+     */
+    public SimpleExpression<byte[]> asBinary() {
+        if (binary == null) {
+            binary = Expressions.operation(byte[].class, SpatialOps.AS_BINARY, mixin);
+        }
+        return binary;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is the empty Geometry. If true, then this
+     * geometric object represents the empty point set ∅ for the coordinate space.
+     *
+     * @return empty
+     */
+    public BooleanExpression isEmpty() {
+        if (empty == null) {
+            empty = Expressions.booleanOperation(SpatialOps.IS_EMPTY, mixin);
+        }
+        return empty;
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object has no anomalous geometric points, such
+     * as self intersection or self tangency. The description of each instantiable geometric class
+     * will include the specific conditions that cause an instance of that class to be classified as not simple.
+     *
+     * @return simple
+     */
+    public BooleanExpression isSimple() {
+        if (simple == null) {
+            simple = Expressions.booleanOperation(SpatialOps.IS_SIMPLE, mixin);
+        }
+        return simple;
+    }
+
+    /**
+     * Returns the closure of the combinatorial boundary of this geometric object
+     *
+     * @return boundary
+     */
+    public JTSGeometryExpression<Geometry> boundary() {
+        if (boundary == null) {
+            boundary = JTSGeometryExpressions.geometryOperation(SpatialOps.BOUNDARY, mixin);
+        }
+        return boundary;
+    }
+
+    // query
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(java.lang.Object)
+     */
+    @Override
+    public BooleanExpression eq(Geometry right) {
+        return eq(ConstantImpl.create(right));
+    }
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.types.dsl.SimpleExpression#eq(com.querydsl.core.types.Expression)
+     */
+    @Override
+    public BooleanExpression eq(Expression<? super T> right) {
+        return Expressions.booleanOperation(SpatialOps.EQUALS, mixin, right);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Geometry geometry) {
+        return disjoint(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially disjoint” from anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if disjoint
+     */
+    public BooleanExpression disjoint(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.DISJOINT, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Geometry geometry) {
+        return intersects(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially intersects” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if intersects
+     */
+    public BooleanExpression intersects(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.INTERSECTS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Geometry geometry) {
+        return touches(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially touches” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if touches
+     */
+    public BooleanExpression touches(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.TOUCHES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if crosses
+     */
+    public BooleanExpression crosses(Geometry geometry) {
+         return crosses(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially crosses’ anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if crosses
+     */
+    public BooleanExpression crosses(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CROSSES, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Geometry geometry) {
+        return within(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is “spatially within” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if within
+     */
+    public BooleanExpression within(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.WITHIN, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Geometry geometry) {
+        return contains(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially contains” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if contains
+     */
+    public BooleanExpression contains(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.CONTAINS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Geometry geometry) {
+        return overlaps(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object “spatially overlaps” anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return true, if overlaps
+     */
+    public BooleanExpression overlaps(Expression<? extends Geometry> geometry) {
+        return Expressions.booleanOperation(SpatialOps.OVERLAPS, mixin, geometry);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Geometry geometry, String matrix) {
+        return relate(ConstantImpl.create(geometry), matrix);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this geometric object is spatially related to anotherGeometry by testing
+     * for intersections between the interior, boundary and exterior of the two geometric objects
+     * as specified by the values in the intersectionPatternMatrix. This returns FALSE if all the
+     * tested intersections are empty except exterior (this) intersect exterior (another).
+     *
+     * @param geometry other geometry
+     * @param matrix matrix
+     * @return true, if this geometry is spatially related to the other
+     */
+    public BooleanExpression relate(Expression<? extends Geometry> geometry, String matrix) {
+        return Expressions.booleanOperation(SpatialOps.RELATE, mixin, geometry, ConstantImpl.create(matrix));
+    }
+
+    // analysis
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance
+     */
+    public NumberExpression<Double> distance(Geometry geometry) {
+        return distance(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns the shortest distance between any two Points in the two geometric objects as
+     * calculated in the spatial reference system of this geometric object. Because the geometries
+     * are closed, it is possible to find a point on each geometric object involved, such that the
+     * distance between these 2 points is the returned distance between their geometric objects.
+     *
+     * @param geometry other geometry
+     * @return distance
+     */
+    public NumberExpression<Double> distance(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSphere(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHERE, mixin, geometry);
+    }
+
+    // TODO maybe move out
+    public NumberExpression<Double> distanceSpheroid(Expression<? extends Geometry> geometry) {
+        return Expressions.numberOperation(Double.class, SpatialOps.DISTANCE_SPHEROID, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents all Points whose distance from this geometric
+     * object is less than or equal to distance. Calculations are in the spatial reference system
+     * of this geometric object. Because of the limitations of linear interpolation, there will
+     * often be some relatively small error in this distance, but it should be near the resolution
+     * of the coordinates used.
+     *
+     * @param distance distance
+     * @return buffer
+     */
+    public JTSGeometryExpression<Geometry> buffer(double distance) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.BUFFER, mixin, ConstantImpl.create(distance));
+    }
+
+    /**
+     * Returns a geometric object that represents the convex hull of this geometric object.
+     * Convex hulls, being dependent on straight lines, can be accurately represented in linear
+     * interpolations for any geometry restricted to linear interpolations.
+     *
+     * @return convex hull
+     */
+    public JTSGeometryExpression<Geometry> convexHull() {
+        if (convexHull == null) {
+            convexHull = JTSGeometryExpressions.geometryOperation(SpatialOps.CONVEXHULL, mixin);
+        }
+        return convexHull;
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> intersection(Geometry geometry) {
+        return intersection(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set intersection of this geometric
+     * object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return intersection of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> intersection(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.INTERSECTION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> union(Geometry geometry) {
+        return union(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point set
+     * union of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return union of this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> union(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.UNION, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> difference(Geometry geometry) {
+        return difference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the Point
+     * set difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return difference between this and the other geometry
+     */
+    public JTSGeometryExpression<Geometry> difference(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.DIFFERENCE, mixin, geometry);
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference
+     */
+    public JTSGeometryExpression<Geometry> symDifference(Geometry geometry) {
+        return symDifference(ConstantImpl.create(geometry));
+    }
+
+    /**
+     * Returns a geometric object that represents the
+     * Point set symmetric difference of this geometric object with anotherGeometry.
+     *
+     * @param geometry other geometry
+     * @return symmetric difference
+     */
+    public JTSGeometryExpression<Geometry> symDifference(Expression<? extends Geometry> geometry) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.SYMDIFFERENCE, mixin, geometry);
+    }
+
+    public JTSGeometryExpression<Geometry> transform(int srid) {
+        return JTSGeometryExpressions.geometryOperation(SpatialOps.TRANSFORM, mixin, ConstantImpl.create(srid));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpressions.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpressions.java
new file mode 100644
index 0000000000..086a71597a
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryExpressions.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.core.types.dsl.StringExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * GeometryExpressions contains static functions for GEO operations
+ */
+public final class JTSGeometryExpressions {
+
+    private JTSGeometryExpressions() { }
+
+    /**
+     * Return a specified ST_Geometry value from Extended Well-Known Text representation (EWKT).
+     *
+     * @param expr geometry
+     * @return EWKT form
+     */
+    public static StringExpression asEWKT(JTSGeometryExpression<?> expr) {
+        return Expressions.stringOperation(SpatialOps.AS_EWKT, expr);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static JTSGeometryExpression<?> fromText(String text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, ConstantImpl.create(text));
+    }
+
+    /**
+     * Return a specified ST_Geometry value from Well-Known Text representation (WKT).
+     *
+     * @param text WKT form
+     * @return geometry
+     */
+    public static JTSGeometryExpression<?> fromText(Expression<String> text) {
+        return geometryOperation(SpatialOps.GEOM_FROM_TEXT, text);
+    }
+
+    /**
+     * Sets the SRID on a geometry to a particular integer value.
+     *
+     * @param expr geometry
+     * @param srid SRID
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> setSRID(Expression<T> expr, int srid) {
+        return geometryOperation(expr.getType(), SpatialOps.SET_SRID,
+                expr, ConstantImpl.create(srid));
+    }
+
+    /**
+     * Returns X minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x minima
+     */
+    public static NumberExpression<Double> xmin(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMIN, expr);
+    }
+
+    /**
+     * Returns X maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return x maxima
+     */
+    public static NumberExpression<Double> xmax(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.XMAX, expr);
+    }
+
+    /**
+     * Returns Y minima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y minima
+     */
+    public static NumberExpression<Double> ymin(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMIN, expr);
+    }
+
+    /**
+     * Returns Y maxima of a bounding box 2d or 3d or a geometry.
+     *
+     * @param expr geometry
+     * @return y maxima
+     */
+    public static NumberExpression<Double> ymax(JTSGeometryExpression<?> expr) {
+        return Expressions.numberOperation(Double.class, SpatialOps.YMAX, expr);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if with distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, Expression<Double> distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, distance);
+    }
+
+    /**
+     * Returns true if the geometries are within the specified distance of one another.
+     * For geometry units are in those of spatial reference and For geography units are in meters.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @param distance distance
+     * @return true, if with distance of each other
+     */
+    public static BooleanExpression dwithin(Expression<? extends Geometry> expr1,
+                                            Expression<? extends Geometry> expr2, double distance) {
+        return Expressions.booleanOperation(SpatialOps.DWITHIN, expr1, expr2, ConstantImpl.create(distance));
+    }
+
+    /**
+     *  Returns the bounding box that bounds rows of geometries.
+     *
+     * @param collection geometry collection
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> extent(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.EXTENT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param collection geometry collection
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> collect(Expression<? extends GeometryCollection> collection) {
+        return geometryOperation(SpatialOps.COLLECT, collection);
+    }
+
+    /**
+     * Return a specified ST_Geometry value from a collection of other geometries.
+     *
+     * @param expr1 geometry
+     * @param expr2 other geometry
+     * @return geometry collection
+     */
+    public static JTSGeometryExpression<?> collect(Expression<? extends Geometry> expr1, Expression<? extends Geometry> expr2) {
+        return geometryOperation(SpatialOps.COLLECT2, expr1, expr2);
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay));
+    }
+
+    /**
+     * Translates the geometry to a new location using the numeric parameters as offsets.
+     *
+     * @param expr geometry
+     * @param deltax x offset
+     * @param deltay y offset
+     * @param deltaz z offset
+     * @param <T>
+     * @return geometry
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> translate(Expression<T> expr, float deltax, float deltay, float deltaz) {
+        return geometryOperation(expr.getType(), SpatialOps.TRANSLATE2,
+                expr, ConstantImpl.create(deltax), ConstantImpl.create(deltay), ConstantImpl.create(deltaz));
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSGeometryExpression<Geometry> geometryOperation(Operator op, Expression<?>... args) {
+        return new JTSGeometryOperation<Geometry>(Geometry.class, op, args);
+    }
+
+    /**
+     * Create a new Geometry operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> geometryOperation(Class<? extends T> type,
+                                                                                  Operator op, Expression<?>... args) {
+        return new JTSGeometryOperation<T>(type, op, args);
+    }
+
+    /**
+     * Create a new LineString operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSLineStringExpression<LineString> lineStringOperation(Operator op, Expression<?>... args) {
+        return new JTSLineStringOperation<LineString>(LineString.class, op, args);
+    }
+
+    /**
+     * Create a new Point operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSPointExpression<Point> pointOperation(Operator op, Expression<?>... args) {
+        return new JTSPointOperation<Point>(Point.class, op, args);
+    }
+
+    /**
+     * Create a new Polygon operation expression
+     *
+     * @param op operator
+     * @param args arguments
+     * @return operation expression
+     */
+    public static JTSPolygonExpression<Polygon> polygonOperation(Operator op, Expression<?>... args) {
+        return new JTSPolygonOperation<Polygon>(Polygon.class, op, args);
+    }
+
+    /**
+     * Create a new JTSGeometryExpression
+     *
+     * @param expr Expression of type Geometry
+     * @return new JTSGeometryExpression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> asJTSGeometry(
+            Expression<T> expr) {
+        Expression<T> underlyingMixin = ExpressionUtils.extract(expr);
+        return new JTSGeometryExpression<T>(underlyingMixin) {
+
+            private static final long serialVersionUID = -6714044005570420009L;
+
+            @Override
+            public <R, C> R accept(Visitor<R, C> v, C context) {
+                return this.mixin.accept(v, context);
+            }
+
+        };
+    }
+
+    /**
+     * Create a new JTSGeometryExpression
+     *
+     * @param value Geometry
+     * @return new JTSGeometryExpression
+     */
+    public static <T extends Geometry> JTSGeometryExpression<T> asJTSGeometry(T value) {
+        return asJTSGeometry(Expressions.constant(value));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryOperation.java
new file mode 100644
index 0000000000..42e968aa04
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryOperation.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.OperationImpl;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Geometry;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@code JTSGeometryOperation} extends {@link JTSGeometryExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryOperation<T extends Geometry> extends JTSGeometryExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSGeometryOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSGeometryOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPath.java
new file mode 100644
index 0000000000..b3d40f3ed2
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPath.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSGeometryPath} extends {@link JTSGeometryExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSGeometryPath<T extends Geometry> extends JTSGeometryExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    private transient volatile JTSGeometryCollectionPath<GeometryCollection> collection;
+
+    private transient volatile JTSLinearRingPath<LinearRing> linearRing;
+
+    private transient volatile JTSLineStringPath<LineString> lineString;
+
+    private transient volatile JTSMultiLineStringPath<MultiLineString> multiLineString;
+
+    private transient volatile JTSMultiPointPath<MultiPoint> multiPoint;
+
+    private transient volatile JTSMultiPolygonPath<MultiPolygon> multiPolygon;
+
+    private transient volatile JTSPointPath<Point> point;
+
+    private transient volatile JTSPolygonPath<Polygon> polygon;
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Geometry.class, parent, property);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(PathMetadata metadata) {
+        this((Class<? extends T>) Geometry.class, metadata);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSGeometryPath(String var) {
+        this((Class<? extends T>) Geometry.class, PathMetadataFactory.forVariable(var));
+    }
+
+    public JTSGeometryCollectionPath<GeometryCollection> asCollection() {
+        if (collection == null) {
+            collection = new JTSGeometryCollectionPath<GeometryCollection>(pathMixin.getMetadata());
+        }
+        return collection;
+    }
+
+    public JTSLinearRingPath<LinearRing> asLinearRing() {
+        if (linearRing == null) {
+            linearRing = new JTSLinearRingPath<LinearRing>(pathMixin.getMetadata());
+        }
+        return linearRing;
+    }
+
+    public JTSLineStringPath<LineString> asLineString() {
+        if (lineString == null) {
+            lineString = new JTSLineStringPath<LineString>(pathMixin.getMetadata());
+        }
+        return lineString;
+    }
+
+    public JTSMultiLineStringPath<MultiLineString> asMultiLineString() {
+        if (multiLineString == null) {
+            multiLineString = new JTSMultiLineStringPath<MultiLineString>(pathMixin.getMetadata());
+        }
+        return multiLineString;
+    }
+
+    public JTSMultiPointPath<MultiPoint> asMultiPoint() {
+        if (multiPoint == null) {
+            multiPoint = new JTSMultiPointPath<MultiPoint>(pathMixin.getMetadata());
+        }
+        return multiPoint;
+    }
+
+    public JTSMultiPolygonPath<MultiPolygon> asMultiPolygon() {
+        if (multiPolygon == null) {
+            multiPolygon = new JTSMultiPolygonPath<MultiPolygon>(pathMixin.getMetadata());
+        }
+        return multiPolygon;
+    }
+
+    public JTSPointPath<Point> asPoint() {
+        if (point == null) {
+            point = new JTSPointPath<Point>(pathMixin.getMetadata());
+        }
+        return point;
+    }
+
+    public JTSPolygonPath<Polygon> asPolygon() {
+        if (polygon == null) {
+            polygon = new JTSPolygonPath<Polygon>(pathMixin.getMetadata());
+        }
+        return polygon;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSGeometryPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPaths.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPaths.java
new file mode 100644
index 0000000000..e77d973d48
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSGeometryPaths.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.MultiLineString;
+import org.locationtech.jts.geom.MultiPoint;
+import org.locationtech.jts.geom.MultiPolygon;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+
+/**
+ * {@code JTSGeometryPaths} provides factory methods for {@link JTSGeometryExpression} creation
+ *
+ * @author tiwe
+ *
+ */
+public interface JTSGeometryPaths {
+
+    <A extends GeometryCollection> JTSGeometryCollectionPath<A> createGeometryCollection(String property, Class<? extends A> type);
+
+    <A extends Geometry> JTSGeometryPath<A> createGeometry(String property, Class<? extends A> type);
+
+    <A extends LinearRing> JTSLinearRingPath<A> createLinearRing(String property, Class<? extends A> type);
+
+    <A extends LineString> JTSLineStringPath<A> createLineString(String property, Class<? extends A> type);
+
+    <A extends MultiLineString> JTSMultiLineStringPath<A> createMultiLineString(String property, Class<? extends A> type);
+
+    <A extends MultiPoint> JTSMultiPointPath<A> createMultiPoint(String property, Class<? extends A> type);
+
+    <A extends MultiPolygon> JTSMultiPolygonPath<A> createMultiPolygon(String property, Class<? extends A> type);
+
+    <A extends Point> JTSPointPath<A> createPoint(String property, Class<? extends A> type);
+
+    <A extends Polygon> JTSPolygonPath<A> createPolygon(String property, Class<? extends A> type);
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineExpression.java
new file mode 100644
index 0000000000..36c77d1c9b
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * A Line is a LineString with exactly 2 Points.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLineExpression<T extends LineString> extends JTSLineStringExpression<T> {
+
+    private static final long serialVersionUID = -4849454664355502296L;
+
+    public JTSLineExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringExpression.java
new file mode 100644
index 0000000000..5700d89fbc
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringExpression.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A LineString is a Curve with linear interpolation between Points. Each consecutive pair of Points defines a Line
+ * segment.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLineStringExpression<T extends LineString> extends JTSCurveExpression<T> {
+
+    private static final long serialVersionUID = -6572984614863252657L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numPoints;
+
+    public JTSLineStringExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The number of Points in this LineString.
+     *
+     * @return number of points
+     */
+    public NumberExpression<Integer> numPoints() {
+        if (numPoints == null) {
+            numPoints = Expressions.numberOperation(Integer.class, SpatialOps.NUM_POINTS, mixin);
+        }
+        return numPoints;
+    }
+
+    /**
+     * Returns the specified Point N in this LineString.
+     *
+     * @param idx one based index
+     * @return point at index
+     */
+    public JTSPointExpression<Point> pointN(int idx) {
+        return JTSGeometryExpressions.pointOperation(SpatialOps.POINTN, mixin, ConstantImpl.create(idx));
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringOperation.java
new file mode 100644
index 0000000000..f267995406
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringOperation.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.OperationImpl;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.LineString;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@code JTSLineStringOperation} extends {@link JTSLineStringExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLineStringOperation<T extends LineString> extends JTSLineStringExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl< T> opMixin;
+
+    protected JTSLineStringOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSLineStringOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringPath.java
new file mode 100644
index 0000000000..9107c44ea2
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLineStringPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.LineString;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSLineStringPath} extends {@link JTSLineStringExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLineStringPath<T extends LineString> extends JTSLineStringExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(Path<?> parent, String property) {
+        this((Class<? extends T>) LineString.class, parent, property);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(PathMetadata metadata) {
+        this((Class<? extends T>) LineString.class, metadata);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLineStringPath(String var) {
+        this((Class<? extends T>) LineString.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSLineStringPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingExpression.java
new file mode 100644
index 0000000000..9a7de8fa62
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import org.locationtech.jts.geom.LineString;
+
+/**
+ * A LinearRing is a LineString that is both closed and simple.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSLinearRingExpression<T extends LineString> extends JTSLineStringExpression<T> {
+
+    private static final long serialVersionUID = -759466658721392938L;
+
+    public JTSLinearRingExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingPath.java
new file mode 100644
index 0000000000..a4423373ad
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSLinearRingPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.LinearRing;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSLinearRingPath} extends {@link JTSLinearRingExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSLinearRingPath<T extends LinearRing> extends JTSLinearRingExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(Path<?> parent, String property) {
+        this((Class<? extends T>) LinearRing.class, parent, property);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(PathMetadata metadata) {
+        this((Class<? extends T>) LinearRing.class, metadata);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSLinearRingPath(String var) {
+        this((Class<? extends T>) LinearRing.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSLinearRingPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiCurveExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiCurveExpression.java
new file mode 100644
index 0000000000..187e0added
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiCurveExpression.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A MultiCurve is a 1-dimensional GeometryCollection whose elements are Curves.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiCurveExpression<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 6983316799469849656L;
+
+    @Nullable
+    private transient volatile BooleanExpression closed;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> length;
+
+    public JTSMultiCurveExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns 1 (TRUE) if this MultiCurve is closed [StartPoint ( ) = EndPoint ( ) for each
+     * Curve in this MultiCurve].
+     *
+     * @return closed
+     */
+    public BooleanExpression isClosed() {
+        if (closed == null) {
+            closed = Expressions.booleanOperation(SpatialOps.IS_CLOSED, mixin);
+        }
+        return closed;
+    }
+
+    /**
+     * The Length of this MultiCurve which is equal to the sum of the lengths of the element
+     * Curves.
+     *
+     * @return length
+     */
+    public NumberExpression<Double> length() {
+        if (length == null) {
+            length = Expressions.numberOperation(Double.class, SpatialOps.LENGTH, mixin);
+        }
+        return length;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringExpression.java
new file mode 100644
index 0000000000..22e9219995
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import org.locationtech.jts.geom.MultiLineString;
+
+/**
+ * A MultiLineString is a MultiCurve whose elements are LineStrings.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiLineStringExpression<T extends MultiLineString> extends JTSMultiCurveExpression<T> {
+
+    private static final long serialVersionUID = -3103756880812584473L;
+
+    public JTSMultiLineStringExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringPath.java
new file mode 100644
index 0000000000..8bef108164
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiLineStringPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.MultiLineString;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSMultiLineStringPath} extends {@link JTSMultiLineStringExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiLineStringPath<T extends MultiLineString> extends JTSMultiLineStringExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiLineString.class, parent, property);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiLineString.class, metadata);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiLineStringPath(String var) {
+        this((Class<? extends T>) MultiLineString.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiLineStringPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointExpression.java
new file mode 100644
index 0000000000..b1b870c454
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointExpression.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import org.locationtech.jts.geom.MultiPoint;
+
+/**
+ * A MultiPoint is a 0-dimensional GeometryCollection. The elements of a MultiPoint are restricted to Points. The
+ * Points are not connected or ordered in any semantically important way (see the discussion at
+ * GeometryCollection).
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiPointExpression<T extends MultiPoint> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 7221702165705045865L;
+
+    public JTSMultiPointExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointPath.java
new file mode 100644
index 0000000000..d15d6f73bb
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPointPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.MultiPoint;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSMultiPointPath} extends {@link JTSMultiPointExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiPointPath<T extends MultiPoint> extends JTSMultiPointExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiPoint.class, parent, property);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiPoint.class, metadata);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPointPath(String var) {
+        this((Class<? extends T>) MultiPoint.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiPointPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonExpression.java
new file mode 100644
index 0000000000..3afe6171c9
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonExpression.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import org.locationtech.jts.geom.MultiPolygon;
+
+/**
+ * A MultiPolygon is a MultiSurface whose elements are Polygons.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiPolygonExpression<T extends MultiPolygon> extends JTSMultiSurfaceExpression<T> {
+
+    private static final long serialVersionUID = -2285946852207189655L;
+
+    public JTSMultiPolygonExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonPath.java
new file mode 100644
index 0000000000..6ba7725907
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiPolygonPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.MultiPolygon;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSMultiPolygonPath} extends {@link JTSMultiPolygonExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSMultiPolygonPath<T extends MultiPolygon> extends JTSMultiPolygonExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(Path<?> parent, String property) {
+        this((Class<? extends T>) MultiPolygon.class, parent, property);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(PathMetadata metadata) {
+        this((Class<? extends T>) MultiPolygon.class, metadata);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSMultiPolygonPath(String var) {
+        this((Class<? extends T>) MultiPolygon.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSMultiPolygonPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiSurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiSurfaceExpression.java
new file mode 100644
index 0000000000..ac757157e4
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSMultiSurfaceExpression.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A MultiSurface is a 2-dimensional GeometryCollection whose elements are Surfaces, all using coordinates from
+ * the same coordinate reference system. The geometric interiors of any two Surfaces in a MultiSurface may not
+ * intersect in the full coordinate system. The boundaries of any two coplanar elements in a MultiSurface may
+ * intersect, at most, at a finite number of Points. If they were to meet along a curve, they could be merged into a
+ * single surface.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSMultiSurfaceExpression<T extends GeometryCollection> extends JTSGeometryCollectionExpression<T> {
+
+    private static final long serialVersionUID = 4133386816772862010L;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public JTSMultiSurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this MultiSurface, as measured in the spatial reference system of this MultiSurface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this MultiSurface. The result is not guaranteed to be on
+     * this MultiSurface.
+     *
+     * @return centroid
+     */
+    public JTSPointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = JTSGeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this MultiSurface.
+     *
+     * @return point on surface
+     */
+    public JTSPointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = JTSGeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointExpression.java
new file mode 100644
index 0000000000..a08616f58e
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointExpression.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an
+ * x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also
+ * have coordinate values for z and m.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSPointExpression<T extends Point> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = -3549448861390349654L;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> x, y, z, m;
+
+    public JTSPointExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The x-coordinate value for this Point.
+     *
+     * @return x-coordinate
+     */
+    public NumberExpression<Double> x() {
+        if (x == null) {
+            x = Expressions.numberOperation(Double.class, SpatialOps.X, mixin);
+        }
+        return x;
+    }
+
+    /**
+     * The y-coordinate value for this Point.
+     *
+     * @return y-coordinate
+     */
+    public NumberExpression<Double> y() {
+        if (y == null) {
+            y = Expressions.numberOperation(Double.class, SpatialOps.Y, mixin);
+        }
+        return y;
+    }
+
+    /**
+     * The z-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return z-coordinate
+     */
+    public NumberExpression<Double> z() {
+        if (z == null) {
+            z = Expressions.numberOperation(Double.class, SpatialOps.Z, mixin);
+        }
+        return z;
+    }
+
+    /**
+     * The m-coordinate value for this Point, if it has one. Returns NIL otherwise.
+     *
+     * @return m-coordinate
+     */
+    public NumberExpression<Double> m() {
+        if (m == null) {
+            m = Expressions.numberOperation(Double.class, SpatialOps.M, mixin);
+        }
+        return m;
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointOperation.java
new file mode 100644
index 0000000000..d0c9e3b161
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.OperationImpl;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Point;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@code JTSPointOperation} extends {@link JTSPointExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPointOperation<T extends Point> extends JTSPointExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSPointOperation(Class<T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSPointOperation(Class<T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointPath.java
new file mode 100644
index 0000000000..50d02a11f8
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPointPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Point;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSPointPath} extends {@link JTSPointExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPointPath<T extends Point> extends JTSPointExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Point.class, parent, property);
+    }
+
+    public JTSPointPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(PathMetadata metadata) {
+        this((Class<? extends T>) Point.class, metadata);
+    }
+
+    public JTSPointPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPointPath(String var) {
+        this((Class<? extends T>) Point.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSPointPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonExpression.java
new file mode 100644
index 0000000000..56ecea16e2
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonExpression.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Polygon is a planar Surface defined by 1 exterior boundary and 0 or more interior boundaries. Each interior
+ * boundary defines a hole in the Polygon. A Triangle is a polygon with 3 distinct, non-collinear vertices and no
+ * interior boundary.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSPolygonExpression<T extends Polygon> extends JTSSurfaceExpression<T> {
+
+    private static final long serialVersionUID = 7544382956232485312L;
+
+    @Nullable
+    private transient volatile NumberExpression<Integer> numInteriorRing;
+
+    @Nullable
+    private transient volatile JTSLineStringExpression<LineString> exteriorRing;
+
+    public JTSPolygonExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * Returns the exterior ring of this Polygon.
+     *
+     * @return exterior ring
+     */
+    public JTSLineStringExpression<?> exteriorRing() {
+        if (exteriorRing == null) {
+            exteriorRing = JTSGeometryExpressions.lineStringOperation(SpatialOps.EXTERIOR_RING, mixin);
+        }
+        return exteriorRing;
+    }
+
+    /**
+     * Returns the number of interior rings in this Polygon.
+     *
+     * @return number of interior rings
+     */
+    public NumberExpression<Integer> numInteriorRing() {
+        if (numInteriorRing == null) {
+            numInteriorRing = Expressions.numberOperation(Integer.class, SpatialOps.NUM_INTERIOR_RING, mixin);
+        }
+        return numInteriorRing;
+    }
+
+    /**
+     * Returns the N th interior ring for this Polygon as a LineString.
+     *
+     * @param idx one based index
+     * @return interior ring at index
+     */
+    public JTSLineStringExpression<LineString> interiorRingN(int idx) {
+        return JTSGeometryExpressions.lineStringOperation(SpatialOps.INTERIOR_RINGN, mixin, ConstantImpl.create(idx));
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonOperation.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonOperation.java
new file mode 100644
index 0000000000..2087965968
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.OperationImpl;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Polygon;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@code JTSPolygonOperation} extends {@link JTSPolygonExpression} to implement the
+ * {@link Operation} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPolygonOperation<T extends Polygon> extends JTSPolygonExpression<T> implements Operation<T> {
+
+    private static final long serialVersionUID = 3433471874808633698L;
+
+    private final OperationImpl<T> opMixin;
+
+    protected JTSPolygonOperation(Class<? extends T> type, Operator op, Expression<?>... args) {
+        this(type, op, Arrays.asList(args));
+    }
+
+    protected JTSPolygonOperation(Class<? extends T> type, Operator op, List<Expression<?>> args) {
+        super(ExpressionUtils.operation(type, op, args));
+        this.opMixin = (OperationImpl<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(opMixin, context);
+    }
+
+    @Override
+    public Expression<?> getArg(int index) {
+        return opMixin.getArg(index);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return opMixin.getArgs();
+    }
+
+    @Override
+    public Operator getOperator() {
+        return opMixin.getOperator();
+    }
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonPath.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonPath.java
new file mode 100644
index 0000000000..9d3eb1d341
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSPolygonPath.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathImpl;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Visitor;
+import org.locationtech.jts.geom.Polygon;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * {@code JTSPolygonPath} extends {@link JTSPolygonExpression} to implement the
+ * {@link Path} interface
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class JTSPolygonPath<T extends Polygon> extends JTSPolygonExpression<T> implements Path<T> {
+
+    private static final long serialVersionUID = 312776751843333543L;
+
+    private final PathImpl<T> pathMixin;
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(Path<?> parent, String property) {
+        this((Class<? extends T>) Polygon.class, parent, property);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, Path<?> parent, String property) {
+        this(type, PathMetadataFactory.forProperty(parent, property));
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(PathMetadata metadata) {
+        this((Class<? extends T>) Polygon.class, metadata);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, PathMetadata metadata) {
+        super(ExpressionUtils.path(type, metadata));
+        this.pathMixin = (PathImpl<T>) mixin;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JTSPolygonPath(String var) {
+        this((Class<? extends T>) Polygon.class, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(pathMixin, context);
+    }
+
+    public JTSPolygonPath(Class<? extends T> type, String var) {
+        this(type, PathMetadataFactory.forVariable(var));
+    }
+
+    @Override
+    public PathMetadata getMetadata() {
+        return pathMixin.getMetadata();
+    }
+
+    @Override
+    public Path<?> getRoot() {
+        return pathMixin.getRoot();
+    }
+
+    @Override
+    public AnnotatedElement getAnnotatedElement() {
+        return pathMixin.getAnnotatedElement();
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSSurfaceExpression.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSSurfaceExpression.java
new file mode 100644
index 0000000000..e0358415f9
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/JTSSurfaceExpression.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.spatial.locationtech.jts;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.spatial.SpatialOps;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A Surface is a 2-dimensional geometric object.
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class JTSSurfaceExpression<T extends Geometry> extends JTSGeometryExpression<T> {
+
+    private static final long serialVersionUID = 3534197011234723698L;
+
+    @Nullable
+    private transient volatile JTSPointExpression<Point> centroid, pointOnSurface;
+
+    @Nullable
+    private transient volatile NumberExpression<Double> area;
+
+    public JTSSurfaceExpression(Expression<T> mixin) {
+        super(mixin);
+    }
+
+    /**
+     * The area of this Surface, as measured in the spatial reference system of this Surface.
+     *
+     * @return area
+     */
+    public NumberExpression<Double> area() {
+        if (area == null) {
+            area = Expressions.numberOperation(Double.class, SpatialOps.AREA, mixin);
+        }
+        return area;
+    }
+
+    /**
+     * The mathematical centroid for this Surface as a Point. The result is not guaranteed to
+     * be on this Surface.
+     *
+     * @return centroid
+     */
+    public JTSPointExpression<Point> centroid() {
+        if (centroid == null) {
+            centroid = JTSGeometryExpressions.pointOperation(SpatialOps.CENTROID, mixin);
+        }
+        return centroid;
+    }
+
+    /**
+     * A Point guaranteed to be on this Surface.
+     *
+     * @return point on surface
+     */
+    public JTSPointExpression<Point> pointOnSurface() {
+        if (pointOnSurface == null) {
+            pointOnSurface = JTSGeometryExpressions.pointOperation(SpatialOps.POINT_ON_SURFACE, mixin);
+        }
+        return pointOnSurface;
+    }
+
+}
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/package-info.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/package-info.java
new file mode 100644
index 0000000000..758d3e3f61
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/locationtech/jts/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Spatial types using JTS
+ */
+package com.querydsl.spatial.locationtech.jts;
diff --git a/querydsl-spatial/src/main/java/com/querydsl/spatial/package-info.java b/querydsl-spatial/src/main/java/com/querydsl/spatial/package-info.java
new file mode 100644
index 0000000000..e1c782393e
--- /dev/null
+++ b/querydsl-spatial/src/main/java/com/querydsl/spatial/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Spatial types using Geolatte
+ */
+package com.querydsl.spatial;
diff --git a/querydsl-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension b/querydsl-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
new file mode 100644
index 0000000000..660cfe9b1a
--- /dev/null
+++ b/querydsl-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
@@ -0,0 +1 @@
+com.querydsl.spatial.apt.SpatialSupport
\ No newline at end of file
diff --git a/querydsl-spatial/src/test/java/com/mysema/query/spatial/HibernateSpatialSupport.java b/querydsl-spatial/src/test/java/com/mysema/query/spatial/HibernateSpatialSupport.java
deleted file mode 100644
index 8ae00df5de..0000000000
--- a/querydsl-spatial/src/test/java/com/mysema/query/spatial/HibernateSpatialSupport.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.spatial;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.types.Operator;
-
-import java.util.Map;
-
-public class HibernateSpatialSupport {
-
-    public static Map<Operator<?>, String> getSpatialOps(String prefix, boolean asFunction) {
-        Map<Operator<?>, String> ops = Maps.newHashMap();
-        ops.put(SpatialOps.DIMENSION, "dimension({0})");
-        ops.put(SpatialOps.GEOMETRY_TYPE, "geometrytype({0}, {1})");
-        ops.put(SpatialOps.SRID, "srid({0})");
-        ops.put(SpatialOps.ENVELOPE, "envelope({0})");
-        ops.put(SpatialOps.AS_TEXT, "astext({0})");
-        ops.put(SpatialOps.AS_BINARY, "asbinary({0})");
-        ops.put(SpatialOps.IS_EMPTY, "isempty({0})");
-        ops.put(SpatialOps.IS_SIMPLE, "issimple({0})");
-        ops.put(SpatialOps.BOUNDARY, "boundary({0})");
-
-        ops.put(SpatialOps.EQUALS, "equals({0}, {1})");
-        ops.put(SpatialOps.DISJOINT, "disjoint({0}, {1})");
-        ops.put(SpatialOps.INTERSECTS, "intersects({0}, {1})");
-        ops.put(SpatialOps.TOUCHES, "touches({0}, {1})");
-        ops.put(SpatialOps.CROSSES, "crosses({0}, {1})");
-        ops.put(SpatialOps.WITHIN, "within({0}, {1})");
-        ops.put(SpatialOps.CONTAINS, "contains({0}, {1})");
-        ops.put(SpatialOps.OVERLAPS, "overlaps({0}, {1})");
-        ops.put(SpatialOps.RELATE, "relate({0}, {1}, {2})");
-
-        ops.put(SpatialOps.DISTANCE, "distance({0}, {1})");
-        ops.put(SpatialOps.BUFFER, "buffer({0}, {1})");
-        ops.put(SpatialOps.CONVEXHULL, "convexhull({0})");
-        ops.put(SpatialOps.INTERSECTION, "intersection({0}, {1})");
-        ops.put(SpatialOps.UNION, "geomunion({0}, {1})");
-        ops.put(SpatialOps.DIFFERENCE, "difference({0}, {1})");
-        ops.put(SpatialOps.SYMDIFFERENCE, "symdifference({0}, {1})");
-        // dwithin({0}, {1}, 2)
-        ops.put(SpatialOps.TRANSFORM, "transform({0}, {1})");
-        // extent({0})
-        return ops;
-    }
-}
diff --git a/querydsl-spatial/src/test/java/com/mysema/query/spatial/path/GeometryPathTest.java b/querydsl-spatial/src/test/java/com/mysema/query/spatial/path/GeometryPathTest.java
deleted file mode 100644
index d1f39c8aa0..0000000000
--- a/querydsl-spatial/src/test/java/com/mysema/query/spatial/path/GeometryPathTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.spatial.path;
-
-import static org.junit.Assert.assertEquals;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-import org.junit.Test;
-
-public class GeometryPathTest {
-
-    @Test
-    public void Convert() {
-        GeometryPath<Geometry> geometry = new GeometryPath<Geometry>("geometry");
-        assertEquals(new GeometryCollectionPath<GeometryCollection>("geometry"), geometry.asCollection());
-        assertEquals(new LinearRingPath<LinearRing>("geometry"), geometry.asLinearRing());
-        assertEquals(new LineStringPath<LineString>("geometry"), geometry.asLineString());
-        assertEquals(new MultiLineStringPath<MultiLineString>("geometry"), geometry.asMultiLineString());
-        assertEquals(new MultiPointPath<MultiPoint>("geometry"), geometry.asMultiPoint());
-        assertEquals(new MultiPolygonPath<MultiPolygon>("geometry"), geometry.asMultiPolygon());
-        assertEquals(new PointPath<Point>("geometry"), geometry.asPoint());
-        assertEquals(new PolygonPath<Polygon>("geometry"), geometry.asPolygon());
-        assertEquals(new PolyhedralSurfacePath<PolyHedralSurface>("geometry"), geometry.asPolygHedralSurface());
-    }
-}
diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryEntity.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryEntity.java
new file mode 100644
index 0000000000..2cc1e2e633
--- /dev/null
+++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryEntity.java
@@ -0,0 +1,28 @@
+package com.querydsl.spatial;
+
+import org.geolatte.geom.*;
+
+import com.querydsl.core.annotations.QueryEntity;
+
+@QueryEntity
+public class GeometryEntity {
+
+    Geometry geometry;
+
+    GeometryCollection geometryCollection;
+
+    LinearRing linearRing;
+
+    LineString lineString;
+
+    MultiLineString multiLineString;
+
+    MultiPoint multiPoint;
+
+    MultiPolygon multiPolygon;
+
+    Point point;
+
+    Polygon polygon;
+
+}
diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java
new file mode 100644
index 0000000000..6fbaea1f00
--- /dev/null
+++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java
@@ -0,0 +1,22 @@
+package com.querydsl.spatial;
+
+import static org.junit.Assert.assertEquals;
+
+import org.geolatte.geom.*;
+import org.junit.Test;
+
+public class GeometryPathTest {
+
+    @Test
+    public void convert() {
+        GeometryPath<Geometry> geometry = new GeometryPath<Geometry>("geometry");
+        assertEquals(new GeometryCollectionPath<GeometryCollection>("geometry"), geometry.asCollection());
+        assertEquals(new LinearRingPath<LinearRing>("geometry"), geometry.asLinearRing());
+        assertEquals(new LineStringPath<LineString>("geometry"), geometry.asLineString());
+        assertEquals(new MultiLineStringPath<MultiLineString>("geometry"), geometry.asMultiLineString());
+        assertEquals(new MultiPointPath<MultiPoint>("geometry"), geometry.asMultiPoint());
+        assertEquals(new MultiPolygonPath<MultiPolygon>("geometry"), geometry.asMultiPolygon());
+        assertEquals(new PointPath<Point>("geometry"), geometry.asPoint());
+        assertEquals(new PolygonPath<Polygon>("geometry"), geometry.asPolygon());
+    }
+}
diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java
new file mode 100644
index 0000000000..7723637660
--- /dev/null
+++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java
@@ -0,0 +1,21 @@
+package com.querydsl.spatial.hibernate;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.spatial.SpatialOps;
+
+public class HibernateSpatialSupportTest {
+
+    @Test
+    public void allMapped() {
+        Map<Operator, String> mapping = HibernateSpatialSupport.getSpatialOps();
+        for (Operator operator : SpatialOps.values()) {
+            assertTrue(operator + " missing", mapping.containsKey(operator));
+        }
+    }
+}
diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryEntity.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryEntity.java
new file mode 100644
index 0000000000..4aa6d87ae4
--- /dev/null
+++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryEntity.java
@@ -0,0 +1,27 @@
+package com.querydsl.spatial.jts;
+
+import com.querydsl.core.annotations.QueryEntity;
+import com.vividsolutions.jts.geom.*;
+
+@QueryEntity
+public class JTSGeometryEntity {
+
+    Geometry geometry;
+
+    GeometryCollection geometryCollection;
+
+    LinearRing linearRing;
+
+    LineString lineString;
+
+    MultiLineString multiLineString;
+
+    MultiPoint multiPoint;
+
+    MultiPolygon multiPolygon;
+
+    Point point;
+
+    Polygon polygon;
+
+}
diff --git a/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java b/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java
new file mode 100644
index 0000000000..59894d49d1
--- /dev/null
+++ b/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.spatial.jts;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vividsolutions.jts.geom.*;
+
+public class JTSGeometryPathTest {
+
+    @Test
+    public void convert() {
+        JTSGeometryPath<Geometry> geometry = new JTSGeometryPath<Geometry>("geometry");
+        assertEquals(new JTSGeometryCollectionPath<GeometryCollection>("geometry"), geometry.asCollection());
+        assertEquals(new JTSLinearRingPath<LinearRing>("geometry"), geometry.asLinearRing());
+        assertEquals(new JTSLineStringPath<LineString>("geometry"), geometry.asLineString());
+        assertEquals(new JTSMultiLineStringPath<MultiLineString>("geometry"), geometry.asMultiLineString());
+        assertEquals(new JTSMultiPointPath<MultiPoint>("geometry"), geometry.asMultiPoint());
+        assertEquals(new JTSMultiPolygonPath<MultiPolygon>("geometry"), geometry.asMultiPolygon());
+        assertEquals(new JTSPointPath<Point>("geometry"), geometry.asPoint());
+        assertEquals(new JTSPolygonPath<Polygon>("geometry"), geometry.asPolygon());
+    }
+}
diff --git a/querydsl-spatial/template.mf b/querydsl-spatial/template.mf
deleted file mode 100644
index 72e7150306..0000000000
--- a/querydsl-spatial/template.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.core
-Bundle-Name: Querydsl Spatial
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  javax.annotation.*;version="0",
-  org.geolatte.geom.*;version="0.11",
-  com.mysema.query.*;version="${project.version}",
-  com.google.common.*;version="${guava.version}"
diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml
index cb5cb44fe1..3f109c5084 100644
--- a/querydsl-sql-codegen/pom.xml
+++ b/querydsl-sql-codegen/pom.xml
@@ -1,50 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-sql-codegen</artifactId>
   <name>Querydsl - SQL codegen support</name>
   <description>SQL codegen support for Querydsl</description>
   <packaging>jar</packaging>
 
   <properties>
-    <ant.version>1.8.1</ant.version>
+    <ant.version>1.10.12</ant.version>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-codegen</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-sql</artifactId>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-codegen</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-spatial</artifactId>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
-    </dependency>        
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-        <scope>provided</scope>      
-    </dependency>    
 
     <!-- ANT integration -->    
     <dependency>
@@ -56,7 +46,13 @@
 
     <!-- test -->
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-sql</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -75,6 +71,12 @@
       <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -86,30 +88,59 @@
       <artifactId>postgresql</artifactId>
       <version>${postgresql.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc6</artifactId>
-      <version>11.1.0.7.0</version>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
+      <version>${oracle.version}</version>
       <scope>test</scope>
     </dependency>
           
     <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>${jtds.version}</version>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>${mssql.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opengeo</groupId>
-      <artifactId>geodb</artifactId>
-      <version>0.7</version>
+      <groupId>org.orbisgis</groupId>
+      <artifactId>h2gis</artifactId>
+      <version>${h2gis.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.35</version>
       <scope>test</scope>
     </dependency>
 
@@ -121,7 +152,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -139,8 +170,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>   
     
       <plugin>       
@@ -149,7 +180,7 @@
           <descriptors>
             <descriptor>src/main/assembly.xml</descriptor>
           </descriptors>
-          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
+          <outputDirectory>../target/dist</outputDirectory>
         </configuration>
       </plugin>       
     
@@ -164,6 +195,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.sql.codegen</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -191,7 +229,7 @@
       
       <!-- 
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <executions>
@@ -204,7 +242,7 @@
         <configuration>
           <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
           <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-          <packageName>com.mysema.query.sql.domain2</packageName>
+          <packageName>com.querydsl.sql.domain2</packageName>
           <targetFolder>target/generated-test-sources/java</targetFolder>
         </configuration>
         <dependencies>
@@ -219,4 +257,4 @@
     </plugins>
   </build>
   
-</project>
+</project>
diff --git a/querydsl-sql-codegen/src/main/assembly.xml b/querydsl-sql-codegen/src/main/assembly.xml
index e14a926712..d0d3bf827a 100644
--- a/querydsl-sql-codegen/src/main/assembly.xml
+++ b/querydsl-sql-codegen/src/main/assembly.xml
@@ -8,7 +8,7 @@
   </formats>
   <files>
     <file>
-      <source>../querydsl-root/LICENSE.txt</source>
+      <source>../LICENSE.txt</source>
       <outputDirectory>/</outputDirectory>
     </file>
   </files>
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java
deleted file mode 100644
index 5f6dd822ea..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.ant;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Comparator;
-
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.query.codegen.BeanSerializer;
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.MetaDataExporter;
-import com.mysema.query.sql.codegen.NamingStrategy;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * AntMetaDataExporter exports JDBC metadata to Querydsl query types
- *
- * @author tiwe
- *
- */
-public class AntMetaDataExporter extends Task {
-
-    /**
-     * JDBC driver class name
-     */
-    private String jdbcDriverClass;
-
-    /**
-     * JDBC connection url
-     */
-    private String dbUrl;
-
-    /**
-     * JDBC connection username
-     */
-    private String dbUserName;
-
-    /**
-     * JDBC connection password
-     */
-    private String dbPassword;
-
-    /**
-     * name prefix for generated query types (default: "Q")
-     */
-    private String namePrefix;
-
-    /**
-     * name suffix for generated query types (default: "")
-     */
-    private String nameSuffix;
-
-    /**
-     * name prefix for generated bean types (default: "Q")
-     */
-    private String beanPrefix;
-
-    /**
-     * name suffix for generated bean types (default: "")
-     */
-    private String beanSuffix;
-
-    /**
-     * target package to generate classes to
-     */
-    private String targetPackage;
-
-    /**
-     * target package to generated bean classes to (default: targetPackage)
-     */
-    private String beanTargetPackage;
-
-    /**
-     * target source folder
-     */
-    private String targetSourceFolder;
-
-    /**
-     * schemaPattern a schema name pattern; must match the schema name
-     *        as it is stored in the database; "" retrieves those without a schema;
-     *        <code>null</code> means that the schema name should not be used to narrow
-     *        the search (default: null)
-     */
-    private String schemaPattern;
-
-    /**
-     * tableNamePattern a table name pattern; must match the
-     *        table name as it is stored in the database (default: null)
-     */
-    private String tableNamePattern;
-
-    /**
-     * wrap key properties into inner classes (default: false)
-     */
-    private boolean innerClassesForKeys;
-
-    /**
-     * serialize beans as well
-     */
-    private boolean exportBeans;
-
-    /**
-     * export validation annotations (@NotNull, @Size etc)
-     */
-    private boolean validationAnnotations = false;
-
-    /**
-     * charset encoding of the sources to be generated
-     */
-    private String sourceEncoding;
-
-    /**
-     *
-     */
-    private boolean columnAnnotations = false;
-
-    /**
-     *
-     */
-    private boolean schemaToPackage = false;
-
-    /**
-     *
-     */
-    private boolean lowerCase = false;
-
-    /**
-     *
-     */
-    private boolean exportTables = true;
-
-    /**
-     *
-     */
-    private boolean exportViews = true;
-
-    /**
-     *
-     */
-    private boolean exportAll = false;
-
-    /**
-     *
-     */
-    private boolean exportPrimaryKeys = true;
-
-    /**
-     *
-     */
-    private boolean exportForeignKeys = true;
-
-    /**
-     *
-     */
-    private String[] beanInterfaces;
-
-    /**
-     *
-     */
-    private boolean beanAddToString;
-
-    /**
-     *
-     */
-    private boolean beanAddFullConstructor;
-
-    /**
-     *
-     */
-    private boolean beanPrintSupertype;
-    
-    /**
-     * override default column order (default: alphabetical)
-     */
-    private String columnComparatorClass;
-
-    /**
-     *
-     */
-    private boolean spatial;
-    
-    /**
-     * java import added to generated query classes:
-     * com.bar for package (without .* notation)
-     * com.bar.Foo for class
-     *
-     */
-    private String[] imports;
-
-
-    @Override
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public void execute() {
-        Connection dbConn = null;
-        File targetPackagePath = new File(targetSourceFolder);
-
-        try {
-            Class.forName(jdbcDriverClass).newInstance();
-
-            dbConn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
-
-            NamingStrategy namingStrategy = new DefaultNamingStrategy();
-            MetaDataExporter exporter = new MetaDataExporter();
-            if (namePrefix != null) {
-                exporter.setNamePrefix(namePrefix);
-            }
-            if (nameSuffix != null) {
-                exporter.setNameSuffix(nameSuffix);
-            }
-            if (beanPrefix != null) {
-                exporter.setBeanPrefix(beanPrefix);
-            }
-            if (beanSuffix != null) {
-                exporter.setBeanSuffix(beanSuffix);
-            }
-            exporter.setPackageName(targetPackage);
-            exporter.setBeanPackageName(beanTargetPackage);
-            exporter.setTargetFolder(targetPackagePath);
-            exporter.setNamingStrategy(namingStrategy);
-            exporter.setInnerClassesForKeys(innerClassesForKeys);
-            exporter.setSchemaPattern(schemaPattern);
-            exporter.setTableNamePattern(tableNamePattern);
-            exporter.setColumnAnnotations(columnAnnotations);
-            exporter.setValidationAnnotations(validationAnnotations);
-            exporter.setSchemaToPackage(schemaToPackage);
-            exporter.setLowerCase(lowerCase);
-            exporter.setExportTables(exportTables);
-            exporter.setExportViews(exportViews);
-            exporter.setExportAll(exportAll);
-            exporter.setExportPrimaryKeys(exportPrimaryKeys);
-            exporter.setExportForeignKeys(exportForeignKeys);
-            exporter.setSpatial(spatial);
-
-            if (imports != null && imports.length > 0) {
-                exporter.setImports(imports);
-            }
-
-            if (exportBeans) {
-                BeanSerializer serializer = new BeanSerializer();
-                if (beanInterfaces != null) {
-                    for (String iface : beanInterfaces) {
-                        int sepIndex = iface.lastIndexOf('.');
-                        if (sepIndex < 0) {
-                            serializer.addInterface(new SimpleType(iface));
-                        } else {
-                            String packageName = iface.substring(0, sepIndex);
-                            String simpleName = iface.substring(sepIndex + 1);
-                            serializer.addInterface(new SimpleType(iface, packageName, simpleName));
-                        }
-                    }
-                }
-                serializer.setAddFullConstructor(beanAddFullConstructor);
-                serializer.setAddToString(beanAddToString);
-                serializer.setPrintSupertype(beanPrintSupertype);
-                exporter.setBeanSerializer(serializer);
-            }
-            if (sourceEncoding != null) {
-                exporter.setSourceEncoding(sourceEncoding);
-            }
-            if (columnComparatorClass != null) {
-                exporter.setColumnComparatorClass((Class) Class.forName(this.columnComparatorClass).asSubclass(Comparator.class));
-            }
-
-            exporter.export(dbConn.getMetaData());
-
-        } catch (RuntimeException e) {
-            throw new BuildException(e);
-        } catch (InstantiationException e) {
-            throw new BuildException(e);
-        } catch (IllegalAccessException e) {
-            throw new BuildException(e);
-        } catch (ClassNotFoundException e) {
-            throw new BuildException(e);
-        } catch (SQLException e) {
-            throw new BuildException(e);
-        } finally {
-            if (dbConn != null) {
-                try {
-                    dbConn.close();
-                } catch (SQLException e2) {
-                    throw new BuildException(e2);
-                }
-            }
-        }
-    }
-
-    public String getDbUrl() {
-        return dbUrl;
-    }
-
-    public void setDbUrl(String dbUrl) {
-        this.dbUrl = dbUrl;
-    }
-
-    public String getDbUserName() {
-        return dbUserName;
-    }
-
-    public void setDbUserName(String dbUserName) {
-        this.dbUserName = dbUserName;
-    }
-
-    public String getDbPassword() {
-        return dbPassword;
-    }
-
-    public void setDbPassword(String dbPassword) {
-        this.dbPassword = dbPassword;
-    }
-
-    public String getJdbcDriverClass() {
-        return jdbcDriverClass;
-    }
-
-    public void setJdbcDriverClass(String jdbcDriverClass) {
-        this.jdbcDriverClass = jdbcDriverClass;
-    }
-
-    public String getNamePrefix() {
-        return namePrefix;
-    }
-
-    public void setNamePrefix(String namePrefix) {
-        this.namePrefix = namePrefix;
-    }
-
-    public String getTargetPackage() {
-        return targetPackage;
-    }
-
-    public void setTargetPackage(String targetPackage) {
-        this.targetPackage = targetPackage;
-    }
-
-    public String getTargetSourceFolder() {
-        return targetSourceFolder;
-    }
-
-    public void setTargetSourceFolder(String targetSourceFolder) {
-        this.targetSourceFolder = targetSourceFolder;
-    }
-
-    public void setSchemaPattern(String schemaPattern) {
-        this.schemaPattern = schemaPattern;
-    }
-
-    public void setTableNamePattern(String tableNamePattern) {
-        this.tableNamePattern = tableNamePattern;
-    }
-
-    public String getSchemaPattern() {
-        return schemaPattern;
-    }
-
-    public String getTableNamePattern() {
-        return tableNamePattern;
-    }
-
-    public boolean isInnerClassesForKeys() {
-        return innerClassesForKeys;
-    }
-
-    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
-        this.innerClassesForKeys = innerClassesForKeys;
-    }
-
-    public boolean isExportBeans() {
-        return exportBeans;
-    }
-
-    public void setExportBeans(boolean exportBeans) {
-        this.exportBeans = exportBeans;
-    }
-
-    public String getNameSuffix() {
-        return nameSuffix;
-    }
-
-    public void setNameSuffix(String nameSuffix) {
-        this.nameSuffix = nameSuffix;
-    }
-
-    public String getBeanPrefix() {
-        return beanPrefix;
-    }
-
-    public void setBeanPrefix(String beanPrefix) {
-        this.beanPrefix = beanPrefix;
-    }
-
-    public String getBeanSuffix() {
-        return beanSuffix;
-    }
-
-    public void setBeanSuffix(String beanSuffix) {
-        this.beanSuffix = beanSuffix;
-    }
-
-    public String getBeanTargetPackage() {
-        return beanTargetPackage;
-    }
-
-    public void setBeanTargetPackage(String beanTargetPackage) {
-        this.beanTargetPackage = beanTargetPackage;
-    }
-
-    public boolean isValidationAnnotations() {
-        return validationAnnotations;
-    }
-
-    public void setValidationAnnotations(boolean validationAnnotations) {
-        this.validationAnnotations = validationAnnotations;
-    }
-
-    public String getSourceEncoding() {
-        return sourceEncoding;
-    }
-
-    public void setSourceEncoding(String sourceEncoding) {
-        this.sourceEncoding = sourceEncoding;
-    }
-
-    public boolean isColumnAnnotations() {
-        return columnAnnotations;
-    }
-
-    public void setColumnAnnotations(boolean columnAnnotations) {
-        this.columnAnnotations = columnAnnotations;
-    }
-
-    public boolean isSchemaToPackage() {
-        return schemaToPackage;
-    }
-
-    public void setSchemaToPackage(boolean schemaToPackage) {
-        this.schemaToPackage = schemaToPackage;
-    }
-
-    public boolean isLowerCase() {
-        return lowerCase;
-    }
-
-    public void setLowerCase(boolean lowerCase) {
-        this.lowerCase = lowerCase;
-    }
-
-    public boolean isExportTables() {
-        return exportTables;
-    }
-
-    public void setExportTables(boolean exportTables) {
-        this.exportTables = exportTables;
-    }
-
-    public boolean isExportViews() {
-        return exportViews;
-    }
-
-    public void setExportViews(boolean exportViews) {
-        this.exportViews = exportViews;
-    }
-
-    public boolean isExportAll() {
-        return exportAll;
-    }
-
-    public void setExportAll(boolean exportAll) {
-        this.exportAll = exportAll;
-    }
-
-    public boolean isExportPrimaryKeys() {
-        return exportPrimaryKeys;
-    }
-
-    public void setExportPrimaryKeys(boolean exportPrimaryKeys) {
-        this.exportPrimaryKeys = exportPrimaryKeys;
-    }
-
-    public boolean isExportForeignKeys() {
-        return exportForeignKeys;
-    }
-
-    public void setExportForeignKeys(boolean exportForeignKeys) {
-        this.exportForeignKeys = exportForeignKeys;
-    }
-
-    public String[] getImports() {
-        return imports;
-    }
-
-    public void setImports(String[] imports) {
-        this.imports = imports;
-    }
-
-    public boolean isSpatial() {
-        return spatial;
-    }
-
-    public void setSpatial(boolean spatial) {
-        this.spatial = spatial;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java
deleted file mode 100644
index 5fd955f24b..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import com.mysema.query.codegen.EntityType;
-import com.mysema.util.JavaSyntaxUtils;
-
-/**
- * AbstractNamingStrategy is an abstract base class for NamingStrategy implementations
- *
- * @author tiwe
- *
- */
-public abstract class AbstractNamingStrategy implements NamingStrategy {
-
-    protected String foreignKeysClassName = "ForeignKeys";
-
-    protected String foreignKeysVariable = "fk";
-
-    protected String primaryKeysClassName = "PrimaryKeys";
-
-    protected String primaryKeysVariable = "pk";
-
-    protected String reservedSuffix = "_col";
-
-    @Override
-    public String appendSchema(String packageName, String schemaName) {
-        String suffix = schemaName.toLowerCase();
-        if (JavaSyntaxUtils.isReserved(suffix)) {
-            suffix += "_";
-        }
-        return packageName + "." + suffix;
-    }
-
-    protected String escape(EntityType entityType, String name) {
-        int suffix = 0;
-        while (true) {
-            String candidate = suffix > 0 ? name + suffix : name;
-            if (entityType.getEscapedPropertyNames().contains(candidate)) {
-                suffix++;
-            } else {
-                return candidate;
-            }
-        }
-    }
-
-    @Override
-    public String getForeignKeysClassName() {
-        return foreignKeysClassName;
-    }
-
-    @Override
-    public String getForeignKeysVariable(EntityType entityType) {
-        return foreignKeysVariable;
-    }
-
-    @Override
-    public String getPrimaryKeysClassName() {
-        return primaryKeysClassName;
-    }
-
-    @Override
-    public String getPrimaryKeysVariable(EntityType entityType) {
-        return primaryKeysVariable;
-    }
-
-    @Override
-    public String normalizeColumnName(String columnName) {
-        if (columnName != null) {
-            return columnName.replaceAll("\r", "").replaceAll("\n", " ");
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String normalizeTableName(String tableName) {
-        if (tableName != null) {
-            return tableName.replaceAll("\r", "").replaceAll("\n", " ");
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String normalizeSchemaName(String schemaName) {
-        if (schemaName != null) {
-            return schemaName.replaceAll("\r", "").replaceAll("\n", " ");
-        } else {
-            return null;
-        }
-    }
-
-    public void setForeignKeysClassName(String foreignKeysClassName) {
-        this.foreignKeysClassName = foreignKeysClassName;
-    }
-
-    public void setForeignKeysVariable(String foreignKeysVariable) {
-        this.foreignKeysVariable = foreignKeysVariable;
-    }
-
-    public void setPrimaryKeysClassName(String primaryKeysClassName) {
-        this.primaryKeysClassName = primaryKeysClassName;
-    }
-
-    public void setPrimaryKeysVariable(String primaryKeysVariable) {
-        this.primaryKeysVariable = primaryKeysVariable;
-    }
-
-    public void setReservedSuffix(String reservedSuffix) {
-        this.reservedSuffix = reservedSuffix;
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java
deleted file mode 100644
index 5c9b9cb09c..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.util.Locale;
-
-import com.mysema.query.codegen.EntityType;
-
-/**
- * DefaultNamingStrategy is the default implementation of the NamingStrategy
- * interface. It changes underscore usage into camel case form.
- *
- * @author tiwe
- *
- */
-public class DefaultNamingStrategy extends AbstractNamingStrategy {
-
-    public DefaultNamingStrategy() {
-        reservedSuffix = "Col";
-    }
-
-    @Override
-    public String getClassName(String tableName) {
-        if (tableName.length() > 1) {
-            return tableName.substring(0, 1).toUpperCase(Locale.ENGLISH) +
-                    toCamelCase(tableName.substring(1));
-        } else {
-            return tableName.toUpperCase(Locale.ENGLISH);
-        }
-    }
-
-    @Override
-    public String getDefaultAlias(EntityType entityType) {
-        return entityType.getData().get("table").toString();
-    }
-
-    @Override
-    public String getDefaultVariableName(EntityType entityType) {
-        return escape(entityType, toCamelCase(entityType.getData().get("table").toString()));
-    }
-
-    @Override
-    public String getForeignKeysVariable(EntityType entityType) {
-        return escape(entityType, foreignKeysVariable);
-    }
-
-    @Override
-    public String getPrimaryKeysVariable(EntityType entityType) {
-        return escape(entityType, primaryKeysVariable);
-    }
-
-    @Override
-    public String getPropertyName(String columnName, EntityType entityType) {
-        if (columnName.length() > 1) {
-            String normalized = normalizePropertyName(columnName);
-            return normalizePropertyName(normalized.substring(0, 1).toLowerCase(Locale.ENGLISH) +
-                    toCamelCase(normalized.substring(1)));
-        } else {
-            return columnName.toLowerCase(Locale.ENGLISH);
-        }
-    }
-
-    @Override
-    public String getPropertyNameForForeignKey(String fkName, EntityType entityType) {
-        if (fkName.toLowerCase().startsWith("fk_")) {
-            fkName = fkName.substring(3) + "_" + fkName.substring(0,2);
-        }
-        return getPropertyName(fkName, entityType);
-    }
-
-    @Override
-    public String getPropertyNameForInverseForeignKey(String fkName, EntityType entityType) {
-        return "_" + getPropertyNameForForeignKey(fkName, entityType);
-    }
-
-
-    @Override
-    public String getPropertyNameForPrimaryKey(String pkName, EntityType entityType) {
-        if (pkName.toLowerCase().startsWith("pk_")) {
-            pkName = pkName.substring(3) + "_" + pkName.substring(0,2);
-        }
-        return getPropertyName(pkName, entityType);
-    }
-
-    protected String normalizePropertyName(String name) {
-        return Naming.normalize(name, reservedSuffix);
-    }
-
-    protected String toCamelCase(String str) {
-        boolean toLower = str.toUpperCase().equals(str);
-        StringBuilder builder = new StringBuilder(str.length());
-        for (int i = 0; i < str.length(); i++) {
-            if (i < str.length() - 1 && (str.charAt(i) == '_' || str.charAt(i) == ' ')) {
-                i += 1;
-                if (i < str.length()) {
-                    builder.append(Character.toUpperCase(str.charAt(i)));
-                }
-            } else if (toLower) {
-                builder.append(Character.toLowerCase(str.charAt(i)));
-            } else {
-                builder.append(str.charAt(i));
-            }
-        }
-        return builder.toString();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java
deleted file mode 100644
index 345cdb0204..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.Parameter;
-import com.mysema.codegen.model.Types;
-import com.mysema.query.codegen.BeanSerializer;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.sql.Column;
-import com.mysema.query.sql.support.PrimaryKeyData;
-
-/**
- * ExtendedBeanSerialzier outputs primary key based equals, hashCode and toString implementations
- * 
- * @author tiwe
- *
- */
-public class ExtendedBeanSerializer extends BeanSerializer {
-
-    private static final Parameter o = new Parameter("o", Types.OBJECT);
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void bodyEnd(EntityType model, CodeWriter writer) throws IOException {
-        Collection<PrimaryKeyData> primaryKeys = (Collection<PrimaryKeyData>) model.getData().get(PrimaryKeyData.class);
-        
-        if (primaryKeys == null || primaryKeys.isEmpty()) {
-            return;
-        }
-        
-        Map<String, Property> columnToProperty = new HashMap<String, Property>();
-        for (Property property : model.getProperties()) {
-            columnToProperty.put(property.getAnnotation(Column.class).value(), property);
-        }
-        
-        StringBuilder anyColumnIsNull = new StringBuilder();
-        StringBuilder columnEquals = new StringBuilder();
-        StringBuilder toString = new StringBuilder();
-        List<String> properties = new ArrayList<String>();
-        for (PrimaryKeyData pk : primaryKeys) {
-            for (String column : pk.getColumns()) {
-                Property property = columnToProperty.get(column);
-                String propName = property.getEscapedName();
-                if (anyColumnIsNull.length() > 0) {
-                    anyColumnIsNull.append(" || ");
-                    columnEquals.append(" && ");
-                    toString.append("+ \";\" + ");
-                } else {
-                    toString.append("\"" + model.getSimpleName() + "#\" + ");
-                }
-                anyColumnIsNull.append(propName + " == null");
-                columnEquals.append(propName + ".equals(obj." + propName + ")");
-                toString.append(propName);
-                properties.add(propName);
-            }
-        }
-        
-        // equals
-        writer.annotation(Override.class);
-        writer.beginPublicMethod(Types.BOOLEAN_P, "equals", o);
-        writer.line("if (", anyColumnIsNull + ") {");        
-        writer.line("    return super.equals(o);");
-        writer.line("}");
-        writer.line("if (!(o instanceof ", model.getSimpleName(), ")) {");
-        writer.line("    return false;");
-        writer.line("}");
-        writer.line(model.getSimpleName(), " obj = (", model.getSimpleName(), ")o;");
-        writer.line("return ", columnEquals + ";");
-        writer.end();
-        
-        // hashCode
-        writer.annotation(Override.class);
-        writer.beginPublicMethod(Types.INT, "hashCode");
-        writer.line("if (", anyColumnIsNull + ") {");        
-        writer.line("    return super.hashCode();");
-        writer.line("}");
-        writer.line("final int prime = 31;");
-        writer.line("int result = 1;");
-        for (String property : properties) {
-            writer.line("result = prime * result + ", property, ".hashCode();");
-        }
-        writer.line("return result;");
-        writer.end();
-        
-        // toString
-        writer.annotation(Override.class);
-        writer.beginPublicMethod(Types.STRING, "toString");
-//        writer.line("if (", anyColumnIsNull + ") {");      
-//        writer.line("    return super.toString();");
-//        writer.line("}");
-        writer.line("return ", toString + ";");
-        writer.end();
-        
-    }
-    
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java
deleted file mode 100644
index 77a1568da6..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.util.regex.Pattern;
-
-import com.mysema.query.codegen.EntityType;
-
-/**
- * ExtendedNamingStrategy works like the DefaultNamingStrategy but tries to create foreign key 
- * property names in a different way.
- * 
- * <p>It looks for patterns like this .*_&lt;forward&gt;_&lt;inverse&gt; and uses the forward part for 
- * the foreign key name and inverse for the inverse foreign key name.</p>
- * 
- * @author tiwe
- *
- */
-public class ExtendedNamingStrategy extends DefaultNamingStrategy {
-    
-    private static final Pattern SPLIT = Pattern.compile("_");
-    
-    @Override
-    public String getPropertyNameForForeignKey(String fkName, EntityType entityType) {
-        String[] split = SPLIT.split(fkName);
-        if (split.length > 2) {
-            return getPropertyName(split[split.length-2], entityType);
-        } else {
-            return super.getPropertyNameForForeignKey(fkName, entityType);
-        }
-    }
-
-    @Override
-    public String getPropertyNameForInverseForeignKey(String fkName, EntityType entityType) {
-        String[] split = SPLIT.split(fkName);
-        if (split.length > 2) {
-            return getPropertyName(split[split.length-1], entityType);
-        } else {
-            return super.getPropertyNameForInverseForeignKey(fkName, entityType);
-        }
-    }
-    
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java
deleted file mode 100644
index befa710f6a..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.io.Files;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.JavaWriter;
-import com.mysema.codegen.ScalaWriter;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.codegen.Property;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.codegen.SimpleSerializerConfig;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.query.sql.ColumnImpl;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.support.ForeignKeyData;
-import com.mysema.query.sql.support.InverseForeignKeyData;
-import com.mysema.query.sql.support.NotNullImpl;
-import com.mysema.query.sql.support.PrimaryKeyData;
-import com.mysema.query.sql.support.SizeImpl;
-
-/**
- * MetadataExporter exports JDBC metadata to Querydsl query types
- *
- * <p>Example</p>
- *
- * <pre>
- * MetaDataExporter exporter = new MetaDataExporter();
- * exporter.setPackageName("com.example.domain");
- * exporter.setTargetFolder(new File("target/generated-sources/java"));
- * exporter.export(connection.getMetaData());
- * </pre>
- *
- * @author tiwe
- */
-public class MetaDataExporter {
-
-    private static final Logger logger = LoggerFactory.getLogger(MetaDataExporter.class);
-
-    private final SQLCodegenModule module = new SQLCodegenModule();
-
-    private final Set<String> classes = new HashSet<String>();
-
-    private File targetFolder;
-
-    @Nullable
-    private String beanPackageName;
-
-    @Nullable
-    private String schemaPattern, tableNamePattern;
-
-    @Nullable
-    private Serializer beanSerializer;
-
-    private boolean createScalaSources = false;
-
-    private final Map<EntityType, Type> entityToWrapped = new HashMap<EntityType, Type>();
-
-    private Serializer serializer;
-
-    private TypeMappings typeMappings;
-
-    private QueryTypeFactory queryTypeFactory;
-
-    private NamingStrategy namingStrategy;
-
-    private Configuration configuration;
-
-    private KeyDataFactory keyDataFactory;
-
-    private boolean columnAnnotations = false;
-
-    private boolean validationAnnotations = false;
-
-    private boolean schemaToPackage = false;
-
-    private String sourceEncoding = "UTF-8";
-
-    private boolean lowerCase = false;
-
-    private boolean exportTables = true;
-
-    private boolean exportViews = true;
-
-    private boolean exportAll = false;
-
-    private boolean exportPrimaryKeys = true;
-
-    private boolean exportForeignKeys = true;
-
-    private boolean spatial = false;
-
-    public MetaDataExporter() {}
-
-    protected EntityType createEntityType(@Nullable String schemaName, String tableName,
-            final String className) {
-        EntityType classModel;
-
-        if (beanSerializer == null) {
-            String packageName = normalizePackage(module.getPackageName(), schemaName);
-            String simpleName = module.getPrefix() + className + module.getSuffix();
-            Type classTypeModel = new SimpleType(TypeCategory.ENTITY,
-                    packageName + "." + simpleName,  packageName, simpleName, false, false);
-            classModel = new EntityType(classTypeModel);
-            typeMappings.register(classModel, classModel);
-
-        } else {
-            String beanPackage = normalizePackage(beanPackageName, schemaName);
-            String simpleName = module.getBeanPrefix() + className + module.getBeanSuffix();
-            Type classTypeModel = new SimpleType(TypeCategory.ENTITY,
-                    beanPackage + "." + simpleName, beanPackage, simpleName, false, false);
-            classModel = new EntityType(classTypeModel);
-
-            Type mappedType = queryTypeFactory.create(classModel);
-            entityToWrapped.put(classModel, mappedType);
-            typeMappings.register(classModel, mappedType);
-        }
-
-        classModel.getData().put("schema", schemaName);
-        classModel.getData().put("table", tableName);
-        return classModel;
-    }
-
-
-    private String normalizePackage(String packageName, @Nullable String schemaName) {
-        if (schemaToPackage && schemaName != null) {
-            return namingStrategy.appendSchema(packageName, schemaName);
-        } else {
-            return packageName;
-        }
-    }
-
-    protected Property createProperty(EntityType classModel, String normalizedColumnName,
-            String propertyName, Type typeModel) {
-        return new Property(
-                classModel,
-                propertyName,
-                propertyName,
-                typeModel,
-                Collections.<String>emptyList(),
-                false);
-    }
-
-    /**
-     * Export the tables based on the given database metadata
-     *
-     * @param md
-     * @throws SQLException
-     */
-    public void export(DatabaseMetaData md) throws SQLException {
-        if (beanPackageName == null) {
-            beanPackageName =  module.getPackageName();
-        }
-        module.bind(SQLCodegenModule.BEAN_PACKAGE_NAME, beanPackageName);
-
-        if (spatial) {
-            SpatialSupport.addSupport(module);
-        }
-
-        typeMappings = module.get(TypeMappings.class);
-        queryTypeFactory = module.get(QueryTypeFactory.class);
-        serializer = module.get(Serializer.class);
-        beanSerializer = module.get(Serializer.class, SQLCodegenModule.BEAN_SERIALIZER);
-        namingStrategy = module.get(NamingStrategy.class);
-        configuration = module.get(Configuration.class);
-
-        if (beanSerializer == null) {
-            keyDataFactory = new KeyDataFactory(namingStrategy,  module.getPackageName(),
-                    module.getPrefix(), module.getSuffix(), schemaToPackage);
-        } else {
-            keyDataFactory = new KeyDataFactory(namingStrategy, beanPackageName,
-                    module.getBeanPrefix(), module.getBeanSuffix(), schemaToPackage);
-        }
-
-        String[] typesArray = null;
-        if (!exportAll) {
-            List<String> types = new ArrayList<String>(2);
-            if (exportTables) {
-                types.add("TABLE");
-            }
-            if (exportViews) {
-                types.add("VIEW");
-            }
-            typesArray = types.toArray(new String[types.size()]);
-        }
-
-        if (tableNamePattern != null && tableNamePattern.contains(",")) {
-            for (String table : tableNamePattern.split(",")) {
-                ResultSet tables = md.getTables(null, schemaPattern, table.trim(), typesArray);
-                try{
-                    while (tables.next()) {
-                        handleTable(md, tables);
-                    }
-                }finally{
-                    tables.close();
-                }
-            }
-        } else {
-            ResultSet tables = md.getTables(null, schemaPattern, tableNamePattern, typesArray);
-            try{
-                while (tables.next()) {
-                    handleTable(md, tables);
-                }
-            }finally{
-                tables.close();
-            }
-        }
-
-    }
-
-    Set<String> getClasses() {
-        return classes;
-    }
-
-    private void handleColumn(EntityType classModel, String tableName, ResultSet columns) throws SQLException {
-        String columnName = normalize(columns.getString("COLUMN_NAME"));
-        String normalizedColumnName = namingStrategy.normalizeColumnName(columnName);
-        int columnType = columns.getInt("DATA_TYPE");
-        String typeName = columns.getString("TYPE_NAME");
-        Number columnSize = (Number) columns.getObject("COLUMN_SIZE");
-        Number columnDigits = (Number) columns.getObject("DECIMAL_DIGITS");
-        int columnIndex = columns.getInt("ORDINAL_POSITION");
-        int nullable = columns.getInt("NULLABLE");
-
-        String propertyName = namingStrategy.getPropertyName(normalizedColumnName, classModel);
-        Class<?> clazz = configuration.getJavaType(columnType,
-                typeName,
-                columnSize != null ? columnSize.intValue() : 0,
-                columnDigits != null ? columnDigits.intValue() : 0,
-                tableName, columnName);
-        if (clazz == null) {
-            throw new IllegalStateException("Found no mapping for " + columnType + " (" + tableName + "." + columnName + " " + typeName + ")");
-        }
-        TypeCategory fieldType = TypeCategory.get(clazz.getName());
-        if (Number.class.isAssignableFrom(clazz)) {
-            fieldType = TypeCategory.NUMERIC;
-        } else if (Enum.class.isAssignableFrom(clazz)) {
-            fieldType = TypeCategory.ENUM;
-        }
-        Type typeModel = new ClassType(fieldType, clazz);
-        Property property = createProperty(classModel, normalizedColumnName, propertyName, typeModel);
-        ColumnMetadata column = ColumnMetadata.named(normalizedColumnName).ofType(columnType).withIndex(columnIndex);
-        if (nullable == DatabaseMetaData.columnNoNulls) {
-            column = column.notNull();
-        }
-        if (columnSize != null) {
-            column = column.withSize(columnSize.intValue());
-        }
-        if (columnDigits != null) {
-            column = column.withDigits(columnDigits.intValue());
-        }
-        property.getData().put("COLUMN", column);
-
-        if (columnAnnotations) {
-            property.addAnnotation(new ColumnImpl(normalizedColumnName));
-        }
-        if (validationAnnotations) {
-            if (nullable == DatabaseMetaData.columnNoNulls) {
-                property.addAnnotation(new NotNullImpl());
-            }
-            int size = columns.getInt("COLUMN_SIZE");
-            if (size > 0 && clazz.equals(String.class)) {
-                property.addAnnotation(new SizeImpl(0, size));
-            }
-        }
-        classModel.addProperty(property);
-    }
-
-    private void handleTable(DatabaseMetaData md, ResultSet tables) throws SQLException {
-        String catalog = tables.getString("TABLE_CAT");
-        String schema = tables.getString("TABLE_SCHEM");
-        String schemaName = normalize(tables.getString("TABLE_SCHEM"));
-        String tableName = normalize(tables.getString("TABLE_NAME"));
-        String normalizedTableName = namingStrategy.normalizeTableName(tableName);
-        String className = namingStrategy.getClassName(normalizedTableName);
-        EntityType classModel = createEntityType(schemaName, normalizedTableName, className);
-
-        if (exportPrimaryKeys) {
-            // collect primary keys
-            Map<String,PrimaryKeyData> primaryKeyData = keyDataFactory
-                    .getPrimaryKeys(md, catalog, schema, tableName);
-            if (!primaryKeyData.isEmpty()) {
-                classModel.getData().put(PrimaryKeyData.class, primaryKeyData.values());
-            }
-        }
-
-        if (exportForeignKeys) {
-            // collect foreign keys
-            Map<String,ForeignKeyData> foreignKeyData = keyDataFactory
-                    .getImportedKeys(md, catalog, schema, tableName);
-            if (!foreignKeyData.isEmpty()) {
-                classModel.getData().put(ForeignKeyData.class, foreignKeyData.values());
-            }
-
-            // collect inverse foreign keys
-            Map<String,InverseForeignKeyData> inverseForeignKeyData = keyDataFactory
-                    .getExportedKeys(md, catalog, schema, tableName);
-            if (!inverseForeignKeyData.isEmpty()) {
-                classModel.getData().put(InverseForeignKeyData.class, inverseForeignKeyData.values());
-            }
-        }
-
-        // collect columns
-        ResultSet columns = md.getColumns(catalog, schema, tableName.replace("/", "//"), null);
-        try{
-            while (columns.next()) {
-                handleColumn(classModel, tableName, columns);
-            }
-        }finally{
-            columns.close();
-        }
-
-        // serialize model
-        serialize(classModel);
-
-        logger.info("Exported " + tableName + " successfully");
-    }
-
-    private String normalize(String str) {
-        if (lowerCase && str != null) {
-            return str.toLowerCase();
-        } else {
-            return str;
-        }
-    }
-
-    private void serialize(EntityType type) {
-        try {
-            String fileSuffix = createScalaSources ? ".scala" : ".java";
-
-            if (beanSerializer != null) {
-                String packageName = normalizePackage(beanPackageName, (String)type.getData().get("schema"));
-                String path = packageName.replace('.', '/') + "/" + type.getSimpleName() + fileSuffix;
-                write(beanSerializer, path, type);
-
-                String otherPath = entityToWrapped.get(type).getFullName().replace('.', '/') + fileSuffix;
-                write(serializer, otherPath, type);
-            } else {
-                String packageName = normalizePackage(module.getPackageName(), (String)type.getData().get("schema"));
-                String path =  packageName.replace('.', '/') + "/" + type.getSimpleName() + fileSuffix;
-                write(serializer, path, type);
-            }
-
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    private void write(Serializer serializer, String path, EntityType type) throws IOException {
-        File targetFile = new File(targetFolder, path);
-        classes.add(targetFile.getPath());
-        StringWriter w = new StringWriter();
-        CodeWriter writer = createScalaSources ? new ScalaWriter(w) : new JavaWriter(w);
-        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, writer);
-
-        // conditional creation
-        boolean generate = true;
-        byte[] bytes = w.toString().getBytes(sourceEncoding);
-        if (targetFile.exists() && targetFile.length() == bytes.length) {
-            String str = Files.toString(targetFile, Charset.forName(sourceEncoding));
-            if (str.equals(w.toString())) {
-                generate = false;
-            }
-        } else {
-            targetFile.getParentFile().mkdirs();
-        }
-
-        if (generate) {
-            Files.write(bytes, targetFile);
-        }
-    }
-
-
-    /**
-     * Set the schema pattern filter to be used
-     *
-     * @param schemaPattern a schema name pattern; must match the schema name
-     *        as it is stored in the database; "" retrieves those without a schema;
-     *        <code>null</code> means that the schema name should not be used to narrow
-     *        the search (default: null)
-     */
-    public void setSchemaPattern(@Nullable String schemaPattern) {
-        this.schemaPattern = schemaPattern;
-    }
-
-    /**
-     * Set the table name pattern filter to be used
-     *
-    * @param tableNamePattern a table name pattern; must match the
-    *        table name as it is stored in the database (default: null)
-    */
-    public void setTableNamePattern(@Nullable String tableNamePattern) {
-        this.tableNamePattern = tableNamePattern;
-    }
-
-    /**
-     * Override the configuration
-     *
-     * @param configuration override configuration for custom type mappings etc
-     */
-    public void setConfiguration(Configuration configuration) {
-        module.bind(Configuration.class, configuration);
-    }
-
-    /**
-     * Set true to create Scala sources instead of Java sources
-     *
-     * @param createScalaSources whether to create Scala sources (default: false)
-     */
-    public void setCreateScalaSources(boolean createScalaSources) {
-        this.createScalaSources = createScalaSources;
-    }
-
-    /**
-     * Set the target folder
-     *
-     * @param targetFolder target source folder to create the sources into
-     *        (e.g. target/generated-sources/java)
-     */
-    public void setTargetFolder(File targetFolder) {
-        this.targetFolder = targetFolder;
-    }
-
-    /**
-     * Set the package name
-     *
-     * @param packageName package name for sources
-     */
-    public void setPackageName(String packageName) {
-        module.bind(SQLCodegenModule.PACKAGE_NAME, packageName);
-    }
-
-    /**
-     * Override the bean package name (default: packageName)
-     *
-     * @param beanPackageName
-     */
-    public void setBeanPackageName(@Nullable String beanPackageName) {
-        this.beanPackageName = beanPackageName;
-    }
-
-    /**
-     * Override the name prefix for the classes (default: Q)
-     *
-     * @param namePrefix name prefix for query-types (default: Q)
-     */
-    public void setNamePrefix(String namePrefix) {
-        module.bind(CodegenModule.PREFIX, namePrefix);
-    }
-
-    /**
-     * Override the name suffix for the classes (default: "")
-     *
-     * @param nameSuffix name suffix for query-types (default: "")
-     */
-    public void setNameSuffix(String nameSuffix) {
-        module.bind(CodegenModule.SUFFIX, nameSuffix);
-    }
-
-    /**
-     * Override the bean prefix for the classes (default: "")
-     *
-     * @param beanPrefix bean prefix for bean-types (default: "")
-     */
-    public void setBeanPrefix(String beanPrefix) {
-        module.bind(SQLCodegenModule.BEAN_PREFIX, beanPrefix);
-    }
-
-    /**
-     * Override the bean suffix for the classes (default: "")
-     *
-     * @param beanSuffix bean suffix for bean-types (default: "")
-     */
-    public void setBeanSuffix(String beanSuffix) {
-        module.bind(SQLCodegenModule.BEAN_SUFFIX, beanSuffix);
-    }
-
-    /**
-     * Override the NamingStrategy (default: new DefaultNamingStrategy())
-     *
-     * @param namingStrategy namingstrategy to override (default: new DefaultNamingStrategy())
-     */
-    public void setNamingStrategy(NamingStrategy namingStrategy) {
-        module.bind(NamingStrategy.class, namingStrategy);
-    }
-
-    /**
-     * Set the Bean serializer to create bean types as well
-     *
-     * @param beanSerializer serializer for JavaBeans (default: null)
-     */
-    public void setBeanSerializer(@Nullable Serializer beanSerializer) {
-        module.bind(SQLCodegenModule.BEAN_SERIALIZER, beanSerializer);
-    }
-
-    /**
-     * Set the Bean serializer class to create bean types as well
-     *
-     * @param beanSerializer serializer for JavaBeans (default: null)
-     */
-    public void setBeanSerializerClass(Class<? extends Serializer> beanSerializerClass) {
-        module.bind(SQLCodegenModule.BEAN_SERIALIZER, beanSerializerClass);
-    }
-
-    /**
-     * @param innerClassesForKeys
-     */
-    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
-        module.bind(SQLCodegenModule.INNER_CLASSES_FOR_KEYS, innerClassesForKeys);
-    }
-
-    /**
-     * @param columnComparator
-     */
-    public void setColumnComparatorClass(Class<? extends Comparator<Property>> columnComparatorClass) {
-        module.bind(SQLCodegenModule.COLUMN_COMPARATOR, columnComparatorClass);
-    }
-
-    /**
-     * @param serializerClass
-     */
-    public void setSerializerClass(Class<? extends Serializer> serializerClass) {
-        module.bind(Serializer.class, serializerClass);
-    }
-
-    /**
-     * @param typeMappings
-     */
-    public void setTypeMappings(TypeMappings typeMappings) {
-        module.bind(TypeMappings.class, typeMappings);
-    }
-
-    /**
-     * @param columnAnnotations
-     */
-    public void setColumnAnnotations(boolean columnAnnotations) {
-        this.columnAnnotations = columnAnnotations;
-    }
-
-    /**
-     * @param validationAnnotations
-     */
-    public void setValidationAnnotations(boolean validationAnnotations) {
-        this.validationAnnotations = validationAnnotations;
-    }
-
-    /**
-     * @param sourceEncoding
-     */
-    public void setSourceEncoding(String sourceEncoding) {
-        this.sourceEncoding = sourceEncoding;
-    }
-
-    /**
-     * @param schemaToPackage
-     */
-    public void setSchemaToPackage(boolean schemaToPackage) {
-        this.schemaToPackage = schemaToPackage;
-        module.bind(SQLCodegenModule.SCHEMA_TO_PACKAGE, schemaToPackage);
-    }
-
-    /**
-     * @param lowerCase
-     */
-    public void setLowerCase(boolean lowerCase) {
-        this.lowerCase = lowerCase;
-    }
-
-    /**
-     * @param exportTables
-     */
-    public void setExportTables(boolean exportTables) {
-        this.exportTables = exportTables;
-    }
-
-    /**
-     * @param exportViews
-     */
-    public void setExportViews(boolean exportViews) {
-        this.exportViews = exportViews;
-    }
-
-    /**
-     * @param exportAll
-     */
-    public void setExportAll(boolean exportAll) {
-        this.exportAll = exportAll;
-    }
-
-    /**
-     * @param exportPrimaryKeys
-     */
-    public void setExportPrimaryKeys(boolean exportPrimaryKeys) {
-        this.exportPrimaryKeys = exportPrimaryKeys;
-    }
-
-    /**
-     * @param exportForeignKeys
-     */
-    public void setExportForeignKeys(boolean exportForeignKeys) {
-        this.exportForeignKeys = exportForeignKeys;
-    }
-
-    /**
-     * Set the java imports
-     *
-     * @param imports
-     *            java imports array
-     */
-    public void setImports(String[] imports) {
-        module.bind(CodegenModule.IMPORTS, new HashSet<String>(Arrays.asList(imports)));
-    }
-
-    /**
-     * @param spatial
-     */
-    public void setSpatial(boolean spatial) {
-        this.spatial = spatial;
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java
deleted file mode 100644
index e5f1c884c1..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-import com.google.common.collect.Lists;
-import com.mysema.codegen.CodeWriter;
-import com.mysema.codegen.model.*;
-import com.mysema.query.codegen.*;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.sql.support.ForeignKeyData;
-import com.mysema.query.sql.support.InverseForeignKeyData;
-import com.mysema.query.sql.support.KeyData;
-import com.mysema.query.sql.support.PrimaryKeyData;
-import static com.mysema.codegen.Symbols.*;
-
-/**
- * MetaDataSerializer defines the Query type serialization logic for MetaDataExporter.
- * Subclass this class for customization.
- *
- * @author tiwe
- *
- */
-public class MetaDataSerializer extends EntitySerializer {
-
-    private final NamingStrategy namingStrategy;
-
-    private final boolean innerClassesForKeys;
-
-    private final Set<String> imports;
-    
-    private final Comparator<Property> columnComparator;
-
-    private final Class<?> entityPathType;
-
-    /**
-     * Create a new MetaDataSerializer instance
-     *
-     * @param namingStrategy naming strategy for table to class and column to property conversion
-     * @param innerClassesForKeys wrap key properties into inner classes (default: false)
-     * @param imports java user imports
-     */
-    @Inject
-    public MetaDataSerializer(
-            TypeMappings typeMappings,
-            NamingStrategy namingStrategy,
-            @Named(SQLCodegenModule.INNER_CLASSES_FOR_KEYS) boolean innerClassesForKeys,
-            @Named(SQLCodegenModule.IMPORTS) Set<String> imports,
-            @Named(SQLCodegenModule.COLUMN_COMPARATOR) Comparator<Property> columnComparator,
-            @Named(SQLCodegenModule.ENTITYPATH_TYPE) Class<?> entityPathType) {
-        super(typeMappings,Collections.<String>emptyList());
-        this.namingStrategy = namingStrategy;
-        this.innerClassesForKeys = innerClassesForKeys;
-        this.imports = new HashSet<String>(imports);
-        this.columnComparator = columnComparator;
-        this.entityPathType = entityPathType;
-    }
-
-    @Deprecated
-    public MetaDataSerializer(
-            TypeMappings typeMappings,
-            NamingStrategy namingStrategy,
-            boolean innerClassesForKeys,
-            Set<String> imports,
-            Comparator<Property> columnComparator) {
-        this(typeMappings, namingStrategy, innerClassesForKeys,
-                imports, columnComparator, RelationalPathBase.class);
-    }
-
-    @Override
-    protected void constructorsForVariables(CodeWriter writer, EntityType model) throws IOException {
-        super.constructorsForVariables(writer, model);
-
-        String localName = writer.getRawName(model);
-        String genericName = writer.getGenericName(true, model);
-
-        if (!localName.equals(genericName)) {
-            writer.suppressWarnings("all");
-        }
-        writer.beginConstructor(new Parameter("variable", Types.STRING),
-                                new Parameter("schema", Types.STRING),
-                                new Parameter("table", Types.STRING));
-        writer.line(SUPER,"(", writer.getClassConstant(localName) + COMMA
-                + "forVariable(variable), schema, table);");
-        constructorContent(writer, model);
-        writer.end();
-    }
-
-    @Override
-    protected void constructorContent(CodeWriter writer, EntityType model) throws IOException {
-        writer.line("addMetadata();");
-    }
-
-    @Override
-    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
-        Type queryType = typeMappings.getPathType(model, model, true);
-
-        writer.line("@Generated(\"", getClass().getName(), "\")");
-
-        TypeCategory category = model.getOriginalCategory();
-        // serialize annotations only, if no bean types are used
-        if (model.equals(queryType)) {
-            for (Annotation annotation : model.getAnnotations()) {
-                writer.annotation(annotation);
-            }
-        }
-        writer.beginClass(queryType, new ClassType(category, entityPathType, model));
-        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", String.valueOf(model.hashCode()));
-    }
-
-    @Override
-    protected String getAdditionalConstructorParameter(EntityType model) {
-        StringBuilder builder = new StringBuilder();
-        if (model.getData().containsKey("schema")) {
-            builder.append(", \"").append(model.getData().get("schema")).append("\"");
-        } else {
-            builder.append(", null");
-        }
-        builder.append(", \"").append(model.getData().get("table")).append("\"");
-        return builder.toString();
-    }
-
-    @Override
-    protected void introDefaultInstance(CodeWriter writer, EntityType entityType, String defaultName) throws IOException {
-        String variableName = !defaultName.isEmpty() ? defaultName : namingStrategy.getDefaultVariableName(entityType);
-        String alias = namingStrategy.getDefaultAlias(entityType);
-        Type queryType = typeMappings.getPathType(entityType, entityType, true);
-        writer.publicStaticFinal(queryType, variableName, NEW + queryType.getSimpleName() + "(\"" + alias + "\")");
-    }
-
-    @Override
-    protected void introImports(CodeWriter writer, SerializerConfig config, EntityType model) throws IOException {
-        super.introImports(writer, config, model);
-
-        Collection<ForeignKeyData> foreignKeys = (Collection<ForeignKeyData>)
-                model.getData().get(ForeignKeyData.class);
-        Collection<InverseForeignKeyData> inverseForeignKeys = (Collection<InverseForeignKeyData>)
-                model.getData().get(InverseForeignKeyData.class);
-        boolean addJavaUtilImport = false;
-        if (foreignKeys != null) {
-            for (ForeignKeyData keyData : foreignKeys) {
-                if (keyData.getForeignColumns().size() > 1) {
-                    addJavaUtilImport = true;
-                }
-            }
-        }
-        if (inverseForeignKeys != null) {
-            for (InverseForeignKeyData keyData : inverseForeignKeys) {
-                if (keyData.getForeignColumns().size() > 1) {
-                    addJavaUtilImport = true;
-                }
-            }
-        }
-
-        if (addJavaUtilImport) {
-            writer.imports(List.class.getPackage());
-        }
-
-        writer.imports(ColumnMetadata.class);
-
-        if (!entityPathType.getPackage().equals(ColumnMetadata.class.getPackage())) {
-            writer.imports(entityPathType);
-        }
-
-        writeUserImports(writer);
-    }
-
-    protected void writeUserImports(CodeWriter writer) throws IOException {
-        Set<String> packages = new HashSet<String>();
-        Set<String> classes = new HashSet<String>();
-
-        for (String javaImport : imports){
-            //true if the character next to the dot is an upper case or if no dot is found (-1+1=0) the first character
-            boolean isClass = Character.isUpperCase(javaImport.charAt(javaImport.lastIndexOf(".") + 1));
-            if (isClass){
-                classes.add(javaImport);
-            }else{
-                packages.add(javaImport);
-            }
-        }
-
-        String[] marker = new String[]{};
-        writer.importPackages(packages.toArray(marker));
-        writer.importClasses(classes.toArray(marker));
-    }
-
-    @Override
-    protected void outro(EntityType model, CodeWriter writer) throws IOException {
-        writer.beginPublicMethod(Types.VOID,"addMetadata");
-        List<Property> properties = Lists.newArrayList(model.getProperties());
-        if (columnComparator != null) {
-            Collections.sort(properties, columnComparator);
-        }
-        for (Property property : properties) {
-            String name = property.getEscapedName();
-            ColumnMetadata metadata = (ColumnMetadata) property.getData().get("COLUMN");
-            StringBuilder columnMeta = new StringBuilder();
-            columnMeta.append("ColumnMetadata");
-            columnMeta.append(".named(\"" + metadata.getName() + "\")");
-            columnMeta.append(".withIndex(" + metadata.getIndex() + ")");
-            columnMeta.append(".ofType(" + metadata.getJdbcType() + ")");
-            if (metadata.hasSize()) {
-                columnMeta.append(".withSize(" + metadata.getSize() + ")");
-            }
-            if (metadata.getDigits() > 0) {
-                columnMeta.append(".withDigits(" + metadata.getDigits() + ")");
-            }
-            if (!metadata.isNullable()) {
-                columnMeta.append(".notNull()");
-            }
-            writer.line("addMetadata(", name, ", ", columnMeta.toString(), ");");
-        }
-        writer.end();
-
-        super.outro(model, writer);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void serializeProperties(EntityType model,  SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        Collection<PrimaryKeyData> primaryKeys =
-            (Collection<PrimaryKeyData>) model.getData().get(PrimaryKeyData.class);
-        Collection<ForeignKeyData> foreignKeys =
-            (Collection<ForeignKeyData>) model.getData().get(ForeignKeyData.class);
-        Collection<InverseForeignKeyData> inverseForeignKeys =
-            (Collection<InverseForeignKeyData>)model.getData().get(InverseForeignKeyData.class);
-
-        if (innerClassesForKeys) {
-            Type primaryKeyType = new SimpleType(namingStrategy.getPrimaryKeysClassName());
-            Type foreignKeysType = new SimpleType(namingStrategy.getForeignKeysClassName());
-
-            // primary keys
-            if (primaryKeys != null) {
-                writer.beginClass(primaryKeyType);
-                serializePrimaryKeys(model, writer, primaryKeys);
-                writer.end();
-            }
-
-            // foreign keys
-            if (foreignKeys != null || inverseForeignKeys != null) {
-                writer.beginClass(foreignKeysType);
-                if (foreignKeys != null) {
-                    serializeForeignKeys(model, writer, foreignKeys, false);
-                }
-                // inverse foreign keys
-                if (inverseForeignKeys != null) {
-                    serializeForeignKeys(model, writer, inverseForeignKeys, true);
-                }
-                writer.end();
-            }
-
-            super.serializeProperties(model, config, writer);
-
-            if (primaryKeys != null) {
-                writer.publicFinal(
-                        primaryKeyType,
-                        namingStrategy.getPrimaryKeysVariable(model),
-                        "new "+primaryKeyType.getSimpleName()+"()");
-            }
-            if (foreignKeys != null || inverseForeignKeys != null) {
-                writer.publicFinal(
-                        foreignKeysType,
-                        namingStrategy.getForeignKeysVariable(model),
-                        "new "+foreignKeysType.getSimpleName()+"()");
-            }
-
-        } else {
-
-            super.serializeProperties(model, config, writer);
-
-            // primary keys
-            if (primaryKeys != null) {
-                serializePrimaryKeys(model, writer, primaryKeys);
-            }
-
-            // foreign keys
-            if (foreignKeys != null) {
-                serializeForeignKeys(model, writer, foreignKeys, false);
-            }
-
-            // inverse foreign keys
-            if (inverseForeignKeys != null) {
-                serializeForeignKeys(model, writer, inverseForeignKeys, true);
-            }
-        }
-    }
-
-    @Override
-    protected void customField(EntityType model, Property field, SerializerConfig config,
-            CodeWriter writer) throws IOException {
-        Type queryType = typeMappings.getPathType(field.getType(), model, false);
-        String localRawName = writer.getRawName(field.getType());
-        serialize(model, field, queryType, writer, "create" + field.getType().getSimpleName(),
-                writer.getClassConstant(localRawName));
-    }
-
-    protected void serializePrimaryKeys(EntityType model, CodeWriter writer,
-            Collection<PrimaryKeyData> primaryKeys) throws IOException {
-        for (PrimaryKeyData primaryKey : primaryKeys) {
-            String fieldName = namingStrategy.getPropertyNameForPrimaryKey(primaryKey.getName(), model);
-            StringBuilder value = new StringBuilder("createPrimaryKey(");
-            boolean first = true;
-            for (String column : primaryKey.getColumns()) {
-                if (!first) {
-                    value.append(", ");
-                }
-                value.append(namingStrategy.getPropertyName(column, model));
-                first = false;
-            }
-            value.append(")");
-            Type type = new ClassType(PrimaryKey.class, model);
-            writer.publicFinal(type, fieldName, value.toString());
-        }
-
-    }
-
-    protected void serializeForeignKeys(EntityType model, CodeWriter writer,
-            Collection<? extends KeyData> foreignKeys, boolean inverse) throws IOException {
-        for (KeyData foreignKey : foreignKeys) {
-            String fieldName;
-            if (inverse) {
-                fieldName = namingStrategy.getPropertyNameForInverseForeignKey(foreignKey.getName(), model);
-            } else {
-                fieldName = namingStrategy.getPropertyNameForForeignKey(foreignKey.getName(), model);
-            }
-
-            StringBuilder value = new StringBuilder();
-            if (inverse) {
-                value.append("createInvForeignKey(");
-            } else {
-                value.append("createForeignKey(");
-            }
-            if (foreignKey.getForeignColumns().size() == 1) {
-                value.append(namingStrategy.getPropertyName(foreignKey.getForeignColumns().get(0), model));
-                value.append(", \"" + foreignKey.getParentColumns().get(0) + "\"");
-            } else {
-                StringBuilder local = new StringBuilder();
-                StringBuilder foreign = new StringBuilder();
-                for (int i = 0; i < foreignKey.getForeignColumns().size(); i++) {
-                    if (i > 0) {
-                        local.append(", ");
-                        foreign.append(", ");
-                    }
-                    local.append(namingStrategy.getPropertyName(foreignKey.getForeignColumns().get(i), model));
-                    foreign.append("\"" +foreignKey.getParentColumns().get(i) + "\"");
-                }
-                value.append("Arrays.asList("+local+"), Arrays.asList("+foreign+")");
-            }
-            value.append(")");
-            Type type = new ClassType(ForeignKey.class, foreignKey.getType());
-            writer.publicFinal(type, fieldName, value.toString());
-        }
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java
deleted file mode 100644
index aa2faa759c..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import com.mysema.query.codegen.EntityType;
-
-/**
- * NamingStrategy defines a conversion strategy from table to class and column
- * to property names
- *
- * @author tiwe
- */
-public interface NamingStrategy {
-
-    /**
-     * Normalizes and appends the given schema name to the package name
-     * 
-     * @param packageName
-     * @param schema
-     * @return
-     */
-    String appendSchema(String packageName, String schema);
-    
-    /**
-     * Convert the given tableName to a simple class name
-     * @return
-     */
-    String getClassName(String tableName);
-
-    /**
-     * Get the default alias for the given EntityType
-     *
-     * @param entityType
-     * @return
-     */
-    String getDefaultAlias(EntityType entityType);
-
-    /**
-     * Get the default variable name for the given EntityType
-     *
-     * @param entityType
-     * @return
-     */
-    String getDefaultVariableName(EntityType entityType);
-
-    /**
-     * Get the class name for the foreign keys inner class
-     * 
-     * @return
-     */
-    String getForeignKeysClassName();
-
-    /**
-     * Get the field name for the foreign keys class instance
-     * 
-     * @return
-     */
-    String getForeignKeysVariable(EntityType entityType);
-
-    /**
-     * Get the class name for the primary keys inner class
-     * 
-     * @return
-     */
-    String getPrimaryKeysClassName();
-
-    /**
-     * Get the field name for the primary keys class instance
-     * 
-     * @return
-     */
-    String getPrimaryKeysVariable(EntityType entityType);
-
-    /**
-     * Convert the given column name to a property name
-     *
-     * @param columnName
-     * @param entityType
-     * @return
-     */
-    String getPropertyName(String columnName, EntityType entityType);
-
-    /**
-     * Convert the given foreign key name to a foreign key property name
-     *
-     * @param foreignKeyName
-     * @param entityType
-     * @return
-     */
-    String getPropertyNameForForeignKey(String foreignKeyName, EntityType entityType);
-    
-    /**
-     * Convert the given foreign key name to a foreign key property name
-     * 
-     * @param name
-     * @param model
-     * @return
-     */
-    String getPropertyNameForInverseForeignKey(String name, EntityType model);
-    
-    /**
-     * Convert the given primary key name to a primary key property name
-     *
-     * @param name
-     * @param model
-     * @return
-     */
-    String getPropertyNameForPrimaryKey(String name, EntityType model);
-    
-    /**
-     * Convert the given column name and provide the opportunity to add quoted identifiers
-     *
-     * @param columnName
-     * @return
-     */
-    String normalizeColumnName(String columnName);
-    
-    /**
-     * Convert the given table name and provide the opportunity to add quoted identifiers
-     *
-     * @param tableName
-     * @return
-     */
-    String normalizeTableName(String tableName);
-    
-
-    /**
-     * Convert the given schema name and provide the opportunity to add quoted identifiers
-     *
-     * @param schemaName
-     * @return
-     */
-    String normalizeSchemaName(String schemaName);
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OrdinalPositionComparator.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OrdinalPositionComparator.java
deleted file mode 100644
index 5bc9079bb6..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OrdinalPositionComparator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mysema.query.sql.codegen;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Map;
-
-import com.mysema.query.codegen.Property;
-import com.mysema.query.sql.ColumnMetadata;
-
-public class OrdinalPositionComparator implements Comparator<Property> {
-
-    public OrdinalPositionComparator() {
-        super();
-    }
-
-    @Override
-    public int compare(Property property1, Property property2) {
-        Integer comparison = null;
-        for (Property property : Arrays.asList(property1, property2)) {
-            Map<Object, Object> data = property.getData();
-            ColumnMetadata columnMetadata = (ColumnMetadata) data.get("COLUMN");
-            int index = columnMetadata.getIndex();
-            comparison = comparison == null ? index : comparison - index;
-        }
-        return comparison;
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java
deleted file mode 100644
index dab998c5b1..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import com.mysema.query.codegen.EntityType;
-
-/**
- * OriginalNamingStrategy preserves the table and column names in the conversion
- *
- * @author tiwe
- *
- */
-public class OriginalNamingStrategy extends AbstractNamingStrategy {
-
-    @Override
-    public String getClassName(String tableName) {
-        return Naming.normalize(tableName, reservedSuffix);
-    }
-
-    @Override
-    public String getDefaultAlias(EntityType entityType) {
-        return entityType.getData().get("table").toString();
-    }
-
-    @Override
-    public String getDefaultVariableName(EntityType entityType) {
-        return Naming.normalize(escape(entityType, entityType.getData().get("table").toString()), reservedSuffix);
-    }
-
-    @Override
-    public String getPropertyName(String columnName, EntityType entityType) {
-        return getPropertyName(columnName);
-    }
-
-    @Override
-    public String getPropertyNameForForeignKey(String foreignKeyName, EntityType entityType) {
-        return getPropertyName(foreignKeyName);
-    }
-
-    @Override
-    public String getPropertyNameForInverseForeignKey(String foreignKeyName, EntityType entityType) {
-        return "_" + foreignKeyName;
-    }
-
-    @Override
-    public String getPropertyNameForPrimaryKey(String primaryKeyName, EntityType model) {
-        return getPropertyName(primaryKeyName);
-    }
-
-    private String getPropertyName(String name) {
-        return Naming.normalize(name, reservedSuffix);
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SpatialSupport.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SpatialSupport.java
deleted file mode 100644
index 6b3b2b630b..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SpatialSupport.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.awt.Polygon;
-import java.util.Map;
-import java.util.Set;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.mysema.codegen.model.ClassType;
-import com.mysema.codegen.model.Type;
-import com.mysema.query.codegen.AbstractModule;
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.codegen.TypeMappings;
-import com.mysema.query.spatial.path.GeometryCollectionPath;
-import com.mysema.query.spatial.path.GeometryPath;
-import com.mysema.query.spatial.path.LineStringPath;
-import com.mysema.query.spatial.path.LinearRingPath;
-import com.mysema.query.spatial.path.MultiLineStringPath;
-import com.mysema.query.spatial.path.MultiPointPath;
-import com.mysema.query.spatial.path.MultiPolygonPath;
-import com.mysema.query.spatial.path.PointPath;
-import com.mysema.query.spatial.path.PolygonPath;
-import com.mysema.query.spatial.path.PolyhedralSurfacePath;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.spatial.RelationalPathSpatial;
-
-/**
- * @author tiwe
- *
- */
-public final class SpatialSupport {
-
-    private static void registerTypes(Configuration configuration) {
-        // mysql & postgres
-        configuration.registerType("geometry", Geometry.class);
-        configuration.registerType("point", Point.class);
-        configuration.registerType("linestring", LineString.class);
-        configuration.registerType("polygon", Polygon.class);
-        configuration.registerType("multipoint", MultiPoint.class);
-        configuration.registerType("multilinestring", MultiLineString.class);
-        configuration.registerType("multipolygon", MultiPolygon.class);
-        configuration.registerType("geometrycollection", GeometryCollection.class);
-        // teradata
-        configuration.registerType("sysudtlib.st_geometry", Geometry.class);
-    }
-
-    private static void registerTypes(TypeMappings typeMappings) {
-        Map<Class<?>, Class<?>> mappings = Maps.newHashMap();
-        mappings.put(GeometryCollection.class, GeometryCollectionPath.class);
-        mappings.put(Geometry.class, GeometryPath.class);
-        mappings.put(LinearRing.class, LinearRingPath.class);
-        mappings.put(LineString.class, LineStringPath.class);
-        mappings.put(MultiLineString.class, MultiLineStringPath.class);
-        mappings.put(MultiPoint.class, MultiPointPath.class);
-        mappings.put(MultiPolygon.class, MultiPolygonPath.class);
-        mappings.put(Point.class, PointPath.class);
-        mappings.put(Polygon.class, PolygonPath.class);
-        mappings.put(PolyHedralSurface.class, PolyhedralSurfacePath.class);
-        for (Map.Entry<Class<?>, Class<?>> entry : mappings.entrySet()) {
-            Type type = new ClassType(entry.getKey());
-            typeMappings.register(type, new ClassType(entry.getValue(), type));
-        }
-    }
-
-    private static void addImports(AbstractModule module) {
-        Set<String> imports = module.get(Set.class, CodegenModule.IMPORTS);
-        String packageName = GeometryPath.class.getPackage().getName();
-        if (imports.isEmpty()) {
-            imports = ImmutableSet.of(packageName);
-        } else {
-            Set<String> old = imports;
-            imports = Sets.newHashSet();
-            imports.addAll(old);
-            imports.add(packageName);
-        }
-        module.bind(CodegenModule.IMPORTS, imports);
-    }
-
-    public static void addSupport(AbstractModule module) {
-        module.bindInstance(SQLCodegenModule.ENTITYPATH_TYPE, RelationalPathSpatial.class);
-        registerTypes(module.get(Configuration.class));
-        registerTypes(module.get(TypeMappings.class));
-        addImports(module);
-    }
-
-    private SpatialSupport() {}
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ColumnData.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ColumnData.java
deleted file mode 100644
index c1b1e8f360..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ColumnData.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-/**
- * @author tiwe
- *
- */
-public class ColumnData {
-    
-    private final String name;
-    
-    private final String type;
-    
-    private boolean nullAllowed = true;
-    
-    private boolean autoIncrement;
-    
-    private Integer size;
-
-    public ColumnData(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public boolean isNullAllowed() {
-        return nullAllowed;
-    }
-
-    public void setNullAllowed(boolean nullAllowed) {
-        this.nullAllowed = nullAllowed;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public boolean isAutoIncrement() {
-        return autoIncrement;
-    }
-
-    public void setAutoIncrement(boolean autoIncrement) {
-        this.autoIncrement = autoIncrement;
-    }
-    
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ForeignKeyData.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ForeignKeyData.java
deleted file mode 100644
index b953d18435..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/ForeignKeyData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.mysema.codegen.model.Type;
-
-/**
- * @author tiwe
- *
- */
-public class ForeignKeyData implements KeyData {
-
-    private final String name;
-    
-    @Nullable
-    private final String schema;
-
-    private final String table;
-    
-    @Nullable
-    private final Type type;
-    
-    private final List<String> foreignColumns = new ArrayList<String>();
-    
-    private final List<String> parentColumns = new ArrayList<String>();
-
-    public ForeignKeyData(String name, @Nullable String schema, String parentTable, @Nullable Type type) {
-        this.name = name;
-        this.schema = schema;
-        this.table = parentTable;
-        this.type = type;
-    }
-
-    public void add(String foreignColumn, String parentColumn) {
-        foreignColumns.add(foreignColumn);
-        parentColumns.add(parentColumn);
-    }
-
-    public String getName() {
-        return name;
-    }
-    
-    @Nullable
-    public String getSchema() {
-        return schema;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public List<String> getForeignColumns() {
-        return foreignColumns;
-    }
-
-    public List<String> getParentColumns() {
-        return parentColumns;
-    }
-
-    @Nullable
-    public Type getType() {
-        return type;
-    }
-    
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/IndexData.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/IndexData.java
deleted file mode 100644
index 113a9b0eef..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/IndexData.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-/**
- * @author tiwe
- *
- */
-public class IndexData {
-
-    private final String name;
-    
-    private final String[] columns;
-
-    private boolean unique;
-    
-    public IndexData(String name, String[] columns) {
-        this.name = name;
-        this.columns = columns.clone();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String[] getColumns() {
-        return columns.clone();
-    }
-
-    public boolean isUnique() {
-        return unique;
-    }
-
-    public void setUnique(boolean unique) {
-        this.unique = unique;
-    }
-    
-    
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/KeyData.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/KeyData.java
deleted file mode 100644
index 559c04d4c9..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/KeyData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-import java.util.List;
-
-import com.mysema.codegen.model.Type;
-
-/**
- * Common interface for ForeignKeyData and InverseForeignKeyData
- * 
- * @author tiwe
- *
- */
-public interface KeyData {
-
-    String getName();
-
-    String getTable();
-    
-    Type getType();
-    
-    List<String> getForeignColumns();
-
-    List<String> getParentColumns();
-
-}
\ No newline at end of file
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/NotNullImpl.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/NotNullImpl.java
deleted file mode 100644
index b7d15b95df..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/NotNullImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-import java.lang.annotation.Annotation;
-
-import javax.validation.Payload;
-import javax.validation.constraints.*;
-
-/**
- * @author tiwe
- *
- */
-@SuppressWarnings("all")
-public class NotNullImpl implements NotNull{
-
-    @Override
-    public Class<?>[] groups() {
-        return new Class[0];
-    }
-
-    @Override
-    public String message() {
-        return "{javax.validation.constraints.NotNull.message}";
-    }
-
-    @Override
-    public Class<? extends Annotation> annotationType() {
-        return NotNull.class;
-    }
-
-    @Override
-    public Class<? extends Payload>[] payload() {
-        return new Class[0];
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/PrimaryKeyData.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/PrimaryKeyData.java
deleted file mode 100644
index a5e4fb8877..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/PrimaryKeyData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.support;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tiwe
- *
- */
-public class PrimaryKeyData {
-
-    private final String name;
-
-    private final List<String> columns = new ArrayList<String>();
-
-    public PrimaryKeyData(String name) {
-        this.name = name;
-    }
-    
-    public PrimaryKeyData(String name, String[] c) {
-        this.name = name;
-        for (String column : c) {
-            columns.add(column);
-        }
-    }
-
-    public void add(String column) {
-        columns.add(column);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public List<String> getColumns() {
-        return columns;
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/package-info.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/package-info.java
deleted file mode 100644
index 5a9de44bea..0000000000
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Support classes
- */
-package com.mysema.query.sql.support;
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
new file mode 100644
index 0000000000..9203b6b2cb
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import javax.lang.model.SourceVersion;
+
+import com.querydsl.codegen.EntityType;
+import com.querydsl.sql.SchemaAndTable;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+
+/**
+ * {@code AbstractNamingStrategy} is an abstract base class for {@link NamingStrategy} implementations
+ *
+ * @author tiwe
+ *
+ */
+public abstract class AbstractNamingStrategy implements NamingStrategy {
+
+    protected String foreignKeysClassName = "ForeignKeys";
+
+    protected String foreignKeysVariable = "fk";
+
+    protected String primaryKeysClassName = "PrimaryKeys";
+
+    protected String primaryKeysVariable = "pk";
+
+    protected String reservedSuffix = "_col";
+
+    @Override
+    public String appendSchema(String packageName, String schemaName) {
+        if (schemaName == null) {
+          return packageName;
+        }
+        String suffix = schemaName.toLowerCase();
+        if (SourceVersion.isKeyword(suffix)) {
+            suffix += "_";
+        }
+        return packageName + "." + suffix;
+    }
+
+    protected String escape(EntityType entityType, String name) {
+        int suffix = 0;
+        while (true) {
+            String candidate = suffix > 0 ? name + suffix : name;
+            if (entityType.getEscapedPropertyNames().contains(candidate)) {
+                suffix++;
+            } else {
+                return candidate;
+            }
+        }
+    }
+
+    @Override
+    public String getForeignKeysClassName() {
+        return foreignKeysClassName;
+    }
+
+    @Override
+    public String getForeignKeysVariable(EntityType entityType) {
+        return foreignKeysVariable;
+    }
+
+    @Override
+    public String getPrimaryKeysClassName() {
+        return primaryKeysClassName;
+    }
+
+    @Override
+    public String getPrimaryKeysVariable(EntityType entityType) {
+        return primaryKeysVariable;
+    }
+
+    @Override
+    public String normalizeColumnName(String columnName) {
+        return normalizeSQLName(columnName);
+    }
+
+    @Override
+    public String normalizeTableName(String tableName) {
+        return normalizeSQLName(tableName);
+    }
+
+    @Override
+    public String normalizeSchemaName(String schemaName) {
+        return normalizeSQLName(schemaName);
+    }
+
+    protected String normalizeSQLName(String name) {
+        if (name != null) {
+            return name.replaceAll("\r", "").replaceAll("\n", " ");
+        } else {
+            return null;
+        }
+    }
+
+    protected String normalizeJavaName(String name) {
+        return Naming.normalize(name, reservedSuffix);
+    }
+
+    public void setForeignKeysClassName(String foreignKeysClassName) {
+        this.foreignKeysClassName = foreignKeysClassName;
+    }
+
+    public void setForeignKeysVariable(String foreignKeysVariable) {
+        this.foreignKeysVariable = foreignKeysVariable;
+    }
+
+    public void setPrimaryKeysClassName(String primaryKeysClassName) {
+        this.primaryKeysClassName = primaryKeysClassName;
+    }
+
+    public void setPrimaryKeysVariable(String primaryKeysVariable) {
+        this.primaryKeysVariable = primaryKeysVariable;
+    }
+
+    public void setReservedSuffix(String reservedSuffix) {
+        this.reservedSuffix = reservedSuffix;
+    }
+
+    @Override
+    public String getPackage(String basePackage, SchemaAndTable schemaAndTable) {
+        return appendSchema(basePackage, schemaAndTable.getSchema());
+    }
+
+    @Override
+    public boolean shouldGenerateClass(SchemaAndTable schemaAndTable) {
+        return true;
+    }
+
+    @Override
+    public boolean shouldGenerateForeignKey(SchemaAndTable schemaAndTable,
+        ForeignKeyData foreignKeyData) {
+        return true;
+    }
+
+    @Override
+    public String getClassName(SchemaAndTable schemaAndTable) {
+        return getClassName(schemaAndTable.getTable());
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/DefaultNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/DefaultNamingStrategy.java
new file mode 100644
index 0000000000..a37bedfed4
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/DefaultNamingStrategy.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+import com.querydsl.codegen.EntityType;
+
+/**
+ * {@code DefaultNamingStrategy} is the default implementation of the {@link NamingStrategy}
+ * interface. It changes underscore usage into camel case form.
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultNamingStrategy extends AbstractNamingStrategy {
+
+    public DefaultNamingStrategy() {
+        reservedSuffix = "Col";
+    }
+
+    @Override
+    public String getClassName(String tableName) {
+        String className = tableName.substring(0, 1).toUpperCase(Locale.ENGLISH) +
+                toCamelCase(tableName.substring(1));
+        return normalizeJavaName(className);
+    }
+
+    @Override
+    public String getDefaultAlias(EntityType entityType) {
+        return entityType.getData().get("table").toString();
+    }
+
+    @Override
+    public String getDefaultVariableName(EntityType entityType) {
+        String variable = escape(entityType, toCamelCase(entityType.getData().get("table").toString()));
+        return normalizeJavaName(variable);
+    }
+
+    @Override
+    public String getForeignKeysVariable(EntityType entityType) {
+        String variable = escape(entityType, foreignKeysVariable);
+        return normalizeJavaName(variable);
+    }
+
+    @Override
+    public String getPrimaryKeysVariable(EntityType entityType) {
+        String variable = escape(entityType, primaryKeysVariable);
+        return normalizeJavaName(variable);
+    }
+
+    @Override
+    public String getPropertyName(String columnName, EntityType entityType) {
+        String normalized = normalizeJavaName(columnName);
+        return normalizeJavaName(normalized.substring(0, 1).toLowerCase(Locale.ENGLISH) +
+                toCamelCase(normalized.substring(1)));
+    }
+
+    @Override
+    public String getPropertyNameForForeignKey(String fkName, EntityType entityType) {
+        if (fkName.toLowerCase().startsWith("fk_")) {
+            fkName = fkName.substring(3) + "_" + fkName.substring(0,2);
+        }
+        String propertyName = escape(entityType, getPropertyName(fkName, entityType));
+        return normalizeJavaName(propertyName);
+    }
+
+    @Override
+    public String getPropertyNameForInverseForeignKey(String fkName, EntityType entityType) {
+        String propertyName = "_" + getPropertyNameForForeignKey(fkName, entityType);
+        return normalizeJavaName(propertyName);
+    }
+
+
+    @Override
+    public String getPropertyNameForPrimaryKey(String pkName, EntityType entityType) {
+        if (pkName.toLowerCase().startsWith("pk_")) {
+            pkName = pkName.substring(3) + "_" + pkName.substring(0,2);
+        }
+        String propertyName = getPropertyName(pkName, entityType);
+        for (String candidate : Arrays.asList(propertyName, propertyName + "Pk")) {
+            if (!entityType.getEscapedPropertyNames().contains(candidate)) {
+                return normalizeJavaName(candidate);
+            }
+        }
+        return normalizeJavaName(escape(entityType, propertyName));
+    }
+
+    protected String toCamelCase(String str) {
+        boolean toLower = str.toUpperCase().equals(str);
+        StringBuilder builder = new StringBuilder(str.length());
+        for (int i = 0; i < str.length(); i++) {
+            if (i < str.length() - 1 && (str.charAt(i) == '_' || str.charAt(i) == ' ')) {
+                i += 1;
+                if (i < str.length()) {
+                    builder.append(Character.toUpperCase(str.charAt(i)));
+                }
+            } else if (toLower) {
+                builder.append(Character.toLowerCase(str.charAt(i)));
+            } else {
+                builder.append(str.charAt(i));
+            }
+        }
+        return builder.toString();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java
new file mode 100644
index 0000000000..6c6b02e2ce
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedBeanSerializer.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.sql.Column;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@code ExtendedBeanSerializer} outputs primary key based {@code equals}, {@code hashCode} and
+ * {@code toString} implementations
+ *
+ * Requires column annotation generation to be enabled
+ *
+ * @author tiwe
+ *
+ */
+public class ExtendedBeanSerializer extends BeanSerializer {
+
+    private static final Parameter o = new Parameter("o", Types.OBJECT);
+
+    public ExtendedBeanSerializer() {
+    }
+
+    /**
+     * Create a new ExtendedBeanSerializer with the given javadoc suffix and generatedAnnotationClass
+     *
+     * @param javadocSuffix suffix to be used after the simple name in class level javadoc
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public ExtendedBeanSerializer(
+            @Named(SQLCodegenModule.JAVADOC_SUFFIX) String javadocSuffix,
+            @Named(SQLCodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        super(javadocSuffix, generatedAnnotationClass);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void bodyEnd(EntityType model, CodeWriter writer) throws IOException {
+        Collection<PrimaryKeyData> primaryKeys = (Collection<PrimaryKeyData>) model.getData().get(PrimaryKeyData.class);
+
+        if (primaryKeys == null || primaryKeys.isEmpty()) {
+            return;
+        }
+
+        Map<String, Property> columnToProperty = new HashMap<String, Property>();
+        for (Property property : model.getProperties()) {
+            columnToProperty.put(property.getAnnotation(Column.class).value(), property);
+        }
+
+        StringBuilder anyColumnIsNull = new StringBuilder();
+        StringBuilder columnEquals = new StringBuilder();
+        List<String> properties = new ArrayList<String>();
+        for (PrimaryKeyData pk : primaryKeys) {
+            for (String column : pk.getColumns()) {
+                Property property = columnToProperty.get(column);
+                String propName = property.getEscapedName();
+                if (anyColumnIsNull.length() > 0) {
+                    anyColumnIsNull.append(" || ");
+                    columnEquals.append(" && ");
+                }
+                anyColumnIsNull.append(propName).append(" == null");
+                columnEquals.append(propName).append(".equals(obj.").append(propName).append(")");
+                properties.add(propName);
+            }
+        }
+
+        // equals
+        writer.annotation(Override.class);
+        writer.beginPublicMethod(Types.BOOLEAN_P, "equals", o);
+        writer.line("if (", anyColumnIsNull + ") {");
+        writer.line("    return super.equals(o);");
+        writer.line("}");
+        writer.line("if (!(o instanceof ", model.getSimpleName(), ")) {");
+        writer.line("    return false;");
+        writer.line("}");
+        writer.line(model.getSimpleName(), " obj = (", model.getSimpleName(), ") o;");
+        writer.line("return ", columnEquals + ";");
+        writer.end();
+
+        // hashCode
+        writer.annotation(Override.class);
+        writer.beginPublicMethod(Types.INT, "hashCode");
+        writer.line("if (", anyColumnIsNull + ") {");
+        writer.line("    return super.hashCode();");
+        writer.line("}");
+        writer.line("final int prime = 31;");
+        writer.line("int result = 1;");
+        for (String property : properties) {
+            writer.line("result = prime * result + ", property, ".hashCode();");
+        }
+        writer.line("return result;");
+        writer.end();
+
+
+    }
+
+    @Override
+    protected void addToString(EntityType model, CodeWriter writer) throws IOException {
+        Collection<PrimaryKeyData> primaryKeys = (Collection<PrimaryKeyData>) model.getData().get(PrimaryKeyData.class);
+
+        if (primaryKeys == null || primaryKeys.isEmpty()) {
+            super.addToString(model, writer);
+            return;
+        }
+
+        StringBuilder toString = new StringBuilder();
+        Map<String, Property> columnToProperty = new HashMap<String, Property>();
+        for (Property property : model.getProperties()) {
+            columnToProperty.put(property.getAnnotation(Column.class).value(), property);
+        }
+
+        for (PrimaryKeyData pk : primaryKeys) {
+            for (String column : pk.getColumns()) {
+                Property property = columnToProperty.get(column);
+                String propName = property.getEscapedName();
+                if (toString.length() > 0) {
+                    toString.append("+ \";\" + ");
+                } else {
+                    toString.append("\"" + model.getSimpleName() + "#\" + ");
+                }
+                toString.append(propName);
+            }
+        }
+
+        // toString
+        writer.annotation(Override.class);
+        writer.beginPublicMethod(Types.STRING, "toString");
+//        writer.line("if (", anyColumnIsNull + ") {");
+//        writer.line("    return super.toString();");
+//        writer.line("}");
+        writer.line("return ", toString + ";");
+        writer.end();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedNamingStrategy.java
new file mode 100644
index 0000000000..0855d7a825
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ExtendedNamingStrategy.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import java.util.regex.Pattern;
+
+import com.querydsl.codegen.EntityType;
+
+/**
+ * {@code ExtendedNamingStrategy} works like the {@link DefaultNamingStrategy}, but tries to create foreign key
+ * property names in a different way.
+ *
+ * <p>It looks for patterns like this {@literal .*_<forward>_<inverse>} and uses the forward part for
+ * the foreign key name and inverse for the inverse foreign key name.</p>
+ *
+ * @author tiwe
+ *
+ */
+public class ExtendedNamingStrategy extends DefaultNamingStrategy {
+
+    private static final Pattern SPLIT = Pattern.compile("_");
+
+    @Override
+    public String getPropertyNameForForeignKey(String fkName, EntityType entityType) {
+        String[] split = SPLIT.split(fkName);
+        if (split.length > 2) {
+            return getPropertyName(split[split.length - 2], entityType);
+        } else {
+            return super.getPropertyNameForForeignKey(fkName, entityType);
+        }
+    }
+
+    @Override
+    public String getPropertyNameForInverseForeignKey(String fkName, EntityType entityType) {
+        String[] split = SPLIT.split(fkName);
+        if (split.length > 2) {
+            return getPropertyName(split[split.length - 1], entityType);
+        } else {
+            return super.getPropertyNameForInverseForeignKey(fkName, entityType);
+        }
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/KeyDataFactory.java
similarity index 80%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/KeyDataFactory.java
index 31d23b13b4..a49de07a6b 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/KeyDataFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,23 +11,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.query.sql.support.ForeignKeyData;
-import com.mysema.query.sql.support.InverseForeignKeyData;
-import com.mysema.query.sql.support.PrimaryKeyData;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.sql.SchemaAndTable;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+import com.querydsl.sql.codegen.support.InverseForeignKeyData;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
 
 /**
+ * {@code KeyDataFactory} is a factory for table key data
+ *
  * @author tiwe
  *
  */
@@ -67,10 +70,9 @@ public KeyDataFactory(NamingStrategy namingStrategy, String packageName,
     }
 
     public Map<String, InverseForeignKeyData> getExportedKeys(DatabaseMetaData md,
-            String catalog, String schema, String tableName) throws SQLException{
-        ResultSet foreignKeys = md.getExportedKeys(catalog, schema, tableName);
-        Map<String,InverseForeignKeyData> inverseForeignKeyData = new HashMap<String,InverseForeignKeyData>();
-        try{
+            String catalog, String schema, String tableName) throws SQLException {
+        try (ResultSet foreignKeys = md.getExportedKeys(catalog, schema, tableName)) {
+            Map<String, InverseForeignKeyData> inverseForeignKeyData = new TreeMap<String, InverseForeignKeyData>();
             while (foreignKeys.next()) {
                 String name = foreignKeys.getString(FK_NAME);
                 String parentColumnName = namingStrategy.normalizeColumnName(foreignKeys.getString(FK_PARENT_COLUMN_NAME));
@@ -90,16 +92,13 @@ public Map<String, InverseForeignKeyData> getExportedKeys(DatabaseMetaData md,
                 data.add(parentColumnName, foreignColumn);
             }
             return inverseForeignKeyData;
-        }finally{
-            foreignKeys.close();
         }
     }
 
     public Map<String, ForeignKeyData> getImportedKeys(DatabaseMetaData md,
             String catalog, String schema, String tableName) throws SQLException {
-        ResultSet foreignKeys = md.getImportedKeys(catalog, schema, tableName);
-        Map<String,ForeignKeyData> foreignKeyData = new HashMap<String,ForeignKeyData>();
-        try{
+        try (ResultSet foreignKeys = md.getImportedKeys(catalog, schema, tableName)) {
+            Map<String, ForeignKeyData> foreignKeyData = new TreeMap<String, ForeignKeyData>();
             while (foreignKeys.next()) {
                 String name = foreignKeys.getString(FK_NAME);
                 String parentSchemaName = namingStrategy.normalizeSchemaName(foreignKeys.getString(FK_PARENT_SCHEMA_NAME));
@@ -119,16 +118,13 @@ public Map<String, ForeignKeyData> getImportedKeys(DatabaseMetaData md,
                 data.add(foreignColumn, parentColumnName);
             }
             return foreignKeyData;
-        }finally{
-            foreignKeys.close();
         }
     }
 
     public Map<String, PrimaryKeyData> getPrimaryKeys(DatabaseMetaData md,
             String catalog, String schema, String tableName) throws SQLException {
-        ResultSet primaryKeys = md.getPrimaryKeys(catalog, schema, tableName);
-        Map<String,PrimaryKeyData> primaryKeyData = new HashMap<String,PrimaryKeyData>();
-        try{
+        try (ResultSet primaryKeys = md.getPrimaryKeys(catalog, schema, tableName)) {
+            Map<String, PrimaryKeyData> primaryKeyData = new TreeMap<String, PrimaryKeyData>();
             while (primaryKeys.next()) {
                 String name = primaryKeys.getString(PK_NAME);
                 String columnName = primaryKeys.getString(PK_COLUMN_NAME);
@@ -144,17 +140,16 @@ public Map<String, PrimaryKeyData> getPrimaryKeys(DatabaseMetaData md,
                 data.add(columnName);
             }
             return primaryKeyData;
-        }finally{
-            primaryKeys.close();
         }
     }
 
     private Type createType(@Nullable String schemaName, String table) {
+        SchemaAndTable schemaAndTable = new SchemaAndTable(schemaName, table);
         String packageName = this.packageName;
-        if (schemaToPackage && schemaName != null) {
-            packageName = namingStrategy.appendSchema(packageName, schemaName);
+        if (schemaToPackage) {
+            packageName = namingStrategy.getPackage(packageName, schemaAndTable);
         }
-        String simpleName = prefix + namingStrategy.getClassName(table) + suffix;
+        String simpleName = prefix + namingStrategy.getClassName(schemaAndTable) + suffix;
         return new SimpleType(packageName + "." + simpleName, packageName, simpleName);
     }
 
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java
new file mode 100644
index 0000000000..c9048d708c
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java
@@ -0,0 +1,827 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.GeneratedAnnotationResolver;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.QueryTypeFactory;
+import com.querydsl.codegen.Serializer;
+import com.querydsl.codegen.SimpleSerializerConfig;
+import com.querydsl.codegen.TypeMappings;
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.ScalaWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.sql.ColumnImpl;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.SQLTemplatesRegistry;
+import com.querydsl.sql.SchemaAndTable;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+import com.querydsl.sql.codegen.support.InverseForeignKeyData;
+import com.querydsl.sql.codegen.support.NotNullImpl;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
+import com.querydsl.sql.codegen.support.SizeImpl;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.logging.Logger;
+
+/**
+ * {@code MetadataExporter} exports JDBC metadata to Querydsl query types
+ *
+ * <p>Example</p>
+ *
+ * <pre>
+ * MetaDataExporter exporter = new MetaDataExporter();
+ * exporter.setPackageName("com.example.domain");
+ * exporter.setTargetFolder(new File("target/generated-sources/java"));
+ * exporter.export(connection.getMetaData());
+ * </pre>
+ *
+ * @author tiwe
+ */
+public class MetaDataExporter {
+
+    private static final Logger logger = Logger.getLogger(MetaDataExporter.class.getName());
+
+    private final SQLTemplatesRegistry sqlTemplatesRegistry = new SQLTemplatesRegistry();
+
+    private final SQLCodegenModule module = new SQLCodegenModule();
+
+    private final Set<String> classes = new HashSet<String>();
+
+    private File targetFolder;
+
+    private File beansTargetFolder;
+
+    @Nullable
+    private String beanPackageName;
+
+    @Nullable
+    private String schemaPattern, tableNamePattern, catalogPattern;
+
+    @Nullable
+    private Serializer beanSerializer;
+
+    private boolean createScalaSources = false;
+
+    private final Map<EntityType, Type> entityToWrapped = new HashMap<EntityType, Type>();
+
+    private Serializer serializer;
+
+    private TypeMappings typeMappings;
+
+    private QueryTypeFactory queryTypeFactory;
+
+    private NamingStrategy namingStrategy;
+
+    private Configuration configuration;
+
+    private KeyDataFactory keyDataFactory;
+
+    private boolean columnAnnotations = false;
+
+    private boolean validationAnnotations = false;
+
+    private boolean schemaToPackage = false;
+
+    private String sourceEncoding = "UTF-8";
+
+    private boolean lowerCase = false;
+
+    private boolean exportTables = true;
+
+    private boolean exportViews = true;
+
+    private boolean exportAll = false;
+
+    private boolean exportPrimaryKeys = true;
+
+    private boolean exportForeignKeys = true;
+
+    private boolean exportDirectForeignKeys = true;
+
+    private boolean exportInverseForeignKeys = true;
+
+    private boolean spatial = false;
+
+    @Nullable
+    private String tableTypesToExport;
+
+    public MetaDataExporter() { }
+
+    protected EntityType createEntityType(SchemaAndTable schemaAndTable,
+            final String className) {
+        EntityType classModel;
+
+        if (beanSerializer == null) {
+            String packageName = normalizePackage(module.getPackageName(), schemaAndTable);
+            String simpleName = module.getPrefix() + className + module.getSuffix();
+            Type classTypeModel = new SimpleType(TypeCategory.ENTITY,
+                    packageName + "." + simpleName,  packageName, simpleName, false, false);
+            classModel = new EntityType(classTypeModel, module.get(Function.class, CodegenModule.VARIABLE_NAME_FUNCTION_CLASS));
+            typeMappings.register(classModel, classModel);
+
+        } else {
+            String beanPackage = normalizePackage(beanPackageName, schemaAndTable);
+            String simpleName = module.getBeanPrefix() + className + module.getBeanSuffix();
+            Type classTypeModel = new SimpleType(TypeCategory.ENTITY,
+                    beanPackage + "." + simpleName, beanPackage, simpleName, false, false);
+            classModel = new EntityType(classTypeModel, module.get(Function.class, CodegenModule.VARIABLE_NAME_FUNCTION_CLASS));
+
+            Type mappedType = queryTypeFactory.create(classModel);
+            entityToWrapped.put(classModel, mappedType);
+            typeMappings.register(classModel, mappedType);
+        }
+
+        classModel.getData().put("schema", schemaAndTable.getSchema());
+        classModel.getData().put("table", schemaAndTable.getTable());
+        return classModel;
+    }
+
+
+    private String normalizePackage(String packageName, SchemaAndTable schemaAndTable) {
+        String rval = packageName;
+        if (schemaToPackage) {
+            rval = namingStrategy.getPackage(rval, schemaAndTable);
+        }
+        return rval;
+    }
+
+    protected Property createProperty(EntityType classModel, String normalizedColumnName,
+            String propertyName, Type typeModel) {
+        return new Property(
+                classModel,
+                propertyName,
+                propertyName,
+                typeModel,
+                Collections.<String>emptyList(),
+                false);
+    }
+
+    /**
+     * Export the tables based on the given database metadata
+     *
+     * @param md database metadata
+     * @throws SQLException
+     */
+    public void export(DatabaseMetaData md) throws SQLException {
+        if (beanPackageName == null) {
+            beanPackageName =  module.getPackageName();
+        }
+        if (beansTargetFolder == null) {
+            beansTargetFolder = targetFolder;
+        }
+        module.bind(SQLCodegenModule.BEAN_PACKAGE_NAME, beanPackageName);
+        module.loadExtensions();
+
+        classes.clear();
+        typeMappings = module.get(TypeMappings.class);
+        queryTypeFactory = module.get(QueryTypeFactory.class);
+        serializer = module.get(Serializer.class);
+        beanSerializer = module.get(Serializer.class, SQLCodegenModule.BEAN_SERIALIZER);
+        namingStrategy = module.get(NamingStrategy.class);
+        configuration = module.get(Configuration.class);
+
+        SQLTemplates templates = sqlTemplatesRegistry.getTemplates(md);
+        if (templates != null) {
+            configuration.setTemplates(templates);
+        } else {
+            logger.info("Found no specific dialect for " + md.getDatabaseProductName());
+        }
+
+        if (beanSerializer == null) {
+            keyDataFactory = new KeyDataFactory(namingStrategy,  module.getPackageName(),
+                    module.getPrefix(), module.getSuffix(), schemaToPackage);
+        } else {
+            keyDataFactory = new KeyDataFactory(namingStrategy, beanPackageName,
+                    module.getBeanPrefix(), module.getBeanSuffix(), schemaToPackage);
+        }
+
+        String[] typesArray = null;
+
+        if (tableTypesToExport != null && !tableTypesToExport.isEmpty()) {
+            List<String> types = new ArrayList<String>();
+            for (String tableType : tableTypesToExport.split(",")) {
+                types.add(tableType.trim());
+            }
+            typesArray = types.toArray(new String[0]);
+        } else if (!exportAll) {
+            List<String> types = new ArrayList<String>(2);
+            if (exportTables) {
+                types.add("TABLE");
+            }
+            if (exportViews) {
+                types.add("VIEW");
+            }
+            typesArray = types.toArray(new String[0]);
+        }
+
+        List<String> catalogs = patternAsList(catalogPattern);
+        List<String> schemas = patternAsList(schemaPattern);
+        List<String> tables = patternAsList(tableNamePattern);
+
+        for (String catalog : catalogs) {
+            catalog = trimIfNonNull(catalog);
+            for (String schema : schemas) {
+                schema = trimIfNonNull(schema);
+                for (String table : tables) {
+                    table = trimIfNonNull(table);
+                    handleTables(md, catalog, schema, table, typesArray);
+                }
+            }
+        }
+    }
+
+    private String trimIfNonNull(String input) {
+        return input != null ? input.trim() : null;
+    }
+
+    /**
+     * Splits the input on ',' if non-null and a ',' is present.
+     * Returns a singletonList of null if null
+     */
+    private List<String> patternAsList(@Nullable String input) {
+        if (input != null && input.contains(",")) {
+            return Arrays.asList(input.split(","));
+        } else {
+            return Collections.singletonList(input);
+        }
+    }
+
+    private void handleTables(DatabaseMetaData md, String catalogPattern, String schemaPattern, String tablePattern, String[] types) throws SQLException {
+        try (ResultSet tables = md.getTables(catalogPattern, schemaPattern, tablePattern, types)) {
+            while (tables.next()) {
+                handleTable(md, tables);
+            }
+        }
+    }
+
+    Set<String> getClasses() {
+        return classes;
+    }
+
+    private void handleColumn(EntityType classModel, String tableName, ResultSet columns) throws SQLException {
+        String columnName = normalize(columns.getString("COLUMN_NAME"));
+        String normalizedColumnName = namingStrategy.normalizeColumnName(columnName);
+        int columnType = columns.getInt("DATA_TYPE");
+        String typeName = columns.getString("TYPE_NAME");
+        Number columnSize = (Number) columns.getObject("COLUMN_SIZE");
+        Number columnDigits = (Number) columns.getObject("DECIMAL_DIGITS");
+        String columnDefaultValue = columns.getString("COLUMN_DEF");
+        int columnIndex = columns.getInt("ORDINAL_POSITION");
+        int nullable = columns.getInt("NULLABLE");
+
+        String propertyName = namingStrategy.getPropertyName(normalizedColumnName, classModel);
+        Class<?> clazz = configuration.getJavaType(columnType,
+                typeName,
+                columnSize != null ? columnSize.intValue() : 0,
+                columnDigits != null ? columnDigits.intValue() : 0,
+                tableName, columnName);
+        if (clazz == null) {
+            clazz = Object.class;
+        }
+        TypeCategory fieldType = TypeCategory.get(clazz.getName());
+        if (Number.class.isAssignableFrom(clazz)) {
+            fieldType = TypeCategory.NUMERIC;
+        } else if (Enum.class.isAssignableFrom(clazz)) {
+            fieldType = TypeCategory.ENUM;
+        }
+        Type typeModel = new ClassType(fieldType, clazz);
+        Property property = createProperty(classModel, normalizedColumnName, propertyName, typeModel);
+        ColumnMetadata column = ColumnMetadata.named(normalizedColumnName).ofType(columnType).withIndex(columnIndex);
+        if (nullable == DatabaseMetaData.columnNoNulls) {
+            column = column.notNull();
+        }
+        if (columnSize != null) {
+            column = column.withSize(columnSize.intValue());
+        }
+        if (columnDigits != null) {
+            column = column.withDigits(columnDigits.intValue());
+        }
+        property.getData().put("COLUMN", column);
+
+        if (columnAnnotations) {
+            property.addAnnotation(new ColumnImpl(normalizedColumnName));
+        }
+        if (validationAnnotations) {
+            if (nullable == DatabaseMetaData.columnNoNulls && columnDefaultValue == null) {
+                property.addAnnotation(new NotNullImpl());
+            }
+            int size = columns.getInt("COLUMN_SIZE");
+            if (size > 0 && clazz.equals(String.class)) {
+                property.addAnnotation(new SizeImpl(0, size));
+            }
+        }
+        classModel.addProperty(property);
+    }
+
+    private void handleTable(DatabaseMetaData md, ResultSet tables) throws SQLException {
+        String catalog = tables.getString("TABLE_CAT");
+        String schema = tables.getString("TABLE_SCHEM");
+        String schemaName = normalize(tables.getString("TABLE_SCHEM"));
+        String tableName = normalize(tables.getString("TABLE_NAME"));
+
+        String normalizedSchemaName = namingStrategy.normalizeSchemaName(schemaName);
+        String normalizedTableName = namingStrategy.normalizeTableName(tableName);
+
+        SchemaAndTable schemaAndTable = new SchemaAndTable(
+            normalizedSchemaName, normalizedTableName);
+
+        if (!namingStrategy.shouldGenerateClass(schemaAndTable)) {
+            return;
+        }
+
+        String className = namingStrategy.getClassName(schemaAndTable);
+        EntityType classModel = createEntityType(schemaAndTable, className);
+
+        if (exportPrimaryKeys) {
+            // collect primary keys
+            Map<String,PrimaryKeyData> primaryKeyData = keyDataFactory
+                    .getPrimaryKeys(md, catalog, schema, tableName);
+            if (!primaryKeyData.isEmpty()) {
+                classModel.getData().put(PrimaryKeyData.class, primaryKeyData.values());
+            }
+        }
+
+        if (exportForeignKeys) {
+            if (exportDirectForeignKeys) {
+                // collect foreign keys
+                Map<String,ForeignKeyData> foreignKeyData = keyDataFactory
+                        .getImportedKeys(md, catalog, schema, tableName);
+                if (!foreignKeyData.isEmpty()) {
+                    Collection<ForeignKeyData> foreignKeysToGenerate = new LinkedHashSet<ForeignKeyData>();
+                    for (ForeignKeyData fkd : foreignKeyData.values()) {
+                        if (namingStrategy.shouldGenerateForeignKey(schemaAndTable, fkd)) {
+                            foreignKeysToGenerate.add(fkd);
+                        }
+                    }
+
+                    if (!foreignKeysToGenerate.isEmpty()) {
+                        classModel.getData().put(ForeignKeyData.class, foreignKeysToGenerate);
+                    }
+                }
+            }
+
+            if (exportInverseForeignKeys) {
+                // collect inverse foreign keys
+                Map<String,InverseForeignKeyData> inverseForeignKeyData = keyDataFactory
+                        .getExportedKeys(md, catalog, schema, tableName);
+                if (!inverseForeignKeyData.isEmpty()) {
+                    classModel.getData().put(InverseForeignKeyData.class, inverseForeignKeyData.values());
+                }
+            }
+        }
+
+        // collect columns
+        try (ResultSet columns = md.getColumns(catalog, schema, tableName.replace("/", "//"), null)) {
+            while (columns.next()) {
+                handleColumn(classModel, tableName, columns);
+            }
+        }
+
+        // serialize model
+        serialize(classModel, schemaAndTable);
+
+        logger.info("Exported " + tableName + " successfully");
+    }
+
+    private String normalize(String str) {
+        if (lowerCase && str != null) {
+            return str.toLowerCase();
+        } else {
+            return str;
+        }
+    }
+
+    private void serialize(EntityType type, SchemaAndTable schemaAndTable) {
+        try {
+            String fileSuffix = createScalaSources ? ".scala" : ".java";
+
+            if (beanSerializer != null) {
+                String packageName = normalizePackage(beanPackageName, schemaAndTable);
+                String path = packageName.replace('.', '/') + "/" + type.getSimpleName() + fileSuffix;
+                write(beanSerializer, new File(beansTargetFolder, path), type);
+
+                String otherPath = entityToWrapped.get(type).getFullName().replace('.', '/') + fileSuffix;
+                write(serializer, new File(targetFolder, otherPath), type);
+            } else {
+                String packageName = normalizePackage(module.getPackageName(), schemaAndTable);
+                String path =  packageName.replace('.', '/') + "/" + type.getSimpleName() + fileSuffix;
+                write(serializer, new File(targetFolder, path), type);
+            }
+
+        } catch (IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    private void write(Serializer serializer, File targetFile, EntityType type) throws IOException {
+        if (!classes.add(targetFile.getPath())) {
+            throw new IllegalStateException("Attempted to write multiple times to " +
+                    targetFile.getPath() + ", please check your configuration");
+        }
+        StringWriter w = new StringWriter();
+        CodeWriter writer = createScalaSources ? new ScalaWriter(w) : new JavaWriter(w);
+        serializer.serialize(type, SimpleSerializerConfig.DEFAULT, writer);
+
+        // conditional creation
+        boolean generate = true;
+        byte[] bytes = w.toString().getBytes(sourceEncoding);
+        if (targetFile.exists() && targetFile.length() == bytes.length) {
+            String str = new String(Files.readAllBytes(targetFile.toPath()), Charset.forName(sourceEncoding));
+            if (str.equals(w.toString())) {
+                generate = false;
+            }
+        } else {
+            targetFile.getParentFile().mkdirs();
+        }
+
+        if (generate) {
+            Files.write(targetFile.toPath(), bytes);
+        }
+    }
+
+
+    /**
+     * Set the schema pattern filter to be used
+     *
+     * @param schemaPattern a schema name pattern; must match the schema name
+     *        as it is stored in the database; "" retrieves those without a schema;
+     *        {@code null} means that the schema name should not be used to narrow
+     *        the search (default: null)
+     */
+    public void setSchemaPattern(@Nullable String schemaPattern) {
+        this.schemaPattern = schemaPattern;
+    }
+
+    /**
+     * a catalog name; must match the catalog name as it
+     *      is stored in the database; "" retrieves those without a catalog;
+     *      <code>null</code> means that the catalog name should not be used to narrow
+     *      the search
+     */
+    public void setCatalogPattern(@Nullable String catalogPattern) {
+        this.catalogPattern = catalogPattern;
+    }
+
+    /**
+     * Set the table name pattern filter to be used
+     *
+    * @param tableNamePattern a table name pattern; must match the
+    *        table name as it is stored in the database (default: null)
+    */
+    public void setTableNamePattern(@Nullable String tableNamePattern) {
+        this.tableNamePattern = tableNamePattern;
+    }
+
+    /**
+     * Override the configuration
+     *
+     * @param configuration override configuration for custom type mappings etc
+     */
+    public void setConfiguration(Configuration configuration) {
+        module.bind(Configuration.class, configuration);
+    }
+
+    /**
+     * Set true to create Scala sources instead of Java sources
+     *
+     * @param createScalaSources whether to create Scala sources (default: false)
+     */
+    public void setCreateScalaSources(boolean createScalaSources) {
+        this.createScalaSources = createScalaSources;
+    }
+
+    /**
+     * Set the target folder
+     *
+     * @param targetFolder target source folder to create the sources into
+     *        (e.g. target/generated-sources/java)
+     */
+    public void setTargetFolder(File targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    /**
+     * Set the target folder for beans
+     *
+     * <p>defaults to the targetFolder value</p>
+     *
+     * @param targetFolder target source folder to create the bean sources into
+     */
+    public void setBeansTargetFolder(File targetFolder) {
+        this.beansTargetFolder = targetFolder;
+    }
+
+    /**
+     * Set the package name
+     *
+     * @param packageName package name for sources
+     */
+    public void setPackageName(String packageName) {
+        module.bind(SQLCodegenModule.PACKAGE_NAME, packageName);
+    }
+
+    /**
+     * Override the bean package name (default: packageName)
+     *
+     * @param beanPackageName package name for bean sources
+     */
+    public void setBeanPackageName(@Nullable String beanPackageName) {
+        this.beanPackageName = beanPackageName;
+    }
+
+    /**
+     * Override the name prefix for the classes (default: Q)
+     *
+     * @param namePrefix name prefix for querydsl-types (default: Q)
+     */
+    public void setNamePrefix(String namePrefix) {
+        module.bind(CodegenModule.PREFIX, namePrefix);
+    }
+
+    /**
+     * Override the name suffix for the classes (default: "")
+     *
+     * @param nameSuffix name suffix for querydsl-types (default: "")
+     */
+    public void setNameSuffix(String nameSuffix) {
+        module.bind(CodegenModule.SUFFIX, nameSuffix);
+    }
+
+    /**
+     * Override the bean prefix for the classes (default: "")
+     *
+     * @param beanPrefix bean prefix for bean-types (default: "")
+     */
+    public void setBeanPrefix(String beanPrefix) {
+        module.bind(SQLCodegenModule.BEAN_PREFIX, beanPrefix);
+    }
+
+    /**
+     * Override the bean suffix for the classes (default: "")
+     *
+     * @param beanSuffix bean suffix for bean-types (default: "")
+     */
+    public void setBeanSuffix(String beanSuffix) {
+        module.bind(SQLCodegenModule.BEAN_SUFFIX, beanSuffix);
+    }
+
+    /**
+     * Override the NamingStrategy (default: new DefaultNamingStrategy())
+     *
+     * @param namingStrategy naming strategy to override (default: new DefaultNamingStrategy())
+     */
+    public void setNamingStrategy(NamingStrategy namingStrategy) {
+        module.bind(NamingStrategy.class, namingStrategy);
+    }
+
+    /**
+     * Set the Bean serializer to create bean types as well
+     *
+     * @param beanSerializer serializer for JavaBeans (default: null)
+     */
+    public void setBeanSerializer(@Nullable Serializer beanSerializer) {
+        module.bind(SQLCodegenModule.BEAN_SERIALIZER, beanSerializer);
+    }
+
+    /**
+     * Set the Bean serializer class to create bean types as well
+     *
+     * @param beanSerializerClass serializer for JavaBeans (default: null)
+     */
+    public void setBeanSerializerClass(Class<? extends Serializer> beanSerializerClass) {
+        module.bind(SQLCodegenModule.BEAN_SERIALIZER, beanSerializerClass);
+    }
+
+    /**
+     * Set whether inner classes should be created for keys
+     *
+     * @param innerClassesForKeys
+     */
+    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
+        module.bind(SQLCodegenModule.INNER_CLASSES_FOR_KEYS, innerClassesForKeys);
+    }
+
+    /**
+     * Set the column comparator class
+     *
+     * @param columnComparatorClass
+     */
+    public void setColumnComparatorClass(Class<? extends Comparator<Property>> columnComparatorClass) {
+        module.bind(SQLCodegenModule.COLUMN_COMPARATOR, columnComparatorClass);
+    }
+
+    /**
+     * Set the serializer class
+     *
+     * @param serializerClass
+     */
+    public void setSerializerClass(Class<? extends Serializer> serializerClass) {
+        module.bind(Serializer.class, serializerClass);
+    }
+
+    /**
+     * Set the type mappings to use
+     *
+     * @param typeMappings
+     */
+    public void setTypeMappings(TypeMappings typeMappings) {
+        module.bind(TypeMappings.class, typeMappings);
+    }
+
+    /**
+     * Set whether column annotations should be created
+     *
+     * @param columnAnnotations
+     */
+    public void setColumnAnnotations(boolean columnAnnotations) {
+        this.columnAnnotations = columnAnnotations;
+    }
+
+    /**
+     * Set whether validation annotations should be created
+     *
+     * @param validationAnnotations
+     */
+    public void setValidationAnnotations(boolean validationAnnotations) {
+        this.validationAnnotations = validationAnnotations;
+    }
+
+    /**
+     * Set the source encoding
+     *
+     * @param sourceEncoding
+     */
+    public void setSourceEncoding(String sourceEncoding) {
+        this.sourceEncoding = sourceEncoding;
+    }
+
+    /**
+     * Set whether schema names should be appended to the package name.
+     *
+     * <p><b>!!! Important !!!</b><i> {@link NamingStrategy#getPackage(String, SchemaAndTable)}
+     * will be invoked only if <code>schemaToPackage</code> is set to <code>true</code>.</i></p>
+     *
+     * @deprecated This flag will not be necessary in the future because the generated package name
+     * can be controlled in method {@link NamingStrategy#getPackage(String, SchemaAndTable)}.
+     *
+     * @param schemaToPackage
+     */
+    @Deprecated
+    public void setSchemaToPackage(boolean schemaToPackage) {
+        this.schemaToPackage = schemaToPackage;
+        module.bind(SQLCodegenModule.SCHEMA_TO_PACKAGE, schemaToPackage);
+    }
+
+    /**
+     * Set whether names should be normalized to lowercase
+     *
+     * @param lowerCase
+     */
+    public void setLowerCase(boolean lowerCase) {
+        this.lowerCase = lowerCase;
+    }
+
+    /**
+     * Set whether tables should be exported
+     *
+     * @param exportTables
+     */
+    public void setExportTables(boolean exportTables) {
+        this.exportTables = exportTables;
+    }
+
+    /**
+     * Set whether views should be exported
+     *
+     * @param exportViews
+     */
+    public void setExportViews(boolean exportViews) {
+        this.exportViews = exportViews;
+    }
+
+    /**
+     * Set whether all table types should be exported
+     *
+     * @param exportAll
+     */
+    public void setExportAll(boolean exportAll) {
+        this.exportAll = exportAll;
+    }
+
+    /**
+     * Set whether primary keys should be exported
+     *
+     * @param exportPrimaryKeys
+     */
+    public void setExportPrimaryKeys(boolean exportPrimaryKeys) {
+        this.exportPrimaryKeys = exportPrimaryKeys;
+    }
+
+    /**
+     * Set whether foreign keys should be exported
+     *
+     * @param exportForeignKeys
+     */
+    public void setExportForeignKeys(boolean exportForeignKeys) {
+        this.exportForeignKeys = exportForeignKeys;
+    }
+
+    /**
+     * Set whether direct foreign keys should be exported
+     *
+     * @param exportDirectForeignKeys
+     */
+    public void setExportDirectForeignKeys(boolean exportDirectForeignKeys) {
+        this.exportDirectForeignKeys = exportDirectForeignKeys;
+    }
+
+    /**
+     * Set whether inverse foreign keys should be exported
+     *
+     * @param exportInverseForeignKeys
+     */
+    public void setExportInverseForeignKeys(boolean exportInverseForeignKeys) {
+        this.exportInverseForeignKeys = exportInverseForeignKeys;
+    }
+
+    /**
+     * Set the java imports
+     *
+     * @param imports
+     *            java imports array
+     */
+    public void setImports(String[] imports) {
+        module.bind(CodegenModule.IMPORTS, new HashSet<String>(Arrays.asList(imports)));
+    }
+
+    /**
+     * Set whether spatial type support should be used
+     *
+     * @param spatial
+     */
+    public void setSpatial(boolean spatial) {
+        this.spatial = spatial;
+    }
+
+    /**
+     * Set the table types to export as a comma separated string
+     *
+     * @param tableTypesToExport
+     */
+    public void setTableTypesToExport(String tableTypesToExport) {
+        this.tableTypesToExport = tableTypesToExport;
+    }
+
+    /**
+     * Set the fully qualified class name of the "generated" annotation added ot the generated sources
+     *
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on
+     *                                 the generated sources, or {@code null} (defaulting to {@code javax.annotation.Generated} or
+     *                                {@code javax.annotation.processing.Generated} depending on the java version).
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    public void setGeneratedAnnotationClass(@Nullable String generatedAnnotationClass) {
+        module.bindInstance(CodegenModule.GENERATED_ANNOTATION_CLASS, GeneratedAnnotationResolver.resolve(generatedAnnotationClass));
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java
new file mode 100644
index 0000000000..c94bca28e8
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java
@@ -0,0 +1,434 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.*;
+import com.querydsl.codegen.utils.CodeWriter;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.Parameter;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+import com.querydsl.sql.codegen.support.InverseForeignKeyData;
+import com.querydsl.sql.codegen.support.KeyData;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.querydsl.codegen.utils.Symbols.COMMA;
+import static com.querydsl.codegen.utils.Symbols.NEW;
+import static com.querydsl.codegen.utils.Symbols.SUPER;
+
+/**
+ * {@code MetaDataSerializer} defines the Query type serialization logic for {@link MetaDataExporter}.
+ * Extend this class for customization.
+ *
+ * @author tiwe
+ *
+ */
+public class MetaDataSerializer extends DefaultEntitySerializer {
+
+    private static final Map<Integer, String> typeConstants = new HashMap<>();
+
+    static {
+        try {
+            for (Field field : java.sql.Types.class.getDeclaredFields()) {
+                if (field.getType().equals(Integer.TYPE)) {
+                    typeConstants.put(field.getInt(null), field.getName());
+                }
+            }
+        } catch (IllegalAccessException e) {
+            throw new IllegalStateException(e.getMessage(), e);
+        }
+
+    }
+
+    private final NamingStrategy namingStrategy;
+
+    private final boolean innerClassesForKeys;
+
+    private final Set<String> imports;
+
+    private final Comparator<Property> columnComparator;
+
+    private final Class<?> entityPathType;
+
+    /**
+     * Create a new {@code MetaDataSerializer} instance
+     *
+     * @param namingStrategy           naming strategy for table to class and column to property conversion
+     * @param innerClassesForKeys      wrap key properties into inner classes (default: false)
+     * @param imports                  java user imports
+     * @param generatedAnnotationClass the fully qualified class name of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
+     * @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
+     */
+    @Inject
+    public MetaDataSerializer(
+            TypeMappings typeMappings,
+            NamingStrategy namingStrategy,
+            @Named(SQLCodegenModule.INNER_CLASSES_FOR_KEYS) boolean innerClassesForKeys,
+            @Named(SQLCodegenModule.IMPORTS) Set<String> imports,
+            @Named(SQLCodegenModule.COLUMN_COMPARATOR) Comparator<Property> columnComparator,
+            @Named(SQLCodegenModule.ENTITYPATH_TYPE) Class<?> entityPathType,
+            @Named(SQLCodegenModule.GENERATED_ANNOTATION_CLASS) Class<? extends Annotation> generatedAnnotationClass) {
+        super(typeMappings, Collections.<String>emptyList(), generatedAnnotationClass);
+        this.namingStrategy = namingStrategy;
+        this.innerClassesForKeys = innerClassesForKeys;
+        this.imports = new HashSet<String>(imports);
+        this.columnComparator = columnComparator;
+        this.entityPathType = entityPathType;
+    }
+
+    /**
+     * Create a new {@code MetaDataSerializer} instance
+     *
+     * @param namingStrategy      naming strategy for table to class and column to property conversion
+     * @param innerClassesForKeys wrap key properties into inner classes (default: false)
+     * @param imports             java user imports
+     */
+    public MetaDataSerializer(
+            TypeMappings typeMappings,
+            NamingStrategy namingStrategy,
+            boolean innerClassesForKeys,
+            Set<String> imports,
+            Comparator<Property> columnComparator,
+            Class<?> entityPathType) {
+        this(typeMappings, namingStrategy, innerClassesForKeys, imports, columnComparator, entityPathType, GeneratedAnnotationResolver.resolveDefault());
+    }
+
+    @Override
+    protected void constructorsForVariables(CodeWriter writer, EntityType model) throws IOException {
+        super.constructorsForVariables(writer, model);
+
+        String localName = writer.getRawName(model);
+        String genericName = writer.getGenericName(true, model);
+
+        if (!localName.equals(genericName)) {
+            writer.suppressWarnings("all");
+        }
+        writer.beginConstructor(new Parameter("variable", Types.STRING),
+                                new Parameter("schema", Types.STRING),
+                                new Parameter("table", Types.STRING));
+        writer.line(SUPER,"(", writer.getClassConstant(localName) + COMMA
+                + "forVariable(variable), schema, table);");
+        constructorContent(writer, model);
+        writer.end();
+
+        writer.beginConstructor(new Parameter("variable", Types.STRING),
+                                new Parameter("schema", Types.STRING));
+        writer.line(SUPER, "(", writer.getClassConstant(localName), COMMA,
+                "forVariable(variable), schema, \"", model.getData().get("table").toString(), "\");");
+        constructorContent(writer, model);
+        writer.end();
+    }
+
+    @Override
+    protected void constructorContent(CodeWriter writer, EntityType model) throws IOException {
+        writer.line("addMetadata();");
+    }
+
+    @Override
+    protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException {
+        Type queryType = typeMappings.getPathType(model, model, true);
+
+        writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")");
+
+        TypeCategory category = model.getOriginalCategory();
+        // serialize annotations only, if no bean types are used
+        if (model.equals(queryType)) {
+            for (Annotation annotation : model.getAnnotations()) {
+                writer.annotation(annotation);
+            }
+        }
+        writer.beginClass(queryType, new ClassType(category, entityPathType, model));
+        writer.privateStaticFinal(Types.LONG_P, "serialVersionUID", String.valueOf(model.hashCode()));
+    }
+
+    @Override
+    protected String getAdditionalConstructorParameter(EntityType model) {
+        StringBuilder builder = new StringBuilder();
+        if (model.getData().containsKey("schema")) {
+            builder.append(", \"").append(model.getData().get("schema")).append("\"");
+        } else {
+            builder.append(", null");
+        }
+        builder.append(", \"").append(model.getData().get("table")).append("\"");
+        return builder.toString();
+    }
+
+    @Override
+    protected void introDefaultInstance(CodeWriter writer, EntityType entityType, String defaultName) throws IOException {
+        String variableName = !defaultName.isEmpty() ? defaultName : namingStrategy.getDefaultVariableName(entityType);
+        String alias = namingStrategy.getDefaultAlias(entityType);
+        Type queryType = typeMappings.getPathType(entityType, entityType, true);
+        writer.publicStaticFinal(queryType, variableName, NEW + queryType.getSimpleName() + "(\"" + alias + "\")");
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void introImports(CodeWriter writer, SerializerConfig config, EntityType model) throws IOException {
+        super.introImports(writer, config, model);
+
+        Collection<ForeignKeyData> foreignKeys = (Collection<ForeignKeyData>)
+                model.getData().get(ForeignKeyData.class);
+        Collection<InverseForeignKeyData> inverseForeignKeys = (Collection<InverseForeignKeyData>)
+                model.getData().get(InverseForeignKeyData.class);
+        boolean addJavaUtilImport = false;
+        if (foreignKeys != null) {
+            for (ForeignKeyData keyData : foreignKeys) {
+                if (keyData.getForeignColumns().size() > 1) {
+                    addJavaUtilImport = true;
+                    break;
+                }
+            }
+        }
+        if (inverseForeignKeys != null) {
+            for (InverseForeignKeyData keyData : inverseForeignKeys) {
+                if (keyData.getForeignColumns().size() > 1) {
+                    addJavaUtilImport = true;
+                    break;
+                }
+            }
+        }
+
+        if (addJavaUtilImport) {
+            writer.imports(List.class.getPackage());
+        }
+
+        writer.imports(ColumnMetadata.class, java.sql.Types.class);
+
+        if (!entityPathType.getPackage().equals(ColumnMetadata.class.getPackage())) {
+            writer.imports(entityPathType);
+        }
+
+        writeUserImports(writer);
+    }
+
+    protected void writeUserImports(CodeWriter writer) throws IOException {
+        Set<String> packages = new HashSet<String>();
+        Set<String> classes = new HashSet<String>();
+
+        for (String javaImport : imports) {
+            //true if the character next to the dot is an upper case or if no dot is found (-1+1=0) the first character
+            boolean isClass = Character.isUpperCase(javaImport.charAt(javaImport.lastIndexOf(".") + 1));
+            if (isClass) {
+                classes.add(javaImport);
+            } else {
+                packages.add(javaImport);
+            }
+        }
+
+        String[] marker = new String[]{};
+        writer.importPackages(packages.toArray(marker));
+        writer.importClasses(classes.toArray(marker));
+    }
+
+    @Override
+    protected void outro(EntityType model, CodeWriter writer) throws IOException {
+        writer.beginPublicMethod(Types.VOID,"addMetadata");
+        List<Property> properties = new ArrayList<>(model.getProperties());
+        if (columnComparator != null) {
+            properties.sort(columnComparator);
+        }
+        for (Property property : properties) {
+            String name = property.getEscapedName();
+            ColumnMetadata metadata = (ColumnMetadata) property.getData().get("COLUMN");
+            StringBuilder columnMeta = new StringBuilder();
+            columnMeta.append("ColumnMetadata");
+            columnMeta.append(".named(\"").append(metadata.getName()).append("\")");
+            columnMeta.append(".withIndex(").append(metadata.getIndex()).append(")");
+            if (metadata.hasJdbcType()) {
+                String type = String.valueOf(metadata.getJdbcType());
+                if (typeConstants.containsKey(metadata.getJdbcType())) {
+                    type = "Types." + typeConstants.get(metadata.getJdbcType());
+                }
+                columnMeta.append(".ofType(").append(type).append(")");
+            }
+            if (metadata.hasSize()) {
+                columnMeta.append(".withSize(").append(metadata.getSize()).append(")");
+            }
+            if (metadata.getDigits() > 0) {
+                columnMeta.append(".withDigits(").append(metadata.getDigits()).append(")");
+            }
+            if (!metadata.isNullable()) {
+                columnMeta.append(".notNull()");
+            }
+            writer.line("addMetadata(", name, ", ", columnMeta.toString(), ");");
+        }
+        writer.end();
+
+        super.outro(model, writer);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void serializeProperties(EntityType model,  SerializerConfig config,
+            CodeWriter writer) throws IOException {
+        Collection<PrimaryKeyData> primaryKeys =
+            (Collection<PrimaryKeyData>) model.getData().get(PrimaryKeyData.class);
+        Collection<ForeignKeyData> foreignKeys =
+            (Collection<ForeignKeyData>) model.getData().get(ForeignKeyData.class);
+        Collection<InverseForeignKeyData> inverseForeignKeys =
+            (Collection<InverseForeignKeyData>) model.getData().get(InverseForeignKeyData.class);
+
+        if (innerClassesForKeys) {
+            Type primaryKeyType = new SimpleType(namingStrategy.getPrimaryKeysClassName());
+            Type foreignKeysType = new SimpleType(namingStrategy.getForeignKeysClassName());
+
+            // primary keys
+            if (primaryKeys != null) {
+                writer.beginClass(primaryKeyType);
+                serializePrimaryKeys(model, writer, primaryKeys);
+                writer.end();
+            }
+
+            // foreign keys
+            if (foreignKeys != null || inverseForeignKeys != null) {
+                writer.beginClass(foreignKeysType);
+                if (foreignKeys != null) {
+                    serializeForeignKeys(model, writer, foreignKeys, false);
+                }
+                // inverse foreign keys
+                if (inverseForeignKeys != null) {
+                    serializeForeignKeys(model, writer, inverseForeignKeys, true);
+                }
+                writer.end();
+            }
+
+            super.serializeProperties(model, config, writer);
+
+            if (primaryKeys != null) {
+                writer.publicFinal(
+                        primaryKeyType,
+                        namingStrategy.getPrimaryKeysVariable(model),
+                        "new " + primaryKeyType.getSimpleName() + "()");
+            }
+            if (foreignKeys != null || inverseForeignKeys != null) {
+                writer.publicFinal(
+                        foreignKeysType,
+                        namingStrategy.getForeignKeysVariable(model),
+                        "new " + foreignKeysType.getSimpleName() + "()");
+            }
+
+        } else {
+
+            super.serializeProperties(model, config, writer);
+
+            // primary keys
+            if (primaryKeys != null) {
+                serializePrimaryKeys(model, writer, primaryKeys);
+            }
+
+            // foreign keys
+            if (foreignKeys != null) {
+                serializeForeignKeys(model, writer, foreignKeys, false);
+            }
+
+            // inverse foreign keys
+            if (inverseForeignKeys != null) {
+                serializeForeignKeys(model, writer, inverseForeignKeys, true);
+            }
+        }
+    }
+
+    @Override
+    protected void customField(EntityType model, Property field, SerializerConfig config,
+                               CodeWriter writer) throws IOException {
+        Type queryType = typeMappings.getPathType(field.getType(), model, false);
+        if (queryType.getPackageName().startsWith("com.querydsl")) {
+            String localRawName = writer.getRawName(field.getType());
+            serialize(model, field, queryType, writer, "create" + field.getType().getSimpleName(),
+                    writer.getClassConstant(localRawName));
+        } else {
+            super.customField(model, field, config, writer);
+        }
+    }
+
+    protected void serializePrimaryKeys(EntityType model, CodeWriter writer,
+            Collection<PrimaryKeyData> primaryKeys) throws IOException {
+        for (PrimaryKeyData primaryKey : primaryKeys) {
+            String fieldName = namingStrategy.getPropertyNameForPrimaryKey(primaryKey.getName(), model);
+            StringBuilder value = new StringBuilder("createPrimaryKey(");
+            boolean first = true;
+            for (String column : primaryKey.getColumns()) {
+                if (!first) {
+                    value.append(", ");
+                }
+                value.append(namingStrategy.getPropertyName(column, model));
+                first = false;
+            }
+            value.append(")");
+            Type type = new ClassType(PrimaryKey.class, model);
+            writer.publicFinal(type, fieldName, value.toString());
+        }
+
+    }
+
+    protected void serializeForeignKeys(EntityType model, CodeWriter writer,
+            Collection<? extends KeyData> foreignKeys, boolean inverse) throws IOException {
+        for (KeyData foreignKey : foreignKeys) {
+            String fieldName;
+            if (inverse) {
+                fieldName = namingStrategy.getPropertyNameForInverseForeignKey(foreignKey.getName(), model);
+            } else {
+                fieldName = namingStrategy.getPropertyNameForForeignKey(foreignKey.getName(), model);
+            }
+
+            StringBuilder value = new StringBuilder();
+            if (inverse) {
+                value.append("createInvForeignKey(");
+            } else {
+                value.append("createForeignKey(");
+            }
+            if (foreignKey.getForeignColumns().size() == 1) {
+                value.append(namingStrategy.getPropertyName(foreignKey.getForeignColumns().get(0), model));
+                value.append(", \"").append(foreignKey.getParentColumns().get(0)).append("\"");
+            } else {
+                StringBuilder local = new StringBuilder();
+                StringBuilder foreign = new StringBuilder();
+                for (int i = 0; i < foreignKey.getForeignColumns().size(); i++) {
+                    if (i > 0) {
+                        local.append(", ");
+                        foreign.append(", ");
+                    }
+                    local.append(namingStrategy.getPropertyName(foreignKey.getForeignColumns().get(i), model));
+                    foreign.append("\"").append(foreignKey.getParentColumns().get(i)).append("\"");
+                }
+                value.append("Arrays.asList(").append(local).append("), Arrays.asList(").append(foreign).append(")");
+            }
+            value.append(")");
+            Type type = new ClassType(ForeignKey.class, foreignKey.getType());
+            writer.publicFinal(type, fieldName, value.toString());
+        }
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/Naming.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
similarity index 75%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/Naming.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
index fbc379776e..3400e4c7fe 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/Naming.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2013, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,34 +11,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
-import static com.mysema.util.JavaSyntaxUtils.isReserved;
+import static javax.lang.model.SourceVersion.isKeyword;
 
 /**
+ * {@code Naming} provides name normalization functionality
+ *
  * @author tiwe
  *
  */
 public final class Naming {
-    
+
     public static String normalize(String s, String reservedSuffix) {
-        if (isReserved(s)) {
+        if (isKeyword(s)) {
             return s + reservedSuffix;
         } else {
             StringBuilder sb = new StringBuilder(s.length() + 1);
             for (char c : s.toCharArray()) {
-                if(!Character.isJavaIdentifierPart(c)) {
+                if (!Character.isJavaIdentifierPart(c)) {
                     sb.append("_");
                 } else if (sb.length() == 0 && !Character.isJavaIdentifierStart(c)) {
                     sb.append("_").append(c);
-                } else {                    
+                } else {
                     sb.append(c);
                 }
             }
             return sb.toString();
         }
     }
-    
-    private Naming() {}
+
+    private Naming() { }
 
 }
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/NamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/NamingStrategy.java
new file mode 100644
index 0000000000..7672ff754f
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/NamingStrategy.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.EntityType;
+import com.querydsl.sql.SchemaAndTable;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+
+/**
+ * {@code NamingStrategy} defines a conversion strategy from table to class and column
+ * to property names
+ *
+ * @author tiwe
+ */
+public interface NamingStrategy {
+
+    /**
+     * Normalizes and appends the given schema name to the package name
+     *
+     * @deprecated Use {@link #getPackage(String, SchemaAndTable)} instead.
+     *
+     * @param packageName
+     * @param schema
+     * @return
+     */
+    @Deprecated
+    String appendSchema(String packageName, String schema);
+
+    /**
+     * Convert the given tableName to a simple class name
+     *
+     * @deprecated Use {@link #getClassName(SchemaAndTable)} instead.
+     *
+     * @return
+     */
+    @Deprecated
+    String getClassName(String tableName);
+
+    /**
+     * Convert the given schema and table name to a simple class name.
+     */
+    String getClassName(SchemaAndTable schemaAndTable);
+
+    /**
+     * Get the default alias for the given EntityType
+     *
+     * @param entityType
+     * @return
+     */
+    String getDefaultAlias(EntityType entityType);
+
+    /**
+     * Get the default variable name for the given EntityType
+     *
+     * @param entityType
+     * @return
+     */
+    String getDefaultVariableName(EntityType entityType);
+
+    /**
+     * Get the class name for the foreign keys inner class
+     *
+     * @return
+     */
+    String getForeignKeysClassName();
+
+    /**
+     * Get the field name for the foreign keys class instance
+     *
+     * @return
+     */
+    String getForeignKeysVariable(EntityType entityType);
+
+    /**
+     * Get the class name for the primary keys inner class
+     *
+     * @return
+     */
+    String getPrimaryKeysClassName();
+
+    /**
+     * Get the field name for the primary keys class instance
+     *
+     * @return
+     */
+    String getPrimaryKeysVariable(EntityType entityType);
+
+    /**
+     * Convert the given column name to a property name
+     *
+     * @param columnName
+     * @param entityType
+     * @return
+     */
+    String getPropertyName(String columnName, EntityType entityType);
+
+    /**
+     * Convert the given foreign key name to a foreign key property name
+     *
+     * @param foreignKeyName
+     * @param entityType
+     * @return
+     */
+    String getPropertyNameForForeignKey(String foreignKeyName, EntityType entityType);
+
+    /**
+     * Convert the given foreign key name to a foreign key property name
+     *
+     * @param name
+     * @param model
+     * @return
+     */
+    String getPropertyNameForInverseForeignKey(String name, EntityType model);
+
+    /**
+     * Convert the given primary key name to a primary key property name
+     *
+     * @param name
+     * @param model
+     * @return
+     */
+    String getPropertyNameForPrimaryKey(String name, EntityType model);
+
+    /**
+     * Convert the given column name and provide the opportunity to add quoted identifiers
+     *
+     * @param columnName
+     * @return
+     */
+    String normalizeColumnName(String columnName);
+
+    /**
+     * Convert the given table name and provide the opportunity to add quoted identifiers
+     *
+     * @param tableName
+     * @return
+     */
+    String normalizeTableName(String tableName);
+
+
+    /**
+     * Convert the given schema name and provide the opportunity to add quoted identifiers
+     *
+     * @param schemaName
+     * @return
+     */
+    String normalizeSchemaName(String schemaName);
+
+    /**
+     * Returns <code>true</code> if the class generation of the table is required, otherwise
+     * <code>false</code>.
+     *
+     * @param schemaAndTable the schema and table
+     * @return
+     */
+    boolean shouldGenerateClass(SchemaAndTable schemaAndTable);
+
+    /**
+     * Returns <code>true</code> if the foreign key reference should be generated in the table,
+     * otherwise <code>false</code>.
+     *
+     * @param schemaAndTable the schema and table
+     * @param foreignKeyData the foreign key in the table
+     * @return
+     */
+    boolean shouldGenerateForeignKey(SchemaAndTable schemaAndTable, ForeignKeyData foreignKeyData);
+
+    /**
+     * Returns the package where the class of the table will be generated.
+     *
+     * @param basePackage the base package of the class generation
+     * @param schemaAndTable the schema and table
+     * @return
+     */
+    String getPackage(String basePackage, SchemaAndTable schemaAndTable);
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OrdinalPositionComparator.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OrdinalPositionComparator.java
new file mode 100644
index 0000000000..d015e145d0
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OrdinalPositionComparator.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Map;
+
+import com.querydsl.codegen.Property;
+import com.querydsl.sql.ColumnMetadata;
+
+/**
+ * Compares {@link Property} instances based on their ordinal position in the table
+ */
+public class OrdinalPositionComparator implements Comparator<Property> {
+
+    public OrdinalPositionComparator() {
+        super();
+    }
+
+    @Override
+    public int compare(Property property1, Property property2) {
+        Integer comparison = null;
+        for (Property property : Arrays.asList(property1, property2)) {
+            Map<Object, Object> data = property.getData();
+            ColumnMetadata columnMetadata = (ColumnMetadata) data.get("COLUMN");
+            int index = columnMetadata.getIndex();
+            comparison = comparison == null ? index : comparison - index;
+        }
+        return comparison;
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OriginalNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OriginalNamingStrategy.java
new file mode 100644
index 0000000000..926ad5c489
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/OriginalNamingStrategy.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.EntityType;
+
+/**
+ * {@code OriginalNamingStrategy} preserves the table and column names in the conversion
+ *
+ * @author tiwe
+ *
+ */
+public class OriginalNamingStrategy extends AbstractNamingStrategy {
+
+    @Override
+    public String getClassName(String tableName) {
+        return normalizeJavaName(tableName);
+    }
+
+    @Override
+    public String getDefaultAlias(EntityType entityType) {
+        return entityType.getData().get("table").toString();
+    }
+
+    @Override
+    public String getDefaultVariableName(EntityType entityType) {
+        String escaped = escape(entityType, entityType.getData().get("table").toString());
+        return normalizeJavaName(escaped);
+    }
+
+    @Override
+    public String getPropertyName(String columnName, EntityType entityType) {
+        return normalizeJavaName(columnName);
+    }
+
+    @Override
+    public String getPropertyNameForForeignKey(String foreignKeyName, EntityType entityType) {
+        return normalizeJavaName(foreignKeyName);
+    }
+
+    @Override
+    public String getPropertyNameForInverseForeignKey(String foreignKeyName, EntityType entityType) {
+        return normalizeJavaName("_" + foreignKeyName);
+    }
+
+    @Override
+    public String getPropertyNameForPrimaryKey(String primaryKeyName, EntityType model) {
+        return normalizeJavaName(primaryKeyName);
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLCodegenModule.java
similarity index 75%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLCodegenModule.java
index f6d872c4ad..23b8a798f8 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLCodegenModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,23 +11,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import java.util.Set;
 
-import com.mysema.query.codegen.CodegenModule;
-import com.mysema.query.codegen.QueryTypeFactory;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPathBase;
+import com.querydsl.codegen.CodegenModule;
+import com.querydsl.codegen.QueryTypeFactory;
+import com.querydsl.codegen.Serializer;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPathBase;
+import com.querydsl.sql.SQLTemplates;
 
 /**
- * SQLCodegenModule is a dependency injection module with codegen configuration
+ * {@code SQLCodegenModule} is a dependency injection module with codegen configuration
  *
  * @author tiwe
  *
  */
-public class SQLCodegenModule extends CodegenModule{
+public class SQLCodegenModule extends CodegenModule {
 
     public static final String BEAN_SERIALIZER = "beanSerializer";
 
@@ -46,22 +47,24 @@ public class SQLCodegenModule extends CodegenModule{
     public static final String SCHEMA_TO_PACKAGE = "schemaToPackage";
 
     public static final String COLUMN_COMPARATOR = "columnComparator";
-    
+
+    static final String JAVADOC_SUFFIX = CodegenModule.JAVADOC_SUFFIX;
+
     @Override
     protected void configure() {
         super.configure();
         bind(NamingStrategy.class, DefaultNamingStrategy.class);
-        bind(Configuration.class, Configuration.DEFAULT);
+        bind(Configuration.class, new Configuration(SQLTemplates.DEFAULT));
         bind(Serializer.class, MetaDataSerializer.class);
         bind(QueryTypeFactory.class, SQLQueryTypeFactory.class);
-        bind(BEAN_SERIALIZER, (Class<?>)null);
+        bind(BEAN_SERIALIZER, (Class<?>) null);
 
         bind(INNER_CLASSES_FOR_KEYS, false);
         bind(BEAN_PREFIX, "");
         bind(BEAN_SUFFIX, "");
         bind(BEAN_PACKAGE_NAME, "com.example");
         bind(PACKAGE_NAME, "com.example");
-        bind(BEAN_SERIALIZER, (Class<?>)null);
+        bind(BEAN_SERIALIZER, (Class<?>) null);
         bind(SCHEMA_TO_PACKAGE, false);
         bindInstance(ENTITYPATH_TYPE, RelationalPathBase.class);
         bind(COLUMN_COMPARATOR, null);
@@ -87,6 +90,7 @@ public String getPackageName() {
         return get(String.class, PACKAGE_NAME);
     }
 
+    @SuppressWarnings("unchecked")
     public Set<String> getImports() {
         return get(Set.class, IMPORTS);
     }
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLQueryTypeFactory.java
similarity index 81%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLQueryTypeFactory.java
index f60b18d176..6a069c262f 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/SQLQueryTypeFactory.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,31 +11,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.query.codegen.QueryTypeFactory;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.QueryTypeFactory;
 
 /**
- * SQLQueryTypeFactory is a QueryTypeFactory implementation with configuration data from this module
- * 
+ * {@code SQLQueryTypeFactory} is a {@link QueryTypeFactory} implementation with configuration
+ * data from this module
+ *
  * @author tiwe
  *
  */
-public final class SQLQueryTypeFactory implements QueryTypeFactory{
+public final class SQLQueryTypeFactory implements QueryTypeFactory {
 
     private final String packageName, beanPackageName;
-    
+
     private final int stripStart, stripEnd;
 
     private final String prefix, suffix;
-    
+
     private final boolean replacePackage;
-    
+
     @Inject
     public SQLQueryTypeFactory(
             @Named(SQLCodegenModule.PACKAGE_NAME) String packageName,
@@ -59,8 +60,8 @@ public Type create(Type type) {
         if (replacePackage) {
             packageName = this.packageName + packageName.substring(beanPackageName.length());
         }
-        String simpleName = type.getSimpleName();        
-        simpleName = prefix + simpleName.substring(stripStart, simpleName.length()-stripEnd) + suffix;
+        String simpleName = type.getSimpleName();
+        simpleName = prefix + simpleName.substring(stripStart, simpleName.length() - stripEnd) + suffix;
         return new SimpleType(packageName + "." + simpleName, packageName, simpleName);
     }
 
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
new file mode 100644
index 0000000000..31f4c2f3a2
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/AntMetaDataExporter.java
@@ -0,0 +1,770 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.ant;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.codegen.DefaultNamingStrategy;
+import com.querydsl.sql.codegen.MetaDataExporter;
+import com.querydsl.sql.codegen.NamingStrategy;
+import com.querydsl.sql.codegen.support.CustomType;
+import com.querydsl.sql.codegen.support.NumericMapping;
+import com.querydsl.sql.codegen.support.RenameMapping;
+import com.querydsl.sql.codegen.support.TypeMapping;
+import com.querydsl.sql.types.Type;
+
+/**
+ * {@code AntMetaDataExporter} exports JDBC metadata to Querydsl query types
+ *
+ * @author tiwe
+ *
+ */
+public class AntMetaDataExporter extends Task {
+
+    /**
+     * JDBC driver class name
+     */
+    private String jdbcDriver;
+
+    /**
+     * JDBC connection url
+     */
+    private String jdbcUrl;
+
+    /**
+     * JDBC connection username
+     */
+    private String jdbcUser;
+
+    /**
+     * JDBC connection password
+     */
+    private String jdbcPassword;
+
+    /**
+     * name prefix for querydsl-types (default: "Q")
+     */
+    private String namePrefix;
+
+    /**
+     * name suffix for querydsl-types (default: "")
+     */
+    private String nameSuffix;
+
+    /**
+     * name prefix for bean types (default: "")
+     */
+    private String beanPrefix;
+
+    /**
+     * name suffix for bean types (default: "")
+     */
+    private String beanSuffix;
+
+    /**
+     * package name for sources
+     */
+    private String packageName;
+
+    /**
+     * package name for bean sources (default: packageName)
+     */
+    private String beanPackageName;
+
+    /**
+     * schemaPattern a schema name pattern; must match the schema name
+     *        as it is stored in the database; "" retrieves those without a schema;
+     *        {@code null} means that the schema name should not be used to narrow
+     *        the search (default: null)
+     */
+    private String schemaPattern;
+
+    /**
+     * tableNamePattern a table name pattern; must match the
+     *        table name as it is stored in the database (default: null)
+     */
+    private String tableNamePattern;
+
+    /**
+     * target source folder to create the sources into (e.g. target/generated-sources/java)
+     */
+    private String targetFolder;
+
+    /**
+     * target source folder to create the bean sources into
+     */
+    private String beansTargetFolder;
+
+    /**
+     * naming strategy class to override (default: DefaultNamingStrategy)
+     */
+    private String namingStrategyClass = DefaultNamingStrategy.class.getName();
+
+    /**
+     * bean serializer class (default: BeanSerializer)
+     */
+    private String beanSerializerClass = BeanSerializer.class.getName();
+
+    /**
+     * serializer class to override
+     */
+    private String serializerClass;
+
+    /**
+     * serialize beans as well
+     */
+    private boolean exportBeans;
+
+    /**
+     * additional bean interfaces
+     */
+    private String[] beanInterfaces;
+
+    /**
+     * toString() method addition to beans
+     */
+    private boolean beanAddToString;
+
+    /**
+     * full constructor addition to beans
+     */
+    private boolean beanAddFullConstructor;
+
+    /**
+     * use supertype in beans
+     */
+    private boolean beanPrintSupertype;
+
+    /**
+     * wrap key properties into inner classes (default: false)
+     */
+    private boolean innerClassesForKeys;
+
+    /**
+     * export validation annotations (default: false)
+     */
+    private boolean validationAnnotations;
+
+    /**
+     * export column annotations (default: false)
+     */
+    private boolean columnAnnotations;
+
+    /**
+     * custom types to use
+     */
+    private List<CustomType> customTypes = new ArrayList<>();
+
+    /**
+     * scala generation mode
+     */
+    private boolean createScalaSources;
+
+    /**
+     * append schema name to package
+     */
+    private boolean schemaToPackage;
+
+    /**
+     * lower case normalization of names
+     */
+    private boolean lowerCase;
+
+    /**
+     * export tables
+     */
+    private boolean exportTables = true;
+
+    /**
+     * export views
+     */
+    private boolean exportViews = true;
+
+    /**
+     * export all
+     */
+    private boolean exportAll;
+
+    /**
+     * export primary keys
+     */
+    private boolean exportPrimaryKeys = true;
+
+    /**
+     * export foreign keys
+     */
+    private boolean exportForeignKeys = true;
+
+    /**
+     * export direct foreign keys
+     */
+    private boolean exportDirectForeignKeys = true;
+
+    /**
+     * export inverse foreign keys
+     */
+    private boolean exportInverseForeignKeys = true;
+
+    /**
+     * override default column order (default: alphabetical)
+     */
+    private String columnComparatorClass;
+
+    /**
+     * spatial type support
+     */
+    private boolean spatial;
+
+    /**
+     * Comma-separated list of table types to export (allowable values will
+     * depend on JDBC driver). Allows for arbitrary set of types to be exported,
+     * e.g.: "TABLE, MATERIALIZED VIEW". The exportTables and exportViews
+     * parameters will be ignored if this parameter is set. (default: none)
+     */
+    private String tableTypesToExport;
+
+    /**
+     * java import added to generated query classes:
+     * com.bar for package (without .* notation)
+     * com.bar.Foo for class
+     */
+    private String[] imports;
+
+    // Ant only
+    private String sourceEncoding;
+
+    /**
+     * custom type mappings to use
+     */
+    private List<TypeMapping> typeMappings = new ArrayList<>();
+
+    /**
+     * custom numeric mappings
+     */
+    private List<NumericMapping> numericMappings = new ArrayList<>();
+
+    /**
+     * custom rename mappings
+     */
+    private List<RenameMapping> renameMappings = new ArrayList<>();
+
+
+    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void execute() {
+        if (targetFolder == null) {
+            throw new BuildException("targetFolder is a mandatory property");
+        }
+
+        Connection dbConn = null;
+        try {
+            Class.forName(jdbcDriver).newInstance();
+
+            dbConn = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
+            Configuration configuration = new Configuration(SQLTemplates.DEFAULT);
+
+            MetaDataExporter exporter = new MetaDataExporter();
+            if (namePrefix != null) {
+                exporter.setNamePrefix(namePrefix);
+            }
+            if (nameSuffix != null) {
+                exporter.setNameSuffix(nameSuffix);
+            }
+            if (beanPrefix != null) {
+                exporter.setBeanPrefix(beanPrefix);
+            }
+            if (beanSuffix != null) {
+                exporter.setBeanSuffix(beanSuffix);
+            }
+            if (beansTargetFolder != null) {
+                exporter.setBeansTargetFolder(new File(beansTargetFolder));
+            }
+            exporter.setPackageName(packageName);
+            exporter.setBeanPackageName(beanPackageName);
+            exporter.setTargetFolder(new File(targetFolder));
+            exporter.setNamingStrategy((NamingStrategy) Class.forName(namingStrategyClass).newInstance());
+            exporter.setInnerClassesForKeys(innerClassesForKeys);
+            exporter.setSchemaPattern(schemaPattern);
+            exporter.setTableNamePattern(tableNamePattern);
+            exporter.setColumnAnnotations(columnAnnotations);
+            exporter.setValidationAnnotations(validationAnnotations);
+            exporter.setSchemaToPackage(schemaToPackage);
+            exporter.setLowerCase(lowerCase);
+            exporter.setExportTables(exportTables);
+            exporter.setExportViews(exportViews);
+            exporter.setExportAll(exportAll);
+            exporter.setTableTypesToExport(tableTypesToExport);
+            exporter.setExportPrimaryKeys(exportPrimaryKeys);
+            exporter.setExportForeignKeys(exportForeignKeys);
+            exporter.setExportDirectForeignKeys(exportDirectForeignKeys);
+            exporter.setExportInverseForeignKeys(exportInverseForeignKeys);
+            exporter.setSpatial(spatial);
+
+            if (imports != null && imports.length > 0) {
+                exporter.setImports(imports);
+            }
+
+            if (exportBeans) {
+                BeanSerializer serializer = (BeanSerializer) Class.forName(beanSerializerClass).newInstance();
+                if (beanInterfaces != null) {
+                    for (String iface : beanInterfaces) {
+                        int sepIndex = iface.lastIndexOf('.');
+                        if (sepIndex < 0) {
+                            serializer.addInterface(new SimpleType(iface));
+                        } else {
+                            String packageName = iface.substring(0, sepIndex);
+                            String simpleName = iface.substring(sepIndex + 1);
+                            serializer.addInterface(new SimpleType(iface, packageName, simpleName));
+                        }
+                    }
+                }
+                serializer.setAddFullConstructor(beanAddFullConstructor);
+                serializer.setAddToString(beanAddToString);
+                serializer.setPrintSupertype(beanPrintSupertype);
+                exporter.setBeanSerializer(serializer);
+            }
+            if (sourceEncoding != null) {
+                exporter.setSourceEncoding(sourceEncoding);
+            }
+            if (customTypes != null) {
+                for (CustomType customType : customTypes) {
+                    configuration.register((Type<?>) Class.forName(customType.getClassName()).newInstance());
+                }
+            }
+            if (typeMappings != null) {
+                for (TypeMapping mapping : typeMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+            if (numericMappings != null) {
+                for (NumericMapping mapping : numericMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+            if (renameMappings != null) {
+                for (RenameMapping mapping : renameMappings) {
+                    mapping.apply(configuration);
+                }
+            }
+
+            if (columnComparatorClass != null) {
+                exporter.setColumnComparatorClass((Class) Class.forName(this.columnComparatorClass).asSubclass(Comparator.class));
+            }
+
+            exporter.setConfiguration(configuration);
+
+            exporter.export(dbConn.getMetaData());
+
+        } catch (RuntimeException | SQLException | ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+            throw new BuildException(e);
+        } finally {
+            if (dbConn != null) {
+                try {
+                    dbConn.close();
+                } catch (SQLException e2) {
+                    throw new BuildException(e2);
+                }
+            }
+        }
+    }
+
+    public String getJdbcDriver() {
+        return jdbcDriver;
+    }
+
+    public void setJdbcDriver(String jdbcDriver) {
+        this.jdbcDriver = jdbcDriver;
+    }
+
+    public String getJdbcUrl() {
+        return jdbcUrl;
+    }
+
+    public void setJdbcUrl(String jdbcUrl) {
+        this.jdbcUrl = jdbcUrl;
+    }
+
+    public String getJdbcUser() {
+        return jdbcUser;
+    }
+
+    public void setJdbcUser(String jdbcUser) {
+        this.jdbcUser = jdbcUser;
+    }
+
+    public String getJdbcPassword() {
+        return jdbcPassword;
+    }
+
+    public void setJdbcPassword(String jdbcPassword) {
+        this.jdbcPassword = jdbcPassword;
+    }
+
+    public String getNamePrefix() {
+        return namePrefix;
+    }
+
+    public void setNamePrefix(String namePrefix) {
+        this.namePrefix = namePrefix;
+    }
+
+    public String getNameSuffix() {
+        return nameSuffix;
+    }
+
+    public void setNameSuffix(String nameSuffix) {
+        this.nameSuffix = nameSuffix;
+    }
+
+    public String getBeanPrefix() {
+        return beanPrefix;
+    }
+
+    public void setBeanPrefix(String beanPrefix) {
+        this.beanPrefix = beanPrefix;
+    }
+
+    public String getBeanSuffix() {
+        return beanSuffix;
+    }
+
+    public void setBeanSuffix(String beanSuffix) {
+        this.beanSuffix = beanSuffix;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getBeanPackageName() {
+        return beanPackageName;
+    }
+
+    public void setBeanPackageName(String beanPackageName) {
+        this.beanPackageName = beanPackageName;
+    }
+
+    public String getSchemaPattern() {
+        return schemaPattern;
+    }
+
+    public void setSchemaPattern(String schemaPattern) {
+        this.schemaPattern = schemaPattern;
+    }
+
+    public String getTableNamePattern() {
+        return tableNamePattern;
+    }
+
+    public void setTableNamePattern(String tableNamePattern) {
+        this.tableNamePattern = tableNamePattern;
+    }
+
+    public String getTargetFolder() {
+        return targetFolder;
+    }
+
+    public void setTargetFolder(String targetFolder) {
+        this.targetFolder = targetFolder;
+    }
+
+    public String getNamingStrategyClass() {
+        return namingStrategyClass;
+    }
+
+    public void setNamingStrategyClass(String namingStrategyClass) {
+        this.namingStrategyClass = namingStrategyClass;
+    }
+
+    public String getBeanSerializerClass() {
+        return beanSerializerClass;
+    }
+
+    public void setBeanSerializerClass(String beanSerializerClass) {
+        this.beanSerializerClass = beanSerializerClass;
+    }
+
+    public String getSerializerClass() {
+        return serializerClass;
+    }
+
+    public void setSerializerClass(String serializerClass) {
+        this.serializerClass = serializerClass;
+    }
+
+    public boolean isExportBeans() {
+        return exportBeans;
+    }
+
+    public void setExportBeans(boolean exportBeans) {
+        this.exportBeans = exportBeans;
+    }
+
+    public String[] getBeanInterfaces() {
+        return beanInterfaces;
+    }
+
+    public void setBeanInterfaces(String[] beanInterfaces) {
+        this.beanInterfaces = beanInterfaces;
+    }
+
+    public boolean isBeanAddToString() {
+        return beanAddToString;
+    }
+
+    public void setBeanAddToString(boolean beanAddToString) {
+        this.beanAddToString = beanAddToString;
+    }
+
+    public boolean isBeanAddFullConstructor() {
+        return beanAddFullConstructor;
+    }
+
+    public void setBeanAddFullConstructor(boolean beanAddFullConstructor) {
+        this.beanAddFullConstructor = beanAddFullConstructor;
+    }
+
+    public boolean isBeanPrintSupertype() {
+        return beanPrintSupertype;
+    }
+
+    public void setBeanPrintSupertype(boolean beanPrintSupertype) {
+        this.beanPrintSupertype = beanPrintSupertype;
+    }
+
+    public boolean isInnerClassesForKeys() {
+        return innerClassesForKeys;
+    }
+
+    public void setInnerClassesForKeys(boolean innerClassesForKeys) {
+        this.innerClassesForKeys = innerClassesForKeys;
+    }
+
+    public boolean isValidationAnnotations() {
+        return validationAnnotations;
+    }
+
+    public void setValidationAnnotations(boolean validationAnnotations) {
+        this.validationAnnotations = validationAnnotations;
+    }
+
+    public boolean isColumnAnnotations() {
+        return columnAnnotations;
+    }
+
+    public void setColumnAnnotations(boolean columnAnnotations) {
+        this.columnAnnotations = columnAnnotations;
+    }
+
+    /**
+     * Adds custom type to ant
+     */
+    public void addCustomType(CustomType customType) {
+        customTypes.add(customType);
+    }
+
+    /**
+     * Gets a list of custom types
+     * @return a list of custom types
+     * @deprecated Use addCustomType instead
+     */
+    public String[] getCustomTypes() {
+        String[] customTypes = new String[this.customTypes.size()];
+        for (int i = 0; i < this.customTypes.size(); i++) {
+            CustomType customType = this.customTypes.get(i);
+            customTypes[i] = customType.getClassName();
+        }
+        return customTypes;
+    }
+
+    /**
+     * Sets a list of custom types
+     * @param strings a list of custom types
+     * @deprecated Use addCustomType instead
+     */
+    public void setCustomTypes(String[] strings) {
+        this.customTypes.clear();
+        for (String string : strings) {
+            CustomType customType = new CustomType();
+            customType.setClassName(string);
+            this.customTypes.add(customType);
+        }
+    }
+
+    public boolean isCreateScalaSources() {
+        return createScalaSources;
+    }
+
+    public void setCreateScalaSources(boolean createScalaSources) {
+        this.createScalaSources = createScalaSources;
+    }
+
+    public boolean isSchemaToPackage() {
+        return schemaToPackage;
+    }
+
+    public void setSchemaToPackage(boolean schemaToPackage) {
+        this.schemaToPackage = schemaToPackage;
+    }
+
+    public boolean isLowerCase() {
+        return lowerCase;
+    }
+
+    public void setLowerCase(boolean lowerCase) {
+        this.lowerCase = lowerCase;
+    }
+
+    public boolean isExportTables() {
+        return exportTables;
+    }
+
+    public void setExportTables(boolean exportTables) {
+        this.exportTables = exportTables;
+    }
+
+    public boolean isExportViews() {
+        return exportViews;
+    }
+
+    public void setExportViews(boolean exportViews) {
+        this.exportViews = exportViews;
+    }
+
+    public boolean isExportAll() {
+        return exportAll;
+    }
+
+    public void setExportAll(boolean exportAll) {
+        this.exportAll = exportAll;
+    }
+
+    public boolean isExportPrimaryKeys() {
+        return exportPrimaryKeys;
+    }
+
+    public void setExportPrimaryKeys(boolean exportPrimaryKeys) {
+        this.exportPrimaryKeys = exportPrimaryKeys;
+    }
+
+    public boolean isExportForeignKeys() {
+        return exportForeignKeys;
+    }
+
+    public boolean isExportDirectForeignKeys() {
+        return exportDirectForeignKeys;
+    }
+
+    public void setExportDirectForeignKeys(boolean exportDirectForeignKeys) {
+        this.exportDirectForeignKeys = exportDirectForeignKeys;
+    }
+
+    public boolean isExportInverseForeignKeys() {
+        return exportInverseForeignKeys;
+    }
+
+    public void setExportInverseForeignKeys(boolean exportInverseForeignKeys) {
+        this.exportInverseForeignKeys = exportInverseForeignKeys;
+    }
+
+    public void setExportForeignKeys(boolean exportForeignKeys) {
+        this.exportForeignKeys = exportForeignKeys;
+    }
+
+    public String getColumnComparatorClass() {
+        return columnComparatorClass;
+    }
+
+    public void setColumnComparatorClass(String columnComparatorClass) {
+        this.columnComparatorClass = columnComparatorClass;
+    }
+
+    public boolean isSpatial() {
+        return spatial;
+    }
+
+    public void setSpatial(boolean spatial) {
+        this.spatial = spatial;
+    }
+
+    public String getTableTypesToExport() {
+        return tableTypesToExport;
+    }
+
+    public void setTableTypesToExport(String tableTypesToExport) {
+        this.tableTypesToExport = tableTypesToExport;
+    }
+
+    public String[] getImports() {
+        return imports;
+    }
+
+    public void setImports(String[] imports) {
+        this.imports = imports;
+    }
+
+    public String getSourceEncoding() {
+        return sourceEncoding;
+    }
+
+    public void setSourceEncoding(String sourceEncoding) {
+        this.sourceEncoding = sourceEncoding;
+    }
+
+    public String getBeansTargetFolder() {
+        return beansTargetFolder;
+    }
+
+    public void setBeansTargetFolder(String beansTargetFolder) {
+        this.beansTargetFolder = beansTargetFolder;
+    }
+
+    /**
+     * Adds TypeMapping instance, called by Ant
+     */
+    public void addTypeMapping(TypeMapping mapping) {
+        typeMappings.add(mapping);
+    }
+
+    /**
+     * Adds NumericMapping instance, called by Ant
+     */
+    public void addNumericMapping(NumericMapping mapping) {
+        numericMappings.add(mapping);
+    }
+
+    /**
+     * Adds RenameMapping instance, called by Ant
+     */
+    public void addRenameMapping(RenameMapping mapping) {
+        renameMappings.add(mapping);
+    }
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/package-info.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/package-info.java
new file mode 100644
index 0000000000..4332b0cabb
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/ant/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * ANT support
+ */
+package com.querydsl.sql.codegen.ant;
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/package-info.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/package-info.java
new file mode 100644
index 0000000000..da66eafc13
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * JDBC schema inspection based code generation
+ */
+package com.querydsl.sql.codegen;
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ColumnData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ColumnData.java
new file mode 100644
index 0000000000..be31332382
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ColumnData.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+/**
+ * {@code ColumnData} defines column data
+ *
+ * @author tiwe
+ *
+ */
+public class ColumnData {
+
+    private final String name;
+
+    private final String type;
+
+    private boolean nullAllowed = true;
+
+    private boolean autoIncrement;
+
+    private Integer size;
+
+    public ColumnData(String name, String type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public boolean isNullAllowed() {
+        return nullAllowed;
+    }
+
+    public void setNullAllowed(boolean nullAllowed) {
+        this.nullAllowed = nullAllowed;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public boolean isAutoIncrement() {
+        return autoIncrement;
+    }
+
+    public void setAutoIncrement(boolean autoIncrement) {
+        this.autoIncrement = autoIncrement;
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/CustomType.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/CustomType.java
new file mode 100644
index 0000000000..2a42f8f60f
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/CustomType.java
@@ -0,0 +1,19 @@
+package com.querydsl.sql.codegen.support;
+
+/**
+ * Models a custom type for the AntMetaDataExporter
+ */
+public class CustomType {
+  private String className;
+
+  public CustomType() {
+  }
+
+  public String getClassName() {
+    return className;
+  }
+
+  public void setClassName(String aClassName) {
+    className = aClassName;
+  }
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ForeignKeyData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ForeignKeyData.java
new file mode 100644
index 0000000000..a6fd978f1f
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/ForeignKeyData.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * {@code ForeignKeyData} defines foreign key data
+ *
+ * @author tiwe
+ *
+ */
+public class ForeignKeyData implements KeyData {
+
+    private final String name;
+
+    @Nullable
+    private final String schema;
+
+    private final String table;
+
+    @Nullable
+    private final Type type;
+
+    private final List<String> foreignColumns = new ArrayList<String>();
+
+    private final List<String> parentColumns = new ArrayList<String>();
+
+    public ForeignKeyData(String name, @Nullable String schema, String parentTable, @Nullable Type type) {
+        this.name = name;
+        this.schema = schema;
+        this.table = parentTable;
+        this.type = type;
+    }
+
+    public void add(String foreignColumn, String parentColumn) {
+        foreignColumns.add(foreignColumn);
+        parentColumns.add(parentColumn);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Nullable
+    public String getSchema() {
+        return schema;
+    }
+
+    @Override
+    public String getTable() {
+        return table;
+    }
+
+    @Override
+    public List<String> getForeignColumns() {
+        return foreignColumns;
+    }
+
+    @Override
+    public List<String> getParentColumns() {
+        return parentColumns;
+    }
+
+    @Nullable
+    @Override
+    public Type getType() {
+        return type;
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/IndexData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/IndexData.java
new file mode 100644
index 0000000000..37f9e051a2
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/IndexData.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+/**
+ * {@code IndexData} defines index data
+ *
+ * @author tiwe
+ *
+ */
+public class IndexData {
+
+    private final String name;
+
+    private final String[] columns;
+
+    private boolean unique;
+
+    public IndexData(String name, String[] columns) {
+        this.name = name;
+        this.columns = columns.clone();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String[] getColumns() {
+        return columns.clone();
+    }
+
+    public boolean isUnique() {
+        return unique;
+    }
+
+    public void setUnique(boolean unique) {
+        this.unique = unique;
+    }
+
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/InverseForeignKeyData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/InverseForeignKeyData.java
similarity index 81%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/InverseForeignKeyData.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/InverseForeignKeyData.java
index fa7dbb120d..2e8072b2a3 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/InverseForeignKeyData.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/InverseForeignKeyData.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,33 +11,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.support;
+package com.querydsl.sql.codegen.support;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
-import com.mysema.codegen.model.Type;
+import com.querydsl.codegen.utils.model.Type;
 
 /**
+ * {@code InverseForeignKeyData} defines inverse foreign key data
+ *
  * @author tiwe
  *
  */
-public class InverseForeignKeyData implements KeyData{
+public class InverseForeignKeyData implements KeyData {
 
     private final String name;
 
     @Nullable
     private final String schema;
-    
+
     private final String table;
-    
+
     @Nullable
     private final Type type;
-    
+
     private final List<String> foreignColumns = new ArrayList<String>();
-    
+
     private final List<String> parentColumns = new ArrayList<String>();
 
     public InverseForeignKeyData(String name, @Nullable String schema, String parentTable, @Nullable Type type) {
@@ -52,28 +54,33 @@ public void add(String foreignColumn, String parentColumn) {
         parentColumns.add(parentColumn);
     }
 
+    @Override
     public String getName() {
         return name;
     }
-    
+
     @Nullable
     public String getSchema() {
         return schema;
     }
 
+    @Override
     public String getTable() {
         return table;
     }
-    
+
+    @Override
     public List<String> getForeignColumns() {
         return foreignColumns;
     }
 
+    @Override
     public List<String> getParentColumns() {
         return parentColumns;
     }
 
     @Nullable
+    @Override
     public Type getType() {
         return type;
     }
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/KeyData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/KeyData.java
new file mode 100644
index 0000000000..ebeb7da29b
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/KeyData.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import java.util.List;
+
+import com.querydsl.codegen.utils.model.Type;
+
+/**
+ * Common interface for {@link ForeignKeyData} and {@link InverseForeignKeyData}
+ *
+ * @author tiwe
+ *
+ */
+public interface KeyData {
+
+    String getName();
+
+    String getTable();
+
+    Type getType();
+
+    List<String> getForeignColumns();
+
+    List<String> getParentColumns();
+
+}
\ No newline at end of file
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/Mapping.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/Mapping.java
new file mode 100644
index 0000000000..e55af9841f
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/Mapping.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import com.querydsl.sql.Configuration;
+
+/**
+ * Specifies mapping customization options.
+ *
+ * @author tiwe
+ */
+public interface Mapping {
+
+    /**
+     * Apply the customization to the passed in configuration.
+     *
+     * @param configuration the configuration to apply the customization to
+     */
+    void apply(Configuration configuration);
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NotNullImpl.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NotNullImpl.java
new file mode 100644
index 0000000000..2682c29adf
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NotNullImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import java.lang.annotation.Annotation;
+
+import javax.validation.Payload;
+import javax.validation.constraints.NotNull;
+
+/**
+ * {@code NotNullImpl} is an implementation of the {@link NotNull} interface
+ *
+ * @author tiwe
+ *
+ */
+@SuppressWarnings("all")
+public class NotNullImpl implements NotNull {
+
+    @Override
+    public Class<?>[] groups() {
+        return new Class[0];
+    }
+
+    @Override
+    public String message() {
+        return "{javax.validation.constraints.NotNull.message}";
+    }
+
+    @Override
+    public Class<? extends Annotation> annotationType() {
+        return NotNull.class;
+    }
+
+    @Override
+    public Class<? extends Payload>[] payload() {
+        return new Class[0];
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NumericMapping.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NumericMapping.java
new file mode 100644
index 0000000000..eabdc1ec65
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/NumericMapping.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import com.querydsl.sql.Configuration;
+
+/**
+ * {@code NumericMapping} customizes mappings of various numeric precisions to data types.
+ *
+ * @author tiwe
+ *
+ */
+public class NumericMapping implements Mapping {
+
+    private int total, decimal;
+
+    private String javaType;
+
+    @Override
+    public void apply(Configuration configuration) {
+        try {
+            configuration.registerNumeric(total, decimal, Class.forName(javaType));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getDecimal() {
+        return decimal;
+    }
+
+    public void setDecimal(int decimal) {
+        this.decimal = decimal;
+    }
+
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/PrimaryKeyData.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/PrimaryKeyData.java
new file mode 100644
index 0000000000..d0f4df32a3
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/PrimaryKeyData.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * {@code PrimaryKeyData} defines primary key data
+ *
+ * @author tiwe
+ *
+ */
+public class PrimaryKeyData {
+
+    private final String name;
+
+    private final List<String> columns = new ArrayList<String>();
+
+    public PrimaryKeyData(String name) {
+        this.name = name;
+    }
+
+    public PrimaryKeyData(String name, String[] c) {
+        this.name = name;
+        columns.addAll(Arrays.asList(c));
+    }
+
+    public void add(String column) {
+        columns.add(column);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<String> getColumns() {
+        return columns;
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/RenameMapping.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/RenameMapping.java
new file mode 100644
index 0000000000..b258128747
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/RenameMapping.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import com.querydsl.sql.Configuration;
+
+import java.util.Arrays;
+
+/**
+ * {@code RenameMapping} overrides schemas, tables, columns and combinations of the three.
+ *
+ * @author tiwe
+ */
+public class RenameMapping implements Mapping {
+
+    private String fromSchema, fromTable, fromColumn;
+
+    private String toSchema, toTable, toColumn;
+
+    @Override
+    public void apply(Configuration configuration) {
+        if (fromSchema != null) {
+            if (fromTable != null && fromColumn != null && toColumn != null) {
+                configuration.registerColumnOverride(fromSchema, fromTable, fromColumn, toColumn);
+            } else if (fromTable != null && toTable != null) {
+                if (toSchema != null) {
+                    configuration.registerTableOverride(fromSchema, fromTable, toSchema, toTable);
+                } else {
+                    configuration.registerTableOverride(fromSchema, fromTable, toTable);
+                }
+            } else if (toSchema != null) {
+                configuration.registerSchemaOverride(fromSchema, toSchema);
+            } else {
+                insufficientArgs();
+            }
+        } else if (fromTable != null) {
+            if (fromColumn != null && toColumn != null) {
+                configuration.registerColumnOverride(fromTable, fromColumn, toColumn);
+            } else if (toTable != null) {
+                configuration.registerTableOverride(fromTable, toTable);
+            } else {
+                insufficientArgs();
+            }
+        } else {
+            insufficientArgs();
+        }
+    }
+
+    private void insufficientArgs() {
+        throw new IllegalArgumentException("Insufficient args " +
+                Arrays.asList(fromSchema, fromTable, fromColumn) + " to " +
+                Arrays.asList(toSchema, toTable, toColumn));
+    }
+
+    public String getFromSchema() {
+        return fromSchema;
+    }
+
+    public void setFromSchema(String fromSchema) {
+        this.fromSchema = fromSchema;
+    }
+
+    public String getFromTable() {
+        return fromTable;
+    }
+
+    public void setFromTable(String fromTable) {
+        this.fromTable = fromTable;
+    }
+
+    public String getFromColumn() {
+        return fromColumn;
+    }
+
+    public void setFromColumn(String fromColumn) {
+        this.fromColumn = fromColumn;
+    }
+
+    public String getToSchema() {
+        return toSchema;
+    }
+
+    public void setToSchema(String toSchema) {
+        this.toSchema = toSchema;
+    }
+
+    public String getToTable() {
+        return toTable;
+    }
+
+    public void setToTable(String toTable) {
+        this.toTable = toTable;
+    }
+
+    public String getToColumn() {
+        return toColumn;
+    }
+
+    public void setToColumn(String toColumn) {
+        this.toColumn = toColumn;
+    }
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/SizeImpl.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/SizeImpl.java
similarity index 88%
rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/SizeImpl.java
rename to querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/SizeImpl.java
index 523f98c426..02ccd4ec01 100644
--- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/support/SizeImpl.java
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/SizeImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.support;
+package com.querydsl.sql.codegen.support;
 
 import java.lang.annotation.Annotation;
 
@@ -19,14 +19,16 @@
 import javax.validation.constraints.Size;
 
 /**
+ * {@code SizeImpl} is an implementation of the {@link Size} interface
+ *
  * @author tiwe
  *
  */
 @SuppressWarnings("all")
 public class SizeImpl implements Size {
-    
+
     private final int min, max;
-    
+
     public SizeImpl(int min, int max) {
         this.min = min;
         this.max = max;
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/TypeMapping.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/TypeMapping.java
new file mode 100644
index 0000000000..8fa96bf456
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/TypeMapping.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.support;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.types.Type;
+
+/**
+ * {@code TypeMapping} customizes the mapping from table + column to a type.
+ *
+ * @author tiwe
+ *
+ */
+public class TypeMapping implements Mapping {
+
+    private String table, column, type;
+
+    @Override
+    public void apply(Configuration configuration) {
+        try {
+            Class<?> typeClass = Class.forName(type);
+            if (Type.class.isAssignableFrom(typeClass)) {
+                configuration.register(table, column, (Type<?>) typeClass.newInstance());
+            } else {
+                configuration.register(table, column, typeClass);
+            }
+        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getTable() {
+        return table;
+    }
+
+    public void setTable(String table) {
+        this.table = table;
+    }
+
+    public String getColumn() {
+        return column;
+    }
+
+    public void setColumn(String column) {
+        this.column = column;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/package-info.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/package-info.java
new file mode 100644
index 0000000000..a77a069ff2
--- /dev/null
+++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/support/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Support classes
+ */
+package com.querydsl.sql.codegen.support;
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java
deleted file mode 100644
index 9ea82c075e..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.File;
-import java.sql.SQLException;
-
-import org.junit.AfterClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.MetaDataExporter;
-import com.mysema.query.sql.codegen.NamingStrategy;
-import com.mysema.testutil.FilteringTestRunner;
-
-@RunWith(FilteringTestRunner.class)
-public abstract class ExportBaseTest {
-
-    @Test
-    public void Export() throws SQLException{
-        File folder = new File("target", getClass().getSimpleName());
-        folder.mkdirs();
-        NamingStrategy namingStrategy = new DefaultNamingStrategy();
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSpatial(true);
-        exporter.setSchemaPattern(getSchemaPattern());
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(folder);
-        exporter.setNamingStrategy(namingStrategy);
-        exporter.export(Connections.getConnection().getMetaData());
-    }
-
-    protected String getSchemaPattern() {
-        return null;
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws SQLException {
-        Connections.close();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportDerbyTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportDerbyTest.java
deleted file mode 100644
index fad9e945ce..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportDerbyTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.Connections;
-
-public class ExportDerbyTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initDerby();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2Test.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2Test.java
deleted file mode 100644
index 268415ed4b..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2Test.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.Connections;
-
-public class ExportH2Test extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initH2();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2TwoSchemasTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2TwoSchemasTest.java
deleted file mode 100644
index 0367a03568..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportH2TwoSchemasTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.MetaDataExporter;
-import com.mysema.query.sql.codegen.NamingStrategy;
-
-public class ExportH2TwoSchemasTest {
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initH2();
-
-        Statement stmt = Connections.getStatement();
-        stmt.execute("create schema if not exists newschema");
-        stmt.execute("create table if not exists " +
-                "newschema.SURVEY(ID2 int auto_increment, NAME2 varchar(30), NAME3 varchar(30))");
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws SQLException {
-        Connections.close();
-    }
-
-    @Test
-    public void Export() throws SQLException, MalformedURLException, IOException {
-        File folder = new File("target", getClass().getSimpleName());
-        folder.mkdirs();
-        NamingStrategy namingStrategy = new DefaultNamingStrategy();
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern(null);
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(folder);
-        exporter.setNamingStrategy(namingStrategy);
-        exporter.export(Connections.getConnection().getMetaData());
-
-        String contents = Resources.toString(new File(folder, "test/QSurvey.java").toURI().toURL(),
-                Charsets.UTF_8);
-        assertTrue(contents.contains("id"));
-        assertTrue(contents.contains("name"));
-        assertTrue(contents.contains("name2"));
-
-        assertFalse(contents.contains("id2"));
-        assertFalse(contents.contains("name3"));
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportHsqldbTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportHsqldbTest.java
deleted file mode 100644
index c57e869116..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportHsqldbTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.Connections;
-
-public class ExportHsqldbTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initHSQL();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMSSQLTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMSSQLTest.java
deleted file mode 100644
index ddd73d2080..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMSSQLTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.Connections;
-import com.mysema.testutil.ResourceCheck;
-
-@ResourceCheck("/sqlserver.run")
-public class ExportMSSQLTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initSQLServer();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMySQLTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMySQLTest.java
deleted file mode 100644
index b3035f517f..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportMySQLTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class ExportMySQLTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initMySQL();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportOracleTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportOracleTest.java
deleted file mode 100644
index 1f812f407b..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportOracleTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class ExportOracleTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initOracle();
-    }
-
-    @Override
-    public String getSchemaPattern() {
-        return "QUERYDSL";
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportPostgresTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportPostgresTest.java
deleted file mode 100644
index a08ce94bc6..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportPostgresTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class ExportPostgresTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initPostgres();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportSQLiteTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportSQLiteTest.java
deleted file mode 100644
index dfd5b31f4f..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportSQLiteTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-
-public class ExportSQLiteTest extends ExportBaseTest{
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initSQLite();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportTeradataTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportTeradataTest.java
deleted file mode 100644
index 329ca4150b..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportTeradataTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mysema.query;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.testutil.ExternalDB;
-
-//@Ignore
-@Category(ExternalDB.class)
-public class ExportTeradataTest extends ExportBaseTest {
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Connections.initTeradata();
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ant/AntMetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ant/AntMetaDataExporterTest.java
deleted file mode 100644
index 90477f8f32..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ant/AntMetaDataExporterTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.ant;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
-public class AntMetaDataExporterTest {
-
-//    private final String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
-    private final String url = "jdbc:h2:~/dbs/h2" + System.currentTimeMillis();
-
-    @Before
-    public void setUp() throws SQLException {
-        Connection conn = DriverManager.getConnection(url, "sa", "");
-        try {
-          Statement stmt = conn.createStatement();
-          try {
-              stmt.execute("create table test (id int)");    
-          } finally {
-              stmt.close();
-          }                           
-        } finally {
-            conn.close();  
-        }
-    }
-    
-    @Test
-    public void Execute() {
-        AntMetaDataExporter exporter = new AntMetaDataExporter();
-        exporter.setJdbcDriverClass("org.h2.Driver");
-        exporter.setDbUserName("sa");
-        exporter.setDbUrl(url);
-        exporter.setTargetPackage("test");
-        exporter.setTargetSourceFolder("target/AntMetaDataExporterTest");
-        exporter.execute();
-
-        assertTrue(new File("target/AntMetaDataExporterTest").exists());
-    }
-    
-    @Test
-    public void Execute_With_Beans() {
-        AntMetaDataExporter exporter = new AntMetaDataExporter();
-        exporter.setJdbcDriverClass("org.h2.Driver");
-        exporter.setDbUserName("sa");
-        exporter.setDbUrl(url);
-        exporter.setTargetPackage("test");
-        exporter.setTargetSourceFolder("target/AntMetaDataExporterTest2");
-        exporter.setExportBeans(true);
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Q");
-        exporter.setBeanPrefix("");
-        exporter.setBeanSuffix("Bean");
-        exporter.execute();
-
-        assertTrue(new File("target/AntMetaDataExporterTest2").exists());
-    }
-
-
-    @Test
-    public void Execute_With_Import() {
-        AntMetaDataExporter exporter = new AntMetaDataExporter();
-        exporter.setJdbcDriverClass("org.h2.Driver");
-        exporter.setDbUserName("sa");
-        exporter.setDbUrl(url);
-        exporter.setTargetPackage("test");
-        exporter.setTargetSourceFolder("target/AntMetaDataExporterTest3");
-        exporter.setExportBeans(true);
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Q");
-        exporter.setBeanPrefix("");
-        exporter.setBeanSuffix("Bean");
-        exporter.setImports(new String[]{"com.pck1" , "com.pck2" , "com.Q1" , "com.Q2"});
-        exporter.execute();
-
-        assertTrue(new File("target/AntMetaDataExporterTest3").exists());
-    }
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java
deleted file mode 100644
index 1b4f80b90f..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.mysema.query.AbstractJDBCTest;
-import com.mysema.query.alias.Gender;
-import com.mysema.query.sql.*;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.sql.types.EnumByNameType;
-import com.mysema.query.sql.types.StringType;
-import com.mysema.query.sql.types.UtilDateType;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class CustomTypesTest extends AbstractJDBCTest{
-
-    private Configuration configuration;
-
-    @Override
-    @Before
-    public void setUp() throws ClassNotFoundException, SQLException{
-        super.setUp();
-        // create schema
-        statement.execute("drop table person if exists");
-        statement.execute("create table person("
-            + "id INT, "
-            + "firstname VARCHAR(50), "
-            + "gender VARCHAR(50), "
-            + "securedId VARCHAR(50), "
-            + "CONSTRAINT PK_person PRIMARY KEY (id) "
-            + ")");
-
-        // create configuration
-        configuration = new Configuration(new HSQLDBTemplates());
-//        configuration.setJavaType(Types.DATE, java.util.Date.class);
-        configuration.register(new UtilDateType());
-        configuration.register("PERSON", "SECUREDID", new EncryptedString());
-        configuration.register("PERSON", "GENDER",  new EnumByNameType<Gender>(Gender.class));
-        configuration.register(new StringType());
-
-    }
-
-    @Test
-    public void Export() throws SQLException, IOException{
-        // create exporter
-        String namePrefix = "Q";
-        NamingStrategy namingStrategy = new DefaultNamingStrategy();
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setNamePrefix(namePrefix);
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(new File("target/customExport"));
-        exporter.setNamingStrategy(namingStrategy);
-        exporter.setConfiguration(configuration);
-
-        // export
-        exporter.export(connection.getMetaData());
-        String person = Files.toString(new File("target/customExport/test/QPerson.java"), Charsets.UTF_8);
-        //System.err.println(person);
-        assertTrue(person.contains("createEnum(\"gender\""));
-    }
-
-    @Test
-    public void Insert_Query_Update() {
-        QPerson person = QPerson.person;
-
-        // insert
-        SQLInsertClause insert = new SQLInsertClause(connection, configuration, person);
-        insert.set(person.id, 10);
-        insert.set(person.firstname, "Bob");
-        insert.set(person.gender, Gender.MALE);
-        assertEquals(1l, insert.execute());
-
-        // query
-        SQLQuery query = new SQLQuery(connection, configuration);
-        assertEquals(Gender.MALE, query.from(person).where(person.id.eq(10)).uniqueResult(person.gender));
-
-        // update
-        SQLUpdateClause update = new SQLUpdateClause(connection, configuration, person);
-        update.set(person.gender, Gender.FEMALE);
-        update.set(person.firstname, "Jane");
-        update.where(person.id.eq(10));
-        update.execute();
-
-        // query
-        query = new SQLQuery(connection, configuration);
-        assertEquals(Gender.FEMALE, query.from(person).where(person.id.eq(10)).uniqueResult(person.gender));
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java
deleted file mode 100644
index b26cd2ca17..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.codegen.model.Types;
-import com.mysema.query.codegen.EntityType;
-
-public class DefaultNamingStrategyTest {
-
-    private NamingStrategy namingStrategy = new DefaultNamingStrategy();
-
-    private EntityType entityModel;
-
-    @Before
-    public void setUp() {
-        entityModel = new EntityType(Types.OBJECT);
-        //entityModel.addAnnotation(new TableImpl("OBJECT"));
-        entityModel.getData().put("table", "OBJECT");
-    }
-
-    @Test
-    public void GetClassName() {
-        assertEquals("UserData", namingStrategy.getClassName("user_data"));
-        assertEquals("U", namingStrategy.getClassName("u"));
-        assertEquals("Us",namingStrategy.getClassName("us"));
-        assertEquals("U_", namingStrategy.getClassName("u_"));
-        assertEquals("Us_",namingStrategy.getClassName("us_"));
-
-        assertEquals("NewLine", namingStrategy.getClassName("new line"));
-    }
-
-    @Test
-    public void GetPropertyName() {
-        assertEquals("whileCol", namingStrategy.getPropertyName("while", entityModel));
-        assertEquals("name", namingStrategy.getPropertyName("name", entityModel));
-        assertEquals("userId", namingStrategy.getPropertyName("user_id", entityModel));
-        assertEquals("accountEventId", namingStrategy.getPropertyName("accountEvent_id", entityModel));
-
-        assertEquals("_123abc", namingStrategy.getPropertyName("123abc", entityModel));
-        assertEquals("_123Abc", namingStrategy.getPropertyName("123 abc", entityModel));
-
-        assertEquals("_123AbcDef", namingStrategy.getPropertyName("#123#abc#def", entityModel));
-
-        assertEquals("newLine", namingStrategy.getPropertyName("new line", entityModel));
-    }
-
-    @Test
-    public void GetPropertyName_With_Dashes() {
-        assertEquals("aFoobar", namingStrategy.getPropertyName("A-FOOBAR" , entityModel));
-        assertEquals("aFoobar", namingStrategy.getPropertyName("A_FOOBAR" , entityModel));
-    }
-
-    @Test
-    public void GetPropertyName_For_Column_With_Spaces() {
-        assertEquals("userId", namingStrategy.getPropertyName("user id", entityModel));
-    }
-
-    @Test
-    public void GetPropertyNameForInverseForeignKey() {
-        assertEquals("_superiorFk", namingStrategy.getPropertyNameForInverseForeignKey("fk_superior", entityModel));
-    }
-
-    @Test
-    public void GetPropertyNameForForeignKey() {
-        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("fk_superior", entityModel));
-        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("FK_SUPERIOR", entityModel));
-
-        assertEquals("reffooBar", namingStrategy.getPropertyNameForForeignKey("REFFOO_BAR", entityModel));
-        assertEquals("refFooBar", namingStrategy.getPropertyNameForForeignKey("REF_FOO_BAR", entityModel));
-        assertEquals("refFooBar_", namingStrategy.getPropertyNameForForeignKey("REF_FOO_BAR_", entityModel));
-    }
-
-
-    @Test
-    public void GetPropertyNameForPrimaryKey() {
-        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("pk_superior", entityModel));
-        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("PK_SUPERIOR", entityModel));
-    }
-
-    @Test
-    public void GetDefaultVariableName() {
-        assertEquals("object", namingStrategy.getDefaultVariableName(entityModel));
-    }
-
-    @Test
-    public void Spaces() {
-        assertEquals("a_b", namingStrategy.getPropertyName("a  b", entityModel));
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java
deleted file mode 100644
index dd473d677e..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.mysema.query.AbstractJDBCTest;
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.KeyDataFactory;
-import com.mysema.query.sql.support.ForeignKeyData;
-import com.mysema.query.sql.support.InverseForeignKeyData;
-import com.mysema.query.sql.support.PrimaryKeyData;
-
-
-public class KeyDataFactoryTest extends AbstractJDBCTest{
-        
-    @Test
-    public void test() throws SQLException{
-        statement.execute("drop table employee if exists");
-        statement.execute("drop table survey if exists");
-        statement.execute("drop table date_test if exists");
-        statement.execute("drop table date_time_test if exists");
-
-        statement.execute("create table survey (id int, name varchar(30), "
-                + "CONSTRAINT PK_survey PRIMARY KEY (id, name))");
-
-        statement.execute("create table employee("
-                + "id INT, "
-                + "superior_id int, "
-                + "survey_id int, "
-                + "survey_name varchar(30), "
-                + "CONSTRAINT PK_employee PRIMARY KEY (id), "
-                + "CONSTRAINT FK_survey FOREIGN KEY (survey_id, survey_name) REFERENCES survey(id,name), "
-                + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");
-        
-        KeyDataFactory keyDataFactory = new KeyDataFactory(new DefaultNamingStrategy(), "Q","","test", false);
-        
-        DatabaseMetaData md = connection.getMetaData();
-        
-        // EMPLOYEE
-        
-        // primary key
-        Map<String, PrimaryKeyData> primaryKeys = keyDataFactory.getPrimaryKeys(md, null, null, "EMPLOYEE");
-        assertFalse(primaryKeys.isEmpty());
-        // inverse foreign keys
-        Map<String, InverseForeignKeyData> exportedKeys = keyDataFactory.getExportedKeys(md, null, null, "EMPLOYEE");
-        assertFalse(exportedKeys.isEmpty());
-        assertTrue(exportedKeys.containsKey("FK_SUPERIOR"));
-        // foreign keys
-        Map<String, ForeignKeyData> importedKeys = keyDataFactory.getImportedKeys(md, null, null, "EMPLOYEE");
-        assertFalse(importedKeys.isEmpty());
-        assertTrue(importedKeys.containsKey("FK_SUPERIOR"));
-        assertTrue(importedKeys.containsKey("FK_SURVEY"));
-        
-        // SURVEY
-        
-        // primary key
-        primaryKeys = keyDataFactory.getPrimaryKeys(md, null, null, "SURVEY");
-        assertFalse(primaryKeys.isEmpty());
-        // inverse foreign keys
-        exportedKeys = keyDataFactory.getExportedKeys(md, null, null, "SURVEY");
-        assertFalse(exportedKeys.isEmpty());
-        assertTrue(exportedKeys.containsKey("FK_SURVEY"));
-        // foreign keys
-        importedKeys = keyDataFactory.getImportedKeys(md, null, null, "SURVEY");
-        assertTrue(importedKeys.isEmpty());
-        
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java
deleted file mode 100644
index 23702cbe6f..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import javax.tools.JavaCompiler;
-import java.io.File;
-import java.io.IOException;
-import java.sql.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import com.mysema.codegen.SimpleCompiler;
-import com.mysema.query.codegen.BeanSerializer;
-import com.mysema.query.codegen.Serializer;
-import com.mysema.util.FileUtils;
-import junit.framework.Assert;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class MetaDataExporterTest {
-
-    private static final List<Serializer> BEAN_SERIALIZERS = Arrays.<Serializer>asList(
-            new BeanSerializer());
-
-    private static Connection connection;
-
-    private Statement statement;
-
-    private Serializer beanSerializer;
-
-    private boolean clean = true;
-
-    private boolean exportColumns = false;
-
-    private boolean schemaToPackage = false;
-
-    private DatabaseMetaData metadata;
-
-    private JavaCompiler compiler = new SimpleCompiler();
-
-    @BeforeClass
-    public static void setUpClass() throws ClassNotFoundException, SQLException{
-        Class.forName("org.h2.Driver");
-        String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
-        connection = DriverManager.getConnection(url, "sa", "");
-
-        Statement stmt = connection.createStatement();
-
-        try{
-            // reserved words
-            stmt.execute("create table reserved (id int, while int)");
-
-            // underscore
-            stmt.execute("create table underscore (e_id int, c_id int)");
-
-            // bean generation
-            stmt.execute("create table beangen1 (\"SEP_Order\" int)");
-
-            // default instance clash
-            stmt.execute("create table definstance (id int, definstance int, definstance1 int)");
-
-            // class with pk and fk classes
-            stmt.execute("create table pkfk (id int primary key, pk int, fk int)");
-
-            // camel case
-            stmt.execute("create table \"camelCase\" (id int)");
-            stmt.execute("create table \"vwServiceName\" (id int)");
-
-            // simple types
-            stmt.execute("create table date_test (d date)");
-            stmt.execute("create table date_time_test (dt datetime)");
-
-            // complex type
-            stmt.execute("create table survey (id int, name varchar(30))");
-
-            // new line
-            stmt.execute("create table \"new\nline\" (id int)");
-
-            stmt.execute("create table newline2 (id int, \"new\nline\" int)");
-
-            stmt.execute("create table employee("
-                    + "id INT, "
-                    + "firstname VARCHAR(50), "
-                    + "lastname VARCHAR(50), "
-                    + "salary DECIMAL(10, 2), "
-                    + "datefield DATE, "
-                    + "timefield TIME, "
-                    + "superior_id int, "
-                    + "survey_id int, "
-                    + "survey_name varchar(30), "
-                    + "CONSTRAINT PK_employee PRIMARY KEY (id), "
-                    + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");
-
-            // multi key
-            stmt.execute("create table multikey(id INT, id2 VARCHAR, id3 INT, CONSTRAINT pk_multikey PRIMARY KEY (id, id2, id3) )");
-
-            //  M_PRODUCT_BOM_ID
-            stmt.execute("create table product(id int, "
-                    + "m_product_bom_id int, "
-                    + "m_productbom_id int, "
-                    + "constraint product_bom foreign key (m_productbom_id) references product(id))");
-
-        }finally{
-            stmt.close();
-        }
-
-
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws SQLException{
-        connection.close();
-    }
-
-    @Before
-    public void setUp() throws ClassNotFoundException, SQLException {
-        statement = connection.createStatement();
-        metadata = connection.getMetaData();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        statement.close();
-    }
-
-    private static final NamingStrategy defaultNaming = new DefaultNamingStrategy();
-
-    private static final NamingStrategy originalNaming = new OriginalNamingStrategy();
-
-    private String beanPackageName = null;
-
-    @Test
-    public void NormalSettings_Repetition() throws SQLException {
-        test("Q", "", "", "", defaultNaming, "target/1", false, false, false);
-
-        File file = new File("target/1/test/QEmployee.java");
-        long lastModified = file.lastModified();
-        assertTrue(file.exists());
-
-        clean = false;
-        test("Q", "", "", "", defaultNaming, "target/1", false, false, false);
-        assertEquals(lastModified, file.lastModified());
-    }
-
-    @Test
-    public void Multiple() throws SQLException {
-        // TODO : refactor this to use new JUnit constructs
-        List<String> emptyString = Collections.singletonList("");
-        boolean[] trueAndFalse = new boolean[]{true, false};
-        int counter = 0;
-        for (boolean withBeans : trueAndFalse) {
-        for (boolean withInnerClasses : trueAndFalse) {
-        for (boolean schemaToPackage : trueAndFalse) {
-        for (boolean exportColumns : trueAndFalse) {
-        for (boolean withOriginalPositioning : trueAndFalse) {
-        for (NamingStrategy ns : Arrays.asList(defaultNaming, originalNaming)) {
-        for (String namePrefix : Arrays.asList("", "Q", "Query")) {
-        for (String nameSuffix : Arrays.asList("", "Type")) {
-        for (String beanPrefix : withBeans ? Arrays.asList("", "Bean") : emptyString) {
-        for (String beanSuffix : withBeans ? Arrays.asList("", "Bean") : emptyString) {
-        for (String beanPackage : withBeans ? Arrays.asList("test2", null) : emptyString) {
-        for (Serializer beanSerializer : BEAN_SERIALIZERS) {
-            counter++;
-            this.beanPackageName = beanPackage;
-            this.schemaToPackage = schemaToPackage;
-            this.exportColumns = exportColumns;
-            this.beanSerializer = beanSerializer;
-            test(namePrefix, nameSuffix, beanPrefix, beanSuffix,
-                 ns, "target/multiple_"+counter, withBeans, withInnerClasses, withOriginalPositioning);
-        }}}}}}}}}}}}
-    }
-
-    @Test
-    public void Explicit_Configuration() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setNamePrefix("Q");
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(new File("target/7"));
-        exporter.setNamingStrategy(new DefaultNamingStrategy());
-        exporter.setBeanSerializer(new BeanSerializer());
-        exporter.setBeanPackageName("test2");
-        exporter.export(metadata);
-
-        assertTrue(new File("target/7/test/QDateTest.java").exists());
-        assertTrue(new File("target/7/test2/DateTest.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(new File("target/8"));
-        exporter.export(metadata);
-
-        assertTrue(new File("target/8/test/QDateTest.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration_with_tables() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setTableNamePattern("RESERVED,UNDERSCORE,BEANGEN1");
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(new File("target/82"));
-        exporter.export(metadata);
-
-        assertTrue(new File("target/82/test/QBeangen1.java").exists());
-        assertTrue(new File("target/82/test/QReserved.java").exists());
-        assertTrue(new File("target/82/test/QUnderscore.java").exists());
-        assertFalse(new File("target/82/test/QDefinstance.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration_with_Suffix() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setPackageName("test");
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Type");
-        exporter.setTargetFolder(new File("target/9"));
-        exporter.export(metadata);
-
-        assertTrue(new File("target/9/test/DateTestType.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration_without_keys() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setPackageName("test");
-        exporter.setNamePrefix("");
-        exporter.setNameSuffix("Type");
-        exporter.setTargetFolder(new File("target/10"));
-        exporter.setExportForeignKeys(false);
-        exporter.export(metadata);
-
-        assertTrue(new File("target/10/test/DateTestType.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration_with_Bean_prefix() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setPackageName("test");
-        exporter.setNamePrefix("");
-        exporter.setBeanPrefix("Bean");
-        exporter.setBeanSerializer(new BeanSerializer());
-        exporter.setTargetFolder(new File("target/a"));
-        exporter.export(metadata);
-
-        assertTrue(new File("target/a/test/DateTest.java").exists());
-        assertTrue(new File("target/a/test/BeanDateTest.java").exists());
-    }
-
-    @Test
-    public void Minimal_Configuration_with_Bean_suffix() throws SQLException{
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setPackageName("test");
-        exporter.setNamePrefix("");
-        exporter.setBeanSuffix("Bean");
-        exporter.setBeanSerializer(new BeanSerializer());
-        exporter.setTargetFolder(new File("target/b"));
-        exporter.export(metadata);
-
-        assertTrue(new File("target/b/test/DateTest.java").exists());
-        assertTrue(new File("target/b/test/DateTestBean.java").exists());
-    }
-
-    private void test(String namePrefix, String nameSuffix, String beanPrefix, String beanSuffix,
-            NamingStrategy namingStrategy, String target, boolean withBeans,
-            boolean withInnerClasses, boolean withOrdinalPositioning) throws SQLException{
-        File targetDir = new File(target);
-        if (clean) {
-            try {
-                if (targetDir.exists()) {
-                    FileUtils.delete(targetDir);
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setColumnAnnotations(exportColumns);
-        exporter.setSchemaPattern("PUBLIC");
-        exporter.setNamePrefix(namePrefix);
-        exporter.setNameSuffix(nameSuffix);
-        exporter.setBeanPrefix(beanPrefix);
-        exporter.setBeanSuffix(beanSuffix);
-        exporter.setInnerClassesForKeys(withInnerClasses);
-        exporter.setPackageName("test");
-        exporter.setBeanPackageName(beanPackageName);
-        exporter.setTargetFolder(targetDir);
-        exporter.setNamingStrategy(namingStrategy);
-        exporter.setSchemaToPackage(schemaToPackage);
-        if (withBeans) {
-            exporter.setBeanSerializer(beanSerializer);
-        }
-        if (withOrdinalPositioning) {
-            exporter.setColumnComparatorClass(OrdinalPositionComparator.class);
-        }
-        exporter.export(metadata);
-
-        Set<String> classes = exporter.getClasses();
-        int compilationResult = compiler.run(null, System.out, System.err,
-                classes.toArray(new String[classes.size()]));
-        if (compilationResult != 0) {
-            Assert.fail("Compilation Failed for " + target);
-        }
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java
deleted file mode 100644
index 09a5b71e83..0000000000
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.codegen;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.util.Set;
-
-import javax.tools.JavaCompiler;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.codegen.SimpleCompiler;
-import com.mysema.query.AbstractJDBCTest;
-import com.mysema.query.codegen.BeanSerializer;
-
-public class MetaDataSerializerTest extends AbstractJDBCTest{
-
-    @Override
-    @Before
-    public void setUp() throws SQLException, ClassNotFoundException{
-        super.setUp();
-        statement.execute("drop table employee if exists");
-        statement.execute("drop table survey if exists");
-        statement.execute("drop table date_test if exists");
-        statement.execute("drop table date_time_test if exists");
-
-        // survey
-        statement.execute("create table survey (id int, name varchar(30), "
-                + "CONSTRAINT PK_survey PRIMARY KEY (id, name))");
-        
-        // date_test
-        statement.execute("create table date_test (d date)");
-        
-        // date_time
-        statement.execute("create table date_time_test (dt datetime)");
-        
-        // spaces
-        statement.execute("create table spaces (\"spaces  \n 1\" date)");
-        
-        // employee
-        statement.execute("create table employee("
-                + "id INT, "
-                + "firstname VARCHAR(50), "
-                + "lastname VARCHAR(50), "
-                + "salary DECIMAL(10, 2), "
-                + "datefield DATE, "
-                + "timefield TIME, "
-                + "superior_id int, "
-                + "survey_id int, "
-                + "\"123abc\" int,"
-                + "survey_name varchar(30), "
-                + "CONSTRAINT PK_employee PRIMARY KEY (id), "
-                + "CONSTRAINT FK_survey FOREIGN KEY (survey_id, survey_name) REFERENCES survey(id,name), "
-                + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");
-    }
-
-    @Test
-    public void Normal_serialization() throws SQLException{
-        String namePrefix = "Q";
-        NamingStrategy namingStrategy = new DefaultNamingStrategy();
-        // customization of serialization
-        MetaDataExporter exporter = new MetaDataExporter();
-        exporter.setBeanSerializerClass(BeanSerializer.class);
-        exporter.setNamePrefix(namePrefix);
-        exporter.setPackageName("test");
-        exporter.setTargetFolder(new File("target/cust1"));
-        exporter.setNamingStrategy(namingStrategy);
-        exporter.export(connection.getMetaData());
-
-        compile(exporter);
-    }
-
-    private void compile(MetaDataExporter exporter) {
-        JavaCompiler compiler = new SimpleCompiler();
-        Set<String> classes = exporter.getClasses();
-        int compilationResult = compiler.run(null, null, null, classes.toArray(new String[classes.size()]));
-        if(compilationResult == 0) {
-            System.out.println("Compilation is successful");
-        } else {
-            Assert.fail("Compilation Failed");
-        }
-    }
-
-}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java
new file mode 100644
index 0000000000..0c701fad7a
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.SQLException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.alias.Gender;
+import com.querydsl.sql.*;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+import com.querydsl.sql.types.EnumByNameType;
+import com.querydsl.sql.types.StringType;
+import com.querydsl.sql.types.UtilDateType;
+
+public class CustomTypesTest extends AbstractJDBCTest {
+
+    private Configuration configuration;
+
+    @Override
+    @Before
+    public void setUp() throws ClassNotFoundException, SQLException {
+        super.setUp();
+        // create schema
+        statement.execute("drop table person if exists");
+        statement.execute("create table person("
+            + "id INT, "
+            + "firstname VARCHAR(50), "
+            + "gender VARCHAR(50), "
+            + "securedId VARCHAR(50), "
+            + "CONSTRAINT PK_person PRIMARY KEY (id) "
+            + ")");
+
+        // create configuration
+        configuration = new Configuration(new HSQLDBTemplates());
+//        configuration.setJavaType(Types.DATE, java.util.Date.class);
+        configuration.register(new UtilDateType());
+        configuration.register("PERSON", "SECUREDID", new EncryptedString());
+        configuration.register("PERSON", "GENDER",  new EnumByNameType<Gender>(Gender.class));
+        configuration.register(new StringType());
+
+    }
+
+    @Test
+    public void export() throws SQLException, IOException {
+        // create exporter
+        String namePrefix = "Q";
+        NamingStrategy namingStrategy = new DefaultNamingStrategy();
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setNamePrefix(namePrefix);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(new File("target/customExport"));
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.setConfiguration(configuration);
+
+        // export
+        exporter.export(connection.getMetaData());
+        String person = new String(Files.readAllBytes(Paths.get("target", "customExport", "test", "QPerson.java")), StandardCharsets.UTF_8);
+        //System.err.println(person);
+        assertTrue(person.contains("createEnum(\"gender\""));
+    }
+
+    @Test
+    public void insert_query_update() {
+        QPerson person = QPerson.person;
+
+        // insert
+        SQLInsertClause insert = new SQLInsertClause(connection, configuration, person);
+        insert.set(person.id, 10);
+        insert.set(person.firstname, "Bob");
+        insert.set(person.gender, Gender.MALE);
+        assertEquals(1L, insert.execute());
+
+        // query
+        SQLQuery<?> query = new SQLQuery<Void>(connection, configuration);
+        assertEquals(Gender.MALE, query.from(person).where(person.id.eq(10)).select(person.gender).fetchOne());
+
+        // update
+        SQLUpdateClause update = new SQLUpdateClause(connection, configuration, person);
+        update.set(person.gender, Gender.FEMALE);
+        update.set(person.firstname, "Jane");
+        update.where(person.id.eq(10));
+        update.execute();
+
+        // query
+        query = new SQLQuery<Void>(connection, configuration);
+        assertEquals(Gender.FEMALE, query.from(person).where(person.id.eq(10)).select(person.gender).fetchOne());
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java
new file mode 100644
index 0000000000..58576cbd2f
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+
+public class DefaultNamingStrategyTest {
+
+    private NamingStrategy namingStrategy = new DefaultNamingStrategy();
+
+    private EntityType entityModel;
+
+    @Before
+    public void setUp() {
+        entityModel = new EntityType(Types.OBJECT);
+        //entityModel.addAnnotation(new TableImpl("OBJECT"));
+        entityModel.getData().put("table", "OBJECT");
+    }
+
+    @Test
+    public void getClassName() {
+        assertEquals("UserData", namingStrategy.getClassName("user_data"));
+        assertEquals("U", namingStrategy.getClassName("u"));
+        assertEquals("Us",namingStrategy.getClassName("us"));
+        assertEquals("U_", namingStrategy.getClassName("u_"));
+        assertEquals("Us_",namingStrategy.getClassName("us_"));
+
+        assertEquals("NewLine", namingStrategy.getClassName("new line"));
+    }
+
+    @Test
+    public void getPropertyName() {
+        assertEquals("a", namingStrategy.getPropertyName("a", entityModel));
+        assertEquals("whileCol", namingStrategy.getPropertyName("while", entityModel));
+        assertEquals("name", namingStrategy.getPropertyName("name", entityModel));
+        assertEquals("userId", namingStrategy.getPropertyName("user_id", entityModel));
+        assertEquals("accountEventId", namingStrategy.getPropertyName("accountEvent_id", entityModel));
+
+        assertEquals("_123abc", namingStrategy.getPropertyName("123abc", entityModel));
+        assertEquals("_123Abc", namingStrategy.getPropertyName("123 abc", entityModel));
+
+        assertEquals("_123AbcDef", namingStrategy.getPropertyName("#123#abc#def", entityModel));
+
+        assertEquals("newLine", namingStrategy.getPropertyName("new line", entityModel));
+
+        assertEquals("classCol", namingStrategy.getPropertyName("class", entityModel));
+        assertEquals("classCol", namingStrategy.getPropertyName("Class", entityModel));
+    }
+
+    @Test
+    public void getPropertyName_with_dashes() {
+        assertEquals("aFoobar", namingStrategy.getPropertyName("A-FOOBAR", entityModel));
+        assertEquals("aFoobar", namingStrategy.getPropertyName("A_FOOBAR", entityModel));
+    }
+
+    @Test
+    public void getPropertyName_for_column_with_spaces() {
+        assertEquals("userId", namingStrategy.getPropertyName("user id", entityModel));
+    }
+
+    @Test
+    public void getPropertyNameForInverseForeignKey() {
+        assertEquals("_superiorFk", namingStrategy.getPropertyNameForInverseForeignKey("fk_superior", entityModel));
+    }
+
+    @Test
+    public void getPropertyNameForForeignKey() {
+        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("fk_superior", entityModel));
+        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("FK_SUPERIOR", entityModel));
+
+        assertEquals("reffooBar", namingStrategy.getPropertyNameForForeignKey("REFFOO_BAR", entityModel));
+        assertEquals("refFooBar", namingStrategy.getPropertyNameForForeignKey("REF_FOO_BAR", entityModel));
+        assertEquals("refFooBar_", namingStrategy.getPropertyNameForForeignKey("REF_FOO_BAR_", entityModel));
+    }
+
+    @Test
+    public void getPropertyNameForPrimaryKey() {
+        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("pk_superior", entityModel));
+        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("PK_SUPERIOR", entityModel));
+    }
+
+    @Test
+    public void getPropertyNameForPrimaryKey_clash() {
+        entityModel.addProperty(new Property(entityModel, "id", Types.STRING));
+        assertEquals("idPk", namingStrategy.getPropertyNameForPrimaryKey("id", entityModel));
+    }
+
+    @Test
+    public void getDefaultVariableName() {
+        assertEquals("object", namingStrategy.getDefaultVariableName(entityModel));
+    }
+
+    @Test
+    public void spaces() {
+        assertEquals("a_b", namingStrategy.getPropertyName("a  b", entityModel));
+    }
+
+    @Test
+    public void validName() {
+        assertEquals("8FRecord", namingStrategy.normalizeColumnName("8FRecord"));
+        assertEquals("_8FRecord", namingStrategy.getPropertyName("8FRecord", entityModel));
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/Export.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/Export.java
similarity index 76%
rename from querydsl-sql-codegen/src/test/java/com/mysema/query/Export.java
rename to querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/Export.java
index 97512f634c..cf996e8929 100644
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/Export.java
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/Export.java
@@ -1,26 +1,25 @@
-package com.mysema.query;
+package com.querydsl.sql.codegen;
 
 import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import com.mysema.query.sql.codegen.MetaDataExporter;
+public final class Export {
 
+    private Export() { }
 
-public class Export {
-    
     public static void main(String[] args) throws Exception {
         Class.forName("com.mysql.jdbc.Driver");
         String url = "jdbc:mysql://localhost:3306/querydsl";
         Connection conn = DriverManager.getConnection(url, "querydsl", "querydsl");
-        
+
         MetaDataExporter exporter = new MetaDataExporter();
         exporter.setNamePrefix("S");
-        exporter.setPackageName("com.mysema.query.jpa.domain.sql");
+        exporter.setPackageName("com.querydsl.jpa.domain.sql");
         exporter.setTargetFolder(new File("../querydsl-jpa/src/test/java"));
 //        exporter.setLowerCase(true);
         exporter.export(conn.getMetaData());
-        
+
         conn.close();
     }
 
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java
new file mode 100644
index 0000000000..8d67f59082
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import java.sql.SQLException;
+
+import org.junit.AfterClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.querydsl.sql.Connections;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+public abstract class ExportBaseTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Test
+    public void export() throws SQLException {
+        NamingStrategy namingStrategy = new DefaultNamingStrategy();
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSpatial(true);
+        exporter.setSchemaPattern(getSchemaPattern());
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.export(Connections.getConnection().getMetaData());
+
+        assertThat(folder.getRoot().listFiles().length, is(greaterThan(0)));
+    }
+
+    protected String getSchemaPattern() {
+        return null;
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws SQLException {
+        Connections.close();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java
new file mode 100644
index 0000000000..bdfdf0291f
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.sql.Connections;
+
+@Category(Derby.class)
+public class ExportDerbyTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initDerby();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java
new file mode 100644
index 0000000000..eec11bd4c5
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.Connections;
+
+@Category(H2.class)
+public class ExportH2Test extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initH2();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java
new file mode 100644
index 0000000000..ab45714dc4
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java
@@ -0,0 +1,64 @@
+package com.querydsl.sql.codegen;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.Connections;
+
+@Category(H2.class)
+public class ExportH2TwoSchemasTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initH2();
+
+        Statement stmt = Connections.getStatement();
+        stmt.execute("create schema if not exists newschema");
+        stmt.execute("create table if not exists " +
+                "newschema.SURVEY2(ID2 int auto_increment, NAME2 varchar(30), NAME3 varchar(30))");
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws SQLException {
+        Connections.close();
+    }
+
+    @Test
+    public void export() throws SQLException, MalformedURLException, IOException {
+        NamingStrategy namingStrategy = new DefaultNamingStrategy();
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern(null);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.export(Connections.getConnection().getMetaData());
+
+        String contents = new String(Files.readAllBytes(new File(folder.getRoot(), "test/QSurvey.java").toPath()), StandardCharsets.UTF_8);
+        assertTrue(contents.contains("id"));
+        assertTrue(contents.contains("name"));
+        assertTrue(contents.contains("name2"));
+
+        assertFalse(contents.contains("id2"));
+        assertFalse(contents.contains("name3"));
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java
new file mode 100644
index 0000000000..a5b67bf169
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.HSQLDB;
+import com.querydsl.sql.Connections;
+
+@Category(HSQLDB.class)
+public class ExportHsqldbTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initHSQL();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java
new file mode 100644
index 0000000000..eca6dc02a8
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.sql.Connections;
+
+@Category(SQLServer.class)
+public class ExportMSSQLTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initSQLServer();
+    }
+
+    @Override
+    protected String getSchemaPattern() {
+        return "sys";
+    }
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java
new file mode 100644
index 0000000000..b5358c0699
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.Connections;
+
+@Category(MySQL.class)
+public class ExportMySQLTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initMySQL();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
new file mode 100644
index 0000000000..2b12a82ab0
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import java.util.TimeZone;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Oracle;
+import com.querydsl.sql.Connections;
+
+@Category(Oracle.class)
+public class ExportOracleTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        TimeZone tz = TimeZone.getDefault();
+        try {
+            // change time zone to work around ORA-01882
+            // see https://gist.github.com/jarek-przygodzki/cbea3cedae3aef2bbbe0ff6b057e8321
+            // the test may work fine on your machine without this, but it fails when the GitHub runner executes it
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            Connections.initOracle();
+        } finally {
+            TimeZone.setDefault(tz);
+        }
+    }
+
+    @Override
+    public String getSchemaPattern() {
+        return "QUERYDSL";
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java
new file mode 100644
index 0000000000..a386a05382
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.sql.Connections;
+
+@Category(PostgreSQL.class)
+public class ExportPostgreSQLTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initPostgreSQL();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java
new file mode 100644
index 0000000000..b8f76625d0
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java
@@ -0,0 +1,17 @@
+package com.querydsl.sql.codegen;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLite;
+import com.querydsl.sql.Connections;
+
+@Category(SQLite.class)
+public class ExportSQLiteTest extends ExportBaseTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Connections.initSQLite();
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java
new file mode 100644
index 0000000000..018fb2ad87
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java
@@ -0,0 +1,112 @@
+package com.querydsl.sql.codegen;
+
+import com.querydsl.codegen.EntityType;
+import com.querydsl.codegen.Property;
+import com.querydsl.codegen.SimpleSerializerConfig;
+import com.querydsl.codegen.utils.JavaWriter;
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.codegen.utils.model.ClassType;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.sql.ColumnImpl;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class ExtendedBeanSerializerTest {
+
+    private static final String CLASS_NAME = "DomainClass";
+    private static final String[] PATH = {"com", "querydsl", "test", "gen"};
+    private static final String PACKAGE = String.join(".", PATH);
+    private static final String FULL_NAME = PACKAGE + "." + CLASS_NAME;
+
+    @Rule
+    public TemporaryFolder compileFolder = new TemporaryFolder();
+
+    private EntityType type;
+
+    private File srcFile;
+
+    @Before
+    public void setUp() throws IOException {
+        Type typeModel = new SimpleType(TypeCategory.ENTITY, FULL_NAME, PACKAGE, CLASS_NAME, false, false);
+        type = new EntityType(typeModel);
+        File srcFolder = compileFolder.newFolder(PATH);
+        srcFile = new File(srcFolder, CLASS_NAME + ".java");
+    }
+
+    @Test
+    public void equals_hashcode_tostring() throws Exception {
+        Property idCol = new Property(type, "id", new ClassType(Integer.class));
+        idCol.addAnnotation(new ColumnImpl("ID"));
+        Property subIdCol = new Property(type, "sub_id", new ClassType(String.class));
+        subIdCol.addAnnotation(new ColumnImpl("SUB_ID"));
+        Property nameCol = new Property(type, "name", new ClassType(String.class));
+        nameCol.addAnnotation(new ColumnImpl("NAME"));
+
+        type.addProperty(idCol);
+        type.addProperty(subIdCol);
+        type.addProperty(nameCol);
+
+        type.getData().put(PrimaryKeyData.class, Arrays.asList(
+                new PrimaryKeyData("PK", new String[]{"ID", "SUB_ID"})));
+
+        ExtendedBeanSerializer extendedBeanSerializer = new ExtendedBeanSerializer();
+        extendedBeanSerializer.setAddToString(true);
+
+        FileWriter fw = new FileWriter(srcFile);
+        extendedBeanSerializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(fw));
+        fw.close();
+
+        URLClassLoader classLoader = URLClassLoader.newInstance(new URL[] {compileFolder.getRoot().toURI().toURL()});
+        int retCode = new SimpleCompiler().run(null, System.out, System.err, srcFile.getAbsolutePath());
+        assertEquals("The generated source should compile", 0, retCode);
+
+        Class<?> cls = Class.forName(FULL_NAME, true, classLoader);
+        ReflectionHelper reflection = new ReflectionHelper(cls);
+        Object obj1 = cls.newInstance();
+        Object obj1a = cls.newInstance();
+        Object obj2 = cls.newInstance();
+        reflection.setValues(obj1, 1, "##", "X");
+        reflection.setValues(obj1a, 1, "##", null);
+        reflection.setValues(obj2, 2, "--", "Y");
+
+        assertEquals(obj1, obj1a);
+        assertEquals(obj1.hashCode(), obj1a.hashCode());
+        assertNotEquals(obj1, obj2);
+
+        assertEquals(obj1.toString(), "DomainClass#1;##");
+    }
+
+    private static class ReflectionHelper {
+        private final Map<String, Method> methodByName = new HashMap<String, Method>();
+
+        ReflectionHelper(Class<?> cls) {
+            for (Method m : cls.getDeclaredMethods()) {
+                methodByName.put(m.getName(), m);
+            }
+        }
+
+        private void setValues(Object instance, int id, String subId, String name) throws Exception {
+            methodByName.get("setId").invoke(instance, id);
+            methodByName.get("setSub_id").invoke(instance, subId);
+            methodByName.get("setName").invoke(instance, name);
+        }
+    }
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java
similarity index 81%
rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java
rename to querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java
index 57367ccd48..4af30351cb 100644
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,33 +11,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.codegen.model.Types;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.sql.codegen.ExtendedNamingStrategy;
-import com.mysema.query.sql.codegen.NamingStrategy;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.EntityType;
 
 public class ExtendedNamingStrategyTest {
 
     private NamingStrategy namingStrategy = new ExtendedNamingStrategy();
 
     private EntityType entityModel;
-    
+
     @Before
     public void setUp() {
         entityModel = new EntityType(Types.OBJECT);
         //entityModel.addAnnotation(new TableImpl("OBJECT"));
         entityModel.getData().put("table", "OBJECT");
     }
-    
+
     @Test
-    public void GetClassName() {
+    public void getClassName() {
         assertEquals("UserData", namingStrategy.getClassName("user_data"));
         assertEquals("U", namingStrategy.getClassName("u"));
         assertEquals("Us",namingStrategy.getClassName("us"));
@@ -46,49 +44,49 @@ public void GetClassName() {
     }
 
     @Test
-    public void GetPropertyName() {
+    public void getPropertyName() {
         assertEquals("whileCol", namingStrategy.getPropertyName("while", entityModel));
         assertEquals("name", namingStrategy.getPropertyName("name", entityModel));
         assertEquals("userId", namingStrategy.getPropertyName("user_id", entityModel));
         assertEquals("accountEventId", namingStrategy.getPropertyName("accountEvent_id", entityModel));
-        
+
         assertEquals("_123abc", namingStrategy.getPropertyName("123abc", entityModel));
         assertEquals("_123Abc", namingStrategy.getPropertyName("123 abc", entityModel));
     }
-    
+
     @Test
-    public void GetPropertyName_For_Column_With_Spaces() {
+    public void getPropertyName_for_column_with_spaces() {
         assertEquals("userId", namingStrategy.getPropertyName("user id", entityModel));
     }
-    
+
     @Test
-    public void GetPropertyNameForInverseForeignKey() {
+    public void getPropertyNameForInverseForeignKey() {
         assertEquals("_superiorFk", namingStrategy.getPropertyNameForInverseForeignKey("fk_superior", entityModel));
         // fk_order_rows
         assertEquals("rows", namingStrategy.getPropertyNameForInverseForeignKey("fk_order_rows", entityModel));
         // fk_category_events
         assertEquals("events", namingStrategy.getPropertyNameForInverseForeignKey("fk_category_events", entityModel));
     }
-    
+
     @Test
-    public void GetPropertyNameForForeignKey() {
+    public void getPropertyNameForForeignKey() {
         assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("fk_superior", entityModel));
-        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("FK_SUPERIOR", entityModel));   
+        assertEquals("superiorFk", namingStrategy.getPropertyNameForForeignKey("FK_SUPERIOR", entityModel));
         // fk_order_rows
         assertEquals("order", namingStrategy.getPropertyNameForForeignKey("fk_order_rows", entityModel));
         // fk_category_events
         assertEquals("category", namingStrategy.getPropertyNameForForeignKey("fk_category_events", entityModel));
     }
-    
+
     @Test
-    public void GetPropertyNameForPrimaryKey() {
+    public void getPropertyNameForPrimaryKey() {
         assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("pk_superior", entityModel));
-        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("PK_SUPERIOR", entityModel));        
+        assertEquals("superiorPk", namingStrategy.getPropertyNameForPrimaryKey("PK_SUPERIOR", entityModel));
     }
-    
+
     @Test
-    public void GetDefaultVariableName() {
+    public void getDefaultVariableName() {
         assertEquals("object", namingStrategy.getDefaultVariableName(entityModel));
     }
-    
+
 }
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java
new file mode 100644
index 0000000000..ab61daef10
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.sql.AbstractJDBCTest;
+import com.querydsl.sql.codegen.support.ForeignKeyData;
+import com.querydsl.sql.codegen.support.InverseForeignKeyData;
+import com.querydsl.sql.codegen.support.PrimaryKeyData;
+
+
+public class KeyDataFactoryTest extends AbstractJDBCTest {
+
+    @Test
+    public void test() throws SQLException {
+        statement.execute("drop table employee if exists");
+        statement.execute("drop table survey if exists");
+        statement.execute("drop table date_test if exists");
+        statement.execute("drop table date_time_test if exists");
+
+        statement.execute("create table survey (id int, name varchar(30), "
+                + "CONSTRAINT PK_survey PRIMARY KEY (id, name))");
+
+        statement.execute("create table employee("
+                + "id INT, "
+                + "superior_id int, "
+                + "superior_id2 int, "
+                + "survey_id int, "
+                + "survey_name varchar(30), "
+                + "CONSTRAINT PK_employee PRIMARY KEY (id), "
+                + "CONSTRAINT FK_survey FOREIGN KEY (survey_id, survey_name) REFERENCES survey(id,name), "
+                + "CONSTRAINT FK_superior2 FOREIGN KEY (superior_id) REFERENCES employee(id), "
+                + "CONSTRAINT FK_superior1 FOREIGN KEY (superior_id2) REFERENCES employee(id))");
+
+        KeyDataFactory keyDataFactory = new KeyDataFactory(new DefaultNamingStrategy(), "Q","","test", false);
+
+        DatabaseMetaData md = connection.getMetaData();
+
+        // EMPLOYEE
+
+        // primary key
+        Map<String, PrimaryKeyData> primaryKeys = keyDataFactory.getPrimaryKeys(md, null, null, "EMPLOYEE");
+        assertFalse(primaryKeys.isEmpty());
+        // inverse foreign keys sorted in abc
+        Map<String, InverseForeignKeyData> exportedKeys = keyDataFactory.getExportedKeys(md, null, null, "EMPLOYEE");
+        assertEquals(2, exportedKeys.size());
+        Iterator<String> exportedKeysIterator = exportedKeys.keySet().iterator();
+        assertEquals("FK_SUPERIOR1", exportedKeysIterator.next());
+        assertEquals("FK_SUPERIOR2", exportedKeysIterator.next());
+        // foreign keys sorted in abc
+        Map<String, ForeignKeyData> importedKeys = keyDataFactory.getImportedKeys(md, null, null, "EMPLOYEE");
+        assertEquals(3, importedKeys.size());
+        Iterator<String> importedKeysIterator = importedKeys.keySet().iterator();
+        assertEquals("FK_SUPERIOR1", importedKeysIterator.next());
+        assertEquals("FK_SUPERIOR2", importedKeysIterator.next());
+        assertEquals("FK_SURVEY", importedKeysIterator.next());
+
+        // SURVEY
+
+        // primary key
+        primaryKeys = keyDataFactory.getPrimaryKeys(md, null, null, "SURVEY");
+        assertFalse(primaryKeys.isEmpty());
+        // inverse foreign keys
+        exportedKeys = keyDataFactory.getExportedKeys(md, null, null, "SURVEY");
+        assertFalse(exportedKeys.isEmpty());
+        assertTrue(exportedKeys.containsKey("FK_SURVEY"));
+        // foreign keys
+        importedKeys = keyDataFactory.getImportedKeys(md, null, null, "SURVEY");
+        assertTrue(importedKeys.isEmpty());
+
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java
new file mode 100644
index 0000000000..2fa1421e1d
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java
@@ -0,0 +1,162 @@
+package com.querydsl.sql.codegen;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.tools.JavaCompiler;
+
+import org.junit.*;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.core.testutil.Parallelized;
+import com.querydsl.core.testutil.SlowTest;
+
+@RunWith(value = Parallelized.class)
+@Category(SlowTest.class)
+public class MetaDataExporterAllTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    private static Connection connection;
+    private static DatabaseMetaData metadata;
+    private static JavaCompiler compiler = new SimpleCompiler();
+
+    private String namePrefix, nameSuffix, beanPrefix, beanSuffix;
+    private String beanPackageName;
+    private BeanSerializer beanSerializer = new BeanSerializer();
+    private NamingStrategy namingStrategy;
+    private boolean withBeans, withInnerClasses, withOrdinalPositioning;
+    private boolean exportColumns, schemaToPackage;
+
+    @BeforeClass
+    public static void setUpClass() throws ClassNotFoundException, SQLException {
+        Class.forName("org.h2.Driver");
+        String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
+        connection = DriverManager.getConnection(url, "sa", "");
+        metadata = connection.getMetaData();
+        MetaDataExporterTest.createTables(connection);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws SQLException {
+        connection.close();
+    }
+
+    @Parameterized.Parameters
+    public static List<Object[]> parameters() {
+        List<Object[]> params = new ArrayList<>();
+
+        List<NamingStrategy> ns = Arrays.<NamingStrategy>asList(
+                new DefaultNamingStrategy(), new OriginalNamingStrategy());
+        List<String> prefixOrSuffix = Arrays.asList("", "Q");
+        List<String> beanPackage = Arrays.asList(null, "test2");
+        List<Boolean> booleans = Arrays.asList(true, false);
+
+        for (String namePrefix : prefixOrSuffix) {
+            for (String nameSuffix : prefixOrSuffix) {
+                for (String beanPrefix : prefixOrSuffix) {
+                    for (String beanSuffix : prefixOrSuffix) {
+                        for (String beanPackageName : beanPackage) {
+                            for (NamingStrategy namingStrategy : ns) {
+                                for (boolean withBeans : booleans) {
+                                    for (boolean withInnerClasses : booleans) {
+                                        for (boolean withOrdinalPositioning : booleans) {
+                                            for (boolean exportColumns : booleans) {
+                                                for (boolean schemaToPackage : booleans) {
+                                                    if (withBeans && beanPackageName == null) {
+                                                        if (Objects.equals(namePrefix, beanPrefix) && Objects.equals(nameSuffix, beanSuffix)) {
+                                                            continue;
+                                                        }
+                                                    }
+
+                                                    if (withInnerClasses && withOrdinalPositioning) {
+                                                        continue;
+                                                    }
+
+                                                    params.add(new Object[]{namePrefix, nameSuffix, beanPrefix,
+                                                            beanSuffix, beanPackageName,
+                                                            namingStrategy,
+                                                            withBeans, withInnerClasses,
+                                                            withOrdinalPositioning, exportColumns,
+                                                            schemaToPackage});
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return params;
+    }
+
+    public MetaDataExporterAllTest(String namePrefix, String nameSuffix, String beanPrefix,
+                                   String beanSuffix, String beanPackageName,
+                                   NamingStrategy namingStrategy,
+                                   boolean withBeans, boolean withInnerClasses,
+                                   boolean withOrdinalPositioning, boolean exportColumns,
+                                   boolean schemaToPackage) {
+        this.namePrefix = namePrefix;
+        this.nameSuffix = nameSuffix;
+        this.beanPrefix = beanPrefix;
+        this.beanSuffix = beanSuffix;
+        this.beanPackageName = beanPackageName;
+        this.schemaToPackage = schemaToPackage;
+        this.namingStrategy = namingStrategy;
+        this.withBeans = withBeans;
+        this.withInnerClasses = withInnerClasses;
+        this.withOrdinalPositioning = withOrdinalPositioning;
+        this.exportColumns = exportColumns;
+    }
+
+    @Test
+    public void export() throws SQLException, IOException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setColumnAnnotations(exportColumns);
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setNamePrefix(namePrefix);
+        exporter.setNameSuffix(nameSuffix);
+        exporter.setBeanPrefix(beanPrefix);
+        exporter.setBeanSuffix(beanSuffix);
+        exporter.setInnerClassesForKeys(withInnerClasses);
+        exporter.setPackageName("test");
+        exporter.setBeanPackageName(beanPackageName);
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.setSchemaToPackage(schemaToPackage);
+        if (withBeans) {
+            exporter.setBeanSerializer(beanSerializer);
+        }
+        if (withOrdinalPositioning) {
+            exporter.setColumnComparatorClass(OrdinalPositionComparator.class);
+        }
+
+        exporter.export(metadata);
+
+        Set<String> classes = exporter.getClasses();
+        int compilationResult = compiler.run(null, System.out, System.err,
+                classes.toArray(new String[0]));
+        if (compilationResult != 0) {
+            Assert.fail("Compilation Failed for " + folder.getRoot().getPath());
+        }
+
+    }
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java
new file mode 100644
index 0000000000..e69ab14aeb
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java
@@ -0,0 +1,461 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.*;
+import java.util.Set;
+
+import javax.tools.JavaCompiler;
+import javax.validation.constraints.NotNull;
+
+import com.querydsl.core.util.ReflectionUtils;
+import com.querydsl.sql.Connections;
+import org.junit.*;
+import org.junit.rules.TemporaryFolder;
+
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.core.util.FileUtils;
+
+public class MetaDataExporterTest {
+
+    private static Connection connection;
+
+    private boolean clean = true;
+
+    private boolean exportColumns = false;
+
+    private boolean schemaToPackage = false;
+
+    private DatabaseMetaData metadata;
+
+    private JavaCompiler compiler = new SimpleCompiler();
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @BeforeClass
+    public static void setUpClass() throws ClassNotFoundException, SQLException {
+        Class.forName("org.h2.Driver");
+        String url = "jdbc:h2:mem:testdb" + System.currentTimeMillis();
+        connection = DriverManager.getConnection(url, "sa", "");
+        createTables(connection);
+    }
+
+    static void createTables(Connection connection) throws SQLException {
+
+        try (Statement stmt = connection.createStatement()) {
+            // reserved words
+            stmt.execute("create table reserved (id int, while int)");
+
+            stmt.execute("create table class (id int)");
+
+            // underscore
+            stmt.execute("create table underscore (e_id int, c_id int)");
+
+            // bean generation
+            stmt.execute("create table beangen1 (\"SEP_Order\" int)");
+
+            // default instance clash
+            stmt.execute("create table definstance (id int, definstance int, definstance1 int)");
+
+            // class with pk and fk classes
+            stmt.execute("create table pkfk (id int primary key, pk int, fk int)");
+
+            // camel case
+            stmt.execute("create table \"camelCase\" (id int)");
+            stmt.execute("create table \"vwServiceName\" (id int)");
+
+            // simple types
+            stmt.execute("create table date_test (d date)");
+            stmt.execute("create table date_time_test (dt datetime)");
+
+            // complex type
+            stmt.execute("create table survey (id int, name varchar(30))");
+
+            // new line
+            stmt.execute("create table \"new\nline\" (id int)");
+
+            stmt.execute("create table newline2 (id int, \"new\nline\" int)");
+
+            stmt.execute("create table employee("
+                    + "id INT, "
+                    + "firstname VARCHAR(50), "
+                    + "lastname VARCHAR(50), "
+                    + "salary DECIMAL(10, 2), "
+                    + "datefield DATE, "
+                    + "timefield TIME, "
+                    + "superior_id int, "
+                    + "survey_id int, "
+                    + "survey_name varchar(30), "
+                    + "CONSTRAINT PK_employee PRIMARY KEY (id), "
+                    + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");
+
+            // multi key
+            stmt.execute("create table multikey(id INT, id2 VARCHAR, id3 INT, CONSTRAINT pk_multikey PRIMARY KEY (id, id2, id3) )");
+
+            //  M_PRODUCT_BOM_ID
+            stmt.execute("create table product(id int, "
+                    + "m_product_bom_id int, "
+                    + "m_productbom_id int, "
+                    + "constraint product_bom foreign key (m_productbom_id) references product(id))");
+        }
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws SQLException {
+        connection.close();
+    }
+
+    @Before
+    public void setUp() throws ClassNotFoundException, SQLException {
+        metadata = connection.getMetaData();
+    }
+
+
+    private static final NamingStrategy defaultNaming = new DefaultNamingStrategy();
+
+    private static final NamingStrategy originalNaming = new OriginalNamingStrategy();
+
+    private String beanPackageName = null;
+
+    @Test
+    public void normalSettings_repetition() throws SQLException {
+        test("Q", "", "", "", defaultNaming, folder.getRoot(), false, false, false);
+
+        File file = new File(folder.getRoot(), "test/QEmployee.java");
+        long lastModified = file.lastModified();
+        assertTrue(file.exists());
+
+        clean = false;
+        test("Q", "", "", "", defaultNaming, folder.getRoot(), false, false, false);
+        assertEquals(lastModified, file.lastModified());
+    }
+
+    @Test
+    public void explicit_configuration() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setCatalogPattern("%TESTDB%");
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setNamePrefix("Q");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(new DefaultNamingStrategy());
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setBeanPackageName("test2");
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QDateTest.java").exists());
+        assertTrue(new File(folder.getRoot(), "test2/DateTest.java").exists());
+    }
+
+
+    @Test
+    public void validation_annotations_are_not_added_to_columns_with_default_values() throws SQLException, ClassNotFoundException, MalformedURLException {
+        Statement stmt = connection.createStatement();
+        stmt.execute("CREATE TABLE foo ("
+                + "id INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,"
+                + "name VARCHAR(255) NOT NULL DEFAULT 'some default')");
+
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setNamePrefix("Q");
+        exporter.setPackageName("test");
+        exporter.setTableNamePattern("FOO");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setValidationAnnotations(true);
+        exporter.export(metadata);
+
+        URLClassLoader classLoader = URLClassLoader.newInstance(new URL[] {folder.getRoot().toURI().toURL()});
+        compiler.run(null, null, null, folder.getRoot().getAbsoluteFile()  + "/test/Foo.java");
+        Class<?> cls = Class.forName("test.Foo", true, classLoader);
+        assertThat(ReflectionUtils.getAnnotatedElement(cls, "id", Integer.class).getAnnotation(NotNull.class), is(nullValue()));
+        assertThat(ReflectionUtils.getAnnotatedElement(cls, "name", String.class).getAnnotation(NotNull.class), is(nullValue()));
+
+        stmt.execute("DROP TABLE foo");
+    }
+
+    @Test
+    public void validation_annotations_are_added_to_columns_without_default_values() throws SQLException, ClassNotFoundException, MalformedURLException {
+        Statement stmt = connection.createStatement();
+        stmt.execute("CREATE TABLE bar ("
+                + "id VARCHAR(10) PRIMARY KEY NOT NULL,"
+                + "name VARCHAR(255) NOT NULL)");
+
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setNamePrefix("Q");
+        exporter.setPackageName("test");
+        exporter.setTableNamePattern("BAR");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setValidationAnnotations(true);
+        exporter.export(metadata);
+
+        URLClassLoader classLoader = URLClassLoader.newInstance(new URL[] {folder.getRoot().toURI().toURL()});
+        compiler.run(null, null, null, folder.getRoot().getAbsoluteFile()  + "/test/Bar.java");
+        Class<?> cls = Class.forName("test.Bar", true, classLoader);
+        assertThat(ReflectionUtils.getAnnotatedElement(cls, "id", Integer.class).getAnnotation(NotNull.class), is(notNullValue()));
+        assertThat(ReflectionUtils.getAnnotatedElement(cls, "name", String.class).getAnnotation(NotNull.class), is(notNullValue()));
+
+        stmt.execute("DROP TABLE bar");
+    }
+
+    @Test
+    public void minimal_configuration() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QDateTest.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_schemas() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC2,PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QDateTest.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_schemas_and_tables() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC2,PUBLIC");
+        exporter.setTableNamePattern("RESERVED,UNDERSCORE,BEANGEN1");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QBeangen1.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QReserved.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QUnderscore.java").exists());
+        assertFalse(new File(folder.getRoot(), "test/QDefinstance.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_tables() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setTableNamePattern("RESERVED,UNDERSCORE,BEANGEN1");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QBeangen1.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QReserved.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QUnderscore.java").exists());
+        assertFalse(new File(folder.getRoot(), "test/QDefinstance.java").exists());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void minimal_configuration_with_duplicate_tables() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setTableNamePattern("%,%");
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/QBeangen1.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QReserved.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/QUnderscore.java").exists());
+        assertFalse(new File(folder.getRoot(), "test/QDefinstance.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_suffix() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setNameSuffix("Type");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTestType.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_without_keys() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setNameSuffix("Type");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setExportForeignKeys(false);
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTestType.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_only_direct_foreign_keys() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setNameSuffix("Type");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setExportInverseForeignKeys(false);
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTestType.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_bean_prefix() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setBeanPrefix("Bean");
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTest.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/BeanDateTest.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_bean_suffix() throws SQLException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setBeanSuffix("Bean");
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTest.java").exists());
+        assertTrue(new File(folder.getRoot(), "test/DateTestBean.java").exists());
+    }
+
+    @Test
+    public void minimal_configuration_with_bean_folder() throws SQLException, IOException {
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setPackageName("test");
+        exporter.setNamePrefix("");
+        exporter.setBeanSuffix("Bean");
+        exporter.setBeanSerializer(new BeanSerializer());
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setBeansTargetFolder(folder.newFolder("beans"));
+        exporter.export(metadata);
+
+        assertTrue(new File(folder.getRoot(), "test/DateTest.java").exists());
+        assertTrue(new File(folder.getRoot(), "beans/test/DateTestBean.java").exists());
+    }
+
+    @Test
+    public void catalog_pattern() throws SQLException, IOException, ClassNotFoundException {
+        Connections.initMySQL();
+        Connection connection = Connections.getConnection();
+        Statement stmt = Connections.getStatement();
+        try {
+            stmt.execute("CREATE DATABASE IF NOT EXISTS catalog_test_one");
+            stmt.execute("CREATE TABLE IF NOT EXISTS catalog_test_one.test_catalog_table_one(id INT PRIMARY KEY, foo VARCHAR(32) NOT NULL)");
+            stmt.execute("CREATE DATABASE IF NOT EXISTS catalog_test_two");
+            stmt.execute("CREATE TABLE IF NOT EXISTS catalog_test_two.test_catalog_table_two(id INT PRIMARY KEY, foo VARCHAR(32) NOT NULL)");
+
+            MetaDataExporter exporter = new MetaDataExporter();
+            exporter.setSchemaPattern("PUBLIC");
+            exporter.setCatalogPattern("catalog_test_one");
+            exporter.setPackageName("test");
+            exporter.setNamePrefix("");
+            exporter.setBeanSuffix("Bean");
+            exporter.setBeanSerializer(new BeanSerializer());
+            exporter.setTargetFolder(folder.getRoot());
+            exporter.setBeansTargetFolder(folder.newFolder("beans"));
+
+            exporter.export(connection.getMetaData());
+            assertTrue(new File(folder.getRoot(), "test/TestCatalogTableOne.java").exists());
+            assertTrue(new File(folder.getRoot(), "beans/test/TestCatalogTableOneBean.java").exists());
+
+            assertFalse(new File(folder.getRoot(), "test/TestCatalogTableTwo.java").exists());
+            assertFalse(new File(folder.getRoot(), "beans/test/TestCatalogTableTwoBean.java").exists());
+
+            exporter.setCatalogPattern("catalog_test_two");
+            exporter.export(connection.getMetaData());
+
+            assertTrue(new File(folder.getRoot(), "test/TestCatalogTableTwo.java").exists());
+            assertTrue(new File(folder.getRoot(), "beans/test/TestCatalogTableTwoBean.java").exists());
+        } finally {
+            stmt.execute("DROP DATABASE IF EXISTS catalog_test_one");
+            stmt.execute("DROP DATABASE IF EXISTS catalog_test_two");
+            stmt.close();
+            Connections.close();
+        }
+    }
+
+    private void test(String namePrefix, String nameSuffix, String beanPrefix, String beanSuffix,
+            NamingStrategy namingStrategy, File targetDir, boolean withBeans,
+            boolean withInnerClasses, boolean withOrdinalPositioning) throws SQLException {
+        if (clean) {
+            try {
+                if (targetDir.exists()) {
+                    FileUtils.delete(targetDir);
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setColumnAnnotations(exportColumns);
+        exporter.setSchemaPattern("PUBLIC");
+        exporter.setNamePrefix(namePrefix);
+        exporter.setNameSuffix(nameSuffix);
+        exporter.setBeanPrefix(beanPrefix);
+        exporter.setBeanSuffix(beanSuffix);
+        exporter.setInnerClassesForKeys(withInnerClasses);
+        exporter.setPackageName("test");
+        exporter.setBeanPackageName(beanPackageName);
+        exporter.setTargetFolder(targetDir);
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.setSchemaToPackage(schemaToPackage);
+        if (withBeans) {
+            exporter.setBeanSerializer(new BeanSerializer());
+        }
+        if (withOrdinalPositioning) {
+            exporter.setColumnComparatorClass(OrdinalPositionComparator.class);
+        }
+        exporter.export(metadata);
+
+        Set<String> classes = exporter.getClasses();
+        int compilationResult = compiler.run(null, System.out, System.err,
+                classes.toArray(new String[0]));
+        if (compilationResult != 0) {
+            Assert.fail("Compilation Failed for " + targetDir.getAbsolutePath());
+        }
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java
new file mode 100644
index 0000000000..ccac7252d1
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Arrays.asList;
+import static org.hamcrest.Matchers.stringContainsInOrder;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Set;
+
+import javax.tools.JavaCompiler;
+
+import com.querydsl.codegen.GeneratedAnnotationResolver;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.querydsl.codegen.utils.SimpleCompiler;
+import com.querydsl.codegen.BeanSerializer;
+import com.querydsl.sql.AbstractJDBCTest;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.types.AbstractType;
+
+public class MetaDataSerializerTest extends AbstractJDBCTest {
+    public static class CustomNumber { }
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Override
+    @Before
+    public void setUp() throws SQLException, ClassNotFoundException {
+        super.setUp();
+        statement.execute("drop table employee if exists");
+        statement.execute("drop table survey if exists");
+        statement.execute("drop table date_test if exists");
+        statement.execute("drop table date_time_test if exists");
+        statement.execute("drop table spaces if exists");
+
+        // survey
+        statement.execute("create table survey (id int, name varchar(30), "
+                + "CONSTRAINT PK_survey PRIMARY KEY (id, name))");
+
+        // date_test
+        statement.execute("create table date_test (d date)");
+
+        // date_time
+        statement.execute("create table date_time_test (dt datetime)");
+
+        // spaces
+        statement.execute("create table spaces (\"spaces  \n 1\" date)");
+
+        // employee
+        statement.execute("create table employee("
+                + "id INT, "
+                + "firstname VARCHAR(50), "
+                + "lastname VARCHAR(50), "
+                + "salary DECIMAL(10, 2), "
+                + "datefield DATE, "
+                + "timefield TIME, "
+                + "superior_id int, "
+                + "survey_id int, "
+                + "\"123abc\" int,"
+                + "survey_name varchar(30), "
+                + "CONSTRAINT PK_employee PRIMARY KEY (id), "
+                + "CONSTRAINT FK_survey FOREIGN KEY (survey_id, survey_name) REFERENCES survey(id,name), "
+                + "CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))");
+    }
+
+    @Test
+    public void normal_serialization() throws SQLException {
+        String namePrefix = "Q";
+        NamingStrategy namingStrategy = new DefaultNamingStrategy();
+        // customization of serialization
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setBeanSerializerClass(BeanSerializer.class);
+        exporter.setNamePrefix(namePrefix);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.export(connection.getMetaData());
+
+        compile(exporter);
+
+        // validation of output
+        try {
+            //
+            assertFileContainsInOrder("test/QSurvey.java",
+                    String.format("import %s;", GeneratedAnnotationResolver.resolveDefault().getName()),
+                    "@Generated(\"com.querydsl.sql.codegen.MetaDataSerializer\")\npublic class QSurvey",
+                    // variable + schema constructor
+                    "    public QSurvey(String variable, String schema) {\n"
+                    + "        super(Survey.class, forVariable(variable), schema, \"SURVEY\");\n"
+                    + "        addMetadata();\n"
+                    + "    }"
+            );
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @Test
+    public void customized_serialization() throws SQLException {
+        String namePrefix = "Q";
+        Configuration conf = new Configuration(SQLTemplates.DEFAULT);
+        conf.register("EMPLOYEE", "ID", new AbstractType<CustomNumber>(0) {
+            @Override
+            public Class<CustomNumber> getReturnedClass() {
+                return CustomNumber.class;
+            }
+
+            @Override
+            public CustomNumber getValue(ResultSet rs, int startIndex) throws SQLException {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void setValue(PreparedStatement st, int startIndex, CustomNumber value) throws SQLException {
+                throw new UnsupportedOperationException();
+            }
+        });
+        NamingStrategy namingStrategy = new DefaultNamingStrategy();
+        // customization of serialization
+        MetaDataExporter exporter = new MetaDataExporter();
+        exporter.setBeanSerializerClass(BeanSerializer.class);
+        exporter.setNamePrefix(namePrefix);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder(folder.getRoot());
+        exporter.setNamingStrategy(namingStrategy);
+        exporter.setConfiguration(conf);
+        exporter.setGeneratedAnnotationClass("com.querydsl.core.annotations.Generated");
+        exporter.export(connection.getMetaData());
+
+        compile(exporter);
+
+        // validation of output
+        try {
+            //
+            assertFileContainsInOrder("test/QSurvey.java",
+                    "import com.querydsl.core.annotations.Generated;",
+                    "@Generated(\"com.querydsl.sql.codegen.MetaDataSerializer\")\npublic class QSurvey",
+                    // variable + schema constructor
+                    "    public QSurvey(String variable, String schema) {\n"
+                    + "        super(Survey.class, forVariable(variable), schema, \"SURVEY\");\n"
+                    + "        addMetadata();\n"
+                    + "    }"
+            );
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private void compile(MetaDataExporter exporter) {
+        JavaCompiler compiler = new SimpleCompiler();
+        Set<String> classes = exporter.getClasses();
+        int compilationResult = compiler.run(null, null, null, classes.toArray(new String[0]));
+        if (compilationResult == 0) {
+            System.out.println("Compilation is successful");
+        } else {
+            Assert.fail("Compilation Failed");
+        }
+    }
+
+    private void assertFileContainsInOrder(String path, String... methods) throws IOException {
+        String content = new String(Files.readAllBytes(folder.getRoot().toPath().resolve(path)), UTF_8);
+        assertThat(content, stringContainsInOrder(asList(methods)));
+    }
+
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java
similarity index 76%
rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java
rename to querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java
index 8e3cff26e5..8fd2c56b4e 100644
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,31 +11,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.codegen.model.SimpleType;
-import com.mysema.codegen.model.Type;
-import com.mysema.codegen.model.TypeCategory;
-import com.mysema.query.codegen.EntityType;
-import com.mysema.query.sql.codegen.DefaultNamingStrategy;
-import com.mysema.query.sql.codegen.NamingStrategy;
+import com.querydsl.codegen.utils.model.SimpleType;
+import com.querydsl.codegen.utils.model.Type;
+import com.querydsl.codegen.utils.model.TypeCategory;
+import com.querydsl.codegen.EntityType;
 
 public class MetaDataTest {
-    
+
     private EntityType classModel;
-    
+
     @Before
     public void setUp() {
         NamingStrategy namingStrategy = new DefaultNamingStrategy();
         String packageName = "com.myproject.domain";
         String tableName = "vwServiceName";
         String className = namingStrategy.getClassName(tableName);
-        
+
         Type classTypeModel = new SimpleType(TypeCategory.ENTITY, packageName + "." + className, packageName, className, false, false);
         classModel = new EntityType(classTypeModel);
 //        classModel.addAnnotation(new TableImpl(namingStrategy.normalizeTableName(tableName)));
@@ -43,13 +41,13 @@ public void setUp() {
     }
 
     @Test
-    public void GetSimpleName() {                
-        assertEquals("VwServiceName", classModel.getSimpleName());        
+    public void getSimpleName() {
+        assertEquals("VwServiceName", classModel.getSimpleName());
     }
-    
+
     @Test
-    public void GetFullName() {
+    public void getFullName() {
         assertEquals("com.myproject.domain.VwServiceName", classModel.getFullName());
     }
-    
+
 }
diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java
similarity index 84%
rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java
rename to querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java
index 14fdcc70dc..3db64f05e2 100644
--- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.codegen;
+package com.querydsl.sql.codegen;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.codegen.model.Types;
-import com.mysema.query.codegen.EntityType;
+import com.querydsl.codegen.utils.model.Types;
+import com.querydsl.codegen.EntityType;
 
 public class OriginalNamingStrategyTest {
 
@@ -35,7 +35,7 @@ public void setUp() {
     }
 
     @Test
-    public void GetClassName() {
+    public void getClassName() {
         assertEquals("user_data", namingStrategy.getClassName("user_data"));
         assertEquals("u", namingStrategy.getClassName("u"));
         assertEquals("us",namingStrategy.getClassName("us"));
@@ -46,7 +46,7 @@ public void GetClassName() {
     }
 
     @Test
-    public void GetPropertyName() {
+    public void getPropertyName() {
         assertEquals("while_col", namingStrategy.getPropertyName("while", entityModel));
         assertEquals("name", namingStrategy.getPropertyName("name", entityModel));
         assertEquals("user_id", namingStrategy.getPropertyName("user_id", entityModel));
@@ -61,24 +61,24 @@ public void GetPropertyName() {
     }
 
     @Test
-    public void GetPropertyName_With_Dashes() {
-        assertEquals("A_FOOBAR", namingStrategy.getPropertyName("A-FOOBAR" , entityModel));
-        assertEquals("A_FOOBAR", namingStrategy.getPropertyName("A_FOOBAR" , entityModel));
+    public void getPropertyName_with_dashes() {
+        assertEquals("A_FOOBAR", namingStrategy.getPropertyName("A-FOOBAR", entityModel));
+        assertEquals("A_FOOBAR", namingStrategy.getPropertyName("A_FOOBAR", entityModel));
     }
 
     @Test
-    public void GetPropertyNameForInverseForeignKey() {
+    public void getPropertyNameForInverseForeignKey() {
         assertEquals("_fk_superior", namingStrategy.getPropertyNameForInverseForeignKey("fk_superior", entityModel));
     }
 
     @Test
-    public void GetPropertyNameForForeignKey() {
+    public void getPropertyNameForForeignKey() {
         assertEquals("fk_superior", namingStrategy.getPropertyNameForForeignKey("fk_superior", entityModel));
         assertEquals("FK_SUPERIOR", namingStrategy.getPropertyNameForForeignKey("FK_SUPERIOR", entityModel));
     }
 
     @Test
-    public void GetDefaultVariableName() {
+    public void getDefaultVariableName() {
         assertEquals("OBJECT", namingStrategy.getDefaultVariableName(entityModel));
     }
 }
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java
new file mode 100644
index 0000000000..404b62ebda
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.codegen.ant;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class AntMetaDataExporterTest {
+
+    private static final String url = "jdbc:h2:./target/dbs/h2_AntMetaDataExporterTest";
+
+    @BeforeClass
+    public static void setUp() throws SQLException {
+        try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute("drop table test if exists");
+                stmt.execute("create table test (id int)");
+            }
+        }
+    }
+
+    @Test
+    public void execute() {
+        AntMetaDataExporter exporter = new AntMetaDataExporter();
+        exporter.setJdbcDriver("org.h2.Driver");
+        exporter.setJdbcUser("sa");
+        exporter.setJdbcUrl(url);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder("target/AntMetaDataExporterTest");
+        exporter.execute();
+
+        assertTrue(new File("target/AntMetaDataExporterTest").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest/test/QTest.java").exists());
+    }
+
+    @Test
+    public void execute_with_beans() {
+        AntMetaDataExporter exporter = new AntMetaDataExporter();
+        exporter.setJdbcDriver("org.h2.Driver");
+        exporter.setJdbcUser("sa");
+        exporter.setJdbcUrl(url);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder("target/AntMetaDataExporterTest2");
+        exporter.setExportBeans(true);
+        exporter.setNamePrefix("Q");
+        exporter.setNameSuffix("");
+        exporter.setBeanPrefix("");
+        exporter.setBeanSuffix("Bean");
+        exporter.execute();
+
+        assertTrue(new File("target/AntMetaDataExporterTest2").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest2/test/QTest.java").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest2/test/TestBean.java").exists());
+    }
+
+
+    @Test
+    public void execute_with_import() {
+        AntMetaDataExporter exporter = new AntMetaDataExporter();
+        exporter.setJdbcDriver("org.h2.Driver");
+        exporter.setJdbcUser("sa");
+        exporter.setJdbcUrl(url);
+        exporter.setPackageName("test");
+        exporter.setTargetFolder("target/AntMetaDataExporterTest3");
+        exporter.setExportBeans(true);
+        exporter.setNamePrefix("Q");
+        exporter.setNameSuffix("");
+        exporter.setBeanPrefix("");
+        exporter.setBeanSuffix("Bean");
+        exporter.setImports(new String[]{"com.pck1", "com.pck2", "com.Q1", "com.Q2"});
+        exporter.execute();
+
+        assertTrue(new File("target/AntMetaDataExporterTest3").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest3/test/QTest.java").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest3/test/TestBean.java").exists());
+    }
+
+    @Test
+    public void execute_inside_ant() {
+        File buildFile = new File(getClass().getResource("/build.xml").getFile());
+        Project p = new Project();
+        p.setUserProperty("ant.file", buildFile.getAbsolutePath());
+        p.init();
+        ProjectHelper helper = ProjectHelper.getProjectHelper();
+        p.addReference("ant.projectHelper", helper);
+        helper.parse(p, buildFile);
+        p.executeTarget(p.getDefaultTarget());
+
+        assertTrue(new File("target/AntMetaDataExporterTest4").exists());
+        assertTrue(new File("target/AntMetaDataExporterTest4/test/QTest.java").exists());
+    }
+}
diff --git a/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java
new file mode 100644
index 0000000000..1a56d11e78
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java
@@ -0,0 +1,112 @@
+package com.querydsl.sql.codegen.support;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.SchemaAndTable;
+
+public class RenameMappingTest {
+
+    private RenameMapping mapping = new RenameMapping();
+    private Configuration configuration = new Configuration(SQLTemplates.DEFAULT);
+
+    // to schema
+
+    @Test
+    public void schemaToSchema() {
+        mapping.setFromSchema("ABC");
+        mapping.setToSchema("DEF");
+        mapping.apply(configuration);
+
+        assertEquals(
+                new SchemaAndTable("DEF", "TABLE"),
+                configuration.getOverride(new SchemaAndTable("ABC", "TABLE")));
+        assertEquals(
+                new SchemaAndTable("ABCD", "TABLE"),
+                configuration.getOverride(new SchemaAndTable("ABCD", "TABLE")));
+
+    }
+
+    // to table
+
+    @Test
+    public void tableToTable() {
+        mapping.setFromTable("TABLE1");
+        mapping.setToTable("TABLE2");
+        mapping.apply(configuration);
+
+        assertEquals(
+                new SchemaAndTable("DEF", "TABLE2"),
+                configuration.getOverride(new SchemaAndTable("DEF", "TABLE1")));
+        assertEquals(
+                new SchemaAndTable("DEF", "TABLE3"),
+                configuration.getOverride(new SchemaAndTable("DEF", "TABLE3")));
+    }
+
+    @Test
+    public void schemaTableToTable() {
+        mapping.setFromSchema("ABC");
+        mapping.setFromTable("TABLE1");
+        mapping.setToTable("TABLE2");
+        mapping.apply(configuration);
+
+        assertEquals(
+                new SchemaAndTable("ABC", "TABLE2"),
+                configuration.getOverride(new SchemaAndTable("ABC", "TABLE1")));
+        assertEquals(
+                new SchemaAndTable("DEF", "TABLE1"),
+                configuration.getOverride(new SchemaAndTable("DEF", "TABLE1")));
+    }
+
+    @Test
+    public void schemaTableToSchemaTable() {
+        mapping.setFromSchema("ABC");
+        mapping.setFromTable("TABLE1");
+        mapping.setToSchema("ABC");
+        mapping.setToTable("TABLE2");
+        mapping.apply(configuration);
+
+        assertEquals(
+                new SchemaAndTable("ABC", "TABLE2"),
+                configuration.getOverride(new SchemaAndTable("ABC", "TABLE1")));
+        assertEquals(
+                new SchemaAndTable("DEF", "TABLE1"),
+                configuration.getOverride(new SchemaAndTable("DEF", "TABLE1")));
+    }
+
+    // to column
+
+    @Test
+    public void schemaTableColumnToColumn() {
+        mapping.setFromSchema("ABC");
+        mapping.setFromTable("TABLE1");
+        mapping.setFromColumn("COLUMN1");
+        mapping.setToColumn("COLUMN2");
+        mapping.apply(configuration);
+
+        assertEquals(
+                "COLUMN2",
+                configuration.getColumnOverride(new SchemaAndTable("ABC", "TABLE1"), "COLUMN1"));
+        assertEquals(
+                "COLUMN1",
+                configuration.getColumnOverride(new SchemaAndTable("DEF", "TABLE1"), "COLUMN1"));
+    }
+
+    @Test
+    public void tableColumnToColumn() {
+        mapping.setFromTable("TABLE1");
+        mapping.setFromColumn("COLUMN1");
+        mapping.setToColumn("COLUMN2");
+        mapping.apply(configuration);
+
+        assertEquals(
+                "COLUMN2",
+                configuration.getColumnOverride(new SchemaAndTable("ABC", "TABLE1"), "COLUMN1"));
+        assertEquals(
+                "COLUMN1",
+                configuration.getColumnOverride(new SchemaAndTable("ABC", "TABLE2"), "COLUMN1"));
+    }
+}
diff --git a/querydsl-sql-codegen/src/test/resources/build.xml b/querydsl-sql-codegen/src/test/resources/build.xml
new file mode 100644
index 0000000000..4adf02ffe4
--- /dev/null
+++ b/querydsl-sql-codegen/src/test/resources/build.xml
@@ -0,0 +1,15 @@
+<project name="testproject" default="codegen" basedir=".">
+
+  <taskdef name="codegen" classname="com.querydsl.sql.codegen.ant.AntMetaDataExporter"/>
+
+  <target name="codegen">
+    <codegen
+      jdbcDriver="org.h2.Driver"
+      jdbcUser="sa"
+      jdbcUrl="jdbc:h2:./target/dbs/h2_AntMetaDataExporterTest"
+      packageName="test"
+      targetFolder="target/AntMetaDataExporterTest4">
+      <renameMapping fromSchema="PUBLIC" toSchema="PUB"/>
+    </codegen>
+  </target>
+</project>
\ No newline at end of file
diff --git a/querydsl-sql-codegen/template.mf b/querydsl-sql-codegen/template.mf
deleted file mode 100644
index 6e99f3ad61..0000000000
--- a/querydsl-sql-codegen/template.mf
+++ /dev/null
@@ -1,18 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.sql.codegen
-Bundle-Name: Querydsl SQL Codegen
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Import-Template:
-  com.mysema.codegen.*;version="${codegen.version}",
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",   
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",
-  javax.validation.*;version="1.0.0",
-  com.google.common.*;version="${guava.version}",
-  org.apache.tools.ant.*;version="${ant.version}",
-  org.joda.time.*;version="1.6",
-  org.geolatte.*;version="0.11",
-  org.slf4j.*;version="${slf4j.version}"
-  
\ No newline at end of file
diff --git a/querydsl-sql-spatial/pom.xml b/querydsl-sql-spatial/pom.xml
new file mode 100644
index 0000000000..1b8cec21a4
--- /dev/null
+++ b/querydsl-sql-spatial/pom.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql-spatial</artifactId>
+  <name>Querydsl - SQL Spatial support</name>
+  <description>SQL support for Querydsl</description>
+  <packaging>jar</packaging>
+
+  <properties>
+    <osgi.import.package>
+      org.joda.time.*;version="[1.6,3)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-codegen</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql-codegen</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-spatial</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- test -->
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cglib.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldb.version}</version>
+      <scope>test</scope>
+      <!-- license : TODO -->
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.db2</groupId>
+      <artifactId>jcc</artifactId>
+      <version>${db2.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>${mysql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>1.3.3</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
+      <version>${oracle.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>oracle</groupId>
+      <artifactId>sdoapi</artifactId>
+      <version>11.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>${mssql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.orbisgis</groupId>
+      <artifactId>h2gis</artifactId>
+      <version>${h2gis.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jts-core</artifactId>
+          <groupId>org.locationtech.jts</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.jinahya</groupId>
+      <artifactId>cubrid-jdbc-driver-${cubrid.version}</artifactId>
+      <version>1.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.firebirdsql.jdbc</groupId>
+      <artifactId>jaybird</artifactId>
+      <version>${firebird.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>${sqlite.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
+
+    <dependency>
+      <groupId>jdepend</groupId>
+      <artifactId>jdepend</artifactId>
+      <version>2.9.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- backwards compatibility -->
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>annotation-indexer</artifactId>
+      <version>1.2</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.sql.spatial</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>derby.stream.error.file</name>
+              <value>target/derby.log</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>teradata</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.teradata</groupId>
+          <artifactId>teradata-jdbc</artifactId>
+          <version>${teradata.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.teradata</groupId>
+          <artifactId>teradata-config</artifactId>
+          <version>${teradata.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>java-21</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>${cglib.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
+  <!--TODO upgrade dependencies and get rid of repositories and pluginRepositories -->
+  <repositories>
+    <repository>
+      <id>datanucleus</id>
+      <url>https://www.datanucleus.org/downloads/maven2</url>
+    </repository>
+  </repositories>
+
+</project>
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBTemplates.java
similarity index 75%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBTemplates.java
index ba3657e2d6..eaa504826b 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.SQLTemplates;
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLTemplates;
 
 /**
- * GeoDBTemplates is a spatial enabled SQL dialect for GeoDB
+ * {@code GeoDBTemplates} is a spatial enabled SQL dialect for GeoDB
  *
  * @author tiwe
  *
  */
 public class GeoDBTemplates extends H2Templates {
 
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final GeoDBTemplates DEFAULT = new GeoDBTemplates();
+
     public static Builder builder() {
         return new Builder() {
             @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBWkbType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBWkbType.java
similarity index 79%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBWkbType.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBWkbType.java
index c426aef753..d0a8735445 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBWkbType.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeoDBWkbType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import javax.annotation.Nullable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import com.mysema.query.sql.types.AbstractType;
+import org.jetbrains.annotations.Nullable;
+
 import org.geolatte.geom.ByteBuffer;
 import org.geolatte.geom.ByteOrder;
 import org.geolatte.geom.Geometry;
@@ -28,17 +28,15 @@
 import org.geolatte.geom.codec.WkbEncoder;
 import org.geolatte.geom.codec.Wkt;
 
-/**
- * @author tiwe
- *
- */
-public class GeoDBWkbType extends AbstractType<Geometry> {
+import com.querydsl.sql.types.AbstractType;
+
+class GeoDBWkbType extends AbstractType<Geometry> {
 
     public static final GeoDBWkbType DEFAULT = new GeoDBWkbType();
 
     private final ByteOrder byteOrder = ByteOrder.NDR;
 
-    public GeoDBWkbType() {
+    GeoDBWkbType() {
         super(Types.BLOB);
     }
 
@@ -59,7 +57,7 @@ public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
             } else {
                 wkb = bytes;
             }
-            WkbDecoder decoder = Wkb.newWkbDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
+            WkbDecoder decoder = Wkb.newDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
             return decoder.decode(ByteBuffer.from(wkb));
         } else {
             return null;
@@ -68,18 +66,18 @@ public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
 
     @Override
     public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        WkbEncoder encoder = Wkb.newWkbEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
+        WkbEncoder encoder = Wkb.newEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
         ByteBuffer buffer = encoder.encode(value, byteOrder);
         st.setBytes(startIndex, buffer.toByteArray());
     }
 
     @Override
     public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
         if (geometry.getSRID() > -1) {
             return "ST_GeomFromText('" + str + "', " + geometry.getSRID() + ")";
         } else {
-            return "ST_GeomFromText('" + str + "')";
+            return "ST_GeomFromText('" + str + "', -1)";
         }
     }
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWkbType.java
similarity index 77%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWkbType.java
index f5856567a3..88e87f4ee5 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWkbType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import javax.annotation.Nullable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import com.mysema.query.sql.types.AbstractType;
+import org.jetbrains.annotations.Nullable;
+
 import org.geolatte.geom.ByteBuffer;
 import org.geolatte.geom.ByteOrder;
 import org.geolatte.geom.Geometry;
@@ -28,11 +28,9 @@
 import org.geolatte.geom.codec.WkbEncoder;
 import org.geolatte.geom.codec.Wkt;
 
-/**
- * @author tiwe
- *
- */
-public class GeometryWkbType extends AbstractType<Geometry> {
+import com.querydsl.sql.types.AbstractType;
+
+class GeometryWkbType extends AbstractType<Geometry> {
 
     public static final GeometryWkbType NDR = new GeometryWkbType(ByteOrder.NDR);
 
@@ -40,7 +38,7 @@ public class GeometryWkbType extends AbstractType<Geometry> {
 
     private final ByteOrder byteOrder;
 
-    public GeometryWkbType(ByteOrder byteOrder) {
+    GeometryWkbType(ByteOrder byteOrder) {
         super(Types.OTHER);
         this.byteOrder = byteOrder;
     }
@@ -55,7 +53,7 @@ public Class<Geometry> getReturnedClass() {
     public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
         byte[] bytes = rs.getBytes(startIndex);
         if (bytes != null) {
-            WkbDecoder decoder = Wkb.newWkbDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
+            WkbDecoder decoder = Wkb.newDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
             return decoder.decode(ByteBuffer.from(bytes));
         } else {
             return null;
@@ -64,15 +62,14 @@ public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
 
     @Override
     public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        WkbEncoder encoder = Wkb.newWkbEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
+        WkbEncoder encoder = Wkb.newEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
         ByteBuffer buffer = encoder.encode(value, byteOrder);
         st.setBytes(startIndex, buffer.toByteArray());
     }
 
     @Override
     public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
-        return "'" + str + "'";
+        return "'" + Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry) + "'";
     }
 
 }
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktClobType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktClobType.java
new file mode 100644
index 0000000000..c8023fe48b
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktClobType.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import java.sql.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkt;
+
+import com.querydsl.sql.types.AbstractType;
+
+class GeometryWktClobType extends AbstractType<Geometry> {
+
+    public static final GeometryWktClobType DEFAULT = new GeometryWktClobType();
+
+    GeometryWktClobType() {
+        super(Types.CLOB);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        Clob clob = rs.getClob(startIndex);
+        String str = clob != null ? clob.getSubString(1, (int) clob.length()) : null;
+        if (str != null) {
+            return Wkt.newDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(str);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(value);
+        st.setString(startIndex, str);
+    }
+
+    @Override
+    public String getLiteral(Geometry geometry) {
+        return "'" + Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry) + "'";
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktType.java
new file mode 100644
index 0000000000..f32bdcfd56
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/GeometryWktType.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkt;
+
+import com.querydsl.sql.types.AbstractType;
+
+class GeometryWktType extends AbstractType<Geometry> {
+
+    public static final GeometryWktType DEFAULT = new GeometryWktType();
+
+    GeometryWktType() {
+        super(Types.VARCHAR);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        String str = rs.getString(startIndex);
+        if (str != null) {
+            return Wkt.newDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(str);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(value);
+        st.setString(startIndex, str);
+    }
+
+    @Override
+    public String getLiteral(Geometry geometry) {
+        return "'" + Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry) + "'";
+    }
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISTemplates.java
new file mode 100644
index 0000000000..3e7934bd14
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISTemplates.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code GeoDBTemplates} is a spatial enabled SQL dialect for GeoDB
+ *
+ * @author tiwe
+ *
+ */
+public class H2GISTemplates extends H2Templates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final H2GISTemplates DEFAULT = new H2GISTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new H2GISTemplates(escape, quote);
+            }
+        };
+    }
+
+    public H2GISTemplates() {
+        this('\\', false);
+    }
+
+    public H2GISTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public H2GISTemplates(char escape, boolean quote) {
+        super(escape, quote);
+        addCustomType(H2GISWkbType.DEFAULT);
+        add(SpatialTemplatesSupport.getSpatialOps(true));
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISWkbType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISWkbType.java
new file mode 100644
index 0000000000..0859e59e03
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/H2GISWkbType.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.sql.types.AbstractType;
+import org.geolatte.geom.ByteBuffer;
+import org.geolatte.geom.ByteOrder;
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkb;
+import org.geolatte.geom.codec.WkbDecoder;
+import org.geolatte.geom.codec.WkbEncoder;
+import org.geolatte.geom.codec.Wkt;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+class H2GISWkbType extends AbstractType<Geometry> {
+
+    public static final H2GISWkbType DEFAULT = new H2GISWkbType();
+
+    private final ByteOrder byteOrder = ByteOrder.NDR;
+
+    H2GISWkbType() {
+        super(Types.BLOB);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        byte[] bytes = rs.getBytes(startIndex);
+        if (bytes != null) {
+            byte[] wkb;
+            if (bytes[0] != 0 && bytes[0] != 1) { // decodes EWKB
+                wkb = new byte[bytes.length - 32];
+                System.arraycopy(bytes, 32, wkb, 0, wkb.length);
+            } else {
+                wkb = bytes;
+            }
+            WkbDecoder decoder = Wkb.newDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
+            return decoder.decode(ByteBuffer.from(wkb));
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        WkbEncoder encoder = Wkb.newEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
+        ByteBuffer buffer = encoder.encode(value, byteOrder);
+        st.setBytes(startIndex, buffer.toByteArray());
+    }
+
+    @Override
+    public String getLiteral(Geometry geometry) {
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
+        if (geometry.getSRID() > -1) {
+            return "ST_GeomFromText('" + str + "', " + geometry.getSRID() + ")";
+        } else {
+            return "ST_GeomFromText('" + str + "', -1)";
+        }
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLSpatialTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLSpatialTemplates.java
new file mode 100644
index 0000000000..b75622566a
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLSpatialTemplates.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.spatial.SpatialOps;
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code MySQLSpatialTemplates} is a spatial enabled SQL dialect for MySQL
+ *
+ * @author tiwe
+ *
+ */
+public class MySQLSpatialTemplates extends MySQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final MySQLSpatialTemplates DEFAULT = new MySQLSpatialTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new MySQLSpatialTemplates(escape, quote);
+            }
+        };
+    }
+
+    public MySQLSpatialTemplates() {
+        this('\\', false);
+    }
+
+    public MySQLSpatialTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public MySQLSpatialTemplates(char escape, boolean quote) {
+        super(escape, quote);
+        addCustomType(MySQLWkbType.DEFAULT);
+        add(SpatialTemplatesSupport.getSpatialOps("", true));
+        add(SpatialOps.NUM_INTERIOR_RING, "NumInteriorRings({0})");
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLWkbType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLWkbType.java
similarity index 84%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLWkbType.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLWkbType.java
index 8f19c6cbbe..8a91fd5406 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLWkbType.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/MySQLWkbType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import javax.annotation.Nullable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import com.mysema.query.sql.types.AbstractType;
+import org.jetbrains.annotations.Nullable;
+
 import org.geolatte.geom.ByteBuffer;
 import org.geolatte.geom.ByteOrder;
 import org.geolatte.geom.Geometry;
@@ -28,17 +28,15 @@
 import org.geolatte.geom.codec.WkbEncoder;
 import org.geolatte.geom.codec.Wkt;
 
-/**
- * @author tiwe
- *
- */
-public class MySQLWkbType extends AbstractType<Geometry> {
+import com.querydsl.sql.types.AbstractType;
+
+class MySQLWkbType extends AbstractType<Geometry> {
 
     public static final MySQLWkbType DEFAULT = new MySQLWkbType();
 
     private final ByteOrder byteOrder = ByteOrder.NDR;
 
-    public MySQLWkbType() {
+    MySQLWkbType() {
         super(Types.BLOB);
     }
 
@@ -56,7 +54,7 @@ public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
             System.arraycopy(bytes, 4, wkb, 0, wkb.length);
             int srid = bytes[3] << 24 | (bytes[2] & 0xff) << 16 | (bytes[1] & 0xff) << 8 | (bytes[0] & 0xff);
             // TODO make sure srid is set
-            WkbDecoder decoder = Wkb.newWkbDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
+            WkbDecoder decoder = Wkb.newDecoder(Wkb.Dialect.POSTGIS_EWKB_1);
             return decoder.decode(ByteBuffer.from(wkb));
         } else {
             return null;
@@ -65,7 +63,7 @@ public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
 
     @Override
     public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        WkbEncoder encoder = Wkb.newWkbEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
+        WkbEncoder encoder = Wkb.newEncoder(Wkb.Dialect.POSTGIS_EWKB_1);
         ByteBuffer buffer = encoder.encode(value, byteOrder);
         int srid = value.getSRID();
 
@@ -83,7 +81,7 @@ public void setValue(PreparedStatement st, int startIndex, Geometry value) throw
 
     @Override
     public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
         if (geometry.getSRID() > -1) {
             return "GeomFromText('" + str + "', " + geometry.getSRID() + ")";
         } else {
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/OracleSpatialTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/OracleSpatialTemplates.java
new file mode 100644
index 0000000000..3cc259889b
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/OracleSpatialTemplates.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.sql.OracleTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code OracleSpatialTemplates} is a spatial enabled SQL dialect for Oracle
+ *
+ * @author tiwe
+ *
+ */
+public class OracleSpatialTemplates extends OracleTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final OracleSpatialTemplates DEFAULT = new OracleSpatialTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new OracleSpatialTemplates(escape, quote);
+            }
+        };
+    }
+
+    public OracleSpatialTemplates() {
+        this('\\', false);
+    }
+
+    public OracleSpatialTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public OracleSpatialTemplates(char escape, boolean quote) {
+        super(escape, quote);
+        addCustomType(SDOGeometryType.DEFAULT);
+        // TODO
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PGgeometryType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PGgeometryType.java
new file mode 100644
index 0000000000..d069d8f660
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PGgeometryType.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkt;
+import org.postgis.PGgeometry;
+
+import com.querydsl.sql.types.AbstractType;
+
+class PGgeometryType extends AbstractType<Geometry> {
+
+    public static final PGgeometryType DEFAULT = new PGgeometryType();
+
+    PGgeometryType() {
+        super(Types.STRUCT);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        PGgeometry obj = (PGgeometry) rs.getObject(startIndex);
+        if (obj == null) {
+            return null;
+        }
+        return Wkt.newDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(obj.getValue());
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        final String encode = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(value);
+        PGgeometry geometry = new PGgeometry(encode);
+        st.setObject(startIndex, geometry);
+    }
+
+    @Override
+    public String getLiteral(Geometry geometry) {
+        return "'" + Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry) + "'";
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PostGISTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PostGISTemplates.java
new file mode 100644
index 0000000000..a2a936fefc
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/PostGISTemplates.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.spatial.SpatialOps;
+import com.querydsl.sql.PostgreSQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code PostGISTemplates} is a spatial enabled SQL dialect for PostGIS
+ *
+ * @author tiwe
+ *
+ */
+public class PostGISTemplates extends PostgreSQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final PostGISTemplates DEFAULT = new PostGISTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new PostGISTemplates(escape, quote);
+            }
+        };
+    }
+
+    public PostGISTemplates() {
+        this('\\', false);
+    }
+
+    public PostGISTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public PostGISTemplates(char escape, boolean quote) {
+        super(escape, quote);
+        addCustomType(PGgeometryType.DEFAULT);
+        add(SpatialTemplatesSupport.getSpatialOps(true));
+        add(SpatialOps.DISTANCE_SPHERE, "ST_Distance_Sphere({0}, {1})");
+        add(SpatialOps.DISTANCE_SPHEROID, "ST_Distance_Spheroid({0}, {1})");
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/QSpatialRefSys.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/QSpatialRefSys.java
similarity index 77%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/QSpatialRefSys.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/QSpatialRefSys.java
index 29e41d6980..82ac5ade68 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/QSpatialRefSys.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/QSpatialRefSys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,24 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import javax.annotation.Generated;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
+package com.querydsl.sql.spatial;
 
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
 
 /**
  * QSpatialRefSys is a Querydsl query type for SpatialRefSys
  */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
 public class QSpatialRefSys extends RelationalPathSpatial<SpatialRefSys> {
 
     private static final long serialVersionUID = 1681874658;
@@ -43,7 +38,7 @@ public class QSpatialRefSys extends RelationalPathSpatial<SpatialRefSys> {
 
     public final StringPath srtext = createString("srtext");
 
-    public final com.mysema.query.sql.PrimaryKey<SpatialRefSys> spatialRefSysPkey = createPrimaryKey(srid);
+    public final com.querydsl.sql.PrimaryKey<SpatialRefSys> spatialRefSysPkey = createPrimaryKey(srid);
 
     public QSpatialRefSys(String variable) {
         super(SpatialRefSys.class, forVariable(variable), "public", "spatial_ref_sys");
@@ -60,7 +55,7 @@ public QSpatialRefSys(Path<? extends SpatialRefSys> path) {
         addMetadata();
     }
 
-    public QSpatialRefSys(PathMetadata<?> metadata) {
+    public QSpatialRefSys(PathMetadata metadata) {
         super(SpatialRefSys.class, metadata, "public", "spatial_ref_sys");
         addMetadata();
     }
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/RelationalPathSpatial.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/RelationalPathSpatial.java
new file mode 100644
index 0000000000..fdec6b56bd
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/RelationalPathSpatial.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import org.geolatte.geom.*;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.spatial.*;
+import com.querydsl.sql.RelationalPathBase;
+
+/**
+ * {@code RelationalPathSpatial} extends {@link RelationalPathBase} to provide factory methods
+ * for spatial path creation
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class RelationalPathSpatial<T> extends RelationalPathBase<T> implements GeometryPaths {
+
+    private static final long serialVersionUID = -7176236689794620277L;
+
+    public RelationalPathSpatial(Class<? extends T> type, String variable, String schema, String table) {
+        this(type, PathMetadataFactory.forVariable(variable), schema, table);
+    }
+
+    public RelationalPathSpatial(Class<? extends T> type, PathMetadata metadata, String schema, String table) {
+        super(type, metadata, schema, table);
+    }
+
+    @Override
+    public <A extends GeometryCollection> GeometryCollectionPath<A> createGeometryCollection(
+            String property, Class<? extends A> type) {
+        return add(new GeometryCollectionPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Geometry> GeometryPath<A> createGeometry(String property,
+            Class<? extends A> type) {
+        return add(new GeometryPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends LinearRing> LinearRingPath<A> createLinearRing(String property,
+            Class<? extends A> type) {
+        return add(new LinearRingPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends LineString> LineStringPath<A> createLineString(String property,
+            Class<? extends A> type) {
+        return add(new LineStringPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(
+            String property, Class<? extends A> type) {
+        return add(new MultiLineStringPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property,
+            Class<? extends A> type) {
+        return add(new MultiPointPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property,
+            Class<? extends A> type) {
+        return add(new MultiPolygonPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type) {
+        return add(new PointPath<A>(type, forProperty(property)));
+    }
+
+    @Override
+    public <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type) {
+        return add(new PolygonPath<A>(type, forProperty(property)));
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SDOGeometryType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SDOGeometryType.java
new file mode 100644
index 0000000000..9f5bb87985
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SDOGeometryType.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.sql.types.AbstractType;
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.db.oracle.Decoders;
+import org.geolatte.geom.codec.db.oracle.DefaultConnectionFinder;
+import org.geolatte.geom.codec.db.oracle.Encoders;
+import org.geolatte.geom.codec.db.oracle.OracleJDBCTypeFactory;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Struct;
+import java.sql.Types;
+
+class SDOGeometryType extends AbstractType<Geometry> {
+
+    public static final SDOGeometryType DEFAULT = new SDOGeometryType();
+
+    SDOGeometryType() {
+        super(Types.OTHER);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        byte[] bytes = rs.getBytes(startIndex);
+        if (bytes != null) {
+            try {
+                final Struct object = rs.getObject(startIndex, Struct.class);
+                return Decoders.decode(object);
+            } catch (Exception e) {
+                throw new SQLException(e);
+            }
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        try {
+            final Struct struct = Encoders.encode(value, st.getConnection(), new OracleJDBCTypeFactory(new DefaultConnectionFinder()));
+            st.setObject(startIndex, struct);
+        } catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplates.java
similarity index 75%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplates.java
index 7c9c9dd7dc..4abd3769d9 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.spatial.SpatialOps;
-import com.mysema.query.sql.SQLServer2008Templates;
-import com.mysema.query.sql.SQLTemplates;
+import com.querydsl.spatial.SpatialOps;
+import com.querydsl.sql.SQLServer2008Templates;
+import com.querydsl.sql.SQLTemplates;
 
 /**
- * SQLServer2008SpatialTemplates is a spatial enabled SQL dialect for SQL Server 2008
+ * {@code SQLServer2008SpatialTemplates} is a spatial enabled SQL dialect for SQL Server 2008
  *
  * @author tiwe
  *
  */
 public class SQLServer2008SpatialTemplates extends SQLServer2008Templates {
 
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLServer2008SpatialTemplates DEFAULT = new SQLServer2008SpatialTemplates();
+
     public static Builder builder() {
         return new Builder() {
             @Override
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServerGeometryType.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServerGeometryType.java
new file mode 100644
index 0000000000..0a2169592f
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SQLServerGeometryType.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.geolatte.geom.codec.db.sqlserver.Decoders;
+import org.geolatte.geom.codec.db.sqlserver.Encoders;
+import org.jetbrains.annotations.Nullable;
+
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.codec.Wkt;
+
+import com.querydsl.sql.types.AbstractType;
+
+class SQLServerGeometryType extends AbstractType<Geometry> {
+
+    public static final SQLServerGeometryType DEFAULT = new SQLServerGeometryType();
+
+    private static final int DEFAULT_SRID = 4326;
+
+    SQLServerGeometryType() {
+        super(Types.BLOB);
+    }
+
+    @Override
+    public Class<Geometry> getReturnedClass() {
+        return Geometry.class;
+    }
+
+    @Override
+    @Nullable
+    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
+        byte[] bytes = rs.getBytes(startIndex);
+        if (bytes != null) {
+            return Decoders.decode(bytes);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
+        byte[] bytes = Encoders.encode(value);
+        st.setBytes(startIndex, bytes);
+    }
+
+    @Override
+    public String getLiteral(Geometry geometry) {
+        String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
+        if (geometry.getSRID() > -1) {
+            return "geometry::STGeomFromText('" + str + "', " + geometry.getSRID() + ")";
+        } else {
+            return "geometry::STGeomFromText('" + str + "', " + DEFAULT_SRID + ")";
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialRefSys.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialRefSys.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialRefSys.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialRefSys.java
index 3bff433b98..7ba3eac477 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialRefSys.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialRefSys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,14 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
-
-import javax.annotation.Generated;
+package com.querydsl.sql.spatial;
 
 /**
  * SpatialRefSys is a Querydsl bean type
  */
-@Generated("com.mysema.query.codegen.BeanSerializer")
 public class SpatialRefSys {
 
     private String authName;
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialSupport.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialSupport.java
new file mode 100644
index 0000000000..73618cfb53
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialSupport.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spatial;
+
+import com.querydsl.codegen.AbstractModule;
+import com.querydsl.codegen.Extension;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.codegen.SQLCodegenModule;
+import org.geolatte.geom.Geometry;
+import org.geolatte.geom.GeometryCollection;
+import org.geolatte.geom.LineString;
+import org.geolatte.geom.MultiLineString;
+import org.geolatte.geom.MultiPoint;
+import org.geolatte.geom.MultiPolygon;
+import org.geolatte.geom.Point;
+import org.geolatte.geom.Polygon;
+
+/**
+ * {@code SpatialSupport} provides support for spatial types in code generation
+ *
+ * @author tiwe
+ *
+ */
+public final class SpatialSupport implements Extension {
+
+    private static void registerTypes(Configuration configuration) {
+        // mysql & postgresql
+        configuration.registerType("geometry", Geometry.class);
+        configuration.registerType("point", Point.class);
+        configuration.registerType("linestring", LineString.class);
+        configuration.registerType("polygon", Polygon.class);
+        configuration.registerType("multipoint", MultiPoint.class);
+        configuration.registerType("multilinestring", MultiLineString.class);
+        configuration.registerType("multipolygon", MultiPolygon.class);
+        configuration.registerType("geometrycollection", GeometryCollection.class);
+        // teradata
+        configuration.registerType("sysudtlib.st_geometry", Geometry.class);
+    }
+
+    /**
+     * Register spatial types to the given codegen module
+     *
+     * @param module module to be customized for spatial support
+     */
+    public void addSupport(AbstractModule module) {
+        module.bindInstance(SQLCodegenModule.ENTITYPATH_TYPE, RelationalPathSpatial.class);
+        registerTypes(module.get(Configuration.class));
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialTemplatesSupport.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialTemplatesSupport.java
similarity index 80%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialTemplatesSupport.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialTemplatesSupport.java
index a3e5d43a49..4926ad374b 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SpatialTemplatesSupport.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/SpatialTemplatesSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
+import java.util.HashMap;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-import com.mysema.query.spatial.SpatialOps;
-import com.mysema.query.types.Operator;
+import com.querydsl.core.types.Operator;
+import com.querydsl.spatial.SpatialOps;
 
 /**
  * Static factory methods for spatial enabled SQLTemplates subclasses
@@ -27,6 +27,8 @@
  */
 public final class SpatialTemplatesSupport {
 
+    private SpatialTemplatesSupport() { }
+
     private static String createSpatial(String name, int args, boolean asFunction) {
         StringBuilder result = new StringBuilder();
         if (!asFunction) {
@@ -39,18 +41,18 @@ private static String createSpatial(String name, int args, boolean asFunction) {
             if (i > start) {
                 result.append(", ");
             }
-            result.append("{" + i + "}");
+            result.append("{").append(i).append("}");
         }
         result.append(")");
         return result.toString();
     }
 
-    public static Map<Operator<?>, String> getSpatialOps(boolean asFunction) {
+    public static Map<Operator, String> getSpatialOps(boolean asFunction) {
         return getSpatialOps("ST_", asFunction);
     }
 
-    public static Map<Operator<?>, String> getSpatialOps(String prefix, boolean asFunction) {
-        Map<Operator<?>, String> ops = Maps.newHashMap();
+    public static Map<Operator, String> getSpatialOps(String prefix, boolean asFunction) {
+        Map<Operator, String> ops = new HashMap<>();
         ops.put(SpatialOps.AREA, createSpatial(prefix + "Area", 1, asFunction));
         ops.put(SpatialOps.AREA2, createSpatial(prefix + "Area", 2, asFunction));
         ops.put(SpatialOps.AS_BINARY, createSpatial(prefix + "AsBinary", 1, asFunction));
@@ -113,6 +115,22 @@ public static Map<Operator<?>, String> getSpatialOps(String prefix, boolean asFu
         ops.put(SpatialOps.Y2, createSpatial(prefix + "Y", 2, asFunction));
         ops.put(SpatialOps.Z, createSpatial(prefix + "Z", 1, asFunction));
         ops.put(SpatialOps.Z2, createSpatial(prefix + "Z", 2, asFunction));
+
+        // extensions
+        ops.put(SpatialOps.AS_EWKT, createSpatial(prefix + "AsEWKT", 1, asFunction));
+        ops.put(SpatialOps.GEOM_FROM_TEXT, createSpatial(prefix + "GeomFromText", 1, asFunction));
+        ops.put(SpatialOps.SET_SRID, createSpatial(prefix + "SetSRID", 2, asFunction));
+        ops.put(SpatialOps.XMIN, createSpatial(prefix + "XMin", 1, asFunction));
+        ops.put(SpatialOps.XMAX, createSpatial(prefix + "XMax", 1, asFunction));
+        ops.put(SpatialOps.YMIN, createSpatial(prefix + "YMin", 1, asFunction));
+        ops.put(SpatialOps.YMAX, createSpatial(prefix + "YMax", 1, asFunction));
+        ops.put(SpatialOps.DWITHIN, createSpatial(prefix + "DWithin", 3, asFunction));
+        ops.put(SpatialOps.EXTENT, createSpatial(prefix + "Extent", 1, asFunction));
+        ops.put(SpatialOps.COLLECT, createSpatial(prefix + "Collect", 1, asFunction));
+        ops.put(SpatialOps.COLLECT2, createSpatial(prefix + "Collect", 2, asFunction));
+        ops.put(SpatialOps.TRANSLATE, createSpatial(prefix + "Translate", 3, asFunction));
+        ops.put(SpatialOps.TRANSLATE2, createSpatial(prefix + "Translate", 4, asFunction));
+
         return ops;
     }
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/TeradataSpatialTemplates.java
similarity index 76%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java
rename to querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/TeradataSpatialTemplates.java
index b64dc6faea..2fe934d5c7 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/TeradataSpatialTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,22 +11,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.spatial.SpatialOps;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.SchemaAndTable;
-import com.mysema.query.sql.TeradataTemplates;
-import com.mysema.query.sql.types.StringAsObjectType;
+import com.querydsl.spatial.SpatialOps;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.SchemaAndTable;
+import com.querydsl.sql.TeradataTemplates;
+import com.querydsl.sql.types.StringAsObjectType;
 
 /**
- * TeradataSpatialTemplates is a spatial enabled SQL dialect for Teradata
+ * {@code TeradataSpatialTemplates} is a spatial enabled SQL dialect for Teradata
  *
  * @author tiwe
  *
  */
 public class TeradataSpatialTemplates extends TeradataTemplates {
 
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final TeradataSpatialTemplates DEFAULT = new TeradataSpatialTemplates();
+
     public static Builder builder() {
         return new Builder() {
             @Override
diff --git a/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/package-info.java b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/package-info.java
new file mode 100644
index 0000000000..82f00ef0b5
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/java/com/querydsl/sql/spatial/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Spatial support
+ */
+package com.querydsl.sql.spatial;
diff --git a/querydsl-sql-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension b/querydsl-sql-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
new file mode 100644
index 0000000000..0389ec47c6
--- /dev/null
+++ b/querydsl-sql-spatial/src/main/resources/META-INF/services/com.querydsl.codegen.Extension
@@ -0,0 +1 @@
+com.querydsl.sql.spatial.SpatialSupport
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/GeoDBTemplatesTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java
similarity index 81%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/GeoDBTemplatesTest.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java
index e64484e686..a02c4e82f7 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/GeoDBTemplatesTest.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java
@@ -1,8 +1,9 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.SQLTemplates;
 import org.junit.Test;
 
+import com.querydsl.sql.SQLTemplates;
+
 public class GeoDBTemplatesTest {
 
     @Test
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/MySQLSpatialTemplatesTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java
similarity index 81%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/MySQLSpatialTemplatesTest.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java
index dd7f158752..c459fae55d 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/MySQLSpatialTemplatesTest.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java
@@ -1,8 +1,9 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.SQLTemplates;
 import org.junit.Test;
 
+import com.querydsl.sql.SQLTemplates;
+
 public class MySQLSpatialTemplatesTest {
 
     @Test
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PostGISTemplatesTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java
similarity index 79%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PostGISTemplatesTest.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java
index b358689523..1870c80e50 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PostGISTemplatesTest.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java
@@ -1,8 +1,9 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.SQLTemplates;
 import org.junit.Test;
 
+import com.querydsl.sql.SQLTemplates;
+
 public class PostGISTemplatesTest {
 
     @Test
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/QShapes.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/QShapes.java
new file mode 100644
index 0000000000..71c73a102e
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/QShapes.java
@@ -0,0 +1,57 @@
+package com.querydsl.sql.spatial;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import org.geolatte.geom.Geometry;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.spatial.GeometryPath;
+import com.querydsl.sql.ColumnMetadata;
+
+/**
+ * QShapes is a Querydsl query type for QShapes
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class QShapes extends RelationalPathSpatial<Shapes> {
+
+    private static final long serialVersionUID = 563213127;
+
+    public static final QShapes shapes = new QShapes("SHAPES");
+
+    public final GeometryPath<Geometry> geometry = createGeometry("geometry", Geometry.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final com.querydsl.sql.PrimaryKey<Shapes> shapesPkey = createPrimaryKey(id);
+
+    public QShapes(String variable) {
+        super(Shapes.class, forVariable(variable), "PUBLIC", "SHAPES");
+        addMetadata();
+    }
+
+    public QShapes(String variable, String schema, String table) {
+        super(Shapes.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public QShapes(Path<? extends Shapes> path) {
+        super(path.getType(), path.getMetadata(), "PUBLIC", "SHAPES");
+        addMetadata();
+    }
+
+    public QShapes(PathMetadata metadata) {
+        super(Shapes.class, metadata, "PUBLIC", "SHAPES");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(geometry, ColumnMetadata.named("GEOMETRY").ofType(1111).withSize(2147483647));
+        addMetadata(id, ColumnMetadata.named("ID").ofType(4).withSize(10).notNull());
+    }
+
+}
+
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplatesTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java
similarity index 82%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplatesTest.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java
index a8acd6b523..a568360231 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplatesTest.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java
@@ -1,8 +1,9 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.SQLTemplates;
 import org.junit.Test;
 
+import com.querydsl.sql.SQLTemplates;
+
 public class SQLServer2008SpatialTemplatesTest {
 
     @Test
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/Shapes.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/Shapes.java
similarity index 91%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/Shapes.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/Shapes.java
index f46aebddf8..117044a4f8 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/Shapes.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/Shapes.java
@@ -1,4 +1,4 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
 import org.geolatte.geom.Geometry;
 
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java
new file mode 100644
index 0000000000..ebf75c6c5d
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java
@@ -0,0 +1,450 @@
+
+package com.querydsl.sql.spatial;
+
+import static com.querydsl.core.Target.*;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.geolatte.geom.*;
+import org.geolatte.geom.codec.Wkt;
+import org.junit.Test;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.spatial.*;
+import com.querydsl.sql.AbstractBaseTest;
+import com.querydsl.sql.SQLQuery;
+
+public class SpatialBase extends AbstractBaseTest {
+
+    private static final QShapes shapes = QShapes.shapes;
+
+    // point 1-5
+    // linestring 6-7
+    // polygon 8-9
+    // multipoint 10-11
+    // multilinestring 12-13
+    // multipolygon 14-15
+
+    private SQLQuery<?> withPoints() {
+        return query().from(shapes).where(shapes.id.between(1, 5));
+    }
+
+    private SQLQuery<?> withLineStrings() {
+        return query().from(shapes).where(shapes.id.between(6, 7));
+    }
+
+    private SQLQuery<?> withPolygons() {
+        return query().from(shapes).where(shapes.id.between(8, 9));
+    }
+
+    private SQLQuery<?> withMultipoints() {
+        return query().from(shapes).where(shapes.id.between(10, 11));
+    }
+
+    private SQLQuery<?> withMultiLineStrings() {
+        return query().from(shapes).where(shapes.id.between(12, 13));
+    }
+
+    private SQLQuery<?> withMultiPolygons() {
+        return query().from(shapes).where(shapes.id.between(14, 15));
+    }
+
+    @Test
+    @IncludeIn(POSTGRESQL)
+    public void spatialRefSys() {
+        QSpatialRefSys spatialRefSys = QSpatialRefSys.spatialRefSys;
+        query().from(spatialRefSys).select(spatialRefSys).fetch();
+    }
+
+    private String normalize(String s) {
+        String normalized = s.replace(" ", "").replace("ST_", "").replace("_", "");
+        normalized = normalized.substring(normalized.indexOf(';') + 1);
+        return normalized.toUpperCase();
+    }
+
+    @Test // FIXME, maybe use enum as the type ?!?
+    @ExcludeIn(H2)
+    public void geometryType() {
+        List<Tuple> results = query().from(shapes).select(shapes.geometry, shapes.geometry.geometryType()).fetch();
+        assertFalse(results.isEmpty());
+        for (Tuple row : results) {
+            assertEquals(
+                    normalize(row.get(shapes.geometry).getGeometryType().name()),
+                    normalize(row.get(shapes.geometry.geometryType())));
+        }
+    }
+
+    @Test
+    public void asText() {
+        List<Tuple> results = query().from(shapes).select(shapes.geometry, shapes.geometry.asText()).fetch();
+        assertFalse(results.isEmpty());
+        for (Tuple row : results) {
+            if (!(row.get(shapes.geometry) instanceof MultiPoint)) {
+                assertEquals(
+                        normalize(Wkt.toWkt(row.get(shapes.geometry))),
+                        normalize(row.get(shapes.geometry.asText())));
+            }
+        }
+    }
+
+    @Test
+    @ExcludeIn(H2)
+    public void point_x_y() {
+        PointPath<Point> point = shapes.geometry.asPoint();
+        List<Tuple> results = withPoints().select(point, point.x(), point.y()).fetch();
+        assertFalse(results.isEmpty());
+        for (Tuple row : results) {
+            assertEquals(Double.valueOf(row.get(point).getPosition().getCoordinate(0)), row.get(point.x()));
+            assertEquals(Double.valueOf(row.get(point).getPosition().getCoordinate(1)), row.get(point.y()));
+        }
+    }
+
+    @Test
+    @ExcludeIn(MYSQL)
+    public void point_distance() {
+        QShapes shapes1 = QShapes.shapes;
+        QShapes shapes2 = new QShapes("shapes2");
+        for (Tuple tuple : query().from(shapes1, shapes2)
+                    .where(shapes1.id.loe(5), shapes2.id.loe(5))
+                    .select(shapes1.geometry.asPoint(),
+                          shapes2.geometry.asPoint(),
+                          shapes1.geometry.distance(shapes2.geometry)).fetch()) {
+            Point point1 = tuple.get(shapes1.geometry.asPoint());
+            Point point2 = tuple.get(shapes2.geometry.asPoint());
+            Double distance = tuple.get(shapes1.geometry.distance(shapes2.geometry));
+            assertEquals(JTSGeometryOperations.Default.distance(point1, point2), distance, 0.0001);
+        }
+    }
+
+    @Test
+    public void point_instances() {
+        List<Shapes> results = withPoints().select(shapes).fetch();
+        assertEquals(5, results.size());
+        for (Shapes row : results) {
+            assertNotNull(row.getId());
+            assertNotNull(row.getGeometry());
+            assertTrue(row.getGeometry() instanceof Point);
+        }
+    }
+
+    @Test
+    public void lineString_instances() {
+        List<Geometry> results = withLineStrings().select(shapes.geometry).fetch();
+        assertFalse(results.isEmpty());
+        for (Geometry row : results) {
+            assertNotNull(row);
+            assertTrue(row instanceof LineString);
+        }
+    }
+
+    @Test
+    public void polygon_instances() {
+        List<Geometry> results = withPolygons().select(shapes.geometry).fetch();
+        assertFalse(results.isEmpty());
+        for (Geometry row : results) {
+            assertNotNull(row);
+            assertTrue(row instanceof Polygon);
+        }
+    }
+
+    @Test
+    public void multiPoint_instances() {
+        List<Geometry> results = withMultipoints().select(shapes.geometry).fetch();
+        assertFalse(results.isEmpty());
+        for (Geometry row : results) {
+            assertNotNull(row);
+            assertTrue(row instanceof MultiPoint);
+        }
+    }
+
+    @Test
+    public void multiLineString_instances() {
+        List<Geometry> results = withMultiLineStrings().select(shapes.geometry).fetch();
+        assertFalse(results.isEmpty());
+        for (Geometry row : results) {
+            assertNotNull(row);
+            assertTrue(row instanceof MultiLineString);
+        }
+    }
+
+    @Test
+    public void multiPolygon_instances() {
+        List<Geometry> results = withMultiPolygons().select(shapes.geometry).fetch();
+        assertFalse(results.isEmpty());
+        for (Geometry row : results) {
+            assertNotNull(row);
+            assertTrue(row instanceof MultiPolygon);
+        }
+    }
+
+    @Test
+    public void point_methods() {
+        PointPath<Point> point = shapes.geometry.asPoint();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, point.asBinary(), H2);
+        add(expressions, point.asText());
+        add(expressions, point.boundary(), H2, MYSQL);
+        add(expressions, point.convexHull(), H2, MYSQL);
+        add(expressions, point.dimension());
+        add(expressions, point.envelope(), H2);
+        add(expressions, point.geometryType(), H2);
+        add(expressions, point.isEmpty());
+        add(expressions, point.isSimple());
+        add(expressions, point.m(), MYSQL, TERADATA, H2);
+        add(expressions, point.srid());
+        // TODO add emulations
+        add(expressions, point.transform(26986), MYSQL, POSTGRESQL, SQLSERVER, TERADATA, H2);
+        // point specific
+        add(expressions, point.x(), H2);
+        add(expressions, point.y(), H2);
+        add(expressions, point.z(), MYSQL, TERADATA, H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withPoints().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    private List<Expression<?>> createExpressions(PointExpression<Point> point1, Expression<Point> point2) {
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, point1.contains(point2));
+        add(expressions, point1.crosses(point2));
+        add(expressions, point1.difference(point2), H2, MYSQL);
+        add(expressions, point1.disjoint(point2));
+        add(expressions, point1.distance(point2), MYSQL);
+        add(expressions, point1.distanceSphere(point2), H2, MYSQL, SQLSERVER);
+        add(expressions, point1.distanceSpheroid(point2), H2, MYSQL, POSTGRESQL, SQLSERVER);
+        add(expressions, point1.eq(point2));
+        add(expressions, point1.intersection(point2), H2, MYSQL);
+        add(expressions, point1.intersects(point2));
+        add(expressions, point1.overlaps(point2));
+        add(expressions, point1.symDifference(point2), H2, MYSQL);
+        add(expressions, point1.touches(point2));
+        add(expressions, point1.union(point2), H2, MYSQL);
+        add(expressions, point1.within(point2));
+        return expressions;
+    }
+
+    @Test
+    public void point_methods2() {
+        QShapes shapes1 = QShapes.shapes;
+        QShapes shapes2 = new QShapes("shapes2");
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        expressions.addAll(createExpressions(shapes1.geometry.asPoint(), shapes2.geometry.asPoint()));
+        expressions.addAll(createExpressions(shapes1.geometry.asPoint(), ConstantImpl.create((Point) Wkt.fromWkt("Point(2 2)"))));
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : query().from(shapes1, shapes2)
+                    .where(shapes1.id.loe(5), shapes2.id.loe(5)).select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void lineString_methods() {
+        LineStringPath<LineString> lineString = shapes.geometry.asLineString();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, lineString.asBinary(), H2);
+        add(expressions, lineString.asText());
+        add(expressions, lineString.boundary(), H2, MYSQL);
+        add(expressions, lineString.convexHull(), H2, MYSQL);
+        add(expressions, lineString.dimension());
+        add(expressions, lineString.envelope(), H2);
+        add(expressions, lineString.geometryType(), H2);
+        add(expressions, lineString.isEmpty());
+        add(expressions, lineString.isSimple());
+        // curve specific
+        add(expressions, lineString.length(), H2);
+        add(expressions, lineString.startPoint(), H2);
+        add(expressions, lineString.endPoint(), H2);
+        add(expressions, lineString.isClosed(), H2);
+        add(expressions, lineString.isRing(), H2, MYSQL);
+        // linestring specific
+        add(expressions, lineString.numPoints(), H2);
+        add(expressions, lineString.pointN(1), H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withLineStrings().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void polygon_methods() {
+        PolygonPath<Polygon> polygon = shapes.geometry.asPolygon();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, polygon.asBinary(), H2);
+        add(expressions, polygon.asText());
+        add(expressions, polygon.boundary(), H2, MYSQL);
+        add(expressions, polygon.convexHull(), H2, MYSQL);
+        add(expressions, polygon.dimension());
+        add(expressions, polygon.envelope(), H2);
+        add(expressions, polygon.geometryType(), H2);
+        add(expressions, polygon.isEmpty());
+        add(expressions, polygon.isSimple());
+        // surface specific
+        add(expressions, polygon.area());
+        add(expressions, polygon.centroid());
+        add(expressions, polygon.pointOnSurface(), H2, MYSQL);
+        // polygon specific
+        add(expressions, polygon.exteriorRing(), H2);
+        add(expressions, polygon.numInteriorRing(), H2);
+        add(expressions, polygon.interiorRingN(1), H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withPolygons().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void multiPoint_methods() {
+        MultiPointPath<MultiPoint> multipoint = shapes.geometry.asMultiPoint();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, multipoint.asBinary(), H2);
+        add(expressions, multipoint.asText());
+        add(expressions, multipoint.boundary(), H2, MYSQL);
+        add(expressions, multipoint.convexHull(), H2, MYSQL);
+        add(expressions, multipoint.dimension());
+        add(expressions, multipoint.envelope(), H2);
+        add(expressions, multipoint.geometryType(), H2);
+        add(expressions, multipoint.isEmpty());
+        add(expressions, multipoint.isSimple());
+        // multipoint specific
+        add(expressions, multipoint.numGeometries(), H2);
+        add(expressions, multipoint.geometryN(1), H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withMultipoints().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void multiLineString_methods() {
+        MultiLineStringPath<MultiLineString> multilinestring = shapes.geometry.asMultiLineString();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, multilinestring.asBinary(), H2);
+        add(expressions, multilinestring.asText());
+        add(expressions, multilinestring.boundary(), H2, MYSQL);
+        add(expressions, multilinestring.convexHull(), H2, MYSQL);
+        add(expressions, multilinestring.dimension());
+        add(expressions, multilinestring.envelope(), H2);
+        add(expressions, multilinestring.geometryType(), H2);
+        add(expressions, multilinestring.isEmpty());
+        add(expressions, multilinestring.isSimple());
+        // multicurve specific
+        add(expressions, multilinestring.isClosed(), H2);
+        add(expressions, multilinestring.length(), H2);
+        // multilinestring specific
+        add(expressions, multilinestring.numGeometries(), H2);
+        add(expressions, multilinestring.geometryN(1), H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withMultiLineStrings().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void multiPolygon_methods() {
+        MultiPolygonPath<MultiPolygon> multipolygon = shapes.geometry.asMultiPolygon();
+
+        List<Expression<?>> expressions = new ArrayList<>();
+        add(expressions, multipolygon.asBinary(), H2);
+        add(expressions, multipolygon.asText());
+        add(expressions, multipolygon.boundary(), H2, MYSQL);
+        add(expressions, multipolygon.convexHull(), H2, MYSQL);
+        add(expressions, multipolygon.dimension());
+        add(expressions, multipolygon.envelope(), H2);
+        add(expressions, multipolygon.geometryType(), H2);
+        add(expressions, multipolygon.isEmpty());
+        add(expressions, multipolygon.isSimple());
+        // multipolygon specific
+        add(expressions, multipolygon.numGeometries(), H2);
+        add(expressions, multipolygon.geometryN(1), H2);
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withMultiPolygons().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+    @Test
+    @IncludeIn(Target.POSTGRESQL)
+    public void extensions() {
+        List<Expression<?>> expressions = new ArrayList<>();
+        GeometryExpression<?> expr1 = shapes.geometry;
+
+        expressions.add(GeometryExpressions.asEWKT(expr1));
+        expressions.add(GeometryExpressions.fromText(expr1.asText()));
+        expressions.add(GeometryExpressions.setSRID(expr1, 4326));
+        expressions.add(GeometryExpressions.xmin(expr1));
+        expressions.add(GeometryExpressions.xmax(expr1));
+        expressions.add(GeometryExpressions.ymin(expr1));
+        expressions.add(GeometryExpressions.ymax(expr1));
+        expressions.add(GeometryExpressions.dwithin(expr1, expr1, 1));
+        expressions.add(GeometryExpressions.collect(expr1, expr1));
+        expressions.add(GeometryExpressions.translate(expr1, 1, 1));
+
+        for (Expression<?> expr : expressions) {
+            boolean logged = false;
+            for (Object row : withPoints().select(expr).fetch()) {
+                if (row == null && !logged) {
+                    System.err.println(expr.toString());
+                    logged = true;
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/TeradataSpatialTemplatesTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java
similarity index 80%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/spatial/TeradataSpatialTemplatesTest.java
rename to querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java
index aaa1d99bc6..484199286c 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/TeradataSpatialTemplatesTest.java
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java
@@ -1,8 +1,9 @@
-package com.mysema.query.sql.spatial;
+package com.querydsl.sql.spatial;
 
-import com.mysema.query.sql.SQLTemplates;
 import org.junit.Test;
 
+import com.querydsl.sql.SQLTemplates;
+
 public class TeradataSpatialTemplatesTest {
 
     @Test
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java
new file mode 100644
index 0000000000..cb1b41be9b
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.sql.spatial.suites;
+
+import com.querydsl.sql.spatial.H2GISTemplates;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(H2.class)
+public class H2LiteralsSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2GISTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java
new file mode 100644
index 0000000000..88d8604779
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.sql.spatial.suites;
+
+import com.querydsl.sql.spatial.H2GISTemplates;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(H2.class)
+public class H2SuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2GISTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..4d2254489b
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.SQLServer2008SpatialTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(SQLServer.class)
+public class MSSQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLServer();
+        Connections.initConfiguration(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java
new file mode 100644
index 0000000000..9040296ac7
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.SQLServer2008SpatialTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(SQLServer.class)
+public class MSSQLSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLServer();
+        Connections.initConfiguration(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..c3c9c8f508
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.MySQLSpatialTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(MySQL.class)
+public class MySQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initMySQL();
+        Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java
new file mode 100644
index 0000000000..1d355777da
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.MySQLSpatialTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(MySQL.class)
+public class MySQLSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initMySQL();
+        Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..ad03e6a57e
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.PostGISTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initPostgreSQL();
+        Connections.initConfiguration(PostGISTemplates.builder().quote().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java
new file mode 100644
index 0000000000..d0a7b2cf90
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java
@@ -0,0 +1,23 @@
+package com.querydsl.sql.spatial.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.spatial.PostGISTemplates;
+import com.querydsl.sql.spatial.SpatialBase;
+import com.querydsl.sql.suites.AbstractSuite;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLSuiteTest extends AbstractSuite {
+
+    public static class Spatial extends SpatialBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initPostgreSQL();
+        Connections.initConfiguration(PostGISTemplates.builder().quote().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java
new file mode 100644
index 0000000000..34ccdcb3f9
--- /dev/null
+++ b/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java
@@ -0,0 +1,54 @@
+package com.querydsl.sql.spatial.suites;
+
+import java.sql.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.Connections;
+
+@Category(H2.class)
+public class SpatialTest {
+
+    @Before
+    public void setUp() throws ClassNotFoundException, SQLException {
+        Connections.initH2();
+//      Connections.initMySQL();
+//      Connections.initPostgreSQL();
+//      Connections.initTeradata();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        Connections.close();
+    }
+
+    @Test
+    public void test() throws SQLException {
+        Statement stmt = Connections.getStatement();
+        try (ResultSet rs = stmt.executeQuery("select \"GEOMETRY\" from \"SHAPES\"")) {
+            while (rs.next()) {
+                System.err.println(rs.getObject(1).getClass().getName());
+                System.err.println(rs.getString(1));
+//                Clob clob = rs.getClob(1);
+//                System.err.println(clob.getSubString(1, (int) clob.length()));
+            }
+        }
+    }
+
+    @Test
+    public void metadata() throws SQLException {
+        Connection conn = Connections.getConnection();
+        DatabaseMetaData md = conn.getMetaData();
+        try (ResultSet rs = md.getColumns(null, null, "SHAPES", "GEOMETRY")) {
+            rs.next();
+            int type = rs.getInt("DATA_TYPE");
+            String typeName = rs.getString("TYPE_NAME");
+            System.err.println(type + " " + typeName);
+        }
+    }
+
+}
diff --git a/querydsl-sql-spring/pom.xml b/querydsl-sql-spring/pom.xml
new file mode 100644
index 0000000000..8731ecc684
--- /dev/null
+++ b/querydsl-sql-spring/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.querydsl</groupId>
+    <artifactId>querydsl-root</artifactId>
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql-spring</artifactId>
+  <name>Querydsl - SQL Spring support</name>
+  <description>SQL Spring support for Querydsl</description>
+
+
+  <properties>
+    <spring.version>5.3.26</spring.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-sql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringConnectionProvider.java b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringConnectionProvider.java
new file mode 100644
index 0000000000..90f087f394
--- /dev/null
+++ b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringConnectionProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spring;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.datasource.DataSourceUtils;
+
+/**
+ * {@code SpringConnectionProvider} is a Provider implementation which provides a transactionally bound connection
+ *
+ * <p>Usage example</p>
+ * <pre>
+ * {@code
+ * Provider<Connection> provider = new SpringConnectionProvider(dataSource());
+ * SQLQueryFactory queryFactory = SQLQueryFactory(configuration, provider);
+ * }
+ * </pre>
+ */
+public class SpringConnectionProvider implements Supplier<Connection> {
+
+    private final DataSource dataSource;
+
+    public SpringConnectionProvider(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    public Connection get() {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
+        if (!DataSourceUtils.isConnectionTransactional(connection, dataSource)) {
+            throw new IllegalStateException("Connection is not transactional");
+        }
+        return connection;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringExceptionTranslator.java b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringExceptionTranslator.java
new file mode 100644
index 0000000000..88caff976d
--- /dev/null
+++ b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/SpringExceptionTranslator.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.spring;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.springframework.jdbc.support.SQLExceptionTranslator;
+import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
+
+/**
+ * {@code SpringExceptionTranslator} is an {@link SQLExceptionTranslator} implementation which uses Spring's
+ * exception translation functionality internally
+ *
+ * <p>Usage example</p>
+ * <pre>
+ * {@code
+ * Configuration configuration = new Configuration(templates);
+ * configuration.setExceptionTranslator(new SpringExceptionTranslator());
+ * }
+ * </pre>
+ *
+ */
+public class SpringExceptionTranslator implements com.querydsl.sql.SQLExceptionTranslator {
+
+    private final SQLExceptionTranslator translator;
+
+    public SpringExceptionTranslator() {
+        this.translator = new SQLStateSQLExceptionTranslator();
+    }
+
+    public SpringExceptionTranslator(SQLExceptionTranslator translator) {
+        this.translator = translator;
+    }
+
+    @Override
+    public RuntimeException translate(String sql, List<Object> bindings, SQLException e) {
+        return translator.translate(null, sql, e);
+    }
+
+    @Override
+    public RuntimeException translate(SQLException e) {
+        return translator.translate(null, null, e);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/package-info.java b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/package-info.java
new file mode 100644
index 0000000000..628b475f46
--- /dev/null
+++ b/querydsl-sql-spring/src/main/java/com/querydsl/sql/spring/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Spring support
+ */
+package com.querydsl.sql.spring;
diff --git a/querydsl-sql/README.md b/querydsl-sql/README.md
index ddb7938ece..51b21d18c4 100644
--- a/querydsl-sql/README.md
+++ b/querydsl-sql/README.md
@@ -6,60 +6,68 @@ The SQL module provides integration with the JDBC API.
 
  Add the following dependencies to your Maven project :
 
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-sql</artifactId>
-      <version>${querydsl.version}</version>
-    </dependency>    
-            
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.1</version>
-    </dependency>   
+```XML
+<dependency>
+  <groupId>com.querydsl</groupId>
+  <artifactId>querydsl-sql</artifactId>
+  <version>${querydsl.version}</version>
+</dependency>
+```
 
 **Code generation via Maven**
 
 This functionality is also available as a Maven plugin. The presented example can be declared like this in the POM :
-   
-    <plugin>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-maven-plugin</artifactId>
-      <version>${querydsl.version}</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>export</goal>
-          </goals>
-        </execution>            
-      </executions>
-      <configuration>
-        <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
-        <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-        <packageName>com.myproject.domain</packageName>
-        <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder> 
-      </configuration>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.derby</groupId>
-          <artifactId>derby</artifactId>
-          <version>${derby.version}</version>
-        </dependency>
-      </dependencies>
-    </plugin>  
+
+```XML
+<project>
+  <build>
+    <plugins>
+      ...
+      <plugin>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-maven-plugin</artifactId>
+        <version>${querydsl.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>export</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
+          <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
+          <packageName>com.myproject.domain</packageName>
+          <targetFolder>${project.basedir}/target/generated-sources/java</targetFolder>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      ...
+    </plugins>
+  </build>
+</project>
+```
 
 Use the goal test-export to add the targetFolder as a test compile source root instead of a compile source root.
 
 **Querying**
 
 Querying with Querydsl SQL is as simple as this :
- 
-    QCustomer customer = new QCustomer("c");
 
-    SQLTemplates dialect = new HSQLDBTemplates(); // SQL-dialect
-    SQLQuery query = new SQLQuery(connection, dialect); 
-    List<String> lastNames = query.from(customer)
-        .where(customer.firstName.eq("Bob"))
-        .list(customer.lastName);
-        
+```JAVA 
+QCustomer customer = new QCustomer("c");
+
+SQLTemplates dialect = new HSQLDBTemplates(); // SQL-dialect
+SQLQuery<?> query = new SQLQuery<Void>(connection, dialect);
+List<String> lastNames = query.select(customer.lastName)
+    .from(customer)
+    .where(customer.firstName.eq("Bob"))
+    .fetch();
+```
 For more information on the Querydsl SQL module visit the reference documentation http://www.querydsl.com/static/querydsl/latest/reference/html/ch02s03.html
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 2c8dd34043..2a7437dc6b 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -1,70 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.mysema.querydsl</groupId>
+    <groupId>com.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>3.4.1.BUILD-SNAPSHOT</version>
-    <relativePath>../querydsl-root/pom.xml</relativePath> 
+    <version>5.1.0</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.mysema.querydsl</groupId>
+  <groupId>com.querydsl</groupId>
   <artifactId>querydsl-sql</artifactId>
   <name>Querydsl - SQL support</name>
   <description>SQL support for Querydsl</description>
   <packaging>jar</packaging>
 
   <properties>
-    <bridge-method.version>1.11</bridge-method.version>
+    <osgi.import.package>
+      org.joda.time.*;version="[1.6,3)",
+      ${osgi.import.package.root}
+    </osgi.import.package>
+    <argLine>-Xms256m -Xmx512m -Duser.timezone=UTC</argLine>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.mysema.querydsl</groupId>
-      <artifactId>querydsl-spatial</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>com.vividsolutions</groupId>
-      <artifactId>jts</artifactId>
-      <version>1.10</version>
-      <scope>provided</scope>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
-    </dependency>    
+      <version>${jodatime.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>1.0.0.GA</version>
+      <scope>test</scope>
     </dependency>
-       
+
+    <!-- test -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>com.ibm.db2</groupId>
+      <artifactId>jcc</artifactId>
+      <version>${db2.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-        <scope>provided</scope>      
-    </dependency>    
-    
-    <dependency>  
-      <groupId>javax.inject</groupId>  
-      <artifactId>javax.inject</artifactId>  
-      <version>1</version>  
-    </dependency>    
-
-    <!-- test -->
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>${cglib.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
@@ -78,6 +75,12 @@
       <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -88,51 +91,76 @@
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>${postgresql.version}</version>
-      <scope>provided</scope>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.postgis</groupId>
       <artifactId>postgis-jdbc</artifactId>
       <version>1.3.3</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>ojdbc6</artifactId>
+      <groupId>com.oracle.database.jdbc</groupId>
+      <artifactId>ojdbc8</artifactId>
       <version>${oracle.version}</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>oracle</groupId>
       <artifactId>sdoapi</artifactId>
       <version>11.2.0</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>${jtds.version}</version>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>${mssql.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.opengeo</groupId>
-      <artifactId>geodb</artifactId>
-      <version>0.7</version>
+      <groupId>org.orbisgis</groupId>
+      <artifactId>h2gis</artifactId>
+      <version>${h2gis.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jts-core</artifactId>
+          <groupId>org.locationtech.jts</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.jinahya</groupId>
+      <artifactId>cubrid-jdbc-driver-${cubrid.version}</artifactId>
+      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
-      <groupId>cubrid</groupId>
-      <artifactId>cubrid-jdbc</artifactId>
-      <version>${cubrid.version}</version>
+      <groupId>org.firebirdsql.jdbc</groupId>
+      <artifactId>jaybird</artifactId>
+      <version>${firebird.version}</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
 
     <dependency>
       <groupId>org.xerial</groupId>
@@ -142,13 +170,24 @@
     </dependency>
 
     <dependency>
-      <groupId>com.mysema.querydsl</groupId>
+      <groupId>com.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
-    </dependency>    
-    
+    </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.querydsl</groupId>
+      <artifactId>querydsl-spatial</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>jdepend</groupId>
       <artifactId>jdepend</artifactId>
@@ -156,63 +195,34 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- backwards compatibility -->
     <dependency>
-      <groupId>com.infradna.tool</groupId>
-      <artifactId>bridge-method-annotation</artifactId>
-      <version>${bridge-method.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jenkins-ci</groupId>
-          <artifactId>annotation-indexer</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-generator-annprocess</artifactId>
+      <version>${jmh.version}</version>
+      <scope>test</scope>
     </dependency>
+
+    <!-- backwards compatibility -->
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>annotation-indexer</artifactId>
       <version>1.2</version>
       <optional>true</optional>
     </dependency>
-
   </dependencies>
   
   <build>
     <plugins>
       <plugin>
-        <groupId>com.infradna.tool</groupId>
-        <artifactId>bridge-method-injector</artifactId>
-        <version>${bridge-method.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.infradna.tool</groupId>
-            <artifactId>bridge-method-annotation</artifactId>
-            <version>${bridge-method.version}</version>
-            <optional>true</optional>
-            <exclusions>
-              <exclusion>
-                <groupId>org.jenkins-ci</groupId>
-                <artifactId>annotation-indexer</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.jvnet.hudson</groupId>
-            <artifactId>annotation-indexer</artifactId>
-            <version>1.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>com.springsource.bundlor</groupId>
-        <artifactId>com.springsource.bundlor.maven</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
       </plugin>   
     
       <plugin>
@@ -226,6 +236,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>com.querydsl.sql</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -249,11 +266,18 @@
             </property>
           </systemProperties>
         </configuration>
-      </plugin>         
-      
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgument>-proc:none</compilerArgument>
+        </configuration>
+      </plugin>
       <!-- 
       <plugin>
-        <groupId>com.mysema.querydsl</groupId>
+        <groupId>com.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
         <version>${project.version}</version>
         <executions>
@@ -266,7 +290,7 @@
         <configuration>
           <jdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</jdbcDriver>
           <jdbcUrl>jdbc:derby:target/demoDB;create=true</jdbcUrl>
-          <packageName>com.mysema.query.sql.domain2</packageName>
+          <packageName>com.querydsl.sql.domain2</packageName>
           <targetFolder>target/generated-test-sources/java</targetFolder>
         </configuration>
         <dependencies>
@@ -299,19 +323,64 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>java-11</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3.2</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>java-21</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+          <version>${cglib.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.ow2.asm</groupId>
+              <artifactId>asm-commons</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-commons</artifactId>
+          <version>${asm.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
+  <!--TODO upgrade dependencies and get rid of repositories and pluginRepositories -->
   <repositories>
-    <!--for cubrid:cubrid-jdbc -->
-    <repository>
-      <id>CUBRID</id>
-      <url>http://maven.cubrid.org</url>
-    </repository>
-    <!-- for oracle -->
     <repository>
       <id>datanucleus</id>
-      <url>http://www.datanucleus.org/downloads/maven2</url>
+      <url>https://www.datanucleus.org/downloads/maven2</url>
     </repository>
   </repositories>
-  
-</project>
+
+</project>
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
deleted file mode 100644
index 293a52a5f1..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.lang.reflect.InvocationTargetException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.SearchResults;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.util.ResultSetAdapter;
-
-/**
- * AbstractSQLQuery is the base type for SQL query implementations
- *
- * @author tiwe
- *
- * @param <Q> concrete subtype
- */
-public abstract class AbstractSQLQuery<Q extends AbstractSQLQuery<Q>> extends ProjectableSQLQuery<Q> {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbstractSQLQuery.class);
-
-    private static final QueryFlag rowCountFlag = new QueryFlag(QueryFlag.Position.AFTER_PROJECTION, ", count(*) over() ");
-
-    @Nullable
-    private final Connection conn;
-
-    protected SQLListeners listeners;
-
-    protected boolean useLiterals;
-
-    private boolean getLastCell;
-
-    private Object lastCell;
-
-    public AbstractSQLQuery(@Nullable Connection conn, Configuration configuration) {
-        this(conn, configuration, new DefaultQueryMetadata().noValidate());
-    }
- 
-    public AbstractSQLQuery(@Nullable Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(new QueryMixin<Q>(metadata, false), configuration);
-        this.conn = conn;
-        this.listeners = new SQLListeners(configuration.getListeners());
-        this.useLiterals = configuration.getUseLiterals();
-    }
-
-    /**
-     * @param listener
-     */
-    public void addListener(SQLListener listener) {
-        listeners.add(listener);
-    }
-
-    @Override
-    public long count() {
-        try {
-            return unsafeCount();
-        } catch (SQLException e) {
-            String error = "Caught " + e.getClass().getName();
-            logger.error(error, e);
-            throw configuration.translate(e);
-        }
-    }
-
-    /**
-     * If you use forUpdate() with a backend that uses page or row locks, rows examined by the
-     * query are write-locked until the end of the current transaction.
-     *
-     * Not supported for SQLite and CUBRID
-     *
-     * @return
-     */
-    public Q forUpdate() {
-        return addFlag(SQLOps.FOR_UPDATE_FLAG);
-    }
-
-    protected SQLSerializer createSerializer() {
-        SQLSerializer serializer = new SQLSerializer(configuration);
-        serializer.setUseLiterals(useLiterals);
-        return serializer;
-    }
-
-    @Nullable
-    private <T> T get(ResultSet rs, Expression<?> expr, int i, Class<T> type) throws SQLException {
-        return configuration.get(rs, expr instanceof Path ? (Path<?>)expr : null, i, type);
-    }
-
-    private void set(PreparedStatement stmt, Path<?> path, int i, Object value) throws SQLException{
-        configuration.set(stmt, path, i, value);
-    }
-
-    /**
-     * Get the results as an JDBC result set
-     *
-     * @param args
-     * @return
-     */
-    public ResultSet getResults(Expression<?>... exprs) {
-        queryMixin.addProjection(exprs);
-        SQLSerializer serializer = serialize(false);
-        String queryString = serializer.toString();
-        if (logger.isDebugEnabled()) {
-            logger.debug("query : {}", queryString);
-        }
-        listeners.notifyQuery(queryMixin.getMetadata());
-
-        List<Object> constants = serializer.getConstants();
-        try {
-            final PreparedStatement stmt = conn.prepareStatement(queryString);
-            setParameters(stmt, constants, serializer.getConstantPaths(), getMetadata().getParams());
-            final ResultSet rs = stmt.executeQuery();
-
-            return new ResultSetAdapter(rs) {
-                @Override
-                public void close() throws SQLException {
-                    try {
-                        super.close();
-                    } finally {
-                        stmt.close();
-                    }
-                }
-            };
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            reset();
-        }
-    }
-
-    protected Configuration getConfiguration() {
-        return configuration;
-    }
-    
-    @Override
-    public <RT> CloseableIterator<RT> iterate(Expression<RT> expr) {
-        expr = queryMixin.addProjection(expr);
-        return iterateSingle(queryMixin.getMetadata(), expr);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <RT> CloseableIterator<RT> iterateSingle(QueryMetadata metadata, @Nullable final Expression<RT> expr) {
-        SQLSerializer serializer = serialize(false);
-        final String queryString = serializer.toString();
-        if (logger.isDebugEnabled()) {
-            logger.debug("query : {}", queryString);
-        }
-        listeners.notifyQuery(queryMixin.getMetadata());
-        List<Object> constants = serializer.getConstants();
-        try {
-            final PreparedStatement stmt = conn.prepareStatement(queryString);
-            setParameters(stmt, constants, serializer.getConstantPaths(), metadata.getParams());
-            final ResultSet rs = stmt.executeQuery();
-
-            if (expr == null) {
-                return new SQLResultIterator<RT>(configuration, stmt, rs) {
-                    @Override
-                    public RT produceNext(ResultSet rs) throws Exception {
-                        return (RT) rs.getObject(1);
-                    }
-                };
-            } else if (expr instanceof FactoryExpression) {
-                return new SQLResultIterator<RT>(configuration, stmt, rs) {
-                    @Override
-                    public RT produceNext(ResultSet rs) throws Exception {
-                        return newInstance((FactoryExpression<RT>) expr, rs, 0);
-                    }
-                };
-            } else if (expr.getType().isArray()) {
-                return new SQLResultIterator<RT>(configuration, stmt, rs) {
-                    @Override
-                    public RT produceNext(ResultSet rs) throws Exception {
-                        Object[] rv = new Object[rs.getMetaData().getColumnCount()];
-                        for (int i = 0; i < rv.length; i++) {
-                            rv[i] = rs.getObject(i+1);
-                        }
-                        return (RT) rv;
-                    }
-                };
-            } else {
-                return new SQLResultIterator<RT>(configuration, stmt, rs) {
-                    @Override
-                    public RT produceNext(ResultSet rs) throws Exception {
-                        return get(rs, expr, 1, expr.getType());
-                    }
-                };
-            }
-
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            reset();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <RT> List<RT> list(Expression<RT> expr) {
-        expr = queryMixin.addProjection(expr);
-        SQLSerializer serializer = serialize(false);
-        final String queryString = serializer.toString();
-        if (logger.isDebugEnabled()) {
-            logger.debug("query : {}", queryString);
-        }
-        listeners.notifyQuery(queryMixin.getMetadata());
-        List<Object> constants = serializer.getConstants();
-        try {
-            final PreparedStatement stmt = conn.prepareStatement(queryString);
-            try {
-                setParameters(stmt, constants, serializer.getConstantPaths(), queryMixin.getMetadata().getParams());
-                final ResultSet rs = stmt.executeQuery();
-                try {
-                    lastCell = null;
-                    final List<RT> rv = new ArrayList<RT>();
-                    if (expr instanceof FactoryExpression) {
-                        FactoryExpression<RT> fe = (FactoryExpression<RT>)expr;
-                        while (rs.next()) {
-                            if (getLastCell) {
-                                lastCell = rs.getObject(fe.getArgs().size() + 1);
-                                getLastCell = false;
-                            }
-                            rv.add(newInstance(fe, rs, 0));
-                        }
-                    }  else if (expr.getType().isArray()) {
-                        while (rs.next()) {
-                            Object[] row = new Object[rs.getMetaData().getColumnCount()];
-                            if (getLastCell) {
-                                lastCell = rs.getObject(row.length);
-                                getLastCell = false;
-                            }
-                            for (int i = 0; i < row.length; i++) {
-                                row[i] = rs.getObject(i+1);
-                            }
-                            rv.add((RT)row);
-                        }
-                    } else {
-                        while (rs.next()) {
-                            if (getLastCell) {
-                                lastCell = rs.getObject(2);
-                                getLastCell = false;
-                            }
-                            rv.add(get(rs, expr, 1, expr.getType()));
-                        }
-                    }
-                    return rv;
-                } catch (IllegalAccessException e) {
-                    throw new QueryException(e);
-                } catch (InvocationTargetException e) {
-                    throw new QueryException(e);
-                } catch (InstantiationException e) {
-                    throw new QueryException(e);
-                } catch (SQLException e) {
-                    throw configuration.translate(queryString, constants, e);
-                } finally {
-                    rs.close();
-                }
-            } finally {
-                stmt.close();
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            reset();
-        }
-    }
-
-    @Override
-    public <RT> SearchResults<RT> listResults(Expression<RT> expr) {
-        try {
-            if (configuration.getTemplates().isCountViaAnalytics()) {
-                List<RT> results;
-                try {
-                    queryMixin.addFlag(rowCountFlag);
-                    getLastCell = true;
-                    results = list(expr);
-                } finally {
-                    queryMixin.removeFlag(rowCountFlag);
-                }
-                long total;
-                if (!results.isEmpty()) {
-                    if (lastCell instanceof Number) {
-                        total = ((Number)lastCell).longValue();
-                    } else {
-                        throw new IllegalStateException("Unsupported lastCell instance " + lastCell);
-                    }
-                } else {
-                    total = count();
-                }
-                QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-                return new SearchResults<RT>(results, modifiers, total);
-
-            } else {
-                queryMixin.addProjection(expr);
-                long total = count();
-                if (total > 0) {
-                    queryMixin.getMetadata().clearProjection();
-                    QueryModifiers modifiers = queryMixin.getMetadata().getModifiers();
-                    return new SearchResults<RT>(list(expr), modifiers, total);
-                } else {
-                    return SearchResults.emptyResults();
-                }
-            }
-
-        } finally {
-            getLastCell = false;
-            reset();
-        }
-    }
-
-    private <RT> RT newInstance(FactoryExpression<RT> c, ResultSet rs, int offset)
-        throws InstantiationException, IllegalAccessException, InvocationTargetException, SQLException{
-        Object[] args = new Object[c.getArgs().size()];
-        for (int i = 0; i < args.length; i++) {
-            args[i] = get(rs, c.getArgs().get(i), offset + i + 1, c.getArgs().get(i).getType());
-        }
-        return c.newInstance(args);
-    }
-
-    private void reset() {
-        queryMixin.getMetadata().reset();
-    }
-
-    protected void setParameters(PreparedStatement stmt, List<?> objects, List<Path<?>> constantPaths,
-            Map<ParamExpression<?>, ?> params) {
-        if (objects.size() != constantPaths.size()) {
-            throw new IllegalArgumentException("Expected " + objects.size() +
-                    " paths, but got " + constantPaths.size());
-        }
-        for (int i = 0; i < objects.size(); i++) {
-            Object o = objects.get(i);
-            try {
-                if (o instanceof ParamExpression) {
-                    if (!params.containsKey(o)) {
-                        throw new ParamNotSetException((ParamExpression<?>) o);
-                    }
-                    o = params.get(o);
-                }
-                set(stmt, constantPaths.get(i), i+1, o);
-            } catch (SQLException e) {
-                throw configuration.translate(e);
-            }
-        }
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        if (getMetadata().getModifiers().getLimit() == null
-           && !expr.toString().contains("count(")) {
-            limit(2);
-        }
-        CloseableIterator<RT> iterator = iterate(expr);
-        return uniqueResult(iterator);
-    }
-
-    private long unsafeCount() throws SQLException {
-        SQLSerializer serializer = serialize(true);
-        final String queryString = serializer.toString();
-        if (logger.isDebugEnabled()) {
-            logger.debug("query : {}", queryString);
-        }
-        List<Object> constants = serializer.getConstants();
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
-        try {
-            stmt = conn.prepareStatement(queryString);
-            setParameters(stmt, constants, serializer.getConstantPaths(), getMetadata().getParams());
-            rs = stmt.executeQuery();
-            rs.next();
-            return rs.getLong(1);
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            try {
-                if (rs != null) {
-                    rs.close();
-                }
-            } finally {
-                if (stmt != null) {
-                    stmt.close();
-                }
-            }
-        }
-    }
-
-    public void setUseLiterals(boolean useLiterals) {
-        this.useLiterals = useLiterals;
-    }
-    
-    @Override
-    protected void clone(Q query) {
-        super.clone(query);
-        this.useLiterals = query.useLiterals;
-        this.listeners = new SQLListeners(query.listeners);
-    }
-    
-    @Override
-    public Q clone() {
-        return this.clone(this.conn);
-    }
-    
-    public abstract Q clone(Connection connection);
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java
deleted file mode 100644
index dd045ae178..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQueryFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import com.mysema.query.sql.dml.SQLDeleteClause;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.dml.SQLMergeClause;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * AbstractSQLQueryFactory is the base class for {@link SQLCommonQueryFactory} implementations
- *
- * @author tiwe
- *
- */
-public abstract class AbstractSQLQueryFactory<Q extends SQLCommonQuery<Q>, SQ extends AbstractSQLSubQuery<SQ>> implements SQLCommonQueryFactory<Q, SQ,
-    SQLDeleteClause, SQLUpdateClause, SQLInsertClause, SQLMergeClause> {
-
-    protected final Configuration configuration;
-
-    protected final Provider<Connection> connection;
-
-    public AbstractSQLQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        this.configuration = configuration;
-        this.connection = connection;
-    }
-
-    @Override
-    public final SQLDeleteClause delete(RelationalPath<?> path) {
-        return new SQLDeleteClause(connection.get(), configuration, path);
-    }
-
-    @Override
-    public final Q from(Expression<?> from) {
-        return (Q) query().from(from);
-    }
-
-    public final Q from(Expression<?>... args) {
-        return (Q) query().from(args);
-    }
-
-    public final Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
-        return (Q) query().from(subQuery, alias);
-    }
-
-    @Override
-    public final SQLInsertClause insert(RelationalPath<?> path) {
-        return new SQLInsertClause(connection.get(), configuration, path);
-    }
-
-    @Override
-    public final SQLMergeClause merge(RelationalPath<?> path) {
-        return new SQLMergeClause(connection.get(), configuration, path);
-    }
-
-    @Override
-    public final SQLUpdateClause update(RelationalPath<?> path) {
-        return new SQLUpdateClause(connection.get(), configuration, path);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    @WithBridgeMethods(value=SQLSubQuery.class, castRequired=true)
-    public SQ subQuery() {
-        return (SQ) new SQLSubQuery();
-    }
-
-    @Override
-    @WithBridgeMethods(value=SQLSubQuery.class, castRequired=true)
-    public final SQ subQuery(Expression<?> from) {
-        return subQuery().from(from);
-    }
-
-    public final Configuration getConfiguration() {
-        return configuration;
-    }
-
-    public final Connection getConnection() {
-        return connection.get();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLSubQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLSubQuery.java
deleted file mode 100644
index e31337e294..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLSubQuery.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryMetadata;
-
-/**
- * Abstract superclass for SubQuery implementations
- *
- * @author tiwe
- *
- */
-public abstract class AbstractSQLSubQuery<Q extends AbstractSQLSubQuery<Q>> extends DetachableSQLQuery<Q>
-{
-
-    public AbstractSQLSubQuery()
-    {
-        super();
-    }
-
-    public AbstractSQLSubQuery(QueryMetadata metadata)
-    {
-        super(metadata);
-    }
-
-    public AbstractSQLSubQuery(Configuration configuration, QueryMetadata metadata)
-    {
-        super(configuration, metadata);
-    }
-
-    protected SQLSerializer createSerializer()
-    {
-        return new SQLSerializer(configuration);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java
deleted file mode 100644
index b1daa48dff..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Ops;
-
-/**
- * CUBRIDTemplates is a SQL dialect for CUBRID
- *
- * @author tiwe
- *
- */
-public class CUBRIDTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new CUBRIDTemplates(escape, quote);
-            }
-        };
-    }
-
-    private String limitTemplate = "\nlimit {0}";
-
-    private String offsetLimitTemplate = "\nlimit {0}, {1}";
-
-    public CUBRIDTemplates() {
-        this('\\', false);
-    }
-
-    public CUBRIDTemplates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public CUBRIDTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setDummyTable(null);
-        setParameterMetadataAvailable(false);
-        setNullsFirst(null);
-        setNullsLast(null);
-        setDefaultValues("\ndefault values");
-
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(year({0}) * 100 + week({0}))");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "date_add({0}, interval {1s} year)");
-        add(Ops.DateTimeOps.ADD_MONTHS, "date_add({0}, interval {1s} month)");
-        add(Ops.DateTimeOps.ADD_WEEKS, "date_add({0}, interval {1s} week)");
-        add(Ops.DateTimeOps.ADD_DAYS, "date_add({0}, interval {1s} day)");
-        add(Ops.DateTimeOps.ADD_HOURS, "date_add({0}, interval {1s} hour)");
-        add(Ops.DateTimeOps.ADD_MINUTES, "date_add({0}, interval {1s} minute)");
-        add(Ops.DateTimeOps.ADD_SECONDS, "date_add({0}, interval {1s} second)");
-
-        add(Ops.MathOps.LN, "ln({0})");
-        add(Ops.MathOps.LOG, "(ln({0}) / ln({1}))");
-        add(Ops.MathOps.COSH, "(exp({0}) + exp({0} * -1)) / 2");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
-        add(Ops.MathOps.TANH, "(exp({0} * 2) - 1) / (exp({0} * 2) + 1)");
-    }
-
-    @Override
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.getLimit() != null) {
-            if (mod.getOffset() != null) {
-                context.handle(offsetLimitTemplate, mod.getOffset(), mod.getLimit());
-            } else {
-                context.handle(limitTemplate, mod.getLimit());
-            }
-        } else if (mod.getOffset() != null) {
-            context.handle(offsetLimitTemplate, mod.getOffset(), Integer.MAX_VALUE);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java b/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
deleted file mode 100644
index 85f00ed6cc..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Configuration.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.sql.types.Type;
-import com.mysema.query.types.Path;
-
-/**
- * Configuration for SQLQuery instances
- *
- * @author tiwe
- *
- */
-public final class Configuration {
-
-    public static final Configuration DEFAULT = new Configuration(SQLTemplates.DEFAULT);
-
-    private final JDBCTypeMapping jdbcTypeMapping = new JDBCTypeMapping();
-
-    private final JavaTypeMapping javaTypeMapping = new JavaTypeMapping();
-
-    private final Map<SchemaAndTable, SchemaAndTable> schemaTables = Maps.newHashMap();
-
-    private final Map<String, String> schemas = Maps.newHashMap();
-
-    private final Map<String, String> tables = Maps.newHashMap();
-
-    private final Map<SchemaAndTable, Map<String, String>> schemaTableColumns = Maps.newHashMap();
-
-    private final Map<String, Map<String, String>> tableColumns = Maps.newHashMap();
-
-    private final Map<String, Class<?>> typeToName = Maps.newHashMap();
-
-    private final SQLTemplates templates;
-
-    private SQLExceptionTranslator exceptionTranslator = DefaultSQLExceptionTranslator.DEFAULT;
-
-    private final SQLListeners listeners = new SQLListeners();
-
-    private boolean hasTableColumnTypes = false;
-
-    private boolean useLiterals = false;
-
-    /**
-     * Create a new Configuration instance
-     *
-     * @param templates
-     */
-    public Configuration(SQLTemplates templates) {
-        this.templates = templates;
-        for (Type<?> customType : templates.getCustomTypes()) {
-            javaTypeMapping.register(customType);
-        }
-        for (Map.Entry<SchemaAndTable, SchemaAndTable> entry : templates.getTableOverrides().entrySet()) {
-            schemaTables.put(entry.getKey(), entry.getValue());
-        }
-    }
-
-    /**
-     * Get the literal representation of the given constant
-     *
-     * @param o
-     * @return
-     */
-    public String asLiteral(Object o) {
-        Type type = javaTypeMapping.getType(o.getClass());
-        if (type != null) {
-            return templates.serialize(type.getLiteral(o), type.getSQLTypes()[0]);
-        } else {
-            throw new IllegalArgumentException("Unsupported literal type " + o.getClass().getName());
-        }
-    }
-
-    public SQLTemplates getTemplates() {
-        return templates;
-    }
-
-    /**
-     * Use the other getJavaType method instead
-     *
-     * @param sqlType
-     * @param size
-     * @param digits
-     * @param tableName
-     * @param columnName
-     * @return
-     */
-    @Deprecated
-    public Class<?> getJavaType(int sqlType, int size, int digits, String tableName, String columnName) {
-        return getJavaType(sqlType, null, size, digits, tableName, columnName);
-    }
-
-    /**
-     * Get the java type for the given jdbc type, table name and column name
-     *
-     * @param sqlType
-     * @param typeName
-     * @param size
-     * @param digits
-     * @param tableName
-     * @param columnName
-     * @return
-     */
-    public Class<?> getJavaType(int sqlType, String typeName, int size, int digits, String tableName, String columnName) {
-        // table.column mapped class
-        Type<?> type = javaTypeMapping.getType(tableName, columnName);
-        if (type != null) {
-            return type.getReturnedClass();
-        } else if (typeName != null && !typeToName.isEmpty()) {
-            // typename mapped class
-            Class<?> clazz = typeToName.get(typeName.toLowerCase());
-            if (clazz != null) {
-                return clazz;
-            }
-        }
-        // sql type mapped class
-        return jdbcTypeMapping.get(sqlType, size, digits);
-    }
-
-    /**
-     * @param <T>
-     * @param rs
-     * @param path
-     * @param i
-     * @param clazz
-     * @return
-     * @throws SQLException
-     */
-    @Nullable
-    public <T> T get(ResultSet rs, @Nullable Path<?> path, int i, Class<T> clazz) throws SQLException {
-        return getType(path, clazz).getValue(rs, i);
-    }
-
-    /**
-     * Use getOverride instead
-     *
-     * @param schema
-     * @return
-     */
-    @Deprecated
-    public String getSchema(String schema) {
-        return schemas.get(schema);
-    }
-
-    /**
-     * Use getOverride instead
-     *
-     * @param schema
-     * @param table
-     * @return
-     */
-    @Deprecated
-    public String getTable(String schema, String table) {
-        return getOverride(new SchemaAndTable(schema, table)).getTable();
-    }
-
-    /**
-     * Get the schema/table override
-     *
-     * @param schema
-     * @param table
-     * @return
-     */
-    @Nullable
-    public SchemaAndTable getOverride(SchemaAndTable key) {
-        if (!schemaTables.isEmpty() && key.getSchema() != null) {
-            if (schemaTables.containsKey(key)) {
-                return schemaTables.get(key);
-            }
-        }
-        String schema = key.getSchema(), table = key.getTable();
-        boolean changed = false;
-        if (schemas.containsKey(key.getSchema())) {
-            schema = schemas.get(key.getSchema());
-            changed = true;
-        }
-
-        if (tables.containsKey(key.getTable())) {
-            table = tables.get(key.getTable());
-            changed = true;
-        }
-        return changed ? new SchemaAndTable(schema, table) : key;
-    }
-
-    /**
-     * Get the column override
-     *
-     * @param key
-     * @param column
-     * @return
-     */
-    public String getColumnOverride(SchemaAndTable key, String column) {
-        Map<String, String> columnOverrides;
-        String newColumn = null;
-        columnOverrides = schemaTableColumns.get(key);
-        if (columnOverrides != null && (newColumn = columnOverrides.get(column)) != null) {
-            return newColumn;
-        }
-        columnOverrides = tableColumns.get(key.getTable());
-        if (columnOverrides != null && (newColumn = columnOverrides.get(column)) != null) {
-            return newColumn;
-        }
-        return column;
-
-    }
-
-    /**
-     * @param <T>
-     * @param stmt
-     * @param path
-     * @param i
-     * @param value
-     * @return
-     * @throws SQLException
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> void set(PreparedStatement stmt, Path<?> path, int i, T value) throws SQLException {
-        if (Null.class.isInstance(value)) {
-            Integer sqlType = path != null ? jdbcTypeMapping.get(path.getType()) : null;
-            if (sqlType != null) {
-                stmt.setNull(i, sqlType);
-            } else {
-                stmt.setNull(i, Types.NULL);
-            }
-        } else {
-            getType(path, (Class)value.getClass()).setValue(stmt, i, value);
-        }
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private <T> Type<T> getType(@Nullable Path<?> path, Class<T> clazz) {
-        if (hasTableColumnTypes && path != null && !clazz.equals(Null.class)
-                && path.getMetadata().getParent() instanceof RelationalPath) {
-            String table = ((RelationalPath)path.getMetadata().getParent()).getTableName();
-            String column = ColumnMetadata.getName(path);
-            Type<T> type = (Type)javaTypeMapping.getType(table, column);
-            if (type != null) {
-                return type;
-            }
-        }
-        return javaTypeMapping.getType(clazz);
-    }
-
-    /**
-     * Register a schema override
-     *
-     * @param oldSchema
-     * @param newSchema
-     * @return
-     */
-    public String registerSchemaOverride(String oldSchema, String newSchema) {
-        return schemas.put(oldSchema, newSchema);
-    }
-
-    /**
-     * Register a table override
-     *
-     * @param oldTable
-     * @param newTable
-     * @return
-     */
-    public String registerTableOverride(String oldTable, String newTable) {
-        return tables.put(oldTable, newTable);
-    }
-
-    /**
-     * Register a schema specific table override
-     *
-     * @param schema
-     * @param oldTable
-     * @param newTable
-     * @return
-     */
-    public String registerTableOverride(String schema, String oldTable, String newTable) {
-        SchemaAndTable st = registerTableOverride(schema, oldTable, schema, newTable);
-        return st != null ? st.getTable() : null;
-    }
-
-    /**
-     * Register a schema specific table override
-     *
-     * @param schema
-     * @param oldTable
-     * @param newSchema
-     * @param newTable
-     * @return
-     */
-    public SchemaAndTable registerTableOverride(String schema, String oldTable, String newSchema, String newTable) {
-        return registerTableOverride(new SchemaAndTable(schema, oldTable), new SchemaAndTable(newSchema, newTable));
-    }
-
-    /**
-     * Register a schema specific table override
-     *
-     * @param from
-     * @param to
-     * @return
-     */
-    public SchemaAndTable registerTableOverride(SchemaAndTable from, SchemaAndTable to) {
-        return schemaTables.put(from, to);
-    }
-
-    /**
-     * Register a column override
-     *
-     * @param schema
-     * @param table
-     * @param oldColumn
-     * @param newColumn
-     * @return
-     */
-    public String registerColumnOverride(String schema, String table, String oldColumn, String newColumn) {
-        SchemaAndTable key = new SchemaAndTable(schema, table);
-        Map<String, String> columnOverrides = schemaTableColumns.get(key);
-        if (columnOverrides == null) {
-            columnOverrides = new HashMap<String, String>();
-            schemaTableColumns.put(key, columnOverrides);
-        }
-        return columnOverrides.put(oldColumn, newColumn);
-    }
-
-    /**
-     * Register a column override
-     *
-     * @param table
-     * @param oldColumn
-     * @param newColumn
-     * @return
-     */
-    public String registerColumnOverride(String table, String oldColumn, String newColumn) {
-        Map<String, String> columnOverrides = tableColumns.get(table);
-        if (columnOverrides == null) {
-            columnOverrides = new HashMap<String, String>();
-            tableColumns.put(table, columnOverrides);
-        }
-        return columnOverrides.put(oldColumn, newColumn);
-    }
-
-    /**
-     * Register the given {@link Type} converter
-     *
-     * @param type
-     */
-    public void register(Type<?> type) {
-        jdbcTypeMapping.register(type.getSQLTypes()[0], type.getReturnedClass());
-        javaTypeMapping.register(type);
-    }
-
-    /**
-     * Register a typeName to Class mapping
-     *
-     * @param typeName
-     * @param clazz
-     */
-    public void registerType(String typeName, Class<?> clazz) {
-        typeToName.put(typeName.toLowerCase(), clazz);
-    }
-
-    /**
-     * Override the binding for the given NUMERIC type
-     *
-     * @param total total amount of digits
-     * @param decimal amount of fractional digits
-     * @param javaType
-     */
-    public void registerNumeric(int total, int decimal, Class<?> javaType) {
-        jdbcTypeMapping.registerNumeric(total, decimal, javaType);
-    }
-
-    /**
-     * Register the given javaType for the given table and column
-     *
-     * @param table
-     * @param column
-     * @param javaType
-     */
-    public void register(String table, String column, Class<?> javaType) {
-        register(table, column, javaTypeMapping.getType(javaType));
-    }
-
-    /**
-     * Register the given {@link Type} converter for the given table and column
-     *
-     * @param table
-     * @param column
-     * @param type
-     */
-    public void register(String table, String column, Type<?> type) {
-        javaTypeMapping.setType(table, column, type);
-        hasTableColumnTypes = true;
-    }
-
-    /**
-     * Translate the given SQLException
-     *
-     * @param ex
-     * @return
-     */
-    public RuntimeException translate(SQLException ex) {
-        return exceptionTranslator.translate(ex);
-    }
-
-    /**
-     * Translate the given SQLException
-     *
-     * @param sql
-     * @param ex
-     * @return
-     */
-    public RuntimeException translate(String sql, List<Object> bindings, SQLException ex) {
-        return exceptionTranslator.translate(sql, bindings, ex);
-    }
-
-    /**
-     * @param listeners
-     */
-    public void addListener(SQLListener listener) {
-        listeners.add(listener);
-    }
-
-    /**
-     * @return
-     */
-    public SQLListeners getListeners() {
-        return listeners;
-    }
-
-    /**
-     * @return
-     */
-    public boolean getUseLiterals() {
-        return useLiterals;
-    }
-
-    /**
-     * @param useLiterals
-     */
-    public void setUseLiterals(boolean useLiterals) {
-        this.useLiterals = useLiterals;
-    }
-
-    /**
-     * @param exceptionTranslator
-     */
-    public void setExceptionTranslator(SQLExceptionTranslator exceptionTranslator) {
-        this.exceptionTranslator = exceptionTranslator;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DefaultSQLExceptionTranslator.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DefaultSQLExceptionTranslator.java
deleted file mode 100644
index e299de94bc..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DefaultSQLExceptionTranslator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.SQLException;
-import java.util.List;
-
-import com.mysema.query.QueryException;
-
-/**
- * Default implementation of the SQLExceptionTranslator interface
- *
- * @author tiwe
- *
- */
-public final class DefaultSQLExceptionTranslator implements SQLExceptionTranslator {
-
-    public static final SQLExceptionTranslator DEFAULT = new DefaultSQLExceptionTranslator();
-
-    @Override
-    public RuntimeException translate(SQLException e) {
-        return new QueryException(e);
-    }
-
-    @Override
-    public RuntimeException translate(String sql, List<Object> bindings, SQLException e) {
-        return new QueryException("Caught " + e.getClass().getSimpleName() + " for " + sql, e);
-    }
-
-    private DefaultSQLExceptionTranslator() {}
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java
deleted file mode 100644
index 17c53fd73a..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Ops;
-
-import java.sql.Types;
-
-/**
- * DerbyTemplates is an SQL dialect for Derby
- *
- * @author tiwe
- *
- */
-public class DerbyTemplates extends SQLTemplates {
-
-    private String limitOffsetTemplate = "\noffset {1s} rows fetch next {0s} rows only";
-
-    private String limitTemplate = "\nfetch first {0s} rows only";
-
-    private String offsetTemplate = "\noffset {0s} rows";
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new DerbyTemplates(escape, quote);
-            }
-        };
-    }
-
-    public DerbyTemplates() {
-        this('\\',false);
-    }
-
-    public DerbyTemplates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public DerbyTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setDummyTable("sysibm.sysdummy1");
-        addClass2TypeMappings("smallint", Byte.class);
-        setAutoIncrement(" generated always as identity");
-        setFunctionJoinsWrapped(true);
-        setDefaultValues("\nvalues (default)");
-
-        add(Ops.CONCAT, "varchar({0} || {1})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
-
-        add(SQLOps.NEXTVAL, "next value for {0s}");
-
-        // case for eq
-        add(Ops.CASE_EQ, "case {1} end");
-        add(Ops.CASE_EQ_WHEN,  "when {0} = {1} then {2} {3}");
-        add(Ops.CASE_EQ_ELSE,  "else {0}");
-
-        add(Ops.MathOps.RANDOM, "random()");
-        add(Ops.MathOps.ROUND, "floor({0})"); // FIXME
-        add(Ops.MathOps.POWER, "exp({1} * log({0}))");
-        add(Ops.MathOps.LN, "log({0})");
-        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-
-        // overrides of the SQL standard functions
-        add(Ops.DateTimeOps.SECOND, "second({0})");
-        add(Ops.DateTimeOps.MINUTE, "minute({0})");
-        add(Ops.DateTimeOps.HOUR, "hour({0})");
-        add(Ops.DateTimeOps.WEEK, "week({0})");
-        add(Ops.DateTimeOps.MONTH, "month({0})");
-        add(Ops.DateTimeOps.YEAR, "year({0})");
-        add(Ops.DateTimeOps.YEAR_MONTH, "(year({0}) * 100 + month({0}))");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(year({0}) * 100 + week({0}))");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "{fn timestampadd(SQL_TSI_YEAR, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_MONTHS, "{fn timestampadd(SQL_TSI_MONTH, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_WEEKS, "{fn timestampadd(SQL_TSI_WEEK, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_DAYS, "{fn timestampadd(SQL_TSI_DAY, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_HOURS, "{fn timestampadd(SQL_TSI_HOUR, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_MINUTES, "{fn timestampadd(SQL_TSI_MINUTE, {1}, {0})}");
-        add(Ops.DateTimeOps.ADD_SECONDS, "{fn timestampadd(SQL_TSI_SECOND, {1}, {0})}");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "{fn timestampdiff(SQL_TSI_YEAR, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "{fn timestampdiff(SQL_TSI_MONTH, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "{fn timestampdiff(SQL_TSI_WEEK, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_DAYS, "{fn timestampdiff(SQL_TSI_DAY, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_HOURS, "{fn timestampdiff(SQL_TSI_HOUR, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "{fn timestampdiff(SQL_TSI_MINUTE, {0}, {1})}");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "{fn timestampdiff(SQL_TSI_SECOND, {0}, {1})}");
-
-        // left via substr
-        add(Ops.StringOps.LEFT, "substr({0},1,{1})");
-    }
-
-    @Override
-    public String serialize(String literal, int jdbcType) {
-        if (jdbcType == Types.TIMESTAMP) {
-            return "{ts '" + literal + "'}";
-        } else if (jdbcType == Types.DATE) {
-            return "{d '" + literal + "'}";
-        } else if (jdbcType == Types.TIME) {
-            return "{t '" + literal + "'}";
-        } else {
-            return super.serialize(literal, jdbcType);
-        }
-    }
-
-    @Override
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.getLimit() == null) {
-            context.handle(offsetTemplate, mod.getOffset());
-        } else if (mod.getOffset() == null) {
-            context.handle(limitTemplate, mod.getLimit());
-        } else {
-            context.handle(limitOffsetTemplate, mod.getLimit(), mod.getOffset());
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java
deleted file mode 100644
index 5cdf8bc70e..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DetachableSQLQuery.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.DetachableQuery;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.CollectionExpressionBase;
-import com.mysema.query.types.expr.CollectionOperation;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-
-/**
- * Abstract superclass for SubQuery implementations
- *
- * @author tiwe
- *
- */
-public abstract class DetachableSQLQuery<Q extends DetachableSQLQuery<Q>> extends DetachableQuery<Q> implements SQLCommonQuery<Q> {
-
-    protected final Configuration configuration;
-    
-    public DetachableSQLQuery() {
-        this(new DefaultQueryMetadata().noValidate());
-    }
-    
-    public DetachableSQLQuery(QueryMetadata metadata) {
-        this(Configuration.DEFAULT, metadata);
-    }
-
-    @SuppressWarnings("unchecked")
-    public DetachableSQLQuery(Configuration configuration, QueryMetadata metadata) {
-        super(new QueryMixin<Q>(metadata));
-        this.queryMixin.setSelf((Q)this);
-        this.configuration = configuration;
-    }
-
-    /**
-     * Add the given prefix and expression as a general query flag
-     *
-     * @param position position of the flag
-     * @param prefix prefix for the flag
-     * @param expr expression of the flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q addFlag(Position position, String prefix, Expression<?> expr) {
-        Expression<?> flag = TemplateExpressionImpl.create(expr.getType(), prefix + "{0}", expr);
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    /**
-     * Add the given String literal as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q addFlag(Position position, String flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    /**
-     * Add the given Expression as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q addFlag(Position position, Expression<?> flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    /**
-     * Add the given String literal as a join flag to the last added join with the
-     * position BEFORE_TARGET
-     *
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q addJoinFlag(String flag) {
-        return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
-    }
-
-    /**
-     * Add the given String literal as a join flag to the last added join
-     *
-     * @param flag
-     * @param position
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    @SuppressWarnings("unchecked")
-    public Q addJoinFlag(String flag, JoinFlag.Position position) {
-        queryMixin.addJoinFlag(new JoinFlag(flag, position));
-        return (Q)this;
-    }
-
-    @Override
-    public BooleanExpression exists() {
-        return unique(NumberTemplate.ONE).exists();
-    }
-
-    @Override
-    public BooleanExpression notExists() {
-        return exists().not();
-    }
-
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q from(Expression<?> arg) {
-        return queryMixin.from(arg);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q from(Expression<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
-        return queryMixin.from(ExpressionUtils.as((Expression)subQuery, alias));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q fullJoin(EntityPath<?> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.fullJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q fullJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q innerJoin(EntityPath<?> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.innerJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q innerJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q join(EntityPath<?> target) {
-        return queryMixin.join(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q join(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q join(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.join(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q join(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q leftJoin(EntityPath<?> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q leftJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.leftJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q leftJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q on(Predicate condition) {
-        return queryMixin.on(condition);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q on(Predicate... conditions) {
-        return queryMixin.on(conditions);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q rightJoin(EntityPath<?> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public <E> Q rightJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.rightJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q rightJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private <T> CollectionExpressionBase<?,T> union(Operator<Object> op, List<? extends SubQueryExpression<?>> sq) {
-        Expression<?> rv = sq.get(0);
-        if (sq.size() == 1 && !CollectionExpression.class.isInstance(rv)) {
-            return new ListSubQuery(rv.getType(), sq.get(0).getMetadata());
-        } else {
-            Class<?> elementType = sq.get(0).getType();
-            if (rv instanceof CollectionExpression) {
-                elementType = ((CollectionExpression)rv).getParameter(0);
-            }
-            for (int i = 1; i < sq.size(); i++) {
-                rv = CollectionOperation.create(op, (Class)elementType, rv, sq.get(i));
-            }
-            return (CollectionExpressionBase<?,T>)rv;
-        }
-    }
-
-    public <T> CollectionExpressionBase<?,T> union(List<? extends SubQueryExpression<T>> sq) {
-        return union(SQLOps.UNION, sq);
-    }
-
-    public <T> CollectionExpressionBase<?,T> union(ListSubQuery<T>... sq) {
-        return union(SQLOps.UNION, Arrays.asList(sq));
-    }
-
-    public <T> CollectionExpressionBase<?,T> union(SubQueryExpression<T>... sq) {
-        return union(SQLOps.UNION, Arrays.asList(sq));
-    }
-
-    public <T> CollectionExpressionBase<?,T> unionAll(List<? extends SubQueryExpression<T>> sq) {
-        return union(SQLOps.UNION_ALL, sq);
-    }
-
-    public <T> CollectionExpressionBase<?,T> unionAll(ListSubQuery<T>... sq) {
-        return union(SQLOps.UNION_ALL, Arrays.asList(sq));
-    }
-
-    public <T> CollectionExpressionBase<?,T> unionAll(SubQueryExpression<T>... sq) {
-        return union(SQLOps.UNION_ALL, Arrays.asList(sq));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q withRecursive(Path<?> alias, SubQueryExpression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q withRecursive(Path<?> alias, Expression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, columns);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q with(Path<?> alias, SubQueryExpression<?> target) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, target);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLSubQuery.class, castRequired=true)
-    public Q with(Path<?> alias, Expression<?> query) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    public WithBuilder<Q> with(Path<?> alias, Path<?>... columns) {
-        Expression<?> columnsCombined = ExpressionUtils.list(Object.class, columns);
-        Expression<?> aliasCombined = Expressions.operation(alias.getType(), SQLOps.WITH_COLUMNS, alias, columnsCombined);
-        return new WithBuilder<Q>(queryMixin, aliasCombined);
-    }
-
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-    
-
-    @Override
-    public abstract Q clone();
-    
-    protected abstract SQLSerializer createSerializer();
-    
-    protected SQLSerializer serialize(boolean forCountRow) {
-        SQLSerializer serializer = createSerializer();
-        serializer.setStrict(false);
-        serializer.serialize(queryMixin.getMetadata(), forCountRow);
-        return serializer;
-    }
-    
-    /**
-     * Get the query as an SQL query string and bindings
-     *
-     * @param exprs
-     * @return
-     */
-    public SQLBindings getSQL(Expression<?>... exprs) {
-        queryMixin.addProjection(exprs);
-        SQLSerializer serializer = serialize(false);
-        ImmutableList.Builder<Object> args = ImmutableList.builder();
-        Map<ParamExpression<?>, Object> params = getMetadata().getParams();
-        for (Object o : serializer.getConstants()) {
-            if (o instanceof ParamExpression) {
-                if (!params.containsKey(o)) {
-                    throw new ParamNotSetException((ParamExpression<?>) o);
-                }
-                o = queryMixin.getMetadata().getParams().get(o);
-            }
-            args.add(o);
-        }
-        return new SQLBindings(serializer.toString(), args.build());
-    }
-
-    @Override
-    public String toString() {
-        if (!getMetadata().getJoins().isEmpty()) {
-            SQLSerializer serializer = serialize(false);
-            return serializer.toString().trim();
-        } else {
-            return super.toString();
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ForeignKey.java b/querydsl-sql/src/main/java/com/mysema/query/sql/ForeignKey.java
deleted file mode 100644
index b8b813403a..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/ForeignKey.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ProjectionRole;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * ForeignKey defines a foreign key on a table to another table
- *
- * @author tiwe
- *
- * @param <E>
- */
-@Immutable
-public final class ForeignKey<E> implements Serializable, ProjectionRole<Tuple> {
-
-    private static final long serialVersionUID = 2260578033772289023L;
-
-    private final RelationalPath<?> entity;
-
-    private final ImmutableList<? extends Path<?>> localColumns;
-
-    private final ImmutableList<String> foreignColumns;
-
-    @Nullable
-    private volatile Expression<Tuple> mixin;
-
-    public ForeignKey(RelationalPath<?> entity, Path<?> localColumn, String foreignColumn) {
-        this(entity, ImmutableList.of(localColumn), ImmutableList.of(foreignColumn));
-    }
-
-    public ForeignKey(RelationalPath<?> entity, ImmutableList<? extends Path<?>> localColumns,
-            ImmutableList<String> foreignColumns) {
-        this.entity = entity;
-        this.localColumns = localColumns;
-        this.foreignColumns = foreignColumns;
-    }
-
-    public RelationalPath<?> getEntity() {
-        return entity;
-    }
-
-    public List<? extends Path<?>> getLocalColumns() {
-        return localColumns;
-    }
-
-    public List<String> getForeignColumns() {
-        return foreignColumns;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Predicate on(RelationalPath<E> entity) {
-        BooleanBuilder builder = new BooleanBuilder();
-        for (int i = 0; i < localColumns.size(); i++) {
-            Expression<Object> local = (Expression<Object>)localColumns.get(i);
-            Expression<?> foreign = new PathImpl(local.getType(), entity, foreignColumns.get(i));
-            builder.and(ExpressionUtils.eq(local,foreign));
-        }
-        return builder.getValue();
-    }
-
-    public BooleanExpression in(CollectionExpression<?,Tuple> coll) {
-        return BooleanOperation.create(Ops.IN, getProjection(), coll);
-    }
-
-    @Override
-    public Expression<Tuple> getProjection() {
-        if (mixin == null) {
-            mixin = ExpressionUtils.list(Tuple.class, localColumns);
-        }
-        return mixin;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java
deleted file mode 100644
index 9e72a896fa..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.types.Ops;
-
-/**
- * H2Templates is an SQL dialect for H2
- *
- * @author tiwe
- *
- */
-public class H2Templates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new H2Templates(escape, quote);
-            }
-        };
-    }
-
-    public H2Templates() {
-        this('\\', false);
-    }
-
-    public H2Templates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public H2Templates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setNativeMerge(true);
-        setLimitRequired(true);
-        setCountDistinctMultipleColumns(true);
-
-        add(Ops.MathOps.ROUND, "round({0},0)");
-        add(Ops.TRIM, "trim(both from {0})");
-
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "day_of_week({0})");
-
-        add(Ops.MathOps.LN, "log({0})");
-        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
-        add(Ops.MathOps.COTH, "(cosh({0}) / sinh({0}))");
-
-        add(Ops.DateTimeOps.DATE, "convert({0}, date)");
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java
deleted file mode 100644
index c164e75f0f..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.types.Ops;
-
-/**
- * HSQLDBTemplates is an SQL dialect for HSQLDB
- *
- * @author tiwe
- *
- */
-public class HSQLDBTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new HSQLDBTemplates(escape, quote);
-            }
-        };
-    }
-
-    public HSQLDBTemplates() {
-        this('\\', false);
-    }
-
-    public HSQLDBTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public HSQLDBTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setLimitRequired(true);
-        setAutoIncrement(" identity");
-        setDefaultValues("\ndefault values");
-        add(Ops.TRIM, "trim(both from {0})");
-        add(Ops.NEGATE, "{0} * -1", 7);
-
-        add(SQLOps.NEXTVAL, "next value for {0s}");
-
-        add(Ops.MathOps.ROUND, "round({0},0)");
-        add(Ops.MathOps.LN, "log({0})");
-        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
-        add(Ops.MathOps.COSH, "(exp({0}) + exp({0} * -1)) / 2");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
-        add(Ops.MathOps.TANH, "(exp({0} * 2) - 1) / (exp({0} * 2) + 1)");
-
-        add(Ops.DateTimeOps.WEEK, "extract(week_of_year from {0})");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(extract(year from {0}) * 100 + extract(week_of_year from {0}))");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "dateadd('yy', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd('mm', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd('week', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_DAYS, "dateadd('dd', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_HOURS, "dateadd('hh', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd('mi', {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd('ss', {1s}, {0})");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "datediff('yy', {0}, {1})");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff('mm', {0}, {1})");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "trunc(datediff('dd', {0}, {1}) / 7)");
-        add(Ops.DateTimeOps.DIFF_DAYS, "datediff('dd', {0}, {1})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "datediff('hh', {0}, {1})");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff('mi', {0}, {1})");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff('ss', {0}, {1})");
-
-        add(Ops.DateTimeOps.DATE, "convert({0}, date)");
-    }
-
-    @Override
-    public String getTypeForCast(Class<?> cl) {
-        return (cl.equals(String.class)) ? "varchar(10)" : getTypeForClass(cl);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java b/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java
deleted file mode 100644
index c31dac07c3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import javax.annotation.Nullable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Blob;
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.sql.types.Null;
-
-/**
- * JDBCTypeMapping defines a mapping from JDBC types to Java classes.
- *
- * @author tiwe
- *
- */
-public final class JDBCTypeMapping {
-
-    private static final Map<Integer, Class<?>> defaultTypes = new HashMap<Integer, Class<?>>();
-
-    private static final Map<Class<?>, Integer> defaultSqlTypes = new HashMap<Class<?>, Integer>();
-
-    static{
-        registerDefault(-101, Object.class);
-        registerDefault(-102, java.sql.Timestamp.class); // Oracle: TIMESTAMP(6) WITH LOCAL TIME ZONE
-
-        // BOOLEAN
-        registerDefault(Types.BIT, Boolean.class);
-        registerDefault(Types.BOOLEAN, Boolean.class);
-
-        // NUMERIC
-        registerDefault(Types.BIGINT, Long.class);
-        registerDefault(Types.DECIMAL, BigDecimal.class);
-        registerDefault(Types.DOUBLE, Double.class);
-        registerDefault(Types.FLOAT, Float.class);
-        registerDefault(Types.INTEGER, Integer.class);
-        registerDefault(Types.NUMERIC, BigDecimal.class);
-        registerDefault(Types.REAL, Float.class);
-        registerDefault(Types.SMALLINT, Short.class);
-        registerDefault(Types.TINYINT, Byte.class);
-
-        // DATE and TIME
-        registerDefault(Types.DATE, java.sql.Date.class);
-        registerDefault(Types.TIME, java.sql.Time.class);
-        registerDefault(Types.TIMESTAMP, java.sql.Timestamp.class);
-
-        // TEXT
-        registerDefault(Types.NCHAR, String.class);
-        registerDefault(Types.CHAR, String.class);
-        registerDefault(Types.NCLOB, String.class);
-        registerDefault(Types.CLOB, String.class);
-        registerDefault(Types.LONGNVARCHAR, String.class);
-        registerDefault(Types.LONGVARCHAR, String.class);
-        registerDefault(Types.SQLXML, String.class);
-        registerDefault(Types.NVARCHAR, String.class);
-        registerDefault(Types.VARCHAR, String.class);
-
-        // byte[]
-        registerDefault(Types.BINARY, byte[].class);
-        registerDefault(Types.LONGVARBINARY, byte[].class);
-        registerDefault(Types.VARBINARY, byte[].class);
-
-        // BLOB
-        registerDefault(Types.BLOB, Blob.class);
-
-        // OTHER
-        registerDefault(Types.ARRAY, Object[].class);
-        registerDefault(Types.DISTINCT, Object.class);
-        registerDefault(Types.DATALINK, Object.class);
-        registerDefault(Types.JAVA_OBJECT, Object.class);
-        registerDefault(Types.NULL, Null.class);
-        registerDefault(Types.OTHER, Object.class);
-        registerDefault(Types.REF, Object.class);
-        registerDefault(Types.ROWID, Object.class);
-        registerDefault(Types.STRUCT, Object.class);
-    }
-
-    private static void registerDefault(int sqlType, Class<?> javaType) {
-        defaultTypes.put(sqlType, javaType);
-        defaultSqlTypes.put(javaType, sqlType);
-    }
-
-    private final Map<Integer, Class<?>> types = new HashMap<Integer, Class<?>>();
-
-    private final Map<Class<?>, Integer> sqlTypes = new HashMap<Class<?>, Integer>();
-
-    private final Map<Pair<Integer,Integer>, Class<?>> numericTypes = new HashMap<Pair<Integer,Integer>, Class<?>>();
-
-    public void register(int sqlType, Class<?> javaType) {
-        types.put(sqlType, javaType);
-        sqlTypes.put(javaType, sqlType);
-    }
-
-    public void registerNumeric(int total, int decimal, Class<?> javaType) {
-        numericTypes.put(Pair.of(total, decimal), javaType);
-    }
-
-    private Class<?> getNumericClass(int total, int decimal) {
-        Pair<Integer,Integer> key = Pair.of(total, decimal);
-        if (numericTypes.containsKey(key)) {
-            return numericTypes.get(key);
-        } else if (decimal <= 0) {
-            if (total > 18 || total == 0) {
-                return BigInteger.class;
-            } else if (total > 9 || total == 0) {
-                return Long.class;
-            } else if (total > 4) {
-                return Integer.class;
-            } else if (total > 2) {
-                return Short.class;
-            } else if (total > 0) {
-                return Byte.class;
-            } else {
-                return Boolean.class;
-            }
-        } else {
-            if (total > 16) {
-                return BigDecimal.class;
-            } else {
-                return Double.class;
-            }
-        }
-    }
-
-    @Nullable
-    public Class<?> get(int sqlType, int total, int decimal) {
-        if (sqlType == Types.NUMERIC || sqlType == Types.DECIMAL) {
-            return getNumericClass(total, decimal);
-        } else if (types.containsKey(sqlType)) {
-            return types.get(sqlType);
-        } else {
-            return defaultTypes.get(sqlType);
-        }
-    }
-
-    @Nullable
-    public Integer get(Class<?> clazz) {
-        if (sqlTypes.containsKey(clazz)) {
-            return sqlTypes.get(clazz);
-        } else {
-            return defaultSqlTypes.get(clazz);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/JavaTypeMapping.java b/querydsl-sql/src/main/java/com/mysema/query/sql/JavaTypeMapping.java
deleted file mode 100644
index f87ad72bff..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/JavaTypeMapping.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.primitives.Primitives;
-import com.mysema.query.sql.types.BigDecimalType;
-import com.mysema.query.sql.types.BigIntegerType;
-import com.mysema.query.sql.types.BlobType;
-import com.mysema.query.sql.types.BooleanType;
-import com.mysema.query.sql.types.ByteType;
-import com.mysema.query.sql.types.BytesType;
-import com.mysema.query.sql.types.CalendarType;
-import com.mysema.query.sql.types.CharacterType;
-import com.mysema.query.sql.types.ClobType;
-import com.mysema.query.sql.types.CurrencyType;
-import com.mysema.query.sql.types.DateType;
-import com.mysema.query.sql.types.DoubleType;
-import com.mysema.query.sql.types.FloatType;
-import com.mysema.query.sql.types.IntegerType;
-import com.mysema.query.sql.types.LocaleType;
-import com.mysema.query.sql.types.LongType;
-import com.mysema.query.sql.types.ObjectType;
-import com.mysema.query.sql.types.ShortType;
-import com.mysema.query.sql.types.StringType;
-import com.mysema.query.sql.types.TimeType;
-import com.mysema.query.sql.types.TimestampType;
-import com.mysema.query.sql.types.Type;
-import com.mysema.query.sql.types.URLType;
-import com.mysema.query.sql.types.UtilDateType;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * JavaTypeMapping provides a mapping from Class to Type instances
- *
- * @author tiwe
- *
- */
-public class JavaTypeMapping {
-
-    private static final Map<Class<?>,Type<?>> defaultTypes = new HashMap<Class<?>,Type<?>>();
-
-    static{
-        registerDefault(new BigIntegerType());
-        registerDefault(new BigDecimalType());
-        registerDefault(new BlobType());
-        registerDefault(new BooleanType());
-        registerDefault(new BytesType());
-        registerDefault(new ByteType());
-        registerDefault(new CharacterType());
-        registerDefault(new CalendarType());
-        registerDefault(new ClobType());
-        registerDefault(new CurrencyType());
-        registerDefault(new DateType());
-        registerDefault(new DoubleType());
-        registerDefault(new FloatType());
-        registerDefault(new IntegerType());
-        registerDefault(new LocaleType());
-        registerDefault(new LongType());
-        registerDefault(new ObjectType());
-        registerDefault(new ShortType());
-        registerDefault(new StringType());
-        registerDefault(new TimestampType());
-        registerDefault(new TimeType());
-        registerDefault(new URLType());
-        registerDefault(new UtilDateType());
-
-        // initialize joda time converters only if joda time is available
-        try {
-            Class.forName("org.joda.time.DateTime");
-            registerDefault((Type<?>)Class.forName("com.mysema.query.sql.types.DateTimeType").newInstance());
-            registerDefault((Type<?>)Class.forName("com.mysema.query.sql.types.LocalDateTimeType").newInstance());
-            registerDefault((Type<?>)Class.forName("com.mysema.query.sql.types.LocalDateType").newInstance());
-            registerDefault((Type<?>)Class.forName("com.mysema.query.sql.types.LocalTimeType").newInstance());
-        } catch (ClassNotFoundException e) {
-            // converters for joda.time are not loaded
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    private static void registerDefault(Type<?> type) {
-        defaultTypes.put(type.getReturnedClass(), type);
-        Class<?> primitive = Primitives.unwrap(type.getReturnedClass());
-        if (primitive != null) {
-            defaultTypes.put(primitive, type);
-        }
-    }
-
-    private final Map<Class<?>,Type<?>> typeByClass = new HashMap<Class<?>,Type<?>>();
-
-    private final Map<Class<?>,Type<?>> resolvedTypesByClass = new HashMap<Class<?>,Type<?>>();
-
-    private final Map<String, Map<String,Type<?>>> typeByColumn = new HashMap<String,Map<String,Type<?>>>();
-
-    @Nullable
-    public Type<?> getType(String table, String column) {
-        Map<String,Type<?>> columns = typeByColumn.get(table);
-        if (columns != null) {
-            return columns.get(column);
-        } else {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> Type<T> getType(Class<T> clazz) {
-        Type<?> resolvedType = resolvedTypesByClass.get(clazz);
-        if (resolvedType == null) {
-            resolvedType = findType(clazz);
-            if (resolvedType != null) {
-                resolvedTypesByClass.put(clazz, resolvedType);
-            } else {
-                throw new IllegalArgumentException("Found no type for " + clazz.getName());
-            }
-        }
-        return (Type<T>) resolvedType;
-    }
-
-    @Nullable
-    private Type<?> findType(Class<?> clazz) {
-        //Look for a registered type in the class hierarchy
-        Class<?> cl = clazz;
-        do{
-            if (typeByClass.containsKey(cl)) {
-                return typeByClass.get(cl);
-            } else if (defaultTypes.containsKey(cl)) {
-                return defaultTypes.get(cl);
-            }
-            cl = cl.getSuperclass();
-        } while(!cl.equals(Object.class));
-
-        //Look for a registered type in any implemented interfaces
-        Set<Class<?>> interfaces = ReflectionUtils.getImplementedInterfaces(clazz);
-        for (Class<?> itf : interfaces) {
-            if (typeByClass.containsKey(itf)) {
-                return typeByClass.get(itf);
-            } else if (defaultTypes.containsKey(itf)) {
-                return defaultTypes.get(itf);
-            }
-        }
-        return null;
-    }
-
-    public void register(Type<?> type) {
-        typeByClass.put(type.getReturnedClass(), type);
-        Class<?> primitive = Primitives.unwrap(type.getReturnedClass());
-        if (primitive != null) {
-            typeByClass.put(primitive, type);
-        }
-        // Clear previous resolved types, so they won't impact future lookups
-        resolvedTypesByClass.clear();
-    }
-
-    public void setType(String table, String column, Type<?> type) {
-        Map<String,Type<?>> columns = typeByColumn.get(table);
-        if (columns == null) {
-            columns = new HashMap<String, Type<?>>();
-            typeByColumn.put(table, columns);
-        }
-        columns.put(column, type);
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java
deleted file mode 100644
index ddda7f7bbe..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.math.BigDecimal;
-
-import com.mysema.query.types.Ops;
-
-/**
- * MySQLTemplates is an SQL dialect for MySQL
- *
- * <p>tested with MySQL CE 5.1 and 5.5</p>
- *
- * @author tiwe
- *
- */
-public class MySQLTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new MySQLTemplates(escape, quote);
-            }
-        };
-    }
-
-    public MySQLTemplates() {
-        this('\\', false);
-    }
-
-    public MySQLTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public MySQLTemplates(char escape, boolean quote) {
-        super("`", escape, quote);
-        setParameterMetadataAvailable(false);
-        setLimitRequired(true);
-        setNullsFirst(null);
-        setNullsLast(null);
-
-        addClass2TypeMappings("bool", Boolean.class);
-        addClass2TypeMappings("int", Integer.class);
-
-        addClass2TypeMappings("decimal",
-                Double.class,
-                Float.class,
-                BigDecimal.class);
-        addClass2TypeMappings("char", String.class);
-
-        add(Ops.CONCAT, "concat({0}, {1})",0);
-
-        add(Ops.StringOps.LPAD, "lpad({0},{1},' ')");
-        add(Ops.StringOps.RPAD, "rpad({0},{1},' ')");
-
-        // like without escape
-        if (escape == '\\') {
-            add(Ops.LIKE, "{0} like {1}");
-            add(Ops.ENDS_WITH, "{0} like {%1}");
-            add(Ops.ENDS_WITH_IC, "{0l} like {%%1}");
-            add(Ops.STARTS_WITH, "{0} like {1%}");
-            add(Ops.STARTS_WITH_IC, "{0l} like {1%%}");
-            add(Ops.STRING_CONTAINS, "{0} like {%1%}");
-            add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%}");
-        }
-
-        add(Ops.MathOps.LOG, "log({1},{0})");
-        add(Ops.MathOps.COSH, "(exp({0}) + exp({0} * -1)) / 2");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
-        add(Ops.MathOps.TANH, "(exp({0} * 2) - 1) / (exp({0} * 2) + 1)");
-
-        add(Ops.AggOps.BOOLEAN_ANY, "bit_or({0})", 0);
-        add(Ops.AggOps.BOOLEAN_ALL, "bit_and({0})", 0);
-
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
-        add(Ops.DateTimeOps.YEAR_MONTH, "extract(year_month from {0})");
-        add(Ops.DateTimeOps.YEAR_WEEK, "yearweek({0})");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "date_add({0}, interval {1s} year)");
-        add(Ops.DateTimeOps.ADD_MONTHS, "date_add({0}, interval {1s} month)");
-        add(Ops.DateTimeOps.ADD_WEEKS, "date_add({0}, interval {1s} week)");
-        add(Ops.DateTimeOps.ADD_DAYS, "date_add({0}, interval {1s} day)");
-        add(Ops.DateTimeOps.ADD_HOURS, "date_add({0}, interval {1s} hour)");
-        add(Ops.DateTimeOps.ADD_MINUTES, "date_add({0}, interval {1s} minute)");
-        add(Ops.DateTimeOps.ADD_SECONDS, "date_add({0}, interval {1s} second)");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "timestampdiff(year,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "timestampdiff(month,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "timestampdiff(week,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_DAYS, "timestampdiff(day,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "timestampdiff(hour,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "timestampdiff(minute,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "timestampdiff(second,{0},{1})");
-    }
-
-    @Override
-    public String escapeLiteral(String str) {
-        StringBuilder builder = new StringBuilder();
-        for (char ch : super.escapeLiteral(str).toCharArray()) {
-            if (ch == '\\') {
-                builder.append("\\");
-            }
-            builder.append(ch);
-        }
-        return builder.toString();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java
deleted file mode 100644
index 693b8813f7..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.math.BigInteger;
-import java.sql.Types;
-import java.util.List;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-
-/**
- * OracleTemplates is an SQL dialect for Oracle
- *
- * <p>tested with Oracle 10g XE</p>
- *
- * @author tiwe
- */
-public class OracleTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new OracleTemplates(escape, quote);
-            }
-        };
-    }
-
-    private String outerQueryStart = "select * from (\n select a.*, rownum rn from (\n  ";
-
-    private String outerQueryEnd = "\n ) a) where ";
-
-    private String limitQueryStart = "select * from (\n  ";
-
-    private String limitQueryEnd = "\n) where rownum <= {0}";
-
-    private String limitOffsetTemplate = "rn > {0s} and rownum <= {1s}";
-
-    private String offsetTemplate = "rn > {0}";
-
-    public OracleTemplates() {
-        this('\\', false);
-    }
-
-    public OracleTemplates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public OracleTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setParameterMetadataAvailable(false);
-        setBatchCountViaGetUpdateCount(true);
-        setWithRecursive("with ");
-        setCountViaAnalytics(true);
-
-        // type mappings
-        addClass2TypeMappings("number(3,0)", Byte.class);
-        addClass2TypeMappings("number(1,0)", Boolean.class);
-        addClass2TypeMappings("number(19,0)", BigInteger.class, Long.class);
-        addClass2TypeMappings("number(5,0)", Short.class);
-        addClass2TypeMappings("number(10,0)", Integer.class);
-        addClass2TypeMappings("double precision", Double.class);
-        addClass2TypeMappings("varchar(4000 char)", String.class);
-
-        add(Ops.ALIAS, "{0} {1}");
-        add(SQLOps.NEXTVAL, "{0s}.nextval");
-
-        // String
-        add(Ops.INDEX_OF, "instrb({0},{1})-1");
-        add(Ops.INDEX_OF_2ARGS, "instrb({0},{1},{2}+1)-1");
-        add(Ops.MATCHES, "regexp_like({0},{1})");
-        add(Ops.StringOps.LOCATE, "instr({1},{0})");
-        add(Ops.StringOps.LOCATE2, "instr({1},{0},{2s})");
-        add(Ops.StringOps.LEFT, "substr({0},1,{1})");
-        add(Ops.StringOps.RIGHT, "substr({0},-{1s},length({0}))");
-
-        // Number
-        add(Ops.MathOps.CEIL, "ceil({0})");
-        add(Ops.MathOps.RANDOM, "dbms_random.value");
-        add(Ops.MathOps.LN, "ln({0})");
-        add(Ops.MathOps.LOG, "log({1},{0})");
-        add(Ops.MathOps.COT, "(cos({0}) / sin({0}))");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.DEG, "({0} * 180 / "+Math.PI+")");
-        add(Ops.MathOps.RAD, "({0} * "+Math.PI+" / 180)");
-
-        // Date / time
-        add(Ops.DateTimeOps.DATE, "trunc({0})");
-
-        add(Ops.DateTimeOps.WEEK, "to_number(to_char({0},'WW'))");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "to_number(to_char({0},'D')) + 1");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "to_number(to_char({0},'DDD'))");
-        add(Ops.DateTimeOps.YEAR_WEEK, "to_number(to_char({0},'IYYY') || to_char({0},'IW'))");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "{0} + interval '{1s}' year");
-        add(Ops.DateTimeOps.ADD_MONTHS, "{0} + interval '{1s}' month");
-        add(Ops.DateTimeOps.ADD_WEEKS, "{0} + interval '{1s}' week");
-        add(Ops.DateTimeOps.ADD_DAYS, "{0} + interval '{1s}' day");
-        add(Ops.DateTimeOps.ADD_HOURS, "{0} + interval '{1s}' hour");
-        add(Ops.DateTimeOps.ADD_MINUTES, "{0} + interval '{1s}' minute");
-        add(Ops.DateTimeOps.ADD_SECONDS, "{0} + interval '{1s}' second");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "trunc(months_between({1}, {0}) / 12)");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "trunc(months_between({1}, {0}))");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "round(({1} - {0}) / 7)");
-        add(Ops.DateTimeOps.DIFF_DAYS, "round({1} - {0})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "round(({1} - {0}) * 24)");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "round(({1} - {0}) * 1440)");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "round(({1} - {0}) * 86400)");
-
-        add(Ops.DateTimeOps.TRUNC_YEAR, "trunc({0}, 'year')");
-        add(Ops.DateTimeOps.TRUNC_MONTH, "trunc({0}, 'month')");
-        add(Ops.DateTimeOps.TRUNC_WEEK, "trunc({0}, 'w')");
-        add(Ops.DateTimeOps.TRUNC_DAY, "trunc({0}, 'day')");
-        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc({0}, 'hh')");
-        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc({0}, 'mi')");
-        add(Ops.DateTimeOps.TRUNC_SECOND, "{0}"); // not truncated
-    }
-
-    @Override
-    public String serialize(String literal, int jdbcType) {
-        if (jdbcType == Types.DATE) {
-            return "date '" + literal + "'";
-        } else if (jdbcType == Types.TIMESTAMP) {
-            return "timestamp '" + literal + "'";
-        } else if (jdbcType == Types.TIME) {
-            return "timestamp '1970-01-01 " + literal + "'";
-        } else {
-            return super.serialize(literal, jdbcType);
-        }
-    }
-
-    @Override
-    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
-        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
-            QueryModifiers mod = metadata.getModifiers();
-
-            if (mod.getOffset() == null) {
-                context.append(limitQueryStart);
-                context.serializeForQuery(metadata, forCountRow);
-                context.handle(limitQueryEnd, mod.getLimit());
-            } else {
-                context.append(outerQueryStart);
-                context.serializeForQuery(metadata, forCountRow);
-                context.append(outerQueryEnd);
-
-                if (mod.getLimit() == null) {
-                    context.handle(offsetTemplate, mod.getOffset());
-                } else {
-                    context.handle(limitOffsetTemplate, mod.getOffset(), mod.getLimit());
-                }
-            }
-
-        } else {
-            context.serializeForQuery(metadata, forCountRow);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
-        context.serializeForDelete(metadata, entity);
-
-        // limit
-        if (metadata.getModifiers().isRestricting()) {
-            serializeModifiersForDML(metadata, context);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Pair<Path<?>, Expression<?>>> updates, SQLSerializer context) {
-        context.serializeForUpdate(metadata, entity, updates);
-
-        // limit
-        if (metadata.getModifiers().isRestricting()) {
-            serializeModifiersForDML(metadata, context);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    private void serializeModifiersForDML(QueryMetadata metadata, SQLSerializer context) {
-        if (metadata.getWhere() != null) {
-            context.append(" and ");
-        } else {
-            context.append(getWhere());
-        }
-        context.append("rownum <= ");
-        context.visitConstant(metadata.getModifiers().getLimit());
-    }
-
-    @Override
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        // do nothing
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java
deleted file mode 100644
index 2c06685ae6..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.types.Ops;
-
-/**
- * PostgresTemplates is an SQL dialect for PostgreSQL
- *
- * <p>tested with PostgreSQL 8.4 and 9.1</p>
- *
- * @author tiwe
- *
- */
-public class PostgresTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new PostgresTemplates(escape, quote);
-            }
-        };
-    }
-
-    public PostgresTemplates() {
-        this('\\', false);
-    }
-
-    public PostgresTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public PostgresTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setDummyTable(null);
-        setCountDistinctMultipleColumns(true);
-        setCountViaAnalytics(true);
-        setDefaultValues("\ndefault values");
-
-        addClass2TypeMappings("numeric(3,0)", Byte.class);
-        addClass2TypeMappings("double precision", Double.class);
-
-        // String
-        add(Ops.MATCHES, "{0} ~ {1}");
-        add(Ops.INDEX_OF, "strpos({0},{1})-1");
-        add(Ops.INDEX_OF_2ARGS, "strpos({0},{1})-1"); //FIXME
-        add(Ops.StringOps.LOCATE,  "strpos({1},{0})");
-        add(Ops.StringOps.LOCATE2, "strpos(repeat('^',{2s}-1) || substr({1},{2s}),{0})");
-
-        // like without escape
-        if (escape == '\\') {
-            add(Ops.LIKE, "{0} like {1}");
-            add(Ops.ENDS_WITH, "{0} like {%1}");
-            add(Ops.ENDS_WITH_IC, "{0l} like {%%1}");
-            add(Ops.STARTS_WITH, "{0} like {1%}");
-            add(Ops.STARTS_WITH_IC, "{0l} like {1%%}");
-            add(Ops.STRING_CONTAINS, "{0} like {%1%}");
-            add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%}");
-        }
-
-        // Number
-        add(Ops.MathOps.RANDOM, "random()");
-        add(Ops.MathOps.LN, "ln({0})");
-        add(Ops.MathOps.LOG, "log({1},{0})");
-        add(Ops.MathOps.COSH, "(exp({0}) + exp({0} * -1)) / 2");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
-        add(Ops.MathOps.TANH, "(exp({0} * 2) - 1) / (exp({0} * 2) + 1)");
-
-        // Date / time
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "extract(dow from {0}) + 1");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "extract(doy from {0})");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(extract(isoyear from {0}) * 100 + extract(week from {0}))");
-
-        add(Ops.AggOps.BOOLEAN_ANY, "bool_or({0})", 0);
-        add(Ops.AggOps.BOOLEAN_ALL, "bool_and({0})", 0);
-
-        add(Ops.DateTimeOps.ADD_YEARS, "{0} + interval '{1s} years'");
-        add(Ops.DateTimeOps.ADD_MONTHS, "{0} + interval '{1s} months'");
-        add(Ops.DateTimeOps.ADD_WEEKS, "{0} + interval '{1s} weeks'");
-        add(Ops.DateTimeOps.ADD_DAYS, "{0} + interval '{1s} days'");
-        add(Ops.DateTimeOps.ADD_HOURS, "{0} + interval '{1s} hours'");
-        add(Ops.DateTimeOps.ADD_MINUTES, "{0} + interval '{1s} minutes'");
-        add(Ops.DateTimeOps.ADD_SECONDS, "{0} + interval '{1s} seconds'");
-
-        String yearsDiff = "date_part('year', age({1}, {0}))";
-        String monthsDiff = "(" + yearsDiff + " * 12 + date_part('month', age({1}, {0})))";
-        String weeksDiff =  "trunc((cast({1} as date) - cast({0} as date))/7)";
-        String daysDiff = "(cast({1} as date) - cast({0} as date))";
-        String hoursDiff = "("+ daysDiff + " * 24 + date_part('hour', age({1}, {0})))";
-        String minutesDiff = "(" + hoursDiff + " * 60 + date_part('minute', age({1}, {0})))";
-        String secondsDiff =  "(" +  minutesDiff + " * 60 + date_part('second', age({1}, {0})))";
-
-        add(Ops.DateTimeOps.DIFF_YEARS,   yearsDiff);
-        add(Ops.DateTimeOps.DIFF_MONTHS,  monthsDiff);
-        add(Ops.DateTimeOps.DIFF_WEEKS,   weeksDiff);
-        add(Ops.DateTimeOps.DIFF_DAYS,    daysDiff);
-        add(Ops.DateTimeOps.DIFF_HOURS,   hoursDiff);
-        add(Ops.DateTimeOps.DIFF_MINUTES, minutesDiff);
-        add(Ops.DateTimeOps.DIFF_SECONDS, secondsDiff);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/PrimaryKey.java b/querydsl-sql/src/main/java/com/mysema/query/sql/PrimaryKey.java
deleted file mode 100644
index fe6e286e51..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/PrimaryKey.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.Tuple;
-import com.mysema.query.types.CollectionExpression;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.ProjectionRole;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-
-/**
- * PrimaryKey defines a primary key on table
- *
- * @author tiwe
- */
-@Immutable
-public final class PrimaryKey<E> implements Serializable, ProjectionRole<Tuple> {
-
-    private static final long serialVersionUID = -6913344535043394649L;
-
-    private final RelationalPath<?> entity;
-
-    private final ImmutableList<? extends Path<?>> localColumns;
-    
-    @Nullable
-    private volatile Expression<Tuple> mixin;
-
-    public PrimaryKey(RelationalPath<?> entity, Path<?>... localColumns) {
-        this(entity, ImmutableList.copyOf(localColumns));
-    }
-
-    public PrimaryKey(RelationalPath<?> entity, ImmutableList<? extends Path<?>> localColumns) {
-        this.entity = entity;
-        this.localColumns = localColumns;
-        this.mixin = ExpressionUtils.list(Tuple.class, localColumns);
-    }
-
-    public RelationalPath<?> getEntity() {
-        return entity;
-    }
-
-    public List<? extends Path<?>> getLocalColumns() {
-        return localColumns;
-    }
-    
-    public BooleanExpression in(CollectionExpression<?,Tuple> coll) {        
-        return BooleanOperation.create(Ops.IN, getProjection(), coll);
-    }
-
-    @Override
-    public Expression<Tuple> getProjection() {
-        if (mixin == null) {
-            mixin = ExpressionUtils.list(Tuple.class, localColumns);
-        }
-        return mixin;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java
deleted file mode 100644
index e3365475f7..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/ProjectableSQLQuery.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.*;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.support.ProjectableQuery;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.query.types.template.SimpleTemplate;
-
-/**
- * ProjectableSQLQuery is the base type for SQL query implementations
- *
- * @param <Q> concrete subtype
- */
-public abstract class ProjectableSQLQuery<Q extends ProjectableSQLQuery<Q> & Query<Q>> extends ProjectableQuery<Q> implements SQLCommonQuery<Q> {
-
-    protected final Configuration configuration;
-    
-    @Nullable
-    protected Expression<?> union;
-
-    protected boolean unionAll;
-
-    @SuppressWarnings("unchecked")
-    public ProjectableSQLQuery(QueryMixin<Q> queryMixin, Configuration configuration) {
-        super(queryMixin);
-        this.queryMixin.setSelf((Q) this);
-        this.configuration = configuration;
-    }
-
-    /**
-     * Add the given String literal as a join flag to the last added join with the position
-     * BEFORE_TARGET
-     *
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q addJoinFlag(String flag) {
-        return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
-    }
-
-    /**
-     * Add the given String literal as a join flag to the last added join
-     *
-     * @param flag
-     * @param position
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    @SuppressWarnings("unchecked")
-    public Q addJoinFlag(String flag, JoinFlag.Position position) {
-        queryMixin.addJoinFlag(new JoinFlag(flag, position));
-        return (Q)this;
-    }
-
-    /**
-     * Add the given prefix and expression as a general query flag
-     *
-     * @param position position of the flag
-     * @param prefix prefix for the flag
-     * @param expr expression of the flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q addFlag(Position position, String prefix, Expression<?> expr) {
-        Expression<?> flag = SimpleTemplate.create(expr.getType(), prefix + "{0}", expr);
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    /**
-     * Add the given query flag
-     *
-     * @param flag
-     * @return
-     */
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q addFlag(QueryFlag flag) {
-        return queryMixin.addFlag(flag);
-    }
-
-    /**
-     * Add the given String literal as query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q addFlag(Position position, String flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    /**
-     * Add the given Expression as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q addFlag(Position position, Expression<?> flag) {
-        return queryMixin.addFlag(new QueryFlag(position, flag));
-    }
-
-    @Override
-    public long count() {
-        Number number = uniqueResult(Wildcard.countAsInt);
-        return number.longValue();
-    }
-
-    @Override
-    public boolean exists() {
-        return limit(1).singleResult(NumberTemplate.ONE) != null;
-    }
-
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q from(Expression<?> arg) {
-        return queryMixin.from(arg);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q from(Expression<?>... args) {
-        return queryMixin.from(args);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
-        return queryMixin.from(ExpressionUtils.as((Expression) subQuery, alias));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q fullJoin(EntityPath<?> target) {
-        return queryMixin.fullJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q fullJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.fullJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.fullJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q innerJoin(EntityPath<?> target) {
-        return queryMixin.innerJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q innerJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.innerJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
-        return queryMixin.innerJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q join(EntityPath<?> target) {
-        return queryMixin.join(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q join(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q join(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.join(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q join(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.join(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q leftJoin(EntityPath<?> target) {
-        return queryMixin.leftJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q leftJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.leftJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q leftJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.leftJoin(entity).on(key.on(entity));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q rightJoin(EntityPath<?> target) {
-        return queryMixin.rightJoin(target);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q rightJoin(SubQueryExpression<?> target, Path<?> alias) {
-        return queryMixin.rightJoin(target, alias);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <E> Q rightJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
-        return queryMixin.rightJoin(entity).on(key.on(entity));
-    }
-
-    public QueryMetadata getMetadata() {
-        return queryMixin.getMetadata();
-    }
-
-    @SuppressWarnings("unchecked")
-    private <RT> Union<RT> innerUnion(SubQueryExpression<?>... sq) {
-        queryMixin.getMetadata().setValidate(false);
-        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
-            throw new IllegalArgumentException("Don't mix union and from");
-        }
-        this.union = UnionUtils.union(sq, unionAll);
-        return new UnionImpl<Q ,RT>((Q)this, sq[0].getMetadata().getProjection());
-    }
-
-    @Override
-    public CloseableIterator<Tuple> iterate(Expression<?>... args) {
-        return iterate(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public List<Tuple> list(Expression<?>... args) {
-        return list(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public SearchResults<Tuple> listResults(Expression<?>... args) {
-        return listResults(queryMixin.createProjection(args));
-    }
-
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q on(Predicate condition) {
-        return queryMixin.on(condition);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q on(Predicate... conditions) {
-        return queryMixin.on(conditions);
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    public <RT> Union<RT> union(ListSubQuery<RT>... sq) {
-        return innerUnion(sq);
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <RT> Q union(Path<?> alias, ListSubQuery<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, false));
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    public <RT> Union<RT> union(SubQueryExpression<RT>... sq) {
-        return innerUnion(sq);
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <RT> Q union(Path<?> alias, SubQueryExpression<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, false));
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    public <RT> Union<RT> unionAll(ListSubQuery<RT>... sq) {
-        unionAll = true;
-        return innerUnion(sq);
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <RT> Q unionAll(Path<?> alias, ListSubQuery<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, true));
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    public <RT> Union<RT> unionAll(SubQueryExpression<RT>... sq) {
-        unionAll = true;
-        return innerUnion(sq);
-    }
-
-    /**
-     * Creates an union expression for the given subqueries
-     *
-     * @param <RT>
-     * @param sq
-     * @return
-     */
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public <RT> Q unionAll(Path<?> alias, SubQueryExpression<RT>... sq) {
-        return from(UnionUtils.union(sq, alias, true));
-    }
-
-    @Override
-    public Tuple uniqueResult(Expression<?>... args) {
-        return uniqueResult(queryMixin.createProjection(args));
-    }
-
-    @Override
-    public <RT> RT uniqueResult(Expression<RT> expr) {
-        if (getMetadata().getModifiers().getLimit() == null
-           && !expr.toString().contains("count(")) {
-            limit(2);
-        }
-        CloseableIterator<RT> iterator = iterate(expr);
-        return uniqueResult(iterator);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q withRecursive(Path<?> alias, SubQueryExpression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q withRecursive(Path<?> alias, Expression<?> query) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, query);
-    }
-
-    @Override
-    public WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns) {
-        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
-        return with(alias, columns);
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q with(Path<?> alias, SubQueryExpression<?> query) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    @WithBridgeMethods(value=AbstractSQLQuery.class, castRequired=true)
-    public Q with(Path<?> alias, Expression<?> query) {
-        Expression<?> expr = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
-    }
-
-    @Override
-    public WithBuilder<Q> with(Path<?> alias, Path<?>... columns) {
-        Expression<?> columnsCombined = ExpressionUtils.list(Object.class, columns);
-        Expression<?> aliasCombined = Expressions.operation(alias.getType(), SQLOps.WITH_COLUMNS, alias, columnsCombined);
-        return new WithBuilder<Q>(queryMixin, aliasCombined);
-    }
-    
-    protected void clone(Q query) {
-        this.union = query.union;
-        this.unionAll = query.unionAll;
-    }
-
-    @Override
-    public abstract Q clone();
-    
-    protected abstract SQLSerializer createSerializer();
-    
-    protected SQLSerializer serialize(boolean forCountRow) {
-        SQLSerializer serializer = createSerializer();
-        if (union != null) {
-            serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
-        } else {
-            serializer.serialize(queryMixin.getMetadata(), forCountRow);
-        }
-        return serializer;
-    }
-    
-    /**
-     * Get the query as an SQL query string and bindings
-     *
-     * @param exprs
-     * @return
-     */
-    public SQLBindings getSQL(Expression<?>... exprs) {
-        queryMixin.addProjection(exprs);
-        SQLSerializer serializer = serialize(false);
-        ImmutableList.Builder<Object> args = ImmutableList.builder();
-        Map<ParamExpression<?>, Object> params = getMetadata().getParams();
-        for (Object o : serializer.getConstants()) {
-            if (o instanceof ParamExpression) {
-                if (!params.containsKey(o)) {
-                    throw new ParamNotSetException((ParamExpression<?>) o);
-                }
-                o = queryMixin.getMetadata().getParams().get(o);
-            }
-            args.add(o);
-        }
-        return new SQLBindings(serializer.toString(), args.build());
-    }
-    
-    public String toString() {
-        SQLSerializer serializer = serialize(false);
-        return serializer.toString().trim();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/QBeans.java b/querydsl-sql/src/main/java/com/mysema/query/sql/QBeans.java
deleted file mode 100644
index 2086df450e..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/QBeans.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.QBean;
-import com.mysema.query.types.Visitor;
-import com.mysema.util.ArrayUtils;
-
-/**
- * Expression used to project a list of beans
- *
- * @author luis
- */
-public class QBeans extends ExpressionBase<Beans> implements FactoryExpression<Beans> {
-
-    private static final long serialVersionUID = -4411839816134215923L;
-
-    private final ImmutableMap<RelationalPath<?>, QBean<?>> qBeans;
-
-    private final ImmutableList<Expression<?>> expressions;
-
-    @SuppressWarnings("unchecked")
-    public QBeans(RelationalPath<?>... beanPaths) {
-        super(Beans.class);
-        try {
-            final ImmutableList.Builder<Expression<?>> listBuilder = ImmutableList.builder();
-            final ImmutableMap.Builder<RelationalPath<?>, QBean<?>> mapBuilder = ImmutableMap.builder();
-            for (RelationalPath<?> path : beanPaths) {
-                Map<String, Expression<?>> bindings = new LinkedHashMap<String, Expression<?>>();
-                for (Path<?> column : path.getColumns()) {
-                    bindings.put(column.getMetadata().getName(), column);
-                    listBuilder.add(column);
-                }
-                mapBuilder.put(path, new QBean<Object>((Class)path.getType(), bindings));
-            }
-            expressions = listBuilder.build();
-            qBeans = mapBuilder.build();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return expressions;
-    }
-
-    @Override
-    public Beans newInstance(Object... args) {
-        int offset = 0;
-        Map<RelationalPath<?>, Object> beans = new HashMap<RelationalPath<?>, Object>();
-        for (Map.Entry<RelationalPath<?>, QBean<?>> entry : qBeans.entrySet()) {
-            RelationalPath<?> path = entry.getKey();
-            QBean<?> qBean = entry.getValue();
-            int argsSize = qBean.getArgs().size();
-            Object[] subArgs = ArrayUtils.subarray(args, offset, offset + argsSize);
-            beans.put(path, qBean.newInstance(subArgs));
-            offset += argsSize;
-        }
-        return new Beans(beans);
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalFunctionCall.java b/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalFunctionCall.java
deleted file mode 100644
index 85c232a9c3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalFunctionCall.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import com.mysema.query.types.Template;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.TemplateExpressionImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.SimpleExpression;
-
-/**
- * Represents a table valued function call
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class RelationalFunctionCall<T> extends SimpleExpression<T> implements TemplateExpression<T> {
-
-    private static final long serialVersionUID = 256739044928186923L;
-
-    private static Template createTemplate(String function, int argCount) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(function);
-        builder.append("(");
-        for (int i = 0; i < argCount; i++) {
-            if (i > 0) {
-                builder.append(", ");
-            }
-            builder.append("{"+ i + "}");
-        }
-        builder.append(")");
-        return TemplateFactory.DEFAULT.create(builder.toString());
-    }
-
-    private final TemplateExpression<T> templateMixin;
-
-    /**
-     * Create a new RelationalFunctionCall for the given function and arguments
-     *
-     * @param type
-     * @param function
-     * @param args
-     * @return
-     */
-    public static <T> RelationalFunctionCall<T> create(Class<? extends T> type, String function, Object... args) {
-        return new RelationalFunctionCall<T>(type, function, args);
-    }
-
-    public RelationalFunctionCall(Class<? extends T> type, String function, Object... args) {
-        super(TemplateExpressionImpl.create((Class)type, createTemplate(function, args.length), args));
-        templateMixin = (TemplateExpression<T>)mixin;
-    }
-
-    @Override
-    public final <R,C> R accept(Visitor<R,C> v, C context) {
-        return v.visit(this, context);
-    }
-
-    @Override
-    public Object getArg(int index) {
-        return templateMixin.getArg(index);
-    }
-
-    @Override
-    public List<?> getArgs() {
-        return templateMixin.getArgs();
-    }
-
-    @Override
-    public Template getTemplate() {
-        return templateMixin.getTemplate();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathBase.java b/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathBase.java
deleted file mode 100644
index f9dfc8e2fb..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathBase.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.path.BeanPath;
-import static com.google.common.collect.ImmutableList.copyOf;
-
-/**
- * RelationalPathBase is a base class for {@link RelationalPath} implementations
- *
- * @author tiwe
- *
- * @param <T>
- *            entity type
- */
-public class RelationalPathBase<T> extends BeanPath<T> implements RelationalPath<T> {
-
-    private static final long serialVersionUID = -7031357250283629202L;
-
-    @Nullable
-    private PrimaryKey<T> primaryKey;
-
-    private final Map<Path<?>, ColumnMetadata> columnMetadata = Maps.newLinkedHashMap();
-
-    private final List<ForeignKey<?>> foreignKeys = Lists.newArrayList();
-
-    private final List<ForeignKey<?>> inverseForeignKeys = Lists.newArrayList();
-
-    private final String schema, table;
-
-    private final SchemaAndTable schemaAndTable;
-
-    private transient FactoryExpression<T> projection;
-
-    private transient NumberExpression<Long> count, countDistinct;
-
-    public RelationalPathBase(Class<? extends T> type, String variable, String schema, String table) {
-        this(type, PathMetadataFactory.forVariable(variable), schema, table);
-    }
-
-    public RelationalPathBase(Class<? extends T> type, PathMetadata<?> metadata, String schema,
-            String table) {
-        super(type, metadata);
-        this.schema = schema;
-        this.table = table;
-        this.schemaAndTable = new SchemaAndTable(schema, table);
-    }
-
-    protected PrimaryKey<T> createPrimaryKey(Path<?>... columns) {
-        primaryKey = new PrimaryKey<T>(this, columns);
-        return primaryKey;
-    }
-
-    protected <F> ForeignKey<F> createForeignKey(Path<?> local, String foreign) {
-        ForeignKey<F> foreignKey = new ForeignKey<F>(this, local, foreign);
-        foreignKeys.add(foreignKey);
-        return foreignKey;
-    }
-
-    protected <F> ForeignKey<F> createForeignKey(List<? extends Path<?>> local, List<String> foreign) {
-        ForeignKey<F> foreignKey = new ForeignKey<F>(this, copyOf(local), copyOf(foreign));
-        foreignKeys.add(foreignKey);
-        return foreignKey;
-    }
-
-    protected <F> ForeignKey<F> createInvForeignKey(Path<?> local, String foreign) {
-        ForeignKey<F> foreignKey = new ForeignKey<F>(this, local, foreign);
-        inverseForeignKeys.add(foreignKey);
-        return foreignKey;
-    }
-
-    protected <F> ForeignKey<F> createInvForeignKey(List<? extends Path<?>> local,
-            List<String> foreign) {
-        ForeignKey<F> foreignKey = new ForeignKey<F>(this, copyOf(local), copyOf(foreign));
-        inverseForeignKeys.add(foreignKey);
-        return foreignKey;
-    }
-
-    protected <P extends Path<?>> P addMetadata(P path, ColumnMetadata metadata) {
-        columnMetadata.put(path, metadata);
-        return path;
-    }
-
-    @Override
-    public NumberExpression<Long> count() {
-        if (count == null) {
-            if (primaryKey != null) {
-                count = NumberOperation.create(Long.class, Ops.AggOps.COUNT_AGG,
-                        primaryKey.getLocalColumns().get(0));
-            } else {
-                throw new IllegalStateException("No count expression can be created");
-            }
-        }
-        return count;
-    }
-
-    @Override
-    public NumberExpression<Long> countDistinct() {
-        if (countDistinct == null) {
-            if (primaryKey != null) {
-                // TODO handle multiple column primary keys properly
-                countDistinct = NumberOperation.create(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG,
-                        primaryKey.getLocalColumns().get(0));
-            } else {
-                throw new IllegalStateException("No count distinct expression can be created");
-            }
-        }
-        return countDistinct;
-    }
-
-    @Override
-    public FactoryExpression<T> getProjection() {
-        if (projection == null) {
-            projection = RelationalPathUtils.createProjection(this);
-        }
-        return projection;
-    }
-
-    public Path<?>[] all() {
-        Path<?>[] all = new Path[columnMetadata.size()];
-        columnMetadata.keySet().toArray(all);
-        return all;
-    }
-
-    @Override
-    protected <P extends Path<?>> P add(P path) {
-        return path;
-    }
-
-    @Override
-    public List<Path<?>> getColumns() {
-        return Lists.newArrayList(this.columnMetadata.keySet());
-    }
-
-    @Override
-    public Collection<ForeignKey<?>> getForeignKeys() {
-        return foreignKeys;
-    }
-
-    @Override
-    public Collection<ForeignKey<?>> getInverseForeignKeys() {
-        return inverseForeignKeys;
-    }
-
-    @Override
-    public PrimaryKey<T> getPrimaryKey() {
-        return primaryKey;
-    }
-
-    @Override
-    public SchemaAndTable getSchemaAndTable() {
-        return schemaAndTable;
-    }
-
-    @Override
-    public String getSchemaName() {
-        return schema;
-    }
-
-    @Override
-    public String getTableName() {
-        return table;
-    }
-
-    @Override
-    public ColumnMetadata getMetadata(Path<?> column) {
-        return columnMetadata.get(column);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathUtils.java b/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathUtils.java
deleted file mode 100644
index 7a81a09f13..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathUtils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Projections;
-import com.mysema.query.types.QBean;
-
-/**
- * RelationalPathUtils provides static utility methods for {@link RelationalPath} instances
- *
- * @author tiwe
- *
- */
-@SuppressWarnings("unchecked")
-public final class RelationalPathUtils {
-
-    public static <T> FactoryExpression<T> createProjection(RelationalPath<T> path) {
-        if (path.getType().equals(path.getClass())) {
-            throw new IllegalArgumentException("RelationalPath based projection can only be used with generated Bean types");
-        }
-        try {
-            // ensure that empty constructor is available
-            path.getType().getConstructor();
-            return createBeanProjection(path);
-        } catch (NoSuchMethodException e) {
-            // fallback to constructor projection
-            return createConstructorProjection(path);
-        }
-    }
-
-    private static <T> FactoryExpression<T> createConstructorProjection(RelationalPath<T> path) {
-        Expression<?>[] exprs = path.getColumns().toArray(new Expression[path.getColumns().size()]);
-        return Projections.<T>constructor((Class)path.getType(), exprs);
-    }
-
-    private static <T> FactoryExpression<T> createBeanProjection(RelationalPath<T> path) {
-        Map<String,Expression<?>> bindings = new HashMap<String,Expression<?>>();
-        for (Path<?> column : path.getColumns()) {
-            bindings.put(column.getMetadata().getName(), column);
-        }
-        if (bindings.isEmpty()) {
-            throw new IllegalArgumentException("No bindings could be derived from " + path);
-        }
-        return new QBean<T>((Class)path.getType(), true, bindings);
-    }
-
-    private RelationalPathUtils() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLBindings.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLBindings.java
deleted file mode 100644
index 3d03177d23..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLBindings.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * SQLBindings provides the SQL query string and bindings
- *
- * @author tiwe
- *
- */
-public class SQLBindings {
-
-    private final String sql;
-
-    private final ImmutableList<Object> bindings;
-
-    public SQLBindings(String sql, ImmutableList<Object> bindings) {
-        this.sql = sql;
-        this.bindings = bindings;
-    }
-
-    @Deprecated
-    public String getSql() {
-        return sql;
-    }
-
-    public String getSQL() {
-        return sql;
-    }
-
-    public ImmutableList<Object> getBindings() {
-        return bindings;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQuery.java
deleted file mode 100644
index bf8af58894..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQuery.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.JoinFlag;
-import com.mysema.query.Query;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * SQLCommonQuery is a common interface for SQLQuery and SQLSubQuery
- *
- * @author tiwe
- *
- * @param <Q> concrete type
- */
-public interface SQLCommonQuery<Q extends SQLCommonQuery<Q>> extends Query<Q> {
-
-    /**
-     * Add the given Expression as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    Q addFlag(Position position, Expression<?> flag);
-
-    /**
-     * Add the given String literal as query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    Q addFlag(Position position, String flag);
-
-    /**
-     * Add the given prefix and expression as a general query flag
-     *
-     * @param position position of the flag
-     * @param prefix prefix for the flag
-     * @param expr expression of the flag
-     * @return
-     */
-    Q addFlag(Position position, String prefix, Expression<?> expr);
-
-    /**
-     * Add the given String literal as a join flag to the last added join with the
-     * position BEFORE_TARGET
-     *
-     * @param flag
-     * @return
-     */
-    Q addJoinFlag(String flag);
-
-    /**
-     * Add the given String literal as a join flag to the last added join
-     *
-     * @param flag
-     * @param position
-     * @return
-     */
-    Q addJoinFlag(String flag, JoinFlag.Position position);
-
-    /**
-     * Defines the sources of the query
-     *
-     * @param o
-     * @return
-     */
-    Q from(Expression<?>... o);
-
-    /**
-     * Adds a sub query source
-     *
-     * @param subQuery
-     * @param alias
-     * @return
-     */
-    Q from(SubQueryExpression<?> subQuery, Path<?> alias);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q fullJoin(EntityPath<?> o);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q fullJoin(RelationalFunctionCall<E> o, Path<E> alias);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q fullJoin(SubQueryExpression<?> o, Path<?> alias);
-
-    /**
-     * Adds an inner join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q innerJoin(EntityPath<?> o);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q innerJoin(RelationalFunctionCall<E> o, Path<E> alias);
-
-    /**
-     * Adds an inner join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q innerJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
-
-    /**
-     * Adds an inner join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q innerJoin(SubQueryExpression<?> o, Path<?> alias);
-
-    /**
-     * Adds a join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q join(EntityPath<?> o);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q join(RelationalFunctionCall<E> o, Path<E> alias);
-
-    /**
-     * Adds a join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q join(ForeignKey<E> foreign, RelationalPath<E> entity);
-
-    /**
-     * Adds a join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q join(SubQueryExpression<?> o, Path<?> alias);
-
-    /**
-     * Adds a left join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q leftJoin(EntityPath<?> o);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q leftJoin(RelationalFunctionCall<E> o, Path<E> alias);
-
-    /**
-     * Adds a left join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q leftJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
-
-    /**
-     * Adds a left join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q leftJoin(SubQueryExpression<?> o, Path<?> alias);
-
-    /**
-     * Defines a filter to the last added join
-     *
-     * @param conditions
-     * @return
-     */
-    Q on(Predicate... conditions);
-
-    /**
-     * Adds a right join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q rightJoin(EntityPath<?> o);
-
-    /**
-     * Adds a full join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q rightJoin(RelationalFunctionCall<E> o, Path<E> alias);
-
-    /**
-     * Adds a right join to the given target
-     *
-     * @param o
-     * @return
-     */
-    <E> Q rightJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
-
-    /**
-     * Adds a right join to the given target
-     *
-     * @param o
-     * @return
-     */
-    Q rightJoin(SubQueryExpression<?> o, Path<?> alias);
-
-    /**
-     * Adds a common table expression
-     *
-     * @return
-     */
-    Q with(Path<?> alias, SubQueryExpression<?> o);
-
-    /**
-     * Adds a common table expression
-     *
-     * @param alias
-     * @param query
-     * @return
-     */
-    Q with(Path<?> alias, Expression<?> query);
-
-    /**
-     * Adds a common table expression
-     *
-     * @param alias
-     * @param columns
-     * @return
-     */
-    WithBuilder<Q> with(Path<?> alias, Path<?>... columns);
-
-    /**
-     * Adds a common table expression
-     *
-     * @return
-     */
-    Q withRecursive(Path<?> alias, SubQueryExpression<?> o);
-
-    /**
-     * Adds a common table expression
-     *
-     * @param alias
-     * @param query
-     * @return
-     */
-    Q withRecursive(Path<?> alias, Expression<?> query);
-
-    /**
-     * Adds a common table expression
-     *
-     * @param alias
-     * @param columns
-     * @return
-     */
-    WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns);
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQueryFactory.java
deleted file mode 100644
index ba3f0b285c..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLCommonQueryFactory.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryFactory;
-import com.mysema.query.sql.dml.SQLDeleteClause;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.dml.SQLMergeClause;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * Factory interface for query and clause creation.
- *
- * <p>The default implementation is {@link SQLQueryFactory} and should be used for general
- * query creation. Type specific variants are available if database specific queries need to be created.</p>
- *
- * @author tiwe
- *
- * @param <Q> query type
- * @param <SQ> subquery type
- * @param <D> delete clause type
- * @param <U> update clause type
- * @param <I> insert clause type
- * @param <M> merge clause type
- */
-public interface SQLCommonQueryFactory<Q extends SQLCommonQuery<?>, // extends AbstractSQLQuery<?>
-    SQ extends AbstractSQLSubQuery<?>,
-    D extends SQLDeleteClause,
-    U extends SQLUpdateClause,
-    I extends SQLInsertClause,
-    M extends SQLMergeClause> extends QueryFactory<Q,SQ> {
-
-    /**
-     * Create a new DELETE clause
-     *
-     * @param path
-     * @return
-     */
-    D delete(RelationalPath<?> path);
-
-    /**
-     * Create a new SELECT query
-     *
-     * @param from
-     * @return
-     */
-    Q from(Expression<?> from);
-
-    /**
-     * Create a new SELECT query
-     *
-     * @param from
-     * @return
-     */
-    Q from(Expression<?>... from);
-
-    /**
-     * Create a new SELECT query
-     *
-     * @param from
-     * @return
-     */
-    Q from(SubQueryExpression<?> subQuery, Path<?> alias);
-
-    /**
-     * Create a new INSERT INTO clause
-     *
-     * @param path
-     * @return
-     */
-    I insert(RelationalPath<?> path);
-
-    /**
-     * Create a new MERGE clause
-     *
-     * @param path
-     * @return
-     */
-    M merge(RelationalPath<?> path);
-
-    /**
-     * Create a new UPDATE clause
-     *
-     * @param path
-     * @return
-     */
-    U update(RelationalPath<?> path);
-
-    /* (non-Javadoc)
-     * @see com.mysema.query.QueryFactory#query()
-     */
-    @Override
-    Q query();
-
-    /* (non-Javadoc)
-     * @see com.mysema.query.QueryFactory#subQuery()
-     */
-    @Override
-    SQ subQuery();
-
-    /**
-     * @param from
-     * @return
-     */
-    SQ subQuery(Expression<?> from);
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExceptionTranslator.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExceptionTranslator.java
deleted file mode 100644
index 8b80542fe6..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExceptionTranslator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * SQLExceptionTranslator translate SQLExceptions to runtime exceptions
- *
- * @author tiwe
- *
- */
-public interface SQLExceptionTranslator {
-
-    /**
-     * @param sql
-     * @param e
-     * @return
-     */
-    RuntimeException translate(String sql, List<Object> bindings, SQLException e);
-
-    /**
-     * @param e
-     * @return
-     */
-    RuntimeException translate(SQLException e);
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java
deleted file mode 100644
index f76bd00404..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLExpressions.java
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.EnumMap;
-import java.util.Map;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.DateOperation;
-import com.mysema.query.types.expr.DateTimeExpression;
-import com.mysema.query.types.expr.DateTimeOperation;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.expr.NumberOperation;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.expr.StringOperation;
-import com.mysema.query.types.expr.Wildcard;
-
-/**
- * Common SQL expressions
- *
- * @author tiwe
- *
- */
-@SuppressWarnings("rawtypes")
-public final class SQLExpressions {
-
-    private static final Map<DatePart, Operator> DATE_ADD_OPS
-            = new EnumMap<DatePart, Operator>(DatePart.class);
-
-    private static final Map<DatePart, Operator> DATE_DIFF_OPS
-            = new EnumMap<DatePart, Operator>(DatePart.class);
-
-    private static final Map<DatePart, Operator> DATE_TRUNC_OPS
-            = new EnumMap<DatePart, Operator>(DatePart.class);
-
-    static {
-        DATE_ADD_OPS.put(DatePart.year, Ops.DateTimeOps.ADD_YEARS);
-        DATE_ADD_OPS.put(DatePart.month, Ops.DateTimeOps.ADD_MONTHS);
-        DATE_ADD_OPS.put(DatePart.week, Ops.DateTimeOps.ADD_WEEKS);
-        DATE_ADD_OPS.put(DatePart.day, Ops.DateTimeOps.ADD_DAYS);
-        DATE_ADD_OPS.put(DatePart.hour, Ops.DateTimeOps.ADD_HOURS);
-        DATE_ADD_OPS.put(DatePart.minute, Ops.DateTimeOps.ADD_MINUTES);
-        DATE_ADD_OPS.put(DatePart.second, Ops.DateTimeOps.ADD_SECONDS);
-        DATE_ADD_OPS.put(DatePart.millisecond, null); // TODO
-
-        DATE_DIFF_OPS.put(DatePart.year, Ops.DateTimeOps.DIFF_YEARS);
-        DATE_DIFF_OPS.put(DatePart.month, Ops.DateTimeOps.DIFF_MONTHS);
-        DATE_DIFF_OPS.put(DatePart.week, Ops.DateTimeOps.DIFF_WEEKS);
-        DATE_DIFF_OPS.put(DatePart.day, Ops.DateTimeOps.DIFF_DAYS);
-        DATE_DIFF_OPS.put(DatePart.hour, Ops.DateTimeOps.DIFF_HOURS);
-        DATE_DIFF_OPS.put(DatePart.minute, Ops.DateTimeOps.DIFF_MINUTES);
-        DATE_DIFF_OPS.put(DatePart.second, Ops.DateTimeOps.DIFF_SECONDS);
-        DATE_DIFF_OPS.put(DatePart.millisecond, null); // TODO
-
-        DATE_TRUNC_OPS.put(DatePart.year, Ops.DateTimeOps.TRUNC_YEAR);
-        DATE_TRUNC_OPS.put(DatePart.month, Ops.DateTimeOps.TRUNC_MONTH);
-        DATE_TRUNC_OPS.put(DatePart.week, Ops.DateTimeOps.TRUNC_WEEK);
-        DATE_TRUNC_OPS.put(DatePart.day, Ops.DateTimeOps.TRUNC_DAY);
-        DATE_TRUNC_OPS.put(DatePart.hour, Ops.DateTimeOps.TRUNC_HOUR);
-        DATE_TRUNC_OPS.put(DatePart.minute, Ops.DateTimeOps.TRUNC_MINUTE);
-        DATE_TRUNC_OPS.put(DatePart.second, Ops.DateTimeOps.TRUNC_SECOND);
-
-    }
-
-    private static final WindowOver<Double> cumeDist = new WindowOver<Double>(Double.class, SQLOps.CUMEDIST);
-
-    private static final WindowOver<Long> rank = new WindowOver<Long>(Long.class, SQLOps.RANK);
-
-    private static final WindowOver<Long> denseRank = new WindowOver<Long>(Long.class, SQLOps.DENSERANK);
-
-    private static final WindowOver<Double> percentRank = new WindowOver<Double>(Double.class, SQLOps.PERCENTRANK);
-
-    private static final WindowOver<Long> rowNumber = new WindowOver<Long>(Long.class, SQLOps.ROWNUMBER);
-
-    private static Expression[] convertToExpressions(Object... args) {
-        Expression<?>[] exprs = new Expression<?>[args.length];
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] instanceof Expression) {
-                exprs[i] = (Expression)args[i];
-            } else {
-                exprs[i] = new ConstantImpl(args[i]);
-            }
-        }
-        return exprs;
-    }
-
-    /**
-     * Wildcard expression
-     */
-    public static final Expression<Object[]> all = Wildcard.all;
-
-    /**
-     * Wilcard count expression
-     */
-    public static final Expression<Long> countAll = Wildcard.count;
-
-    /**
-     * Get an aggregate any expression for the given boolean expression
-     */
-    public static BooleanExpression any(BooleanExpression expr) {
-        return BooleanOperation.create(Ops.AggOps.BOOLEAN_ANY, expr);
-    }
-
-    /**
-     * Get an aggregate all expression for the given boolean expression
-     */
-    public static BooleanExpression all(BooleanExpression expr) {
-        return BooleanOperation.create(Ops.AggOps.BOOLEAN_ALL, expr);
-    }
-
-    /**
-     * Get a nextval(sequence) expression
-     *
-     * @param sequence
-     * @return
-     */
-    public static SimpleExpression<Long> nextval(String sequence) {
-        return nextval(Long.class, sequence);
-    }
-
-    /**
-     * Get a nextval(sequence) expression of the given type
-     *
-     * @param type
-     * @param sequence
-     * @return
-     */
-    public static <T extends Number> SimpleExpression<T> nextval(Class<T> type, String sequence) {
-        return SimpleOperation.create(type, SQLOps.NEXTVAL, ConstantImpl.create(sequence));
-    }
-
-    /**
-     * Convert timestamp to date
-     *
-     * @param dateTime
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> date(DateTimeExpression<D> dateTime) {
-        return DateOperation.create((Class)dateTime.getType(), Ops.DateTimeOps.DATE, dateTime);
-    }
-
-    /**
-     * Convert timestamp to date
-     *
-     * @param type
-     * @param dateTime
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> date(Class<D> type, DateTimeExpression<?> dateTime) {
-        return DateOperation.create(type, Ops.DateTimeOps.DATE, dateTime);
-    }
-
-    /**
-     * Get a dateadd(unit, date, amount) expression
-     *
-     * @param unit
-     * @param date
-     * @param amount
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> dateadd(DatePart unit, DateTimeExpression<D> date, int amount) {
-        return DateTimeOperation.create((Class)date.getType(), DATE_ADD_OPS.get(unit), date, ConstantImpl.create(amount));
-    }
-
-    /**
-     * Get a dateadd(unit, date, amount) expression
-     *
-     * @param unit
-     * @param date
-     * @param amount
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> dateadd(DatePart unit, DateExpression<D> date, int amount) {
-        return DateOperation.create((Class)date.getType(), DATE_ADD_OPS.get(unit), date, ConstantImpl.create(amount));
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            DateExpression<D> start, DateExpression<D> end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), start, end);
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            D start, DateExpression<D> end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), ConstantImpl.create(start), end);
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            DateExpression<D> start, D end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), start, ConstantImpl.create(end));
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            DateTimeExpression<D> start, DateTimeExpression<D> end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), start, end);
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            D start, DateTimeExpression<D> end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), ConstantImpl.create(start), end);
-    }
-
-    /**
-     * Get a datediff(unit, start, end) expression
-     *
-     * @param unit
-     * @param start
-     * @param end
-     * @return
-     */
-    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
-            DateTimeExpression<D> start, D end) {
-        return NumberOperation.create(Integer.class, DATE_DIFF_OPS.get(unit), start, ConstantImpl.create(end));
-    }
-
-    /**
-     * Truncate the given date expression
-     *
-     * @param unit
-     * @param expr
-     */
-    public static <D extends Comparable> DateExpression<D> datetrunc(DatePart unit, DateExpression<D> expr) {
-        return DateOperation.create(expr.getType(), DATE_TRUNC_OPS.get(unit), expr);
-    }
-
-    /**
-     * Truncate the given datetime expression
-     *
-     * @param unit
-     * @param expr
-     */
-    public static <D extends Comparable> DateTimeExpression<D> datetrunc(DatePart unit, DateTimeExpression<D> expr) {
-        return DateTimeOperation.create(expr.getType(), DATE_TRUNC_OPS.get(unit), expr);
-    }
-
-    /**
-     * Add the given amount of years to the date
-     *
-     * @param date
-     * @param years
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addYears(DateTimeExpression<D> date, int years) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_YEARS, date, ConstantImpl.create(years));
-    }
-
-    /**
-     * Add the given amount of months to the date
-     *
-     * @param date
-     * @param months
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addMonths(DateTimeExpression<D> date, int months) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_MONTHS, date, ConstantImpl.create(months));
-    }
-
-    /**
-     * Add the given amount of weeks to the date
-     *
-     * @param date
-     * @param weeks
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addWeeks(DateTimeExpression<D> date, int weeks) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_WEEKS, date, ConstantImpl.create(weeks));
-    }
-
-    /**
-     * Add the given amount of days to the date
-     *
-     * @param date
-     * @param days
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addDays(DateTimeExpression<D> date, int days) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_DAYS, date, ConstantImpl.create(days));
-    }
-
-    /**
-     * Add the given amount of hours to the date
-     *
-     * @param date
-     * @param hours
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addHours(DateTimeExpression<D> date, int hours) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_HOURS, date, ConstantImpl.create(hours));
-    }
-
-    /**
-     * Add the given amount of minutes to the date
-     *
-     * @param date
-     * @param minutes
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addMinutes(DateTimeExpression<D> date, int minutes) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_MINUTES, date, ConstantImpl.create(minutes));
-    }
-
-    /**
-     * Add the given amount of seconds to the date
-     *
-     * @param date
-     * @param seconds
-     * @return
-     */
-    public static <D extends Comparable> DateTimeExpression<D> addSeconds(DateTimeExpression<D> date, int seconds) {
-        return DateTimeOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_SECONDS, date, ConstantImpl.create(seconds));
-    }
-
-    /**
-     * Add the given amount of years to the date
-     *
-     * @param date
-     * @param years
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> addYears(DateExpression<D> date, int years) {
-        return DateOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_YEARS, date, ConstantImpl.create(years));
-    }
-
-    /**
-     * Add the given amount of months to the date
-     *
-     * @param date
-     * @param months
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> addMonths(DateExpression<D> date, int months) {
-        return DateOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_MONTHS, date, ConstantImpl.create(months));
-    }
-
-    /**
-     * Add the given amount of weeks to the date
-     *
-     * @param date
-     * @param weeks
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> addWeeks(DateExpression<D> date, int weeks) {
-        return DateOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_WEEKS, date, ConstantImpl.create(weeks));
-    }
-
-    /**
-     * Add the given amount of days to the date
-     *
-     * @param date
-     * @param days
-     * @return
-     */
-    public static <D extends Comparable> DateExpression<D> addDays(DateExpression<D> date, int days) {
-        return DateOperation.create((Class)date.getType(), Ops.DateTimeOps.ADD_DAYS, date, ConstantImpl.create(days));
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> sum(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), Ops.AggOps.SUM_AGG, expr);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @return
-     */
-    public static WindowOver<Long> count() {
-        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_ALL_AGG);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static WindowOver<Long> count(Expression<?> expr) {
-        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_AGG, expr);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static WindowOver<Long> countDistinct(Expression<?> expr) {
-        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG, expr);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> avg(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), Ops.AggOps.AVG_AGG, expr);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Comparable> WindowOver<T> min(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), Ops.AggOps.MIN_AGG, expr);
-    }
-
-    /**
-     * Start a window function expression
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Comparable> WindowOver<T> max(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), Ops.AggOps.MAX_AGG, expr);
-    }
-
-    /**
-     * expr evaluated at the row that is one row after the current row within the partition;
-     *
-     * @param expr
-     * @return
-     */
-    public static <T> WindowOver<T> lead(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.LEAD, expr);
-    }
-
-    /**
-     * expr evaluated at the row that is one row before the current row within the partition
-     *
-     * @param expr
-     * @return
-     */
-    public static <T> WindowOver<T> lag(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.LAG, expr);
-    }
-
-    /**
-     * @param expr
-     * @param delimiter
-     * @return
-     */
-    public static WithinGroup<Object> listagg(Expression<?> expr, String delimiter) {
-        return new WithinGroup<Object>(Object.class, SQLOps.LISTAGG, expr, ConstantImpl.create(delimiter));
-    }
-
-    /**
-     * @param measureExpr
-     * @param n
-     * @return
-     */
-    public static <T> WindowOver<T> nthValue(Expression<T> measureExpr, Number n) {
-        return nthValue(measureExpr, new ConstantImpl<Number>(n));
-    }
-
-    /**
-     * @param measureExpr
-     * @param n
-     * @return
-     */
-    public static <T> WindowOver<T> nthValue(Expression<T> measureExpr, Expression<? extends Number> n) {
-        return new WindowOver<T>((Class<T>)measureExpr.getType(), SQLOps.NTHVALUE, measureExpr, n);
-    }
-
-    /**
-     * divides an ordered data set into a number of buckets indicated by expr and assigns the
-     * appropriate bucket number to each row
-     *
-     * @param num
-     * @return
-     */
-    public static <T extends Number & Comparable> WindowOver<T> ntile(T num) {
-        return new WindowOver<T>((Class<T>)num.getClass(), SQLOps.NTILE, new ConstantImpl<T>(num));
-    }
-
-    /**
-     * rank of the current row with gaps; same as row_number of its first peer
-     *
-     * @return
-     */
-    public static WindowOver<Long> rank() {
-        return rank;
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Long> rank(Object... args) {
-        return rank(convertToExpressions(args));
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Long> rank(Expression<?>... args) {
-        return new WithinGroup<Long>(Long.class, SQLOps.RANK2, args);
-    }
-
-    /**
-     * rank of the current row without gaps; this function counts peer groups
-     *
-     * @return
-     */
-    public static WindowOver<Long> denseRank() {
-        return denseRank;
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Long> denseRank(Object... args) {
-        return denseRank(convertToExpressions(args));
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Long> denseRank(Expression<?>... args) {
-        return new WithinGroup<Long>(Long.class, SQLOps.DENSERANK2, args);
-    }
-
-    /**
-     * @return
-     */
-    public static WindowOver<Double> percentRank() {
-        return percentRank;
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Double> percentRank(Object... args) {
-        return percentRank(convertToExpressions(args));
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Double> percentRank(Expression<?>... args) {
-        return new WithinGroup<Double>(Double.class, SQLOps.PERCENTRANK2, args);
-    }
-
-    /**
-     * @param arg
-     * @return
-     */
-    public static <T extends Number> WithinGroup<T> percentileCont(T arg) {
-        if (arg.doubleValue() < 0.0 || arg.doubleValue() > 1.0) {
-            throw new IllegalArgumentException("The percentile value should be a number between 0 and 1");
-        }
-        return percentileCont(new ConstantImpl<T>(arg));
-    }
-
-    /**
-     * @param arg
-     * @return
-     */
-    public static <T extends Number> WithinGroup<T> percentileCont(Expression<T> arg) {
-        return new WithinGroup<T>((Class)arg.getType(), SQLOps.PERCENTILECONT, arg);
-    }
-
-    /**
-     * @param arg
-     * @return
-     */
-    public static <T extends Number> WithinGroup<T> percentileDisc(T arg) {
-        if (arg.doubleValue() < 0.0 || arg.doubleValue() > 1.0) {
-            throw new IllegalArgumentException("The percentile value should be a number between 0 and 1");
-        }
-        return percentileDisc(new ConstantImpl<T>(arg));
-    }
-
-    /**
-     * @param arg
-     * @return
-     */
-    public static <T extends Number> WithinGroup<T> percentileDisc(Expression<T> arg) {
-        return new WithinGroup<T>((Class)arg.getType(), SQLOps.PERCENTILEDISC, arg);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrSlope(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_SLOPE, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrIntercept(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_INTERCEPT, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrCount(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_COUNT, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrR2(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_R2, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrAvgx(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_AVGX, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrAvgy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_AVGY, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrSxx(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_SXX, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrSyy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_SYY, arg1, arg2);
-    }
-
-    /**
-     * @param arg1
-     * @param arg2
-     * @return
-     */
-    public static WindowOver<Double> regrSxy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
-        return new WindowOver<Double>(Double.class, SQLOps.REGR_SXY, arg1, arg2);
-    }
-
-    /**
-     * @return
-     */
-    public static WindowOver<Double> cumeDist() {
-        return cumeDist;
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Double> cumeDist(Object... args) {
-        return cumeDist(convertToExpressions(args));
-    }
-
-    /**
-     * @param args
-     * @return
-     */
-    public static WithinGroup<Double> cumeDist(Expression<?>... args) {
-        return new WithinGroup<Double>(Double.class, SQLOps.CUMEDIST2, args);
-    }
-
-    /**
-     * @param expr1
-     * @param expr2
-     * @return
-     */
-    public static WindowOver<Double> corr(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
-        return new WindowOver<Double>(Double.class, SQLOps.CORR, expr1, expr2);
-    }
-
-    /**
-     * @param expr1
-     * @param expr2
-     * @return
-     */
-    public static WindowOver<Double> covarPop(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
-        return new WindowOver<Double>(Double.class, SQLOps.COVARPOP, expr1, expr2);
-    }
-
-    /**
-     * @param expr1
-     * @param expr2
-     * @return
-     */
-    public static WindowOver<Double> covarSamp(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
-        return new WindowOver<Double>(Double.class, SQLOps.COVARSAMP, expr1, expr2);
-    }
-
-    /**
-     * computes the ratio of a value to the sum of a set of values. If expr evaluates to null,
-     * then the ratio-to-report value also evaluates to null.
-     *
-     * @return
-     */
-    public static <T> WindowOver<T> ratioToReport(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.RATIOTOREPORT, expr);
-    }
-
-    /**
-     * number of the current row within its partition, counting from 1
-     *
-     * @return
-     */
-    public static WindowOver<Long> rowNumber() {
-        return rowNumber;
-    }
-
-    /**
-     * returns the sample standard deviation of expr, a set of numbers.
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> stddev(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.STDDEV, expr);
-    }
-
-    /**
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> stddevDistinct(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.STDDEV_DISTINCT, expr);
-    }
-
-    /**
-     * returns the population standard deviation and returns the square root of the population variance.
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> stddevPop(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.STDDEVPOP, expr);
-    }
-
-    /**
-     * returns the cumulative sample standard deviation and returns the square root of the sample variance.
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> stddevSamp(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.STDDEVSAMP, expr);
-    }
-
-    /**
-     * returns the variance of expr
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> variance(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.VARIANCE, expr);
-    }
-
-    /**
-     * returns the population variance of a set of numbers after discarding the nulls in this set.
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> varPop(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.VARPOP, expr);
-    }
-
-    /**
-     * returns the sample variance of a set of numbers after discarding the nulls in this set.
-     *
-     * @param expr
-     * @return
-     */
-    public static <T extends Number> WindowOver<T> varSamp(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.VARSAMP, expr);
-    }
-
-    /**
-     * returns value evaluated at the row that is the first row of the window frame
-     *
-     * @param expr
-     * @return
-     */
-    public static <T> WindowOver<T> firstValue(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.FIRSTVALUE, expr);
-    }
-
-    /**
-     * returns value evaluated at the row that is the last row of the window frame
-     *
-     * @param expr
-     * @return
-     */
-    public static <T> WindowOver<T> lastValue(Expression<T> expr) {
-        return new WindowOver<T>((Class<T>)expr.getType(), SQLOps.LASTVALUE, expr);
-    }
-
-    /**
-     * Get the rhs leftmost characters of lhs
-     *
-     * @param lhs
-     * @param rhs
-     * @return
-     */
-    public static StringExpression left(Expression<String> lhs, int rhs) {
-        return left(lhs, ConstantImpl.create(rhs));
-    }
-
-    /**
-     * Get the rhs rightmost characters of lhs
-     *
-     * @param lhs
-     * @param rhs
-     * @return
-     */
-    public static StringExpression right(Expression<String> lhs, int rhs) {
-        return right(lhs, ConstantImpl.create(rhs));
-    }
-
-    /**
-     * Get the rhs leftmost characters of lhs
-     *
-     * @param lhs
-     * @param rhs
-     * @return
-     */
-    public static StringExpression left(Expression<String> lhs, Expression<Integer> rhs) {
-        return StringOperation.create(Ops.StringOps.LEFT, lhs, rhs);
-    }
-
-    /**
-     * Get the rhs leftmost characters of lhs
-     *
-     * @param lhs
-     * @param rhs
-     * @return
-     */
-    public static StringExpression right(Expression<String> lhs, Expression<Integer> rhs) {
-        return StringOperation.create(Ops.StringOps.RIGHT, lhs, rhs);
-    }
-
-    private SQLExpressions() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLListeners.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLListeners.java
deleted file mode 100644
index 8df7e2bf4a..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLListeners.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.dml.SQLInsertBatch;
-import com.mysema.query.sql.dml.SQLMergeBatch;
-import com.mysema.query.sql.dml.SQLUpdateBatch;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * SQLListeners is an SQLListener implementation which dispatches the
- * notifications to a list of SQLListener instances
- *
- * @author tiwe
- *
- */
-public class SQLListeners implements SQLListener {
-
-    @Nullable
-    private final SQLListener parent;
-
-    private final List<SQLListener> listeners = Lists.newArrayList();
-
-    public SQLListeners(SQLListener parent) {
-        this.parent = parent;
-    }
-
-    public SQLListeners() {
-        this.parent = null;
-    }
-
-    public void add(SQLListener listener) {
-        listeners.add(listener);
-    }
-
-    @Override
-    public void notifyQuery(QueryMetadata md) {
-        if (parent != null) {
-            parent.notifyQuery(md);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyQuery(md);
-        }
-    }
-
-    @Override
-    public void notifyDelete(RelationalPath<?> entity, QueryMetadata md) {
-        if (parent != null) {
-            parent.notifyDelete(entity, md);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyDelete(entity, md);
-        }
-    }
-
-    @Override
-    public void notifyDeletes(RelationalPath<?> entity, List<QueryMetadata> batches) {
-        if (parent != null) {
-            parent.notifyDeletes(entity, batches);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyDeletes(entity, batches);
-        }
-    }
-
-    @Override
-    public void notifyMerge(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> keys,
-            List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
-        if (parent != null) {
-            parent.notifyMerge(entity, md, keys, columns, values, subQuery);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyMerge(entity, md, keys, columns, values, subQuery);
-        }
-    }
-
-    @Override
-    public void notifyMerges(RelationalPath<?> entity, QueryMetadata md, List<SQLMergeBatch> batches) {
-        if (parent != null) {
-            parent.notifyMerges(entity, md, batches);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyMerges(entity, md, batches);
-        }
-    }
-
-    @Override
-    public void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> columns,
-            List<Expression<?>> values, SubQueryExpression<?> subQuery) {
-        if (parent != null) {
-            parent.notifyInsert(entity, md, columns, values, subQuery);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyInsert(entity, md, columns, values, subQuery);
-        }
-    }
-
-    @Override
-    public void notifyInserts(RelationalPath<?> entity, QueryMetadata md,
-            List<SQLInsertBatch> batches) {
-        if (parent != null) {
-            parent.notifyInserts(entity, md, batches);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyInserts(entity, md, batches);
-        }
-    }
-
-    @Override
-    public void notifyUpdate(RelationalPath<?> entity, QueryMetadata md,
-            List<Pair<Path<?>, Expression<?>>> updates) {
-        if (parent != null) {
-            parent.notifyUpdate(entity, md, updates);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyUpdate(entity, md, updates);
-        }
-    }
-
-    @Override
-    public void notifyUpdates(RelationalPath<?> entity, List<SQLUpdateBatch> batches) {
-        if (parent != null) {
-            parent.notifyUpdates(entity, batches);
-        }
-        for (SQLListener listener : listeners) {
-            listener.notifyUpdates(entity, batches);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLOps.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLOps.java
deleted file mode 100644
index 0a599896c4..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLOps.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OperatorImpl;
-
-/**
- * SQLOps provides SQL specific operators
- *
- * @author tiwe
- *
- */
-public final class SQLOps {
-
-    private static final String NS = SQLOps.class.getName();
-
-    public static final Operator<Object> ALL = new OperatorImpl<Object>(NS, "ALL");
-
-    public static final Operator<Object> CAST = new OperatorImpl<Object>(NS, "CAST");
-
-    public static final Operator<Double> CORR = new OperatorImpl<Double>(NS, "CORR");
-
-    public static final Operator<Double> COVARPOP = new OperatorImpl<Double>(NS, "COVARPOP");
-
-    public static final Operator<Double> COVARSAMP = new OperatorImpl<Double>(NS, "COVARSAMP");
-
-    public static final Operator<Double> CUMEDIST = new OperatorImpl<Double>(NS, "CUMEDIST");
-
-    public static final Operator<Double> CUMEDIST2 = new OperatorImpl<Double>(NS, "CUMEDIST2");
-
-    public static final Operator<Long> DENSERANK = new OperatorImpl<Long>(NS, "DENSERANK");
-
-    public static final Operator<Long> DENSERANK2 = new OperatorImpl<Long>(NS, "DENSERANK2");
-
-    public static final Operator<Object> FIRSTVALUE = new OperatorImpl<Object>(NS, "FIRSTVALUE");
-
-    public static final Operator<Object> FOR_SHARE = new OperatorImpl<Object>(NS, "FOR_SHARE");
-
-    public static final Operator<Object> FOR_UPDATE = new OperatorImpl<Object>(NS, "FOR_UPDATE");
-
-    public static final Operator<Object> LAG = new OperatorImpl<Object>(NS, "LAG");
-
-    public static final Operator<Object> LASTVALUE = new OperatorImpl<Object>(NS, "LASTVALUE");
-
-    public static final Operator<Object> LEAD = new OperatorImpl<Object>(NS, "LEAD");
-
-    public static final Operator<Object> LISTAGG = new OperatorImpl<Object>(NS, "LISTAGG");
-
-    public static final Operator<Object> NEXTVAL = new OperatorImpl<Object>(NS, "NEXTVAL");
-
-    public static final Operator<Object> NO_WAIT = new OperatorImpl<Object>(NS, "NO_WAIT");
-
-    public static final Operator<Object> NTHVALUE = new OperatorImpl<Object>(NS, "NTHVALUE");
-
-    public static final Operator<Object> NTILE = new OperatorImpl<Object>(NS, "NTILE");
-
-    public static final Operator<Double> PERCENTRANK = new OperatorImpl<Double>(NS, "PERCENTRANK");
-
-    public static final Operator<Double> PERCENTRANK2 = new OperatorImpl<Double>(NS, "PERCENTRANK2");
-
-    public static final Operator<Object> PERCENTILECONT = new OperatorImpl<Object>(NS, "PERCENTILECONT");
-
-    public static final Operator<Object> PERCENTILEDISC = new OperatorImpl<Object>(NS, "PERCENTILEDISC");
-
-    public static final Operator<Boolean> QUALIFY = new OperatorImpl<Boolean>(NS, "QUALIFY");
-
-    public static final Operator<Long> RANK = new OperatorImpl<Long>(NS, "RANK");
-
-    public static final Operator<Long> RANK2 = new OperatorImpl<Long>(NS, "RANK2");
-
-    public static final Operator<Object> REGR_SLOPE = new OperatorImpl<Object>(NS, "REGR_SLOPE");
-
-    public static final Operator<Object> REGR_INTERCEPT = new OperatorImpl<Object>(NS, "REGR_INTERCEPT");
-
-    public static final Operator<Object> REGR_COUNT = new OperatorImpl<Object>(NS, "REGR_COUNT");
-
-    public static final Operator<Object> REGR_R2 = new OperatorImpl<Object>(NS, "REGR_R2");
-
-    public static final Operator<Object> REGR_AVGX = new OperatorImpl<Object>(NS, "REGR_AVGX");
-
-    public static final Operator<Object> REGR_AVGY = new OperatorImpl<Object>(NS, "REGR_AVGY");
-
-    public static final Operator<Object> REGR_SXX = new OperatorImpl<Object>(NS, "REGR_SXX");
-
-    public static final Operator<Object> REGR_SYY = new OperatorImpl<Object>(NS, "REGR_SYY");
-
-    public static final Operator<Object> REGR_SXY = new OperatorImpl<Object>(NS, "REGR_SXY");
-
-    public static final Operator<Object> RATIOTOREPORT = new OperatorImpl<Object>(NS, "RATIOTOREPORT");
-
-    public static final Operator<Long> ROWNUMBER = new OperatorImpl<Long>(NS, "ROWNUMBER");
-
-    public static final Operator<Object> STDDEV = new OperatorImpl<Object>(NS, "STDDEV");
-
-    public static final Operator<Object> STDDEVPOP = new OperatorImpl<Object>(NS, "STDDEVPOP");
-
-    public static final Operator<Object> STDDEVSAMP = new OperatorImpl<Object>(NS, "STDDEVSAMP");
-
-    public static final Operator<Object> STDDEV_DISTINCT = new OperatorImpl<Object>(NS, "STDDEV_DISTINCT");
-
-    public static final Operator<Object> UNION = new OperatorImpl<Object>(NS, "UNION");
-
-    public static final Operator<Object> UNION_ALL = new OperatorImpl<Object>(NS, "UNION_ALL");
-
-    public static final Operator<Object> VARIANCE = new OperatorImpl<Object>(NS, "VARIANCE");
-
-    public static final Operator<Object> VARPOP = new OperatorImpl<Object>(NS, "VARPOP");
-
-    public static final Operator<Object> VARSAMP = new OperatorImpl<Object>(NS, "VARSAMP");
-
-    public static final Operator<Object> WITH_ALIAS = new OperatorImpl<Object>(NS, "WITH_ALIAS");
-
-    public static final Operator<Object> WITH_COLUMNS = new OperatorImpl<Object>(NS, "WITH_COLUMNS");
-
-    public static final QueryFlag FOR_SHARE_FLAG = new QueryFlag(Position.END, new OperationImpl<Object>(
-            Object.class, FOR_SHARE, ImmutableList.<Expression<?>>of()));
-
-    public static final QueryFlag FOR_UPDATE_FLAG = new QueryFlag(Position.END, new OperationImpl<Object>(
-            Object.class, FOR_UPDATE, ImmutableList.<Expression<?>>of()));
-
-    public static final QueryFlag NO_WAIT_FLAG = new QueryFlag(Position.END, new OperationImpl<Object>(
-            Object.class, NO_WAIT, ImmutableList.<Expression<?>>of()));
-
-    private SQLOps() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java
deleted file mode 100644
index 0de5e70b63..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.Connection;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryMetadata;
-
-/**
- * SQLQuery is a JDBC based implementation of the {@link SQLCommonQuery} interface
- *
- * @author tiwe
- */
-public final class SQLQuery extends AbstractSQLQuery<SQLQuery> {
-
-    /**
-     * Create a detached SQLQuery instance
-     * The query can be attached via the clone method
-     *
-     * @param connection Connection to use
-     * @param templates SQLTemplates to use
-     */
-    public SQLQuery(SQLTemplates templates) {
-        super(null, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    /**
-     * Create a new SQLQuery instance
-     *
-     * @param conn Connection to use
-     * @param templates SQLTemplates to use
-     */
-    public SQLQuery(Connection conn, SQLTemplates templates) {
-        super(conn, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    /**
-     * Create a new SQLQuery instance
-     *
-     * @param conn Connection to use
-     * @param templates SQLTemplates to use
-     * @param metadata
-     */
-    public SQLQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
-        super(conn, new Configuration(templates), metadata);
-    }
-
-    /**
-     * Create a new SQLQuery instance
-     * 
-     * @param configuration
-     */
-    public SQLQuery( Configuration configuration) {
-        this(null, configuration);
-    }
-    
-    /**
-     * Create a new SQLQuery instance
-     *
-     * @param conn Connection to use
-     * @param configuration
-     */
-    public SQLQuery(Connection conn, Configuration configuration) {
-        super(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    /**
-     * Create a new SQLQuery instance
-     *
-     * @param conn
-     * @param templates
-     * @param metadata
-     */
-    public SQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    @Override
-    public SQLQuery clone(Connection conn) {
-        SQLQuery q = new SQLQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactory.java
deleted file mode 100644
index ee9364d57b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.inject.Provider;
-import javax.sql.DataSource;
-
-/**
- * Factory class for query and DML clause creation
- *
- * @author tiwe
- *
- */
-public class SQLQueryFactory extends AbstractSQLQueryFactory<SQLQuery, SQLSubQuery> {
-
-    static class DataSourceProvider implements Provider<Connection> {
-
-        private final DataSource ds;
-
-        public DataSourceProvider(DataSource ds) {
-            this.ds = ds;
-        }
-
-        @Override
-        public Connection get() {
-            try {
-                return ds.getConnection();
-            } catch (SQLException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-
-    }
-
-    public SQLQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public SQLQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public SQLQueryFactory(Configuration configuration, DataSource dataSource) {
-        super(configuration, new DataSourceProvider(dataSource));
-    }
-
-    @Override
-    public SQLQuery query() {
-        return new SQLQuery(connection.get(), configuration);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactoryImpl.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactoryImpl.java
deleted file mode 100644
index f07182396b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQueryFactoryImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.inject.Provider;
-import javax.sql.DataSource;
-
-/**
- * Use SQLQueryFactory instead
- *
- * @author tiwe
- *
- */
-@Deprecated
-public class SQLQueryFactoryImpl extends AbstractSQLQueryFactory<SQLQuery, SQLSubQuery> {
-
-    static class DataSourceProvider implements Provider<Connection> {
-
-        private final DataSource ds;
-
-        public DataSourceProvider(DataSource ds) {
-            this.ds = ds;
-        }
-
-        @Override
-        public Connection get() {
-            try {
-                return ds.getConnection();
-            } catch (SQLException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-
-    }
-
-    public SQLQueryFactoryImpl(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public SQLQueryFactoryImpl(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public SQLQueryFactoryImpl(Configuration configuration, DataSource dataSource) {
-        super(configuration, new DataSourceProvider(dataSource));
-    }
-
-    @Override
-    public SQLQuery query() {
-        return new SQLQuery(connection.get(), configuration);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
deleted file mode 100644
index faea0566d8..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
+++ /dev/null
@@ -1,885 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.support.SerializerBase;
-import com.mysema.query.types.*;
-import com.mysema.query.types.Template.Element;
-
-/**
- * SqlSerializer serializes Querydsl queries into SQL
- *
- * @author tiwe
- */
-public class SQLSerializer extends SerializerBase<SQLSerializer> {
-
-    protected enum Stage {SELECT, FROM, WHERE, GROUP_BY, HAVING, ORDER_BY, MODIFIERS}
-
-    private static final String COMMA = ", ";
-
-    private final List<Path<?>> constantPaths = new ArrayList<Path<?>>();
-
-    private final List<Object> constants = new ArrayList<Object>();
-
-    private final boolean dml;
-
-    protected Stage stage = Stage.SELECT;
-
-    private boolean skipParent;
-
-    private boolean dmlWithSchema;
-
-    private RelationalPath<?> entity;
-
-    private final Configuration configuration;
-
-    private final SQLTemplates templates;
-
-    private boolean inUnion = false;
-
-    private boolean inJoin = false;
-
-    private boolean useLiterals = false;
-
-    public SQLSerializer(Configuration conf) {
-        this(conf, false);
-    }
-
-    public SQLSerializer(Configuration conf, boolean dml) {
-        super(conf.getTemplates());
-        this.configuration = conf;
-        this.templates = conf.getTemplates();
-        this.dml = dml;
-    }
-
-    private void appendAsColumnName(Path<?> path) {
-        String column = ColumnMetadata.getName(path);
-        if (path.getMetadata().getParent() instanceof RelationalPath) {
-            RelationalPath<?> parent = (RelationalPath<?>)path.getMetadata().getParent();
-            column = configuration.getColumnOverride(parent.getSchemaAndTable(), column);
-        }
-        append(templates.quoteIdentifier(column));
-    }
-
-    private SchemaAndTable getSchemaAndTable(RelationalPath<?> path) {
-        return configuration.getOverride(path.getSchemaAndTable());
-    }
-
-    private void appendSchemaName(String schema) {
-        append(templates.quoteIdentifier(schema));
-    }
-
-    private void appendTableName(String table) {
-        append(templates.quoteIdentifier(table));
-    }
-
-    public List<Object> getConstants() {
-        return constants;
-    }
-
-    public List<Path<?>> getConstantPaths() {
-        return constantPaths;
-    }
-
-    /**
-     * Return a list of expressions that can be used to uniquely define the query sources
-     *
-     * @param joins
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    private List<Expression<?>> getIdentifierColumns(List<JoinExpression> joins, boolean alias) {
-        if (joins.size() == 1) {
-            JoinExpression join = joins.get(0);
-            if (join.getTarget() instanceof RelationalPath) {
-                return ((RelationalPath)join.getTarget()).getColumns();
-            } else {
-                return Collections.emptyList();
-            }
-
-        } else {
-            List<Expression<?>> rv = Lists.newArrayList();
-            int counter = 0;
-            for (JoinExpression join : joins) {
-                if (join.getTarget() instanceof RelationalPath) {
-                    RelationalPath path = (RelationalPath)join.getTarget();
-                    List<Expression<?>> columns;
-                    if (path.getPrimaryKey() != null) {
-                        columns = path.getPrimaryKey().getLocalColumns();
-                    } else {
-                        columns = path.getColumns();
-                    }
-                    if (alias) {
-                        for (Expression<?> column : columns) {
-                            rv.add(ExpressionUtils.as(column, "col" + (++counter)));
-                        }
-                    } else {
-                        rv.addAll(columns);
-                    }
-
-                } else {
-                    // not able to provide a distinct list of columns
-                    return Collections.emptyList();
-                }
-            }
-            return rv;
-        }
-
-    }
-
-    protected SQLTemplates getTemplates() {
-        return templates;
-    }
-
-    public void handle(String template, Object... args) {
-        handleTemplate(TemplateFactory.DEFAULT.create(template), Arrays.asList(args));
-    }
-
-    private void handleJoinTarget(JoinExpression je) {
-        // type specifier
-        if (je.getTarget() instanceof RelationalPath && templates.isSupportsAlias()) {
-            final RelationalPath<?> pe = (RelationalPath<?>) je.getTarget();
-            if (pe.getMetadata().getParent() == null) {
-                SchemaAndTable schemaAndTable = getSchemaAndTable(pe);
-                if (templates.isPrintSchema()) {
-                    appendSchemaName(schemaAndTable.getSchema());
-                    append(".");
-                }
-                appendTableName(schemaAndTable.getTable());
-                append(templates.getTableAlias());
-            }
-        }
-        inJoin = true;
-        handle(je.getTarget());
-        inJoin = false;
-    }
-
-    public void serialize(QueryMetadata metadata, boolean forCountRow) {
-        templates.serialize(metadata, forCountRow, this);
-    }
-
-    void serializeForQuery(QueryMetadata metadata, boolean forCountRow) {
-        boolean oldSkipParent = skipParent;
-        skipParent = false;
-        final List<? extends Expression<?>> select = metadata.getProjection();
-        final List<JoinExpression> joins = metadata.getJoins();
-        final Predicate where = metadata.getWhere();
-        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
-        final Predicate having = metadata.getHaving();
-        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
-        final Set<QueryFlag> flags = metadata.getFlags();
-        final boolean hasFlags = !flags.isEmpty();
-        String suffix = null;
-
-        List<Expression<?>> sqlSelect;
-        if (select.size() == 1) {
-            final Expression<?> first = select.get(0);
-            if (first instanceof FactoryExpression) {
-                sqlSelect = ((FactoryExpression<?>)first).getArgs();
-            } else {
-                sqlSelect = (List)select;
-            }
-        } else {
-            sqlSelect = new ArrayList<Expression<?>>(select.size());
-            for (Expression<?> selectExpr : select) {
-                if (selectExpr instanceof FactoryExpression) {
-                    // transforms constructor arguments into individual select expressions
-                    sqlSelect.addAll(((FactoryExpression<?>) selectExpr).getArgs());
-                } else {
-                    sqlSelect.add(selectExpr);
-                }
-            }
-        }
-
-        // with
-        if (hasFlags){
-            boolean handled = false;
-            boolean recursive = false;
-            for (QueryFlag flag : flags) {
-                if (flag.getPosition() == Position.WITH) {
-                    if (flag.getFlag() == SQLTemplates.RECURSIVE) {
-                        recursive = true;
-                        continue;
-                    }
-                    if (handled) {
-                        append(", ");
-                    }
-                    handle(flag.getFlag());
-                    handled = true;
-                }
-            }
-            if (handled) {
-                if (recursive) {
-                    prepend(templates.getWithRecursive());
-                } else {
-                    prepend(templates.getWith());
-                }
-                append("\n");
-            }
-        }
-
-        // start
-        if (hasFlags) {
-            serialize(Position.START, flags);
-        }
-
-        // select
-        Stage oldStage = stage;
-        stage = Stage.SELECT;
-        if (forCountRow) {
-            append(templates.getSelect());
-            if (hasFlags) {
-                serialize(Position.AFTER_SELECT, flags);
-            }
-
-            if (!metadata.isDistinct()) {
-                append(templates.getCountStar());
-            } else {
-                List<? extends Expression<?>> columns;
-                if (sqlSelect.isEmpty()) {
-                    columns = getIdentifierColumns(joins, !templates.isCountDistinctMultipleColumns());
-                } else {
-                    columns = sqlSelect;
-                }
-                if (columns.size() == 1) {
-                    append(templates.getDistinctCountStart());
-                    handle(columns.get(0));
-                    append(templates.getDistinctCountEnd());
-                } else if (templates.isCountDistinctMultipleColumns()) {
-                    append(templates.getDistinctCountStart());
-                    append("(").handle(COMMA, columns).append(")");
-                    append(templates.getDistinctCountEnd());
-                } else {
-                    // select count(*) from (select distinct ...)
-                    append(templates.getCountStar());
-                    append(templates.getFrom());
-                    append("(");
-                    append(templates.getSelectDistinct());
-                    handle(COMMA, columns);
-                    suffix = ") internal";
-                }
-            }
-
-        } else if (!sqlSelect.isEmpty()) {
-            if (!metadata.isDistinct()) {
-                append(templates.getSelect());
-            } else {
-                append(templates.getSelectDistinct());
-            }
-            if (hasFlags) {
-                serialize(Position.AFTER_SELECT, flags);
-            }
-
-            handle(COMMA, sqlSelect);
-        }
-        if (hasFlags) {
-            serialize(Position.AFTER_PROJECTION, flags);
-        }
-
-        // from
-        stage = Stage.FROM;
-        serializeSources(joins);
-
-        // where
-        if (where != null) {
-            stage = Stage.WHERE;
-            if (hasFlags) {
-                serialize(Position.BEFORE_FILTERS, flags);
-            }
-            append(templates.getWhere()).handle(where);
-            if (hasFlags) {
-                serialize(Position.AFTER_FILTERS, flags);
-            }
-        }
-
-        // group by
-        if (!groupBy.isEmpty()) {
-            stage = Stage.GROUP_BY;
-            if (hasFlags) {
-                serialize(Position.BEFORE_GROUP_BY, flags);
-            }
-            append(templates.getGroupBy()).handle(COMMA, groupBy);
-            if (hasFlags) {
-                serialize(Position.AFTER_GROUP_BY, flags);
-            }
-        }
-
-        // having
-        if (having != null) {
-            stage = Stage.HAVING;
-            if (hasFlags) {
-                serialize(Position.BEFORE_HAVING, flags);
-            }
-            append(templates.getHaving()).handle(having);
-            if (hasFlags) {
-                serialize(Position.AFTER_HAVING, flags);
-            }
-        }
-
-        // order by
-        if (hasFlags) {
-            serialize(Position.BEFORE_ORDER, flags);
-        }
-        if (!orderBy.isEmpty() && !forCountRow) {
-            stage = Stage.ORDER_BY;
-            append(templates.getOrderBy());
-            handleOrderBy(orderBy);
-            if (hasFlags) {
-                serialize(Position.AFTER_ORDER, flags);
-            }
-        }
-
-        // modifiers
-        if (!forCountRow && metadata.getModifiers().isRestricting() && !joins.isEmpty()) {
-            stage = Stage.MODIFIERS;
-            templates.serializeModifiers(metadata, this);
-        }
-
-        if (suffix != null) {
-            append(suffix);
-        }
-
-        // reset stage
-        stage = oldStage;
-        skipParent = oldSkipParent;
-    }
-
-    protected void handleOrderBy(List<OrderSpecifier<?>> orderBy) {
-        boolean first = true;
-        for (final OrderSpecifier<?> os : orderBy) {
-            if (!first) {
-                append(COMMA);
-            }
-            String order = os.getOrder() == Order.ASC ? templates.getAsc() : templates.getDesc();
-            if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
-                if (templates.getNullsFirst() != null) {
-                    handle(os.getTarget());
-                    append(order);
-                    append(templates.getNullsFirst());
-                } else {
-                    append("(case when ");
-                    handle(os.getTarget());
-                    append(" is null then 0 else 1 end), ");
-                    handle(os.getTarget());
-                    append(order);
-                }
-            } else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
-                if (templates.getNullsLast() != null) {
-                    handle(os.getTarget());
-                    append(order);
-                    append(templates.getNullsLast());
-                } else {
-                    append("(case when ");
-                    handle(os.getTarget());
-                    append(" is null then 1 else 0 end), ");
-                    handle(os.getTarget());
-                    append(order);
-                }
-
-            } else {
-                handle(os.getTarget());
-                append(order);
-            }
-            first = false;
-        }
-    }
-
-    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity) {
-        this.entity = entity;
-        templates.serializeDelete(metadata, entity, this);
-    }
-
-    void serializeForDelete(QueryMetadata metadata, RelationalPath<?> entity) {
-        serialize(Position.START, metadata.getFlags());
-
-        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
-            append(templates.getDelete());
-        }
-        serialize(Position.AFTER_SELECT, metadata.getFlags());
-        append("from ");
-
-        dmlWithSchema = true;
-        handle(entity);
-        dmlWithSchema = false;
-
-        if (metadata.getWhere() != null) {
-            append(templates.getWhere()).handle(metadata.getWhere());
-        }
-    }
-
-    public void serializeMerge(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> keys,
-            List<Path<?>> columns, List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
-        this.entity = entity;
-        templates.serializeMerge(metadata, entity, keys, columns, values, subQuery, this);
-    }
-
-    void serializeForMerge(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> keys,
-            List<Path<?>> columns, List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
-        serialize(Position.START, metadata.getFlags());
-
-        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
-            append(templates.getMergeInto());
-        }
-        serialize(Position.AFTER_SELECT, metadata.getFlags());
-
-        dmlWithSchema = true;
-        handle(entity);
-        dmlWithSchema = false;
-        append(" ");
-        // columns
-        if (!columns.isEmpty()) {
-            skipParent = true;
-            append("(").handle(COMMA, columns).append(") ");
-            skipParent = false;
-        }
-        // keys
-        if (!keys.isEmpty()) {
-            append(templates.getKey());
-            skipParent = true;
-            append("(").handle(COMMA, keys).append(") ");
-            skipParent = false;
-        }
-
-        if (subQuery != null) {
-            // subquery
-            append("\n");
-            serialize(subQuery.getMetadata(), false);
-        } else {
-            if (!useLiterals) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (values.get(i) instanceof Constant<?>) {
-                        constantPaths.add(columns.get(i));
-                    }
-                }
-            }
-
-            // values
-            append(templates.getValues());
-            append("(").handle(COMMA, values).append(") ");
-        }
-    }
-
-    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> columns,
-            List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
-        this.entity = entity;
-        templates.serializeInsert(metadata, entity, columns, values, subQuery, this);
-    }
-
-    void serializeForInsert(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> columns,
-            List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
-        serialize(Position.START, metadata.getFlags());
-
-        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
-            append(templates.getInsertInto());
-        }
-        serialize(Position.AFTER_SELECT, metadata.getFlags());
-
-        dmlWithSchema = true;
-        handle(entity);
-        dmlWithSchema = false;
-        // columns
-        if (!columns.isEmpty()) {
-            append(" (");
-            skipParent = true;
-            handle(COMMA, columns);
-            skipParent = false;
-            append(")");
-        }
-
-        if (subQuery != null) {
-            append("\n");
-            serialize(subQuery.getMetadata(), false);
-
-        } else {
-            if (!useLiterals) {
-                for (int i = 0; i < columns.size(); i++) {
-                    if (values.get(i) instanceof Constant<?>) {
-                        constantPaths.add(columns.get(i));
-                    }
-                }
-            }
-
-            if (!values.isEmpty()) {
-                // values
-                append(templates.getValues());
-                append("(");
-                handle(COMMA, values);
-                append(")");
-            } else {
-                append(templates.getDefaultValues());
-            }
-        }
-
-    }
-
-    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Pair<Path<?>, Expression<?>>> updates) {
-        templates.serializeUpdate(metadata, entity, updates, this);
-    }
-
-    void serializeForUpdate(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Pair<Path<?>, Expression<?>>> updates) {
-        this.entity = entity;
-
-        serialize(Position.START, metadata.getFlags());
-
-        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
-            append(templates.getUpdate());
-        }
-        serialize(Position.AFTER_SELECT, metadata.getFlags());
-
-        dmlWithSchema = true;
-        handle(entity);
-        dmlWithSchema = false;
-        append("\n");
-        append(templates.getSet());
-        boolean first = true;
-        skipParent = true;
-        for (final Pair<Path<?>,Expression<?>> update : updates) {
-            if (!first) {
-                append(COMMA);
-            }
-            handle(update.getFirst());
-            append(" = ");
-            if (!useLiterals && update.getSecond() instanceof Constant<?>) {
-                constantPaths.add(update.getFirst());
-            }
-            handle(update.getSecond());
-            first = false;
-        }
-        skipParent = false;
-
-        if (metadata.getWhere() != null) {
-            append(templates.getWhere()).handle(metadata.getWhere());
-        }
-    }
-
-    private void serializeSources(List<JoinExpression> joins) {
-        if (joins.isEmpty()) {
-            String dummyTable = templates.getDummyTable();
-            if (!Strings.isNullOrEmpty(dummyTable)) {
-                append(templates.getFrom());
-                append(dummyTable);
-            }
-        } else {
-            append(templates.getFrom());
-            for (int i = 0; i < joins.size(); i++) {
-                final JoinExpression je = joins.get(i);
-                if (je.getFlags().isEmpty()) {
-                    if (i > 0) {
-                        append(templates.getJoinSymbol(je.getType()));
-                    }
-                    handleJoinTarget(je);
-                    if (je.getCondition() != null) {
-                        append(templates.getOn()).handle(je.getCondition());
-                    }
-                } else {
-                    serialize(JoinFlag.Position.START, je.getFlags());
-                    if (!serialize(JoinFlag.Position.OVERRIDE, je.getFlags()) && i > 0) {
-                        append(templates.getJoinSymbol(je.getType()));
-                    }
-                    serialize(JoinFlag.Position.BEFORE_TARGET, je.getFlags());
-                    handleJoinTarget(je);
-                    serialize(JoinFlag.Position.BEFORE_CONDITION, je.getFlags());
-                    if (je.getCondition() != null) {
-                        append(templates.getOn()).handle(je.getCondition());
-                    }
-                    serialize(JoinFlag.Position.END, je.getFlags());
-                }
-            }
-        }
-    }
-
-    public void serializeUnion(Expression<?> union, QueryMetadata metadata, boolean unionAll) {
-        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
-        final Predicate having = metadata.getHaving();
-        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
-        final Set<QueryFlag> flags = metadata.getFlags();
-        final boolean hasFlags = !flags.isEmpty();
-
-        // with
-        if (hasFlags){
-            boolean handled = false;
-            boolean recursive = false;
-            for (QueryFlag flag : flags) {
-                if (flag.getPosition() == Position.WITH) {
-                    if (flag.getFlag() == SQLTemplates.RECURSIVE) {
-                        recursive = true;
-                        continue;
-                    }
-                    if (handled) {
-                        append(", ");
-                    }
-                    handle(flag.getFlag());
-                    handled = true;
-                }
-            }
-            if (handled) {
-                if (recursive) {
-                    prepend(templates.getWithRecursive());
-                } else {
-                    prepend(templates.getWith());
-                }
-                append("\n");
-            }
-        }
-
-        // union
-        Stage oldStage = stage;
-        handle(union);
-
-        // group by
-        if (!groupBy.isEmpty()) {
-            stage = Stage.GROUP_BY;
-            if (hasFlags) {
-                serialize(Position.BEFORE_GROUP_BY, flags);
-            }
-            append(templates.getGroupBy()).handle(COMMA, groupBy);
-            if (hasFlags) {
-                serialize(Position.AFTER_GROUP_BY, flags);
-            }
-        }
-
-        // having
-        if (having != null) {
-            stage = Stage.HAVING;
-            if (hasFlags) {
-                serialize(Position.BEFORE_HAVING, flags);
-            }
-            append(templates.getHaving()).handle(having);
-            if (hasFlags) {
-                serialize(Position.AFTER_HAVING, flags);
-            }
-        }
-
-        // order by
-        if (hasFlags) {
-            serialize(Position.BEFORE_ORDER, flags);
-        }
-        if (!orderBy.isEmpty()) {
-            stage = Stage.ORDER_BY;
-            append(templates.getOrderBy());
-            boolean first = true;
-            skipParent = true;
-            for (OrderSpecifier<?> os : orderBy) {
-                if (!first) {
-                    append(COMMA);
-                }
-                handle(os.getTarget());
-                append(os.getOrder() == Order.ASC ? templates.getAsc() : templates.getDesc());
-                first = false;
-            }
-            skipParent = false;
-            if (hasFlags) {
-                serialize(Position.AFTER_ORDER, flags);
-            }
-        }
-
-        // end
-        if (hasFlags) {
-            serialize(Position.END, flags);
-        }
-
-        // reset stage
-        stage = oldStage;
-    }
-
-    @Override
-    public void visitConstant(Object constant) {
-        if (useLiterals) {
-            if (constant instanceof Collection) {
-                append("(");
-                boolean first = true;
-                for (Object o : ((Collection)constant)) {
-                    if (!first) {
-                        append(COMMA);
-                    }
-                    append(configuration.asLiteral(o));
-                    first = false;
-                }
-                append(")");
-            } else {
-                append(configuration.asLiteral(constant));
-            }
-        } else if (constant instanceof Collection) {
-            append("(");
-            boolean first = true;
-            for (Object o : ((Collection)constant)) {
-                if (!first) {
-                    append(COMMA);
-                }
-                append("?");
-                constants.add(o);
-                if (first && (constantPaths.size() < constants.size())) {
-                    constantPaths.add(null);
-                }
-                first = false;
-            }
-            append(")");
-
-            int size = ((Collection)constant).size() - 1;
-            Path<?> lastPath = constantPaths.get(constantPaths.size()-1);
-            for (int i = 0; i < size; i++) {
-                constantPaths.add(lastPath);
-            }
-        } else {
-            append("?");
-            constants.add(constant);
-            if (constantPaths.size() < constants.size()) {
-                constantPaths.add(null);
-            }
-        }
-    }
-
-    @Override
-    public Void visit(ParamExpression<?> param, Void context) {
-        append("?");
-        constants.add(param);
-        if (constantPaths.size() < constants.size()) {
-            constantPaths.add(null);
-        }
-        return null;
-    }
-
-    @Override
-    public Void visit(Path<?> path, Void context) {
-        if (dml) {
-            if (path.equals(entity) && path instanceof RelationalPath<?>) {
-                SchemaAndTable schemaAndTable = getSchemaAndTable((RelationalPath<?>) path);
-                if (dmlWithSchema && templates.isPrintSchema()) {
-                    appendSchemaName(schemaAndTable.getSchema());
-                    append(".");
-                }
-                appendTableName(schemaAndTable.getTable());
-                return null;
-            } else if (entity.equals(path.getMetadata().getParent()) && skipParent) {
-                appendAsColumnName(path);
-                return null;
-            }
-        }
-        final PathMetadata<?> metadata = path.getMetadata();
-        if (metadata.getParent() != null && (!skipParent || dml)) {
-            visit(metadata.getParent(), context);
-            append(".");
-        }
-        appendAsColumnName(path);
-        return null;
-    }
-
-    @Override
-    public Void visit(SubQueryExpression<?> query, Void context) {
-        if (inUnion && !templates.isUnionsWrapped()) {
-            serialize(query.getMetadata(), false);
-        } else {
-            append("(");
-            serialize(query.getMetadata(), false);
-            append(")");
-        }
-        return null;
-    }
-
-    @Override
-    public Void visit(TemplateExpression<?> expr, Void context) {
-        if (inJoin && templates.isFunctionJoinsWrapped()) {
-            append("table(");
-            super.visit(expr, context);
-            append(")");
-        } else {
-            super.visit(expr, context);
-        }
-        return null;
-    }
-
-    @Override
-    protected void visitOperation(Class<?> type, Operator<?> operator, List<? extends Expression<?>> args) {
-        if (args.size() == 2
-         && !useLiterals
-         && args.get(0) instanceof Path<?>
-         && args.get(1) instanceof Constant<?>
-         && operator != Ops.NUMCAST) {
-            for (Element element : templates.getTemplate(operator).getElements()) {
-                if (element instanceof Template.ByIndex && ((Template.ByIndex)element).getIndex() == 1) {
-                    constantPaths.add((Path<?>)args.get(0));
-                    break;
-                }
-            }
-        }
-
-        if (operator == SQLOps.UNION || operator == SQLOps.UNION_ALL) {
-            boolean oldUnion = inUnion;
-            inUnion = true;
-            super.visitOperation(type, operator, args);
-            inUnion = oldUnion;
-
-        } else if (operator == Ops.LIKE && args.get(1) instanceof Constant) {
-            final String escape = String.valueOf(templates.getEscapeChar());
-            final String escaped = args.get(1).toString().replace(escape, escape + escape);
-            super.visitOperation(String.class, Ops.LIKE,
-                    ImmutableList.of(args.get(0), ConstantImpl.create(escaped)));
-
-        } else if (operator == Ops.STRING_CAST) {
-            final String typeName = templates.getTypeForCast(String.class);
-            super.visitOperation(String.class, SQLOps.CAST,
-                    ImmutableList.of(args.get(0), ConstantImpl.create(typeName)));
-
-        } else if (operator == Ops.NUMCAST) {
-            final Class<?> targetType = (Class<?>) ((Constant<?>) args.get(1)).getConstant();
-            final String typeName = templates.getTypeForCast(targetType);
-            super.visitOperation(targetType, SQLOps.CAST,
-                    ImmutableList.of(args.get(0), ConstantImpl.create(typeName)));
-
-        } else if (operator == Ops.ALIAS) {
-            if (stage == Stage.SELECT || stage == Stage.FROM) {
-                super.visitOperation(type, operator, args);
-            } else {
-                // handle only target
-                handle(args.get(1));
-            }
-
-        } else if (operator == SQLOps.WITH_COLUMNS) {
-            boolean oldSkipParent = skipParent;
-            skipParent = true;
-            super.visitOperation(type, operator, args);
-            skipParent = oldSkipParent;
-
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-
-    public void setUseLiterals(boolean useLiterals) {
-        this.useLiterals = useLiterals;
-    }
-
-    protected void setSkipParent(boolean b) {
-        skipParent = b;
-    }
-
-    protected void setDmlWithSchema(boolean b) {
-        dmlWithSchema = b;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java
deleted file mode 100644
index 768974a908..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Path;
-
-
-/**
- * SQLServer2005Templates is an SQL dialect for Microsoft SQL Server 2005
- *
- * @author tiwe
- */
-public class SQLServer2005Templates extends SQLServerTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new SQLServer2005Templates(escape, quote);
-            }
-        };
-    }
-
-    private String topTemplate = "top ({0}) ";
-
-    private String outerQueryStart = "select * from (\n  ";
-
-    private String outerQueryEnd = ") a where ";
-
-    private String limitOffsetTemplate = "rn > {0} and rn <= {1}";
-
-    private String offsetTemplate = "rn > {0}";
-
-    private String outerQuerySuffix = " order by rn";
-
-    public SQLServer2005Templates() {
-        this('\\',false);
-    }
-
-    public SQLServer2005Templates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public SQLServer2005Templates(char escape, boolean quote) {
-        super(escape, quote);
-    }
-
-    @Override
-    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
-        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
-            QueryModifiers mod = metadata.getModifiers();
-            if (mod.getOffset() == null) {
-                // select top ...
-                metadata = metadata.clone();
-                metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
-                        Expressions.template(Integer.class, topTemplate, mod.getLimit())));
-                context.serializeForQuery(metadata, forCountRow);
-            } else {
-                context.append(outerQueryStart);
-                metadata = metadata.clone();
-                WindowFunction<Long> rn = SQLExpressions.rowNumber().over();
-                for (OrderSpecifier<?> os : metadata.getOrderBy()) {
-                    rn.orderBy(os);
-                }
-                metadata.addProjection(rn.as("rn"));
-                metadata.clearOrderBy();
-                context.serializeForQuery(metadata, forCountRow);
-                context.append(outerQueryEnd);
-                if (mod.getLimit() == null) {
-                    context.handle(offsetTemplate, mod.getOffset());
-                } else {
-                    context.handle(limitOffsetTemplate, mod.getOffset(), mod.getLimit() + mod.getOffset());
-                }
-                context.append(outerQuerySuffix);
-            }
-
-        } else {
-            context.serializeForQuery(metadata, forCountRow);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
-        // limit
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.isRestricting()) {
-            metadata = metadata.clone();
-            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
-                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
-        }
-
-        context.serializeForDelete(metadata, entity);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Pair<Path<?>, Expression<?>>> updates, SQLSerializer context) {
-        // limit
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.isRestricting()) {
-            metadata = metadata.clone();
-            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
-                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
-        }
-
-        context.serializeForUpdate(metadata, entity, updates);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java
deleted file mode 100644
index e361821f2a..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-
-/**
- * SQLServer2008Templates is an SQL dialect for Microsoft SQL Server 2008
- *
- * @author tiwe
- *
- */
-public class SQLServer2008Templates extends SQLServer2005Templates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new SQLServer2008Templates(escape, quote);
-            }
-        };
-    }
-
-    public SQLServer2008Templates() {
-        this('\\',false);
-    }
-
-    public SQLServer2008Templates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public SQLServer2008Templates(char escape, boolean quote) {
-        super(escape, quote);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java
deleted file mode 100644
index bf371e96d2..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-
-/**
- * SQLServer2012Templates is an SQL dialect for Microsoft SQL Server 2012 and later
- *
- * @author tiwe
- *
- */
-public class SQLServer2012Templates extends SQLServerTemplates {
-
-    private String limitOffsetTemplate = "\noffset {1} rows fetch next {0} rows only";
-
-    private String offsetTemplate = "\noffset {0} rows";
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new SQLServer2012Templates(escape, quote);
-            }
-        };
-    }
-
-    public SQLServer2012Templates() {
-        this('\\',false);
-    }
-
-    public SQLServer2012Templates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public SQLServer2012Templates(char escape, boolean quote) {
-        super(escape, quote);
-    }
-
-    @Override
-    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
-        context.serializeForQuery(metadata, forCountRow);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.getLimit() == null) {
-            context.handle(offsetTemplate, mod.getOffset());
-        } else if (mod.getOffset() == null) {
-            context.handle(limitOffsetTemplate, mod.getLimit(), 0);
-        } else {
-            context.handle(limitOffsetTemplate, mod.getLimit(), mod.getOffset());
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
deleted file mode 100644
index c18577a671..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.sql.Types;
-
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Ops;
-
-/**
- * SQLServerTemplates is an SQL dialect for Microsoft SQL Server
- *
- * @author tiwe
- *
- */
-public class SQLServerTemplates extends SQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new SQLServerTemplates(escape, quote);
-            }
-        };
-    }
-
-    private String topTemplate = "top {0s} ";
-
-    public SQLServerTemplates() {
-        this('\\',false);
-    }
-
-    public SQLServerTemplates(boolean quote) {
-        this('\\',quote);
-    }
-
-    public SQLServerTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        addClass2TypeMappings("decimal", Double.class);
-        setDummyTable("");
-        setNullsFirst(null);
-        setNullsLast(null);
-        setDefaultValues("\ndefault values");
-
-        // String
-        add(Ops.CONCAT, "{0} + {1}", 13);
-        add(Ops.CHAR_AT, "cast(substring({0},{1}+1,1) as char)");
-        add(Ops.INDEX_OF, "charindex({1},{0})-1");
-        add(Ops.INDEX_OF_2ARGS, "charindex({1},{0},{2})-1");
-        // NOTE : needs to be replaced with real regular expression
-        add(Ops.MATCHES, "{0} like {1}");
-        add(Ops.STRING_IS_EMPTY, "len({0}) = 0");
-        add(Ops.STRING_LENGTH, "len({0})");
-        add(Ops.SUBSTR_1ARG, "substring({0},{1}+1,255)");
-        add(Ops.SUBSTR_2ARGS, "substring({0},{1}+1,{2s}-{1s})", 1);
-        add(Ops.TRIM, "ltrim(rtrim({0}))");
-
-        add(Ops.StringOps.LOCATE, "charindex({0},{1})");
-        add(Ops.StringOps.LOCATE2, "charindex({0},{1},{2})");
-
-        add(SQLOps.NEXTVAL, "{0s}.nextval");
-
-        add(Ops.MOD, "{0} % {1}", 10);
-        add(Ops.MathOps.COSH, "(exp({0}) + exp({0} * -1)) / 2");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
-        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
-        add(Ops.MathOps.TANH, "(exp({0} * 2) - 1) / (exp({0} * 2) + 1)");
-
-        // Date / time
-        add(Ops.DateTimeOps.YEAR, "datepart(year, {0})");
-        add(Ops.DateTimeOps.MONTH, "datepart(month, {0})");
-        add(Ops.DateTimeOps.WEEK, "datepart(week, {0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "datepart(day, {0})");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "datepart(weekday, {0})");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "datepart(dayofyear, {0})");
-        add(Ops.DateTimeOps.HOUR, "datepart(hour, {0})");
-        add(Ops.DateTimeOps.MINUTE, "datepart(minute, {0})");
-        add(Ops.DateTimeOps.SECOND, "datepart(second, {0})");
-        add(Ops.DateTimeOps.MILLISECOND, "datepart(millisecond, {0})");
-
-        add(Ops.DateTimeOps.YEAR_MONTH, "(datepart(year, {0}) * 100 + datepart(month, {0}))");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(datepart(year, {0}) * 100 + datepart(isowk, {0}))");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "dateadd(year, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd(month, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd(week, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_DAYS, "dateadd(day, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_HOURS, "dateadd(hour, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd(minute, {1s}, {0})");
-        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd(second, {1s}, {0})");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "datediff(year,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff(month,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "datediff(week,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_DAYS, "datediff(day,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "datediff(hour,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff(minute,{0},{1})");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff(second,{0},{1})");
-
-        add(Ops.DateTimeOps.DATE, "cast({0} as date)");
-        add(Ops.DateTimeOps.CURRENT_DATE, "cast(getdate() as date)");
-    }
-
-    @Override
-    public String serialize(String literal, int jdbcType) {
-        if (jdbcType == Types.TIMESTAMP) {
-            return "{ts '" + literal + "'}";
-        } else if (jdbcType == Types.DATE) {
-            return "{d '" + literal + "'}";
-        } else if (jdbcType == Types.TIME) {
-            return "{t '" + literal + "'}";
-        } else {
-            return super.serialize(literal, jdbcType);
-        }
-    }
-
-    @Override
-    protected String escapeForLike(String str) {
-        final StringBuilder rv = new StringBuilder(str.length() + 3);
-        for (char ch : str.toCharArray()) {
-            if (ch == getEscapeChar() || ch == '%' || ch == '_' || ch == '[') {
-                rv.append(getEscapeChar());
-            }
-            rv.append(ch);
-        }
-        return rv.toString();
-    }
-
-    @Override
-    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
-        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
-            QueryModifiers mod = metadata.getModifiers();
-            if (mod.getOffset() == null) {
-                // select top ...
-                metadata = metadata.clone();
-                metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
-                        Expressions.template(Integer.class, topTemplate, mod.getLimit())));
-                context.serializeForQuery(metadata, forCountRow);
-            } else {
-                throw new IllegalStateException("offset not supported");
-            }
-
-        } else {
-            context.serializeForQuery(metadata, forCountRow);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    @Override
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        // do nothing
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSubQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSubQuery.java
deleted file mode 100644
index ec5e556808..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSubQuery.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryMetadata;
-
-/**
- * SQLSubQuery is a subquery implementation for SQL queries
- *
- * @author tiwe
- *
- */
-public class SQLSubQuery extends AbstractSQLSubQuery<SQLSubQuery> {
-
-    public SQLSubQuery() {
-        super();
-    }
-    
-    public SQLSubQuery(QueryMetadata metadata) {
-        super(metadata);
-    }
-
-    public SQLSubQuery(Configuration configuration, QueryMetadata metadata) {
-        super(metadata);
-    }
-
-    @Override
-    public SQLSubQuery clone() {
-        SQLSubQuery subQuery = new SQLSubQuery(configuration, getMetadata());
-        return subQuery;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
deleted file mode 100644
index 91f631cb98..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java
+++ /dev/null
@@ -1,1011 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.lang.reflect.Field;
-import java.sql.Types;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.primitives.Primitives;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryException;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.sql.types.Type;
-import com.mysema.query.types.*;
-
-/**
- * SQLTemplates extends Templates to provides SQL specific extensions
- * and acts as database specific Dialect for Querydsl SQL
- *
- * @author tiwe
- */
-public class SQLTemplates extends Templates {
-
-    public static final Expression<?> RECURSIVE = TemplateExpressionImpl.create(Object.class, "");
-
-    public static final SQLTemplates DEFAULT = new SQLTemplates("\"",'\\',false);
-
-    public abstract static class Builder {
-
-        protected boolean printSchema, quote, newLineToSingleSpace;
-
-        protected char escape = '\\';
-
-        public Builder printSchema() {
-            printSchema = true;
-            return this;
-        }
-
-        public Builder quote() {
-            quote = true;
-            return this;
-        }
-
-        public Builder newLineToSingleSpace() {
-            newLineToSingleSpace = true;
-            return this;
-        }
-
-        public Builder escape(char ch) {
-            escape = ch;
-            return this;
-        }
-
-        protected abstract SQLTemplates build(char escape, boolean quote);
-
-        public SQLTemplates build() {
-            SQLTemplates templates = build(escape, quote);
-            if (newLineToSingleSpace) {
-                templates.newLineToSingleSpace();
-            }
-            templates.setPrintSchema(printSchema);
-            return templates;
-        }
-
-    }
-
-    private final Map<Class<?>, String> class2type = Maps.newHashMap();
-
-    private final Map<SchemaAndTable, SchemaAndTable> tableOverrides = Maps.newHashMap();
-
-    private final List<Type<?>> customTypes = Lists.newArrayList();
-
-    private final String quoteStr;
-
-    private final boolean useQuotes;
-
-    private boolean printSchema;
-
-    private String createTable = "create table ";
-
-    private String asc = " asc";
-
-    private String autoIncrement = " auto_increment";
-
-    private String columnAlias = " ";
-
-    private String count = "count ";
-
-    private String countStar = "count(*)";
-
-    private String delete = "delete ";
-
-    private String desc = " desc";
-
-    private String distinctCountEnd = ")";
-
-    private String distinctCountStart = "count(distinct ";
-
-    private String dummyTable = "dual";
-
-    private String from = "\nfrom ";
-
-    private String fullJoin = "\nfull join ";
-
-    private String groupBy = "\ngroup by ";
-
-    private String having = "\nhaving ";
-
-    private String innerJoin = "\ninner join ";
-
-    private String insertInto = "insert into ";
-
-    private String join = "\njoin ";
-
-    private String key = "key";
-
-    private String leftJoin = "\nleft join ";
-
-    private String rightJoin = "\nright join ";;
-
-    private String limitTemplate = "\nlimit {0}";
-
-    private String mergeInto = "merge into ";
-
-    private boolean nativeMerge;
-
-    private String notNull = " not null";
-
-    private String offsetTemplate = "\noffset {0}";
-
-    private String on = "\non ";
-
-    private String orderBy = "\norder by ";
-
-    private String select = "select ";
-
-    private String selectDistinct = "select distinct ";
-
-    private String set = "set ";
-
-    private String tableAlias = " ";
-
-    private String update = "update ";
-
-    private String values = "\nvalues ";
-
-    private String defaultValues = "\nvalues ()";
-
-    private String where = "\nwhere ";
-
-    private String with = "with ";
-
-    private String withRecursive = "with recursive ";
-
-    private String createIndex = "create index ";
-
-    private String createUniqueIndex = "create unique index ";
-
-    private String nullsFirst = " nulls first";
-
-    private String nullsLast = " nulls last";
-
-    private boolean parameterMetadataAvailable = true;
-
-    private boolean batchCountViaGetUpdateCount = false;
-
-    private boolean unionsWrapped = true;
-
-    private boolean functionJoinsWrapped = false;
-
-    private boolean limitRequired = false;
-
-    private boolean countDistinctMultipleColumns = false;
-
-    private boolean countViaAnalytics = false;
-
-    protected SQLTemplates(String quoteStr, char escape, boolean useQuotes) {
-        super(escape);
-        this.quoteStr = quoteStr;
-        this.useQuotes = useQuotes;
-
-        add(SQLOps.ALL, "{0}.*");
-
-        // flags
-        add(SQLOps.WITH_ALIAS, "{0} as {1}", 0);
-        add(SQLOps.WITH_COLUMNS, "{0} {1}", 0);
-        add(SQLOps.FOR_UPDATE, "\nfor update");
-        add(SQLOps.FOR_SHARE, "\nfor share");
-        add(SQLOps.NO_WAIT, " nowait");
-        add(SQLOps.QUALIFY, "\nqualify {0}");
-
-        // boolean
-        add(Ops.AND, "{0} and {1}", 36);
-        add(Ops.NOT, "not {0}", 35);
-        add(Ops.OR, "{0} or {1}", 38);
-        add(Ops.XNOR, "{0} xnor {1}", 39);
-        add(Ops.XOR, "{0} xor {1}", 39);
-
-        // math
-        add(Ops.MathOps.RANDOM, "rand()");
-        add(Ops.MathOps.RANDOM2, "rand({0})");
-        add(Ops.MathOps.CEIL, "ceiling({0})");
-        add(Ops.MathOps.POWER, "power({0},{1})");
-        add(Ops.MOD, "mod({0},{1})", -1);
-
-        // date time
-        add(Ops.DateTimeOps.CURRENT_DATE, "current_date");
-        add(Ops.DateTimeOps.CURRENT_TIME, "current_time");
-        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp");
-
-        add(Ops.DateTimeOps.MILLISECOND, "0");
-        add(Ops.DateTimeOps.SECOND, "extract(second from {0})");
-        add(Ops.DateTimeOps.MINUTE, "extract(minute from {0})");
-        add(Ops.DateTimeOps.HOUR, "extract(hour from {0})");
-        add(Ops.DateTimeOps.WEEK, "extract(week from {0})");
-        add(Ops.DateTimeOps.MONTH, "extract(month from {0})");
-        add(Ops.DateTimeOps.YEAR, "extract(year from {0})");
-        add(Ops.DateTimeOps.YEAR_MONTH, "(extract(year from {0}) * 100 + extract(month from {0}))");
-        add(Ops.DateTimeOps.YEAR_WEEK, "(extract(year from {0}) * 100 + extract(week from {0}))");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "extract(day_of_week from {0})");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "extract(day from {0})");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "extract(day_of_year from {0})");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "dateadd('year',{1},{0})");
-        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd('month',{1},{0})");
-        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd('week',{1},{0})");
-        add(Ops.DateTimeOps.ADD_DAYS, "dateadd('day',{1},{0})");
-        add(Ops.DateTimeOps.ADD_HOURS, "dateadd('hour',{1},{0})");
-        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd('minute',{1},{0})");
-        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd('second',{1},{0})");
-
-        add(Ops.DateTimeOps.DIFF_YEARS, "datediff('year',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff('month',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_WEEKS, "datediff('week',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_DAYS, "datediff('day',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_HOURS, "datediff('hour',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff('minute',{0},{1})");
-        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff('second',{0},{1})");
-
-        add(Ops.DateTimeOps.TRUNC_YEAR, "date_trunc('year',{0})");
-        add(Ops.DateTimeOps.TRUNC_MONTH, "date_trunc('month',{0})");
-        add(Ops.DateTimeOps.TRUNC_WEEK, "date_trunc('week',{0})");
-        add(Ops.DateTimeOps.TRUNC_DAY, "date_trunc('day',{0})");
-        add(Ops.DateTimeOps.TRUNC_HOUR, "date_trunc('hour',{0})");
-        add(Ops.DateTimeOps.TRUNC_MINUTE, "date_trunc('minute',{0})");
-        add(Ops.DateTimeOps.TRUNC_SECOND, "date_trunc('second',{0})");
-
-        // string
-        add(Ops.CONCAT, "{0} || {1}", 38);
-        add(Ops.MATCHES, "{0} regexp {1}", 25);
-        add(Ops.CHAR_AT, "cast(substr({0},{1s}+1,1) as char)");
-        add(Ops.EQ_IGNORE_CASE, "{0l} = {1l}");
-        add(Ops.INDEX_OF, "locate({1},{0})-1");
-        add(Ops.INDEX_OF_2ARGS, "locate({1},{0},{2s}+1)-1");
-        add(Ops.STRING_IS_EMPTY, "length({0}) = 0");
-        add(Ops.SUBSTR_1ARG, "substr({0},{1s}+1)", 1);
-        add(Ops.SUBSTR_2ARGS, "substr({0},{1s}+1,{2s}-{1s})", 1);
-        add(Ops.StringOps.LOCATE, "locate({0},{1})");
-        add(Ops.StringOps.LOCATE2, "locate({0},{1},{2})");
-
-        // like with escape
-        add(Ops.LIKE, "{0} like {1} escape '"+escape+"'");
-        add(Ops.ENDS_WITH, "{0} like {%1} escape '"+escape+"'");
-        add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '"+escape+"'");
-        add(Ops.STARTS_WITH, "{0} like {1%} escape '"+escape+"'");
-        add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '"+escape+"'");
-        add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '"+escape+"'");
-        add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '"+escape+"'");
-
-        add(SQLOps.CAST, "cast({0} as {1s})");
-        add(SQLOps.UNION, "{0}\nunion\n{1}", 50);
-        add(SQLOps.UNION_ALL, "{0}\nunion all\n{1}", 50);
-        add(SQLOps.NEXTVAL, "nextval('{0s}')");
-
-        // analytic functions
-        add(SQLOps.CORR, "corr({0},{1})");
-        add(SQLOps.COVARPOP, "covar_pop({0},{1})");
-        add(SQLOps.COVARSAMP, "covar_samp({0},{1})");
-        add(SQLOps.CUMEDIST, "cume_dist()");
-        add(SQLOps.CUMEDIST2, "cume_dist({0})");
-        add(SQLOps.DENSERANK, "dense_rank()");
-        add(SQLOps.DENSERANK2, "dense_rank({0})");
-        add(SQLOps.FIRSTVALUE, "first_value({0})");
-        add(SQLOps.LAG, "lag({0})");
-        add(SQLOps.LASTVALUE, "last_value({0})");
-        add(SQLOps.LEAD, "lead({0})");
-        add(SQLOps.LISTAGG, "listagg({0},'{1s}')");
-        add(SQLOps.NTHVALUE, "nth_value({0}, {1})");
-        add(SQLOps.NTILE, "ntile({0})");
-        add(SQLOps.PERCENTILECONT, "percentile_cont({0})");
-        add(SQLOps.PERCENTILEDISC, "percentile_disc({0})");
-        add(SQLOps.PERCENTRANK, "percent_rank()");
-        add(SQLOps.PERCENTRANK2, "percent_rank({0})");
-        add(SQLOps.RANK, "rank()");
-        add(SQLOps.RANK2, "rank({0})");
-        add(SQLOps.RATIOTOREPORT, "ratio_to_report({0})");
-        add(SQLOps.REGR_SLOPE, "regr_slope({0}, {1})");
-        add(SQLOps.REGR_INTERCEPT, "regr_intercept({0}, {1})");
-        add(SQLOps.REGR_COUNT, "regr_count({0}, {1})");
-        add(SQLOps.REGR_R2, "regr_r2({0}, {1})");
-        add(SQLOps.REGR_AVGX, "regr_avgx({0}, {1})");
-        add(SQLOps.REGR_AVGY, "regr_avgy({0}, {1})");
-        add(SQLOps.REGR_SXX, "regr_sxx({0}, {1})");
-        add(SQLOps.REGR_SYY, "regr_syy({0}, {1})");
-        add(SQLOps.REGR_SXY, "regr_sxy({0}, {1})");
-        add(SQLOps.ROWNUMBER, "row_number()");
-        add(SQLOps.STDDEV, "stddev({0})");
-        add(SQLOps.STDDEVPOP, "stddev_pop({0})");
-        add(SQLOps.STDDEVSAMP, "stddev_samp({0})");
-        add(SQLOps.STDDEV_DISTINCT, "stddev(distinct {0})");
-        add(SQLOps.VARIANCE, "variance({0})");
-        add(SQLOps.VARPOP, "var_pop({0})");
-        add(SQLOps.VARSAMP, "var_samp({0})");
-
-        add(Ops.AggOps.BOOLEAN_ANY, "some({0})");
-        add(Ops.AggOps.BOOLEAN_ALL, "every({0})");
-
-        for (Class<?> cl : new Class[] { Boolean.class, Byte.class,
-                Double.class, Float.class, Integer.class, Long.class,
-                Short.class, String.class }) {
-            class2type.put(cl, cl.getSimpleName().toLowerCase(Locale.ENGLISH));
-        }
-
-        class2type.put(Boolean.class, "bit");
-        class2type.put(Byte.class, "tinyint");
-        class2type.put(Long.class, "bigint");
-        class2type.put(Short.class, "smallint");
-        class2type.put(String.class, "varchar");
-        class2type.put(java.sql.Date.class, "date");
-        class2type.put(java.sql.Time.class, "time");
-        class2type.put(java.sql.Timestamp.class, "timestamp");
-    }
-
-    public String serialize(String literal, int jdbcType) {
-        switch (jdbcType) {
-            case Types.TIMESTAMP:
-                return "(timestamp '" + literal + "')";
-            case Types.DATE:
-                return "(date '" + literal + "')";
-            case Types.TIME:
-                return "(time '" + literal + "')";
-            case Types.CHAR:
-            case Types.CLOB:
-            case Types.LONGNVARCHAR:
-            case Types.LONGVARCHAR:
-            case Types.NCHAR:
-            case Types.NCLOB:
-            case Types.NVARCHAR:
-            case Types.VARCHAR:
-                return "'" + escapeLiteral(literal) + "'";
-            default:
-                return literal;
-        }
-    }
-
-    public String escapeLiteral(String str) {
-        StringBuilder builder = new StringBuilder();
-        for (char ch : str.toCharArray()) {
-            if (ch == '\n') {
-                builder.append("\\n");
-                continue;
-            } else if (ch == '\r') {
-                builder.append("\\r");
-                continue;
-            } else if (ch == '\'') {
-                builder.append("''");
-                continue;
-            }
-            builder.append(ch);
-        }
-        return builder.toString();
-    }
-
-    protected void addClass2TypeMappings(String type, Class<?>... classes) {
-        for (Class<?> cl : classes) {
-            class2type.put(cl, type);
-        }
-    }
-
-    protected void add(Map<Operator<?>, String> ops) {
-        for (Map.Entry<Operator<?>, String> entry : ops.entrySet()) {
-            add(entry.getKey(), entry.getValue());
-        }
-    }
-
-    protected void addTableOverride(SchemaAndTable from, SchemaAndTable to) {
-        tableOverrides.put(from, to);
-    }
-
-    /**
-     * Use customTypes instead
-     */
-    @Deprecated
-    public final boolean isBigDecimalSupported() {
-        return false;
-    }
-
-    public final List<Type<?>> getCustomTypes() {
-        return customTypes;
-    }
-
-    public final String getAsc() {
-        return asc;
-    }
-
-    public final String getAutoIncrement() {
-        return autoIncrement;
-    }
-
-    public final String getColumnAlias() {
-        return columnAlias;
-    }
-
-    public final String getCount() {
-        return count;
-    }
-
-    public final String getCountStar() {
-        return countStar;
-    }
-
-    public final String getDelete() {
-        return delete;
-    }
-
-    public final String getDesc() {
-        return desc;
-    }
-
-    public final String getDistinctCountEnd() {
-        return distinctCountEnd;
-    }
-
-    public final String getDistinctCountStart() {
-        return distinctCountStart;
-    }
-
-    public final String getDummyTable() {
-        return dummyTable;
-    }
-
-    public final String getFrom() {
-        return from;
-    }
-
-    public final String getFullJoin() {
-        return fullJoin;
-    }
-
-    public final String getGroupBy() {
-        return groupBy;
-    }
-
-    public final String getHaving() {
-        return having;
-    }
-
-    public final String getInnerJoin() {
-        return innerJoin;
-    }
-
-    public final String getInsertInto() {
-        return insertInto;
-    }
-
-    public final String getJoin() {
-        return join;
-    }
-
-    public final String getJoinSymbol(JoinType joinType) {
-        switch (joinType) {
-            case JOIN:      return join;
-            case INNERJOIN: return innerJoin;
-            case FULLJOIN:  return fullJoin;
-            case LEFTJOIN:  return leftJoin;
-            case RIGHTJOIN: return rightJoin;
-            default:       return ", ";
-        }
-    }
-
-    public final String getKey() {
-        return key;
-    }
-
-    public final String getLeftJoin() {
-        return leftJoin;
-    }
-
-    public final String getRightJoin() {
-        return rightJoin;
-    }
-
-    public final String getLimitTemplate() {
-        return limitTemplate;
-    }
-
-    public final String getMergeInto() {
-        return mergeInto;
-    }
-
-    public final String getNotNull() {
-        return notNull;
-    }
-
-    public final String getOffsetTemplate() {
-        return offsetTemplate;
-    }
-
-    public final String getOn() {
-        return on;
-    }
-
-    public final String getOrderBy() {
-        return orderBy;
-    }
-
-    public final String getSelect() {
-        return select;
-    }
-
-    public final String getSelectDistinct() {
-        return selectDistinct;
-    }
-
-    public final String getSet() {
-        return set;
-    }
-
-    public final String getTableAlias() {
-        return tableAlias;
-    }
-
-    public final Map<SchemaAndTable, SchemaAndTable> getTableOverrides() {
-        return tableOverrides;
-    }
-
-    public String getTypeForCast(Class<?> cl) {
-        return getTypeForClass(cl);
-    }
-
-    public String getTypeForClass(Class<?> cl) {
-        Class<?> clazz = Primitives.wrap(cl);
-        if (class2type.containsKey(clazz)) {
-            return class2type.get(clazz);
-        } else {
-            throw new IllegalArgumentException("Got not type for " + clazz.getName());
-        }
-    }
-
-    public final String getUpdate() {
-        return update;
-    }
-
-    public final String getValues() {
-        return values;
-    }
-
-    public final String getDefaultValues() {
-        return defaultValues;
-    }
-
-    public final String getWhere() {
-        return where;
-    }
-
-    public final boolean isNativeMerge() {
-        return nativeMerge;
-    }
-
-    public final boolean isSupportsAlias() {
-        return true;
-    }
-
-    public final String getCreateIndex() {
-        return createIndex;
-    }
-
-    public final String getCreateUniqueIndex() {
-        return createUniqueIndex;
-    }
-
-    public final String getCreateTable() {
-        return createTable;
-    }
-
-    public final String getWith() {
-        return with;
-    }
-
-    public final String getWithRecursive() {
-        return withRecursive;
-    }
-
-    public final boolean isCountDistinctMultipleColumns() {
-        return countDistinctMultipleColumns;
-    }
-
-    public final boolean isPrintSchema() {
-        return printSchema;
-    }
-
-    public final boolean isParameterMetadataAvailable() {
-        return parameterMetadataAvailable;
-    }
-
-    public final boolean isBatchCountViaGetUpdateCount() {
-        return batchCountViaGetUpdateCount;
-    }
-
-    public final boolean isUseQuotes() {
-        return useQuotes;
-    }
-
-    public final boolean isUnionsWrapped() {
-        return unionsWrapped;
-    }
-
-    public final boolean isFunctionJoinsWrapped() {
-        return functionJoinsWrapped;
-    }
-
-    public final boolean isLimitRequired() {
-        return limitRequired;
-    }
-
-    public final String getNullsFirst() {
-        return nullsFirst;
-    }
-
-    public final String getNullsLast() {
-        return nullsLast;
-    }
-
-    public boolean isCountViaAnalytics() {
-        return countViaAnalytics;
-    }
-
-    protected void newLineToSingleSpace() {
-        for (Class<?> cl : Arrays.<Class<?>>asList(getClass(), SQLTemplates.class)) {
-            for (Field field : cl.getDeclaredFields()) {
-                try {
-                    if (field.getType().equals(String.class)) {
-                        field.setAccessible(true);
-                        Object val = field.get(this);
-                        if (val != null) {
-                            field.set(this, val.toString().replace('\n',' '));
-                        }
-
-                    }
-                } catch (IllegalAccessException e) {
-                    throw new QueryException(e.getMessage(), e);
-                }
-            }
-        }
-    }
-
-    public final String quoteIdentifier(String identifier) {
-        if (useQuotes || requiresQuotes(identifier)) {
-            return quoteStr + identifier + quoteStr;
-        } else {
-            return identifier;
-        }
-    }
-
-    protected boolean requiresQuotes(final String identifier) {
-        for (int i = 0; i < identifier.length(); i++) {
-            final char ch = identifier.charAt(i);
-            //0-9,a-z,A-Z_
-            if (ch < '0' || (ch > '9' && ch < 'A') || (ch > 'Z' && ch < '_') || ch > 'z') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * template method for SELECT serialization
-     *
-     * @param metadata
-     * @param forCountRow
-     * @param context
-     */
-    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
-        context.serializeForQuery(metadata, forCountRow);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    /**
-     * template method for DELETE serialization
-     *
-     * @param metadata
-     * @param entity
-     * @param context
-     */
-    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
-        context.serializeForDelete(metadata, entity);
-
-        // limit
-        if (metadata.getModifiers().isRestricting()) {
-            serializeModifiers(metadata, context);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    /**
-     * template method for INSERT serialization
-     *
-     * @param metadata
-     * @param entity
-     * @param columns
-     * @param values
-     * @param subQuery
-     * @param context
-     */
-    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery,
-            SQLSerializer context) {
-        context.serializeForInsert(metadata, entity, columns, values, subQuery);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    /**
-     * template method for MERGE serialization
-     *
-     * @param metadata
-     * @param entity
-     * @param keys
-     * @param columns
-     * @param values
-     * @param subQuery
-     * @param context
-     */
-    public void serializeMerge(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Path<?>> keys, List<Path<?>> columns, List<Expression<?>> values,
-            SubQueryExpression<?> subQuery, SQLSerializer context) {
-        context.serializeForMerge(metadata, entity, keys, columns, values, subQuery);
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    /**
-     * template method for UPDATE serialization
-     *
-     * @param metadata
-     * @param entity
-     * @param updates
-     * @param context
-     */
-    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
-            List<Pair<Path<?>, Expression<?>>> updates, SQLSerializer context) {
-        context.serializeForUpdate(metadata, entity, updates);
-
-        // limit
-        if (metadata.getModifiers().isRestricting()) {
-            serializeModifiers(metadata, context);
-        }
-
-        if (!metadata.getFlags().isEmpty()) {
-            context.serialize(Position.END, metadata.getFlags());
-        }
-    }
-
-    /**
-     * template method for LIMIT and OFFSET serialization
-     *
-     * @param metadata
-     * @param context
-     */
-    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
-        QueryModifiers mod = metadata.getModifiers();
-        if (mod.getLimit() != null) {
-            context.handle(limitTemplate, mod.getLimit());
-        } else if (limitRequired) {
-            context.handle(limitTemplate, Integer.MAX_VALUE);
-        }
-        if (mod.getOffset() != null) {
-            context.handle(offsetTemplate, mod.getOffset());
-        }
-    }
-
-    protected void addCustomType(Type<?> type) {
-        customTypes.add(type);
-    }
-
-    protected void setAsc(String asc) {
-        this.asc = asc;
-    }
-
-    protected void setAutoIncrement(String autoIncrement) {
-        this.autoIncrement = autoIncrement;
-    }
-
-    protected void setColumnAlias(String columnAlias) {
-        this.columnAlias = columnAlias;
-    }
-
-    protected void setCount(String count) {
-        this.count = count;
-    }
-
-    protected void setCountStar(String countStar) {
-        this.countStar = countStar;
-    }
-
-    protected void setDelete(String delete) {
-        this.delete = delete;
-    }
-
-    protected void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    protected void setDistinctCountEnd(String distinctCountEnd) {
-        this.distinctCountEnd = distinctCountEnd;
-    }
-
-    protected void setDistinctCountStart(String distinctCountStart) {
-        this.distinctCountStart = distinctCountStart;
-    }
-
-    protected void setDummyTable(String dummyTable) {
-        this.dummyTable = dummyTable;
-    }
-
-    protected void setFrom(String from) {
-        this.from = from;
-    }
-
-    protected void setFullJoin(String fullJoin) {
-        this.fullJoin = fullJoin;
-    }
-
-    protected void setGroupBy(String groupBy) {
-        this.groupBy = groupBy;
-    }
-
-    protected void setHaving(String having) {
-        this.having = having;
-    }
-
-    protected void setInnerJoin(String innerJoin) {
-        this.innerJoin = innerJoin;
-    }
-
-    protected void setInsertInto(String insertInto) {
-        this.insertInto = insertInto;
-    }
-
-    protected void setJoin(String join) {
-        this.join = join;
-    }
-
-    protected void setKey(String key) {
-        this.key = key;
-    }
-
-    protected void setLeftJoin(String leftJoin) {
-        this.leftJoin = leftJoin;
-    }
-
-    protected void setRightJoin(String rightJoin) {
-        this.rightJoin = rightJoin;
-    }
-
-    protected void setMergeInto(String mergeInto) {
-        this.mergeInto = mergeInto;
-    }
-
-    protected void setNativeMerge(boolean nativeMerge) {
-        this.nativeMerge = nativeMerge;
-    }
-
-    protected void setNotNull(String notNull) {
-        this.notNull = notNull;
-    }
-
-    protected void setOffsetTemplate(String offsetTemplate) {
-        this.offsetTemplate = offsetTemplate;
-    }
-
-    protected void setOn(String on) {
-        this.on = on;
-    }
-
-    protected void setOrderBy(String orderBy) {
-        this.orderBy = orderBy;
-    }
-
-    protected void setSelect(String select) {
-        this.select = select;
-    }
-
-    protected void setSelectDistinct(String selectDistinct) {
-        this.selectDistinct = selectDistinct;
-    }
-
-    protected void setSet(String set) {
-        this.set = set;
-    }
-
-    protected void setTableAlias(String tableAlias) {
-        this.tableAlias = tableAlias;
-    }
-
-    protected void setUpdate(String update) {
-        this.update = update;
-    }
-
-    protected void setValues(String values) {
-        this.values = values;
-    }
-
-    protected void setDefaultValues(String defaultValues) {
-        this.defaultValues = defaultValues;
-    }
-
-    protected void setWhere(String where) {
-        this.where = where;
-    }
-
-    protected void setWith(String with) {
-        this.with = with;
-    }
-
-    protected void setWithRecursive(String withRecursive) {
-        this.withRecursive = withRecursive;
-    }
-
-    protected void setCreateIndex(String createIndex) {
-        this.createIndex = createIndex;
-    }
-
-    protected void setCreateUniqueIndex(String createUniqueIndex) {
-        this.createUniqueIndex = createUniqueIndex;
-    }
-
-    protected void setCreateTable(String createTable) {
-        this.createTable = createTable;
-    }
-
-    protected void setPrintSchema(boolean printSchema) {
-        this.printSchema = printSchema;
-    }
-
-    protected void setParameterMetadataAvailable(boolean parameterMetadataAvailable) {
-        this.parameterMetadataAvailable = parameterMetadataAvailable;
-    }
-
-    protected void setBatchCountViaGetUpdateCount(boolean batchCountViaGetUpdateCount) {
-        this.batchCountViaGetUpdateCount = batchCountViaGetUpdateCount;
-    }
-
-    protected void setUnionsWrapped(boolean unionsWrapped) {
-        this.unionsWrapped = unionsWrapped;
-    }
-
-    protected void setFunctionJoinsWrapped(boolean functionJoinsWrapped) {
-        this.functionJoinsWrapped = functionJoinsWrapped;
-    }
-
-    protected void setNullsFirst(String nullsFirst) {
-        this.nullsFirst = nullsFirst;
-    }
-
-    protected void setNullsLast(String nullsLast) {
-        this.nullsLast = nullsLast;
-    }
-
-    protected void setLimitRequired(boolean limitRequired) {
-        this.limitRequired = limitRequired;
-    }
-
-    protected void setCountDistinctMultipleColumns(boolean countDistinctMultipleColumns) {
-        this.countDistinctMultipleColumns = countDistinctMultipleColumns;
-    }
-
-    protected void setCountViaAnalytics(boolean countViaAnalytics) {
-        this.countViaAnalytics = countViaAnalytics;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
deleted file mode 100644
index 9c612a0ae4..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.sql.types.BigDecimalAsDoubleType;
-import com.mysema.query.types.Ops;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import java.sql.Types;
-
-/**
- * SQLiteTemplates is a SQL dialect for SQLite
- *
- * @author tiwe
- *
- */
-public class SQLiteTemplates extends SQLTemplates {
-
-    private static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-    private static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-
-    private static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new SQLiteTemplates(escape, quote);
-            }
-        };
-    }
-
-    public SQLiteTemplates() {
-        this('\\', false);
-    }
-
-    public SQLiteTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public SQLiteTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
-        setDummyTable(null);
-        addCustomType(BigDecimalAsDoubleType.DEFAULT);
-        setUnionsWrapped(false);
-        setLimitRequired(true);
-        setNullsFirst(null);
-        setNullsLast(null);
-        setDefaultValues("\ndefault values");
-        add(Ops.MOD, "{0} % {1}");
-
-        add(Ops.INDEX_OF, "charindex({1},{0},1)-1");
-        add(Ops.INDEX_OF_2ARGS, "charindex({1},{0},{2s}+1)-1");
-
-        add(Ops.StringOps.LOCATE, "charindex({0},{1})");
-        add(Ops.StringOps.LOCATE2, "charindex({0},{1},{2s})");
-
-        // TODO : optimize
-        add(Ops.DateTimeOps.YEAR, "cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.MONTH, "cast(strftime('%m',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.WEEK, "cast(strftime('%W',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1");
-        add(Ops.DateTimeOps.DAY_OF_MONTH, "cast(strftime('%d',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.DAY_OF_WEEK, "cast(strftime('%w',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1");
-        add(Ops.DateTimeOps.DAY_OF_YEAR, "cast(strftime('%j',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.HOUR, "cast(strftime('%H',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.MINUTE, "cast(strftime('%M',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.SECOND, "cast(strftime('%S',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-
-        add(Ops.DateTimeOps.YEAR_MONTH, "cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') * 100 + strftime('%m',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-        add(Ops.DateTimeOps.YEAR_WEEK, "cast(strftime('%Y%W',{0} / 1000, 'unixepoch', 'localtime') as integer)");
-
-        add(Ops.DateTimeOps.ADD_YEARS, "date({0}, '+{1s} year')");
-        add(Ops.DateTimeOps.ADD_MONTHS, "date({0}, '+{1s} month')");
-        add(Ops.DateTimeOps.ADD_WEEKS, "date({0}, '+{1s} week')");
-        add(Ops.DateTimeOps.ADD_DAYS, "date({0}, '+{1s} day')");
-        add(Ops.DateTimeOps.ADD_HOURS, "date({0}, '+{1s} hour')");
-        add(Ops.DateTimeOps.ADD_MINUTES, "date({0}, '+{1s} minute')");
-        add(Ops.DateTimeOps.ADD_SECONDS, "date({0}, '+{1s} second')");
-
-        add(Ops.MathOps.RANDOM, "random()");
-        add(Ops.MathOps.RANDOM2, "random({0})");
-        add(Ops.MathOps.LN, "log({0})");
-        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
-    }
-
-    @Override
-    public String serialize(String literal, int jdbcType) {
-        // XXX doesn't work with LocalDate, LocalDateTime and LocalTime
-        if (jdbcType == Types.TIMESTAMP) {
-            return String.valueOf(dateTimeFormatter.parseDateTime(literal).getMillis());
-        } else if (jdbcType == Types.DATE) {
-            return String.valueOf(dateFormatter.parseDateTime(literal).getMillis());
-        } else if (jdbcType == Types.TIME) {
-            return String.valueOf(timeFormatter.parseDateTime(literal).getMillis());
-        } else {
-            return super.serialize(literal, jdbcType);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SchemaAndTable.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SchemaAndTable.java
deleted file mode 100644
index 733c2b51e4..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SchemaAndTable.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.io.Serializable;
-
-/**
- *
- */
-public class SchemaAndTable implements Serializable {
-
-    private final String schema, table;
-
-    public SchemaAndTable(String schema, String table) {
-        this.schema = schema;
-        this.table = table;
-    }
-
-    public String getSchema() {
-        return schema;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof SchemaAndTable) {
-            SchemaAndTable st = (SchemaAndTable)o;
-            return st.schema.equals(schema) && st.table.equals(table);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return 31 * schema.hashCode() + table.hashCode();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Union.java b/querydsl-sql/src/main/java/com/mysema/query/sql/Union.java
deleted file mode 100644
index 4936445673..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Union.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Predicate;
-
-/**
- * Union defines an interface for Union queries
- *
- * @author tiwe
- *
- * @param <RT> return type of projection
- */
-public interface Union<RT> {
-    
-    /**
-     * Get the projection as a typed List
-     *
-     * @return
-     */
-    List<RT> list();
-    
-    
-    /**
-     * Get the projection as a typed Iterator
-     *
-     * @return
-     */
-    CloseableIterator<RT> iterate();
-    
-    /**
-     * Defines the grouping/aggregation expressions
-     *
-     * @param o
-     * @return
-     */
-    Union<RT> groupBy(Expression<?>... o);
-
-    /**
-     * Defines the filters for aggregation
-     *
-     * @param o
-     * @return
-     */
-    Union<RT> having(Predicate... o);
-    
-
-    /**
-     * Define the ordering of the query results
-     *
-     * @param o
-     * @return
-     */
-    Union<RT> orderBy(OrderSpecifier<?>... o);
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/UnionImpl.java b/querydsl-sql/src/main/java/com/mysema/query/sql/UnionImpl.java
deleted file mode 100644
index 4885c9fef3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/UnionImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.Projectable;
-import com.mysema.query.Query;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Predicate;
-
-/**
- * Default implementation of the Union interface
- * 
- * @author tiwe
- *
- * @param <Q>
- * @param <RT>
- */
-public class UnionImpl<Q extends Query & Projectable, RT>  implements Union<RT> {
-    
-    private final Q query;
-    
-    private final Expression<?>[] projection;
-        
-    public UnionImpl(Q query, List<? extends Expression<?>> projection) {
-        this.query = query;
-        this.projection = projection.toArray(new Expression[projection.size()]);
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<RT> list() {
-        if (projection.length == 1) {
-            return (List<RT>) query.list(projection[0]);
-        } else {
-            return (List<RT>) query.list(projection);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public CloseableIterator<RT> iterate() {
-        if (projection.length == 1) {
-            return (CloseableIterator<RT>) query.iterate(projection[0]);
-        } else {
-            return (CloseableIterator<RT>) query.iterate(projection);
-        }
-    }
-
-    @Override
-    public Union<RT> groupBy(Expression<?>... o) {
-        query.groupBy(o);
-        return this;
-    }
-
-    @Override
-    public Union<RT> having(Predicate... o) {
-        query.having(o);
-        return this;
-    }
-
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public Union<RT> orderBy(OrderSpecifier<?>... o) {
-        query.orderBy(o);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return query.toString();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/UnionUtils.java b/querydsl-sql/src/main/java/com/mysema/query/sql/UnionUtils.java
deleted file mode 100644
index af30c610cb..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/UnionUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-
-/**
- * UnionUtils provides static utility methods for Union handling
- *
- * @author tiwe
- *
- */
-public final class UnionUtils {
-
-    public static Expression<?> union(SubQueryExpression<?>[] union, boolean unionAll) {
-        final Operator<Object> operator = unionAll ? SQLOps.UNION_ALL : SQLOps.UNION;
-        Expression<?> rv = union[0];
-        for (int i = 1; i < union.length; i++) {
-            rv = OperationImpl.create(rv.getType(), operator, rv, union[i]);
-        }
-        return rv;
-    }
-
-    public static Expression<?> union(SubQueryExpression<?>[] union, Path<?> alias,
-            boolean unionAll) {
-        final Expression<?> rv = union(union, unionAll);
-        return ExpressionUtils.as((Expression)rv, alias);
-    }
-
-    private UnionUtils() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFirstLast.java b/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFirstLast.java
deleted file mode 100644
index 3ecfa49299..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFirstLast.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MutableExpressionBase;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ComparableExpressionBase;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.template.SimpleTemplate;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class WindowFirstLast<T> extends MutableExpressionBase<T> {
-
-    private static final long serialVersionUID = 4107262569593794721L;
-
-    private static final String ORDER_BY = "order by ";
-
-    private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
-
-    private volatile SimpleExpression<T> value;
-
-    private final Expression<T> target;
-
-    private final boolean first;
-
-    public WindowFirstLast(WindowOver<T> target, boolean first) {
-        super(target.getType());
-        this.target = target;
-        this.first = first;
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return getValue().accept(v, context);
-    }
-
-    public WindowFirstLast<T> orderBy(ComparableExpressionBase<?> orderBy) {
-        value = null;
-        this.orderBy.add(orderBy.asc());
-        return this;
-    }
-
-    public WindowFirstLast<T> orderBy(ComparableExpressionBase<?>... orderBy) {
-        value = null;
-        for (ComparableExpressionBase<?> e : orderBy) {
-            this.orderBy.add(e.asc());
-        }
-        return this;
-    }
-
-    public WindowFirstLast<T> orderBy(OrderSpecifier<?> orderBy) {
-        value = null;
-        this.orderBy.add(orderBy);
-        return this;
-    }
-
-    public WindowFirstLast<T> orderBy(OrderSpecifier<?>... orderBy) {
-        value = null;
-        this.orderBy.addAll(Arrays.asList(orderBy));
-        return this;
-    }
-
-    SimpleExpression<T> getValue() {
-        if (value == null) {
-            if (orderBy.isEmpty()) {
-                // TODO this check should be static
-                throw new IllegalStateException("No order by arguments given");
-            }
-            ImmutableList.Builder<Expression<?>> args = ImmutableList.builder();
-            StringBuilder builder = new StringBuilder();
-            builder.append("{0} keep (dense_rank ");
-            args.add(target);
-            builder.append(first ? "first " : "last ");
-            builder.append(ORDER_BY);
-            boolean first = true;
-            int size = 1;
-            for (OrderSpecifier<?> expr : orderBy) {
-                if (!first) {
-                    builder.append(", ");
-                }
-                builder.append("{" + size + "}");
-                if (!expr.isAscending()) {
-                    builder.append(" desc");
-                }
-                args.add(expr.getTarget());
-                size++;
-                first = false;
-            }
-            builder.append(")");
-            value = new SimpleTemplate<T>(
-                    target.getType(),
-                    TemplateFactory.DEFAULT.create(builder.toString()),
-                    args.build());
-        }
-        return value;
-    }
-
-    public WindowFunction<T> over() {
-        return new WindowFunction<T>(getValue());
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFunction.java b/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFunction.java
deleted file mode 100644
index f8894d5208..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowFunction.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.MutableExpressionBase;
-import com.mysema.query.types.Ops;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.expr.ComparableExpressionBase;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.template.SimpleTemplate;
-
-/**
- * @author tiwe
- */
-public class WindowFunction<A> extends MutableExpressionBase<A> {
-
-    private static final String ORDER_BY = "order by ";
-
-    private static final String PARTITION_BY = "partition by ";
-
-    private static final long serialVersionUID = -4130672293308756779L;
-
-    private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
-
-    private final List<Expression<?>> partitionBy = new ArrayList<Expression<?>>();
-
-    private final Expression<A> target;
-
-    private volatile SimpleExpression<A> value;
-
-    private String rowsOrRange;
-
-    private List<Expression<?>> rowsOrRangeArgs;
-
-    public WindowFunction(Expression<A> expr) {
-        super(expr.getType());
-        this.target = expr;
-    }
-
-    public SimpleExpression<A> getValue() {
-        if (value == null) {
-            int size = 0;
-            ImmutableList.Builder<Expression<?>> args = ImmutableList.builder();
-            StringBuilder builder = new StringBuilder();
-            builder.append("{0} over (");
-            args.add(target);
-            size++;
-            if (!partitionBy.isEmpty()) {
-                builder.append(PARTITION_BY);
-                boolean first = true;
-                for (Expression<?> expr : partitionBy) {
-                    if (!first) {
-                        builder.append(", ");
-                    }
-                    builder.append("{" + size + "}");
-                    args.add(expr);
-                    size++;
-                    first = false;
-                }
-
-            }
-            if (!orderBy.isEmpty()) {
-                if (!partitionBy.isEmpty()) {
-                    builder.append(" ");
-                }
-                builder.append(ORDER_BY);
-                boolean first = true;
-                for (OrderSpecifier<?> expr : orderBy) {
-                    if (!first) {
-                        builder.append(", ");
-                    }
-                    builder.append("{" + size + "}");
-                    if (!expr.isAscending()) {
-                        builder.append(" desc");
-                    }
-                    args.add(expr.getTarget());
-                    size++;
-                    first = false;
-                }
-            }
-            if (rowsOrRange != null) {
-                builder.append(rowsOrRange);
-                args.addAll(rowsOrRangeArgs);
-                size += rowsOrRangeArgs.size();
-            }
-            builder.append(")");
-            value = new SimpleTemplate<A>(
-                    target.getType(),
-                    TemplateFactory.DEFAULT.create(builder.toString()),
-                    args.build());
-        }
-        return value;
-    }
-
-    @SuppressWarnings("unchecked")
-    public SimpleExpression<A> as(Expression<A> alias) {
-        return SimpleOperation.create((Class<A>)getType(),Ops.ALIAS, this, alias);
-    }
-
-    public SimpleExpression<A> as(String alias) {
-        return SimpleOperation.create((Class<A>)getType(),Ops.ALIAS, this, new PathImpl<A>(getType(), alias));
-    }
-
-    @Override
-    public <R,C> R accept(Visitor<R,C> v, C context) {
-        return getValue().accept(v, context);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (o instanceof WindowFunction) {
-            WindowFunction<?> so = (WindowFunction<?>)o;
-            return so.target.equals(target)
-                && so.partitionBy.equals(partitionBy)
-                && so.orderBy.equals(orderBy);
-        } else {
-            return false;
-        }
-    }
-
-    public BooleanExpression eq(Expression<A> expr) {
-        return getValue().eq(expr);
-    }
-
-    public BooleanExpression eq(A arg) {
-        return getValue().eq(arg);
-    }
-
-    public BooleanExpression ne(Expression<A> expr) {
-        return getValue().ne(expr);
-    }
-
-    public BooleanExpression ne(A arg) {
-        return getValue().ne(arg);
-    }
-
-    public WindowFunction<A> orderBy(ComparableExpressionBase<?> orderBy) {
-        value = null;
-        this.orderBy.add(orderBy.asc());
-        return this;
-    }
-
-    public WindowFunction<A> orderBy(ComparableExpressionBase<?>... orderBy) {
-        value = null;
-        for (ComparableExpressionBase<?> e : orderBy) {
-            this.orderBy.add(e.asc());
-        }
-        return this;
-    }
-
-    public WindowFunction<A> orderBy(OrderSpecifier<?> orderBy) {
-        value = null;
-        this.orderBy.add(orderBy);
-        return this;
-    }
-
-    public WindowFunction<A> orderBy(OrderSpecifier<?>... orderBy) {
-        value = null;
-        this.orderBy.addAll(Arrays.asList(orderBy));
-        return this;
-    }
-
-    public WindowFunction<A> partitionBy(Expression<?> partitionBy) {
-        value = null;
-        this.partitionBy.add(partitionBy);
-        return this;
-    }
-
-    public WindowFunction<A> partitionBy(Expression<?>... partitionBy) {
-        value = null;
-        this.partitionBy.addAll(Arrays.asList(partitionBy));
-        return this;
-    }
-
-    WindowFunction<A> withRowsOrRange(String s, List<Expression<?>> args) {
-        rowsOrRange = s;
-        rowsOrRangeArgs = args;
-        return this;
-    }
-
-    public WindowRows<A> rows() {
-        value = null;
-        int offset = orderBy.size() + partitionBy.size() + 1;
-        return new WindowRows<A>(this, " rows", offset);
-    }
-
-    public WindowRows<A> range() {
-        value = null;
-        int offset = orderBy.size() + partitionBy.size() + 1;
-        return new WindowRows<A>(this, " range", offset);
-    }
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowOver.java b/querydsl-sql/src/main/java/com/mysema/query/sql/WindowOver.java
deleted file mode 100644
index a2da9f8edd..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowOver.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.expr.SimpleOperation;
-
-/**
- * WindowOver is the first part of a WindowFunction construction
- *
- * @author tiwe
- *
- * @param <T>
- */
-public class WindowOver<T> extends SimpleOperation<T> {
-
-    private static final long serialVersionUID = 464583892898579544L;
-
-    public WindowOver(Class<T> type, Operator<? super T> op) {
-        super(type, op, ImmutableList.<Expression<?>>of());
-    }
-
-    public WindowOver(Class<T> type, Operator<? super T> op, Expression<?> arg) {
-        super(type, op, ImmutableList.<Expression<?>>of(arg));
-    }
-
-    public WindowOver(Class<T> type, Operator<? super T> op, Expression<?> arg1, Expression<?> arg2) {
-        super(type, op, ImmutableList.<Expression<?>>of(arg1, arg2));
-    }
-
-    /**
-     * @return
-     */
-    public WindowFirstLast<T> keepFirst() {
-        return new WindowFirstLast<T>(this, true);
-    }
-
-    /**
-     * @return
-     */
-    public WindowFirstLast<T> keepLast() {
-        return new WindowFirstLast<T>(this, false);
-    }
-
-    /**
-     * @return
-     */
-    public WindowFunction<T> over() {
-        return new WindowFunction<T>(this);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WithBuilder.java b/querydsl-sql/src/main/java/com/mysema/query/sql/WithBuilder.java
deleted file mode 100644
index c54667c207..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WithBuilder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.QueryFlag;
-import com.mysema.query.support.QueryMixin;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.OperationImpl;
-
-/**
- * @author tiwe
- *
- * @param <R>
- */
-public class WithBuilder<R> {
-
-    private final QueryMixin<R> queryMixin;
-
-    private final Expression<?> alias;
-
-    public WithBuilder(QueryMixin<R> queryMixin, Expression<?> alias) {
-        this.queryMixin = queryMixin;
-        this.alias = alias;
-    }
-
-    public R as(Expression<?> expr) {
-        Expression<?> flag = OperationImpl.create(alias.getType(), SQLOps.WITH_ALIAS, alias, expr);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, flag));
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WithinGroup.java b/querydsl-sql/src/main/java/com/mysema/query/sql/WithinGroup.java
deleted file mode 100644
index 6894c02fff..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WithinGroup.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.MutableExpressionBase;
-import com.mysema.query.types.Operator;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.TemplateFactory;
-import com.mysema.query.types.Visitor;
-import com.mysema.query.types.expr.ComparableExpressionBase;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.expr.SimpleOperation;
-import com.mysema.query.types.template.SimpleTemplate;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class WithinGroup<T> extends SimpleOperation<T> {
-
-    private static final long serialVersionUID = 464583892898579544L;
-
-    private static Expression<?> merge(Expression<?>... args) {
-        if (args.length == 1) {
-            return args[0];
-        } else {
-            return ExpressionUtils.list(Object.class, args);
-        }
-    }
-
-    public class OrderBy extends MutableExpressionBase<T> {
-
-        private static final long serialVersionUID = -4936481493030913621L;
-
-        private static final String ORDER_BY = "order by ";
-
-        private volatile SimpleExpression<T> value;
-
-        private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
-
-        public OrderBy() {
-            super(WithinGroup.this.getType());
-        }
-
-        public SimpleExpression<T> getValue() {
-            if (value == null) {
-                int size = 0;
-                ImmutableList.Builder<Expression<?>> args = ImmutableList.builder();
-                StringBuilder builder = new StringBuilder();
-                builder.append("{0} within group (");
-                args.add(WithinGroup.this);
-                size++;
-                if (!orderBy.isEmpty()) {
-                    builder.append(ORDER_BY);
-                    boolean first = true;
-                    for (OrderSpecifier<?> expr : orderBy) {
-                        if (!first) {
-                            builder.append(", ");
-                        }
-                        builder.append("{" + size + "}");
-                        if (!expr.isAscending()) {
-                            builder.append(" desc");
-                        }
-                        args.add(expr.getTarget());
-                        size++;
-                        first = false;
-                    }
-                }
-                builder.append(")");
-                value = new SimpleTemplate<T>(
-                        WithinGroup.this.getType(),
-                        TemplateFactory.DEFAULT.create(builder.toString()),
-                        args.build());
-            }
-            return value;
-        }
-
-        @Override
-        public <R, C> R accept(Visitor<R, C> v, C context) {
-            return getValue().accept(v, context);
-        }
-
-        public OrderBy orderBy(ComparableExpressionBase<?> orderBy) {
-            value = null;
-            this.orderBy.add(orderBy.asc());
-            return this;
-        }
-
-        public OrderBy orderBy(ComparableExpressionBase<?>... orderBy) {
-            value = null;
-            for (ComparableExpressionBase<?> e : orderBy) {
-                this.orderBy.add(e.asc());
-            }
-            return this;
-        }
-    }
-
-    public WithinGroup(Class<T> type, Operator<? super T> op) {
-        super(type, op, ImmutableList.<Expression<?>>of());
-    }
-
-    public WithinGroup(Class<T> type, Operator<? super T> op, Expression<?> arg) {
-        super(type, op, ImmutableList.<Expression<?>>of(arg));
-    }
-
-    public WithinGroup(Class<T> type, Operator<? super T> op, Expression<?> arg1, Expression<?> arg2) {
-        super(type, op, ImmutableList.<Expression<?>>of(arg1, arg2));
-    }
-
-    public WithinGroup(Class<T> type, Operator<? super T> op, Expression<?>... args) {
-        super(type, op, merge(args));
-    }
-
-    /**
-     * @return
-     */
-    public OrderBy withinGroup() {
-        return new OrderBy();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java
deleted file mode 100644
index 771042b6e3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.DMLClause;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLListener;
-import com.mysema.query.sql.SQLListeners;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.ParamNotSetException;
-import com.mysema.query.types.Path;
-
-/**
- * AbstractSQLClause is a superclass for SQL based DMLClause implementations
- *
- * @author tiwe
- *
- */
-public abstract class AbstractSQLClause<C extends AbstractSQLClause<C>> implements DMLClause<C> {
-
-    protected final Configuration configuration;
-
-    protected final SQLListeners listeners;
-
-    protected boolean useLiterals;
-
-    /**
-     * @param configuration
-     */
-    public AbstractSQLClause(Configuration configuration) {
-        this.configuration = configuration;
-        this.listeners = new SQLListeners(configuration.getListeners());
-        this.useLiterals = configuration.getUseLiterals();
-    }
-
-    /**
-     * @param listener
-     */
-    public void addListener(SQLListener listener) {
-        listeners.add(listener);
-    }
-
-    protected SQLBindings createBindings(QueryMetadata metadata, SQLSerializer serializer) {
-        String queryString = serializer.toString();
-        ImmutableList.Builder<Object> args = ImmutableList.builder();
-        Map<ParamExpression<?>, Object> params = metadata.getParams();
-        for (Object o : serializer.getConstants()) {
-            if (o instanceof ParamExpression) {
-                if (!params.containsKey(o)) {
-                    throw new ParamNotSetException((ParamExpression<?>) o);
-                }
-                o = metadata.getParams().get(o);
-            }
-            args.add(o);
-        }
-        return new SQLBindings(queryString, args.build());
-    }
-
-    protected SQLSerializer createSerializer() {
-        SQLSerializer serializer = new SQLSerializer(configuration, true);
-        serializer.setUseLiterals(useLiterals);
-        return serializer;
-    }
-
-    /**
-     * Get the SQL string and bindings
-     *
-     * @return
-     */
-    public abstract List<SQLBindings> getSQL();
-
-    /**
-     * Set the parameters to the given PreparedStatement
-     *
-     * @param stmt preparedStatement to be populated
-     * @param objects list of constants
-     * @param constantPaths list of paths related to the constants
-     * @param params map of param to value for param resolving
-     */
-    protected void setParameters(PreparedStatement stmt, List<?> objects,
-            List<Path<?>> constantPaths, Map<ParamExpression<?>, ?> params) {
-        if (objects.size() != constantPaths.size()) {
-            throw new IllegalArgumentException("Expected " + objects.size() + " paths, " +
-                    "but got " + constantPaths.size());
-        }
-        for (int i = 0; i < objects.size(); i++) {
-            Object o = objects.get(i);
-            try {
-                if (o instanceof ParamExpression) {
-                    if (!params.containsKey(o)) {
-                        throw new ParamNotSetException((ParamExpression<?>) o);
-                    }
-                    o = params.get(o);
-                }
-                configuration.set(stmt, constantPaths.get(i), i+1, o);
-            } catch (SQLException e) {
-                throw configuration.translate(e);
-            }
-        }
-    }
-
-    protected long executeBatch(PreparedStatement stmt) throws SQLException {
-        if (configuration.getTemplates().isBatchCountViaGetUpdateCount()) {
-            stmt.executeBatch();
-            return stmt.getUpdateCount();
-        } else {
-            long rv = 0;
-            for (int i : stmt.executeBatch()) {
-                rv += i;
-            }
-            return rv;
-        }
-    }
-
-    protected void close(Statement stmt) {
-        try {
-            stmt.close();
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        }
-    }
-
-    protected void close(ResultSet rs) {
-        try {
-            rs.close();
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        }
-    }
-
-    public void setUseLiterals(boolean useLiterals) {
-        this.useLiterals = useLiterals;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/BeanMapper.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/BeanMapper.java
deleted file mode 100644
index c39c2e01cf..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/BeanMapper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.Path;
-import com.mysema.util.BeanMap;
-
-/**
- * Creates the mapping by inspecting object via bean inspection.
- * Given bean doesn't need to have @Column metadata, but the fields need to have the same
- * name as in the given relational path.
- *
- * @author tiwe
- *
- */
-public class BeanMapper extends AbstractMapper<Object> {
-
-    public static final BeanMapper DEFAULT = new BeanMapper(false);
-
-    public static final BeanMapper WITH_NULL_BINDINGS = new BeanMapper(true);
-
-    private final boolean withNullBindings;
-
-    public BeanMapper() {
-        this(false);
-    }
-
-    public BeanMapper(boolean withNullBindings) {
-        this.withNullBindings = withNullBindings;
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    @Override
-    public Map<Path<?>, Object> createMap(RelationalPath<?> entity, Object bean) {
-        Map<Path<?>, Object> values = new HashMap<Path<?>, Object>();
-        Map<String, Object> map = new BeanMap(bean);
-        Map<String, Path<?>> columns = getColumns(entity);
-        for (Map.Entry entry : map.entrySet()) {
-            String property = entry.getKey().toString();
-            if (!property.equals("class") && columns.containsKey(property)) {
-                Path path = columns.get(property);
-                if (entry.getValue() != null) {
-                    values.put(path, entry.getValue());
-                } else if (withNullBindings && !isPrimaryKeyColumn(entity, path)) {
-                    values.put(path, Null.DEFAULT);
-                }
-            }
-        }
-        return values;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/DefaultMapper.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/DefaultMapper.java
deleted file mode 100644
index 71871f66d5..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/DefaultMapper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.query.QueryException;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.Path;
-import com.mysema.util.ReflectionUtils;
-
-/**
- * Creates the mapping by inspecting the RelationalPath and Object via reflection.
- * Given bean doesn't need to have @Column metadata, but the fields need to have the same
- * name as in the given relational path.
- *
- * @author tiwe
- *
- */
-public class DefaultMapper extends AbstractMapper<Object> {
-
-    public static final DefaultMapper DEFAULT = new DefaultMapper(false);
-
-    public static final DefaultMapper WITH_NULL_BINDINGS = new DefaultMapper(true);
-
-    private final boolean withNullBindings;
-
-    public DefaultMapper() {
-        this(false);
-    }
-
-    public DefaultMapper(boolean withNullBindings) {
-        this.withNullBindings = withNullBindings;
-    }
-
-    @Override
-    public Map<Path<?>, Object> createMap(RelationalPath<?> entity, Object bean) {
-        try {
-            Map<Path<?>, Object> values = new HashMap<Path<?>, Object>();
-            Class<?> beanClass = bean.getClass();
-            Map<String, Path<?>> columns = getColumns(entity);
-            for (Field beanField : ReflectionUtils.getFields(beanClass)) {
-                if (!Modifier.isStatic(beanField.getModifiers()) && columns.containsKey(beanField.getName())) {
-                    @SuppressWarnings("rawtypes")
-                    Path path = columns.get(beanField.getName());
-                    beanField.setAccessible(true);
-                    Object propertyValue = beanField.get(bean);
-                    if (propertyValue != null) {
-                        values.put(path, propertyValue);
-                    } else if (withNullBindings && !isPrimaryKeyColumn(entity, path)) {
-                        values.put(path, Null.DEFAULT);
-                    }
-                }
-            }
-            return values;
-        } catch (IllegalAccessException e) {
-            throw new QueryException(e);
-        }
-    }
-
-
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/Mapper.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/Mapper.java
deleted file mode 100644
index a0e6a6b858..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/Mapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.util.Map;
-
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.types.Path;
-
-/**
- * Create a Map of updates for a given domain object
- * 
- * @author tiwe
- *
- */
-public interface Mapper<T> {
-    
-    /**
-     * @param path
-     * @param object
-     * @return
-     */
-    Map<Path<?>, Object> createMap(RelationalPath<?> path, T object);
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java
deleted file mode 100644
index 9376735957..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnegative;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.ValidatingVisitor;
-
-/**
- * SQLDeleteClause defines a DELETE clause
- *
- * @author tiwe
- *
- */
-public class SQLDeleteClause extends AbstractSQLClause<SQLDeleteClause> implements DeleteClause<SQLDeleteClause> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SQLDeleteClause.class);
-
-    private static final ValidatingVisitor validatingVisitor = new ValidatingVisitor("Undeclared path '%s'. " +
-            "A delete operation can only reference a single table. " +
-            "Consider this alternative: DELETE ... WHERE EXISTS (subquery)");
-
-    private final Connection connection;
-
-    private final RelationalPath<?> entity;
-
-    private final List<QueryMetadata> batches = new ArrayList<QueryMetadata>();
-
-    private DefaultQueryMetadata metadata = new DefaultQueryMetadata();
-
-    private transient String queryString;
-
-    private transient List<Object> constants;
-
-    public SQLDeleteClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
-        this(connection, new Configuration(templates), entity);
-    }
-
-    public SQLDeleteClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
-        super(configuration);
-        this.connection = connection;
-        this.entity = entity;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-        metadata.setValidatingVisitor(validatingVisitor);
-    }
-
-    /**
-     * Add the given String literal at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLDeleteClause addFlag(Position position, String flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the given Expression at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLDeleteClause addFlag(Position position, Expression<?> flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add current state of bindings as a batch item
-     *
-     * @return
-     */
-    public SQLDeleteClause addBatch() {
-        batches.add(metadata);
-        metadata = new DefaultQueryMetadata();
-        metadata.addJoin(JoinType.DEFAULT, entity);
-        metadata.setValidatingVisitor(validatingVisitor);
-        return this;
-    }
-
-    private PreparedStatement createStatement() throws SQLException{
-        PreparedStatement stmt;
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeDelete(metadata, entity);
-            queryString = serializer.toString();
-            constants = serializer.getConstants();
-            logger.debug(queryString);
-            stmt = connection.prepareStatement(queryString);
-            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-        } else {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeDelete(batches.get(0), entity);
-            queryString = serializer.toString();
-            constants = serializer.getConstants();
-            logger.debug(queryString);
-
-            // add first batch
-            stmt = connection.prepareStatement(queryString);
-            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-            stmt.addBatch();
-
-            // add other batches
-            for (int i = 1; i < batches.size(); i++) {
-                serializer = createSerializer();
-                serializer.serializeDelete(batches.get(i), entity);
-                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-                stmt.addBatch();
-            }
-        }
-        return stmt;
-    }
-
-    @Override
-    public long execute() {
-        PreparedStatement stmt = null;
-        try {
-            stmt = createStatement();
-            if (batches.isEmpty()) {
-                listeners.notifyDelete(entity, metadata);
-                return stmt.executeUpdate();
-            } else {
-                listeners.notifyDeletes(entity, batches);
-                return executeBatch(stmt);
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            if (stmt != null) {
-                close(stmt);
-            }
-        }
-    }
-
-    @Override
-    public List<SQLBindings> getSQL() {
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeDelete(metadata, entity);
-            return ImmutableList.of(createBindings(metadata, serializer));
-        } else {
-            ImmutableList.Builder<SQLBindings> builder = ImmutableList.builder();
-            for (QueryMetadata metadata : batches) {
-                SQLSerializer serializer = createSerializer();
-                serializer.serializeDelete(metadata, entity);
-                builder.add(createBindings(metadata, serializer));
-            }
-            return builder.build();
-        }
-    }
-
-    public SQLDeleteClause where(Predicate p) {
-        metadata.addWhere(p);
-        return this;
-    }
-
-    @Override
-    public SQLDeleteClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);
-        }
-        return this;
-    }
-
-    public SQLDeleteClause limit(@Nonnegative long limit) {
-        metadata.setModifiers(QueryModifiers.limit(limit));
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        SQLSerializer serializer = createSerializer();
-        serializer.serializeDelete(metadata, entity);
-        return serializer.toString();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
deleted file mode 100644
index ece68342b7..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.InsertClause;
-import com.mysema.query.sql.AbstractSQLSubQuery;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.util.ResultSetAdapter;
-
-/**
- * SQLInsertClause defines an INSERT INTO clause
- *
- * @author tiwe
- *
- */
-public class SQLInsertClause extends AbstractSQLClause<SQLInsertClause> implements
-        InsertClause<SQLInsertClause> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SQLInsertClause.class);
-
-    private final Connection connection;
-
-    private final RelationalPath<?> entity;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    @Nullable
-    private SubQueryExpression<?> subQuery;
-
-    @Nullable
-    private AbstractSQLSubQuery<?> subQueryBuilder;
-
-    private final List<SQLInsertBatch> batches = new ArrayList<SQLInsertBatch>();
-
-    private final List<Path<?>> columns = new ArrayList<Path<?>>();
-
-    private final List<Expression<?>> values = new ArrayList<Expression<?>>();
-
-    private transient String queryString;
-
-    private transient List<Object> constants;
-
-    public SQLInsertClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
-        this(connection, new Configuration(templates), entity);
-    }
-
-    public SQLInsertClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity,
-            AbstractSQLSubQuery<?> subQuery) {
-        this(connection, new Configuration(templates), entity);
-        this.subQueryBuilder = subQuery;
-    }
-
-    public SQLInsertClause(Connection connection, Configuration configuration,
-            RelationalPath<?> entity, AbstractSQLSubQuery<?> subQuery) {
-        this(connection, configuration, entity);
-        this.subQueryBuilder = subQuery;
-    }
-
-    public SQLInsertClause(Connection connection, Configuration configuration,
-            RelationalPath<?> entity) {
-        super(configuration);
-        this.connection = connection;
-        this.entity = entity;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    /**
-     * Add the given String literal at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLInsertClause addFlag(Position position, String flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the given Expression at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLInsertClause addFlag(Position position, Expression<?> flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the current state of bindings as a batch item
-     *
-     * @return
-     */
-    public SQLInsertClause addBatch() {
-        if (subQueryBuilder != null) {
-            subQuery = subQueryBuilder.list(values.toArray(new Expression[values.size()]));
-            values.clear();
-        }
-        batches.add(new SQLInsertBatch(columns, values, subQuery));
-        columns.clear();
-        values.clear();
-        subQuery = null;
-        return this;
-    }
-
-    @Override
-    public SQLInsertClause columns(Path<?>... columns) {
-        this.columns.addAll(Arrays.asList(columns));
-        return this;
-    }
-
-    /**
-     * Execute the clause and return the generated key with the type of the
-     * given path. If no rows were created, null is returned, otherwise the key
-     * of the first row is returned.
-     *
-     * @param <T>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <T> T executeWithKey(Path<T> path) {
-        return executeWithKey((Class<T>) path.getType(), path);
-    }
-
-    /**
-     * Execute the clause and return the generated key cast to the given type.
-     * If no rows were created, null is returned, otherwise the key of the first
-     * row is returned.
-     *
-     * @param <T>
-     * @param type
-     * @return
-     */
-    public <T> T executeWithKey(Class<T> type) {
-        return executeWithKey(type, null);
-    }
-
-    private <T> T executeWithKey(Class<T> type, @Nullable Path<T> path) {
-        ResultSet rs = executeWithKeys();
-        try {
-            if (rs.next()) {
-                return configuration.get(rs, path, 1, type);
-            } else {
-                return null;
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        } finally {
-            close(rs);
-        }
-    }
-
-    /**
-     * Execute the clause and return the generated key with the type of the
-     * given path. If no rows were created, or the referenced column is not a
-     * generated key, null is returned. Otherwise, the key of the first row is
-     * returned.
-     *
-     * @param <T>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <T> List<T> executeWithKeys(Path<T> path) {
-        return executeWithKeys((Class<T>) path.getType(), path);
-    }
-
-    public <T> List<T> executeWithKeys(Class<T> type) {
-        return executeWithKeys(type, null);
-    }
-
-    private <T> List<T> executeWithKeys(Class<T> type, @Nullable Path<T> path) {
-        ResultSet rs = executeWithKeys();
-        try {
-            List<T> rv = new ArrayList<T>();
-            while (rs.next()) {
-                rv.add(configuration.get(rs, path, 1, type));
-            }
-            return rv;
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        } finally {
-            close(rs);
-        }
-    }
-
-    private PreparedStatement createStatement(boolean withKeys) throws SQLException {
-        SQLSerializer serializer = createSerializer();
-        if (subQueryBuilder != null) {
-            subQuery = subQueryBuilder.list(values.toArray(new Expression[values.size()]));
-            values.clear();
-        }
-        PreparedStatement stmt = null;
-        if (batches.isEmpty()) {
-            serializer.serializeInsert(metadata, entity, columns, values, subQuery);
-            stmt = prepareStatementAndSetParameters(serializer, withKeys);
-        } else {
-            serializer.serializeInsert(metadata, entity, batches.get(0).getColumns(), batches
-                    .get(0).getValues(), batches.get(0).getSubQuery());
-            stmt = prepareStatementAndSetParameters(serializer, withKeys);
-
-            // add first batch
-            stmt.addBatch();
-
-            // add other batches
-            for (int i = 1; i < batches.size(); i++) {
-                SQLInsertBatch batch = batches.get(i);
-                serializer = createSerializer();
-                serializer.serializeInsert(metadata, entity, batch.getColumns(),
-                        batch.getValues(), batch.getSubQuery());
-                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(),
-                        metadata.getParams());
-                stmt.addBatch();
-            }
-        }
-        return stmt;
-    }
-
-    private PreparedStatement prepareStatementAndSetParameters(SQLSerializer serializer,
-            boolean withKeys) throws SQLException {
-        queryString = serializer.toString();
-        constants = serializer.getConstants();
-        logger.debug(queryString);
-        PreparedStatement stmt;
-        if (withKeys) {
-            if (entity.getPrimaryKey() != null) {
-                String[] target = new String[entity.getPrimaryKey().getLocalColumns().size()];
-                for (int i = 0; i < target.length; i++) {
-                    Path<?> path = entity.getPrimaryKey().getLocalColumns().get(i);
-                    String column = ColumnMetadata.getName(path);
-                    target[i] = column;
-                }
-                stmt = connection.prepareStatement(queryString, target);
-            } else {
-                stmt = connection.prepareStatement(queryString, Statement.RETURN_GENERATED_KEYS);
-            }
-        } else {
-            stmt = connection.prepareStatement(queryString);
-        }
-        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(),
-                metadata.getParams());
-        return stmt;
-    }
-
-    /**
-     * Execute the clause and return the generated keys as a ResultSet
-     *
-     * @return
-     */
-    public ResultSet executeWithKeys() {
-        try {
-            final PreparedStatement stmt = createStatement(true);
-            if (batches.isEmpty()) {
-                listeners.notifyInsert(entity, metadata, columns, values, subQuery);
-                stmt.executeUpdate();
-            } else {
-                listeners.notifyInserts(entity, metadata, batches);
-                stmt.executeBatch();
-            }
-            ResultSet rs = stmt.getGeneratedKeys();
-            return new ResultSetAdapter(rs) {
-                @Override
-                public void close() throws SQLException {
-                    try {
-                        super.close();
-                    } finally {
-                        stmt.close();
-                    }
-                }
-            };
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        }
-    }
-
-    @Override
-    public long execute() {
-        PreparedStatement stmt = null;
-        try {
-            stmt = createStatement(false);
-            if (batches.isEmpty()) {
-                listeners.notifyInsert(entity, metadata, columns, values, subQuery);
-                return stmt.executeUpdate();
-            } else {
-                listeners.notifyInserts(entity, metadata, batches);
-                return executeBatch(stmt);
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            if (stmt != null) {
-                close(stmt);
-            }
-        }
-    }
-
-    @Override
-    public List<SQLBindings> getSQL() {
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeInsert(metadata, entity, columns, values, subQuery);
-            return ImmutableList.of(createBindings(metadata, serializer));
-        } else {
-            ImmutableList.Builder<SQLBindings> builder = ImmutableList.builder();
-            for (SQLInsertBatch batch : batches) {
-                SQLSerializer serializer = createSerializer();
-                serializer.serializeInsert(metadata, entity, batch.getColumns(), batch.getValues(), batch.getSubQuery());
-                builder.add(createBindings(metadata, serializer));
-            }
-            return builder.build();
-        }
-    }
-
-    @Override
-    public SQLInsertClause select(SubQueryExpression<?> sq) {
-        subQuery = sq;
-        for (Map.Entry<ParamExpression<?>, Object> entry : sq.getMetadata().getParams().entrySet()) {
-            metadata.setParam((ParamExpression) entry.getKey(), entry.getValue());
-        }
-        return this;
-    }
-
-    @Override
-    public <T> SQLInsertClause set(Path<T> path, T value) {
-        columns.add(path);
-        if (value instanceof Expression<?>) {
-            values.add((Expression<?>) value);
-        } else if (value != null) {
-            values.add(ConstantImpl.create(value));
-        } else {
-            values.add(Null.CONSTANT);
-        }
-        return this;
-    }
-
-    @Override
-    public <T> SQLInsertClause set(Path<T> path, Expression<? extends T> expression) {
-        columns.add(path);
-        values.add(expression);
-        return this;
-    }
-
-    @Override
-    public <T> SQLInsertClause setNull(Path<T> path) {
-        columns.add(path);
-        values.add(Null.CONSTANT);
-        return this;
-    }
-
-    @Override
-    public SQLInsertClause values(Object... v) {
-        for (Object value : v) {
-            if (value instanceof Expression<?>) {
-                values.add((Expression<?>) value);
-            } else if (value != null) {
-                values.add(ConstantImpl.create(value));
-            } else {
-                values.add(Null.CONSTANT);
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        SQLSerializer serializer = createSerializer();
-        serializer.serializeInsert(metadata, entity, columns, values, subQuery);
-        return serializer.toString();
-    }
-
-    /**
-     * Populate the INSERT clause with the properties of the given bean. The
-     * properties need to match the fields of the clause's entity instance.
-     *
-     * @param bean
-     * @return
-     */
-    public SQLInsertClause populate(Object bean) {
-        return populate(bean, DefaultMapper.DEFAULT);
-    }
-
-    /**
-     * Populate the INSERT clause with the properties of the given bean using
-     * the given Mapper.
-     *
-     * @param obj
-     * @param mapper
-     * @return
-     */
-    @SuppressWarnings("rawtypes")
-    public <T> SQLInsertClause populate(T obj, Mapper<T> mapper) {
-        Map<Path<?>, Object> values = mapper.createMap(entity, obj);
-        for (Map.Entry<Path<?>, Object> entry : values.entrySet()) {
-            set((Path) entry.getKey(), entry.getValue());
-        }
-        return this;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return values.isEmpty() && batches.isEmpty();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
deleted file mode 100644
index a0bffe2481..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.dml.StoreClause;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.NullExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.util.ResultSetAdapter;
-
-/**
- * SQLMergeClause defines an MERGE INTO clause
- *
- * @author tiwe
- *
- */
-public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements StoreClause<SQLMergeClause> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SQLMergeClause.class);
-
-    private final List<Path<?>> columns = new ArrayList<Path<?>>();
-
-    private final Connection connection;
-
-    private final RelationalPath<?> entity;
-
-    private final QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private final List<Path<?>> keys = new ArrayList<Path<?>>();
-
-    @Nullable
-    private SubQueryExpression<?> subQuery;
-
-    private final List<SQLMergeBatch> batches = new ArrayList<SQLMergeBatch>();
-
-    private final List<Expression<?>> values = new ArrayList<Expression<?>>();
-
-    private transient String queryString;
-
-    private transient List<Object> constants;
-
-    public SQLMergeClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
-        this(connection, new Configuration(templates), entity);
-    }
-
-    public SQLMergeClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
-        super(configuration);
-        this.connection = connection;
-        this.entity = entity;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    /**
-     * Add the given String literal at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLMergeClause addFlag(Position position, String flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the given Expression at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLMergeClause addFlag(Position position, Expression<?> flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the current state of bindings as a batch item
-     *
-     * @return
-     */
-    public SQLMergeClause addBatch() {
-        if (!configuration.getTemplates().isNativeMerge()) {
-            throw new IllegalStateException("batch only supported for databases that support native merge");
-        }
-
-        batches.add(new SQLMergeBatch(keys, columns, values, subQuery));
-        columns.clear();
-        values.clear();
-        keys.clear();
-        subQuery = null;
-        return this;
-    }
-
-    public SQLMergeClause columns(Path<?>... columns) {
-        this.columns.addAll(Arrays.asList(columns));
-        return this;
-    }
-
-    /**
-     * Execute the clause and return the generated key with the type of the given path.
-     * If no rows were created, null is returned, otherwise the key of the first row is returned.
-     *
-     * @param <T>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <T> T executeWithKey(Path<T> path) {
-        return executeWithKey((Class<T>)path.getType(), path);
-    }
-
-    /**
-     * Execute the clause and return the generated key cast to the given type.
-     * If no rows were created, null is returned, otherwise the key of the first row is returned.
-     *
-     * @param <T>
-     * @param type
-     * @return
-     */
-    public <T> T executeWithKey(Class<T> type) {
-        return executeWithKey(type, null);
-    }
-
-    private <T> T executeWithKey(Class<T> type, @Nullable Path<T> path) {
-        ResultSet rs = executeWithKeys();
-        try{
-            if (rs.next()) {
-                return configuration.get(rs, path, 1, type);
-            } else {
-                return null;
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        }finally{
-            close(rs);
-        }
-    }
-
-    /**
-     * Execute the clause and return the generated key with the type of the given path.
-     * If no rows were created, or the referenced column is not a generated key, null is returned.
-     * Otherwise, the key of the first row is returned.
-     *
-     * @param <T>
-     * @param path
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <T> List<T> executeWithKeys(Path<T> path) {
-        return executeWithKeys((Class<T>)path.getType(), path);
-    }
-
-    public <T> List<T> executeWithKeys(Class<T> type) {
-        return executeWithKeys(type, null);
-    }
-
-    private <T> List<T> executeWithKeys(Class<T> type, @Nullable Path<T> path) {
-        ResultSet rs = executeWithKeys();
-        try{
-            List<T> rv = new ArrayList<T>();
-            while (rs.next()) {
-                rv.add(configuration.get(rs, path, 1, type));
-            }
-            return rv;
-        } catch (SQLException e) {
-            throw configuration.translate(e);
-        }finally{
-            close(rs);
-        }
-    }
-
-    /**
-     * Execute the clause and return the generated keys as a ResultSet
-     *
-     * @return
-     */
-    public ResultSet executeWithKeys() {
-        try {
-            if (configuration.getTemplates().isNativeMerge()) {
-                final PreparedStatement stmt = createStatement(true);
-                if (batches.isEmpty()) {
-                    listeners.notifyMerge(entity, metadata, keys, columns, values, subQuery);
-                    stmt.executeUpdate();
-                } else {
-                    listeners.notifyMerges(entity, metadata, batches);
-                    stmt.executeBatch();
-                }
-                ResultSet rs = stmt.getGeneratedKeys();
-                return new ResultSetAdapter(rs) {
-                    @Override
-                    public void close() throws SQLException {
-                        try {
-                            super.close();
-                        } finally {
-                            stmt.close();
-                        }
-                    }
-                };
-            } else {
-                List<?> ids = getIds();
-                if (!ids.isEmpty()) {
-                    // update
-                    SQLUpdateClause update = new SQLUpdateClause(connection, configuration.getTemplates(), entity);
-                    populate(update);
-                    update.where(ExpressionUtils.in((Expression)keys.get(0),ids));
-                    return EmptyResultSet.DEFAULT;
-                } else {
-                    // insert
-                    SQLInsertClause insert = new SQLInsertClause(connection, configuration.getTemplates(), entity);
-                    populate(insert);
-                    return insert.executeWithKeys();
-                }
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        }
-    }
-
-    @Override
-    public long execute() {
-        if (configuration.getTemplates().isNativeMerge()) {
-            return executeNativeMerge();
-        } else {
-            return executeCompositeMerge();
-        }
-    }
-
-    @Override
-    public List<SQLBindings> getSQL() {
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
-            return ImmutableList.of(createBindings(metadata, serializer));
-        } else {
-            ImmutableList.Builder<SQLBindings> builder = ImmutableList.builder();
-            for (SQLMergeBatch batch : batches) {
-                SQLSerializer serializer = createSerializer();
-                serializer.serializeMerge(metadata, entity, batch.getKeys(), batch.getColumns(), batch.getValues(), batch.getSubQuery());
-                builder.add(createBindings(metadata, serializer));
-            }
-            return builder.build();
-        }
-    }
-
-    private List<?> getIds() {
-         // select
-        SQLQuery query = new SQLQuery(connection, configuration.getTemplates()).from(entity);
-        for (int i=0; i < columns.size(); i++) {
-            if (values.get(i) instanceof NullExpression) {
-                query.where(ExpressionUtils.isNull(columns.get(i)));
-            } else {
-                query.where(ExpressionUtils.eq(columns.get(i),(Expression)values.get(i)));
-            }
-        }
-        return query.list(keys.get(0));
-    }
-
-    @SuppressWarnings("unchecked")
-    private long executeCompositeMerge() {
-        List<?> ids = getIds();
-        if (!ids.isEmpty()) {
-            // update
-            SQLUpdateClause update = new SQLUpdateClause(connection, configuration.getTemplates(), entity);
-            populate(update);
-            update.where(ExpressionUtils.in((Expression)keys.get(0),ids));
-            return update.execute();
-        } else {
-            // insert
-            SQLInsertClause insert = new SQLInsertClause(connection, configuration.getTemplates(), entity);
-            populate(insert);
-            return insert.execute();
-
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void populate(StoreClause<?> clause) {
-        for (int i = 0; i < columns.size(); i++) {
-            clause.set((Path)columns.get(i), (Object)values.get(i));
-        }
-    }
-
-    private PreparedStatement createStatement(boolean withKeys) throws SQLException{
-        SQLSerializer serializer = createSerializer();
-        PreparedStatement stmt = null;
-        if (batches.isEmpty()) {
-            serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
-            stmt = prepareStatementAndSetParameters(serializer, withKeys);
-        } else {
-            serializer.serializeMerge(metadata, entity,
-                    batches.get(0).getKeys(), batches.get(0).getColumns(),
-                    batches.get(0).getValues(), batches.get(0).getSubQuery());
-            stmt = prepareStatementAndSetParameters(serializer, withKeys);
-
-            // add first batch
-            stmt.addBatch();
-
-            // add other batches
-            for (int i = 1; i < batches.size(); i++) {
-                SQLMergeBatch batch = batches.get(i);
-                serializer = createSerializer();
-                serializer.serializeMerge(metadata, entity, batch.getKeys(), batch.getColumns(), batch.getValues(), batch.getSubQuery());
-                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-                stmt.addBatch();
-            }
-        }
-        return stmt;
-    }
-
-    private PreparedStatement prepareStatementAndSetParameters(SQLSerializer serializer,
-            boolean withKeys) throws SQLException {
-        queryString = serializer.toString();
-        constants = serializer.getConstants();
-        logger.debug(queryString);
-        PreparedStatement stmt;
-        if (withKeys) {
-            String[] target = new String[keys.size()];
-            for (int i = 0; i < target.length; i++) {
-                target[i] = ColumnMetadata.getName(keys.get(i));
-            }
-            stmt = connection.prepareStatement(queryString, target);
-        } else {
-            stmt = connection.prepareStatement(queryString);
-        }
-        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-        return stmt;
-    }
-
-    private long executeNativeMerge() {
-        PreparedStatement stmt = null;
-        try {
-            stmt = createStatement(false);
-            if (batches.isEmpty()) {
-                listeners.notifyMerge(entity, metadata, keys, columns, values, subQuery);
-                return stmt.executeUpdate();
-            } else {
-                listeners.notifyMerges(entity, metadata, batches);
-                return executeBatch(stmt);
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            if (stmt != null) {
-                close(stmt);
-            }
-        }
-    }
-
-    /**
-     * Set the keys to be used in the MERGE clause
-     *
-     * @param paths
-     * @return
-     */
-    public SQLMergeClause keys(Path<?>... paths) {
-        for (Path<?> path : paths) {
-            keys.add(path);
-        }
-        return this;
-    }
-
-    public SQLMergeClause select(SubQueryExpression<?> subQuery) {
-        this.subQuery = subQuery;
-        return this;
-    }
-
-    @Override
-    public <T> SQLMergeClause set(Path<T> path, @Nullable T value) {
-        columns.add(path);
-        if (value != null) {
-            values.add(ConstantImpl.create(value));
-        } else {
-            values.add(Null.CONSTANT);
-        }
-        return this;
-    }
-
-    @Override
-    public <T> SQLMergeClause set(Path<T> path, Expression<? extends T> expression) {
-        columns.add(path);
-        values.add(expression);
-        return this;
-    }
-
-    @Override
-    public <T> SQLMergeClause setNull(Path<T> path) {
-        columns.add(path);
-        values.add(Null.CONSTANT);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        SQLSerializer serializer = createSerializer();
-        serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
-        return serializer.toString();
-    }
-
-    public SQLMergeClause values(Object... v) {
-        for (Object value : v) {
-            if (value instanceof Expression<?>) {
-                values.add((Expression<?>) value);
-            } else if (value != null) {
-                values.add(ConstantImpl.create(value));
-            } else {
-                values.add(Null.CONSTANT);
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return values.isEmpty();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateBatch.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateBatch.java
deleted file mode 100644
index 2995692a24..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateBatch.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.util.List;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-
-/**
- * SQLUpdateBatch defines the state of an SQL UPDATE batch item
- *
- * @author tiwe
- *
- */
-public class SQLUpdateBatch {
-
-    private final QueryMetadata metadata;
-
-    private final List<Pair<Path<?>,Expression<?>>> updates;
-
-    public SQLUpdateBatch(QueryMetadata metadata, List<Pair<Path<?>,Expression<?>>> updates) {
-        this.metadata = metadata;
-        this.updates = updates;
-    }
-
-    public QueryMetadata getMetadata() {
-        return metadata;
-    }
-
-    public List<Pair<Path<?>, Expression<?>>> getUpdates() {
-        return updates;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java
deleted file mode 100644
index a3b89b2d52..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.dml;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnegative;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.dml.UpdateClause;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.Predicate;
-
-/**
- * SQLUpdateClause defines a UPDATE clause
- *
- * @author tiwe
- *
- */
-public class SQLUpdateClause extends AbstractSQLClause<SQLUpdateClause> implements UpdateClause<SQLUpdateClause> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SQLInsertClause.class);
-
-    private final Connection connection;
-
-    private final RelationalPath<?> entity;
-
-    private final List<SQLUpdateBatch> batches = new ArrayList<SQLUpdateBatch>();
-
-    private List<Pair<Path<?>,Expression<?>>> updates = new ArrayList<Pair<Path<?>,Expression<?>>>();
-
-    private QueryMetadata metadata = new DefaultQueryMetadata();
-
-    private transient String queryString;
-
-    private transient List<Object> constants;
-
-    public SQLUpdateClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
-        this(connection, new Configuration(templates), entity);
-    }
-
-    public SQLUpdateClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
-        super(configuration);
-        this.connection = connection;
-        this.entity = entity;
-        metadata.addJoin(JoinType.DEFAULT, entity);
-    }
-
-    /**
-     * Add the given String literal at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLUpdateClause addFlag(Position position, String flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the given Expression at the given position as a query flag
-     *
-     * @param position
-     * @param flag
-     * @return
-     */
-    public SQLUpdateClause addFlag(Position position, Expression<?> flag) {
-        metadata.addFlag(new QueryFlag(position, flag));
-        return this;
-    }
-
-    /**
-     * Add the current state of bindings as a batch item
-     *
-     * @return
-     */
-    public SQLUpdateClause addBatch() {
-        batches.add(new SQLUpdateBatch(metadata, updates));
-        updates = new ArrayList<Pair<Path<?>,Expression<?>>>();
-        metadata = new DefaultQueryMetadata();
-        metadata.addJoin(JoinType.DEFAULT, entity);
-        return this;
-    }
-
-    private PreparedStatement createStatement() throws SQLException{
-        PreparedStatement stmt;
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeUpdate(metadata, entity, updates);
-            queryString = serializer.toString();
-            constants = serializer.getConstants();
-            logger.debug(queryString);
-            stmt = connection.prepareStatement(queryString);
-            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-        } else {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeUpdate(batches.get(0).getMetadata(), entity, batches.get(0).getUpdates());
-            queryString = serializer.toString();
-            constants = serializer.getConstants();
-            logger.debug(queryString);
-
-            // add first batch
-            stmt = connection.prepareStatement(queryString);
-            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-            stmt.addBatch();
-
-            // add other batches
-            for (int i = 1; i < batches.size(); i++) {
-                serializer = createSerializer();
-                serializer.serializeUpdate(batches.get(i).getMetadata(), entity, batches.get(i).getUpdates());
-                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
-                stmt.addBatch();
-            }
-        }
-        return stmt;
-    }
-
-    @Override
-    public long execute() {
-        PreparedStatement stmt = null;
-        try {
-            stmt = createStatement();
-            if (batches.isEmpty()) {
-                listeners.notifyUpdate(entity, metadata, updates);
-                return stmt.executeUpdate();
-            } else {
-                listeners.notifyUpdates(entity, batches);
-                return executeBatch(stmt);
-            }
-        } catch (SQLException e) {
-            throw configuration.translate(queryString, constants, e);
-        } finally {
-            if (stmt != null) {
-                close(stmt);
-            }
-        }
-    }
-
-    @Override
-    public List<SQLBindings> getSQL() {
-        if (batches.isEmpty()) {
-            SQLSerializer serializer = createSerializer();
-            serializer.serializeUpdate(metadata, entity, updates);
-            return ImmutableList.of(createBindings(metadata, serializer));
-        } else {
-            ImmutableList.Builder<SQLBindings> builder = ImmutableList.builder();
-            for (SQLUpdateBatch batch : batches) {
-                SQLSerializer serializer = createSerializer();
-                serializer.serializeUpdate(batch.getMetadata(), entity, batch.getUpdates());
-                builder.add(createBindings(metadata, serializer));
-            }
-            return builder.build();
-        }
-    }
-
-    @Override
-    public <T> SQLUpdateClause set(Path<T> path, T value) {
-        if (value instanceof Expression<?>) {
-            updates.add(Pair.<Path<?>,Expression<?>>of(path, (Expression<?>)value));
-        } else if (value != null) {
-            updates.add(Pair.<Path<?>,Expression<?>>of(path, ConstantImpl.create(value)));
-        } else {
-            setNull(path);
-        }
-        return this;
-    }
-
-    @Override
-    public <T> SQLUpdateClause set(Path<T> path, Expression<? extends T> expression) {
-        if (expression != null) {
-            updates.add(Pair.<Path<?>,Expression<?>>of(path, expression));
-        } else {
-            setNull(path);
-        }
-        return this;
-    }
-
-    @Override
-    public <T> SQLUpdateClause setNull(Path<T> path) {
-        updates.add(Pair.<Path<?>,Expression<?>>of(path, Null.CONSTANT));
-        return this;
-    }
-
-    @Override
-    public SQLUpdateClause set(List<? extends Path<?>> paths, List<?> values) {
-        for (int i = 0; i < paths.size(); i++) {
-            if (values.get(i) instanceof Expression) {
-                updates.add(Pair.<Path<?>,Expression<?>>of(paths.get(i), (Expression<?>)values.get(i)));
-            } else if (values.get(i) != null) {
-                updates.add(Pair.<Path<?>,Expression<?>>of(paths.get(i), ConstantImpl.create(values.get(i))));
-            } else {
-                updates.add(Pair.<Path<?>,Expression<?>>of(paths.get(i), Null.CONSTANT));
-            }
-        }
-        return this;
-    }
-
-    public SQLUpdateClause where(Predicate p) {
-        metadata.addWhere(p);
-        return this;
-    }
-
-    @Override
-    public SQLUpdateClause where(Predicate... o) {
-        for (Predicate p : o) {
-            metadata.addWhere(p);
-        }
-        return this;
-    }
-
-    public SQLUpdateClause limit(@Nonnegative long limit) {
-        metadata.setModifiers(QueryModifiers.limit(limit));
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        SQLSerializer serializer = createSerializer();
-        serializer.serializeUpdate(metadata, entity, updates);
-        return serializer.toString();
-    }
-
-    /**
-     * Populate the UPDATE clause with the properties of the given bean.
-     * The properties need to match the fields of the clause's entity instance.
-     * Primary key columns are skipped in the population.
-     *
-     * @param bean
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public SQLUpdateClause populate(Object bean) {
-        return populate(bean, DefaultMapper.DEFAULT);
-    }
-
-    /**
-     * Populate the UPDATE clause with the properties of the given bean using the given Mapper.
-     *
-     * @param obj
-     * @param mapper
-     * @return
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public <T> SQLUpdateClause populate(T obj, Mapper<T> mapper) {
-        Collection<? extends Path<?>> primaryKeyColumns = entity.getPrimaryKey() != null
-                ? entity.getPrimaryKey().getLocalColumns()
-                : Collections.<Path<?>>emptyList();
-        Map<Path<?>, Object> values = mapper.createMap(entity, obj);
-        for (Map.Entry<Path<?>, Object> entry : values.entrySet()) {
-            if (!primaryKeyColumns.contains(entry.getKey())) {
-                set((Path)entry.getKey(), entry.getValue());
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return updates.isEmpty() && batches.isEmpty();
-    }
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/package-info.java
deleted file mode 100644
index 8a9cd3e4b6..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * DML operations support
- */
-package com.mysema.query.sql.dml;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerGrammar.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerGrammar.java
deleted file mode 100644
index 3fe69a9a2b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerGrammar.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.template.NumberTemplate;
-
-/**
- * Convenience functions and constants for SQL Server usage
- *
- * @author tiwe
- *
- */
-public final class SQLServerGrammar {
-
-    private SQLServerGrammar() {}
-
-    @Deprecated
-    public static final NumberExpression<Long> rowNumber = NumberTemplate.create(Long.class, "row_number");
-
-    @Deprecated
-    public static final NumberExpression<Long> rn = NumberTemplate.create(Long.class, "rn");
-
-    static String tableHints(SQLServerTableHints... tableHints) {
-        StringBuilder hints = new StringBuilder(" with ").append("(");
-        for (int i = 0; i < tableHints.length; i++) {
-            if (i > 0) {
-                hints.append(", ");
-            }
-            hints.append(tableHints[i].name());
-        }
-        hints.append(")");
-        return hints.toString();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQuery.java
deleted file mode 100644
index a067e6d0a7..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQuery.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import java.sql.Connection;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLServerTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * SQLServerQuery provides SQL Server related extensions to SQLQuery
- *
- * @author tiwe
- *
- */
-public class SQLServerQuery extends AbstractSQLQuery<SQLServerQuery> {
-
-    public SQLServerQuery(Connection conn) {
-        this(conn, new SQLServerTemplates(), new DefaultQueryMetadata());
-    }
-
-    public SQLServerQuery(Connection conn, SQLTemplates templates) {
-        this(conn, templates, new DefaultQueryMetadata());
-    }
-
-    protected SQLServerQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
-        super(conn, new Configuration(templates), metadata);
-    }
-
-    public SQLServerQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    public SQLServerQuery(Connection conn, Configuration configuration) {
-        super(conn, configuration);
-    }
-
-    /**
-     * @param tableHints
-     * @return
-     */
-    public SQLServerQuery tableHints(SQLServerTableHints... tableHints) {
-        if (tableHints.length > 0) {
-            String hints = SQLServerGrammar.tableHints(tableHints);
-            addJoinFlag(hints, JoinFlag.Position.END);
-        }
-        return this;
-    }
-    
-    @Override
-    public SQLServerQuery clone(Connection conn) {
-        SQLServerQuery q = new SQLServerQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQueryFactory.java
deleted file mode 100644
index 6956dbb574..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerQueryFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.mysema.query.sql.AbstractSQLQueryFactory;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLServerTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * SQL Server specific implementation of SQLQueryFactory
- *
- * @author tiwe
- *
- */
-public class SQLServerQueryFactory extends AbstractSQLQueryFactory<SQLServerQuery, SQLServerSubQuery> {
-
-    public SQLServerQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public SQLServerQueryFactory(Provider<Connection> connection) {
-        this(new Configuration(new SQLServerTemplates()), connection);
-    }
-
-    public SQLServerQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public SQLServerQuery query() {
-        return new SQLServerQuery(connection.get(), configuration);
-    }
-    
-    @Override
-    public SQLServerSubQuery subQuery() {
-        return new SQLServerSubQuery();
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerSubQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerSubQuery.java
deleted file mode 100644
index d41dee8577..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerSubQuery.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2012, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLSubQuery;
-import com.mysema.query.sql.Configuration;
-
-/**
- * @author tiwe
- *
- */
-public class SQLServerSubQuery extends AbstractSQLSubQuery<SQLServerSubQuery> {
-    
-    public SQLServerSubQuery() {
-        super();
-    }
-
-    public SQLServerSubQuery(QueryMetadata metadata) {
-        super(metadata);
-    }
-    
-    public SQLServerSubQuery(Configuration configuration, QueryMetadata metadata){
-        super(configuration, metadata);
-    }
-
-    /**
-     * @param tableHints
-     * @return
-     */
-    public SQLServerSubQuery tableHints(SQLServerTableHints... tableHints) {
-        if (tableHints.length > 0) {
-            String hints = SQLServerGrammar.tableHints(tableHints);
-            addJoinFlag(hints, JoinFlag.Position.END);
-        }
-        return this;
-    }
-
-    @Override
-    public SQLServerSubQuery clone() {
-        SQLServerSubQuery subQuery = new SQLServerSubQuery(this.configuration, this.getMetadata().clone());
-        return subQuery;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerTableHints.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerTableHints.java
deleted file mode 100644
index d92a3bdc9b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/SQLServerTableHints.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-/**
- * @author tiwe
- *
- */
-public enum SQLServerTableHints {
-    NOEXPAND,
-    FASTFIRSTROW, 
-    FORCESEEK,
-    HOLDLOCK,
-    NOLOCK, 
-    NOWAIT,
-    PAGLOCK, 
-    READCOMMITTED, 
-    READCOMMITTEDLOCK, 
-    READPAST, 
-    READUNCOMMITTED, 
-    REPEATABLEREAD, 
-    ROWLOCK, 
-    SERIALIZABLE, 
-    TABLOCK, 
-    TABLOCKX, 
-    UPDLOCK, 
-    XLOCK
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/package-info.java
deleted file mode 100644
index 330a462eef..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mssql/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * SQL Server support
- */
-package com.mysema.query.sql.mssql;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQuery.java
deleted file mode 100644
index 95ba52bf10..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQuery.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mysql;
-
-import java.io.File;
-import java.sql.Connection;
-
-import com.google.common.base.Joiner;
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinFlag;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.MySQLTemplates;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * MySQLQuery provides MySQL related extensions to SQLQuery
- *
- * @author tiwe
- * @see SQLQuery
- *
- */
-public class MySQLQuery extends AbstractSQLQuery<MySQLQuery> {
-
-    private static final String WITH_ROLLUP = "\nwith rollup ";
-
-    private static final String STRAIGHT_JOIN = "straight_join ";
-
-    private static final String SQL_SMALL_RESULT = "sql_small_result ";
-
-    private static final String SQL_NO_CACHE = "sql_no_cache ";
-
-    private static final String LOCK_IN_SHARE_MODE = "\nlock in share mode ";
-
-    private static final String HIGH_PRIORITY = "high_priority ";
-
-    private static final String SQL_CALC_FOUND_ROWS = "sql_calc_found_rows ";
-
-    private static final String SQL_CACHE = "sql_cache ";
-
-    private static final String SQL_BUFFER_RESULT = "sql_buffer_result ";
-
-    private static final String SQL_BIG_RESULT = "sql_big_result ";
-
-    private static final Joiner JOINER = Joiner.on(", ");
-
-    public MySQLQuery(Connection conn) {
-        this(conn, new Configuration(new MySQLTemplates()), new DefaultQueryMetadata());
-    }
-
-    public MySQLQuery(Connection conn, SQLTemplates templates) {
-        this(conn, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    public MySQLQuery(Connection conn, Configuration configuration) {
-        this(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    public MySQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery bigResult() {
-        return addFlag(Position.AFTER_SELECT, SQL_BIG_RESULT);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery bufferResult() {
-        return addFlag(Position.AFTER_SELECT, SQL_BUFFER_RESULT);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery cache() {
-        return addFlag(Position.AFTER_SELECT, SQL_CACHE);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery calcFoundRows() {
-        return addFlag(Position.AFTER_SELECT, SQL_CALC_FOUND_ROWS);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery highPriority() {
-        return addFlag(Position.AFTER_SELECT, HIGH_PRIORITY);
-    }
-
-    /**
-     * @param var
-     * @return
-     */
-    public MySQLQuery into(String var) {
-        return addFlag(Position.END, "\ninto " + var);
-    }
-
-    /**
-     * @param file
-     * @return
-     */
-    public MySQLQuery intoDumpfile(File file) {
-        return addFlag(Position.END, "\ninto dumpfile '" + file.getPath() + "'" );
-    }
-
-    /**
-     * @param file
-     * @return
-     */
-    public MySQLQuery intoOutfile(File file) {
-        return addFlag(Position.END, "\ninto outfile '" + file.getPath() + "'" );
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery lockInShareMode() {
-        return addFlag(Position.END, LOCK_IN_SHARE_MODE);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery noCache() {
-        return addFlag(Position.AFTER_SELECT, SQL_NO_CACHE);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery smallResult() {
-        return addFlag(Position.AFTER_SELECT, SQL_SMALL_RESULT);
-    }
-
-    /**
-     * @return
-     */
-    public MySQLQuery straightJoin() {
-        return addFlag(Position.AFTER_SELECT, STRAIGHT_JOIN);
-    }
-
-    /**
-     * @param indexes
-     * @return
-     */
-    public MySQLQuery forceIndex(String... indexes) {
-        return addJoinFlag(" force index (" + JOINER.join(indexes) + ")", JoinFlag.Position.END);
-    }
-
-    /**
-     * @param indexes
-     * @return
-     */
-    public MySQLQuery ignoreIndex(String... indexes) {
-        return addJoinFlag(" ignore index (" + JOINER.join(indexes) + ")", JoinFlag.Position.END);
-    }
-
-
-    /**
-     * @param indexes
-     * @return
-     */
-    public MySQLQuery useIndex(String... indexes) {
-        return addJoinFlag(" use index (" + JOINER.join(indexes) + ")", JoinFlag.Position.END);
-    }
-
-
-    /**
-     * @return
-     */
-    public MySQLQuery withRollup() {
-        return addFlag(Position.AFTER_GROUP_BY, WITH_ROLLUP);
-    }
-
-    @Override
-    public MySQLQuery clone(Connection conn) {
-        MySQLQuery q = new MySQLQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-    
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQueryFactory.java
deleted file mode 100644
index ebba5bbbcb..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLQueryFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mysql;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.sql.AbstractSQLQueryFactory;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.MySQLTemplates;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.TemplateExpressionImpl;
-
-/**
- * MySQL specific implementation of SQLQueryFactory
- *
- * @author tiwe
- *
- */
-public class MySQLQueryFactory extends AbstractSQLQueryFactory<MySQLQuery, SQLSubQuery> {
-
-    public MySQLQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public MySQLQueryFactory(Provider<Connection> connection) {
-        this(new Configuration(new MySQLTemplates()), connection);
-    }
-
-    public MySQLQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public SQLInsertClause insertIgnore(RelationalPath<?> entity) {
-        SQLInsertClause insert = insert(entity);
-        insert.addFlag(Position.START_OVERRIDE, "insert ignore into ");
-        return insert;
-    }
-
-    public SQLInsertClause insertOnDuplicateKeyUpdate(RelationalPath<?> entity, String clause) {
-        SQLInsertClause insert = insert(entity);
-        insert.addFlag(Position.END, " on duplicate key update " + clause);
-        return insert;
-    }
-    
-    public SQLInsertClause insertOnDuplicateKeyUpdate(RelationalPath<?> entity, Expression<?> clause) {
-        SQLInsertClause insert = insert(entity);
-        insert.addFlag(Position.END, TemplateExpressionImpl.create(String.class, " on duplicate key update {0}", clause));
-        return insert;
-    }
-    
-    public MySQLQuery query() {
-        return new MySQLQuery(connection.get(), configuration);
-    }
-
-    public MySQLReplaceClause replace(RelationalPath<?> entity) {
-        return new MySQLReplaceClause(connection.get(), configuration, entity);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLReplaceClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLReplaceClause.java
deleted file mode 100644
index a6bd37ce31..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/MySQLReplaceClause.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mysql;
-
-import java.sql.Connection;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.dml.SQLInsertClause;
-
-/**
- * @author tiwe
- *
- */
-public class MySQLReplaceClause extends SQLInsertClause{
-    
-    private static final String REPLACE_INTO = "replace into ";
-
-    public MySQLReplaceClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
-        super(connection, templates, entity);
-        addFlag(Position.START_OVERRIDE, REPLACE_INTO);
-    }
-    
-    public MySQLReplaceClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
-        super(connection, configuration, entity);
-        addFlag(Position.START_OVERRIDE, REPLACE_INTO);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/package-info.java
deleted file mode 100644
index 83b9aec726..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/mysql/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * MySQL support
- */
-package com.mysema.query.sql.mysql;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleGrammar.java b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleGrammar.java
deleted file mode 100644
index 87ed8a6460..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleGrammar.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.oracle;
-
-import java.util.Date;
-
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.template.DateTemplate;
-import com.mysema.query.types.template.NumberTemplate;
-
-/**
- * Convenience functions and constants for Oracle DB usage
- *
- * @author tiwe
- */
-public final class OracleGrammar {
-
-    private OracleGrammar() {}
-
-    public static final NumberExpression<Integer> level = NumberTemplate.create(Integer.class, "level");
-
-    public static final NumberExpression<Integer> rownum = NumberTemplate.create(Integer.class, "rownum");
-
-    public static final NumberExpression<Integer> rowid = NumberTemplate.create(Integer.class, "rowid");
-
-    public static final DateExpression<Date> sysdate = DateTemplate.create(Date.class, "sysdate");
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java
deleted file mode 100644
index 5dbf3163a3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.oracle;
-
-import java.sql.Connection;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Predicate;
-
-/**
- * OracleQuery provides Oracle specific extensions to the base SQL query type
- *
- * @author tiwe
- */
-public class OracleQuery extends AbstractSQLQuery<OracleQuery> {
-
-    private static final String CONNECT_BY = "\nconnect by ";
-
-    private static final String CONNECT_BY_NOCYCLE_PRIOR = "\nconnect by nocycle prior ";
-
-    private static final String CONNECT_BY_PRIOR = "\nconnect by prior ";
-
-    private static final String ORDER_SIBLINGS_BY = "\norder siblings by ";
-
-    private static final String START_WITH = "\nstart with ";
-
-    public OracleQuery(Connection conn) {
-        this(conn, new OracleTemplates(), new DefaultQueryMetadata());
-    }
-
-    public OracleQuery(Connection conn, SQLTemplates templates) {
-        this(conn, templates, new DefaultQueryMetadata());
-    }
-
-    public OracleQuery(Connection conn, Configuration configuration) {
-        super(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    public OracleQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    protected OracleQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
-        super(conn, new Configuration(templates), metadata);
-    }
-
-    /**
-     * @param cond
-     * @return
-     */
-    public OracleQuery connectByPrior(Predicate cond) {
-        return addFlag(Position.BEFORE_ORDER, CONNECT_BY_PRIOR, cond);
-    }
-
-    /**
-     * @param cond
-     * @return
-     */
-    public OracleQuery connectBy(Predicate cond) {
-        return addFlag(Position.BEFORE_ORDER, CONNECT_BY, cond);
-    }
-
-    /**
-     * @param cond
-     * @return
-     */
-    public OracleQuery connectByNocyclePrior(Predicate cond) {
-        return addFlag(Position.BEFORE_ORDER, CONNECT_BY_NOCYCLE_PRIOR, cond);
-    }
-
-    /**
-     * @param cond
-     * @return
-     */
-    public <A> OracleQuery startWith(Predicate cond) {
-        return addFlag(Position.BEFORE_ORDER, START_WITH, cond);
-    }
-
-    /**
-     * @param path
-     * @return
-     */
-    public OracleQuery orderSiblingsBy(Expression<?> path) {
-        return addFlag(Position.BEFORE_ORDER, ORDER_SIBLINGS_BY, path);
-    }
-    
-    @Override
-    public OracleQuery clone(Connection conn) {
-        OracleQuery q = new OracleQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-    // TODO : connect by root
-
-    // TODO : connect by iscycle
-
-    // TODO : connect by isleaf (pseudocolumn)
-
-    // TODO : sys connect path
-}
-
-
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQueryFactory.java
deleted file mode 100644
index 86dd507594..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQueryFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.oracle;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.mysema.query.sql.AbstractSQLQueryFactory;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * Oracle specific implementation of SQLQueryFactory
- *
- * @author tiwe
- *
- */
-public class OracleQueryFactory extends AbstractSQLQueryFactory<OracleQuery, SQLSubQuery> {
-
-    public OracleQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public OracleQueryFactory(Provider<Connection> connection) {
-        this(new Configuration(new OracleTemplates()), connection);
-    }
-
-    public OracleQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public OracleQuery query() {
-        return new OracleQuery(connection.get(), configuration);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/package-info.java
deleted file mode 100644
index fd6548a42a..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Oracle support for Querydsl SQL
- */
-package com.mysema.query.sql.oracle;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/package-info.java
deleted file mode 100644
index 421bd4e9e6..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * SQL/JDBC support for Querydsl
- */
-package com.mysema.query.sql;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQuery.java
deleted file mode 100644
index 7988ddaaf0..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQuery.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.postgres;
-
-import java.sql.Connection;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.SQLOps;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * PostgresQuery provides Postgres related extensions to SQLQuery
- *
- * @author tiwe
- * @see SQLQuery
- *
- */
-public class PostgresQuery extends AbstractSQLQuery<PostgresQuery> {
-
-    public PostgresQuery(Connection conn) {
-        this(conn, new Configuration(new PostgresTemplates()), new DefaultQueryMetadata());
-    }
-
-    public PostgresQuery(Connection conn, SQLTemplates templates) {
-        this(conn, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    public PostgresQuery(Connection conn, Configuration configuration) {
-        this(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    public PostgresQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    /**
-     * @return
-     */
-    public PostgresQuery forShare() {
-        return addFlag(SQLOps.FOR_SHARE_FLAG);
-    }
-
-    /**
-     * @return
-     */
-    public PostgresQuery noWait() {
-        return addFlag(SQLOps.NO_WAIT_FLAG);
-    }
-
-    /**
-     * @param paths
-     * @return
-     */
-    public PostgresQuery of(RelationalPath<?>... paths) {
-        StringBuilder builder = new StringBuilder(" of ");
-        for (RelationalPath<?> path : paths) {
-            if (builder.length() > 4) {
-                builder.append(", ");
-            }
-            builder.append(getConfiguration().getTemplates().quoteIdentifier(path.getTableName()));
-        }
-        return addFlag(Position.END, builder.toString());
-    }
- 
-    @Override
-    public PostgresQuery clone(Connection conn) {
-        PostgresQuery q = new PostgresQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQueryFactory.java
deleted file mode 100644
index ecd8b45575..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/postgres/PostgresQueryFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.postgres;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.mysema.query.sql.AbstractSQLQueryFactory;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * PostgreSQL specific implementation of SQLQueryFactory
- *
- * @author tiwe
- *
- */
-public class PostgresQueryFactory extends AbstractSQLQueryFactory<PostgresQuery, SQLSubQuery> {
-
-    public PostgresQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public PostgresQueryFactory(Provider<Connection> connection) {
-        this(new Configuration(new PostgresTemplates()), connection);
-    }
-
-    public PostgresQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    public PostgresQuery query() {
-        return new PostgresQuery(connection.get(), configuration);
-    }
-
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java
deleted file mode 100644
index 8309de5173..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import javax.annotation.Nullable;
-import java.sql.*;
-
-import com.mysema.query.sql.types.AbstractType;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.Wkt;
-
-/**
- * @author tiwe
- *
- */
-public class GeometryWktClobType extends AbstractType<Geometry> {
-
-    public static final GeometryWktClobType DEFAULT = new GeometryWktClobType();
-
-    public GeometryWktClobType() {
-        super(Types.CLOB);
-    }
-
-    @Override
-    public Class<Geometry> getReturnedClass() {
-        return Geometry.class;
-    }
-
-    @Override
-    @Nullable
-    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
-        Clob clob = rs.getClob(startIndex);
-        String str = clob != null ? clob.getSubString(1, (int) clob.length()) : null;
-        if (str != null) {
-            return Wkt.newWktDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(str);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(value);
-        st.setString(startIndex, str);
-    }
-
-    @Override
-    public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
-        return "'" + str + "'";
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java
deleted file mode 100644
index d3bd8e2977..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import javax.annotation.Nullable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import com.mysema.query.sql.types.AbstractType;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.Wkt;
-
-/**
- * @author tiwe
- *
- */
-public class GeometryWktType extends AbstractType<Geometry> {
-
-    public static final GeometryWktType DEFAULT = new GeometryWktType();
-
-    public GeometryWktType() {
-        super(Types.VARCHAR);
-    }
-
-    @Override
-    public Class<Geometry> getReturnedClass() {
-        return Geometry.class;
-    }
-
-    @Override
-    @Nullable
-    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
-        String str = rs.getString(startIndex);
-        if (str != null) {
-            return Wkt.newWktDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(str);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(value);
-        st.setString(startIndex, str);
-    }
-
-    @Override
-    public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
-        return "'" + str + "'";
-    }
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryConverter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryConverter.java
deleted file mode 100644
index 20df004615..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryConverter.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import static oracle.spatial.geometry.JGeometry.GTYPE_COLLECTION;
-import static oracle.spatial.geometry.JGeometry.GTYPE_CURVE;
-import static oracle.spatial.geometry.JGeometry.GTYPE_MULTICURVE;
-import static oracle.spatial.geometry.JGeometry.GTYPE_MULTIPOINT;
-import static oracle.spatial.geometry.JGeometry.GTYPE_MULTIPOLYGON;
-import static oracle.spatial.geometry.JGeometry.GTYPE_POINT;
-import static oracle.spatial.geometry.JGeometry.GTYPE_POLYGON;
-import oracle.spatial.geometry.JGeometry;
-
-import org.geolatte.geom.DimensionalFlag;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PointCollection;
-import org.geolatte.geom.PointCollectionFactory;
-import org.geolatte.geom.PointSequence;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-import org.geolatte.geom.crs.CrsId;
-
-/**
- * @author tiwe
- *
- */
-public class JGeometryConverter {
-
-    // to jgeometry
-
-    public static JGeometry convert(Geometry geometry) {
-        switch (geometry.getGeometryType()) {
-        case POINT: return convert((Point)geometry);
-//        case CURVE:
-//        case SURFACE:
-        case GEOMETRY_COLLECTION: return convert((GeometryCollection)geometry);
-        case LINE_STRING: return convert((LineString)geometry);
-        case LINEAR_RING: return convert((LinearRing)geometry);
-        case POLYGON: return convert((Polygon)geometry);
-        case POLYHEDRAL_SURFACE: return convert((PolyHedralSurface)geometry);
-//        case MULTI_SURFACE:
-        case MULTI_POINT: return convert((MultiPoint)geometry);
-//        case TIN
-        case MULTI_POLYGON: return convert((MultiPolygon)geometry);
-        case MULTI_LINE_STRING: return convert((MultiLineString)geometry);
-        default: throw new IllegalArgumentException(geometry.toString());
-        }
-    }
-
-    private static double[] getPoints(PointCollection points) {
-        int dim = points.getCoordinateDimension();
-        double[] values = new double[points.size() * dim];
-        int offset = 0;
-        for (int i = 0; i < points.size(); i++) {
-            values[offset++] = points.getX(i);
-            values[offset++] = points.getY(i);
-            if (points.is3D()) {
-                values[offset++] = points.getZ(i);
-            }
-            if (points.isMeasured()) {
-                values[offset++] = points.getM(i);
-            }
-        }
-        return values;
-    }
-
-    private static double[] getCoordinates(Point geometry) {
-        double[] value = new double[geometry.getCoordinateDimension()];
-        int offset = 0;
-        value[offset++] = geometry.getX();
-        value[offset++] = geometry.getY();
-        if (geometry.is3D()) {
-            value[offset++] = geometry.getZ();
-        }
-        if (geometry.isMeasured()) {
-            value[offset++] = geometry.getM();
-        }
-        return value;
-    }
-
-    private static JGeometry convert(Polygon geometry) {
-        int srid = geometry.getSRID();
-        int dim = geometry.getCoordinateDimension();
-        double[] points = getPoints(geometry.getPoints());
-        int[] elemInfo = new int[3 + geometry.getNumInteriorRing() * 3];
-        int offset = 0;
-        int pointOffset = 1;
-        elemInfo[offset++] = pointOffset;
-        elemInfo[offset++] = 1003; // exterior
-        elemInfo[offset++] = 1;
-        pointOffset += geometry.getExteriorRing().getNumPoints() * dim;
-        for (int i = 0; i < geometry.getNumInteriorRing(); i++) {
-            elemInfo[offset++] = pointOffset;
-            elemInfo[offset++] = 2003;
-            elemInfo[offset++] = 1;
-            pointOffset += geometry.getInteriorRingN(i).getNumPoints() * dim;
-        }
-        int gtype = dim * 1000 + (geometry.isMeasured() ? dim : 0) * 100 + GTYPE_POLYGON;
-        return new JGeometry(gtype, srid, elemInfo, points);
-    }
-
-    private static JGeometry convert(PolyHedralSurface geometry) {
-        throw new UnsupportedOperationException();
-    }
-
-    private static JGeometry convert(LineString geometry) {
-        int srid = geometry.getSRID();
-        int dim = geometry.getCoordinateDimension();
-        double[] points = getPoints(geometry.getPoints());
-        int[] elemInfo = new int[]{1, 2, 1};
-        int gtype = dim * 1000 + (geometry.isMeasured() ? dim : 0) * 100 + GTYPE_CURVE;
-        return new JGeometry(gtype, srid, elemInfo, points);
-    }
-
-    private static JGeometry convert(GeometryCollection geometry) {
-        // TODO
-        throw new UnsupportedOperationException();
-    }
-
-    private static JGeometry convert(MultiPoint geometry) {
-        int srid = geometry.getSRID();
-        int dim = geometry.getCoordinateDimension();
-        double[] points = getPoints(geometry.getPoints());
-        int[] elemInfo = new int[]{1, 1, geometry.getNumPoints()};
-        int gtype = dim * 1000 + (geometry.isMeasured() ? dim : 0) * 100 + GTYPE_MULTIPOINT;
-        return new JGeometry(gtype, srid, elemInfo, points);
-    }
-
-    private static JGeometry convert(MultiPolygon geometry) {
-        // TODO
-        throw new UnsupportedOperationException();
-    }
-
-    private static JGeometry convert(MultiLineString geometry) {
-        int srid = geometry.getSRID();
-        int dim = geometry.getCoordinateDimension();
-        double[] points = getPoints(geometry.getPoints());
-        int[] elemInfo = new int[geometry.getNumGeometries() * 3];
-        int offset = 0;
-        int pointOffset = 1;
-        for (int i = 0; i < geometry.getNumGeometries(); i++) {
-            elemInfo[offset++] = pointOffset;
-            elemInfo[offset++] = 2;
-            elemInfo[offset++] = 1;
-            pointOffset += geometry.getGeometryN(i).getNumPoints() * dim;
-        }
-        int gtype = dim * 1000 + (geometry.isMeasured() ? dim : 0) * 100 + GTYPE_MULTICURVE;
-        return new JGeometry(gtype, srid, elemInfo, points);
-    }
-
-    private static JGeometry convert(Point geometry) {
-        double[] value = getCoordinates(geometry);
-        int srid = geometry.getSRID();
-        if (geometry.isMeasured()) {
-            return JGeometry.createLRSPoint(value, value.length - 1, srid);
-        } else {
-            return JGeometry.createPoint(value, value.length, srid);
-        }
-    }
-
-    // to geolatte
-
-    public static Geometry convert(JGeometry geometry) {
-        switch (geometry.getType()) {
-        case GTYPE_COLLECTION: return convertCollection(geometry);
-        case GTYPE_CURVE: return convertCurve(geometry);
-        case GTYPE_MULTICURVE: return convertMultiCurve(geometry);
-        case GTYPE_MULTIPOINT: return convertMultiPoint(geometry);
-        case GTYPE_MULTIPOLYGON: return convertMultiPolygon(geometry);
-        case GTYPE_POINT: return convertPoint(geometry);
-        case GTYPE_POLYGON: return convertPolygon(geometry);
-        default: throw new IllegalArgumentException(geometry.toString());
-        }
-    }
-
-    private static PointSequence getPoints(JGeometry geometry) {
-        int dimensions = geometry.getDimensions();
-        boolean measured = geometry.isLRSGeometry();
-        DimensionalFlag flag = DimensionalFlag.valueOf(dimensions > (measured ? 3 : 2), measured);
-        double[] ordinates = geometry.getOrdinatesArray();
-        return PointCollectionFactory.create(ordinates, flag);
-    }
-
-    private static Polygon convertPolygon(JGeometry geometry) {
-        CrsId crs = CrsId.valueOf(geometry.getSRID());
-        int dimensions = geometry.getDimensions();
-        boolean measured = geometry.isLRSGeometry();
-        DimensionalFlag flag = DimensionalFlag.valueOf(dimensions > (measured ? 3 : 2), measured);
-        Object[] elements = geometry.getOrdinatesOfElements();
-        LinearRing[] rings = new LinearRing[elements.length];
-        for (int i = 0; i < elements.length; i++) {
-            PointSequence points = PointCollectionFactory.create((double[]) elements[i], flag);
-            rings[i] = new LinearRing(points, crs);
-        }
-        return new Polygon(rings);
-    }
-
-    private static Point convertPoint(JGeometry geometry) {
-        CrsId crs = CrsId.valueOf(geometry.getSRID());
-        double[] point = geometry.getPoint();
-        int dimensions = geometry.getDimensions();
-        boolean measured = geometry.isLRSGeometry();
-        DimensionalFlag flag = DimensionalFlag.valueOf(dimensions > (measured ? 3 : 2), measured);
-        return new Point(PointCollectionFactory.create(point, flag), crs);
-    }
-
-    private static LineString convertCurve(JGeometry geometry) {
-        CrsId crs = CrsId.valueOf(geometry.getSRID());
-        PointSequence points = getPoints(geometry);
-        return new LineString(points, crs);
-    }
-
-    private static MultiPoint convertMultiPoint(JGeometry geometry) {
-        CrsId crs = CrsId.valueOf(geometry.getSRID());
-        JGeometry[] elements = geometry.getElements();
-        if (elements == null || elements.length == 0) {
-            return MultiPoint.createEmpty();
-        }
-        Point[] points = new Point[elements.length];
-        int dimensions = geometry.getDimensions();
-        double[] ordinates = geometry.getOrdinatesArray();
-        boolean measured = geometry.isLRSGeometry();
-        DimensionalFlag flag = DimensionalFlag.valueOf(dimensions > (measured ? 3 : 2), measured);
-        int offset = 0;
-        for (int i = 0; i < points.length; i++) {
-            double[] coords = new double[dimensions];
-            System.arraycopy(ordinates, offset, coords, 0, coords.length);
-            points[i] = new Point(PointCollectionFactory.create(coords, flag), crs);
-            offset += dimensions;
-        }
-        return new MultiPoint(points);
-    }
-
-    // FIXME
-    private static MultiPolygon convertMultiPolygon(JGeometry geometry) {
-        JGeometry[] elements = geometry.getElements();
-        if (elements == null || elements.length == 0) {
-            return MultiPolygon.createEmpty();
-        }
-        Polygon[] polygons = new Polygon[elements.length];
-        for (int i = 0; i < elements.length; i++) {
-            polygons[i] = convertPolygon(elements[i]);
-        }
-        return new MultiPolygon(polygons);
-    }
-
-    // FIXME
-    private static MultiLineString convertMultiCurve(JGeometry geometry) {
-        JGeometry[] elements = geometry.getElements();
-        if (elements == null || elements.length == 0) {
-            return MultiLineString.createEmpty();
-        }
-        CrsId crs = CrsId.valueOf(geometry.getSRID());
-        LineString[] lineStrings = new LineString[elements.length];
-        for (int i = 0; i < elements.length; i++) {
-            PointSequence points = getPoints(elements[i]);
-            lineStrings[i] = new LineString(points, crs);
-        }
-        return new MultiLineString(lineStrings);
-    }
-
-    // FIXME
-    private static GeometryCollection convertCollection(JGeometry geometry) {
-        JGeometry[] elements = geometry.getElements();
-        if (elements == null || elements.length == 0) {
-            return GeometryCollection.createEmpty();
-        }
-        Geometry[] geometries = new Geometry[elements.length];
-        for (int i = 0; i < elements.length; i++) {
-            geometries[i] = convert(elements[i]);
-        }
-        return new GeometryCollection(geometries);
-    }
-
-    private JGeometryConverter() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryType.java
deleted file mode 100644
index 2718810991..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/JGeometryType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import javax.annotation.Nullable;
-
-import oracle.spatial.geometry.JGeometry;
-import oracle.sql.STRUCT;
-
-import org.geolatte.geom.Geometry;
-
-import com.mysema.query.sql.types.AbstractType;
-
-/**
- * @author tiwe
- *
- */
-public class JGeometryType extends AbstractType<Geometry> {
-
-    public static final JGeometryType DEFAULT = new JGeometryType();
-
-    public JGeometryType() {
-        super(Types.OTHER);
-    }
-
-    @Override
-    public Class<Geometry> getReturnedClass() {
-        return Geometry.class;
-    }
-
-    @Override
-    @Nullable
-    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
-        byte[] bytes = rs.getBytes(startIndex);
-        if (bytes != null) {
-            try {
-                JGeometry geometry = JGeometry.load(bytes);
-                return JGeometryConverter.convert(geometry);
-            } catch (Exception e) {
-                throw new SQLException(e);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        try {
-            JGeometry geo = JGeometryConverter.convert(value);
-            STRUCT struct = JGeometry.store(st.getConnection(), geo);
-            st.setObject(startIndex, struct);
-        } catch (Exception e) {
-            throw new SQLException(e);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java
deleted file mode 100644
index eaf2431a46..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import com.mysema.query.spatial.SpatialOps;
-import com.mysema.query.sql.MySQLTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * MySQLSpatialTemplates is a spatial enabled SQL dialect for MySQL
- *
- * @author tiwe
- *
- */
-public class MySQLSpatialTemplates extends MySQLTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new MySQLSpatialTemplates(escape, quote);
-            }
-        };
-    }
-
-    public MySQLSpatialTemplates() {
-        this('\\', false);
-    }
-
-    public MySQLSpatialTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public MySQLSpatialTemplates(char escape, boolean quote) {
-        super(escape, quote);
-        addCustomType(MySQLWkbType.DEFAULT);
-        add(SpatialTemplatesSupport.getSpatialOps("", true));
-        add(SpatialOps.NUM_INTERIOR_RING, "NumInteriorRings({0})");
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java
deleted file mode 100644
index 6f7faef1e5..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * @author tiwe
- *
- */
-public class OracleSpatialTemplates extends OracleTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new OracleSpatialTemplates(escape, quote);
-            }
-        };
-    }
-
-    public OracleSpatialTemplates() {
-        this('\\', false);
-    }
-
-    public OracleSpatialTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public OracleSpatialTemplates(char escape, boolean quote) {
-        super(escape, quote);
-        addCustomType(JGeometryType.DEFAULT);
-        // TODO
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryConverter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryConverter.java
deleted file mode 100644
index 489d9e4159..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryConverter.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import org.geolatte.geom.DimensionalFlag;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PointCollectionFactory;
-import org.geolatte.geom.PointSequence;
-import org.geolatte.geom.PointSequenceBuilder;
-import org.geolatte.geom.PointSequenceBuilders;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-import org.geolatte.geom.crs.CrsId;
-
-
-/**
- * @author tiwe
- *
- */
-public class PGgeometryConverter {
-
-    // to postgis
-
-    public static org.postgis.Geometry convert(Geometry geometry) {
-        if (geometry instanceof Point) {
-            return convert((Point)geometry);
-        } else if (geometry instanceof LinearRing) {
-            return convert((LinearRing)geometry);
-        } else if (geometry instanceof LineString) {
-            return convert((LineString)geometry);
-        } else if (geometry instanceof MultiLineString) {
-            return convert((MultiLineString)geometry);
-        } else if (geometry instanceof Polygon) {
-            return convert((Polygon)geometry);
-        } else if (geometry instanceof PolyHedralSurface) {
-            return convert((PolyHedralSurface)geometry);
-        } else if (geometry instanceof MultiPoint) {
-            return convert((MultiPoint)geometry);
-        } else if (geometry instanceof MultiPolygon) {
-            return convert((MultiPolygon)geometry);
-        } else if (geometry instanceof GeometryCollection) {
-            return convert((GeometryCollection)geometry);
-        } else {
-            throw new IllegalArgumentException(geometry.getClass().getName());
-        }
-    }
-
-    private static org.postgis.Point convert(Point point) {
-        org.postgis.Point pgPoint = new org.postgis.Point();
-        pgPoint.srid = point.getSRID();
-        pgPoint.dimension = point.is3D() ? 3 : 2;
-        pgPoint.haveMeasure = false;
-        pgPoint.x = point.getX();
-        pgPoint.y = point.getY();
-        if (point.is3D()) {
-            pgPoint.z = point.getZ();
-        }
-        if (point.isMeasured()) {
-            pgPoint.m = point.getM();
-            pgPoint.haveMeasure = true;
-        }
-        return pgPoint;
-    }
-
-    private static org.postgis.Point[] convertPoints(Geometry geometry) {
-        org.postgis.Point[] pgPoints = new org.postgis.Point[geometry.getNumPoints()];
-        for (int i = 0; i < pgPoints.length; i++) {
-            pgPoints[i] = convert(geometry.getPointN(i));
-        }
-        return pgPoints;
-    }
-
-    private static org.postgis.LineString convert(LineString lineString) {
-        org.postgis.Point[] pgPoints = convertPoints(lineString);
-        org.postgis.LineString pgLineString = new org.postgis.LineString(pgPoints);
-        pgLineString.haveMeasure = lineString.isMeasured();
-        pgLineString.setSrid(lineString.getSRID());
-        return pgLineString;
-    }
-
-    private static org.postgis.LinearRing convert(LinearRing linearRing) {
-        org.postgis.Point[] pgPoints = convertPoints(linearRing);
-        org.postgis.LinearRing pgLinearRing = new org.postgis.LinearRing(pgPoints);
-        pgLinearRing.haveMeasure = linearRing.isMeasured();
-        pgLinearRing.setSrid(linearRing.getSRID());
-        return pgLinearRing;
-    }
-
-    private static org.postgis.MultiLineString convert(MultiLineString multiLineString) {
-        org.postgis.LineString[] pgLineStrings = new org.postgis.LineString[multiLineString.getNumGeometries()];
-        for (int i = 0; i < pgLineStrings.length; i++) {
-            pgLineStrings[i] = convert(multiLineString.getGeometryN(i));
-        }
-        org.postgis.MultiLineString pgMultiLineString = new org.postgis.MultiLineString(pgLineStrings);
-        pgMultiLineString.haveMeasure = multiLineString.isMeasured();
-        pgMultiLineString.setSrid(multiLineString.getSRID());
-        return pgMultiLineString;
-    }
-
-    private static org.postgis.Polygon convert(Polygon polygon) {
-        int numRings = polygon.getNumInteriorRing();
-        org.postgis.LinearRing[] rings = new org.postgis.LinearRing[numRings + 1];
-        rings[0] = convert(polygon.getExteriorRing());
-        for (int i = 0; i < numRings; i++) {
-            rings[i+1] = convert(polygon.getInteriorRingN(i));
-        }
-        org.postgis.Polygon pgPolygon = new org.postgis.Polygon(rings);
-        pgPolygon.setSrid(polygon.getSRID());
-        return pgPolygon;
-    }
-
-    private static org.postgis.Polygon convert(PolyHedralSurface polyHedralSurface) {
-        throw new UnsupportedOperationException();
-    }
-
-    private static org.postgis.MultiPoint convert(MultiPoint multiPoint) {
-        org.postgis.Point[] pgPoints = convertPoints(multiPoint);
-        org.postgis.MultiPoint pgMultiPoint = new org.postgis.MultiPoint(pgPoints);
-        pgMultiPoint.setSrid(multiPoint.getSRID());
-        return pgMultiPoint;
-    }
-
-    private static org.postgis.MultiPolygon convert(MultiPolygon multiPolygon) {
-        org.postgis.Polygon[] pgPolygons = new org.postgis.Polygon[multiPolygon.getNumGeometries()];
-        for (int i = 0; i < pgPolygons.length; i++) {
-            pgPolygons[i] = convert(multiPolygon.getGeometryN(i));
-        }
-        org.postgis.MultiPolygon pgMultiPolygon = new org.postgis.MultiPolygon(pgPolygons);
-        pgMultiPolygon.setSrid(multiPolygon.getSRID());
-        return pgMultiPolygon;
-    }
-
-    private static org.postgis.GeometryCollection convert(GeometryCollection geometryCollection) {
-        org.postgis.Geometry[] pgGeometries = new org.postgis.Geometry[geometryCollection.getNumGeometries()];
-        for (int i = 0; i < pgGeometries.length; i++) {
-            pgGeometries[i] = convert(geometryCollection.getGeometryN(i));
-        }
-        org.postgis.GeometryCollection pgGeometryCollection = new org.postgis.GeometryCollection(pgGeometries);
-        pgGeometryCollection.setSrid(geometryCollection.getSRID());
-        return pgGeometryCollection;
-    }
-
-    // to geolatte
-
-    public static Geometry convert(org.postgis.Geometry geometry) {
-        switch (geometry.getType()) {
-        case org.postgis.Geometry.POINT:
-            return convert((org.postgis.Point)geometry);
-        case org.postgis.Geometry.LINESTRING:
-            return convert((org.postgis.LineString)geometry);
-        case org.postgis.Geometry.LINEARRING:
-            return convert((org.postgis.LinearRing)geometry);
-        case org.postgis.Geometry.POLYGON:
-            return convert((org.postgis.Polygon)geometry);
-        case org.postgis.Geometry.MULTILINESTRING:
-            return convert((org.postgis.MultiLineString)geometry);
-        case org.postgis.Geometry.MULTIPOINT:
-            return convert((org.postgis.MultiPoint)geometry);
-        case org.postgis.Geometry.MULTIPOLYGON:
-            return convert((org.postgis.MultiPolygon)geometry);
-        case org.postgis.Geometry.GEOMETRYCOLLECTION:
-            return convert((org.postgis.GeometryCollection)geometry);
-        }
-        throw new IllegalArgumentException(geometry.toString());
-    }
-
-    private static Point convert(org.postgis.Point geometry) {
-        int d = geometry.dimension;
-        CrsId crs = CrsId.valueOf(geometry.srid);
-        double[] point = new double[d + (geometry.haveMeasure ? 1 : 0)];
-        int offset = 0;
-        point[offset++] = geometry.x;
-        point[offset++] = geometry.y;
-        if (d == 3) {
-             point[offset++] = geometry.z;
-        }
-        if (geometry.haveMeasure) {
-            point[offset++] = geometry.m;
-        }
-        DimensionalFlag flag = DimensionalFlag.valueOf(d == 3, geometry.haveMeasure);
-        return new Point(PointCollectionFactory.create(point, flag), crs);
-    }
-
-    private static PointSequence convertPoints(org.postgis.Point[] points) {
-        if (points.length == 0) {
-            return PointCollectionFactory.createEmpty();
-        }
-        org.postgis.Point first = points[0];
-        DimensionalFlag flag = DimensionalFlag.valueOf(first.dimension == 3, first.haveMeasure);
-        PointSequenceBuilder pointSequence = PointSequenceBuilders.variableSized(flag);
-        for (int i = 0; i < points.length; i++) {
-            pointSequence.add(convert(points[i]));
-        }
-        return pointSequence.toPointSequence();
-    }
-
-    private static GeometryCollection convert(org.postgis.GeometryCollection geometry) {
-        Geometry[] geometries = new Geometry[geometry.numGeoms()];
-        for (int i = 0; i < geometries.length; i++) {
-            geometries[i] = convert(geometry.getSubGeometry(i));
-        }
-        return new GeometryCollection(geometries);
-    }
-
-    private static MultiPolygon convert(org.postgis.MultiPolygon geometry) {
-        Polygon[] polygons = new Polygon[geometry.numPolygons()];
-        for (int i = 0; i < polygons.length; i++) {
-            polygons[i] = convert(geometry.getPolygon(i));
-        }
-        return new MultiPolygon(polygons);
-    }
-
-    private static MultiPoint convert(org.postgis.MultiPoint geometry) {
-        Point[] points = new Point[geometry.numPoints()];
-        for (int i = 0; i < points.length; i++) {
-            points[i] = convert(geometry.getPoint(i));
-        }
-        return new MultiPoint(points);
-    }
-
-    private static MultiLineString convert(org.postgis.MultiLineString geometry) {
-        LineString[] lineStrings = new LineString[geometry.numLines()];
-        for (int i = 0; i < lineStrings.length; i++) {
-            lineStrings[i] = convert(geometry.getLine(i));
-        }
-        return new MultiLineString(lineStrings);
-    }
-
-    private static Polygon convert(org.postgis.Polygon geometry) {
-        LinearRing[] rings = new LinearRing[geometry.numRings()];
-        for (int i = 0; i < rings.length; i++) {
-            rings[i] = convert(geometry.getRing(i));
-        }
-        return new Polygon(rings);
-    }
-
-    private static LinearRing convert(org.postgis.LinearRing geometry) {
-        PointSequence points = convertPoints(geometry.getPoints());
-        return new LinearRing(points, CrsId.valueOf(geometry.getSrid()));
-    }
-
-
-    private static LineString convert(org.postgis.LineString geometry) {
-        PointSequence points = convertPoints(geometry.getPoints());
-        return new LineString(points, CrsId.valueOf(geometry.getSrid()));
-    }
-
-    private PGgeometryConverter() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java
deleted file mode 100644
index ba658b4ffc..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import javax.annotation.Nullable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import com.mysema.query.sql.types.AbstractType;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.Wkt;
-import org.postgis.PGgeometry;
-
-/**
- * @author tiwe
- *
- */
-public class PGgeometryType extends AbstractType<Geometry> {
-
-    public static final PGgeometryType DEFAULT = new PGgeometryType();
-
-    public PGgeometryType() {
-        super(Types.STRUCT);
-    }
-
-    @Override
-    public Class<Geometry> getReturnedClass() {
-        return Geometry.class;
-    }
-
-    @Override
-    @Nullable
-    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
-        Object obj = rs.getObject(startIndex);
-        return obj != null ? PGgeometryConverter.convert(((PGgeometry) obj).getGeometry()) : null;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        PGgeometry geometry = new PGgeometry(PGgeometryConverter.convert(value));
-        st.setObject(startIndex, geometry);
-    }
-
-    @Override
-    public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
-        return "'" + str + "'";
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java
deleted file mode 100644
index 1423183620..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import com.mysema.query.spatial.SpatialOps;
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * PostGISTemplates is a spatial enabled SQL dialect for PostGIS
- *
- * @author tiwe
- *
- */
-public class PostGISTemplates extends PostgresTemplates {
-
-    public static Builder builder() {
-        return new Builder() {
-            @Override
-            protected SQLTemplates build(char escape, boolean quote) {
-                return new PostGISTemplates(escape, quote);
-            }
-        };
-    }
-
-    public PostGISTemplates() {
-        this('\\', false);
-    }
-
-    public PostGISTemplates(boolean quote) {
-        this('\\', quote);
-    }
-
-    public PostGISTemplates(char escape, boolean quote) {
-        super(escape, quote);
-        addCustomType(PGgeometryType.DEFAULT);
-        add(SpatialTemplatesSupport.getSpatialOps(true));
-        add(SpatialOps.DISTANCE_SPHERE, "ST_Distance_Sphere({0}, {1})");
-        add(SpatialOps.DISTANCE_SPHEROID, "ST_Distance_Spheroid({0}, {1})");
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/RelationalPathSpatial.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/RelationalPathSpatial.java
deleted file mode 100644
index f6e3ebb56b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/RelationalPathSpatial.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-
-import com.mysema.query.spatial.path.GeometryCollectionPath;
-import com.mysema.query.spatial.path.GeometryPath;
-import com.mysema.query.spatial.path.GeometryPaths;
-import com.mysema.query.spatial.path.LineStringPath;
-import com.mysema.query.spatial.path.LinearRingPath;
-import com.mysema.query.spatial.path.MultiLineStringPath;
-import com.mysema.query.spatial.path.MultiPointPath;
-import com.mysema.query.spatial.path.MultiPolygonPath;
-import com.mysema.query.spatial.path.PointPath;
-import com.mysema.query.spatial.path.PolygonPath;
-import com.mysema.query.spatial.path.PolyhedralSurfacePath;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public class RelationalPathSpatial<T> extends RelationalPathBase<T> implements GeometryPaths {
-
-    private static final long serialVersionUID = -7176236689794620277L;
-
-    public RelationalPathSpatial(Class<? extends T> type, String variable, String schema, String table) {
-        this(type, PathMetadataFactory.forVariable(variable), schema, table);
-    }
-
-    public RelationalPathSpatial(Class<? extends T> type, PathMetadata<?> metadata, String schema, String table) {
-        super(type, metadata, schema, table);
-    }
-
-    @Override
-    public <A extends GeometryCollection> GeometryCollectionPath<A> createGeometryCollection(
-            String property, Class<? extends A> type) {
-        return add(new GeometryCollectionPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends Geometry> GeometryPath<A> createGeometry(String property,
-            Class<? extends A> type) {
-        return add(new GeometryPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends LinearRing> LinearRingPath<A> createLinearRing(String property,
-            Class<? extends A> type) {
-        return add(new LinearRingPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends LineString> LineStringPath<A> createLineString(String property,
-            Class<? extends A> type) {
-        return add(new LineStringPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends MultiLineString> MultiLineStringPath<A> createMultiLineString(
-            String property, Class<? extends A> type) {
-        return add(new MultiLineStringPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends MultiPoint> MultiPointPath<A> createMultiPoint(String property,
-            Class<? extends A> type) {
-        return add(new MultiPointPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends MultiPolygon> MultiPolygonPath<A> createMultiPolygon(String property,
-            Class<? extends A> type) {
-        return add(new MultiPolygonPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends Point> PointPath<A> createPoint(String property, Class<? extends A> type) {
-        return add(new PointPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends Polygon> PolygonPath<A> createPolygon(String property, Class<? extends A> type) {
-        return add(new PolygonPath<A>(type, forProperty(property)));
-    }
-
-    @Override
-    public <A extends PolyHedralSurface> PolyhedralSurfacePath<A> createPolyhedralSurface(
-            String property, Class<? extends A> type) {
-        return add(new PolyhedralSurfacePath<A>(type, forProperty(property)));
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryReader.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryReader.java
deleted file mode 100644
index a5de8315f4..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryReader.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.geolatte.geom.DimensionalFlag;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.GeometryType;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.LinearRing;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PointSequence;
-import org.geolatte.geom.PointSequenceBuilder;
-import org.geolatte.geom.PointSequenceBuilders;
-import org.geolatte.geom.Points;
-import org.geolatte.geom.Polygon;
-import org.geolatte.geom.crs.CrsId;
-
-import com.google.common.collect.Lists;
-import com.vividsolutions.jts.io.ByteArrayInStream;
-import com.vividsolutions.jts.io.ByteOrderDataInStream;
-import com.vividsolutions.jts.io.ByteOrderValues;
-import com.vividsolutions.jts.io.InStream;
-
-/**
- * @author tiwe
- *
- */
-public class SQLServerGeometryReader {
-
-    private static class Figure {
-        int attributes;
-        int pointOffset;
-    }
-
-    private static class Shape {
-        int parentOffset;
-        int figureOffset;
-        GeometryType type;
-    }
-
-    private static GeometryType[] TYPES = new GeometryType[]{
-        GeometryType.POINT,
-        GeometryType.LINE_STRING,
-        GeometryType.POLYGON,
-        GeometryType.MULTI_POINT,
-        GeometryType.MULTI_LINE_STRING,
-        GeometryType.MULTI_POLYGON,
-        GeometryType.GEOMETRY_COLLECTION,
-        // TODO CircularString
-        // TODO CompoundCurve
-        // TODO CurvePolygon
-        // TODO FullGlobe
-    };
-
-    private int srid, version, serializationProps, numberOfPoints;
-
-    private boolean hasZ, hasM, singlePoint, singleLine;
-
-    private DimensionalFlag dimensionalFlag;
-
-    private double[][] points;
-
-    private double[] zValues, mValues;
-
-    private Figure[] figures;
-
-    private Shape[] shapes;
-
-    private CrsId crsId;
-
-    public Geometry read(byte[] bytes) throws IOException {
-        return read(new ByteArrayInStream(bytes));
-    }
-
-    public Geometry read(InStream is) throws IOException {
-        ByteOrderDataInStream dis = new ByteOrderDataInStream(is);
-        dis.setOrder(ByteOrderValues.LITTLE_ENDIAN);
-
-        srid = dis.readInt();
-        version = dis.readByte();
-        serializationProps = dis.readByte();
-        hasZ = (serializationProps & 1) == 1;
-        hasM = (serializationProps & 2) == 2;
-        singlePoint = (serializationProps & 8) == 8;
-        singleLine = (serializationProps & 16) == 16;
-        numberOfPoints = 1;
-        if (singleLine) {
-            numberOfPoints = 2;
-        } else if (!singlePoint) {
-            numberOfPoints = dis.readInt();
-        }
-        dimensionalFlag = DimensionalFlag.XY;
-        if (hasM) {
-            if (hasZ) {
-                dimensionalFlag = DimensionalFlag.XYZM;
-            } else {
-                dimensionalFlag = DimensionalFlag.XYM;
-            }
-        } else if (hasZ) {
-            dimensionalFlag = DimensionalFlag.XYZ;
-        }
-
-        // points
-        points = readPoints(dis, numberOfPoints);
-        if (hasZ) {
-            zValues = readDoubles(dis, numberOfPoints);
-        }
-        if (hasM) {
-            mValues = readDoubles(dis, numberOfPoints);
-        }
-
-        crsId = CrsId.valueOf(srid);
-        if (singlePoint) {
-            return createPoint(0);
-
-        } else if (singleLine) {
-            PointSequence points = createPoints(0, 2);
-            return new LineString(points, crsId);
-
-        } else {
-            // figures
-            int numberOfFigures = dis.readInt();
-            figures = readFigures(dis, numberOfFigures);
-            // shapes
-            int numberOfShapes = dis.readInt();
-            shapes = readShapes(dis, numberOfShapes);
-            return decode(0);
-        }
-    }
-
-    private Geometry decode(int shapeIdx) {
-        switch (shapes[shapeIdx].type) {
-        case POINT: return decodePoint(shapeIdx);
-        case LINE_STRING: return decodeLineString(shapeIdx);
-        case POLYGON: return decodePolygon(shapeIdx);
-        case MULTI_POINT: return decodeMultiPoint(shapeIdx);
-        case MULTI_LINE_STRING: return decodeMultiLineString(shapeIdx);
-        case MULTI_POLYGON: return decodeMultiPolygon(shapeIdx);
-        case GEOMETRY_COLLECTION: return decodeGeometryCollection(shapeIdx);
-        default: throw new IllegalArgumentException(String.valueOf(shapeIdx));
-        }
-    }
-
-    private GeometryCollection decodeGeometryCollection(int shapeIdx) {
-        List<Geometry> geometries = Lists.newArrayList();
-        for (int i = shapeIdx; i < shapes.length; i++) {
-            if (shapes[i].parentOffset == shapeIdx) {
-                geometries.add(decode(i));
-            }
-        }
-        return new GeometryCollection(geometries.toArray(new Geometry[0]));
-    }
-
-    private MultiLineString decodeMultiLineString(int shapeIdx) {
-        List<LineString> lineStrings = Lists.newArrayList();
-        for (int i = shapeIdx; i < shapes.length; i++) {
-            if (shapes[i].parentOffset == shapeIdx) {
-                lineStrings.add(decodeLineString(i));
-            }
-        }
-        return new MultiLineString(lineStrings.toArray(new LineString[0]));
-    }
-
-    private MultiPolygon decodeMultiPolygon(int shapeIdx) {
-        List<Polygon> polygons = Lists.newArrayList();
-        for (int i = shapeIdx; i < shapes.length; i++) {
-            if (shapes[i].parentOffset == shapeIdx) {
-                polygons.add(decodePolygon(i));
-            }
-        }
-        return new MultiPolygon(polygons.toArray(new Polygon[0]));
-    }
-
-    private MultiPoint decodeMultiPoint(int shapeIdx) {
-        List<Point> points = Lists.newArrayList();
-        for (int i = shapeIdx; i < shapes.length; i++) {
-            if (shapes[i].parentOffset == shapeIdx) {
-                points.add(decodePoint(i));
-            }
-        }
-        return new MultiPoint(points.toArray(new Point[0]));
-    }
-
-    private Polygon decodePolygon(int shapeIdx) {
-        Shape shape = shapes[shapeIdx];
-        int figureOffset = shape.figureOffset;
-        if (figureOffset <= -1) {
-            return Polygon.createEmpty();
-        }
-        int figureStopIdx = figures.length - 1;
-        if (shapeIdx < (shapes.length - 1)) {
-            figureStopIdx = shapes[shapeIdx + 1].figureOffset - 1;
-        }
-        List<LinearRing> linearRings = Lists.newArrayList();
-        for (int i = figureOffset; i <= figureStopIdx; i++) {
-            linearRings.add(new LinearRing(createPoints(i), crsId));
-        }
-        return new Polygon(linearRings.toArray(new LinearRing[0]));
-    }
-
-    private LineString decodeLineString(int shapeIdx) {
-        Shape shape = shapes[shapeIdx];
-        return new LineString(createPoints(shape.figureOffset), crsId);
-    }
-
-    private Point decodePoint(int shapeIdx) {
-        int pointIdx = figures[shapes[shapeIdx].figureOffset].pointOffset;
-        return createPoint(pointIdx);
-    }
-
-    private Point createPoint(int idx) {
-        double x = points[idx][0];
-        double y = points[idx][1];
-        if (hasM) {
-            if (hasZ) {
-                return Points.create(x, y, zValues[idx], mValues[idx], crsId);
-            } else {
-                return Points.createMeasured(x, y, mValues[idx], crsId);
-            }
-        } else if (hasZ) {
-            return Points.create3D(x, y, zValues[idx], crsId);
-        } else {
-            return Points.create(x, y, crsId);
-        }
-    }
-
-    private PointSequence createPoints(int idx1, int idx2) {
-        PointSequenceBuilder builder = PointSequenceBuilders.fixedSized(idx2 - idx1, dimensionalFlag);
-        for (int i = idx1; i < idx2; i++) {
-            builder.add(createPoint(i));
-        }
-        return builder.toPointSequence();
-    }
-
-    private PointSequence createPoints(int figureIdx) {
-        int idx1 = figures[figureIdx].pointOffset;
-        int idx2 = points.length;
-        if (figureIdx < (figures.length - 1)) {
-            idx2 = figures[figureIdx + 1].pointOffset;
-        }
-        return createPoints(idx1, idx2);
-    }
-
-    private double[] readDoubles(ByteOrderDataInStream is, int num) throws IOException {
-        double[] doubles = new double[num];
-        for (int i = 0; i < num; i++) {
-            doubles[i] = is.readDouble();
-        }
-        return doubles;
-    }
-
-    private Figure[] readFigures(ByteOrderDataInStream is, int num) throws IOException {
-        Figure[] figures = new Figure[num];
-        for (int i = 0; i < num; i++) {
-            Figure figure = new Figure();
-            figure.attributes = is.readByte();
-            figure.pointOffset = is.readInt();
-            figures[i] = figure;
-        }
-        return figures;
-    }
-
-    private double[][] readPoints(ByteOrderDataInStream is, int num) throws IOException {
-        double[][] points = new double[num][];
-        for (int i = 0; i < num; i++) {
-            points[i] = new double[]{is.readDouble(), is.readDouble()};
-        }
-        return points;
-    }
-
-    private Shape[] readShapes(ByteOrderDataInStream is, int num) throws IOException {
-        Shape[] shapes = new Shape[num];
-        for (int i = 0; i < num; i++) {
-            Shape shape = new Shape();
-            shape.parentOffset = is.readInt();
-            shape.figureOffset = is.readInt();
-            shape.type = TYPES[is.readByte() - 1];
-            shapes[i] = shape;
-        }
-        return shapes;
-    }
-
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryType.java
deleted file mode 100644
index d98268a9bf..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryType.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import com.mysema.query.sql.types.AbstractType;
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.codec.Wkt;
-
-/**
- * @author tiwe
- *
- */
-public class SQLServerGeometryType extends AbstractType<Geometry> {
-
-    public static final SQLServerGeometryType DEFAULT = new SQLServerGeometryType();
-
-    public SQLServerGeometryType() {
-        super(Types.BLOB);
-    }
-
-    @Override
-    public Class<Geometry> getReturnedClass() {
-        return Geometry.class;
-    }
-
-    @Override
-    @Nullable
-    public Geometry getValue(ResultSet rs, int startIndex) throws SQLException {
-        try {
-            byte[] bytes = rs.getBytes(startIndex);
-            if (bytes != null) {
-                return new SQLServerGeometryReader().read(bytes);
-            } else {
-                return null;
-            }
-        } catch (IOException e) {
-            throw new SQLException(e);
-        }
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Geometry value) throws SQLException {
-        try {
-            byte[] bytes = new SQLServerGeometryWriter().write(value);
-            st.setBytes(startIndex, bytes);
-        } catch (IOException e) {
-            throw new SQLException(e);
-        }
-    }
-
-    @Override
-    public String getLiteral(Geometry geometry) {
-        String str = Wkt.newWktEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry);
-        if (geometry.getSRID() > -1) {
-            return "geometry::STGeomFromText('" + str + "', " + geometry.getSRID() + ")";
-        } else {
-            return "geometry::STGeomFromText('" + str + "')";
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryWriter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryWriter.java
deleted file mode 100644
index c429b1aef1..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServerGeometryWriter.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.spatial;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.List;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PolyHedralSurface;
-import org.geolatte.geom.Polygon;
-
-import com.google.common.collect.Lists;
-
-/**
- * @author tiwe
- *
- */
-public class SQLServerGeometryWriter {
-
-    private static final int POINT = 1;
-
-    private static final int LINE_STRING = 2;
-
-    private static final int POLYGON = 3;
-
-    private static final int MULTI_POINT = 4;
-
-    private static final int MULTI_LINESTRING = 5;
-
-    private static final int MULTI_POLYGON = 6;
-
-    private static final int GEOMETRY_COLLECTION = 7;
-
-    private static class Figure {
-        int attributes;
-        int pointOffset;
-    }
-
-    private static class Shape {
-        int parentOffset;
-        int figureOffset;
-        int type;
-    }
-
-    private List<Point> points = Lists.newArrayList();
-
-    private List<Figure> figures = Lists.newArrayList();
-
-    private List<Shape> shapes = Lists.newArrayList();
-
-    private int calculateCapacity(Geometry geometry) {
-        int numPoints = points.size();
-        int prefixSize = 6;
-
-        if (geometry instanceof Point) {
-            int capacity = prefixSize + 16 * numPoints;
-            if (geometry.is3D()) {
-                capacity += 8 * numPoints;
-            }
-            if (geometry.isMeasured()) {
-                capacity += 8 * numPoints;
-            }
-            return capacity;
-        }
-
-        int pointSize = 16 + (geometry.is3D() ? 8 : 0) + (geometry.isMeasured() ? 8 : 0);
-        int size = prefixSize + 3 * 4; // prefix + 3 ints for points, shapes and
-                                       // figures
-        size += numPoints * pointSize;
-        size += figures.size() * 5;
-        size += shapes.size() * 9;
-        return size;
-    }
-
-    public byte[] write(Geometry geometry) throws IOException {
-        visit(geometry, -1);
-
-        int bytes = calculateCapacity(geometry);
-        boolean singlePoint = geometry instanceof Point;
-        ByteBuffer buffer = ByteBuffer.allocate(bytes);
-        buffer.order(ByteOrder.LITTLE_ENDIAN);
-        buffer.putInt(geometry.getSRID());
-        buffer.put((byte)1);
-        buffer.put((byte)((geometry.is3D() ? 1 : 0)
-                 + (geometry.isMeasured() ? 2 : 0)
-                 + 4 // is valid
-                 + (singlePoint ? 8 : 0)
-                 + 0)); // TODO
-
-        if (!singlePoint) {
-            buffer.putInt(points.size());
-        }
-        for (Point point : points) {
-            buffer.putDouble(point.getX());
-            buffer.putDouble(point.getY());
-        }
-        if (geometry.is3D()) {
-            for (Point point : points) {
-                buffer.putDouble(point.getZ());
-            }
-        }
-        if (geometry.isMeasured()) {
-            for (Point point : points) {
-                buffer.putDouble(point.getM());
-            }
-        }
-        if (!singlePoint) {
-            buffer.putInt(figures.size());
-            for (Figure figure : figures) {
-                buffer.put((byte)figure.attributes);
-                buffer.putInt(figure.pointOffset);
-            }
-            buffer.putInt(shapes.size());
-            for (Shape shape : shapes) {
-                buffer.putInt(shape.parentOffset);
-                buffer.putInt(shape.figureOffset);
-                buffer.put((byte)shape.type);
-            }
-        }
-        return buffer.array();
-    }
-
-    private void visit(Geometry geometry, int parent) {
-        switch (geometry.getGeometryType()) {
-        case POINT: visit((Point)geometry, parent); break;
-        case POLYGON: visit((Polygon)geometry, parent); break;
-        case LINE_STRING: visit((LineString)geometry, parent); break;
-        case MULTI_POINT: visit((MultiPoint)geometry, parent); break;
-        case MULTI_LINE_STRING: visit((MultiLineString)geometry, parent); break;
-        case MULTI_POLYGON: visit((MultiPolygon)geometry, parent); break;
-        case GEOMETRY_COLLECTION: visit((GeometryCollection)geometry, parent); break;
-        default: throw new IllegalArgumentException(geometry.toString());
-        }
-    }
-
-    public void visit(Point point, int parent) {
-        Shape shape = new Shape();
-        shape.type = POINT;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        Figure figure = new Figure();
-        figure.attributes = 1;
-        figure.pointOffset = points.size();
-        figures.add(figure);
-
-        points.add(point);
-    }
-
-    public void visit(LineString lineString, int parent) {
-        Shape shape = new Shape();
-        shape.type = LINE_STRING;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        Figure figure = new Figure();
-        figure.attributes = 1;
-        figure.pointOffset = points.size();
-        figures.add(figure);
-
-        for (Point point : lineString.getPoints()) {
-            points.add(point);
-        }
-    }
-
-    public void visit(Polygon polygon, int parent) {
-        Shape shape = new Shape();
-        shape.type = POLYGON;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        // exterior
-        Figure figure = new Figure();
-        figure.attributes = 2;
-        figure.pointOffset = points.size();
-        figures.add(figure);
-        for (Point point : polygon.getExteriorRing().getPoints()) {
-            points.add(point);
-        }
-
-        // interior
-        for (int i = 0; i < polygon.getNumInteriorRing(); i++) {
-            figure = new Figure();
-            figure.attributes = 0;
-            figure.pointOffset = points.size();
-            figures.add(figure);
-            for (Point point : polygon.getInteriorRingN(i).getPoints()) {
-                points.add(point);
-            }
-        }
-    }
-
-    public void visit(MultiPoint collection, int parent) {
-        Shape shape = new Shape();
-        shape.type = MULTI_POINT;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        parent = shapes.size() - 1;
-        for (int i = 0; i < collection.getNumGeometries(); i++) {
-            visit(collection.getGeometryN(i), parent);
-        }
-    }
-
-    public void visit(MultiLineString collection, int parent) {
-        Shape shape = new Shape();
-        shape.type = MULTI_LINESTRING;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        parent = shapes.size() - 1;
-        for (int i = 0; i < collection.getNumGeometries(); i++) {
-            visit(collection.getGeometryN(i), parent);
-        }
-    }
-
-    public void visit(MultiPolygon collection, int parent) {
-        Shape shape = new Shape();
-        shape.type = MULTI_POLYGON;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        parent = shapes.size() - 1;
-        for (int i = 0; i < collection.getNumGeometries(); i++) {
-            visit(collection.getGeometryN(i), parent);
-        }
-    }
-
-    public void visit(GeometryCollection collection, int parent) {
-        Shape shape = new Shape();
-        shape.type = GEOMETRY_COLLECTION;
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        parent = shapes.size() - 1;
-        for (int i = 0; i < collection.getNumGeometries(); i++) {
-            visit(collection.getGeometryN(i), parent);
-        }
-    }
-
-    public void visit(PolyHedralSurface surface, int parent) {
-        Shape shape = new Shape();
-        shape.type = -1; // TODO
-        shape.figureOffset = figures.size();
-        shape.parentOffset = parent;
-        shapes.add(shape);
-
-        parent = shapes.size() - 1;
-        for (int i = 0; i < surface.getNumPatches(); i++) {
-            visit(surface.getPatchN(i), parent);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java
deleted file mode 100644
index 8e7e11fbc3..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/SetQueryBandClause.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.teradata;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.dml.AbstractSQLClause;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * SetQueryBandClause provides support for Teradata specific set query_band executions.
- *
- * @author tiwe
- *
- */
-public class SetQueryBandClause extends AbstractSQLClause<SetQueryBandClause> {
-
-    private final Connection connection;
-
-    private boolean forSession = true;
-
-    private final Map<String, String> values = Maps.newHashMap();
-
-    private transient String queryString;
-
-    private transient String parameter;
-
-    public SetQueryBandClause(Connection connection, SQLTemplates templates) {
-        this(connection, new Configuration(templates));
-    }
-
-    public SetQueryBandClause(Connection connection, Configuration configuration) {
-        super(configuration);
-        this.connection = connection;
-    }
-
-    public SetQueryBandClause forSession() {
-        queryString = null;
-        forSession = true;
-        return this;
-    }
-
-    public SetQueryBandClause forTransaction(){
-        queryString = null;
-        forSession = false;
-        return this;
-    }
-
-    public SetQueryBandClause set(String key, String value) {
-        queryString = null;
-        values.put(key, value);
-        return this;
-    }
-
-    public SetQueryBandClause set(Map<String, String> values) {
-        queryString = null;
-        this.values.putAll(values);
-        return this;
-    }
-
-    @Override
-    public long execute() {
-        PreparedStatement stmt = null;
-        try {
-            stmt = connection.prepareStatement(toString());
-            if (parameter != null) {
-                stmt.setString(1, parameter);
-            }
-            return 1;
-        } catch (SQLException e) {
-            List<Object> bindings = parameter != null ? ImmutableList.<Object>of(parameter) : ImmutableList.of();
-            throw configuration.translate(queryString, bindings, e);
-        } finally {
-            if (stmt != null) {
-                close(stmt);
-            }
-        }
-    }
-
-    @Override
-    public List<SQLBindings> getSQL() {
-        SQLBindings bindings;
-        if (configuration.getUseLiterals() || forSession) {
-            bindings = new SQLBindings(toString(), ImmutableList.of());
-        } else {
-            bindings = new SQLBindings(toString(), ImmutableList.<Object>of(parameter));
-        }
-        return ImmutableList.of(bindings);
-    }
-
-    @Override
-    public String toString() {
-        if (queryString == null) {
-            StringBuilder builder = new StringBuilder();
-            for (Map.Entry<String, String> entry : values.entrySet()) {
-                builder.append(entry.getKey()).append("=").append(entry.getValue());
-                builder.append(";");
-            }
-            if (configuration.getUseLiterals() || forSession) {
-                queryString = "set query_band='"
-                        + configuration.getTemplates().escapeLiteral(builder.toString())
-                        + (forSession ? "' for session" : "' for transaction");
-                parameter = null;
-            } else {
-                queryString = "set query_band=?" + (forSession ? " for session" : " for transaction");
-                parameter = builder.toString();
-            }
-
-        }
-        return queryString;
-    }
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQuery.java
deleted file mode 100644
index 5d22f39a6f..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQuery.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.teradata;
-
-import java.sql.Connection;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.QueryFlag;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLOps;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.TeradataTemplates;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.PredicateOperation;
-
-/**
- * TeradataQuery provides Teradata related extensions to SQLQuery
- *
- * @author tiwe
- *
- */
-public class TeradataQuery extends AbstractSQLQuery<TeradataQuery> {
-
-    public TeradataQuery(Connection conn) {
-        this(conn, new Configuration(new TeradataTemplates()), new DefaultQueryMetadata());
-    }
-
-    public TeradataQuery(Connection conn, SQLTemplates templates) {
-        this(conn, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    public TeradataQuery(Connection conn, Configuration configuration) {
-        this(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    public TeradataQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-
-    /**
-     * Adds a qualify expression
-     *
-     * @param predicate
-     * @return
-     */
-    public TeradataQuery qualify(Predicate predicate) {
-        predicate = PredicateOperation.create(SQLOps.QUALIFY, predicate);
-        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.BEFORE_ORDER, predicate));
-    }
-
-    @Override
-    public TeradataQuery clone(Connection conn) {
-        TeradataQuery q = new TeradataQuery(conn, getConfiguration(), getMetadata().clone());
-        q.clone(this);
-        return q;
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQueryFactory.java b/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQueryFactory.java
deleted file mode 100644
index e486347c44..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/teradata/TeradataQueryFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.teradata;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import com.mysema.query.sql.AbstractSQLQueryFactory;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.TeradataTemplates;
-
-/**
- * Teradata specific implementation of SQLQueryFactory
- *
- * @author tiwe
- *
- */
-public class TeradataQueryFactory extends AbstractSQLQueryFactory<TeradataQuery, SQLSubQuery> {
-
-    public TeradataQueryFactory(Configuration configuration, Provider<Connection> connection) {
-        super(configuration, connection);
-    }
-
-    public TeradataQueryFactory(Provider<Connection> connection) {
-        this(new Configuration(new TeradataTemplates()), connection);
-    }
-
-    public TeradataQueryFactory(SQLTemplates templates, Provider<Connection> connection) {
-        this(new Configuration(templates), connection);
-    }
-
-    @Override
-    public TeradataQuery query() {
-        return new TeradataQuery(connection.get(), configuration);
-    }
-
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java
deleted file mode 100644
index 7e0ec7e3c6..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractDateTimeType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2014, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-
-/**
- * Common abstract superclass for Type implementations
- *
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class AbstractDateTimeType<T>  extends AbstractType<T> {
-
-    private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-
-    static {
-        UTC.setTimeInMillis(0);
-    }
-
-    protected static Calendar utc() {
-        return (Calendar) UTC.clone();
-    }
-
-    protected static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-    protected static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-
-    protected static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
-
-    public AbstractDateTimeType(int type) {
-        super(type);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractNumberType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractNumberType.java
deleted file mode 100644
index 29f11597b1..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractNumberType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import com.mysema.util.MathUtils;
-
-/**
- * @author tiwe
- *
- * @param <T>
- */
-public abstract class AbstractNumberType<T extends Number & Comparable<T>> extends AbstractType<T> {
-
-    public AbstractNumberType(int type) {
-        super(type);
-    }
-
-    @Override
-    public T getValue(ResultSet rs, int startIndex) throws SQLException {
-        Number num = (Number) rs.getObject(startIndex);
-        return num != null ? MathUtils.cast(num, getReturnedClass()) : null; 
-    }
-    
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ByteType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/ByteType.java
deleted file mode 100644
index aa18c441cd..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ByteType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * ByteType maps Byte to Byte on the JDBC level
- *
- * @author tiwe
- *
- */
-public class ByteType extends AbstractNumberType<Byte> {
-
-    public ByteType() {
-        super(Types.TINYINT);
-    }
-
-    public ByteType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Byte> getReturnedClass() {
-        return Byte.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Byte value) throws SQLException {
-        st.setByte(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DoubleType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/DoubleType.java
deleted file mode 100644
index a1c61bc292..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DoubleType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * DoubleType maps Double to Double on the JDBC level
- *
- * @author tiwe
- *
- */
-public class DoubleType extends AbstractNumberType<Double> {
-
-    public DoubleType() {
-        super(Types.DOUBLE);
-    }
-
-    public DoubleType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Double> getReturnedClass() {
-        return Double.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Double value) throws SQLException {
-        st.setDouble(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/FloatType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/FloatType.java
deleted file mode 100644
index 909ee6322d..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/FloatType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * FloatType maps Float to Float on the JDBC level
- *
- * @author tiwe
- *
- */
-public class FloatType extends AbstractNumberType<Float> {
-
-    public FloatType() {
-        super(Types.FLOAT);
-    }
-
-    public FloatType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Float> getReturnedClass() {
-        return Float.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Float value) throws SQLException {
-        st.setFloat(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/IntegerType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/IntegerType.java
deleted file mode 100644
index 2cc213fea4..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/IntegerType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * IntegerType maps Integer to Integer on the JDBC level
- *
- * @author tiwe
- *
- */
-public class IntegerType extends AbstractNumberType<Integer> {
-
-    public IntegerType() {
-        super(Types.INTEGER);
-    }
-
-    public IntegerType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Integer> getReturnedClass() {
-        return Integer.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Integer value) throws SQLException {
-        st.setInt(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LongType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/LongType.java
deleted file mode 100644
index a9331b7a7b..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LongType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * LongType maps Long to Long on the JDBC level
- *
- * @author tiwe
- *
- */
-public class LongType extends AbstractNumberType<Long> {
-
-    public LongType() {
-        super(Types.BIGINT);
-    }
-
-    public LongType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Long> getReturnedClass() {
-        return Long.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Long value) throws SQLException {
-        st.setLong(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Null.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/Null.java
deleted file mode 100644
index 3cfdebbfa8..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Null.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.ConstantImpl;
-
-/**
- * @author tiwe
- *
- */
-public final class Null {
-
-    public static final Null DEFAULT = new Null();
-
-    public static final Constant<Null> CONSTANT = ConstantImpl.create(DEFAULT);
-
-    private Null() {}
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/NumericBooleanType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/NumericBooleanType.java
deleted file mode 100644
index 75ad920a0f..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/NumericBooleanType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import javax.annotation.Nullable;
-
-/**
- * NumericBooleanType maps Boolean to 1/0 (Integer) on the JDBC level
- *
- * @author tiwe
- *
- */
-public class NumericBooleanType extends AbstractType<Boolean> {
-
-    public NumericBooleanType() {
-        super(Types.INTEGER);
-    }
-
-    public NumericBooleanType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Boolean> getReturnedClass() {
-        return Boolean.class;
-    }
-
-    @Override
-    @Nullable
-    public Boolean getValue(ResultSet rs, int startIndex) throws SQLException {
-        Number num = (Number) rs.getObject(startIndex);
-        return num != null ? Boolean.valueOf(num.intValue() == 1) : null;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Boolean value) throws SQLException {
-        st.setInt(startIndex, value.booleanValue() ? 1 : 0);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ShortType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/ShortType.java
deleted file mode 100644
index 4ef3fe3330..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ShortType.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * ShortType maps Short to Short on the JDBC level
- *
- * @author tiwe
- *
- */
-public class ShortType extends AbstractNumberType<Short> {
-
-    public ShortType() {
-        super(Types.SMALLINT);
-    }
-
-    public ShortType(int type) {
-        super(type);
-    }
-
-    @Override
-    public Class<Short> getReturnedClass() {
-        return Short.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, Short value) throws SQLException {
-        st.setShort(startIndex, value);
-    }
-
-}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java
deleted file mode 100644
index 23c44402e1..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/Type.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import javax.annotation.Nullable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Defines the de/serialization of a typed Java object from a ResultSet or to a PreparedStatement
- *
- * <p>getValue(ResultSet, int) is used for extraction and setValue(PreparedStatement, int, T) is
- * used for population</p>
- *
- * @author tiwe
- *
- * @param <T>
- */
-// TODO : rename this since it clashes with com.mysema.codegen.model.Type
-public interface Type<T> {
-
-    /**
-     * Get the SQL supported SQL types
-     *
-     * @return
-     */
-    int[] getSQLTypes();
-
-    /**
-     * Get the returned type
-     *
-     * @return
-     */
-    Class<T> getReturnedClass();
-
-    /**
-     * Get the literal representation
-     *
-     * @param value
-     * @return
-     */
-    String getLiteral(T value);
-
-    /**
-     * Get the object from the result set
-     *
-     * @param rs result set
-     * @param startIndex column index in result set
-     * @return
-     * @throws SQLException
-     */
-    @Nullable
-    T getValue(ResultSet rs, int startIndex) throws SQLException;
-
-    /**
-     * Set the object to the statement
-     *
-     * @param st statement
-     * @param startIndex column index in statement
-     * @param value value to be set
-     * @throws SQLException
-     */
-    void setValue(PreparedStatement st, int startIndex, T value) throws SQLException;
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilUUIDType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilUUIDType.java
deleted file mode 100644
index 9ce744b1a5..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilUUIDType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.UUID;
-
-/**
- * UtilUUIDType maps UUID to String on the JDBC level
- *
- * @author tiwe
- *
- */
-public class UtilUUIDType extends AbstractType<UUID> {
-
-    public UtilUUIDType() {
-        super(Types.OTHER);
-    }
-
-    public UtilUUIDType(int type) {
-        super(type);
-    }
-
-    @Override
-    public UUID getValue(ResultSet rs, int startIndex) throws SQLException {
-        return UUID.fromString(rs.getString(startIndex));
-    }
-
-    @Override
-    public Class<UUID> getReturnedClass() {
-        return UUID.class;
-    }
-
-    @Override
-    public void setValue(PreparedStatement st, int startIndex, UUID value) throws SQLException {
-        st.setString(startIndex, value.toString());
-    }
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/package-info.java b/querydsl-sql/src/main/java/com/mysema/query/sql/types/package-info.java
deleted file mode 100644
index 94bf5542cf..0000000000
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Types for de/serialization to ResultSet and PreparedStatement
- */
-package com.mysema.query.sql.types;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java
new file mode 100644
index 0000000000..eae79e7efa
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQuery.java
@@ -0,0 +1,681 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.*;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.types.dsl.Wildcard;
+import com.querydsl.core.util.ResultSetAdapter;
+
+/**
+ * {@code AbstractSQLQuery} is the base type for SQL query implementations
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractSQLQuery<T, Q extends AbstractSQLQuery<T, Q>> extends ProjectableSQLQuery<T, Q> {
+
+    protected static final String PARENT_CONTEXT = AbstractSQLQuery.class.getName() + "#PARENT_CONTEXT";
+
+    private static final Logger logger = Logger.getLogger(AbstractSQLQuery.class.getName());
+
+    private static final QueryFlag rowCountFlag = new QueryFlag(QueryFlag.Position.AFTER_PROJECTION, ", count(*) over() ");
+
+    @Nullable
+    private Supplier<Connection> connProvider;
+
+    @Nullable
+    private Connection conn;
+
+    protected SQLListeners listeners;
+
+    protected boolean useLiterals;
+
+    private boolean getLastCell;
+
+    private Object lastCell;
+
+    private SQLListenerContext parentContext;
+
+    private StatementOptions statementOptions = StatementOptions.DEFAULT;
+
+    public AbstractSQLQuery(@Nullable Connection conn, Configuration configuration) {
+        this(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public AbstractSQLQuery(@Nullable Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(new QueryMixin<Q>(metadata, false), configuration);
+        this.conn = conn;
+        this.listeners = new SQLListeners(configuration.getListeners());
+        this.useLiterals = configuration.getUseLiterals();
+    }
+
+    public AbstractSQLQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        this(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+    public AbstractSQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(new QueryMixin<Q>(metadata, false), configuration);
+        this.connProvider = connProvider;
+        this.listeners = new SQLListeners(configuration.getListeners());
+        this.useLiterals = configuration.getUseLiterals();
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @param alias alias
+     * @return this as alias
+     */
+    public SimpleExpression<T> as(String alias) {
+        return Expressions.as(this, alias);
+    }
+
+    /**
+     * Create an alias for the expression
+     *
+     * @param alias alias
+     * @return this as alias
+     */
+    @SuppressWarnings("unchecked")
+    public SimpleExpression<T> as(Path<?> alias) {
+        return Expressions.as(this, (Path) alias);
+    }
+
+    /**
+     * Add a listener
+     *
+     * @param listener listener to add
+     */
+    public void addListener(SQLListener listener) {
+        listeners.add(listener);
+    }
+
+    @Override
+    public long fetchCount() {
+        try {
+            return unsafeCount();
+        } catch (SQLException e) {
+            String error = "Caught " + e.getClass().getName();
+            logger.log(Level.SEVERE, error, e);
+            throw configuration.translate(e);
+        }
+    }
+
+    /**
+     * If you use forUpdate() with a backend that uses page or row locks, rows examined by the
+     * query are write-locked until the end of the current transaction.
+     *
+     * Not supported for SQLite and CUBRID
+     *
+     * @return the current object
+     */
+    public Q forUpdate() {
+        QueryFlag forUpdateFlag = configuration.getTemplates().getForUpdateFlag();
+        return addFlag(forUpdateFlag);
+    }
+
+    /**
+     * FOR SHARE causes the rows retrieved by the SELECT statement to be locked as though for update.
+     *
+     * Supported by MySQL, PostgreSQL, SQLServer.
+     *
+     * @return the current object
+     *
+     * @throws QueryException
+     *          if the FOR SHARE is not supported.
+     */
+    public Q forShare() {
+        return forShare(false);
+    }
+
+    /**
+     * FOR SHARE causes the rows retrieved by the SELECT statement to be locked as though for update.
+     *
+     * Supported by MySQL, PostgreSQL, SQLServer.
+     *
+     * @param fallbackToForUpdate
+     *          if the FOR SHARE is not supported and this parameter is <code>true</code>, the
+     *          {@link #forUpdate()} functionality will be used.
+     *
+     * @return the current object
+     *
+     * @throws QueryException
+     *          if the FOR SHARE is not supported and <i>fallbackToForUpdate</i> is set to
+     *          <code>false</code>.
+     */
+    public Q forShare(boolean fallbackToForUpdate) {
+        SQLTemplates sqlTemplates = configuration.getTemplates();
+
+        if (sqlTemplates.isForShareSupported()) {
+            QueryFlag forShareFlag = sqlTemplates.getForShareFlag();
+            return addFlag(forShareFlag);
+        }
+
+        if (fallbackToForUpdate) {
+            return forUpdate();
+        }
+
+        throw new QueryException("Using forShare() is not supported");
+    }
+
+    @Override
+    protected SQLSerializer createSerializer() {
+        SQLSerializer serializer = new SQLSerializer(configuration);
+        serializer.setUseLiterals(useLiterals);
+        return serializer;
+    }
+
+    @Nullable
+    private <U> U get(ResultSet rs, Expression<?> expr, int i, Class<U> type) throws SQLException {
+        return configuration.get(rs, expr instanceof Path ? (Path<?>) expr : null, i, type);
+    }
+
+    private void set(PreparedStatement stmt, Path<?> path, int i, Object value) throws SQLException {
+        configuration.set(stmt, path, i, value);
+    }
+
+    /**
+     * Called to create and start a new SQL Listener context
+     *
+     * @param connection the database connection
+     * @param metadata   the meta data for that context
+     * @return the newly started context
+     */
+    protected SQLListenerContextImpl startContext(Connection connection, QueryMetadata metadata) {
+        SQLListenerContextImpl context = new SQLListenerContextImpl(metadata, connection);
+        if (parentContext != null) {
+            context.setData(PARENT_CONTEXT, parentContext);
+        }
+        listeners.start(context);
+        return context;
+    }
+
+    /**
+     * Called to make the call back to listeners when an exception happens
+     *
+     * @param context the current context in play
+     * @param e       the exception
+     */
+    protected void onException(SQLListenerContextImpl context, Exception e) {
+        context.setException(e);
+        listeners.exception(context);
+    }
+
+    /**
+     * Called to end a SQL listener context
+     *
+     * @param context the listener context to end
+     */
+    protected void endContext(SQLListenerContext context) {
+        listeners.end(context);
+    }
+
+    /**
+     * Get the results as a JDBC ResultSet
+     *
+     * @param exprs the expression arguments to retrieve
+     * @return results as ResultSet
+     * @deprecated Use @{code select(..)} to define the projection and {@code getResults()} to obtain
+     *             the result set
+     */
+    @Deprecated
+    public ResultSet getResults(Expression<?>... exprs) {
+        if (exprs.length > 0) {
+            queryMixin.setProjection(exprs);
+        }
+        return getResults();
+    }
+
+    /**
+     * Get the results as a JDBC ResultSet
+     *
+     * @return results as ResultSet
+     */
+    public ResultSet getResults() {
+        final SQLListenerContextImpl context = startContext(connection(), queryMixin.getMetadata());
+        String queryString = null;
+        List<Object> constants = Collections.emptyList();
+
+        try {
+            listeners.preRender(context);
+            SQLSerializer serializer = serialize(false);
+            queryString = serializer.toString();
+            logQuery(queryString, serializer.getConstants());
+            context.addSQL(getSQL(serializer));
+            listeners.rendered(context);
+
+            listeners.notifyQuery(queryMixin.getMetadata());
+
+            constants = serializer.getConstants();
+
+            listeners.prePrepare(context);
+            final PreparedStatement stmt = getPreparedStatement(queryString);
+            setParameters(stmt, constants, serializer.getConstantPaths(), getMetadata().getParams());
+            context.addPreparedStatement(stmt);
+            listeners.prepared(context);
+
+            listeners.preExecute(context);
+            final ResultSet rs = stmt.executeQuery();
+            listeners.executed(context);
+
+            return new ResultSetAdapter(rs) {
+                @Override
+                public void close() throws SQLException {
+                    try {
+                        super.close();
+                    } finally {
+                        stmt.close();
+                        reset();
+                        endContext(context);
+                    }
+                }
+            };
+        } catch (SQLException e) {
+            onException(context, e);
+            reset();
+            endContext(context);
+            throw configuration.translate(queryString, constants, e);
+        }
+    }
+
+    private PreparedStatement getPreparedStatement(String queryString) throws SQLException {
+        PreparedStatement statement = connection().prepareStatement(queryString);
+        if (statementOptions.getFetchSize() != null) {
+            statement.setFetchSize(statementOptions.getFetchSize());
+        }
+        if (statementOptions.getMaxFieldSize() != null) {
+            statement.setMaxFieldSize(statementOptions.getMaxFieldSize());
+        }
+        if (statementOptions.getQueryTimeout() != null) {
+            statement.setQueryTimeout(statementOptions.getQueryTimeout());
+        }
+        if (statementOptions.getMaxRows() != null) {
+            statement.setMaxRows(statementOptions.getMaxRows());
+        }
+        return statement;
+    }
+
+    protected Configuration getConfiguration() {
+        return configuration;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public CloseableIterator<T> iterate() {
+        Expression<T> expr = (Expression<T>) queryMixin.getMetadata().getProjection();
+        return iterateSingle(queryMixin.getMetadata(), expr);
+    }
+
+    @SuppressWarnings("unchecked")
+    private CloseableIterator<T> iterateSingle(QueryMetadata metadata, @Nullable final Expression<T> expr) {
+        SQLListenerContextImpl context = startContext(connection(), queryMixin.getMetadata());
+        String queryString = null;
+        List<Object> constants = Collections.emptyList();
+
+        try {
+            listeners.preRender(context);
+            SQLSerializer serializer = serialize(false);
+            queryString = serializer.toString();
+            logQuery(queryString, serializer.getConstants());
+            context.addSQL(getSQL(serializer));
+            listeners.rendered(context);
+
+
+            listeners.notifyQuery(queryMixin.getMetadata());
+            constants = serializer.getConstants();
+
+            listeners.prePrepare(context);
+            final PreparedStatement stmt = getPreparedStatement(queryString);
+            setParameters(stmt, constants, serializer.getConstantPaths(), metadata.getParams());
+            context.addPreparedStatement(stmt);
+            listeners.prepared(context);
+
+            listeners.preExecute(context);
+            final ResultSet rs = stmt.executeQuery();
+            listeners.executed(context);
+
+            if (expr == null) {
+                return new SQLResultIterator<T>(configuration, stmt, rs, listeners, context) {
+                    @Override
+                    public T produceNext(ResultSet rs) throws Exception {
+                        return (T) rs.getObject(1);
+                    }
+                };
+            } else if (expr instanceof FactoryExpression) {
+                return new SQLResultIterator<T>(configuration, stmt, rs, listeners, context) {
+                    @Override
+                    public T produceNext(ResultSet rs) throws Exception {
+                        return newInstance((FactoryExpression<T>) expr, rs, 0);
+                    }
+                };
+            } else if (expr.equals(Wildcard.all)) {
+                return new SQLResultIterator<T>(configuration, stmt, rs, listeners, context) {
+                    @Override
+                    public T produceNext(ResultSet rs) throws Exception {
+                        Object[] rv = new Object[rs.getMetaData().getColumnCount()];
+                        for (int i = 0; i < rv.length; i++) {
+                            rv[i] = rs.getObject(i + 1);
+                        }
+                        return (T) rv;
+                    }
+                };
+            } else {
+                return new SQLResultIterator<T>(configuration, stmt, rs, listeners, context) {
+                    @Override
+                    public T produceNext(ResultSet rs) throws Exception {
+                        return get(rs, expr, 1, expr.getType());
+                    }
+                };
+            }
+
+        } catch (SQLException e) {
+            onException(context, e);
+            endContext(context);
+            throw configuration.translate(queryString, constants, e);
+        } catch (RuntimeException e) {
+            logger.log(Level.SEVERE, "Caught " + e.getClass().getName() + " for " + queryString);
+            onException(context, e);
+            endContext(context);
+            throw e;
+        } finally {
+            reset();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<T> fetch() {
+        Expression<T> expr = (Expression<T>) queryMixin.getMetadata().getProjection();
+        SQLListenerContextImpl context = startContext(connection(), queryMixin.getMetadata());
+        String queryString = null;
+        List<Object> constants = Collections.emptyList();
+
+        try {
+            listeners.preRender(context);
+            SQLSerializer serializer = serialize(false);
+            queryString = serializer.toString();
+            logQuery(queryString, serializer.getConstants());
+            context.addSQL(getSQL(serializer));
+            listeners.rendered(context);
+
+            listeners.notifyQuery(queryMixin.getMetadata());
+            constants = serializer.getConstants();
+
+            listeners.prePrepare(context);
+            try (PreparedStatement stmt = getPreparedStatement(queryString)) {
+                setParameters(stmt, constants, serializer.getConstantPaths(), queryMixin.getMetadata().getParams());
+                context.addPreparedStatement(stmt);
+                listeners.prepared(context);
+
+                listeners.preExecute(context);
+                try (ResultSet rs = stmt.executeQuery()) {
+                    listeners.executed(context);
+                    lastCell = null;
+                    final List<T> rv = new ArrayList<T>();
+                    if (expr instanceof FactoryExpression) {
+                        FactoryExpression<T> fe = (FactoryExpression<T>) expr;
+                        while (rs.next()) {
+                            if (getLastCell) {
+                                lastCell = rs.getObject(fe.getArgs().size() + 1);
+                                getLastCell = false;
+                            }
+                            rv.add(newInstance(fe, rs, 0));
+                        }
+                    } else if (expr.equals(Wildcard.all)) {
+                        while (rs.next()) {
+                            Object[] row = new Object[rs.getMetaData().getColumnCount()];
+                            if (getLastCell) {
+                                lastCell = rs.getObject(row.length);
+                                getLastCell = false;
+                            }
+                            for (int i = 0; i < row.length; i++) {
+                                row[i] = rs.getObject(i + 1);
+                            }
+                            rv.add((T) row);
+                        }
+                    } else {
+                        while (rs.next()) {
+                            if (getLastCell) {
+                                lastCell = rs.getObject(2);
+                                getLastCell = false;
+                            }
+                            rv.add(get(rs, expr, 1, expr.getType()));
+                        }
+                    }
+                    return rv;
+                } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
+                    onException(context, e);
+                    throw new QueryException(e);
+                } catch (SQLException e) {
+                    onException(context, e);
+                    throw configuration.translate(queryString, constants, e);
+                }
+            }
+        } catch (SQLException e) {
+            onException(context, e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            endContext(context);
+            reset();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public QueryResults<T> fetchResults() {
+        parentContext = startContext(connection(), queryMixin.getMetadata());
+        Expression<T> expr = (Expression<T>) queryMixin.getMetadata().getProjection();
+        QueryModifiers originalModifiers = queryMixin.getMetadata().getModifiers();
+        try {
+            if (configuration.getTemplates().isCountViaAnalytics()
+                && queryMixin.getMetadata().getGroupBy().isEmpty()) {
+                List<T> results;
+                try {
+                    queryMixin.addFlag(rowCountFlag);
+                    getLastCell = true;
+                    results = fetch();
+                } finally {
+                    queryMixin.removeFlag(rowCountFlag);
+                }
+                long total;
+                if (!results.isEmpty()) {
+                    if (lastCell instanceof Number) {
+                        total = ((Number) lastCell).longValue();
+                    } else {
+                        throw new IllegalStateException("Unsupported lastCell instance " + lastCell);
+                    }
+                } else {
+                    total = fetchCount();
+                }
+                return new QueryResults<T>(results, originalModifiers, total);
+
+            } else {
+                queryMixin.setProjection(expr);
+                long total = fetchCount();
+                if (total > 0) {
+                    return new QueryResults<T>(fetch(), originalModifiers, total);
+                } else {
+                    return QueryResults.emptyResults();
+                }
+            }
+
+        } finally {
+            endContext(parentContext);
+            reset();
+            getLastCell = false;
+            parentContext = null;
+        }
+    }
+
+    private <RT> RT newInstance(FactoryExpression<RT> c, ResultSet rs, int offset)
+        throws InstantiationException, IllegalAccessException, InvocationTargetException, SQLException {
+        Object[] args = new Object[c.getArgs().size()];
+        for (int i = 0; i < args.length; i++) {
+            args[i] = get(rs, c.getArgs().get(i), offset + i + 1, c.getArgs().get(i).getType());
+        }
+        return c.newInstance(args);
+    }
+
+    private void reset() {
+    }
+
+    protected void setParameters(PreparedStatement stmt, List<?> objects, List<Path<?>> constantPaths,
+            Map<ParamExpression<?>, ?> params) {
+        if (objects.size() != constantPaths.size()) {
+            throw new IllegalArgumentException("Expected " + objects.size() +
+                    " paths, but got " + constantPaths.size());
+        }
+        for (int i = 0; i < objects.size(); i++) {
+            Object o = objects.get(i);
+            try {
+                if (o instanceof ParamExpression) {
+                    if (!params.containsKey(o)) {
+                        throw new ParamNotSetException((ParamExpression<?>) o);
+                    }
+                    o = params.get(o);
+                }
+                set(stmt, constantPaths.get(i), i + 1, o);
+            } catch (SQLException e) {
+                throw configuration.translate(e);
+            }
+        }
+    }
+
+    private long unsafeCount() throws SQLException {
+        SQLListenerContextImpl context = startContext(connection(), getMetadata());
+        String queryString = null;
+        List<Object> constants = Collections.emptyList();
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+
+        try {
+            listeners.preRender(context);
+            SQLSerializer serializer = serialize(true);
+            queryString = serializer.toString();
+            logQuery(queryString, serializer.getConstants());
+            context.addSQL(getSQL(serializer));
+            listeners.rendered(context);
+
+            constants = serializer.getConstants();
+            listeners.prePrepare(context);
+
+            stmt = getPreparedStatement(queryString);
+            setParameters(stmt, constants, serializer.getConstantPaths(), getMetadata().getParams());
+
+            context.addPreparedStatement(stmt);
+            listeners.prepared(context);
+
+            listeners.preExecute(context);
+            rs = stmt.executeQuery();
+            boolean hasResult = rs.next();
+            listeners.executed(context);
+
+            if (hasResult) {
+                return rs.getLong(1);
+            } else {
+                return 0;
+            }
+        } catch (SQLException e) {
+            onException(context, e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+            } finally {
+                if (stmt != null) {
+                    stmt.close();
+                }
+            }
+            endContext(context);
+        }
+    }
+
+    protected void logQuery(String queryString, Collection<Object> parameters) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    private Connection connection() {
+        if (conn == null) {
+            if (connProvider != null) {
+                conn = connProvider.get();
+            } else {
+                throw new IllegalStateException("No connection provided");
+            }
+        }
+        return conn;
+    }
+
+    /**
+     * Set whether literals are used in SQL strings instead of parameter bindings (default: false)
+     *
+     * <p>Warning: When literals are used, prepared statement won't have any parameter bindings
+     * and also batch statements will only be simulated, but not executed as actual batch statements.</p>
+     *
+     * @param useLiterals true for literals and false for bindings
+     */
+    public void setUseLiterals(boolean useLiterals) {
+        this.useLiterals = useLiterals;
+    }
+
+    @Override
+    protected void clone(Q query) {
+        super.clone(query);
+        this.useLiterals = query.useLiterals;
+        this.listeners = new SQLListeners(query.listeners);
+    }
+
+    @Override
+    public Q clone() {
+        return this.clone(this.conn);
+    }
+
+    public abstract Q clone(Connection connection);
+
+    /**
+     * Set the options to be applied to the JDBC statements of this query
+     *
+     * @param statementOptions options to be applied to statements
+     */
+    public void setStatementOptions(StatementOptions statementOptions) {
+        this.statementOptions = statementOptions;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQueryFactory.java
new file mode 100644
index 0000000000..fd845ca13d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/AbstractSQLQueryFactory.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLMergeClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+
+/**
+ * {@code AbstractSQLQueryFactory} is the base class for {@link SQLCommonQueryFactory} implementations
+ *
+ * @param <Q> query type
+ *
+ * @author tiwe
+ */
+public abstract class AbstractSQLQueryFactory<Q extends SQLCommonQuery<?>> implements SQLCommonQueryFactory<Q,
+    SQLDeleteClause, SQLUpdateClause, SQLInsertClause, SQLMergeClause> {
+
+    protected final Configuration configuration;
+
+    protected final Supplier<Connection> connection;
+
+    public AbstractSQLQueryFactory(Configuration configuration, Supplier<Connection> connProvider) {
+        this.configuration = configuration;
+        this.connection = connProvider;
+    }
+
+    @Override
+    public final SQLDeleteClause delete(RelationalPath<?> path) {
+        return new SQLDeleteClause(connection, configuration, path);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final Q from(Expression<?> from) {
+        return (Q) query().from(from);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final Q from(Expression<?>... args) {
+        return (Q) query().from(args);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
+        return (Q) query().from(subQuery, alias);
+    }
+
+    @Override
+    public final SQLInsertClause insert(RelationalPath<?> path) {
+        return new SQLInsertClause(connection, configuration, path);
+    }
+
+    @Override
+    public final SQLMergeClause merge(RelationalPath<?> path) {
+        return new SQLMergeClause(connection, configuration, path);
+    }
+
+    @Override
+    public final SQLUpdateClause update(RelationalPath<?> path) {
+        return new SQLUpdateClause(connection, configuration, path);
+    }
+
+    public final Configuration getConfiguration() {
+        return configuration;
+    }
+
+    public final Connection getConnection() {
+        return connection.get();
+    }
+
+    /**
+     * Create a new SQL query with the given projection
+     *
+     * @param expr projection
+     * @param <T> type of the projection
+     * @return select(expr)
+     */
+    public abstract <T> AbstractSQLQuery<T, ?> select(Expression<T> expr);
+
+    /**
+     * Create a new SQL query with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    public abstract AbstractSQLQuery<Tuple, ?> select(Expression<?>... exprs);
+
+    /**
+     * Create a new SQL query with the given projection
+     *
+     * @param expr distinct projection
+     * @param <T> type of the projection
+     * @return select(distinct expr)
+     */
+    public abstract <T> AbstractSQLQuery<T, ?> selectDistinct(Expression<T> expr);
+
+    /**
+     * Create a new SQL query with the given projection
+     *
+     * @param exprs distinct projection
+     * @return select(distinct exprs)
+     */
+    public abstract AbstractSQLQuery<Tuple, ?> selectDistinct(Expression<?>... exprs);
+
+    /**
+     * Create a new SQL query with zero as the projection
+     *
+     * @return select(0)
+     */
+    public abstract AbstractSQLQuery<Integer, ?> selectZero();
+
+    /**
+     * Create a new SQL query with one as the projection
+     *
+     * @return select(1)
+     */
+    public abstract AbstractSQLQuery<Integer, ?> selectOne();
+
+    /**
+     * Create a new SQL query with the given projection and source
+     *
+     * @param expr query source and projection
+     * @param <T> type of the projection
+     * @return select(expr).from(expr)
+     */
+    public abstract <T> AbstractSQLQuery<T, ?> selectFrom(RelationalPath<T> expr);
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Beans.java b/querydsl-sql/src/main/java/com/querydsl/sql/Beans.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/Beans.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/Beans.java
index da5badf2c3..8a7d10cf4e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Beans.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Beans.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.util.Map;
 
 /**
- * Beans contains Objects mapped to {@link RelationalPath} instances
- * 
+ * {@code Beans} contains Objects mapped to {@link RelationalPath} instances
+ *
  * @author luis
  */
 public class Beans {
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/CUBRIDTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/CUBRIDTemplates.java
new file mode 100644
index 0000000000..c432efb9a5
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/CUBRIDTemplates.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.types.NumericBooleanType;
+
+/**
+ * {@code CUBRIDTemplates} is a SQL dialect for CUBRID
+ *
+ * @author tiwe
+ *
+ */
+public class CUBRIDTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final CUBRIDTemplates DEFAULT = new CUBRIDTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new CUBRIDTemplates(escape, quote);
+            }
+        };
+    }
+
+    private String limitTemplate = "\nlimit {0}";
+
+    private String offsetLimitTemplate = "\nlimit {0}, {1}";
+
+    public CUBRIDTemplates() {
+        this('\\', false);
+    }
+
+    public CUBRIDTemplates(boolean quote) {
+        this('\\',quote);
+    }
+
+    public CUBRIDTemplates(char escape, boolean quote) {
+        super(Keywords.CUBRID, "\"", escape, quote, false);
+        setDummyTable(null);
+        addCustomType(NumericBooleanType.DEFAULT);
+        setParameterMetadataAvailable(false);
+        setNullsFirst(null);
+        setNullsLast(null);
+        setDefaultValues("\ndefault values");
+        setArraysSupported(false);
+
+        add(Ops.DateTimeOps.DATE, "trunc({0})");
+
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
+        add(Ops.DateTimeOps.YEAR_WEEK, "(year({0}) * 100 + week({0}))");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "date_add({0}, interval {1s} year)");
+        add(Ops.DateTimeOps.ADD_MONTHS, "date_add({0}, interval {1s} month)");
+        add(Ops.DateTimeOps.ADD_WEEKS, "date_add({0}, interval {1s} week)");
+        add(Ops.DateTimeOps.ADD_DAYS, "date_add({0}, interval {1s} day)");
+        add(Ops.DateTimeOps.ADD_HOURS, "date_add({0}, interval {1s} hour)");
+        add(Ops.DateTimeOps.ADD_MINUTES, "date_add({0}, interval {1s} minute)");
+        add(Ops.DateTimeOps.ADD_SECONDS, "date_add({0}, interval {1s} second)");
+
+        String diffSeconds = "(unix_timestamp({1}) - unix_timestamp({0}))";
+        add(Ops.DateTimeOps.DIFF_YEARS,   "(year({1}) - year({0}))");
+        add(Ops.DateTimeOps.DIFF_MONTHS,  "months_between({1}, {0})");
+        add(Ops.DateTimeOps.DIFF_WEEKS,   "ceil(({1}-{0}) / 7)");
+        add(Ops.DateTimeOps.DIFF_DAYS,    "({1}-{0})");
+        add(Ops.DateTimeOps.DIFF_HOURS,   "ceil(" + diffSeconds + " / 3600)");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "ceil(" + diffSeconds + " / 60)");
+        add(Ops.DateTimeOps.DIFF_SECONDS, diffSeconds);
+
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "trunc({0},'yyyy')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "trunc({0},'mm')");
+        add(Ops.DateTimeOps.TRUNC_WEEK,   "trunc({0},'day')");
+        add(Ops.DateTimeOps.TRUNC_DAY,    "trunc({0},'dd')");
+        // trunc works only with date arguments
+        // timestamp(datepart, timepart) reconstructs a datetime
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "timestamp(date({0}),concat(hour({0}),':00:00'))");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "timestamp(date({0}),concat(hour({0}),':',minute({0}),':00'))");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "timestamp(date({0}),concat(hour({0}),':',minute({0}),':',second({0})))");
+
+        add(Ops.MathOps.LN, "ln({0})");
+        add(Ops.MathOps.LOG, "(ln({0}) / ln({1}))");
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0*'-1'})) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+
+        add(SQLOps.GROUP_CONCAT2, "group_concat({0} separator '{1s}')");
+
+        addTypeNameToCode("numeric(1,0)", Types.BOOLEAN, true);
+        addTypeNameToCode("numeric(3,0)", Types.TINYINT, true);
+        addTypeNameToCode("numeric(38,0)", Types.BIGINT, true);
+        addTypeNameToCode("bit varying", Types.LONGVARBINARY);
+        addTypeNameToCode("bit varying", Types.VARBINARY);
+        addTypeNameToCode("bit", Types.BINARY, true);
+        addTypeNameToCode("varchar", Types.LONGVARCHAR, true);
+        addTypeNameToCode("double", Types.FLOAT, true);
+        addTypeNameToCode("float", Types.REAL, true);
+    }
+
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+                return "timestamp'" + literal + "'";
+            case Types.DATE:
+                return "date'" + literal + "'";
+            case Types.TIME:
+                return "time'" + literal + "'";
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.getLimit() != null) {
+            if (mod.getOffset() != null) {
+                context.handle(offsetLimitTemplate, mod.getOffset(), mod.getLimit());
+            } else {
+                context.handle(limitTemplate, mod.getLimit());
+            }
+        } else if (mod.getOffset() != null) {
+            context.handle(offsetLimitTemplate, mod.getOffset(), Integer.MAX_VALUE);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Column.java b/querydsl-sql/src/main/java/com/querydsl/sql/Column.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/Column.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/Column.java
index c6d3344504..bfbeac7378 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/Column.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Column.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -23,7 +23,7 @@
 
 /**
  * Defines the related SQL table column for a property
- * 
+ *
  * @author tiwe
  *
  */
@@ -31,8 +31,10 @@
 @Target({FIELD,METHOD})
 @Retention(RUNTIME)
 public @interface Column {
-    
+
     /**
+     * Get the column name
+     *
      * @return column name
      */
     String value();
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ColumnImpl.java b/querydsl-sql/src/main/java/com/querydsl/sql/ColumnImpl.java
similarity index 85%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/ColumnImpl.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/ColumnImpl.java
index 624888c6ac..e2c1e671ad 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/ColumnImpl.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/ColumnImpl.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,14 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.lang.annotation.Annotation;
 
 
 /**
- * ColumnImpl is an implementation for the Column annotation
- * 
+ * ColumnImpl is an implementation of the {@link Column} annotation
+ *
  * @author tiwe
  *
  */
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ColumnMetadata.java b/querydsl-sql/src/main/java/com/querydsl/sql/ColumnMetadata.java
similarity index 87%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/ColumnMetadata.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/ColumnMetadata.java
index 490708f9da..111bbac0e8 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/ColumnMetadata.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/ColumnMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.io.Serializable;
+import java.util.Objects;
 
-import com.google.common.base.Objects;
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
 
 /**
  * Provides metadata like the column name, JDBC type and constraints
@@ -35,18 +35,24 @@ public static ColumnMetadata getColumnMetadata(Path<?> path) {
         if (parent instanceof EntityPath) {
             Object columnMetadata = ((EntityPath<?>) parent).getMetadata(path);
             if (columnMetadata instanceof ColumnMetadata) {
-                return (ColumnMetadata)columnMetadata;
+                return (ColumnMetadata) columnMetadata;
             }
         }
         return ColumnMetadata.named(path.getMetadata().getName());
     }
 
+    /**
+     * Extract the column name for the given path, returns the path name, if no ColumnMetadata is attached
+     *
+     * @param path patch
+     * @return column name or path name
+     */
     public static String getName(Path<?> path) {
         Path<?> parent = path.getMetadata().getParent();
         if (parent instanceof EntityPath) {
             Object columnMetadata = ((EntityPath<?>) parent).getMetadata(path);
             if (columnMetadata instanceof ColumnMetadata) {
-                return ((ColumnMetadata)columnMetadata).getName();
+                return ((ColumnMetadata) columnMetadata).getName();
             }
         }
         return path.getMetadata().getName();
@@ -67,7 +73,7 @@ public static ColumnMetadata named(String name) {
     private static final int UNDEFINED = -1;
 
     private final String name;
-    
+
     private final Integer index;
 
     private final Integer jdbcType;
@@ -91,11 +97,11 @@ private ColumnMetadata(Integer index, String name, Integer jdbcType, boolean nul
     public String getName() {
         return name;
     }
-    
+
     public int getIndex() {
         return index;
     }
-    
+
     public ColumnMetadata withIndex(int index) {
         return new ColumnMetadata(index, name, jdbcType, nullable, size, decimalDigits);
     }
@@ -123,7 +129,7 @@ public ColumnMetadata notNull() {
     /**
      * For char or date types this is the maximum number of characters, for numeric or decimal types this is precision.
      *
-     * @return
+     * @return size
      */
     public int getSize() {
         return size;
@@ -140,7 +146,7 @@ public ColumnMetadata withSize(int size) {
     /**
      * the number of fractional digits
      *
-     * @return
+     * @return digits
      */
     public int getDigits() {
         return decimalDigits;
@@ -159,9 +165,9 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         } else if (o instanceof ColumnMetadata) {
-            ColumnMetadata md = (ColumnMetadata)o;
+            ColumnMetadata md = (ColumnMetadata) o;
             return name.equals(md.name)
-                && Objects.equal(jdbcType, md.jdbcType)
+                && Objects.equals(jdbcType, md.jdbcType)
                 && nullable == md.nullable
                 && size == md.size
                 && decimalDigits == md.decimalDigits;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java b/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java
new file mode 100644
index 0000000000..13ab128785
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Configuration.java
@@ -0,0 +1,567 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.lang.reflect.Array;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.PrimitiveUtils;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.namemapping.ChainedNameMapping;
+import com.querydsl.sql.namemapping.NameMapping;
+import com.querydsl.sql.namemapping.PreConfiguredNameMapping;
+import com.querydsl.sql.types.ArrayType;
+import com.querydsl.sql.types.Null;
+import com.querydsl.sql.types.Type;
+
+/**
+ * Configuration for SQLQuery instances
+ *
+ * @author tiwe
+ *
+ */
+public final class Configuration {
+
+    private static final Logger logger = Logger.getLogger(Configuration.class.getName());
+
+    static final Configuration DEFAULT = new Configuration(SQLTemplates.DEFAULT);
+
+    private final JDBCTypeMapping jdbcTypeMapping = new JDBCTypeMapping();
+
+    private final JavaTypeMapping javaTypeMapping = new JavaTypeMapping();
+
+    private final PreConfiguredNameMapping internalNameMapping = new PreConfiguredNameMapping();
+
+    private NameMapping nameMapping = internalNameMapping;
+
+    private final Map<String, String> schemaMapping = new HashMap<>();
+
+    private final Map<String, Class<?>> typeToName = new HashMap<>();
+
+    private SQLTemplates templates;
+
+    private SQLExceptionTranslator exceptionTranslator = DefaultSQLExceptionTranslator.DEFAULT;
+
+    private final SQLListeners listeners = new SQLListeners();
+
+    private boolean hasTableColumnTypes = false;
+
+    private boolean useLiterals = false;
+
+    /**
+     * Create a new Configuration instance
+     *
+     * @param templates templates for SQL serialization
+     */
+    @SuppressWarnings("unchecked")
+    public Configuration(SQLTemplates templates) {
+        this.templates = templates;
+        for (Type<?> customType : templates.getCustomTypes()) {
+            javaTypeMapping.register(customType);
+        }
+        for (Map.Entry<SchemaAndTable, SchemaAndTable> entry : templates.getTableOverrides().entrySet()) {
+            registerTableOverride(entry.getKey(), entry.getValue());
+        }
+
+        if (templates.isArraysSupported()) {
+            // register array types
+            List<Class<?>> classes = Arrays.asList(String.class, Long.class, Integer.class, Short.class,
+                    Byte.class, Boolean.class, java.sql.Date.class, java.sql.Timestamp.class,
+                    java.sql.Time.class, Double.class, Float.class);
+            for (Class<?> cl : classes) {
+                int code = jdbcTypeMapping.get(cl);
+                String name = templates.getTypeNameForCode(code);
+                Class<?> arrType = Array.newInstance(cl, 0).getClass();
+                javaTypeMapping.register(new ArrayType(arrType, name));
+                if (PrimitiveUtils.isWrapperType(cl) && !cl.equals(Byte.class)) {
+                    cl = PrimitiveUtils.unwrap(cl);
+                    arrType = Array.newInstance(cl, 0).getClass();
+                    javaTypeMapping.register(new ArrayType(arrType, name));
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Get the literal representation of the given constant
+     *
+     * @param o object
+     * @return literal representation
+     */
+    @SuppressWarnings("unchecked")
+    public String asLiteral(Object o) {
+        if (o == null || o instanceof Null) {
+            return "null";
+        } else {
+            Type type = javaTypeMapping.getType(o.getClass());
+            if (type != null) {
+                return templates.serialize(type.getLiteral(o), type.getSQLTypes()[0]);
+            } else {
+                throw new IllegalArgumentException("Unsupported literal type " + o.getClass().getName());
+            }
+        }
+    }
+
+    public SQLTemplates getTemplates() {
+        return templates;
+    }
+
+    /**
+     * Get the java type for the given jdbc type, table name and column name
+     *
+     * @param sqlType JDBC type
+     * @param typeName JDBC type name
+     * @param size size
+     * @param digits digits
+     * @param tableName table name
+     * @param columnName column name
+     * @return Java type
+     */
+    public Class<?> getJavaType(int sqlType, String typeName, int size, int digits, String tableName, String columnName) {
+        // table.column mapped class
+        Type<?> type = javaTypeMapping.getType(tableName, columnName);
+        if (type != null) {
+            return type.getReturnedClass();
+        } else if (typeName != null && !typeName.isEmpty()) {
+            typeName = typeName.toLowerCase();
+            // typename mapped class
+            Class<?> clazz = typeToName.get(typeName);
+            if (clazz != null) {
+                return clazz;
+            }
+            if (sqlType == Types.ARRAY) {
+                if (typeName.startsWith("_")) {
+                    typeName = typeName.substring(1);
+                } else if (typeName.endsWith(" array")) {
+                    typeName = typeName.substring(0, typeName.length() - 6);
+                }
+                if (typeName.contains("[")) {
+                    typeName = typeName.substring(0, typeName.indexOf("["));
+                }
+                if (typeName.contains("(")) {
+                    typeName = typeName.substring(0, typeName.indexOf("("));
+                }
+
+                Integer sqlComponentType = templates.getCodeForTypeName(typeName);
+                if (sqlComponentType == null) {
+                    logger.warning("Found no JDBC type for " + typeName + " using OTHER instead");
+                    sqlComponentType = Types.OTHER;
+                }
+                Class<?> componentType = jdbcTypeMapping.get(sqlComponentType, size, digits);
+                return Array.newInstance(componentType, 0).getClass();
+            }
+        }
+        // sql type mapped class
+        return jdbcTypeMapping.get(sqlType, size, digits);
+    }
+
+    /**
+     * Get the value at the given index from the result set
+     *
+     * @param <T> type to return
+     * @param rs result set
+     * @param path path
+     * @param i one based index in result set row
+     * @param clazz type
+     * @return value
+     * @throws SQLException
+     */
+    @Nullable
+    public <T> T get(ResultSet rs, @Nullable Path<?> path, int i, Class<T> clazz) throws SQLException {
+        return getType(path, clazz).getValue(rs, i);
+    }
+
+    /**
+     * Get the schema/table override
+     *
+     * @param key schema and table
+     * @return overridden schema and table
+     */
+    @Nullable
+    public SchemaAndTable getOverride(SchemaAndTable key) {
+        SchemaAndTable result = nameMapping.getOverride(key).orElse(key);
+        if (schemaMapping.containsKey(key.getSchema())) {
+            result = new SchemaAndTable(schemaMapping.get(key.getSchema()), result.getTable());
+        }
+        return result;
+    }
+
+    /**
+     * Get the column override
+     *
+     * @param key schema and table
+     * @param column column
+     * @return overridden column
+     */
+    public String getColumnOverride(SchemaAndTable key, String column) {
+        return nameMapping.getColumnOverride(key, column).orElse(column);
+    }
+
+    /**
+     * Programmers can specify name mappings by implementing the
+     * {@link NameMapping} interface. The mapping rules that are specified by
+     * this property are checked if no mapping is specified by any of the
+     * <code>register*Override</code> functions.
+     *
+     * @param nameMapping
+     *            The name mapping that is implemented by the user.
+     */
+    public void setDynamicNameMapping(NameMapping nameMapping) {
+        if (nameMapping == null) {
+            this.nameMapping = this.internalNameMapping;
+        } else {
+            this.nameMapping = new ChainedNameMapping(this.internalNameMapping, nameMapping);
+        }
+    }
+
+    /**
+     * Set the value at the given index in the statement
+     *
+     * @param <T>
+     * @param stmt statement
+     * @param path path
+     * @param i one based index in statement
+     * @param value value to bind
+     * @throws SQLException
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public <T> void set(PreparedStatement stmt, Path<?> path, int i, T value) throws SQLException {
+        if (value == null || value instanceof Null) {
+            Integer sqlType = null;
+            if (path != null) {
+                ColumnMetadata columnMetadata = ColumnMetadata.getColumnMetadata(path);
+                if (columnMetadata.hasJdbcType()) {
+                    sqlType = columnMetadata.getJdbcType();
+                }
+            }
+            if (sqlType != null) {
+                stmt.setNull(i, sqlType);
+            } else {
+                stmt.setNull(i, Types.NULL);
+            }
+        } else {
+            getType(path, (Class) value.getClass()).setValue(stmt, i, value);
+        }
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private <T> Type<T> getType(@Nullable Path<?> path, Class<T> clazz) {
+        if (hasTableColumnTypes && path != null && !clazz.equals(Null.class)
+                && path.getMetadata().getParent() instanceof RelationalPath) {
+            String table = ((RelationalPath) path.getMetadata().getParent()).getTableName();
+            String column = ColumnMetadata.getName(path);
+            Type<T> type = (Type) javaTypeMapping.getType(table, column);
+            if (type != null) {
+                return type;
+            }
+        }
+        return javaTypeMapping.getType(clazz);
+    }
+
+    /**
+     * Get the SQL type name for the given java type
+     *
+     * @param type java type
+     * @return SQL type name
+     */
+    public String getTypeName(Class<?> type) {
+        Integer jdbcType = jdbcTypeMapping.get(type);
+        if (jdbcType == null) {
+            jdbcType = javaTypeMapping.getType(type).getSQLTypes()[0];
+        }
+        return templates.getTypeNameForCode(jdbcType);
+    }
+
+    /**
+     * Get the SQL type name for a cast operation
+     *
+     * @param type java type
+     * @return SQL type name
+     */
+    public String getTypeNameForCast(Class<?> type) {
+        Integer jdbcType = jdbcTypeMapping.get(type);
+        if (jdbcType == null) {
+            jdbcType = javaTypeMapping.getType(type).getSQLTypes()[0];
+        }
+        return templates.getCastTypeNameForCode(jdbcType);
+    }
+
+    /**
+     * Register a schema override
+     *
+     * @param oldSchema schema to override
+     * @param newSchema override
+     * @return previous override value
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public String registerSchemaOverride(String oldSchema, String newSchema) {
+        return schemaMapping.put(oldSchema, newSchema);
+    }
+
+    /**
+     * Register a table override
+     *
+     * @param oldTable table to override
+     * @param newTable override
+     * @return previous override value
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public String registerTableOverride(String oldTable, String newTable) {
+        return internalNameMapping.registerTableOverride(oldTable, newTable);
+    }
+
+    /**
+     * Register a schema specific table override
+     *
+     * @param schema schema of table
+     * @param oldTable table to override
+     * @param newTable override
+     * @return previous override value
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public String registerTableOverride(String schema, String oldTable, String newTable) {
+        SchemaAndTable st = registerTableOverride(schema, oldTable, schema, newTable);
+        return st != null ? st.getTable() : null;
+    }
+
+    /**
+     * Register a schema specific table override
+     *
+     * @param schema schema of table
+     * @param oldTable table to override
+     * @param newSchema override schema
+     * @param newTable override table
+     * @return previous override value
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public SchemaAndTable registerTableOverride(String schema, String oldTable, String newSchema, String newTable) {
+        return registerTableOverride(new SchemaAndTable(schema, oldTable), new SchemaAndTable(newSchema, newTable));
+    }
+
+    /**
+     * Register a schema specific table override
+     *
+     * @param from schema and table to override
+     * @param to override
+     * @return previous override
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public SchemaAndTable registerTableOverride(SchemaAndTable from, SchemaAndTable to) {
+        return internalNameMapping.registerTableOverride(from, to);
+    }
+
+    /**
+     * Register a column override
+     *
+     * @param schema schema
+     * @param table table
+     * @param oldColumn column
+     * @param newColumn override
+     * @return previous override
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public String registerColumnOverride(String schema, String table, String oldColumn, String newColumn) {
+        return internalNameMapping.registerColumnOverride(schema, table, oldColumn, newColumn);
+    }
+
+    /**
+     * Register a column override
+     *
+     * @param table table
+     * @param oldColumn column
+     * @param newColumn override
+     * @return previous override
+     *
+     * @deprecated Use {@link #setDynamicNameMapping(NameMapping)} instead.
+     */
+    @Deprecated
+    public String registerColumnOverride(String table, String oldColumn, String newColumn) {
+        return internalNameMapping.registerColumnOverride(table, oldColumn, newColumn);
+    }
+
+    /**
+     * Register the given {@link Type} converter
+     *
+     * @param type type
+     */
+    public void register(Type<?> type) {
+        jdbcTypeMapping.register(type.getSQLTypes()[0], type.getReturnedClass());
+        javaTypeMapping.register(type);
+    }
+
+    /**
+     * Register a typeName to Class mapping
+     *
+     * @param typeName SQL type name
+     * @param clazz java type
+     */
+    public void registerType(String typeName, Class<?> clazz) {
+        typeToName.put(typeName.toLowerCase(), clazz);
+    }
+
+    /**
+     * Override the binding for the given NUMERIC type
+     *
+     * @param total total amount of digits
+     * @param decimal amount of fractional digits
+     * @param javaType java type
+     */
+    public void registerNumeric(int total, int decimal, Class<?> javaType) {
+        jdbcTypeMapping.registerNumeric(total, decimal, javaType);
+    }
+
+    /**
+     * Override multiple numeric bindings, both begin and end are inclusive
+     *
+     * @param beginTotal inclusive start of range
+     * @param endTotal inclusive end of range
+     * @param beginDecimal inclusive start of range
+     * @param endDecimal inclusive end of range
+     * @param javaType java type
+     */
+    public void registerNumeric(int beginTotal, int endTotal, int beginDecimal, int endDecimal, Class <?> javaType) {
+        for (int total = beginTotal; total <= endTotal; total++) {
+            for (int decimal = beginDecimal; decimal <= endDecimal; decimal++) {
+                registerNumeric(total, decimal, javaType);
+            }
+        }
+    }
+
+    /**
+     * Register the given javaType for the given table and column
+     *
+     * @param table table
+     * @param column column
+     * @param javaType java type
+     */
+    public void register(String table, String column, Class<?> javaType) {
+        register(table, column, javaTypeMapping.getType(javaType));
+    }
+
+    /**
+     * Register the given {@link Type} converter for the given table and column
+     *
+     * @param table table
+     * @param column column
+     * @param type type
+     */
+    public void register(String table, String column, Type<?> type) {
+        javaTypeMapping.setType(table, column, type);
+        hasTableColumnTypes = true;
+    }
+
+    /**
+     * Translate the given SQLException
+     *
+     * @param ex SQLException to translate
+     * @return translated exception
+     */
+    public RuntimeException translate(SQLException ex) {
+        return exceptionTranslator.translate(ex);
+    }
+
+    /**
+     * Translate the given SQLException
+     *
+     * @param sql SQL string
+     * @param bindings bindings
+     * @param ex SQLException to translate
+     * @return translated exception
+     */
+    public RuntimeException translate(String sql, List<Object> bindings, SQLException ex) {
+        return exceptionTranslator.translate(sql, bindings, ex);
+    }
+
+    /**
+     * Add a listener
+     *
+     * @param listener listener
+     */
+    public void addListener(SQLListener listener) {
+        listeners.add(listener);
+    }
+
+    /**
+     * Get the registered listener
+     *
+     * @return listeners as single listener instance
+     */
+    public SQLListeners getListeners() {
+        return listeners;
+    }
+
+    /**
+     * Get whether literals are serialized or prepared statement bindings are used
+     *
+     * @return true for literals and false for bindings
+     */
+    public boolean getUseLiterals() {
+        return useLiterals;
+    }
+
+    /**
+     * Set whether literals are used in SQL strings instead of parameter bindings (default: false)
+     *
+     * <p>Warning: When literals are used, prepared statement won't have any parameter bindings
+     * and also batch statements will only be simulated, but not executed as actual batch statements.</p>
+     *
+     * @param useLiterals true for literals and false for bindings
+     */
+    public void setUseLiterals(boolean useLiterals) {
+        this.useLiterals = useLiterals;
+    }
+
+    /**
+     * Set the exception translator
+     *
+     * @param exceptionTranslator exception translator
+     */
+    public void setExceptionTranslator(SQLExceptionTranslator exceptionTranslator) {
+        this.exceptionTranslator = exceptionTranslator;
+    }
+
+    /**
+     * Set the templates to use for serialization
+     *
+     * @param templates templates
+     */
+    public void setTemplates(SQLTemplates templates) {
+        this.templates = templates;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/DB2Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/DB2Templates.java
new file mode 100644
index 0000000000..19ad78058d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/DB2Templates.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.*;
+
+/**
+ * {@code DB2Templates} is an SQL dialect for DB2 10.1.2
+ *
+ * @author tiwe
+ *
+ */
+public class DB2Templates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final DB2Templates DEFAULT = new DB2Templates();
+
+    private String limitTemplate = "\nfetch first {0s} rows only";
+
+    private String outerQueryStart = "select * from (\n  ";
+
+    private String outerQueryEnd = ") a where ";
+
+    private String limitOffsetTemplate = "rn > {0} and rn <= {1}";
+
+    private String offsetTemplate = "rn > {0}";
+
+    private String outerQuerySuffix = " order by rn";
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new DB2Templates(escape, quote);
+            }
+        };
+    }
+
+    public DB2Templates() {
+        this('\\',false);
+    }
+
+    public DB2Templates(boolean quote) {
+        this('\\',quote);
+    }
+
+    public DB2Templates(char escape, boolean quote) {
+        super(Keywords.DB2, "\"", escape, quote, false);
+        setDummyTable("sysibm.sysdummy1");
+        setAutoIncrement(" generated always as identity");
+        setFunctionJoinsWrapped(true);
+        setDefaultValues("\nvalues (default)");
+        setNullsFirst(null);
+        setNullsLast(null);
+
+        setPrecedence(Precedence.ARITH_HIGH, Ops.CONCAT);
+        setPrecedence(Precedence.COMPARISON - 1, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        setPrecedence(Precedence.COMPARISON, Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN,
+                Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+
+        setPrecedence(Precedence.COMPARISON, OTHER_LIKE_CASES);
+
+        add(SQLOps.NEXTVAL, "next value for {0s}");
+
+        add(Ops.MathOps.RANDOM, "rand()");
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+
+        // overrides of the SQL standard functions
+        add(Ops.DateTimeOps.SECOND, "second({0})");
+        add(Ops.DateTimeOps.MINUTE, "minute({0})");
+        add(Ops.DateTimeOps.HOUR, "hour({0})");
+        add(Ops.DateTimeOps.WEEK, "week({0})");
+        add(Ops.DateTimeOps.MONTH, "month({0})");
+        add(Ops.DateTimeOps.YEAR, "year({0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "(year({0}) * 100 + month({0}))");
+        add(Ops.DateTimeOps.YEAR_WEEK, "(year({0}) * 100 + week({0}))");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "{0} + {1} years");
+        add(Ops.DateTimeOps.ADD_MONTHS, "{0} + {1} months");
+        add(Ops.DateTimeOps.ADD_WEEKS, "{0} + {1} weeks");
+        add(Ops.DateTimeOps.ADD_DAYS, "{0} + {1} days");
+        add(Ops.DateTimeOps.ADD_HOURS, "{0} + {1} hours");
+        add(Ops.DateTimeOps.ADD_MINUTES, "{0} + {1} minutes");
+        add(Ops.DateTimeOps.ADD_SECONDS, "{0} + {1} seconds");
+
+        add(Ops.DateTimeOps.DIFF_YEARS,   "timestampdiff(256, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_MONTHS,  "timestampdiff(64, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_WEEKS,   "timestampdiff(32, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_DAYS,    "timestampdiff(16, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_HOURS,   "timestampdiff(8, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "timestampdiff(4, char(timestamp({1}) - timestamp({0})))");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "timestampdiff(2, char(timestamp({1}) - timestamp({0})))");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR, "trunc_timestamp({0}, 'year')");
+        add(Ops.DateTimeOps.TRUNC_MONTH, "trunc_timestamp({0}, 'month')");
+        add(Ops.DateTimeOps.TRUNC_WEEK, "trunc_timestamp({0}, 'ww')");
+        add(Ops.DateTimeOps.TRUNC_DAY, "trunc_timestamp({0}, 'dd')");
+        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc_timestamp({0}, 'hh')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc_timestamp({0}, 'mi')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "trunc_timestamp({0}, 'ss')");
+
+        addTypeNameToCode("smallint", Types.BOOLEAN, true);
+        addTypeNameToCode("smallint", Types.TINYINT, true);
+        addTypeNameToCode("long varchar for bit data", Types.LONGVARBINARY);
+        addTypeNameToCode("varchar () for bit data", Types.VARBINARY);
+        addTypeNameToCode("char () for bit data", Types.BINARY);
+        addTypeNameToCode("long varchar", Types.LONGVARCHAR, true);
+        addTypeNameToCode("object", Types.JAVA_OBJECT, true);
+        addTypeNameToCode("xml", Types.SQLXML,true);
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        switch (code) {
+            case Types.VARCHAR:  return "varchar(4000)";
+            default: return super.getCastTypeNameForCode(code);
+        }
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
+            QueryModifiers mod = metadata.getModifiers();
+            if (mod.getOffset() == null) {
+                context.serializeForQuery(metadata, forCountRow);
+                context.handle(limitTemplate, mod.getLimit());
+            } else {
+                context.append(outerQueryStart);
+                metadata = metadata.clone();
+                WindowFunction<Long> rn = SQLExpressions.rowNumber().over();
+                for (OrderSpecifier<?> os : metadata.getOrderBy()) {
+                    rn.orderBy(os);
+                }
+                FactoryExpression<?> pr = Projections.appending(metadata.getProjection(), rn.as("rn"));
+                metadata.setProjection(FactoryExpressionUtils.wrap(pr));
+                metadata.clearOrderBy();
+                context.serializeForQuery(metadata, forCountRow);
+                context.append(outerQueryEnd);
+                if (mod.getLimit() == null) {
+                    context.handle(offsetTemplate, mod.getOffset());
+                } else {
+                    context.handle(limitOffsetTemplate, mod.getOffset(), mod.getLimit() + mod.getOffset());
+                }
+                context.append(outerQuerySuffix);
+            }
+
+        } else {
+            context.serializeForQuery(metadata, forCountRow);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(QueryFlag.Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        // do nothing
+    }
+
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DatePart.java b/querydsl-sql/src/main/java/com/querydsl/sql/DatePart.java
similarity index 77%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/DatePart.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/DatePart.java
index 4e2c7354fc..afcd5fb980 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/DatePart.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/DatePart.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2012, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
+/**
+ * {@code DatePart} defines date parts for various date/time operations
+ */
 public enum DatePart {
     year,
     month,
     week,
-    day,    
+    day,
     hour,
     minute,
     second,
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/DefaultSQLExceptionTranslator.java b/querydsl-sql/src/main/java/com/querydsl/sql/DefaultSQLExceptionTranslator.java
new file mode 100644
index 0000000000..d8943382e9
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/DefaultSQLExceptionTranslator.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.sql.support.SQLExceptionWrapper;
+
+/**
+ * Default implementation of the {@link SQLExceptionTranslator} interface
+ *
+ * @author tiwe
+ *
+ */
+public final class DefaultSQLExceptionTranslator implements SQLExceptionTranslator {
+
+    public static final SQLExceptionTranslator DEFAULT = new DefaultSQLExceptionTranslator();
+
+    private static final SQLExceptionWrapper WRAPPER = SQLExceptionWrapper.INSTANCE;
+
+    @Override
+    public RuntimeException translate(SQLException e) {
+        if (containsAdditionalExceptions(e)) {
+            return WRAPPER.wrap(e);
+        } else {
+            return new QueryException(e);
+        }
+    }
+
+    @Override
+    public RuntimeException translate(String sql, List<Object> bindings, SQLException e) {
+        String message = "Caught " + e.getClass().getSimpleName()
+                + " for " + sql;
+        if (containsAdditionalExceptions(e)) {
+            return WRAPPER.wrap(message, e);
+        } else {
+            return new QueryException(message, e);
+        }
+    }
+
+    private static boolean containsAdditionalExceptions(SQLException e) {
+        return e.getNextException() != null;
+    }
+
+    private DefaultSQLExceptionTranslator() { }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/DerbyTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/DerbyTemplates.java
new file mode 100644
index 0000000000..831eb931eb
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/DerbyTemplates.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code DerbyTemplates} is an SQL dialect for Derby
+ *
+ * @author tiwe
+ *
+ */
+public class DerbyTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final DerbyTemplates DEFAULT = new DerbyTemplates();
+
+    private String limitOffsetTemplate = "\noffset {1s} rows fetch next {0s} rows only";
+
+    private String limitTemplate = "\nfetch first {0s} rows only";
+
+    private String offsetTemplate = "\noffset {0s} rows";
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new DerbyTemplates(escape, quote);
+            }
+        };
+    }
+
+    public DerbyTemplates() {
+        this('\\',false);
+    }
+
+    public DerbyTemplates(boolean quote) {
+        this('\\',quote);
+    }
+
+    public DerbyTemplates(char escape, boolean quote) {
+        super(Keywords.DERBY, "\"", escape, quote, true);
+        setDummyTable("sysibm.sysdummy1");
+        setAutoIncrement(" generated always as identity");
+        setFunctionJoinsWrapped(true);
+        setDefaultValues("\nvalues (default)");
+
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE, Ops.EXISTS);
+
+        add(Ops.CONCAT, "varchar({0} || {1})", -1);
+
+        add(SQLOps.NEXTVAL, "next value for {0s}");
+
+        // case for eq
+        add(Ops.CASE_EQ, "case {1} end");
+        add(Ops.CASE_EQ_WHEN,  "when {0} = {1} then {2} {3}");
+        add(Ops.CASE_EQ_ELSE,  "else {0}");
+
+        add(Ops.MathOps.RANDOM, "random()");
+        add(Ops.MathOps.ROUND, "floor({0})"); // FIXME
+        add(Ops.MathOps.POWER, "exp({1} * log({0}))");
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+
+        // overrides of the SQL standard functions
+        add(Ops.DateTimeOps.SECOND, "second({0})");
+        add(Ops.DateTimeOps.MINUTE, "minute({0})");
+        add(Ops.DateTimeOps.HOUR, "hour({0})");
+        add(Ops.DateTimeOps.WEEK, "week({0})");
+        add(Ops.DateTimeOps.MONTH, "month({0})");
+        add(Ops.DateTimeOps.YEAR, "year({0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "(year({0}) * 100 + month({0}))");
+        add(Ops.DateTimeOps.YEAR_WEEK, "(year({0}) * 100 + week({0}))");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "day({0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "{fn timestampadd(SQL_TSI_YEAR, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_MONTHS, "{fn timestampadd(SQL_TSI_MONTH, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_WEEKS, "{fn timestampadd(SQL_TSI_WEEK, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_DAYS, "{fn timestampadd(SQL_TSI_DAY, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_HOURS, "{fn timestampadd(SQL_TSI_HOUR, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_MINUTES, "{fn timestampadd(SQL_TSI_MINUTE, {1}, {0})}");
+        add(Ops.DateTimeOps.ADD_SECONDS, "{fn timestampadd(SQL_TSI_SECOND, {1}, {0})}");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "{fn timestampdiff(SQL_TSI_YEAR, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "{fn timestampdiff(SQL_TSI_MONTH, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "{fn timestampdiff(SQL_TSI_WEEK, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_DAYS, "{fn timestampdiff(SQL_TSI_DAY, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_HOURS, "{fn timestampdiff(SQL_TSI_HOUR, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "{fn timestampdiff(SQL_TSI_MINUTE, {0}, {1})}");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "{fn timestampdiff(SQL_TSI_SECOND, {0}, {1})}");
+
+        // substrings 'yyyy-MM-dd hh:mm:ss' style date pattern and adds a static suffix
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "timestamp(substr(cast({0} as char(30)),1,4)||'-01-01 00:00:00')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "timestamp(substr(cast({0} as char(30)),1,7)||'-01 00:00:00')");
+        // TODO weeks
+        add(Ops.DateTimeOps.TRUNC_DAY,    "timestamp(substr(cast({0} as char(30)),1,10)||' 00:00:00')");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "timestamp(substr(cast({0} as char(30)),1,13)||':00:00')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "timestamp(substr(cast({0} as char(30)),1,16)||':00')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "timestamp(substr(cast({0} as char(30)),1,19))");
+
+        // left via substr
+        add(Ops.StringOps.LEFT, "substr({0},1,{1})");
+
+        addTypeNameToCode("smallint", Types.TINYINT, true);
+        addTypeNameToCode("long varchar for bit data", Types.LONGVARBINARY);
+        addTypeNameToCode("varchar () for bit data", Types.VARBINARY);
+        addTypeNameToCode("char () for bit data", Types.BINARY);
+        addTypeNameToCode("long varchar", Types.LONGVARCHAR, true);
+        addTypeNameToCode("object", Types.JAVA_OBJECT, true);
+        addTypeNameToCode("xml", Types.SQLXML,true);
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.BOOLEAN:
+                return "1".equals(literal) ? "true" : "false";
+            case Types.TIMESTAMP:
+            case TIMESTAMP_WITH_TIMEZONE:
+                return "{ts '" + literal + "'}";
+            case Types.DATE:
+                return "{d '" + literal + "'}";
+            case Types.TIME:
+            case TIME_WITH_TIMEZONE:
+                return "{t '" + literal + "'}";
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.getLimit() == null) {
+            context.handle(offsetTemplate, mod.getOffset());
+        } else if (mod.getOffset() == null) {
+            context.handle(limitTemplate, mod.getLimit());
+        } else {
+            context.handle(limitOffsetTemplate, mod.getLimit(), mod.getOffset());
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/FirebirdTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/FirebirdTemplates.java
new file mode 100644
index 0000000000..4276423f09
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/FirebirdTemplates.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code FirebirdTemplates} is an SQL dialect for Firebird
+ */
+public class FirebirdTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final FirebirdTemplates DEFAULT = new FirebirdTemplates();
+
+    private String limitOffsetTemplate = "\nrows {0} to {1}";
+
+    private String limitTemplate = "\nrows {0}";
+
+    private String offsetTemplate = "\nrows {0} to " + Integer.MAX_VALUE;
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new FirebirdTemplates(escape, quote);
+            }
+        };
+    }
+
+    public FirebirdTemplates() {
+        this('\\', false);
+    }
+
+    public FirebirdTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public FirebirdTemplates(char escape, boolean quote) {
+        super(Keywords.FIREBIRD, "\"", escape, quote, false);
+        setDummyTable("RDB$DATABASE");
+        setUnionsWrapped(false);
+        setWrapSelectParameters(true);
+        setArraysSupported(false);
+        setBatchToBulkSupported(false);
+
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+
+        add(Ops.CONCAT, "{0} || {1}", Precedence.NEGATE - 1);
+
+        // string
+        add(Ops.CHAR_AT, "cast(substring({0} from {1+'1's} for 1) as char)");
+        add(Ops.SUBSTR_1ARG, "substring({0} from {1+'1's})");
+        add(Ops.SUBSTR_2ARGS, "substring({0} from {1+'1's} for {2-1s})");
+        add(Ops.INDEX_OF, "position({1},{0})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "position({1},{0},{2+'1's})-1", Precedence.ARITH_LOW);
+        add(Ops.StringOps.LOCATE, "position({0},{1})");
+        add(Ops.StringOps.LOCATE2, "position({0},{1},{2})");
+        add(Ops.STRING_LENGTH, "char_length({0})");
+        add(Ops.STRING_IS_EMPTY, "char_length({0}) = 0");
+        add(Ops.StringOps.LTRIM, "trim (leading from {0})");
+        add(Ops.StringOps.RTRIM, "trim (trailing from {0})");
+
+        add(Ops.AggOps.BOOLEAN_ANY, "any({0})");
+        add(Ops.AggOps.BOOLEAN_ALL, "all({0})");
+
+        // math
+        add(Ops.MathOps.LOG, "log({1},{0})");
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+        add(Ops.MathOps.DEG, "{0*'180.0'} / pi()", Precedence.ARITH_HIGH);
+        add(Ops.MathOps.RAD, "{0}*pi() / 180.0 ", Precedence.ARITH_HIGH);
+
+        //
+        add(Ops.DateTimeOps.DATE, "cast({0} as date)");
+
+        add(Ops.DateTimeOps.MILLISECOND, "extract(millisecond from {0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "extract(year from {0}) * 100 + extract(month from {0})", Precedence.ARITH_LOW);
+        add(Ops.DateTimeOps.YEAR_WEEK, "extract(year from {0}) * 100 + extract(week from {0})", Precedence.ARITH_LOW);
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "extract(weekday from {0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "extract(day from {0})");
+        //add(Ops.DateTimeOps.DAY_OF_YEAR, "extract(day_of_year from {0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "dateadd(year,{1},{0})");
+        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd(month,{1},{0})");
+        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd(week,{1},{0})");
+        add(Ops.DateTimeOps.ADD_DAYS, "dateadd(day,{1},{0})");
+        add(Ops.DateTimeOps.ADD_HOURS, "dateadd(hour,{1},{0})");
+        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd(minute,{1},{0})");
+        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd(second,{1},{0})");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "datediff(year,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff(month,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "datediff(week,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_DAYS, "datediff(day,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "datediff(hour,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff(minute,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff(second,{0},{1})");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "cast(extract(year from {0}) || '-1-1' as date)");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "cast(substring(cast({0} as char(100)) from 1 for 7) || '-1' as date)");
+        // TODO weeks
+        add(Ops.DateTimeOps.TRUNC_DAY,    "cast(substring(cast({0} as char(100)) from 1 for 10) as date)");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "cast(substring(cast({0} as char(100)) from 1 for 13) || ':00:00' as timestamp)");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "cast(substring(cast({0} as char(100)) from 1 for 16) || ':00' as timestamp)");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "cast(substring(cast({0} as char(100)) from 1 for 19) as timestamp)");
+
+        add(SQLOps.GROUP_CONCAT, "list({0},',')");
+        add(SQLOps.GROUP_CONCAT2, "list({0},{1})");
+
+        addTypeNameToCode("time with time zone", Types.TIME_WITH_TIMEZONE, true);
+        addTypeNameToCode("timestamp with time zone", Types.TIMESTAMP_WITH_TIMEZONE, true);
+        addTypeNameToCode("smallint", Types.BOOLEAN, true);
+        addTypeNameToCode("smallint", Types.BIT, true);
+        addTypeNameToCode("smallint", Types.TINYINT, true);
+        addTypeNameToCode("decimal", Types.DOUBLE, true);
+        addTypeNameToCode("blob sub_type 0", Types.LONGVARBINARY);
+        addTypeNameToCode("blob sub_type 1", Types.LONGVARCHAR);
+        addTypeNameToCode("double precision", Types.DOUBLE);
+        addTypeNameToCode("array", Types.OTHER);
+        addTypeNameToCode("blob sub_type 0 ", Types.BLOB);
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        if (code == Types.VARCHAR) {
+            return "varchar(256)";
+        } else {
+            return super.getCastTypeNameForCode(code);
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.isRestricting()) {
+            if (mod.getLimit() != null) {
+                if (mod.getOffset() != null) {
+                    context.handle(limitOffsetTemplate, mod.getOffset() + 1, mod.getOffset() + mod.getLimit());
+                } else {
+                    context.handle(limitTemplate, mod.getLimit());
+                }
+            } else {
+                context.handle(offsetTemplate, mod.getOffset() + 1);
+            }
+        }
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/ForeignKey.java b/querydsl-sql/src/main/java/com/querydsl/sql/ForeignKey.java
new file mode 100644
index 0000000000..96369dd49c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/ForeignKey.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code ForeignKey} defines a foreign key on a table to another table
+ *
+ * @author tiwe
+ *
+ * @param <E>
+ */
+@Immutable
+public final class ForeignKey<E> implements Serializable, ProjectionRole<Tuple> {
+
+    private static final long serialVersionUID = 2260578033772289023L;
+
+    private final RelationalPath<?> entity;
+
+    private final List<? extends Path<?>> localColumns;
+
+    private final List<String> foreignColumns;
+
+    @Nullable
+    private transient volatile Expression<Tuple> mixin;
+
+    public ForeignKey(RelationalPath<?> entity, Path<?> localColumn, String foreignColumn) {
+        this(entity, Collections.singletonList(localColumn), Collections.singletonList(foreignColumn));
+    }
+
+    public ForeignKey(RelationalPath<?> entity, List<? extends Path<?>> localColumns,
+            List<String> foreignColumns) {
+        this.entity = entity;
+        this.localColumns = CollectionUtils.unmodifiableList(localColumns);
+        this.foreignColumns = CollectionUtils.unmodifiableList(foreignColumns);
+    }
+
+    public RelationalPath<?> getEntity() {
+        return entity;
+    }
+
+    public List<? extends Path<?>> getLocalColumns() {
+        return localColumns;
+    }
+
+    public List<String> getForeignColumns() {
+        return foreignColumns;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Predicate on(RelationalPath<E> entity) {
+        BooleanBuilder builder = new BooleanBuilder();
+        for (int i = 0; i < localColumns.size(); i++) {
+            Expression<Object> local = (Expression<Object>) localColumns.get(i);
+            Expression<?> foreign = ExpressionUtils.path(local.getType(), entity, foreignColumns.get(i));
+            builder.and(ExpressionUtils.eq(local,foreign));
+        }
+        return builder.getValue();
+    }
+
+    public BooleanExpression in(SubQueryExpression<Tuple> coll) {
+        return Expressions.booleanOperation(Ops.IN, getProjection(), coll);
+    }
+
+    @Override
+    public Expression<Tuple> getProjection() {
+        if (mixin == null) {
+            mixin = ExpressionUtils.list(Tuple.class, localColumns);
+        }
+        return mixin;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/H2Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/H2Templates.java
new file mode 100644
index 0000000000..5680129519
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/H2Templates.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code H2Templates} is an SQL dialect for H2
+ *
+ * @author tiwe
+ *
+ */
+public class H2Templates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final H2Templates DEFAULT = new H2Templates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new H2Templates(escape, quote);
+            }
+        };
+    }
+
+    public H2Templates() {
+        this('\\', false);
+    }
+
+    public H2Templates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public H2Templates(char escape, boolean quote) {
+        super(Keywords.H2, "\"", escape, quote, false);
+        setNativeMerge(true);
+        setMaxLimit(2 ^ 31);
+        setLimitRequired(true);
+        setCountDistinctMultipleColumns(true);
+
+        setPrecedence(Precedence.ARITH_LOW + 1, Ops.CONCAT);
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+
+        add(Ops.MathOps.ROUND, "round({0},0)");
+        add(Ops.TRIM, "trim(both from {0})");
+
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "day_of_week({0})");
+
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
+        add(Ops.MathOps.COTH, "(cosh({0}) / sinh({0}))");
+
+        add(Ops.DateTimeOps.DATE, "convert({0}, date)");
+
+        addTypeNameToCode("result_set", -10);
+        addTypeNameToCode("identity", Types.BIGINT);
+        addTypeNameToCode("uuid", Types.BINARY);
+        addTypeNameToCode("serial", Types.INTEGER);
+        addTypeNameToCode("varchar_ignorecase", Types.VARCHAR);
+
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "parsedatetime(formatdatetime({0},'yyyy'),'yyyy')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "parsedatetime(formatdatetime({0},'yyyy-MM'),'yyyy-MM')");
+        add(Ops.DateTimeOps.TRUNC_WEEK,   "parsedatetime(formatdatetime({0},'YYYY-ww'),'YYYY-ww')");
+        add(Ops.DateTimeOps.TRUNC_DAY,    "parsedatetime(formatdatetime({0},'yyyy-MM-dd'),'yyyy-MM-dd')");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "parsedatetime(formatdatetime({0},'yyyy-MM-dd HH'),'yyyy-MM-dd HH')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "parsedatetime(formatdatetime({0},'yyyy-MM-dd HH:mm'),'yyyy-MM-dd HH:mm')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "parsedatetime(formatdatetime({0},'yyyy-MM-dd HH:mm:ss'),'yyyy-MM-dd HH:mm:ss')");
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case TIMESTAMP_WITH_TIMEZONE:
+                return "(timestamp with time zone '" + literal + "')";
+            case TIME_WITH_TIMEZONE:
+                return "(time with time zone '" + literal + "')";
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java
new file mode 100644
index 0000000000..bacd6be6b8
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/HSQLDBTemplates.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code HSQLDBTemplates} is an SQL dialect for HSQLDB
+ *
+ * @author tiwe
+ *
+ */
+public class HSQLDBTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final HSQLDBTemplates DEFAULT = new HSQLDBTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new HSQLDBTemplates(escape, quote);
+            }
+        };
+    }
+
+    public HSQLDBTemplates() {
+        this('\\', false);
+    }
+
+    public HSQLDBTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public HSQLDBTemplates(char escape, boolean quote) {
+        super(Keywords.HSQLDB, "\"", escape, quote, false);
+        setLimitRequired(true);
+        setAutoIncrement(" identity");
+        setDefaultValues("\ndefault values");
+        setFunctionJoinsWrapped(true);
+        setUnionsWrapped(false);
+
+        setPrecedence(Precedence.ARITH_HIGH, Ops.CONCAT);
+        setPrecedence(Precedence.ARITH_LOW + 1, Ops.NOT);
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+        setPrecedence(Precedence.COMPARISON + 1, Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN,
+                Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+
+        setPrecedence(Precedence.COMPARISON + 1, OTHER_LIKE_CASES);
+
+        add(Ops.TRIM, "trim(both from {0})");
+        add(Ops.NEGATE, "{0} * -1", Precedence.ARITH_HIGH);
+
+        add(SQLOps.NEXTVAL, "next value for {0s}");
+
+        add(Ops.MathOps.POWER, "power({0},{1s})");
+        add(Ops.MathOps.ROUND, "round({0},0)");
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "(log({0}) / log({1}))");
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0*'-1'})) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+
+        add(Ops.DateTimeOps.WEEK, "extract(week_of_year from {0})");
+        add(Ops.DateTimeOps.YEAR_WEEK, "extract(year from {0}) * 100 + extract(week_of_year from {0})", Precedence.ARITH_LOW);
+
+        add(Ops.DateTimeOps.ADD_YEARS, "dateadd('yy', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd('mm', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd('week', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_DAYS, "dateadd('dd', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_HOURS, "dateadd('hh', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd('mi', {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd('ss', {1s}, {0})");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "datediff('yy', {0}, {1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff('mm', {0}, {1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "trunc(datediff('dd', {0}, {1}) / 7)");
+        add(Ops.DateTimeOps.DIFF_DAYS, "datediff('dd', {0}, {1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "datediff('hh', {0}, {1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff('mi', {0}, {1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff('ss', {0}, {1})");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "trunc({0},'YY')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "trunc({0},'MM')");
+        add(Ops.DateTimeOps.TRUNC_WEEK,   "trunc({0},'WW')");
+        add(Ops.DateTimeOps.TRUNC_DAY,    "trunc({0},'DD')");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "trunc({0},'HH')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc({0},'MI')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "trunc({0},'SS')");
+
+        add(Ops.DateTimeOps.DATE, "convert({0}, date)");
+
+        add(SQLOps.GROUP_CONCAT2, "group_concat({0} separator '{1s}')");
+
+        addTypeNameToCode("character", Types.CHAR, true);
+        addTypeNameToCode("float", Types.DOUBLE, true);
+        addTypeNameToCode("real", Types.DOUBLE);
+        addTypeNameToCode("nvarchar", Types.VARCHAR);
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        if (code == Types.VARCHAR) {
+            return "varchar(10)";
+        } else {
+            return super.getCastTypeNameForCode(code);
+        }
+    }
+    
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case TIMESTAMP_WITH_TIMEZONE:
+            case TIME_WITH_TIMEZONE:
+                // HSQLDB does not tolerate space before the time zone, unlike other DBs
+                int tzSeparatorIndex = literal.lastIndexOf(' ');
+                literal = literal.substring(0, tzSeparatorIndex) + literal.substring(tzSeparatorIndex + 1);
+                break;
+        }
+        return super.serialize(literal, jdbcType);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java
new file mode 100644
index 0000000000..1fe8d4f3b7
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/JDBCTypeMapping.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Blob;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.Pair;
+import com.querydsl.sql.types.Null;
+
+/**
+ * {@code JDBCTypeMapping} defines a mapping from JDBC types to Java classes.
+ *
+ * @author tiwe
+ *
+ */
+final class JDBCTypeMapping {
+
+    private static final Set<Integer> NUMERIC_TYPES;
+
+    private static final Map<Integer, Class<?>> defaultTypes = new HashMap<Integer, Class<?>>();
+
+    private static final Map<Class<?>, Integer> defaultSqlTypes = new HashMap<Class<?>, Integer>();
+
+    static {
+        registerDefault(-101, Object.class);
+        registerDefault(-102, Timestamp.class); // Oracle: TIMESTAMP(6) WITH LOCAL TIME ZONE
+        registerDefault(2012, Object.class); // REF_CURSOR
+        registerDefault(2013, Time.class);   // TIME_WITH_TIMEZONE
+        registerDefault(2014, Timestamp.class); // TIMESTAMP_WIH_TIMEZONE
+
+        // BOOLEAN
+        registerDefault(Types.BIT, Boolean.class);
+        registerDefault(Types.BOOLEAN, Boolean.class);
+
+        // NUMERIC
+        registerDefault(Types.BIGINT, Long.class);
+        registerDefault(Types.DECIMAL, BigDecimal.class);
+        registerDefault(Types.DOUBLE, Double.class);
+        registerDefault(Types.FLOAT, Float.class);
+        registerDefault(Types.INTEGER, Integer.class);
+        registerDefault(Types.NUMERIC, BigDecimal.class);
+        registerDefault(Types.REAL, Float.class);
+        registerDefault(Types.SMALLINT, Short.class);
+        registerDefault(Types.TINYINT, Byte.class);
+
+        // DATE and TIME
+        registerDefault(Types.DATE, java.sql.Date.class);
+        registerDefault(Types.TIME, java.sql.Time.class);
+        registerDefault(Types.TIMESTAMP, java.sql.Timestamp.class);
+
+        // TEXT
+        registerDefault(Types.NCHAR, String.class);
+        registerDefault(Types.CHAR, String.class);
+        registerDefault(Types.NCLOB, String.class);
+        registerDefault(Types.CLOB, String.class);
+        registerDefault(Types.LONGNVARCHAR, String.class);
+        registerDefault(Types.LONGVARCHAR, String.class);
+        registerDefault(Types.SQLXML, String.class);
+        registerDefault(Types.NVARCHAR, String.class);
+        registerDefault(Types.VARCHAR, String.class);
+
+        // byte[]
+        registerDefault(Types.BINARY, byte[].class);
+        registerDefault(Types.LONGVARBINARY, byte[].class);
+        registerDefault(Types.VARBINARY, byte[].class);
+
+        // BLOB
+        registerDefault(Types.BLOB, Blob.class);
+
+        // OTHER
+        registerDefault(Types.ARRAY, Object[].class);
+        registerDefault(Types.DISTINCT, Object.class);
+        registerDefault(Types.DATALINK, Object.class);
+        registerDefault(Types.JAVA_OBJECT, Object.class);
+        registerDefault(Types.NULL, Null.class);
+        registerDefault(Types.OTHER, Object.class);
+        registerDefault(Types.REF, Object.class);
+        registerDefault(Types.ROWID, Object.class);
+        registerDefault(Types.STRUCT, Object.class);
+
+        Set<Integer> builder = new HashSet<>();
+        for (Map.Entry<Integer, Class<?>> entry : defaultTypes.entrySet()) {
+            if (Number.class.isAssignableFrom(entry.getValue())) {
+                builder.add(entry.getKey());
+            }
+        }
+        NUMERIC_TYPES = Collections.unmodifiableSet(builder);
+    }
+
+    private static void registerDefault(int sqlType, Class<?> javaType) {
+        defaultTypes.put(sqlType, javaType);
+        defaultSqlTypes.put(javaType, sqlType);
+    }
+
+    private final Map<Integer, Class<?>> types = new HashMap<Integer, Class<?>>();
+
+    private final Map<Class<?>, Integer> sqlTypes = new HashMap<Class<?>, Integer>();
+
+    private final Map<Pair<Integer, Integer>, Class<?>> numericTypes = new HashMap<Pair<Integer,Integer>, Class<?>>();
+
+    public void register(int sqlType, Class<?> javaType) {
+        types.put(sqlType, javaType);
+        sqlTypes.put(javaType, sqlType);
+    }
+
+    public void registerNumeric(int total, int decimal, Class<?> javaType) {
+        numericTypes.put(Pair.of(total, decimal), javaType);
+    }
+
+    private static Class<?> getNumericClass(int total, int decimal) {
+        if (decimal <= 0) {
+            if (total > 18 || total == 0) {
+                return BigInteger.class;
+            } else if (total > 9) {
+                return Long.class;
+            } else if (total > 4) {
+                return Integer.class;
+            } else if (total > 2) {
+                return Short.class;
+            } else {
+                return Byte.class;
+            }
+        } else {
+            return BigDecimal.class;
+        }
+    }
+
+    @Nullable
+    public Class<?> get(int sqlType, int total, int decimal) {
+        if (NUMERIC_TYPES.contains(sqlType)) {
+            Pair<Integer,Integer> key = Pair.of(total, decimal);
+            if (numericTypes.containsKey(key)) {
+                return numericTypes.get(key);
+            } else if (sqlType == Types.NUMERIC || sqlType == Types.DECIMAL) {
+                return getNumericClass(total, decimal);
+            }
+        }
+        if (types.containsKey(sqlType)) {
+            return types.get(sqlType);
+        } else {
+            return defaultTypes.get(sqlType);
+        }
+    }
+
+    @Nullable
+    public Integer get(Class<?> clazz) {
+        if (sqlTypes.containsKey(clazz)) {
+            return sqlTypes.get(clazz);
+        } else {
+            return defaultSqlTypes.get(clazz);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/JavaTypeMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/JavaTypeMapping.java
new file mode 100644
index 0000000000..b7d485813f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/JavaTypeMapping.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.PrimitiveUtils;
+import com.querydsl.core.util.ReflectionUtils;
+import com.querydsl.sql.types.*;
+
+/**
+ * {@code JavaTypeMapping} provides a mapping from Class to Type instances
+ *
+ * @author tiwe
+ *
+ */
+class JavaTypeMapping {
+
+    private static final Type<Object> DEFAULT = new ObjectType();
+
+    private static final Map<Class<?>,Type<?>> defaultTypes = new HashMap<Class<?>,Type<?>>();
+
+    static {
+        registerDefault(new BigIntegerType());
+        registerDefault(new BigDecimalType());
+        registerDefault(new BlobType());
+        registerDefault(new BooleanType());
+        registerDefault(new BytesType());
+        registerDefault(new ByteType());
+        registerDefault(new CharacterType());
+        registerDefault(new CalendarType());
+        registerDefault(new ClobType());
+        registerDefault(new CurrencyType());
+        registerDefault(new DateType());
+        registerDefault(new DoubleType());
+        registerDefault(new FloatType());
+        registerDefault(new IntegerType());
+        registerDefault(new LocaleType());
+        registerDefault(new LongType());
+        registerDefault(new ObjectType());
+        registerDefault(new ShortType());
+        registerDefault(new StringType());
+        registerDefault(new TimestampType());
+        registerDefault(new TimeType());
+        registerDefault(new URLType());
+        registerDefault(new UtilDateType());
+        registerDefault(new UtilUUIDType(false));
+        registerDefault(new JSR310InstantType());
+        registerDefault(new JSR310LocalDateTimeType());
+        registerDefault(new JSR310LocalDateType());
+        registerDefault(new JSR310LocalTimeType());
+        registerDefault(new JSR310OffsetDateTimeType());
+        registerDefault(new JSR310OffsetTimeType());
+        registerDefault(new JSR310ZonedDateTimeType());
+
+        // initialize Joda-Time converters only if Joda-Time is available
+        try {
+            Class.forName("org.joda.time.Instant");
+            registerDefault((Type<?>) Class.forName("com.querydsl.sql.types.DateTimeType").newInstance());
+            registerDefault((Type<?>) Class.forName("com.querydsl.sql.types.LocalDateTimeType").newInstance());
+            registerDefault((Type<?>) Class.forName("com.querydsl.sql.types.LocalDateType").newInstance());
+            registerDefault((Type<?>) Class.forName("com.querydsl.sql.types.LocalTimeType").newInstance());
+        } catch (ClassNotFoundException e) {
+            // converters for Joda-Time are not loaded
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void registerDefault(Type<?> type) {
+        defaultTypes.put(type.getReturnedClass(), type);
+        Class<?> primitive = PrimitiveUtils.unwrap(type.getReturnedClass());
+        if (primitive != null) {
+            defaultTypes.put(primitive, type);
+        }
+    }
+
+    private final Map<Class<?>,Type<?>> typeByClass = new HashMap<Class<?>,Type<?>>();
+
+    private final Map<Class<?>,Type<?>> resolvedTypesByClass = new HashMap<Class<?>,Type<?>>();
+
+    private final Map<String, Map<String,Type<?>>> typeByColumn = new HashMap<String,Map<String,Type<?>>>();
+
+    @Nullable
+    public Type<?> getType(String table, String column) {
+        Map<String,Type<?>> columns = typeByColumn.get(table);
+        if (columns != null) {
+            return columns.get(column);
+        } else {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Type<T> getType(Class<T> clazz) {
+        Type<?> resolvedType = resolvedTypesByClass.get(clazz);
+        if (resolvedType == null) {
+            resolvedType = findType(clazz);
+            if (resolvedType != null) {
+                resolvedTypesByClass.put(clazz, resolvedType);
+            } else {
+                return (Type) DEFAULT;
+            }
+        }
+        return (Type<T>) resolvedType;
+    }
+
+    @Nullable
+    private Type<?> findType(Class<?> clazz) {
+        //Look for a registered type in the class hierarchy
+        Class<?> cl = clazz;
+        do {
+            if (typeByClass.containsKey(cl)) {
+                return typeByClass.get(cl);
+            } else if (defaultTypes.containsKey(cl)) {
+                return defaultTypes.get(cl);
+            }
+            cl = cl.getSuperclass();
+        } while (!cl.equals(Object.class));
+
+        //Look for a registered type in any implemented interfaces
+        Set<Class<?>> interfaces = ReflectionUtils.getImplementedInterfaces(clazz);
+        for (Class<?> itf : interfaces) {
+            if (typeByClass.containsKey(itf)) {
+                return typeByClass.get(itf);
+            } else if (defaultTypes.containsKey(itf)) {
+                return defaultTypes.get(itf);
+            }
+        }
+        return null;
+    }
+
+    public void register(Type<?> type) {
+        typeByClass.put(type.getReturnedClass(), type);
+        Class<?> primitive = PrimitiveUtils.unwrap(type.getReturnedClass());
+        if (primitive != null) {
+            typeByClass.put(primitive, type);
+        }
+        // Clear previous resolved types, so they won't impact future lookups
+        resolvedTypesByClass.clear();
+    }
+
+    public void setType(String table, String column, Type<?> type) {
+        Map<String, Type<?>> columns = typeByColumn.computeIfAbsent(table, k -> new HashMap<String, Type<?>>());
+        columns.put(column, type);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java b/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java
new file mode 100644
index 0000000000..ca01a42dab
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Defines reserved keywords for the supported dialects
+ */
+final class Keywords {
+
+    private Keywords() { }
+
+    private static Set<String> readLines(String path) {
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(Keywords.class.getResourceAsStream("/keywords/" + path)));) {
+            return bufferedReader.lines()
+                    .filter(line -> !line.isEmpty() && !line.startsWith("#"))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static final Set<String> DEFAULT = readLines("default");
+
+    public static final Set<String> CUBRID = readLines("cubrid");
+    public static final Set<String> DB2 = readLines("db2");
+    public static final Set<String> DERBY = readLines("derby");
+    public static final Set<String> FIREBIRD = readLines("firebird");
+    public static final Set<String> H2 = readLines("h2");
+    public static final Set<String> HSQLDB = readLines("hsqldb");
+    public static final Set<String> MYSQL = readLines("mysql");
+    public static final Set<String> ORACLE = readLines("oracle");
+    public static final Set<String> POSTGRESQL = readLines("postgresql");
+    public static final Set<String> SQLITE = readLines("sqlite");
+    public static final Set<String> SQLSERVER2005 = readLines("sqlserver2005");
+    public static final Set<String> SQLSERVER2008 = readLines("sqlserver2008");
+    public static final Set<String> SQLSERVER2012 = readLines("sqlserver2012");
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/MySQLTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/MySQLTemplates.java
new file mode 100644
index 0000000000..5fdebf6602
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/MySQLTemplates.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+import java.util.Collections;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code MySQLTemplates} is an SQL dialect for MySQL
+ *
+ * <p>tested with MySQL CE 5.1 and 5.5</p>
+ *
+ * @author tiwe
+ *
+ */
+public class MySQLTemplates extends SQLTemplates {
+
+    protected static final Expression<?> LOCK_IN_SHARE_MODE = ExpressionUtils.operation(
+        Object.class, SQLOps.LOCK_IN_SHARE_MODE, Collections.emptyList());
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final MySQLTemplates DEFAULT = new MySQLTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new MySQLTemplates(escape, quote);
+            }
+        };
+    }
+
+    public MySQLTemplates() {
+        this('\\', false);
+    }
+
+    public MySQLTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public MySQLTemplates(char escape, boolean quote) {
+        super(Keywords.MYSQL, "`", escape, quote, false);
+        setArraysSupported(false);
+        setParameterMetadataAvailable(false);
+        setLimitRequired(true);
+        setSupportsUnquotedReservedWordsAsIdentifier(true);
+        setNullsFirst(null);
+        setNullsLast(null);
+
+        setForShareSupported(true);
+        setForShareFlag(new QueryFlag(Position.END, LOCK_IN_SHARE_MODE));
+
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+        setPrecedence(Precedence.CASE, Ops.BETWEEN);
+
+        add(SQLOps.LOCK_IN_SHARE_MODE, "\nlock in share mode");
+
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+        add(Ops.CONCAT, "concat({0}, {1})", -1);
+
+        add(Ops.StringOps.LPAD, "lpad({0},{1},' ')");
+        add(Ops.StringOps.RPAD, "rpad({0},{1},' ')");
+
+        // like without escape
+        if (escape == '\\') {
+            add(Ops.LIKE, "{0} like {1}");
+            add(Ops.ENDS_WITH, "{0} like {%1}");
+            add(Ops.ENDS_WITH_IC, "{0l} like {%%1}");
+            add(Ops.STARTS_WITH, "{0} like {1%}");
+            add(Ops.STARTS_WITH_IC, "{0l} like {1%%}");
+            add(Ops.STRING_CONTAINS, "{0} like {%1%}");
+            add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%}");
+        }
+
+        add(Ops.MathOps.LOG, "log({1},{0})");
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0*'-1'})) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+
+        add(Ops.AggOps.BOOLEAN_ANY, "bit_or({0})", 0);
+        add(Ops.AggOps.BOOLEAN_ALL, "bit_and({0})", 0);
+
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "dayofweek({0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "dayofyear({0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "extract(year_month from {0})");
+        add(Ops.DateTimeOps.YEAR_WEEK, "yearweek({0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "date_add({0}, interval {1s} year)");
+        add(Ops.DateTimeOps.ADD_MONTHS, "date_add({0}, interval {1s} month)");
+        add(Ops.DateTimeOps.ADD_WEEKS, "date_add({0}, interval {1s} week)");
+        add(Ops.DateTimeOps.ADD_DAYS, "date_add({0}, interval {1s} day)");
+        add(Ops.DateTimeOps.ADD_HOURS, "date_add({0}, interval {1s} hour)");
+        add(Ops.DateTimeOps.ADD_MINUTES, "date_add({0}, interval {1s} minute)");
+        add(Ops.DateTimeOps.ADD_SECONDS, "date_add({0}, interval {1s} second)");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "timestampdiff(year,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "timestampdiff(month,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "timestampdiff(week,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_DAYS, "timestampdiff(day,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "timestampdiff(hour,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "timestampdiff(minute,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "timestampdiff(second,{0},{1})");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "str_to_date(concat(date_format({0},'%Y'),'-1-1'),'%Y-%m-%d')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "str_to_date(concat(date_format({0},'%Y-%m'),'-1'),'%Y-%m-%d')");
+        add(Ops.DateTimeOps.TRUNC_WEEK,   "str_to_date(concat(date_format({0},'%Y-%u'),'-1'),'%Y-%u-%w')");
+        add(Ops.DateTimeOps.TRUNC_DAY,    "str_to_date(date_format({0},'%Y-%m-%d'),'%Y-%m-%d')");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "str_to_date(date_format({0},'%Y-%m-%d %k'),'%Y-%m-%d %k')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "str_to_date(date_format({0},'%Y-%m-%d %k:%i'),'%Y-%m-%d %k:%i')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "str_to_date(date_format({0},'%Y-%m-%d %k:%i:%s'),'%Y-%m-%d %k:%i:%s')");
+
+        addTypeNameToCode("bool", Types.BIT, true);
+        addTypeNameToCode("tinyint unsigned", Types.TINYINT);
+        addTypeNameToCode("bigint unsigned", Types.BIGINT);
+        addTypeNameToCode("long varbinary", Types.LONGVARBINARY, true);
+        addTypeNameToCode("mediumblob", Types.LONGVARBINARY);
+        addTypeNameToCode("longblob", Types.LONGVARBINARY);
+        addTypeNameToCode("blob", Types.LONGVARBINARY);
+        addTypeNameToCode("tinyblob", Types.LONGVARBINARY);
+        addTypeNameToCode("long varchar", Types.LONGVARCHAR, true);
+        addTypeNameToCode("mediumtext", Types.LONGVARCHAR);
+        addTypeNameToCode("longtext", Types.LONGVARCHAR);
+        addTypeNameToCode("text", Types.LONGVARCHAR);
+        addTypeNameToCode("tinytext", Types.LONGVARCHAR);
+        addTypeNameToCode("integer unsigned", Types.INTEGER);
+        addTypeNameToCode("int", Types.INTEGER);
+        addTypeNameToCode("int unsigned", Types.INTEGER);
+        addTypeNameToCode("mediumint", Types.INTEGER);
+        addTypeNameToCode("mediumint unsigned", Types.INTEGER);
+        addTypeNameToCode("smallint unsigned", Types.SMALLINT);
+        addTypeNameToCode("float", Types.REAL, true);
+        addTypeNameToCode("double precision", Types.DOUBLE, true);
+        addTypeNameToCode("real", Types.DOUBLE);
+        addTypeNameToCode("enum", Types.VARCHAR);
+        addTypeNameToCode("set", Types.VARCHAR);
+        addTypeNameToCode("datetime", Types.TIMESTAMP, true);
+    }
+
+    @Override
+    public String escapeLiteral(String str) {
+        StringBuilder builder = new StringBuilder();
+        for (char ch : super.escapeLiteral(str).toCharArray()) {
+            if (ch == '\\') {
+                builder.append("\\");
+            }
+            builder.append(ch);
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        switch (code) {
+            case Types.TINYINT:
+            case Types.SMALLINT:
+            case Types.INTEGER:
+            case Types.BIGINT: return "signed";
+            case Types.FLOAT:
+            case Types.DOUBLE:
+            case Types.REAL:
+            case Types.DECIMAL: return "decimal";
+            case Types.VARCHAR: return "char";
+            default: return super.getCastTypeNameForCode(code);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/OracleTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/OracleTemplates.java
new file mode 100644
index 0000000000..77e909201d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/OracleTemplates.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.dml.SQLInsertBatch;
+
+/**
+ * {@code OracleTemplates} is an SQL dialect for Oracle
+ *
+ * <p>tested with Oracle 10g XE</p>
+ *
+ * @author tiwe
+ */
+public class OracleTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final OracleTemplates DEFAULT = new OracleTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new OracleTemplates(escape, quote);
+            }
+        };
+    }
+
+    private String outerQueryStart = "select * from (\n select a.*, rownum rn from (\n  ";
+
+    private String outerQueryEnd = "\n ) a) where ";
+
+    private String limitQueryStart = "select * from (\n  ";
+
+    private String limitQueryEnd = "\n) where rownum <= {0}";
+
+    private String limitOffsetTemplate = "rn > {0s} and rownum <= {1s}";
+
+    private String offsetTemplate = "rn > {0}";
+
+    private String bulkInsertTemplate = "insert all";
+
+    private String bulkInsertSeparator = " into ";
+
+    public OracleTemplates() {
+        this('\\', false);
+    }
+
+    public OracleTemplates(boolean quote) {
+        this('\\',quote);
+    }
+
+    public OracleTemplates(char escape, boolean quote) {
+        super(Keywords.ORACLE, "\"", escape, quote, false);
+        setParameterMetadataAvailable(false);
+        setBatchCountViaGetUpdateCount(true);
+        setWithRecursive("with ");
+        setCountViaAnalytics(true);
+        setListMaxSize(1000);
+
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+        setPrecedence(Precedence.COMPARISON + 1, Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN,
+                Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+
+        setPrecedence(Precedence.COMPARISON + 1, OTHER_LIKE_CASES);
+
+        add(Ops.ALIAS, "{0} {1}");
+        add(SQLOps.NEXTVAL, "{0s}.nextval");
+
+        // String
+        add(Ops.INDEX_OF, "instrb({0},{1})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "instrb({0},{1},{2+'1'})-1", Precedence.ARITH_LOW);
+        add(Ops.MATCHES, "regexp_like({0},{1})", -1);
+        add(Ops.StringOps.LOCATE, "instr({1},{0})");
+        add(Ops.StringOps.LOCATE2, "instr({1},{0},{2s})");
+        add(Ops.StringOps.LEFT, "substr({0},1,{1})");
+        add(Ops.StringOps.RIGHT, "substr({0},-{1s},length({0}))");
+        add(SQLOps.GROUP_CONCAT, "listagg({0},',')");
+        add(SQLOps.GROUP_CONCAT2, "listagg({0},{1})");
+
+        // Number
+        add(Ops.MathOps.CEIL, "ceil({0})");
+        add(Ops.MathOps.RANDOM, "dbms_random.value");
+        add(Ops.MathOps.LN, "ln({0})");
+        add(Ops.MathOps.LOG, "log({1},{0})");
+        add(Ops.MathOps.COT, "(cos({0}) / sin({0}))");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.DEG, "({0*'180.0'} / " + Math.PI + ")");
+        add(Ops.MathOps.RAD, "({0*'" + Math.PI + "'} / 180.0)");
+
+        // Date / time
+        add(Ops.DateTimeOps.DATE, "trunc({0})");
+
+        add(Ops.DateTimeOps.WEEK, "to_number(to_char({0},'WW'))");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "to_number(to_char({0},'D')) + 1");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "to_number(to_char({0},'DDD'))");
+        add(Ops.DateTimeOps.YEAR_WEEK, "to_number(to_char({0},'IYYY') || to_char({0},'IW'))");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "{0} + interval '{1s}' year");
+        add(Ops.DateTimeOps.ADD_MONTHS, "{0} + interval '{1s}' month");
+        add(Ops.DateTimeOps.ADD_WEEKS, "{0} + interval '{1s}' week");
+        add(Ops.DateTimeOps.ADD_DAYS, "{0} + interval '{1s}' day");
+        add(Ops.DateTimeOps.ADD_HOURS, "{0} + interval '{1s}' hour");
+        add(Ops.DateTimeOps.ADD_MINUTES, "{0} + interval '{1s}' minute");
+        add(Ops.DateTimeOps.ADD_SECONDS, "{0} + interval '{1s}' second");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "trunc(months_between({1}, {0}) / 12)");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "trunc(months_between({1}, {0}))");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "round((cast({1} as date) - cast({0} as date)) / 7)");
+        add(Ops.DateTimeOps.DIFF_DAYS, "round(cast({1} as date) - cast({0} as date))");
+        add(Ops.DateTimeOps.DIFF_HOURS, "round((cast({1} as date) - cast({0} as date)) * 24)");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "round((cast({1} as date) - cast({0} as date)) * 1440)");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "round((cast({1} as date) - cast({0} as date)) * 86400)");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR, "trunc({0}, 'year')");
+        add(Ops.DateTimeOps.TRUNC_MONTH, "trunc({0}, 'month')");
+        add(Ops.DateTimeOps.TRUNC_WEEK, "trunc({0}, 'iw')");
+        add(Ops.DateTimeOps.TRUNC_DAY, "trunc({0}, 'dd')");
+        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc({0}, 'hh')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc({0}, 'mi')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "{0}"); // not truncated
+
+        addTypeNameToCode("intervalds", -104);
+        addTypeNameToCode("intervalym", -103);
+        addTypeNameToCode("timestamp with local time zone", -102);
+        addTypeNameToCode("timestamp with time zone", -101);
+        addTypeNameToCode("long raw", Types.LONGVARBINARY);
+        addTypeNameToCode("raw", Types.VARBINARY);
+        addTypeNameToCode("long", Types.LONGVARCHAR);
+        addTypeNameToCode("varchar2", Types.VARCHAR);
+
+        addTypeNameToCode("number(1,0)", Types.BOOLEAN, true);
+        addTypeNameToCode("number(3,0)", Types.TINYINT, true);
+        addTypeNameToCode("number(5,0)", Types.SMALLINT, true);
+        addTypeNameToCode("number(10,0)", Types.INTEGER, true);
+        addTypeNameToCode("number(19,0)", Types.BIGINT, true);
+        addTypeNameToCode("binary_float", Types.FLOAT, true);
+        addTypeNameToCode("binary_double", Types.DOUBLE, true);
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        switch (code) {
+            case Types.DOUBLE:   return "double precision";
+            case Types.VARCHAR:  return "varchar(4000 char)";
+            default: return super.getCastTypeNameForCode(code);
+        }
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+            case TIMESTAMP_WITH_TIMEZONE:
+                return "timestamp '" + literal + "'";
+            case Types.DATE:
+                return "date '" + literal + "'";
+            case Types.TIME:
+            case TIME_WITH_TIMEZONE:
+                return "timestamp '1970-01-01 " + literal + "'";
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
+            QueryModifiers mod = metadata.getModifiers();
+
+            if (mod.getOffset() == null) {
+                context.append(limitQueryStart);
+                context.serializeForQuery(metadata, forCountRow);
+                context.handle(limitQueryEnd, mod.getLimit());
+            } else {
+                context.append(outerQueryStart);
+                context.serializeForQuery(metadata, forCountRow);
+                context.append(outerQueryEnd);
+
+                if (mod.getLimit() == null) {
+                    context.handle(offsetTemplate, mod.getOffset());
+                } else {
+                    context.handle(limitOffsetTemplate, mod.getOffset(), mod.getLimit());
+                }
+            }
+
+        } else {
+            context.serializeForQuery(metadata, forCountRow);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
+        context.serializeForDelete(metadata, entity);
+
+        // limit
+        if (metadata.getModifiers().isRestricting()) {
+            serializeModifiersForDML(metadata, context);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity, List<SQLInsertBatch> batches, SQLSerializer context) {
+        context.append(bulkInsertTemplate);
+        metadata.addFlag(new QueryFlag(Position.START_OVERRIDE, bulkInsertSeparator));
+        for (SQLInsertBatch batch : batches) {
+            serializeInsert(metadata, entity, batch.getColumns(), batch.getValues(), batch.getSubQuery(), context);
+        }
+        context.append(" select * from dual");
+    }
+
+    @Override
+    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+                                Map<Path<?>, Expression<?>> updates, SQLSerializer context) {
+        context.serializeForUpdate(metadata, entity, updates);
+
+        // limit
+        if (metadata.getModifiers().isRestricting()) {
+            serializeModifiersForDML(metadata, context);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    private void serializeModifiersForDML(QueryMetadata metadata, SQLSerializer context) {
+        if (metadata.getWhere() != null) {
+            context.append(" and ");
+        } else {
+            context.append(getWhere());
+        }
+        context.append("rownum <= ");
+        context.visitConstant(metadata.getModifiers().getLimit());
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        // do nothing
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/PostgreSQLTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/PostgreSQLTemplates.java
new file mode 100644
index 0000000000..a1c76d6f96
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/PostgreSQLTemplates.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+
+import com.querydsl.core.types.Ops;
+
+/**
+ * {@code PostgreSQLTemplates} is an SQL dialect for PostgreSQL
+ *
+ * <p>tested with PostgreSQL 8.4 and 9.1</p>
+ *
+ * @author tiwe
+ *
+ */
+public class PostgreSQLTemplates extends SQLTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final PostgreSQLTemplates DEFAULT = new PostgreSQLTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new PostgreSQLTemplates(escape, quote);
+            }
+        };
+    }
+
+    public PostgreSQLTemplates() {
+        this('\\', false);
+    }
+
+    public PostgreSQLTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public PostgreSQLTemplates(char escape, boolean quote) {
+        super(Keywords.POSTGRESQL, "\"", escape, quote, false);
+        setDummyTable(null);
+        setCountDistinctMultipleColumns(true);
+        setCountViaAnalytics(true);
+        setDefaultValues("\ndefault values");
+        setSupportsUnquotedReservedWordsAsIdentifier(true);
+
+        setForShareSupported(true);
+
+        setPrecedence(Precedence.COMPARISON - 3, Ops.IS_NULL, Ops.IS_NOT_NULL);
+        setPrecedence(Precedence.COMPARISON - 2, Ops.CONCAT, Ops.MATCHES);
+        setPrecedence(Precedence.COMPARISON - 1, Ops.IN);
+        setPrecedence(Precedence.COMPARISON, Ops.BETWEEN);
+        setPrecedence(Precedence.COMPARISON + 1, Ops.LIKE, Ops.LIKE_ESCAPE);
+        setPrecedence(Precedence.COMPARISON + 2, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        setPrecedence(Precedence.COMPARISON + 3, Ops.EQ, Ops.EQ_IGNORE_CASE);
+
+        setPrecedence(Precedence.COMPARISON + 1, OTHER_LIKE_CASES);
+
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+
+        // String
+        add(Ops.MATCHES, "{0} ~ {1}");
+        add(Ops.INDEX_OF, "strpos({0},{1})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "strpos({0},{1})-1", Precedence.ARITH_LOW); //FIXME
+        add(Ops.StringOps.LOCATE,  "strpos({1},{0})");
+        add(Ops.StringOps.LOCATE2, "strpos(repeat('^',{2-'1's}) || substr({1},{2s}),{0})");
+        add(SQLOps.GROUP_CONCAT, "string_agg({0},',')");
+        add(SQLOps.GROUP_CONCAT2, "string_agg({0},{1})");
+
+        add(Ops.LIKE_ESCAPE_IC, "{0} ilike {1} escape '{2s}'");
+        // like without escape
+        if (escape == '\\') {
+            add(Ops.LIKE, "{0} like {1}");
+            add(Ops.LIKE_IC, "{0} ilike {1}");
+            add(Ops.ENDS_WITH, "{0} like {%1}");
+            add(Ops.ENDS_WITH_IC, "{0} ilike {%1}");
+            add(Ops.STARTS_WITH, "{0} like {1%}");
+            add(Ops.STARTS_WITH_IC, "{0} ilike {1%}");
+            add(Ops.STRING_CONTAINS, "{0} like {%1%}");
+            add(Ops.STRING_CONTAINS_IC, "{0} ilike {%1%}");
+        } else {
+            // remap case insensitive operations under 'ilike'
+            add(Ops.LIKE_IC, "{0} ilike {1} escape '" + escape + "'");
+            add(Ops.ENDS_WITH_IC, "{0} ilike {%1} escape '" + escape + "'");
+            add(Ops.STARTS_WITH_IC, "{0} ilike {1%} escape '" + escape + "'");
+            add(Ops.STRING_CONTAINS_IC, "{0} ilike {%1%} escape '" + escape + "'");
+        }
+
+        // Number
+        add(Ops.MathOps.RANDOM, "random()");
+        add(Ops.MathOps.LN, "ln({0})");
+        add(Ops.MathOps.LOG, "log({1s},{0s})");
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0} * -1)) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+
+        // Date / time
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "cast(extract(day from {0}) as integer)");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "cast(extract(dow from {0}) + 1 as integer)");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "cast(extract(doy from {0}) as integer)");
+        add(Ops.DateTimeOps.HOUR, "cast(extract(hour from {0}) as integer)");
+        add(Ops.DateTimeOps.MINUTE, "cast(extract(minute from {0}) as integer)");
+        add(Ops.DateTimeOps.MONTH, "cast(extract(month from {0}) as integer)");
+        add(Ops.DateTimeOps.SECOND, "cast(extract(second from {0}) as integer)");
+        add(Ops.DateTimeOps.WEEK, "cast(extract(week from {0}) as integer)");
+        add(Ops.DateTimeOps.YEAR, "cast(extract(year from {0}) as integer)");
+        add(Ops.DateTimeOps.YEAR_MONTH, "cast(extract(year from {0}) * 100 + extract(month from {0}) as integer)");
+        add(Ops.DateTimeOps.YEAR_WEEK, "cast(extract(isoyear from {0}) * 100 + extract(week from {0}) as integer)");
+
+        add(Ops.AggOps.BOOLEAN_ANY, "bool_or({0})", 0);
+        add(Ops.AggOps.BOOLEAN_ALL, "bool_and({0})", 0);
+
+        add(Ops.DateTimeOps.ADD_YEARS, "{0} + interval '{1s} years'");
+        add(Ops.DateTimeOps.ADD_MONTHS, "{0} + interval '{1s} months'");
+        add(Ops.DateTimeOps.ADD_WEEKS, "{0} + interval '{1s} weeks'");
+        add(Ops.DateTimeOps.ADD_DAYS, "{0} + interval '{1s} days'");
+        add(Ops.DateTimeOps.ADD_HOURS, "{0} + interval '{1s} hours'");
+        add(Ops.DateTimeOps.ADD_MINUTES, "{0} + interval '{1s} minutes'");
+        add(Ops.DateTimeOps.ADD_SECONDS, "{0} + interval '{1s} seconds'");
+
+        String yearsDiff = "date_part('year', age({1}, {0}))";
+        String monthsDiff = "(" + yearsDiff + " * 12 + date_part('month', age({1}, {0})))";
+        String weeksDiff =  "trunc((cast({1} as date) - cast({0} as date))/7)";
+        String daysDiff = "(cast({1} as date) - cast({0} as date))";
+        String hoursDiff = "(" + daysDiff + " * 24 + date_part('hour', age({1}, {0})))";
+        String minutesDiff = "(" + hoursDiff + " * 60 + date_part('minute', age({1}, {0})))";
+        String secondsDiff =  "(" +  minutesDiff + " * 60 + date_part('second', age({1}, {0})))";
+
+        add(Ops.DateTimeOps.DIFF_YEARS,   yearsDiff);
+        add(Ops.DateTimeOps.DIFF_MONTHS,  monthsDiff);
+        add(Ops.DateTimeOps.DIFF_WEEKS,   weeksDiff);
+        add(Ops.DateTimeOps.DIFF_DAYS,    daysDiff);
+        add(Ops.DateTimeOps.DIFF_HOURS,   hoursDiff);
+        add(Ops.DateTimeOps.DIFF_MINUTES, minutesDiff);
+        add(Ops.DateTimeOps.DIFF_SECONDS, secondsDiff);
+
+        addTypeNameToCode("bool", Types.BIT, true);
+        addTypeNameToCode("bytea", Types.BINARY);
+        addTypeNameToCode("name", Types.VARCHAR);
+        addTypeNameToCode("int8", Types.BIGINT, true);
+        addTypeNameToCode("bigserial", Types.BIGINT);
+        addTypeNameToCode("int2", Types.SMALLINT, true);
+        addTypeNameToCode("int2", Types.TINYINT, true); // secondary mapping
+        addTypeNameToCode("int4", Types.INTEGER, true);
+        addTypeNameToCode("serial", Types.INTEGER);
+        addTypeNameToCode("text", Types.VARCHAR);
+        addTypeNameToCode("oid", Types.BIGINT);
+        addTypeNameToCode("xml", Types.SQLXML, true);
+        addTypeNameToCode("float4", Types.REAL, true);
+        addTypeNameToCode("float8", Types.DOUBLE, true);
+        addTypeNameToCode("bpchar", Types.CHAR);
+        addTypeNameToCode("timestamptz", Types.TIMESTAMP);
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        if (jdbcType == Types.BOOLEAN) {
+            return "1".equals(literal) ? "true" : "false";
+        } else {
+            return super.serialize(literal, jdbcType);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/PrimaryKey.java b/querydsl-sql/src/main/java/com/querydsl/sql/PrimaryKey.java
new file mode 100644
index 0000000000..e4f1862804
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/PrimaryKey.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+import com.querydsl.core.annotations.Immutable;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code PrimaryKey} defines a primary key on table
+ *
+ * @param <E> expression type
+ *
+ * @author tiwe
+ */
+@Immutable
+public final class PrimaryKey<E> implements Serializable, ProjectionRole<Tuple> {
+
+    private static final long serialVersionUID = -6913344535043394649L;
+
+    private final RelationalPath<?> entity;
+
+    private final List<? extends Path<?>> localColumns;
+
+    @Nullable
+    private transient volatile Expression<Tuple> mixin;
+
+    public PrimaryKey(RelationalPath<?> entity, Path<?>... localColumns) {
+        this(entity, Arrays.asList(localColumns));
+    }
+
+    public PrimaryKey(RelationalPath<?> entity, List<? extends Path<?>> localColumns) {
+        this.entity = entity;
+        this.localColumns = CollectionUtils.unmodifiableList(localColumns);
+        this.mixin = ExpressionUtils.list(Tuple.class, localColumns);
+    }
+
+    public RelationalPath<?> getEntity() {
+        return entity;
+    }
+
+    public List<? extends Path<?>> getLocalColumns() {
+        return localColumns;
+    }
+
+    public BooleanExpression in(CollectionExpression<?,Tuple> coll) {
+        return Expressions.booleanOperation(Ops.IN, getProjection(), coll);
+    }
+
+    @Override
+    public Expression<Tuple> getProjection() {
+        if (mixin == null) {
+            mixin = ExpressionUtils.list(Tuple.class, localColumns);
+        }
+        return mixin;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
new file mode 100644
index 0000000000..b3884a3434
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.FetchableQuery;
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.Query;
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.support.FetchableSubQueryBase;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Wildcard;
+
+/**
+ * {@code ProjectableSQLQuery} is the base type for SQL query implementations
+ *
+ * @param <T> result type
+ * @param <Q> concrete subtype
+ */
+public abstract class ProjectableSQLQuery<T, Q extends ProjectableSQLQuery<T, Q> & Query<Q>> extends FetchableSubQueryBase<T, Q>
+        implements SQLCommonQuery<Q>, FetchableQuery<T, Q> {
+
+    private static final Path<?> defaultQueryAlias = ExpressionUtils.path(Object.class, "query");
+
+    protected final Configuration configuration;
+
+    @Nullable
+    protected Expression<?> union;
+
+    protected SubQueryExpression<?> firstUnionSubQuery;
+
+    protected boolean unionAll;
+
+    @SuppressWarnings("unchecked")
+    public ProjectableSQLQuery(QueryMixin<Q> queryMixin, Configuration configuration) {
+        super(queryMixin);
+        this.queryMixin.setSelf((Q) this);
+        this.configuration = configuration;
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, @Nullable C context) {
+        if (union != null) {
+            return union.accept(v, context);
+        } else {
+            return super.accept(v, context);
+        }
+    }
+
+    /**
+     * Add the given String literal as a join flag to the last added join with the position
+     * BEFORE_TARGET
+     *
+     * @param flag join flag
+     * @return the current object
+     */
+    @Override
+    public Q addJoinFlag(String flag) {
+        return addJoinFlag(flag, JoinFlag.Position.BEFORE_TARGET);
+    }
+
+    /**
+     * Add the given String literal as a join flag to the last added join
+     *
+     * @param flag join flag
+     * @param position position
+     * @return the current object
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Q addJoinFlag(String flag, JoinFlag.Position position) {
+        queryMixin.addJoinFlag(new JoinFlag(flag, position));
+        return (Q) this;
+    }
+
+    /**
+     * Add the given prefix and expression as a general query flag
+     *
+     * @param position position of the flag
+     * @param prefix prefix for the flag
+     * @param expr expression of the flag
+     * @return the current object
+     */
+    @Override
+    public Q addFlag(Position position, String prefix, Expression<?> expr) {
+        Expression<?> flag = Expressions.template(expr.getType(), prefix + "{0}", expr);
+        return queryMixin.addFlag(new QueryFlag(position, flag));
+    }
+
+    /**
+     * Add the given query flag
+     *
+     * @param flag query flag
+     * @return the current object
+     */
+    public Q addFlag(QueryFlag flag) {
+        return queryMixin.addFlag(flag);
+    }
+
+    /**
+     * Add the given String literal as query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    @Override
+    public Q addFlag(Position position, String flag) {
+        return queryMixin.addFlag(new QueryFlag(position, flag));
+    }
+
+    /**
+     * Add the given Expression as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    @Override
+    public Q addFlag(Position position, Expression<?> flag) {
+        return queryMixin.addFlag(new QueryFlag(position, flag));
+    }
+
+    @Override
+    public long fetchCount() {
+        queryMixin.setProjection(Wildcard.countAsInt);
+        return ((Number) fetchOne()).longValue();
+    }
+
+    public Q from(Expression<?> arg) {
+        return queryMixin.from(arg);
+    }
+
+    @Override
+    public Q from(Expression<?>... args) {
+        return queryMixin.from(args);
+    }
+
+    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public Q from(SubQueryExpression<?> subQuery, Path<?> alias) {
+        return queryMixin.from((Expression) ExpressionUtils.as((Expression) subQuery, alias));
+    }
+
+    @Override
+    public Q fullJoin(EntityPath<?> target) {
+        return queryMixin.fullJoin(target);
+    }
+
+    @Override
+    public <E> Q fullJoin(EntityPath<E> target, Path<E> alias) {
+        return queryMixin.fullJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q fullJoin(RelationalFunctionCall<E> target, Path<E> alias) {
+        return queryMixin.fullJoin(target, alias);
+    }
+
+    @Override
+    public Q fullJoin(SubQueryExpression<?> target, Path<?> alias) {
+        return queryMixin.fullJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity) {
+        return queryMixin.fullJoin(entity).on(key.on(entity));
+    }
+
+    @Override
+    public Q innerJoin(EntityPath<?> target) {
+        return queryMixin.innerJoin(target);
+    }
+
+    @Override
+    public <E> Q innerJoin(EntityPath<E> target, Path<E> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q innerJoin(RelationalFunctionCall<E> target, Path<E> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public Q innerJoin(SubQueryExpression<?> target, Path<?> alias) {
+        return queryMixin.innerJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q innerJoin(ForeignKey<E> key, RelationalPath<E> entity) {
+        return queryMixin.innerJoin(entity).on(key.on(entity));
+    }
+
+    @Override
+    public Q join(EntityPath<?> target) {
+        return queryMixin.join(target);
+    }
+
+    @Override
+    public <E> Q join(EntityPath<E> target, Path<E> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public <E> Q join(RelationalFunctionCall<E> target, Path<E> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public Q join(SubQueryExpression<?> target, Path<?> alias) {
+        return queryMixin.join(target, alias);
+    }
+
+    @Override
+    public <E> Q join(ForeignKey<E> key, RelationalPath<E>  entity) {
+        return queryMixin.join(entity).on(key.on(entity));
+    }
+
+    @Override
+    public Q leftJoin(EntityPath<?> target) {
+        return queryMixin.leftJoin(target);
+    }
+
+    @Override
+    public <E> Q leftJoin(EntityPath<E> target, Path<E> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q leftJoin(RelationalFunctionCall<E> target, Path<E> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public Q leftJoin(SubQueryExpression<?> target, Path<?> alias) {
+        return queryMixin.leftJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q leftJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
+        return queryMixin.leftJoin(entity).on(key.on(entity));
+    }
+
+    @Override
+    public Q rightJoin(EntityPath<?> target) {
+        return queryMixin.rightJoin(target);
+    }
+
+    @Override
+    public <E> Q rightJoin(EntityPath<E> target, Path<E> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q rightJoin(RelationalFunctionCall<E> target, Path<E> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    @Override
+    public Q rightJoin(SubQueryExpression<?> target, Path<?> alias) {
+        return queryMixin.rightJoin(target, alias);
+    }
+
+    @Override
+    public <E> Q rightJoin(ForeignKey<E> key, RelationalPath<E>  entity) {
+        return queryMixin.rightJoin(entity).on(key.on(entity));
+    }
+
+    @SuppressWarnings("unchecked")
+    private <RT> Union<RT> innerUnion(SubQueryExpression<?>... sq) {
+        return innerUnion((List) Arrays.asList(sq));
+    }
+
+    @SuppressWarnings("unchecked")
+    private <RT> Union<RT> innerUnion(List<SubQueryExpression<RT>> sq) {
+        queryMixin.setProjection(sq.get(0).getMetadata().getProjection());
+        if (!queryMixin.getMetadata().getJoins().isEmpty()) {
+            throw new IllegalArgumentException("Don't mix union and from");
+        }
+        this.union = UnionUtils.union(sq, unionAll);
+        this.firstUnionSubQuery = sq.get(0);
+        return new UnionImpl(this);
+    }
+
+    public Q on(Predicate condition) {
+        return queryMixin.on(condition);
+    }
+
+    @Override
+    public Q on(Predicate... conditions) {
+        return queryMixin.on(conditions);
+    }
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param sq subqueries
+     * @return union
+     */
+    public <RT> Union<RT> union(SubQueryExpression<RT>... sq) {
+        return innerUnion(sq);
+    }
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param sq subqueries
+     * @return union
+     */
+    public <RT> Union<RT> union(List<SubQueryExpression<RT>> sq) {
+        return innerUnion(sq);
+    }
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param alias alias for union
+     * @param sq subqueries
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public <RT> Q union(Path<?> alias, SubQueryExpression<RT>... sq) {
+        return from((Expression) UnionUtils.union(Arrays.asList(sq), (Path) alias, false));
+    }
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param sq subqueries
+     * @return union
+     */
+    public <RT> Union<RT> unionAll(SubQueryExpression<RT>... sq) {
+        unionAll = true;
+        return innerUnion(sq);
+    }
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param sq subqueries
+     * @return union
+     */
+    public <RT> Union<RT> unionAll(List<SubQueryExpression<RT>> sq) {
+        unionAll = true;
+        return innerUnion(sq);
+    }
+
+
+    /**
+     * Creates an union expression for the given subqueries
+     *
+     * @param <RT>
+     * @param alias alias for union
+     * @param sq subqueries
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public <RT> Q unionAll(Path<?> alias, SubQueryExpression<RT>... sq) {
+        return from((Expression) UnionUtils.union(Arrays.asList(sq), (Path) alias, true));
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        if (getMetadata().getModifiers().getLimit() == null
+            && !queryMixin.getMetadata().getProjection().toString().contains("count(")) {
+            limit(2);
+        }
+        CloseableIterator<T> iterator = iterate();
+        return uniqueResult(iterator);
+    }
+
+    @Override
+    public Q withRecursive(Path<?> alias, SubQueryExpression<?> query) {
+        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
+        return with(alias, query);
+    }
+
+    @Override
+    public Q withRecursive(Path<?> alias, Expression<?> query) {
+        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
+        return with(alias, query);
+    }
+
+    @Override
+    public WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns) {
+        queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, SQLTemplates.RECURSIVE));
+        return with(alias, columns);
+    }
+
+    @Override
+    public Q with(Path<?> alias, SubQueryExpression<?> query) {
+        Expression<?> expr = ExpressionUtils.operation(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
+        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
+    }
+
+    @Override
+    public Q with(Path<?> alias, Expression<?> query) {
+        Expression<?> expr = ExpressionUtils.operation(alias.getType(), SQLOps.WITH_ALIAS, alias, query);
+        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, expr));
+    }
+
+    @Override
+    public WithBuilder<Q> with(Path<?> alias, Path<?>... columns) {
+        Expression<?> columnsCombined = ExpressionUtils.list(Object.class, columns);
+        Expression<?> aliasCombined = Expressions.operation(alias.getType(), SQLOps.WITH_COLUMNS, alias, columnsCombined);
+        return new WithBuilder<Q>(queryMixin, aliasCombined);
+    }
+
+    protected void clone(Q query) {
+        this.union = query.union;
+        this.unionAll = query.unionAll;
+        this.firstUnionSubQuery = query.firstUnionSubQuery;
+    }
+
+    @Override
+    public abstract Q clone();
+
+    protected abstract SQLSerializer createSerializer();
+
+    private Set<Path<?>> getRootPaths(Collection<? extends Expression<?>> exprs) {
+        Set<Path<?>> paths = new HashSet<>();
+        for (Expression<?> e : exprs) {
+            Path<?> path = e.accept(PathExtractor.DEFAULT, null);
+            if (path != null && !path.getMetadata().isRoot()) {
+                paths.add(path.getMetadata().getRootPath());
+            }
+        }
+        return paths;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Collection<? extends Expression<?>> expandProjection(Expression<?> expr) {
+        if (expr instanceof FactoryExpression) {
+            return ((FactoryExpression) expr).getArgs();
+        } else {
+            return Collections.singletonList(expr);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected SQLSerializer serialize(boolean forCountRow) {
+        SQLSerializer serializer = createSerializer();
+        if (union != null) {
+            if (queryMixin.getMetadata().getProjection() == null ||
+                expandProjection(queryMixin.getMetadata().getProjection())
+                .equals(expandProjection(firstUnionSubQuery.getMetadata().getProjection()))) {
+                serializer.serializeUnion(union, queryMixin.getMetadata(), unionAll);
+            } else {
+                QueryMixin<Q> mixin2 = new QueryMixin<Q>(queryMixin.getMetadata().clone());
+                Set<Path<?>> paths = getRootPaths(expandProjection(mixin2.getMetadata().getProjection()));
+                if (paths.isEmpty()) {
+                    mixin2.from(ExpressionUtils.as((Expression) union, defaultQueryAlias));
+                } else if (paths.size() == 1) {
+                    mixin2.from(ExpressionUtils.as((Expression) union, paths.iterator().next()));
+                } else {
+                    throw new IllegalStateException("Unable to create serialize union");
+                }
+                serializer.serialize(mixin2.getMetadata(), forCountRow);
+            }
+        } else {
+            serializer.serialize(queryMixin.getMetadata(), forCountRow);
+        }
+        return serializer;
+    }
+
+    /**
+     * Get the query as an SQL query string and bindings
+     *
+     * @return SQL string and bindings
+     */
+    public SQLBindings getSQL() {
+        return getSQL(serialize(false));
+    }
+
+    protected SQLBindings getSQL(SQLSerializer serializer) {
+        List<Object> args = new ArrayList<>();
+        Map<ParamExpression<?>, Object> params = getMetadata().getParams();
+        for (Object o : serializer.getConstants()) {
+            if (o instanceof ParamExpression) {
+                if (!params.containsKey(o)) {
+                    throw new ParamNotSetException((ParamExpression<?>) o);
+                }
+                o = queryMixin.getMetadata().getParams().get(o);
+            }
+            args.add(o);
+        }
+        return new SQLBindings(serializer.toString(), args);
+    }
+
+    @Override
+    public String toString() {
+        SQLSerializer serializer = serialize(false);
+        return serializer.toString().trim();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/QBeans.java b/querydsl-sql/src/main/java/com/querydsl/sql/QBeans.java
new file mode 100644
index 0000000000..be954c625a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/QBeans.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.ArrayUtils;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * Expression used to project a list of beans
+ *
+ * @author luis
+ */
+public class QBeans extends FactoryExpressionBase<Beans> {
+
+    private static final long serialVersionUID = -4411839816134215923L;
+
+    private final Map<RelationalPath<?>, QBean<?>> qBeans;
+
+    private final List<Expression<?>> expressions;
+
+    @SuppressWarnings("unchecked")
+    public QBeans(RelationalPath<?>... beanPaths) {
+        super(Beans.class);
+        try {
+            final List<Expression<?>> listBuilder = new ArrayList<>();
+            final Map<RelationalPath<?>, QBean<?>> mapBuilder = new HashMap<>();
+            for (RelationalPath<?> path : beanPaths) {
+                Map<String, Expression<?>> bindings = new LinkedHashMap<String, Expression<?>>();
+                for (Path<?> column : path.getColumns()) {
+                    bindings.put(column.getMetadata().getName(), column);
+                    listBuilder.add(column);
+                }
+                mapBuilder.put(path, Projections.bean((Class) path.getType(), bindings));
+            }
+            expressions = CollectionUtils.unmodifiableList(listBuilder);
+            qBeans = Collections.unmodifiableMap(mapBuilder);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public List<Expression<?>> getArgs() {
+        return expressions;
+    }
+
+    @Override
+    public Beans newInstance(Object... args) {
+        int offset = 0;
+        Map<RelationalPath<?>, Object> beans = new HashMap<RelationalPath<?>, Object>();
+        for (Map.Entry<RelationalPath<?>, QBean<?>> entry : qBeans.entrySet()) {
+            RelationalPath<?> path = entry.getKey();
+            QBean<?> qBean = entry.getValue();
+            int argsSize = qBean.getArgs().size();
+            Object[] subArgs = ArrayUtils.subarray(args, offset, offset + argsSize);
+            beans.put(path, qBean.newInstance(subArgs));
+            offset += argsSize;
+        }
+        return new Beans(beans);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/RelationalFunctionCall.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalFunctionCall.java
new file mode 100644
index 0000000000..d39142bd18
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalFunctionCall.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.SimpleExpression;
+
+/**
+ * Represents a table valued function call
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class RelationalFunctionCall<T> extends SimpleExpression<T> implements TemplateExpression<T> {
+
+    private static final long serialVersionUID = 256739044928186923L;
+
+    private static Template createTemplate(String function, int argCount) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(function);
+        builder.append("(");
+        for (int i = 0; i < argCount; i++) {
+            if (i > 0) {
+                builder.append(", ");
+            }
+            builder.append("{").append(i).append("}");
+        }
+        builder.append(")");
+        return TemplateFactory.DEFAULT.create(builder.toString());
+    }
+
+    private final TemplateExpression<T> templateMixin;
+
+    protected RelationalFunctionCall(Class<? extends T> type, String function, Object... args) {
+        super(ExpressionUtils.template(type, createTemplate(function, args.length), args));
+        templateMixin = (TemplateExpression<T>) mixin;
+    }
+
+    @Override
+    public final <R,C> R accept(Visitor<R,C> v, C context) {
+        return v.visit(this, context);
+    }
+
+    @Override
+    public Object getArg(int index) {
+        return templateMixin.getArg(index);
+    }
+
+    @Override
+    public List<?> getArgs() {
+        return templateMixin.getArgs();
+    }
+
+    @Override
+    public Template getTemplate() {
+        return templateMixin.getTemplate();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPath.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPath.java
similarity index 77%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPath.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/RelationalPath.java
index 84a677a754..904ee6fba9 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPath.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,57 +11,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
-import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.List;
 
-import com.mysema.query.types.EntityPath;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.ProjectionRole;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.EntityPath;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.ProjectionRole;
 
 /**
  * RelationalPath extends {@link EntityPath} to provide access to relational
  * metadata
  *
- * @author tiwe
+ * @param <T> expression type
  *
+ * @author tiwe
  */
 public interface RelationalPath<T> extends EntityPath<T>, ProjectionRole<T> {
 
     /**
      * Get the schema and table name
      *
-     * @return
+     * @return schema and table
      */
     SchemaAndTable getSchemaAndTable();
 
     /**
      * Get the schema name
      *
-     * @return
+     * @return schema
      */
     String getSchemaName();
 
     /**
      * Get the table name
      *
-     * @return
+     * @return table
      */
     String getTableName();
 
     /**
      * Get all columns
      *
-     * @return
+     * @return columns
      */
     List<Path<?>> getColumns();
 
     /**
      * Get the primary key for this relation or null if none exists
      *
-     * @return
+     * @return primary key
      */
     @Nullable
     PrimaryKey<T> getPrimaryKey();
@@ -69,14 +71,14 @@ public interface RelationalPath<T> extends EntityPath<T>, ProjectionRole<T> {
     /**
      * Get the foreign keys for this relation
      *
-     * @return
+     * @return foreign keys
      */
     Collection<ForeignKey<?>> getForeignKeys();
 
     /**
      * Get the inverse foreign keys for this relation
      *
-     * @return
+     * @return inverse foreign keys
      */
     Collection<ForeignKey<?>> getInverseForeignKeys();
 
@@ -84,6 +86,8 @@ public interface RelationalPath<T> extends EntityPath<T>, ProjectionRole<T> {
      * Returns the metadata for this path or null if none was assigned. See
      * {@link ColumnMetadata#getColumnMetadata(Path)} for a null safe
      * alternative
+     *
+     * @return column metadata for path
      */
     @Override
     @Nullable
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathBase.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathBase.java
new file mode 100644
index 0000000000..40969d2bfb
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathBase.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * {@code RelationalPathBase} is a base class for {@link RelationalPath} implementations
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ *            entity type
+ */
+public class RelationalPathBase<T> extends BeanPath<T> implements RelationalPath<T> {
+
+    private static final long serialVersionUID = -7031357250283629202L;
+
+    @Nullable
+    private PrimaryKey<T> primaryKey;
+
+    private final Map<Path<?>, ColumnMetadata> columnMetadata = new LinkedHashMap<>();
+
+    private final List<ForeignKey<?>> foreignKeys = new ArrayList<>();
+
+    private final List<ForeignKey<?>> inverseForeignKeys = new ArrayList<>();
+
+    private final String schema, table;
+
+    private final SchemaAndTable schemaAndTable;
+
+    private transient FactoryExpression<T> projection;
+
+    private transient NumberExpression<Long> count, countDistinct;
+
+    public RelationalPathBase(Class<? extends T> type, String variable, String schema, String table) {
+        this(type, PathMetadataFactory.forVariable(variable), schema, table);
+    }
+
+    public RelationalPathBase(Class<? extends T> type, PathMetadata metadata, String schema,
+            String table) {
+        super(type, metadata);
+        this.schema = schema;
+        this.table = table;
+        this.schemaAndTable = new SchemaAndTable(schema, table);
+    }
+
+    protected PrimaryKey<T> createPrimaryKey(Path<?>... columns) {
+        primaryKey = new PrimaryKey<T>(this, columns);
+        return primaryKey;
+    }
+
+    protected <F> ForeignKey<F> createForeignKey(Path<?> local, String foreign) {
+        ForeignKey<F> foreignKey = new ForeignKey<F>(this, local, foreign);
+        foreignKeys.add(foreignKey);
+        return foreignKey;
+    }
+
+    protected <F> ForeignKey<F> createForeignKey(List<? extends Path<?>> local, List<String> foreign) {
+        ForeignKey<F> foreignKey = new ForeignKey<F>(this, new ArrayList<>(local), new ArrayList<>(foreign));
+        foreignKeys.add(foreignKey);
+        return foreignKey;
+    }
+
+    protected <F> ForeignKey<F> createInvForeignKey(Path<?> local, String foreign) {
+        ForeignKey<F> foreignKey = new ForeignKey<F>(this, local, foreign);
+        inverseForeignKeys.add(foreignKey);
+        return foreignKey;
+    }
+
+    protected <F> ForeignKey<F> createInvForeignKey(List<? extends Path<?>> local,
+            List<String> foreign) {
+        ForeignKey<F> foreignKey = new ForeignKey<F>(this, new ArrayList<>(local), new ArrayList<>(foreign));
+        inverseForeignKeys.add(foreignKey);
+        return foreignKey;
+    }
+
+    protected <P extends Path<?>> P addMetadata(P path, ColumnMetadata metadata) {
+        columnMetadata.put(path, metadata);
+        return path;
+    }
+
+    @Override
+    public NumberExpression<Long> count() {
+        if (count == null) {
+            if (primaryKey != null) {
+                count = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_AGG,
+                        primaryKey.getLocalColumns().get(0));
+            } else {
+                throw new IllegalStateException("No count expression can be created");
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public NumberExpression<Long> countDistinct() {
+        if (countDistinct == null) {
+            if (primaryKey != null) {
+                // TODO handle multiple column primary keys properly
+                countDistinct = Expressions.numberOperation(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG,
+                        primaryKey.getLocalColumns().get(0));
+            } else {
+                throw new IllegalStateException("No count distinct expression can be created");
+            }
+        }
+        return countDistinct;
+    }
+
+    /**
+     * Compares the two relational paths using primary key columns
+     *
+     * @param right rhs of the comparison
+     * @return this == right
+     */
+    @Override
+    public BooleanExpression eq(T right) {
+        if (right instanceof RelationalPath) {
+            return primaryKeyOperation(Ops.EQ, primaryKey, ((RelationalPath) right).getPrimaryKey());
+        } else {
+            return super.eq(right);
+        }
+    }
+
+    /**
+     * Compares the two relational paths using primary key columns
+     *
+     * @param right rhs of the comparison
+     * @return this == right
+     */
+    @Override
+    public BooleanExpression eq(Expression<? super T> right) {
+        if (right instanceof RelationalPath) {
+            return primaryKeyOperation(Ops.EQ, primaryKey, ((RelationalPath) right).getPrimaryKey());
+        } else {
+            return super.eq(right);
+        }
+    }
+
+    /**
+     * Compares the two relational paths using primary key columns
+     *
+     * @param right rhs of the comparison
+     * @return this != right
+     */
+    @Override
+    public BooleanExpression ne(T right) {
+        if (right instanceof RelationalPath) {
+            return primaryKeyOperation(Ops.NE, primaryKey, ((RelationalPath) right).getPrimaryKey());
+        } else {
+            return super.ne(right);
+        }
+    }
+
+    /**
+     * Compares the two relational paths using primary key columns
+     *
+     * @param right rhs of the comparison
+     * @return this != right
+     */
+    @Override
+    public BooleanExpression ne(Expression<? super T> right) {
+        if (right instanceof RelationalPath) {
+            return primaryKeyOperation(Ops.NE, primaryKey, ((RelationalPath) right).getPrimaryKey());
+        } else {
+            return super.ne(right);
+        }
+    }
+
+    private BooleanExpression primaryKeyOperation(Operator op, PrimaryKey<?> pk1, PrimaryKey<?> pk2) {
+        if (pk1 == null || pk2 == null) {
+            throw new UnsupportedOperationException("No primary keys available");
+        }
+        if (pk1.getLocalColumns().size() != pk2.getLocalColumns().size()) {
+            throw new UnsupportedOperationException("Size mismatch for primary key columns");
+        }
+        BooleanExpression rv = null;
+        for (int i = 0; i < pk1.getLocalColumns().size(); i++) {
+            BooleanExpression pred = Expressions.booleanOperation(op, pk1.getLocalColumns().get(i), pk2.getLocalColumns().get(i));
+            rv = rv != null ? rv.and(pred) : pred;
+        }
+        return rv;
+    }
+
+    @Override
+    public FactoryExpression<T> getProjection() {
+        if (projection == null) {
+            projection = RelationalPathUtils.createProjection(this);
+        }
+        return projection;
+    }
+
+    public Path<?>[] all() {
+        return columnMetadata.keySet().toArray(new Path<?>[0]);
+    }
+
+    @Override
+    protected <P extends Path<?>> P add(P path) {
+        return path;
+    }
+
+    @Override
+    public List<Path<?>> getColumns() {
+        return new ArrayList<>(this.columnMetadata.keySet());
+    }
+
+    @Override
+    public Collection<ForeignKey<?>> getForeignKeys() {
+        return foreignKeys;
+    }
+
+    @Override
+    public Collection<ForeignKey<?>> getInverseForeignKeys() {
+        return inverseForeignKeys;
+    }
+
+    @Override
+    public PrimaryKey<T> getPrimaryKey() {
+        return primaryKey;
+    }
+
+    @Override
+    public SchemaAndTable getSchemaAndTable() {
+        return schemaAndTable;
+    }
+
+    @Override
+    public String getSchemaName() {
+        return schema;
+    }
+
+    @Override
+    public String getTableName() {
+        return table;
+    }
+
+    @Override
+    public ColumnMetadata getMetadata(Path<?> column) {
+        return columnMetadata.get(column);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathExtractor.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java
similarity index 75%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathExtractor.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java
index 8f5566bf85..6c8f2880c7 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/RelationalPathExtractor.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,28 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
-import static com.mysema.query.util.CollectionUtils.add;
+import static com.querydsl.core.util.CollectionUtils.add;
 
+import java.util.Collections;
 import java.util.Set;
 
-import com.google.common.collect.ImmutableSet;
-import com.mysema.query.JoinExpression;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.types.Constant;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.ParamExpression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.TemplateExpression;
-import com.mysema.query.types.Visitor;
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.*;
 
 /**
- * RelationalPathExtractor extracts RelationlPath instances from expressions and queries
+ * {@code RelationalPathExtractor} extracts {@link RelationalPath} instances from expressions and queries
  *
  * @author tiwe
  *
@@ -42,10 +33,10 @@ public final class RelationalPathExtractor implements Visitor<Set<RelationalPath
     public static final RelationalPathExtractor DEFAULT = new RelationalPathExtractor();
 
     public static Set<RelationalPath<?>> extract(QueryMetadata md) {
-        Set<RelationalPath<?>> known = ImmutableSet.of();
+        Set<RelationalPath<?>> known = Collections.emptySet();
         known = DEFAULT.visitJoins(md.getJoins(), known);
-        for (Expression<?> p : md.getProjection()) {
-            known = p.accept(DEFAULT, known);
+        if (md.getProjection() != null) {
+            known = md.getProjection().accept(DEFAULT, known);
         }
         for (OrderSpecifier<?> o : md.getOrderBy()) {
             known = o.getTarget().accept(DEFAULT, known);
@@ -63,7 +54,7 @@ public static Set<RelationalPath<?>> extract(QueryMetadata md) {
     }
 
     public static Set<RelationalPath<?>> extract(Expression<?> expr) {
-        return expr.accept(DEFAULT, ImmutableSet.<RelationalPath<?>>of());
+        return expr.accept(DEFAULT, Collections.emptySet());
     }
 
     @Override
@@ -96,7 +87,7 @@ public Set<RelationalPath<?>> visit(ParamExpression<?> expr, Set<RelationalPath<
     public Set<RelationalPath<?>> visit(Path<?> expr, Set<RelationalPath<?>> known) {
         if (expr.getMetadata().isRoot()) {
             if (expr instanceof RelationalPath) {
-                known = add(known, (RelationalPath<?>)expr);
+                known = add(known, (RelationalPath<?>) expr);
             }
         } else {
             known = expr.getMetadata().getParent().accept(this, known);
@@ -109,8 +100,8 @@ public Set<RelationalPath<?>> visit(SubQueryExpression<?> expr, Set<RelationalPa
         Set<RelationalPath<?>> old = known;
         final QueryMetadata md = expr.getMetadata();
         known = visitJoins(md.getJoins(), known);
-        for (Expression<?> p : md.getProjection()) {
-            known = p.accept(this, known);
+        if (md.getProjection() != null) {
+            known = md.getProjection().accept(this, known);
         }
         for (OrderSpecifier<?> o : md.getOrderBy()) {
             known = o.getTarget().accept(this, known);
@@ -132,7 +123,7 @@ public Set<RelationalPath<?>> visit(SubQueryExpression<?> expr, Set<RelationalPa
     public Set<RelationalPath<?>> visit(TemplateExpression<?> expr, Set<RelationalPath<?>> known) {
         for (Object arg : expr.getArgs()) {
             if (arg instanceof Expression<?>) {
-                known = ((Expression<?>)arg).accept(this, known);
+                known = ((Expression<?>) arg).accept(this, known);
             }
         }
         return known;
@@ -148,6 +139,6 @@ private Set<RelationalPath<?>> visitJoins(Iterable<JoinExpression> joins, Set<Re
         return known;
     }
 
-    private RelationalPathExtractor() {}
+    private RelationalPathExtractor() { }
 
 }
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathUtils.java b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathUtils.java
new file mode 100644
index 0000000000..91275e2975
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/RelationalPathUtils.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Projections;
+
+/**
+ * {@code RelationalPathUtils} provides static utility methods for {@link RelationalPath} instances
+ *
+ * @author tiwe
+ *
+ */
+@SuppressWarnings("unchecked")
+public final class RelationalPathUtils {
+
+    public static <T> FactoryExpression<T> createProjection(RelationalPath<T> path) {
+        if (path.getType().equals(path.getClass())) {
+            throw new IllegalArgumentException("RelationalPath based projection can only be used with generated Bean types");
+        }
+        try {
+            // ensure that empty constructor is available
+            path.getType().getConstructor();
+            return createBeanProjection(path);
+        } catch (NoSuchMethodException e) {
+            // fallback to constructor projection
+            return createConstructorProjection(path);
+        }
+    }
+
+    private static <T> FactoryExpression<T> createConstructorProjection(RelationalPath<T> path) {
+        Expression<?>[] exprs = path.getColumns().toArray(new Expression[0]);
+        return Projections.<T>constructor((Class) path.getType(), exprs);
+    }
+
+    private static <T> FactoryExpression<T> createBeanProjection(RelationalPath<T> path) {
+        Map<String,Expression<?>> bindings = new LinkedHashMap<String,Expression<?>>();
+        for (Path<?> column : path.getColumns()) {
+            bindings.put(column.getMetadata().getName(), column);
+        }
+        if (bindings.isEmpty()) {
+            throw new IllegalArgumentException("No bindings could be derived from " + path);
+        }
+        return Projections.<T>fields((Class) path.getType(), bindings);
+    }
+
+    private RelationalPathUtils() { }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLBaseListener.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLBaseListener.java
new file mode 100644
index 0000000000..5d250aca26
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLBaseListener.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
+
+/**
+ * {@code SQLBaseListener} is a base implementation of the {@link SQLDetailedListener} interface
+ * with empty method implementations
+ */
+public class SQLBaseListener implements SQLDetailedListener {
+
+    @Override
+    public void start(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void preRender(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void rendered(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void prePrepare(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void prepared(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void preExecute(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void executed(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void exception(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void end(SQLListenerContext context) {
+
+    }
+
+    @Override
+    public void notifyQuery(QueryMetadata md) {
+
+    }
+
+    @Override
+    public void notifyDelete(RelationalPath<?> entity, QueryMetadata md) {
+
+    }
+
+    @Override
+    public void notifyDeletes(RelationalPath<?> entity, List<QueryMetadata> batches) {
+
+    }
+
+    @Override
+    public void notifyMerge(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> keys, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+
+    }
+
+    @Override
+    public void notifyMerges(RelationalPath<?> entity, QueryMetadata md, List<SQLMergeBatch> batches) {
+
+    }
+
+    @Override
+    public void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+
+    }
+
+    @Override
+    public void notifyInserts(RelationalPath<?> entity, QueryMetadata md, List<SQLInsertBatch> batches) {
+
+    }
+
+    @Override
+    public void notifyUpdate(RelationalPath<?> entity, QueryMetadata md, Map<Path<?>, Expression<?>> updates) {
+
+    }
+
+    @Override
+    public void notifyUpdates(RelationalPath<?> entity, List<SQLUpdateBatch> batches) {
+
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLBindings.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLBindings.java
new file mode 100644
index 0000000000..82bcfc1f02
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLBindings.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+import java.util.logging.Logger;
+
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code SQLBindings} provides the SQL query string and bindings
+ *
+ * @author tiwe
+ *
+ */
+public class SQLBindings {
+
+    private static final Logger log = Logger.getLogger(SQLBindings.class.getName());
+
+    private final String sql;
+
+    private final List<Object> bindings;
+
+    public SQLBindings(String sql, List<Object> bindings) {
+        this.sql = sql;
+        this.bindings = CollectionUtils.unmodifiableList(bindings);
+    }
+
+    public String getSQL() {
+        return sql;
+    }
+
+    public List<Object> getNullFriendlyBindings() {
+        return bindings;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLCloseListener.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCloseListener.java
new file mode 100644
index 0000000000..040c2923cd
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCloseListener.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import com.querydsl.core.QueryException;
+
+/**
+ * {@code SQLCloseListener} closes the JDBC connection at the end of the query or clause execution
+ */
+public final class SQLCloseListener extends SQLBaseListener {
+
+    public static final SQLCloseListener DEFAULT = new SQLCloseListener();
+
+    private SQLCloseListener() { }
+
+    @Override
+    public void end(SQLListenerContext context) {
+        Connection connection = context.getConnection();
+        if (connection != null && context.getData(AbstractSQLQuery.PARENT_CONTEXT) == null) {
+            try {
+                connection.close();
+            } catch (SQLException e) {
+                throw new QueryException(e);
+            }
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQuery.java
new file mode 100644
index 0000000000..1106ba6b11
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQuery.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.Query;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.types.*;
+
+/**
+ * {@code SQLCommonQuery} is a common interface for SQLQuery and SQLSubQuery
+ *
+ * @author tiwe
+ *
+ * @param <Q> concrete type
+ */
+public interface SQLCommonQuery<Q extends SQLCommonQuery<Q>> extends Query<Q> {
+
+    /**
+     * Add the given Expression as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    Q addFlag(Position position, Expression<?> flag);
+
+    /**
+     * Add the given String literal as query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    Q addFlag(Position position, String flag);
+
+    /**
+     * Add the given prefix and expression as a general query flag
+     *
+     * @param position position of the flag
+     * @param prefix prefix for the flag
+     * @param expr expression of the flag
+     * @return the current object
+     */
+    Q addFlag(Position position, String prefix, Expression<?> expr);
+
+    /**
+     * Add the given String literal as a join flag to the last added join with the
+     * position BEFORE_TARGET
+     *
+     * @param flag join flag
+     * @return the current object
+     */
+    Q addJoinFlag(String flag);
+
+    /**
+     * Add the given String literal as a join flag to the last added join
+     *
+     * @param flag join flag
+     * @param position position
+     * @return the current object
+     */
+    Q addJoinFlag(String flag, JoinFlag.Position position);
+
+    /**
+     * Defines the sources of the query
+     *
+     * @param o from
+     * @return the current object
+     */
+    Q from(Expression<?>... o);
+
+    /**
+     * Adds a sub query source
+     *
+     * @param subQuery sub query
+     * @param alias alias
+     * @return the current object
+     */
+    Q from(SubQueryExpression<?> subQuery, Path<?> alias);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param o full join target
+     * @return the current object
+     */
+    Q fullJoin(EntityPath<?> o);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param <E>
+     * @param o full join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q fullJoin(EntityPath<E> o, Path<E> alias);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param <E>
+     * @param o full join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q fullJoin(RelationalFunctionCall<E> o, Path<E> alias);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param <E>
+     * @param key foreign key for join
+     * @param entity join target
+     * @return the current object
+     */
+    <E> Q fullJoin(ForeignKey<E> key, RelationalPath<E> entity);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param o subquery
+     * @param alias alias
+     * @return the current object
+     */
+    Q fullJoin(SubQueryExpression<?> o, Path<?> alias);
+
+    /**
+     * Adds an inner join to the given target
+     *
+     * @param o
+     * @return the current object
+     */
+    Q innerJoin(EntityPath<?> o);
+
+    /**
+     * Adds an inner join to the given target
+     *
+     * @param <E>
+     * @param o inner join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q innerJoin(EntityPath<E> o, Path<E> alias);
+
+    /**
+     * Adds a inner join to the given target
+     *
+     * @param <E>
+     * @param o relational function call
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q innerJoin(RelationalFunctionCall<E> o, Path<E> alias);
+
+    /**
+     * Adds an inner join to the given target
+     *
+     * @param <E>
+     * @param foreign foreign key to use for join
+     * @param entity join target
+     * @return the current object
+     */
+    <E> Q innerJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
+
+    /**
+     * Adds an inner join to the given target
+     *
+     * @param o subquery
+     * @param alias alias
+     * @return the current object
+     */
+    Q innerJoin(SubQueryExpression<?> o, Path<?> alias);
+
+    /**
+     * Adds a join to the given target
+     *
+     * @param o join target
+     * @return the current object
+     */
+    Q join(EntityPath<?> o);
+
+    /**
+     * Adds a join to the given target
+     *
+     * @param <E>
+     * @param o join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q join(EntityPath<E> o, Path<E> alias);
+
+    /**
+     * Adds a join to the given target
+     *
+     * @param <E>
+     * @param o join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q join(RelationalFunctionCall<E> o, Path<E> alias);
+
+    /**
+     * Adds a join to the given target
+     *
+     * @param <E>
+     * @param foreign foreign key to use for join
+     * @param entity join target
+     * @return the current object
+     */
+    <E> Q join(ForeignKey<E> foreign, RelationalPath<E> entity);
+
+    /**
+     * Adds a join to the given target
+     *
+     * @param o subquery
+     * @param alias alias
+     * @return the current object
+     */
+    Q join(SubQueryExpression<?> o, Path<?> alias);
+
+    /**
+     * Adds a left join to the given target
+     *
+     * @param o join target
+     * @return the current object
+     */
+    Q leftJoin(EntityPath<?> o);
+
+    /**
+     * Adds a left join to the given target
+     *
+     * @param <E>
+     * @param o left join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q leftJoin(EntityPath<E> o, Path<E> alias);
+
+    /**
+     * Adds a left join to the given target
+     *
+     * @param <E>
+     * @param o relational function call
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q leftJoin(RelationalFunctionCall<E> o, Path<E> alias);
+
+    /**
+     * Adds a left join to the given target
+     *
+     * @param <E>
+     * @param foreign foreign key to use for join
+     * @param entity join target
+     * @return the current object
+     */
+    <E> Q leftJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
+
+    /**
+     * Adds a left join to the given target
+     *
+     * @param o subquery
+     * @param alias alias
+     * @return the current object
+     */
+    Q leftJoin(SubQueryExpression<?> o, Path<?> alias);
+
+    /**
+     * Defines a filter to the last added join
+     *
+     * @param conditions join conditions
+     * @return the current object
+     */
+    Q on(Predicate... conditions);
+
+    /**
+     * Adds a right join to the given target
+     *
+     * @param o join target
+     * @return the current object
+     */
+    Q rightJoin(EntityPath<?> o);
+
+    /**
+     * Adds a right join to the given target
+     *
+     * @param <E>
+     * @param o right join target
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q rightJoin(EntityPath<E> o, Path<E> alias);
+
+    /**
+     * Adds a full join to the given target
+     *
+     * @param <E>
+     * @param o relational function call
+     * @param alias alias
+     * @return the current object
+     */
+    <E> Q rightJoin(RelationalFunctionCall<E> o, Path<E> alias);
+
+    /**
+     * Adds a right join to the given target
+     *
+     * @param <E>
+     * @param foreign foreign key to use for join
+     * @param entity join target
+     * @return the current object
+     */
+    <E> Q rightJoin(ForeignKey<E> foreign, RelationalPath<E> entity);
+
+    /**
+     * Adds a right join to the given target
+     *
+     * @param o subquery
+     * @param alias alias
+     * @return the current object
+     */
+    Q rightJoin(SubQueryExpression<?> o, Path<?> alias);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.with(alias, subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param o subquery
+     * @return the current object
+     */
+    Q with(Path<?> alias, SubQueryExpression<?> o);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.with(alias, subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param query subquery
+     * @return the current object
+     */
+    Q with(Path<?> alias, Expression<?> query);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.with(alias, columns...).as(subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param columns columns to use
+     * @return the current object
+     */
+    WithBuilder<Q> with(Path<?> alias, Path<?>... columns);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.withRecursive(alias, subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param o subquery
+     * @return the current object
+     */
+    Q withRecursive(Path<?> alias, SubQueryExpression<?> o);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.withRecursive(alias, subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param query subquery
+     * @return the current object
+     */
+    Q withRecursive(Path<?> alias, Expression<?> query);
+
+    /**
+     * Adds a common table expression
+     *
+     * <p>Usage</p>
+     * <pre>
+     * query.withRecursive(alias, columns...).as(subQuery)
+     *      .from(...)
+     * </pre>
+     *
+     * @param alias alias for query
+     * @param columns columns to use
+     * @return builder for with part
+     */
+    WithBuilder<Q> withRecursive(Path<?> alias, Path<?>... columns);
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQueryFactory.java
new file mode 100644
index 0000000000..84a7179401
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLCommonQueryFactory.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.QueryFactory;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLMergeClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+
+/**
+ * Factory interface for query and clause creation.
+ *
+ * <p>The default implementation is {@link SQLQueryFactory} and should be used for general
+ * query creation. Type specific variants are available if database specific queries need to be created.</p>
+ *
+ * @author tiwe
+ *
+ * @param <Q> query type
+ * @param <D> delete clause type
+ * @param <U> update clause type
+ * @param <I> insert clause type
+ * @param <M> merge clause type
+ */
+public interface SQLCommonQueryFactory<Q extends SQLCommonQuery<?>, // extends AbstractSQLQuery<?>
+    D extends SQLDeleteClause,
+    U extends SQLUpdateClause,
+    I extends SQLInsertClause,
+    M extends SQLMergeClause> extends QueryFactory<Q> {
+
+    /**
+     * Create a new DELETE clause
+     *
+     * @param path table to delete from
+     * @return delete clause
+     */
+    D delete(RelationalPath<?> path);
+
+    /**
+     * Create a new SELECT query
+     *
+     * @param from query source
+     * @return query
+     */
+    Q from(Expression<?> from);
+
+    /**
+     * Create a new SELECT query
+     *
+     * @param from query sources
+     * @return query
+     */
+    Q from(Expression<?>... from);
+
+    /**
+     * Create a new SELECT query
+     *
+     * @param subQuery query source
+     * @param alias alias
+     * @return query
+     */
+    Q from(SubQueryExpression<?> subQuery, Path<?> alias);
+
+    /**
+     * Create a new INSERT INTO clause
+     *
+     * @param path table to insert to
+     * @return insert clause
+     */
+    I insert(RelationalPath<?> path);
+
+    /**
+     * Create a new MERGE clause
+     *
+     * @param path table to merge into
+     * @return merge clause
+     */
+    M merge(RelationalPath<?> path);
+
+    /**
+     * Create a new UPDATE clause
+     *
+     * @param path table to update
+     * @return update clause
+     */
+    U update(RelationalPath<?> path);
+
+    /* (non-Javadoc)
+     * @see com.querydsl.core.QueryFactory#query()
+     */
+    @Override
+    Q query();
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLDetailedListener.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLDetailedListener.java
new file mode 100644
index 0000000000..c7ef778f51
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLDetailedListener.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+/**
+ * An extended listener interface that details much more about the preparation and execution of queries
+ */
+public interface SQLDetailedListener extends SQLListener {
+    /**
+     * Called at the start of a query.  Most context parameters are empty at this stage
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void start(SQLListenerContext context);
+
+    /**
+     * Called at the start of SQL rendering.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void preRender(SQLListenerContext context);
+
+    /**
+     * Called at the end of SQL rendering.  The sql context value will not be available
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void rendered(SQLListenerContext context);
+
+    /**
+     * Called at the start of {@link java.sql.PreparedStatement} preparation.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void prePrepare(SQLListenerContext context);
+
+    /**
+     * Called at the end of {@link java.sql.PreparedStatement} preparation.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void prepared(SQLListenerContext context);
+
+    /**
+     * Called at the start of {@link java.sql.PreparedStatement} execution.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void preExecute(SQLListenerContext context);
+
+    /**
+     * Called at the end of {@link java.sql.PreparedStatement} execution.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void executed(SQLListenerContext context);
+
+    /**
+     * Called if an exception happens during query building and execution.  The context exception values will
+     * now be available indicating the exception that occurred.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void exception(SQLListenerContext context);
+
+    /**
+     * Called at the end of a query.
+     *
+     * @param context a context object that is progressively filled out as the query executes
+     */
+    void end(SQLListenerContext context);
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLExceptionTranslator.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExceptionTranslator.java
new file mode 100644
index 0000000000..cf1ebf3961
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExceptionTranslator.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * {@code SQLExceptionTranslator} translate SQLExceptions to runtime exceptions
+ *
+ * @author tiwe
+ *
+ */
+public interface SQLExceptionTranslator {
+
+    /**
+     * Translate the given SQLException
+     *
+     * @param sql SQL string
+     * @param bindings binding
+     * @param e SQLException to translate
+     * @return translated exception
+     */
+    RuntimeException translate(String sql, List<Object> bindings, SQLException e);
+
+    /**
+     * Translate the given SQLException
+     *
+     * @param e SQLException to translate
+     * @return translated exception
+     */
+    RuntimeException translate(SQLException e);
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java
new file mode 100644
index 0000000000..85e0cca2e2
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLExpressions.java
@@ -0,0 +1,1251 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+
+/**
+ * Common SQL expressions
+ *
+ * @author tiwe
+ *
+ */
+@SuppressWarnings("rawtypes")
+public final class SQLExpressions {
+
+    private static final Map<DatePart, Operator> DATE_ADD_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
+
+    private static final Map<DatePart, Operator> DATE_DIFF_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
+
+    private static final Map<DatePart, Operator> DATE_TRUNC_OPS
+            = new EnumMap<DatePart, Operator>(DatePart.class);
+
+    static {
+        DATE_ADD_OPS.put(DatePart.year, Ops.DateTimeOps.ADD_YEARS);
+        DATE_ADD_OPS.put(DatePart.month, Ops.DateTimeOps.ADD_MONTHS);
+        DATE_ADD_OPS.put(DatePart.week, Ops.DateTimeOps.ADD_WEEKS);
+        DATE_ADD_OPS.put(DatePart.day, Ops.DateTimeOps.ADD_DAYS);
+        DATE_ADD_OPS.put(DatePart.hour, Ops.DateTimeOps.ADD_HOURS);
+        DATE_ADD_OPS.put(DatePart.minute, Ops.DateTimeOps.ADD_MINUTES);
+        DATE_ADD_OPS.put(DatePart.second, Ops.DateTimeOps.ADD_SECONDS);
+        DATE_ADD_OPS.put(DatePart.millisecond, null); // TODO
+
+        DATE_DIFF_OPS.put(DatePart.year, Ops.DateTimeOps.DIFF_YEARS);
+        DATE_DIFF_OPS.put(DatePart.month, Ops.DateTimeOps.DIFF_MONTHS);
+        DATE_DIFF_OPS.put(DatePart.week, Ops.DateTimeOps.DIFF_WEEKS);
+        DATE_DIFF_OPS.put(DatePart.day, Ops.DateTimeOps.DIFF_DAYS);
+        DATE_DIFF_OPS.put(DatePart.hour, Ops.DateTimeOps.DIFF_HOURS);
+        DATE_DIFF_OPS.put(DatePart.minute, Ops.DateTimeOps.DIFF_MINUTES);
+        DATE_DIFF_OPS.put(DatePart.second, Ops.DateTimeOps.DIFF_SECONDS);
+        DATE_DIFF_OPS.put(DatePart.millisecond, null); // TODO
+
+        DATE_TRUNC_OPS.put(DatePart.year, Ops.DateTimeOps.TRUNC_YEAR);
+        DATE_TRUNC_OPS.put(DatePart.month, Ops.DateTimeOps.TRUNC_MONTH);
+        DATE_TRUNC_OPS.put(DatePart.week, Ops.DateTimeOps.TRUNC_WEEK);
+        DATE_TRUNC_OPS.put(DatePart.day, Ops.DateTimeOps.TRUNC_DAY);
+        DATE_TRUNC_OPS.put(DatePart.hour, Ops.DateTimeOps.TRUNC_HOUR);
+        DATE_TRUNC_OPS.put(DatePart.minute, Ops.DateTimeOps.TRUNC_MINUTE);
+        DATE_TRUNC_OPS.put(DatePart.second, Ops.DateTimeOps.TRUNC_SECOND);
+
+    }
+
+    private static final WindowOver<Double> cumeDist = new WindowOver<Double>(Double.class, SQLOps.CUMEDIST);
+
+    private static final WindowOver<Long> rank = new WindowOver<Long>(Long.class, SQLOps.RANK);
+
+    private static final WindowOver<Long> denseRank = new WindowOver<Long>(Long.class, SQLOps.DENSERANK);
+
+    private static final WindowOver<Double> percentRank = new WindowOver<Double>(Double.class, SQLOps.PERCENTRANK);
+
+    private static final WindowOver<Long> rowNumber = new WindowOver<Long>(Long.class, SQLOps.ROWNUMBER);
+
+    private static Expression[] convertToExpressions(Object... args) {
+        Expression<?>[] exprs = new Expression<?>[args.length];
+        for (int i = 0; i < args.length; i++) {
+            if (args[i] instanceof Expression) {
+                exprs[i] = (Expression) args[i];
+            } else {
+                exprs[i] = ConstantImpl.create(args[i]);
+            }
+        }
+        return exprs;
+    }
+
+    /**
+     * Wildcard expression
+     */
+    public static final Expression<Object[]> all = Wildcard.all;
+
+    /**
+     * Wildcard count expression
+     */
+    public static final Expression<Long> countAll = Wildcard.count;
+
+    /**
+     * Create an assignment expression
+     *
+     * @param target target expression
+     * @param value value to be set
+     * @param <T>
+     * @return target = value
+     */
+    public static <T> Expression<T> set(Path<T> target, Expression<? extends T> value) {
+        if (value != null) {
+            return Expressions.operation(target.getType(), SQLOps.SET_PATH, target, value);
+        } else {
+            return Expressions.operation(target.getType(), SQLOps.SET_LITERAL,
+                    target, Expressions.nullExpression());
+        }
+
+    }
+
+    /**
+     * Create an assignment expression
+     *
+     * @param target target expression
+     * @param value value to be set
+     * @param <T>
+     * @return target = value
+     */
+    public static <T> Expression<T> set(Path<T> target, T value) {
+        if (value != null) {
+            return Expressions.operation(target.getType(), SQLOps.SET_LITERAL,
+                    target, Expressions.constant(value));
+        } else {
+            return Expressions.operation(target.getType(), SQLOps.SET_LITERAL,
+                    target, Expressions.nullExpression());
+        }
+
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with the given projection
+     *
+     * @param expr projection
+     * @param <T>
+     * @return select(expr)
+     */
+    public static <T> SQLQuery<T> select(Expression<T> expr) {
+        return new SQLQuery<Void>().select(expr);
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with the given projection
+     *
+     * @param exprs projection
+     * @return select(exprs)
+     */
+    public static SQLQuery<Tuple> select(Expression<?>... exprs) {
+        return new SQLQuery<Void>().select(exprs);
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with the given projection
+     *
+     * @param expr distinct projection
+     * @param <T>
+     * @return select(distinct expr)
+     */
+    public static <T> SQLQuery<T> selectDistinct(Expression<T> expr) {
+        return new SQLQuery<Void>().select(expr).distinct();
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with the given projection
+     *
+     * @param exprs distinct projection
+     * @return select(distinct exprs)
+     */
+    public static SQLQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return new SQLQuery<Void>().select(exprs).distinct();
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with zero as the projection
+     *
+     * @return select(0)
+     */
+    public static SQLQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with one as the projection
+     *
+     * @return select(1)
+     */
+    public static SQLQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    /**
+     * Create a new detached SQLQuery instance with the given projection
+     *
+     * @param expr query source and projection
+     * @param <T>
+     * @return select(expr).from(expr)
+     */
+    public static <T> SQLQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+    /**
+     * Create a new UNION clause
+     *
+     * @param sq subqueries
+     * @param <T>
+     * @return union
+     */
+    public static <T> Union<T> union(SubQueryExpression<T>... sq) {
+        return new SQLQuery<Void>().union(sq);
+    }
+
+    /**
+     * Create a new UNION clause
+     *
+     * @param sq subqueries
+     * @param <T>
+     * @return union
+     */
+    public static <T> Union<T> union(List<SubQueryExpression<T>> sq) {
+        return new SQLQuery<Void>().union(sq);
+    }
+
+    /**
+     * Create a new UNION ALL clause
+     *
+     * @param sq subqueries
+     * @param <T>
+     * @return union
+     */
+    public static <T> Union<T> unionAll(SubQueryExpression<T>... sq) {
+        return new SQLQuery<Void>().unionAll(sq);
+    }
+
+    /**
+     * Create a new UNION ALL clause
+     *
+     * @param sq subqueries
+     * @param <T>
+     * @return union
+     */
+    public static <T> Union<T> unionAll(List<SubQueryExpression<T>> sq) {
+        return new SQLQuery<Void>().unionAll(sq);
+    }
+
+    /**
+     * Get an aggregate any expression for the given boolean expression
+     */
+    public static BooleanExpression any(BooleanExpression expr) {
+        return Expressions.booleanOperation(Ops.AggOps.BOOLEAN_ANY, expr);
+    }
+
+    /**
+     * Get an aggregate all expression for the given boolean expression
+     */
+    public static BooleanExpression all(BooleanExpression expr) {
+        return Expressions.booleanOperation(Ops.AggOps.BOOLEAN_ALL, expr);
+    }
+
+    /**
+     * Create a new RelationalFunctionCall for the given function and arguments
+     *
+     * @param type type
+     * @param function function name
+     * @param args arguments
+     * @param <T>
+     * @return relational function call
+     */
+    public static <T> RelationalFunctionCall<T> relationalFunctionCall(Class<? extends T> type, String function, Object... args) {
+        return new RelationalFunctionCall<T>(type, function, args);
+    }
+
+    /**
+     * Create a nextval(sequence) expression
+     *
+     * <p>Returns the next value from the give sequence</p>
+     *
+     * @param sequence sequence name
+     * @return nextval(sequence)
+     */
+    public static SimpleExpression<Long> nextval(String sequence) {
+        return nextval(Long.class, sequence);
+    }
+
+    /**
+     * Create a nextval(sequence) expression of the given type
+     *
+     * <p>Returns the next value from the given sequence</p>
+     *
+     * @param type type of call
+     * @param sequence sequence name
+     * @return nextval(sequence)
+     */
+    public static <T extends Number> SimpleExpression<T> nextval(Class<T> type, String sequence) {
+        return Expressions.operation(type, SQLOps.NEXTVAL, ConstantImpl.create(sequence));
+    }
+
+    /**
+     * Convert timestamp to date
+     *
+     * @param dateTime timestamp
+     * @return date
+     */
+    public static <D extends Comparable> DateExpression<D> date(DateTimeExpression<D> dateTime) {
+        return Expressions.dateOperation(dateTime.getType(), Ops.DateTimeOps.DATE, dateTime);
+    }
+
+    /**
+     * Convert timestamp to date
+     *
+     * @param type type
+     * @param dateTime timestamp
+     * @return date
+     */
+    public static <D extends Comparable> DateExpression<D> date(Class<D> type, DateTimeExpression<?> dateTime) {
+        return Expressions.dateOperation(type, Ops.DateTimeOps.DATE, dateTime);
+    }
+
+    /**
+     * Create a dateadd(unit, date, amount) expression
+     *
+     * @param unit date part
+     * @param date date
+     * @param amount amount
+     * @return converted date
+     */
+    public static <D extends Comparable> DateTimeExpression<D> dateadd(DatePart unit, DateTimeExpression<D> date, int amount) {
+        return Expressions.dateTimeOperation(date.getType(), DATE_ADD_OPS.get(unit), date, ConstantImpl.create(amount));
+    }
+
+    /**
+     * Create a dateadd(unit, date, amount) expression
+     *
+     * @param unit date part
+     * @param date date
+     * @param amount amount
+     * @return converted date
+     */
+    public static <D extends Comparable> DateExpression<D> dateadd(DatePart unit, DateExpression<D> date, int amount) {
+        return Expressions.dateOperation(date.getType(), DATE_ADD_OPS.get(unit), date, ConstantImpl.create(amount));
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            DateExpression<D> start, DateExpression<D> end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), start, end);
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            D start, DateExpression<D> end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), ConstantImpl.create(start), end);
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            DateExpression<D> start, D end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), start, ConstantImpl.create(end));
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            DateTimeExpression<D> start, DateTimeExpression<D> end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), start, end);
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            D start, DateTimeExpression<D> end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), ConstantImpl.create(start), end);
+    }
+
+    /**
+     * Get a datediff(unit, start, end) expression
+     *
+     * @param unit date part
+     * @param start start
+     * @param end end
+     * @return difference in units
+     */
+    public static <D extends Comparable> NumberExpression<Integer> datediff(DatePart unit,
+            DateTimeExpression<D> start, D end) {
+        return Expressions.numberOperation(Integer.class, DATE_DIFF_OPS.get(unit), start, ConstantImpl.create(end));
+    }
+
+    /**
+     * Truncate the given date expression
+     *
+     * @param unit date part to truncate to
+     * @param expr truncated date
+     */
+    public static <D extends Comparable> DateExpression<D> datetrunc(DatePart unit, DateExpression<D> expr) {
+        return Expressions.dateOperation(expr.getType(), DATE_TRUNC_OPS.get(unit), expr);
+    }
+
+    /**
+     * Truncate the given datetime expression
+     *
+     * @param unit datepart to truncate to
+     * @param expr truncated datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> datetrunc(DatePart unit, DateTimeExpression<D> expr) {
+        return Expressions.dateTimeOperation(expr.getType(), DATE_TRUNC_OPS.get(unit), expr);
+    }
+
+    /**
+     * Add the given amount of years to the date
+     *
+     * @param date datetime
+     * @param years years to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addYears(DateTimeExpression<D> date, int years) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_YEARS, date, ConstantImpl.create(years));
+    }
+
+    /**
+     * Add the given amount of months to the date
+     *
+     * @param date datetime
+     * @param months months to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addMonths(DateTimeExpression<D> date, int months) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_MONTHS, date, ConstantImpl.create(months));
+    }
+
+    /**
+     * Add the given amount of weeks to the date
+     *
+     * @param date datetime
+     * @param weeks weeks to add
+     * @return converted date
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addWeeks(DateTimeExpression<D> date, int weeks) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_WEEKS, date, ConstantImpl.create(weeks));
+    }
+
+    /**
+     * Add the given amount of days to the date
+     *
+     * @param date datetime
+     * @param days days to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addDays(DateTimeExpression<D> date, int days) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_DAYS, date, ConstantImpl.create(days));
+    }
+
+    /**
+     * Add the given amount of hours to the date
+     *
+     * @param date datetime
+     * @param hours hours to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addHours(DateTimeExpression<D> date, int hours) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_HOURS, date, ConstantImpl.create(hours));
+    }
+
+    /**
+     * Add the given amount of minutes to the date
+     *
+     * @param date datetime
+     * @param minutes minutes to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addMinutes(DateTimeExpression<D> date, int minutes) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_MINUTES, date, ConstantImpl.create(minutes));
+    }
+
+    /**
+     * Add the given amount of seconds to the date
+     *
+     * @param date datetime
+     * @param seconds seconds to add
+     * @return converted datetime
+     */
+    public static <D extends Comparable> DateTimeExpression<D> addSeconds(DateTimeExpression<D> date, int seconds) {
+        return Expressions.dateTimeOperation(date.getType(), Ops.DateTimeOps.ADD_SECONDS, date, ConstantImpl.create(seconds));
+    }
+
+    /**
+     * Add the given amount of years to the date
+     *
+     * @param date date
+     * @param years years to add
+     * @return converted date
+     */
+    public static <D extends Comparable> DateExpression<D> addYears(DateExpression<D> date, int years) {
+        return Expressions.dateOperation(date.getType(), Ops.DateTimeOps.ADD_YEARS, date, ConstantImpl.create(years));
+    }
+
+    /**
+     * Add the given amount of months to the date
+     *
+     * @param date date
+     * @param months months to add
+     * @return converted date
+     */
+    public static <D extends Comparable> DateExpression<D> addMonths(DateExpression<D> date, int months) {
+        return Expressions.dateOperation(date.getType(), Ops.DateTimeOps.ADD_MONTHS, date, ConstantImpl.create(months));
+    }
+
+    /**
+     * Add the given amount of weeks to the date
+     *
+     * @param date date
+     * @param weeks weeks to add
+     * @return converted date
+     */
+    public static <D extends Comparable> DateExpression<D> addWeeks(DateExpression<D> date, int weeks) {
+        return Expressions.dateOperation(date.getType(), Ops.DateTimeOps.ADD_WEEKS, date, ConstantImpl.create(weeks));
+    }
+
+    /**
+     * Add the given amount of days to the date
+     *
+     * @param date date
+     * @param days days to add
+     * @return converted date
+     */
+    public static <D extends Comparable> DateExpression<D> addDays(DateExpression<D> date, int days) {
+        return Expressions.dateOperation(date.getType(), Ops.DateTimeOps.ADD_DAYS, date, ConstantImpl.create(days));
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return sum(expr)
+     */
+    public static <T extends Number> WindowOver<T> sum(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), Ops.AggOps.SUM_AGG, expr);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @return count()
+     */
+    public static WindowOver<Long> count() {
+        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_ALL_AGG);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return count(expr)
+     */
+    public static WindowOver<Long> count(Expression<?> expr) {
+        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_AGG, expr);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return count(distinct expr)
+     */
+    public static WindowOver<Long> countDistinct(Expression<?> expr) {
+        return new WindowOver<Long>(Long.class, Ops.AggOps.COUNT_DISTINCT_AGG, expr);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return avg(expr)
+     */
+    public static <T extends Number> WindowOver<T> avg(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), Ops.AggOps.AVG_AGG, expr);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return min(expr)
+     */
+    public static <T extends Comparable> WindowOver<T> min(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), Ops.AggOps.MIN_AGG, expr);
+    }
+
+    /**
+     * Start a window function expression
+     *
+     * @param expr expression
+     * @return max(expr)
+     */
+    public static <T extends Comparable> WindowOver<T> max(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), Ops.AggOps.MAX_AGG, expr);
+    }
+
+    /**
+     * expr evaluated at the row that is one row after the current row within the partition;
+     *
+     * @param expr expression
+     * @return lead(expr)
+     */
+    public static <T> WindowOver<T> lead(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.LEAD, expr);
+    }
+
+    /**
+     * expr evaluated at the row that is one row before the current row within the partition
+     *
+     * @param expr expression
+     * @return lag(expr)
+     */
+    public static <T> WindowOver<T> lag(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.LAG, expr);
+    }
+
+    /**
+     * LISTAGG orders data within each group specified in the ORDER BY clause and then concatenates
+     * the values of the measure column.
+     *
+     * @param expr measure column
+     * @param delimiter delimiter
+     * @return listagg(expr, delimiter)
+     */
+    public static WithinGroup<String> listagg(Expression<?> expr, String delimiter) {
+        return new WithinGroup<String>(String.class, SQLOps.LISTAGG, expr, ConstantImpl.create(delimiter));
+    }
+
+
+    /**
+     * NTH_VALUE returns the expr value of the nth row in the window defined by the analytic clause.
+     * The returned value has the data type of the expr.
+     *
+     * @param expr measure expression
+     * @param n one based row index
+     * @return nth_value(expr, n)
+     */
+    public static <T> WindowOver<T> nthValue(Expression<T> expr, Number n) {
+        return nthValue(expr, ConstantImpl.create(n));
+    }
+
+    /**
+     * NTH_VALUE returns the expr value of the nth row in the window defined by the analytic clause.
+     * The returned value has the data type of the expr
+     *
+     * @param expr measure expression
+     * @param n one based row index
+     * @return nth_value(expr, n)
+     */
+    public static <T> WindowOver<T> nthValue(Expression<T> expr, Expression<? extends Number> n) {
+        return new WindowOver<T>(expr.getType(), SQLOps.NTHVALUE, expr, n);
+    }
+
+    /**
+     * divides an ordered data set into a number of buckets indicated by expr and assigns the
+     * appropriate bucket number to each row
+     *
+     * @param num bucket size
+     * @return ntile(num)
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends Number & Comparable> WindowOver<T> ntile(T num) {
+        return new WindowOver<T>((Class<T>) num.getClass(), SQLOps.NTILE, ConstantImpl.create(num));
+    }
+
+    /**
+     * rank of the current row with gaps; same as row_number of its first peer
+     *
+     * @return rank()
+     */
+    public static WindowOver<Long> rank() {
+        return rank;
+    }
+
+    /**
+     * As an aggregate function, RANK calculates the rank of a hypothetical row identified by the
+     * arguments of the function with respect to a given sort specification. The arguments of the
+     * function must all evaluate to constant expressions within each aggregate group, because they
+     * identify a single row within each group. The constant argument expressions and the expressions
+     * in the ORDER BY clause of the aggregate match by position. Therefore, the number of arguments
+     * must be the same and their types must be compatible.
+     *
+     * @param args arguments
+     * @return rank(args)
+     */
+    @SuppressWarnings("unchecked")
+    public static WithinGroup<Long> rank(Object... args) {
+        return rank(convertToExpressions(args));
+    }
+
+    /**
+     * As an aggregate function, RANK calculates the rank of a hypothetical row identified by the
+     * arguments of the function with respect to a given sort specification. The arguments of the
+     * function must all evaluate to constant expressions within each aggregate group, because they
+     * identify a single row within each group. The constant argument expressions and the expressions
+     * in the ORDER BY clause of the aggregate match by position. Therefore, the number of arguments
+     * must be the same and their types must be compatible.
+     *
+     * @param args arguments
+     * @return rank(args)
+     */
+    public static WithinGroup<Long> rank(Expression<?>... args) {
+        return new WithinGroup<Long>(Long.class, SQLOps.RANK2, args);
+    }
+
+    /**
+     * rank of the current row without gaps; this function counts peer groups
+     *
+     * @return dense_rank()
+     */
+    public static WindowOver<Long> denseRank() {
+        return denseRank;
+    }
+
+    /**
+     * As an aggregate function, DENSE_RANK calculates the dense rank of a hypothetical row identified
+     * by the arguments of the function with respect to a given sort specification. The arguments of
+     * the function must all evaluate to constant expressions within each aggregate group, because they
+     * identify a single row within each group. The constant argument expressions and the expressions
+     * in the order_by_clause of the aggregate match by position. Therefore, the number of arguments
+     * must be the same and types must be compatible.
+     *
+     * @param args arguments
+     * @return dense_rank(args)
+     */
+    @SuppressWarnings("unchecked")
+    public static WithinGroup<Long> denseRank(Object... args) {
+        return denseRank(convertToExpressions(args));
+    }
+
+    /**
+     * As an aggregate function, DENSE_RANK calculates the dense rank of a hypothetical row identified
+     * by the arguments of the function with respect to a given sort specification. The arguments of
+     * the function must all evaluate to constant expressions within each aggregate group, because they
+     * identify a single row within each group. The constant argument expressions and the expressions
+     * in the order_by_clause of the aggregate match by position. Therefore, the number of arguments
+     * must be the same and types must be compatible.
+     *
+     * @param args arguments
+     * @return dense_rank(args)
+     */
+    public static WithinGroup<Long> denseRank(Expression<?>... args) {
+        return new WithinGroup<Long>(Long.class, SQLOps.DENSERANK2, args);
+    }
+
+    /**
+     * As an analytic function, for a row r, PERCENT_RANK calculates the rank of r minus 1, divided by
+     * 1 less than the number of rows being evaluated (the entire query result set or a partition).
+     *
+     * @return percent_rank()
+     */
+    public static WindowOver<Double> percentRank() {
+        return percentRank;
+    }
+
+    /**
+     * As an aggregate function, PERCENT_RANK calculates, for a hypothetical row r identified by the
+     * arguments of the function and a corresponding sort specification, the rank of row r minus 1
+     * divided by the number of rows in the aggregate group. This calculation is made as if the
+     * hypothetical row r were inserted into the group of rows over which Oracle Database is to
+     * aggregate. The arguments of the function identify a single hypothetical row within each aggregate
+     * group. Therefore, they must all evaluate to constant expressions within each aggregate group.
+     * The constant argument expressions and the expressions in the ORDER BY clause of the aggregate
+     * match by position. Therefore the number of arguments must be the same and their types must be
+     * compatible.
+     *
+     * @param args arguments
+     * @return percent_rank(args)
+     */
+    @SuppressWarnings("unchecked")
+    public static WithinGroup<Double> percentRank(Object... args) {
+        return percentRank(convertToExpressions(args));
+    }
+
+    /**
+     * As an aggregate function, PERCENT_RANK calculates, for a hypothetical row r identified by the
+     * arguments of the function and a corresponding sort specification, the rank of row r minus 1
+     * divided by the number of rows in the aggregate group. This calculation is made as if the
+     * hypothetical row r were inserted into the group of rows over which Oracle Database is to aggregate.
+     * The arguments of the function identify a single hypothetical row within each aggregate group.
+     * Therefore, they must all evaluate to constant expressions within each aggregate group. The
+     * constant argument expressions and the expressions in the ORDER BY clause of the aggregate match
+     * by position. Therefore the number of arguments must be the same and their types must be compatible.
+     *
+     * @param args arguments
+     * @return percent_rank(args)
+     */
+    public static WithinGroup<Double> percentRank(Expression<?>... args) {
+        return new WithinGroup<Double>(Double.class, SQLOps.PERCENTRANK2, args);
+    }
+
+    /**
+     * Calculates a percentile based on a continuous distribution of the column value
+     *
+     * @param arg argument
+     * @return percentile_cont(arg)
+     */
+    public static <T extends Number> WithinGroup<T> percentileCont(T arg) {
+        if (arg.doubleValue() < 0.0 || arg.doubleValue() > 1.0) {
+            throw new IllegalArgumentException("The percentile value should be a number between 0 and 1");
+        }
+        return percentileCont(ConstantImpl.create(arg));
+    }
+
+    /**
+     * Calculates a percentile based on a continuous distribution of the column value
+     *
+     * @param arg argument
+     * @return percentile_cont(arg)
+     */
+    public static <T extends Number> WithinGroup<T> percentileCont(Expression<T> arg) {
+        return new WithinGroup<T>(arg.getType(), SQLOps.PERCENTILECONT, arg);
+    }
+
+    /**
+     * PERCENTILE_DISC is an inverse distribution function that assumes a discrete distribution model.
+     * It takes a percentile value and a sort specification and returns an element from the set.
+     * Nulls are ignored in the calculation.
+     *
+     * <p>This function takes as an argument any numeric datatype or any nonnumeric datatype that can be
+     * implicitly converted to a numeric datatype. The function returns the same datatype as the numeric
+     * datatype of the argument.</p>
+     *
+     * @param arg argument
+     * @return percentile_disc(arg)
+     */
+    public static <T extends Number> WithinGroup<T> percentileDisc(T arg) {
+        if (arg.doubleValue() < 0.0 || arg.doubleValue() > 1.0) {
+            throw new IllegalArgumentException("The percentile value should be a number between 0 and 1");
+        }
+        return percentileDisc(ConstantImpl.create(arg));
+    }
+
+    /**
+     * PERCENTILE_DISC is an inverse distribution function that assumes a discrete distribution model.
+     * It takes a percentile value and a sort specification and returns an element from the set.
+     * Nulls are ignored in the calculation.
+     *
+     * <p>This function takes as an argument any numeric datatype or any nonnumeric datatype that can be
+     * implicitly converted to a numeric datatype. The function returns the same datatype as the numeric
+     * datatype of the argument.</p>
+     *
+     * @param arg argument
+     * @return percentile_disc(arg)
+     */
+    public static <T extends Number> WithinGroup<T> percentileDisc(Expression<T> arg) {
+        return new WithinGroup<T>(arg.getType(), SQLOps.PERCENTILEDISC, arg);
+    }
+
+    /**
+     * REGR_SLOPE returns the slope of the line
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_slope(arg1, arg2)
+     */
+    public static WindowOver<Double> regrSlope(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_SLOPE, arg1, arg2);
+    }
+
+    /**
+     * REGR_INTERCEPT returns the y-intercept of the regression line.
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_intercept(arg1, arg2)
+     */
+    public static WindowOver<Double> regrIntercept(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_INTERCEPT, arg1, arg2);
+    }
+
+    /**
+     * REGR_COUNT returns an integer that is the number of non-null number pairs used to fit the regression line.
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_count(arg1, arg2)
+     */
+    public static WindowOver<Double> regrCount(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_COUNT, arg1, arg2);
+    }
+
+    /**
+     * REGR_R2 returns the coefficient of determination (also called R-squared or goodness of fit) for the regression.
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_r2(arg1, arg2)
+     */
+    public static WindowOver<Double> regrR2(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_R2, arg1, arg2);
+    }
+
+    /**
+     * REGR_AVGX evaluates the average of the independent variable (arg2) of the regression line.
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_avgx(arg1, arg2)
+     */
+    public static WindowOver<Double> regrAvgx(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_AVGX, arg1, arg2);
+    }
+
+    /**
+     * REGR_AVGY evaluates the average of the dependent variable (arg1) of the regression line.
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_avgy(arg1, arg2)
+     */
+    public static WindowOver<Double> regrAvgy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_AVGY, arg1, arg2);
+    }
+
+    /**
+     * REGR_SXX makes the following computation after the elimination of null (arg1, arg2) pairs:
+     *
+     * <p>{@code REGR_COUNT(arg1, arg2) * VAR_POP(arg2)}</p>
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_sxx(arg1, arg2)
+     */
+    public static WindowOver<Double> regrSxx(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_SXX, arg1, arg2);
+    }
+
+    /**
+     * REGR_SYY makes the following computation after the elimination of null (arg1, arg2) pairs:
+     *
+     * <p>{@code REGR_COUNT(arg1, arg2) * VAR_POP(arg1)}</p>
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_syy(arg1, arg2)
+     */
+    public static WindowOver<Double> regrSyy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_SYY, arg1, arg2);
+    }
+
+    /**
+     * REGR_SXY makes the following computation after the elimination of null (arg1, arg2) pairs:
+     *
+     * <p>REGR_COUNT(arg1, arg2) * COVAR_POP(arg1, arg2)</p>
+     *
+     * @param arg1 first arg
+     * @param arg2 second arg
+     * @return regr_sxy(arg1, arg2)
+     */
+    public static WindowOver<Double> regrSxy(Expression<? extends Number> arg1, Expression<? extends Number> arg2) {
+        return new WindowOver<Double>(Double.class, SQLOps.REGR_SXY, arg1, arg2);
+    }
+
+    /**
+     * CUME_DIST calculates the cumulative distribution of a value in a group of values.
+     *
+     * @return cume_dist()
+     */
+    public static WindowOver<Double> cumeDist() {
+        return cumeDist;
+    }
+
+    /**
+     * As an aggregate function, CUME_DIST calculates, for a hypothetical row r identified by the
+     * arguments of the function and a corresponding sort specification, the relative position of row
+     * r among the rows in the aggregation group. Oracle makes this calculation as if the hypothetical
+     * row r were inserted into the group of rows to be aggregated over. The arguments of the function
+     * identify a single hypothetical row within each aggregate group. Therefore, they must all
+     * evaluate to constant expressions within each aggregate group. The constant argument expressions
+     * and the expressions in the ORDER BY clause of the aggregate match by position. Therefore,
+     * the number of arguments must be the same and their types must be compatible.
+     *
+     * @param args arguments
+     * @return cume_dist(args)
+     */
+    @SuppressWarnings("unchecked")
+    public static WithinGroup<Double> cumeDist(Object... args) {
+        return cumeDist(convertToExpressions(args));
+    }
+
+    /**
+     * As an aggregate function, CUME_DIST calculates, for a hypothetical row r identified by the
+     * arguments of the function and a corresponding sort specification, the relative position of row
+     * r among the rows in the aggregation group. Oracle makes this calculation as if the hypothetical
+     * row r were inserted into the group of rows to be aggregated over. The arguments of the function
+     * identify a single hypothetical row within each aggregate group. Therefore, they must all
+     * evaluate to constant expressions within each aggregate group. The constant argument expressions
+     * and the expressions in the ORDER BY clause of the aggregate match by position. Therefore,
+     * the number of arguments must be the same and their types must be compatible.
+     *
+     * @param args arguments
+     * @return cume_dist(args)
+     */
+    public static WithinGroup<Double> cumeDist(Expression<?>... args) {
+        return new WithinGroup<Double>(Double.class, SQLOps.CUMEDIST2, args);
+    }
+
+    /**
+     * CORR returns the coefficient of correlation of a set of number pairs.
+     *
+     * @param expr1 first arg
+     * @param expr2 second arg
+     * @return corr(expr1, expr2)
+     */
+    public static WindowOver<Double> corr(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
+        return new WindowOver<Double>(Double.class, SQLOps.CORR, expr1, expr2);
+    }
+
+    /**
+     * CORR returns the coefficient of correlation of a set of number pairs.
+     *
+     * @param expr1 first arg
+     * @param expr2 second arg
+     * @return corr(expr1, expr2)
+     */
+    public static WindowOver<Double> covarPop(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
+        return new WindowOver<Double>(Double.class, SQLOps.COVARPOP, expr1, expr2);
+    }
+
+    /**
+     * CORR returns the coefficient of correlation of a set of number pairs.
+     *
+     * @param expr1 first arg
+     * @param expr2 second arg
+     * @return corr(expr1, expr2)
+     */
+    public static WindowOver<Double> covarSamp(Expression<? extends Number> expr1, Expression<? extends Number> expr2) {
+        return new WindowOver<Double>(Double.class, SQLOps.COVARSAMP, expr1, expr2);
+    }
+
+    /**
+     * computes the ratio of a value to the sum of a set of values. If expr evaluates to null,
+     * then the ratio-to-report value also evaluates to null.
+     *
+     * @return ratio_to_report(expr)
+     */
+    public static <T> WindowOver<T> ratioToReport(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.RATIOTOREPORT, expr);
+    }
+
+    /**
+     * number of the current row within its partition, counting from 1
+     *
+     * @return row_number()
+     */
+    public static WindowOver<Long> rowNumber() {
+        return rowNumber;
+    }
+
+    /**
+     * returns the sample standard deviation of expr, a set of numbers.
+     *
+     * @param expr argument
+     * @return stddev(expr)
+     */
+    public static <T extends Number> WindowOver<T> stddev(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.STDDEV, expr);
+    }
+
+    /**
+     * returns the sample standard deviation of expr, a set of numbers.
+     *
+     * @param expr argument
+     * @return stddev(distinct expr)
+     */
+    public static <T extends Number> WindowOver<T> stddevDistinct(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.STDDEV_DISTINCT, expr);
+    }
+
+    /**
+     * returns the population standard deviation and returns the square root of the population variance.
+     *
+     * @param expr argument
+     * @return stddev_pop(expr)
+     */
+    public static <T extends Number> WindowOver<T> stddevPop(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.STDDEVPOP, expr);
+    }
+
+    /**
+     * returns the cumulative sample standard deviation and returns the square root of the sample variance.
+     *
+     * @param expr argument
+     * @return stddev_samp(expr)
+     */
+    public static <T extends Number> WindowOver<T> stddevSamp(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.STDDEVSAMP, expr);
+    }
+
+    /**
+     * returns the variance of expr
+     *
+     * @param expr argument
+     * @return variance(expr)
+     */
+    public static <T extends Number> WindowOver<T> variance(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.VARIANCE, expr);
+    }
+
+    /**
+     * returns the population variance of a set of numbers after discarding the nulls in this set.
+     *
+     * @param expr argument
+     * @return var_pop(expr)
+     */
+    public static <T extends Number> WindowOver<T> varPop(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.VARPOP, expr);
+    }
+
+    /**
+     * returns the sample variance of a set of numbers after discarding the nulls in this set.
+     *
+     * @param expr argument
+     * @return var_samp(expr)
+     */
+    public static <T extends Number> WindowOver<T> varSamp(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.VARSAMP, expr);
+    }
+
+    /**
+     * returns value evaluated at the row that is the first row of the window frame
+     *
+     * @param expr argument
+     * @return first_value(expr)
+     */
+    public static <T> WindowOver<T> firstValue(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.FIRSTVALUE, expr);
+    }
+
+    /**
+     * returns value evaluated at the row that is the last row of the window frame
+     *
+     * @param expr argument
+     * @return last_value(expr)
+     */
+    public static <T> WindowOver<T> lastValue(Expression<T> expr) {
+        return new WindowOver<T>(expr.getType(), SQLOps.LASTVALUE, expr);
+    }
+
+    /**
+     * Get the rhs leftmost characters of lhs
+     *
+     * @param lhs string
+     * @param rhs character amount
+     * @return rhs leftmost characters
+     */
+    public static StringExpression left(Expression<String> lhs, int rhs) {
+        return left(lhs, ConstantImpl.create(rhs));
+    }
+
+    /**
+     * Get the rhs rightmost characters of lhs
+     *
+     * @param lhs string
+     * @param rhs character amount
+     * @return rhs rightmost characters
+     */
+    public static StringExpression right(Expression<String> lhs, int rhs) {
+        return right(lhs, ConstantImpl.create(rhs));
+    }
+
+    /**
+     * Get the rhs leftmost characters of lhs
+     *
+     * @param lhs string
+     * @param rhs character amount
+     * @return rhs leftmost characters
+     */
+    public static StringExpression left(Expression<String> lhs, Expression<Integer> rhs) {
+        return Expressions.stringOperation(Ops.StringOps.LEFT, lhs, rhs);
+    }
+
+    /**
+     * Get the rhs leftmost characters of lhs
+     *
+     * @param lhs string
+     * @param rhs character amount
+     * @return rhs rightmost characters
+     */
+    public static StringExpression right(Expression<String> lhs, Expression<Integer> rhs) {
+        return Expressions.stringOperation(Ops.StringOps.RIGHT, lhs, rhs);
+    }
+
+    /**
+     * Get a group_concat(expr) expression
+     *
+     * @param expr expression to be aggregated
+     * @return group_concat(expr)
+     */
+    public static StringExpression groupConcat(Expression<String> expr) {
+        return Expressions.stringOperation(SQLOps.GROUP_CONCAT, expr);
+    }
+
+    /**
+     * Get a group_concat(expr, separator) expression
+     *
+     * @param expr expression to be aggregated
+     * @param separator separator string
+     * @return group_concat(expr, separator)
+     */
+    public static StringExpression groupConcat(Expression<String> expr, String separator) {
+        return Expressions.stringOperation(SQLOps.GROUP_CONCAT2, expr, Expressions.constant(separator));
+    }
+
+    private SQLExpressions() { }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLListener.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListener.java
similarity index 87%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/SQLListener.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/SQLListener.java
index c0d689075d..5de4b0d6a4 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLListener.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.util.List;
+import java.util.Map;
 
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.dml.SQLInsertBatch;
-import com.mysema.query.sql.dml.SQLMergeBatch;
-import com.mysema.query.sql.dml.SQLUpdateBatch;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
 
 /**
  * Listener interface for SQL queries and clauses
@@ -106,7 +106,7 @@ void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> colu
      * @param updates metadata of batches
      */
     void notifyUpdate(RelationalPath<?> entity, QueryMetadata md,
-            List<Pair<Path<?>, Expression<?>>> updates);
+            Map<Path<?>, Expression<?>> updates);
 
     /**
      * Notify about a batch update
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerAdapter.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerAdapter.java
new file mode 100644
index 0000000000..eae99368f5
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerAdapter.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
+
+/**
+ * A simple adapter class that knows if the underlying listener is a simple or detailed SQL listener
+ */
+class SQLListenerAdapter implements SQLDetailedListener {
+
+    private final SQLListener sqlListener;
+    private final SQLDetailedListener detailedListener;
+
+    SQLListenerAdapter(final SQLListener sqlListener) {
+        this.detailedListener = sqlListener instanceof SQLDetailedListener ? (SQLDetailedListener) sqlListener : null;
+        this.sqlListener = sqlListener;
+    }
+
+    public SQLListener getSqlListener() {
+        return sqlListener;
+    }
+
+    @Override
+    public void start(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.start(context);
+        }
+    }
+
+    @Override
+    public void preRender(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.preRender(context);
+        }
+    }
+
+    @Override
+    public void rendered(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.rendered(context);
+        }
+    }
+
+    @Override
+    public void prePrepare(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.prePrepare(context);
+        }
+    }
+
+    @Override
+    public void prepared(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.prepared(context);
+        }
+    }
+
+    @Override
+    public void preExecute(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.preExecute(context);
+        }
+    }
+
+    @Override
+    public void executed(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.executed(context);
+        }
+    }
+
+    @Override
+    public void end(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.end(context);
+        }
+    }
+
+    @Override
+    public void exception(final SQLListenerContext context) {
+        if (detailedListener != null) {
+            detailedListener.exception(context);
+        }
+    }
+
+    @Override
+    public void notifyQuery(final QueryMetadata md) {
+        sqlListener.notifyQuery(md);
+    }
+
+    @Override
+    public void notifyDelete(final RelationalPath<?> entity, final QueryMetadata md) {
+        sqlListener.notifyDelete(entity, md);
+    }
+
+    @Override
+    public void notifyDeletes(final RelationalPath<?> entity, final List<QueryMetadata> batches) {
+        sqlListener.notifyDeletes(entity, batches);
+    }
+
+    @Override
+    public void notifyMerge(final RelationalPath<?> entity, final QueryMetadata md, final List<Path<?>> keys, final List<Path<?>> columns, final List<Expression<?>> values, final SubQueryExpression<?> subQuery) {
+        sqlListener.notifyMerge(entity, md, keys, columns, values, subQuery);
+    }
+
+    @Override
+    public void notifyMerges(final RelationalPath<?> entity, final QueryMetadata md, final List<SQLMergeBatch> batches) {
+        sqlListener.notifyMerges(entity, md, batches);
+    }
+
+    @Override
+    public void notifyInsert(final RelationalPath<?> entity, final QueryMetadata md, final List<Path<?>> columns, final List<Expression<?>> values, final SubQueryExpression<?> subQuery) {
+        sqlListener.notifyInsert(entity, md, columns, values, subQuery);
+    }
+
+    @Override
+    public void notifyInserts(final RelationalPath<?> entity, final QueryMetadata md, final List<SQLInsertBatch> batches) {
+        sqlListener.notifyInserts(entity, md, batches);
+    }
+
+    @Override
+    public void notifyUpdate(final RelationalPath<?> entity, final QueryMetadata md, final Map<Path<?>, Expression<?>> updates) {
+        sqlListener.notifyUpdate(entity, md, updates);
+    }
+
+    @Override
+    public void notifyUpdates(final RelationalPath<?> entity, final List<SQLUpdateBatch> batches) {
+        sqlListener.notifyUpdates(entity, batches);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContext.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContext.java
new file mode 100644
index 0000000000..02c4bb8cc3
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContext.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.util.Collection;
+
+import com.querydsl.core.QueryMetadata;
+
+/**
+ * A context object that is progressively filled out during query execution and is passed to each {@link
+ * SQLDetailedListener} callback method
+ */
+public interface SQLListenerContext {
+    /**
+     * The context getData is a general purpose place that listeners can place objects.  It allows listeners to pass
+     * context between themselves during callbacks.
+     * <p>
+     *
+     * @param dataKey the key to look up
+     * @return the context object under that key
+     */
+    Object getData(String dataKey);
+
+    /**
+     * The context setData is a general purpose place that listeners can place objects.  It allows listeners to pass
+     * context between themselves during callbacks.
+     * <p>
+     * A good time to place objects into the context is during {@link com.querydsl.sql.SQLDetailedListener#start(SQLListenerContext)}
+     * and then access if after that.
+     *
+     * @param dataKey the key to use
+     * @param value   the value to place under that key
+     */
+    void setData(String dataKey, Object value);
+
+    /**
+     * Return the underlying query metadata
+     *
+     * @return the underlying query metadata
+     */
+    QueryMetadata getMetadata();
+
+    /**
+     * Return the underlying sql or first in a batch query
+     *
+     * <p>NOTE : This can be null depending on the stage of the query execution</p>
+     *
+     * @return the underlying sql or first in a batch query
+     */
+    String getSQL();
+
+    /**
+     * Return the underlying sql including bindings or first in a batch query
+     *
+     * <p>NOTE : This can be null depending on the stage of the query execution</p>
+     *
+     * @return the underlying sql including bindings or first in a batch query
+     */
+    SQLBindings getSQLBindings();
+
+    /**
+     * Return the underlying sql collection if the query is a batch query
+     *
+     * <p>NOTE : This can be empty depending on the stage of the query execution</p>
+     *
+     * @return the underlying sql collection if the query is a batch query
+     */
+    Collection<String> getSQLStatements();
+
+    /**
+     * Return the underlying sql collection including bindings if the query is a batch query
+     *
+     * <p>NOTE : This can be empty depending on the stage of the query execution</p>
+     *
+     * @return the underlying sql collection including bindings if the query is a batch query
+     */
+    Collection<SQLBindings> getAllSQLBindings();
+
+    /**
+     * Return the underlying entity affected
+     *
+     * <p>NOTE : This can be null depending on the stage of the query execution</p>
+     *
+     * @return the underlying entity affected
+     */
+    RelationalPath<?> getEntity();
+
+    /**
+     * Return the underlying connection if there is one
+     *
+     * <p>NOTE : This can be null depending on the stage of the query execution</p>
+     *
+     * @return the underlying connection if there is one
+     */
+    Connection getConnection();
+
+    /**
+     * Return the underlying exception that has happened during query execution
+     *
+     * <p>NOTE : This can be null depending on whether an exception occurred</p>
+     *
+     * @return the underlying exception that has happened during query execution
+     */
+    Exception getException();
+
+    /**
+     * Return the underlying prepared statement or the first if its batch query
+     *
+     * <p>NOTE : This can be null depending on the stage of the query execution</p>
+     *
+     * @return the underlying prepared statement or the first if its batch query
+     */
+    PreparedStatement getPreparedStatement();
+
+    /**
+     * Return the underlying set of prepared statements
+     *
+     * <p>NOTE : This can be empty depending on the stage of the query execution</p>
+     *
+     * @return the underlying set of prepared statements
+     */
+    Collection<PreparedStatement> getPreparedStatements();
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContextImpl.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContextImpl.java
new file mode 100644
index 0000000000..56ae801558
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListenerContextImpl.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.QueryMetadata;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * A mutable implementation of SQL listener context.
+ * <p>
+ * INTERNAL USE ONLY - {@link com.querydsl.sql.SQLDetailedListener} implementations are not expected to use this
+ * class directly
+ */
+public class SQLListenerContextImpl implements SQLListenerContext {
+    private final Map<String, Object> contextMap;
+
+    private final QueryMetadata md;
+
+    private final List<SQLBindings> sqlStatements;
+
+    private final List<PreparedStatement> preparedStatements;
+
+    private RelationalPath<?> entity;
+
+    private Connection connection;
+
+    private Exception exception;
+
+    public SQLListenerContextImpl(final QueryMetadata metadata, final Connection connection, final RelationalPath<?> entity) {
+        this.contextMap = new HashMap<>();
+        this.preparedStatements = new ArrayList<>();
+        this.sqlStatements = new ArrayList<>();
+        this.md = metadata;
+        this.connection = connection;
+        this.entity = entity;
+    }
+
+    public SQLListenerContextImpl(final QueryMetadata metadata, final Connection connection) {
+        this(metadata, connection, null);
+    }
+
+    public SQLListenerContextImpl(final QueryMetadata metadata) {
+        this(metadata, null, null);
+    }
+
+    public void addSQL(final SQLBindings sql) {
+        this.sqlStatements.add(sql);
+    }
+
+    public void setEntity(final RelationalPath<?> entity) {
+        this.entity = entity;
+    }
+
+    public void setConnection(final Connection connection) {
+        this.connection = connection;
+    }
+
+    public void setException(final Exception exception) {
+        this.exception = exception;
+    }
+
+    public void addPreparedStatement(final PreparedStatement preparedStatement) {
+        this.preparedStatements.add(preparedStatement);
+    }
+
+    @Override
+    public QueryMetadata getMetadata() {
+        return md;
+    }
+
+    @Override
+    public RelationalPath<?> getEntity() {
+        return entity;
+    }
+
+    @Override
+    public String getSQL() {
+        return sqlStatements.isEmpty() ? null : sqlStatements.get(0).getSQL();
+    }
+
+    @Override
+    public SQLBindings getSQLBindings() {
+        return sqlStatements.isEmpty() ? null : sqlStatements.get(0);
+    }
+
+    @Override
+    public Collection<String> getSQLStatements() {
+        return sqlStatements.stream().map(SQLBindings::getSQL).collect(Collectors.toList());
+    }
+
+    @Override
+    public Collection<SQLBindings> getAllSQLBindings() {
+        return sqlStatements;
+    }
+
+    @Override
+    public Exception getException() {
+        return exception;
+    }
+
+    @Override
+    public Connection getConnection() {
+        return connection;
+    }
+
+    @Override
+    public Collection<PreparedStatement> getPreparedStatements() {
+        return preparedStatements;
+    }
+
+    @Override
+    public PreparedStatement getPreparedStatement() {
+        return preparedStatements.isEmpty() ? null : preparedStatements.get(0);
+    }
+
+    @Override
+    public Object getData(final String dataKey) {
+        return contextMap.get(dataKey);
+    }
+
+    @Override
+    public void setData(final String dataKey, final Object value) {
+        contextMap.put(dataKey, value);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder()
+                .append(" sql:").append(nicerSql(getSQL()))
+                .append(" connection:").append(connection == null ? "not connected" : "connected")
+                .append(" entity:").append(entity)
+                .append(" exception:").append(exception);
+
+        for (Map.Entry<String, Object> entry : contextMap.entrySet()) {
+            sb.append(" [").append(entry.getKey()).append(":").append(entry.getValue()).append("]");
+        }
+        return sb.toString();
+    }
+
+    private String nicerSql(final String sql) {
+        return "'" + (sql == null ? null : sql.replace('\n', ' ')) + "'";
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLListeners.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListeners.java
new file mode 100644
index 0000000000..ed03f0776a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLListeners.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
+
+/**
+ * {@code SQLListeners} is a {@link SQLListener} implementation which dispatches the
+ * notifications to a list of SQLListener instances
+ *
+ * @author tiwe
+ */
+public class SQLListeners implements SQLDetailedListener {
+
+    @Nullable
+    private final SQLDetailedListener parent;
+
+    private final Set<SQLDetailedListener> listeners = new LinkedHashSet<>();
+
+    public SQLListeners(SQLListener parent) {
+        this.parent = new SQLListenerAdapter(parent);
+    }
+
+    public SQLListeners() {
+        this.parent = null;
+    }
+
+    public void add(SQLListener listener) {
+        if (listener instanceof SQLListeners) {
+            for (SQLListener l : ((SQLListeners) listener).listeners) {
+                add(l);
+            }
+        } else if (listener instanceof SQLDetailedListener) {
+            listeners.add((SQLDetailedListener) listener);
+        } else {
+            listeners.add(new SQLListenerAdapter(listener));
+        }
+    }
+
+    @Override
+    public void notifyQuery(QueryMetadata md) {
+        if (parent != null) {
+            parent.notifyQuery(md);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyQuery(md);
+        }
+    }
+
+    @Override
+    public void notifyDelete(RelationalPath<?> entity, QueryMetadata md) {
+        if (parent != null) {
+            parent.notifyDelete(entity, md);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyDelete(entity, md);
+        }
+    }
+
+    @Override
+    public void notifyDeletes(RelationalPath<?> entity, List<QueryMetadata> batches) {
+        if (parent != null) {
+            parent.notifyDeletes(entity, batches);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyDeletes(entity, batches);
+        }
+    }
+
+    @Override
+    public void notifyMerge(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> keys,
+                            List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        if (parent != null) {
+            parent.notifyMerge(entity, md, keys, columns, values, subQuery);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyMerge(entity, md, keys, columns, values, subQuery);
+        }
+    }
+
+    @Override
+    public void notifyMerges(RelationalPath<?> entity, QueryMetadata md, List<SQLMergeBatch> batches) {
+        if (parent != null) {
+            parent.notifyMerges(entity, md, batches);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyMerges(entity, md, batches);
+        }
+    }
+
+    @Override
+    public void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> columns,
+                             List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        if (parent != null) {
+            parent.notifyInsert(entity, md, columns, values, subQuery);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyInsert(entity, md, columns, values, subQuery);
+        }
+    }
+
+    @Override
+    public void notifyInserts(RelationalPath<?> entity, QueryMetadata md,
+                              List<SQLInsertBatch> batches) {
+        if (parent != null) {
+            parent.notifyInserts(entity, md, batches);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyInserts(entity, md, batches);
+        }
+    }
+
+    @Override
+    public void notifyUpdate(RelationalPath<?> entity, QueryMetadata md,
+                             Map<Path<?>, Expression<?>> updates) {
+        if (parent != null) {
+            parent.notifyUpdate(entity, md, updates);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyUpdate(entity, md, updates);
+        }
+    }
+
+    @Override
+    public void notifyUpdates(RelationalPath<?> entity, List<SQLUpdateBatch> batches) {
+        if (parent != null) {
+            parent.notifyUpdates(entity, batches);
+        }
+        for (SQLListener listener : listeners) {
+            listener.notifyUpdates(entity, batches);
+        }
+    }
+
+
+    @Override
+    public void start(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.start(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.start(context);
+        }
+    }
+
+    @Override
+    public void preRender(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.preRender(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.preRender(context);
+        }
+    }
+
+    @Override
+    public void rendered(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.rendered(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.rendered(context);
+        }
+    }
+
+    @Override
+    public void prePrepare(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.prePrepare(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.prePrepare(context);
+        }
+    }
+
+    @Override
+    public void prepared(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.prepared(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.prepared(context);
+        }
+    }
+
+    @Override
+    public void preExecute(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.preExecute(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.preExecute(context);
+        }
+    }
+
+    @Override
+    public void executed(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.executed(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.executed(context);
+        }
+    }
+
+    @Override
+    public void end(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.end(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.end(context);
+        }
+    }
+
+    @Override
+    public void exception(final SQLListenerContext context) {
+        if (parent != null) {
+            parent.exception(context);
+        }
+        for (SQLDetailedListener listener : listeners) {
+            listener.exception(context);
+        }
+    }
+
+    public Set<SQLDetailedListener> getListeners() {
+        return listeners;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLNoCloseListener.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLNoCloseListener.java
new file mode 100644
index 0000000000..6e989155a0
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLNoCloseListener.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+/**
+ *  SQLNoCloseListener can be used to block {@link SQLCloseListener} from closing the connection, useful for
+ *  helper query executions
+ */
+public final class SQLNoCloseListener extends SQLBaseListener {
+
+    public static final SQLNoCloseListener DEFAULT = new SQLNoCloseListener();
+
+    private SQLNoCloseListener() { }
+
+    @Override
+    public void start(SQLListenerContext context) {
+        context.setData(AbstractSQLQuery.PARENT_CONTEXT, context);
+    }
+
+    @Override
+    public void end(SQLListenerContext context) {
+        context.setData(AbstractSQLQuery.PARENT_CONTEXT, null);
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLOps.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLOps.java
new file mode 100644
index 0000000000..6106ef23f4
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLOps.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operator;
+
+import java.util.Collections;
+
+/**
+ * {@code SQLOps} provides SQL specific operators
+ *
+ * @author tiwe
+ *
+ */
+public enum SQLOps implements Operator {
+    ALL(Object.class),
+    CAST(Object.class),
+    CORR(Double.class),
+    COVARPOP(Double.class),
+    COVARSAMP(Double.class),
+    CUMEDIST(Double.class),
+    CUMEDIST2(Double.class),
+    DENSERANK(Long.class),
+    DENSERANK2(Long.class),
+    FIRSTVALUE(Object.class),
+    FOR_SHARE(Object.class),
+    FOR_UPDATE(Object.class),
+    LAG(Object.class),
+    LASTVALUE(Object.class),
+    LEAD(Object.class),
+    LISTAGG(Object.class),
+    NEXTVAL(Object.class),
+    NO_WAIT(Object.class),
+    NTHVALUE(Object.class),
+    NTILE(Object.class),
+    PERCENTRANK(Double.class),
+    PERCENTRANK2(Double.class),
+    PERCENTILECONT(Object.class),
+    PERCENTILEDISC(Object.class),
+    QUALIFY(Boolean.class),
+    RANK(Long.class),
+    RANK2(Long.class),
+    REGR_SLOPE(Object.class),
+    REGR_INTERCEPT(Object.class),
+    REGR_COUNT(Object.class),
+    REGR_R2(Object.class),
+    REGR_AVGX(Object.class),
+    REGR_AVGY(Object.class),
+    REGR_SXX(Object.class),
+    REGR_SYY(Object.class),
+    REGR_SXY(Object.class),
+    RATIOTOREPORT(Object.class),
+    ROWNUMBER(Long.class),
+    STDDEV(Object.class),
+    STDDEVPOP(Object.class),
+    STDDEVSAMP(Object.class),
+    STDDEV_DISTINCT(Object.class),
+    UNION(Object.class),
+    UNION_ALL(Object.class),
+    VARIANCE(Object.class),
+    VARPOP(Object.class),
+    VARSAMP(Object.class),
+    WITH_ALIAS(Object.class),
+    WITH_COLUMNS(Object.class),
+    LOCK_IN_SHARE_MODE(Object.class),
+    WITH_REPEATABLE_READ(Object.class),
+    GROUP_CONCAT(String.class),
+    GROUP_CONCAT2(String.class),
+    SET_PATH(Object.class),
+    SET_LITERAL(Object.class);
+
+    private final Class<?> type;
+
+    SQLOps(Class<?> type) {
+        this.type = type;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+
+    @Deprecated
+    public static final QueryFlag FOR_SHARE_FLAG = new QueryFlag(Position.END, ExpressionUtils.operation(
+            Object.class, FOR_SHARE, Collections.emptyList()));
+    @Deprecated
+    public static final QueryFlag FOR_UPDATE_FLAG = new QueryFlag(Position.END, ExpressionUtils.operation(
+            Object.class, FOR_UPDATE, Collections.emptyList()));
+    @Deprecated
+    public static final QueryFlag NO_WAIT_FLAG = new QueryFlag(Position.END, ExpressionUtils.operation(
+            Object.class, NO_WAIT, Collections.emptyList()));
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQuery.java
new file mode 100644
index 0000000000..bb09a3b464
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQuery.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+
+/**
+ * {@code SQLQuery} is a JDBC based implementation of the {@link SQLCommonQuery}
+ * interface
+ *
+ * @param <T>
+ * @author tiwe
+ */
+public class SQLQuery<T> extends AbstractSQLQuery<T, SQLQuery<T>> {
+
+    /**
+     * Create a detached SQLQuery instance The query can be attached via the
+     * clone method
+     */
+    public SQLQuery() {
+        super((Connection) null, Configuration.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Create a detached SQLQuery instance The query can be attached via the
+     * clone method
+     *
+     * @param templates SQLTemplates to use
+     */
+    public SQLQuery(SQLTemplates templates) {
+        super((Connection) null, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param conn Connection to use
+     * @param templates SQLTemplates to use
+     */
+    public SQLQuery(Connection conn, SQLTemplates templates) {
+        super(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param conn Connection to use
+     * @param templates SQLTemplates to use
+     * @param metadata metadata
+     */
+    public SQLQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
+        super(conn, new Configuration(templates), metadata);
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param configuration configuration
+     */
+    public SQLQuery(Configuration configuration) {
+        this((Connection) null, configuration);
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param conn Connection to use
+     * @param configuration configuration
+     */
+    public SQLQuery(Connection conn, Configuration configuration) {
+        super(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param conn Connection to use
+     * @param configuration configuration
+     * @param metadata metadata
+     */
+    public SQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param connProvider Connection to use
+     * @param configuration configuration
+     */
+    public SQLQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+    /**
+     * Create a new SQLQuery instance
+     *
+     * @param connProvider Connection to use
+     * @param configuration configuration
+     * @param metadata metadata
+     */
+    public SQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+
+    @Override
+    public SQLQuery<T> clone(Connection conn) {
+        SQLQuery<T> q = new SQLQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> SQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        SQLQuery<U> newType = (SQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public SQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        SQLQuery<Tuple> newType = (SQLQuery<Tuple>) this;
+        return newType;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java
new file mode 100644
index 0000000000..ddecc06bf1
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLQueryFactory.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.function.Supplier;
+
+import javax.sql.DataSource;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * Factory class for query and DML clause creation
+ *
+ * @author tiwe
+ *
+ */
+public class SQLQueryFactory extends AbstractSQLQueryFactory<SQLQuery<?>> {
+
+    static class DataSourceProvider implements Supplier<Connection> {
+
+        private final DataSource ds;
+
+        DataSourceProvider(DataSource ds) {
+            this.ds = ds;
+        }
+
+        @Override
+        public Connection get() {
+            try {
+                return ds.getConnection();
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+        }
+
+    }
+
+    public SQLQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    public SQLQueryFactory(Configuration configuration, Supplier<Connection> connProvider) {
+        super(configuration, connProvider);
+    }
+
+    public SQLQueryFactory(Configuration configuration, DataSource dataSource) {
+        this(configuration, dataSource, true);
+    }
+
+    public SQLQueryFactory(Configuration configuration, DataSource dataSource, boolean release) {
+        super(configuration, new DataSourceProvider(dataSource));
+        if (release) {
+            configuration.addListener(SQLCloseListener.DEFAULT);
+        }
+    }
+
+    @Override
+    public SQLQuery<?> query() {
+        return new SQLQuery<Void>(connection, configuration);
+    }
+
+    @Override
+    public <T> SQLQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public SQLQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> SQLQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public SQLQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public SQLQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public SQLQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> SQLQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLResultIterator.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
similarity index 75%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/SQLResultIterator.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
index e9fbf982e2..fbc0a124d1 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLResultIterator.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLResultIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.NoSuchElementException;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.QueryException;
+import com.querydsl.core.QueryException;
 
 /**
- * SQLResultIterator is an Iterator adapter for JDBC result sets with customizable projections
+ * {@code SQLResultIterator} is an Iterator adapter for JDBC result sets with customizable projections
  *
  * @author tiwe
  *
@@ -41,15 +41,26 @@ public abstract class SQLResultIterator<T> implements CloseableIterator<T> {
 
     private final Statement stmt;
 
+    private final SQLDetailedListener listener;
+
+    private final SQLListenerContext context;
+
     public SQLResultIterator(Configuration conf, Statement stmt, ResultSet rs) {
+        this(conf, stmt, rs, null, null);
+    }
+
+    public SQLResultIterator(Configuration conf, Statement stmt, ResultSet rs,
+                             SQLDetailedListener listener, SQLListenerContext context) {
         this.configuration = conf;
         this.stmt = stmt;
         this.rs = rs;
+        this.listener = listener;
+        this.context = context;
     }
 
     @Override
     public void close() {
-        try{
+        try {
             try {
                 if (rs != null) {
                     rs.close();
@@ -59,8 +70,12 @@ public void close() {
                     stmt.close();
                 }
             }
-        }catch(SQLException e) {
+        } catch (SQLException e) {
             throw configuration.translate(e);
+        } finally {
+            if (listener != null) {
+                listener.end(context);
+            }
         }
     }
 
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLSerializer.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLSerializer.java
new file mode 100644
index 0000000000..018d37857b
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLSerializer.java
@@ -0,0 +1,1044 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+import java.util.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.JoinExpression;
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.support.SerializerBase;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.Template.Element;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.CollectionUtils;
+import com.querydsl.core.util.StringUtils;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.types.Null;
+
+/**
+ * {@code SqlSerializer} serializes SQL clauses into SQL
+ *
+ * @author tiwe
+ */
+public class SQLSerializer extends SerializerBase<SQLSerializer> {
+
+    protected enum Stage { SELECT, FROM, WHERE, GROUP_BY, HAVING, ORDER_BY, MODIFIERS }
+
+    protected static final Expression<?> Q = Expressions.template(Object.class, "?");
+
+    protected static final String COMMA = ", ";
+
+    protected final LinkedList<Path<?>> constantPaths = new LinkedList<Path<?>>();
+
+    protected final Set<Path<?>> withAliases = new HashSet<>();
+
+    protected final boolean dml;
+
+    protected Stage stage = Stage.SELECT;
+
+    protected boolean skipParent;
+
+    protected boolean dmlWithSchema;
+
+    protected RelationalPath<?> entity;
+
+    protected final Configuration configuration;
+
+    protected final SQLTemplates templates;
+
+    protected boolean inUnion = false;
+
+    protected boolean inJoin = false;
+
+    protected boolean inSubquery = false;
+
+    protected boolean useLiterals = false;
+
+    public SQLSerializer(Configuration conf) {
+        this(conf, false);
+    }
+
+    public SQLSerializer(Configuration conf, boolean dml) {
+        super(conf.getTemplates());
+        this.configuration = conf;
+        this.templates = conf.getTemplates();
+        this.dml = dml;
+    }
+
+    protected void appendAsColumnName(Path<?> path, boolean precededByDot) {
+        String column = ColumnMetadata.getName(path);
+        if (path.getMetadata().getParent() instanceof RelationalPath) {
+            RelationalPath<?> parent = (RelationalPath<?>) path.getMetadata().getParent();
+            column = configuration.getColumnOverride(parent.getSchemaAndTable(), column);
+        }
+        append(templates.quoteIdentifier(column, precededByDot));
+    }
+
+    protected SchemaAndTable getSchemaAndTable(RelationalPath<?> path) {
+        return configuration.getOverride(path.getSchemaAndTable());
+    }
+
+    protected void appendSchemaName(String schema) {
+        append(templates.quoteIdentifier(schema));
+    }
+
+    protected void appendTableName(String table, boolean precededByDot) {
+        append(templates.quoteIdentifier(table, precededByDot));
+    }
+
+    public List<Path<?>> getConstantPaths() {
+        return constantPaths;
+    }
+
+    /**
+     * Return a list of expressions that can be used to uniquely define the query sources
+     *
+     * @param joins
+     * @return identifier columns
+     */
+    @SuppressWarnings("unchecked")
+    protected List<Expression<?>> getIdentifierColumns(List<JoinExpression> joins, boolean alias) {
+        if (joins.size() == 1) {
+            JoinExpression join = joins.get(0);
+            if (join.getTarget() instanceof RelationalPath) {
+                return ((RelationalPath) join.getTarget()).getColumns();
+            } else {
+                return Collections.emptyList();
+            }
+
+        } else {
+            List<Expression<?>> rv = new ArrayList<>();
+            int counter = 0;
+            for (JoinExpression join : joins) {
+                if (join.getTarget() instanceof RelationalPath) {
+                    RelationalPath path = (RelationalPath) join.getTarget();
+                    List<Expression<?>> columns;
+                    if (path.getPrimaryKey() != null) {
+                        columns = path.getPrimaryKey().getLocalColumns();
+                    } else {
+                        columns = path.getColumns();
+                    }
+                    if (alias) {
+                        for (Expression<?> column : columns) {
+                            rv.add(ExpressionUtils.as(column, "col" + (++counter)));
+                        }
+                    } else {
+                        rv.addAll(columns);
+                    }
+
+                } else {
+                    // not able to provide a distinct list of columns
+                    return Collections.emptyList();
+                }
+            }
+            return rv;
+        }
+
+    }
+
+    protected SQLTemplates getTemplates() {
+        return templates;
+    }
+
+    public void handle(String template, Object... args) {
+        handleTemplate(TemplateFactory.DEFAULT.create(template), Arrays.asList(args));
+    }
+
+    public final SQLSerializer handleSelect(final String sep, final List<? extends Expression<?>> expressions) {
+        if (inSubquery) {
+            Set<String> names = new HashSet<>();
+            List<Expression<?>> replacements = new ArrayList<>();
+            for (Expression<?> expr : expressions) {
+                if (expr instanceof Path) {
+                    String name = ColumnMetadata.getName((Path<?>) expr);
+                    if (!names.add(name.toLowerCase())) {
+                        expr = ExpressionUtils.as(expr, "col__" + name + replacements.size());
+                    }
+                }
+                replacements.add(expr);
+            }
+            return handle(sep, replacements);
+        } else {
+            return handle(sep, expressions);
+        }
+    }
+
+    protected void handleJoinTarget(JoinExpression je) {
+        // type specifier
+        if (je.getTarget() instanceof RelationalPath && templates.isSupportsAlias()) {
+            final RelationalPath<?> pe = (RelationalPath<?>) je.getTarget();
+            if (pe.getMetadata().getParent() == null) {
+                if (withAliases.contains(pe)) {
+                    appendTableName(pe.getMetadata().getName(), false);
+                    append(templates.getTableAlias());
+                } else {
+                    SchemaAndTable schemaAndTable = getSchemaAndTable(pe);
+                    boolean precededByDot;
+                    if (templates.isPrintSchema()) {
+                        appendSchemaName(schemaAndTable.getSchema());
+                        append(".");
+                        precededByDot = true;
+                    } else {
+                        precededByDot = false;
+                    }
+                    appendTableName(schemaAndTable.getTable(), precededByDot);
+                    append(templates.getTableAlias());
+                }
+            }
+        }
+        inJoin = true;
+        handle(je.getTarget());
+        inJoin = false;
+    }
+
+    public void serialize(QueryMetadata metadata, boolean forCountRow) {
+        templates.serialize(metadata, forCountRow, this);
+    }
+
+    protected void serializeForQuery(QueryMetadata metadata, boolean forCountRow) {
+        boolean oldInSubquery = inSubquery;
+        inSubquery = inSubquery || getLength() > 0;
+        boolean oldSkipParent = skipParent;
+        skipParent = false;
+        final Expression<?> select = metadata.getProjection();
+        final List<JoinExpression> joins = metadata.getJoins();
+        final Predicate where = metadata.getWhere();
+        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
+        final Predicate having = metadata.getHaving();
+        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
+        final Set<QueryFlag> flags = metadata.getFlags();
+        final boolean hasFlags = !flags.isEmpty();
+        String suffix = null;
+
+        List<? extends Expression<?>> sqlSelect;
+        if (select instanceof FactoryExpression) {
+            sqlSelect = ((FactoryExpression<?>) select).getArgs();
+        } else if (select != null) {
+            sqlSelect = Collections.singletonList(select);
+        } else {
+            sqlSelect = Collections.emptyList();
+        }
+
+        // with
+        if (hasFlags) {
+            List<Expression<?>> withFlags = new ArrayList<>();
+            boolean recursive = false;
+            for (QueryFlag flag : flags) {
+                if (flag.getPosition() == Position.WITH) {
+                    if (flag.getFlag() == SQLTemplates.RECURSIVE) {
+                        recursive = true;
+                        continue;
+                    }
+                    withFlags.add(flag.getFlag());
+                }
+            }
+            if (!withFlags.isEmpty()) {
+                if (recursive) {
+                    append(templates.getWithRecursive());
+                } else {
+                    append(templates.getWith());
+                }
+                handle(", ", withFlags);
+                append("\n");
+            }
+        }
+
+        // start
+        if (hasFlags) {
+            serialize(Position.START, flags);
+        }
+
+        // select
+        Stage oldStage = stage;
+        stage = Stage.SELECT;
+        if (forCountRow) {
+            append(templates.getSelect());
+            if (hasFlags) {
+                serialize(Position.AFTER_SELECT, flags);
+            }
+
+            if (!metadata.isDistinct()) {
+                append(templates.getCountStar());
+                if (!groupBy.isEmpty()) {
+                    append(templates.getFrom());
+                    append("(");
+                    append(templates.getSelect());
+                    append("1 as one ");
+                    suffix = ") internal";
+                }
+
+            } else {
+                List<? extends Expression<?>> columns;
+                if (sqlSelect.isEmpty()) {
+                    columns = getIdentifierColumns(joins, !templates.isCountDistinctMultipleColumns());
+                } else {
+                    columns = sqlSelect;
+                }
+                if (!groupBy.isEmpty()) {
+                    // select count(*) from (select distinct ...)
+                    append(templates.getCountStar());
+                    append(templates.getFrom());
+                    append("(");
+                    append(templates.getSelectDistinct());
+                    handleSelect(COMMA, columns);
+                    suffix = ") internal";
+                } else if (columns.size() == 1) {
+                    append(templates.getDistinctCountStart());
+                    handle(columns.get(0));
+                    append(templates.getDistinctCountEnd());
+                } else if (templates.isCountDistinctMultipleColumns()) {
+                    append(templates.getDistinctCountStart());
+                    append("(").handleSelect(COMMA, columns).append(")");
+                    append(templates.getDistinctCountEnd());
+                } else {
+                    // select count(*) from (select distinct ...)
+                    append(templates.getCountStar());
+                    append(templates.getFrom());
+                    append("(");
+                    append(templates.getSelectDistinct());
+                    handleSelect(COMMA, columns);
+                    suffix = ") internal";
+                }
+            }
+
+        } else if (!sqlSelect.isEmpty()) {
+            if (!metadata.isDistinct()) {
+                append(templates.getSelect());
+            } else {
+                append(templates.getSelectDistinct());
+            }
+            if (hasFlags) {
+                serialize(Position.AFTER_SELECT, flags);
+            }
+
+            handleSelect(COMMA, sqlSelect);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_PROJECTION, flags);
+        }
+
+        // from
+        stage = Stage.FROM;
+        serializeSources(joins);
+
+        // where
+        if (hasFlags) {
+            serialize(Position.BEFORE_FILTERS, flags);
+        }
+        if (where != null) {
+            stage = Stage.WHERE;
+            append(templates.getWhere()).handle(where);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_FILTERS, flags);
+        }
+
+        // group by
+        if (hasFlags) {
+            serialize(Position.BEFORE_GROUP_BY, flags);
+        }
+        if (!groupBy.isEmpty()) {
+            stage = Stage.GROUP_BY;
+            append(templates.getGroupBy()).handle(COMMA, groupBy);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_GROUP_BY, flags);
+        }
+
+        // having
+        if (hasFlags) {
+            serialize(Position.BEFORE_HAVING, flags);
+        }
+        if (having != null) {
+            stage = Stage.HAVING;
+            append(templates.getHaving()).handle(having);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_HAVING, flags);
+        }
+
+        // order by
+        if (hasFlags) {
+            serialize(Position.BEFORE_ORDER, flags);
+        }
+        if (!orderBy.isEmpty() && !forCountRow) {
+            stage = Stage.ORDER_BY;
+            append(templates.getOrderBy());
+            handleOrderBy(orderBy);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_ORDER, flags);
+        }
+
+        // modifiers
+        if (!forCountRow && metadata.getModifiers().isRestricting() && !joins.isEmpty()) {
+            stage = Stage.MODIFIERS;
+            templates.serializeModifiers(metadata, this);
+        }
+
+        if (suffix != null) {
+            append(suffix);
+        }
+
+        // reset stage
+        stage = oldStage;
+        skipParent = oldSkipParent;
+        inSubquery = oldInSubquery;
+    }
+
+    protected void handleOrderBy(List<OrderSpecifier<?>> orderBy) {
+        boolean first = true;
+        for (final OrderSpecifier<?> os : orderBy) {
+            if (!first) {
+                append(COMMA);
+            }
+            String order = os.getOrder() == Order.ASC ? templates.getAsc() : templates.getDesc();
+            if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
+                if (templates.getNullsFirst() != null) {
+                    handle(os.getTarget());
+                    append(order);
+                    append(templates.getNullsFirst());
+                } else {
+                    append("(case when ");
+                    handle(os.getTarget());
+                    append(" is null then 0 else 1 end), ");
+                    handle(os.getTarget());
+                    append(order);
+                }
+            } else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
+                if (templates.getNullsLast() != null) {
+                    handle(os.getTarget());
+                    append(order);
+                    append(templates.getNullsLast());
+                } else {
+                    append("(case when ");
+                    handle(os.getTarget());
+                    append(" is null then 1 else 0 end), ");
+                    handle(os.getTarget());
+                    append(order);
+                }
+
+            } else {
+                handle(os.getTarget());
+                append(order);
+            }
+            first = false;
+        }
+    }
+
+    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity) {
+        this.entity = entity;
+        templates.serializeDelete(metadata, entity, this);
+    }
+
+    protected void serializeForDelete(QueryMetadata metadata, RelationalPath<?> entity) {
+        serialize(Position.START, metadata.getFlags());
+
+        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
+            append(templates.getDelete());
+        }
+        serialize(Position.AFTER_SELECT, metadata.getFlags());
+        append("from ");
+
+        boolean originalDmlWithSchema = dmlWithSchema;
+        dmlWithSchema = true;
+        handle(entity);
+        dmlWithSchema = originalDmlWithSchema;
+
+        if (metadata.getWhere() != null) {
+            serializeForWhere(metadata);
+        }
+    }
+
+    protected void serializeForWhere(QueryMetadata metadata) {
+        boolean requireSchemaInWhere = templates.isRequiresSchemaInWhere();
+        boolean originalDmlWithSchema = dmlWithSchema;
+
+        if (requireSchemaInWhere) {
+            dmlWithSchema = true;
+        }
+        append(templates.getWhere()).handle(metadata.getWhere());
+
+        if (requireSchemaInWhere) {
+            dmlWithSchema = originalDmlWithSchema;
+        }
+    }
+
+    public void serializeMerge(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> keys,
+            List<Path<?>> columns, List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
+        this.entity = entity;
+        templates.serializeMerge(metadata, entity, keys, columns, values, subQuery, this);
+    }
+
+    protected void serializeForMerge(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> keys,
+            List<Path<?>> columns, List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
+        serialize(Position.START, metadata.getFlags());
+
+        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
+            append(templates.getMergeInto());
+        }
+        serialize(Position.AFTER_SELECT, metadata.getFlags());
+
+        boolean originalDmlWithSchema = dmlWithSchema;
+        dmlWithSchema = true;
+        handle(entity);
+        dmlWithSchema = originalDmlWithSchema;
+        append(" ");
+        // columns
+        if (!columns.isEmpty()) {
+            skipParent = true;
+            append("(").handle(COMMA, columns).append(") ");
+            skipParent = false;
+        }
+        // keys
+        if (!keys.isEmpty()) {
+            append(templates.getKey());
+            skipParent = true;
+            append("(").handle(COMMA, keys).append(") ");
+            skipParent = false;
+        }
+
+        if (subQuery != null) {
+            // subquery
+            append("\n");
+            serialize(subQuery.getMetadata(), false);
+        } else {
+            if (!useLiterals) {
+                for (int i = 0; i < columns.size(); i++) {
+                    if (values.get(i) instanceof Constant<?>) {
+                        constantPaths.add(columns.get(i));
+                    }
+                }
+            }
+
+            // values
+            append(templates.getValues());
+            append("(").handle(COMMA, values).append(") ");
+        }
+    }
+
+    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> columns,
+            List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
+        this.entity = entity;
+        templates.serializeInsert(metadata, entity, columns, values, subQuery, this);
+    }
+
+
+    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity, List<SQLInsertBatch> batches) {
+        this.entity = entity;
+        templates.serializeInsert(metadata, entity, batches, this);
+    }
+
+    protected void serializeForInsert(QueryMetadata metadata, RelationalPath<?> entity, List<SQLInsertBatch> batches) {
+        serializeForInsert(metadata, entity, batches.get(0).getColumns(), batches.get(0).getValues(), null);
+        for (int i = 1; i < batches.size(); i++) {
+            append(COMMA);
+            append("(");
+            handle(COMMA, batches.get(i).getValues());
+            append(")");
+        }
+    }
+
+    protected void serializeForInsert(QueryMetadata metadata, RelationalPath<?> entity, List<Path<?>> columns,
+            List<Expression<?>> values, @Nullable SubQueryExpression<?> subQuery) {
+        serialize(Position.START, metadata.getFlags());
+
+        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
+            append(templates.getInsertInto());
+        }
+        serialize(Position.AFTER_SELECT, metadata.getFlags());
+
+        boolean originalDmlWithSchema = dmlWithSchema;
+        dmlWithSchema = true;
+        handle(entity);
+        dmlWithSchema = originalDmlWithSchema;
+        // columns
+        if (!columns.isEmpty()) {
+            append(" (");
+            skipParent = true;
+            handle(COMMA, columns);
+            skipParent = false;
+            append(")");
+        }
+
+        if (subQuery != null) {
+            append("\n");
+            serialize(subQuery.getMetadata(), false);
+
+        } else {
+            if (!useLiterals) {
+                for (int i = 0; i < columns.size(); i++) {
+                    if (values.get(i) instanceof Constant<?>) {
+                        constantPaths.add(columns.get(i));
+                    }
+                }
+            }
+
+            if (!values.isEmpty()) {
+                // values
+                append(templates.getValues());
+                append("(");
+                handle(COMMA, values);
+                append(")");
+            } else {
+                append(templates.getDefaultValues());
+            }
+        }
+
+    }
+
+    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+            Map<Path<?>, Expression<?>> updates) {
+        templates.serializeUpdate(metadata, entity, updates, this);
+    }
+
+    protected void serializeForUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+            Map<Path<?>, Expression<?>> updates) {
+        this.entity = entity;
+
+        serialize(Position.START, metadata.getFlags());
+
+        if (!serialize(Position.START_OVERRIDE, metadata.getFlags())) {
+            append(templates.getUpdate());
+        }
+        serialize(Position.AFTER_SELECT, metadata.getFlags());
+
+        boolean originalDmlWithSchema = dmlWithSchema;
+        dmlWithSchema = true;
+        handle(entity);
+        dmlWithSchema = originalDmlWithSchema;
+        append("\n");
+        append(templates.getSet());
+        boolean first = true;
+        skipParent = true;
+        for (final Map.Entry<Path<?>,Expression<?>> update : updates.entrySet()) {
+            if (!first) {
+                append(COMMA);
+            }
+            handle(update.getKey());
+            append(" = ");
+            if (!useLiterals && update.getValue() instanceof Constant<?>) {
+                constantPaths.add(update.getKey());
+            }
+            handle(update.getValue());
+            first = false;
+        }
+        skipParent = false;
+
+        serialize(Position.BEFORE_FILTERS, metadata.getFlags());
+        if (metadata.getWhere() != null) {
+            serializeForWhere(metadata);
+        }
+    }
+
+    protected void serializeSources(List<JoinExpression> joins) {
+        if (joins.isEmpty()) {
+            String dummyTable = templates.getDummyTable();
+            if (!StringUtils.isNullOrEmpty(dummyTable)) {
+                append(templates.getFrom());
+                append(dummyTable);
+            }
+        } else {
+            append(templates.getFrom());
+            for (int i = 0; i < joins.size(); i++) {
+                final JoinExpression je = joins.get(i);
+                if (je.getFlags().isEmpty()) {
+                    if (i > 0) {
+                        append(templates.getJoinSymbol(je.getType()));
+                    }
+                    handleJoinTarget(je);
+                    if (je.getCondition() != null) {
+                        append(templates.getOn()).handle(je.getCondition());
+                    }
+                } else {
+                    serialize(JoinFlag.Position.START, je.getFlags());
+                    if (!serialize(JoinFlag.Position.OVERRIDE, je.getFlags()) && i > 0) {
+                        append(templates.getJoinSymbol(je.getType()));
+                    }
+                    serialize(JoinFlag.Position.BEFORE_TARGET, je.getFlags());
+                    handleJoinTarget(je);
+                    serialize(JoinFlag.Position.BEFORE_CONDITION, je.getFlags());
+                    if (je.getCondition() != null) {
+                        append(templates.getOn()).handle(je.getCondition());
+                    }
+                    serialize(JoinFlag.Position.END, je.getFlags());
+                }
+            }
+        }
+    }
+
+    public void serializeUnion(Expression<?> union, QueryMetadata metadata, boolean unionAll) {
+        final List<? extends Expression<?>> groupBy = metadata.getGroupBy();
+        final Predicate having = metadata.getHaving();
+        final List<OrderSpecifier<?>> orderBy = metadata.getOrderBy();
+        final Set<QueryFlag> flags = metadata.getFlags();
+        final boolean hasFlags = !flags.isEmpty();
+
+        // with
+        if (hasFlags) {
+            boolean handled = false;
+            boolean recursive = false;
+            for (QueryFlag flag : flags) {
+                if (flag.getPosition() == Position.WITH) {
+                    if (flag.getFlag() == SQLTemplates.RECURSIVE) {
+                        recursive = true;
+                        continue;
+                    }
+                    if (handled) {
+                        append(", ");
+                    }
+                    handle(flag.getFlag());
+                    handled = true;
+                }
+            }
+            if (handled) {
+                if (recursive) {
+                    prepend(templates.getWithRecursive());
+                } else {
+                    prepend(templates.getWith());
+                }
+                append("\n");
+            }
+        }
+
+        // union
+        Stage oldStage = stage;
+        handle(union);
+
+        // group by
+        if (hasFlags) {
+            serialize(Position.BEFORE_GROUP_BY, flags);
+        }
+        if (!groupBy.isEmpty()) {
+            stage = Stage.GROUP_BY;
+            append(templates.getGroupBy()).handle(COMMA, groupBy);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_GROUP_BY, flags);
+        }
+
+        // having
+        if (hasFlags) {
+            serialize(Position.BEFORE_HAVING, flags);
+        }
+        if (having != null) {
+            stage = Stage.HAVING;
+            append(templates.getHaving()).handle(having);
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_HAVING, flags);
+        }
+
+        // order by
+        if (hasFlags) {
+            serialize(Position.BEFORE_ORDER, flags);
+        }
+        if (!orderBy.isEmpty()) {
+            stage = Stage.ORDER_BY;
+            append(templates.getOrderBy());
+            skipParent = true;
+            handleOrderBy(orderBy);
+            skipParent = false;
+        }
+        if (hasFlags) {
+            serialize(Position.AFTER_ORDER, flags);
+        }
+
+        // end
+        if (hasFlags) {
+            serialize(Position.END, flags);
+        }
+
+        // reset stage
+        stage = oldStage;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void visitConstant(Object constant) {
+        if (useLiterals) {
+            if (constant instanceof Collection) {
+                append("(");
+                boolean first = true;
+                for (Object o : ((Collection) constant)) {
+                    if (!first) {
+                        append(COMMA);
+                    }
+                    append(configuration.asLiteral(o));
+                    first = false;
+                }
+                append(")");
+            } else {
+                append(configuration.asLiteral(constant));
+            }
+        } else if (constant instanceof Collection) {
+            append("(");
+            boolean first = true;
+            for (Object o : ((Collection) constant)) {
+                if (!first) {
+                    append(COMMA);
+                }
+                serializeConstant(constants.size() + 1, null);
+                constants.add(o);
+                if (first && (constantPaths.size() < constants.size())) {
+                    constantPaths.add(null);
+                }
+                first = false;
+            }
+            append(")");
+
+            int size = ((Collection) constant).size() - 1;
+            Path<?> lastPath = constantPaths.peekLast();
+            for (int i = 0; i < size; i++) {
+                constantPaths.add(lastPath);
+            }
+        } else {
+            if (stage == Stage.SELECT
+                && !Null.class.isInstance(constant)
+                && configuration.getTemplates().isWrapSelectParameters()) {
+                String typeName = configuration.getTypeNameForCast(constant.getClass());
+                Expression type = Expressions.constant(typeName);
+                super.visitOperation(constant.getClass(), SQLOps.CAST, Arrays.<Expression<?>> asList(Q, type));
+            } else {
+                serializeConstant(constants.size() + 1, null);
+            }
+            constants.add(constant);
+            if (constantPaths.size() < constants.size()) {
+                constantPaths.add(null);
+            }
+        }
+    }
+
+    @Override
+    public Void visit(ParamExpression<?> param, Void context) {
+        constants.add(param);
+        serializeConstant(constants.size(), null);
+        if (constantPaths.size() < constants.size()) {
+            constantPaths.add(null);
+        }
+        return null;
+    }
+
+    @Override
+    protected void serializeConstant(int parameterIndex, String constantLabel) {
+        append("?");
+    }
+
+    @Override
+    public Void visit(Path<?> path, Void context) {
+        if (dml) {
+            if (path.equals(entity) && path instanceof RelationalPath<?>) {
+                SchemaAndTable schemaAndTable = getSchemaAndTable((RelationalPath<?>) path);
+                boolean precededByDot;
+                if (dmlWithSchema && templates.isPrintSchema()) {
+                    appendSchemaName(schemaAndTable.getSchema());
+                    append(".");
+                    precededByDot = true;
+                } else {
+                    precededByDot = false;
+                }
+                appendTableName(schemaAndTable.getTable(), precededByDot);
+                return null;
+            } else if (entity.equals(path.getMetadata().getParent()) && skipParent) {
+                appendAsColumnName(path, false);
+                return null;
+            }
+        }
+        final PathMetadata metadata = path.getMetadata();
+        boolean precededByDot;
+        if (metadata.getParent() != null && (!skipParent || dml)) {
+            visit(metadata.getParent(), context);
+            append(".");
+            precededByDot = true;
+        } else {
+            precededByDot = false;
+        }
+        appendAsColumnName(path, precededByDot);
+        return null;
+    }
+
+    @Override
+    public Void visit(SubQueryExpression<?> query, Void context) {
+        boolean oldInSubsuery = inSubquery;
+        inSubquery = true;
+        if (inUnion && !templates.isUnionsWrapped()) {
+            serialize(query.getMetadata(), false);
+        } else {
+            append("(");
+            serialize(query.getMetadata(), false);
+            append(")");
+        }
+        inSubquery = oldInSubsuery;
+        return null;
+    }
+
+    @Override
+    public Void visit(TemplateExpression<?> expr, Void context) {
+        if (expr.equals(Expressions.TRUE)) {
+            append(templates.serialize("1", Types.BOOLEAN));
+        } else if (expr.equals(Expressions.FALSE)) {
+            append(templates.serialize("0", Types.BOOLEAN));
+        } else if (inJoin && expr instanceof RelationalFunctionCall
+                && templates.isFunctionJoinsWrapped()) {
+            append("table(");
+            super.visit(expr, context);
+            append(")");
+        } else {
+            super.visit(expr, context);
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void visitOperation(Class<?> type, Operator operator, List<? extends Expression<?>> args) {
+        boolean pathAdded = false;
+        if (args.size() == 2
+         && !useLiterals
+         && args.get(0) instanceof Path<?>
+         && args.get(1) instanceof Constant<?>
+         && operator != Ops.NUMCAST) {
+            Object constant = ((Constant<?>) args.get(1)).getConstant();
+            if (!Collection.class.isInstance(constant) || !((Collection) constant).isEmpty()) {
+                for (Element element : templates.getTemplate(operator).getElements()) {
+                    if (element instanceof Template.ByIndex && ((Template.ByIndex) element).getIndex() == 1) {
+                        constantPaths.add((Path<?>) args.get(0));
+                        pathAdded = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (operator == Ops.SET && args.get(0) instanceof SubQueryExpression) {
+            boolean oldUnion = inUnion;
+            inUnion = true;
+            super.visitOperation(type, SQLOps.UNION, args);
+            inUnion = oldUnion;
+
+        } else if (operator == SQLOps.UNION || operator == SQLOps.UNION_ALL) {
+            boolean oldUnion = inUnion;
+            inUnion = true;
+            super.visitOperation(type, operator, args);
+            inUnion = oldUnion;
+
+        } else if (operator == Ops.LIKE && args.get(1) instanceof Constant<?>) {
+            final String escape = String.valueOf(templates.getEscapeChar());
+            final String escaped = args.get(1).toString().replace(escape, escape + escape);
+            super.visitOperation(String.class, Ops.LIKE,
+                    Arrays.asList(args.get(0), ConstantImpl.create(escaped)));
+
+        } else if (operator == Ops.STRING_CAST) {
+            final String typeName = configuration.getTypeNameForCast(String.class);
+            super.visitOperation(String.class, SQLOps.CAST,
+                    Arrays.asList(args.get(0), ConstantImpl.create(typeName)));
+
+        } else if (operator == Ops.NUMCAST) {
+            @SuppressWarnings("unchecked") //this is the second argument's type
+            Constant<Class<?>> expectedConstant = (Constant<Class<?>>) args.get(1);
+
+            final Class<?> targetType = expectedConstant.getConstant();
+            final String typeName = configuration.getTypeNameForCast(targetType);
+            super.visitOperation(targetType, SQLOps.CAST,
+                    Arrays.asList(args.get(0), ConstantImpl.create(typeName)));
+
+        } else if (operator == Ops.ALIAS) {
+            if (stage == Stage.SELECT || stage == Stage.FROM) {
+                if (args.get(1) instanceof Path && !((Path<?>) args.get(1)).getMetadata().isRoot()) {
+                    Path<?> path = (Path<?>) args.get(1);
+                    args = Arrays.asList(args.get(0),
+                            ExpressionUtils.path(path.getType(), path.getMetadata().getName()));
+                }
+                super.visitOperation(type, operator, args);
+            } else {
+                // handle only target
+                handle(args.get(1));
+            }
+
+        } else if ((operator == Ops.IN || operator == Ops.NOT_IN)
+                && args.get(0) instanceof Path<?>
+                && args.get(1) instanceof Constant<?>) {
+            //The type of the constant expression is compatible with the left
+            //expression, since the compile time checking mandates it to be.
+            @SuppressWarnings("unchecked")
+            Collection<Object> coll = ((Constant<Collection<Object>>) args.get(1)).getConstant();
+            if (coll.isEmpty()) {
+                super.visitOperation(type, operator == Ops.IN ? Ops.EQ : Ops.NE,
+                        Arrays.asList(Expressions.ONE, Expressions.TWO));
+            } else {
+                if (templates.getListMaxSize() == 0 || coll.size() <= templates.getListMaxSize()) {
+                    super.visitOperation(type, operator, args);
+                } else {
+                    //The type of the path is compatible with the constant
+                    //expression, since the compile time checking mandates it to be
+                    @SuppressWarnings("unchecked")
+                    Expression<Object> path = (Expression<Object>) args.get(0);
+                    if (pathAdded) {
+                        constantPaths.removeLast();
+                    }
+                    Iterable<List<Object>> partitioned = CollectionUtils.partition(new ArrayList<>(coll), templates.getListMaxSize());
+                    Predicate result;
+                    if (operator == Ops.IN) {
+                        result = ExpressionUtils.inAny(path, partitioned);
+                    } else {
+                        result = ExpressionUtils.notInAny(path, partitioned);
+                    }
+                    append("(");
+                    result.accept(this, null);
+                    append(")");
+                }
+            }
+
+        } else if (operator == SQLOps.WITH_COLUMNS) {
+            boolean oldSkipParent = skipParent;
+            skipParent = true;
+            super.visitOperation(type, operator, args);
+            skipParent = oldSkipParent;
+
+        } else if (operator == Ops.ORDER) {
+            List<OrderSpecifier<?>> order = ((Constant<List<OrderSpecifier<?>>>) args.get(0)).getConstant();
+            handleOrderBy(order);
+
+        } else {
+            super.visitOperation(type, operator, args);
+        }
+
+        if (operator == SQLOps.WITH_ALIAS || operator == SQLOps.WITH_COLUMNS) {
+            if (args.get(0) instanceof Path) {
+                withAliases.add((Path<?>) args.get(0));
+            } else {
+                withAliases.add((Path<?>) ((Operation<?>) args.get(0)).getArg(0));
+            }
+        }
+    }
+
+    public void setUseLiterals(boolean useLiterals) {
+        this.useLiterals = useLiterals;
+    }
+
+    protected void setSkipParent(boolean b) {
+        skipParent = b;
+    }
+
+    protected void setDmlWithSchema(boolean b) {
+        dmlWithSchema = b;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2005Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2005Templates.java
new file mode 100644
index 0000000000..24cbca1d5f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2005Templates.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.Map;
+import java.util.Set;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+
+
+/**
+ * {@code SQLServer2005Templates} is an SQL dialect for Microsoft SQL Server 2005
+ *
+ * @author tiwe
+ */
+public class SQLServer2005Templates extends SQLServerTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLServer2005Templates DEFAULT = new SQLServer2005Templates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new SQLServer2005Templates(escape, quote);
+            }
+        };
+    }
+
+    private String topTemplate = "top ({0}) ";
+
+    private String outerQueryStart = "select * from (\n  ";
+
+    private String outerQueryEnd = ") a where ";
+
+    private String limitOffsetTemplate = "rn > {0} and rn <= {1}";
+
+    private String offsetTemplate = "rn > {0}";
+
+    private String outerQuerySuffix = " order by rn";
+
+    public SQLServer2005Templates() {
+        this(Keywords.SQLSERVER2005, '\\',false);
+    }
+
+    public SQLServer2005Templates(boolean quote) {
+        this(Keywords.SQLSERVER2005, '\\',quote);
+    }
+
+    public SQLServer2005Templates(char escape, boolean quote) {
+        this(Keywords.SQLSERVER2005, escape, quote);
+    }
+
+    protected SQLServer2005Templates(Set<String> keywords, char escape, boolean quote) {
+        super(keywords, escape, quote);
+        //The older MSSQL Server suite doesn't support logarithms with a base other
+        //than 10 and the natural logarithm, so we do it manually
+        add(Ops.MathOps.LOG, "(LOG({0}) / LOG({1}))");
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
+            QueryModifiers mod = metadata.getModifiers();
+            if (mod.getOffset() == null) {
+                // select top ...
+                metadata = metadata.clone();
+                metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                        Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+                context.serializeForQuery(metadata, forCountRow);
+            } else {
+                context.append(outerQueryStart);
+                metadata = metadata.clone();
+                WindowFunction<Long> rn = SQLExpressions.rowNumber().over();
+                for (OrderSpecifier<?> os : metadata.getOrderBy()) {
+                    rn.orderBy(os);
+                }
+                if (metadata.getOrderBy().isEmpty()) {
+                    rn.orderBy(Expressions.currentTimestamp().asc());
+                }
+                FactoryExpression<?> pr = Projections.appending(metadata.getProjection(), rn.as("rn"));
+                metadata.setProjection(FactoryExpressionUtils.wrap(pr));
+                metadata.clearOrderBy();
+                context.serializeForQuery(metadata, forCountRow);
+                context.append(outerQueryEnd);
+                if (mod.getLimit() == null) {
+                    context.handle(offsetTemplate, mod.getOffset());
+                } else {
+                    context.handle(limitOffsetTemplate, mod.getOffset(), mod.getLimit() + mod.getOffset());
+                }
+                context.append(outerQuerySuffix);
+            }
+
+        } else {
+            context.serializeForQuery(metadata, forCountRow);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
+        // limit
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.isRestricting()) {
+            metadata = metadata.clone();
+            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+        }
+
+        context.serializeForDelete(metadata, entity);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+            Map<Path<?>, Expression<?>> updates, SQLSerializer context) {
+        // limit
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.isRestricting()) {
+            metadata = metadata.clone();
+            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+        }
+
+        context.serializeForUpdate(metadata, entity, updates);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2008Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2008Templates.java
new file mode 100644
index 0000000000..09a06bec62
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2008Templates.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+
+import java.util.Set;
+
+/**
+ * {@code SQLServer2008Templates} is an SQL dialect for Microsoft SQL Server 2008
+ *
+ * @author tiwe
+ *
+ */
+public class SQLServer2008Templates extends SQLServer2005Templates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLServer2008Templates DEFAULT = new SQLServer2008Templates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new SQLServer2008Templates(escape, quote);
+            }
+        };
+    }
+
+    public SQLServer2008Templates() {
+        this(Keywords.SQLSERVER2008, '\\',false);
+    }
+
+    public SQLServer2008Templates(boolean quote) {
+        this(Keywords.SQLSERVER2008, '\\',quote);
+    }
+
+    public SQLServer2008Templates(char escape, boolean quote) {
+        this(Keywords.SQLSERVER2008, escape, quote);
+    }
+
+    protected SQLServer2008Templates(Set<String> keywords, char escape, boolean quote) {
+        super(keywords, escape, quote);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java
new file mode 100644
index 0000000000..012163e7f1
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.Map;
+import java.util.Set;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code SQLServer2012Templates} is an SQL dialect for Microsoft SQL Server 2012 and later
+ *
+ * @author tiwe
+ *
+ */
+public class SQLServer2012Templates extends SQLServerTemplates {
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLServer2012Templates DEFAULT = new SQLServer2012Templates();
+
+    private String topTemplate = "top {0s} ";
+
+    private String limitOffsetTemplate = "\noffset {1} rows fetch next {0} rows only";
+
+    private String offsetTemplate = "\noffset {0} rows";
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new SQLServer2012Templates(escape, quote);
+            }
+        };
+    }
+
+    public SQLServer2012Templates() {
+        this(Keywords.SQLSERVER2012, '\\',false);
+    }
+
+    public SQLServer2012Templates(boolean quote) {
+        this(Keywords.SQLSERVER2012, '\\',quote);
+    }
+
+    public SQLServer2012Templates(char escape, boolean quote) {
+        this(Keywords.SQLSERVER2012, escape, quote);
+    }
+
+    protected SQLServer2012Templates(Set<String> keywords, char escape, boolean quote) {
+        super(keywords, escape, quote);
+        add(SQLOps.NEXTVAL, "next value for {0s}");
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        if (!forCountRow && metadata.getModifiers().isRestricting() && metadata.getOrderBy().isEmpty()
+                && !metadata.getJoins().isEmpty()) {
+            metadata = metadata.clone();
+            QueryModifiers mod = metadata.getModifiers();
+            // use top if order by is empty
+            if (mod.getOffset() == null) {
+                // select top ...
+                metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                        Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+            } else {
+                // order by first column
+                metadata.addOrderBy(Expressions.ONE.asc());
+            }
+        }
+        context.serializeForQuery(metadata, forCountRow);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
+        // limit
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.isRestricting()) {
+            metadata = metadata.clone();
+            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+        }
+
+        context.serializeForDelete(metadata, entity);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+                                Map<Path<?>, Expression<?>> updates, SQLSerializer context) {
+        // limit
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.isRestricting()) {
+            metadata = metadata.clone();
+            metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                    Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+        }
+
+        context.serializeForUpdate(metadata, entity, updates);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        if (!metadata.getOrderBy().isEmpty()) {
+            QueryModifiers mod = metadata.getModifiers();
+            if (mod.getLimit() == null) {
+                context.handle(offsetTemplate, mod.getOffset());
+            } else if (mod.getOffset() == null) {
+                context.handle(limitOffsetTemplate, mod.getLimit(), 0);
+            } else {
+                context.handle(limitOffsetTemplate, mod.getLimit(), mod.getOffset());
+            }
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServerTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServerTemplates.java
new file mode 100644
index 0000000000..02ab19b25c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServerTemplates.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Types;
+import java.util.Collections;
+import java.util.Set;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.dsl.Expressions;
+
+/**
+ * {@code SQLServerTemplates} is an SQL dialect for Microsoft SQL Server
+ *
+ * @author tiwe
+ *
+ */
+public class SQLServerTemplates extends SQLTemplates {
+
+    protected static final Expression<?> WITH_REPEATABLE_READ = ExpressionUtils.operation(
+        Object.class, SQLOps.WITH_REPEATABLE_READ, Collections.emptyList());
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLServerTemplates DEFAULT = new SQLServerTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new SQLServerTemplates(escape, quote);
+            }
+        };
+    }
+
+    private String topTemplate = "top {0s} ";
+
+    public SQLServerTemplates() {
+        this('\\',false);
+    }
+
+    public SQLServerTemplates(boolean quote) {
+        this('\\',quote);
+    }
+
+    public SQLServerTemplates(char escape, boolean quote) {
+        this(Keywords.DEFAULT, escape, quote);
+    }
+
+    protected SQLServerTemplates(Set<String> keywords, char escape, boolean quote) {
+        super(keywords, "\"", escape, quote, false);
+        setDummyTable("");
+        setNullsFirst(null);
+        setNullsLast(null);
+        setDefaultValues("\ndefault values");
+        setArraysSupported(false);
+        setForUpdateFlag(new QueryFlag(Position.BEFORE_FILTERS, FOR_UPDATE));
+
+        setForShareSupported(true);
+        setForShareFlag(new QueryFlag(Position.BEFORE_FILTERS, WITH_REPEATABLE_READ));
+
+        setPrecedence(Precedence.ARITH_LOW, Ops.NEGATE);
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+        setPrecedence(Precedence.OR, Ops.BETWEEN, Ops.IN, Ops.NOT_IN, Ops.LIKE, Ops.LIKE_ESCAPE);
+        setPrecedence(Precedence.OR, OTHER_LIKE_CASES);
+        setPrecedence(Precedence.OR + 1, Ops.LIST, Ops.SET, Ops.SINGLETON);
+
+        add(SQLOps.WITH_REPEATABLE_READ, "\nwith (repeatableread)");
+
+        // String
+        add(Ops.CONCAT, "{0} + {1}");
+        add(Ops.CHAR_AT, "cast(substring({0},{1+'1'},1) as char)");
+        add(Ops.INDEX_OF, "charindex({1},{0})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "charindex({1},{0},{2})-1", Precedence.ARITH_LOW);
+        // NOTE : needs to be replaced with real regular expression
+        add(Ops.MATCHES, "{0} like {1}", Precedence.OR);
+        add(Ops.STRING_IS_EMPTY, "len({0}) = 0", Precedence.COMPARISON);
+        add(Ops.STRING_LENGTH, "len({0})");
+        add(Ops.SUBSTR_1ARG, "substring({0},{1+'1'},255)");
+        add(Ops.SUBSTR_2ARGS, "substring({0},{1+'1'},{2-1s})");
+        add(Ops.TRIM, "ltrim(rtrim({0}))");
+
+        add(SQLOps.FOR_UPDATE, "\nwith (updlock)");
+
+        add(Ops.StringOps.LOCATE, "charindex({0},{1})");
+        add(Ops.StringOps.LOCATE2, "charindex({0},{1},{2})");
+        add(Ops.StringOps.LPAD, "right(replicate(' ', {1}) + left({0}, {1}), {1})");
+        add(Ops.StringOps.LPAD2, "right(replicate({2}, {1}) + left({0}, {1}), {1})");
+        add(Ops.StringOps.RPAD, "left(left({0}, {1}) + replicate(' ', {1}), {1})");
+        add(Ops.StringOps.RPAD2, "left(left({0}, {1}) + replicate({2}, {1}), {1})");
+
+        add(SQLOps.NEXTVAL, "{0s}.nextval");
+
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+        add(Ops.MathOps.COSH, "(exp({0}) + exp({0*'-1'})) / 2");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "log({0}, {1})");
+        add(Ops.MathOps.POWER, "power({0}, {1})");
+        add(Ops.MathOps.ROUND, "round({0}, 0)");
+        add(Ops.MathOps.SINH, "(exp({0}) - exp({0*'-1'})) / 2");
+        add(Ops.MathOps.TANH, "(exp({0*'2'}) - 1) / (exp({0*'2'}) + 1)");
+
+        // Date / time
+        add(Ops.DateTimeOps.YEAR, "datepart(year, {0})");
+        add(Ops.DateTimeOps.MONTH, "datepart(month, {0})");
+        add(Ops.DateTimeOps.WEEK, "datepart(week, {0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "datepart(day, {0})");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "datepart(weekday, {0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "datepart(dayofyear, {0})");
+        add(Ops.DateTimeOps.HOUR, "datepart(hour, {0})");
+        add(Ops.DateTimeOps.MINUTE, "datepart(minute, {0})");
+        add(Ops.DateTimeOps.SECOND, "datepart(second, {0})");
+        add(Ops.DateTimeOps.MILLISECOND, "datepart(millisecond, {0})");
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "(datepart(year, {0}) * 100 + datepart(month, {0}))");
+        add(Ops.DateTimeOps.YEAR_WEEK, "(datepart(year, {0}) * 100 + datepart(isowk, {0}))");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "dateadd(year, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd(month, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd(week, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_DAYS, "dateadd(day, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_HOURS, "dateadd(hour, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd(minute, {1s}, {0})");
+        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd(second, {1s}, {0})");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "datediff(year,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff(month,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "datediff(week,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_DAYS, "datediff(day,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "datediff(hour,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff(minute,{0},{1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff(second,{0},{1})");
+
+        // truncates timestamps by replacing suffix
+        add(Ops.DateTimeOps.TRUNC_YEAR,   "CONVERT(DATETIME, CONVERT(VARCHAR(4), {0}, 120) + '-01-01')");
+        add(Ops.DateTimeOps.TRUNC_MONTH,  "CONVERT(DATETIME, CONVERT(VARCHAR(7), {0}, 120) + '-01')");
+        add(Ops.DateTimeOps.TRUNC_WEEK, "DATEADD(WEEK, DATEDIFF(WEEK, 0, {0} - 1), 0)");
+        add(Ops.DateTimeOps.TRUNC_DAY,    "CONVERT(DATETIME, CONVERT(VARCHAR(10), {0}, 120))");
+        add(Ops.DateTimeOps.TRUNC_HOUR,   "CONVERT(DATETIME, CONVERT(VARCHAR(13), {0}, 120) + ':00:00')");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "CONVERT(DATETIME, CONVERT(VARCHAR(16), {0}, 120) + ':00')");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "CONVERT(DATETIME, CONVERT(VARCHAR(19), {0}, 120))");
+
+        add(Ops.DateTimeOps.DATE, "cast({0} as date)");
+        add(Ops.DateTimeOps.CURRENT_DATE, "cast(getdate() as date)");
+
+        addTypeNameToCode("bit", Types.BOOLEAN, true);
+        addTypeNameToCode("decimal", Types.DOUBLE, true);
+        addTypeNameToCode("tinyint identity", Types.TINYINT);
+        addTypeNameToCode("bigint identity", Types.BIGINT);
+        addTypeNameToCode("timestamp", Types.BINARY);
+        addTypeNameToCode("nchar", Types.CHAR);
+        addTypeNameToCode("uniqueidentifier", Types.CHAR);
+        addTypeNameToCode("numeric() identity", Types.NUMERIC);
+        addTypeNameToCode("money", Types.DECIMAL);
+        addTypeNameToCode("smallmoney", Types.DECIMAL);
+        addTypeNameToCode("decimal() identity", Types.DECIMAL);
+        addTypeNameToCode("int", Types.INTEGER);
+        addTypeNameToCode("int identity", Types.INTEGER);
+        addTypeNameToCode("smallint identity", Types.SMALLINT);
+        addTypeNameToCode("float", Types.DOUBLE);
+        addTypeNameToCode("nvarchar", Types.VARCHAR);
+        addTypeNameToCode("date", Types.VARCHAR);
+        addTypeNameToCode("time", Types.VARCHAR);
+        addTypeNameToCode("datetime2", Types.VARCHAR);
+        addTypeNameToCode("datetimeoffset", Types.VARCHAR);
+        addTypeNameToCode("sysname", Types.VARCHAR);
+        addTypeNameToCode("sql_variant", Types.VARCHAR);
+        addTypeNameToCode("datetime", Types.TIMESTAMP);
+        addTypeNameToCode("smalldatetime", Types.TIMESTAMP);
+        addTypeNameToCode("image", Types.BLOB);
+        addTypeNameToCode("ntext", Types.CLOB);
+        addTypeNameToCode("xml", Types.CLOB);
+        addTypeNameToCode("text", Types.CLOB);
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+                return "CAST('" + literal + "' AS DATETIME2)";
+            case TIMESTAMP_WITH_TIMEZONE:
+                return "CAST('" + literal + "' AS DATETIMEOFFSET)";
+            case Types.DATE:
+                return "CAST('" + literal + "' AS DATE)";
+            case Types.TIME:
+            case TIME_WITH_TIMEZONE:
+                return "CAST('" + literal + "' AS TIME)";
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+    @Override
+    protected String escapeForLike(String str) {
+        final StringBuilder rv = new StringBuilder(str.length() + 3);
+        for (char ch : str.toCharArray()) {
+            if (ch == getEscapeChar() || ch == '%' || ch == '_' || ch == '[') {
+                rv.append(getEscapeChar());
+            }
+            rv.append(ch);
+        }
+        return rv.toString();
+    }
+
+    @Override
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        if (!forCountRow && metadata.getModifiers().isRestricting() && !metadata.getJoins().isEmpty()) {
+            QueryModifiers mod = metadata.getModifiers();
+            if (mod.getOffset() == null) {
+                // select top ...
+                metadata = metadata.clone();
+                metadata.addFlag(new QueryFlag(QueryFlag.Position.AFTER_SELECT,
+                        Expressions.template(Integer.class, topTemplate, mod.getLimit())));
+                context.serializeForQuery(metadata, forCountRow);
+            } else {
+                throw new IllegalStateException("offset not supported");
+            }
+
+        } else {
+            context.serializeForQuery(metadata, forCountRow);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    @Override
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        // do nothing
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java
new file mode 100644
index 0000000000..8cc34b7a31
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplates.java
@@ -0,0 +1,1213 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.lang.reflect.Field;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.querydsl.core.*;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.types.*;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.types.Type;
+
+/**
+ * {@code SQLTemplates} extends {@link Templates} to provides SQL specific extensions
+ * and acts as database specific Dialect for Querydsl SQL
+ *
+ * @author tiwe
+ */
+public class SQLTemplates extends Templates {
+
+    protected static final Expression<?> FOR_SHARE = ExpressionUtils.operation(
+            Object.class, SQLOps.FOR_SHARE, Collections.emptyList());
+    protected static final Expression<?> FOR_UPDATE = ExpressionUtils.operation(
+            Object.class, SQLOps.FOR_UPDATE, Collections.emptyList());
+    protected static final Expression<?> NO_WAIT = ExpressionUtils.operation(
+            Object.class, SQLOps.NO_WAIT, Collections.emptyList());
+
+    protected static final int TIME_WITH_TIMEZONE = 2013;
+
+    protected static final int TIMESTAMP_WITH_TIMEZONE = 2014;
+
+    public static final Expression<?> RECURSIVE = ExpressionUtils.template(Object.class, "");
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLTemplates DEFAULT = new SQLTemplates("\"",'\\',false);
+
+    protected static final Set<? extends Operator> OTHER_LIKE_CASES
+            = Collections.unmodifiableSet(EnumSet.of(Ops.ENDS_WITH, Ops.ENDS_WITH_IC,
+                    Ops.LIKE_IC, Ops.LIKE_ESCAPE_IC,
+                    Ops.STARTS_WITH, Ops.STARTS_WITH_IC,
+                    Ops.STRING_CONTAINS, Ops.STRING_CONTAINS_IC));
+
+    private final Set<String> reservedWords;
+
+    /**
+     * Fluent builder for {@code SQLTemplates} instances     *
+     */
+    public abstract static class Builder {
+
+        protected boolean printSchema, quote, newLineToSingleSpace;
+
+        protected char escape = '\\';
+
+        public Builder printSchema() {
+            printSchema = true;
+            return this;
+        }
+
+        public Builder quote() {
+            quote = true;
+            return this;
+        }
+
+        public Builder newLineToSingleSpace() {
+            newLineToSingleSpace = true;
+            return this;
+        }
+
+        public Builder escape(char ch) {
+            escape = ch;
+            return this;
+        }
+
+        protected abstract SQLTemplates build(char escape, boolean quote);
+
+        public SQLTemplates build() {
+            SQLTemplates templates = build(escape, quote);
+            if (newLineToSingleSpace) {
+                templates.newLineToSingleSpace();
+            }
+            templates.setPrintSchema(printSchema);
+            return templates;
+        }
+
+    }
+
+    private final Map<String, Integer> typeNameToCode = new HashMap<>();
+
+    private final Map<Integer, String> codeToTypeName = new HashMap<>();
+
+    private final Map<SchemaAndTable, SchemaAndTable> tableOverrides = new HashMap<>();
+
+    private final List<Type<?>> customTypes = new ArrayList<>();
+
+    private final String quoteStr;
+
+    private final boolean useQuotes;
+
+    private final boolean requiresSchemaInWhere;
+
+    private boolean printSchema;
+
+    private String createTable = "create table ";
+
+    private String asc = " asc";
+
+    private String autoIncrement = " auto_increment";
+
+    private String columnAlias = " ";
+
+    private String count = "count ";
+
+    private String countStar = "count(*)";
+
+    private String crossJoin = ", ";
+
+    private String delete = "delete ";
+
+    private String desc = " desc";
+
+    private String distinctCountEnd = ")";
+
+    private String distinctCountStart = "count(distinct ";
+
+    private String dummyTable = "dual";
+
+    private String from = "\nfrom ";
+
+    private String fullJoin = "\nfull join ";
+
+    private String groupBy = "\ngroup by ";
+
+    private String having = "\nhaving ";
+
+    private String innerJoin = "\ninner join ";
+
+    private String insertInto = "insert into ";
+
+    private String join = "\njoin ";
+
+    private String key = "key";
+
+    private String leftJoin = "\nleft join ";
+
+    private String rightJoin = "\nright join ";
+
+    private String limitTemplate = "\nlimit {0}";
+
+    private String mergeInto = "merge into ";
+
+    private boolean nativeMerge;
+
+    private String notNull = " not null";
+
+    private String offsetTemplate = "\noffset {0}";
+
+    private String on = "\non ";
+
+    private String orderBy = "\norder by ";
+
+    private String select = "select ";
+
+    private String selectDistinct = "select distinct ";
+
+    private String set = "set ";
+
+    private String tableAlias = " ";
+
+    private String update = "update ";
+
+    private String values = "\nvalues ";
+
+    private String defaultValues = "\nvalues ()";
+
+    private String where = "\nwhere ";
+
+    private String with = "with ";
+
+    private String withRecursive = "with recursive ";
+
+    private String createIndex = "create index ";
+
+    private String createUniqueIndex = "create unique index ";
+
+    private String nullsFirst = " nulls first";
+
+    private String nullsLast = " nulls last";
+
+    private boolean parameterMetadataAvailable = true;
+
+    private boolean batchCountViaGetUpdateCount = false;
+
+    private boolean unionsWrapped = true;
+
+    private boolean functionJoinsWrapped = false;
+
+    private boolean limitRequired = false;
+
+    private boolean countDistinctMultipleColumns = false;
+
+    private boolean countViaAnalytics = false;
+
+    private boolean wrapSelectParameters = false;
+
+    private boolean arraysSupported = true;
+
+    private boolean forShareSupported = false;
+
+    private boolean batchToBulkSupported = true;
+
+    private int listMaxSize = 0;
+
+    private boolean supportsUnquotedReservedWordsAsIdentifier = false;
+
+    private int maxLimit = Integer.MAX_VALUE;
+
+    private QueryFlag forShareFlag = new QueryFlag(Position.END, FOR_SHARE);
+
+    private QueryFlag forUpdateFlag = new QueryFlag(Position.END, FOR_UPDATE);
+
+    private QueryFlag noWaitFlag = new QueryFlag(Position.END, NO_WAIT);
+
+    @Deprecated
+    protected SQLTemplates(String quoteStr, char escape, boolean useQuotes) {
+        this(Keywords.DEFAULT, quoteStr, escape, useQuotes, false);
+    }
+
+    protected SQLTemplates(Set<String> reservedKeywords, String quoteStr, char escape, boolean useQuotes) {
+        this(reservedKeywords, quoteStr, escape, useQuotes, false);
+    }
+
+    protected SQLTemplates(Set<String> reservedKeywords, String quoteStr, char escape, boolean useQuotes, boolean requiresSchemaInWhere) {
+        super(escape);
+        this.reservedWords = reservedKeywords;
+        this.quoteStr = quoteStr;
+        this.useQuotes = useQuotes;
+        this.requiresSchemaInWhere = requiresSchemaInWhere;
+
+        add(SQLOps.ALL, "{0}.*");
+
+        // flags
+        add(SQLOps.WITH_ALIAS, "{0} as {1}", 0);
+        add(SQLOps.WITH_COLUMNS, "{0} {1}", 0);
+        add(SQLOps.FOR_UPDATE, "\nfor update");
+        add(SQLOps.FOR_SHARE, "\nfor share");
+        add(SQLOps.NO_WAIT, " nowait");
+        add(SQLOps.QUALIFY, "\nqualify {0}");
+
+        // boolean
+        add(Ops.AND, "{0} and {1}");
+        add(Ops.NOT, "not {0}", Precedence.NOT);
+        add(Ops.OR, "{0} or {1}");
+
+        // math
+        add(Ops.MathOps.RANDOM, "rand()");
+        add(Ops.MathOps.RANDOM2, "rand({0})");
+        add(Ops.MathOps.CEIL, "ceiling({0})");
+        add(Ops.MathOps.POWER, "power({0},{1})");
+        add(Ops.MOD, "mod({0},{1})", Precedence.HIGHEST);
+
+        // date time
+        add(Ops.DateTimeOps.CURRENT_DATE, "current_date");
+        add(Ops.DateTimeOps.CURRENT_TIME, "current_time");
+        add(Ops.DateTimeOps.CURRENT_TIMESTAMP, "current_timestamp");
+
+        add(Ops.DateTimeOps.MILLISECOND, "0");
+        add(Ops.DateTimeOps.SECOND, "extract(second from {0})");
+        add(Ops.DateTimeOps.MINUTE, "extract(minute from {0})");
+        add(Ops.DateTimeOps.HOUR, "extract(hour from {0})");
+        add(Ops.DateTimeOps.WEEK, "extract(week from {0})");
+        add(Ops.DateTimeOps.MONTH, "extract(month from {0})");
+        add(Ops.DateTimeOps.YEAR, "extract(year from {0})");
+        add(Ops.DateTimeOps.YEAR_MONTH, "extract(year from {0}) * 100 + extract(month from {0})", Precedence.ARITH_LOW);
+        add(Ops.DateTimeOps.YEAR_WEEK, "extract(year from {0}) * 100 + extract(week from {0})", Precedence.ARITH_LOW);
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "extract(day_of_week from {0})");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "extract(day from {0})");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "extract(day_of_year from {0})");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "dateadd('year',{1},{0})");
+        add(Ops.DateTimeOps.ADD_MONTHS, "dateadd('month',{1},{0})");
+        add(Ops.DateTimeOps.ADD_WEEKS, "dateadd('week',{1},{0})");
+        add(Ops.DateTimeOps.ADD_DAYS, "dateadd('day',{1},{0})");
+        add(Ops.DateTimeOps.ADD_HOURS, "dateadd('hour',{1},{0})");
+        add(Ops.DateTimeOps.ADD_MINUTES, "dateadd('minute',{1},{0})");
+        add(Ops.DateTimeOps.ADD_SECONDS, "dateadd('second',{1},{0})");
+
+        add(Ops.DateTimeOps.DIFF_YEARS, "datediff('year',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MONTHS, "datediff('month',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_WEEKS, "datediff('week',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_DAYS, "datediff('day',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_HOURS, "datediff('hour',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_MINUTES, "datediff('minute',{0},{1})");
+        add(Ops.DateTimeOps.DIFF_SECONDS, "datediff('second',{0},{1})");
+
+        add(Ops.DateTimeOps.TRUNC_YEAR, "date_trunc('year',{0})");
+        add(Ops.DateTimeOps.TRUNC_MONTH, "date_trunc('month',{0})");
+        add(Ops.DateTimeOps.TRUNC_WEEK, "date_trunc('week',{0})");
+        add(Ops.DateTimeOps.TRUNC_DAY, "date_trunc('day',{0})");
+        add(Ops.DateTimeOps.TRUNC_HOUR, "date_trunc('hour',{0})");
+        add(Ops.DateTimeOps.TRUNC_MINUTE, "date_trunc('minute',{0})");
+        add(Ops.DateTimeOps.TRUNC_SECOND, "date_trunc('second',{0})");
+
+        // string
+        add(Ops.CONCAT, "{0} || {1}", Precedence.ARITH_LOW);
+        add(Ops.MATCHES, "{0} regexp {1}", Precedence.COMPARISON);
+        add(Ops.CHAR_AT, "cast(substr({0},{1+'1's},1) as char)");
+        add(Ops.EQ_IGNORE_CASE, "{0l} = {1l}");
+        add(Ops.INDEX_OF, "locate({1},{0})-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "locate({1},{0},{2+'1's})-1", Precedence.ARITH_LOW);
+        add(Ops.STRING_IS_EMPTY, "length({0}) = 0");
+        add(Ops.SUBSTR_1ARG, "substr({0},{1s}+1)", Precedence.ARITH_LOW);
+        add(Ops.SUBSTR_2ARGS, "substr({0},{1+'1's},{2-1s})", Precedence.ARITH_LOW);
+        add(Ops.StringOps.LOCATE, "locate({0},{1})");
+        add(Ops.StringOps.LOCATE2, "locate({0},{1},{2})");
+
+        // like with escape
+        add(Ops.LIKE, "{0} like {1} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.ENDS_WITH, "{0} like {%1} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.STARTS_WITH, "{0} like {1%} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '" + escape + "'", Precedence.COMPARISON);
+        add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '" + escape + "'", Precedence.COMPARISON);
+
+        add(SQLOps.CAST, "cast({0} as {1s})");
+        add(SQLOps.UNION, "{0}\nunion\n{1}", Precedence.OR + 1);
+        add(SQLOps.UNION_ALL, "{0}\nunion all\n{1}", Precedence.OR + 1);
+        add(SQLOps.NEXTVAL, "nextval('{0s}')");
+
+        // analytic functions
+        add(SQLOps.CORR, "corr({0},{1})");
+        add(SQLOps.COVARPOP, "covar_pop({0},{1})");
+        add(SQLOps.COVARSAMP, "covar_samp({0},{1})");
+        add(SQLOps.CUMEDIST, "cume_dist()");
+        add(SQLOps.CUMEDIST2, "cume_dist({0})");
+        add(SQLOps.DENSERANK, "dense_rank()");
+        add(SQLOps.DENSERANK2, "dense_rank({0})");
+        add(SQLOps.FIRSTVALUE, "first_value({0})");
+        add(SQLOps.LAG, "lag({0})");
+        add(SQLOps.LASTVALUE, "last_value({0})");
+        add(SQLOps.LEAD, "lead({0})");
+        add(SQLOps.LISTAGG, "listagg({0},'{1s}')");
+        add(SQLOps.NTHVALUE, "nth_value({0}, {1})");
+        add(SQLOps.NTILE, "ntile({0})");
+        add(SQLOps.PERCENTILECONT, "percentile_cont({0})");
+        add(SQLOps.PERCENTILEDISC, "percentile_disc({0})");
+        add(SQLOps.PERCENTRANK, "percent_rank()");
+        add(SQLOps.PERCENTRANK2, "percent_rank({0})");
+        add(SQLOps.RANK, "rank()");
+        add(SQLOps.RANK2, "rank({0})");
+        add(SQLOps.RATIOTOREPORT, "ratio_to_report({0})");
+        add(SQLOps.REGR_SLOPE, "regr_slope({0}, {1})");
+        add(SQLOps.REGR_INTERCEPT, "regr_intercept({0}, {1})");
+        add(SQLOps.REGR_COUNT, "regr_count({0}, {1})");
+        add(SQLOps.REGR_R2, "regr_r2({0}, {1})");
+        add(SQLOps.REGR_AVGX, "regr_avgx({0}, {1})");
+        add(SQLOps.REGR_AVGY, "regr_avgy({0}, {1})");
+        add(SQLOps.REGR_SXX, "regr_sxx({0}, {1})");
+        add(SQLOps.REGR_SYY, "regr_syy({0}, {1})");
+        add(SQLOps.REGR_SXY, "regr_sxy({0}, {1})");
+        add(SQLOps.ROWNUMBER, "row_number()");
+        add(SQLOps.STDDEV, "stddev({0})");
+        add(SQLOps.STDDEVPOP, "stddev_pop({0})");
+        add(SQLOps.STDDEVSAMP, "stddev_samp({0})");
+        add(SQLOps.STDDEV_DISTINCT, "stddev(distinct {0})");
+        add(SQLOps.VARIANCE, "variance({0})");
+        add(SQLOps.VARPOP, "var_pop({0})");
+        add(SQLOps.VARSAMP, "var_samp({0})");
+
+        add(SQLOps.GROUP_CONCAT, "group_concat({0})");
+        add(SQLOps.GROUP_CONCAT2, "group_concat({0} separator {1})");
+
+        add(Ops.AggOps.BOOLEAN_ANY, "some({0})");
+        add(Ops.AggOps.BOOLEAN_ALL, "every({0})");
+
+        add(SQLOps.SET_LITERAL, "{0} = {1}");
+        add(SQLOps.SET_PATH, "{0} = values({1})");
+
+        // default type names
+        addTypeNameToCode("null", Types.NULL);
+        addTypeNameToCode("char", Types.CHAR);
+        addTypeNameToCode("datalink", Types.DATALINK);
+        addTypeNameToCode("numeric", Types.NUMERIC);
+        addTypeNameToCode("decimal", Types.DECIMAL);
+        addTypeNameToCode("integer", Types.INTEGER);
+        addTypeNameToCode("smallint", Types.SMALLINT);
+        addTypeNameToCode("float", Types.FLOAT);
+        addTypeNameToCode("real", Types.REAL);
+        addTypeNameToCode("double", Types.DOUBLE);
+        addTypeNameToCode("varchar", Types.VARCHAR);
+        addTypeNameToCode("longnvarchar", Types.LONGNVARCHAR);
+        addTypeNameToCode("nchar", Types.NCHAR);
+        addTypeNameToCode("boolean", Types.BOOLEAN);
+        addTypeNameToCode("nvarchar", Types.NVARCHAR);
+        addTypeNameToCode("rowid", Types.ROWID);
+        addTypeNameToCode("timestamp", Types.TIMESTAMP);
+        addTypeNameToCode("timestamp", TIMESTAMP_WITH_TIMEZONE);
+        addTypeNameToCode("bit", Types.BIT);
+        addTypeNameToCode("time", Types.TIME);
+        addTypeNameToCode("time", TIME_WITH_TIMEZONE);
+        addTypeNameToCode("tinyint", Types.TINYINT);
+        addTypeNameToCode("other", Types.OTHER);
+        addTypeNameToCode("bigint", Types.BIGINT);
+        addTypeNameToCode("longvarbinary", Types.LONGVARBINARY);
+        addTypeNameToCode("varbinary", Types.VARBINARY);
+        addTypeNameToCode("date", Types.DATE);
+        addTypeNameToCode("binary", Types.BINARY);
+        addTypeNameToCode("longvarchar", Types.LONGVARCHAR);
+        addTypeNameToCode("struct", Types.STRUCT);
+        addTypeNameToCode("array", Types.ARRAY);
+        addTypeNameToCode("java_object", Types.JAVA_OBJECT);
+        addTypeNameToCode("distinct", Types.DISTINCT);
+        addTypeNameToCode("ref", Types.REF);
+        addTypeNameToCode("blob", Types.BLOB);
+        addTypeNameToCode("clob", Types.CLOB);
+        addTypeNameToCode("nclob", Types.NCLOB);
+        addTypeNameToCode("sqlxml", Types.SQLXML);
+    }
+
+    public String serialize(String literal, int jdbcType) {
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+            case TIMESTAMP_WITH_TIMEZONE:
+                return "(timestamp '" + literal + "')";
+            case Types.DATE:
+                return "(date '" + literal + "')";
+            case Types.TIME:
+            case TIME_WITH_TIMEZONE:
+                return "(time '" + literal + "')";
+            case Types.CHAR:
+            case Types.CLOB:
+            case Types.LONGNVARCHAR:
+            case Types.LONGVARCHAR:
+            case Types.NCHAR:
+            case Types.NCLOB:
+            case Types.NVARCHAR:
+            case Types.VARCHAR:
+                return "'" + escapeLiteral(literal) + "'";
+            case Types.BIGINT:
+            case Types.BIT:
+            case Types.BOOLEAN:
+            case Types.DECIMAL:
+            case Types.DOUBLE:
+            case Types.FLOAT:
+            case Types.INTEGER:
+            case Types.NULL:
+            case Types.NUMERIC:
+            case Types.SMALLINT:
+            case Types.TINYINT:
+                return literal;
+            default:
+                // for other JDBC types the Type instance is expected to provide
+                // the necessary quoting
+                return literal;
+        }
+    }
+
+    public String escapeLiteral(String str) {
+        StringBuilder builder = new StringBuilder();
+        for (char ch : str.toCharArray()) {
+            if (ch == '\'') {
+                builder.append("''");
+                continue;
+            }
+            builder.append(ch);
+        }
+        return builder.toString();
+    }
+
+    protected void addTypeNameToCode(String type, int code, boolean override) {
+        if (!typeNameToCode.containsKey(type)) {
+            typeNameToCode.put(type, code);
+        }
+        if (override || !codeToTypeName.containsKey(code)) {
+            codeToTypeName.put(code, type);
+        }
+    }
+
+    protected void addTypeNameToCode(String type, int code) {
+        addTypeNameToCode(type, code, false);
+    }
+
+    protected void addTableOverride(SchemaAndTable from, SchemaAndTable to) {
+        tableOverrides.put(from, to);
+    }
+
+    public final List<Type<?>> getCustomTypes() {
+        return customTypes;
+    }
+
+    public final String getAsc() {
+        return asc;
+    }
+
+    public final String getAutoIncrement() {
+        return autoIncrement;
+    }
+
+    public final String getColumnAlias() {
+        return columnAlias;
+    }
+
+    public final String getCount() {
+        return count;
+    }
+
+    public final String getCountStar() {
+        return countStar;
+    }
+
+    public final String getCrossJoin() {
+        return crossJoin;
+    }
+
+    public final String getDelete() {
+        return delete;
+    }
+
+    public final String getDesc() {
+        return desc;
+    }
+
+    public final String getDistinctCountEnd() {
+        return distinctCountEnd;
+    }
+
+    public final String getDistinctCountStart() {
+        return distinctCountStart;
+    }
+
+    public final String getDummyTable() {
+        return dummyTable;
+    }
+
+    public final String getFrom() {
+        return from;
+    }
+
+    public final String getFullJoin() {
+        return fullJoin;
+    }
+
+    public final String getGroupBy() {
+        return groupBy;
+    }
+
+    public final String getHaving() {
+        return having;
+    }
+
+    public final String getInnerJoin() {
+        return innerJoin;
+    }
+
+    public final String getInsertInto() {
+        return insertInto;
+    }
+
+    public final String getJoin() {
+        return join;
+    }
+
+    public final String getJoinSymbol(JoinType joinType) {
+        switch (joinType) {
+            case JOIN:      return join;
+            case INNERJOIN: return innerJoin;
+            case FULLJOIN:  return fullJoin;
+            case LEFTJOIN:  return leftJoin;
+            case RIGHTJOIN: return rightJoin;
+            default:        return crossJoin;
+        }
+    }
+
+    public final String getKey() {
+        return key;
+    }
+
+    public final String getLeftJoin() {
+        return leftJoin;
+    }
+
+    public final String getRightJoin() {
+        return rightJoin;
+    }
+
+    public final String getLimitTemplate() {
+        return limitTemplate;
+    }
+
+    public final String getMergeInto() {
+        return mergeInto;
+    }
+
+    public final String getNotNull() {
+        return notNull;
+    }
+
+    public final String getOffsetTemplate() {
+        return offsetTemplate;
+    }
+
+    public final String getOn() {
+        return on;
+    }
+
+    public final String getOrderBy() {
+        return orderBy;
+    }
+
+    public final String getSelect() {
+        return select;
+    }
+
+    public final String getSelectDistinct() {
+        return selectDistinct;
+    }
+
+    public final String getSet() {
+        return set;
+    }
+
+    public final String getTableAlias() {
+        return tableAlias;
+    }
+
+    public final Map<SchemaAndTable, SchemaAndTable> getTableOverrides() {
+        return tableOverrides;
+    }
+
+    public String getTypeNameForCode(int code) {
+        return codeToTypeName.get(code);
+    }
+
+    public String getCastTypeNameForCode(int code) {
+        return getTypeNameForCode(code);
+    }
+
+    public Integer getCodeForTypeName(String type) {
+        return typeNameToCode.get(type);
+    }
+
+    public final String getUpdate() {
+        return update;
+    }
+
+    public final String getValues() {
+        return values;
+    }
+
+    public final String getDefaultValues() {
+        return defaultValues;
+    }
+
+    public final String getWhere() {
+        return where;
+    }
+
+    public final boolean isNativeMerge() {
+        return nativeMerge;
+    }
+
+    public final boolean isSupportsAlias() {
+        return true;
+    }
+
+    public final String getCreateIndex() {
+        return createIndex;
+    }
+
+    public final String getCreateUniqueIndex() {
+        return createUniqueIndex;
+    }
+
+    public final String getCreateTable() {
+        return createTable;
+    }
+
+    public final String getWith() {
+        return with;
+    }
+
+    public final String getWithRecursive() {
+        return withRecursive;
+    }
+
+    public final boolean isCountDistinctMultipleColumns() {
+        return countDistinctMultipleColumns;
+    }
+
+    public final boolean isRequiresSchemaInWhere() {
+        return requiresSchemaInWhere;
+    }
+
+    public final boolean isPrintSchema() {
+        return printSchema;
+    }
+
+    public final boolean isParameterMetadataAvailable() {
+        return parameterMetadataAvailable;
+    }
+
+    public final boolean isBatchCountViaGetUpdateCount() {
+        return batchCountViaGetUpdateCount;
+    }
+
+    public final boolean isUseQuotes() {
+        return useQuotes;
+    }
+
+    public final boolean isUnionsWrapped() {
+        return unionsWrapped;
+    }
+
+    public boolean isForShareSupported() {
+        return forShareSupported;
+    }
+
+    public final boolean isFunctionJoinsWrapped() {
+        return functionJoinsWrapped;
+    }
+
+    public final boolean isLimitRequired() {
+        return limitRequired;
+    }
+
+    public final String getNullsFirst() {
+        return nullsFirst;
+    }
+
+    public final String getNullsLast() {
+        return nullsLast;
+    }
+
+    public final boolean isCountViaAnalytics() {
+        return countViaAnalytics;
+    }
+
+    public final boolean isWrapSelectParameters() {
+        return wrapSelectParameters;
+    }
+
+    public final boolean isArraysSupported() {
+        return arraysSupported;
+    }
+
+    public final int getListMaxSize() {
+        return listMaxSize;
+    }
+
+    public final boolean isSupportsUnquotedReservedWordsAsIdentifier() {
+        return supportsUnquotedReservedWordsAsIdentifier;
+    }
+
+    public final boolean isBatchToBulkSupported() {
+        return batchToBulkSupported;
+    }
+
+    public final QueryFlag getForShareFlag() {
+        return forShareFlag;
+    }
+
+    public final QueryFlag getForUpdateFlag() {
+        return forUpdateFlag;
+    }
+
+    public final QueryFlag getNoWaitFlag() {
+        return noWaitFlag;
+    }
+
+    protected void newLineToSingleSpace() {
+        for (Class<?> cl : Arrays.<Class<?>>asList(getClass(), SQLTemplates.class)) {
+            for (Field field : cl.getDeclaredFields()) {
+                try {
+                    if (field.getType().equals(String.class)) {
+                        field.setAccessible(true);
+                        Object val = field.get(this);
+                        if (val != null) {
+                            field.set(this, val.toString().replace('\n',' '));
+                        }
+
+                    }
+                } catch (IllegalAccessException e) {
+                    throw new QueryException(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    public final String quoteIdentifier(String identifier) {
+        return quoteIdentifier(identifier, false);
+    }
+
+    public final String quoteIdentifier(String identifier, boolean precededByDot) {
+        if (useQuotes || requiresQuotes(identifier, precededByDot)) {
+            return quoteStr + identifier + quoteStr;
+        } else {
+            return identifier;
+        }
+    }
+
+    protected boolean requiresQuotes(final String identifier, final boolean precededByDot) {
+        if (identifier.matches(".*[^A-z0-9_].*")) {
+            return true;
+        } else if (identifier.matches("^[^A-z_].*")) {
+            return true;
+        } else if (precededByDot && supportsUnquotedReservedWordsAsIdentifier) {
+            return false;
+        } else {
+            return isReservedWord(identifier);
+        }
+    }
+
+    private boolean isReservedWord(String identifier) {
+        return reservedWords.contains(identifier.toUpperCase());
+    }
+
+    /**
+     * template method for SELECT serialization
+     *
+     * @param metadata
+     * @param forCountRow
+     * @param context
+     */
+    public void serialize(QueryMetadata metadata, boolean forCountRow, SQLSerializer context) {
+        context.serializeForQuery(metadata, forCountRow);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for DELETE serialization
+     *
+     * @param metadata
+     * @param entity
+     * @param context
+     */
+    public void serializeDelete(QueryMetadata metadata, RelationalPath<?> entity, SQLSerializer context) {
+        context.serializeForDelete(metadata, entity);
+
+        // limit
+        if (metadata.getModifiers().isRestricting()) {
+            serializeModifiers(metadata, context);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for INSERT serialization
+     *
+     * @param metadata
+     * @param entity
+     * @param columns
+     * @param values
+     * @param subQuery
+     * @param context
+     */
+    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity,
+            List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery,
+            SQLSerializer context) {
+        context.serializeForInsert(metadata, entity, columns, values, subQuery);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for INSERT serialization
+     *
+     * @param metadata
+     * @param batches
+     * @param context
+     */
+    public void serializeInsert(QueryMetadata metadata, RelationalPath<?> entity,
+                                List<SQLInsertBatch> batches, SQLSerializer context) {
+        context.serializeForInsert(metadata, entity, batches);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for MERGE serialization
+     *
+     * @param metadata
+     * @param entity
+     * @param keys
+     * @param columns
+     * @param values
+     * @param subQuery
+     * @param context
+     */
+    public void serializeMerge(QueryMetadata metadata, RelationalPath<?> entity,
+            List<Path<?>> keys, List<Path<?>> columns, List<Expression<?>> values,
+            SubQueryExpression<?> subQuery, SQLSerializer context) {
+        context.serializeForMerge(metadata, entity, keys, columns, values, subQuery);
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for UPDATE serialization
+     *
+     * @param metadata
+     * @param entity
+     * @param updates
+     * @param context
+     */
+    public void serializeUpdate(QueryMetadata metadata, RelationalPath<?> entity,
+            Map<Path<?>, Expression<?>> updates, SQLSerializer context) {
+        context.serializeForUpdate(metadata, entity, updates);
+
+        // limit
+        if (metadata.getModifiers().isRestricting()) {
+            serializeModifiers(metadata, context);
+        }
+
+        if (!metadata.getFlags().isEmpty()) {
+            context.serialize(Position.END, metadata.getFlags());
+        }
+    }
+
+    /**
+     * template method for LIMIT and OFFSET serialization
+     *
+     * @param metadata
+     * @param context
+     */
+    protected void serializeModifiers(QueryMetadata metadata, SQLSerializer context) {
+        QueryModifiers mod = metadata.getModifiers();
+        if (mod.getLimit() != null) {
+            context.handle(limitTemplate, mod.getLimit());
+        } else if (limitRequired) {
+            context.handle(limitTemplate, maxLimit);
+        }
+        if (mod.getOffset() != null) {
+            context.handle(offsetTemplate, mod.getOffset());
+        }
+    }
+
+    protected void addCustomType(Type<?> type) {
+        customTypes.add(type);
+    }
+
+    protected void setAsc(String asc) {
+        this.asc = asc;
+    }
+
+    protected void setAutoIncrement(String autoIncrement) {
+        this.autoIncrement = autoIncrement;
+    }
+
+    protected void setColumnAlias(String columnAlias) {
+        this.columnAlias = columnAlias;
+    }
+
+    protected void setCount(String count) {
+        this.count = count;
+    }
+
+    protected void setCountStar(String countStar) {
+        this.countStar = countStar;
+    }
+
+    protected void setCrossJoin(String crossJoin) {
+        this.crossJoin = crossJoin;
+    }
+
+    protected void setDelete(String delete) {
+        this.delete = delete;
+    }
+
+    protected void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    protected void setDistinctCountEnd(String distinctCountEnd) {
+        this.distinctCountEnd = distinctCountEnd;
+    }
+
+    protected void setDistinctCountStart(String distinctCountStart) {
+        this.distinctCountStart = distinctCountStart;
+    }
+
+    protected void setDummyTable(String dummyTable) {
+        this.dummyTable = dummyTable;
+    }
+
+    protected void setForShareSupported(boolean forShareSupported) {
+        this.forShareSupported = forShareSupported;
+    }
+
+    protected void setFrom(String from) {
+        this.from = from;
+    }
+
+    protected void setFullJoin(String fullJoin) {
+        this.fullJoin = fullJoin;
+    }
+
+    protected void setGroupBy(String groupBy) {
+        this.groupBy = groupBy;
+    }
+
+    protected void setHaving(String having) {
+        this.having = having;
+    }
+
+    protected void setInnerJoin(String innerJoin) {
+        this.innerJoin = innerJoin;
+    }
+
+    protected void setInsertInto(String insertInto) {
+        this.insertInto = insertInto;
+    }
+
+    protected void setJoin(String join) {
+        this.join = join;
+    }
+
+    protected void setKey(String key) {
+        this.key = key;
+    }
+
+    protected void setLeftJoin(String leftJoin) {
+        this.leftJoin = leftJoin;
+    }
+
+    protected void setRightJoin(String rightJoin) {
+        this.rightJoin = rightJoin;
+    }
+
+    protected void setMergeInto(String mergeInto) {
+        this.mergeInto = mergeInto;
+    }
+
+    protected void setNativeMerge(boolean nativeMerge) {
+        this.nativeMerge = nativeMerge;
+    }
+
+    protected void setNotNull(String notNull) {
+        this.notNull = notNull;
+    }
+
+    protected void setOffsetTemplate(String offsetTemplate) {
+        this.offsetTemplate = offsetTemplate;
+    }
+
+    protected void setOn(String on) {
+        this.on = on;
+    }
+
+    protected void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
+    }
+
+    protected void setSelect(String select) {
+        this.select = select;
+    }
+
+    protected void setSelectDistinct(String selectDistinct) {
+        this.selectDistinct = selectDistinct;
+    }
+
+    protected void setSet(String set) {
+        this.set = set;
+    }
+
+    protected void setTableAlias(String tableAlias) {
+        this.tableAlias = tableAlias;
+    }
+
+    protected void setUpdate(String update) {
+        this.update = update;
+    }
+
+    protected void setValues(String values) {
+        this.values = values;
+    }
+
+    protected void setDefaultValues(String defaultValues) {
+        this.defaultValues = defaultValues;
+    }
+
+    protected void setWhere(String where) {
+        this.where = where;
+    }
+
+    protected void setWith(String with) {
+        this.with = with;
+    }
+
+    protected void setWithRecursive(String withRecursive) {
+        this.withRecursive = withRecursive;
+    }
+
+    protected void setCreateIndex(String createIndex) {
+        this.createIndex = createIndex;
+    }
+
+    protected void setCreateUniqueIndex(String createUniqueIndex) {
+        this.createUniqueIndex = createUniqueIndex;
+    }
+
+    protected void setCreateTable(String createTable) {
+        this.createTable = createTable;
+    }
+
+    protected void setPrintSchema(boolean printSchema) {
+        this.printSchema = printSchema;
+    }
+
+    protected void setParameterMetadataAvailable(boolean parameterMetadataAvailable) {
+        this.parameterMetadataAvailable = parameterMetadataAvailable;
+    }
+
+    protected void setBatchCountViaGetUpdateCount(boolean batchCountViaGetUpdateCount) {
+        this.batchCountViaGetUpdateCount = batchCountViaGetUpdateCount;
+    }
+
+    protected void setUnionsWrapped(boolean unionsWrapped) {
+        this.unionsWrapped = unionsWrapped;
+    }
+
+    protected void setFunctionJoinsWrapped(boolean functionJoinsWrapped) {
+        this.functionJoinsWrapped = functionJoinsWrapped;
+    }
+
+    protected void setNullsFirst(String nullsFirst) {
+        this.nullsFirst = nullsFirst;
+    }
+
+    protected void setNullsLast(String nullsLast) {
+        this.nullsLast = nullsLast;
+    }
+
+    protected void setLimitRequired(boolean limitRequired) {
+        this.limitRequired = limitRequired;
+    }
+
+    protected void setCountDistinctMultipleColumns(boolean countDistinctMultipleColumns) {
+        this.countDistinctMultipleColumns = countDistinctMultipleColumns;
+    }
+
+    protected void setCountViaAnalytics(boolean countViaAnalytics) {
+        this.countViaAnalytics = countViaAnalytics;
+    }
+
+    protected void setWrapSelectParameters(boolean b) {
+        this.wrapSelectParameters = b;
+    }
+
+    protected void setArraysSupported(boolean b) {
+        this.arraysSupported = b;
+    }
+
+    protected void setListMaxSize(int i) {
+        listMaxSize = i;
+    }
+
+    protected void setSupportsUnquotedReservedWordsAsIdentifier(boolean b) {
+        this.supportsUnquotedReservedWordsAsIdentifier = b;
+    }
+
+    protected void setMaxLimit(int i) {
+        this.maxLimit = i;
+    }
+
+    protected void setBatchToBulkSupported(boolean b) {
+        this.batchToBulkSupported = b;
+    }
+
+    protected void setForShareFlag(QueryFlag flag) {
+        forShareFlag = flag;
+    }
+
+    protected void setForUpdateFlag(QueryFlag flag) {
+        forUpdateFlag = flag;
+    }
+
+    protected void setNoWaitFlag(QueryFlag flag) {
+        noWaitFlag = flag;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java
new file mode 100644
index 0000000000..f9f3c8cf2c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+/**
+ * {@code SQLTemplatesRegistry} is a registry for SQLTemplates instances
+ */
+public class SQLTemplatesRegistry {
+
+    /**
+     * Get the SQLTemplates instance that matches best the SQL engine of the
+     * given database metadata
+     *
+     * @param md database metadata
+     * @return templates
+     * @throws SQLException
+     */
+    public SQLTemplates getTemplates(DatabaseMetaData md) throws SQLException {
+        return getBuilder(md).build();
+    }
+
+    /**
+     * Get a SQLTemplates.Builder instance that matches best the SQL engine of the
+     * given database metadata
+     *
+     * @param md database metadata
+     * @return templates
+     * @throws SQLException
+     */
+    public SQLTemplates.Builder getBuilder(DatabaseMetaData md) throws SQLException {
+        String name = md.getDatabaseProductName().toLowerCase();
+        if (name.equals("cubrid")) {
+            return CUBRIDTemplates.builder();
+        } else if (name.equals("apache derby")) {
+            return DerbyTemplates.builder();
+        } else if (name.startsWith("firebird")) {
+            return FirebirdTemplates.builder();
+        } else if (name.equals("h2")) {
+            return H2Templates.builder();
+        } else if (name.equals("hsql")) {
+            return HSQLDBTemplates.builder();
+        } else if (name.equals("mysql")) {
+            return MySQLTemplates.builder();
+        } else if (name.equals("oracle")) {
+            return OracleTemplates.builder();
+        } else if (name.equals("postgresql")) {
+            return PostgreSQLTemplates.builder();
+        } else if (name.equals("sqlite")) {
+            return SQLiteTemplates.builder();
+        } else if (name.startsWith("teradata")) {
+            return TeradataTemplates.builder();
+        } else if (name.equals("microsoft sql server")) {
+            return getMssqlSqlTemplates(md);
+        } else {
+            return new SQLTemplates.Builder() {
+                @Override
+                protected SQLTemplates build(char escape, boolean quote) {
+                    return new SQLTemplates(Keywords.DEFAULT, "\"", escape, quote, false);
+                }
+            };
+        }
+    }
+
+    private SQLTemplates.Builder getMssqlSqlTemplates(DatabaseMetaData md) throws SQLException {
+        int databaseMajorVersion = md.getDatabaseMajorVersion();
+
+        if (databaseMajorVersion < 9) {
+            return SQLServerTemplates.builder();
+        }
+
+        if (databaseMajorVersion == 9) {
+            return SQLServer2005Templates.builder();
+        }
+
+        if (databaseMajorVersion == 10) {
+            return SQLServer2008Templates.builder();
+        }
+
+        return SQLServer2012Templates.builder();
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLiteTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLiteTemplates.java
new file mode 100644
index 0000000000..6b9d0eb1b0
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLiteTemplates.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.sql.types.BigDecimalAsDoubleType;
+import com.querydsl.sql.types.BigIntegerAsLongType;
+
+import java.sql.Types;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
+
+/**
+ * {@code SQLiteTemplates} is a SQL dialect for SQLite
+ *
+ * @author tiwe
+ *
+ */
+public class SQLiteTemplates extends SQLTemplates {
+
+    private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    private static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final SQLiteTemplates DEFAULT = new SQLiteTemplates();
+
+    public static Builder builder() {
+        return new Builder() {
+            @Override
+            protected SQLTemplates build(char escape, boolean quote) {
+                return new SQLiteTemplates(escape, quote);
+            }
+        };
+    }
+
+    public SQLiteTemplates() {
+        this('\\', false);
+    }
+
+    public SQLiteTemplates(boolean quote) {
+        this('\\', quote);
+    }
+
+    public SQLiteTemplates(char escape, boolean quote) {
+        super(Keywords.SQLITE, "\"", escape, quote, false);
+        setDummyTable(null);
+        addCustomType(BigDecimalAsDoubleType.DEFAULT);
+        addCustomType(BigIntegerAsLongType.DEFAULT);
+        setUnionsWrapped(false);
+        setLimitRequired(true);
+        setNullsFirst(null);
+        setNullsLast(null);
+        setDefaultValues("\ndefault values");
+        setArraysSupported(false);
+        setBatchToBulkSupported(false);
+
+        setPrecedence(Precedence.COMPARISON - 1, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
+
+        add(Ops.INDEX_OF, "charindex({1},{0},1)-1", Precedence.ARITH_LOW);
+        add(Ops.INDEX_OF_2ARGS, "charindex({1},{0},{2s}+1)-1", Precedence.ARITH_LOW);
+
+        add(Ops.StringOps.LOCATE, "charindex({0},{1})");
+        add(Ops.StringOps.LOCATE2, "charindex({0},{1},{2s})");
+
+        // TODO : optimize
+        add(Ops.DateTimeOps.YEAR, "cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.MONTH, "cast(strftime('%m',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.WEEK, "cast(strftime('%W',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1");
+        add(Ops.DateTimeOps.DAY_OF_MONTH, "cast(strftime('%d',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.DAY_OF_WEEK, "cast(strftime('%w',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1");
+        add(Ops.DateTimeOps.DAY_OF_YEAR, "cast(strftime('%j',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.HOUR, "cast(strftime('%H',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.MINUTE, "cast(strftime('%M',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.SECOND, "cast(strftime('%S',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+
+        add(Ops.DateTimeOps.YEAR_MONTH, "cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') * 100 + strftime('%m',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+        add(Ops.DateTimeOps.YEAR_WEEK, "cast(strftime('%Y%W',{0} / 1000, 'unixepoch', 'localtime') as integer)");
+
+        add(Ops.DateTimeOps.ADD_YEARS, "date({0}, '+{1s} year')");
+        add(Ops.DateTimeOps.ADD_MONTHS, "date({0}, '+{1s} month')");
+        add(Ops.DateTimeOps.ADD_WEEKS, "date({0}, '+{1s} week')");
+        add(Ops.DateTimeOps.ADD_DAYS, "date({0}, '+{1s} day')");
+        add(Ops.DateTimeOps.ADD_HOURS, "date({0}, '+{1s} hour')");
+        add(Ops.DateTimeOps.ADD_MINUTES, "date({0}, '+{1s} minute')");
+        add(Ops.DateTimeOps.ADD_SECONDS, "date({0}, '+{1s} second')");
+
+        add(Ops.MathOps.RANDOM, "random()");
+        add(Ops.MathOps.RANDOM2, "random({0})");
+        add(Ops.MathOps.LN, "log({0})");
+        add(Ops.MathOps.LOG, "log({0}) / log({1})", Precedence.ARITH_HIGH);
+
+        add(SQLOps.GROUP_CONCAT2, "group_concat({0},{1})");
+
+        addTypeNameToCode("text", Types.VARCHAR);
+    }
+
+    @Override
+    public String serialize(String literal, int jdbcType) {
+        // XXX doesn't work with LocalDate, LocalDateTime and LocalTime
+        switch (jdbcType) {
+            case Types.TIMESTAMP:
+            case TIMESTAMP_WITH_TIMEZONE:
+                return String.valueOf(
+                        dateTimeFormatter.parse(literal, LocalDateTime::from)
+                                .toInstant(ZoneOffset.UTC)
+                                .toEpochMilli());
+            case Types.DATE:
+                return String.valueOf(
+                        dateFormatter.parse(literal, LocalDate::from)
+                                .atStartOfDay(ZoneOffset.UTC)
+                                .toInstant()
+                                .toEpochMilli());
+            case Types.TIME:
+            case TIME_WITH_TIMEZONE:
+                return String.valueOf(
+                        timeFormatter.parse(literal, LocalTime::from)
+                                .get(ChronoField.MILLI_OF_DAY));
+            default:
+                return super.serialize(literal, jdbcType);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SchemaAndTable.java b/querydsl-sql/src/main/java/com/querydsl/sql/SchemaAndTable.java
new file mode 100644
index 0000000000..cd75ba2380
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/SchemaAndTable.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * {@code SchemaAndTable} combines schema and table into a single value type
+ */
+public class SchemaAndTable implements Serializable {
+
+    private final String schema, table;
+
+    public SchemaAndTable(String schema, String table) {
+        this.schema = schema;
+        this.table = table;
+    }
+
+    public String getSchema() {
+        return schema;
+    }
+
+    public String getTable() {
+        return table;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof SchemaAndTable) {
+            SchemaAndTable st = (SchemaAndTable) o;
+            return Objects.equals(st.schema, schema) && Objects.equals(st.table, table);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return (schema != null ? 31 * schema.hashCode() : 0) + table.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "(" + schema + " " + table + ")";
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/StatementOptions.java b/querydsl-sql/src/main/java/com/querydsl/sql/StatementOptions.java
new file mode 100644
index 0000000000..1d86fe4c50
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/StatementOptions.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.querydsl.sql;
+
+import java.sql.Statement;
+
+import com.querydsl.core.annotations.Immutable;
+
+/**
+ * {@code StatementOptions} holds parameters that should be applied to {@link Statement}s.
+ */
+@Immutable
+public class StatementOptions {
+
+    public static final StatementOptions DEFAULT = new StatementOptions(null, null, null, null);
+
+    private final Integer maxFieldSize;
+    private final Integer maxRows;
+    private final Integer queryTimeout;
+    private final Integer fetchSize;
+
+    public StatementOptions(Integer maxFieldSize, Integer maxRows, Integer queryTimeout, Integer fetchSize) {
+        this.maxFieldSize = maxFieldSize;
+        this.maxRows = maxRows;
+        this.queryTimeout = queryTimeout;
+        this.fetchSize = fetchSize;
+    }
+
+    public Integer getMaxFieldSize() {
+        return maxFieldSize;
+    }
+
+    public Integer getMaxRows() {
+        return maxRows;
+    }
+
+    public Integer getQueryTimeout() {
+        return queryTimeout;
+    }
+
+    public Integer getFetchSize() {
+        return fetchSize;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder for {@link StatementOptions}
+     */
+    public static final class Builder {
+        private Integer maxFieldSize;
+        private Integer maxRows;
+        private Integer queryTimeout;
+        private Integer fetchSize;
+
+        private Builder() { }
+
+        public Builder setMaxFieldSize(Integer maxFieldSize) {
+            this.maxFieldSize = maxFieldSize;
+            return this;
+        }
+
+        public Builder setMaxRows(Integer maxRows) {
+            this.maxRows = maxRows;
+            return this;
+        }
+
+        public Builder setQueryTimeout(Integer queryTimeout) {
+            this.queryTimeout = queryTimeout;
+            return this;
+        }
+
+        public Builder setFetchSize(Integer fetchSize) {
+            this.fetchSize = fetchSize;
+            return this;
+        }
+
+        public StatementOptions build() {
+            return new StatementOptions(maxFieldSize, maxRows, queryTimeout, fetchSize);
+        }
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java b/querydsl-sql/src/main/java/com/querydsl/sql/TeradataTemplates.java
similarity index 75%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/TeradataTemplates.java
index 17217e9fe1..bef91f5c0a 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/TeradataTemplates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,21 +11,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.types.Ops;
+import java.sql.Types;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.types.Ops;
 
 
 /**
- * TeradataTemplates is a SQL dialect for Teradata
+ * {@code TeradataTemplates} is a SQL dialect for Teradata
  *
  * @author tiwe
  *
  */
 public class TeradataTemplates extends SQLTemplates {
 
+    @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional
+    public static final TeradataTemplates DEFAULT = new TeradataTemplates();
+
     public static Builder builder() {
         return new Builder() {
             @Override
@@ -58,17 +63,18 @@ public TeradataTemplates(char escape, boolean quote) {
         setDummyTable(null);
         setCountViaAnalytics(true);
         setDefaultValues("\ndefault values");
+        setBatchToBulkSupported(false);
 
-        addClass2TypeMappings("byteint", Byte.class);
-        addClass2TypeMappings("double precision", Double.class);
-        addClass2TypeMappings("varchar(4000)", String.class);
+        setPrecedence(Precedence.ARITH_LOW + 1, Ops.CONCAT);
+        setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
 
         add(Ops.NE, "{0} <> {1}");
+        add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH);
 
         // String
         add(Ops.STRING_LENGTH, "character_length({0})");
         add(Ops.INDEX_OF, "(instr({0},{1})-1)");
-        add(Ops.INDEX_OF_2ARGS, "(instr({0},{1},{2}+1)-1)");
+        add(Ops.INDEX_OF_2ARGS, "(instr({0},{1},{2+'1'})-1)");
         add(Ops.STRING_CAST, "cast({0} as varchar(255))");
         add(Ops.StringOps.LOCATE, "instr({1},{0})");
         add(Ops.StringOps.LOCATE2, "instr({1},{0},{2s})");
@@ -82,7 +88,7 @@ public TeradataTemplates(char escape, boolean quote) {
         add(Ops.MathOps.LOG, "(ln({0}) / ln({1}))");
         add(Ops.MathOps.RANDOM, "cast(random(0, 1000000000) as numeric(20,10))/1000000000");
         add(Ops.MathOps.COT, "(cos({0}) / sin({0}))");
-        add(Ops.MathOps.COTH, "(exp({0} * 2) + 1) / (exp({0} * 2) - 1)");
+        add(Ops.MathOps.COTH, "(exp({0*'2'}) + 1) / (exp({0*'2'}) - 1)");
 
         // Date / time
         add(Ops.DateTimeOps.DATE, "cast({0} as date)");
@@ -103,10 +109,23 @@ public TeradataTemplates(char escape, boolean quote) {
         add(Ops.DateTimeOps.TRUNC_YEAR, "trunc({0}, 'year')");
         add(Ops.DateTimeOps.TRUNC_MONTH, "trunc({0}, 'month')");
         add(Ops.DateTimeOps.TRUNC_WEEK, "trunc({0}, 'w')");
-        add(Ops.DateTimeOps.TRUNC_DAY, "trunc({0}, 'day')");
-        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc({0}, 'hh')");
+        add(Ops.DateTimeOps.TRUNC_DAY, "trunc({0}, 'dd')");
+        add(Ops.DateTimeOps.TRUNC_HOUR, "trunc({0}, 'hh24')");
         add(Ops.DateTimeOps.TRUNC_MINUTE, "trunc({0}, 'mi')");
         add(Ops.DateTimeOps.TRUNC_SECOND, "{0}"); // not truncated
+
+        addTypeNameToCode("byteint", Types.BIT, true);
+        addTypeNameToCode("byteint", Types.BOOLEAN, true);
+        addTypeNameToCode("byteint", Types.TINYINT, true);
+        addTypeNameToCode("float", Types.DOUBLE, true);
+    }
+
+    @Override
+    public String getCastTypeNameForCode(int code) {
+        switch (code) {
+            case Types.VARCHAR:  return "varchar(4000)";
+            default: return super.getCastTypeNameForCode(code);
+        }
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/Union.java b/querydsl-sql/src/main/java/com/querydsl/sql/Union.java
new file mode 100644
index 0000000000..aaad3688c1
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/Union.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.types.*;
+
+/**
+ * {@code Union} defines an interface for Union queries
+ *
+ * @author tiwe
+ *
+ * @param <RT> return type of projection
+ */
+public interface Union<RT> extends SubQueryExpression<RT>, Fetchable<RT> {
+
+    /**
+     * Get the projection as a typed List
+     *
+     * @deprecated Use {@link Union#fetch()}
+     */
+    @Deprecated
+    List<RT> list();
+
+    /**
+     * Get the projection as a typed Iterator
+     *
+     * @return result iterator
+     */
+    CloseableIterator<RT> iterate();
+
+    /**
+     * Defines the grouping/aggregation expressions
+     *
+     * @param o group by
+     * @return the current object
+     */
+    Union<RT> groupBy(Expression<?>... o);
+
+    /**
+     * Defines the filters for aggregation
+     *
+     * @param o having conditions
+     * @return the current object
+     */
+    Union<RT> having(Predicate... o);
+
+
+    /**
+     * Define the ordering of the query results
+     *
+     * @param o order
+     * @return the current object
+     */
+    Union<RT> orderBy(OrderSpecifier<?>... o);
+
+    /**
+     * Create an alias for the expression
+     *
+     * @param alias alias
+     * @return this as alias
+     */
+    Expression<RT> as(String alias);
+
+    /**
+     * Create an alias for the expression
+     *
+     * @param alias alias
+     * @return this as alias
+     */
+    Expression<RT> as(Path<RT> alias);
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java b/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
new file mode 100644
index 0000000000..01bc68e0e9
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.NonUniqueResultException;
+import com.querydsl.core.Query;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.*;
+
+/**
+ * Default implementation of the Union interface
+ *
+ * @param <T> result type
+ * @param <Q> concrete query type
+ *
+ * @author tiwe
+ */
+public class UnionImpl<T, Q extends ProjectableSQLQuery<T, Q> & Query<Q>>  implements Union<T> {
+
+    private final Q query;
+
+    public UnionImpl(Q query) {
+        this.query = query;
+    }
+
+    @Override
+    public List<T> list() {
+        return query.fetch();
+    }
+
+    @Override
+    public List<T> fetch() {
+        return query.fetch();
+    }
+
+    @Override
+    public T fetchFirst() {
+        return query.fetchFirst();
+    }
+
+    @Override
+    public T fetchOne() throws NonUniqueResultException {
+        return query.fetchOne();
+    }
+
+    @Override
+    public CloseableIterator<T> iterate() {
+        return query.iterate();
+    }
+
+    @Override
+    public Stream<T> stream() {
+        return query.stream();
+    }
+
+    @Override
+    public QueryResults<T> fetchResults() {
+        return query.fetchResults();
+    }
+
+    @Override
+    public long fetchCount() {
+        return query.fetchCount();
+    }
+
+    @Override
+    public Union<T> groupBy(Expression<?>... o) {
+        query.groupBy(o);
+        return this;
+    }
+
+    @Override
+    public Union<T> having(Predicate... o) {
+        query.having(o);
+        return this;
+    }
+
+    @Override
+    public Union<T> orderBy(OrderSpecifier<?>... o) {
+        query.orderBy(o);
+        return this;
+    }
+
+    @Override
+    public Expression<T> as(String alias) {
+        return ExpressionUtils.as(this, alias);
+    }
+
+    @Override
+    public Expression<T> as(Path<T> alias) {
+        return ExpressionUtils.as(this, alias);
+    }
+
+    @Override
+    public String toString() {
+        return query.toString();
+    }
+
+    @Nullable
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, @Nullable C context) {
+        return query.accept(v, context);
+    }
+
+    @Override
+    public Class<? extends T> getType() {
+        return query.getType();
+    }
+
+    @Override
+    public QueryMetadata getMetadata() {
+        return query.getMetadata();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/UnionUtils.java b/querydsl-sql/src/main/java/com/querydsl/sql/UnionUtils.java
new file mode 100644
index 0000000000..880ae41ca1
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/UnionUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.List;
+
+import com.querydsl.core.types.*;
+
+/**
+ * UnionUtils provides static utility methods for Union handling
+ *
+ * @author tiwe
+ *
+ */
+final class UnionUtils {
+
+    public static <T> Expression<T> union(List<SubQueryExpression<T>> union, boolean unionAll) {
+        final Operator operator = unionAll ? SQLOps.UNION_ALL : SQLOps.UNION;
+        Expression<T> rv = union.get(0);
+        for (int i = 1; i < union.size(); i++) {
+            rv = ExpressionUtils.operation(rv.getType(), operator, rv, union.get(i));
+        }
+        return rv;
+    }
+
+    public static <T> Expression<T> union(List<SubQueryExpression<T>> union, Path<T> alias,
+            boolean unionAll) {
+        final Expression<T> rv = union(union, unionAll);
+        return ExpressionUtils.as(rv, alias);
+    }
+
+    private UnionUtils() { }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java
new file mode 100644
index 0000000000..f63fc7ad5c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.ComparableExpressionBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code WindowFirstLast} is a builder for window function expressions
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class WindowFirstLast<T> extends MutableExpressionBase<T> {
+
+    private static final long serialVersionUID = 4107262569593794721L;
+
+    private static final String ORDER_BY = "order by ";
+
+    private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
+
+    @Nullable
+    private transient volatile SimpleExpression<T> value;
+
+    private final Expression<T> target;
+
+    private final boolean first;
+
+    public WindowFirstLast(WindowOver<T> target, boolean first) {
+        super(target.getType());
+        this.target = target;
+        this.first = first;
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return getValue().accept(v, context);
+    }
+
+    public WindowFirstLast<T> orderBy(ComparableExpressionBase<?> orderBy) {
+        value = null;
+        this.orderBy.add(orderBy.asc());
+        return this;
+    }
+
+    public WindowFirstLast<T> orderBy(ComparableExpressionBase<?>... orderBy) {
+        value = null;
+        for (ComparableExpressionBase<?> e : orderBy) {
+            this.orderBy.add(e.asc());
+        }
+        return this;
+    }
+
+    public WindowFirstLast<T> orderBy(OrderSpecifier<?> orderBy) {
+        value = null;
+        this.orderBy.add(orderBy);
+        return this;
+    }
+
+    public WindowFirstLast<T> orderBy(OrderSpecifier<?>... orderBy) {
+        value = null;
+        Collections.addAll(this.orderBy, orderBy);
+        return this;
+    }
+
+    SimpleExpression<T> getValue() {
+        if (value == null) {
+            if (orderBy.isEmpty()) {
+                // TODO this check should be static
+                throw new IllegalStateException("No order by arguments given");
+            }
+            List<Expression<?>> args = new ArrayList<>();
+            StringBuilder builder = new StringBuilder();
+            builder.append("{0} keep (dense_rank ");
+            args.add(target);
+            builder.append(first ? "first " : "last ");
+            builder.append(ORDER_BY);
+            builder.append("{1}");
+            args.add(ExpressionUtils.orderBy(orderBy));
+            builder.append(")");
+            value = Expressions.template(target.getType(), builder.toString(), CollectionUtils.unmodifiableList(args));
+        }
+        return value;
+    }
+
+    public WindowFunction<T> over() {
+        return new WindowFunction<T>(getValue());
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java
new file mode 100644
index 0000000000..b63f70c6a4
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.ComparableExpressionBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimpleExpression;
+
+/**
+ * {@code WindowFunction} is a builder for window function expressions
+ *
+ * @param <A> expression type
+ *
+ * @author tiwe
+ */
+public class WindowFunction<A> extends MutableExpressionBase<A> {
+
+    private static final String ORDER_BY = "order by ";
+
+    private static final String PARTITION_BY = "partition by ";
+
+    private static final long serialVersionUID = -4130672293308756779L;
+
+    private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
+
+    private final List<Expression<?>> partitionBy = new ArrayList<Expression<?>>();
+
+    private final Expression<A> target;
+
+    @Nullable
+    private transient volatile SimpleExpression<A> value;
+
+    private String rowsOrRange;
+
+    private List<Expression<?>> rowsOrRangeArgs;
+
+    public WindowFunction(Expression<A> expr) {
+        super(expr.getType());
+        this.target = expr;
+    }
+
+    public SimpleExpression<A> getValue() {
+        if (value == null) {
+            int size = 0;
+            List<Expression<?>> args = new ArrayList<>();
+            StringBuilder builder = new StringBuilder();
+            builder.append("{0} over (");
+            args.add(target);
+            size++;
+            if (!partitionBy.isEmpty()) {
+                builder.append(PARTITION_BY);
+                boolean first = true;
+                for (Expression<?> expr : partitionBy) {
+                    if (!first) {
+                        builder.append(", ");
+                    }
+                    builder.append("{").append(size).append("}");
+                    args.add(expr);
+                    size++;
+                    first = false;
+                }
+
+            }
+            if (!orderBy.isEmpty()) {
+                if (!partitionBy.isEmpty()) {
+                    builder.append(" ");
+                }
+                builder.append(ORDER_BY);
+                builder.append("{").append(size).append("}");
+                args.add(ExpressionUtils.orderBy(orderBy));
+                size++;
+            }
+            if (rowsOrRange != null) {
+                builder.append(rowsOrRange);
+                args.addAll(rowsOrRangeArgs);
+                size += rowsOrRangeArgs.size();
+            }
+            builder.append(")");
+            value = Expressions.template(target.getType(), builder.toString(), Collections.unmodifiableList(args));
+        }
+        return value;
+    }
+
+    @SuppressWarnings("unchecked")
+    public SimpleExpression<A> as(Expression<A> alias) {
+        return Expressions.operation(getType(), Ops.ALIAS, this, alias);
+    }
+
+    public SimpleExpression<A> as(String alias) {
+        return Expressions.operation(getType(), Ops.ALIAS, this, ExpressionUtils.path(getType(), alias));
+    }
+
+    @Override
+    public <R,C> R accept(Visitor<R,C> v, C context) {
+        return getValue().accept(v, context);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof WindowFunction) {
+            WindowFunction<?> so = (WindowFunction<?>) o;
+            return so.target.equals(target)
+                && so.partitionBy.equals(partitionBy)
+                && so.orderBy.equals(orderBy);
+        } else {
+            return false;
+        }
+    }
+
+    public BooleanExpression eq(Expression<A> expr) {
+        return getValue().eq(expr);
+    }
+
+    public BooleanExpression eq(A arg) {
+        return getValue().eq(arg);
+    }
+
+    public BooleanExpression ne(Expression<A> expr) {
+        return getValue().ne(expr);
+    }
+
+    public BooleanExpression ne(A arg) {
+        return getValue().ne(arg);
+    }
+
+    public WindowFunction<A> orderBy(ComparableExpressionBase<?> orderBy) {
+        value = null;
+        this.orderBy.add(orderBy.asc());
+        return this;
+    }
+
+    public WindowFunction<A> orderBy(ComparableExpressionBase<?>... orderBy) {
+        value = null;
+        for (ComparableExpressionBase<?> e : orderBy) {
+            this.orderBy.add(e.asc());
+        }
+        return this;
+    }
+
+    public WindowFunction<A> orderBy(OrderSpecifier<?> orderBy) {
+        value = null;
+        this.orderBy.add(orderBy);
+        return this;
+    }
+
+    public WindowFunction<A> orderBy(OrderSpecifier<?>... orderBy) {
+        value = null;
+        Collections.addAll(this.orderBy, orderBy);
+        return this;
+    }
+
+    public WindowFunction<A> partitionBy(Expression<?> partitionBy) {
+        value = null;
+        this.partitionBy.add(partitionBy);
+        return this;
+    }
+
+    public WindowFunction<A> partitionBy(Expression<?>... partitionBy) {
+        value = null;
+        Collections.addAll(this.partitionBy, partitionBy);
+        return this;
+    }
+
+    WindowFunction<A> withRowsOrRange(String s, List<Expression<?>> args) {
+        rowsOrRange = s;
+        rowsOrRangeArgs = args;
+        return this;
+    }
+
+    public WindowRows<A> rows() {
+        value = null;
+        int offset = orderBy.size() + partitionBy.size() + 1;
+        return new WindowRows<A>(this, " rows", offset);
+    }
+
+    public WindowRows<A> range() {
+        value = null;
+        int offset = orderBy.size() + partitionBy.size() + 1;
+        return new WindowRows<A>(this, " range", offset);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WindowOver.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowOver.java
new file mode 100644
index 0000000000..4a64a972b6
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowOver.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.dsl.SimpleOperation;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+/**
+ * {@code WindowOver} is the first part of a WindowFunction construction
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public class WindowOver<T> extends SimpleOperation<T> {
+
+    private static final long serialVersionUID = 464583892898579544L;
+
+    public WindowOver(Class<? extends T> type, Operator op) {
+        super(type, op, Collections.emptyList());
+    }
+
+    public WindowOver(Class<? extends T> type, Operator op, Expression<?> arg) {
+        super(type, op, Collections.singletonList(arg));
+    }
+
+    public WindowOver(Class<? extends T> type, Operator op, Expression<?> arg1, Expression<?> arg2) {
+        super(type, op, Arrays.asList(arg1, arg2));
+    }
+
+    public WindowFirstLast<T> keepFirst() {
+        return new WindowFirstLast<T>(this, true);
+    }
+
+    public WindowFirstLast<T> keepLast() {
+        return new WindowFirstLast<T>(this, false);
+    }
+
+    public WindowFunction<T> over() {
+        return new WindowFunction<T>(this);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowRows.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowRows.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/WindowRows.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/WindowRows.java
index 1796d4bf50..15ac4b7396 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/WindowRows.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowRows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
 
 /**
- * WindowRows provides the building of the rows/range part of the window function expression
+ * {@code WindowRows} provides the building of the rows/range part of the window function expression
  *
- * @author tiwe
+ * @param <A> expression type
  *
- * @param <A>
+ * @author tiwe
  */
 public class WindowRows<A> {
 
@@ -40,6 +40,9 @@ public class WindowRows<A> {
 
     private static final String UNBOUNDED = " unbounded";
 
+    /**
+     * Intermediate step
+     */
     public class Between {
 
         public BetweenAnd unboundedPreceding() {
@@ -56,7 +59,7 @@ public BetweenAnd currentRow() {
         public BetweenAnd preceding(Expression<Integer> expr) {
             args.add(expr);
             str.append(PRECEDING);
-            str.append(" {" + (offset++) + "}");
+            str.append(" {").append(offset++).append("}");
             return new BetweenAnd();
         }
 
@@ -67,7 +70,7 @@ public BetweenAnd preceding(int i) {
         public BetweenAnd following(Expression<Integer> expr) {
             args.add(expr);
             str.append(FOLLOWING);
-            str.append(" {" + (offset++) + "}");
+            str.append(" {").append(offset++).append("}");
             return new BetweenAnd();
         }
 
@@ -76,6 +79,9 @@ public BetweenAnd following(int i) {
         }
     }
 
+    /**
+     * Intermediate step
+     */
     public class BetweenAnd {
 
         public BetweenAnd() {
@@ -96,7 +102,7 @@ public WindowFunction<A> currentRow() {
         public WindowFunction<A> preceding(Expression<Integer> expr) {
             args.add(expr);
             str.append(PRECEDING);
-            str.append(" {" + (offset++) + "}");
+            str.append(" {").append(offset++).append("}");
             return rv.withRowsOrRange(str.toString(), args);
         }
 
@@ -107,7 +113,7 @@ public WindowFunction<A> preceding(int i) {
         public WindowFunction<A> following(Expression<Integer> expr) {
             args.add(expr);
             str.append(FOLLOWING);
-            str.append(" {" + (offset++) + "}");
+            str.append(" {").append(offset++).append("}");
             return rv.withRowsOrRange(str.toString(), args);
         }
 
@@ -120,7 +126,7 @@ public WindowFunction<A> following(int i) {
 
     private final StringBuilder str = new StringBuilder();
 
-    private final List<Expression<?>> args = Lists.newArrayList();
+    private final List<Expression<?>> args = new ArrayList<>();
 
     private int offset;
 
@@ -149,7 +155,7 @@ public WindowFunction<A> currentRow() {
     public WindowFunction<A> preceding(Expression<Integer> expr) {
         args.add(expr);
         str.append(PRECEDING);
-        str.append(" {" + (offset++) + "}");
+        str.append(" {").append(offset++).append("}");
         return rv.withRowsOrRange(str.toString(), args);
     }
 
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WithBuilder.java b/querydsl-sql/src/main/java/com/querydsl/sql/WithBuilder.java
new file mode 100644
index 0000000000..4c0c7b81f2
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WithBuilder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+
+/**
+ * {@code WithBuilder} is a builder for common table expressions
+ *
+ * @author tiwe
+ *
+ * @param <R>
+ */
+public class WithBuilder<R> {
+
+    private final QueryMixin<R> queryMixin;
+
+    private final Expression<?> alias;
+
+    public WithBuilder(QueryMixin<R> queryMixin, Expression<?> alias) {
+        this.queryMixin = queryMixin;
+        this.alias = alias;
+    }
+
+    public R as(Expression<?> expr) {
+        Expression<?> flag = ExpressionUtils.operation(alias.getType(), SQLOps.WITH_ALIAS, alias, expr);
+        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.WITH, flag));
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java
new file mode 100644
index 0000000000..e6e1e1b898
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.ComparableExpressionBase;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.types.dsl.SimpleOperation;
+import com.querydsl.core.util.CollectionUtils;
+
+/**
+ * {@code WithinGroup} is a builder for {@code WITHIN GROUP} constructs
+ *
+ * @param <T> expression type
+ *
+ * @author tiwe
+ */
+public class WithinGroup<T> extends SimpleOperation<T> {
+
+    private static final long serialVersionUID = 464583892898579544L;
+
+    private static Expression<?> merge(Expression<?>... args) {
+        if (args.length == 1) {
+            return args[0];
+        } else {
+            return ExpressionUtils.list(Object.class, args);
+        }
+    }
+
+    /**
+     * Intermediate step
+     */
+    public class OrderBy extends MutableExpressionBase<T> {
+
+        private static final long serialVersionUID = -4936481493030913621L;
+
+        private static final String ORDER_BY = "order by ";
+
+        @Nullable
+        private transient volatile SimpleExpression<T> value;
+
+        private final List<OrderSpecifier<?>> orderBy = new ArrayList<OrderSpecifier<?>>();
+
+        public OrderBy() {
+            super(WithinGroup.this.getType());
+        }
+
+        @SuppressWarnings("unchecked")
+        public SimpleExpression<T> getValue() {
+            if (value == null) {
+                int size = 0;
+                List<Expression<?>> args = new ArrayList<>();
+                StringBuilder builder = new StringBuilder();
+                builder.append("{0} within group (");
+                args.add(WithinGroup.this);
+                size++;
+                if (!orderBy.isEmpty()) {
+                    builder.append(ORDER_BY);
+                    builder.append("{").append(size).append("}");
+                    args.add(ExpressionUtils.orderBy(orderBy));
+                }
+                builder.append(")");
+                value = Expressions.template((Class) WithinGroup.this.getType(), builder.toString(), CollectionUtils.unmodifiableList(args));
+            }
+            return value;
+        }
+
+        @Override
+        public <R, C> R accept(Visitor<R, C> v, C context) {
+            return getValue().accept(v, context);
+        }
+
+        public OrderBy orderBy(ComparableExpressionBase<?> orderBy) {
+            value = null;
+            this.orderBy.add(orderBy.asc());
+            return this;
+        }
+
+        public OrderBy orderBy(ComparableExpressionBase<?>... orderBy) {
+            value = null;
+            for (ComparableExpressionBase<?> e : orderBy) {
+                this.orderBy.add(e.asc());
+            }
+            return this;
+        }
+
+        public OrderBy orderBy(OrderSpecifier<?> orderBy) {
+            value = null;
+            this.orderBy.add(orderBy);
+            return this;
+        }
+
+        public OrderBy orderBy(OrderSpecifier<?>... orderBy) {
+            value = null;
+            Collections.addAll(this.orderBy, orderBy);
+            return this;
+        }
+    }
+
+    public WithinGroup(Class<? extends T> type, Operator op) {
+        super(type, op, Collections.emptyList());
+    }
+
+    public WithinGroup(Class<? extends T> type, Operator op, Expression<?> arg) {
+        super(type, op, Collections.singletonList(arg));
+    }
+
+    public WithinGroup(Class<? extends T> type, Operator op, Expression<?> arg1, Expression<?> arg2) {
+        super(type, op, Arrays.asList(arg1, arg2));
+    }
+
+    public WithinGroup(Class<? extends T> type, Operator op, Expression<?>... args) {
+        super(type, op, merge(args));
+    }
+
+    public OrderBy withinGroup() {
+        return new OrderBy();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractMapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractMapper.java
similarity index 81%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractMapper.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractMapper.java
index e05d906175..4e65a8299a 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractMapper.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.google.common.collect.Maps;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.types.Path;
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.RelationalPath;
 
 /**
  * Abstract base class for Mapper implementations
@@ -29,7 +29,7 @@
 public abstract class AbstractMapper<T> implements Mapper<T> {
 
     protected Map<String, Path<?>> getColumns(RelationalPath<?> path) {
-        Map<String, Path<?>> columns = Maps.newHashMap();
+        Map<String, Path<?>> columns = new LinkedHashMap<>();
         for (Path<?> column : path.getColumns()) {
             columns.put(column.getMetadata().getName(), column);
         }
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLClause.java
new file mode 100644
index 0000000000..227440cd3a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLClause.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.dml.DMLClause;
+import com.querydsl.core.types.ParamExpression;
+import com.querydsl.core.types.ParamNotSetException;
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.*;
+
+/**
+ * {@code AbstractSQLClause} is a superclass for SQL based DMLClause implementations
+ *
+ * @param <C> concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractSQLClause<C extends AbstractSQLClause<C>> implements DMLClause<C> {
+
+    protected final Configuration configuration;
+
+    protected final SQLListeners listeners;
+
+    protected boolean useLiterals;
+
+    protected SQLListenerContextImpl context;
+
+    @Nullable
+    private Supplier<Connection> connProvider;
+
+    @Nullable
+    private Connection conn;
+
+    public AbstractSQLClause(Configuration configuration) {
+        this.configuration = configuration;
+        this.listeners = new SQLListeners(configuration.getListeners());
+        this.useLiterals = configuration.getUseLiterals();
+    }
+
+    public AbstractSQLClause(Configuration configuration, Supplier<Connection> connProvider) {
+        this(configuration);
+        this.connProvider = connProvider;
+    }
+
+    public AbstractSQLClause(Configuration configuration, Connection conn) {
+        this(configuration);
+        this.conn = conn;
+    }
+
+    /**
+     * Add a listener
+     *
+     * @param listener listener to add
+     */
+    public void addListener(SQLListener listener) {
+        listeners.add(listener);
+    }
+
+    /**
+     * Clear the internal state of the clause
+     */
+    public abstract void clear();
+
+    /**
+     * Called to create and start a new SQL Listener context
+     *
+     * @param connection the database connection
+     * @param metadata   the meta data for that context
+     * @param entity     the entity for that context
+     * @return the newly started context
+     */
+    protected SQLListenerContextImpl startContext(Connection connection, QueryMetadata metadata, RelationalPath<?> entity) {
+        SQLListenerContextImpl context = new SQLListenerContextImpl(metadata, connection, entity);
+        listeners.start(context);
+        return context;
+    }
+
+    /**
+     * Called to make the call back to listeners when an exception happens
+     *
+     * @param context the current context in play
+     * @param e       the exception
+     */
+    protected void onException(SQLListenerContextImpl context, Exception e) {
+        context.setException(e);
+        listeners.exception(context);
+    }
+
+    /**
+     * Called to end a SQL listener context
+     *
+     * @param context the listener context to end
+     */
+    protected void endContext(SQLListenerContextImpl context) {
+        listeners.end(context);
+        this.context = null;
+    }
+
+
+    protected SQLBindings createBindings(QueryMetadata metadata, SQLSerializer serializer) {
+        String queryString = serializer.toString();
+        List<Object> args = new ArrayList<>();
+        Map<ParamExpression<?>, Object> params = metadata.getParams();
+        for (Object o : serializer.getConstants()) {
+            if (o instanceof ParamExpression) {
+                if (!params.containsKey(o)) {
+                    throw new ParamNotSetException((ParamExpression<?>) o);
+                }
+                o = metadata.getParams().get(o);
+            }
+            args.add(o);
+        }
+        return new SQLBindings(queryString, args);
+    }
+
+    protected SQLSerializer createSerializer() {
+        SQLSerializer serializer = new SQLSerializer(configuration, true);
+        serializer.setUseLiterals(useLiterals);
+        return serializer;
+    }
+
+    /**
+     * Get the SQL string and bindings
+     *
+     * @return SQL and bindings
+     */
+    public abstract List<SQLBindings> getSQL();
+
+    /**
+     * Set the parameters to the given PreparedStatement
+     *
+     * @param stmt preparedStatement to be populated
+     * @param objects list of constants
+     * @param constantPaths list of paths related to the constants
+     * @param params map of param to value for param resolving
+     */
+    protected void setParameters(PreparedStatement stmt, List<?> objects,
+            List<Path<?>> constantPaths, Map<ParamExpression<?>, ?> params) {
+        if (objects.size() != constantPaths.size()) {
+            throw new IllegalArgumentException("Expected " + objects.size() + " paths, " +
+                    "but got " + constantPaths.size());
+        }
+        for (int i = 0; i < objects.size(); i++) {
+            Object o = objects.get(i);
+            try {
+                if (o instanceof ParamExpression) {
+                    if (!params.containsKey(o)) {
+                        throw new ParamNotSetException((ParamExpression<?>) o);
+                    }
+                    o = params.get(o);
+                }
+                configuration.set(stmt, constantPaths.get(i), i + 1, o);
+            } catch (SQLException e) {
+                throw configuration.translate(e);
+            }
+        }
+    }
+
+    private long executeBatch(PreparedStatement stmt) throws SQLException {
+        if (configuration.getUseLiterals()) {
+            return stmt.executeUpdate();
+        } else if (configuration.getTemplates().isBatchCountViaGetUpdateCount()) {
+            stmt.executeBatch();
+            return stmt.getUpdateCount();
+        } else {
+            long rv = 0;
+            for (int i : stmt.executeBatch()) {
+                rv += i;
+            }
+            return rv;
+        }
+    }
+
+    protected long executeBatch(Collection<PreparedStatement> stmts) throws SQLException {
+        long rv = 0;
+        for (PreparedStatement stmt : stmts) {
+            rv += executeBatch(stmt);
+        }
+        return rv;
+    }
+
+    protected void close(Statement stmt) {
+        try {
+            stmt.close();
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        }
+    }
+
+    protected void close(Collection<? extends Statement> stmts) {
+        for (Statement stmt : stmts) {
+            close(stmt);
+        }
+    }
+
+    protected void close(ResultSet rs) {
+        try {
+            rs.close();
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        }
+    }
+
+    protected void logQuery(Logger logger, String queryString, Collection<Object> parameters) {
+        if (logger.isLoggable(Level.FINE)) {
+            String normalizedQuery = queryString.replace('\n', ' ');
+            logger.fine(normalizedQuery);
+        }
+    }
+
+    protected void reset() {
+    }
+
+    protected Connection connection() {
+        if (conn == null) {
+            if (connProvider != null) {
+                conn = connProvider.get();
+            } else {
+                throw new IllegalStateException("No connection provided");
+            }
+        }
+        return conn;
+    }
+
+    public void setUseLiterals(boolean useLiterals) {
+        this.useLiterals = useLiterals;
+    }
+
+    public abstract int getBatchCount();
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLDeleteClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLDeleteClause.java
new file mode 100644
index 0000000000..214628941b
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLDeleteClause.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.*;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.dml.DeleteClause;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.ValidatingVisitor;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLSerializer;
+
+/**
+ * Provides a base class for dialect-specific DELETE clauses.
+ *
+ * @author tiwe
+ * @param <C> The type extending this class.
+ *
+ */
+public abstract class AbstractSQLDeleteClause<C extends AbstractSQLDeleteClause<C>> extends AbstractSQLClause<C> implements DeleteClause<C> {
+
+    protected static final Logger logger = Logger.getLogger(AbstractSQLDeleteClause.class.getName());
+
+    protected static final ValidatingVisitor validatingVisitor = new ValidatingVisitor("Undeclared path '%s'. " +
+            "A delete operation can only reference a single table. " +
+            "Consider this alternative: DELETE ... WHERE EXISTS (subquery)");
+
+    protected final RelationalPath<?> entity;
+
+    protected final List<QueryMetadata> batches = new ArrayList<QueryMetadata>();
+
+    protected DefaultQueryMetadata metadata = new DefaultQueryMetadata();
+
+    protected transient String queryString;
+
+    protected transient List<Object> constants;
+
+    public AbstractSQLDeleteClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+        metadata.setValidatingVisitor(validatingVisitor);
+    }
+
+    public AbstractSQLDeleteClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+        metadata.setValidatingVisitor(validatingVisitor);
+    }
+
+    /**
+     * Add the given String literal at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, String flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add the given Expression at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, Expression<?> flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add current state of bindings as a batch item
+     *
+     * @return the current object
+     */
+    public C addBatch() {
+        batches.add(metadata);
+        metadata = new DefaultQueryMetadata();
+        metadata.addJoin(JoinType.DEFAULT, entity);
+        metadata.setValidatingVisitor(validatingVisitor);
+        return (C) this;
+    }
+
+    @Override
+    public void clear() {
+        batches.clear();
+        metadata = new DefaultQueryMetadata();
+        metadata.addJoin(JoinType.DEFAULT, entity);
+        metadata.setValidatingVisitor(validatingVisitor);
+    }
+
+    protected PreparedStatement createStatement() throws SQLException {
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeDelete(metadata, entity);
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+
+        listeners.prePrepare(context);
+        PreparedStatement stmt = connection().prepareStatement(queryString);
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+
+        return stmt;
+    }
+
+    protected Collection<PreparedStatement> createStatements() throws SQLException {
+        boolean addBatches = !configuration.getUseLiterals();
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeDelete(batches.get(0), entity);
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+
+        Map<String, PreparedStatement> stmts = new HashMap<>();
+
+        // add first batch
+        listeners.prePrepare(context);
+        PreparedStatement stmt = connection().prepareStatement(queryString);
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+        if (addBatches) {
+            stmt.addBatch();
+        }
+        stmts.put(queryString, stmt);
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+
+
+        // add other batches
+        for (int i = 1; i < batches.size(); i++) {
+            listeners.preRender(context);
+            serializer = createSerializer();
+            serializer.serializeDelete(batches.get(i), entity);
+            context.addSQL(createBindings(metadata, serializer));
+            listeners.rendered(context);
+
+            stmt = stmts.get(serializer.toString());
+            if (stmt == null) {
+                listeners.prePrepare(context);
+                stmt = connection().prepareStatement(serializer.toString());
+                stmts.put(serializer.toString(), stmt);
+                context.addPreparedStatement(stmt);
+                listeners.prepared(context);
+            }
+            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+            if (addBatches) {
+                stmt.addBatch();
+            }
+        }
+
+        return stmts.values();
+    }
+
+    @Override
+    public long execute() {
+        context = startContext(connection(), metadata, entity);
+        PreparedStatement stmt = null;
+        Collection<PreparedStatement> stmts = null;
+        try {
+            if (batches.isEmpty()) {
+                stmt = createStatement();
+                listeners.notifyDelete(entity, metadata);
+
+                listeners.preExecute(context);
+                int rc = stmt.executeUpdate();
+                listeners.executed(context);
+                return rc;
+            } else {
+                stmts = createStatements();
+                listeners.notifyDeletes(entity, batches);
+
+                listeners.preExecute(context);
+                long rc = executeBatch(stmts);
+                listeners.executed(context);
+                return rc;
+            }
+        } catch (SQLException e) {
+            onException(context,e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            if (stmt != null) {
+                close(stmt);
+            }
+            if (stmts != null) {
+                close(stmts);
+            }
+            reset();
+            endContext(context);
+        }
+    }
+
+    @Override
+    public List<SQLBindings> getSQL() {
+        if (batches.isEmpty()) {
+            SQLSerializer serializer = createSerializer();
+            serializer.serializeDelete(metadata, entity);
+            return Collections.singletonList(createBindings(metadata, serializer));
+        } else {
+            List<SQLBindings> builder = new ArrayList<>();
+            for (QueryMetadata metadata : batches) {
+                SQLSerializer serializer = createSerializer();
+                serializer.serializeDelete(metadata, entity);
+                builder.add(createBindings(metadata, serializer));
+            }
+            return Collections.unmodifiableList(builder);
+        }
+    }
+
+    public C where(Predicate p) {
+        metadata.addWhere(p);
+        return (C) this;
+    }
+
+    @Override
+    public C where(Predicate... o) {
+        for (Predicate p : o) {
+            metadata.addWhere(p);
+        }
+        return (C) this;
+    }
+
+    public C limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit) {
+        metadata.setModifiers(QueryModifiers.limit(limit));
+        return (C) this;
+    }
+
+    @Override
+    public int getBatchCount() {
+        return batches.size();
+    }
+
+    @Override
+    public String toString() {
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeDelete(metadata, entity);
+        return serializer.toString();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLInsertClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLInsertClause.java
new file mode 100644
index 0000000000..dd04f40134
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLInsertClause.java
@@ -0,0 +1,562 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.*;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.CollectionUtils;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.dml.InsertClause;
+import com.querydsl.core.types.*;
+import com.querydsl.core.util.ResultSetAdapter;
+import com.querydsl.sql.*;
+import com.querydsl.sql.types.Null;
+
+/**
+ * Provides a base class for dialect-specific INSERT clauses.
+ *
+ * @author tiwe
+ * @param <C> The type extending this class.
+ *
+ */
+public abstract class AbstractSQLInsertClause<C extends AbstractSQLInsertClause<C>> extends AbstractSQLClause<C> implements InsertClause<C> {
+
+    protected static final Logger logger = Logger.getLogger(AbstractSQLInsertClause.class.getName());
+
+    protected final RelationalPath<?> entity;
+
+    protected final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    @Nullable
+    protected SubQueryExpression<?> subQuery;
+
+    @Nullable
+    protected SQLQuery<?> subQueryBuilder;
+
+    protected final List<SQLInsertBatch> batches = new ArrayList<SQLInsertBatch>();
+
+    protected final List<Path<?>> columns = new ArrayList<Path<?>>();
+
+    protected final List<Expression<?>> values = new ArrayList<Expression<?>>();
+
+    protected transient String queryString;
+
+    protected transient List<Object> constants;
+
+    protected transient boolean batchToBulk;
+
+    public AbstractSQLInsertClause(Connection connection, Configuration configuration, RelationalPath<?> entity, SQLQuery<?> subQuery) {
+        this(connection, configuration, entity);
+        this.subQueryBuilder = subQuery;
+    }
+
+    public AbstractSQLInsertClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    public AbstractSQLInsertClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity, SQLQuery<?> subQuery) {
+        this(connection, configuration, entity);
+        this.subQueryBuilder = subQuery;
+    }
+
+    public AbstractSQLInsertClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    /**
+     * Add the given String literal at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, String flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add the given Expression at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, Expression<?> flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add the current state of bindings as a batch item
+     *
+     * @return the current object
+     */
+    public C addBatch() {
+        if (subQueryBuilder != null) {
+            subQuery = subQueryBuilder.select(values.toArray(new Expression[0])).clone();
+            values.clear();
+        }
+        batches.add(new SQLInsertBatch(columns, values, subQuery));
+        columns.clear();
+        values.clear();
+        subQuery = null;
+        return (C) this;
+    }
+
+    /**
+     * Set whether batches should be optimized into a single bulk operation.
+     * Will revert to batches, if bulk is not supported
+     */
+    public void setBatchToBulk(boolean b) {
+        this.batchToBulk = b && configuration.getTemplates().isBatchToBulkSupported();
+    }
+
+    @Override
+    public void clear() {
+        batches.clear();
+        columns.clear();
+        values.clear();
+        subQuery = null;
+    }
+
+    @Override
+    public C columns(Path<?>... columns) {
+        this.columns.addAll(Arrays.asList(columns));
+        return (C) this;
+    }
+
+    /**
+     * Execute the clause and return the generated key with the type of the
+     * given path. If no rows were created, null is returned, otherwise the key
+     * of the first row is returned.
+     *
+     * @param <T>
+     * @param path path for key
+     * @return generated key
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public <T> T executeWithKey(Path<T> path) {
+        return executeWithKey((Class<T>) path.getType(), path);
+    }
+
+    /**
+     * Execute the clause and return the generated key cast to the given type.
+     * If no rows were created, null is returned, otherwise the key of the first
+     * row is returned.
+     *
+     * @param <T>
+     * @param type type of key
+     * @return generated key
+     */
+    public <T> T executeWithKey(Class<T> type) {
+        return executeWithKey(type, null);
+    }
+
+    protected <T> T executeWithKey(Class<T> type, @Nullable Path<T> path) {
+        ResultSet rs = null;
+        try {
+            rs = executeWithKeys();
+            if (rs.next()) {
+                return configuration.get(rs, path, 1, type);
+            } else {
+                return null;
+            }
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        } finally {
+            if (rs != null) {
+                close(rs);
+            }
+            reset();
+        }
+    }
+
+    /**
+     * Execute the clause and return the generated key with the type of the
+     * given path. If no rows were created, or the referenced column is not a
+     * generated key, null is returned. Otherwise, the key of the first row is
+     * returned.
+     *
+     * @param <T>
+     * @param path path for key
+     * @return generated keys
+     */
+    @SuppressWarnings("unchecked")
+    public <T> List<T> executeWithKeys(Path<T> path) {
+        return executeWithKeys((Class<T>) path.getType(), path);
+    }
+
+    public <T> List<T> executeWithKeys(Class<T> type) {
+        return executeWithKeys(type, null);
+    }
+
+    protected <T> List<T> executeWithKeys(Class<T> type, @Nullable Path<T> path) {
+        ResultSet rs = null;
+        try {
+            rs = executeWithKeys();
+            List<T> rv = new ArrayList<T>();
+            while (rs.next()) {
+                rv.add(configuration.get(rs, path, 1, type));
+            }
+            return rv;
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        } finally {
+            if (rs != null) {
+                close(rs);
+            }
+            reset();
+        }
+    }
+
+    protected PreparedStatement createStatement(boolean withKeys) throws SQLException {
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        if (subQueryBuilder != null) {
+            subQuery = subQueryBuilder.select(values.toArray(new Expression[0])).clone();
+            values.clear();
+        }
+
+        if (!batches.isEmpty() && batchToBulk) {
+            serializer.serializeInsert(metadata, entity, batches);
+        } else {
+            serializer.serializeInsert(metadata, entity, columns, values, subQuery);
+        }
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+        return prepareStatementAndSetParameters(serializer, withKeys);
+    }
+
+    protected Collection<PreparedStatement> createStatements(boolean withKeys) throws SQLException {
+        boolean addBatches = !configuration.getUseLiterals();
+        listeners.preRender(context);
+
+        if (subQueryBuilder != null) {
+            subQuery = subQueryBuilder.select(values.toArray(new Expression[0])).clone();
+            values.clear();
+        }
+
+        Map<String, PreparedStatement> stmts = new HashMap<>();
+
+        // add first batch
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeInsert(metadata, entity, batches.get(0).getColumns(), batches
+                .get(0).getValues(), batches.get(0).getSubQuery());
+        PreparedStatement stmt = prepareStatementAndSetParameters(serializer, withKeys);
+        if (addBatches) {
+            stmt.addBatch();
+        }
+        stmts.put(serializer.toString(), stmt);
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+
+        // add other batches
+        for (int i = 1; i < batches.size(); i++) {
+            SQLInsertBatch batch = batches.get(i);
+
+            listeners.preRender(context);
+            serializer = createSerializer();
+            serializer.serializeInsert(metadata, entity, batch.getColumns(),
+                    batch.getValues(), batch.getSubQuery());
+            context.addSQL(createBindings(metadata, serializer));
+            listeners.rendered(context);
+
+            stmt = stmts.get(serializer.toString());
+            if (stmt == null) {
+                stmt = prepareStatementAndSetParameters(serializer, withKeys);
+                stmts.put(serializer.toString(), stmt);
+            } else {
+                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(),
+                        metadata.getParams());
+            }
+            if (addBatches) {
+                stmt.addBatch();
+            }
+        }
+
+        return stmts.values();
+    }
+
+    protected PreparedStatement prepareStatementAndSetParameters(SQLSerializer serializer,
+            boolean withKeys) throws SQLException {
+        listeners.prePrepare(context);
+
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        PreparedStatement stmt;
+        if (withKeys) {
+            if (entity.getPrimaryKey() != null) {
+                String[] target = new String[entity.getPrimaryKey().getLocalColumns().size()];
+                for (int i = 0; i < target.length; i++) {
+                    Path<?> path = entity.getPrimaryKey().getLocalColumns().get(i);
+                    String column = ColumnMetadata.getName(path);
+                    column = configuration.getColumnOverride(entity.getSchemaAndTable(), column);
+                    target[i] = column;
+                }
+                stmt = connection().prepareStatement(queryString, target);
+            } else {
+                stmt = connection().prepareStatement(queryString, Statement.RETURN_GENERATED_KEYS);
+            }
+        } else {
+            stmt = connection().prepareStatement(queryString);
+        }
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(),
+                metadata.getParams());
+
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+        return stmt;
+    }
+
+    /**
+     * Execute the clause and return the generated keys as a ResultSet
+     *
+     * @return result set with generated keys
+     */
+    public ResultSet executeWithKeys() {
+        context = startContext(connection(), metadata, entity);
+        try {
+            PreparedStatement stmt = null;
+            if (batches.isEmpty()) {
+                stmt = createStatement(true);
+                listeners.notifyInsert(entity, metadata, columns, values, subQuery);
+
+                listeners.preExecute(context);
+                stmt.executeUpdate();
+                listeners.executed(context);
+            } else if (batchToBulk) {
+                stmt = createStatement(true);
+                listeners.notifyInserts(entity, metadata, batches);
+
+                listeners.preExecute(context);
+                stmt.executeUpdate();
+                listeners.executed(context);
+            } else {
+                Collection<PreparedStatement> stmts = createStatements(true);
+                if (stmts != null && stmts.size() > 1) {
+                    throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
+                }
+                stmt = stmts.iterator().next();
+                listeners.notifyInserts(entity, metadata, batches);
+
+                listeners.preExecute(context);
+                stmt.executeBatch();
+                listeners.executed(context);
+            }
+
+            final Statement stmt2 = stmt;
+            ResultSet rs = stmt.getGeneratedKeys();
+            return new ResultSetAdapter(rs) {
+                @Override
+                public void close() throws SQLException {
+                    try {
+                        super.close();
+                    } finally {
+                        stmt2.close();
+                        reset();
+                        endContext(context);
+                    }
+                }
+            };
+        } catch (SQLException e) {
+            onException(context, e);
+            reset();
+            endContext(context);
+            throw configuration.translate(queryString, constants, e);
+        }
+    }
+
+    @Override
+    public long execute() {
+        context = startContext(connection(), metadata,entity);
+        PreparedStatement stmt = null;
+        Collection<PreparedStatement> stmts = null;
+        try {
+            if (batches.isEmpty()) {
+                stmt = createStatement(false);
+                listeners.notifyInsert(entity, metadata, columns, values, subQuery);
+
+                listeners.preExecute(context);
+                int rc = stmt.executeUpdate();
+                listeners.executed(context);
+                return rc;
+            } else if (batchToBulk) {
+                stmt = createStatement(false);
+                listeners.notifyInserts(entity, metadata, batches);
+
+                listeners.preExecute(context);
+                int rc = stmt.executeUpdate();
+                listeners.executed(context);
+                return rc;
+            } else {
+                stmts = createStatements(false);
+                listeners.notifyInserts(entity, metadata, batches);
+
+                listeners.preExecute(context);
+                long rc = executeBatch(stmts);
+                listeners.executed(context);
+                return rc;
+            }
+        } catch (SQLException e) {
+            onException(context,e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            if (stmt != null) {
+                close(stmt);
+            }
+            if (stmts != null) {
+                close(stmts);
+            }
+            reset();
+            endContext(context);
+        }
+    }
+
+    @Override
+    public List<SQLBindings> getSQL() {
+        if (batches.isEmpty()) {
+            SQLSerializer serializer = createSerializer();
+            serializer.serializeInsert(metadata, entity, columns, values, subQuery);
+            return Collections.singletonList(createBindings(metadata, serializer));
+        } else if (batchToBulk) {
+            SQLSerializer serializer = createSerializer();
+            serializer.serializeInsert(metadata, entity, batches);
+            return Collections.singletonList(createBindings(metadata, serializer));
+        } else {
+            List<SQLBindings> builder = new ArrayList<>();
+            for (SQLInsertBatch batch : batches) {
+                SQLSerializer serializer = createSerializer();
+                serializer.serializeInsert(metadata, entity, batch.getColumns(), batch.getValues(), batch.getSubQuery());
+                builder.add(createBindings(metadata, serializer));
+            }
+            return CollectionUtils.unmodifiableList(builder);
+        }
+    }
+
+    @Override
+    public C select(SubQueryExpression<?> sq) {
+        subQuery = sq;
+        for (Map.Entry<ParamExpression<?>, Object> entry : sq.getMetadata().getParams().entrySet()) {
+            metadata.setParam((ParamExpression) entry.getKey(), entry.getValue());
+        }
+        return (C) this;
+    }
+
+    @Override
+    public <T> C set(Path<T> path, T value) {
+        columns.add(path);
+        if (value instanceof Expression<?>) {
+            values.add((Expression<?>) value);
+        } else if (value != null) {
+            values.add(ConstantImpl.create(value));
+        } else {
+            values.add(Null.CONSTANT);
+        }
+        return (C) this;
+    }
+
+    @Override
+    public <T> C set(Path<T> path, Expression<? extends T> expression) {
+        columns.add(path);
+        values.add(expression);
+        return (C) this;
+    }
+
+    @Override
+    public <T> C setNull(Path<T> path) {
+        columns.add(path);
+        values.add(Null.CONSTANT);
+        return (C) this;
+    }
+
+    @Override
+    public C values(Object... v) {
+        for (Object value : v) {
+            if (value instanceof Expression<?>) {
+                values.add((Expression<?>) value);
+            } else if (value != null) {
+                values.add(ConstantImpl.create(value));
+            } else {
+                values.add(Null.CONSTANT);
+            }
+        }
+        return (C) this;
+    }
+
+    @Override
+    public String toString() {
+        SQLSerializer serializer = createSerializer();
+        if (!batches.isEmpty() && batchToBulk) {
+            serializer.serializeInsert(metadata, entity, batches);
+        } else {
+            serializer.serializeInsert(metadata, entity, columns, values, subQuery);
+        }
+        return serializer.toString();
+    }
+
+    /**
+     * Populate the INSERT clause with the properties of the given bean. The
+     * properties need to match the fields of the clause's entity instance.
+     *
+     * @param bean bean to use for population
+     * @return the current object
+     */
+    public C populate(Object bean) {
+        return populate(bean, DefaultMapper.DEFAULT);
+    }
+
+    /**
+     * Populate the INSERT clause with the properties of the given bean using
+     * the given Mapper.
+     *
+     * @param obj object to use for population
+     * @param mapper mapper to use
+     * @return the current object
+     */
+    @SuppressWarnings("rawtypes")
+    public <T> C populate(T obj, Mapper<T> mapper) {
+        Map<Path<?>, Object> values = mapper.createMap(entity, obj);
+        for (Map.Entry<Path<?>, Object> entry : values.entrySet()) {
+            set((Path) entry.getKey(), entry.getValue());
+        }
+        return (C) this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return values.isEmpty() && batches.isEmpty();
+    }
+
+    @Override
+    public int getBatchCount() {
+        return batches.size();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLUpdateClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLUpdateClause.java
new file mode 100644
index 0000000000..3e11ef7b52
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AbstractSQLUpdateClause.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.Range;
+
+import com.querydsl.core.*;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.dml.UpdateClause;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLSerializer;
+import com.querydsl.sql.types.Null;
+
+/**
+ * Provides a base class for dialect-specific UPDATE clauses.
+ *
+ * @author tiwe
+ * @param <C> The type extending this class.
+ *
+ */
+public abstract class AbstractSQLUpdateClause<C extends AbstractSQLUpdateClause<C>> extends AbstractSQLClause<C> implements UpdateClause<C> {
+
+    protected static final Logger logger = Logger.getLogger(AbstractSQLUpdateClause.class.getName());
+
+    protected final RelationalPath<?> entity;
+
+    protected final List<SQLUpdateBatch> batches = new ArrayList<SQLUpdateBatch>();
+
+    protected Map<Path<?>, Expression<?>> updates = new LinkedHashMap<>();
+
+    protected QueryMetadata metadata = new DefaultQueryMetadata();
+
+    protected transient String queryString;
+
+    protected transient List<Object> constants;
+
+    public AbstractSQLUpdateClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    public AbstractSQLUpdateClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    /**
+     * Add the given String literal at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, String flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add the given Expression at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public C addFlag(Position position, Expression<?> flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return (C) this;
+    }
+
+    /**
+     * Add the current state of bindings as a batch item
+     *
+     * @return the current object
+     */
+    public C addBatch() {
+        batches.add(new SQLUpdateBatch(metadata, updates));
+        updates = new LinkedHashMap<>();
+        metadata = new DefaultQueryMetadata();
+        metadata.addJoin(JoinType.DEFAULT, entity);
+        return (C) this;
+    }
+
+    @Override
+    public void clear() {
+        batches.clear();
+        updates = new LinkedHashMap<>();
+        metadata = new DefaultQueryMetadata();
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    protected PreparedStatement createStatement() throws SQLException {
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeUpdate(metadata, entity, updates);
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.prepared(context);
+
+        listeners.prePrepare(context);
+        PreparedStatement stmt = connection().prepareStatement(queryString);
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+
+        return stmt;
+    }
+
+    protected Collection<PreparedStatement> createStatements() throws SQLException {
+        boolean addBatches = !configuration.getUseLiterals();
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeUpdate(batches.get(0).getMetadata(), entity, batches.get(0).getUpdates());
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+
+        Map<String, PreparedStatement> stmts = new HashMap<>();
+
+        // add first batch
+        listeners.prePrepare(context);
+        PreparedStatement stmt = connection().prepareStatement(queryString);
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+        if (addBatches) {
+            stmt.addBatch();
+        }
+        stmts.put(serializer.toString(), stmt);
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+
+
+        // add other batches
+        for (int i = 1; i < batches.size(); i++) {
+            listeners.preRender(context);
+            serializer = createSerializer();
+            serializer.serializeUpdate(batches.get(i).getMetadata(), entity, batches.get(i).getUpdates());
+            context.addSQL(createBindings(metadata, serializer));
+            listeners.rendered(context);
+
+            stmt = stmts.get(serializer.toString());
+            if (stmt == null) {
+                listeners.prePrepare(context);
+                stmt = connection().prepareStatement(serializer.toString());
+                stmts.put(serializer.toString(), stmt);
+                context.addPreparedStatement(stmt);
+                listeners.prepared(context);
+            }
+            setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+            if (addBatches) {
+                stmt.addBatch();
+            }
+        }
+
+        return stmts.values();
+    }
+
+    @Override
+    public long execute() {
+        context = startContext(connection(), metadata, entity);
+
+        PreparedStatement stmt = null;
+        Collection<PreparedStatement> stmts = null;
+        try {
+            if (batches.isEmpty()) {
+                stmt = createStatement();
+                listeners.notifyUpdate(entity, metadata, updates);
+
+                listeners.preExecute(context);
+                int rc = stmt.executeUpdate();
+                listeners.executed(context);
+                return rc;
+            } else {
+                stmts = createStatements();
+                listeners.notifyUpdates(entity, batches);
+
+                listeners.preExecute(context);
+                long rc = executeBatch(stmts);
+                listeners.executed(context);
+                return rc;
+            }
+        } catch (SQLException e) {
+            onException(context,e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            if (stmt != null) {
+                close(stmt);
+            }
+            if (stmts != null) {
+                close(stmts);
+            }
+            reset();
+            endContext(context);
+        }
+    }
+
+    @Override
+    public List<SQLBindings> getSQL() {
+        if (batches.isEmpty()) {
+            SQLSerializer serializer = createSerializer();
+            serializer.serializeUpdate(metadata, entity, updates);
+            return Collections.singletonList(createBindings(metadata, serializer));
+        } else {
+            List<SQLBindings> builder = new ArrayList<>();
+            for (SQLUpdateBatch batch : batches) {
+                SQLSerializer serializer = createSerializer();
+                serializer.serializeUpdate(batch.getMetadata(), entity, batch.getUpdates());
+                builder.add(createBindings(metadata, serializer));
+            }
+            return Collections.unmodifiableList(builder);
+        }
+    }
+
+    @Override
+    public <T> C set(Path<T> path, T value) {
+        if (value instanceof Expression<?>) {
+            updates.put(path, (Expression<?>) value);
+        } else if (value != null) {
+            updates.put(path, ConstantImpl.create(value));
+        } else {
+            setNull(path);
+        }
+        return (C) this;
+    }
+
+    @Override
+    public <T> C set(Path<T> path, Expression<? extends T> expression) {
+        if (expression != null) {
+            updates.put(path, expression);
+        } else {
+            setNull(path);
+        }
+        return (C) this;
+    }
+
+    @Override
+    public <T> C setNull(Path<T> path) {
+        updates.put(path, Null.CONSTANT);
+        return (C) this;
+    }
+
+    @Override
+    public C set(List<? extends Path<?>> paths, List<?> values) {
+        for (int i = 0; i < paths.size(); i++) {
+            if (values.get(i) instanceof Expression) {
+                updates.put(paths.get(i), (Expression<?>) values.get(i));
+            } else if (values.get(i) != null) {
+                updates.put(paths.get(i), ConstantImpl.create(values.get(i)));
+            } else {
+                updates.put(paths.get(i), Null.CONSTANT);
+            }
+        }
+        return (C) this;
+    }
+
+    public C where(Predicate p) {
+        metadata.addWhere(p);
+        return (C) this;
+    }
+
+    @Override
+    public C where(Predicate... o) {
+        for (Predicate p : o) {
+            metadata.addWhere(p);
+        }
+        return (C) this;
+    }
+
+    public C limit(@Range(from = 0, to = Integer.MAX_VALUE) long limit) {
+        metadata.setModifiers(QueryModifiers.limit(limit));
+        return (C) this;
+    }
+
+    @Override
+    public String toString() {
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeUpdate(metadata, entity, updates);
+        return serializer.toString();
+    }
+
+    /**
+     * Populate the UPDATE clause with the properties of the given bean.
+     * The properties need to match the fields of the clause's entity instance.
+     * Primary key columns are skipped in the population.
+     *
+     * @param bean bean to use for population
+     * @return the current object
+     */
+    @SuppressWarnings("unchecked")
+    public C populate(Object bean) {
+        return populate(bean, DefaultMapper.DEFAULT);
+    }
+
+    /**
+     * Populate the UPDATE clause with the properties of the given bean using the given Mapper.
+     *
+     * @param obj object to use for population
+     * @param mapper mapper to use
+     * @return the current object
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public <T> C populate(T obj, Mapper<T> mapper) {
+        Collection<? extends Path<?>> primaryKeyColumns = entity.getPrimaryKey() != null
+                ? entity.getPrimaryKey().getLocalColumns()
+                : Collections.<Path<?>>emptyList();
+        Map<Path<?>, Object> values = mapper.createMap(entity, obj);
+        for (Map.Entry<Path<?>, Object> entry : values.entrySet()) {
+            if (!primaryKeyColumns.contains(entry.getKey())) {
+                set((Path) entry.getKey(), entry.getValue());
+            }
+        }
+        return (C) this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return updates.isEmpty() && batches.isEmpty();
+    }
+
+    @Override
+    public int getBatchCount() {
+        return batches.size();
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AnnotationMapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AnnotationMapper.java
similarity index 87%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/dml/AnnotationMapper.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/dml/AnnotationMapper.java
index 3528f4f0be..0da642bbb9 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AnnotationMapper.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/AnnotationMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.mysema.query.QueryException;
-import com.mysema.query.sql.Column;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.RelationalPath;
-import com.mysema.query.sql.types.Null;
-import com.mysema.query.types.Path;
-import com.mysema.util.ReflectionUtils;
+import com.querydsl.core.QueryException;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.util.ReflectionUtils;
+import com.querydsl.sql.Column;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.types.Null;
 
 /**
  * Creates the mapping via @Column annotated fields in the object. Field names don't have to match those in the RelationalPath.
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/BeanMapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/BeanMapper.java
new file mode 100644
index 0000000000..9d68461118
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/BeanMapper.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.util.BeanMap;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.types.Null;
+
+/**
+ * Creates the mapping by inspecting object via bean inspection.
+ * Given bean doesn't need to have @Column metadata, but the fields need to have the same
+ * name as in the given relational path.
+ *
+ * @author tiwe
+ *
+ */
+public class BeanMapper extends AbstractMapper<Object> {
+
+    public static final BeanMapper DEFAULT = new BeanMapper(false);
+
+    public static final BeanMapper WITH_NULL_BINDINGS = new BeanMapper(true);
+
+    private final boolean withNullBindings;
+
+    public BeanMapper() {
+        this(false);
+    }
+
+    public BeanMapper(boolean withNullBindings) {
+        this.withNullBindings = withNullBindings;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    public Map<Path<?>, Object> createMap(RelationalPath<?> entity, Object bean) {
+        Map<Path<?>, Object> values = new LinkedHashMap<>();
+        Map<String, Object> map = new BeanMap(bean);
+        Map<String, Path<?>> columns = getColumns(entity);
+        // populate in column order
+        for (Map.Entry<String, Path<?>> entry : columns.entrySet()) {
+            Path<?> path = entry.getValue();
+            if (map.containsKey(entry.getKey())) {
+                Object value = map.get(entry.getKey());
+                if (value != null) {
+                    values.put(path, value);
+                } else if (withNullBindings && !isPrimaryKeyColumn(entity, path)) {
+                    values.put(path, Null.DEFAULT);
+                }
+            }
+        }
+        return values;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/DefaultMapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/DefaultMapper.java
new file mode 100644
index 0000000000..e3a4163a36
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/DefaultMapper.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.util.ReflectionUtils;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.types.Null;
+
+/**
+ * Creates the mapping by inspecting the RelationalPath and Object via reflection.
+ * Given bean doesn't need to have @Column metadata, but the fields need to have the same
+ * name as in the given relational path.
+ *
+ * @author tiwe
+ *
+ */
+public class DefaultMapper extends AbstractMapper<Object> {
+
+    public static final DefaultMapper DEFAULT = new DefaultMapper(false);
+
+    public static final DefaultMapper WITH_NULL_BINDINGS = new DefaultMapper(true);
+
+    private final boolean withNullBindings;
+
+    public DefaultMapper() {
+        this(false);
+    }
+
+    public DefaultMapper(boolean withNullBindings) {
+        this.withNullBindings = withNullBindings;
+    }
+
+    @Override
+    public Map<Path<?>, Object> createMap(RelationalPath<?> entity, Object bean) {
+        try {
+            Map<Path<?>, Object> values = new LinkedHashMap<>();
+            Class<?> beanClass = bean.getClass();
+            Map<String, Path<?>> columns = getColumns(entity);
+            // populate in column order
+            for (Map.Entry<String, Path<?>> entry : columns.entrySet()) {
+                Path<?> path = entry.getValue();
+                Field beanField = ReflectionUtils.getFieldOrNull(beanClass, entry.getKey());
+                if (beanField != null && !Modifier.isStatic(beanField.getModifiers())) {
+                    beanField.setAccessible(true);
+                    Object propertyValue = beanField.get(bean);
+                    if (propertyValue != null) {
+                        values.put(path, propertyValue);
+                    } else if (withNullBindings && !isPrimaryKeyColumn(entity, path)) {
+                        values.put(path, Null.DEFAULT);
+                    }
+                }
+            }
+            return values;
+        } catch (IllegalAccessException e) {
+            throw new QueryException(e);
+        }
+    }
+
+
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/EmptyResultSet.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/EmptyResultSet.java
similarity index 97%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/dml/EmptyResultSet.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/dml/EmptyResultSet.java
index d5eeee5602..1ff3965ed9 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/EmptyResultSet.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/EmptyResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,32 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Calendar;
 import java.util.Map;
 
 /**
- * Empty implementation of the ResulSet interface
+ * Empty implementation of the ResultSet interface
  *
  * @author tiwe
  *
@@ -45,7 +31,7 @@ public final class EmptyResultSet implements ResultSet {
 
     public static final ResultSet DEFAULT = new EmptyResultSet();
 
-    private EmptyResultSet() {}
+    private EmptyResultSet() { }
 
     @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/Mapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/Mapper.java
new file mode 100644
index 0000000000..adcb245961
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/Mapper.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.util.Map;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.RelationalPath;
+
+/**
+ * Create a Map of updates for a given domain object
+ *
+ * @param <T> object type
+ *
+ * @author tiwe
+ */
+public interface Mapper<T> {
+
+    /**
+     * Create a map of updates for the given path and instance
+     *
+     * @param path path
+     * @param object instance
+     * @return bindings
+     */
+    Map<Path<?>, Object> createMap(RelationalPath<?> path, T object);
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLDeleteClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLDeleteClause.java
new file mode 100644
index 0000000000..fe0983c3d8
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLDeleteClause.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code SQLDeleteClause} defines a DELETE clause.
+ * If you need to subtype this, use {@link AbstractSQLDeleteClause} instead.
+ *
+ * @author tiwe
+ *
+ */
+public class SQLDeleteClause extends AbstractSQLDeleteClause<SQLDeleteClause> {
+    public SQLDeleteClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
+        super(connection, new Configuration(templates), entity);
+    }
+
+    public SQLDeleteClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+
+    public SQLDeleteClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertBatch.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertBatch.java
similarity index 76%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertBatch.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertBatch.java
index 3d48d4e7c2..0c15b70f91 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertBatch.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertBatch.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,32 +11,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
 
 /**
- * SQLInsertBatch defines the state of an SQL INSERT batch item
- * 
+ * {@code SQLInsertBatch} defines the state of an SQL INSERT batch item
+ *
  * @author tiwe
  *
  */
-public class SQLInsertBatch {        
-    
+public class SQLInsertBatch {
+
     private final List<Path<?>> columns;
-    
+
     private final List<Expression<?>> values;
-    
+
     @Nullable
     private final SubQueryExpression<?> subQuery;
-    
+
     public SQLInsertBatch(List<Path<?>> c, List<Expression<?>> v, @Nullable SubQueryExpression<?> sq) {
         columns = new ArrayList<Path<?>>(c);
         values = new ArrayList<Expression<?>>(v);
@@ -54,6 +54,6 @@ public List<Expression<?>> getValues() {
     public SubQueryExpression<?> getSubQuery() {
         return subQuery;
     }
-    
-    
+
+
 }
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertClause.java
new file mode 100644
index 0000000000..61299a5c8a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLInsertClause.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * SQLInsertClause defines an INSERT INTO clause
+ * If you need to subtype this, use {@link AbstractSQLInsertClause} instead.
+ *
+ * @author tiwe
+ *
+ */
+public class SQLInsertClause extends AbstractSQLInsertClause<SQLInsertClause> {
+    public SQLInsertClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
+        this(connection, new Configuration(templates), entity);
+    }
+
+    public SQLInsertClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity, SQLQuery<?> subQuery) {
+        this(connection, new Configuration(templates), entity, subQuery);
+    }
+
+    public SQLInsertClause(Connection connection, Configuration configuration, RelationalPath<?> entity, SQLQuery<?> subQuery) {
+        super(connection, configuration, entity, subQuery);
+    }
+
+    public SQLInsertClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+
+    public SQLInsertClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity, SQLQuery<?> subQuery) {
+        super(connection, configuration, entity, subQuery);
+    }
+
+    public SQLInsertClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeBatch.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeBatch.java
similarity index 80%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeBatch.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeBatch.java
index 0aa29b34de..3afc44f9b0 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeBatch.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeBatch.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,41 +11,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
 
 /**
- * SQLMergeBatch defines the state of an SQL MERGE batch item
- * 
+ * {@code SQLMergeBatch} defines the state of an SQL MERGE batch item
+ *
  * @author tiwe
  *
  */
 public class SQLMergeBatch {
-    
+
     private final List<Path<?>> keys;
-    
+
     private final List<Path<?>> columns;
-    
+
     private final List<Expression<?>> values;
-    
+
     @Nullable
     private final SubQueryExpression<?> subQuery;
-    
+
     public SQLMergeBatch(List<Path<?>> k, List<Path<?>> c, List<Expression<?>> v, @Nullable SubQueryExpression<?> sq) {
         keys = new ArrayList<Path<?>>(k);
         columns = new ArrayList<Path<?>>(c);
         values = new ArrayList<Expression<?>>(v);
         subQuery = sq;
     }
-    
+
     public List<Path<?>> getKeys() {
         return keys;
     }
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
new file mode 100644
index 0000000000..b4a7eb395d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLMergeClause.java
@@ -0,0 +1,593 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.*;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.function.Supplier;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.CollectionUtils;
+
+import com.querydsl.core.*;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.dml.StoreClause;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.util.ResultSetAdapter;
+import com.querydsl.sql.*;
+import com.querydsl.sql.types.Null;
+
+/**
+ * {@code SQLMergeClause} defines an MERGE INTO clause
+ *
+ * @author tiwe
+ *
+ */
+public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements StoreClause<SQLMergeClause> {
+
+    protected static final Logger logger = Logger.getLogger(SQLMergeClause.class.getName());
+
+    protected final List<Path<?>> columns = new ArrayList<Path<?>>();
+
+    protected final RelationalPath<?> entity;
+
+    protected final QueryMetadata metadata = new DefaultQueryMetadata();
+
+    protected final List<Path<?>> keys = new ArrayList<Path<?>>();
+
+    @Nullable
+    protected SubQueryExpression<?> subQuery;
+
+    protected final List<SQLMergeBatch> batches = new ArrayList<SQLMergeBatch>();
+
+    protected final List<Expression<?>> values = new ArrayList<Expression<?>>();
+
+    protected transient String queryString;
+
+    protected transient List<Object> constants;
+
+    public SQLMergeClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
+        this(connection, new Configuration(templates), entity);
+    }
+
+    public SQLMergeClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    public SQLMergeClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(configuration, connection);
+        this.entity = entity;
+        metadata.addJoin(JoinType.DEFAULT, entity);
+    }
+
+    /**
+     * Add the given String literal at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public SQLMergeClause addFlag(Position position, String flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return this;
+    }
+
+    /**
+     * Add the given Expression at the given position as a query flag
+     *
+     * @param position position
+     * @param flag query flag
+     * @return the current object
+     */
+    public SQLMergeClause addFlag(Position position, Expression<?> flag) {
+        metadata.addFlag(new QueryFlag(position, flag));
+        return this;
+    }
+
+    protected List<? extends Path<?>> getKeys() {
+        if (!keys.isEmpty()) {
+            return keys;
+        } else if (entity.getPrimaryKey() != null) {
+            return entity.getPrimaryKey().getLocalColumns();
+        } else {
+            throw new IllegalStateException("No keys were defined, invoke keys(..) to add keys");
+        }
+    }
+
+    /**
+     * Add the current state of bindings as a batch item
+     *
+     * @return the current object
+     */
+    public SQLMergeClause addBatch() {
+        if (!configuration.getTemplates().isNativeMerge()) {
+            throw new IllegalStateException("batch only supported for databases that support native merge");
+        }
+
+        batches.add(new SQLMergeBatch(keys, columns, values, subQuery));
+        columns.clear();
+        values.clear();
+        keys.clear();
+        subQuery = null;
+        return this;
+    }
+
+    @Override
+    public void clear() {
+        batches.clear();
+        columns.clear();
+        values.clear();
+        keys.clear();
+        subQuery = null;
+    }
+
+    public SQLMergeClause columns(Path<?>... columns) {
+        this.columns.addAll(Arrays.asList(columns));
+        return this;
+    }
+
+    /**
+     * Execute the clause and return the generated key with the type of the given path.
+     * If no rows were created, null is returned, otherwise the key of the first row is returned.
+     *
+     * @param <T>
+     * @param path path for key
+     * @return generated key
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public <T> T executeWithKey(Path<T> path) {
+        return executeWithKey((Class<T>) path.getType(), path);
+    }
+
+    /**
+     * Execute the clause and return the generated key cast to the given type.
+     * If no rows were created, null is returned, otherwise the key of the first row is returned.
+     *
+     * @param <T>
+     * @param type type of key
+     * @return generated key
+     */
+    public <T> T executeWithKey(Class<T> type) {
+        return executeWithKey(type, null);
+    }
+
+    protected <T> T executeWithKey(Class<T> type, @Nullable Path<T> path) {
+        ResultSet rs = executeWithKeys();
+        try {
+            if (rs.next()) {
+                return configuration.get(rs, path, 1, type);
+            } else {
+                return null;
+            }
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        } finally {
+            close(rs);
+        }
+    }
+
+    /**
+     * Execute the clause and return the generated key with the type of the given path.
+     * If no rows were created, or the referenced column is not a generated key, null is returned.
+     * Otherwise, the key of the first row is returned.
+     *
+     * @param <T>
+     * @param path path for key
+     * @return generated keys
+     */
+    @SuppressWarnings("unchecked")
+    public <T> List<T> executeWithKeys(Path<T> path) {
+        return executeWithKeys((Class<T>) path.getType(), path);
+    }
+
+    public <T> List<T> executeWithKeys(Class<T> type) {
+        return executeWithKeys(type, null);
+    }
+
+    protected <T> List<T> executeWithKeys(Class<T> type, @Nullable Path<T> path) {
+        ResultSet rs = null;
+        try {
+            rs = executeWithKeys();
+            List<T> rv = new ArrayList<T>();
+            while (rs.next()) {
+                rv.add(configuration.get(rs, path, 1, type));
+            }
+            return rv;
+        } catch (SQLException e) {
+            throw configuration.translate(e);
+        } finally {
+            if (rs != null) {
+                close(rs);
+            }
+            reset();
+        }
+    }
+
+    /**
+     * Execute the clause and return the generated keys as a ResultSet
+     *
+     * @return result set with generated keys
+     */
+    public ResultSet executeWithKeys() {
+        context = startContext(connection(), metadata, entity);
+        try {
+            if (configuration.getTemplates().isNativeMerge()) {
+                PreparedStatement stmt = null;
+                if (batches.isEmpty()) {
+                    stmt = createStatement(true);
+                    listeners.notifyMerge(entity, metadata, keys, columns, values, subQuery);
+
+                    listeners.preExecute(context);
+                    stmt.executeUpdate();
+                    listeners.executed(context);
+                } else {
+                    Collection<PreparedStatement> stmts = createStatements(true);
+                    if (stmts != null && stmts.size() > 1) {
+                        throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
+                    }
+                    stmt = stmts.iterator().next();
+                    listeners.notifyMerges(entity, metadata, batches);
+
+                    listeners.preExecute(context);
+                    stmt.executeBatch();
+                    listeners.executed(context);
+                }
+
+                final Statement stmt2 = stmt;
+                ResultSet rs = stmt.getGeneratedKeys();
+                return new ResultSetAdapter(rs) {
+                    @Override
+                    public void close() throws SQLException {
+                        try {
+                            super.close();
+                        } finally {
+                            stmt2.close();
+                            reset();
+                            endContext(context);
+                        }
+                    }
+                };
+            } else {
+                if (hasRow()) {
+                    // update
+                    SQLUpdateClause update = new SQLUpdateClause(connection(), configuration, entity);
+                    update.addListener(listeners);
+                    populate(update);
+                    addKeyConditions(update);
+                    reset();
+                    endContext(context);
+                    return EmptyResultSet.DEFAULT;
+                } else {
+                    // insert
+                    SQLInsertClause insert = new SQLInsertClause(connection(), configuration, entity);
+                    insert.addListener(listeners);
+                    populate(insert);
+                    return insert.executeWithKeys();
+                }
+            }
+        } catch (SQLException e) {
+            onException(context,e);
+            reset();
+            endContext(context);
+            throw configuration.translate(queryString, constants, e);
+        }
+    }
+
+    @Override
+    public long execute() {
+        if (configuration.getTemplates().isNativeMerge()) {
+            return executeNativeMerge();
+        } else {
+            return executeCompositeMerge();
+        }
+    }
+
+    @Override
+    public List<SQLBindings> getSQL() {
+        if (batches.isEmpty()) {
+            SQLSerializer serializer = createSerializer();
+            serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
+            return Collections.singletonList(createBindings(metadata, serializer));
+        } else {
+            List<SQLBindings> builder = new ArrayList<>();
+            for (SQLMergeBatch batch : batches) {
+                SQLSerializer serializer = createSerializer();
+                serializer.serializeMerge(metadata, entity, batch.getKeys(), batch.getColumns(), batch.getValues(), batch.getSubQuery());
+                builder.add(createBindings(metadata, serializer));
+            }
+            return CollectionUtils.unmodifiableList(builder);
+        }
+    }
+
+    protected boolean hasRow() {
+        SQLQuery<?> query = new SQLQuery<Void>(connection(), configuration).from(entity);
+        for (SQLListener listener : listeners.getListeners()) {
+            query.addListener(listener);
+        }
+        query.addListener(SQLNoCloseListener.DEFAULT);
+        addKeyConditions(query);
+        return query.select(Expressions.ONE).fetchFirst() != null;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void addKeyConditions(FilteredClause<?> query) {
+        List<? extends Path<?>> keys = getKeys();
+        for (int i = 0; i < columns.size(); i++) {
+            if (keys.contains(columns.get(i))) {
+                if (values.get(i) instanceof NullExpression) {
+                    query.where(ExpressionUtils.isNull(columns.get(i)));
+                } else {
+                    query.where(ExpressionUtils.eq(columns.get(i),(Expression) values.get(i)));
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected long executeCompositeMerge() {
+        if (hasRow()) {
+            // update
+            SQLUpdateClause update = new SQLUpdateClause(connection(), configuration, entity);
+            populate(update);
+            addListeners(update);
+            addKeyConditions(update);
+            return update.execute();
+        } else {
+            // insert
+            SQLInsertClause insert = new SQLInsertClause(connection(), configuration, entity);
+            addListeners(insert);
+            populate(insert);
+            return insert.execute();
+
+        }
+    }
+
+    protected void addListeners(AbstractSQLClause<?> clause) {
+        for (SQLListener listener : listeners.getListeners()) {
+            clause.addListener(listener);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void populate(StoreClause<?> clause) {
+        for (int i = 0; i < columns.size(); i++) {
+            clause.set((Path) columns.get(i), (Object) values.get(i));
+        }
+    }
+
+    protected PreparedStatement createStatement(boolean withKeys) throws SQLException {
+        boolean addBatches = !configuration.getUseLiterals();
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        PreparedStatement stmt = null;
+        if (batches.isEmpty()) {
+            serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
+            context.addSQL(createBindings(metadata, serializer));
+            listeners.rendered(context);
+
+            listeners.prePrepare(context);
+            stmt = prepareStatementAndSetParameters(serializer, withKeys);
+            context.addPreparedStatement(stmt);
+            listeners.prepared(context);
+        } else {
+            serializer.serializeMerge(metadata, entity,
+                    batches.get(0).getKeys(), batches.get(0).getColumns(),
+                    batches.get(0).getValues(), batches.get(0).getSubQuery());
+            context.addSQL(createBindings(metadata, serializer));
+            listeners.rendered(context);
+
+            stmt = prepareStatementAndSetParameters(serializer, withKeys);
+
+            // add first batch
+            if (addBatches) {
+                stmt.addBatch();
+            }
+
+            // add other batches
+            for (int i = 1; i < batches.size(); i++) {
+                SQLMergeBatch batch = batches.get(i);
+                listeners.preRender(context);
+                serializer = createSerializer();
+                serializer.serializeMerge(metadata, entity, batch.getKeys(), batch.getColumns(), batch.getValues(), batch.getSubQuery());
+                context.addSQL(createBindings(metadata, serializer));
+                listeners.rendered(context);
+
+                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+                if (addBatches) {
+                    stmt.addBatch();
+                }
+            }
+        }
+        return stmt;
+    }
+
+    protected Collection<PreparedStatement> createStatements(boolean withKeys) throws SQLException {
+        boolean addBatches = !configuration.getUseLiterals();
+        Map<String, PreparedStatement> stmts = new HashMap<>();
+
+        // add first batch
+        listeners.preRender(context);
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeMerge(metadata, entity,
+                batches.get(0).getKeys(), batches.get(0).getColumns(),
+                batches.get(0).getValues(), batches.get(0).getSubQuery());
+        context.addSQL(createBindings(metadata, serializer));
+        listeners.rendered(context);
+
+        PreparedStatement stmt = prepareStatementAndSetParameters(serializer, withKeys);
+        stmts.put(serializer.toString(), stmt);
+        if (addBatches) {
+            stmt.addBatch();
+        }
+
+        // add other batches
+        for (int i = 1; i < batches.size(); i++) {
+            SQLMergeBatch batch = batches.get(i);
+            serializer = createSerializer();
+            serializer.serializeMerge(metadata, entity,
+                    batch.getKeys(), batch.getColumns(), batch.getValues(), batch.getSubQuery());
+            stmt = stmts.get(serializer.toString());
+            if (stmt == null) {
+                stmt = prepareStatementAndSetParameters(serializer, withKeys);
+                stmts.put(serializer.toString(), stmt);
+            } else {
+                setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+            }
+            if (addBatches) {
+                stmt.addBatch();
+            }
+        }
+
+        return stmts.values();
+    }
+
+    protected PreparedStatement prepareStatementAndSetParameters(SQLSerializer serializer,
+            boolean withKeys) throws SQLException {
+        listeners.prePrepare(context);
+
+        queryString = serializer.toString();
+        constants = serializer.getConstants();
+        logQuery(logger, queryString, constants);
+        PreparedStatement stmt;
+        if (withKeys) {
+            String[] target = new String[keys.size()];
+            for (int i = 0; i < target.length; i++) {
+                target[i] = ColumnMetadata.getName(getKeys().get(i));
+            }
+            stmt = connection().prepareStatement(queryString, target);
+        } else {
+            stmt = connection().prepareStatement(queryString);
+        }
+        setParameters(stmt, serializer.getConstants(), serializer.getConstantPaths(), metadata.getParams());
+        context.addPreparedStatement(stmt);
+        listeners.prepared(context);
+
+        return stmt;
+    }
+
+    protected long executeNativeMerge() {
+        context = startContext(connection(), metadata, entity);
+        PreparedStatement stmt = null;
+        Collection<PreparedStatement> stmts = null;
+        try {
+            if (batches.isEmpty()) {
+                stmt = createStatement(false);
+                listeners.notifyMerge(entity, metadata, keys, columns, values, subQuery);
+
+                listeners.preExecute(context);
+                int rc = stmt.executeUpdate();
+                listeners.executed(context);
+                return rc;
+            } else {
+                stmts = createStatements(false);
+                listeners.notifyMerges(entity, metadata, batches);
+
+                listeners.preExecute(context);
+                long rc = executeBatch(stmts);
+                listeners.executed(context);
+                return rc;
+            }
+        } catch (SQLException e) {
+            onException(context,e);
+            throw configuration.translate(queryString, constants, e);
+        } finally {
+            if (stmt != null) {
+                close(stmt);
+            }
+            if (stmts != null) {
+                close(stmts);
+            }
+            reset();
+            endContext(context);
+        }
+    }
+
+    /**
+     * Set the keys to be used in the MERGE clause
+     *
+     * @param paths keys
+     * @return the current object
+     */
+    public SQLMergeClause keys(Path<?>... paths) {
+        keys.addAll(Arrays.asList(paths));
+        return this;
+    }
+
+    public SQLMergeClause select(SubQueryExpression<?> subQuery) {
+        this.subQuery = subQuery;
+        return this;
+    }
+
+    @Override
+    public <T> SQLMergeClause set(Path<T> path, @Nullable T value) {
+        columns.add(path);
+        if (value != null) {
+            values.add(ConstantImpl.create(value));
+        } else {
+            values.add(Null.CONSTANT);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> SQLMergeClause set(Path<T> path, Expression<? extends T> expression) {
+        columns.add(path);
+        values.add(expression);
+        return this;
+    }
+
+    @Override
+    public <T> SQLMergeClause setNull(Path<T> path) {
+        columns.add(path);
+        values.add(Null.CONSTANT);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        SQLSerializer serializer = createSerializer();
+        serializer.serializeMerge(metadata, entity, keys, columns, values, subQuery);
+        return serializer.toString();
+    }
+
+    public SQLMergeClause values(Object... v) {
+        for (Object value : v) {
+            if (value instanceof Expression<?>) {
+                values.add((Expression<?>) value);
+            } else if (value != null) {
+                values.add(ConstantImpl.create(value));
+            } else {
+                values.add(Null.CONSTANT);
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return values.isEmpty() && batches.isEmpty();
+    }
+
+    @Override
+    public int getBatchCount() {
+        return batches.size();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateBatch.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateBatch.java
new file mode 100644
index 0000000000..1ff45743ff
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateBatch.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.util.Map;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+
+/**
+ * {@code SQLUpdateBatch} defines the state of an SQL UPDATE batch item
+ *
+ * @author tiwe
+ *
+ */
+public class SQLUpdateBatch {
+
+    private final QueryMetadata metadata;
+
+    private final Map<Path<?>,Expression<?>> updates;
+
+    public SQLUpdateBatch(QueryMetadata metadata, Map<Path<?>,Expression<?>> updates) {
+        this.metadata = metadata;
+        this.updates = updates;
+    }
+
+    public QueryMetadata getMetadata() {
+        return metadata;
+    }
+
+    public Map<Path<?>, Expression<?>> getUpdates() {
+        return updates;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateClause.java
new file mode 100644
index 0000000000..6f9e48c507
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/SQLUpdateClause.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.dml;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * Defines an UPDATE clause.
+ * If you need to subtype this, use {@link AbstractSQLUpdateClause} instead.
+ */
+public class SQLUpdateClause extends AbstractSQLUpdateClause<SQLUpdateClause> {
+    public SQLUpdateClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
+        super(connection, new Configuration(templates), entity);
+    }
+
+    public SQLUpdateClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+
+    public SQLUpdateClause(Supplier<Connection> connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/dml/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/dml/package-info.java
new file mode 100644
index 0000000000..46ac409471
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/dml/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * DML operations support
+ */
+package com.querydsl.sql.dml;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/AbstractSQLServerQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/AbstractSQLServerQuery.java
new file mode 100644
index 0000000000..07f2e9d782
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/AbstractSQLServerQuery.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.sql.AbstractSQLQuery;
+import com.querydsl.sql.Configuration;
+
+/**
+ * {@code AbstractSQLServerQuery} provides SQL Server related extensions to SQLQuery
+ *
+ * @param <T> result type
+ * @param <C> the concrete subtype
+ *
+ * @author tiwe
+ */
+public abstract class AbstractSQLServerQuery<T, C extends AbstractSQLServerQuery<T,C>> extends AbstractSQLQuery<T, C> {
+    public AbstractSQLServerQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public AbstractSQLServerQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    /**
+     * Set the table hints
+     *
+     * @param tableHints table hints
+     * @return the current object
+     */
+    public C tableHints(SQLServerTableHints... tableHints) {
+        if (tableHints.length > 0) {
+            String hints = SQLServerGrammar.tableHints(tableHints);
+            addJoinFlag(hints, JoinFlag.Position.BEFORE_CONDITION);
+        }
+        return (C) this;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerGrammar.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerGrammar.java
new file mode 100644
index 0000000000..d768b8eac0
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerGrammar.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+
+/**
+ * Convenience functions and constants for SQL Server usage
+ *
+ * @author tiwe
+ *
+ */
+final class SQLServerGrammar {
+
+    private SQLServerGrammar() { }
+
+    static String tableHints(SQLServerTableHints... tableHints) {
+        StringBuilder hints = new StringBuilder(" with ").append("(");
+        for (int i = 0; i < tableHints.length; i++) {
+            if (i > 0) {
+                hints.append(", ");
+            }
+            hints.append(tableHints[i].name());
+        }
+        hints.append(")");
+        return hints.toString();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQuery.java
new file mode 100644
index 0000000000..91e39188bf
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQuery.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLServerTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code SQLServerQuery} provides SQL Server related extensions to SQLQuery
+ *
+ * If you need to subtype this, use the base class instead.
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public class SQLServerQuery<T> extends AbstractSQLServerQuery<T, SQLServerQuery<T>> {
+
+    public SQLServerQuery(Connection conn) {
+        this(conn, SQLServerTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    public SQLServerQuery(Connection conn, SQLTemplates templates) {
+        this(conn, templates, new DefaultQueryMetadata());
+    }
+
+    protected SQLServerQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
+        super(conn, new Configuration(templates), metadata);
+    }
+
+    public SQLServerQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public SQLServerQuery(Connection conn, Configuration configuration) {
+        super(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public SQLServerQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public SQLServerQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+    @Override
+    public SQLServerQuery<T> clone(Connection conn) {
+        SQLServerQuery<T> q = new SQLServerQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> SQLServerQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        SQLServerQuery<U> newType = (SQLServerQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public SQLServerQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        SQLServerQuery<Tuple> newType = (SQLServerQuery<Tuple>) this;
+        return newType;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQueryFactory.java
new file mode 100644
index 0000000000..da935102ad
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerQueryFactory.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.*;
+
+/**
+ * SQL Server specific implementation of SQLQueryFactory
+ *
+ * @author tiwe
+ *
+ */
+public class SQLServerQueryFactory extends AbstractSQLQueryFactory<SQLServerQuery<?>> {
+
+    public SQLServerQueryFactory(Configuration configuration, Supplier<Connection> connection) {
+        super(configuration, connection);
+    }
+
+    public SQLServerQueryFactory(Supplier<Connection> connection) {
+        this(new Configuration(new SQLServerTemplates()), connection);
+    }
+
+    public SQLServerQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    @Override
+    public SQLServerQuery<?> query() {
+        return new SQLServerQuery<Void>(connection, configuration);
+    }
+
+    @Override
+    public <T> SQLServerQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public SQLServerQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> SQLServerQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public SQLServerQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public SQLServerQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public SQLServerQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> SQLServerQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerTableHints.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerTableHints.java
new file mode 100644
index 0000000000..c89d0f622f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/SQLServerTableHints.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+/**
+ * Table hints constants for SQLServerQuery
+ *
+ * @author tiwe
+ */
+public enum SQLServerTableHints {
+    NOEXPAND,
+    FASTFIRSTROW,
+    FORCESEEK,
+    HOLDLOCK,
+    NOLOCK,
+    NOWAIT,
+    PAGLOCK,
+    READCOMMITTED,
+    READCOMMITTEDLOCK,
+    READPAST,
+    READUNCOMMITTED,
+    REPEATABLEREAD,
+    ROWLOCK,
+    SERIALIZABLE,
+    TABLOCK,
+    TABLOCKX,
+    UPDLOCK,
+    XLOCK
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mssql/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/package-info.java
new file mode 100644
index 0000000000..beb86de28a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mssql/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * SQL Server support
+ */
+package com.querydsl.sql.mssql;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mysql/AbstractMySQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/AbstractMySQLQuery.java
new file mode 100644
index 0000000000..1afcaff810
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/AbstractMySQLQuery.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mysql;
+
+import java.io.File;
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.JoinFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.sql.AbstractSQLQuery;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLQuery;
+
+/**
+ * {@code MySQLQuery} provides MySQL related extensions to SQLQuery.
+ *
+ * @author tiwe
+ * @see SQLQuery
+ * @param <T> result type
+ * @param <C> the concrete subtype
+ */
+public abstract class AbstractMySQLQuery<T, C extends AbstractMySQLQuery<T, C>> extends AbstractSQLQuery<T, C> {
+
+    protected static final String WITH_ROLLUP = "\nwith rollup ";
+
+    protected static final String STRAIGHT_JOIN = "straight_join ";
+
+    protected static final String SQL_SMALL_RESULT = "sql_small_result ";
+
+    protected static final String SQL_NO_CACHE = "sql_no_cache ";
+
+    protected static final String LOCK_IN_SHARE_MODE = "\nlock in share mode ";
+
+    protected static final String HIGH_PRIORITY = "high_priority ";
+
+    protected static final String SQL_CALC_FOUND_ROWS = "sql_calc_found_rows ";
+
+    protected static final String SQL_CACHE = "sql_cache ";
+
+    protected static final String SQL_BUFFER_RESULT = "sql_buffer_result ";
+
+    protected static final String SQL_BIG_RESULT = "sql_big_result ";
+
+    public AbstractMySQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public AbstractMySQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    /**
+     * For SQL_BIG_RESULT, MySQL directly uses disk-based temporary tables if needed, and prefers
+     * sorting to using a temporary table with a key on the GROUP BY elements.
+     *
+     * @return the current object
+     */
+    public C bigResult() {
+        return addFlag(Position.AFTER_SELECT, SQL_BIG_RESULT);
+    }
+
+    /**
+     * SQL_BUFFER_RESULT forces the result to be put into a temporary table. This helps MySQL free
+     * the table locks early and helps in cases where it takes a long time to send the result set
+     * to the client. This option can be used only for top-level SELECT statements, not for
+     * subqueries or following UNION.
+     *
+     * @return the current object
+     */
+    public C bufferResult() {
+        return addFlag(Position.AFTER_SELECT, SQL_BUFFER_RESULT);
+    }
+
+    /**
+     * SQL_CACHE tells MySQL to store the result in the query cache if it is cacheable and the value
+     * of the query_cache_type system variable is 2 or DEMAND.
+     *
+     * @return the current object
+     */
+    public C cache() {
+        return addFlag(Position.AFTER_SELECT, SQL_CACHE);
+    }
+
+    /**
+     * SQL_CALC_FOUND_ROWS tells MySQL to calculate how many rows there would be in the result set,
+     * disregarding any LIMIT clause. The number of rows can then be retrieved with SELECT FOUND_ROWS().
+     *
+     * @return the current object
+     */
+    public C calcFoundRows() {
+        return addFlag(Position.AFTER_SELECT, SQL_CALC_FOUND_ROWS);
+    }
+
+    /**
+     * HIGH_PRIORITY gives the SELECT higher priority than a statement that updates a table.
+     * You should use this only for queries that are very fast and must be done at once.
+     *
+     * @return the current object
+     */
+    public C highPriority() {
+        return addFlag(Position.AFTER_SELECT, HIGH_PRIORITY);
+    }
+
+    /**
+     * SELECT ... INTO var_list selects column values and stores them into variables.
+     *
+     * @param var variable name
+     * @return the current object
+     */
+    public C into(String var) {
+        return addFlag(Position.END, "\ninto " + var);
+    }
+
+    /**
+     * SELECT ... INTO DUMPFILE writes a single row to a file without any formatting.
+     *
+     * @param file file to write to
+     * @return the current object
+     */
+    public C intoDumpfile(File file) {
+        return addFlag(Position.END, "\ninto dumpfile '" + file.getPath() + "'");
+    }
+
+    /**
+     * SELECT ... INTO OUTFILE writes the selected rows to a file. Column and line terminators c
+     * an be specified to produce a specific output format.
+     *
+     * @param file file to write to
+     * @return the current object
+     */
+    public C intoOutfile(File file) {
+        return addFlag(Position.END, "\ninto outfile '" + file.getPath() + "'");
+    }
+
+    /**
+     * Using LOCK IN SHARE MODE sets a shared lock that permits other transactions to read the examined
+     * rows but not to update or delete them.
+     *
+     * @return the current object
+     */
+    public C lockInShareMode() {
+        return addFlag(Position.END, LOCK_IN_SHARE_MODE);
+    }
+
+    /**
+     * With SQL_NO_CACHE, the server does not use the query cache. It neither checks the query cache
+     * to see whether the result is already cached, nor does it cache the query result.
+     *
+     * @return the current object
+     */
+    public C noCache() {
+        return addFlag(Position.AFTER_SELECT, SQL_NO_CACHE);
+    }
+
+    /**
+     * For SQL_SMALL_RESULT, MySQL uses fast temporary tables to store the resulting table instead
+     * of using sorting. This should not normally be needed.
+     *
+     * @return the current object
+     */
+    public C smallResult() {
+        return addFlag(Position.AFTER_SELECT, SQL_SMALL_RESULT);
+    }
+
+    /**
+     * STRAIGHT_JOIN forces the optimizer to join the tables in the order in which they are listed
+     * in the FROM clause. You can use this to speed up a query if the optimizer joins the tables
+     * in nonoptimal order. STRAIGHT_JOIN also can be used in the table_references list.
+     *
+     * @return the current object
+     */
+    public C straightJoin() {
+        return addFlag(Position.AFTER_SELECT, STRAIGHT_JOIN);
+    }
+
+    /**
+     * You can use FORCE INDEX, which acts like USE INDEX (index_list) but with the addition that a
+     * table scan is assumed to be very expensive. In other words, a table scan is used only if there
+     * is no way to use one of the given indexes to find rows in the table.
+     *
+     * @param indexes index names
+     * @return the current object
+     */
+    public C forceIndex(String... indexes) {
+        return addJoinFlag(" force index (" + String.join(", ", indexes) + ")", JoinFlag.Position.END);
+    }
+
+    /**
+     * The alternative syntax IGNORE INDEX (index_list) can be used to tell MySQL to not use some
+     * particular index or indexes.
+     *
+     * @param indexes index names
+     * @return the current object
+     */
+    public C ignoreIndex(String... indexes) {
+        return addJoinFlag(" ignore index (" + String.join(", ", indexes) + ")", JoinFlag.Position.END);
+    }
+
+    /**
+     * By specifying USE INDEX (index_list), you can tell MySQL to use only one of the named indexes
+     * to find rows in the table.
+     *
+     * @param indexes index names
+     * @return the current object
+     */
+    public C useIndex(String... indexes) {
+        return addJoinFlag(" use index (" + String.join(", ", indexes) + ")", JoinFlag.Position.END);
+    }
+
+    /**
+     * The GROUP BY clause permits a WITH ROLLUP modifier that causes extra rows to be added to the
+     * summary output. These rows represent higher-level (or super-aggregate) summary operations.
+     * ROLLUP thus enables you to answer questions at multiple levels of analysis with a single query.
+     * It can be used, for example, to provide support for OLAP (Online Analytical Processing) operations.
+     *
+     * @return the current object
+     */
+    public C withRollup() {
+        return addFlag(Position.AFTER_GROUP_BY, WITH_ROLLUP);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQuery.java
new file mode 100644
index 0000000000..2d0d1e3c4d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQuery.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mysql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code MySQLQuery} provides MySQL related extensions to SQLQuery.
+ *
+ * If you need to subtype this, use the base class instead.
+ *
+ * @param <T> the result type
+ */
+public class MySQLQuery<T> extends AbstractMySQLQuery<T, MySQLQuery<T>> {
+    public MySQLQuery(Connection conn) {
+        this(conn, new Configuration(MySQLTemplates.DEFAULT), new DefaultQueryMetadata());
+    }
+
+    public MySQLQuery(Connection conn, SQLTemplates templates) {
+        this(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public MySQLQuery(Connection conn, Configuration configuration) {
+        this(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public MySQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public MySQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public MySQLQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+    @Override
+    public MySQLQuery<T> clone(Connection conn) {
+        MySQLQuery<T> q = new MySQLQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> MySQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+
+        @SuppressWarnings("unchecked")
+        MySQLQuery<U> res = (MySQLQuery<U>) this;
+        return res;
+    }
+
+    @Override
+    public MySQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+
+        @SuppressWarnings("unchecked")
+        MySQLQuery<Tuple> res = (MySQLQuery<Tuple>) this;
+        return res;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQueryFactory.java
new file mode 100644
index 0000000000..813e366cf3
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLQueryFactory.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mysql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.*;
+import com.querydsl.sql.dml.SQLInsertClause;
+
+/**
+ * MySQL specific implementation of SQLQueryFactory
+ *
+ * @author tiwe
+ *
+ */
+public class MySQLQueryFactory extends AbstractSQLQueryFactory<MySQLQuery<?>> {
+
+    public MySQLQueryFactory(Configuration configuration, Supplier<Connection> connection) {
+        super(configuration, connection);
+    }
+
+    public MySQLQueryFactory(Supplier<Connection> connection) {
+        this(new Configuration(new MySQLTemplates()), connection);
+    }
+
+    public MySQLQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    /**
+     * Create a INSERT IGNORE INTO clause
+     *
+     * @param entity table to insert to
+     * @return insert clause
+     */
+    public SQLInsertClause insertIgnore(RelationalPath<?> entity) {
+        SQLInsertClause insert = insert(entity);
+        insert.addFlag(Position.START_OVERRIDE, "insert ignore into ");
+        return insert;
+    }
+
+    /**
+     * Create a INSERT ... ON DUPLICATE KEY UPDATE clause
+     *
+     * @param entity table to insert to
+     * @param clause clause
+     * @return insert clause
+     */
+    public SQLInsertClause insertOnDuplicateKeyUpdate(RelationalPath<?> entity, String clause) {
+        SQLInsertClause insert = insert(entity);
+        insert.addFlag(Position.END, " on duplicate key update " + clause);
+        return insert;
+    }
+
+    /**
+     * Create a INSERT ... ON DUPLICATE KEY UPDATE clause
+     *
+     * @param entity table to insert to
+     * @param clause clause
+     * @return insert clause
+     */
+    public SQLInsertClause insertOnDuplicateKeyUpdate(RelationalPath<?> entity, Expression<?> clause) {
+        SQLInsertClause insert = insert(entity);
+        insert.addFlag(Position.END, ExpressionUtils.template(String.class, " on duplicate key update {0}", clause));
+        return insert;
+    }
+
+    /**
+     * Create a INSERT ... ON DUPLICATE KEY UPDATE clause
+     *
+     * @param entity table to insert to
+     * @param clauses clauses
+     * @return insert clause
+     */
+    public SQLInsertClause insertOnDuplicateKeyUpdate(RelationalPath<?> entity, Expression<?>... clauses) {
+        SQLInsertClause insert = insert(entity);
+        StringBuilder flag = new StringBuilder(" on duplicate key update ");
+        for (int i = 0; i < clauses.length; i++) {
+            flag.append(i > 0 ? ", " : "").append("{").append(i).append("}");
+        }
+        insert.addFlag(Position.END, ExpressionUtils.template(String.class, flag.toString(), clauses));
+        return insert;
+    }
+
+    @Override
+    public MySQLQuery<?> query() {
+        return new MySQLQuery<Void>(connection, configuration);
+    }
+
+    public MySQLReplaceClause replace(RelationalPath<?> entity) {
+        return new MySQLReplaceClause(connection.get(), configuration, entity);
+    }
+
+    @Override
+    public <T> MySQLQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public MySQLQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> MySQLQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public MySQLQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public MySQLQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public MySQLQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> MySQLQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLReplaceClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLReplaceClause.java
new file mode 100644
index 0000000000..a255347621
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/MySQLReplaceClause.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mysql;
+
+import java.sql.Connection;
+
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.dml.SQLInsertClause;
+
+/**
+ * {@code MySQLReplaceClause} is a REPLACE INTO clause
+ *
+ * <p>REPLACE works exactly like INSERT, except that if an old row in the table has the same value
+ * as a new row for a PRIMARY KEY or a UNIQUE index, the old row is deleted before the new row is inserted.</p>
+ *
+ * @author tiwe
+ *
+ */
+public class MySQLReplaceClause extends SQLInsertClause {
+
+    protected static final String REPLACE_INTO = "replace into ";
+
+    public MySQLReplaceClause(Connection connection, SQLTemplates templates, RelationalPath<?> entity) {
+        super(connection, templates, entity);
+        addFlag(Position.START_OVERRIDE, REPLACE_INTO);
+    }
+
+    public MySQLReplaceClause(Connection connection, Configuration configuration, RelationalPath<?> entity) {
+        super(connection, configuration, entity);
+        addFlag(Position.START_OVERRIDE, REPLACE_INTO);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/mysql/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/package-info.java
new file mode 100644
index 0000000000..28f547be78
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/mysql/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * MySQL support
+ */
+package com.querydsl.sql.mysql;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChainedNameMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChainedNameMapping.java
new file mode 100644
index 0000000000..a6ae84dfda
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChainedNameMapping.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.namemapping;
+
+import com.querydsl.sql.SchemaAndTable;
+
+import java.util.Optional;
+
+/**
+ * A {@link NameMapping} implementation that accepts zero or more
+ * {@link NameMapping}s and returns the first non-null mapping result.
+ */
+public class ChainedNameMapping implements NameMapping {
+
+    private NameMapping[] nameMappings;
+
+    public ChainedNameMapping(NameMapping... nameMappings) {
+        if (nameMappings == null) {
+            throw new NullPointerException("Name mapping array must not be null");
+        }
+        for (NameMapping nameMapping : nameMappings) {
+            if (nameMapping == null) {
+                throw new NullPointerException("Name mapping array must not contain null element");
+            }
+        }
+        this.nameMappings = nameMappings.clone();
+    }
+
+    @Override
+    public Optional<String> getColumnOverride(SchemaAndTable key, String column) {
+        for (NameMapping nameMapping : nameMappings) {
+            Optional<String> overriddenColumnName = nameMapping.getColumnOverride(key, column);
+            if (overriddenColumnName.isPresent()) {
+                return overriddenColumnName;
+            }
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<SchemaAndTable> getOverride(SchemaAndTable key) {
+        for (NameMapping nameMapping : nameMappings) {
+            Optional<SchemaAndTable> overridden = nameMapping.getOverride(key);
+            if (overridden.isPresent()) {
+                return overridden;
+            }
+        }
+        return Optional.empty();
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java
new file mode 100644
index 0000000000..d190bfd713
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/ChangeLetterCaseNameMapping.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2018, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.namemapping;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.querydsl.sql.SchemaAndTable;
+
+/**
+ * Simple implementation of {@link NameMapping} that changes the letter-case
+ * (lower-case or upper-case) of the schema, table and column names. The
+ * information how the database stores the identifiers are available normally
+ * from the <code>stores*Identifiers</code> function of the
+ * {@link java.sql.DatabaseMetaData}
+ */
+public class ChangeLetterCaseNameMapping implements NameMapping {
+
+    /**
+     * The target character-case (lower or upper) that the
+     * {@link ChangeLetterCaseNameMapping} should use to convert the identifiers
+     * names.
+     */
+    public enum LetterCase {
+        LOWER, UPPER
+    }
+
+    private Locale locale;
+
+    private final LetterCase targetCase;
+
+    /**
+     * Constructor.
+     * @param targetCase The characters of all table and column names will be converted to the specified letter-case.
+     * @param locale The locale that is used for the letter-case conversion.
+     */
+    public ChangeLetterCaseNameMapping(LetterCase targetCase, Locale locale) {
+        this.locale = Objects.requireNonNull(locale);
+        this.targetCase = Objects.requireNonNull(targetCase);
+    }
+
+    @Override
+    public Optional<String> getColumnOverride(SchemaAndTable key, String column) {
+        return Optional.ofNullable(targetCaseOrNull(column));
+    }
+
+    @Override
+    public Optional<SchemaAndTable> getOverride(SchemaAndTable key) {
+        return Optional.of(new SchemaAndTable(targetCaseOrNull(key.getSchema()), targetCaseOrNull(key.getTable())));
+    }
+
+    private String targetCaseOrNull(String text) {
+        if (targetCase == LetterCase.LOWER) {
+            return text.toLowerCase(locale);
+        } else {
+            return text.toUpperCase(locale);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/NameMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/NameMapping.java
new file mode 100644
index 0000000000..51e396717a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/NameMapping.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.namemapping;
+
+import com.querydsl.sql.SchemaAndTable;
+
+import java.util.Optional;
+
+/**
+ * By implementing this interface, it is possible to programmatically override
+ * schema, table and column names.
+ */
+public interface NameMapping {
+
+    Optional<String> getColumnOverride(SchemaAndTable key, String column);
+
+    Optional<SchemaAndTable> getOverride(SchemaAndTable key);
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/PreConfiguredNameMapping.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/PreConfiguredNameMapping.java
new file mode 100644
index 0000000000..eec0ffdd98
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/PreConfiguredNameMapping.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.namemapping;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.querydsl.sql.SchemaAndTable;
+
+/**
+ * {@link NameMapping} implementation that allows specifying exact schema, table and column name mappings.
+ */
+public class PreConfiguredNameMapping implements NameMapping {
+
+    private final Map<SchemaAndTable, SchemaAndTable> schemaTables = new HashMap<>();
+
+    private final Map<String, String> tables = new HashMap<>();
+
+    private final Map<SchemaAndTable, Map<String, String>> schemaTableColumns = new HashMap<>();
+
+    private final Map<String, Map<String, String>> tableColumns = new HashMap<>();
+
+    public Optional<SchemaAndTable> getOverride(SchemaAndTable key) {
+        if (!schemaTables.isEmpty() && key.getSchema() != null) {
+            if (schemaTables.containsKey(key)) {
+                return Optional.ofNullable(schemaTables.get(key));
+            }
+        }
+
+        if (tables.containsKey(key.getTable())) {
+            String table = tables.get(key.getTable());
+            return Optional.of(new SchemaAndTable(key.getSchema(), table));
+        }
+        return Optional.empty();
+    }
+
+    public Optional<String> getColumnOverride(SchemaAndTable key, String column) {
+        Map<String, String> columnOverrides;
+        String newColumn = null;
+        columnOverrides = schemaTableColumns.get(key);
+        if (columnOverrides != null && (newColumn = columnOverrides.get(column)) != null) {
+            return Optional.of(newColumn);
+        }
+        columnOverrides = tableColumns.get(key.getTable());
+        if (columnOverrides != null && (newColumn = columnOverrides.get(column)) != null) {
+            return Optional.of(newColumn);
+        }
+        return Optional.empty();
+    }
+
+    public String registerTableOverride(String oldTable, String newTable) {
+        return tables.put(oldTable, newTable);
+    }
+
+    public SchemaAndTable registerTableOverride(SchemaAndTable from, SchemaAndTable to) {
+        return schemaTables.put(from, to);
+    }
+
+    public String registerColumnOverride(String schema, String table, String oldColumn, String newColumn) {
+        SchemaAndTable key = new SchemaAndTable(schema, table);
+        Map<String, String> columnOverrides = schemaTableColumns.computeIfAbsent(key, k -> new HashMap<String, String>());
+        return columnOverrides.put(oldColumn, newColumn);
+    }
+
+    public String registerColumnOverride(String table, String oldColumn, String newColumn) {
+        Map<String, String> columnOverrides = tableColumns.computeIfAbsent(table, k -> new HashMap<String, String>());
+        return columnOverrides.put(oldColumn, newColumn);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/package-info.java
new file mode 100644
index 0000000000..b9d9fcc57c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/namemapping/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Changing database identifier names in serialized SQL queries.
+ */
+package com.querydsl.sql.namemapping;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/oracle/AbstractOracleQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/AbstractOracleQuery.java
new file mode 100644
index 0000000000..b6ffd99fe2
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/AbstractOracleQuery.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.oracle;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.sql.AbstractSQLQuery;
+import com.querydsl.sql.Configuration;
+
+/**
+ * {@code OracleQuery} provides Oracle specific extensions to the base SQL query type
+ *
+ * @author tiwe
+ * @param <T> result type
+ * @param <C> the concrete subtype
+ */
+public abstract class AbstractOracleQuery<T, C extends AbstractOracleQuery<T, C>> extends AbstractSQLQuery<T, C> {
+
+    protected static final String CONNECT_BY = "\nconnect by ";
+
+    protected static final String CONNECT_BY_NOCYCLE_PRIOR = "\nconnect by nocycle prior ";
+
+    protected static final String CONNECT_BY_PRIOR = "\nconnect by prior ";
+
+    protected static final String ORDER_SIBLINGS_BY = "\norder siblings by ";
+
+    protected static final String START_WITH = "\nstart with ";
+
+    public AbstractOracleQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public AbstractOracleQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    /**
+     * CONNECT BY specifies the relationship between parent rows and child rows of the hierarchy.
+     *
+     * @param cond condition
+     * @return the current object
+     */
+    public C connectByPrior(Predicate cond) {
+        return addFlag(Position.BEFORE_ORDER, CONNECT_BY_PRIOR, cond);
+    }
+
+    /**
+     * CONNECT BY specifies the relationship between parent rows and child rows of the hierarchy.
+     *
+     * @param cond condition
+     * @return the current object
+     */
+    public C connectBy(Predicate cond) {
+        return addFlag(Position.BEFORE_ORDER, CONNECT_BY, cond);
+    }
+
+    /**
+     * CONNECT BY specifies the relationship between parent rows and child rows of the hierarchy.
+     *
+     * @param cond condition
+     * @return the current object
+     */
+    public C connectByNocyclePrior(Predicate cond) {
+        return addFlag(Position.BEFORE_ORDER, CONNECT_BY_NOCYCLE_PRIOR, cond);
+    }
+
+    /**
+     * START WITH specifies the root row(s) of the hierarchy.
+     *
+     * @param cond condition
+     * @return the current object
+     */
+    public <A> C startWith(Predicate cond) {
+        return addFlag(Position.BEFORE_ORDER, START_WITH, cond);
+    }
+
+    /**
+     * ORDER SIBLINGS BY preserves any ordering specified in the hierarchical query clause and then
+     * applies the order_by_clause to the siblings of the hierarchy.
+     *
+     * @param path path
+     * @return the current object
+     */
+    public C orderSiblingsBy(Expression<?> path) {
+        return addFlag(Position.BEFORE_ORDER, ORDER_SIBLINGS_BY, path);
+    }
+
+    // TODO : connect by root
+
+    // TODO : connect by iscycle
+
+    // TODO : connect by isleaf (pseudocolumn)
+
+    // TODO : sys connect path
+}
+
+
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleGrammar.java b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleGrammar.java
new file mode 100644
index 0000000000..3a9e04892f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleGrammar.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.oracle;
+
+import java.util.Date;
+
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+/**
+ * Convenience functions and constants for Oracle DB usage
+ *
+ * @author tiwe
+ */
+public final class OracleGrammar {
+
+    private OracleGrammar() { }
+
+    public static final NumberExpression<Integer> level = Expressions.numberTemplate(Integer.class, "level");
+
+    public static final NumberExpression<Integer> rownum = Expressions.numberTemplate(Integer.class, "rownum");
+
+    public static final NumberExpression<Integer> rowid = Expressions.numberTemplate(Integer.class, "rowid");
+
+    public static final DateExpression<Date> sysdate = Expressions.dateTemplate(Date.class, "sysdate");
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQuery.java
new file mode 100644
index 0000000000..67fcd8e6a2
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQuery.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.oracle;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.OracleTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code OracleQuery} provides Oracle specific extensions to the base SQL query type
+ *
+ * If you need to subtype this, use the base class instead.
+ *
+ * @author tiwe
+ * @param <T> result type
+ */
+public class OracleQuery<T> extends AbstractOracleQuery<T, OracleQuery<T>> {
+    public OracleQuery(Connection conn) {
+        this(conn, OracleTemplates.DEFAULT, new DefaultQueryMetadata());
+    }
+
+    public OracleQuery(Connection conn, SQLTemplates templates) {
+        this(conn, templates, new DefaultQueryMetadata());
+    }
+
+    public OracleQuery(Connection conn, Configuration configuration) {
+        super(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public OracleQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    protected OracleQuery(Connection conn, SQLTemplates templates, QueryMetadata metadata) {
+        super(conn, new Configuration(templates), metadata);
+    }
+
+    public OracleQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public OracleQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+
+    @Override
+    public OracleQuery<T> clone(Connection conn) {
+        OracleQuery<T> q = new OracleQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> OracleQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+                OracleQuery<U> newType = (OracleQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public OracleQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+                OracleQuery<Tuple> newType = (OracleQuery<Tuple>) this;
+        return newType;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQueryFactory.java
new file mode 100644
index 0000000000..71417271da
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/OracleQueryFactory.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.oracle;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.*;
+
+/**
+ * Oracle specific implementation of SQLQueryFactory
+ *
+ * @author tiwe
+ *
+ */
+public class OracleQueryFactory extends AbstractSQLQueryFactory<OracleQuery<?>> {
+
+    public OracleQueryFactory(Configuration configuration, Supplier<Connection> connection) {
+        super(configuration, connection);
+    }
+
+    public OracleQueryFactory(Supplier<Connection> connection) {
+        this(new Configuration(new OracleTemplates()), connection);
+    }
+
+    public OracleQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    @Override
+    public OracleQuery<?> query() {
+        return new OracleQuery<Void>(connection, configuration);
+    }
+
+    @Override
+    public <T> OracleQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public OracleQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> OracleQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public OracleQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public OracleQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public OracleQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> OracleQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/oracle/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/package-info.java
new file mode 100644
index 0000000000..0eeb1e87b0
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/oracle/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * Oracle support
+ */
+package com.querydsl.sql.oracle;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/package-info.java
new file mode 100644
index 0000000000..db299054a4
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SQL/JDBC support
+ */
+package com.querydsl.sql;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/AbstractPostgreSQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/AbstractPostgreSQLQuery.java
new file mode 100644
index 0000000000..145bca917b
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/AbstractPostgreSQLQuery.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.postgresql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.AbstractSQLQuery;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.RelationalPath;
+import com.querydsl.sql.SQLQuery;
+
+/**
+ * {@code PostgreSQLQuery} provides PostgreSQL related extensions to SQLQuery
+ *
+ * @param <T> result type
+ * @param <C> the concrete subtype
+ *
+ * @see SQLQuery
+ * @author tiwe
+ */
+public abstract class AbstractPostgreSQLQuery<T, C extends AbstractPostgreSQLQuery<T, C>> extends AbstractSQLQuery<T, C> {
+    public AbstractPostgreSQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public AbstractPostgreSQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    /**
+     * FOR SHARE causes the rows retrieved by the SELECT statement to be locked as though for update.
+     *
+     * @return the current object
+     */
+    public C forShare() {
+        // global forShare support was added later, delegating to super implementation
+        return super.forShare();
+    }
+
+    /**
+     * With NOWAIT, the statement reports an error, rather than waiting, if a selected row cannot
+     * be locked immediately.
+     *
+     * @return the current object
+     */
+    public C noWait() {
+        QueryFlag noWaitFlag = configuration.getTemplates().getNoWaitFlag();
+        return addFlag(noWaitFlag);
+    }
+
+    /**
+     * FOR UPDATE / FOR SHARE OF tables
+     *
+     * @param paths tables
+     * @return the current object
+     */
+    public C of(RelationalPath<?>... paths) {
+        StringBuilder builder = new StringBuilder(" of ");
+        for (RelationalPath<?> path : paths) {
+            if (builder.length() > 4) {
+                builder.append(", ");
+            }
+            builder.append(getConfiguration().getTemplates().quoteIdentifier(path.getTableName()));
+        }
+        return addFlag(Position.END, builder.toString());
+    }
+
+    /**
+     * adds a DISTINCT ON clause
+     *
+     * @param exprs
+     * @return
+     */
+    public C distinctOn(Expression<?>... exprs) {
+        return addFlag(Position.AFTER_SELECT,
+            Expressions.template(Object.class, "distinct on({0}) ",
+            ExpressionUtils.list(Object.class, exprs)));
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQuery.java
new file mode 100644
index 0000000000..014bfaa0f5
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQuery.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.postgresql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.PostgreSQLTemplates;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * {@code PostgreSQLQuery} provides Postgres related extensions to SQLQuery.
+ *
+ * If you need to subtype this, use the base class instead.
+ *
+ * @param <T> the result type
+ */
+public class PostgreSQLQuery<T> extends AbstractPostgreSQLQuery<T, PostgreSQLQuery<T>> {
+
+    public PostgreSQLQuery(Connection conn) {
+        this(conn, new Configuration(PostgreSQLTemplates.DEFAULT), new DefaultQueryMetadata());
+    }
+
+    public PostgreSQLQuery(Connection conn, SQLTemplates templates) {
+        this(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public PostgreSQLQuery(Connection conn, Configuration configuration) {
+        this(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public PostgreSQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public PostgreSQLQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public PostgreSQLQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration, new DefaultQueryMetadata());
+    }
+
+
+    @Override
+    public PostgreSQLQuery<T> clone(Connection conn) {
+        PostgreSQLQuery<T> q = new PostgreSQLQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> PostgreSQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+                PostgreSQLQuery<U> newType = (PostgreSQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public PostgreSQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+                PostgreSQLQuery<Tuple> newType = (PostgreSQLQuery<Tuple>) this;
+        return newType;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactory.java
new file mode 100644
index 0000000000..cbd9ba3d3e
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactory.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.postgresql;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.*;
+
+/**
+ * PostgreSQL specific implementation of SQLQueryFactory
+ *
+ * @author tiwe
+ *
+ */
+public class PostgreSQLQueryFactory extends AbstractSQLQueryFactory<PostgreSQLQuery<?>> {
+
+    public PostgreSQLQueryFactory(Configuration configuration, Supplier<Connection> connection) {
+        super(configuration, connection);
+    }
+
+    public PostgreSQLQueryFactory(Supplier<Connection> connection) {
+        this(new Configuration(new PostgreSQLTemplates()), connection);
+    }
+
+    public PostgreSQLQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    @Override
+    public PostgreSQLQuery<?> query() {
+        return new PostgreSQLQuery<Void>(connection, configuration);
+    }
+
+    @Override
+    public <T> PostgreSQLQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public PostgreSQLQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> PostgreSQLQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public PostgreSQLQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public PostgreSQLQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public PostgreSQLQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> PostgreSQLQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/package-info.java
new file mode 100644
index 0000000000..64276ea316
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/postgresql/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * PostgreSQL support
+ */
+package com.querydsl.sql.postgresql;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
new file mode 100644
index 0000000000..59ecbdfb35
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/JavaSE7SQLExceptionWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.support;
+
+import java.sql.SQLException;
+
+import com.querydsl.core.QueryException;
+
+/**
+ * A {@link SQLExceptionWrapper} that adds the additional
+ * {@code SQLException}s as suppressed exceptions.
+ *
+ * @author Shredder121
+ */
+class JavaSE7SQLExceptionWrapper extends SQLExceptionWrapper {
+
+    @Override
+    public RuntimeException wrap(SQLException exception) {
+        QueryException rv = new QueryException(exception);
+        SQLException linkedException = exception.getNextException();
+        while (linkedException != null) {
+            rv.addSuppressed(linkedException);
+            linkedException = linkedException.getNextException();
+        }
+        return rv;
+    }
+
+    @Override
+    public RuntimeException wrap(String message, SQLException exception) {
+        QueryException rv = new QueryException(message, exception);
+        SQLException linkedException = exception.getNextException();
+        while (linkedException != null) {
+            rv.addSuppressed(linkedException);
+            linkedException = linkedException.getNextException();
+        }
+        return rv;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
new file mode 100644
index 0000000000..111a31242f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/SQLExceptionWrapper.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.support;
+
+import java.sql.SQLException;
+
+/**
+ * A {@code SQLExceptionWrapper} is used to accommodate for
+ * Java™ 7's suppressed exceptions.
+ *
+ * @author Shredder121
+ */
+public abstract class SQLExceptionWrapper {
+
+    public static final SQLExceptionWrapper INSTANCE = new JavaSE7SQLExceptionWrapper();
+
+    public abstract RuntimeException wrap(SQLException exception);
+
+    public abstract RuntimeException wrap(String message, SQLException exception);
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/support/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/support/package-info.java
new file mode 100644
index 0000000000..a0dfea3e32
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/support/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Support classes
+ */
+package com.querydsl.sql.support;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/teradata/AbstractTeradataQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/AbstractTeradataQuery.java
new file mode 100644
index 0000000000..ad7a4ea0e3
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/AbstractTeradataQuery.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.teradata;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.sql.AbstractSQLQuery;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.TeradataTemplates;
+
+/**
+ * {@code AbstractTeradataQuery} provides Teradata related extensions to SQLQuery
+ *
+ * @param <T> result type
+ * @param <C> the concrete subtype.
+ *
+ * @author tiwe
+ */
+public abstract class AbstractTeradataQuery<T, C extends AbstractTeradataQuery<T, C>> extends AbstractSQLQuery<T, C> {
+    public AbstractTeradataQuery(Connection conn) {
+        this(conn, new Configuration(TeradataTemplates.DEFAULT), new DefaultQueryMetadata());
+    }
+
+    public AbstractTeradataQuery(Connection conn, SQLTemplates templates) {
+        this(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public AbstractTeradataQuery(Connection conn, Configuration configuration) {
+        this(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public AbstractTeradataQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public AbstractTeradataQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public AbstractTeradataQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/teradata/SetQueryBandClause.java b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/SetQueryBandClause.java
new file mode 100644
index 0000000000..c2df9f3376
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/SetQueryBandClause.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.teradata;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.dml.AbstractSQLClause;
+
+/**
+ * {@code SetQueryBandClause} provides support for Teradata specific set query_band executions.
+ *
+ * @author tiwe
+ *
+ */
+public class SetQueryBandClause extends AbstractSQLClause<SetQueryBandClause> {
+
+    private boolean forSession = true;
+
+    private final Map<String, String> values = new LinkedHashMap<>();
+
+    private transient String queryString;
+
+    private transient String parameter;
+
+    public SetQueryBandClause(Connection connection, SQLTemplates templates) {
+        this(connection, new Configuration(templates));
+    }
+
+    public SetQueryBandClause(Connection connection, Configuration configuration) {
+        super(configuration, connection);
+    }
+
+    public SetQueryBandClause(Supplier<Connection> connection, Configuration configuration) {
+        super(configuration, connection);
+    }
+
+    public SetQueryBandClause forSession() {
+        queryString = null;
+        forSession = true;
+        return this;
+    }
+
+    public SetQueryBandClause forTransaction() {
+        queryString = null;
+        forSession = false;
+        return this;
+    }
+
+    public SetQueryBandClause set(String key, String value) {
+        queryString = null;
+        values.put(key, value);
+        return this;
+    }
+
+    public SetQueryBandClause set(Map<String, String> values) {
+        queryString = null;
+        this.values.putAll(values);
+        return this;
+    }
+
+    @Override
+    public void clear() {
+        values.clear();
+    }
+
+    @Override
+    public long execute() {
+        PreparedStatement stmt = null;
+        try {
+            stmt = connection().prepareStatement(toString());
+            if (parameter != null) {
+                stmt.setString(1, parameter);
+            }
+            return 1;
+        } catch (SQLException e) {
+            List<Object> bindings = parameter != null ? Collections.singletonList(parameter) : Collections.emptyList();
+            throw configuration.translate(queryString, bindings, e);
+        } finally {
+            if (stmt != null) {
+                close(stmt);
+            }
+        }
+    }
+
+    @Override
+    public List<SQLBindings> getSQL() {
+        SQLBindings bindings;
+        if (configuration.getUseLiterals() || forSession) {
+            bindings = new SQLBindings(toString(), Collections.emptyList());
+        } else {
+            bindings = new SQLBindings(toString(), Collections.singletonList(parameter));
+        }
+        return Collections.singletonList(bindings);
+    }
+
+    @Override
+    public String toString() {
+        if (queryString == null) {
+            StringBuilder builder = new StringBuilder();
+            for (Map.Entry<String, String> entry : values.entrySet()) {
+                builder.append(entry.getKey()).append("=").append(entry.getValue());
+                builder.append(";");
+            }
+            if (configuration.getUseLiterals() || forSession) {
+                queryString = "set query_band='"
+                        + configuration.getTemplates().escapeLiteral(builder.toString())
+                        + (forSession ? "' for session" : "' for transaction");
+                parameter = null;
+            } else {
+                queryString = "set query_band=? for transaction";
+                parameter = builder.toString();
+            }
+
+        }
+        return queryString;
+    }
+
+    @Override
+    public int getBatchCount() {
+        return 0;
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQuery.java b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQuery.java
new file mode 100644
index 0000000000..e58a219889
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQuery.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.teradata;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLOps;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.TeradataTemplates;
+
+/**
+ * {@code TeradataQuery} provides Teradata related extensions to SQLQuery
+ *
+ * If you need to subtype this, use the base class instead.
+ *
+ * @param <T> result type
+ *
+ * @author tiwe
+ */
+public class TeradataQuery<T> extends AbstractTeradataQuery<T, TeradataQuery<T>> {
+
+    public TeradataQuery(Connection conn) {
+        this(conn, new Configuration(TeradataTemplates.DEFAULT), new DefaultQueryMetadata());
+    }
+
+    public TeradataQuery(Connection conn, SQLTemplates templates) {
+        this(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public TeradataQuery(Connection conn, Configuration configuration) {
+        this(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public TeradataQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public TeradataQuery(Supplier<Connection> connProvider, Configuration configuration, QueryMetadata metadata) {
+        super(connProvider, configuration, metadata);
+    }
+
+    public TeradataQuery(Supplier<Connection> connProvider, Configuration configuration) {
+        super(connProvider, configuration);
+    }
+
+    /**
+     * Adds a qualify expression
+     *
+     * @param predicate qualify expression
+     * @return the current object
+     */
+    public TeradataQuery<T> qualify(Predicate predicate) {
+        predicate = ExpressionUtils.predicate(SQLOps.QUALIFY, predicate);
+        return queryMixin.addFlag(new QueryFlag(QueryFlag.Position.BEFORE_ORDER, predicate));
+    }
+
+    @Override
+    public TeradataQuery<T> clone(Connection conn) {
+        TeradataQuery<T> q = new TeradataQuery<T>(conn, getConfiguration(), getMetadata().clone());
+        q.clone(this);
+        return q;
+    }
+
+    @Override
+    public <U> TeradataQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        TeradataQuery<U> newType = (TeradataQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public TeradataQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        TeradataQuery<Tuple> newType = (TeradataQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQueryFactory.java b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQueryFactory.java
new file mode 100644
index 0000000000..06da58ddf3
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/TeradataQueryFactory.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.teradata;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.*;
+
+/**
+ * Teradata specific implementation of SQLQueryFactory
+ *
+ * @author tiwe
+ *
+ */
+public class TeradataQueryFactory extends AbstractSQLQueryFactory<TeradataQuery<?>> {
+
+    public TeradataQueryFactory(Configuration configuration, Supplier<Connection> connection) {
+        super(configuration, connection);
+    }
+
+    public TeradataQueryFactory(Supplier<Connection> connection) {
+        this(new Configuration(new TeradataTemplates()), connection);
+    }
+
+    public TeradataQueryFactory(SQLTemplates templates, Supplier<Connection> connection) {
+        this(new Configuration(templates), connection);
+    }
+
+    @Override
+    public TeradataQuery<?> query() {
+        return new TeradataQuery<Void>(connection, configuration);
+    }
+
+    @Override
+    public <T> TeradataQuery<T> select(Expression<T> expr) {
+        return query().select(expr);
+    }
+
+    @Override
+    public TeradataQuery<Tuple> select(Expression<?>... exprs) {
+        return query().select(exprs);
+    }
+
+    @Override
+    public <T> TeradataQuery<T> selectDistinct(Expression<T> expr) {
+        return query().select(expr).distinct();
+    }
+
+    @Override
+    public TeradataQuery<Tuple> selectDistinct(Expression<?>... exprs) {
+        return query().select(exprs).distinct();
+    }
+
+    @Override
+    public TeradataQuery<Integer> selectZero() {
+        return select(Expressions.ZERO);
+    }
+
+    @Override
+    public TeradataQuery<Integer> selectOne() {
+        return select(Expressions.ONE);
+    }
+
+    @Override
+    public <T> TeradataQuery<T> selectFrom(RelationalPath<T> expr) {
+        return select(expr).from(expr);
+    }
+
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/teradata/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/package-info.java
new file mode 100644
index 0000000000..3a0b0ca952
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/teradata/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Teradata support
+ */
+package com.querydsl.sql.teradata;
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractDateTimeType.java
new file mode 100644
index 0000000000..381862a8ad
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractDateTimeType.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * Common abstract superclass for Type implementations
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public abstract class AbstractDateTimeType<T>  extends AbstractType<T> {
+
+    private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+
+    static {
+        UTC.setTimeInMillis(0);
+    }
+
+    protected static Calendar utc() {
+        return (Calendar) UTC.clone();
+    }
+
+    protected static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    protected static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    
+    protected static final DateTimeFormatter dateTimeOffsetFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss xxx");
+    
+    protected static final DateTimeFormatter dateTimeZoneFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss VV");
+
+    protected static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+    
+    protected static final DateTimeFormatter timeOffsetFormatter = DateTimeFormatter.ofPattern("HH:mm:ss xxx");
+
+    public AbstractDateTimeType(int type) {
+        super(type);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJSR310DateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJSR310DateTimeType.java
new file mode 100644
index 0000000000..66a9e37809
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJSR310DateTimeType.java
@@ -0,0 +1,16 @@
+package com.querydsl.sql.types;
+
+import java.time.temporal.Temporal;
+
+/**
+ * Common abstract superclass for Type implementations for Java Time API (JSR310)
+ *
+ * @param <T>
+ */
+public abstract class AbstractJSR310DateTimeType<T extends Temporal> extends AbstractDateTimeType<T> {
+
+    public AbstractJSR310DateTimeType(int type) {
+        super(type);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJodaTimeDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJodaTimeDateTimeType.java
new file mode 100644
index 0000000000..636e4c3a9d
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractJodaTimeDateTimeType.java
@@ -0,0 +1,35 @@
+package com.querydsl.sql.types;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+/**
+ * Common abstract superclass for Type implementations for Joda-Time
+ *
+ * @param <T>
+ */
+public abstract class AbstractJodaTimeDateTimeType<T> extends AbstractType<T> {
+
+    private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+
+    static {
+        UTC.setTimeInMillis(0);
+    }
+
+    protected static Calendar utc() {
+        return (Calendar) UTC.clone();
+    }
+
+    protected static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    protected static final DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+
+    protected static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss");
+
+    public AbstractJodaTimeDateTimeType(int type) {
+        super(type);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractType.java
index e248a472df..ff5638f0cf 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/AbstractType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/AbstractType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 /**
  * Common abstract superclass for Type implementations
@@ -33,6 +33,7 @@ public final int[] getSQLTypes() {
         return new int[]{type};
     }
 
+    @Override
     public String getLiteral(T value) {
         return value.toString();
     }
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/ArrayType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/ArrayType.java
new file mode 100644
index 0000000000..a2e723b10f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/ArrayType.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.*;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.util.PrimitiveUtils;
+
+/**
+ *{@code ArrayType} maps Java arrays to JDBC arrays
+ *
+ * @param <T>
+ */
+public class ArrayType<T> extends AbstractType<T> {
+
+    private static void copy(Object source, Object target, int length) {
+        // Note: System.arrayCopy doesn't handle copying from/to primitive arrays properly
+        for (int i = 0; i < length; i++) {
+            Object val = java.lang.reflect.Array.get(source, i);
+            java.lang.reflect.Array.set(target, i, val);
+        }
+    }
+
+    private final Class<T> type;
+
+    private final String typeName;
+
+    private final boolean convertPrimitives;
+
+    public ArrayType(Class<T> type, String typeName) {
+        super(Types.ARRAY);
+        this.type = type;
+        this.typeName = typeName;
+        this.convertPrimitives = type.getComponentType().isPrimitive();
+    }
+
+    @Override
+    public Class<T> getReturnedClass() {
+        return type;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    @Override
+    public T getValue(ResultSet rs, int startIndex) throws SQLException {
+        Array arr = rs.getArray(startIndex);
+        if (arr != null) {
+            /*
+             * The Javadoc for getArray() is annoyingly ambiguous about what it returns.
+             * 
+             * It says that the method can return a primitive array.
+             * 
+             * But it does not say anything about the type of the array when the method
+             * returns an array of objects.
+             * 
+             * In that case, it could return T[] (Postgres appears to do this)
+             * or it could return Object[] (H2 and HSQLDB appear to do this).
+             * 
+             * The JDBC specification does not offer any additional clarity.
+             * 
+             * In any case, what we need to return is T[]. Otherwise the caller will get
+             * ClassCastExceptions at runtime.
+             * 
+             * Note that we cannot cast arr.getArray() to Object[] because, if the returned
+             * array is a primitive array, that would cause ClassCastException.
+             */
+            Object rv = arr.getArray();
+            if (!type.isAssignableFrom(rv.getClass())) {
+                int length = java.lang.reflect.Array.getLength(rv);
+                Object rv2 = java.lang.reflect.Array.newInstance(type.getComponentType(), length);
+                copy(rv, rv2, length);
+                return (T) rv2;
+            } else {
+                return (T) rv;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, T value) throws SQLException {
+        if (convertPrimitives) {
+            // primitives in
+            int length = java.lang.reflect.Array.getLength(value);
+            Object value2 = java.lang.reflect.Array.newInstance(PrimitiveUtils.wrap(type.getComponentType()), length);
+            copy(value, value2, length);
+            value = (T) value2;
+        }
+        Array arr = st.getConnection().createArrayOf(typeName, (Object[]) value);
+        st.setArray(startIndex, arr);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalAsDoubleType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalAsDoubleType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalAsDoubleType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalAsDoubleType.java
index b95abd511a..f25e10a21a 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalAsDoubleType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalAsDoubleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
@@ -20,7 +20,7 @@
 import java.sql.Types;
 
 /**
- * BigDecimalAsDoubleType maps BigDecimal to Double on the JDBC level
+ * {@code BigDecimalAsDoubleType} maps BigDecimal to Double on the JDBC level
  *
  * @author tiwe
  *
@@ -39,7 +39,8 @@ public BigDecimalAsDoubleType(int type) {
 
     @Override
     public BigDecimal getValue(ResultSet rs, int startIndex) throws SQLException {
-        return BigDecimal.valueOf(rs.getDouble(startIndex));
+        double val = rs.getDouble(startIndex);
+        return rs.wasNull() ? null : BigDecimal.valueOf(val);
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalType.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalType.java
index 40b842a7b4..2ee3e1dc38 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigDecimalType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigDecimalType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
@@ -20,7 +20,7 @@
 import java.sql.Types;
 
 /**
- * BigDecimalType maps BigDecimal to BigDecimal on the JDBC level
+ * {@code BigDecimalType} maps BigDecimal to BigDecimal on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerAsLongType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerAsLongType.java
new file mode 100644
index 0000000000..ba51122688
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerAsLongType.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.math.BigInteger;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code BigIntegerType} maps BigInteger to Long on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class BigIntegerAsLongType extends AbstractType<BigInteger> {
+
+    public static final BigIntegerAsLongType DEFAULT = new BigIntegerAsLongType();
+
+    public BigIntegerAsLongType() {
+        super(Types.NUMERIC);
+    }
+
+    public BigIntegerAsLongType(int type) {
+        super(type);
+    }
+
+    @Override
+    public BigInteger getValue(ResultSet rs, int startIndex) throws SQLException {
+        long val = rs.getLong(startIndex);
+        return rs.wasNull() ? null : BigInteger.valueOf(val);
+    }
+
+    @Override
+    public Class<BigInteger> getReturnedClass() {
+        return BigInteger.class;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, BigInteger value)
+            throws SQLException {
+        st.setLong(startIndex, value.longValue());
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigIntegerType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BigIntegerType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerType.java
index 683cf021af..acefe0aa36 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BigIntegerType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BigIntegerType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -21,7 +21,7 @@
 import java.sql.Types;
 
 /**
- * BigIntegerType maps BigInteger to BigDecimal on the JDBC level
+ * {@code BigIntegerType} maps BigInteger to BigDecimal on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BlobType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BlobType.java
similarity index 82%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BlobType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BlobType.java
index dcbaa665c3..4387a4a777 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BlobType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BlobType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
-import java.sql.Blob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
+import java.sql.*;
 
 /**
- * BlobType maps Blob to Blob on the JDBC level
+ * {@code BlobType} maps Blob to Blob on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BooleanType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BooleanType.java
similarity index 77%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BooleanType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BooleanType.java
index 264b6c8573..1f2197c3aa 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BooleanType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BooleanType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * BooleanType maps Boolean to Boolean on the JDBC level
+ * {@code BooleanType} maps Boolean to Boolean on the JDBC level
  *
  * @author tiwe
  *
@@ -36,8 +36,8 @@ public BooleanType(int type) {
 
     @Override
     public Boolean getValue(ResultSet rs, int startIndex) throws SQLException {
-        final boolean value = rs.getBoolean(startIndex);
-        return rs.wasNull() ? null : value;
+        boolean val = rs.getBoolean(startIndex);
+        return rs.wasNull() ? null : val;
     }
 
     @Override
@@ -45,6 +45,11 @@ public Class<Boolean> getReturnedClass() {
         return Boolean.class;
     }
 
+    @Override
+    public String getLiteral(Boolean value) {
+        return value ? "1" : "0";
+    }
+
     @Override
     public void setValue(PreparedStatement st, int startIndex, Boolean value) throws SQLException {
         st.setBoolean(startIndex, value);
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/ByteType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/ByteType.java
new file mode 100644
index 0000000000..560484e192
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/ByteType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code ByteType} maps Byte to Byte on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class ByteType extends AbstractType<Byte> {
+
+    public ByteType() {
+        super(Types.TINYINT);
+    }
+
+    public ByteType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Byte> getReturnedClass() {
+        return Byte.class;
+    }
+
+    @Override
+    public Byte getValue(ResultSet rs, int startIndex) throws SQLException {
+        byte val = rs.getByte(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Byte value) throws SQLException {
+        st.setByte(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BytesType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/BytesType.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/BytesType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/BytesType.java
index 082344c6f5..d76ecae27e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/BytesType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/BytesType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * BytesType maps byte[] to byte[] on the JDBC level
+ * {@code BytesType} maps byte[] to byte[] on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/CalendarType.java
similarity index 81%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/CalendarType.java
index 3dd6289424..ce54ff8cf0 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CalendarType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/CalendarType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,17 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Calendar;
 
 /**
- * CalendarType maps Calendar to Timestamp on the JDBC level
+ * {@code CalendarType} maps Calendar to Timestamp on the JDBC level
  *
  * @author tiwe
  *
@@ -38,7 +36,7 @@ public CalendarType(int type) {
 
     @Override
     public String getLiteral(Calendar value) {
-        return dateTimeFormatter.print(value.getTimeInMillis());
+        return dateTimeFormatter.format(LocalDateTime.ofInstant(value.toInstant(), ZoneOffset.UTC));
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CharacterType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/CharacterType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/CharacterType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/CharacterType.java
index 894d79093a..c717876874 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CharacterType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/CharacterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * CharacterType maps Character to Character on the JDBC level
+ * {@code CharacterType} maps Character to Character on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ClobType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/ClobType.java
similarity index 82%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/ClobType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/ClobType.java
index 6d115f0b94..d2acf5dbad 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ClobType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/ClobType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
-import java.sql.Clob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
+import java.sql.*;
 
 /**
- * ClobType maps Clob to Clob on the JDBC level
+ * {@code ClobType} maps Clob to Clob on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CurrencyType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/CurrencyType.java
similarity index 87%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/CurrencyType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/CurrencyType.java
index 378d7f662c..26757bb085 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/CurrencyType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/CurrencyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,10 +19,10 @@
 import java.sql.Types;
 import java.util.Currency;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * CurrencyType maps Currency to String on the JDBC level
+ * {@code CurrencyType} maps Currency to String on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/DateTimeType.java
similarity index 82%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/DateTimeType.java
index 3b004681e4..c757359a60 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateTimeType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/DateTimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
-
-import org.joda.time.DateTime;
+package com.querydsl.sql.types;
 
 import java.sql.*;
 
+import org.joda.time.DateTime;
+
 /**
- * DateTimeType maps DateTime to Timestamp on the JDBC level
+ * {@code DateTimeType} maps {@linkplain org.joda.time.DateTime}
+ * to {@linkplain java.sql.Timestamp} on the JDBC level
  *
  * @author tiwe
  *
  */
-public class DateTimeType extends AbstractDateTimeType<DateTime> {
+public class DateTimeType extends AbstractJodaTimeDateTimeType<DateTime> {
 
     public DateTimeType() {
         super(Types.TIMESTAMP);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/DateType.java
similarity index 85%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/DateType.java
index e2dd345f7e..50af30aba1 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/DateType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/DateType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.*;
 
 /**
- * DateType maps Date to Date on the JDBC level
+ * {@code DateType} maps Date to Date on the JDBC level
  *
  * @author tiwe
  *
@@ -33,7 +33,7 @@ public DateType(int type) {
 
     @Override
     public String getLiteral(Date value) {
-        return dateFormatter.print(value.getTime());
+        return dateFormatter.format(value.toLocalDate());
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/DoubleType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/DoubleType.java
new file mode 100644
index 0000000000..87ca936dfe
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/DoubleType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code DoubleType} maps Double to Double on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class DoubleType extends AbstractType<Double> {
+
+    public DoubleType() {
+        super(Types.DOUBLE);
+    }
+
+    public DoubleType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Double> getReturnedClass() {
+        return Double.class;
+    }
+
+    @Override
+    public Double getValue(ResultSet rs, int startIndex) throws SQLException {
+        double val = rs.getDouble(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Double value) throws SQLException {
+        st.setDouble(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumAsObjectType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumAsObjectType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumAsObjectType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/EnumAsObjectType.java
index d3a10904c2..8fa6665175 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumAsObjectType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumAsObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * EnumAsObjectType maps Enum types to Object on the JDBC level
+ * {@code EnumAsObjectType} maps Enum types to Object on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByNameType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByNameType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByNameType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByNameType.java
index bf555d5415..4ecefe63d2 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByNameType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByNameType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * EnumByNameType maps Enum types to their String names on the JDBC level
+ * {@code EnumByNameType} maps Enum types to their String names on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByOrdinalType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByOrdinalType.java
similarity index 81%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByOrdinalType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByOrdinalType.java
index e45220ac68..f4f529f078 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/EnumByOrdinalType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/EnumByOrdinalType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * EnumByOrdinalType maps Enum types to their Integer ordinals on the JDBC level
+ * {@code EnumByOrdinalType} maps Enum types to their Integer ordinals on the JDBC level
  *
  * @author tiwe
  *
@@ -45,8 +45,8 @@ public Class<T> getReturnedClass() {
 
     @Override
     public T getValue(ResultSet rs, int startIndex) throws SQLException {
-        Integer ordinal = (Integer)rs.getObject(startIndex);
-        return ordinal != null ? type.getEnumConstants()[ordinal.intValue()] : null;
+        int ordinal = rs.getInt(startIndex);
+        return rs.wasNull() ? null : type.getEnumConstants()[ordinal];
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/FloatType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/FloatType.java
new file mode 100644
index 0000000000..c874f9ce67
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/FloatType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code FloatType} maps Float to Float on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class FloatType extends AbstractType<Float> {
+
+    public FloatType() {
+        super(Types.FLOAT);
+    }
+
+    public FloatType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Float> getReturnedClass() {
+        return Float.class;
+    }
+
+    @Override
+    public Float getValue(ResultSet rs, int startIndex) throws SQLException {
+        float val = rs.getFloat(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Float value) throws SQLException {
+        st.setFloat(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/InputStreamType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/InputStreamType.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/InputStreamType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/InputStreamType.java
index d48e701752..6b6c5801d2 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/InputStreamType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/InputStreamType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.io.InputStream;
 import java.sql.PreparedStatement;
@@ -20,7 +20,7 @@
 import java.sql.Types;
 
 /**
- * InputStreamType maps InputStream to InputStream on the JDBC level
+ * {@code InputStreamType} maps InputStream to InputStream on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/IntegerType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/IntegerType.java
new file mode 100644
index 0000000000..68219e676f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/IntegerType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code IntegerType} maps Integer to Integer on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class IntegerType extends AbstractType<Integer> {
+
+    public IntegerType() {
+        super(Types.INTEGER);
+    }
+
+    public IntegerType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Integer> getReturnedClass() {
+        return Integer.class;
+    }
+
+    @Override
+    public Integer getValue(ResultSet rs, int startIndex) throws SQLException {
+        int val = rs.getInt(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Integer value) throws SQLException {
+        st.setInt(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java
new file mode 100644
index 0000000000..da5b5d3f65
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java
@@ -0,0 +1,42 @@
+package com.querydsl.sql.types;
+
+import java.sql.*;
+import java.time.Instant;
+
+import org.jetbrains.annotations.Nullable;
+
+public class JSR310InstantType extends AbstractJSR310DateTimeType<Instant>  {
+
+    // JDBC 4.2 does not define any support for Instant, unlike most other JSR-310 types
+    // few drivers support it natively, so go through Timestamp to handle it
+    
+    public JSR310InstantType() {
+        super(Types.TIMESTAMP);
+    }
+
+    public JSR310InstantType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(Instant value) {
+        return dateTimeFormatter.format(Timestamp.from(value).toLocalDateTime());
+    }
+
+    @Override
+    public Class<Instant> getReturnedClass() {
+        return Instant.class;
+    }
+
+    @Nullable
+    @Override
+    public Instant getValue(ResultSet rs, int startIndex) throws SQLException {
+        Timestamp timestamp = rs.getTimestamp(startIndex);
+        return timestamp != null ? timestamp.toInstant() : null;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Instant value) throws SQLException {
+        st.setTimestamp(startIndex, Timestamp.from(value));
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java
new file mode 100644
index 0000000000..1eb0b54a80
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java
@@ -0,0 +1,40 @@
+package com.querydsl.sql.types;
+
+import org.jetbrains.annotations.Nullable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.LocalDateTime;
+
+public class JSR310LocalDateTimeType extends AbstractJSR310DateTimeType<LocalDateTime> {
+
+    public JSR310LocalDateTimeType() {
+        super(Types.TIMESTAMP);
+    }
+
+    public JSR310LocalDateTimeType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(LocalDateTime value) {
+        return dateTimeFormatter.format(value);
+    }
+
+    @Override
+    public Class<LocalDateTime> getReturnedClass() {
+        return LocalDateTime.class;
+    }
+
+    @Nullable
+    @Override
+    public LocalDateTime getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, LocalDateTime.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, LocalDateTime value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateType.java
new file mode 100644
index 0000000000..08d3963753
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateType.java
@@ -0,0 +1,38 @@
+package com.querydsl.sql.types;
+
+import java.sql.*;
+import java.time.LocalDate;
+
+import org.jetbrains.annotations.Nullable;
+
+public class JSR310LocalDateType extends AbstractJSR310DateTimeType<LocalDate> {
+
+    public JSR310LocalDateType() {
+        super(Types.DATE);
+    }
+
+    public JSR310LocalDateType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(LocalDate value) {
+        return dateFormatter.format(value);
+    }
+
+    @Override
+    public Class<LocalDate> getReturnedClass() {
+        return LocalDate.class;
+    }
+
+    @Nullable
+    @Override
+    public LocalDate getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, LocalDate.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, LocalDate value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalTimeType.java
new file mode 100644
index 0000000000..b0160cf38c
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalTimeType.java
@@ -0,0 +1,38 @@
+package com.querydsl.sql.types;
+
+import java.sql.*;
+import java.time.LocalTime;
+
+import org.jetbrains.annotations.Nullable;
+
+public class JSR310LocalTimeType extends AbstractJSR310DateTimeType<LocalTime> {
+
+    public JSR310LocalTimeType() {
+        super(Types.TIME);
+    }
+
+    public JSR310LocalTimeType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(LocalTime value) {
+        return timeFormatter.format(value);
+    }
+
+    @Override
+    public Class<LocalTime> getReturnedClass() {
+        return LocalTime.class;
+    }
+
+    @Nullable
+    @Override
+    public LocalTime getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, LocalTime.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, LocalTime value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java
new file mode 100644
index 0000000000..ed800673ca
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java
@@ -0,0 +1,41 @@
+package com.querydsl.sql.types;
+
+import org.jetbrains.annotations.Nullable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.OffsetDateTime;
+
+public class JSR310OffsetDateTimeType extends AbstractJSR310DateTimeType<OffsetDateTime> {
+
+
+    public JSR310OffsetDateTimeType() {
+        super(Types.TIMESTAMP_WITH_TIMEZONE);
+    }
+
+    public JSR310OffsetDateTimeType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(OffsetDateTime value) {
+        return dateTimeOffsetFormatter.format(value);
+    }
+
+    @Override
+    public Class<OffsetDateTime> getReturnedClass() {
+        return OffsetDateTime.class;
+    }
+
+    @Nullable
+    @Override
+    public OffsetDateTime getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, OffsetDateTime.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, OffsetDateTime value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetTimeType.java
new file mode 100644
index 0000000000..b55e88de09
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetTimeType.java
@@ -0,0 +1,38 @@
+package com.querydsl.sql.types;
+
+import java.sql.*;
+import java.time.OffsetTime;
+
+import org.jetbrains.annotations.Nullable;
+
+public class JSR310OffsetTimeType extends AbstractJSR310DateTimeType<OffsetTime> {
+
+    public JSR310OffsetTimeType() {
+        super(Types.TIME_WITH_TIMEZONE);
+    }
+
+    public JSR310OffsetTimeType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(OffsetTime value) {
+        return timeOffsetFormatter.format(value);
+    }
+
+    @Override
+    public Class<OffsetTime> getReturnedClass() {
+        return OffsetTime.class;
+    }
+
+    @Nullable
+    @Override
+    public OffsetTime getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, OffsetTime.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, OffsetTime value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310ZonedDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310ZonedDateTimeType.java
new file mode 100644
index 0000000000..f74a4bf820
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310ZonedDateTimeType.java
@@ -0,0 +1,40 @@
+package com.querydsl.sql.types;
+
+import org.jetbrains.annotations.Nullable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.ZonedDateTime;
+
+public class JSR310ZonedDateTimeType extends AbstractJSR310DateTimeType<ZonedDateTime> {
+
+    public JSR310ZonedDateTimeType() {
+        super(Types.TIMESTAMP_WITH_TIMEZONE);
+    }
+
+    public JSR310ZonedDateTimeType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getLiteral(ZonedDateTime value) {
+        return dateTimeZoneFormatter.format(value);
+    }
+
+    @Override
+    public Class<ZonedDateTime> getReturnedClass() {
+        return ZonedDateTime.class;
+    }
+
+    @Nullable
+    @Override
+    public ZonedDateTime getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getObject(startIndex, ZonedDateTime.class);
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, ZonedDateTime value) throws SQLException {
+        st.setObject(startIndex, value);
+    }
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateTimeType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateTimeType.java
index 89827c4788..fe6be87a39 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateTimeType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateTimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,21 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
+
+import java.sql.*;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 
-import java.sql.*;
-
 /**
- * LocalDateTimeType maps LocalDateTime to Timestamp on the JDBC level
+ * {@code LocalDateTimeType} maps {@linkplain org.joda.time.LocalDateTime}
+ * to {@linkplain java.sql.Timestamp} on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalDateTimeType extends AbstractDateTimeType<LocalDateTime> {
+public class LocalDateTimeType extends AbstractJodaTimeDateTimeType<LocalDateTime> {
 
     public LocalDateTimeType() {
         super(Types.TIMESTAMP);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateType.java
index ff2a6e87d2..f26d308b16 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalDateType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalDateType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
+
+import java.sql.*;
 
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
-import java.sql.*;
-
 /**
- * LocalDateType maps LocalDate to Date on the JDBC level
+ * {@code LocalDateType} maps {@linkplain org.joda.time.LocalDate}
+ * to {@linkplain java.sql.Date} on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalDateType extends AbstractDateTimeType<LocalDate> {
+public class LocalDateType extends AbstractJodaTimeDateTimeType<LocalDate> {
 
     public LocalDateType() {
         super(Types.DATE);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalTimeType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/LocalTimeType.java
index ec7ea96cec..47a1d1205e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocalTimeType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocalTimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
+
+import java.sql.*;
 
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalTime;
 
-import java.sql.*;
-
 /**
- * LocalTimeType maps LocalTime to Time on the JDBC level
+ * {@code LocalTimeType} maps {@linkplain org.joda.time.LocalTime}
+ * to {@linkplain java.sql.Time} on the JDBC level
  *
  * @author tiwe
  *
  */
-public class LocalTimeType extends AbstractDateTimeType<LocalTime> {
+public class LocalTimeType extends AbstractJodaTimeDateTimeType<LocalTime> {
 
     public LocalTimeType() {
         super(Types.TIME);
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocaleType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocaleType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/LocaleType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/LocaleType.java
index 3b946df861..7dff25cf74 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LocaleType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LocaleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -20,10 +20,10 @@
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * LocaleType maps Locale to String on the JDBC level
+ * {@code LocaleType} maps Locale to String on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/LongType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LongType.java
new file mode 100644
index 0000000000..292655b5ae
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LongType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code LongType} maps Long to Long on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class LongType extends AbstractType<Long> {
+
+    public LongType() {
+        super(Types.BIGINT);
+    }
+
+    public LongType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Long> getReturnedClass() {
+        return Long.class;
+    }
+
+    @Override
+    public Long getValue(ResultSet rs, int startIndex) throws SQLException {
+        long val = rs.getLong(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Long value) throws SQLException {
+        st.setLong(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LongVarBinaryBytesType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/LongVarBinaryBytesType.java
similarity index 80%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/LongVarBinaryBytesType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/LongVarBinaryBytesType.java
index 4b04409a25..c7f44057c6 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/LongVarBinaryBytesType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/LongVarBinaryBytesType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,11 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.Types;
 
 /**
+ * {@code LongVarBinaryBytesType} uses {@code LONGVARBINARY} as the JDBC type
+ *
  * @author tiwe
  *
  */
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/Null.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/Null.java
new file mode 100644
index 0000000000..a295bc2d49
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/Null.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import com.querydsl.core.types.Constant;
+import com.querydsl.core.types.ConstantImpl;
+
+/**
+ * {@code Null} is a singleton value replacement for null
+ *
+ * @author tiwe
+ *
+ */
+public final class Null {
+
+    public static final Null DEFAULT = new Null();
+
+    public static final Constant<Null> CONSTANT = ConstantImpl.create(DEFAULT);
+
+    private Null() { }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/NumericBooleanType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/NumericBooleanType.java
new file mode 100644
index 0000000000..0f71859fc6
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/NumericBooleanType.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * {@code NumericBooleanType} maps Boolean to 1/0 (Integer) on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class NumericBooleanType extends AbstractType<Boolean> {
+
+    public static final NumericBooleanType DEFAULT = new NumericBooleanType();
+
+    public NumericBooleanType() {
+        super(Types.INTEGER);
+    }
+
+    public NumericBooleanType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Boolean> getReturnedClass() {
+        return Boolean.class;
+    }
+
+    @Override
+    public String getLiteral(Boolean value) {
+        return value ? "1" : "0";
+    }
+
+    @Override
+    @Nullable
+    public Boolean getValue(ResultSet rs, int startIndex) throws SQLException {
+        Number num = (Number) rs.getObject(startIndex);
+        return num != null ? num.intValue() == 1 : null;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Boolean value) throws SQLException {
+        st.setInt(startIndex, value ? 1 : 0);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ObjectType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/ObjectType.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/ObjectType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/ObjectType.java
index 66b6f80751..7bfb05bdfa 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/ObjectType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/ObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * ObjectType maps Object to Object on the JDBC level
+ * {@code ObjectType} maps Object to Object on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/SQLXMLType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/SQLXMLType.java
new file mode 100644
index 0000000000..b29855d4fe
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/SQLXMLType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.*;
+
+/**
+ * {@code SQLXMLType} maps SQLXML to SQLXML on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class SQLXMLType extends AbstractType<SQLXML> {
+
+    public SQLXMLType() {
+        super(Types.SQLXML);
+    }
+
+    public SQLXMLType(int type) {
+        super(type);
+    }
+
+    @Override
+    public SQLXML getValue(ResultSet rs, int startIndex) throws SQLException {
+        return rs.getSQLXML(startIndex);
+    }
+
+    @Override
+    public Class<SQLXML> getReturnedClass() {
+        return SQLXML.class;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, SQLXML value)
+            throws SQLException {
+        st.setSQLXML(startIndex, value);
+
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/ShortType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/ShortType.java
new file mode 100644
index 0000000000..50a19ad6f9
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/ShortType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * {@code ShortType} maps Short to Short on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class ShortType extends AbstractType<Short> {
+
+    public ShortType() {
+        super(Types.SMALLINT);
+    }
+
+    public ShortType(int type) {
+        super(type);
+    }
+
+    @Override
+    public Class<Short> getReturnedClass() {
+        return Short.class;
+    }
+
+    @Override
+    public Short getValue(ResultSet rs, int startIndex) throws SQLException {
+        short val = rs.getShort(startIndex);
+        return rs.wasNull() ? null : val;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, Short value) throws SQLException {
+        st.setShort(startIndex, value);
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/StringAsObjectType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/StringAsObjectType.java
similarity index 82%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/StringAsObjectType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/StringAsObjectType.java
index 926db4a0f0..3be14cb0fc 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/StringAsObjectType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/StringAsObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
-import java.sql.Clob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
+import java.sql.*;
 
 /**
- * StringAsObjectType maps String to String on the JDBC level
+ * {@code StringAsObjectType} maps String to String on the JDBC level
  *
  * @author tiwe
  *
@@ -41,9 +37,9 @@ public StringAsObjectType(int type) {
     public String getValue(ResultSet rs, int startIndex) throws SQLException {
         Object o = rs.getObject(startIndex);
         if (o instanceof String) {
-            return (String)o;
+            return (String) o;
         } else if (o instanceof Clob) {
-            Clob clob = (Clob)o;
+            Clob clob = (Clob) o;
             return clob.getSubString(1, (int) clob.length());
         } else if (o != null) {
             return o.toString();
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/StringType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/StringType.java
similarity index 88%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/StringType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/StringType.java
index d966b8c991..077960737b 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/StringType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/StringType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,7 +19,7 @@
 import java.sql.Types;
 
 /**
- * StringType maps String to String on the JDBC level
+ * {@code StringType} maps String to String on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/TimeType.java
similarity index 85%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/TimeType.java
index cee289505e..7e9c00705f 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimeType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/TimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.*;
 
 /**
- * TimeType maps Time to Time on the JDBC level
+ * {@code TimeType} maps Time to Time on the JDBC level
  *
  * @author tiwe
  *
@@ -33,7 +33,7 @@ public TimeType(int type) {
 
     @Override
     public String getLiteral(Time value) {
-        return timeFormatter.print(value.getTime());
+        return timeFormatter.format(value.toLocalTime());
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/TimestampType.java
similarity index 84%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/TimestampType.java
index a03603ea05..e808f0b76f 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TimestampType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/TimestampType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.*;
 
 /**
- * TimestampType maps Timestamp to Timestamp on the JDBC level
+ * {@code TimestampType} maps Timestamp to Timestamp on the JDBC level
  *
  * @author tiwe
  *
@@ -33,7 +33,7 @@ public TimestampType(int type) {
 
     @Override
     public String getLiteral(Timestamp value) {
-        return dateTimeFormatter.print(value.getTime());
+        return dateTimeFormatter.format(value.toLocalDateTime());
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TrueFalseType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/TrueFalseType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/TrueFalseType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/TrueFalseType.java
index d70e66e200..58961a2a14 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/TrueFalseType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/TrueFalseType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * TrueFalseType maps Boolean to 'T'/'F' on the JDBC level
+ * {@code TrueFalseType} maps Boolean to 'T'/'F' on the JDBC level
  *
  * @author tiwe
  *
@@ -50,7 +50,7 @@ public Boolean getValue(ResultSet rs, int startIndex) throws SQLException {
 
     @Override
     public void setValue(PreparedStatement st, int startIndex, Boolean value) throws SQLException {
-        st.setString(startIndex, value.booleanValue() ? "T" : "F");
+        st.setString(startIndex, value ? "T" : "F");
 
     }
 
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/Type.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/Type.java
new file mode 100644
index 0000000000..d88f60f299
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/Type.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Defines the de/serialization of a typed Java object from a ResultSet or to a PreparedStatement
+ *
+ * <p>getValue(ResultSet, int) is used for extraction and setValue(PreparedStatement, int, T) is
+ * used for population</p>
+ *
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public interface Type<T> {
+
+    /**
+     * Get the SQL supported SQL types
+     *
+     * @return sql types
+     */
+    int[] getSQLTypes();
+
+    /**
+     * Get the returned type
+     *
+     * @return returned class
+     */
+    Class<T> getReturnedClass();
+
+    /**
+     * Get the literal representation
+     *
+     * @param value value
+     * @return literal representation
+     */
+    String getLiteral(T value);
+
+    /**
+     * Get the object from the result set
+     *
+     * @param rs result set
+     * @param startIndex column index in result set
+     * @return value
+     * @throws SQLException
+     */
+    @Nullable
+    T getValue(ResultSet rs, int startIndex) throws SQLException;
+
+    /**
+     * Set the object to the statement
+     *
+     * @param st statement
+     * @param startIndex column index in statement
+     * @param value value to be set
+     * @throws SQLException
+     */
+    void setValue(PreparedStatement st, int startIndex, T value) throws SQLException;
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/URLType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/URLType.java
similarity index 89%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/URLType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/URLType.java
index 832bf68465..e8caa90ad2 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/URLType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/URLType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.net.URL;
 import java.sql.PreparedStatement;
@@ -20,7 +20,7 @@
 import java.sql.Types;
 
 /**
- * URLType maps URL to URL on the JDBC level
+ * {@code URLType} maps URL to URL on the JDBC level
  *
  * @author tiwe
  *
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/UtilDateType.java
similarity index 84%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/UtilDateType.java
index c91a56108e..5fa286742e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/UtilDateType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/UtilDateType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -20,7 +20,7 @@
 import java.util.Date;
 
 /**
- * UtilDateType maps Date to Timestamp on the JDBC level
+ * {@code UtilDateType} maps Date to Timestamp on the JDBC level
  *
  * @author tiwe
  *
@@ -37,7 +37,7 @@ public UtilDateType(int type) {
 
     @Override
     public String getLiteral(Date value) {
-        return dateTimeFormatter.print(value.getTime());
+        return dateTimeFormatter.format(new java.sql.Timestamp(value.getTime()).toLocalDateTime());
     }
 
     @Override
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/UtilUUIDType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/UtilUUIDType.java
new file mode 100644
index 0000000000..3a2a7d3e68
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/UtilUUIDType.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.UUID;
+
+/**
+ * {@code UtilUUIDType} maps UUID to String on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class UtilUUIDType extends AbstractType<UUID> {
+
+    private final boolean asString;
+
+    public UtilUUIDType() {
+        this(Types.OTHER, true);
+    }
+
+    public UtilUUIDType(boolean asString) {
+        this(Types.OTHER, asString);
+    }
+
+    public UtilUUIDType(int type) {
+        this(type, true);
+    }
+
+    public UtilUUIDType(int type, boolean asString) {
+        super(type);
+        this.asString = asString;
+    }
+
+    @Override
+    public UUID getValue(ResultSet rs, int startIndex) throws SQLException {
+        if (asString) {
+            String str = rs.getString(startIndex);
+            return str != null ? UUID.fromString(str) : null;
+        } else {
+            return (UUID) rs.getObject(startIndex);
+        }
+    }
+
+    @Override
+    public Class<UUID> getReturnedClass() {
+        return UUID.class;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, UUID value) throws SQLException {
+        if (asString) {
+            st.setString(startIndex, value.toString());
+        } else {
+            st.setObject(startIndex, value);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/XMLAsStringType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/XMLAsStringType.java
new file mode 100644
index 0000000000..1dcaee019a
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/XMLAsStringType.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import java.sql.*;
+
+/**
+ * {@code XMLAsStringType} maps String to SQLXML on the JDBC level
+ *
+ * @author tiwe
+ *
+ */
+public class XMLAsStringType extends AbstractType<String> {
+
+    public XMLAsStringType() {
+        super(Types.SQLXML);
+    }
+
+    public XMLAsStringType(int type) {
+        super(type);
+    }
+
+    @Override
+    public String getValue(ResultSet rs, int startIndex) throws SQLException {
+        SQLXML value = rs.getSQLXML(startIndex);
+        return value != null ? value.getString() : null;
+    }
+
+    @Override
+    public Class<String> getReturnedClass() {
+        return String.class;
+    }
+
+    @Override
+    public void setValue(PreparedStatement st, int startIndex, String value)
+            throws SQLException {
+        SQLXML xml = st.getConnection().createSQLXML();
+        xml.setString(value);
+        st.setSQLXML(startIndex, xml);
+
+    }
+
+}
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/types/YesNoType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/YesNoType.java
similarity index 83%
rename from querydsl-sql/src/main/java/com/mysema/query/sql/types/YesNoType.java
rename to querydsl-sql/src/main/java/com/querydsl/sql/types/YesNoType.java
index c0c1c52f70..023fb76ea8 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/types/YesNoType.java
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/YesNoType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,17 +11,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * YesNoType maps Boolean to 'Y'/'N' on the JDBC level
+ * {@code YesNoType} maps Boolean to 'Y'/'N' on the JDBC level
  *
  * @author tiwe
  *
@@ -50,7 +50,7 @@ public Boolean getValue(ResultSet rs, int startIndex) throws SQLException {
 
     @Override
     public void setValue(PreparedStatement st, int startIndex, Boolean value) throws SQLException {
-        st.setString(startIndex, value.booleanValue() ? "Y" : "N");
+        st.setString(startIndex, value ? "Y" : "N");
 
     }
 
diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/package-info.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/package-info.java
new file mode 100644
index 0000000000..9179d7c39f
--- /dev/null
+++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * Types for de/serialization to ResultSet and PreparedStatement
+ */
+package com.querydsl.sql.types;
diff --git a/querydsl-sql/src/main/resources/keywords/cubrid b/querydsl-sql/src/main/resources/keywords/cubrid
new file mode 100644
index 0000000000..0342d73c3e
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/cubrid
@@ -0,0 +1,371 @@
+# source http://www.cubrid.org/manual/830/en/CUBRID%20Keywords
+ABSOLUTE
+ACTION
+ADD
+ADD_MONTHS
+AFTER
+ALIAS
+ALL
+ALLOCATE
+ALTER
+AND
+ANY
+ARE
+AS
+ASC
+ASSERTION
+ASYNC
+AT
+ATTACH
+ATTRIBUTE
+AVG
+BEFORE
+BETWEEN
+BIGINT
+BIT
+BIT_LENGTH
+BOTH
+BREADTH
+BY
+CALL
+CASCADE
+CASCADED
+CASE
+CAST
+CATALOG
+CHANGE
+CHAR
+CHARACTER
+CHECK
+CLASS
+CLASSES
+CLOSE
+CLUSTER
+COALESCE
+COLLATE
+COLLATION
+COLUMN
+COMMIT
+COMPLETION
+CONNECT
+CONNECTION
+CONNECT_BY_ISCYCLE
+CONNECT_BY_ISLEAF
+CONNECT_BY_ROOT
+CONSTRAINT
+CONSTRAINTS
+CONTINUE
+CONVERT
+CORRESPONDING
+COUNT
+CREATE
+CROSS
+CURRENT
+CURRENT_DATE
+CURRENT_DATETIME
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+CYCLE
+DATA
+DATABASE
+DATA_TYPE
+DATE
+DATETIME
+DAY
+DAY_HOUR
+DAY_MILLISECOND
+DAY_MINUTE
+DAY_SECOND
+DEALLOCATE
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DEFERRABLE
+DEFERRED
+DELETE
+DEPTH
+DESC
+DESCRIBE
+DESCRIPTOR
+DIAGNOSTICS
+DICTIONARY
+DIFFERENCE
+DISCONNECT
+DISTINCT
+DISTINCTROW
+DIV
+DO
+DOMAIN
+DOUBLE
+DROP
+DUPLICATE
+EACH
+ELSE
+ELSEIF
+END
+EQUALS
+ESCAPE
+EVALUATE
+EXCEPT
+EXCEPTION
+EXCLUDE
+EXEC
+EXECUTE
+EXISTS
+EXTERNAL
+EXTRACT
+FALSE
+FETCH
+FILE
+FIRST
+FLOAT
+FOR
+FOREIGN
+FOUND
+FROM
+FULL
+FUNCTION
+GENERAL
+GET
+GLOBAL
+GO
+GOTO
+GRANT
+GROUP
+HAVING
+HOUR
+HOUR_MILLISECOND
+HOUR_MINUTE
+HOUR_SECOND
+IDENTITY
+IF
+IGNORE
+IMMEDIATE
+IN
+INDEX
+INDICATOR
+INHERIT
+INITIALLY
+INNER
+INOUT
+INPUT
+INSERT
+INT
+INTEGER
+INTERSECT
+INTERSECTION
+INTERVAL
+INTO
+IS
+ISOLATION
+JOIN
+KEY
+LANGUAGE
+LAST
+LDB
+LEADING
+LEAVE
+LEFT
+LESS
+LEVEL
+LIKE
+LIMIT
+LIST
+LOCAL
+LOCALTIME
+LOCALTIMESTAMP
+LOCAL_TRANSACTION_ID
+LOOP
+LOWER
+MATCH
+MAX
+METHOD
+MILLISECOND
+MIN
+MINUTE
+MINUTE_MILLISECOND
+MINUTE_SECOND
+MOD
+MODIFY
+MODULE
+MONETARY
+MONTH
+MULTISET
+MULTISET_OF
+NA
+NAMES
+NATIONAL
+NATURAL
+NCHAR
+NEXT
+NO
+NONE
+NOT
+NULL
+NULLIF
+NUMERIC
+OBJECT
+OCTET_LENGTH
+OF
+OFF
+OID
+ON
+ONLY
+OPEN
+OPERATION
+OPERATORS
+OPTIMIZATION
+OPTION
+OR
+ORDER
+OTHERS
+OUT
+OUTER
+OUTPUT
+OVERLAPS
+PARAMETERS
+PARTIAL
+PENDANT
+POSITION
+PRECISION
+PREORDER
+PREPARE
+PRESERVE
+PRIMARY
+PRIOR
+PRIVATE
+PRIVILEGES
+PROCEDURE
+PROTECTED
+PROXY
+QUERY
+READ
+REAL
+RECURSIVE
+REF
+REFERENCES
+REFERENCING
+REGISTER
+RELATIVE
+RENAME
+REPLACE
+RESIGNAL
+RESTRICT
+RETURN
+RETURNS
+REVOKE
+RIGHT
+ROLE
+ROLLBACK
+ROLLUP
+ROUTINE
+ROW
+ROWNUM
+ROWS
+SAVEPOINT
+SCHEMA
+SCOPE
+SCROLL
+SEARCH
+SECOND
+SECOND_MILLISECOND
+SECTION
+SELECT
+SENSITIVE
+SEQUENCE
+SEQUENCE_OF
+SERIALIZABLE
+SESSION
+SESSION_USER
+SET
+SETEQ
+SET_OF
+SHARED
+SIBLINGS
+SIGNAL
+SIMILAR
+SIZE
+SMALLINT
+SOME
+SQL
+SQLCODE
+SQLERROR
+SQLEXCEPTION
+SQLSTATE
+SQLWARNING
+STATISTICS
+STRING
+STRUCTURE
+SUBCLASS
+SUBSET
+SUBSETEQ
+SUBSTRING
+SUM
+SUPERCLASS
+SUPERSET
+SUPERSETEQ
+SYSDATE
+SYSDATETIME
+SYSTEM_USER
+SYSTIME
+SYS_CONNECT_BY_PATH
+SYS_DATE
+SYS_DATETIME
+SYS_TIME
+SYS_TIMESTAMP
+SYS_USER
+TABLE
+TEMPORARY
+TEST
+THEN
+THERE
+TIME
+TIMESTAMP
+TIMEZONE_HOUR
+TIMEZONE_MINUTE
+TO
+TRAILING
+TRANSACTION
+TRANSLATE
+TRANSLATION
+TRIGGER
+TRIM
+TRUE
+TRUNCATE
+TYPE
+UNDER
+UNION
+UNIQUE
+UNKNOWN
+UPDATE
+UPPER
+USAGE
+USE
+USER
+USING
+UTIME
+VALUE
+VALUES
+VARCHAR
+VARIABLE
+VARYING
+VCLASS
+VIEW
+VIRTUAL
+VISIBLE
+WAIT
+WHEN
+WHENEVER
+WHERE
+WHILE
+WITH
+WITHOUT
+WORK
+WRITE
+XOR
+YEAR
+YEAR_MONTH
+ZONE
diff --git a/querydsl-sql/src/main/resources/keywords/db2 b/querydsl-sql/src/main/resources/keywords/db2
new file mode 100644
index 0000000000..d496f46dc4
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/db2
@@ -0,0 +1,518 @@
+# source http://www-01.ibm.com/support/knowledgecenter/SSEPGG_10.1.0/com.ibm.db2.luw.sql.ref.doc/doc/r0001095.html
+ABS
+ACTIVATE
+ADD
+AFTER
+ALIAS
+ALL
+ALLOCATE
+ALLOW
+ALTER
+AND
+ANY
+ARE
+ARRAY
+AS
+ASENSITIVE
+ASSOCIATE
+ASUTIME
+ASYMMETRIC
+AT
+ATOMIC
+ATTRIBUTES
+AUDIT
+AUTHORIZATION
+AUX
+AUXILIARY
+AVG
+BEFORE
+BEGIN
+BETWEEN
+BIGINT
+BINARY
+BLOB
+BOOLEAN
+BOTH
+BUFFERPOOL
+BY
+CACHE
+CALL
+CALLED
+CAPTURE
+CARDINALITY
+CASCADED
+CASE
+CAST
+CCSID
+CEIL
+CEILING
+CHAR
+CHARACTER
+CHARACTER_LENGTH
+CHAR_LENGTH
+CHECK
+CLOB
+CLONE
+CLOSE
+CLUSTER
+COALESCE
+COLLATE
+COLLECT
+COLLECTION
+COLLID
+COLUMN
+COMMENT
+COMMIT
+CONCAT
+CONDITION
+CONNECT
+CONNECTION
+CONSTRAINT
+CONTAINS
+CONTINUE
+CONVERT
+CORR
+CORRESPONDING
+COUNT
+COUNT_BIG
+COVAR_POP
+COVAR_SAMP
+CREATE
+CROSS
+CUBE
+CUME_DIST
+CURRENT
+CURRENT_DATE
+CURRENT_DEFAULT_TRANSFORM_GROUP
+CURRENT_LC_CTYPE
+CURRENT_PATH
+CURRENT_ROLE
+CURRENT_SCHEMA
+CURRENT_SERVER
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_TIMEZONE
+CURRENT_TRANSFORM_GROUP_FOR_TYPE
+CURRENT_USER
+CURSOR
+CYCLE
+DATA
+DATABASE
+DATAPARTITIONNAME
+DATAPARTITIONNUM
+DATE
+DAY
+DAYS
+DB2GENERAL
+DB2GENRL
+DB2SQL
+DBINFO
+DBPARTITIONNAME
+DBPARTITIONNUM
+DEALLOCATE
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DEFAULTS
+DEFINITION
+DELETE
+DENSERANK
+DENSE_RANK
+DEREF
+DESCRIBE
+DESCRIPTOR
+DETERMINISTIC
+DIAGNOSTICS
+DISABLE
+DISALLOW
+DISCONNECT
+DISTINCT
+DO
+DOCUMENT
+DOUBLE
+DROP
+DSSIZE
+DYNAMIC
+EACH
+EDITPROC
+ELEMENT
+ELSE
+ELSEIF
+ENABLE
+ENCODING
+ENCRYPTION
+END
+END-EXEC
+ENDING
+ERASE
+ESCAPE
+EVERY
+EXCEPT
+EXCEPTION
+EXCLUDING
+EXCLUSIVE
+EXEC
+EXECUTE
+EXISTS
+EXIT
+EXP
+EXPLAIN
+EXTENDED
+EXTERNAL
+EXTRACT
+FALSE
+FENCED
+FETCH
+FIELDPROC
+FILE
+FILTER
+FINAL
+FLOAT
+FLOOR
+FOR
+FOREIGN
+FREE
+FROM
+FULL
+FUNCTION
+FUSION
+GENERAL
+GENERATED
+GET
+GLOBAL
+GO
+GOTO
+GRANT
+GRAPHIC
+GROUP
+GROUPING
+HANDLER
+HASH
+HASHED_VALUE
+HAVING
+HINT
+HOLD
+HOUR
+HOURS
+IDENTITY
+IF
+IMMEDIATE
+IN
+INCLUDING
+INCLUSIVE
+INCREMENT
+INDEX
+INDICATOR
+INDICATORS
+INF
+INFINITY
+INHERIT
+INNER
+INOUT
+INSENSITIVE
+INSERT
+INT
+INTEGER
+INTEGRITY
+INTERSECT
+INTERSECTION
+INTERVAL
+INTO
+IS
+ISOBID
+ISOLATION
+ITERATE
+JAR
+JAVA
+JOIN
+KEEP
+KEY
+LABEL
+LANGUAGE
+LARGE
+LATERAL
+LC_CTYPE
+LEADING
+LEAVE
+LEFT
+LIKE
+LIMIT
+LINKTYPE
+LN
+LOCAL
+LOCALDATE
+LOCALE
+LOCALTIME
+LOCALTIMESTAMP
+LOCATOR
+LOCATORS
+LOCK
+LOCKMAX
+LOCKSIZE
+LONG
+LOOP
+LOWER
+MAINTAINED
+MATCH
+MATERIALIZED
+MAX
+MAXVALUE
+MEMBER
+MERGE
+METHOD
+MICROSECOND
+MICROSECONDS
+MIN
+MINUTE
+MINUTES
+MINVALUE
+MOD
+MODE
+MODIFIES
+MODULE
+MONTH
+MONTHS
+MULTISET
+NAN
+NATIONAL
+NATURAL
+NCHAR
+NCLOB
+NEW
+NEW_TABLE
+NEXTVAL
+NO
+NOCACHE
+NOCYCLE
+NODENAME
+NODENUMBER
+NOMAXVALUE
+NOMINVALUE
+NONE
+NOORDER
+NORMALIZE
+NORMALIZED
+NOT
+NULL
+NULLIF
+NULLS
+NUMERIC
+NUMPARTS
+OBID
+OCTET_LENGTH
+OF
+OFFSET
+OLD
+OLD_TABLE
+ON
+ONLY
+OPEN
+OPTIMIZATION
+OPTIMIZE
+OPTION
+OR
+ORDER
+OUT
+OUTER
+OVER
+OVERLAPS
+OVERLAY
+OVERRIDING
+PACKAGE
+PADDED
+PAGESIZE
+PARAMETER
+PART
+PARTITION
+PARTITIONED
+PARTITIONING
+PARTITIONS
+PASSWORD
+PATH
+PERCENTILE_CONT
+PERCENTILE_DISC
+PERCENT_RANK
+PIECESIZE
+PLAN
+POSITION
+POWER
+PRECISION
+PREPARE
+PREVVAL
+PRIMARY
+PRIQTY
+PRIVILEGES
+PROCEDURE
+PROGRAM
+PSID
+PUBLIC
+QUERY
+QUERYNO
+RANGE
+RANK
+READ
+READS
+REAL
+RECOVERY
+RECURSIVE
+REF
+REFERENCES
+REFERENCING
+REFRESH
+REGR_AVGX
+REGR_AVGY
+REGR_COUNT
+REGR_INTERCEPT
+REGR_R2
+REGR_SLOPE
+REGR_SXX
+REGR_SXY
+REGR_SYY
+RELEASE
+RENAME
+REPEAT
+RESET
+RESIGNAL
+RESTART
+RESTRICT
+RESULT
+RESULT_SET_LOCATOR
+RETURN
+RETURNS
+REVOKE
+RIGHT
+ROLE
+ROLLBACK
+ROLLUP
+ROUND_CEILING
+ROUND_DOWN
+ROUND_FLOOR
+ROUND_HALF_DOWN
+ROUND_HALF_EVEN
+ROUND_HALF_UP
+ROUND_UP
+ROUTINE
+ROW
+ROWNUMBER
+ROWS
+ROWSET
+ROW_NUMBER
+RRN
+RUN
+SAVEPOINT
+SCHEMA
+SCOPE
+SCRATCHPAD
+SCROLL
+SEARCH
+SECOND
+SECONDS
+SECQTY
+SECURITY
+SELECT
+SENSITIVE
+SEQUENCE
+SESSION
+SESSION_USER
+SET
+SIGNAL
+SIMILAR
+SIMPLE
+SMALLINT
+SNAN
+SOME
+SOURCE
+SPECIFIC
+SPECIFICTYPE
+SQL
+SQLEXCEPTION
+SQLID
+SQLSTATE
+SQLWARNING
+SQRT
+STACKED
+STANDARD
+START
+STARTING
+STATEMENT
+STATIC
+STATMENT
+STAY
+STDDEV_POP
+STDDEV_SAMP
+STOGROUP
+STORES
+STYLE
+SUBMULTISET
+SUBSTRING
+SUM
+SUMMARY
+SYMMETRIC
+SYNONYM
+SYSFUN
+SYSIBM
+SYSPROC
+SYSTEM
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+TABLESPACE
+THEN
+TIME
+TIMESTAMP
+TIMEZONE_HOUR
+TIMEZONE_MINUTE
+TO
+TRAILING
+TRANSACTION
+TRANSLATE
+TRANSLATION
+TREAT
+TRIGGER
+TRIM
+TRUE
+TRUNCATE
+TYPE
+UESCAPE
+UNDO
+UNION
+UNIQUE
+UNKNOWN
+UNNEST
+UNTIL
+UPDATE
+UPPER
+USAGE
+USER
+USING
+VALIDPROC
+VALUE
+VALUES
+VARCHAR
+VARIABLE
+VARIANT
+VARYING
+VAR_POP
+VAR_SAMP
+VCAT
+VERSION
+VIEW
+VOLATILE
+VOLUMES
+WHEN
+WHENEVER
+WHERE
+WHILE
+WIDTH_BUCKET
+WINDOW
+WITH
+WITHIN
+WITHOUT
+WLM
+WRITE
+XMLELEMENT
+XMLEXISTS
+XMLNAMESPACES
+YEAR
+YEARS
diff --git a/querydsl-sql/src/main/resources/keywords/default b/querydsl-sql/src/main/resources/keywords/default
new file mode 100644
index 0000000000..87b1f4287d
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/default
@@ -0,0 +1,327 @@
+ABS
+ALL
+ALLOCATE
+ALTER
+AND
+ANY
+ARE
+ARRAY
+ARRAY_AGG
+AS
+ASENSITIVE
+ASYMMETRIC
+AT
+ATOMIC
+AUTHORIZATION
+AVG
+BEGIN
+BETWEEN
+BIGINT
+BINARY
+BLOB
+BOOLEAN
+BOTH
+BY
+CALL
+CALLED
+CARDINALITY
+CASCADED
+CASE
+CAST
+CEIL
+CEILING
+CHAR
+CHARACTER
+CHARACTER_LENGTH
+CHAR_LENGTH
+CHECK
+CLOB
+CLOSE
+COALESCE
+COLLATE
+COLLECT
+COLUMN
+COMMIT
+CONDITION
+CONNECT
+CONSTRAINT
+CONVERT
+CORR
+CORRESPONDING
+COUNT
+COVAR_POP
+COVAR_SAMP
+CREATE
+CROSS
+CUBE
+CUME_DIST
+CURRENT
+CURRENT_CATALOG
+CURRENT_DATE
+CURRENT_DEFAULT_TRANSFORM_GROUP
+CURRENT_PATH
+CURRENT_ROLE
+CURRENT_SCHEMA
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_TRANSFORM_GROUP_FOR_TYPE
+CURRENT_USER
+CURSOR
+CYCLE
+DATE
+DAY
+DEALLOCATE
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DELETE
+DENSE_RANK
+DEREF
+DESCRIBE
+DETERMINISTIC
+DISCONNECT
+DISTINCT
+DOUBLE
+DROP
+DYNAMIC
+EACH
+ELEMENT
+ELSE
+END
+END-EXEC
+ESCAPE
+EVERY
+EXCEPT
+EXEC
+EXECUTE
+EXISTS
+EXP
+EXTERNAL
+EXTRACT
+FALSE
+FETCH
+FILTER
+FIRST_VALUE
+FLOAT
+FLOOR
+FOR
+FOREIGN
+FREE
+FROM
+FULL
+FUNCTION
+FUSION
+GET
+GLOBAL
+GRANT
+GROUP
+GROUPING
+HAVING
+HOLD
+HOUR
+IDENTITY
+IN
+INDICATOR
+INNER
+INOUT
+INSENSITIVE
+INSERT
+INT
+INTEGER
+INTERSECT
+INTERSECTION
+INTERVAL
+INTO
+IS
+JOIN
+LAG
+LANGUAGE
+LARGE
+LAST_VALUE
+LATERAL
+LEAD
+LEADING
+LEFT
+LIKE
+LIKE_REGEX
+LN
+LOCAL
+LOCALTIME
+LOCALTIMESTAMP
+LOWER
+MATCH
+MAX
+MAX_CARDINALITY
+MEMBER
+MERGE
+METHOD
+MIN
+MINUTE
+MOD
+MODIFIES
+MODULE
+MONTH
+MULTISET
+NATIONAL
+NATURAL
+NCHAR
+NCLOB
+NEW
+NO
+NONE
+NORMALIZE
+NOT
+NTH_VALUE
+NTILE
+NULL
+NULLIF
+NUMERIC
+OCCURRENCES_REGEX
+OCTET_LENGTH
+OF
+OFFSET
+OLD
+ON
+ONLY
+OPEN
+OR
+ORDER
+OUT
+OUTER
+OVER
+OVERLAPS
+OVERLAY
+PARAMETER
+PARTITION
+PERCENTILE_CONT
+PERCENTILE_DISC
+PERCENT_RANK
+POSITION
+POSITION_REGEX
+POWER
+PRECISION
+PREPARE
+PRIMARY
+PROCEDURE
+RANGE
+RANK
+READS
+REAL
+RECURSIVE
+REF
+REFERENCES
+REFERENCING
+REGR_AVGX
+REGR_AVGY
+REGR_COUNT
+REGR_INTERCEPT
+REGR_R2
+REGR_SLOPE
+REGR_SXX
+REGR_SXY
+REGR_SYY
+RELEASE
+RESULT
+RETURN
+RETURNS
+REVOKE
+RIGHT
+ROLLBACK
+ROLLUP
+ROW
+ROWS
+ROW_NUMBER
+SAVEPOINT
+SCOPE
+SCROLL
+SEARCH
+SECOND
+SELECT
+SENSITIVE
+SESSION_USER
+SET
+SIMILAR
+SMALLINT
+SOME
+SPECIFIC
+SPECIFICTYPE
+SQL
+SQLEXCEPTION
+SQLSTATE
+SQLWARNING
+SQRT
+START
+STATIC
+STDDEV_POP
+STDDEV_SAMP
+SUBMULTISET
+SUBSTRING
+SUBSTRING_REGEX
+SUM
+SYMMETRIC
+SYSTEM
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+THEN
+TIME
+TIMESTAMP
+TIMEZONE_HOUR
+TIMEZONE_MINUTE
+TO
+TRAILING
+TRANSLATE
+TRANSLATE_REGEX
+TRANSLATION
+TREAT
+TRIGGER
+TRIM
+TRIM_ARRAY
+TRUE
+TRUNCATE
+UESCAPE
+UNION
+UNIQUE
+UNKNOWN
+UNNEST
+UPDATE
+UPPER
+USER
+USING
+VALUE
+VALUES
+VARBINARY
+VARCHAR
+VARYING
+VAR_POP
+VAR_SAMP
+WHEN
+WHENEVER
+WHERE
+WIDTH_BUCKET
+WINDOW
+WITH
+WITHIN
+WITHOUT
+XML
+XMLAGG
+XMLATTRIBUTES
+XMLBINARY
+XMLCAST
+XMLCOMMENT
+XMLCONCAT
+XMLDOCUMENT
+XMLELEMENT
+XMLEXISTS
+XMLFOREST
+XMLITERATE
+XMLNAMESPACES
+XMLPARSE
+XMLPI
+XMLQUERY
+XMLSERIALIZE
+XMLTABLE
+XMLTEXT
+XMLVALIDATE
+YEAR
\ No newline at end of file
diff --git a/querydsl-sql/src/main/resources/keywords/derby b/querydsl-sql/src/main/resources/keywords/derby
new file mode 100644
index 0000000000..fac58c39d9
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/derby
@@ -0,0 +1,208 @@
+# source https://db.apache.org/derby/docs/10.1/ref/rrefkeywords29722.html
+ADD
+ALL
+ALLOCATE
+ALTER
+AND
+ANY
+ARE
+AS
+ASC
+ASSERTION
+AT
+AUTHORIZATION
+AVG
+BEGIN
+BETWEEN
+BIT
+BOOLEAN
+BOTH
+BY
+CALL
+CASCADE
+CASCADED
+CASE
+CAST
+CHAR
+CHARACTER
+CHECK
+CLOSE
+COLLATE
+COLLATION
+COLUMN
+COMMIT
+CONNECT
+CONNECTION
+CONSTRAINT
+CONSTRAINTS
+CONTINUE
+CONVERT
+CORRESPONDING
+COUNT
+CREATE
+CURRENT
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+DEALLOCATE
+DEC
+DECIMAL
+DECLARE
+DEFERRABLE
+DEFERRED
+DELETE
+DESC
+DESCRIBE
+DIAGNOSTICS
+DISCONNECT
+DISTINCT
+DOUBLE
+DROP
+ELSE
+END
+ENDEXEC
+ESCAPE
+EXCEPT
+EXCEPTION
+EXEC
+EXECUTE
+EXISTS
+EXPLAIN
+EXTERNAL
+FALSE
+FETCH
+FIRST
+FLOAT
+FOR
+FOREIGN
+FOUND
+FROM
+FULL
+FUNCTION
+GET
+GET_CURRENT_CONNECTION
+GLOBAL
+GO
+GOTO
+GRANT
+GROUP
+HAVING
+HOUR
+IDENTITY
+IMMEDIATE
+IN
+INDICATOR
+INITIALLY
+INNER
+INOUT
+INPUT
+INSENSITIVE
+INSERT
+INT
+INTEGER
+INTERSECT
+INTO
+IS
+ISOLATION
+JOIN
+KEY
+LAST
+LEFT
+LIKE
+LONGINT
+LOWER
+LTRIM
+MATCH
+MAX
+MIN
+MINUTE
+NATIONAL
+NATURAL
+NCHAR
+NEXT
+NO
+NOT
+NULL
+NULLIF
+NUMERIC
+NVARCHAR
+OF
+ON
+ONLY
+OPEN
+OPTION
+OR
+ORDER
+OUT
+OUTER
+OUTPUT
+OVERLAPS
+PAD
+PARTIAL
+PREPARE
+PRESERVE
+PRIMARY
+PRIOR
+PRIVILEGES
+PROCEDURE
+PUBLIC
+READ
+REAL
+REFERENCES
+RELATIVE
+RESTRICT
+REVOKE
+RIGHT
+ROLLBACK
+ROWS
+RTRIM
+SCHEMA
+SCROLL
+SECOND
+SELECT
+SESSION_USER
+SET
+SMALLINT
+SOME
+SPACE
+SQL
+SQLCODE
+SQLERROR
+SQLSTATE
+SUBSTR
+SUBSTRING
+SUM
+SYSTEM_USER
+TABLE
+TEMPORARY
+TIMEZONE_HOUR
+TIMEZONE_MINUTE
+TO
+TRAILING
+TRANSACTION
+TRANSLATE
+TRANSLATION
+TRUE
+UNION
+UNIQUE
+UNKNOWN
+UPDATE
+UPPER
+USER
+USING
+VALUES
+VARCHAR
+VARYING
+VIEW
+WHENEVER
+WHERE
+WITH
+WORK
+WRITE
+XML
+XMLEXISTS
+XMLPARSE
+XMLSERIALIZE
+YEAR
diff --git a/querydsl-sql/src/main/resources/keywords/firebird b/querydsl-sql/src/main/resources/keywords/firebird
new file mode 100644
index 0000000000..4ad75e2dfa
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/firebird
@@ -0,0 +1,168 @@
+# source http://www.firebirdsql.org/refdocs/langrefupd25-reskeywords-full-reswords.html
+ADD
+ADMIN
+ALL
+ALTER
+AND
+ANY
+AS
+AT
+AVG
+BEGIN
+BETWEEN
+BIGINT
+BIT_LENGTH
+BLOB
+BOTH
+BY
+CASE
+CAST
+CHAR
+CHAR_LENGTH
+CHARACTER
+CHARACTER_LENGTH
+CHECK
+CLOSE
+COLLATE
+COLUMN
+COMMIT
+CONNECT
+CONSTRAINT
+COUNT
+CREATE
+CROSS
+CURRENT
+CURRENT_CONNECTION
+CURRENT_DATE
+CURRENT_ROLE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_TRANSACTION
+CURRENT_USER
+CURSOR
+DATE
+DAY
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DELETE
+DISCONNECT
+DISTINCT
+DOUBLE
+DROP
+ELSE
+END
+ESCAPE
+EXECUTE
+EXISTS
+EXTERNAL
+EXTRACT
+FETCH
+FILTER
+FLOAT
+FOR
+FOREIGN
+FROM
+FULL
+FUNCTION
+GDSCODE
+GLOBAL
+GRANT
+GROUP
+HAVING
+HOUR
+IN
+INDEX
+INNER
+INSENSITIVE
+INSERT
+INT
+INTEGER
+INTO
+IS
+JOIN
+LEADING
+LEFT
+LIKE
+LONG
+LOWER
+MAX
+MAXIMUM_SEGMENT
+MERGE
+MIN
+MINUTE
+MONTH
+NATIONAL
+NATURAL
+NCHAR
+NO
+NOT
+NULL
+NUMERIC
+OCTET_LENGTH
+OF
+ON
+ONLY
+OPEN
+OR
+ORDER
+OUTER
+PARAMETER
+PLAN
+POSITION
+POST_EVENT
+PRECISION
+PRIMARY
+PROCEDURE
+RDB$DB_KEY
+REAL
+RECORD_VERSION
+RECREATE
+RECURSIVE
+REFERENCES
+RELEASE
+RETURNING_VALUES
+RETURNS
+REVOKE
+RIGHT
+ROLLBACK
+ROW_COUNT
+ROWS
+SAVEPOINT
+SECOND
+SELECT
+SENSITIVE
+SET
+SIMILAR
+SMALLINT
+SOME
+SQLCODE
+SQLSTATE
+START
+SUM
+TABLE
+THEN
+TIME
+TIMESTAMP
+TO
+TRAILING
+TRIGGER
+TRIM
+UNION
+UNIQUE
+UPDATE
+UPPER
+USER
+USING
+VALUE
+VALUES
+VARCHAR
+VARIABLE
+VARYING
+VIEW
+WHEN
+WHERE
+WHILE
+WITH
+YEAR
\ No newline at end of file
diff --git a/querydsl-sql/src/main/resources/keywords/h2 b/querydsl-sql/src/main/resources/keywords/h2
new file mode 100644
index 0000000000..3b45635404
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/h2
@@ -0,0 +1,81 @@
+# source http://www.h2database.com/html/advanced.html
+ALL
+AND
+ARRAY
+AS
+BETWEEN
+BOTH
+CASE
+CHECK
+CONSTRAINT
+CROSS
+CURRENT_CATALOG
+CURRENT_DATE
+CURRENT_SCHEMA
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+DISTINCT
+EXCEPT
+EXISTS
+FALSE
+FETCH
+FILTER
+FOR
+FOREIGN
+FROM
+FULL
+GROUP
+GROUPS
+HAVING
+IF
+ILIKE
+IN
+INNER
+INTERSECT
+INTERSECTS
+INTERVAL
+IS
+JOIN
+LEADING
+LEFT
+LIKE
+LIMIT
+LOCALTIME
+LOCALTIMESTAMP
+MINUS
+NATURAL
+NOT
+NULL
+OFFSET
+ON
+OR
+ORDER
+OVER
+PARTITION
+PRIMARY
+QUALIFY
+RANGE
+REGEXP
+RIGHT
+ROW
+_ROWID_
+ROWNUM
+ROWS
+SELECT
+SYSDATE
+SYSTIME
+SYSTIMESTAMP
+TABLE
+TODAY
+TOP
+TRAILING
+TRUE
+UNION
+UNIQUE
+UNKNOWN
+USING
+VALUES
+WHERE
+WINDOW
+WITH
\ No newline at end of file
diff --git a/querydsl-sql/src/main/resources/keywords/hsqldb b/querydsl-sql/src/main/resources/keywords/hsqldb
new file mode 100644
index 0000000000..2b606a7736
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/hsqldb
@@ -0,0 +1,322 @@
+# source http://hsqldb.org/doc/guide/lists-app.html
+ABS
+ALL
+ALLOCATE
+ALTER
+AND
+ANY
+ARE
+ARRAY
+AS
+ASENSITIVE
+ASYMMETRIC
+AT
+ATOMIC
+AUTHORIZATION
+AVG
+BEGIN
+BETWEEN
+BIGINT
+BINARY
+BLOB
+BOOLEAN
+BOTH
+BY
+CALL
+CALLED
+CARDINALITY
+CASCADED
+CASE
+CAST
+CEIL
+CEILING
+CHAR
+CHARACTER
+CHARACTER_LENGTH
+CHAR_LENGTH
+CHECK
+CLOB
+CLOSE
+COALESCE
+COLLATE
+COLLECT
+COLUMN
+COMMIT
+COMPARABLE
+CONDITION
+CONNECT
+CONSTRAINT
+CONVERT
+CORR
+CORRESPONDING
+COUNT
+COVAR_POP
+COVAR_SAMP
+CREATE
+CROSS
+CUBE
+CUME_DIST
+CURRENT
+CURRENT_CATALOG
+CURRENT_DATE
+CURRENT_DEFAULT_TRANSFORM_GROUP
+CURRENT_PATH
+CURRENT_ROLE
+CURRENT_SCHEMA
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_TRANSFORM_GROUP_FOR_TYPE
+CURRENT_USER
+CURSOR
+CYCLE
+DATE
+DAY
+DEALLOCATE
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DELETE
+DENSE_RANK
+DEREF
+DESCRIBE
+DETERMINISTIC
+DISCONNECT
+DISTINCT
+DO
+DOUBLE
+DROP
+DYNAMIC
+EACH
+ELEMENT
+ELSE
+ELSEIF
+END
+END_EXEC
+ESCAPE
+EVERY
+EXCEPT
+EXEC
+EXECUTE
+EXISTS
+EXIT
+EXP
+EXTERNAL
+EXTRACT
+FALSE
+FETCH
+FILTER
+FIRST_VALUE
+FLOAT
+FLOOR
+FOR
+FOREIGN
+FREE
+FROM
+FULL
+FUNCTION
+FUSION
+GET
+GLOBAL
+GRANT
+GROUP
+GROUPING
+HANDLER
+HAVING
+HOLD
+HOUR
+IDENTITY
+IN
+INDICATOR
+INNER
+INOUT
+INSENSITIVE
+INSERT
+INT
+INTEGER
+INTERSECT
+INTERSECTION
+INTERVAL
+INTO
+IS
+ITERATE
+JOIN
+LAG
+LANGUAGE
+LARGE
+LAST_VALUE
+LATERAL
+LEAD
+LEADING
+LEAVE
+LEFT
+LIKE
+LIKE_REGEX
+LN
+LOCAL
+LOCALTIME
+LOCALTIMESTAMP
+LOOP
+LOWER
+MATCH
+MAX
+MAX_CARDINALITY
+MEMBER
+MERGE
+METHOD
+MIN
+MINUTE
+MOD
+MODIFIES
+MODULE
+MONTH
+MULTISET
+NATIONAL
+NATURAL
+NCHAR
+NCLOB
+NEW
+NO
+NONE
+NORMALIZE
+NOT
+NTH_VALUE
+NTILE
+NULL
+NULLIF
+NUMERIC
+OCCURRENCES_REGEX
+OCTET_LENGTH
+OF
+OFFSET
+OLD
+ON
+ONLY
+OPEN
+OR
+ORDER
+OUT
+OUTER
+OVER
+OVERLAPS
+OVERLAY
+PARAMETER
+PARTITION
+PERCENTILE_CONT
+PERCENTILE_DISC
+PERCENT_RANK
+POSITION
+POSITION_REGEX
+POWER
+PRECISION
+PREPARE
+PRIMARY
+PROCEDURE
+RANGE
+RANK
+READS
+REAL
+RECURSIVE
+REF
+REFERENCES
+REFERENCING
+REGR_AVGX
+REGR_AVGY
+REGR_COUNT
+REGR_INTERCEPT
+REGR_R2
+REGR_SLOPE
+REGR_SXX
+REGR_SXY
+REGR_SYY
+RELEASE
+REPEAT
+RESIGNAL
+RESULT
+RETURN
+RETURNS
+REVOKE
+RIGHT
+ROLLBACK
+ROLLUP
+ROW
+ROWS
+ROW_NUMBER
+SAVEPOINT
+SCOPE
+SCROLL
+SEARCH
+SECOND
+SELECT
+SENSITIVE
+SESSION_USER
+SET
+SIGNAL
+SIMILAR
+SMALLINT
+SOME
+SPECIFIC
+SPECIFICTYPE
+SQL
+SQLEXCEPTION
+SQLSTATE
+SQLWARNING
+SQRT
+STACKED
+START
+STATIC
+STDDEV_POP
+STDDEV_SAMP
+SUBMULTISET
+SUBSTRING
+SUBSTRING_REGEX
+SUM
+SYMMETRIC
+SYSTEM
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+THEN
+TIME
+TIMESTAMP
+TIMEZONE_HOUR
+TIMEZONE_MINUTE
+TO
+TRAILING
+TRANSLATE
+TRANSLATE_REGEX
+TRANSLATION
+TREAT
+TRIGGER
+TRIM
+TRIM_ARRAY
+TRUE
+TRUNCATE
+UESCAPE
+UNDO
+UNION
+UNIQUE
+UNKNOWN
+UNNEST
+UNTIL
+UPDATE
+UPPER
+USER
+USING
+VALUE
+VALUES
+VARBINARY
+VARCHAR
+VARYING
+VAR_POP
+VAR_SAMP
+WHEN
+WHENEVER
+WHERE
+WHILE
+WIDTH_BUCKET
+WINDOW
+WITH
+WITHIN
+WITHOUT
+YEAR
diff --git a/querydsl-sql/src/main/resources/keywords/mysql b/querydsl-sql/src/main/resources/keywords/mysql
new file mode 100644
index 0000000000..eba58b00ff
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/mysql
@@ -0,0 +1,227 @@
+# source https://dev.mysql.com/doc/refman/5.5/en/keywords.html
+ACCESSIBLE
+ADD
+ALL
+ALTER
+ANALYZE
+AND
+AS
+ASC
+ASENSITIVE
+BEFORE
+BETWEEN
+BIGINT
+BINARY
+BLOB
+BOTH
+BY
+CALL
+CASCADE
+CASE
+CHANGE
+CHAR
+CHARACTER
+CHECK
+COLLATE
+COLUMN
+CONDITION
+CONSTRAINT
+CONTINUE
+CONVERT
+CREATE
+CROSS
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+DATABASE
+DATABASES
+DAY_HOUR
+DAY_MICROSECOND
+DAY_MINUTE
+DAY_SECOND
+DEC
+DECIMAL
+DECLARE
+DEFAULT
+DELAYED
+DELETE
+DESC
+DESCRIBE
+DETERMINISTIC
+DISTINCT
+DISTINCTROW
+DIV
+DOUBLE
+DROP
+DUAL
+EACH
+ELSE
+ELSEIF
+ENCLOSED
+ESCAPED
+EXISTS
+EXIT
+EXPLAIN
+FALSE
+FETCH
+FLOAT
+FLOAT4
+FLOAT8
+FOR
+FORCE
+FOREIGN
+FROM
+FULLTEXT
+GRANT
+GROUP
+HAVING
+HIGH_PRIORITY
+HOUR_MICROSECOND
+HOUR_MINUTE
+HOUR_SECOND
+IF
+IGNORE
+IN
+INDEX
+INFILE
+INNER
+INOUT
+INSENSITIVE
+INSERT
+INT
+INT1
+INT2
+INT3
+INT4
+INT8
+INTEGER
+INTERVAL
+INTO
+IS
+ITERATE
+JOIN
+KEY
+KEYS
+KILL
+LEADING
+LEAVE
+LEFT
+LIKE
+LIMIT
+LINEAR
+LINES
+LOAD
+LOCALTIME
+LOCALTIMESTAMP
+LOCK
+LONG
+LONGBLOB
+LONGTEXT
+LOOP
+LOW_PRIORITY
+MASTER_SSL_VERIFY_SERVER_CERT
+MATCH
+MAXVALUE
+MEDIUMBLOB
+MEDIUMINT
+MEDIUMTEXT
+MIDDLEINT
+MINUTE_MICROSECOND
+MINUTE_SECOND
+MOD
+MODIFIES
+NATURAL
+NOT
+NO_WRITE_TO_BINLOG
+NULL
+NUMERIC
+ON
+OPTIMIZE
+OPTION
+OPTIONALLY
+OR
+ORDER
+OUT
+OUTER
+OUTFILE
+PRECISION
+PRIMARY
+PROCEDURE
+PURGE
+RANGE
+READ
+READS
+READ_WRITE
+REAL
+REFERENCES
+REGEXP
+RELEASE
+RENAME
+REPEAT
+REPLACE
+REQUIRE
+RESIGNAL
+RESTRICT
+RETURN
+REVOKE
+RIGHT
+RLIKE
+SCHEMA
+SCHEMAS
+SECOND_MICROSECOND
+SELECT
+SENSITIVE
+SEPARATOR
+SET
+SHOW
+SIGNAL
+SMALLINT
+SPATIAL
+SPECIFIC
+SQL
+SQLEXCEPTION
+SQLSTATE
+SQLWARNING
+SQL_BIG_RESULT
+SQL_CALC_FOUND_ROWS
+SQL_SMALL_RESULT
+SSL
+STARTING
+STRAIGHT_JOIN
+TABLE
+TERMINATED
+THEN
+TINYBLOB
+TINYINT
+TINYTEXT
+TO
+TRAILING
+TRIGGER
+TRUE
+UNDO
+UNION
+UNIQUE
+UNLOCK
+UNSIGNED
+UPDATE
+USAGE
+USE
+USING
+UTC_DATE
+UTC_TIME
+UTC_TIMESTAMP
+VALUES
+VARBINARY
+VARCHAR
+VARCHARACTER
+VARYING
+WHEN
+WHERE
+WHILE
+WITH
+WRITE
+XOR
+YEAR_MONTH
+ZEROFILL
diff --git a/querydsl-sql/src/main/resources/keywords/oracle b/querydsl-sql/src/main/resources/keywords/oracle
new file mode 100644
index 0000000000..44c0209d83
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/oracle
@@ -0,0 +1,110 @@
+# source https://docs.oracle.com/cd/B19306_01/server.102/b14200/ap_keywd.htm
+ACCESS
+ADD
+ALL
+ALTER
+AND
+ANY
+AS
+ASC
+AUDIT
+BETWEEN
+BY
+CHAR
+CHECK
+CLUSTER
+COLUMN
+COMMENT
+COMPRESS
+CONNECT
+CREATE
+CURRENT
+DATE
+DECIMAL
+DEFAULT
+DELETE
+DESC
+DISTINCT
+DROP
+ELSE
+EXCLUSIVE
+EXISTS
+FILE
+FLOAT
+FOR
+FROM
+GRANT
+GROUP
+HAVING
+IDENTIFIED
+IMMEDIATE
+IN
+INCREMENT
+INDEX
+INITIAL
+INSERT
+INTEGER
+INTERSECT
+INTO
+IS
+LEVEL
+LIKE
+LOCK
+LONG
+MAXEXTENTS
+MINUS
+MLSLABEL
+MODE
+MODIFY
+NOAUDIT
+NOCOMPRESS
+NOT
+NOWAIT
+NULL
+NUMBER
+OF
+OFFLINE
+ON
+ONLINE
+OPTION
+OR
+ORDER
+PCTFREE
+PRIOR
+PRIVILEGES
+PUBLIC
+RAW
+RENAME
+RESOURCE
+REVOKE
+ROW
+ROWID
+ROWNUM
+ROWS
+SELECT
+SESSION
+SET
+SHARE
+SIZE
+SMALLINT
+START
+SUCCESSFUL
+SYNONYM
+SYSDATE
+TABLE
+THEN
+TO
+TRIGGER
+UID
+UNION
+UNIQUE
+UPDATE
+USER
+VALIDATE
+VALUES
+VARCHAR
+VARCHAR2
+VIEW
+WHENEVER
+WHERE
+WITH
diff --git a/querydsl-sql/src/main/resources/keywords/postgresql b/querydsl-sql/src/main/resources/keywords/postgresql
new file mode 100644
index 0000000000..dcb857d030
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/postgresql
@@ -0,0 +1,101 @@
+# source http://www.postgresql.org/docs/9.4/static/sql-keywords-appendix.html
+ALL
+ANALYSE
+ANALYZE
+AND
+ANY
+ARRAY
+AS
+ASC
+ASYMMETRIC
+AUTHORIZATION
+BINARY
+BOTH
+CASE
+CAST
+CHECK
+COLLATE
+COLLATION
+COLUMN
+CONCURRENTLY
+CONSTRAINT
+CREATE
+CROSS
+CURRENT_CATALOG
+CURRENT_DATE
+CURRENT_ROLE
+CURRENT_SCHEMA
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+DEFAULT
+DEFERRABLE
+DESC
+DISTINCT
+DO
+ELSE
+END
+EXCEPT
+FALSE
+FETCH
+FOR
+FOREIGN
+FREEZE
+FROM
+FULL
+GRANT
+GROUP
+HAVING
+ILIKE
+IN
+INITIALLY
+INNER
+INTERSECT
+INTO
+IS
+ISNULL
+JOIN
+LATERAL
+LEADING
+LEFT
+LIKE
+LIMIT
+LOCALTIME
+LOCALTIMESTAMP
+NATURAL
+NOT
+NOTNULL
+NULL
+OFFSET
+ON
+ONLY
+OR
+ORDER
+OUTER
+OVER
+OVERLAPS
+PLACING
+PRIMARY
+REFERENCES
+RETURNING
+RIGHT
+SELECT
+SESSION_USER
+SIMILAR
+SOME
+SYMMETRIC
+TABLE
+THEN
+TO
+TRAILING
+TRUE
+UNION
+UNIQUE
+USER
+USING
+VARIADIC
+VERBOSE
+WHEN
+WHERE
+WINDOW
+WITH
diff --git a/querydsl-sql/src/main/resources/keywords/sqlite b/querydsl-sql/src/main/resources/keywords/sqlite
new file mode 100644
index 0000000000..cf61d95af4
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/sqlite
@@ -0,0 +1,125 @@
+# source https://sqlite.org/lang_keywords.html
+ABORT
+ACTION
+ADD
+AFTER
+ALL
+ALTER
+ANALYZE
+AND
+AS
+ASC
+ATTACH
+AUTOINCREMENT
+BEFORE
+BEGIN
+BETWEEN
+BY
+CASCADE
+CASE
+CAST
+CHECK
+COLLATE
+COLUMN
+COMMIT
+CONFLICT
+CONSTRAINT
+CREATE
+CROSS
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+DATABASE
+DEFAULT
+DEFERRABLE
+DEFERRED
+DELETE
+DESC
+DETACH
+DISTINCT
+DROP
+EACH
+ELSE
+END
+ESCAPE
+EXCEPT
+EXCLUSIVE
+EXISTS
+EXPLAIN
+FAIL
+FOR
+FOREIGN
+FROM
+FULL
+GLOB
+GROUP
+HAVING
+IF
+IGNORE
+IMMEDIATE
+IN
+INDEX
+INDEXED
+INITIALLY
+INNER
+INSERT
+INSTEAD
+INTERSECT
+INTO
+IS
+ISNULL
+JOIN
+KEY
+LEFT
+LIKE
+LIMIT
+MATCH
+NATURAL
+NO
+NOT
+NOTNULL
+NULL
+OF
+OFFSET
+ON
+OR
+ORDER
+OUTER
+PLAN
+PRAGMA
+PRIMARY
+QUERY
+RAISE
+RECURSIVE
+REFERENCES
+REGEXP
+REINDEX
+RELEASE
+RENAME
+REPLACE
+RESTRICT
+RIGHT
+ROLLBACK
+ROW
+SAVEPOINT
+SELECT
+SET
+TABLE
+TEMP
+TEMPORARY
+THEN
+TO
+TRANSACTION
+TRIGGER
+UNION
+UNIQUE
+UPDATE
+USING
+VACUUM
+VALUES
+VIEW
+VIRTUAL
+WHEN
+WHERE
+WITH
+WITHOUT
diff --git a/querydsl-sql/src/main/resources/keywords/sqlserver2005 b/querydsl-sql/src/main/resources/keywords/sqlserver2005
new file mode 100644
index 0000000000..182a92266e
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/sqlserver2005
@@ -0,0 +1,180 @@
+# source https://msdn.microsoft.com/en-us/library/ms189822(v=sql.90).aspx
+ADD
+ALL
+ALTER
+AND
+ANY
+AS
+ASC
+AUTHORIZATION
+BACKUP
+BEGIN
+BETWEEN
+BREAK
+BROWSE
+BULK
+BY
+CASCADE
+CASE
+CHECK
+CHECKPOINT
+CLOSE
+CLUSTERED
+COALESCE
+COLLATE
+COLUMN
+COMMIT
+COMPUTE
+CONSTRAINT
+CONTAINS
+CONTAINSTABLE
+CONTINUE
+CONVERT
+CREATE
+CROSS
+CURRENT
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+DATABASE
+DBCC
+DEALLOCATE
+DECLARE
+DEFAULT
+DELETE
+DENY
+DESC
+DISK
+DISTINCT
+DISTRIBUTED
+DOUBLE
+DROP
+DUMP
+ELSE
+END
+ERRLVL
+ESCAPE
+EXCEPT
+EXEC
+EXECUTE
+EXISTS
+EXIT
+EXTERNAL
+FETCH
+FILE
+FILLFACTOR
+FOR
+FOREIGN
+FREETEXT
+FREETEXTTABLE
+FROM
+FULL
+FUNCTION
+GOTO
+GRANT
+GROUP
+HAVING
+HOLDLOCK
+IDENTITY
+IDENTITYCOL
+IDENTITY_INSERT
+IF
+IN
+INDEX
+INNER
+INSERT
+INTERSECT
+INTO
+IS
+JOIN
+KEY
+KILL
+LEFT
+LIKE
+LINENO
+LOAD
+NATIONAL
+NOCHECK
+NONCLUSTERED
+NOT
+NULL
+NULLIF
+OF
+OFF
+OFFSETS
+ON
+OPEN
+OPENDATASOURCE
+OPENQUERY
+OPENROWSET
+OPENXML
+OPTION
+OR
+ORDER
+OUTER
+OVER
+PERCENT
+PIVOT
+PLAN
+PRECISION
+PRIMARY
+PRINT
+PROC
+PROCEDURE
+PUBLIC
+RAISERROR
+READ
+READTEXT
+RECONFIGURE
+REFERENCES
+REPLICATION
+RESTORE
+RESTRICT
+RETURN
+REVERT
+REVOKE
+RIGHT
+ROLLBACK
+ROWCOUNT
+ROWGUIDCOL
+RULE
+SAVE
+SCHEMA
+SECURITYAUDIT
+SELECT
+SESSION_USER
+SET
+SETUSER
+SHUTDOWN
+SOME
+STATISTICS
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+TEXTSIZE
+THEN
+TO
+TOP
+TRAN
+TRANSACTION
+TRIGGER
+TRUNCATE
+TSEQUAL
+UNION
+UNIQUE
+UNPIVOT
+UPDATE
+UPDATETEXT
+USE
+USER
+VALUES
+VARYING
+VIEW
+WAITFOR
+WHEN
+WHERE
+WHILE
+WITH
+WRITETEXT
diff --git a/querydsl-sql/src/main/resources/keywords/sqlserver2008 b/querydsl-sql/src/main/resources/keywords/sqlserver2008
new file mode 100644
index 0000000000..f85b5930b7
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/sqlserver2008
@@ -0,0 +1,181 @@
+# source https://msdn.microsoft.com/en-us/library/ms189822(v=sql.100).aspx
+ADD
+ALL
+ALTER
+AND
+ANY
+AS
+ASC
+AUTHORIZATION
+BACKUP
+BEGIN
+BETWEEN
+BREAK
+BROWSE
+BULK
+BY
+CASCADE
+CASE
+CHECK
+CHECKPOINT
+CLOSE
+CLUSTERED
+COALESCE
+COLLATE
+COLUMN
+COMMIT
+COMPUTE
+CONSTRAINT
+CONTAINS
+CONTAINSTABLE
+CONTINUE
+CONVERT
+CREATE
+CROSS
+CURRENT
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+DATABASE
+DBCC
+DEALLOCATE
+DECLARE
+DEFAULT
+DELETE
+DENY
+DESC
+DISK
+DISTINCT
+DISTRIBUTED
+DOUBLE
+DROP
+DUMP
+ELSE
+END
+ERRLVL
+ESCAPE
+EXCEPT
+EXEC
+EXECUTE
+EXISTS
+EXIT
+EXTERNAL
+FETCH
+FILE
+FILLFACTOR
+FOR
+FOREIGN
+FREETEXT
+FREETEXTTABLE
+FROM
+FULL
+FUNCTION
+GOTO
+GRANT
+GROUP
+HAVING
+HOLDLOCK
+IDENTITY
+IDENTITYCOL
+IDENTITY_INSERT
+IF
+IN
+INDEX
+INNER
+INSERT
+INTERSECT
+INTO
+IS
+JOIN
+KEY
+KILL
+LEFT
+LIKE
+LINENO
+LOAD
+MERGE
+NATIONAL
+NOCHECK
+NONCLUSTERED
+NOT
+NULL
+NULLIF
+OF
+OFF
+OFFSETS
+ON
+OPEN
+OPENDATASOURCE
+OPENQUERY
+OPENROWSET
+OPENXML
+OPTION
+OR
+ORDER
+OUTER
+OVER
+PERCENT
+PIVOT
+PLAN
+PRECISION
+PRIMARY
+PRINT
+PROC
+PROCEDURE
+PUBLIC
+RAISERROR
+READ
+READTEXT
+RECONFIGURE
+REFERENCES
+REPLICATION
+RESTORE
+RESTRICT
+RETURN
+REVERT
+REVOKE
+RIGHT
+ROLLBACK
+ROWCOUNT
+ROWGUIDCOL
+RULE
+SAVE
+SCHEMA
+SECURITYAUDIT
+SELECT
+SESSION_USER
+SET
+SETUSER
+SHUTDOWN
+SOME
+STATISTICS
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+TEXTSIZE
+THEN
+TO
+TOP
+TRAN
+TRANSACTION
+TRIGGER
+TRUNCATE
+TSEQUAL
+UNION
+UNIQUE
+UNPIVOT
+UPDATE
+UPDATETEXT
+USE
+USER
+VALUES
+VARYING
+VIEW
+WAITFOR
+WHEN
+WHERE
+WHILE
+WITH
+WRITETEXT
diff --git a/querydsl-sql/src/main/resources/keywords/sqlserver2012 b/querydsl-sql/src/main/resources/keywords/sqlserver2012
new file mode 100644
index 0000000000..9e35e1dcac
--- /dev/null
+++ b/querydsl-sql/src/main/resources/keywords/sqlserver2012
@@ -0,0 +1,186 @@
+# source https://msdn.microsoft.com/en-us/library/ms189822(v=sql.110).aspx
+ADD
+ALL
+ALTER
+AND
+ANY
+AS
+ASC
+AUTHORIZATION
+BACKUP
+BEGIN
+BETWEEN
+BREAK
+BROWSE
+BULK
+BY
+CASCADE
+CASE
+CHECK
+CHECKPOINT
+CLOSE
+CLUSTERED
+COALESCE
+COLLATE
+COLUMN
+COMMIT
+COMPUTE
+CONSTRAINT
+CONTAINS
+CONTAINSTABLE
+CONTINUE
+CONVERT
+CREATE
+CROSS
+CURRENT
+CURRENT_DATE
+CURRENT_TIME
+CURRENT_TIMESTAMP
+CURRENT_USER
+CURSOR
+DATABASE
+DBCC
+DEALLOCATE
+DECLARE
+DEFAULT
+DELETE
+DENY
+DESC
+DISK
+DISTINCT
+DISTRIBUTED
+DOUBLE
+DROP
+DUMP
+ELSE
+END
+ERRLVL
+ESCAPE
+EXCEPT
+EXEC
+EXECUTE
+EXISTS
+EXIT
+EXTERNAL
+FETCH
+FILE
+FILLFACTOR
+FOR
+FOREIGN
+FREETEXT
+FREETEXTTABLE
+FROM
+FULL
+FUNCTION
+GOTO
+GRANT
+GROUP
+HAVING
+HOLDLOCK
+IDENTITY
+IDENTITYCOL
+IDENTITY_INSERT
+IF
+IN
+INDEX
+INNER
+INSERT
+INTERSECT
+INTO
+IS
+JOIN
+KEY
+KILL
+LEFT
+LIKE
+LINENO
+LOAD
+MERGE
+NATIONAL
+NOCHECK
+NONCLUSTERED
+NOT
+NULL
+NULLIF
+OF
+OFF
+OFFSETS
+ON
+OPEN
+OPENDATASOURCE
+OPENQUERY
+OPENROWSET
+OPENXML
+OPTION
+OR
+ORDER
+OUTER
+OVER
+PERCENT
+PIVOT
+PLAN
+PRECISION
+PRIMARY
+PRINT
+PROC
+PROCEDURE
+PUBLIC
+RAISERROR
+READ
+READTEXT
+RECONFIGURE
+REFERENCES
+REPLICATION
+RESTORE
+RESTRICT
+RETURN
+REVERT
+REVOKE
+RIGHT
+ROLLBACK
+ROWCOUNT
+ROWGUIDCOL
+RULE
+SAVE
+SCHEMA
+SECURITYAUDIT
+SELECT
+SEMANTICKEYPHRASETABLE
+SEMANTICSIMILARITYDETAILSTABLE
+SEMANTICSIMILARITYTABLE
+SESSION_USER
+SET
+SETUSER
+SHUTDOWN
+SOME
+STATISTICS
+SYSTEM_USER
+TABLE
+TABLESAMPLE
+TEXTSIZE
+THEN
+TO
+TOP
+TRAN
+TRANSACTION
+TRIGGER
+TRUNCATE
+TRY_CONVERT
+TSEQUAL
+UNION
+UNIQUE
+UNPIVOT
+UPDATE
+UPDATETEXT
+USE
+USER
+VALUES
+VARYING
+VIEW
+WAITFOR
+WHEN
+WHERE
+WHILE
+WITH
+WITHIN GROUP
+WRITETEXT
diff --git a/querydsl-sql/src/test/java/com/example/Price.java b/querydsl-sql/src/test/java/com/example/Price.java
index af5b9f9a4b..010a816960 100644
--- a/querydsl-sql/src/test/java/com/example/Price.java
+++ b/querydsl-sql/src/test/java/com/example/Price.java
@@ -3,7 +3,7 @@
 public class Price {
 
     private float price;
-    
+
     private String currency;
 
     public float getPrice() {
@@ -21,7 +21,7 @@ public String getCurrency() {
     public void setCurrency(String currency) {
         this.currency = currency;
     }
-    
-    
+
+
 
 }
diff --git a/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java
deleted file mode 100644
index a2f75f96a3..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.List;
-import javax.annotation.Nullable;
-import java.sql.Connection;
-import java.util.List;
-
-import com.mysema.query.sql.*;
-import com.mysema.query.sql.dml.SQLDeleteClause;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.dml.SQLMergeClause;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.sql.mysql.MySQLReplaceClause;
-import com.mysema.query.sql.teradata.TeradataQuery;
-import org.junit.Rule;
-import org.junit.rules.MethodRule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-
-public abstract class AbstractBaseTest {
-
-    protected static final Logger logger = LoggerFactory.getLogger(AbstractBaseTest.class);
-
-    protected final class TestQuery extends AbstractSQLQuery<TestQuery> implements SQLCommonQuery<TestQuery> {
-
-        private TestQuery(Connection conn, Configuration configuration) {
-            super(conn, configuration);
-        }
-
-        private TestQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-            super(conn, configuration, metadata);
-        }
-
-        @Override
-        protected SQLSerializer serialize(boolean countRow) {
-            SQLSerializer serializer = super.serialize(countRow);
-            String rv = serializer.toString();
-            if (expectedQuery != null) {
-                assertEquals(expectedQuery, rv.replace('\n', ' '));
-                expectedQuery = null;
-            }
-            logger.debug(rv);
-            return serializer;
-        }
-
-        public TestQuery clone(Connection conn) {
-            TestQuery q = new TestQuery(conn, getConfiguration(), getMetadata().clone());
-            q.union = union;
-            q.unionAll = unionAll;
-            return q;
-        }
-    }
-
-    protected Connection connection = Connections.getConnection();
-
-    protected SQLTemplates templates = Connections.getTemplates();
-
-    protected Target target = Connections.getTarget();
-
-    protected Configuration configuration = new Configuration(templates);
-
-    @Nullable
-    protected String expectedQuery;
-
-    @Rule
-    public static MethodRule skipForQuotedRule = new SkipForQuotedRule();
-
-    @Rule
-    public static MethodRule targetRule = new TargetRule();
-
-    protected <T> void add(List<T> list, T arg, Target... exclusions) {
-        if (exclusions.length > 0) {
-            for (Target t : exclusions) {
-                if (t.equals(target)) {
-                    return;
-                }
-            }
-        }
-        list.add(arg);
-    }
-
-    protected SQLUpdateClause update(RelationalPath<?> e) {
-        return new SQLUpdateClause(connection, configuration, e);
-    }
-
-    protected SQLInsertClause insert(RelationalPath<?> e) {
-        return new SQLInsertClause(connection, configuration, e);
-    }
-
-    protected SQLInsertClause insert(RelationalPath<?> e, AbstractSQLSubQuery<?> sq) {
-        return new SQLInsertClause(connection, configuration, e, sq);
-    }
-
-    protected SQLDeleteClause delete(RelationalPath<?> e) {
-        return new SQLDeleteClause(connection, configuration, e);
-    }
-
-    protected SQLMergeClause merge(RelationalPath<?> e) {
-        return new SQLMergeClause(connection, configuration, e);
-    }
-
-    protected ExtendedSQLQuery extQuery() {
-        return new ExtendedSQLQuery(connection, configuration);
-    }
-
-    protected SQLInsertClause mysqlReplace(RelationalPath<?> path) {
-        return new MySQLReplaceClause(connection, configuration, path);
-    }
-
-    protected TestQuery query() {
-        return new TestQuery(connection, configuration);
-    }
-
-    protected TeradataQuery teradataQuery() {
-        return new TeradataQuery(connection, configuration);
-    }
-
-    protected TestQuery testQuery() {
-        return new TestQuery(connection, configuration,
-                new DefaultQueryMetadata().noValidate());
-    }
-
-    protected SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/BeanPopulationBase.java b/querydsl-sql/src/test/java/com/mysema/query/BeanPopulationBase.java
deleted file mode 100644
index f5ed491b8c..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/BeanPopulationBase.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.DERBY;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.Target.POSTGRES;
-import static com.mysema.query.Target.SQLITE;
-import static com.mysema.query.Target.SQLSERVER;
-import static com.mysema.query.Target.TERADATA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.Test;
-
-import com.mysema.query.sql.dml.BeanMapper;
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.testutil.ExcludeIn;
-
-@ExcludeIn({CUBRID, DERBY, ORACLE, SQLSERVER, POSTGRES, SQLITE, TERADATA})
-public class BeanPopulationBase extends AbstractBaseTest {
-
-    private final QEmployee e = new QEmployee("e");
-
-    @After
-    public void tearDown() {
-        delete(e).where(e.firstname.eq("John")).execute();
-    }
-
-    @Test
-    public void CustomProjection() {
-        // Insert
-        Employee employee = new Employee();
-        employee.setFirstname("John");
-        Integer id = insert(e).populate(employee).executeWithKey(e.id);
-        employee.setId(id);
-
-        // Update
-        employee.setLastname("S");
-        assertEquals(1l, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
-
-        // Query
-        Employee smith = extQuery().from(e).where(e.lastname.eq("S"))
-            .limit(1)
-            .uniqueResult(Employee.class, e.lastname, e.firstname);
-        assertEquals("John", smith.getFirstname());
-        assertEquals("S", smith.getLastname());
-
-        // Query with alias
-        smith = extQuery().from(e).where(e.lastname.eq("S"))
-            .limit(1)
-            .uniqueResult(Employee.class, e.lastname.as("lastname"), e.firstname.as("firstname"));
-        assertEquals("John", smith.getFirstname());
-        assertEquals("S", smith.getLastname());
-
-        // Query into custom type
-        OtherEmployee other = extQuery().from(e).where(e.lastname.eq("S"))
-            .limit(1)
-            .uniqueResult(OtherEmployee.class, e.lastname, e.firstname);
-        assertEquals("John", other.getFirstname());
-        assertEquals("S", other.getLastname());
-
-        // Delete (no changes needed)
-        assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
-    }
-
-    @Test
-    public void Insert_Update_Query_and_Delete() {
-        // Insert
-        Employee employee = new Employee();
-        employee.setFirstname("John");
-        Integer id = insert(e).populate(employee).executeWithKey(e.id);
-        assertNotNull(id);
-        employee.setId(id);
-
-        // Update
-        employee.setLastname("S");
-        assertEquals(1l, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
-
-        // Query
-        Employee smith = query().from(e).where(e.lastname.eq("S")).limit(1).uniqueResult(e);
-        assertEquals("John", smith.getFirstname());
-
-        // Delete (no changes needed)
-        assertEquals(1l, delete(e).where(e.id.eq(employee.getId())).execute());
-    }
-
-    @Test
-    public void Populate_With_BeanMapper() {
-        Employee employee = new Employee();
-        employee.setFirstname("John");
-        insert(e).populate(employee, new BeanMapper()).execute();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ColumnMetadataTest.java b/querydsl-sql/src/test/java/com/mysema/query/ColumnMetadataTest.java
deleted file mode 100644
index 49ba29eaac..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ColumnMetadataTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.Types;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.domain.QEmployee;
-
-public class ColumnMetadataTest {
-
-    @Test
-    public void DefaultColumn() {
-        ColumnMetadata column = ColumnMetadata.named("Person");
-        assertEquals("Person", column.getName());
-        assertFalse(column.hasJdbcType());
-        assertFalse(column.hasSize());
-        assertTrue(column.isNullable());
-    }
-
-    @Test
-    public void FullyConfigured() {
-        ColumnMetadata column = ColumnMetadata.named("Person").withSize(10)
-                .notNull().ofType(Types.BIGINT);
-        assertEquals("Person", column.getName());
-        assertTrue(column.hasJdbcType());
-        assertEquals(Types.BIGINT, column.getJdbcType());
-        assertTrue(column.hasSize());
-        assertEquals(10, column.getSize());
-        assertFalse(column.isNullable());
-    }
-
-    @Test
-    public void ExtractFromRelationalPath() {
-        ColumnMetadata column = ColumnMetadata.getColumnMetadata(QEmployee.employee.id);
-        assertEquals("ID", column.getName());
-    }
-
-    @Test
-    public void FallBackToDefaultWhenMissing() {
-        ColumnMetadata column = ColumnMetadata.getColumnMetadata(QEmployee.employee.salary);
-        assertEquals("SALARY", column.getName());
-    }
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/Connections.java b/querydsl-sql/src/test/java/com/mysema/query/Connections.java
deleted file mode 100644
index 19b0fc3162..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.sql.*;
-import java.util.Map;
-import java.util.Properties;
-
-import com.google.common.collect.Maps;
-import com.mysema.query.ddl.CreateTableClause;
-import com.mysema.query.ddl.DropTableClause;
-import com.mysema.query.sql.*;
-import org.hsqldb.types.Types;
-
-/**
- * @author tiwe
- *
- */
-public final class Connections {
-
-    public static final int TEST_ROW_COUNT = 100;
-
-    private static ThreadLocal<Connection> connHolder = new ThreadLocal<Connection>();
-
-    private static ThreadLocal<Target> targetHolder = new ThreadLocal<Target>();
-
-    private static ThreadLocal<SQLTemplates> templatesHolder = new ThreadLocal<SQLTemplates>();
-
-    // datetest
-    private static final String CREATE_TABLE_DATETEST = "create table DATE_TEST(DATE_TEST date)";
-
-    // survey
-    private static final String CREATE_TABLE_SURVEY =
-            "create table SURVEY(ID int auto_increment, NAME varchar(30), NAME2 varchar(30))";
-
-    // test
-    private static final String CREATE_TABLE_TEST = "create table TEST(NAME varchar(255))";
-
-    // timetest
-    private static final String CREATE_TABLE_TIMETEST = "create table TIME_TEST(TIME_TEST time)";
-
-    // employee
-    private static final String INSERT_INTO_EMPLOYEE = "insert into EMPLOYEE " +
-        "(ID, FIRSTNAME, LASTNAME, SALARY, DATEFIELD, TIMEFIELD, SUPERIOR_ID) " +
-        "values (?,?,?,?,?,?,?)";
-
-    private static final String INSERT_INTO_TEST_VALUES = "insert into TEST values(?)";
-
-    private static ThreadLocal<Statement> stmtHolder = new ThreadLocal<Statement>();
-
-    private static boolean derbyInited, sqlServerInited, h2Inited, hsqlInited, mysqlInited, cubridInited, oracleInited, postgresInited, sqliteInited, teradataInited;
-
-    public static void close() throws SQLException{
-        if (stmtHolder.get() != null) {
-            stmtHolder.get().close();
-        }
-        if (connHolder.get() != null) {
-            connHolder.get().close();
-        }
-    }
-
-    public static Connection getConnection() {
-        return connHolder.get();
-    }
-
-    public static Target getTarget() {
-        return targetHolder.get();
-    }
-
-    public static SQLTemplates getTemplates() {
-        return templatesHolder.get();
-    }
-
-    public static void setTemplates(SQLTemplates templates) {
-        templatesHolder.set(templates);
-    }
-
-    private static Connection getDerby() throws SQLException, ClassNotFoundException {
-        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-        String url = "jdbc:derby:target/demoDB;create=true";
-        return DriverManager.getConnection(url, "", "");
-    }
-
-    private static Connection getHSQL() throws SQLException, ClassNotFoundException {
-        Class.forName("org.hsqldb.jdbcDriver");
-        String url = "jdbc:hsqldb:target/tutorial";
-        return DriverManager.getConnection(url, "sa", "");
-    }
-
-    private static Connection getH2() throws SQLException, ClassNotFoundException{
-        Class.forName("org.h2.Driver");
-        String url = "jdbc:h2:~/dbs/h2-test;LOCK_MODE=0";
-        return DriverManager.getConnection(url, "sa", "");
-    }
-
-    private static Connection getMySQL() throws SQLException, ClassNotFoundException {
-        Class.forName("com.mysql.jdbc.Driver");
-        String url = "jdbc:mysql://localhost:3306/querydsl"; // ?useLegacyDatetimeCode=false
-        return DriverManager.getConnection(url, "querydsl", "querydsl");
-    }
-
-    private static Connection getOracle() throws SQLException, ClassNotFoundException{
-        Class.forName("oracle.jdbc.driver.OracleDriver");
-        String url = "jdbc:oracle:thin:@localhost:1521:xe";
-        return DriverManager.getConnection(url, "querydsl", "querydsl");
-    }
-
-    private static Connection getPostgres() throws ClassNotFoundException, SQLException{
-        Class.forName("org.postgresql.Driver");
-        String url = "jdbc:postgresql://localhost:5432/querydsl";
-        return DriverManager.getConnection(url, "querydsl", "querydsl");
-    }
-
-    private static Connection getSQLServer() throws ClassNotFoundException, SQLException{
-        Class.forName("net.sourceforge.jtds.jdbc.Driver");
-        Properties props = new Properties();
-        props.put("user", "querydsl");
-        props.put("password", "querydsl");
-        props.put("sendTimeAsDatetime", "false");
-        String url = "jdbc:jtds:sqlserver://localhost:1433/querydsl";
-//        return DriverManager.getConnection(url, "querydsl", "querydsl");
-        return DriverManager.getConnection(url, props);
-    }
-
-    private static Connection getCubrid() throws ClassNotFoundException, SQLException {
-        Class.forName("cubrid.jdbc.driver.CUBRIDDriver");
-        String url = "jdbc:cubrid:localhost:30000:demodb:public::";
-        return DriverManager.getConnection(url);
-    }
-
-    private static Connection getSQLite() throws SQLException, ClassNotFoundException {
-        //System.setProperty("sqlite.purejava", "true");
-        Class.forName("org.sqlite.JDBC");
-        return DriverManager.getConnection("jdbc:sqlite:target/sample.db");
-    }
-
-    private static Connection getTeradata() throws SQLException, ClassNotFoundException {
-        Class.forName("com.teradata.jdbc.TeraDriver");
-        return DriverManager.getConnection("jdbc:teradata://teradata/dbc", "querydsl", "querydsl");
-    }
-
-    private static CreateTableClause createTable(SQLTemplates templates, String table) {
-        return new CreateTableClause(connHolder.get(), templates, table);
-    }
-
-    public static void dropTable(SQLTemplates templates, String table) throws SQLException{
-        new DropTableClause(connHolder.get(), templates, table).execute();
-    }
-
-    public static void dropType(Statement stmt, String type) throws SQLException {
-        try {
-            stmt.execute("drop type " + type);
-        } catch (SQLException e) {
-            if (!e.getMessage().contains("does not exist")) {
-                throw e;
-            }
-        }
-    }
-
-    public static Statement getStatement() {
-        return stmtHolder.get();
-    }
-
-    private static void createEmployeeTable(SQLTemplates templates) {
-        createTable(templates, "EMPLOYEE")
-        .column("ID", Integer.class).notNull()
-        .column("FIRSTNAME", String.class).size(50)
-        .column("LASTNAME", String.class).size(50)
-        .column("SALARY", Double.class)
-        .column("DATEFIELD", Date.class)
-        .column("TIMEFIELD", Time.class)
-        .column("SUPERIOR_ID", Integer.class)
-        .primaryKey("PK_EMPLOYEE", "ID")
-        .foreignKey("FK_SUPERIOR","SUPERIOR_ID").references("EMPLOYEE","ID")
-        .execute();
-    }
-
-    public static Map<Integer, String> getSpatialData() {
-        Map<Integer, String> m = Maps.newHashMap();
-        // point
-        m.put(1, "POINT (2 2)");
-        m.put(2, "POINT (8 7)");
-        m.put(3, "POINT (1 9)");
-        m.put(4, "POINT (9 2)");
-        m.put(5, "POINT (4 4)");
-        // linestring
-        m.put(6, "LINESTRING (30 10, 10 30)");
-        m.put(7, "LINESTRING (30 10, 10 30, 40 40)");
-        // polygon
-        m.put(8, "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10), (20 30, 35 35, 30 20, 20 30))");
-        m.put(9, "POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10), (20 30, 35 35, 30 20, 20 30))");
-        // multipoint
-        m.put(11, "MULTIPOINT (10 40, 40 30)");
-        m.put(11, "MULTIPOINT (10 40, 40 30, 20 20, 30 10)");
-        // multilinestring
-        m.put(12, "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))");
-        m.put(13, "MULTILINESTRING ((10 10, 20 20, 10 40))");
-        // multipolygon
-        m.put(14, "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))");
-        m.put(15, "MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)), " +
-        	"((20 35, 10 30, 10 10, 30 5, 45 20, 20 35), " +
-        	"(30 20, 20 15, 20 25, 30 20)))");
-
-        // XXX POLYHEDRALSURFACE not supported
-
-        /* GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))
-           CIRCULARSTRING(1 5, 6 2, 7 3)
-           COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))
-           CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
-           MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,2 1,2 2))
-           TRIANGLE((0 0 0,0 1 0,1 1 0,0 0 0))
-           TIN (((0 0 0, 0 0 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)))
-        */
-        return m;
-    }
-
-    public static void initCubrid() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.CUBRID);
-        //SQLTemplates templates = new MySQLTemplates();
-        Connection c = getCubrid();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (cubridInited) {
-            return;
-        }
-
-        // survey
-        stmt.execute("drop table if exists SURVEY");
-        stmt.execute("create table SURVEY(ID int auto_increment(16693,2), " +
-                "NAME varchar(30)," +
-                "NAME2 varchar(30)," +
-                "constraint suryey_pk primary key(ID))");
-        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
-
-        // test
-        stmt.execute("drop table if exists \"TEST\"");
-        stmt.execute("create table \"TEST\"(NAME varchar(255))");
-        PreparedStatement pstmt = c.prepareStatement("insert into \"TEST\" values(?)");
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        stmt.execute("drop table if exists EMPLOYEE");
-        //createEmployeeTable(templates);
-        stmt.execute("create table EMPLOYEE ( " +
-          "ID INT PRIMARY KEY AUTO_INCREMENT, " +
-          "FIRSTNAME VARCHAR(50), " +
-          "LASTNAME VARCHAR(50), " +
-          "SALARY DECIMAL, "  +
-          "DATEFIELD DATE, " +
-          "TIMEFIELD TIME, " +
-          "SUPERIOR_ID INT, " +
-          "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
-        ")");
-
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        stmt.execute("drop table if exists TIME_TEST");
-        stmt.execute("drop table if exists DATE_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        cubridInited = true;
-    }
-
-    public static void initDerby() throws SQLException, ClassNotFoundException {
-        targetHolder.set(Target.DERBY);
-        SQLTemplates templates = new DerbyTemplates();
-        Connection c = getDerby();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (derbyInited) {
-            return;
-        }
-
-        // types
-        dropType(stmt, "price restrict");
-        stmt.execute("create type price external name 'com.example.Price' language java");
-
-        // survey
-        dropTable(templates, "SURVEY");
-        stmt.execute("create table SURVEY(" +
-        	"ID int generated by default as identity(start with 1, increment by 1), " +
-        	"NAME varchar(30)," +
-        	"NAME2 varchar(30))");
-        stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
-
-        // test
-        dropTable(templates, "TEST");
-        stmt.execute(CREATE_TABLE_TEST);
-        stmt.execute("create index test_name on test(name)");
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        dropTable(templates, "EMPLOYEE");
-
-        createEmployeeTable(templates);
-
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        dropTable(templates, "TIME_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-
-        dropTable(templates, "DATE_TEST");
-        stmt.execute(CREATE_TABLE_DATETEST);
-        derbyInited = true;
-    }
-
-
-
-    public static void initH2() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.H2);
-        SQLTemplates templates = new H2Templates();
-        Connection c = getH2();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (h2Inited) {
-            return;
-        }
-
-        stmt.execute("DROP ALIAS IF EXISTS InitGeoDB");
-        stmt.execute("CREATE ALIAS InitGeoDB for \"geodb.GeoDB.InitGeoDB\"");
-        stmt.execute("CALL InitGeoDB()");
-
-        // shapes
-        dropTable(templates, "SHAPES");
-        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY blob)");
-        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
-            stmt.execute("insert into SHAPES values(" + entry.getKey()
-                    +", ST_GeomFromText('" + entry.getValue() + "', 4326))");
-        }
-
-        // qtest
-        stmt.execute("drop table QTEST if exists");
-        stmt.execute("create table QTEST (ID int IDENTITY(1,1) NOT NULL,  C1 int NULL)");
-
-        // survey
-        stmt.execute("drop table SURVEY if exists");
-        stmt.execute(CREATE_TABLE_SURVEY);
-        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello');");
-        stmt.execute("alter table SURVEY alter column id int auto_increment");
-
-        // test
-        stmt.execute("drop table TEST if exists");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        stmt.execute("drop table EMPLOYEE if exists");
-        createEmployeeTable(templates);
-        stmt.execute("alter table EMPLOYEE alter column id int auto_increment");
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-
-        // date_test and time_test
-        stmt.execute("drop table TIME_TEST if exists");
-        stmt.execute("drop table DATE_TEST if exists");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        h2Inited = true;
-    }
-
-    public static void initHSQL() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.HSQLDB);
-        SQLTemplates templates = new HSQLDBTemplates();
-        Connection c = getHSQL();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (hsqlInited) {
-            return;
-        }
-
-        // dual
-        stmt.execute("drop table DUAL if exists");
-        stmt.execute("create table DUAL ( DUMMY varchar(1) )");
-        stmt.execute("insert into DUAL (DUMMY) values ('X')");
-
-        // survey
-        stmt.execute("drop table SURVEY if exists");
-        //stmt.execute(CREATE_TABLE_SURVEY);
-        stmt.execute("create table SURVEY(" +
-                "ID int generated by default as identity, " +
-                "NAME varchar(30)," +
-                "NAME2 varchar(30))");
-        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello')");
-
-        // test
-        stmt.execute("drop table TEST if exists");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        stmt.execute("drop table EMPLOYEE if exists");
-        createEmployeeTable(templates);
-        stmt.execute("alter table EMPLOYEE alter column id int generated by default as identity");
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        stmt.execute("drop table TIME_TEST if exists");
-        stmt.execute("drop table DATE_TEST if exists");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        hsqlInited = true;
-    }
-
-    public static void initMySQL() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.MYSQL);
-        //SQLTemplates templates = new MySQLTemplates();
-        Connection c = getMySQL();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (mysqlInited) {
-            return;
-        }
-
-        // shapes
-        stmt.execute("drop table if exists SHAPES");
-        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)");
-        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
-            stmt.execute("insert into SHAPES values(" + entry.getKey()
-                    +", GeomFromText('" + entry.getValue() + "'))");
-        }
-
-        // survey
-        stmt.execute("drop table if exists SURVEY");
-        stmt.execute("create table SURVEY(ID int primary key auto_increment, " +
-                "NAME varchar(30)," +
-                "NAME2 varchar(30))");
-        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
-
-        // test
-        stmt.execute("drop table if exists TEST");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        stmt.execute("drop table if exists EMPLOYEE");
-        //createEmployeeTable(templates);
-        stmt.execute("create table EMPLOYEE ( " +
-                "ID INT PRIMARY KEY AUTO_INCREMENT, " +
-                "FIRSTNAME VARCHAR(50), " +
-                "LASTNAME VARCHAR(50), " +
-                "SALARY DECIMAL, "  +
-                "DATEFIELD DATE, " +
-                "TIMEFIELD TIME, " +
-                "SUPERIOR_ID INT, " +
-                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
-                ")");
-
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        stmt.execute("drop table if exists TIME_TEST");
-        stmt.execute("drop table if exists DATE_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        mysqlInited = true;
-    }
-
-    public static void initOracle() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.ORACLE);
-        SQLTemplates templates = new OracleTemplates();
-        Connection c = getOracle();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (oracleInited) {
-            return;
-        }
-
-        // types
-        stmt.execute("create or replace type ssn_t as object (ssn_type char(11))");
-
-        // survey
-        dropTable(templates, "SURVEY");
-        stmt.execute("create table SURVEY (ID number(10,0), " +
-                "NAME varchar(30 char)," +
-                "NAME2 varchar(30 char))");
-
-        try {
-            stmt.execute("drop sequence survey_seq");
-        } catch(SQLException e) {
-            if (!e.getMessage().contains("sequence does not exist")) {
-                throw e;
-            }
-        }
-
-        stmt.execute("create sequence survey_seq");
-        stmt.execute("create or replace trigger survey_trigger\n"+
-                "before insert on survey\n"+
-                "for each row\n" +
-                "when (new.id is null)\n"+
-                "begin\n"+
-                "  select survey_seq.nextval into :new.id from dual;\n"+
-                "end;\n");
-
-        stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
-
-        // test
-        dropTable(templates, "TEST");
-        stmt.execute("create table TEST(name varchar(255))");
-        String sql  = "insert into TEST values(?)";
-        PreparedStatement pstmt = c.prepareStatement(sql);
-        for (int i = 0; i < TEST_ROW_COUNT; i++) {
-            pstmt.setString(1, "name" + i);
-            pstmt.addBatch();
-        }
-        pstmt.executeBatch();
-
-        // employee
-        dropTable(templates, "EMPLOYEE");
-        stmt.execute("create table EMPLOYEE ( " +
-                "ID NUMBER(10,0), " +
-                "FIRSTNAME VARCHAR2(50 CHAR), " +
-                "LASTNAME VARCHAR2(50 CHAR), " +
-                "SALARY DOUBLE PRECISION, " +
-                "DATEFIELD DATE, " +
-                "TIMEFIELD TIMESTAMP, " +
-                "SUPERIOR_ID NUMBER(10,0), " +
-                "CONSTRAINT PK_EMPLOYEE PRIMARY KEY(ID), " +
-                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID)" +
-                ")");
-
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        dropTable(templates, "DATE_TEST");
-        stmt.execute("create table date_test(date_test date)");
-        oracleInited = true;
-    }
-
-    public static void initPostgres() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.POSTGRES);
-        SQLTemplates templates = new PostgresTemplates(true);
-        // NOTE : unquoted identifiers are converted to lower case in Postgres
-        Connection c = getPostgres();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (postgresInited) {
-            return;
-        }
-
-        // shapes
-        dropTable(templates, "SHAPES");
-//        stmt.execute("create table \"SHAPES\" (\"ID\" int not null primary key, \"GEOMETRY\" geography(POINT,4326))");
-        stmt.execute("create table \"SHAPES\" (\"ID\" int not null primary key)");
-        stmt.execute("select AddGeometryColumn('SHAPES', 'GEOMETRY', -1, 'GEOMETRY', 2)");
-        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
-            stmt.execute("insert into \"SHAPES\" values(" + entry.getKey()
-                    +", '" + entry.getValue() + "')");
-        }
-
-        // types
-        dropType(stmt, "u_country");
-        stmt.execute("create type u_country as enum ('Brazil', 'England', 'Germany')");
-
-        dropType(stmt, "u_street_type");
-        stmt.execute("create type u_street_type as (street VARCHAR(100), number VARCHAR(30))");
-
-        // arrays
-        dropTable(templates, "ARRAYTEST");
-        stmt.execute("create table \"ARRAYTEST\" (\n" +
-                "\"ID\" bigint primary key,\n" +
-                "\"MYARRAY\" varchar(8)[])");
-
-        // survey
-        dropTable(templates, "SURVEY");
-        try {
-            stmt.execute("drop sequence SURVEY_SEQ");
-        } catch(SQLException e) {
-            if (!e.getMessage().contains("does not exist")) {
-                throw e;
-            }
-        }
-        stmt.execute("create sequence SURVEY_SEQ");
-        stmt.execute("create table \"SURVEY\"(" +
-                "\"ID\" int DEFAULT NEXTVAL('SURVEY_SEQ'), " +
-                "\"NAME\" varchar(30), \"NAME2\" varchar(30))");
-        stmt.execute("insert into \"SURVEY\" values (1, 'Hello World', 'Hello')");
-
-        // test
-        dropTable(templates, "TEST");
-        stmt.execute(quote(CREATE_TABLE_TEST,"TEST","NAME"));
-        String sql = quote(INSERT_INTO_TEST_VALUES,"TEST");
-        PreparedStatement pstmt = c.prepareStatement(sql);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        // stmt.execute("drop table employee if exists");
-        dropTable(templates, "EMPLOYEE");
-        createEmployeeTable(templates);
-        addEmployees("insert into \"EMPLOYEE\" " +
-                "(\"ID\", \"FIRSTNAME\", \"LASTNAME\", \"SALARY\", \"DATEFIELD\", \"TIMEFIELD\", \"SUPERIOR_ID\") " +
-                "values (?,?,?,?,?,?,?)");
-
-        // date_test and time_test
-        dropTable(templates, "TIME_TEST");
-        dropTable(templates, "DATE_TEST");
-        stmt.execute(quote(CREATE_TABLE_TIMETEST, "TIME_TEST"));
-        stmt.execute(quote(CREATE_TABLE_DATETEST, "DATE_TEST"));
-        postgresInited = true;
-    }
-
-    public static void initSQLite() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.SQLITE);
-//        SQLTemplates templates = new SQLiteTemplates();
-        Connection c = getSQLite();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (sqliteInited) {
-            return;
-        }
-
-        // qtest
-        stmt.execute("drop table if exists QTEST");
-        stmt.execute("create table QTEST (ID int IDENTITY(1,1) NOT NULL,  C1 int NULL)");
-
-        // survey
-        stmt.execute("drop table if exists SURVEY");
-        stmt.execute("create table SURVEY(ID int auto_increment, " +
-                "NAME varchar(30)," +
-                "NAME2 varchar(30)," +
-                "constraint suryey_pk primary key(ID))");
-        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
-
-        // test
-        stmt.execute("drop table if exists TEST");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        stmt.execute("drop table if exists EMPLOYEE");
-        stmt.execute("create table EMPLOYEE ( " +
-                "ID INT AUTO_INCREMENT, " +
-                "FIRSTNAME VARCHAR(50), " +
-                "LASTNAME VARCHAR(50), " +
-                "SALARY DECIMAL, "  +
-                "DATEFIELD DATE, " +
-                "TIMEFIELD TIME, " +
-                "SUPERIOR_ID INT, " +
-                "CONSTRAINT PK_EMPLOYEE PRIMARY KEY(ID),"+
-                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
-              ")");
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-
-        // date_test and time_test
-        stmt.execute("drop table if exists TIME_TEST");
-        stmt.execute("drop table if exists DATE_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        sqliteInited = true;
-    }
-
-    public static void initSQLServer() throws SQLException, ClassNotFoundException {
-        targetHolder.set(Target.SQLSERVER);
-        SQLTemplates templates = new SQLServerTemplates();
-        Connection c = getSQLServer();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (sqlServerInited) {
-            return;
-        }
-
-        dropTable(templates, "SHAPES");
-        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)");
-        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
-            stmt.execute("insert into SHAPES values(" + entry.getKey()
-                    +", geometry::STGeomFromText('" + entry.getValue() + "', 0))");
-        }
-
-        // survey
-        dropTable(templates, "SURVEY");
-        stmt.execute("create table SURVEY(ID int, NAME varchar(30), NAME2 varchar(30))");
-        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello')");
-
-        // test
-        dropTable(templates, "TEST");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        dropTable(templates, "EMPLOYEE");
-        createEmployeeTable(templates);
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        dropTable(templates, "TIME_TEST");
-        dropTable(templates, "DATE_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        sqlServerInited = true;
-    }
-
-    public static void initTeradata() throws SQLException, ClassNotFoundException{
-        targetHolder.set(Target.TERADATA);
-        SQLTemplates templates = new TeradataTemplates();
-        Connection c = getTeradata();
-        connHolder.set(c);
-        Statement stmt = c.createStatement();
-        stmtHolder.set(stmt);
-
-        if (teradataInited) {
-            return;
-        }
-
-        String identity = "GENERATED ALWAYS AS IDENTITY(START WITH 1 INCREMENT BY 1)";
-
-        // shapes
-        dropTable(templates, "SHAPES");
-        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY ST_GEOMETRY)");
-        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
-            stmt.execute("insert into SHAPES values(" + entry.getKey()
-                    +", '" + entry.getValue() + "')");
-        }
-
-        // qtest
-        dropTable(templates, "QTEST");
-        stmt.execute("create table QTEST (ID int " + identity + " NOT NULL,  C1 int NULL)");
-
-        // survey
-        dropTable(templates, "SURVEY");
-        stmt.execute("create table SURVEY(ID int " + identity + ", NAME varchar(30), NAME2 varchar(30))");
-        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello');");
-
-        // test
-        dropTable(templates, "TEST");
-        stmt.execute(CREATE_TABLE_TEST);
-        PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES);
-        try{
-            for (int i = 0; i < TEST_ROW_COUNT; i++) {
-                pstmt.setString(1, "name" + i);
-                pstmt.addBatch();
-            }
-            pstmt.executeBatch();
-        }finally{
-            pstmt.close();
-        }
-
-        // employee
-        dropTable(templates, "EMPLOYEE");
-        stmt.execute("create table EMPLOYEE (\n" +
-                "ID INTEGER NOT NULL PRIMARY KEY, \n" +
-                "FIRSTNAME VARCHAR(100),\n" +
-                "LASTNAME VARCHAR(100),\n" +
-                "SALARY DOUBLE PRECISION,\n" +
-                "DATEFIELD DATE,\n" +
-                "TIMEFIELD TIME,\n" +
-                "SUPERIOR_ID INTEGER,\n" +
-                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID))");
-        addEmployees(INSERT_INTO_EMPLOYEE);
-
-        // date_test and time_test
-        dropTable(templates, "TIME_TEST");
-        dropTable(templates, "DATE_TEST");
-        stmt.execute(CREATE_TABLE_TIMETEST);
-        stmt.execute(CREATE_TABLE_DATETEST);
-        teradataInited = true;
-    }
-
-    static void addEmployee(String sql, int id, String firstName, String lastName,
-            double salary, int superiorId) throws SQLException {
-        PreparedStatement stmt = connHolder.get().prepareStatement(sql);
-        stmt.setInt(1, id);
-        stmt.setString(2, firstName);
-        stmt.setString(3,lastName);
-        stmt.setDouble(4, salary);
-        stmt.setDate(5, Constants.date);
-        stmt.setTime(6, Constants.time);
-        if (superiorId <= 0) {
-            stmt.setNull(7, Types.INTEGER);
-        } else {
-            stmt.setInt(7, superiorId);
-        }
-        stmt.execute();
-        stmt.close();
-    }
-
-    private static void addEmployees(String sql) throws SQLException {
-        addEmployee(sql, 1, "Mike", "Smith", 160000, -1);
-        addEmployee(sql, 2, "Mary", "Smith", 140000, -1);
-
-        // Employee under Mike
-        addEmployee(sql, 10, "Joe", "Divis", 50000, 1);
-        addEmployee(sql, 11, "Peter", "Mason", 45000, 1);
-        addEmployee(sql, 12, "Steve", "Johnson", 40000, 1);
-        addEmployee(sql, 13, "Jim", "Hood", 35000, 1);
-
-        // Employee under Mike
-        addEmployee(sql, 20, "Jennifer", "Divis", 60000, 2);
-        addEmployee(sql, 21, "Helen", "Mason", 50000, 2);
-        addEmployee(sql, 22, "Daisy", "Johnson", 40000, 2);
-        addEmployee(sql, 23, "Barbara", "Hood", 30000, 2);
-    }
-
-    private static String quote(String sql, String... identifiers) {
-        String rv = sql;
-        for (String id : identifiers) {
-            rv = rv.replace(id,  "\"" + id +  "\"");
-        }
-        return rv;
-    }
-
-    private Connections() {}
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ConnectionsTest.java b/querydsl-sql/src/test/java/com/mysema/query/ConnectionsTest.java
deleted file mode 100644
index 78a8cfa6e9..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ConnectionsTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.geolatte.geom.codec.Wkt;
-import org.junit.Test;
-
-public class ConnectionsTest {
-
-    @Test
-    public void Valid_Wkt() {
-        for (String wkt : Connections.getSpatialData().values()) {
-            assertNotNull(Wkt.newWktDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(wkt));
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/Constants.java b/querydsl-sql/src/test/java/com/mysema/query/Constants.java
deleted file mode 100644
index b447fcc055..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/Constants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.Calendar;
-
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-
-public final class Constants {
-
-    private Constants() {}
-
-    public static final java.sql.Date date;
-
-    public static final java.sql.Time time;
-
-    public static final QEmployee employee = new QEmployee("e");
-
-    public static final QEmployee employee2 = new QEmployee("e2");
-
-    public static final QSurvey survey = new QSurvey("s");
-
-    public static final QSurvey survey2 = new QSurvey("s2");
-
-    static{
-        Calendar cal = Calendar.getInstance();
-        cal.clear();
-        cal.set(Calendar.YEAR, 2000);
-        cal.set(Calendar.MONTH, 1);
-        cal.set(Calendar.DAY_OF_MONTH, 2);
-        date = new java.sql.Date(cal.getTimeInMillis());
-
-        cal = Calendar.getInstance();
-        cal.set(1970, 0, 1, 3, 4);
-        cal.set(Calendar.SECOND, 30);
-        cal.set(Calendar.MILLISECOND, 0);
-        time = new java.sql.Time(cal.getTimeInMillis());
-    }
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/DeleteBase.java b/querydsl-sql/src/test/java/com/mysema/query/DeleteBase.java
deleted file mode 100644
index 23a86c6455..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/DeleteBase.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.H2;
-import static com.mysema.query.Target.MYSQL;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.Target.SQLSERVER;
-import static org.junit.Assert.assertEquals;
-
-import java.sql.SQLException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.dml.SQLDeleteClause;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.expr.Param;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-
-public class DeleteBase extends AbstractBaseTest{
-
-    private void reset() throws SQLException{
-        delete(survey).where(survey.name.isNotNull()).execute();
-        insert(survey).values(1, "Hello World", "Hello").execute();
-    }
-
-    @Before
-    public void setUp() throws SQLException{
-        reset();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        reset();
-    }
-
-    @Test
-    public void Batch() throws SQLException{
-        insert(survey).values(2, "A","B").execute();
-        insert(survey).values(3, "B","C").execute();
-
-        SQLDeleteClause delete = delete(survey);
-        delete.where(survey.name.eq("A")).addBatch();
-        delete.where(survey.name.eq("B")).addBatch();
-        assertEquals(2, delete.execute());
-    }
-
-    @Test
-    @ExcludeIn(MYSQL)
-    public void Delete() throws SQLException{
-        long count = query().from(survey).count();
-        assertEquals(0, delete(survey).where(survey.name.eq("XXX")).execute());
-        assertEquals(count, delete(survey).execute());
-    }
-
-    @Test
-    @IncludeIn({CUBRID, H2, MYSQL, ORACLE, SQLSERVER})
-    public void Delete_Limit() {
-        insert(survey).values(2, "A","B").execute();
-        insert(survey).values(3, "B","C").execute();
-        insert(survey).values(4, "D","E").execute();
-
-        assertEquals(2, delete(survey).limit(2).execute());
-    }
-
-    @Test
-    public void Delete_with_SubQuery_exists() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLDeleteClause delete = delete(survey1);
-        delete.where(survey1.name.eq("XXX"),
-                sq().from(employee).where(survey1.id.eq(employee.id)).exists());
-        delete.execute();
-    }
-
-    @Test
-    public void Delete_with_SubQuery_exists_Params() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-
-        Param<Integer> param = new Param<Integer>(Integer.class, "param");
-        SQLSubQuery sq = sq().from(employee).where(employee.id.eq(param));
-        sq.set(param, -12478923);
-
-        SQLDeleteClause delete = delete(survey1);
-        delete.where(survey1.name.eq("XXX"), sq.exists());
-        delete.execute();
-    }
-
-    @Test
-    public void Delete_with_SubQuery_exists2() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLDeleteClause delete = delete(survey1);
-        delete.where(survey1.name.eq("XXX"),
-                sq().from(employee).where(survey1.name.eq(employee.lastname)).exists());
-        delete.execute();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/DependenciesTest.java b/querydsl-sql/src/test/java/com/mysema/query/DependenciesTest.java
deleted file mode 100644
index 537c4f012b..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/DependenciesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertFalse;
-
-import java.io.IOException;
-
-import jdepend.framework.JDepend;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class DependenciesTest {
-    
-    @Test
-    @Ignore
-    public void test() throws IOException{
-        JDepend jdepend = new JDepend();        
-        jdepend.addDirectory("target/classes/com/mysema/query/sql");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/ddl");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/dml");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/mssql");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/mysql");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/oracle");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/support");
-        jdepend.addDirectory("target/classes/com/mysema/query/sql/types");
-
-        jdepend.analyze();    
-        assertFalse(jdepend.containsCycles());
-
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java b/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java
deleted file mode 100644
index 7e3d96a4e9..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLQuery.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.sql.Connection;
-import java.util.List;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.sql.AbstractSQLQuery;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.QBean;
-
-/**
- * @author tiwe
- *
- */
-public class ExtendedSQLQuery extends AbstractSQLQuery<ExtendedSQLQuery> {
-
-    public ExtendedSQLQuery(SQLTemplates templates) {
-        super(null, new Configuration(templates), new DefaultQueryMetadata());
-    }
-
-    public ExtendedSQLQuery(Connection conn, SQLTemplates templates) {
-        super(conn, new Configuration(templates), new DefaultQueryMetadata());
-    }
-    
-    public ExtendedSQLQuery(Connection conn, Configuration configuration) {
-        super(conn, configuration, new DefaultQueryMetadata());
-    }
-
-    public ExtendedSQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
-        super(conn, configuration, metadata);
-    }
-    
-    public <T> CloseableIterator<T> iterate(Class<T> type, Expression<?>... exprs) {
-        return iterate(createProjection(type, exprs));
-    }
-    
-    public <T> T uniqueResult(Class<T> type, Expression<?>... exprs) {
-        return uniqueResult(createProjection(type, exprs));
-    }
-    
-    public <T> List<T> list(Class<T> type, Expression<?>... exprs) {
-        return list(createProjection(type, exprs));
-    }
-    
-    public <T> SearchResults<T> listResults(Class<T> type, Expression<?>... exprs) {
-        return listResults(createProjection(type, exprs));
-    }
-    
-    private <T> FactoryExpression<T> createProjection(Class<T> type, Expression<?>... exprs) {
-        return new QBean<T>(type, exprs);
-    }
-
-    @Override
-    public ExtendedSQLQuery clone(Connection connection) {
-        ExtendedSQLQuery query = new ExtendedSQLQuery(connection, getConfiguration(), getMetadata().clone());
-        query.clone(this);
-        return query;
-    }
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java b/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java
deleted file mode 100644
index ebca6ff4e9..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import com.mysema.query.QueryFlag.Position;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.dml.DefaultMapper;
-import com.mysema.query.sql.dml.Mapper;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QDateTest;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.query.types.expr.Param;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Constants.survey2;
-import static com.mysema.query.Target.*;
-import static org.junit.Assert.*;
-
-public class InsertBase extends AbstractBaseTest {
-
-    private void reset() throws SQLException{
-        delete(survey).execute();
-        insert(survey).values(1, "Hello World", "Hello").execute();
-
-        delete(QDateTest.qDateTest).execute();
-    }
-
-    @Before
-    public void setUp() throws SQLException{
-        reset();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        reset();
-    }
-
-    @Test
-    @ExcludeIn(SQLITE) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems
-    public void Insert_Dates() {
-        QDateTest dateTest = QDateTest.qDateTest;
-        LocalDate localDate = new LocalDate(1978, 1, 2);
-
-        Path<LocalDate> localDateProperty = new PathImpl<LocalDate>(LocalDate.class, "DATE_TEST");
-        Path<DateTime> dateTimeProperty = new PathImpl<DateTime>(DateTime.class, "DATE_TEST");
-        SQLInsertClause insert = insert(dateTest);
-        insert.set(localDateProperty, localDate);
-        insert.execute();
-
-        Tuple result = query().from(dateTest).singleResult(
-                dateTest.dateTest.year(),
-                dateTest.dateTest.month(),
-                dateTest.dateTest.dayOfMonth(),
-                dateTimeProperty);
-        assertEquals(Integer.valueOf(1978), result.get(0, Integer.class));
-        assertEquals(Integer.valueOf(1), result.get(1, Integer.class));
-        assertEquals(Integer.valueOf(2), result.get(2, Integer.class));
-
-        DateTime dateTime = result.get(dateTimeProperty);
-        if (target == CUBRID) {
-            // XXX Cubrid adds random milliseconds for some reason
-            dateTime = dateTime.withMillisOfSecond(0);
-        }
-        assertEquals(localDate.toDateTimeAtStartOfDay(), dateTime);
-    }
-
-    @Test
-    public void Complex1() {
-        // related to #584795
-        QSurvey survey = new QSurvey("survey");
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SQLInsertClause insert = insert(survey);
-        insert.columns(survey.id, survey.name);
-        insert.select(new SQLSubQuery().from(survey)
-          .innerJoin(emp1)
-           .on(survey.id.eq(emp1.id))
-          .innerJoin(emp2)
-           .on(emp1.superiorId.eq(emp2.superiorId), emp1.firstname.eq(emp2.firstname))
-          .list(survey.id, emp2.firstname));
-
-        insert.execute();
-    }
-
-    @Test
-    public void Insert_Alternative_Syntax() {
-        // with columns
-        assertEquals(1, insert(survey)
-            .set(survey.id, 3)
-            .set(survey.name, "Hello")
-            .execute());
-    }
-
-    @Test
-    public void Insert_Batch() {
-        SQLInsertClause insert = insert(survey)
-            .set(survey.id, 5)
-            .set(survey.name, "55")
-            .addBatch();
-
-        insert.set(survey.id, 6)
-            .set(survey.name, "66")
-            .addBatch();
-
-        assertEquals(2, insert.execute());
-
-        assertEquals(1l, query().from(survey).where(survey.name.eq("55")).count());
-        assertEquals(1l, query().from(survey).where(survey.name.eq("66")).count());
-    }
-
-    @Test
-    public void Insert_Batch2() {
-        SQLInsertClause insert = insert(survey)
-                .set(survey.id, 5)
-                .set(survey.name, "55")
-                .addBatch();
-
-        insert.set(survey.id, 6)
-                .setNull(survey.name)
-                .addBatch();
-
-        assertEquals(2, insert.execute());
-    }
-
-    @Test
-    public void Insert_Null_With_Columns() {
-        assertEquals(1, insert(survey)
-                .columns(survey.id, survey.name)
-                .values(3, null).execute());
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Insert_Null_Without_Columns() {
-        assertEquals(1, insert(survey)
-                .values(4, null, null).execute());
-    }
-
-    @Test
-    @ExcludeIn({HSQLDB, DERBY, ORACLE})
-    public void Insert_Without_Values() {
-        assertEquals(1, insert(survey).execute());
-    }
-
-    @Test
-    @ExcludeIn(ORACLE)
-    public void Insert_Nulls_In_Batch() {
-//        QFoo f= QFoo.foo;
-//        SQLInsertClause sic = new SQLInsertClause(c, new H2Templates(), f);
-//        sic.columns(f.c1,f.c2).values(null,null).addBatch();
-//        sic.columns(f.c1,f.c2).values(null,1).addBatch();
-//        sic.execute();
-        SQLInsertClause sic = insert(survey);
-        sic.columns(survey.name, survey.name2).values(null, null).addBatch();
-        sic.columns(survey.name, survey.name2).values(null, "X").addBatch();
-        sic.execute();
-    }
-
-    @Test
-    @Ignore
-    @ExcludeIn({DERBY})
-    public void Insert_Nulls_In_Batch2() {
-        Mapper<Object> mapper = DefaultMapper.WITH_NULL_BINDINGS;
-//        QFoo f= QFoo.foo;
-//        SQLInsertClause sic = new SQLInsertClause(c, new H2Templates(), f);
-//        Foo f1=new Foo();
-//        sic.populate(f1).addBatch();
-//        f1=new Foo();
-//        f1.setC1(1);
-//        sic.populate(f1).addBatch();
-//        sic.execute();
-        QEmployee employee = QEmployee.employee;
-        SQLInsertClause sic = insert(employee);
-        Employee e = new Employee();
-        sic.populate(e, mapper).addBatch();
-        e = new Employee();
-        e.setFirstname("X");
-        sic.populate(e, mapper).addBatch();
-        sic.execute();
-
-    }
-
-    @Test
-    public void Insert_With_Columns() {
-        assertEquals(1, insert(survey)
-                .columns(survey.id, survey.name)
-                .values(3, "Hello").execute());
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, SQLSERVER})
-    public void Insert_With_Keys() throws SQLException{
-        ResultSet rs = insert(survey).set(survey.name, "Hello World").executeWithKeys();
-        assertTrue(rs.next());
-        assertTrue(rs.getObject(1) != null);
-        rs.close();
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, SQLSERVER})
-    public void Insert_With_Keys_Projected() throws SQLException{
-        assertNotNull(insert(survey).set(survey.name, "Hello you").executeWithKey(survey.id));
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, SQLSERVER})
-    public void Insert_With_Keys_Projected2() throws SQLException{
-        Path<Object> idPath = new PathImpl<Object>(Object.class, "id");
-        Object id = insert(survey).set(survey.name, "Hello you").executeWithKey(idPath);
-        assertNotNull(id);
-    }
-
- // http://sourceforge.net/tracker/index.php?func=detail&aid=3513432&group_id=280608&atid=2377440
-
-    @Test
-    public void Insert_With_Set() {
-        assertEquals(1, insert(survey)
-                .set(survey.id, 5)
-                .set(survey.name, (String)null)
-                .execute());
-    }
-
-    @Test
-    @IncludeIn(MYSQL)
-    @SkipForQuoted
-    public void Insert_with_Special_Options() {
-        SQLInsertClause clause = insert(survey)
-            .columns(survey.id, survey.name)
-            .values(3, "Hello");
-
-        clause.addFlag(Position.START_OVERRIDE, "insert ignore into ");
-
-        assertEquals("insert ignore into SURVEY (ID, NAME) values (?, ?)", clause.toString());
-        clause.execute();
-    }
-
-    @Test
-    public void Insert_With_SubQuery() {
-        int count = (int)query().from(survey).count();
-        assertEquals(count, insert(survey)
-            .columns(survey.id, survey.name)
-            .select(sq().from(survey2).list(survey2.id.add(20), survey2.name))
-            .execute());
-    }
-
-    @Test
-    @ExcludeIn({HSQLDB, CUBRID, DERBY})
-    public void Insert_With_SubQuery2() {
-//        insert into modules(name)
-//        select 'MyModule'
-//        where not exists
-//        (select 1 from modules where modules.name = 'MyModule')
-
-        assertEquals(1, insert(survey).set(survey.name,
-            sq().where(sq().from(survey2)
-                           .where(survey2.name.eq("MyModule")).notExists())
-                .unique(Expressions.constant("MyModule")))
-            .execute());
-
-        assertEquals(1l , query().from(survey).where(survey.name.eq("MyModule")).count());
-    }
-
-    @Test
-    @ExcludeIn({HSQLDB, CUBRID, DERBY})
-    public void Insert_With_SubQuery3() {
-//        insert into modules(name)
-//        select 'MyModule'
-//        where not exists
-//        (select 1 from modules where modules.name = 'MyModule')
-
-        assertEquals(1, insert(survey).columns(survey.name).select(
-            sq().where(sq().from(survey2)
-                           .where(survey2.name.eq("MyModule2")).notExists())
-                .unique(Expressions.constant("MyModule2")))
-            .execute());
-
-        assertEquals(1l , query().from(survey).where(survey.name.eq("MyModule2")).count());
-    }
-
-    @Test
-    public void Insert_With_SubQuery_Params() {
-        Param<Integer> param = new Param<Integer>(Integer.class, "param");
-        SQLSubQuery sq = sq().from(survey2);
-        sq.set(param, 20);
-
-        int count = (int)query().from(survey).count();
-        assertEquals(count, insert(survey)
-            .columns(survey.id, survey.name)
-            .select(sq.list(survey2.id.add(param), survey2.name))
-            .execute());
-    }
-
-    @Test
-    public void Insert_With_SubQuery_Via_Constructor() {
-        int count = (int)query().from(survey).count();
-        SQLInsertClause insert = insert(survey, sq().from(survey2));
-        insert.set(survey.id, survey2.id.add(20));
-        insert.set(survey.name, survey2.name);
-        assertEquals(count, insert.execute());
-    }
-
-    @Test
-    public void Insert_With_SubQuery_Without_Columns() {
-        int count = (int)query().from(survey).count();
-        assertEquals(count, insert(survey)
-            .select(sq().from(survey2).list(survey2.id.add(10), survey2.name, survey2.name2))
-            .execute());
-
-    }
-
-    @Test
-    public void Insert_Without_Columns() {
-        assertEquals(1, insert(survey).values(4, "Hello", "World").execute());
-
-    }
-
-    @Test
-    public void InsertBatch_with_Subquery() {
-        SQLInsertClause insert = insert(survey)
-            .columns(survey.id, survey.name)
-            .select(sq().from(survey2).list(survey2.id.add(20), survey2.name))
-            .addBatch();
-
-        insert(survey)
-            .columns(survey.id, survey.name)
-            .select(sq().from(survey2).list(survey2.id.add(40), survey2.name))
-            .addBatch();
-
-        insert.execute();
-//        assertEquals(1, insert.execute());
-    }
-
-    @Test
-    public void Like() {
-        insert(survey).values(11, "Hello World", "a\\b").execute();
-        assertEquals(1l, query().from(survey).where(survey.name2.contains("a\\b")).count());
-    }
-
-    @Test
-    public void Like_with_Escape() {
-        SQLInsertClause insert = insert(survey);
-        insert.set(survey.id, 5).set(survey.name, "aaa").addBatch();
-        insert.set(survey.id, 6).set(survey.name, "a_").addBatch();
-        insert.set(survey.id, 7).set(survey.name, "a%").addBatch();
-        assertEquals(3, insert.execute());
-
-        assertEquals(1l, query().from(survey).where(survey.name.like("a|%", '|')).count());
-        assertEquals(1l, query().from(survey).where(survey.name.like("a|_", '|')).count());
-        assertEquals(3l, query().from(survey).where(survey.name.like("a%")).count());
-        assertEquals(2l, query().from(survey).where(survey.name.like("a_")).count());
-
-        assertEquals(1l, query().from(survey).where(survey.name.startsWith("a_")).count());
-        assertEquals(1l, query().from(survey).where(survey.name.startsWith("a%")).count());
-    }
-
-    @Test
-    @IncludeIn(MYSQL)
-    @SkipForQuoted
-    public void Replace() {
-        SQLInsertClause clause = mysqlReplace(survey);
-        clause.columns(survey.id, survey.name)
-            .values(3, "Hello");
-
-        assertEquals("replace into SURVEY (ID, NAME) values (?, ?)", clause.toString());
-        clause.execute();
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBase.java b/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBase.java
deleted file mode 100644
index 8dd3e8f688..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static org.junit.Assert.assertEquals;
-
-import java.sql.SQLException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.mysema.query.sql.dml.SQLInsertClause;
-
-public class LikeEscapeBase extends AbstractBaseTest{
-
-    @Before
-    public void setUp() throws SQLException{
-        delete(survey).execute();
-        SQLInsertClause insert = insert(survey);
-        insert.set(survey.id, 5).set(survey.name, "aaa").addBatch();
-        insert.set(survey.id, 6).set(survey.name, "a_").addBatch();    
-        insert.set(survey.id, 7).set(survey.name, "a%").addBatch();
-        insert.execute();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        delete(survey).execute();
-        insert(survey).values(1, "Hello World", "Hello").execute();
-    }
-    
-    @Test
-    @Ignore
-    public void Like() {        
-        assertEquals(1l, query().from(survey).where(survey.name.like("a!%")).count());
-        assertEquals(1l, query().from(survey).where(survey.name.like("a!_")).count());
-        assertEquals(3l, query().from(survey).where(survey.name.like("a%")).count());
-        assertEquals(2l, query().from(survey).where(survey.name.like("a_")).count());
-        
-        assertEquals(1l, query().from(survey).where(survey.name.startsWith("a_")).count());
-        assertEquals(1l, query().from(survey).where(survey.name.startsWith("a%")).count());
-    }
-    
-    @Test
-    public void Like_with_Escape() {        
-        assertEquals(1l, query().from(survey).where(survey.name.like("a!%", '!')).count());
-        assertEquals(1l, query().from(survey).where(survey.name.like("a!_", '!')).count());
-        assertEquals(3l, query().from(survey).where(survey.name.like("a%", '!')).count());
-        assertEquals(2l, query().from(survey).where(survey.name.like("a_", '!')).count());        
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ListSubQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/ListSubQueryTest.java
deleted file mode 100644
index 3d1ea352ba..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ListSubQueryTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.query.ListSubQuery;
-
-public class ListSubQueryTest {
-
-    @Test
-    public void HashCode() {
-        QSurvey survey = QSurvey.survey;
-        QSurvey survey2 = new QSurvey("survey2");
-        ListSubQuery<Tuple> query1 = new SQLSubQuery().from(survey).list(survey.all());
-        ListSubQuery<Tuple> query2 = new SQLSubQuery().from(survey2).list(survey2.all());
-
-
-        Set<ListSubQuery<Tuple>> queries = new HashSet<ListSubQuery<Tuple>>();
-        queries.add(query1);
-        queries.add(query2);
-        assertEquals(2, queries.size());
-    }
-    
-    @Test
-    public void HashCode2() {
-        QSurvey survey = new QSurvey("entity");
-        QEmployee employee = new QEmployee("entity");
-        ListSubQuery<Integer> query1 = new SQLSubQuery().from(survey).list(survey.id);
-        ListSubQuery<Integer> query2 = new SQLSubQuery().from(employee).list(employee.id);
-
-        Set<ListSubQuery<Integer>> queries = new HashSet<ListSubQuery<Integer>>();
-        queries.add(query1);
-        queries.add(query2);
-        assertEquals(1, queries.size());
-    }
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/MergeBase.java b/querydsl-sql/src/test/java/com/mysema/query/MergeBase.java
deleted file mode 100644
index b0d5491d91..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/MergeBase.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Constants.survey2;
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.DERBY;
-import static com.mysema.query.Target.H2;
-import static com.mysema.query.Target.POSTGRES;
-import static com.mysema.query.Target.SQLSERVER;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.dml.SQLMergeClause;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathImpl;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-
-public class MergeBase extends AbstractBaseTest{
-
-    private void reset() throws SQLException{
-        delete(survey).execute();
-        insert(survey).values(1, "Hello World", "Hello").execute();
-    }
-
-    @Before
-    public void setUp() throws SQLException{
-        reset();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        reset();
-    }
-
-
-    @Test
-    @ExcludeIn({H2, CUBRID, SQLSERVER})
-    public void Merge_With_Keys() throws SQLException{
-        ResultSet rs = merge(survey).keys(survey.id)
-                .set(survey.id, 7)
-                .set(survey.name, "Hello World").executeWithKeys();
-        assertTrue(rs.next());
-        assertTrue(rs.getObject(1) != null);
-        rs.close();
-    }
-
-    @Test
-    @IncludeIn(H2)
-    public void Merge_with_Keys_and_SubQuery() {
-        assertEquals(1, insert(survey).set(survey.id, 6).set(survey.name, "H").execute());
-
-        // keys + subquery
-        QSurvey survey2 = new QSurvey("survey2");
-        assertEquals(2, merge(survey).keys(survey.id).select(
-                sq().from(survey2).list(survey2.id.add(1), survey2.name, survey2.name2)).execute());
-    }
-
-    @Test
-    @IncludeIn(H2)
-    public void Merge_with_Keys_and_Values() {
-        // NOTE : doesn't work with composite merge implementation
-        // keys + values
-        assertEquals(1, merge(survey).keys(survey.id).values(5, "Hello World", "Hello").execute());
-    }
-
-    @Test
-    public void Merge_with_Keys_Columns_and_Values() {
-        // keys + columns + values
-        assertEquals(1, merge(survey).keys(survey.id)
-            .set(survey.id, 5)
-            .set(survey.name, "Hello World").execute());
-    }
-
-    @Test
-    public void Merge_with_Keys_Columns_and_Values_using_null() {
-        // keys + columns + values
-        assertEquals(1, merge(survey).keys(survey.id)
-            .set(survey.id, 5)
-            .set(survey.name, (String)null).execute());
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, DERBY, POSTGRES, SQLSERVER})
-    public void Merge_With_Keys_Null_Id() throws SQLException{
-        ResultSet rs = merge(survey).keys(survey.id)
-                .setNull(survey.id)
-                .set(survey.name, "Hello World").executeWithKeys();
-        assertTrue(rs.next());
-        assertTrue(rs.getObject(1) != null);
-        rs.close();
-    }
-
-    @Test
-    @ExcludeIn({H2, CUBRID, SQLSERVER})
-    public void Merge_With_Keys_Projected() throws SQLException{
-        assertNotNull(merge(survey).keys(survey.id)
-                .set(survey.id, 8)
-                .set(survey.name, "Hello you").executeWithKey(survey.id));
-    }
-
-    @Test
-    @ExcludeIn({H2, CUBRID, SQLSERVER})
-    public void Merge_With_Keys_Projected2() throws SQLException{
-        Path<Object> idPath = new PathImpl<Object>(Object.class, "id");
-        Object id = merge(survey).keys(survey.id)
-                .set(survey.id, 9)
-                .set(survey.name, "Hello you").executeWithKey(idPath);
-        assertNotNull(id);
-    }
-
-    @Test
-    @IncludeIn(H2)
-    public void MergeBatch() {
-        SQLMergeClause merge = merge(survey)
-            .keys(survey.id)
-            .set(survey.id, 5)
-            .set(survey.name, "5")
-            .addBatch();
-
-        merge
-            .keys(survey.id)
-            .set(survey.id, 6)
-            .set(survey.name, "6")
-            .addBatch();
-
-        assertEquals(2, merge.execute());
-
-        assertEquals(1l, query().from(survey).where(survey.name.eq("5")).count());
-        assertEquals(1l, query().from(survey).where(survey.name.eq("6")).count());
-    }
-
-    @Test
-    @IncludeIn(H2)
-    public void MergeBatch_with_subquery() {
-        SQLMergeClause merge = merge(survey)
-            .keys(survey.id)
-            .columns(survey.id, survey.name)
-            .select(sq().from(survey2).list(survey2.id.add(20), survey2.name))
-            .addBatch();
-
-        merge(survey)
-            .keys(survey.id)
-            .columns(survey.id, survey.name)
-            .select(sq().from(survey2).list(survey2.id.add(40), survey2.name))
-            .addBatch();
-
-        merge.execute();
-//        assertEquals(1, insert.execute());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/PrecedenceTest.java b/querydsl-sql/src/test/java/com/mysema/query/PrecedenceTest.java
deleted file mode 100644
index 1b72697cc6..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/PrecedenceTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.StringPath;
-
-public class PrecedenceTest {
-    
-    @Test
-    public void test() {
-        StringPath str1 = new StringPath("str1");
-        StringPath str2 = new StringPath("str2");
-        BooleanExpression pending = str1.eq("3").and(str2.eq("1"));
-        BooleanExpression notNew = str1.ne("1").and(str2.in("2", "3"));       
-        BooleanExpression whereClause = str1.eq("a").and(pending.or(notNew));
-        String str = new SQLSerializer(Configuration.DEFAULT).handle(whereClause).toString();
-        assertEquals("str1 = ? and (str1 = ? and str2 = ? or str1 != ? and str2 in (?, ?))", str);
-    }
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/Projection.java b/querydsl-sql/src/test/java/com/mysema/query/Projection.java
deleted file mode 100644
index 8b6a4774ec..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/Projection.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import javax.annotation.Nullable;
-
-import com.mysema.query.types.Expression;
-
-public interface Projection {
-
-    @Nullable
-    <T> T get(Expression<T> expr);
-
-    @Nullable
-    <T> T get(int index, Class<T> type);
-
-    @Nullable
-    <T> Expression<T> getExpr(Expression<T> expr);
-
-    @Nullable
-    <T> Expression<T> getExpr(int index, Class<T> type);
-
-    Object[] toArray();
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QBeanTest.java b/querydsl-sql/src/test/java/com/mysema/query/QBeanTest.java
deleted file mode 100644
index 39198e1ff4..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/QBeanTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.QBean;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class QBeanTest {
-
-//    @Table("PERSON")
-    public static class QPerson extends RelationalPathBase<QPerson> {
-        private static final long serialVersionUID = 609527362;
-        public static final QPerson person = new QPerson("PERSON");
-        public final StringPath firstName = createString("firstName");
-        public final NumberPath<Integer> id = createNumber("id", Integer.class);
-        public final StringPath lastName = createString("lastName");
-
-        public QPerson(String variable) {
-           super(QPerson.class, PathMetadataFactory.forVariable(variable), "", "PERSON");
-           addMetadata();
-        }
-
-        public QPerson(BeanPath<? extends QPerson> entity) {
-            super(entity.getType(), entity.getMetadata(), "", "PERSON");
-            addMetadata();
-        }
-
-        public QPerson(PathMetadata<?> metadata) {
-            super(QPerson.class, metadata, "", "PERSON");
-            addMetadata();
-        }
-
-        public void addMetadata() {
-            addMetadata(firstName, ColumnMetadata.named("FIRST_NAME"));
-            addMetadata(lastName, ColumnMetadata.named("LAST_NAME"));
-            addMetadata(id, ColumnMetadata.named("ID"));
-        }
-
-    }
-
-    public static class Person {
-        private int id;
-        private String firstName;
-        private String lastName;
-        public int getId() {
-            return id;
-        }
-        public void setId(int id) {
-            this.id = id;
-        }
-        public String getFirstName() {
-            return firstName;
-        }
-        public void setFirstName(String firstName) {
-            this.firstName = firstName;
-        }
-        public String getLastName() {
-            return lastName;
-        }
-        public void setLastName(String lastName) {
-            this.lastName = lastName;
-        }
-
-    }
-
-    @Test
-    public void NewInstance() {
-        QPerson p = QPerson.person;
-        QBean<Person> projection = new QBean<Person>(Person.class, p.id, p.firstName.as("firstName"), p.lastName.as("lastName"));
-
-        Person person = projection.newInstance(3, "John", "Doe");
-        assertEquals(3,      person.getId());
-        assertEquals("John", person.getFirstName());
-        assertEquals("Doe",  person.getLastName());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QCompanies.java b/querydsl-sql/src/test/java/com/mysema/query/QCompanies.java
deleted file mode 100644
index 97b804bbcf..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/QCompanies.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import javax.annotation.Generated;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-
-/**
- * QCompanies is a Querydsl query type for QCompanies
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class QCompanies extends com.mysema.query.sql.RelationalPathBase<QCompanies> {
-
-    private static final long serialVersionUID = 1808918375;
-
-    public static final QCompanies companies = new QCompanies("COMPANIES");
-
-    public final NumberPath<Long> id = createNumber("id", Long.class);
-
-    public final StringPath name = createString("name");
-
-    public final com.mysema.query.sql.PrimaryKey<QCompanies> constraint5 = createPrimaryKey(id);
-
-    public QCompanies(String variable) {
-        super(QCompanies.class, forVariable(variable), "PUBLIC", "COMPANIES");
-        addMetadata();
-    }
-
-    public QCompanies(Path<? extends QCompanies> path) {
-        super(path.getType(), path.getMetadata(), "PUBLIC", "COMPANIES");
-        addMetadata();
-    }
-
-    public QCompanies(PathMetadata<?> metadata) {
-        super(QCompanies.class, metadata, "PUBLIC", "COMPANIES");
-        addMetadata();
-    }
-
-    protected void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("ID"));
-        addMetadata(name, ColumnMetadata.named("NAME"));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QProjection.java b/querydsl-sql/src/test/java/com/mysema/query/QProjection.java
deleted file mode 100644
index 30ba63390c..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/QProjection.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.ExpressionBase;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Visitor;
-
-public class QProjection extends ExpressionBase<Projection> implements FactoryExpression<Projection>{
-
-    private static final long serialVersionUID = -7330905848558102164L;
-
-    private final List<Expression<?>> args;
-    
-    public QProjection(Expression<?>... args) {
-        super(Projection.class);
-        this.args = Arrays.asList(args);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Projection newInstance(final Object... args) {
-        return new Projection() {
-
-            @Override
-            public <T> T get(int index, Class<T> type) {
-                return (T) args[index];
-            }
-
-            @Override
-            public <T> T get(Expression<T> expr) {
-                int index = getArgs().indexOf(expr);
-                return index != -1 ? (T) args[index] : null;
-            }
-
-            @Override
-            public <T> Expression<T> getExpr(Expression<T> expr) {
-                T val = get(expr);
-                return val != null ? SimpleConstant.create(val) : null;
-            }
-
-            @Override
-            public <T> Expression<T> getExpr(int index, Class<T> type) {
-                T val = (T)args[index];
-                return val != null ? SimpleConstant.create(val) : null;
-            }
-
-            @Override
-            public Object[] toArray() {
-                return args;
-            }
-
-        };
-    }
-
-    @Override
-    public List<Expression<?>> getArgs() {
-        return args;
-    }
-
-    @Override
-    public <R, C> R accept(Visitor<R, C> v, C context) {
-        return v.visit(this, context);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QueryMutabilityTest.java b/querydsl-sql/src/test/java/com/mysema/query/QueryMutabilityTest.java
deleted file mode 100644
index 13ad24ba85..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/QueryMutabilityTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.DerbyTemplates;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class QueryMutabilityTest{
-
-    private static final QSurvey survey = new QSurvey("survey");
-
-    private Connection connection;
-
-    @Before
-    public void setUp() throws Exception{
-        Connections.initDerby();
-        connection = Connections.getConnection();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        Connections.close();
-    }
-
-    @Test
-    public void test() throws IOException, SecurityException,
-            IllegalArgumentException, NoSuchMethodException,
-            IllegalAccessException, InvocationTargetException {
-        SQLQuery query = new SQLQuery(connection, new DerbyTemplates());
-        query.from(survey);
-        new QueryMutability(query).test(survey.id, survey.name);
-    }
-
-    @Test
-    public void Clone() {
-        SQLQuery query = new SQLQuery(new DerbyTemplates()).from(survey);
-        SQLQuery query2 = query.clone(connection);
-        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
-        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
-        query2.list(survey.id);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QueryPerformanceTest.java b/querydsl-sql/src/test/java/com/mysema/query/QueryPerformanceTest.java
deleted file mode 100644
index 56a5783c42..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/QueryPerformanceTest.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package com.mysema.query;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.testutil.Benchmark;
-import com.mysema.testutil.Performance;
-import com.mysema.testutil.Runner;
-
-@Category(Performance.class)
-public class QueryPerformanceTest {
-    
-    private static final String QUERY = "select COMPANIES.NAME\n" +
-    		"from COMPANIES COMPANIES\n" +
-    		"where COMPANIES.ID = ?";
-    
-    private static final SQLTemplates templates = new H2Templates();
-    
-    private static final Configuration conf = new Configuration(templates);
-    
-    private final Connection conn = Connections.getConnection();
-    
-    @BeforeClass
-    public static void setUpClass() throws SQLException, ClassNotFoundException {
-        Connections.initH2();        
-        Connection conn = Connections.getConnection();               
-        Statement stmt = conn.createStatement();
-        stmt.execute("create or replace table companies (id identity, name varchar(30) unique not null);");
-        
-        PreparedStatement pstmt = conn.prepareStatement("insert into companies (name) values (?)");
-        final int iterations = 1000000;
-        for (int i = 0; i < iterations; i++) {
-            pstmt.setString(1, String.valueOf(i));
-            pstmt.execute();
-            pstmt.clearParameters();
-        }        
-        pstmt.close();
-        stmt.close();
-        
-        conn.setAutoCommit(false);
-    }
-    
-    @AfterClass
-    public static void tearDownClass() throws SQLException {
-        Connection conn = Connections.getConnection();        
-        Statement stmt = conn.createStatement();
-        stmt.execute("drop table companies");
-        stmt.close();
-        Connections.close();    
-    }
-    
-    
-    @Test
-    public void JDBC() throws Exception {
-        Runner.run("jdbc by id", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {
-                    PreparedStatement stmt = conn.prepareStatement(QUERY);
-                    try {
-                        stmt.setLong(1, i);
-                        ResultSet rs = stmt.executeQuery();                
-                        try {
-                            while (rs.next()) {
-                                rs.getString(1);
-                            }
-                        } finally {
-                            rs.close();
-                        }
-                        
-                    } finally {
-                        stmt.close();
-                    }            
-                }
-            }            
-        });                      
-    }
-        
-    @Test
-    public void JDBC2() throws Exception {
-        Runner.run("jdbc by name", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {
-                    PreparedStatement stmt = conn.prepareStatement(QUERY);                                                           
-                    try {
-                        stmt.setString(1, String.valueOf(i));
-                        ResultSet rs = stmt.executeQuery();                
-                        try {
-                            while (rs.next()) {
-                                rs.getString(1);
-                            }
-                        } finally {
-                            rs.close();
-                        }
-                        
-                    } finally {
-                        stmt.close();
-                    }    
-                }  
-            }
-        });               
-    }
-        
-    @Test
-    public void Querydsl1() throws Exception {
-        Runner.run("qdsl by id", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    query.from(companies).where(companies.id.eq((long)i))
-                        .list(companies.name);            
-                }                
-            }            
-        });    
-    }
-    
-    @Test
-    public void Querydsl12() throws Exception {
-        Runner.run("qdsl by id (iterated)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    CloseableIterator<String> it = query.from(companies)
-                            .where(companies.id.eq((long)i)).iterate(companies.name);
-                    try {
-                        while (it.hasNext()) {
-                            it.next();
-                        }    
-                    } finally {
-                        it.close();
-                    }                       
-                }
-            }            
-        });
-    }
-    
-    @Test
-    public void Querydsl13() throws Exception {
-        Runner.run("qdsl by id (result set access)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    ResultSet rs = query.from(companies)
-                            .where(companies.id.eq((long)i)).getResults(companies.name);          
-                    try {
-                        while (rs.next()) {
-                            rs.getString(1);
-                        }
-                    } finally {
-                        rs.close();
-                    }                 
-                }
-            }            
-        });
-    }
-    
-    @Test
-    public void Querydsl14() throws Exception {
-        Runner.run("qdsl by id (no validation)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf, new DefaultQueryMetadata().noValidate());
-                    query.from(companies).where(companies.id.eq((long)i))
-                        .list(companies.name);            
-                }                
-            }            
-        });    
-    }
-        
-    @Test
-    public void Querydsl15() throws Exception {
-        Runner.run("qdsl by id (two cols)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    query.from(companies).where(companies.id.eq((long)i))
-                        .list(companies.id, companies.name);            
-                }                
-            }            
-        });            
-    }
-    
-    @Test
-    public void Querydsl2() throws Exception {
-        Runner.run("qdsl by name", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    query.from(companies).where(companies.name.eq(String.valueOf(i)))
-                        .list(companies.name);            
-                }                
-            }            
-        });    
-    }
-    
-    @Test
-    public void Querydsl22() throws Exception {
-        Runner.run("qdsl by name (iterated)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf);
-                    CloseableIterator<String> it = query.from(companies)
-                            .where(companies.name.eq(String.valueOf(i)))
-                            .iterate(companies.name);
-                    try {
-                        while (it.hasNext()) {
-                            it.next();
-                        }    
-                    } finally {
-                        it.close();
-                    }                       
-                }
-            }            
-        });
-    }
-    
-    @Test
-    public void Querydsl23() throws Exception {
-        Runner.run("qdsl by name (no validation)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    QCompanies companies = QCompanies.companies;
-                    SQLQuery query = new SQLQuery(conn, conf, new DefaultQueryMetadata().noValidate());
-                    query.from(companies)
-                        .where(companies.name.eq(String.valueOf(i)))
-                        .list(companies.name);            
-                }                
-            }            
-        });    
-    }
-    
-    @Test
-    public void Serialization() throws Exception {
-        QCompanies companies = QCompanies.companies;
-        final QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, companies);
-        md.addWhere(companies.id.eq(1l));
-        md.addProjection(companies.name);
-        
-        Runner.run("ser1", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    SQLSerializer serializer = new SQLSerializer(conf);
-                    serializer.serialize(md, false);
-                    serializer.getConstants();
-                    serializer.getConstantPaths();
-                    assertNotNull(serializer.toString());     
-                }                
-            }            
-        });   
-    }
-    
-    @Test
-    public void Serialization2() throws Exception {
-        QCompanies companies = QCompanies.companies;
-        final QueryMetadata md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, companies);
-        md.addWhere(companies.id.eq(1l));
-        md.addProjection(companies.name);
-        
-        Runner.run("ser2 (non normalized)", new Benchmark() {
-            @Override
-            public void run(int times) throws Exception {
-                for (int i = 0; i < times; i++) {            
-                    SQLSerializer serializer = new SQLSerializer(conf);
-                    serializer.setNormalize(false);
-                    serializer.serialize(md, false);
-                    serializer.getConstants();
-                    serializer.getConstantPaths();
-                    assertNotNull(serializer.toString());     
-                }       
-            }
-        });    
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SQLListenersTest.java b/querydsl-sql/src/test/java/com/mysema/query/SQLListenersTest.java
deleted file mode 100644
index 2ff8c39cfc..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SQLListenersTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.mysema.query;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLListener;
-import com.mysema.query.sql.SQLListeners;
-
-public class SQLListenersTest {
-
-    @Test
-    public void NotifyQuery() {
-        SQLListener listener = createMock(SQLListener.class);
-        SQLListeners listeners = new SQLListeners();
-        listeners.add(listener);
-
-        QueryMetadata md = new DefaultQueryMetadata();
-        listener.notifyQuery(md);
-        replay(listener);
-
-        listeners.notifyQuery(md);
-        verify(listener);
-    }
-
-    @Test
-    public void NotifyQuery_Parent() {
-        SQLListener listener = createMock(SQLListener.class);
-        SQLListeners listeners = new SQLListeners(listener);
-
-        QueryMetadata md = new DefaultQueryMetadata();
-        listener.notifyQuery(md);
-        replay(listener);
-
-        listeners.notifyQuery(md);
-        verify(listener);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
deleted file mode 100644
index 1b08628f01..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java
+++ /dev/null
@@ -1,1523 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.group.Group;
-import com.mysema.query.group.GroupBy;
-import com.mysema.query.sql.*;
-import com.mysema.query.sql.domain.*;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.*;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.query.NumberSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-import junit.framework.Assert;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.junit.Ignore;
-import org.junit.Test;
-import static com.mysema.query.Constants.*;
-import static com.mysema.query.Target.*;
-import static org.junit.Assert.*;
-
-public class SelectBase extends AbstractBaseTest {
-
-    private static final Expression<?>[] NO_EXPRESSIONS = new Expression[0];
-
-    private final QueryExecution standardTest = new QueryExecution(Module.SQL, Connections.getTarget()) {
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery() {
-            return Pair.of(
-                    (Projectable)testQuery().from(employee, employee2),
-                    NO_EXPRESSIONS);
-        }
-        @Override
-        protected Pair<Projectable, Expression<?>[]> createQuery(Predicate filter) {
-            return Pair.of(
-                    (Projectable)testQuery().from(employee, employee2).where(filter),
-                    new Expression<?>[]{employee.firstname});
-        }
-    };
-
-    private <T> T singleResult(Expression<T> expr) {
-        return query().singleResult(expr);
-    }
-
-    @Test
-    public void Aggregate_List() {
-        int min = 30000, avg = 65000, max = 160000;
-        // list
-        assertEquals(min, query().from(employee).list(employee.salary.min()).get(0).intValue());
-        assertEquals(avg, query().from(employee).list(employee.salary.avg()).get(0).intValue());
-        assertEquals(max, query().from(employee).list(employee.salary.max()).get(0).intValue());
-    }
-
-    @Test
-    public void Aggregate_UniqueResult() {
-        int min = 30000, avg = 65000, max = 160000;
-        // uniqueResult
-        assertEquals(min, query().from(employee).uniqueResult(employee.salary.min()).intValue());
-        assertEquals(avg, query().from(employee).uniqueResult(employee.salary.avg()).intValue());
-        assertEquals(max, query().from(employee).uniqueResult(employee.salary.max()).intValue());
-    }
-
-    @Test
-    @ExcludeIn({MYSQL, ORACLE})
-    @SkipForQuoted
-    public void Alias_Quotes() {
-        expectedQuery = "select e.FIRSTNAME as \"First Name\" from EMPLOYEE e";
-        query().from(employee).list(employee.firstname.as("First Name"));
-    }
-
-    @Test
-    @IncludeIn(MYSQL)
-    @SkipForQuoted
-    public void Alias_Quotes_MySQL() {
-        expectedQuery = "select e.FIRSTNAME as `First Name` from EMPLOYEE e";
-        query().from(employee).list(employee.firstname.as("First Name"));
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void Alias_Quotes_Oracle() {
-        expectedQuery = "select e.FIRSTNAME \"First Name\" from EMPLOYEE e";
-        query().from(employee).list(employee.firstname.as("First Name"));
-    }
-
-    @Test
-    public void All() {
-        for (Expression<?> expr : survey.all()) {
-            Path<?> path = (Path<?>)expr;
-            assertEquals(survey, path.getMetadata().getParent());
-        }
-    }
-
-    @Test
-    public void Array_Projection() {
-        List<String[]> results = query().from(employee).list(
-                new ArrayConstructorExpression<String>(String[].class, employee.firstname));
-        assertFalse(results.isEmpty());
-        for (String[] result : results) {
-            assertNotNull(result[0]);
-        }
-    }
-
-    @Test
-    public void Beans() {
-        QEmployee EMPLOYEE = new QEmployee("EMPLOYEE");
-        List<Beans> rows = query().from(employee, EMPLOYEE).list(new QBeans(employee, EMPLOYEE));
-        assertFalse(rows.isEmpty());
-        for (Beans row : rows) {
-            assertEquals(Employee.class, row.get(employee).getClass());
-            assertEquals(Employee.class, row.get(EMPLOYEE).getClass());
-        }
-    }
-
-    @Test
-    @ExcludeIn({ORACLE, CUBRID, DERBY, SQLSERVER, SQLITE, TERADATA})
-    public void Boolean_All() {
-        assertTrue(query().from(employee).uniqueResult(SQLExpressions.all(employee.firstname.isNotNull())));
-    }
-
-    @Test
-    @ExcludeIn({ORACLE, CUBRID, DERBY, SQLSERVER, SQLITE, TERADATA})
-    public void Boolean_Any() {
-        assertTrue(query().from(employee).uniqueResult(SQLExpressions.any(employee.firstname.isNotNull())));
-    }
-
-    @Test
-    public void Casts() throws SQLException {
-        NumberExpression<?> num = employee.id;
-        List<Expression<?>> exprs = Lists.newArrayList();
-
-        add(exprs, num.byteValue(), MYSQL);
-        add(exprs, num.doubleValue());
-        add(exprs, num.floatValue());
-        add(exprs, num.intValue());
-        add(exprs, num.longValue(), MYSQL);
-        add(exprs, num.shortValue(), MYSQL);
-        add(exprs, num.stringValue(), DERBY);
-
-        for (Expression<?> expr : exprs) {
-            for (Object o : query().from(employee).list(expr)) {
-                assertEquals(expr.getType(), o.getClass());
-            }
-        }
-    }
-
-    @Test
-    public void Coalesce() {
-        Coalesce<String> c = new Coalesce<String>(employee.firstname, employee.lastname).add("xxx");
-        query().from(employee).where(c.getValue().eq("xxx")).list(employee.id);
-    }
-
-    @Test
-    public void Compact_Join() {
-        // verbose
-        query().from(employee).innerJoin(employee2)
-        .on(employee.superiorId.eq(employee2.id))
-        .list(employee.id, employee2.id);
-
-        // compact
-        query().from(employee)
-        .innerJoin(employee.superiorIdKey, employee2)
-        .list(employee.id, employee2.id);
-
-    }
-
-    @Test
-    public void Complex_Boolean() {
-        BooleanExpression first = employee.firstname.eq("Mike").and(employee.lastname.eq("Smith"));
-        BooleanExpression second = employee.firstname.eq("Joe").and(employee.lastname.eq("Divis"));
-        assertEquals(2, query().from(employee).where(first.or(second)).count());
-
-        assertEquals(0, query().from(employee).where(
-                employee.firstname.eq("Mike"),
-                employee.lastname.eq("Smith").or(employee.firstname.eq("Joe")),
-                employee.lastname.eq("Divis")
-        ).count());
-    }
-
-    @Test
-    public void Complex_SubQuery() {
-        // alias for the salary
-        NumberPath<BigDecimal> sal = new NumberPath<BigDecimal>(BigDecimal.class, "sal");
-        // alias for the subquery
-        PathBuilder<Object[]> sq = new PathBuilder<Object[]>(Object[].class, "sq");
-        // query execution
-        query().from(
-                sq().from(employee)
-                .list(employee.salary.add(employee.salary).add(employee.salary).as(sal)).as(sq)
-        ).list(sq.get(sal).avg(), sq.get(sal).min(), sq.get(sal).max());
-    }
-
-    @Test
-    public void Constructor() throws Exception {
-        for (IdName idName : query().from(survey).list(new QIdName(survey.id, survey.name))) {
-            System.out.println("id and name : " + idName.getId() + ","+ idName.getName());
-        }
-    }
-
-    @Test
-    public void Constructor_Projection() {
-        // constructor projection
-        for (IdName idAndName : query().from(survey).list(new QIdName(survey.id, survey.name))) {
-            assertNotNull(idAndName);
-            assertNotNull(idAndName.getId());
-            assertNotNull(idAndName.getName());
-        }
-    }
-
-    @Test
-    public void Constructor_Projection2() {
-        List<SimpleProjection> projections =query().from(employee).list(
-                ConstructorExpression.create(SimpleProjection.class,
-                        employee.firstname, employee.lastname));
-        assertFalse(projections.isEmpty());
-        for (SimpleProjection projection : projections) {
-            assertNotNull(projection);
-        }
-    }
-
-    private double cot(double x) {
-        return Math.cos(x) / Math.sin(x);
-    }
-
-    private double coth(double x) {
-        return Math.cosh(x) / Math.sinh(x);
-    }
-
-    @Test
-    public void Count_With_PK() {
-        query().from(employee).count();
-    }
-
-    @Test
-    public void Count_Without_PK() {
-        query().from(QEmployeeNoPK.employee).count();
-    }
-
-    @Test
-    public void Count2() {
-        query().from(employee).singleResult(employee.count());
-    }
-
-    @Test
-    @SkipForQuoted
-    @ExcludeIn(ORACLE)
-    public void Count_All() {
-        expectedQuery = "select count(*) as rc from EMPLOYEE e";
-        NumberPath<Long> rowCount = new NumberPath<Long>(Long.class, "rc");
-        query().from(employee).uniqueResult(Wildcard.count.as(rowCount));
-    }
-
-    @Test
-    @SkipForQuoted
-    @IncludeIn(ORACLE)
-    public void Count_All_Oracle() {
-        expectedQuery = "select count(*) rc from EMPLOYEE e";
-        NumberPath<Long> rowCount = new NumberPath<Long>(Long.class, "rc");
-        query().from(employee).uniqueResult(Wildcard.count.as(rowCount));
-    }
-
-    @Test
-    public void Count_Distinct_With_PK() {
-        query().from(employee).distinct().count();
-    }
-
-    @Test
-    public void Count_Distinct_Without_PK() {
-        query().from(QEmployeeNoPK.employee).distinct().count();
-    }
-
-    @Test
-    public void Count_Distinct2() {
-        query().from(employee).singleResult(employee.countDistinct());
-    }
-
-    @Test
-    public void Custom_Projection() {
-        List<Projection> tuples = query().from(employee).list(
-                new QProjection(employee.firstname, employee.lastname));
-        assertFalse(tuples.isEmpty());
-        for (Projection tuple : tuples) {
-            assertNotNull(tuple.get(employee.firstname));
-            assertNotNull(tuple.get(employee.lastname));
-            assertNotNull(tuple.getExpr(employee.firstname));
-            assertNotNull(tuple.getExpr(employee.lastname));
-        }
-    }
-
-    @Test
-    @IncludeIn({H2, SQLSERVER, MYSQL, ORACLE, TERADATA}) // TODO fix postgres
-    public void Dates() {
-        long ts = ((long)Math.floor(System.currentTimeMillis() / 1000)) * 1000;
-        long tsDate = new org.joda.time.LocalDate(ts).toDateMidnight().getMillis();
-        long tsTime = new org.joda.time.LocalTime(ts).getMillisOfDay();
-
-        List<Object> data = Lists.newArrayList();
-        data.add(Constants.date);
-        data.add(Constants.time);
-        data.add(new java.util.Date(ts));
-        data.add(new java.util.Date(tsDate));
-        data.add(new java.util.Date(tsTime));
-        data.add(new java.sql.Timestamp(ts));
-        data.add(new java.sql.Timestamp(tsDate));
-        data.add(new java.sql.Date(110, 0, 1));
-        data.add(new java.sql.Date(tsDate));
-        data.add(new java.sql.Time(0, 0, 0));
-        data.add(new java.sql.Time(12, 30, 0));
-        data.add(new java.sql.Time(23, 59, 59));
-        //data.add(new java.sql.Time(tsTime));
-        data.add(new DateTime(ts));
-        data.add(new DateTime(tsDate));
-        data.add(new DateTime(tsTime));
-        data.add(new LocalDateTime(ts));
-        data.add(new LocalDateTime(tsDate));
-        data.add(new LocalDateTime(2014, 3, 30, 2, 0));
-        data.add(new LocalDate(2010, 1, 1));
-        data.add(new LocalDate(ts));
-        data.add(new LocalDate(tsDate));
-        data.add(new LocalTime(0, 0, 0));
-        data.add(new LocalTime(12, 30, 0));
-        data.add(new LocalTime(23, 59, 59));
-        data.add(new LocalTime(ts));
-        data.add(new LocalTime(tsTime));
-
-        Map<Object, Object> failures = Maps.newIdentityHashMap();
-        for (Object dt : data) {
-            Object dt2 = query().singleResult(new ConstantImpl(dt));
-            if (!dt.equals(dt2)) {
-                failures.put(dt, dt2);
-            }
-        }
-        if (!failures.isEmpty()) {
-            for (Map.Entry<Object, Object> entry : failures.entrySet()) {
-                System.out.println(entry.getKey().getClass().getName()
-                        + ": " + entry.getKey() + " != " + entry.getValue());
-            }
-            Assert.fail("Failed with " + failures);
-        }
-    }
-
-    @Test
-    @ExcludeIn({SQLITE})
-    public void Date_Add() {
-        TestQuery query = query().from(employee);
-        Date date1 = query.singleResult(employee.datefield);
-        Date date2 = query.singleResult(SQLExpressions.addYears(employee.datefield, 1));
-        Date date3 = query.singleResult(SQLExpressions.addMonths(employee.datefield, 1));
-        Date date4 = query.singleResult(SQLExpressions.addDays(employee.datefield, 1));
-
-        assertTrue(date2.getTime() > date1.getTime());
-        assertTrue(date3.getTime() > date1.getTime());
-        assertTrue(date4.getTime() > date1.getTime());
-    }
-
-    @Test
-    @ExcludeIn({SQLITE})
-    public void Date_Add_Timestamp() {
-        List<Expression<?>> exprs = Lists.newArrayList();
-        DateTimeExpression<java.util.Date> dt = Expressions.currentTimestamp();
-
-        add(exprs, SQLExpressions.addYears(dt, 1));
-        add(exprs, SQLExpressions.addMonths(dt, 1));
-        add(exprs, SQLExpressions.addDays(dt, 1));
-        add(exprs, SQLExpressions.addHours(dt, 1));
-        add(exprs, SQLExpressions.addMinutes(dt, 1));
-        add(exprs, SQLExpressions.addSeconds(dt, 1));
-
-        for (Expression<?> expr : exprs) {
-            assertNotNull(query().singleResult(expr));
-        }
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, SQLITE, TERADATA})
-    public void Date_Diff() {
-        QEmployee employee2 = new QEmployee("employee2");
-        TestQuery query = query().from(employee, employee2);
-
-        List<DatePart> dps = Lists.newArrayList();
-        add(dps, DatePart.year);
-        add(dps, DatePart.month);
-        add(dps, DatePart.week);
-        add(dps, DatePart.day);
-        add(dps, DatePart.hour, HSQLDB);
-        add(dps, DatePart.minute, HSQLDB);
-        add(dps, DatePart.second, HSQLDB);
-
-        Date date = new Date(0);
-        for (DatePart dp : dps) {
-            query.singleResult(SQLExpressions.datediff(dp, employee.datefield, employee2.datefield));
-            query.singleResult(SQLExpressions.datediff(dp, employee.datefield, date));
-            query.singleResult(SQLExpressions.datediff(dp, date, employee.datefield));
-        }
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, DERBY, HSQLDB, SQLITE, TERADATA})
-    public void Date_Diff2() {
-        TestQuery query = query().from(employee).orderBy(employee.id.asc());
-        int offset = TimeZone.getDefault().getOffset(0);
-        Date date = new java.sql.Date(-offset);
-
-        int years = query.singleResult(SQLExpressions.datediff(DatePart.year, date, employee.datefield));
-        int months = query.singleResult(SQLExpressions.datediff(DatePart.month, date, employee.datefield));
-        // weeks
-        int days = query.singleResult(SQLExpressions.datediff(DatePart.day, date, employee.datefield));
-        int hours = query.singleResult(SQLExpressions.datediff(DatePart.hour, date, employee.datefield));
-        int minutes = query.singleResult(SQLExpressions.datediff(DatePart.minute, date, employee.datefield));
-        int seconds = query.singleResult(SQLExpressions.datediff(DatePart.second, date, employee.datefield));
-
-        assertEquals(949449600, seconds);
-        assertEquals(15824160,  minutes);
-        assertEquals(263736,    hours);
-        assertEquals(10989,     days);
-        assertEquals(361,       months);
-        assertEquals(30,        years);
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, DERBY, H2, HSQLDB, MYSQL, SQLITE, SQLSERVER, TERADATA}) // FIXME
-    public void Date_Trunc() {
-        DateTimeExpression<java.util.Date> expr = DateTimeExpression.currentTimestamp();
-
-        List<DatePart> dps = Lists.newArrayList();
-        add(dps, DatePart.year);
-        add(dps, DatePart.month);
-        add(dps, DatePart.week);
-        add(dps, DatePart.day);
-        add(dps, DatePart.hour);
-        add(dps, DatePart.minute);
-        add(dps, DatePart.second);
-
-        for (DatePart dp : dps) {
-            query().singleResult(SQLExpressions.datetrunc(dp, expr));
-        }
-    }
-
-    @Test
-    public void DateTime() {
-        TestQuery query = query().from(employee).orderBy(employee.id.asc());
-        assertEquals(Integer.valueOf(2),      query.singleResult(employee.datefield.dayOfMonth()));
-        assertEquals(Integer.valueOf(2),      query.singleResult(employee.datefield.month()));
-        assertEquals(Integer.valueOf(2000),   query.singleResult(employee.datefield.year()));
-        assertEquals(Integer.valueOf(200002), query.singleResult(employee.datefield.yearMonth()));
-    }
-
-    @Test
-    @ExcludeIn(CUBRID)
-    public void DateTime_To_Date() {
-        query().singleResult(SQLExpressions.date(DateTimeExpression.currentTimestamp()));
-    }
-
-    private double degrees(double x) {
-        return x * 180.0 / Math.PI;
-    }
-
-    @Test
-    public void Distinct_Count() {
-        long count1 = query().from(employee).distinct().count();
-        long count2 = query().from(employee).distinct().count();
-        assertEquals(count1, count2);
-    }
-
-    @Test
-    public void Distinct_List() {
-        List<Integer> lengths1 = query().from(employee).distinct().list(employee.firstname.length());
-        List<Integer> lengths2 = query().from(employee).distinct().list(employee.firstname.length());
-        assertEquals(lengths1, lengths2);
-    }
-
-    @Test
-    public void Exists() {
-        assertTrue(query().from(employee).where(employee.firstname.eq("Barbara")).exists());
-    }
-
-    @Test
-    public void FactoryExpression_In_GroupBy() {
-        Expression<Employee> empBean = Projections.bean(Employee.class, employee.id, employee.superiorId);
-        assertFalse(query().from(employee).groupBy(empBean).list(empBean).isEmpty());
-    }
-
-    @Test
-    @ExcludeIn({H2, SQLITE, DERBY, CUBRID, MYSQL})
-    public void Full_Join() throws SQLException {
-        query().from(employee).fullJoin(employee2)
-            .on(employee.superiorIdKey.on(employee2))
-            .list(employee.id, employee2.id);
-    }
-
-    @Test
-    public void GetResultSet() throws IOException, SQLException{
-        ResultSet results = query().from(survey).getResults(survey.id, survey.name);
-        while(results.next()) {
-            System.out.println(results.getInt(1) +","+results.getString(2));
-        }
-        results.close();
-    }
-
-    @Test
-    public void GroupBy_Superior() {
-        TestQuery qry = query()
-            .from(employee)
-            .innerJoin(employee._superiorIdKey, employee2);
-
-        QTuple subordinates = new QTuple(employee2.id, employee2.firstname, employee2.lastname);
-
-        Map<Integer, Group> results = qry.transform(
-            GroupBy.groupBy(employee.id).as(employee.firstname, employee.lastname,
-            GroupBy.map(employee2.id, subordinates)));
-
-        assertEquals(2, results.size());
-
-        // Mike Smith
-        Group group = results.get(1);
-        assertEquals("Mike", group.getOne(employee.firstname));
-        assertEquals("Smith", group.getOne(employee.lastname));
-
-        Map<Integer, Tuple> emps = group.getMap(employee2.id, subordinates);
-        assertEquals(4, emps.size());
-        assertEquals("Steve", emps.get(12).get(employee2.firstname));
-
-        // Mary Smith
-        group = results.get(2);
-        assertEquals("Mary", group.getOne(employee.firstname));
-        assertEquals("Smith", group.getOne(employee.lastname));
-
-        emps = group.getMap(employee2.id, subordinates);
-        assertEquals(4, emps.size());
-        assertEquals("Mason", emps.get(21).get(employee2.lastname));
-    }
-
-    @Test
-    public void GroupBy_YearMonth() {
-        query().from(employee)
-               .groupBy(employee.datefield.yearMonth())
-               .orderBy(employee.datefield.yearMonth().asc())
-               .list(employee.id.count());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test(expected=IllegalArgumentException.class)
-    public void IllegalUnion() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id.max());
-        query().from(employee).union(sq1, sq2).list();
-    }
-
-    @Test
-    public void In() {
-        query().from(employee).where(employee.id.in(Arrays.asList(1,2))).list(employee);
-    }
-
-    @Test
-    public void Inner_Join() throws SQLException {
-        query().from(employee).innerJoin(employee2)
-            .on(employee.superiorIdKey.on(employee2))
-            .list(employee.id, employee2.id);
-    }
-
-    @Test
-    public void Inner_Join_2Conditions() {
-        query().from(employee).innerJoin(employee2)
-            .on(employee.superiorIdKey.on(employee2))
-            .on(employee2.firstname.isNotNull())
-            .list(employee.id, employee2.id);
-    }
-
-    @Test
-    public void Join() throws Exception {
-        for (String name : query().from(survey, survey2)
-                .where(survey.id.eq(survey2.id)).list(survey.name)) {
-            System.out.println(name);
-        }
-    }
-
-    @Test
-    public void Joins() throws SQLException {
-        for (Tuple row : query().from(employee).innerJoin(employee2)
-                .on(employee.superiorId.eq(employee2.superiorId))
-                .where(employee2.id.eq(10))
-                .list(employee.id, employee2.id)) {
-            System.out.println(row.get(employee.id) + ", " + row.get(employee2.id));
-        }
-    }
-
-    @Test
-    public void Left_Join() throws SQLException {
-        query().from(employee).leftJoin(employee2)
-            .on(employee.superiorIdKey.on(employee2))
-            .list(employee.id, employee2.id);
-    }
-
-    @Test
-    public void Like() {
-        query().from(employee).where(employee.firstname.like("\\")).count();
-        query().from(employee).where(employee.firstname.like("\\\\")).count();
-    }
-
-    @Test
-    public void Like_Escape() {
-        List<String> strs = ImmutableList.of("%a", "a%", "%a%", "_a", "a_", "_a_", "[C-P]arsen");
-
-        for (String str : strs) {
-            assertTrue(str, query()
-                .from(employee)
-                .where(Expressions.stringTemplate("'" + str + "'").contains(str)).count() > 0);
-        }
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Like_Number() {
-        assertEquals(5, query().from(employee)
-                .where(employee.id.like("1%")).count());
-    }
-
-    @Test
-    public void Limit() throws SQLException {
-        query().from(employee)
-            .orderBy(employee.firstname.asc())
-            .limit(4).list(employee.id);
-    }
-
-    @Test
-    public void Limit_and_Offset() throws SQLException {
-        assertEquals(Arrays.asList(20, 13, 10, 2),
-            query().from(employee)
-                   .orderBy(employee.firstname.asc())
-                   .limit(4).offset(3)
-                   .list(employee.id));
-    }
-
-    @Test
-    public void Limit_and_Offset_and_Order() {
-        List<String> names2 = Arrays.asList("Helen","Jennifer","Jim","Joe");
-        assertEquals(names2, query().from(employee)
-                .orderBy(employee.firstname.asc())
-                .limit(4).offset(2)
-                .list(employee.firstname));
-    }
-
-    @Test
-    @IncludeIn(DERBY)
-    public void Limit_and_Offset_In_Derby() throws SQLException {
-        expectedQuery = "select e.ID from EMPLOYEE e offset 3 rows fetch next 4 rows only";
-        query().from(employee).limit(4).offset(3).list(employee.id);
-
-        // limit
-        expectedQuery = "select e.ID from EMPLOYEE e fetch first 4 rows only";
-        query().from(employee).limit(4).list(employee.id);
-
-        // offset
-        expectedQuery = "select e.ID from EMPLOYEE e offset 3 rows";
-        query().from(employee).offset(3).list(employee.id);
-
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void Limit_and_Offset_In_Oracle() throws SQLException {
-        if (configuration.getUseLiterals()) return;
-
-        // limit
-        expectedQuery = "select * from (   select e.ID from EMPLOYEE e ) where rownum <= ?";
-        query().from(employee).limit(4).list(employee.id);
-
-        // offset
-        expectedQuery = "select * from (  select a.*, rownum rn from (   select e.ID from EMPLOYEE e  ) a) where rn > ?";
-        query().from(employee).offset(3).list(employee.id);
-
-        // limit offset
-        expectedQuery =  "select * from (  select a.*, rownum rn from (   select e.ID from EMPLOYEE e  ) a) where rn > 3 and rownum <= 4";
-        query().from(employee).limit(4).offset(3).list(employee.id);
-    }
-
-    @Test
-    @ExcludeIn({ORACLE, DERBY, SQLSERVER, CUBRID, TERADATA})
-    @SkipForQuoted
-    public void Limit_and_Offset2() throws SQLException {
-        // limit
-        expectedQuery = "select e.ID from EMPLOYEE e limit ?";
-        query().from(employee).limit(4).list(employee.id);
-
-        // limit offset
-        expectedQuery = "select e.ID from EMPLOYEE e limit ? offset ?";
-        query().from(employee).limit(4).offset(3).list(employee.id);
-
-    }
-
-    @Test
-    public void Limit_and_Order() {
-        List<String> names1 = Arrays.asList("Barbara","Daisy","Helen","Jennifer");
-        assertEquals(names1, query().from(employee)
-                .orderBy(employee.firstname.asc())
-                .limit(4)
-                .list(employee.firstname));
-    }
-
-    @Test
-    public void ListResults() {
-        SearchResults<Integer> results = query().from(employee)
-                .limit(10).offset(1).orderBy(employee.id.asc())
-                .listResults(employee.id);
-        assertEquals(10, results.getTotal());
-    }
-
-    @Test
-    public void ListResults2() {
-        SearchResults<Integer> results = query().from(employee)
-                .limit(2).offset(10).orderBy(employee.id.asc())
-                .listResults(employee.id);
-        assertEquals(10, results.getTotal());
-    }
-
-    @Test
-    public void ListResults_FactoryExpression() {
-        SearchResults<Employee> results = query().from(employee)
-                .limit(10).offset(1).orderBy(employee.id.asc())
-                .listResults(employee);
-        assertEquals(10, results.getTotal());
-    }
-
-    private double log(double x, int y) {
-        return Math.log(x) / Math.log(y);
-    }
-
-    @Test
-    @ExcludeIn({SQLITE, SQLSERVER, DERBY})
-    public void LPad() {
-        assertEquals("  ab", singleResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4)));
-        assertEquals("!!ab", singleResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4, '!')));
-    }
-
-
-    @Test
-    public void Map() {
-        Map<Integer, String> idToName = query().from(employee).map(employee.id.as("id"), employee.firstname);
-        for (Map.Entry<Integer, String> entry : idToName.entrySet()) {
-            assertNotNull(entry.getKey());
-            assertNotNull(entry.getValue());
-        }
-    }
-
-    @Test
-    @SuppressWarnings("serial")
-    public void MappingProjection() {
-        List<Pair<String, String>> pairs = query().from(employee)
-                .list(new MappingProjection<Pair<String,String>>(Pair.class,
-                      employee.firstname, employee.lastname) {
-            @Override
-            protected Pair<String, String> map(Tuple row) {
-                return Pair.of(row.get(employee.firstname), row.get(employee.lastname));
-            }
-        });
-
-        for (Pair<String, String> pair : pairs) {
-            assertNotNull(pair.getFirst());
-            assertNotNull(pair.getSecond());
-        }
-    }
-
-    @Test
-    @ExcludeIn(SQLSERVER) // FIXME
-    public void Math() {
-        Expression<Double> expr = Expressions.numberTemplate(Double.class, "0.5");
-
-        assertEquals(Math.acos(0.5), singleResult(MathExpressions.acos(expr)), 0.001);
-        assertEquals(Math.asin(0.5), singleResult(MathExpressions.asin(expr)), 0.001);
-        assertEquals(Math.atan(0.5), singleResult(MathExpressions.atan(expr)), 0.001);
-        assertEquals(Math.cos(0.5),  singleResult(MathExpressions.cos(expr)), 0.001);
-        assertEquals(Math.cosh(0.5), singleResult(MathExpressions.cosh(expr)), 0.001);
-        assertEquals(cot(0.5),       singleResult(MathExpressions.cot(expr)), 0.001);
-        assertEquals(coth(0.5),      singleResult(MathExpressions.coth(expr)), 0.001);
-        assertEquals(degrees(0.5),   singleResult(MathExpressions.degrees(expr)), 0.001);
-        assertEquals(Math.exp(0.5),  singleResult(MathExpressions.exp(expr)), 0.001);
-        assertEquals(Math.log(0.5),  singleResult(MathExpressions.ln(expr)), 0.001);
-        assertEquals(log(0.5, 10),   singleResult(MathExpressions.log(expr, 10)), 0.001);
-        assertEquals(0.25,           singleResult(MathExpressions.power(expr, 2)), 0.001);
-        assertEquals(radians(0.5),   singleResult(MathExpressions.radians(expr)), 0.001);
-        assertEquals(Integer.valueOf(1),
-                singleResult(MathExpressions.sign(expr)));
-        assertEquals(Math.sin(0.5),  singleResult(MathExpressions.sin(expr)), 0.001);
-        assertEquals(Math.sinh(0.5), singleResult(MathExpressions.sinh(expr)), 0.001);
-        assertEquals(Math.tan(0.5),  singleResult(MathExpressions.tan(expr)), 0.001);
-        assertEquals(Math.tanh(0.5), singleResult(MathExpressions.tanh(expr)), 0.001);
-    }
-
-    @Test
-    public void Nested_Tuple_Projection() {
-        Concatenation concat = new Concatenation(employee.firstname, employee.lastname);
-        List<Tuple> tuples = query().from(employee)
-                .list(new QTuple(employee.firstname, employee.lastname, concat));
-        assertFalse(tuples.isEmpty());
-        for (Tuple tuple : tuples) {
-            String firstName = tuple.get(employee.firstname);
-            String lastName = tuple.get(employee.lastname);
-            assertEquals(firstName + lastName, tuple.get(concat));
-        }
-    }
-
-
-    @Test
-    public void No_From() {
-        assertNotNull(query().singleResult(DateExpression.currentDate()));
-    }
-
-    @Test
-    public void NotExists() {
-        assertTrue(query().from(employee).where(employee.firstname.eq("Barb")).notExists());
-    }
-
-    @Test
-    public void Nullif() {
-        query().from(employee).list(employee.firstname.nullif(employee.lastname));
-    }
-
-    @Test
-    public void Nullif_Constant() {
-        query().from(employee).list(employee.firstname.nullif("xxx"));
-    }
-
-    @Test
-    public void Offset_Only() {
-        query().from(employee)
-            .orderBy(employee.firstname.asc())
-            .offset(3).list(employee.id);
-    }
-
-    @Test
-    public void Operation_in_Constant_list() {
-        query().from(survey).where(survey.name.charAt(0).in(Arrays.asList('a'))).count();
-        query().from(survey).where(survey.name.charAt(0).in(Arrays.asList('a','b'))).count();
-        query().from(survey).where(survey.name.charAt(0).in(Arrays.asList('a','b','c'))).count();
-    }
-
-    @Test
-    @ExcludeIn(CUBRID)
-    public void Order_NullsFirst() {
-        query().from(survey)
-            .orderBy(survey.name.asc().nullsFirst())
-            .list(survey.name);
-    }
-
-    @Test
-    @ExcludeIn(CUBRID)
-    public void Order_NullsLast() {
-        query().from(survey)
-            .orderBy(survey.name.asc().nullsLast())
-            .list(survey.name);
-    }
-
-    @Test
-    public void Params() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Mike",query()
-                .from(employee).where(employee.firstname.eq(name))
-                .set(name, "Mike")
-                .uniqueResult(employee.firstname));
-    }
-
-    @Test
-    public void Params_anon() {
-        Param<String> name = new Param<String>(String.class);
-        assertEquals("Mike",query()
-                .from(employee).where(employee.firstname.eq(name))
-                .set(name, "Mike")
-                .uniqueResult(employee.firstname));
-    }
-
-    @Test(expected=ParamNotSetException.class)
-    public void Params_not_set() {
-        Param<String> name = new Param<String>(String.class,"name");
-        assertEquals("Mike",query()
-                .from(employee).where(employee.firstname.eq(name))
-                .uniqueResult(employee.firstname));
-    }
-
-    @Test
-    @ExcludeIn({DERBY, HSQLDB, ORACLE, SQLSERVER})
-    @SkipForQuoted
-    public void Path_Alias() {
-        expectedQuery = "select e.LASTNAME, sum(e.SALARY) as salarySum " +
-        		"from EMPLOYEE e " +
-        		"group by e.LASTNAME having salarySum > ?";
-
-        NumberExpression<BigDecimal> salarySum = employee.salary.sum().as("salarySum");
-        query().from(employee)
-            .groupBy(employee.lastname)
-            .having(salarySum.gt(10000))
-            .list(employee.lastname, salarySum);
-    }
-
-    @Test
-    public void Path_in_Constant_list() {
-        query().from(survey).where(survey.name.in(Arrays.asList("a"))).count();
-        query().from(survey).where(survey.name.in(Arrays.asList("a","b"))).count();
-        query().from(survey).where(survey.name.in(Arrays.asList("a","b","c"))).count();
-    }
-
-    @Test
-    public void Precedence() {
-        StringPath fn = employee.firstname;
-        StringPath ln = employee.lastname;
-        Predicate where = fn.eq("Mike").and(ln.eq("Smith")).or(fn.eq("Joe").and(ln.eq("Divis")));
-        assertEquals(2l, query().from(employee).where(where).count());
-    }
-
-    @Test
-    public void Precedence2() {
-        StringPath fn = employee.firstname;
-        StringPath ln = employee.lastname;
-        Predicate where = fn.eq("Mike").and(ln.eq("Smith").or(fn.eq("Joe")).and(ln.eq("Divis")));
-        assertEquals(0l, query().from(employee).where(where).count());
-    }
-
-    @Test
-    public void Projection() throws IOException{
-        CloseableIterator<Tuple> results = query().from(survey).iterate(survey.all());
-        assertTrue(results.hasNext());
-        while (results.hasNext()) {
-            assertEquals(3, results.next().size());
-        }
-        results.close();
-    }
-
-    @Test
-    public void Projection_and_TwoColumns() {
-        // projection and two columns
-        for (Tuple row : query().from(survey)
-                .list(new QIdName(survey.id, survey.name), survey.id, survey.name)) {
-            assertEquals(3, row.size());
-            assertEquals(IdName.class, row.get(0, Object.class).getClass());
-            assertEquals(Integer.class, row.get(1, Object.class).getClass());
-            assertEquals(String.class, row.get(2, Object.class).getClass());
-        }
-    }
-
-    @Test
-    public void Projection2() throws IOException{
-        // TODO : add assertions
-        CloseableIterator<Tuple> results = query().from(survey).iterate(survey.id, survey.name);
-        assertTrue(results.hasNext());
-        while (results.hasNext()) {
-            assertEquals(2, results.next().size());
-        }
-        results.close();
-    }
-
-    @Test
-    public void Projection3() throws IOException{
-        CloseableIterator<String> names = query().from(survey).iterate(survey.name);
-        assertTrue(names.hasNext());
-        while (names.hasNext()) {
-            System.out.println(names.next());
-        }
-        names.close();
-    }
-
-    @Test
-    public void QBeanUsage() {
-        PathBuilder<Object[]> sq = new PathBuilder<Object[]>(Object[].class, "sq");
-        List<Survey> surveys =
-            query().from(
-                sq().from(survey).list(survey.all()).as("sq"))
-            .list(new QBean<Survey>(Survey.class, Collections.singletonMap("name", sq.get(survey.name))));
-        assertFalse(surveys.isEmpty());
-
-    }
-
-    @Test
-    public void Query_with_Constant() throws Exception {
-        for (Tuple row : query().from(survey)
-                .where(survey.id.eq(1))
-                .list(survey.id, survey.name)) {
-            System.out.println(row.get(survey.id) + ", " + row.get(survey.name));
-        }
-    }
-
-    @Test
-    public void Query1() throws Exception {
-        for (String s : query().from(survey).list(survey.name)) {
-            System.out.println(s);
-        }
-    }
-
-    @Test
-    public void Query2() throws Exception {
-        for (Tuple row : query().from(survey).list(survey.id, survey.name)) {
-            System.out.println(row.get(survey.id) + ", " + row.get(survey.name));
-        }
-    }
-
-    private double radians(double x) {
-        return x * Math.PI / 180.0;
-    }
-
-    @Test
-    public void Random() {
-        query().uniqueResult(MathExpressions.random());
-    }
-
-    @Test
-    @ExcludeIn({ORACLE, POSTGRES, SQLITE, TERADATA})
-    public void Random2() {
-        query().uniqueResult(MathExpressions.random(10));
-    }
-
-    @Test
-    public void RelationalPath_Projection() {
-        List<Tuple> results = query().from(employee, employee2).where(employee.id.eq(employee2.id))
-                .list(employee, employee2);
-        assertFalse(results.isEmpty());
-        for (Tuple row : results) {
-            Employee e1 = row.get(employee);
-            Employee e2 = row.get(employee2);
-            assertEquals(e1.getId(), e2.getId());
-        }
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void Right_Join() throws SQLException {
-        query().from(employee).rightJoin(employee2)
-            .on(employee.superiorIdKey.on(employee2))
-            .list(employee.id, employee2.id);
-    }
-
-    @Test
-    @ExcludeIn({DERBY, SQLSERVER})
-    public void Round() {
-        Expression<Double> expr = Expressions.numberTemplate(Double.class, "1.32");
-
-        assertEquals(Double.valueOf(1.0), singleResult(MathExpressions.round(expr)));
-        assertEquals(Double.valueOf(1.3), singleResult(MathExpressions.round(expr, 1)));
-    }
-
-    @Test
-    @ExcludeIn({SQLITE, SQLSERVER, DERBY})
-    public void Rpad() {
-        assertEquals("ab  ", singleResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4)));
-        assertEquals("ab!!", singleResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4,'!')));
-    }
-
-    @Test
-    @Ignore
-    @ExcludeIn({ORACLE, DERBY, SQLSERVER})
-    public void Select_BooleanExpr() throws SQLException {
-        // TODO : FIXME
-        System.out.println(query().from(survey).list(survey.id.eq(0)));
-    }
-
-    @Test
-    @Ignore
-    @ExcludeIn({ORACLE, DERBY, SQLSERVER})
-    public void Select_BooleanExpr2() throws SQLException {
-        // TODO : FIXME
-        System.out.println(query().from(survey).list(survey.id.gt(0)));
-    }
-
-    @Test
-    public void Select_Concat() throws SQLException {
-        System.out.println(query().from(survey).list(survey.name.append("Hello World")));
-    }
-
-    @Test
-    @ExcludeIn({SQLITE, SQLSERVER, CUBRID, TERADATA})
-    public void Select_For_Update() {
-        query().from(survey).forUpdate().list(survey.id);
-    }
-
-    @Test
-    @ExcludeIn({SQLITE, SQLSERVER, CUBRID, TERADATA})
-    public void Select_For_Update_UniqueResult() {
-        query().from(survey).forUpdate().uniqueResult(survey.id);
-    }
-
-    @Test
-    @SkipForQuoted
-    public void Serialization() {
-        TestQuery query = query();
-        query.from(survey);
-        assertEquals("from SURVEY s", query.toString());
-        query.from(survey2);
-        assertEquals("from SURVEY s, SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void Serialization2() throws Exception {
-        List<Tuple> rows = query().from(survey).list(survey.id, survey.name);
-        serialize(rows);
-    }
-
-    private void serialize(Object obj) throws IOException, ClassNotFoundException{
-        ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(bytesOut);
-        out.writeObject(obj);
-        out.close();
-        bytesOut.close();
-
-        ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bytesIn);
-        List<Tuple> rows = (List<Tuple>) in.readObject();
-        for (Tuple row : rows) {
-            row.hashCode();
-        }
-    }
-
-    @Test
-    public void Single() {
-        assertNotNull(query().from(survey).singleResult(survey.name));
-    }
-
-    @Test
-    public void Single_Array() {
-        assertNotNull(query().from(survey).singleResult(new Expression<?>[]{survey.name}));
-    }
-
-    @Test
-    public void Single_Column() {
-        // single column
-        for (String s : query().from(survey).list(survey.name)) {
-            assertNotNull(s);
-        }
-    }
-
-    @Test
-    public void Single_Column_via_Object_type() {
-        for (Object s : query().from(survey)
-                .list(new PathImpl<Object>(Object.class, survey.name.getMetadata()))) {
-            assertEquals(String.class, s.getClass());
-        }
-    }
-
-    @Test
-    public void SpecialChars() {
-        query().from(survey).where(survey.name.in("\n", "\r", "\\", "\'", "\"")).exists();
-    }
-
-    @Test
-    public void StandardTest() {
-        standardTest.runBooleanTests(employee.firstname.isNull(), employee2.lastname.isNotNull());
-        // datetime
-        standardTest.runDateTests(employee.datefield, employee2.datefield, date);
-
-        // numeric
-        standardTest.runNumericCasts(employee.id, employee2.id, 1);
-        standardTest.runNumericTests(employee.id, employee2.id, 1);
-        // BigDecimal
-        standardTest.runNumericTests(employee.salary, employee2.salary, new BigDecimal("30000.00"));
-
-        standardTest.runStringTests(employee.firstname, employee2.firstname, "Jennifer");
-        Target target = Connections.getTarget();
-        if (target != SQLITE && target != SQLSERVER) {
-            // jTDS driver does not support TIME SQL data type
-            standardTest.runTimeTests(employee.timefield, employee2.timefield, time);
-        }
-
-        standardTest.report();
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void String() {
-        StringExpression str = Expressions.stringTemplate("'  abcd  '");
-
-        assertEquals("abcd  ",           singleResult(StringExpressions.ltrim(str)));
-        assertEquals(Integer.valueOf(3), singleResult(str.locate("a")));
-        assertEquals(Integer.valueOf(0), singleResult(str.locate("a", 4)));
-        assertEquals(Integer.valueOf(4), singleResult(str.locate("b", 2)));
-        assertEquals("  abcd",           singleResult(StringExpressions.rtrim(str)));
-    }
-
-    @Test
-    @ExcludeIn({POSTGRES, SQLITE})
-    public void String_IndexOf() {
-        StringExpression str = Expressions.stringTemplate("'  abcd  '");
-
-        assertEquals(Integer.valueOf(2),  singleResult(str.indexOf("a")));
-        assertEquals(Integer.valueOf(-1), singleResult(str.indexOf("a", 4)));
-        assertEquals(Integer.valueOf(3),  singleResult(str.indexOf("b", 2)));
-    }
-
-    @Test
-    public void StringFunctions2() throws SQLException {
-        for (BooleanExpression where : Arrays.<BooleanExpression> asList(
-                employee.firstname.startsWith("a"),
-                employee.firstname.startsWithIgnoreCase("a"),
-                employee.firstname.endsWith("a"),
-                employee.firstname.endsWithIgnoreCase("a"))) {
-            query().from(employee).where(where).list(employee.firstname);
-        }
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void String_Left() {
-        assertEquals("John", query().from(employee).where(employee.lastname.eq("Johnson"))
-                                    .singleResult(SQLExpressions.left(employee.lastname, 4)));
-    }
-
-    @Test
-    @ExcludeIn({DERBY, SQLITE})
-    public void String_Right() {
-        assertEquals("son", query().from(employee).where(employee.lastname.eq("Johnson"))
-                                   .singleResult(SQLExpressions.right(employee.lastname, 3)));
-    }
-
-    @Test
-    @ExcludeIn({DERBY, SQLITE})
-    public void String_Left_Right() {
-        assertEquals("hn", query().from(employee).where(employee.lastname.eq("Johnson"))
-                                  .singleResult(SQLExpressions.right(SQLExpressions.left(employee.lastname, 4), 2)));
-    }
-
-    @Test
-    @ExcludeIn({DERBY, SQLITE})
-    public void String_Right_Left() {
-        assertEquals("ns", query().from(employee).where(employee.lastname.eq("Johnson"))
-                                  .singleResult(SQLExpressions.left(SQLExpressions.right(employee.lastname, 4), 2)));
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Substring() {
-        //SELECT * FROM account where SUBSTRING(name, -x, 1) = SUBSTRING(name, -y, 1)
-        query().from(employee)
-               .where(employee.firstname.substring(-3, 1).eq(employee.firstname.substring(-2, 1)))
-               .list(employee.id);
-    }
-
-    @Test
-    public void Syntax_For_Employee() throws SQLException {
-        query().from(employee).groupBy(employee.superiorId)
-            .orderBy(employee.superiorId.asc())
-            .list(employee.salary.avg(),employee.id.max());
-
-        query().from(employee).groupBy(employee.superiorId)
-            .having(employee.id.max().gt(5))
-            .orderBy(employee.superiorId.asc())
-            .list(employee.salary.avg(), employee.id.max());
-
-        query().from(employee).groupBy(employee.superiorId)
-            .having(employee.superiorId.isNotNull())
-            .orderBy(employee.superiorId.asc())
-            .list(employee.salary.avg(),employee.id.max());
-    }
-
-    @Test
-    public void TemplateExpression() {
-        NumberExpression<Integer> one = NumberTemplate.create(Integer.class, "1");
-        query().from(survey).list(one.as("col1"));
-    }
-
-    @Test
-    public void Transform_GroupBy() {
-        QEmployee employee = new QEmployee("employee");
-        QEmployee employee2 = new QEmployee("employee2");
-        Map<Integer, Map<Integer, Employee>> results = query().from(employee, employee2)
-            .transform(GroupBy.groupBy(employee.id).as(GroupBy.map(employee2.id, employee2)));
-
-        int count = (int) query().from(employee).count();
-        assertEquals(count, results.size());
-        for (Map.Entry<Integer, Map<Integer, Employee>> entry : results.entrySet()) {
-            Map<Integer, Employee> employees = entry.getValue();
-            assertEquals(count, employees.size());
-        }
-
-    }
-
-    @Test
-    public void Tuple_Projection() {
-        List<Tuple> tuples = query().from(employee)
-                .list(new QTuple(employee.firstname, employee.lastname));
-        assertFalse(tuples.isEmpty());
-        for (Tuple tuple : tuples) {
-            assertNotNull(tuple.get(employee.firstname));
-            assertNotNull(tuple.get(employee.lastname));
-        }
-    }
-
-    @Test
-    @ExcludeIn(DERBY)
-    public void Tuple2() {
-        query().from(employee)
-            .list(Expressions.as(ConstantImpl.create("1"),"code"),
-                  employee.id);
-    }
-
-    @Test
-    public void TwoColumns() {
-        // two columns
-        for (Tuple row : query().from(survey).list(survey.id, survey.name)) {
-            assertEquals(2, row.size());
-            assertEquals(Integer.class, row.get(0, Object.class).getClass());
-            assertEquals(String.class, row.get(1, Object.class).getClass());
-        }
-    }
-
-    @Test
-    public void TwoColumns_and_Projection() {
-        // two columns and projection
-        for (Tuple row : query().from(survey)
-                .list(survey.id, survey.name, new QIdName(survey.id, survey.name))) {
-            assertEquals(3, row.size());
-            assertEquals(Integer.class, row.get(0, Object.class).getClass());
-            assertEquals(String.class, row.get(1, Object.class).getClass());
-            assertEquals(IdName.class, row.get(2, Object.class).getClass());
-        }
-    }
-
-    @Test
-    public void Unique_Constructor_Projection() {
-        IdName idAndName = query().from(survey).limit(1).uniqueResult(new QIdName(survey.id, survey.name));
-        assertNotNull(idAndName);
-        assertNotNull(idAndName.getId());
-        assertNotNull(idAndName.getName());
-    }
-
-    @Test
-    public void Unique_Single() {
-        String s = query().from(survey).limit(1).uniqueResult(survey.name);
-        assertNotNull(s);
-    }
-
-    @Test
-    public void Unique_Wildcard() {
-        // unique wildcard
-        Tuple row = query().from(survey).limit(1).uniqueResult(survey.all());
-        assertNotNull(row);
-        assertEquals(3, row.size());
-        assertNotNull(row.get(0, Object.class));
-        assertNotNull(row.get(0, Object.class) +" is not null", row.get(1, Object.class));
-    }
-
-    @Test(expected=NonUniqueResultException.class)
-    public void UniqueResultContract() {
-        query().from(employee).uniqueResult(employee.all());
-    }
-
-    @Test
-    public void Various() throws SQLException {
-        for (String s : query().from(survey).list(survey.name.lower())) {
-            assertEquals(s, s.toLowerCase());
-        }
-
-        for (String s : query().from(survey).list(survey.name.append("abc"))) {
-            assertTrue(s.endsWith("abc"));
-        }
-
-        System.out.println(query().from(survey).list(survey.id.sqrt()));
-    }
-
-    @Test
-    public void Where_Exists() throws SQLException {
-        NumberSubQuery<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        query().from(employee).where(sq1.exists()).count();
-    }
-
-    @Test
-    public void Where_Exists_Not() throws SQLException {
-        NumberSubQuery<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        query().from(employee).where(sq1.exists().not()).count();
-    }
-
-    @Test
-    @IncludeIn({HSQLDB, ORACLE, POSTGRES})
-    public void With() {
-        query().with(employee2, sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .from(employee, employee2)
-               .list(employee.id, employee2.id);
-    }
-
-    @Test
-    @IncludeIn({HSQLDB, ORACLE, POSTGRES})
-    public void With2() {
-        QEmployee employee3 = new QEmployee("e3");
-        query().with(employee2, sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .with(employee2, sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .from(employee, employee2, employee3)
-               .list(employee.id, employee2.id, employee3.id);
-    }
-
-    @Test
-    @IncludeIn({HSQLDB, ORACLE, POSTGRES})
-    public void With3() {
-        query().with(employee2, employee2.all()).as(
-                sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .from(employee, employee2)
-               .list(employee.id, employee2.id);
-    }
-
-    @Test
-    @IncludeIn({ORACLE, POSTGRES})
-    public void With_Recursive() {
-        query().withRecursive(employee2, sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .from(employee, employee2)
-               .list(employee.id, employee2.id);
-    }
-
-
-    @Test
-    @IncludeIn({ORACLE, POSTGRES})
-    public void With_Recursive2() {
-        query().withRecursive(employee2, employee2.all()).as(
-                sq().from(employee)
-                  .where(employee.firstname.eq("Tom"))
-                  .list(Wildcard.all))
-               .from(employee, employee2)
-               .list(employee.id, employee2.id);
-    }
-
-    @Test
-    public void Wildcard() {
-        // wildcard
-        for (Tuple row : query().from(survey).list(survey.all())) {
-            assertNotNull(row);
-            assertEquals(3, row.size());
-            assertNotNull(row.get(0, Object.class));
-            assertNotNull(row.get(0, Object.class) + " is not null", row.get(1, Object.class));
-        }
-    }
-
-    @Test
-    @SkipForQuoted
-    public void Wildcard_All() {
-        expectedQuery = "select * from EMPLOYEE e";
-        query().from(employee).list(Wildcard.all);
-    }
-
-    @Test
-    public void Wildcard_All2() {
-        query().from(new RelationalPathBase(Object.class, "employee", "public", "EMPLOYEE"))
-               .list(Wildcard.all);
-    }
-
-    @Test
-    public void Wildcard_and_QTuple() {
-        // wildcard and QTuple
-        for (Tuple tuple : query().from(survey).list(new QTuple(survey.all()))) {
-            assertNotNull(tuple.get(survey.id));
-            assertNotNull(tuple.get(survey.name));
-        }
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    public void WithinGroup() {
-        List<WithinGroup<?>> exprs = new ArrayList<WithinGroup<?>>();
-        NumberPath<Integer> path = survey.id;
-
-        // two args
-        add(exprs, SQLExpressions.cumeDist(2, 3));
-        add(exprs, SQLExpressions.denseRank(4, 5));
-        add(exprs, SQLExpressions.listagg(path, ","));
-        add(exprs, SQLExpressions.percentRank(6, 7));
-        add(exprs, SQLExpressions.rank(8, 9));
-
-        for (WithinGroup<?> wg : exprs) {
-            query().from(survey).list(wg.withinGroup().orderBy(survey.id, survey.id));
-        }
-
-        // one arg
-        exprs.clear();
-        add(exprs, SQLExpressions.percentileCont(0.1));
-        add(exprs, SQLExpressions.percentileDisc(0.9));
-
-        for (WithinGroup<?> wg : exprs) {
-            query().from(survey).list(wg.withinGroup().orderBy(survey.id));
-        }
-    }
-
-    @Test
-    @ExcludeIn({DERBY, H2})
-    public void YearWeek() {
-        TestQuery query = query().from(employee).orderBy(employee.id.asc());
-        assertEquals(Integer.valueOf(200005), query.singleResult(employee.datefield.yearWeek()));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectMySQLBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectMySQLBase.java
deleted file mode 100644
index 967bd839ed..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectMySQLBase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Target.MYSQL;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.mysql.MySQLQuery;
-import com.mysema.testutil.IncludeIn;
-
-
-public class SelectMySQLBase extends AbstractBaseTest {
-
-    protected MySQLQuery mysqlQuery() {
-        return new MySQLQuery(connection, configuration);
-    }
-
-    @Test
-    @IncludeIn(MYSQL)
-    public void MySQL_Extensions() {
-        mysqlQuery().from(survey).bigResult().list(survey.id);
-        mysqlQuery().from(survey).bufferResult().list(survey.id);
-        mysqlQuery().from(survey).cache().list(survey.id);
-        mysqlQuery().from(survey).calcFoundRows().list(survey.id);
-        mysqlQuery().from(survey).noCache().list(survey.id);
-
-        mysqlQuery().from(survey).highPriority().list(survey.id);
-        mysqlQuery().from(survey).lockInShareMode().list(survey.id);
-        mysqlQuery().from(survey).smallResult().list(survey.id);
-        mysqlQuery().from(survey).straightJoin().list(survey.id);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java
deleted file mode 100644
index 42fde08d0c..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.mysema.query;
-
-import java.sql.SQLException;
-
-import com.mysema.query.sql.SQLExpressions;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.oracle.OracleQuery;
-import com.mysema.testutil.IncludeIn;
-import junit.framework.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.sql.oracle.OracleGrammar.level;
-
-public class SelectOracleBase extends AbstractBaseTest {
-
-    protected OracleQuery oracleQuery() {
-        return new OracleQuery(connection, configuration) {
-            @Override
-            protected SQLSerializer serialize(boolean forCountRow) {
-                SQLSerializer serializer = super.serialize(forCountRow);
-                String rv = serializer.toString();
-                if (expectedQuery != null) {
-                   Assert.assertEquals(expectedQuery, rv.replace('\n', ' '));
-                   expectedQuery = null;
-                }
-                logger.debug(rv);
-                return serializer;
-            }
-        };
-    }
-
-    @Test
-    @Ignore
-    public void ConnectBy() throws SQLException {
-        // TODO : come up with a legal case
-        oracleQuery().from(employee)
-            .where(level.eq(-1))
-            .connectBy(level.lt(1000))
-            .list(employee.id);
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void ConnectByPrior() throws SQLException {
-        expectedQuery =  "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
-                        "from EMPLOYEE e " +
-                        "connect by prior e.ID = e.SUPERIOR_ID";
-        oracleQuery().from(employee)
-            .connectByPrior(employee.id.eq(employee.superiorId))
-            .list(employee.id, employee.lastname, employee.superiorId);
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void ConnectByPrior2() throws SQLException {
-        if (configuration.getUseLiterals()) return;
-
-        expectedQuery =
-                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
-                "from EMPLOYEE e " +
-                "start with e.ID = ? " +
-                "connect by prior e.ID = e.SUPERIOR_ID";
-        oracleQuery().from(employee)
-            .startWith(employee.id.eq(1))
-            .connectByPrior(employee.id.eq(employee.superiorId))
-            .list(employee.id, employee.lastname, employee.superiorId);
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void ConnectByPrior3() throws SQLException {
-        if (configuration.getUseLiterals()) return;
-
-        expectedQuery =
-                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
-                "from EMPLOYEE e " +
-                "start with e.ID = ? " +
-                "connect by prior e.ID = e.SUPERIOR_ID " +
-                "order siblings by e.LASTNAME";
-        oracleQuery().from(employee)
-            .startWith(employee.id.eq(1))
-            .connectByPrior(employee.id.eq(employee.superiorId))
-            .orderSiblingsBy(employee.lastname)
-            .list(employee.id, employee.lastname, employee.superiorId);
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void ConnectByPrior4() throws SQLException {
-        if (configuration.getUseLiterals()) return;
-
-        expectedQuery =
-                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
-                "from EMPLOYEE e " +
-                "connect by nocycle prior e.ID = e.SUPERIOR_ID";
-        oracleQuery().from(employee)
-            .connectByNocyclePrior(employee.id.eq(employee.superiorId))
-            .list(employee.id, employee.lastname, employee.superiorId);
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    @SkipForQuoted
-    public void SumOver() throws SQLException{
-//        SQL> select deptno,
-//        2  ename,
-//        3  sal,
-//        4  sum(sal) over (partition by deptno
-//        5  order by sal,ename) CumDeptTot,
-//        6  sum(sal) over (partition by deptno) SalByDept,
-//        7  sum(sal) over (order by deptno, sal) CumTot,
-//        8  sum(sal) over () TotSal
-//        9  from emp
-//       10  order by deptno, sal;
-        expectedQuery = "select e.LASTNAME, e.SALARY, " +
-            "sum(e.SALARY) over (partition by e.SUPERIOR_ID order by e.LASTNAME, e.SALARY), " +
-            "sum(e.SALARY) over (order by e.SUPERIOR_ID, e.SALARY), " +
-            "sum(e.SALARY) over () from EMPLOYEE e order by e.SALARY asc, e.SUPERIOR_ID asc";
-
-        oracleQuery().from(employee)
-            .orderBy(employee.salary.asc(), employee.superiorId.asc())
-            .list(
-               employee.lastname,
-               employee.salary,
-               SQLExpressions.sum(employee.salary).over().partitionBy(employee.superiorId).orderBy(employee.lastname, employee.salary),
-               SQLExpressions.sum(employee.salary).over().orderBy(employee.superiorId, employee.salary),
-               SQLExpressions.sum(employee.salary).over());
-
-        // shorter version
-        QEmployee e = employee;
-        oracleQuery().from(e)
-            .orderBy(e.salary.asc(), e.superiorId.asc())
-            .list(e.lastname, e.salary,
-               SQLExpressions.sum(e.salary).over().partitionBy(e.superiorId).orderBy(e.lastname, e.salary),
-               SQLExpressions.sum(e.salary).over().orderBy(e.superiorId, e.salary),
-               SQLExpressions.sum(e.salary).over());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectTeradataBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectTeradataBase.java
deleted file mode 100644
index c4cb09a643..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectTeradataBase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Target.TERADATA;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.teradata.SetQueryBandClause;
-import com.mysema.testutil.IncludeIn;
-
-public class SelectTeradataBase extends AbstractBaseTest {
-
-
-    protected SetQueryBandClause setQueryBand() {
-        return new SetQueryBandClause(connection, configuration);
-    }
-
-    @Test
-    @IncludeIn(TERADATA)
-    public void SetQueryBand_ForSession() {
-        setQueryBand().set("a", "bb").forSession().execute();
-        query().from(survey).list(survey.id);
-    }
-
-    @Test
-    @IncludeIn(TERADATA)
-    public void SetQueryBand_ForTransaction() {
-        setQueryBand().set("a", "bb").forTransaction().execute();
-        query().from(survey).list(survey.id);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java
deleted file mode 100644
index bd6bb5e1d2..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2013, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-public class SelectUseLiteralsBase extends SelectBase {
-
-    public SelectUseLiteralsBase() {
-        configuration.setUseLiterals(true);
-    }
-
-    @Override
-    public void Limit_and_Offset2() {
-        // not supported
-    }
-
-    @Override
-    public void Path_Alias() {
-        // not supported
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectWindowFunctionsBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectWindowFunctionsBase.java
deleted file mode 100644
index 6974ad71cf..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectWindowFunctionsBase.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.Constants.employee2;
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.Target.SQLSERVER;
-import static com.mysema.query.Target.TERADATA;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLExpressions;
-import com.mysema.query.sql.WindowOver;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-
-public class SelectWindowFunctionsBase extends AbstractBaseTest {
-
-    @Test
-    @ExcludeIn(SQLSERVER) // FIXME
-    public void WindowFunctions() {
-        NumberPath<Integer> path = survey.id;
-        NumberPath<?> path2 = survey.id;
-
-        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
-        add(exprs, SQLExpressions.avg(path));
-        add(exprs, SQLExpressions.count(path));
-        add(exprs, SQLExpressions.corr(path, path2));
-        add(exprs, SQLExpressions.covarPop(path, path2));
-        add(exprs, SQLExpressions.covarSamp(path, path2));
-        add(exprs, SQLExpressions.cumeDist(), TERADATA);
-        add(exprs, SQLExpressions.denseRank(), TERADATA);
-        add(exprs, SQLExpressions.firstValue(path), TERADATA);
-        add(exprs, SQLExpressions.lag(path), TERADATA);
-        add(exprs, SQLExpressions.lastValue(path), TERADATA);
-        add(exprs, SQLExpressions.lead(path), TERADATA);
-        add(exprs, SQLExpressions.max(path));
-        add(exprs, SQLExpressions.min(path));
-        add(exprs, SQLExpressions.nthValue(path, 2), TERADATA);
-        add(exprs, SQLExpressions.ntile(3), TERADATA);
-        add(exprs, SQLExpressions.percentRank());
-        add(exprs, SQLExpressions.rank());
-        add(exprs, SQLExpressions.rowNumber());
-        add(exprs, SQLExpressions.stddev(path), TERADATA);
-        add(exprs, SQLExpressions.stddevPop(path), TERADATA);
-        add(exprs, SQLExpressions.stddevSamp(path), TERADATA);
-        add(exprs, SQLExpressions.sum(path));
-        add(exprs, SQLExpressions.variance(path), TERADATA);
-        add(exprs, SQLExpressions.varPop(path), TERADATA);
-        add(exprs, SQLExpressions.varSamp(path), TERADATA);
-
-        for (WindowOver<?> wo : exprs) {
-            query().from(survey).list(wo.over().partitionBy(survey.name).orderBy(survey.id));
-        }
-    }
-
-    @Test
-    public void WindowFunctions_Manual_Paging() {
-        Expression<Long> rowNumber = SQLExpressions.rowNumber().over().orderBy(employee.lastname.asc()).as("rn");
-        Expression<Object[]> all = Wildcard.all;
-
-        // simple
-        System.out.println("#1");
-        for (Tuple row : query().from(employee).list(employee.firstname, employee.lastname, rowNumber)) {
-            System.out.println(row);
-        }
-        System.out.println();
-
-        // with subquery, generic alias
-        System.out.println("#2");
-        ListSubQuery<Tuple> sub = sq().from(employee).list(employee.firstname, employee.lastname, rowNumber);
-        SimplePath<Tuple> subAlias = new SimplePath<Tuple>(Tuple.class, "s");
-        for (Object[] row : query().from(sub.as(subAlias)).list(all)) {
-            System.out.println(Arrays.asList(row));
-        }
-        System.out.println();
-
-        // with subquery, only row number
-        System.out.println("#3");
-        SimpleSubQuery<Long> sub2 = sq().from(employee).unique(rowNumber);
-        SimplePath<Long> subAlias2 = new SimplePath<Long>(Long.class, "s");
-        for (Object[] row : query().from(sub2.as(subAlias2)).list(all)) {
-            System.out.println(Arrays.asList(row));
-        }
-        System.out.println();
-
-        // with subquery, specific alias
-        System.out.println("#4");
-        ListSubQuery<Tuple> sub3 = sq().from(employee).list(employee.firstname, employee.lastname, rowNumber);
-        for (Tuple row : query().from(sub3.as(employee2)).list(employee2.firstname, employee2.lastname)) {
-            System.out.println(Arrays.asList(row));
-        }
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    public void WindowFunctions_Keep() {
-        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
-        NumberPath<Integer> path = survey.id;
-
-        add(exprs, SQLExpressions.avg(path));
-        add(exprs, SQLExpressions.count(path));
-        add(exprs, SQLExpressions.max(path));
-        add(exprs, SQLExpressions.min(path));
-        add(exprs, SQLExpressions.stddev(path));
-        add(exprs, SQLExpressions.variance(path));
-
-        for (WindowOver<?> wo : exprs) {
-            query().from(survey).list(wo.keepFirst().orderBy(survey.id));
-        }
-    }
-
-    @Test
-    @ExcludeIn(SQLSERVER)
-    public void WindowFunctions_Regr() {
-        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
-        NumberPath<Integer> path = survey.id;
-        NumberPath<?> path2 = survey.id;
-
-        add(exprs, SQLExpressions.regrSlope(path,  path2), SQLSERVER);
-        add(exprs, SQLExpressions.regrIntercept(path,  path2));
-        add(exprs, SQLExpressions.regrCount(path,  path2));
-        add(exprs, SQLExpressions.regrR2(path,  path2));
-        add(exprs, SQLExpressions.regrAvgx(path, path2));
-        add(exprs, SQLExpressions.regrSxx(path, path2));
-        add(exprs, SQLExpressions.regrSyy(path, path2));
-        add(exprs, SQLExpressions.regrSxy(path,  path2));
-
-        for (WindowOver<?> wo : exprs) {
-            query().from(survey).list(wo.over().partitionBy(survey.name).orderBy(survey.id));
-        }
-    }
-
-    @Test
-    @IncludeIn(ORACLE)
-    public void WindowFunctions_Oracle() {
-        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
-        NumberPath<Integer> path = survey.id;
-        add(exprs, SQLExpressions.countDistinct(path));
-        add(exprs, SQLExpressions.ratioToReport(path));
-        add(exprs, SQLExpressions.stddevDistinct(path));
-
-        for (WindowOver<?> wo : exprs) {
-            query().from(survey).list(wo.over().partitionBy(survey.name));
-        }
-    }
-
-    @Test
-    public void WindowFunctions_Over() {
-        //SELECT Shipment_id,Ship_date, SUM(Qty) OVER () AS Total_Qty
-        //FROM TestDB.Shipment
-
-        query().from(employee).list(
-                employee.id,
-                SQLExpressions.sum(employee.salary).over());
-    }
-
-    @Test
-    public void WindowFunctions_PartitionBy() {
-        //SELECT Shipment_id,Ship_date,Ship_Type,
-        //SUM(Qty) OVER (PARTITION BY Ship_Type ) AS Total_Qty
-        //FROM TestDB.Shipment
-
-        query().from(employee).list(
-                employee.id,
-                employee.superiorId,
-                SQLExpressions.sum(employee.salary).over()
-                    .partitionBy(employee.superiorId));
-    }
-
-    @Test
-    @ExcludeIn(SQLSERVER)
-    public void WindowFunctions_OrderBy() {
-        //SELECT Shipment_id,Ship_date,Ship_Type,
-        //SUM(Qty) OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ) AS Total_Qty
-        //FROM TestDB.Shipment
-
-        query().from(employee).list(
-                employee.id,
-                SQLExpressions.sum(employee.salary).over()
-                    .partitionBy(employee.superiorId)
-                    .orderBy(employee.datefield));
-    }
-
-    @Test
-    @ExcludeIn(SQLSERVER)
-    public void WindowFunctions_UnboundedRows() {
-        //SELECT Shipment_id,Ship_date,Ship_Type,
-        //SUM(Qty) OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt
-        //ROWS BETWEEN UNBOUNDED PRECEDING
-        //AND CURRENT ROW) AS Total_Qty
-        //FROM TestDB.Shipment
-
-        query().from(employee).list(
-                employee.id,
-                SQLExpressions.sum(employee.salary).over()
-                    .partitionBy(employee.superiorId)
-                    .orderBy(employee.datefield)
-                    .rows().between().unboundedPreceding().currentRow());
-    }
-
-    @Test
-    @IncludeIn({TERADATA})
-    public void WindowFunctions_Qualify() {
-        //SELECT Shipment_id,Ship_date,Ship_Type,
-        //Rank() OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ) AS rnk
-        //FROM TestDB.Shipment
-        //QUALIFY  (Rank() OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ))  =1
-
-        teradataQuery().from(employee)
-               .qualify(SQLExpressions.rank().over()
-                       .partitionBy(employee.superiorId)
-                       .orderBy(employee.datefield).eq(1l))
-               .list(employee.id,SQLExpressions.sum(employee.salary).over());
-
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SkipForQuotedRule.java b/querydsl-sql/src/test/java/com/mysema/query/SkipForQuotedRule.java
deleted file mode 100644
index c8392c9bb1..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SkipForQuotedRule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.testutil.EmptyStatement;
-
-public class SkipForQuotedRule implements MethodRule {
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        SQLTemplates templates = Connections.getTemplates();
-        if (templates.isUseQuotes() || templates.isPrintSchema()) {
-            boolean run = method.getMethod().getAnnotation(SkipForQuoted.class) == null;
-            return run ? base :  EmptyStatement.DEFAULT;
-        } else {
-            return base;
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SpatialBase.java b/querydsl-sql/src/test/java/com/mysema/query/SpatialBase.java
deleted file mode 100644
index 5661a14f05..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SpatialBase.java
+++ /dev/null
@@ -1,419 +0,0 @@
-package com.mysema.query;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.spatial.PointExpression;
-import com.mysema.query.spatial.path.*;
-import com.mysema.query.sql.spatial.QShapes;
-import com.mysema.query.sql.spatial.QSpatialRefSys;
-import com.mysema.query.sql.spatial.Shapes;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-import org.geolatte.geom.*;
-import org.geolatte.geom.codec.Wkt;
-import org.junit.Test;
-import static com.mysema.query.Target.*;
-import static org.junit.Assert.*;
-
-public class SpatialBase extends AbstractBaseTest {
-
-    private static final QShapes shapes = QShapes.shapes;
-
-    // point 1-5
-    // linestring 6-7
-    // polygon 8-9
-    // multipoint 10-11
-    // multilinestring 12-13
-    // multipolygon 14-15
-
-    private TestQuery withPoints() {
-        return query().from(shapes).where(shapes.id.between(1, 5));
-    }
-
-    private TestQuery withLineStrings() {
-        return query().from(shapes).where(shapes.id.between(6, 7));
-    }
-
-    private TestQuery withPolygons() {
-        return query().from(shapes).where(shapes.id.between(8, 9));
-    }
-
-    private TestQuery withMultipoints() {
-        return query().from(shapes).where(shapes.id.between(10, 11));
-    }
-
-    private TestQuery withMultiLineStrings() {
-        return query().from(shapes).where(shapes.id.between(12, 13));
-    }
-
-    private TestQuery withMultiPolygons() {
-        return query().from(shapes).where(shapes.id.between(14, 15));
-    }
-
-    @Test
-    @IncludeIn(POSTGRES)
-    public void SpatialRefSys() {
-        QSpatialRefSys spatialRefSys = QSpatialRefSys.spatialRefSys;
-        query().from(spatialRefSys).list(spatialRefSys);
-    }
-
-    private String normalize(String s) {
-        String normalized = s.replace(" ", "").replace("ST_", "").replace("_", "");
-        normalized = normalized.substring(normalized.indexOf(';') + 1);
-        return normalized.toUpperCase();
-    }
-
-    @Test // FIXME, maybe use enum as the type ?!?
-    @ExcludeIn(H2)
-    public void GeometryType() {
-        List<Tuple> results = query().from(shapes).list(shapes.geometry, shapes.geometry.geometryType());
-        assertFalse(results.isEmpty());
-        for (Tuple row : results) {
-            assertEquals(
-                    normalize(row.get(shapes.geometry).getGeometryType().name()),
-                    normalize(row.get(shapes.geometry.geometryType())));
-        }
-    }
-
-    @Test
-    public void AsText() {
-        List<Tuple> results = query().from(shapes).list(shapes.geometry, shapes.geometry.asText());
-        assertFalse(results.isEmpty());
-        for (Tuple row : results) {
-            if (!(row.get(shapes.geometry) instanceof MultiPoint)) {
-                assertEquals(
-                        normalize(row.get(shapes.geometry).asText()),
-                        normalize(row.get(shapes.geometry.asText())));
-            }
-        }
-    }
-
-    @Test
-    @ExcludeIn(H2)
-    public void Point_X_Y() {
-        PointPath<Point> point = shapes.geometry.asPoint();
-        List<Tuple> results = withPoints().list(point, point.x(), point.y());
-        assertFalse(results.isEmpty());
-        for (Tuple row : results) {
-            assertEquals(Double.valueOf(row.get(point).getX()), row.get(point.x()));
-            assertEquals(Double.valueOf(row.get(point).getY()), row.get(point.y()));
-        }
-    }
-
-    @Test
-    @ExcludeIn(MYSQL)
-    public void Point_Distance() {
-        QShapes shapes1 = QShapes.shapes;
-        QShapes shapes2 = new QShapes("shapes2");
-        for (Tuple tuple : query().from(shapes1, shapes2)
-                    .where(shapes1.id.loe(5), shapes2.id.loe(5))
-                    .list(shapes1.geometry.asPoint(),
-                          shapes2.geometry.asPoint(),
-                          shapes1.geometry.distance(shapes2.geometry))) {
-            Point point1 = tuple.get(shapes1.geometry.asPoint());
-            Point point2 = tuple.get(shapes2.geometry.asPoint());
-            Double distance = tuple.get(shapes1.geometry.distance(shapes2.geometry));
-            assertEquals(point1.distance(point2), distance.doubleValue(), 0.0001);
-        }
-    }
-
-    @Test
-    public void Point_Instances() {
-        List<Shapes> results = withPoints().list(shapes);
-        assertEquals(5, results.size());
-        for (Shapes row : results) {
-            assertNotNull(row.getId());
-            assertNotNull(row.getGeometry());
-            assertTrue(row.getGeometry() instanceof Point);
-        }
-    }
-
-    @Test
-    public void LineString_Instances() {
-        List<Geometry> results = withLineStrings().list(shapes.geometry);
-        assertFalse(results.isEmpty());
-        for (Geometry row : results) {
-            assertNotNull(row);
-            assertTrue(row instanceof LineString);
-        }
-    }
-
-    @Test
-    public void Polygon_Instances() {
-        List<Geometry> results = withPolygons().list(shapes.geometry);
-        assertFalse(results.isEmpty());
-        for (Geometry row : results) {
-            assertNotNull(row);
-            assertTrue(row instanceof Polygon);
-        }
-    }
-
-    @Test
-    public void MultiPoint_Instances() {
-        List<Geometry> results = withMultipoints().list(shapes.geometry);
-        assertFalse(results.isEmpty());
-        for (Geometry row : results) {
-            assertNotNull(row);
-            assertTrue(row instanceof MultiPoint);
-        }
-    }
-
-    @Test
-    public void MultiLineString_Instances() {
-        List<Geometry> results = withMultiLineStrings().list(shapes.geometry);
-        assertFalse(results.isEmpty());
-        for (Geometry row : results) {
-            assertNotNull(row);
-            assertTrue(row instanceof MultiLineString);
-        }
-    }
-
-    @Test
-    public void MultiPolygon_Instances() {
-        List<Geometry> results = withMultiPolygons().list(shapes.geometry);
-        assertFalse(results.isEmpty());
-        for (Geometry row : results) {
-            assertNotNull(row);
-            assertTrue(row instanceof MultiPolygon);
-        }
-    }
-
-    @Test
-    public void Point_Methods() {
-        PointPath<Point> point = shapes.geometry.asPoint();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, point.asBinary(), H2);
-        add(expressions, point.asText());
-        add(expressions, point.boundary(), MYSQL);
-        add(expressions, point.convexHull(), MYSQL);
-        add(expressions, point.dimension());
-        add(expressions, point.envelope(), H2);
-        add(expressions, point.geometryType(), H2);
-        add(expressions, point.isEmpty());
-        add(expressions, point.isSimple());
-        add(expressions, point.m(), MYSQL, TERADATA, H2);
-        add(expressions, point.srid());
-        // TODO add emulations
-        add(expressions, point.transform(26986), MYSQL, POSTGRES, SQLSERVER, TERADATA, H2);
-        // point specific
-        add(expressions, point.x(), H2);
-        add(expressions, point.y(), H2);
-        add(expressions, point.z(), MYSQL, TERADATA, H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withPoints().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    private List<Expression<?>> createExpressions(PointExpression<Point> point1, Expression<Point> point2) {
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, point1.contains(point2));
-        add(expressions, point1.crosses(point2));
-        add(expressions, point1.difference(point2), MYSQL);
-        add(expressions, point1.disjoint(point2));
-        add(expressions, point1.distance(point2), MYSQL);
-        add(expressions, point1.distanceSphere(point2), H2, MYSQL, SQLSERVER);
-        add(expressions, point1.distanceSpheroid(point2), H2, MYSQL, POSTGRES, SQLSERVER);
-        add(expressions, point1.eq(point2));
-        add(expressions, point1.intersection(point2), MYSQL);
-        add(expressions, point1.intersects(point2));
-        add(expressions, point1.overlaps(point2));
-        add(expressions, point1.symDifference(point2), MYSQL);
-        add(expressions, point1.touches(point2));
-        add(expressions, point1.union(point2), MYSQL);
-        add(expressions, point1.within(point2));
-        return expressions;
-    }
-
-    @Test
-    public void Point_Methods2() {
-        QShapes shapes1 = QShapes.shapes;
-        QShapes shapes2 = new QShapes("shapes2");
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        expressions.addAll(createExpressions(shapes1.geometry.asPoint(), shapes2.geometry.asPoint()));
-        expressions.addAll(createExpressions(shapes1.geometry.asPoint(), ConstantImpl.create((Point)Wkt.fromWkt("Point(2 2)"))));
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : query().from(shapes1, shapes2)
-                    .where(shapes1.id.loe(5), shapes2.id.loe(5)).list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    @Test
-    public void LineString_Methods() {
-        LineStringPath<LineString> lineString = shapes.geometry.asLineString();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, lineString.asBinary(), H2);
-        add(expressions, lineString.asText());
-        add(expressions, lineString.boundary(), MYSQL);
-        add(expressions, lineString.convexHull(), MYSQL);
-        add(expressions, lineString.dimension());
-        add(expressions, lineString.envelope(), H2);
-        add(expressions, lineString.geometryType(), H2);
-        add(expressions, lineString.isEmpty());
-        add(expressions, lineString.isSimple());
-        // curve specific
-        add(expressions, lineString.length(), H2);
-        add(expressions, lineString.startPoint(), H2);
-        add(expressions, lineString.endPoint(), H2);
-        add(expressions, lineString.isClosed(), H2);
-        add(expressions, lineString.isRing(), H2, MYSQL);
-        // linestring specific
-        add(expressions, lineString.numPoints(), H2);
-        add(expressions, lineString.pointN(1), H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withLineStrings().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    @Test
-    public void Polygon_Methods() {
-        PolygonPath<Polygon> polygon = shapes.geometry.asPolygon();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, polygon.asBinary(), H2);
-        add(expressions, polygon.asText());
-        add(expressions, polygon.boundary(), MYSQL);
-        add(expressions, polygon.convexHull(), MYSQL);
-        add(expressions, polygon.dimension());
-        add(expressions, polygon.envelope(), H2);
-        add(expressions, polygon.geometryType(), H2);
-        add(expressions, polygon.isEmpty());
-        add(expressions, polygon.isSimple());
-        // surface specific
-        add(expressions, polygon.area());
-        add(expressions, polygon.centroid());
-        add(expressions, polygon.pointOnSurface(), H2, MYSQL);
-        // polygon specific
-        add(expressions, polygon.exteriorRing(), H2);
-        add(expressions, polygon.numInteriorRing(), H2);
-        add(expressions, polygon.interiorRingN(1), H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withPolygons().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    @Test
-    public void MultiPoint_Methods() {
-        MultiPointPath<MultiPoint> multipoint = shapes.geometry.asMultiPoint();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, multipoint.asBinary(), H2);
-        add(expressions, multipoint.asText());
-        add(expressions, multipoint.boundary(), MYSQL);
-        add(expressions, multipoint.convexHull(), MYSQL);
-        add(expressions, multipoint.dimension());
-        add(expressions, multipoint.envelope(), H2);
-        add(expressions, multipoint.geometryType(), H2);
-        add(expressions, multipoint.isEmpty());
-        add(expressions, multipoint.isSimple());
-        // multipoint specific
-        add(expressions, multipoint.numGeometries(), H2);
-        add(expressions, multipoint.geometryN(1), H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withMultipoints().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    @Test
-    public void MultiLineString_Methods() {
-        MultiLineStringPath<MultiLineString> multilinestring = shapes.geometry.asMultiLineString();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, multilinestring.asBinary(), H2);
-        add(expressions, multilinestring.asText());
-        add(expressions, multilinestring.boundary(), MYSQL);
-        add(expressions, multilinestring.convexHull(), MYSQL);
-        add(expressions, multilinestring.dimension());
-        add(expressions, multilinestring.envelope(), H2);
-        add(expressions, multilinestring.geometryType(), H2);
-        add(expressions, multilinestring.isEmpty());
-        add(expressions, multilinestring.isSimple());
-        // multicurve specific
-        add(expressions, multilinestring.isClosed(), H2);
-        add(expressions, multilinestring.length(), H2);
-        // multilinestring specific
-        add(expressions, multilinestring.numGeometries(), H2);
-        add(expressions, multilinestring.geometryN(1), H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withMultiLineStrings().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-    @Test
-    public void MultiPolygon_Methods() {
-        MultiPolygonPath<MultiPolygon> multipolygon = shapes.geometry.asMultiPolygon();
-
-        List<Expression<?>> expressions = Lists.newArrayList();
-        add(expressions, multipolygon.asBinary(), H2);
-        add(expressions, multipolygon.asText());
-        add(expressions, multipolygon.boundary(), MYSQL);
-        add(expressions, multipolygon.convexHull(), MYSQL);
-        add(expressions, multipolygon.dimension());
-        add(expressions, multipolygon.envelope(), H2);
-        add(expressions, multipolygon.geometryType(), H2);
-        add(expressions, multipolygon.isEmpty());
-        add(expressions, multipolygon.isSimple());
-        // multipolygon specific
-        add(expressions, multipolygon.numGeometries(), H2);
-        add(expressions, multipolygon.geometryN(1), H2);
-
-        for (Expression<?> expr : expressions) {
-            boolean logged = false;
-            for (Object row : withMultiPolygons().list(expr)) {
-                if (row == null && !logged) {
-                    System.err.println(expr.toString());
-                    logged = true;
-                }
-            }
-        }
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/StoredProcedures.java b/querydsl-sql/src/test/java/com/mysema/query/StoredProcedures.java
deleted file mode 100644
index 89da2878fb..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/StoredProcedures.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class StoredProcedures {
-    
-    public static void main(String[] args) throws ClassNotFoundException, SQLException {
-        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-        String url = "jdbc:derby:target/procedure_test;create=true";
-        Connection connection = DriverManager.getConnection(url, "", "");
-        
-        try {
-            DatabaseMetaData md = connection.getMetaData();
-            ResultSet procedures = md.getProcedures(null, null, null);
-            try {
-                while (procedures.next()) {
-                    String cat = procedures.getString(1);
-                    String schema = procedures.getString(2);
-                    String name = procedures.getString(3);
-                    String remarks = procedures.getString(7);
-                    String type = procedures.getString(8);
-                    String specificName = procedures.getString(9);
-                    System.out.println(name + "\n" + remarks + "\n" + type + "\n" + specificName);
-                    
-                    ResultSet procedureColumns = md.getProcedureColumns(cat, schema, name, null);
-                    try {
-                        while (procedureColumns.next()) {
-                            String columnName = procedureColumns.getString(4);
-                            int columnType = procedureColumns.getInt(5);
-                            int dataType = procedureColumns.getInt(6);
-                            String typeName = procedureColumns.getString(7);
-                            short nullable = procedureColumns.getShort(12);
-                            System.out.println(" " + columnName + " " + columnType + " " + dataType + " " + typeName + " " + nullable);
-                        }
-                        System.out.println();
-                    } finally {
-                        procedureColumns.close();
-                    }
-                }
-            } finally {
-                procedures.close();
-            }
-        } finally {
-            connection.close();
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SubqueriesBase.java b/querydsl-sql/src/test/java/com/mysema/query/SubqueriesBase.java
deleted file mode 100644
index 58d000b4f3..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/SubqueriesBase.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.Constants.employee2;
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Constants.survey2;
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.DERBY;
-import static com.mysema.query.Target.H2;
-import static com.mysema.query.Target.HSQLDB;
-import static com.mysema.query.Target.MYSQL;
-import static com.mysema.query.Target.POSTGRES;
-import static com.mysema.query.Target.SQLITE;
-import static com.mysema.query.Target.SQLSERVER;
-import static com.mysema.query.Target.TERADATA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.expr.Param;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.testutil.ExcludeIn;
-
-public class SubqueriesBase extends AbstractBaseTest {
-
-    @Test
-    @ExcludeIn({CUBRID, DERBY, H2, HSQLDB, SQLITE, SQLSERVER})
-    public void Keys() {
-        QEmployee employee2 = new QEmployee("employee2");
-        ForeignKey<Employee> nameKey1 = new ForeignKey<Employee>(employee,
-                ImmutableList.of(employee.firstname, employee.lastname),
-                ImmutableList.of("a", "b"));
-        ForeignKey<Employee> nameKey2 = new ForeignKey<Employee>(employee,
-                ImmutableList.of(employee.firstname, employee.lastname),
-                ImmutableList.of("a", "b"));
-
-        query().from(employee)
-        .where(nameKey1.in(sq().from(employee2).list(nameKey2)))
-            .list(employee.id);
-    }
-
-    @Test
-    @ExcludeIn({CUBRID, DERBY, H2, HSQLDB, SQLITE, SQLSERVER})
-    public void List_In_Query() {
-        QEmployee employee2 = new QEmployee("employee2");
-        query().from(employee)
-            .where(Expressions.list(employee.id, employee.lastname)
-                .in(sq().from(employee2).list(employee2.id, employee2.lastname)))
-            .list(employee.id);
-    }
-
-    @Test
-    @SkipForQuoted
-    public void SubQueries() throws SQLException {
-        // subquery in where block
-        expectedQuery = "select e.ID from EMPLOYEE e "
-            + "where e.ID = (select max(e.ID) "
-            + "from EMPLOYEE e)";
-        List<Integer> list = query().from(employee)
-        .where(employee.id.eq(sq().from(employee).unique(employee.id.max())))
-        .list(employee.id);
-        assertFalse(list.isEmpty());
-    }
-
-    @Test
-    public void SubQuery_Alias() {
-        query().from(sq().from(employee).list(employee.all()).as(employee2)).list(employee2.all());
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void SubQuery_All() {
-        query().from(employee).where(employee.id.gtAll(
-                sq().from(employee2).list(employee2.id))).count();
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void SubQuery_Any() {
-        query().from(employee).where(employee.id.gtAny(
-                sq().from(employee2).list(employee2.id))).count();
-    }
-
-    @Test
-    public void SubQuery_InnerJoin() {
-        ListSubQuery<Integer> sq = sq().from(employee2).list(employee2.id);
-        QEmployee sqEmp = new QEmployee("sq");
-        query().from(employee).innerJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).list(employee.id);
-
-    }
-
-    @Test
-    public void SubQuery_LeftJoin() {
-        ListSubQuery<Integer> sq = sq().from(employee2).list(employee2.id);
-        QEmployee sqEmp = new QEmployee("sq");
-        query().from(employee).leftJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).list(employee.id);
-
-    }
-
-    @Test
-    @ExcludeIn({MYSQL, POSTGRES, DERBY, SQLSERVER, TERADATA})
-    public void SubQuery_Params() {
-        Param<String> aParam = new Param<String>(String.class, "param");
-        SQLSubQuery subQuery = new SQLSubQuery().from(employee).where(employee.firstname.eq(aParam));
-        subQuery.set(aParam, "Mike");
-
-        assertEquals(1, query().from(subQuery.list(Wildcard.all)).count());
-    }
-
-    @Test
-    @ExcludeIn(SQLITE)
-    public void SubQuery_RightJoin() {
-        ListSubQuery<Integer> sq = sq().from(employee2).list(employee2.id);
-        QEmployee sqEmp = new QEmployee("sq");
-        query().from(employee).rightJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).list(employee.id);
-    }
-
-    @Test
-    public void SubQuery_with_Alias() {
-        List<Integer> ids1 = query().from(employee).list(employee.id);
-        List<Integer> ids2 = query().from(sq().from(employee).list(employee.id), employee).list(employee.id);
-        assertEquals(ids1, ids2);
-    }
-
-    @Test
-    public void SubQuery_with_Alias2() {
-        List<Integer> ids1 = query().from(employee).list(employee.id);
-        List<Integer> ids2 = query().from(sq().from(employee).list(employee.id).as(employee)).list(employee.id);
-        assertEquals(ids1, ids2);
-    }
-
-    @Test
-    public void SubQuerySerialization() {
-        SQLSubQuery query = sq();
-        query.from(survey);
-        assertEquals("from SURVEY s", query.toString());
-
-        query.from(survey2);
-        assertEquals("from SURVEY s, SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void SubQuerySerialization2() {
-        NumberPath<BigDecimal> sal = new NumberPath<BigDecimal>(BigDecimal.class, "sal");
-        PathBuilder<Object[]> sq = new PathBuilder<Object[]>(Object[].class, "sq");
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-
-        serializer.handle(
-                sq()
-                .from(employee)
-                .list(employee.salary.add(employee.salary).add(employee.salary).as(sal))
-                .as(sq));
-        assertEquals(
-                "(select (e.SALARY + e.SALARY + e.SALARY) as sal\nfrom EMPLOYEE e) as sq",
-                serializer.toString());
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/Survey.java b/querydsl-sql/src/test/java/com/mysema/query/Survey.java
deleted file mode 100644
index 97cd63f54f..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/Survey.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mysema.query;
-
-import com.mysema.query.sql.Column;
-
-public class Survey {
-    
-    @Column("NAME")
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/TargetRule.java b/querydsl-sql/src/test/java/com/mysema/query/TargetRule.java
deleted file mode 100644
index 1ea84ba02a..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/TargetRule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-
-import com.mysema.testutil.EmptyStatement;
-import com.mysema.testutil.ExcludeIn;
-import com.mysema.testutil.IncludeIn;
-
-public class TargetRule implements MethodRule {
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object obj) {
-        Target target = Connections.getTarget();
-        boolean run = target == null || isExecuted(method.getMethod(), target);
-        return run ? base : EmptyStatement.DEFAULT;
-    }
-    
-    private boolean isExecuted(Method method, Target target) {
-        ExcludeIn ex = method.getAnnotation(ExcludeIn.class);
-        if (ex == null) {
-            ex = method.getDeclaringClass().getAnnotation(ExcludeIn.class);
-        }
-        // excluded in given targets
-        if (ex != null && Arrays.asList(ex.value()).contains(target)) {
-            return false;
-        }
-        // included only in given targets
-        IncludeIn in = method.getAnnotation(IncludeIn.class);
-        if (in == null) {
-            in = method.getDeclaringClass().getAnnotation(IncludeIn.class);
-        }
-        if (in != null && !Arrays.asList(in.value()).contains(target)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/TypesBase.java b/querydsl-sql/src/test/java/com/mysema/query/TypesBase.java
deleted file mode 100644
index 4493821ef7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/TypesBase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.POSTGRES;
-import static com.mysema.query.Target.TERADATA;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.junit.Test;
-
-import com.mysema.testutil.ExcludeIn;
-
-public class TypesBase extends AbstractBaseTest {
-
-    @Test
-    @ExcludeIn({CUBRID, POSTGRES, TERADATA})
-    public void DumpTypes() throws SQLException {
-        Connection conn = Connections.getConnection();
-        DatabaseMetaData md = conn.getMetaData();
-
-        // types
-        ResultSet rs = md.getUDTs(null, null, null, null);
-        try {
-            while (rs.next()) {
-                // cat, schema, name, classname, datatype, remarks, base_type
-                String cat = rs.getString(1);
-                String schema = rs.getString(2);
-                String name = rs.getString(3);
-                String classname = rs.getString(4);
-                String datatype = rs.getString(5);
-                String remarks = rs.getString(6);
-                String base_type = rs.getString(7);
-                System.out.println(name + " " + classname + " " + datatype + " " +
-                                   remarks + " " + base_type);
-
-                // attributes
-                ResultSet rs2 = md.getAttributes(cat, schema, name, null);
-                try {
-                    while (rs2.next()) {
-                        // cat, schema, name, attr_name, data_type, attr_type_name, attr_size
-                        // decimal_digits, num_prec_radix, nullable, remarks, attr_def, sql_data_type, ordinal_position
-                        // ...
-                        String _cat = rs2.getString(1);
-                        String _schema = rs2.getString(2);
-                        String _name = rs2.getString(3);
-                        String _attr_name = rs2.getString(4);
-                        String _data_type = rs2.getString(5);
-                        String _attr_type_name = rs2.getString(6);
-                        String _attr_size = rs2.getString(7);
-
-                        System.out.println(" " + _attr_name + " " + _data_type + " " + _attr_type_name + " " + _attr_size);
-                    }
-                } finally {
-                    rs2.close();
-                }
-            }
-        } finally {
-            rs.close();
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java b/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java
deleted file mode 100644
index 47f897bae7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/UnionBase.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package com.mysema.query;
-
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.DERBY;
-import static com.mysema.query.Target.MYSQL;
-import static com.mysema.query.Target.TERADATA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Projections;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.SimpleSubQuery;
-import com.mysema.query.types.template.NumberTemplate;
-import com.mysema.testutil.ExcludeIn;
-
-public class UnionBase extends AbstractBaseTest {
-
-    @Test
-    @ExcludeIn({MYSQL, TERADATA})
-    public void In_Union() {
-        assertTrue(query().from(employee)
-            .where(employee.id.in(
-                sq().union(sq().unique(NumberTemplate.ONE),
-                           sq().unique(NumberTemplate.TWO))))
-            .exists());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id.min());
-        List<Integer> list = query().union(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union_All() {
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id.min());
-        List<Integer> list = query().unionAll(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_Multiple_Columns() throws SQLException {
-        SubQueryExpression<Tuple> sq1 = sq().from(employee).unique(employee.firstname, employee.lastname);
-        SubQueryExpression<Tuple> sq2 = sq().from(employee).unique(employee.lastname, employee.firstname);
-        List<Tuple> list = query().union(sq1, sq2).list();
-        assertFalse(list.isEmpty());
-        for (Tuple row : list) {
-            assertNotNull(row.get(0, Object.class));
-            assertNotNull(row.get(1, Object.class));
-        }
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union_Empty_Result() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(employee).where(employee.firstname.eq("XXX")).unique(employee.id);
-        SubQueryExpression<Integer> sq2 = sq().from(employee).where(employee.firstname.eq("YYY")).unique(employee.id);
-        List<Integer> list = query().union(sq1, sq2).list();
-        assertTrue(list.isEmpty());
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union2() throws SQLException {
-        List<Integer> list = query().union(
-                sq().from(employee).unique(employee.id.max()),
-                sq().from(employee).unique(employee.id.min())).list();
-        assertFalse(list.isEmpty());
-
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void Union3() throws SQLException {
-        SimpleSubQuery<Tuple> sq3 = sq().from(employee).unique(new Expression[]{employee.id.max()});
-        SimpleSubQuery<Tuple> sq4 = sq().from(employee).unique(new Expression[]{employee.id.min()});
-        List<Tuple> list2 = query().union(sq3, sq4).list();
-        assertFalse(list2.isEmpty());
-    }
-
-    @Test
-    @ExcludeIn({DERBY})
-    public void Union4() {
-        SimpleSubQuery<Tuple> sq1 = sq().from(employee).unique(employee.id, employee.firstname);
-        SimpleSubQuery<Tuple> sq2 = sq().from(employee).unique(employee.id, employee.firstname);
-        query().union(employee, sq1, sq2).list(employee.id.count());
-    }
-
-    // FIXME for CUBRID
-    // Teradata: The ORDER BY clause must contain only integer constants.
-    @Test
-    @ExcludeIn({DERBY, CUBRID, TERADATA})
-    public void Union5() {
-        /* (select e.ID, e.FIRSTNAME, superior.ID as sup_id, superior.FIRSTNAME as sup_name
-         * from EMPLOYEE e join EMPLOYEE superior on e.SUPERIOR_ID = superior.ID)
-         * union
-         * (select e.ID, e.FIRSTNAME, null, null from EMPLOYEE e)
-         * order by ID asc
-         */
-        QEmployee superior = new QEmployee("superior");
-        ListSubQuery<Tuple> sq1 = sq().from(employee)
-                .join(employee.superiorIdKey, superior)
-                .list(employee.id, employee.firstname, superior.id.as("sup_id"), superior.firstname.as("sup_name"));
-        ListSubQuery<Tuple> sq2 = sq().from(employee)
-                .list(employee.id, employee.firstname, null, null);
-        List<Tuple> results = query().union(sq1, sq2).orderBy(employee.id.asc()).list();
-        for (Tuple result : results) {
-            System.err.println(Arrays.asList(result));
-        }
-    }
-
-    @Test
-    @ExcludeIn(TERADATA) // The ORDER BY clause must contain only integer constants.
-    @SuppressWarnings("unchecked")
-    public void Union_With_Order() throws SQLException {
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id);
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id);
-        List<Integer> list = query().union(sq1, sq2).orderBy(employee.id.asc()).list();
-        assertFalse(list.isEmpty());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_Multi_Column_Projection_List() throws IOException{
-        SubQueryExpression<Tuple> sq1 = sq().from(employee).unique(employee.id.max(), employee.id.max().subtract(1));
-        SubQueryExpression<Tuple> sq2 = sq().from(employee).unique(employee.id.min(), employee.id.min().subtract(1));
-
-        List<Tuple> list = query().union(sq1, sq2).list();
-        assertEquals(2, list.size());
-        assertTrue(list.get(0) != null);
-        assertTrue(list.get(1) != null);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_Multi_Column_Projection_Iterate() throws IOException{
-        SubQueryExpression<Tuple> sq1 = sq().from(employee).unique(employee.id.max(), employee.id.max().subtract(1));
-        SubQueryExpression<Tuple> sq2 = sq().from(employee).unique(employee.id.min(), employee.id.min().subtract(1));
-
-        CloseableIterator<Tuple> iterator = query().union(sq1,sq2).iterate();
-        try{
-            assertTrue(iterator.hasNext());
-            assertTrue(iterator.next() != null);
-            assertTrue(iterator.next() != null);
-            assertFalse(iterator.hasNext());
-        }finally{
-            iterator.close();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_Single_Column_Projections_List() throws IOException{
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id.min());
-
-        List<Integer> list = query().union(sq1, sq2).list();
-        assertEquals(2, list.size());
-        assertTrue(list.get(0) != null);
-        assertTrue(list.get(1) != null);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_Single_Column_Projections_Iterate() throws IOException{
-        SubQueryExpression<Integer> sq1 = sq().from(employee).unique(employee.id.max());
-        SubQueryExpression<Integer> sq2 = sq().from(employee).unique(employee.id.min());
-
-        CloseableIterator<Integer> iterator = query().union(sq1,sq2).iterate();
-        try{
-            assertTrue(iterator.hasNext());
-            assertTrue(iterator.next() != null);
-            assertTrue(iterator.next() != null);
-            assertFalse(iterator.hasNext());
-        }finally{
-            iterator.close();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union_FactoryExpression() {
-        ListSubQuery<Employee> sq1 = sq().from(employee)
-                .list(Projections.constructor(Employee.class, employee.id));
-        ListSubQuery<Employee> sq2 = sq().from(employee)
-                .list(Projections.constructor(Employee.class, employee.id));
-        List<Employee> employees = query().union(sq1, sq2).list();
-        for (Employee employee : employees) {
-            assertNotNull(employee);
-        }
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/UpdateBase.java b/querydsl-sql/src/test/java/com/mysema/query/UpdateBase.java
deleted file mode 100644
index 57b3dbda83..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/UpdateBase.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query;
-
-import static com.mysema.query.Constants.survey;
-import static com.mysema.query.Target.CUBRID;
-import static com.mysema.query.Target.H2;
-import static com.mysema.query.Target.MYSQL;
-import static com.mysema.query.Target.ORACLE;
-import static com.mysema.query.Target.SQLSERVER;
-import static org.junit.Assert.assertEquals;
-
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.Param;
-import com.mysema.testutil.IncludeIn;
-
-public class UpdateBase extends AbstractBaseTest {
-
-    protected void reset() throws SQLException{
-        delete(survey).execute();
-        insert(survey).values(1, "Hello World", "Hello").execute();
-    }
-
-    @Before
-    public void setUp() throws SQLException{
-        reset();
-    }
-
-    @After
-    public void tearDown() throws SQLException{
-        reset();
-    }
-
-    @Test
-    public void Update() throws SQLException{
-
-        // original state
-        long count = query().from(survey).count();
-        assertEquals(0, query().from(survey).where(survey.name.eq("S")).count());
-
-        // update call with 0 update count
-        assertEquals(0, update(survey).where(survey.name.eq("XXX")).set(survey.name, "S").execute());
-        assertEquals(0, query().from(survey).where(survey.name.eq("S")).count());
-
-        // update call with full update count
-        assertEquals(count, update(survey).set(survey.name, "S").execute());
-        assertEquals(count, query().from(survey).where(survey.name.eq("S")).count());
-
-    }
-
-    @Test
-    @IncludeIn({CUBRID, H2, MYSQL, ORACLE, SQLSERVER})
-    public void Update_Limit() {
-        insert(survey).values(2, "A","B").execute();
-        insert(survey).values(3, "B","C").execute();
-
-        assertEquals(2, update(survey).set(survey.name, "S").limit(2).execute());
-    }
-
-    @Test
-    public void Update2() throws SQLException{
-        List<Path<?>> paths = Collections.<Path<?>>singletonList(survey.name);
-        List<?> values = Collections.singletonList("S");
-
-        // original state
-        long count = query().from(survey).count();
-        assertEquals(0, query().from(survey).where(survey.name.eq("S")).count());
-
-        // update call with 0 update count
-        assertEquals(0, update(survey).where(survey.name.eq("XXX")).set(paths, values).execute());
-        assertEquals(0, query().from(survey).where(survey.name.eq("S")).count());
-
-        // update call with full update count
-        assertEquals(count, update(survey).set(paths, values).execute());
-        assertEquals(count, query().from(survey).where(survey.name.eq("S")).count());
-
-    }
-
-    @Test
-    public void Update3() {
-        update(survey).set(survey.name, survey.name.append("X")).execute();
-    }
-
-    @Test
-    public void SetNull() {
-        List<Path<?>> paths = Collections.<Path<?>>singletonList(survey.name);
-        List<?> values = Collections.singletonList(null);
-        long count = query().from(survey).count();
-        assertEquals(count, update(survey).set(paths, values).execute());
-    }
-
-    @Test
-    public void SetNull2() {
-        long count = query().from(survey).count();
-        assertEquals(count, update(survey).set(survey.name, (String)null).execute());
-    }
-
-    @Test
-    public void Batch() throws SQLException{
-        insert(survey).values(2, "A","B").execute();
-        insert(survey).values(3, "B","C").execute();
-
-        SQLUpdateClause update = update(survey);
-        update.set(survey.name, "AA").where(survey.name.eq("A")).addBatch();
-        update.set(survey.name, "BB").where(survey.name.eq("B")).addBatch();
-        assertEquals(2, update.execute());
-    }
-
-    @Test
-    public void Update_with_SubQuery_exists() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLUpdateClause update = update(survey1);
-        update.set(survey1.name, "AA");
-        update.where(new SQLSubQuery().from(employee).where(survey1.id.eq(employee.id)).exists());
-        update.execute();
-    }
-
-    @Test
-    public void Update_with_SubQuery_exists_Params() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-
-        Param<Integer> param = new Param<Integer>(Integer.class, "param");
-        SQLSubQuery sq = sq().from(employee).where(employee.id.eq(param));
-        sq.set(param, -12478923);
-
-        SQLUpdateClause update = update(survey1);
-        update.set(survey1.name, "AA");
-        update.where(sq.exists());
-        update.execute();
-    }
-
-    @Test
-    public void Update_with_SubQuery_exists2() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLUpdateClause update = update(survey1);
-        update.set(survey1.name, "AA");
-        update.where(new SQLSubQuery().from(employee).where(survey1.name.eq(employee.lastname)).exists());
-        update.execute();
-    }
-
-    @Test
-    public void Update_with_SubQuery_notExists() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLUpdateClause update = update(survey1);
-        update.set(survey1.name, "AA");
-        update.where(sq().from(employee).where(survey1.id.eq(employee.id)).notExists());
-        update.execute();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/ColumnData.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/ColumnData.java
deleted file mode 100644
index 3f1eaddc14..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/ColumnData.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2010 Mysema Ltd.
-* All rights reserved.
-*
-*/
-package com.mysema.query.ddl;
-
-/**
-* @author tiwe
-*
-*/
-public class ColumnData {
-    
-    private final String name;
-    
-    private final String type;
-    
-    private boolean nullAllowed = true;
-    
-    private boolean autoIncrement;
-    
-    private Integer size;
-
-    public ColumnData(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public boolean isNullAllowed() {
-        return nullAllowed;
-    }
-
-    public void setNullAllowed(boolean nullAllowed) {
-        this.nullAllowed = nullAllowed;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public boolean isAutoIncrement() {
-        return autoIncrement;
-    }
-
-    public void setAutoIncrement(boolean autoIncrement) {
-        this.autoIncrement = autoIncrement;
-    }
-    
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/CreateTableClause.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/CreateTableClause.java
deleted file mode 100644
index 1a7844b9f2..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/CreateTableClause.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2010 Mysema Ltd.
- * All rights reserved.
- *
- */
-package com.mysema.query.ddl;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Joiner;
-import com.mysema.query.QueryException;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * CreateTableClause defines a CREATE TABLE clause
- *
- * @author tiwe
- *
- */
-public class CreateTableClause {
-
-    private static final Logger logger = LoggerFactory.getLogger(CreateTableClause.class);
-
-    private static final Joiner COMMA_JOINER = Joiner.on(", ");
-
-    private final Connection connection;
-
-    private final SQLTemplates templates;
-
-    private final String table;
-
-    private final List<ColumnData> columns = new ArrayList<ColumnData>();
-
-    private final List<IndexData> indexes = new ArrayList<IndexData>();
-
-    private PrimaryKeyData primaryKey;
-
-    private final List<ForeignKeyData> foreignKeys = new ArrayList<ForeignKeyData>();
-
-    public CreateTableClause(Connection conn, SQLTemplates templates, String table) {
-        this.connection = conn;
-        this.templates = templates;
-        this.table = templates.quoteIdentifier(table);
-    }
-
-    /**
-     * Add a new column definition
-     *
-     * @param name
-     * @param type
-     * @return
-     */
-    public CreateTableClause column(String name, Class<?> type) {
-        columns.add(new ColumnData(templates.quoteIdentifier(name), templates.getTypeForClass(type)));
-        return this;
-    }
-
-    private ColumnData lastColumn() {
-        return columns.get(columns.size()-1);
-    }
-
-    /**
-     * Set the last added column to not null
-     *
-     * @return
-     */
-    public CreateTableClause notNull() {
-        lastColumn().setNullAllowed(false);
-        return this;
-    }
-
-    /**
-     * Set the size of the last column's type
-     *
-     * @param size
-     * @return
-     */
-    public CreateTableClause size(int size) {
-        lastColumn().setSize(size);
-        return this;
-    }
-
-    /**
-     * Set the last column to auto increment
-     *
-     * @return
-     */
-    public CreateTableClause autoIncrement() {
-        lastColumn().setAutoIncrement(true);
-        return this;
-    }
-
-    /**
-     * Set the primary key
-     *
-     * @param name
-     * @param columns
-     * @return
-     */
-    public CreateTableClause primaryKey(String name, String... columns) {
-        for (int i = 0; i < columns.length; i++) {
-            columns[i] = templates.quoteIdentifier(columns[i]);
-        }
-        primaryKey = new PrimaryKeyData(templates.quoteIdentifier(name), columns);
-        return this;
-    }
-
-    /**
-     * Add an index
-     *
-     * @param name
-     * @param columns
-     * @return
-     */
-    public CreateTableClause index(String name, String... columns) {
-        indexes.add(new IndexData(name, columns));
-        return this;
-    }
-
-    /**
-     * Set the last added index to unique
-     *
-     * @return
-     */
-    public CreateTableClause unique() {
-        indexes.get(indexes.size()-1).setUnique(true);
-        return this;
-    }
-
-    /**
-     * Add a foreign key
-     *
-     * @param name
-     * @param columns
-     * @return
-     */
-    public ForeignKeyBuilder foreignKey(String name, String... columns) {
-        return new ForeignKeyBuilder(this, templates, foreignKeys, templates.quoteIdentifier(name), columns);
-    }
-
-    /**
-     * Execute the clause
-     */
-    @SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
-    public void execute() {
-        StringBuilder builder = new StringBuilder();
-        builder.append(templates.getCreateTable() + table + " (\n");
-        List<String> lines = new ArrayList<String>(columns.size() + foreignKeys.size() + 1);
-        // columns
-        for (ColumnData column : columns) {
-            StringBuilder line = new StringBuilder();
-            line.append(column.getName() + " " + column.getType().toUpperCase());
-            if (column.getSize() != null) {
-                line.append("(" + column.getSize() + ")");
-            }
-            if (!column.isNullAllowed()) {
-                line.append(templates.getNotNull().toUpperCase());
-            }
-            if (column.isAutoIncrement()) {
-                line.append(templates.getAutoIncrement().toUpperCase());
-            }
-            lines.add(line.toString());
-        }
-
-        // primary key
-        if (primaryKey != null) {
-            StringBuilder line = new StringBuilder();
-            line.append("CONSTRAINT " + primaryKey.getName()+ " ");
-            line.append("PRIMARY KEY(" + COMMA_JOINER.join(primaryKey.getColumns()) +")");
-            lines.add(line.toString());
-        }
-
-        // foreign keys
-        for (ForeignKeyData foreignKey : foreignKeys) {
-            StringBuilder line = new StringBuilder();
-            line.append("CONSTRAINT " + foreignKey.getName()+ " ");
-            line.append("FOREIGN KEY(" + COMMA_JOINER.join(foreignKey.getForeignColumns())+ ") ");
-            line.append("REFERENCES " + foreignKey.getTable() + "(" + COMMA_JOINER.join(foreignKey.getParentColumns())+ ")");
-            lines.add(line.toString());
-        }
-        builder.append("  " + Joiner.on(",\n  ").join(lines));
-        builder.append("\n)\n");
-        logger.info(builder.toString());
-
-        Statement stmt = null;
-        try{
-            stmt = connection.createStatement();
-            stmt.execute(builder.toString());
-
-            // indexes
-            for (IndexData index : indexes) {
-                String indexColumns = COMMA_JOINER.join(index.getColumns());
-                String prefix = templates.getCreateIndex();
-                if (index.isUnique()) {
-                    prefix = templates.getCreateUniqueIndex();
-                }
-                String sql = prefix + index.getName() + templates.getOn() + table + "(" + indexColumns+ ")";
-                logger.info(sql);
-                stmt.execute(sql);
-            }
-        } catch (SQLException e) {
-            System.err.println(builder.toString());
-            throw new QueryException(e.getMessage(), e);
-        }finally{
-            if (stmt != null) {
-                try {
-                    stmt.close();
-                } catch (SQLException e) {
-                    throw new QueryException(e);
-                }
-            }
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/DropTableClause.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/DropTableClause.java
deleted file mode 100644
index e7f8d1c348..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/DropTableClause.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010 Mysema Ltd.
- * All rights reserved.
- *
- */
-package com.mysema.query.ddl;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.mysema.query.QueryException;
-import com.mysema.query.sql.SQLTemplates;
-
-/**
- * DropTableClause defines a DROP TABLE clause
- * 
- * @author tiwe
- *
- */
-public class DropTableClause {
-
-    private final Connection connection;
-    
-    private final String table;
-    
-    public DropTableClause(Connection conn, SQLTemplates templates, String table) {
-        this.connection = conn;
-        this.table = templates.quoteIdentifier(table);
-    }
-    
-    @SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
-    public void execute() {
-        Statement stmt = null;
-        try{
-            stmt = connection.createStatement();
-            stmt.execute("DROP TABLE " + table);
-        } catch (SQLException e) {
-            // do not rethrow
-        }finally{
-            if (stmt != null) {
-                try {
-                    stmt.close();
-                } catch (SQLException e) {
-                    throw new QueryException(e);
-                }
-            }            
-        }  
-    }
-    
-}
-    
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyData.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyData.java
deleted file mode 100644
index f7f6ca0217..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyData.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2010 Mysema Ltd.
- * All rights reserved.
- *
- */
-package com.mysema.query.ddl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tiwe
- *
- */
-public class ForeignKeyData implements KeyData {
-
-    private final String name;
-
-    private final String table;
-    
-    private final List<String> foreignColumns = new ArrayList<String>();
-    
-    private final List<String> parentColumns = new ArrayList<String>();
-
-    public ForeignKeyData(String name, String parentTable) {
-        this.name = name;
-        this.table = parentTable;
-    }
-
-    public void add(String foreignColumn, String parentColumn) {
-        foreignColumns.add(foreignColumn);
-        parentColumns.add(parentColumn);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public List<String> getForeignColumns() {
-        return foreignColumns;
-    }
-
-    public List<String> getParentColumns() {
-        return parentColumns;
-    }
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/IndexData.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/IndexData.java
deleted file mode 100644
index 92b47c7055..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/IndexData.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2010 Mysema Ltd.
- * All rights reserved.
- *
- */
-package com.mysema.query.ddl;
-
-/**
- * @author tiwe
- *
- */
-public class IndexData {
-
-    private final String name;
-    
-    private final String[] columns;
-
-    private boolean unique;
-    
-    public IndexData(String name, String[] columns) {
-        this.name = name;
-        this.columns = columns.clone();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String[] getColumns() {
-        return columns.clone();
-    }
-
-    public boolean isUnique() {
-        return unique;
-    }
-
-    public void setUnique(boolean unique) {
-        this.unique = unique;
-    }
-    
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/KeyData.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/KeyData.java
deleted file mode 100644
index 81f122c95e..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/KeyData.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 
- */
-package com.mysema.query.ddl;
-
-import java.util.List;
-
-/**
- * Common interface for ForeignKeyData and InverseForeignKeyData
- * 
- * @author tiwe
- *
- */
-public interface KeyData {
-
-    String getName();
-
-    String getTable();
-    
-    List<String> getForeignColumns();
-
-    List<String> getParentColumns();
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/PrimaryKeyData.java b/querydsl-sql/src/test/java/com/mysema/query/ddl/PrimaryKeyData.java
deleted file mode 100644
index 7037c53538..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/PrimaryKeyData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2010 Mysema Ltd.
- * All rights reserved.
- *
- */
-package com.mysema.query.ddl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tiwe
- *
- */
-public class PrimaryKeyData {
-
-    private final String name;
-
-    private final List<String> columns = new ArrayList<String>();
-
-    public PrimaryKeyData(String name) {
-        this.name = name;
-    }
-    
-    public PrimaryKeyData(String name, String[] c) {
-        this.name = name;
-        for (String column : c) {
-            columns.add(column);
-        }
-    }
-
-    public void add(String column) {
-        columns.add(column);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public List<String> getColumns() {
-        return columns;
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/AbstractSQLTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/AbstractSQLTemplatesTest.java
deleted file mode 100644
index bccd32e821..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/AbstractSQLTemplatesTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.NumberTemplate;
-
-public abstract class AbstractSQLTemplatesTest {
-
-    protected static final QSurvey survey1 = new QSurvey("survey1");
-
-    protected static final QSurvey survey2 = new QSurvey("survey2");
-
-    private SQLTemplates templates;
-
-    protected SQLQuery query;
-
-    protected abstract SQLTemplates createTemplates();
-
-    @Before
-    public void setUp() {
-        templates = createTemplates();
-        templates.newLineToSingleSpace();
-        query = new SQLQuery(templates);
-    }
-
-    @Test
-    public void NoFrom() {
-        query.getMetadata().addProjection(NumberTemplate.ONE);
-        if (templates.getDummyTable() == null) {
-            assertEquals("select 1", query.toString());
-        } else {
-            assertEquals("select 1 from dual", query.toString());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union() {
-        NumberExpression<Integer> one = NumberTemplate.ONE;
-        NumberExpression<Integer> two = NumberTemplate.TWO;
-        NumberExpression<Integer> three = NumberTemplate.THREE;
-        Path<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-
-        if (templates.getDummyTable() == null) {
-            assertEquals(
-                    "(select 1 as col1)\n" +
-                    "union\n" +
-                    "(select 2)\n" +
-                    "union\n" +
-                    "(select 3)", union.toString());
-        } else {
-            assertEquals(
-                    "(select 1 as col1 from dual)\n" +
-                    "union\n" +
-                    "(select 2 from dual)\n" +
-                    "union\n" +
-                    "(select 3 from dual)", union.toString());
-        }
-    }
-
-    @Test
-    public void InnerJoin() {
-        query.from(survey1).innerJoin(survey2);
-        assertEquals("from SURVEY survey1 inner join SURVEY survey2", query.toString());
-    }
-
-    protected SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/ConfigurationTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/ConfigurationTest.java
deleted file mode 100644
index ed220e5051..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/ConfigurationTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.io.InputStream;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import com.mysema.query.alias.Gender;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.sql.types.*;
-import org.easymock.EasyMock;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class ConfigurationTest {
-
-    @Test
-    public void Various() {
-        Configuration configuration = new Configuration(new H2Templates());
-//        configuration.setJavaType(Types.DATE, java.util.Date.class);
-        configuration.register(new UtilDateType());
-        configuration.register("person", "secureId", new EncryptedString());
-        configuration.register("person", "gender",  new EnumByNameType<Gender>(Gender.class));
-        configuration.register(new StringType());
-        assertEquals(Gender.class, configuration.getJavaType(java.sql.Types.VARCHAR, null, 0,0,"person", "gender"));
-    }
-
-    @Test
-    public void Custom_Type() {
-        Configuration configuration = new Configuration(new H2Templates());
-//        configuration.setJavaType(Types.BLOB, InputStream.class);
-        configuration.register(new InputStreamType());
-        assertEquals(InputStream.class, configuration.getJavaType(Types.BLOB, null, 0,0,"", ""));
-    }
-
-    @Test
-    public void Set_Null() throws SQLException {
-        Configuration configuration = new Configuration(new H2Templates());
-//        configuration.register(new UntypedNullType());
-        configuration.register("SURVEY", "NAME",  new EncryptedString());
-        PreparedStatement stmt = EasyMock.createNiceMock(PreparedStatement.class);
-        configuration.set(stmt, QSurvey.survey.name, 0, Null.DEFAULT);
-    }
-
-    @Test
-    public void Get_Schema() {
-        Configuration configuration = new Configuration(new H2Templates());
-        configuration.registerSchemaOverride("public", "pub");
-        configuration.registerTableOverride("employee", "emp");
-        configuration.registerTableOverride("public", "employee", "employees");
-
-        assertEquals("pub", configuration.getOverride(new SchemaAndTable("public", "")).getSchema());
-        assertEquals("emp", configuration.getOverride(new SchemaAndTable("", "employee")).getTable());
-        assertEquals("employees", configuration.getOverride(new SchemaAndTable("public", "employee")).getTable());
-//        assertEquals("pub", configuration.getSchema("public"));
-//        assertEquals("emp", configuration.getTable("", "employee"));
-//        assertEquals("employees", configuration.getTable("public", "employee"));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/DateArithmeticTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/DateArithmeticTest.java
deleted file mode 100644
index 22c65fa3e8..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/DateArithmeticTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mysema.query.sql;
-
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.DateTimePath;
-
-public class DateArithmeticTest {
-
-    private String serialize(Expression<?> expr, SQLTemplates templates) {
-        SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
-        serializer.handle(expr);
-        return serializer.toString();
-    }
-
-    @Test
-    public void test() {
-        List<SQLTemplates> list = Lists.newArrayList();
-        list.add(new CUBRIDTemplates());
-        list.add(new DerbyTemplates());
-        list.add(new H2Templates());
-        list.add(new HSQLDBTemplates());
-        list.add(new MySQLTemplates());
-        list.add(new OracleTemplates());
-        list.add(new PostgresTemplates());
-        list.add(new SQLiteTemplates());
-        list.add(new SQLServerTemplates());
-        list.add(new SQLServer2005Templates());
-        list.add(new SQLServer2012Templates());
-        list.add(new TeradataTemplates());
-
-        List<Expression<?>> exprs = Lists.newArrayList();
-        DateTimePath<Date> path = new DateTimePath<Date>(Date.class, "date");
-        exprs.add(SQLExpressions.addYears(path, 2));
-        exprs.add(SQLExpressions.addMonths(path, 2));
-        exprs.add(SQLExpressions.addDays(path, 2));
-        exprs.add(SQLExpressions.addHours(path, 2));
-        exprs.add(SQLExpressions.addMinutes(path, 2));
-        exprs.add(SQLExpressions.addSeconds(path, 2));
-
-        for (SQLTemplates templates : list) {
-            System.out.println(templates.getClass().getSimpleName());
-            for (Expression<?> expr : exprs) {
-                System.err.println(serialize(expr, templates));
-            }
-            System.out.println();
-
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/DerbyTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/DerbyTemplatesTest.java
deleted file mode 100644
index a86045707e..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/DerbyTemplatesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-
-public class DerbyTemplatesTest {
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("next value for myseq", new SQLSerializer(new Configuration(new DerbyTemplates())).handle(nextval).toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/EncryptedString.java b/querydsl-sql/src/test/java/com/mysema/query/sql/EncryptedString.java
deleted file mode 100644
index a4f42d9ff7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/EncryptedString.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.sql.types.StringType;
-
-public class EncryptedString extends StringType{
-    
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/H2TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/H2TemplatesTest.java
deleted file mode 100644
index 3c74b970c0..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/H2TemplatesTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class H2TemplatesTest extends AbstractSQLTemplatesTest{
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new H2Templates();
-    }
-
-    @Test
-    public void Builder() {
-        SQLTemplates templates = H2Templates.builder().quote()
-            .newLineToSingleSpace()
-            .build();
-        
-        assertNotNull(templates);
-    }
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/JavaTypeMappingTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/JavaTypeMappingTest.java
deleted file mode 100644
index bed6949e4c..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/JavaTypeMappingTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.types.BlobType;
-import com.mysema.query.sql.types.BooleanType;
-import com.mysema.query.sql.types.ByteType;
-import com.mysema.query.sql.types.CharacterType;
-import com.mysema.query.sql.types.DoubleType;
-import com.mysema.query.sql.types.FloatType;
-import com.mysema.query.sql.types.InputStreamType;
-import com.mysema.query.sql.types.IntegerType;
-import com.mysema.query.sql.types.LongType;
-import com.mysema.query.sql.types.ObjectType;
-import com.mysema.query.sql.types.ShortType;
-
-public class JavaTypeMappingTest {
-
-    private JavaTypeMapping typeMapping = new JavaTypeMapping();
-    
-    @Test
-    public void GetType_With_Subtypes() {        
-        typeMapping.register(new InputStreamType());
-        assertNotNull(typeMapping.getType(InputStream.class));
-        assertNotNull(typeMapping.getType(FileInputStream.class));
-    }
-    
-    @Test
-    public void GetType_With_Interfaces() {
-        assertEquals(BlobType.class, typeMapping.getType(DummyBlob.class).getClass());
-    }
-    
-    @Test
-    public void GetType_for_Object() {
-        assertEquals(ObjectType.class, typeMapping.getType(Object.class).getClass());
-    }
-    
-    @Test
-    public void GetType_For_Primitive() {
-        assertEquals(ByteType.class, typeMapping.getType(byte.class).getClass());
-        assertEquals(ShortType.class, typeMapping.getType(short.class).getClass());
-        assertEquals(IntegerType.class, typeMapping.getType(int.class).getClass());
-        assertEquals(LongType.class, typeMapping.getType(long.class).getClass());
-        assertEquals(FloatType.class, typeMapping.getType(float.class).getClass());
-        assertEquals(DoubleType.class, typeMapping.getType(double.class).getClass());
-        assertEquals(BooleanType.class, typeMapping.getType(boolean.class).getClass());
-        assertEquals(CharacterType.class, typeMapping.getType(char.class).getClass());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/JoinFlagsTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/JoinFlagsTest.java
deleted file mode 100644
index 177e596683..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/JoinFlagsTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import java.sql.Connection;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.JoinFlag;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class JoinFlagsTest {
-    
-    private Connection connection = EasyMock.createMock(Connection.class);
-
-    private QSurvey s1, s2, s3, s4, s5, s6;
-    
-    private SQLQuery query;
-    
-    @Before
-    public void setUp() {
-        s1 = new QSurvey("s");
-        s2 = new QSurvey("s2");    
-        s3 = new QSurvey("s3");    
-        s4 = new QSurvey("s4");    
-        s5 = new QSurvey("s5");
-        s6 = new QSurvey("s6");        
-        query = new SQLQuery(connection,SQLTemplates.DEFAULT);
-        query.from(s1);    
-    }
-
-    @Test
-    public void JoinFlag_BeforeCondition() {
-        query.innerJoin(s2).on(s1.eq(s2));
-        query.addJoinFlag(" a ", JoinFlag.Position.BEFORE_CONDITION);
-        
-        assertEquals("from SURVEY s\n" +
-                "inner join SURVEY s2 a \n" +
-                "on s = ?", query.toString());
-    }
-    
-    @Test
-    public void JoinFlags_BeforeTarget() {
-        query.innerJoin(s3).on(s1.eq(s3));
-        query.addJoinFlag(" b ", JoinFlag.Position.BEFORE_TARGET);
-        
-        assertEquals("from SURVEY s\n" +
-                "inner join  b SURVEY s3\n" +
-                "on s = ?", query.toString());
-    }
-    
-    @Test
-    public void JoinFlags_End() {
-        query.innerJoin(s4).on(s1.eq(s4));
-        query.addJoinFlag(" c ", JoinFlag.Position.END);
-        
-        assertEquals("from SURVEY s\n" +
-                "inner join SURVEY s4\n" +
-                "on s = ? c", query.toString());
-    }
-    
-    @Test
-    public void JoinFlags_Override() {
-        query.innerJoin(s5).on(s1.eq(s5));
-        query.addJoinFlag(" d ", JoinFlag.Position.OVERRIDE);
-        
-        assertEquals("from SURVEY s d SURVEY s5\n" +
-                "on s = ?", query.toString());
-    }
-    
-    @Test
-    public void JoinFlags_Start() {
-        query.innerJoin(s6).on(s1.eq(s6));
-        query.addJoinFlag(" e ", JoinFlag.Position.START);
-        
-        assertEquals("from SURVEY s e \n" +
-                "inner join SURVEY s6\n" +
-                "on s = ?", query.toString());
-    }
-    
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/JoinUsageTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/JoinUsageTest.java
deleted file mode 100644
index 5a85cea6e1..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/JoinUsageTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import org.junit.Test;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class JoinUsageTest {
-    
-    @Test(expected=IllegalStateException.class)
-    public void Join_Already_Declared() {
-        QSurvey survey = QSurvey.survey;
-        SQLSubQuery subQuery = new SQLSubQuery(new DefaultQueryMetadata());
-        subQuery.from(survey).fullJoin(survey);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/MySQLTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/MySQLTemplatesTest.java
deleted file mode 100644
index 47d0ddaca2..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/MySQLTemplatesTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-
-
-public class MySQLTemplatesTest extends AbstractSQLTemplatesTest {
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new MySQLTemplates();
-    }
-
-    @Test
-    public void test() {
-        SQLTemplates templates = MySQLTemplates.builder()
-                .printSchema()
-                .build();
-        Configuration conf = new Configuration(templates);
-        System.out.println(new SQLQuery(conf).from(survey1).toString());
-    }
-
-    @Test
-    public void Order_NullsFirst() {
-        query.from(survey1).orderBy(survey1.name.asc().nullsFirst());
-        assertEquals("from SURVEY survey1 order by (case when survey1.NAME is null then 0 else 1 end), survey1.NAME asc", query.toString());
-    }
-
-    @Test
-    public void Order_NullsLast() {
-        query.from(survey1).orderBy(survey1.name.asc().nullsLast());
-        assertEquals("from SURVEY survey1 order by (case when survey1.NAME is null then 1 else 0 end), survey1.NAME asc", query.toString());
-    }
-
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/OracleTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/OracleTemplatesTest.java
deleted file mode 100644
index 338b1015ce..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/OracleTemplatesTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.QueryFlag;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.expr.SimpleExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.template.SimpleTemplate;
-
-
-
-public class OracleTemplatesTest extends AbstractSQLTemplatesTest{
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new OracleTemplates();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union() {
-        SimpleExpression<Integer> one = SimpleTemplate.create(Integer.class,"1");
-        SimpleExpression<Integer> two = SimpleTemplate.create(Integer.class,"2");
-        SimpleExpression<Integer> three = SimpleTemplate.create(Integer.class,"3");
-        NumberPath<Integer> col1 = new NumberPath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-        assertEquals(
-                "(select 1 col1 from dual)\n" +
-                "union\n" +
-                "(select 2 from dual)\n" +
-                "union\n" +
-                "(select 3 from dual)", union.toString());
-    }
-
-    @Test
-    public void Modifiers() {
-        query.from(survey1).limit(5).offset(3);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select * from (  " +
-                "select a.*, rownum rn from (   " +
-                "select survey1.ID from SURVEY survey1  ) " +
-                "a) " +
-                "where rn > 3 and rownum <= 5", query.toString());
-    }
-
-    @Test
-    public void Modifiers2() {
-        query.from(survey1).limit(5).offset(3);
-        query.getMetadata().addProjection(survey1.id);
-        query.getMetadata().addFlag(new QueryFlag(QueryFlag.Position.AFTER_PROJECTION, ", count(*) over() "));
-
-        assertEquals("select * from (  " +
-        	"select a.*, rownum rn from (   " +
-        	"select survey1.ID, count(*) over()  from SURVEY survey1  ) " +
-        	"a) " +
-        	"where rn > 3 and rownum <= 5", query.toString());
-    }
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new OracleTemplates())).handle(nextval).toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/PaginationTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/PaginationTest.java
deleted file mode 100644
index 933e957b53..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/PaginationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.QueryModifiers;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.support.QueryMixin;
-
-public class PaginationTest {
-
-    private String serialize(QueryMetadata metadata, SQLTemplates templates) {
-        SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
-        serializer.serialize(metadata, false);
-        return serializer.toString();
-    }
-
-    @Test
-    public void test() {
-        List<SQLTemplates> list = Lists.newArrayList();
-        list.add(new CUBRIDTemplates());
-        list.add(new DerbyTemplates());
-        list.add(new H2Templates());
-        list.add(new HSQLDBTemplates());
-        list.add(new MySQLTemplates());
-        list.add(new OracleTemplates());  // inner query
-        list.add(new PostgresTemplates());
-        list.add(new SQLiteTemplates());
-        list.add(new SQLServerTemplates());
-        list.add(new SQLServer2005Templates()); // inner query
-        list.add(new SQLServer2012Templates());
-        list.add(new TeradataTemplates()); // qualify
-
-        for (SQLTemplates templates : list) {
-            QEmployee employee = QEmployee.employee;
-            QueryMixin query = new QueryMixin();
-            query.from(employee);
-            query.orderBy(employee.firstname.asc());
-            query.addProjection(employee.id);
-
-            System.out.println(templates.getClass().getSimpleName());
-            System.out.println();
-
-            // limit
-            query.restrict(QueryModifiers.limit(10l));
-            System.out.println("* limit");
-            System.out.println(serialize(query.getMetadata(), templates));
-            System.out.println();
-
-            if (!templates.getClass().equals(SQLServerTemplates.class)) {
-                // offset
-                query.restrict(QueryModifiers.offset(10l));
-                System.out.println("* offset");
-                System.out.println(serialize(query.getMetadata(), templates));
-                System.out.println();
-
-                // limit and offset
-                query.restrict(new QueryModifiers(10l, 10l));
-                System.out.println("* limit and offset");
-                System.out.println(serialize(query.getMetadata(), templates));
-                System.out.println();
-            }
-
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/PerformanceTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/PerformanceTest.java
deleted file mode 100644
index b1f9c737cd..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/PerformanceTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.JoinType;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.testutil.Performance;
-
-@Category(Performance.class)
-public class PerformanceTest {
-    
-    private QueryMetadata md;
-    
-    private SQLTemplates templates;
-    
-    private Configuration configuration;
-    
-    int iterations;
-    
-    @Before
-    public void setUp() {
-        QSurvey survey = QSurvey.survey;
-        md = new DefaultQueryMetadata();
-        md.addJoin(JoinType.DEFAULT, survey);
-        md.addWhere(survey.id.eq(10));
-        md.addProjection(survey.name);
-        
-        templates = new H2Templates();
-        configuration = new Configuration(templates);
-        
-        iterations =  1000000;
-    }
-    
-    @Test
-    public void NonNormalized() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            SQLSerializer serializer = new SQLSerializer(configuration);
-            serializer.setNormalize(false);
-            serializer.serialize(md, false);
-            serializer.getConstants();
-            serializer.getConstantPaths();
-            assertNotNull(serializer.toString());
-        }
-        System.err.println("non-normalized " + (System.currentTimeMillis() - start));
-    }
-    
-    @Test
-    public void Default() {
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            SQLSerializer serializer = new SQLSerializer(configuration);
-            serializer.serialize(md, false);
-            serializer.getConstants();
-            serializer.getConstantPaths();
-            assertNotNull(serializer.toString());
-        }
-        System.err.println("default " + (System.currentTimeMillis() - start));
-    }
-        
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/PostgresTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/PostgresTemplatesTest.java
deleted file mode 100644
index 521a64489a..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/PostgresTemplatesTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.NumberTemplate;
-
-
-public class PostgresTemplatesTest extends AbstractSQLTemplatesTest{
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new PostgresTemplates();
-    }    
-    
-    @Test
-    public void NoFrom() {
-        query.getMetadata().addProjection(NumberTemplate.ONE);
-        assertEquals("select 1", query.toString());
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Test
-    public void Union() {        
-        NumberExpression<Integer> one = NumberTemplate.ONE;
-        NumberExpression<Integer> two = NumberTemplate.TWO;
-        NumberExpression<Integer> three = NumberTemplate.THREE;
-        Path<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-        assertEquals(
-                "(select 1 as col1)\n" +
-                "union\n" +
-                "(select 2)\n" +
-                "union\n" +
-                "(select 3)", union.toString());
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/QBeanTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/QBeanTest.java
deleted file mode 100644
index 340956d639..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/QBeanTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.QBean;
-
-public class QBeanTest {
-    
-    private final QEmployee e = new QEmployee("e");
-    
-    @Test
-    public void Direct_to_Managed_type() {
-        FactoryExpression<Employee> expr = new QBean<Employee>(Employee.class, e.superiorId);        
-        Employee e = expr.newInstance(3);
-        assertEquals(Integer.valueOf(3), e.getSuperiorId());
-    }
-    
-    @Test
-    public void Direct_to_Custom_type() {
-        FactoryExpression<Employee> expr = new QBean<Employee>(Employee.class, e.firstname, e.lastname);        
-        Employee e = expr.newInstance("John","Smith");
-        assertEquals("John", e.getFirstname());
-        assertEquals("Smith", e.getLastname());
-    }
-    
-    @Test
-    public void Alias_to_Managed_type() {
-        FactoryExpression<Employee> expr = new QBean<Employee>(Employee.class, e.superiorId.as("id"));        
-        Employee e = expr.newInstance(3);
-        assertEquals(3, e.getId().intValue());
-    }
-    
-    @Test
-    public void Alias_to_Custom_type() {
-        FactoryExpression<Employee> expr = new QBean<Employee>(Employee.class, e.firstname.as("lastname"), e.lastname.as("firstname"));        
-        Employee e = expr.newInstance("John","Smith");
-        assertEquals("Smith", e.getFirstname());
-        assertEquals("John", e.getLastname());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/QPerson.java b/querydsl-sql/src/test/java/com/mysema/query/sql/QPerson.java
deleted file mode 100644
index dc5b363cce..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/QPerson.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.BeanPath;
-import com.mysema.query.types.path.EnumPath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-//@Table("PERSON")
-public class QPerson extends RelationalPathBase<QPerson> {
-
-    private static final long serialVersionUID = 475064746;
-
-    public static final QPerson person = new QPerson("PERSON");
-
-    public final StringPath firstname = createString("firstname");
-
-    public final EnumPath<com.mysema.query.alias.Gender> gender = createEnum("gender", com.mysema.query.alias.Gender.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath securedid = createString("securedid");
-
-    public final PrimaryKey<QPerson> sysIdx118 = createPrimaryKey(id);
-
-    public QPerson(String variable) {
-        super(QPerson.class, PathMetadataFactory.forVariable(variable), null, "PERSON");
-        addMetadata();
-    }
-
-    public QPerson(BeanPath<? extends QPerson> entity) {
-        super(entity.getType(), entity.getMetadata(), "", "PERSON");
-        addMetadata();
-    }
-
-    public QPerson(PathMetadata<?> metadata) {
-        super(QPerson.class, metadata, "", "PERSON");
-        addMetadata();
-    }
-
-    protected void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("ID"));
-        addMetadata(firstname, ColumnMetadata.named("FIRSTNAME"));
-        addMetadata(securedid, ColumnMetadata.named("SECUREDID"));
-        addMetadata(gender, ColumnMetadata.named("GENDER"));
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalFunctionCallTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalFunctionCallTest.java
deleted file mode 100644
index 02a3231eef..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalFunctionCallTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-
-public class RelationalFunctionCallTest {
-    
-    private static Expression[] serializeCollection(String... tokens) {
-        Expression[] rv = new Expression[tokens.length];
-        for (int i = 0; i < tokens.length; i++) {
-            rv[i] = ConstantImpl.create(tokens[i]); 
-        }
-        return rv;
-    }
-    
-    private static class TokenizeFunction extends RelationalFunctionCall<String> {
-        final PathBuilder<String> alias;
-        final StringPath token;
-     
-        public TokenizeFunction(String alias, String... tokens) {
-           super(String.class, "tokenize", serializeCollection(tokens));
-           this.alias = new PathBuilder<String>(String.class, alias);
-           this.token = new StringPath(this.alias, "token");        
-       }
-        
-    }
-    
-    @Test
-    public void Validation() {
-        QSurvey survey = QSurvey.survey;
-        TokenizeFunction func = new TokenizeFunction("func", "a", "b");
-        SQLSubQuery sub = new SQLSubQuery().from(func.as(func.alias)).where(survey.name.like(func.token));
-        System.out.println(sub);
-        
-    }
-    
-    @Test
-    public void NoArgs() {
-        RelationalFunctionCall<String> functionCall = RelationalFunctionCall.create(String.class, "getElements");
-        assertEquals("getElements()", functionCall.getTemplate().toString());
-    }
-    
-    @Test
-    public void TwoArgs() {
-        StringPath str = new StringPath("str");
-        RelationalFunctionCall<String> functionCall = RelationalFunctionCall.create(String.class, "getElements", "a", str);
-        assertEquals("getElements({0}, {1})", functionCall.getTemplate().toString());
-        assertEquals("a", functionCall.getArg(0));
-        assertEquals(str, functionCall.getArg(1));        
-    }
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathExtractorTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathExtractorTest.java
deleted file mode 100644
index 03b95f4bd5..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathExtractorTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.mysema.query.sql;
-
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.sql.RelationalPathExtractor.extract;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.support.Expressions;
-
-public class RelationalPathExtractorTest {
-
-    private SQLQuery query() {
-        return new SQLQuery(SQLTemplates.DEFAULT);
-    }
-
-    private SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-    @Test
-    public void SimpleQuery() {
-        QEmployee employee2 = new QEmployee("employee2");
-        SQLQuery query = query().from(employee, employee2);
-
-        assertEquals(ImmutableSet.of(employee, employee2), extract(query.getMetadata()));
-    }
-
-    @Test
-    public void Joins() {
-        QEmployee employee2 = new QEmployee("employee2");
-        SQLQuery query = query().from(employee)
-                .innerJoin(employee2).on(employee.superiorId.eq(employee2.id));
-
-        assertEquals(ImmutableSet.of(employee, employee2), extract(query.getMetadata()));
-    }
-
-    @Test
-    public void SubQuery() {
-        SQLQuery query = query().from(employee)
-                .where(employee.id.eq(sq().from(employee).unique(employee.id.max())));
-        assertEquals(ImmutableSet.of(employee), extract(query.getMetadata()));
-    }
-
-    @Test
-    public void SubQuery2() {
-        QEmployee employee2 = new QEmployee("employee2");
-        SQLQuery query = query().from(employee)
-            .where(Expressions.list(employee.id, employee.lastname)
-                .in(sq().from(employee2).list(employee2.id, employee2.lastname)));
-
-        assertEquals(ImmutableSet.of(employee, employee2), extract(query.getMetadata()));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathTest.java
deleted file mode 100644
index fdb6db5dbe..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/RelationalPathTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.QTuple;
-
-public class RelationalPathTest {
-
-    @Test
-    public void Path() throws ClassNotFoundException, IOException {
-        QSurvey survey = QSurvey.survey;
-        QSurvey survey2 = (QSurvey) serialize(survey);
-        assertEquals(Arrays.asList(survey.all()), Arrays.asList(survey2.all()));
-        assertEquals(survey.getMetadata(), survey2.getMetadata());
-        assertEquals(survey.getMetadata(survey.id), survey2.getMetadata(survey.id));
-    }
-
-    @Test
-    public void In_Tuple() throws ClassNotFoundException, IOException {
-        //(survey.id, survey.name)
-        QSurvey survey = QSurvey.survey;
-        QTuple tuple = new QTuple(survey.id, survey.name);
-        serialize(tuple);
-        serialize(tuple.newInstance(1, "a"));
-    }
-
-    private Object serialize(Object obj) throws IOException, ClassNotFoundException{
-        ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-        ObjectOutputStream out = new ObjectOutputStream(bytesOut);
-        out.writeObject(obj);
-        out.close();
-
-        ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(bytesIn);
-        return in.readObject();
-    }
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLBindingsTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLBindingsTest.java
deleted file mode 100644
index 043cde4f14..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLBindingsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.expr.Param;
-
-public class SQLBindingsTest {
-
-    private QSurvey survey = QSurvey.survey;
-
-    private SQLQuery query = new SQLQuery(SQLTemplates.DEFAULT);
-
-    @Test
-    public void Empty() {
-        SQLBindings bindings = query.getSQL();
-        assertEquals("\nfrom dual", bindings.getSQL());
-        assertTrue(bindings.getBindings().isEmpty());
-    }
-
-    @Test
-    public void SingleArg() {
-        query.from(survey).where(survey.name.eq("Bob"));
-        SQLBindings bindings = query.getSQL(survey.id);
-        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ?", bindings.getSQL());
-        assertEquals(Arrays.asList("Bob"), bindings.getBindings());
-    }
-
-    @Test
-    public void TwoArgs() {
-        query.from(survey).where(survey.name.eq("Bob"), survey.name2.eq("A"));
-        SQLBindings bindings = query.getSQL(survey.id);
-        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ? and SURVEY.NAME2 = ?", bindings.getSQL());
-        assertEquals(Arrays.asList("Bob", "A"), bindings.getBindings());
-    }
-
-    @Test
-    public void Params() {
-        Param<String> name = new Param<String>(String.class, "name");
-        query.from(survey).where(survey.name.eq(name), survey.name2.eq("A"));
-        query.set(name, "Bob");
-        SQLBindings bindings = query.getSQL(survey.id);
-        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ? and SURVEY.NAME2 = ?", bindings.getSQL());
-        assertEquals(Arrays.asList("Bob", "A"), bindings.getBindings());
-    }
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLQueryFactoryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLQueryFactoryTest.java
deleted file mode 100644
index 40ed22b0ea..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLQueryFactoryTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-
-public class SQLQueryFactoryTest {
-
-    private SQLQueryFactoryImpl queryFactory;
-
-    @Before
-    public void setUp() {
-        Provider<Connection> provider = new Provider<Connection>() {
-            @Override
-            public Connection get() {
-                return EasyMock.createNiceMock(Connection.class);
-            }
-        };
-        queryFactory = new SQLQueryFactoryImpl(SQLTemplates.DEFAULT, provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void SubQuery_From() {
-        assertNotNull(queryFactory.subQuery(QSurvey.survey));
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QSurvey.survey));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QSurvey.survey));
-    }
-
-    @Test
-    public void Insert() {
-        assertNotNull(queryFactory.insert(QSurvey.survey));
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QSurvey.survey));
-    }
-
-    @Test
-    public void Merge() {
-        assertNotNull(queryFactory.merge(QSurvey.survey));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSerializerTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSerializerTest.java
deleted file mode 100644
index 39321078ea..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSerializerTest.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.TimeZone;
-
-import com.mysema.query.BooleanBuilder;
-import com.mysema.query.QueryMetadata;
-import com.mysema.query.Survey;
-import com.mysema.query.Tuple;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QEmployeeNoPK;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class SQLSerializerTest {
-
-    private static final QEmployee employee = QEmployee.employee;
-
-    private static final QSurvey survey = QSurvey.survey;
-
-    @Test
-    public void Count() {
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.handle(employee.id.count().add(employee.id.countDistinct()));
-        assertEquals("count(EMPLOYEE.ID) + count(distinct EMPLOYEE.ID)", serializer.toString());
-    }
-
-    @Test
-    public void CountDistinct() {
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(QEmployeeNoPK.employee);
-        query.distinct();
-        serializer.serializeForQuery(query.getMetadata(), true);
-        assertEquals("select count(*)\n" +
-        "from (select distinct EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, " +
-            "EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID\n" +
-         "from EMPLOYEE EMPLOYEE) internal", serializer.toString());
-    }
-
-    @Test
-    public void CountDistinct_PostgreSQL() {
-        Configuration postgres = new Configuration(new PostgresTemplates());
-        SQLSerializer serializer = new SQLSerializer(postgres);
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(QEmployeeNoPK.employee);
-        query.distinct();
-        serializer.serializeForQuery(query.getMetadata(), true);
-        assertEquals("select count(" +
-            "distinct (EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, " +
-            "EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID))\n" +
-            "from EMPLOYEE EMPLOYEE", serializer.toString());
-    }
-
-    @Test
-    public void DynamicQuery() {
-        Path<Object> userPath = Expressions.path(Object.class, "user");
-        NumberPath<Long> idPath = Expressions.numberPath(Long.class, userPath, "id");
-        StringPath usernamePath = Expressions.stringPath(userPath, "username");
-        Expression<?> sq = new SQLSubQuery()
-            .from(userPath).where(idPath.eq(1l))
-            .list(idPath, usernamePath);
-
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.handle(sq);
-        assertEquals("(select user.id, user.username\n" +
-        	"from user\n" +
-        	"where user.id = ?)", serializer.toString());
-    }
-
-    @Test
-    public void DynamicQuery2() {
-        PathBuilder<Object> userPath = new PathBuilder<Object>(Object.class, "user");
-        NumberPath<Long> idPath = userPath.getNumber("id", Long.class);
-        StringPath usernamePath = userPath.getString("username");
-        Expression<?> sq = new SQLSubQuery()
-            .from(userPath).where(idPath.eq(1l))
-            .list(idPath, usernamePath);
-
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.handle(sq);
-        assertEquals("(select user.id, user.username\n" +
-                "from user\n" +
-                "where user.id = ?)", serializer.toString());
-    }
-
-    @Test
-    public void Some() {
-        //select some((e.FIRSTNAME is not null)) from EMPLOYEE
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.handle(SQLExpressions.any(employee.firstname.isNotNull()));
-        assertEquals("some(EMPLOYEE.FIRSTNAME is not null)", serializer.toString());
-    }
-
-    @Test
-    public void StartsWith() {
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        QSurvey s1 = new QSurvey("s1");
-        serializer.handle(s1.name.startsWith("X"));
-        assertEquals("s1.NAME like ? escape '\\'", serializer.toString());
-        assertEquals(Arrays.asList("X%"), serializer.getConstants());
-    }
-
-    @Test
-    public void From_Function() {
-        SQLQuery query = query();
-        query.from(Expressions.template(Survey.class, "functionCall()")).join(survey);
-        query.where(survey.name.isNotNull());
-        assertEquals("from functionCall()\njoin SURVEY SURVEY\nwhere SURVEY.NAME is not null", query.toString());
-    }
-
-    @Test
-    public void Join_To_Function_With_Alias() {
-        SQLQuery query = query();
-        query.from(survey).join(RelationalFunctionCall.create(Survey.class, "functionCall"), Expressions.path(Survey.class, "fc"));
-        query.where(survey.name.isNotNull());
-        assertEquals("from SURVEY SURVEY\njoin functionCall() as fc\nwhere SURVEY.NAME is not null", query.toString());
-    }
-
-    @Test
-    public void Join_To_Function_In_Derby() {
-        SQLQuery query = new SQLQuery(new DerbyTemplates());
-        query.from(survey).join(RelationalFunctionCall.create(Survey.class, "functionCall"), Expressions.path(Survey.class, "fc"));
-        query.where(survey.name.isNotNull());
-        assertEquals("from SURVEY SURVEY\njoin table(functionCall()) as fc\nwhere SURVEY.NAME is not null", query.toString());
-    }
-
-    @Test
-    public void Like() {
-        Expression<?> expr = Expressions.stringTemplate("'%a%'").contains("%a%");
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.handle(expr);
-        assertEquals("'%a%' like ? escape '\\'", serializer.toString());
-    }
-
-    @Test
-    public void Override() {
-        Configuration conf = new Configuration(new DerbyTemplates());
-        conf.registerTableOverride("SURVEY", "surveys");
-
-        SQLQuery query = new SQLQuery(conf);
-        query.from(survey);
-        assertEquals("from surveys SURVEY", query.toString());
-    }
-
-    @Test
-    public void ColumnOverrides() {
-        Configuration conf = new Configuration(new DerbyTemplates());
-        conf.registerColumnOverride("SURVEY", "NAME", "LABEL");
-
-        SQLQuery query = new SQLQuery(conf);
-        query.from(survey).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY\n" +
-                "where SURVEY.LABEL is null", query.toString());
-    }
-
-    @Test
-    public void ColumnOverrides2() {
-        Configuration conf = new Configuration(new DerbyTemplates());
-        conf.registerColumnOverride("PUBLIC", "SURVEY", "NAME", "LABEL");
-
-        SQLQuery query = new SQLQuery(conf);
-        query.from(survey).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY\n" +
-                "where SURVEY.LABEL is null", query.toString());
-    }
-
-    @Test
-    public void Complex_SubQuery() {
-        // create sub queries
-        List<SubQueryExpression<Tuple>> sq = new ArrayList<SubQueryExpression<Tuple>>();
-        String[] strs = new String[]{"a","b","c"};
-        for(String str : strs) {
-            Expression<Boolean> alias = Expressions.cases().when(survey.name.eq(str)).then(true).otherwise(false);
-            sq.add(sq().from(survey).distinct().unique(survey.name, alias));
-        }
-
-        // master query
-        PathBuilder<Tuple> subAlias = new PathBuilder<Tuple>(Tuple.class, "sub");
-        SubQueryExpression<?> master = sq()
-                .from(sq().union(sq).as(subAlias))
-                .groupBy(subAlias.get("prop1"))
-                .list(subAlias.get("prop2"));
-
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.serialize(master.getMetadata(), false);
-        System.err.println(serializer);
-    }
-
-    private SQLQuery query() {
-        return new SQLQuery(Configuration.DEFAULT);
-    }
-
-    private SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-    @Test
-    public void Boolean() {
-        QSurvey s = new QSurvey("s");
-        BooleanBuilder bb1 = new BooleanBuilder();
-        bb1.and(s.name.eq(s.name));
-
-        BooleanBuilder bb2 = new BooleanBuilder();
-        bb2.or(s.name.eq(s.name));
-        bb2.or(s.name.eq(s.name));
-
-        String str = new SQLSerializer(Configuration.DEFAULT).handle(bb1.and(bb2)).toString();
-        assertEquals("s.NAME = s.NAME and (s.NAME = s.NAME or s.NAME = s.NAME)", str);
-    }
-
-    @Test
-    public void List_In_Query() {
-        Expression<?> expr = Expressions.list(survey.id, survey.name).in(sq().from(survey).list(survey.id, survey.name));
-
-        String str = new SQLSerializer(Configuration.DEFAULT).handle(expr).toString();
-        assertEquals("(SURVEY.ID, SURVEY.NAME) in (select SURVEY.ID, SURVEY.NAME\nfrom SURVEY SURVEY)", str);
-    }
-
-    @Test
-    public void WithRecursive() {
-        /*with sub (id, firstname, superior_id) as (
-            select id, firstname, superior_id from employee where firstname like 'Mike'
-            union all
-            select employee.id, employee.firstname, employee.superior_id from sub, employee
-            where employee.superior_id = sub.id)
-        select * from sub;*/
-
-        QEmployee e = QEmployee.employee;
-        PathBuilder<Tuple> sub = new PathBuilder<Tuple>(Tuple.class, "sub");
-        SQLQuery query = new SQLQuery(SQLTemplates.DEFAULT);
-        query.withRecursive(sub,
-                sq().unionAll(
-                    sq().from(e).where(e.firstname.eq("Mike"))
-                        .list(e.id, e.firstname, e.superiorId),
-                    sq().from(e, sub).where(e.superiorId.eq(sub.get(e.id)))
-                        .list(e.id, e.firstname, e.superiorId)))
-             .from(sub);
-
-        QueryMetadata md = query.getMetadata();
-        md.addProjection(Wildcard.all);
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.serialize(md, false);
-        assertEquals("with recursive sub as ((select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
-                "from EMPLOYEE EMPLOYEE\n" +
-                "where EMPLOYEE.FIRSTNAME = ?)\n" +
-                "union all\n" +
-                "(select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
-                "from EMPLOYEE EMPLOYEE, sub\n" +
-                "where EMPLOYEE.SUPERIOR_ID = sub.ID))\n" +
-                "select *\n" +
-                "from sub", serializer.toString());
-
-    }
-
-    @Test
-    public void WithRecursive2() {
-        /*with sub (id, firstname, superior_id) as (
-            select id, firstname, superior_id from employee where firstname like 'Mike'
-            union all
-            select employee.id, employee.firstname, employee.superior_id from sub, employee
-            where employee.superior_id = sub.id)
-        select * from sub;*/
-
-        QEmployee e = QEmployee.employee;
-        PathBuilder<Tuple> sub = new PathBuilder<Tuple>(Tuple.class, "sub");
-        SQLQuery query = new SQLQuery(SQLTemplates.DEFAULT);
-        query.withRecursive(sub, sub.get(e.id), sub.get(e.firstname), sub.get(e.superiorId)).as(
-                sq().unionAll(
-                    sq().from(e).where(e.firstname.eq("Mike"))
-                        .list(e.id, e.firstname, e.superiorId),
-                    sq().from(e, sub).where(e.superiorId.eq(sub.get(e.id)))
-                        .list(e.id, e.firstname, e.superiorId)))
-             .from(sub);
-
-        QueryMetadata md = query.getMetadata();
-        md.addProjection(Wildcard.all);
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.serialize(md, false);
-        assertEquals("with recursive sub (ID, FIRSTNAME, SUPERIOR_ID) as ((select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
-                "from EMPLOYEE EMPLOYEE\n" +
-                "where EMPLOYEE.FIRSTNAME = ?)\n" +
-                "union all\n" +
-                "(select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
-                "from EMPLOYEE EMPLOYEE, sub\n" +
-                "where EMPLOYEE.SUPERIOR_ID = sub.ID))\n" +
-                "select *\n" +
-                "from sub", serializer.toString());
-
-    }
-
-    @Test
-    public void UseLiterals() {
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.setUseLiterals(true);
-
-        int offset = TimeZone.getDefault().getRawOffset();
-        Expression<?> expr = SQLExpressions.datediff(DatePart.year, employee.datefield, new java.sql.Date(-offset));
-        serializer.handle(expr);
-        assertEquals("datediff('year',EMPLOYEE.DATEFIELD,(date '1970-01-01'))", serializer.toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2005TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2005TemplatesTest.java
deleted file mode 100644
index 6a8e653c57..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2005TemplatesTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.NumberTemplate;
-
-
-public class SQLServer2005TemplatesTest extends AbstractSQLTemplatesTest{
-
-    @Override
-    @Test
-    public void NoFrom() {
-        query.getMetadata().addProjection(NumberTemplate.ONE);
-        assertEquals("select 1", query.toString());
-    }
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new SQLServer2005Templates();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    @Override
-    public void Union() {
-        NumberExpression<Integer> one = NumberTemplate.ONE;
-        NumberExpression<Integer> two = NumberTemplate.TWO;
-        NumberExpression<Integer> three = NumberTemplate.THREE;
-        Path<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-        assertEquals(
-                "(select 1 as col1)\n" +
-                "union\n" +
-                "(select 2)\n" +
-                "union\n" +
-                "(select 3)", union.toString());
-    }
-
-    @Test
-    public void Limit() {
-        query.from(survey1).limit(5);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select top (?) survey1.ID from SURVEY survey1", query.toString());
-    }
-
-    @Test
-    public void Modifiers() {
-        query.from(survey1).limit(5).offset(3);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select * from (" +
-      		"   select survey1.ID, row_number() over () as rn from SURVEY survey1) a " +
-      		"where rn > ? and rn <= ? order by rn", query.toString());
-    }
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java
deleted file mode 100644
index dc3bc203c6..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.NumberTemplate;
-
-
-public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest {
-
-    @Override
-    @Test
-    public void NoFrom() {
-        query.getMetadata().addProjection(NumberTemplate.ONE);
-        assertEquals("select 1", query.toString());
-    }
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new SQLServer2012Templates();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    @Override
-    public void Union() {
-        NumberExpression<Integer> one = NumberTemplate.ONE;
-        NumberExpression<Integer> two = NumberTemplate.TWO;
-        NumberExpression<Integer> three = NumberTemplate.THREE;
-        Path<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-        assertEquals(
-                "(select 1 as col1)\n" +
-                "union\n" +
-                "(select 2)\n" +
-                "union\n" +
-                "(select 3)", union.toString());
-    }
-
-    @Test
-    public void Limit() {
-        query.from(survey1).limit(5);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select survey1.ID from SURVEY survey1 offset ? rows fetch next ? rows only", query.toString());
-    }
-
-    @Test
-    public void Modifiers() {
-        query.from(survey1).limit(5).offset(3);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select survey1.ID from SURVEY survey1 offset ? rows fetch next ? rows only", query.toString());
-    }
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServerTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServerTemplatesTest.java
deleted file mode 100644
index 1d549705de..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServerTemplatesTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Operation;
-import com.mysema.query.types.OperationImpl;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.expr.NumberExpression;
-import com.mysema.query.types.path.SimplePath;
-import com.mysema.query.types.template.NumberTemplate;
-
-
-public class SQLServerTemplatesTest extends AbstractSQLTemplatesTest{
-
-    @Override
-    @Test
-    public void NoFrom() {
-        query.getMetadata().addProjection(NumberTemplate.ONE);
-        assertEquals("select 1", query.toString());
-    }
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new SQLServerTemplates();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    @Override
-    public void Union() {
-        NumberExpression<Integer> one = NumberTemplate.ONE;
-        NumberExpression<Integer> two = NumberTemplate.TWO;
-        NumberExpression<Integer> three = NumberTemplate.THREE;
-        Path<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Union union = query.union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-        assertEquals(
-                "(select 1 as col1)\n" +
-                "union\n" +
-                "(select 2)\n" +
-                "union\n" +
-                "(select 3)", union.toString());
-    }
-
-    @Test
-    public void Limit() {
-        query.from(survey1).limit(5);
-        query.getMetadata().addProjection(survey1.id);
-        assertEquals("select top 5 survey1.ID from SURVEY survey1", query.toString());
-    }
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSubQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSubQueryTest.java
deleted file mode 100644
index 552e398161..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLSubQueryTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import java.util.List;
-
-import com.mysema.query.DefaultQueryMetadata;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.*;
-import com.mysema.query.types.expr.BooleanOperation;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.query.ListSubQuery;
-import com.mysema.query.types.query.NumberSubQuery;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class SQLSubQueryTest {
-
-    private static final QEmployee employee = QEmployee.employee;
-
-    @Test
-    public void UnknownOperator() {
-        Operator op = new OperatorImpl(SQLSubQueryTest.class.getName(), "unknownfn");
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(employee)
-            .where(BooleanOperation.create(op, employee.id));
-
-        assertEquals("from EMPLOYEE EMPLOYEE\nwhere com.mysema.query.sql.SQLSubQueryTest#unknownfn(EMPLOYEE.ID)", query.toString());
-    }
-
-    @Test
-    public void Multiple_Projections() {
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(employee);
-        assertEquals(1, query.list(employee).getMetadata().getProjection().size());
-        assertEquals(1, query.list(employee).getMetadata().getProjection().size());
-    }
-
-    @Test
-    public void List() {
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(employee);
-        ListSubQuery<?> subQuery = query.list(employee.id, "XXX", employee.firstname);
-        List<? extends Expression<?>> exprs = subQuery.getMetadata().getProjection();
-        assertEquals(employee.id, exprs.get(0));
-        assertEquals(ConstantImpl.create("XXX") , exprs.get(1));
-        assertEquals(employee.firstname, exprs.get(2));
-    }
-
-    @Test
-    public void List_Entity() {
-        QEmployee employee2 = new QEmployee("employee2");
-        SQLSubQuery query = new SQLSubQuery();
-        Expression<?> expr = query.from(employee)
-             .innerJoin(employee.superiorIdKey, employee2)
-             .list(employee, employee2.id);
-
-        SQLSerializer serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
-        serializer.handle(expr);
-
-        assertEquals("(select EMPLOYEE.ID, EMPLOYEE.SUPERIOR_ID, EMPLOYEE.TIMEFIELD, EMPLOYEE.LASTNAME, EMPLOYEE.DATEFIELD, EMPLOYEE.SALARY, EMPLOYEE.FIRSTNAME, employee2.ID\n" +
-            "from EMPLOYEE EMPLOYEE\n" +
-            "inner join EMPLOYEE employee2\n" +
-            "on EMPLOYEE.SUPERIOR_ID = employee2.ID)", serializer.toString());
-    }
-
-    @Test
-    public void In() {
-        ListSubQuery<Integer> ints = new SQLSubQuery().from(employee).list(employee.id);
-        QEmployee.employee.id.in(ints);
-    }
-
-    @Test
-    public void In_Union() {
-        ListSubQuery<Integer> ints1 = new SQLSubQuery().from(employee).list(employee.id);
-        ListSubQuery<Integer> ints2 = new SQLSubQuery().from(employee).list(employee.id);
-        QEmployee.employee.id.in(new SQLSubQuery().union(ints1, ints2));
-    }
-
-    @Test
-    public void In_Union2() {
-        NumberSubQuery<Integer> ints1 = new SQLSubQuery().from(employee).unique(employee.id);
-        NumberSubQuery<Integer> ints2 = new SQLSubQuery().from(employee).unique(employee.id);
-        QEmployee.employee.id.in(new SQLSubQuery().union(ints1, ints2));
-    }
-
-    @Test
-    public void Unique() {
-        SQLSubQuery query = new SQLSubQuery();
-        query.from(employee);
-        SubQueryExpression<?> subQuery = query.unique(employee.id, "XXX", employee.firstname);
-        List<? extends Expression<?>> exprs = subQuery.getMetadata().getProjection();
-        assertEquals(employee.id, exprs.get(0));
-        assertEquals(ConstantImpl.create("XXX") , exprs.get(1));
-        assertEquals(employee.firstname, exprs.get(2));
-    }
-
-    @Test
-    public void Complex() {
-        // related to #584795
-        QSurvey survey = new QSurvey("survey");
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SubQueryExpression<?> subQuery = new SQLSubQuery().from(survey)
-          .innerJoin(emp1)
-           .on(survey.id.eq(emp1.id))
-          .innerJoin(emp2)
-           .on(emp1.superiorId.eq(emp2.superiorId), emp1.firstname.eq(emp2.firstname))
-          .list(survey.id, emp2.firstname);
-
-        assertEquals(3, subQuery.getMetadata().getJoins().size());
-    }
-
-    @Test
-    public void Validate() {
-        NumberPath<Long> operatorTotalPermits = new NumberPath<Long>(Long.class, "operator_total_permits");
-        QSurvey survey = new QSurvey("survey");
-
-        // select survey.name, count(*) as operator_total_permits
-        // from survey
-        // where survey.name >= "A"
-        // group by survey.name
-        // order by operator_total_permits asc
-        // limit 10
-
-        Expression<?> e = new SQLSubQuery().from(survey)
-            .where(survey.name.goe("A"))
-            .groupBy(survey.name)
-            .orderBy(operatorTotalPermits.asc())
-            .limit(10)
-            .list(survey.name, Wildcard.count.as(operatorTotalPermits))
-            .as("top");
-
-        new SQLQuery(null, SQLTemplates.DEFAULT).from(e);
-    }
-
-    @Test
-    public void Union() {
-        ListSubQuery<Object> q1 = new ListSubQuery<Object>(Object.class, new DefaultQueryMetadata());
-        ListSubQuery<Object> q2 = new ListSubQuery<Object>(Object.class, new DefaultQueryMetadata());
-        new SQLSubQuery().union(q1, q2);
-        new SQLSubQuery().union(q1);
-    }
-
-    @Test
-    public void Union_With() {
-        QSurvey survey1 = new QSurvey("survey1");
-        QSurvey survey2 = new QSurvey("survey2");
-        QSurvey survey3 = new QSurvey("survey3");
-
-        SQLQuery query = new SQLQuery(SQLTemplates.DEFAULT);
-        query.with(survey1, new SQLSubQuery().from(survey1).list(survey1.all()));
-        query.union(
-              new SQLSubQuery().from(survey2).list(survey2.all()),
-              new SQLSubQuery().from(survey3).list(survey3.all()));
-
-        assertEquals("with survey1 as (select survey1.NAME, survey1.NAME2, survey1.ID\n" +
-                "from SURVEY survey1)\n" +
-                "(select survey2.NAME, survey2.NAME2, survey2.ID\n" +
-                "from SURVEY survey2)\n" +
-                "union\n" +
-                "(select survey3.NAME, survey3.NAME2, survey3.ID\n" +
-                "from SURVEY survey3)", query.toString());
-
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java
deleted file mode 100644
index 98e51a5b0a..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.*;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.template.SimpleTemplate;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
-import org.junit.Test;
-
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class SQLTemplatesTest {
-
-    private static final String DATETIME = "\\(timestamp '\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}'\\)";
-    private static final String TIME = "\\(time '\\d{2}:\\d{2}:\\d{2}'\\)";
-    private static final String DATE = "\\(date '\\d{4}-\\d{2}-\\d{2}'\\)";
-
-    private static void assertMatches(String regex, String str) {
-        assertTrue(str, str.matches(regex));
-    }
-
-    @Test
-    public void test() {
-        Template template = TemplateFactory.DEFAULT.create("fetch first {0s} rows only");
-        assertTrue(template.getElements().get(1) instanceof Template.AsString);
-
-        SQLSerializer serializer = new SQLSerializer(new Configuration(new DerbyTemplates()));
-        serializer.handle(SimpleTemplate.create(Object.class, template, ConstantImpl.create(5)));
-        assertEquals("fetch first 5 rows only", serializer.toString());
-    }
-
-    @Test
-    public void AsLiteral() {
-        SQLTemplates templates = SQLTemplates.DEFAULT;
-        Configuration conf = new Configuration(templates);
-        assertMatches(DATE, conf.asLiteral(new Date(0)));
-        assertMatches(TIME, conf.asLiteral(new Time(0)));
-        assertMatches(DATETIME, conf.asLiteral(new Timestamp(0)));
-    }
-
-    @Test
-    public void AsLiteral_JodaTime() {
-        SQLTemplates templates = SQLTemplates.DEFAULT;
-        Configuration conf = new Configuration(templates);
-        assertMatches(DATE, conf.asLiteral(new LocalDate(0)));
-        assertMatches(TIME, conf.asLiteral(new LocalTime(0)));
-        assertMatches(DATETIME, conf.asLiteral(new DateTime(0)));
-    }
-
-    @Test
-    public void Quote() {
-        Pattern pattern = Pattern.compile("[a-zA-Z0-9_\\-]+");
-        assertTrue(pattern.matcher("a1").matches());
-        assertTrue(pattern.matcher("a").matches());
-    }
-
-    @Test
-    public void Quoting_Performance() {
-        // 385 -> 63
-        SQLTemplates templates = new H2Templates();
-        long start = System.currentTimeMillis();
-        int iterations = 1000000;
-        for (int i = 0; i < iterations; i++) {
-            templates.quoteIdentifier("companies");
-        }
-        System.err.println(System.currentTimeMillis() - start);
-    }
-
-    @Test
-    public void NextVal() {
-        Operation<String> nextval = OperationImpl.create(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
-        assertEquals("nextval('myseq')", new SQLSerializer(new Configuration(SQLTemplates.DEFAULT)).handle(nextval).toString());
-        // Derby OK
-        // H2 OK
-        // HSQLDB OK
-        // MSSQL OK
-        // MySQL
-        // Oracle OK
-        // Postgres OK
-
-    }
-
-    @Test
-    public void Numeric_Operations() {
-        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
-        NumberPath<Integer> intPath2 = Expressions.numberPath(Integer.class, "intPath2");
-        SQLSerializer serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
-        serializer.handle(intPath.subtract(intPath2.add(2)));
-        assertEquals("intPath - (intPath2 + ?)", serializer.toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SerializationTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SerializationTest.java
deleted file mode 100644
index 364d836e88..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SerializationTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import java.sql.Connection;
-
-import org.easymock.EasyMock;
-import org.junit.Test;
-
-import com.mysema.query.Survey;
-import com.mysema.query.sql.dml.SQLDeleteClause;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.dml.SQLUpdateClause;
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.sql.domain.QSurvey;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.SubQueryExpression;
-import com.mysema.query.types.path.PathBuilder;
-
-public class SerializationTest {
-
-    private static final QSurvey survey = QSurvey.survey;
-
-    private final Connection connection = EasyMock.createMock(Connection.class);
-
-    @Test
-    public void InnerJoin() {
-        SQLQuery query = new SQLQuery(connection,SQLTemplates.DEFAULT);
-        query.from(new QSurvey("s1")).innerJoin(new QSurvey("s2"));
-        assertEquals("from SURVEY s1\ninner join SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void LeftJoin() {
-        SQLQuery query = new SQLQuery(connection,SQLTemplates.DEFAULT);
-        query.from(new QSurvey("s1")).leftJoin(new QSurvey("s2"));
-        assertEquals("from SURVEY s1\nleft join SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void RightJoin() {
-        SQLQuery query = new SQLQuery(connection,SQLTemplates.DEFAULT);
-        query.from(new QSurvey("s1")).rightJoin(new QSurvey("s2"));
-        assertEquals("from SURVEY s1\nright join SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void FullJoin() {
-        SQLQuery query = new SQLQuery(connection,SQLTemplates.DEFAULT);
-        query.from(new QSurvey("s1")).fullJoin(new QSurvey("s2"));
-        assertEquals("from SURVEY s1\nfull join SURVEY s2", query.toString());
-    }
-
-    @Test
-    public void Update() {
-        SQLUpdateClause updateClause = new SQLUpdateClause(connection,SQLTemplates.DEFAULT,survey);
-        updateClause.set(survey.id, 1);
-        updateClause.set(survey.name, (String)null);
-        assertEquals("update SURVEY\nset ID = ?, NAME = ?", updateClause.toString());
-    }
-
-    @Test
-    public void Update_Where() {
-        SQLUpdateClause updateClause = new SQLUpdateClause(connection,SQLTemplates.DEFAULT,survey);
-        updateClause.set(survey.id, 1);
-        updateClause.set(survey.name, (String)null);
-        updateClause.where(survey.name.eq("XXX"));
-        assertEquals("update SURVEY\nset ID = ?, NAME = ?\nwhere SURVEY.NAME = ?", updateClause.toString());
-    }
-
-    @Test
-    public void Insert() {
-        SQLInsertClause insertClause = new SQLInsertClause(connection,SQLTemplates.DEFAULT,survey);
-        insertClause.set(survey.id, 1);
-        insertClause.set(survey.name, (String)null);
-        assertEquals("insert into SURVEY (ID, NAME)\nvalues (?, ?)", insertClause.toString());
-    }
-
-    @Test
-    public void Delete_with_SubQuery_exists() {
-        QSurvey survey1 = new QSurvey("s1");
-        QEmployee employee = new QEmployee("e");
-        SQLDeleteClause delete = new SQLDeleteClause(connection, SQLTemplates.DEFAULT,survey1);
-        delete.where(survey1.name.eq("XXX"), new SQLSubQuery().from(employee).where(survey1.id.eq(employee.id)).exists());
-        assertEquals("delete from SURVEY\n" +
-                     "where SURVEY.NAME = ? and exists (select 1\n" +
-                     "from EMPLOYEE e\n" +
-                     "where SURVEY.ID = e.ID)", delete.toString());
-    }
-
-    @Test
-    public void Nextval() {
-        SubQueryExpression<?> sq = new SQLSubQuery().from(QSurvey.survey).list(SQLExpressions.nextval("myseq"));
-        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
-        serializer.serialize(sq.getMetadata(), false);
-        assertEquals("select nextval('myseq')\nfrom SURVEY SURVEY", serializer.toString());
-    }
-
-    @Test
-    public void FunctionCall() {
-        RelationalFunctionCall<String> func = RelationalFunctionCall.create(String.class, "TableValuedFunction", "parameter");
-        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
-        SQLSubQuery sq = new SQLSubQuery();
-        SubQueryExpression<?> expr = sq.from(survey)
-            .join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not())
-            .list(survey.name);
-
-        SQLSerializer serializer = new SQLSerializer(new Configuration(new SQLServerTemplates()));
-        serializer.serialize(expr.getMetadata(), false);
-        assertEquals("select SURVEY.NAME\n" +
-                "from SURVEY SURVEY\n" +
-                "join TableValuedFunction(?) as tokFunc\n" +
-                "on not SURVEY.NAME like tokFunc.prop escape '\\'", serializer.toString());
-
-    }
-
-    @Test
-    public void FunctionCall2() {
-        RelationalFunctionCall<String> func = RelationalFunctionCall.create(String.class, "TableValuedFunction", "parameter");
-        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
-        SQLQuery q = new SQLQuery(new SQLServerTemplates());
-        q.from(survey)
-            .join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not());
-
-        assertEquals("from SURVEY SURVEY\n" +
-                "join TableValuedFunction(?) as tokFunc\n" +
-                "on not SURVEY.NAME like tokFunc.prop escape '\\'", q.toString());
-    }
-
-    @Test
-    public void Union() {
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.union(new SQLSubQuery().from(survey).list(survey.all()),
-                new SQLSubQuery().from(survey).list(survey.all()));
-
-        assertEquals("(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
-            "from SURVEY SURVEY)\n" +
-            "union\n" +
-            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
-            "from SURVEY SURVEY)", q.toString());
-
-    }
-
-    @Test
-    public void Union_GroupBy() {
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.union(new SQLSubQuery().from(survey).list(survey.all()),
-                new SQLSubQuery().from(survey).list(survey.all()))
-                .groupBy(survey.id);
-
-        assertEquals("(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
-            "from SURVEY SURVEY)\n" +
-            "union\n" +
-            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
-            "from SURVEY SURVEY)\n"+
-            "group by SURVEY.ID", q.toString());
-
-    }
-
-    @Test
-    public void Union2() {
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.union(survey,
-                new SQLSubQuery().from(survey).list(survey.all()),
-                new SQLSubQuery().from(survey).list(survey.all()));
-
-        assertEquals("from ((select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n"+
-            "from SURVEY SURVEY)\n" +
-            "union\n" +
-            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
-            "from SURVEY SURVEY)) as SURVEY", q.toString());
-
-    }
-
-    @Test
-    public void With() {
-        QSurvey survey2 = new QSurvey("survey2");
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.with(survey, survey.id, survey.name).as(
-                new SQLSubQuery().from(survey2).list(survey2.id, survey2.name));
-
-        assertEquals("with SURVEY (ID, NAME) as (select survey2.ID, survey2.NAME\n" +
-            "from SURVEY survey2)\n\n" +
-            "from dual", q.toString());
-    }
-
-    @Test
-    public void With_Tuple() {
-        PathBuilder<Survey> survey = new PathBuilder<Survey>(Survey.class, "SURVEY");
-        QSurvey survey2 = new QSurvey("survey2");
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.with(survey, survey.get(survey2.id), survey.get(survey2.name)).as(
-                new SQLSubQuery().from(survey2).list(survey2.id, survey2.name));
-
-        assertEquals("with SURVEY (ID, NAME) as (select survey2.ID, survey2.NAME\n" +
-            "from SURVEY survey2)\n\n" +
-            "from dual", q.toString());
-    }
-
-    @Test
-    public void With_SingleColumn() {
-        QSurvey survey2 = new QSurvey("survey2");
-        SQLQuery q = new SQLQuery(SQLTemplates.DEFAULT);
-        q.with(survey, new Path[]{ survey.id }).as(
-                new SQLSubQuery().from(survey2).list(survey2.id));
-
-        assertEquals("with SURVEY (ID) as (select survey2.ID\n" +
-            "from SURVEY survey2)\n\n" +
-            "from dual", q.toString());
-    }
-
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplateTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/TemplateTest.java
deleted file mode 100644
index be680c7604..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplateTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Date;
-
-import org.junit.Test;
-
-import com.mysema.query.types.ConstantImpl;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.expr.DateExpression;
-import com.mysema.query.types.expr.StringExpression;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.template.DateTemplate;
-import com.mysema.query.types.template.StringTemplate;
-
-public class TemplateTest {
-
-    @Test
-    public void ToDate() {
-        StringExpression str = new StringPath("str");
-        assertEquals("to_date(str,'DD-MON-YYYY')", to_date(str, "DD-MON-YYYY").toString());
-    }
-
-    @Test
-    public void ToChar() {
-        DateExpression<Date> date = new DatePath<Date>(Date.class,"date");
-        assertEquals("to_char(date,'DD-MON-YYYY')", to_char(date, "DD-MON-YYYY").toString());
-    }
-
-    private DateExpression<Date> to_date(Expression<String> expr, String pattern) {
-        return DateTemplate.create(Date.class, "to_date({0},'{1s}')", expr, ConstantImpl.create(pattern));
-    }
-
-    private StringExpression to_char(Expression<?> expr, String pattern) {
-        return StringTemplate.create("to_char({0},'{1s}')", expr, ConstantImpl.create(pattern));
-    }
-        
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java
deleted file mode 100644
index 53c77bfef5..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import org.junit.Test;
-
-public class TemplatesTest {
-
-    @Test
-    public void test() {
-        new DerbyTemplates();
-        new H2Templates();
-        new HSQLDBTemplates();
-        new MySQLTemplates();
-        new OracleTemplates();
-        new PostgresTemplates();
-        new SQLTemplates("\"",'\\',false);
-        new SQLServerTemplates();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/TeradataTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/TeradataTemplatesTest.java
deleted file mode 100644
index e6bc3cae49..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/TeradataTemplatesTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class TeradataTemplatesTest extends AbstractSQLTemplatesTest {
-
-    @Override
-    protected SQLTemplates createTemplates() {
-        return new TeradataTemplates();
-    }
-
-    @Test
-    public void Limit() {
-        query.from(survey1).limit(5);
-        assertEquals("from SURVEY survey1 " +
-            "qualify row_number() over (order by 1) <= ?", query.toString());
-    }
-
-    @Test
-    public void Offset() {
-        query.from(survey1).offset(5);
-        assertEquals("from SURVEY survey1 " +
-            "qualify row_number() over (order by 1) > ?", query.toString());
-    }
-
-    @Test
-    public void Limit_Offset() {
-        query.from(survey1).limit(5).offset(10);
-        assertEquals("from SURVEY survey1 " +
-            "qualify row_number() over (order by 1) between ? and ?", query.toString());
-    }
-
-    @Test
-    public void OrderBy_Limit() {
-        query.from(survey1).orderBy(survey1.name.asc()).limit(5);
-        assertEquals("from SURVEY survey1 " +
-            "order by survey1.NAME asc " +
-            "qualify row_number() over (order by survey1.NAME asc) <= ?", query.toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/UnionSubQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/UnionSubQueryTest.java
deleted file mode 100644
index 07db2a5556..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/UnionSubQueryTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.SimplePath;
-
-public class UnionSubQueryTest {
-
-    private SQLTemplates templates = H2Templates.builder().newLineToSingleSpace().build();
-
-    private SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
-
-    @Test
-    public void In_Union() {
-        SimplePath<Integer> one = new SimplePath<Integer>(Integer.class,"1");
-        SimplePath<Integer> two = new SimplePath<Integer>(Integer.class,"2");
-        NumberPath<Integer> intPath = new NumberPath<Integer>(Integer.class, "intPath");
-
-        Expression<?> expr = intPath.in(sq().union(
-                sq().unique(one),
-                sq().unique(two)));
-
-        serializer.handle(expr);
-        assertEquals(
-                "intPath in ((select 1 from dual)\n" +
-        	"union\n" +
-        	"(select 2 from dual))", serializer.toString());
-    }
-
-    @Test
-    public void Union_SubQuery() {
-        SimplePath<Integer> one = new SimplePath<Integer>(Integer.class,"1");
-        SimplePath<Integer> two = new SimplePath<Integer>(Integer.class,"2");
-        SimplePath<Integer> three = new SimplePath<Integer>(Integer.class,"3");
-        SimplePath<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Expression<?> union = sq().union(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-
-        serializer.handle(union);
-        assertEquals(
-                "(select 1 as col1 from dual)\n" +
-                "union\n" +
-                "(select 2 from dual)\n" +
-                "union\n" +
-                "(select 3 from dual)", serializer.toString());
-    }
-
-    @Test
-    public void UnionAll_SubQuery() {
-        SimplePath<Integer> one = new SimplePath<Integer>(Integer.class,"1");
-        SimplePath<Integer> two = new SimplePath<Integer>(Integer.class,"2");
-        SimplePath<Integer> three = new SimplePath<Integer>(Integer.class,"3");
-        SimplePath<Integer> col1 = new SimplePath<Integer>(Integer.class,"col1");
-        Expression<?> union = sq().unionAll(
-            sq().unique(one.as(col1)),
-            sq().unique(two),
-            sq().unique(three));
-
-        serializer.handle(union);
-        assertEquals(
-                "(select 1 as col1 from dual)\n" +
-                "union all\n" +
-                "(select 2 from dual)\n" +
-                "union all\n" +
-                "(select 3 from dual)", serializer.toString());
-    }
-
-
-    protected SQLSubQuery sq() {
-        return new SQLSubQuery();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/WindowFunctionTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/WindowFunctionTest.java
deleted file mode 100644
index 20a3a124e7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/WindowFunctionTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.NumberPath;
-
-public class WindowFunctionTest {
-
-    private static String toString(Expression<?> e) {
-        return new SQLSerializer(Configuration.DEFAULT).handle(e).toString();
-    }
-
-    @Test
-    public void Complex() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-        Expression<?> wf = SQLExpressions.sum(path).over().partitionBy(path2).orderBy(path);
-        assertEquals("sum(path) over (partition by path2 order by path)", toString(wf));
-    }
-
-    @Test
-    public void All() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-        assertEquals("avg(path)", toString(SQLExpressions.avg(path)));
-        assertEquals("count(path)", toString(SQLExpressions.count(path)));
-        assertEquals("corr(path,path2)", toString(SQLExpressions.corr(path, path2)));
-        assertEquals("covar_pop(path,path2)", toString(SQLExpressions.covarPop(path, path2)));
-        assertEquals("covar_samp(path,path2)", toString(SQLExpressions.covarSamp(path, path2)));
-        assertEquals("cume_dist()", toString(SQLExpressions.cumeDist()));
-        assertEquals("dense_rank()", toString(SQLExpressions.denseRank()));
-        assertEquals("first_value(path)", toString(SQLExpressions.firstValue(path)));
-        assertEquals("lag(path)", toString(SQLExpressions.lag(path)));
-        assertEquals("last_value(path)", toString(SQLExpressions.lastValue(path)));
-        assertEquals("lead(path)", toString(SQLExpressions.lead(path)));
-        assertEquals("max(path)", toString(SQLExpressions.max(path)));
-        assertEquals("min(path)", toString(SQLExpressions.min(path)));
-        assertEquals("nth_value(path, ?)", toString(SQLExpressions.nthValue(path, 3)));
-        assertEquals("ntile(?)", toString(SQLExpressions.ntile(4)));
-        assertEquals("percent_rank()", toString(SQLExpressions.percentRank()));
-        assertEquals("rank()", toString(SQLExpressions.rank()));
-        assertEquals("ratio_to_report(path)", toString(SQLExpressions.ratioToReport(path)));
-        assertEquals("row_number()", toString(SQLExpressions.rowNumber()));
-        assertEquals("stddev(path)", toString(SQLExpressions.stddev(path)));
-        assertEquals("stddev(distinct path)", toString(SQLExpressions.stddevDistinct(path)));
-        assertEquals("stddev_pop(path)", toString(SQLExpressions.stddevPop(path)));
-        assertEquals("stddev_samp(path)", toString(SQLExpressions.stddevSamp(path)));
-        assertEquals("sum(path)", toString(SQLExpressions.sum(path)));
-        assertEquals("variance(path)", toString(SQLExpressions.variance(path)));
-        assertEquals("var_pop(path)", toString(SQLExpressions.varPop(path)));
-        assertEquals("var_samp(path)", toString(SQLExpressions.varSamp(path)));
-
-        // TODO FIRST
-        // TODO LAST
-        // TODO NTH_VALUE ... FROM (FIRST|LAST) (RESPECT|IGNORE) NULLS
-    }
-
-    @Test
-    public void Regr() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-        assertEquals("regr_slope(path, path2)", toString(SQLExpressions.regrSlope(path, path2)));
-        assertEquals("regr_intercept(path, path2)", toString(SQLExpressions.regrIntercept(path, path2)));
-        assertEquals("regr_count(path, path2)", toString(SQLExpressions.regrCount(path, path2)));
-        assertEquals("regr_r2(path, path2)", toString(SQLExpressions.regrR2(path, path2)));
-        assertEquals("regr_avgx(path, path2)", toString(SQLExpressions.regrAvgx(path, path2)));
-        assertEquals("regr_avgy(path, path2)", toString(SQLExpressions.regrAvgy(path, path2)));
-        assertEquals("regr_sxx(path, path2)", toString(SQLExpressions.regrSxx(path, path2)));
-        assertEquals("regr_syy(path, path2)", toString(SQLExpressions.regrSyy(path, path2)));
-        assertEquals("regr_sxy(path, path2)", toString(SQLExpressions.regrSxy(path, path2)));
-    }
-
-    @Test
-    public void Rows_Between() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
-        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
-
-        assertEquals("sum(path) over (order by path rows between current row and unbounded following)",
-                toString(wf.rows().between().currentRow().unboundedFollowing()));
-        assertEquals("sum(path) over (order by path rows between preceding intPath and following intPath)",
-                toString(wf.rows().between().preceding(intPath).following(intPath)));
-        assertEquals("sum(path) over (order by path rows between preceding ? and following ?)",
-                toString(wf.rows().between().preceding(1).following(3)));
-    }
-
-    @Test
-    public void Rows_UnboundedPreceding() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
-
-        assertEquals("sum(path) over (order by path rows unbounded preceding)",
-                toString(wf.rows().unboundedPreceding()));
-    }
-
-    @Test
-    public void Rows_CurrentRow() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
-
-        assertEquals("sum(path) over (order by path rows current row)",
-                toString(wf.rows().currentRow()));
-    }
-
-    @Test
-    public void Rows_PrecedingRow() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
-        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
-
-        assertEquals("sum(path) over (order by path rows preceding intPath)",
-                toString(wf.rows().preceding(intPath)));
-        assertEquals("sum(path) over (order by path rows preceding ?)",
-                toString(wf.rows().preceding(3)));
-    }
-
-    @Test
-    public void Keep_First() {
-        //MIN(salary) KEEP (DENSE_RANK FIRST ORDER BY commission_pct) OVER (PARTITION BY department_id)
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-        NumberPath<Long> path3 = Expressions.numberPath(Long.class, "path3");
-        assertEquals(
-                "min(path) keep (dense_rank first order by path2)",
-                toString(SQLExpressions.min(path).keepFirst().orderBy(path2)));
-        assertEquals(
-                "min(path) keep (dense_rank first order by path2) over (partition by path3)",
-                toString(SQLExpressions.min(path).keepFirst().orderBy(path2).over().partitionBy(path3)));
-    }
-
-    @Test
-    public void Keep_Last() {
-        //MIN(salary) KEEP (DENSE_RANK FIRST ORDER BY commission_pct) OVER (PARTITION BY department_id)
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-        NumberPath<Long> path3 = Expressions.numberPath(Long.class, "path3");
-        assertEquals(
-                "min(path) keep (dense_rank last order by path2) over (partition by path3)",
-                toString(SQLExpressions.min(path).keepLast().orderBy(path2).over().partitionBy(path3)));
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/WithinGroupTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/WithinGroupTest.java
deleted file mode 100644
index bf4451134e..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/WithinGroupTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mysema.query.sql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.support.Expressions;
-import com.mysema.query.types.Expression;
-import com.mysema.query.types.path.NumberPath;
-
-public class WithinGroupTest {
-
-    private static String toString(Expression<?> e) {
-        return new SQLSerializer(Configuration.DEFAULT).handle(e).toString();
-    }
-
-    @Test
-    public void All() {
-        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
-        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
-
-        assertEquals("cume_dist(path)", toString(SQLExpressions.cumeDist(path)));
-        assertEquals("cume_dist(path, path2)", toString(SQLExpressions.cumeDist(path, path2)));
-        assertEquals("dense_rank(path, path2)", toString(SQLExpressions.denseRank(path, path2)));
-        assertEquals("listagg(path,',')", toString(SQLExpressions.listagg(path, ",")));
-        assertEquals("percent_rank(path, path2)", toString(SQLExpressions.percentRank(path, path2)));
-        assertEquals("percentile_cont(path)", toString(SQLExpressions.percentileCont(path)));
-        assertEquals("percentile_disc(path)", toString(SQLExpressions.percentileDisc(path)));
-        assertEquals("rank(path, path2)", toString(SQLExpressions.rank(path, path2)));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/DefaultMapperTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/dml/DefaultMapperTest.java
deleted file mode 100644
index bd84d0af63..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/DefaultMapperTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mysema.query.sql.dml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.types.Path;
-
-public class DefaultMapperTest extends AbstractMapperTest {
-    
-    private static final QEmployee emp = QEmployee.employee;
-    
-    @Test
-    public void Extract() {        
-        Map<Path<?>, Object> values = DefaultMapper.DEFAULT.createMap(emp, employee);        
-        assertEquals(employee.getDatefield(), values.get(emp.datefield));
-        assertEquals(employee.getFirstname(), values.get(emp.firstname));
-        assertEquals(employee.getLastname(), values.get(emp.lastname));
-        assertEquals(employee.getSalary(), values.get(emp.salary));
-        assertEquals(employee.getSuperiorId(), values.get(emp.superiorId));
-        assertEquals(employee.getTimefield(), values.get(emp.timefield));
-    }
-    
-    @Test
-    public void Extract2() {
-        Map<Path<?>, Object> values = DefaultMapper.DEFAULT.createMap(emp, new EmployeeX());
-        assertTrue(values.isEmpty());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLDeleteClauseTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLDeleteClauseTest.java
deleted file mode 100644
index fa0b1e1a54..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLDeleteClauseTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.sql.dml;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.sql.KeyAccessorsTest.QEmployee;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLTemplates;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class SQLDeleteClauseTest {
-
-    @Test(expected=IllegalArgumentException.class)
-    public void Error() {
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
-        delete.where(emp2.id.eq(1));
-    }
-
-    @Test
-    public void GetSQL() {
-        QEmployee emp1 = new QEmployee("emp1");
-        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
-        delete.where(emp1.id.eq(1));
-
-        SQLBindings sql = delete.getSQL().get(0);
-        assertEquals("delete from EMPLOYEE\nwhere EMPLOYEE.ID = ?", sql.getSQL());
-        assertEquals(ImmutableList.of(1), sql.getBindings());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLInsertClauseTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLInsertClauseTest.java
deleted file mode 100644
index 0c99b71b8b..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLInsertClauseTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mysema.query.sql.dml;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.sql.KeyAccessorsTest.QEmployee;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLTemplates;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class SQLInsertClauseTest {
-
-    @Test
-    public void GetSQL() {
-        QEmployee emp1 = new QEmployee("emp1");
-        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
-        insert.set(emp1.id, 1);
-
-        SQLBindings sql = insert.getSQL().get(0);
-        assertEquals("insert into EMPLOYEE (ID)\nvalues (?)", sql.getSQL());
-        assertEquals(ImmutableList.of(1), sql.getBindings());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLUpdateClauseTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLUpdateClauseTest.java
deleted file mode 100644
index a1b8f338d6..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/SQLUpdateClauseTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.mysema.query.sql.dml;
-
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.sql.KeyAccessorsTest.QEmployee;
-import com.mysema.query.sql.SQLBindings;
-import com.mysema.query.sql.SQLSubQuery;
-import com.mysema.query.sql.SQLTemplates;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class SQLUpdateClauseTest {
-
-    @Test
-    public void GetSQL() {
-        QEmployee emp1 = new QEmployee("emp1");
-        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
-        update.set(emp1.id, 1);
-
-        SQLBindings sql = update.getSQL().get(0);
-        assertEquals("update EMPLOYEE\nset ID = ?", sql.getSQL());
-        assertEquals(ImmutableList.of(1), sql.getBindings());
-    }
-
-    @Test
-    public void Intertable() {
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
-        update.set(emp1.id, 1)
-              .where(emp1.id.eq(new SQLSubQuery().from(emp2)
-                      .where(emp2.superiorId.isNotNull())
-                      .unique(emp2.id)));
-
-        SQLBindings sql = update.getSQL().get(0);
-        assertEquals("update EMPLOYEE\n" +
-                "set ID = ?\n" +
-                "where EMPLOYEE.ID = (select emp2.ID\n" +
-                "from EMPLOYEE emp2\n" +
-                "where emp2.SUPERIOR_ID is not null)", sql.getSQL());
-    }
-
-    @Test
-    public void Intertable2() {
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
-        update.set(emp1.id, new SQLSubQuery().from(emp2)
-              .where(emp2.superiorId.isNotNull())
-              .unique(emp2.id));
-
-        SQLBindings sql = update.getSQL().get(0);
-        assertEquals("update EMPLOYEE\n" +
-                "set ID = (select emp2.ID\n" +
-                "from EMPLOYEE emp2\n" +
-                "where emp2.SUPERIOR_ID is not null)", sql.getSQL());
-    }
-
-    @Test
-    public void Intertable3() {
-        QEmployee emp1 = new QEmployee("emp1");
-        QEmployee emp2 = new QEmployee("emp2");
-        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
-        update.set(emp1.superiorId, new SQLSubQuery().from(emp2)
-                .where(emp2.id.eq(emp1.id))
-                .unique(emp2.id));
-
-        SQLBindings sql = update.getSQL().get(0);
-        assertEquals("update EMPLOYEE\n" +
-                "set SUPERIOR_ID = (select emp2.ID\n" +
-                "from EMPLOYEE emp2\n" +
-                "where emp2.ID = EMPLOYEE.ID)", sql.getSQL());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/Employee.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/Employee.java
deleted file mode 100644
index 6d1d3d0541..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/Employee.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.domain;
-
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Time;
-
-//@Schema("PUBLIC")
-//@Table("EMPLOYEE")
-public class Employee {
-
-    //@Column("ID")
-    private Integer id;
-    
-    //@Column("FIRSTNAME")
-    private String firstname;
-    
-    //@Column("LASTNAME")
-    private String lastname;
-    
-    //@Column("SALARY")
-    private BigDecimal salary;
-    
-    //@Column("DATEFIELD")
-    private Date datefield;
-    
-    //@Column("TIMEFIELD")
-    private Time timefield;
-    
-    //@Column("SUPERIOR_ID")
-    private Integer superiorId;
-
-    public Employee() {}
-    
-    public Employee(int id) {
-        this.id = id;
-    }
-    
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getFirstname() {
-        return firstname;
-    }
-
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
-
-    public String getLastname() {
-        return lastname;
-    }
-
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
-
-    public BigDecimal getSalary() {
-        return salary;
-    }
-
-    public void setSalary(BigDecimal salary) {
-        this.salary = salary;
-    }
-
-    public Date getDatefield() {
-        return new Date(datefield.getTime());
-    }
-
-    public void setDatefield(Date datefield) {
-        this.datefield = new Date(datefield.getTime());
-    }
-
-    public Time getTimefield() {
-        return timefield;
-    }
-
-    public void setTimefield(Time timefield) {
-        this.timefield = timefield;
-    }
-
-    public Integer getSuperiorId() {
-        return superiorId;
-    }
-
-    public void setSuperiorId(Integer superiorId) {
-        this.superiorId = superiorId;
-    }
-    
-    
-    
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QDateTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QDateTest.java
deleted file mode 100644
index c87832d2f0..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QDateTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mysema.query.sql.domain;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.DatePath;
-
-import java.sql.Date;
-
-public class QDateTest extends RelationalPathBase<QDateTest> {
-
-    private static final long serialVersionUID = 1394463749655231079L;
-
-    public static final QDateTest qDateTest = new QDateTest("DATE_TEST");
-
-    public final DatePath<Date> dateTest = createDate("dateTest", java.sql.Date.class);
-
-    public QDateTest(String path) {
-        super(QDateTest.class, PathMetadataFactory.forVariable(path), "PUBLIC", "DATE_TEST");
-        addMetadata();
-    }
-
-    public QDateTest(PathMetadata<?> metadata) {
-        super(QDateTest.class, metadata, "PUBLIC", "DATE_TEST");
-        addMetadata();
-    }
-
-    protected void addMetadata() {
-        addMetadata(dateTest, ColumnMetadata.named("DATE_TEST"));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployee.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployee.java
deleted file mode 100644
index f95a42ffd1..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployee.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.domain;
-
-import java.math.BigDecimal;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
-
-//@Schema("PUBLIC")
-//@Table("EMPLOYEE")
-public class QEmployee extends RelationalPathBase<Employee> {
-
-    private static final long serialVersionUID = 1394463749655231079L;
-
-    public static final QEmployee employee = new QEmployee("EMPLOYEE");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final StringPath firstname = createString("firstname");
-
-    public final StringPath lastname = createString("lastname");
-
-    public final NumberPath<BigDecimal> salary = createNumber("salary", BigDecimal.class);
-
-    public final DatePath<java.sql.Date> datefield = createDate("datefield", java.sql.Date.class);
-
-    public final TimePath<java.sql.Time> timefield = createTime("timefield", java.sql.Time.class);
-
-    public final NumberPath<Integer> superiorId = createNumber("superiorId", Integer.class);
-
-    public final PrimaryKey<Employee> idKey = createPrimaryKey(id);
-
-    public final ForeignKey<Employee> superiorIdKey = createForeignKey(superiorId, "ID");
-
-    public final ForeignKey<Employee> _superiorIdKey = createInvForeignKey(id, "SUPERIOR_ID");
-
-    public QEmployee(String path) {
-        super(Employee.class, PathMetadataFactory.forVariable(path), "PUBLIC", "EMPLOYEE");
-        addMetadata();
-    }
-
-    public QEmployee(PathMetadata<?> metadata) {
-        super(Employee.class, metadata, "PUBLIC", "EMPLOYEE");
-        addMetadata();
-    }
-
-    protected void addMetadata() {
-        addMetadata(id, ColumnMetadata.named("ID"));
-        addMetadata(firstname, ColumnMetadata.named("FIRSTNAME"));
-        addMetadata(lastname, ColumnMetadata.named("LASTNAME"));
-        addMetadata(salary, ColumnMetadata.named("SALARY"));
-        addMetadata(datefield, ColumnMetadata.named("DATEFIELD"));
-        addMetadata(timefield, ColumnMetadata.named("TIMEFIELD"));
-        addMetadata(superiorId, ColumnMetadata.named("SUPERIOR_ID"));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QIdName.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QIdName.java
deleted file mode 100644
index 461940ec67..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QIdName.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.domain;
-
-import com.mysema.query.types.ConstructorExpression;
-import com.mysema.query.types.Expression;
-
-public class QIdName extends ConstructorExpression<IdName> {
-
-    private static final long serialVersionUID = 5770565824515003611L;
-
-    public QIdName(Expression<java.lang.Integer> id, Expression<java.lang.String> name) {
-        super(IdName.class, new Class[]{int.class, String.class}, id, name);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurvey.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurvey.java
deleted file mode 100644
index f6291f70eb..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurvey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.domain;
-
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.PrimaryKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-
-//@Schema("PUBLIC")
-//@Table("SURVEY")
-public class QSurvey extends RelationalPathBase<QSurvey>{
-
-    private static final long serialVersionUID = -7427577079709192842L;
-
-    public static final QSurvey survey = new QSurvey("SURVEY");
-
-    public final StringPath name = createString("name");
-
-    public final StringPath name2 = createString("name2");
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final PrimaryKey<QSurvey> idKey = createPrimaryKey(id);
-
-    public QSurvey(String path) {
-        super(QSurvey.class, PathMetadataFactory.forVariable(path), "PUBLIC", "SURVEY");
-        addMetadata();
-    }
-
-    public QSurvey(PathMetadata<?> metadata) {
-        super(QSurvey.class, metadata, "PUBLIC", "SURVEY");
-        addMetadata();
-    }
-
-    protected void addMetadata() {
-        addMetadata(name, ColumnMetadata.named("NAME"));
-        addMetadata(name2, ColumnMetadata.named("NAME2"));
-        addMetadata(id, ColumnMetadata.named("ID"));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QTest_.java b/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QTest_.java
deleted file mode 100644
index dd88b0770d..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QTest_.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.domain;
-
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.EntityPathBase;
-import com.mysema.query.types.path.StringPath;
-
-//@Table("TEST")
-public class QTest_ extends EntityPathBase<Object> {
-
-    private static final long serialVersionUID = -8421112749591552595L;
-
-    public final StringPath name = createString("NAME");
-
-    public QTest_(String path) {
-        super(Object.class, PathMetadataFactory.forVariable(path));
-    }
-
-    public QTest_(PathMetadata<?> metadata) {
-        super(Object.class, metadata);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/h2/H2QueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/h2/H2QueryTest.java
deleted file mode 100644
index 6c8b72e344..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/h2/H2QueryTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mysema.query.sql.h2;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class H2QueryTest {
-    
-    private SQLQuery query;
-    
-    private QSurvey survey = new QSurvey("survey");
-    
-    @Before
-    public void setUp() {
-        query = new SQLQuery(null, new H2Templates() {{
-            newLineToSingleSpace();
-        }});
-    }
-    
-    @Test
-    public void Syntax() {
-//        SELECT TOP? [DISTINCT | All]? selectExpression
-//        FROM tableExpression+
-        query.from(survey);
-//        WHERE expression+
-        query.where(survey.name.isNotNull());
-//        GROUP BY expression+
-        query.groupBy(survey.name);
-//        HAVING expression
-        query.having(survey.name.lt(""));
-//        [
-//          UNION ALL?  select ORDER BY order
-//          MINUS
-//          EXCEPT
-//          INTERSECT
-//        ]
-//        LIMIT expression 
-        query.limit(2);
-//        OFFSET expression
-        query.offset(3);
-//        SAMPLE_SIZE rowCountInt
-        // TODO
-//        FOR UPDATE
-        query.forUpdate();
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/hsqldb/HsqldbQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/hsqldb/HsqldbQueryTest.java
deleted file mode 100644
index df329d1635..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/hsqldb/HsqldbQueryTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mysema.query.sql.hsqldb;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.SQLQuery;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class HsqldbQueryTest {
-    
-    private SQLQuery query;
-    
-    private QSurvey survey = new QSurvey("survey");
-    
-    @Before
-    public void setUp() {
-        query = new SQLQuery(null, new H2Templates() {{
-            newLineToSingleSpace();
-        }});
-    }
-    
-    @Test
-    public void Syntax() {
-//        SELECT [{LIMIT <offset> <limit> | TOP <limit>}[2]][ALL | DISTINCT]
-//        { selectExpression | table.* | * } [, ...]
-//        [INTO [CACHED | TEMP  | TEXT][2] newTable]
-//        FROM tableList
-        query.from(survey);
-//        [WHERE Expression]
-        query.where(survey.id.isNotNull());
-//        [GROUP BY Expression [, ...]]
-        query.groupBy(survey.name);
-//        [HAVING Expression]
-        query.having(survey.id.isNotNull());
-//        [{ UNION [ALL | DISTINCT] | {MINUS [DISTINCT] | EXCEPT [DISTINCT] } |
-        // TODO MINUS
-        // TODO EXCEPT
-//        INTERSECT [DISTINCT] } selectStatement]
-        // TODO INTERSECT
-//        [ORDER BY orderExpression [, ...]]
-        query.orderBy(survey.name.asc());
-//        [LIMIT <limit> [OFFSET <offset>]];
-        query.limit(4);
-        query.offset(4);
-        
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerQueryTest.java
deleted file mode 100644
index 3da89598e7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerQueryTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLServerTemplates;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class SQLServerQueryTest {
-
-    private static final QSurvey survey = QSurvey.survey;
-    
-    @Test
-    public void TableHints_Single() {        
-        SQLServerQuery query = new SQLServerQuery(null, new SQLServerTemplates());
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT)\nwhere SURVEY.NAME is null", query.toString());
-    }
-    
-    @Test
-    public void TableHints_Multiple() {
-        SQLServerQuery query = new SQLServerQuery(null, new SQLServerTemplates());
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT, SQLServerTableHints.NOLOCK).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT, NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
-    }
-    
-    @Test
-    public void TableHints_Multiple2() {
-        QSurvey survey2 = new QSurvey("survey2");
-        SQLServerQuery query = new SQLServerQuery(null, new SQLServerTemplates());
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT)
-             .from(survey2).tableHints(SQLServerTableHints.NOLOCK)
-             .where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT), SURVEY survey2 with (NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerSubQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerSubQueryTest.java
deleted file mode 100644
index 8c27c85b6f..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/SQLServerSubQueryTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.domain.QSurvey;
-
-public class SQLServerSubQueryTest {
-
-    private static final QSurvey survey = QSurvey.survey;
-    
-    @Test
-    public void TableHints_Single() {        
-        SQLServerSubQuery query = new SQLServerSubQuery();
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT)\nwhere SURVEY.NAME is null", query.toString());
-    }
-    
-    @Test
-    public void TableHints_Multiple() {
-        SQLServerSubQuery query = new SQLServerSubQuery();
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT, SQLServerTableHints.NOLOCK).where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT, NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
-    }
-    
-    @Test
-    public void TableHints_Multiple2() {
-        QSurvey survey2 = new QSurvey("survey2");
-        SQLServerSubQuery query = new SQLServerSubQuery();
-        query.from(survey).tableHints(SQLServerTableHints.NOWAIT)
-             .from(survey2).tableHints(SQLServerTableHints.NOLOCK)
-             .where(survey.name.isNull());
-        assertEquals("from SURVEY SURVEY with (NOWAIT), SURVEY survey2 with (NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/WindowFunctionTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/WindowFunctionTest.java
deleted file mode 100644
index e0716f4d38..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mssql/WindowFunctionTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mssql;
-
-import static com.mysema.query.Constants.employee;
-import static com.mysema.query.sql.SQLExpressions.rowNumber;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLSerializer;
-import com.mysema.query.sql.WindowFunction;
-import com.mysema.query.types.Expression;
-
-public class WindowFunctionTest {
-
-    private static String toString(Expression<?> e) {
-        return new SQLSerializer(Configuration.DEFAULT).handle(e).toString();
-    }
-
-//    ROW_NUMBER() OVER (ORDER BY OrderDate) AS 'RowNumber'
-
-//    ROW_NUMBER() OVER (PARTITION BY PostalCode ORDER BY SalesYTD DESC)
-
-    @Test
-    public void Mutable() {
-        WindowFunction<Long> rn = rowNumber().over().orderBy(employee.firstname);
-        assertEquals("row_number() over (order by e.FIRSTNAME)", toString(rn));
-        assertEquals("row_number() over (order by e.FIRSTNAME, e.LASTNAME)", toString(rn.orderBy(employee.lastname)));
-    }
-
-    @Test
-    public void OrderBy() {
-        assertEquals("row_number() over (order by e.FIRSTNAME)",
-            toString(rowNumber().over().orderBy(employee.firstname.asc())));
-
-        assertEquals("row_number() over (order by e.FIRSTNAME)",
-            toString(rowNumber().over().orderBy(employee.firstname)));
-
-        assertEquals("row_number() over (order by e.FIRSTNAME) as rn",
-            toString(rowNumber().over().orderBy(employee.firstname.asc()).as("rn")));
-
-        assertEquals("row_number() over (order by e.FIRSTNAME desc)",
-            toString(rowNumber().over().orderBy(employee.firstname.desc())));
-    }
-
-    @Test
-    public void PartitionBy() {
-        assertEquals("row_number() over (partition by e.LASTNAME order by e.FIRSTNAME)",
-            toString(rowNumber().over().partitionBy(employee.lastname).orderBy(employee.firstname.asc())));
-
-        assertEquals("row_number() over (partition by e.LASTNAME, e.FIRSTNAME order by e.FIRSTNAME)",
-            toString(rowNumber().over().partitionBy(employee.lastname, employee.firstname).orderBy(employee.firstname.asc())));
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryFactoryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryFactoryTest.java
deleted file mode 100644
index b23d0a0c99..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryFactoryTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.mysql;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class MySQLQueryFactoryTest {
-
-    private MySQLQueryFactory queryFactory;
-    
-    @Before
-    public void setUp() {
-        Provider<Connection> provider = new Provider<Connection>() {
-            @Override
-            public Connection get() {
-                return EasyMock.createNiceMock(Connection.class);
-            }
-        };
-        queryFactory = new MySQLQueryFactory(SQLTemplates.DEFAULT, provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void SubQuery_From() {
-        assertNotNull(queryFactory.subQuery(QSurvey.survey));
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QSurvey.survey));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QSurvey.survey));
-    }
-
-    @Test
-    public void Insert() {
-        assertNotNull(queryFactory.insert(QSurvey.survey));
-    }
-
-    @Test
-    public void InsertIgnore() {
-        SQLInsertClause clause = queryFactory.insertIgnore(QSurvey.survey);
-        assertEquals("insert ignore into SURVEY\nvalues ()", clause.toString());
-    }
-
-    @Test
-    public void InsertOnDuplicateKeyUpdate() {
-        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey, "c = c+1");
-        assertEquals("insert into SURVEY\nvalues () on duplicate key update c = c+1", clause.toString());
-    }
-    
-    @Test
-    public void InsertOnDuplicateKeyUpdate2() {
-        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey, QSurvey.survey.id.eq(2));
-        assertEquals("insert into SURVEY\nvalues () on duplicate key update SURVEY.ID = ?", clause.toString());
-    }    
-    
-    @Test
-    public void Replace() {
-        assertNotNull(queryFactory.replace(QSurvey.survey));
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QSurvey.survey));
-    }
-
-    @Test
-    public void Merge() {
-        assertNotNull(queryFactory.merge(QSurvey.survey));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryFactoryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryFactoryTest.java
deleted file mode 100644
index a6ba299b35..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryFactoryTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.oracle;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class OracleQueryFactoryTest {
-
-    private OracleQueryFactory queryFactory;
-
-    @Before
-    public void setUp() {
-        Provider<Connection> provider = new Provider<Connection>() {
-            @Override
-            public Connection get() {
-                return EasyMock.createNiceMock(Connection.class);
-            }
-        };
-        queryFactory = new OracleQueryFactory(SQLTemplates.DEFAULT, provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void SubQuery_From() {
-        assertNotNull(queryFactory.subQuery(QSurvey.survey));
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QSurvey.survey));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QSurvey.survey));
-    }
-
-    @Test
-    public void Insert() {
-        assertNotNull(queryFactory.insert(QSurvey.survey));
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QSurvey.survey));
-    }
-
-    @Test
-    public void Merge() {
-        assertNotNull(queryFactory.merge(QSurvey.survey));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryFactoryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryFactoryTest.java
deleted file mode 100644
index 1413952022..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryFactoryTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.postgres;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-
-import javax.inject.Provider;
-
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class PostgresQueryFactoryTest {
-
-    private PostgresQueryFactory queryFactory;
-
-    @Before
-    public void setUp() {
-        Provider<Connection> provider = new Provider<Connection>() {
-            @Override
-            public Connection get() {
-                return EasyMock.createNiceMock(Connection.class);
-            }
-        };
-        queryFactory = new PostgresQueryFactory(SQLTemplates.DEFAULT, provider);
-    }
-
-    @Test
-    public void Query() {
-        assertNotNull(queryFactory.query());
-    }
-
-    @Test
-    public void SubQuery() {
-        assertNotNull(queryFactory.subQuery());
-    }
-
-    @Test
-    public void SubQuery_From() {
-        assertNotNull(queryFactory.subQuery(QSurvey.survey));
-    }
-
-    @Test
-    public void From() {
-        assertNotNull(queryFactory.from(QSurvey.survey));
-    }
-
-    @Test
-    public void Delete() {
-        assertNotNull(queryFactory.delete(QSurvey.survey));
-    }
-
-    @Test
-    public void Insert() {
-        assertNotNull(queryFactory.insert(QSurvey.survey));
-    }
-
-    @Test
-    public void Update() {
-        assertNotNull(queryFactory.update(QSurvey.survey));
-    }
-
-    @Test
-    public void Merge() {
-        assertNotNull(queryFactory.merge(QSurvey.survey));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryTest.java
deleted file mode 100644
index b2df7024a2..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresQueryTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.mysema.query.sql.postgres;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.domain.QSurvey;
-
-public class PostgresQueryTest {
-    
-    private PostgresQuery query;
-    
-    private QSurvey survey = new QSurvey("survey");
-    
-    @Before
-    public void setUp() {
-        query = new PostgresQuery(null, new PostgresTemplates() {{
-            newLineToSingleSpace();
-        }});        
-    }
-    
-    @Test
-    public void Syntax() {
-//        [ WITH [ RECURSIVE ] with_query [, ...] ]
-//        SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]
-//            * | expression [ [ AS ] output_name ] [, ...]
-//            [ FROM from_item [, ...] ]
-        query.from(survey);
-//            [ WHERE condition ]
-        query.where(survey.name.isNull());
-//            [ GROUP BY expression [, ...] ]
-        query.groupBy(survey.name);
-//            [ HAVING condition [, ...] ]
-        query.having(survey.id.isNotNull());
-//            [ WINDOW window_name AS ( window_definition ) [, ...] ]
-        // TODO
-//            [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]
-        // TODO INTERSECT
-        // TODO EXCEPT
-//            [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]
-        query.orderBy(survey.name.asc());
-//            [ LIMIT { count | ALL } ]
-        query.limit(4);
-//            [ OFFSET start [ ROW | ROWS ] ]
-        query.offset(4);
-//            [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]
-//            [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]
-        query.forUpdate();
-        query.forShare();
-        query.noWait();
-        
-        query.forUpdate().of(survey);
-        
-//        where from_item can be one of:
-//
-//            [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-//            ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]
-//            with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
-//            function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias [, ...] | column_definition [, ...] ) ]
-//            function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )
-//            from_item [ NATURAL ] join_type from_item [ ON join_condition | USING ( join_column [, ...] ) ]
-//
-//        and with_query is:
-//
-//            with_query_name [ ( column_name [, ...] ) ] AS ( select )
-//
-//        TABLE { [ ONLY ] table_name [ * ] | with_query_name }
-    }
-    
-    @Test
-    public void ForShare() {
-        query.from(survey).forShare();
-        assertEquals("from SURVEY survey for share", toString(query));
-    }
-    
-    @Test
-    public void ForUpDate_NoWait() {
-        query.from(survey).forUpdate().noWait();
-        assertEquals("from SURVEY survey for update nowait", toString(query));
-    }
-    
-    @Test
-    public void ForUpdate_Of() {
-        query.from(survey).forUpdate().of(survey);
-        assertEquals("from SURVEY survey for update of SURVEY", toString(query));
-    }
-    
-    private String toString(PostgresQuery query) {
-        return query.toString().replace('\n', ' ');
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresTypesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresTypesTest.java
deleted file mode 100644
index 93c1535bc1..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/postgres/PostgresTypesTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.mysema.query.sql.postgres;
-
-import java.lang.reflect.Field;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.mysema.testutil.ExternalDB;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.Connections;
-import com.mysema.query.sql.JDBCTypeMapping;
-import com.mysema.query.sql.PostgresTemplates;
-import com.mysema.query.sql.SQLTemplates;
-import org.junit.experimental.categories.Category;
-
-@Category(ExternalDB.class)
-public class PostgresTypesTest {
-    
-    @Before
-    public void setUp() throws SQLException, ClassNotFoundException {
-        Connections.initPostgres();
-    }
-    
-    @After
-    public void tearDown() throws SQLException {
-        Connections.close();
-    }
-    
-    @Test
-    public void test() throws SQLException, IllegalArgumentException, IllegalAccessException {
-        SQLTemplates templates = new PostgresTemplates();
-        Connections.dropTable(templates, "type_tests");
-        Statement stmt = Connections.getStatement();
-        stmt.execute("create table type_tests (" +
-                "_numeric_1 numeric(1), " +
-                "_numeric_2 numeric(2), " +
-                "_numeric_3 numeric(3), " +
-                "_numeric_4 numeric(3), " +
-                "_smallint smallint, " + 
-                "_integer integer, " +
-                "_bigint bigint, " +
-                "_decimal decimal, " +
-                "_numeric numeric, " +
-                "_real real, " +
-                "_double_precision double precision, " +
-                "_serial serial, " +
-                "_bigserial bigserial)");
-        
-        Map<Integer, String> types = new HashMap<Integer, String>();
-        for (Field field : java.sql.Types.class.getFields()) {
-            types.put((Integer)field.get(null), field.getName());
-        }
-        
-        JDBCTypeMapping jdbcTypeMapping = new JDBCTypeMapping();
-        
-        DatabaseMetaData metadata = Connections.getConnection().getMetaData();
-        ResultSet rs = metadata.getColumns(null, null, "type_tests", null);
-        try {
-            while (rs.next()) {
-                System.out.println(rs.getString("COLUMN_NAME"));
-                System.out.println(types.get(rs.getInt("DATA_TYPE")));
-                System.out.println(rs.getInt("COLUMN_SIZE"));
-                System.out.println(rs.getInt("DECIMAL_DIGITS"));
-                System.out.println(jdbcTypeMapping.get(
-                        rs.getInt("DATA_TYPE"), 
-                        rs.getInt("COLUMN_SIZE"), 
-                        rs.getInt("DECIMAL_DIGITS")));
-                System.out.println();
-            }
-        } finally {
-            rs.close();
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/AbstractConverterTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/AbstractConverterTest.java
deleted file mode 100644
index ffbb121057..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/AbstractConverterTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.mysema.query.sql.spatial;
-
-import java.util.List;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.LineString;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPoint;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Point;
-import org.geolatte.geom.PointSequence;
-import org.geolatte.geom.PointSequenceBuilder;
-import org.geolatte.geom.PointSequenceBuilders;
-import org.geolatte.geom.Points;
-import org.geolatte.geom.Polygon;
-import org.geolatte.geom.codec.Wkt;
-import org.geolatte.geom.crs.CrsId;
-
-import com.google.common.collect.Lists;
-import com.mysema.query.Connections;
-
-public abstract class AbstractConverterTest {
-
-    protected PointSequence createSequence(Point... points) {
-        PointSequenceBuilder builder = PointSequenceBuilders.fixedSized(points.length, points[0].getDimensionalFlag());
-        for (Point point : points) {
-            builder.add(point);
-        }
-        return builder.toPointSequence();
-    }
-
-    protected List<Geometry> getGeometries() {
-        CrsId crs = CrsId.valueOf(1);
-        List<Geometry> data = Lists.newArrayList();
-        // points
-//        data.add(Points.createEmpty());
-        data.add(Points.create(1, 2));
-        data.add(Points.create(1, 2, crs));
-        data.add(Points.create3D(1, 2, 3));
-        data.add(Points.create3D(1, 2, 3, crs));
-        data.add(Points.createMeasured(1, 2, 3));
-        data.add(Points.createMeasured(1, 2, 3, crs));
-
-        // linestring
-        data.add(LineString.createEmpty());
-        for (int i = 0; i < 6; i++) {
-            data.add(new LineString(createSequence((Point)data.get(i)), crs));
-        }
-
-        // polgyon
-        // TODO
-
-        // multipoint
-        data.add(MultiPoint.createEmpty());
-        for (int i = 0; i < 6; i++) {
-            data.add(new MultiPoint(new Point[]{(Point)data.get(i)}));
-        }
-
-        // multilinestring
-        int size = data.size();
-        data.add(MultiLineString.createEmpty());
-        for (int i = 0; i < size; i++) {
-            if (data.get(i) instanceof LineString) {
-                data.add(new MultiLineString(new LineString[]{(LineString)data.get(i)}));
-            }
-        }
-
-        // multipolygon
-        data.add(MultiPolygon.createEmpty());
-        for (int i = 0; i < size; i++) {
-            if (data.get(i) instanceof Polygon) {
-                data.add(new MultiPolygon(new Polygon[]{(Polygon)data.get(i)}));
-            }
-        }
-
-        // collection
-        size = data.size();
-        for (int i = 0; i < size; i++) {
-            data.add(new GeometryCollection(new Geometry[]{data.get(i)}));
-        }
-
-        for (String wkt : Connections.getSpatialData().values()) {
-            data.add(Wkt.fromWkt(wkt));
-        }
-
-        return data;
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/JGeometryConverterTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/JGeometryConverterTest.java
deleted file mode 100644
index bfa3e92210..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/JGeometryConverterTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.mysema.query.sql.spatial;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import oracle.spatial.geometry.JGeometry;
-
-import org.geolatte.geom.Geometry;
-import org.geolatte.geom.GeometryCollection;
-import org.geolatte.geom.MultiLineString;
-import org.geolatte.geom.MultiPolygon;
-import org.geolatte.geom.Polygon;
-import org.geolatte.geom.codec.Wkt;
-import org.junit.Test;
-
-public class JGeometryConverterTest extends AbstractConverterTest {
-
-    @Test
-    public void RoundTrip() {
-        List<Geometry> geometries = getGeometries();
-        for (Geometry geometry : geometries) {
-            if (geometry instanceof MultiPolygon) continue;
-            if (geometry instanceof GeometryCollection) continue;
-            System.err.println(Wkt.toWkt(geometry));
-            JGeometry converted = JGeometryConverter.convert(geometry);
-            Geometry back = JGeometryConverter.convert(converted);
-            assertEquals(geometry, back);
-        }
-    }
-
-    @Test
-    public void Polygon() {
-        Polygon polygon = (org.geolatte.geom.Polygon) Wkt.fromWkt("POLYGON (" +
-        		"(30 10, 40 40, 20 40, 10 20, 30 10), " +
-        		"(20 30, 35 35, 30 20, 20 30))");
-        JGeometry geo = JGeometryConverter.convert(polygon);
-
-        double[] extRing = new double[]{30, 10, 40, 40, 20, 40, 10, 20, 30, 10};
-        double[] intRing = new double[]{20, 30, 35, 35, 30, 20, 20, 30};
-        JGeometry geo2 = JGeometry.createLinearPolygon(new Object[]{extRing, intRing},
-                polygon.getCoordinateDimension(), polygon.getSRID());
-        assertEquals(geo2, geo);
-    }
-
-    @Test
-    public void MultiLineString() {
-        MultiLineString multiLineString = (org.geolatte.geom.MultiLineString) Wkt.fromWkt("MULTILINESTRING (" +
-                        "(30 10, 40 40, 20 40, 10 20, 30 10), " +
-                        "(20 30, 35 35, 30 20, 20 30))");
-        JGeometry geo = JGeometryConverter.convert(multiLineString);
-
-        double[] line1 = new double[]{30, 10, 40, 40, 20, 40, 10, 20, 30, 10};
-        double[] line2 = new double[]{20, 30, 35, 35, 30, 20, 20, 30};
-        JGeometry geo2 = JGeometry.createLinearMultiLineString(new Object[]{line1, line2},
-                multiLineString.getCoordinateDimension(), multiLineString.getSRID());
-//        System.err.println(Arrays.toString(geo.getElemInfo()));
-//        System.err.println(Arrays.toString(geo.getOrdinatesArray()));
-//        System.err.println(Arrays.toString(geo2.getElemInfo()));
-//        System.err.println(Arrays.toString(geo2.getOrdinatesArray()));
-        assertEquals(geo2, geo);
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PGgeometryConverterTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PGgeometryConverterTest.java
deleted file mode 100644
index 11c5dbf1d0..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/PGgeometryConverterTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mysema.query.sql.spatial;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.geolatte.geom.Geometry;
-import org.junit.Test;
-
-public class PGgeometryConverterTest extends AbstractConverterTest {
-
-    @Test
-    public void RoundTrip() {
-        List<Geometry> geometries = getGeometries();
-        for (Geometry geometry : geometries) {
-            org.postgis.Geometry converted = PGgeometryConverter.convert(geometry);
-            Geometry back = PGgeometryConverter.convert(converted);
-            assertEquals(geometry, back);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/QShapes.java b/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/QShapes.java
deleted file mode 100644
index cbc4590529..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/QShapes.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.mysema.query.sql.spatial;
-
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-
-import javax.annotation.Generated;
-
-import org.geolatte.geom.Geometry;
-
-import com.mysema.query.spatial.path.GeometryPath;
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.types.Path;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.path.NumberPath;
-
-/**
- * QShapes is a Querydsl query type for QShapes
- */
-@Generated("com.mysema.query.sql.codegen.MetaDataSerializer")
-public class QShapes extends RelationalPathSpatial<Shapes> {
-
-    private static final long serialVersionUID = 563213127;
-
-    public static final QShapes shapes = new QShapes("SHAPES");
-
-    public final GeometryPath<Geometry> geometry = createGeometry("geometry", Geometry.class);
-
-    public final NumberPath<Integer> id = createNumber("id", Integer.class);
-
-    public final com.mysema.query.sql.PrimaryKey<Shapes> shapesPkey = createPrimaryKey(id);
-
-    public QShapes(String variable) {
-        super(Shapes.class, forVariable(variable), "PUBLIC", "SHAPES");
-        addMetadata();
-    }
-
-    public QShapes(String variable, String schema, String table) {
-        super(Shapes.class, forVariable(variable), schema, table);
-        addMetadata();
-    }
-
-    public QShapes(Path<? extends Shapes> path) {
-        super(path.getType(), path.getMetadata(), "PUBLIC", "SHAPES");
-        addMetadata();
-    }
-
-    public QShapes(PathMetadata<?> metadata) {
-        super(Shapes.class, metadata, "PUBLIC", "SHAPES");
-        addMetadata();
-    }
-
-    public void addMetadata() {
-        addMetadata(geometry, ColumnMetadata.named("GEOMETRY").ofType(1111).withSize(2147483647));
-        addMetadata(id, ColumnMetadata.named("ID").ofType(4).withSize(10).notNull());
-    }
-
-}
-
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServerGeometryWriterTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServerGeometryWriterTest.java
deleted file mode 100644
index d5d0fe0b73..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/spatial/SQLServerGeometryWriterTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mysema.query.sql.spatial;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.geolatte.geom.Geometry;
-import org.junit.Test;
-
-public class SQLServerGeometryWriterTest extends AbstractConverterTest {
-
-    @Test
-    public void RoundTrip() throws IOException {
-        for (Geometry geometry : getGeometries()) {
-            byte[] bytes = new SQLServerGeometryWriter().write(geometry);
-            Geometry geometry2 = new SQLServerGeometryReader().read(bytes);
-            assertEquals(geometry, geometry2);
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/teradata/SetQueryBandClauseTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/teradata/SetQueryBandClauseTest.java
deleted file mode 100644
index d701ff8960..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/teradata/SetQueryBandClauseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mysema.query.sql.teradata;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.sql.Configuration;
-import com.mysema.query.sql.SQLTemplates;
-
-public class SetQueryBandClauseTest {
-
-    private Configuration conf;
-
-    private SetQueryBandClause clause;
-
-    @Before
-    public void setUp() {
-        conf = new Configuration(SQLTemplates.DEFAULT);
-        conf.setUseLiterals(true);
-        clause = new SetQueryBandClause(null, conf);
-    }
-
-    @Test
-    public void ToString() {
-        clause.set("a", "b");
-        assertEquals("set query_band='a=b;' for session", clause.toString());
-    }
-
-    @Test
-    public void ToString2() {
-        conf.setUseLiterals(false);
-        clause.set("a", "b");
-        clause.forTransaction();
-        assertEquals("set query_band=? for transaction", clause.toString());
-    }
-
-    @Test
-    public void ForTransaction() {
-        clause.forTransaction();
-        clause.set("a", "b");
-        clause.set("b", "c");
-        assertEquals("set query_band='b=c;a=b;' for transaction", clause.toString());
-    }
-
-    @Test
-    public void GetSQL() {
-        clause.forTransaction();
-        clause.set("a", "b");
-        clause.set("b", "c");
-        assertEquals("set query_band='b=c;a=b;' for transaction", clause.getSQL().get(0).getSQL());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/types/LocaleTypeTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/types/LocaleTypeTest.java
deleted file mode 100644
index dfedc5d933..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/types/LocaleTypeTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mysema.query.sql.types;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Locale;
-
-import org.junit.Test;
-
-import com.mysema.query.sql.types.LocaleType;
-
-public class LocaleTypeTest {
-
-    @Test
-    public void Lang() {
-        Locale l = new Locale("en");
-        assertEquals(l, LocaleType.toLocale(l.toString()));
-    }
-
-    @Test
-    public void Lang_Country() {
-        Locale l = new Locale("en", "US");
-        assertEquals(l, LocaleType.toLocale(l.toString()));
-    }
-
-    @Test
-    public void Lang_Country_Variant() {
-        Locale l = new Locale("en", "US", "X");
-        assertEquals(l, LocaleType.toLocale(l.toString()));
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/types/TypeTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/types/TypeTest.java
deleted file mode 100644
index 90e9e0e074..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/types/TypeTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2011, Mysema Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mysema.query.sql.types;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Currency;
-import java.util.List;
-
-import org.easymock.EasyMock;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.junit.Test;
-
-import com.mysema.commons.lang.Pair;
-import com.mysema.query.sql.types.BigDecimalType;
-import com.mysema.query.sql.types.BigIntegerType;
-import com.mysema.query.sql.types.BlobType;
-import com.mysema.query.sql.types.ByteType;
-import com.mysema.query.sql.types.BytesType;
-import com.mysema.query.sql.types.CalendarType;
-import com.mysema.query.sql.types.CharacterType;
-import com.mysema.query.sql.types.ClobType;
-import com.mysema.query.sql.types.CurrencyType;
-import com.mysema.query.sql.types.DateTimeType;
-import com.mysema.query.sql.types.DateType;
-import com.mysema.query.sql.types.DoubleType;
-import com.mysema.query.sql.types.EnumByNameType;
-import com.mysema.query.sql.types.EnumByOrdinalType;
-import com.mysema.query.sql.types.FloatType;
-import com.mysema.query.sql.types.IntegerType;
-import com.mysema.query.sql.types.LocalDateTimeType;
-import com.mysema.query.sql.types.LocalDateType;
-import com.mysema.query.sql.types.LocalTimeType;
-import com.mysema.query.sql.types.LongType;
-import com.mysema.query.sql.types.NumericBooleanType;
-import com.mysema.query.sql.types.ObjectType;
-import com.mysema.query.sql.types.ShortType;
-import com.mysema.query.sql.types.StringType;
-import com.mysema.query.sql.types.TimeType;
-import com.mysema.query.sql.types.TimestampType;
-import com.mysema.query.sql.types.TrueFalseType;
-import com.mysema.query.sql.types.Type;
-import com.mysema.query.sql.types.URLType;
-import com.mysema.query.sql.types.UtilDateType;
-import com.mysema.query.sql.types.YesNoType;
-
-public class TypeTest implements InvocationHandler{
-
-    public enum Gender {
-        MALE, FEMALE
-    }
-
-    private Object value;
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if (method.getName().startsWith("get")) {
-            return value;
-        } else {
-            value = args[1];
-            return null;
-        }
-    }
-
-    private final ResultSet resultSet = (ResultSet) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ResultSet.class}, this);
-
-    private final PreparedStatement statement = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{PreparedStatement.class}, this);
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void test() throws MalformedURLException, SQLException{
-        List<Pair<?,?>> valueAndType = new ArrayList<Pair<?,?>>();
-        valueAndType.add(Pair.of(new BigDecimal("1"), new BigDecimalType()));
-        valueAndType.add(Pair.of(new BigInteger("2"), new BigIntegerType()));
-        //valueAndType.add(Pair.of(Boolean.TRUE,         new BooleanType()));
-        valueAndType.add(Pair.of(Byte.valueOf((byte)1),   new ByteType()));
-        valueAndType.add(Pair.of(new byte[0],         new BytesType()));
-        valueAndType.add(Pair.of(Calendar.getInstance(), new CalendarType()));
-        valueAndType.add(Pair.of(new Character('c'),  new CharacterType()));
-        valueAndType.add(Pair.of(Currency.getInstance("EUR"), new CurrencyType()));
-        valueAndType.add(Pair.of(new java.sql.Date(0),new DateType()));
-        valueAndType.add(Pair.of(Double.valueOf(1),       new DoubleType()));
-        valueAndType.add(Pair.of(Float.valueOf(1),        new FloatType()));
-        valueAndType.add(Pair.of(Integer.valueOf(1),      new IntegerType()));
-        valueAndType.add(Pair.of(true,                    new NumericBooleanType()));
-        valueAndType.add(Pair.of(Long.valueOf(1),         new LongType()));
-        valueAndType.add(Pair.of(new Object(),        new ObjectType()));
-        valueAndType.add(Pair.of(Short.valueOf((short)1), new ShortType()));
-        valueAndType.add(Pair.of("",                   new StringType()));
-        valueAndType.add(Pair.of(true,                 new TrueFalseType()));
-        valueAndType.add(Pair.of(true,                 new YesNoType()));
-        valueAndType.add(Pair.of(new Timestamp(0),    new TimestampType()));
-        valueAndType.add(Pair.of(new Time(0),         new TimeType()));
-        valueAndType.add(Pair.of(new URL("http://www.mysema.com"), new URLType()));
-        valueAndType.add(Pair.of(new java.util.Date(),new UtilDateType()));
-
-        valueAndType.add(Pair.of(new DateTime(),      new DateTimeType()));
-        valueAndType.add(Pair.of(new LocalDateTime(), new LocalDateTimeType()));
-        valueAndType.add(Pair.of(new LocalDate(),     new LocalDateType()));
-        valueAndType.add(Pair.of(new LocalTime(),     new LocalTimeType()));
-
-        valueAndType.add(Pair.of(Gender.MALE,         new EnumByNameType<Gender>(Gender.class)));
-        valueAndType.add(Pair.of(Gender.MALE,         new EnumByOrdinalType<Gender>(Gender.class)));
-
-        valueAndType.add(Pair.of(EasyMock.createNiceMock(Blob.class), new BlobType()));
-        valueAndType.add(Pair.of(EasyMock.createNiceMock(Clob.class), new ClobType()));
-
-        for (Pair pair : valueAndType) {
-            value = null;
-            Type type = (Type) pair.getSecond();
-            assertNull(type.getValue(resultSet, 0));
-            type.setValue(statement, 0, pair.getFirst());
-            assertEquals(type.toString(), pair.getFirst(), type.getValue(resultSet, 0));
-        }
-    }
-
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/AbstractSuite.java b/querydsl-sql/src/test/java/com/mysema/query/suites/AbstractSuite.java
deleted file mode 100644
index 22a217fa86..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/AbstractSuite.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mysema.query.suites;
-
-import java.sql.SQLException;
-
-import org.junit.AfterClass;
-import org.junit.runner.RunWith;
-
-import com.mysema.query.Connections;
-import com.mysema.testutil.CustomSuite;
-
-@RunWith(CustomSuite.class)
-public abstract class AbstractSuite {
-
-    @AfterClass
-    public static void tearDown() throws SQLException {
-        Connections.close();
-    }
-
-}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java
deleted file mode 100644
index 8a7ef58277..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.CUBRIDTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class CUBRIDSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initCubrid();
-        Connections.setTemplates(CUBRIDTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java
deleted file mode 100644
index 611c8fe0f7..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.DerbyTemplates;
-
-public class DerbySuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initDerby();
-        Connections.setTemplates(DerbyTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java
deleted file mode 100644
index cd50218984..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mysema.query.suites;
-
-import com.mysema.query.*;
-import com.mysema.query.SpatialBase;
-import com.mysema.query.sql.spatial.GeoDBTemplates;
-import org.junit.BeforeClass;
-
-public class H2SuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Spatial extends SpatialBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initH2();
-        Connections.setTemplates(GeoDBTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java
deleted file mode 100644
index a88f0cfbe9..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.H2Templates;
-
-public class H2WithQuotingTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initH2();
-        Connections.setTemplates(H2Templates.builder().quote().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java
deleted file mode 100644
index aec392bc4e..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.H2Templates;
-
-public class H2WithSchemaTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initH2();
-        Connections.setTemplates(H2Templates.builder().printSchema().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java
deleted file mode 100644
index f8294c068d..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.HSQLDBTemplates;
-
-public class HsqldbSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initHSQL();
-        Connections.setTemplates(HSQLDBTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java
deleted file mode 100644
index fbe71d637f..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SpatialBase;
-import com.mysema.query.SelectWindowFunctionsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.SQLServer2008SpatialTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MSSQLSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Spatial extends SpatialBase {}
-    public static class SelectWindowFunctions extends SelectWindowFunctionsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initSQLServer();
-        Connections.setTemplates(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java
deleted file mode 100644
index 4a0321d99b..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SpatialBase;
-import com.mysema.query.SelectMySQLBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.MySQLSpatialTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MySQLSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectMySQL extends SelectMySQLBase {}
-    public static class Spatial extends SpatialBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initMySQL();
-        Connections.setTemplates(MySQLSpatialTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java
deleted file mode 100644
index ae2125e84d..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.MySQLSpatialTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class MySQLWithQuotingTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initMySQL();
-        Connections.setTemplates(MySQLSpatialTemplates.builder().quote().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java
deleted file mode 100644
index 18597e9322..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectOracleBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SelectWindowFunctionsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.OracleSpatialTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class OracleSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectOracle extends SelectOracleBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class SelectWindowFunctions extends SelectWindowFunctionsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initOracle();
-        Connections.setTemplates(OracleSpatialTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java
deleted file mode 100644
index 9d623c9d68..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class OracleWithQuotingTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initOracle();
-        Connections.setTemplates(OracleTemplates.builder().quote().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java
deleted file mode 100644
index beacc2b8b9..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SpatialBase;
-import com.mysema.query.SelectWindowFunctionsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.PostGISTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class PostgreSQLSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Spatial extends SpatialBase {}
-    public static class SelectWindowFunctions extends SelectWindowFunctionsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initPostgres();
-        Connections.setTemplates(PostGISTemplates.builder().quote().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java
deleted file mode 100644
index d479f9c144..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.SQLiteTemplates;
-
-public class SQLiteSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initSQLite();
-        Connections.setTemplates(SQLiteTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SpatialTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SpatialTest.java
deleted file mode 100644
index 9816f84f16..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/SpatialTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mysema.query.suites;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.mysema.query.Connections;
-
-public class SpatialTest {
-
-    @Before
-    public void setUp() throws ClassNotFoundException, SQLException {
-        Connections.initH2();
-//      Connections.initMySQL();
-//      Connections.initPostgres();
-//      Connections.initTeradata();
-    }
-
-    @After
-    public void tearDown() throws SQLException {
-        Connections.close();
-    }
-
-    @Test
-    public void test() throws SQLException {
-        Statement stmt = Connections.getStatement();
-        ResultSet rs = stmt.executeQuery("select \"GEOMETRY\" from \"SHAPES\"");
-        try {
-            while (rs.next()) {
-                System.err.println(rs.getObject(1).getClass().getName());
-                System.err.println(rs.getString(1));
-//                Clob clob = rs.getClob(1);
-//                System.err.println(clob.getSubString(1, (int) clob.length()));
-            }
-        } finally {
-            rs.close();
-        }
-    }
-
-    @Test
-    public void Metadata() throws SQLException {
-        Connection conn = Connections.getConnection();
-        DatabaseMetaData md = conn.getMetaData();
-        ResultSet rs = md.getColumns(null, null, "SHAPES", "GEOMETRY");
-        try {
-            rs.next();
-            int type = rs.getInt("DATA_TYPE");
-            String typeName = rs.getString("TYPE_NAME");
-            System.err.println(type + " " + typeName);
-        } finally {
-            rs.close();
-        }
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java
deleted file mode 100644
index cd6cc46036..0000000000
--- a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mysema.query.suites;
-
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-import com.mysema.query.BeanPopulationBase;
-import com.mysema.query.Connections;
-import com.mysema.query.DeleteBase;
-import com.mysema.query.InsertBase;
-import com.mysema.query.LikeEscapeBase;
-import com.mysema.query.MergeBase;
-import com.mysema.query.SelectBase;
-import com.mysema.query.SelectTeradataBase;
-import com.mysema.query.SpatialBase;
-import com.mysema.query.SelectUseLiteralsBase;
-import com.mysema.query.SelectWindowFunctionsBase;
-import com.mysema.query.SubqueriesBase;
-import com.mysema.query.TypesBase;
-import com.mysema.query.UnionBase;
-import com.mysema.query.UpdateBase;
-import com.mysema.query.sql.spatial.TeradataSpatialTemplates;
-import com.mysema.testutil.ExternalDB;
-
-@Category(ExternalDB.class)
-public class TeradataSuiteTest extends AbstractSuite {
-
-    public static class BeanPopulation extends BeanPopulationBase {}
-    public static class Delete extends DeleteBase {}
-    public static class Insert extends InsertBase {}
-    public static class LikeEscape extends LikeEscapeBase {}
-    public static class Merge extends MergeBase {}
-    public static class Select extends SelectBase {}
-    public static class SelectTeradata extends SelectTeradataBase {}
-    public static class Spatial extends SpatialBase {}
-    public static class SelectUseLiterals extends SelectUseLiteralsBase {}
-    public static class SelectWindowFunctions extends SelectWindowFunctionsBase {}
-    public static class Subqueries extends SubqueriesBase {}
-    public static class Types extends TypesBase {}
-    public static class Union extends UnionBase {}
-    public static class Update extends UpdateBase {}
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        Connections.initTeradata();
-        Connections.setTemplates(TeradataSpatialTemplates.builder().newLineToSingleSpace().build());
-    }
-
-}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java
new file mode 100644
index 0000000000..e084b06509
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+import java.util.List;
+import java.util.logging.Logger;
+
+import org.jetbrains.annotations.Nullable;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Target;
+import com.querydsl.core.dml.DMLClause;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLMergeClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+import com.querydsl.sql.mysql.MySQLReplaceClause;
+import com.querydsl.sql.teradata.TeradataQuery;
+import com.querydsl.sql.types.XMLAsStringType;
+
+public abstract class AbstractBaseTest {
+
+    protected static final Logger logger = Logger.getLogger(AbstractBaseTest.class.getName());
+
+    protected final class TestQuery<T> extends SQLQuery<T>  {
+
+        private TestQuery(Connection conn, Configuration configuration) {
+            super(conn, configuration);
+        }
+
+        private TestQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+            super(conn, configuration, metadata);
+        }
+
+        @Override
+        protected SQLSerializer serialize(boolean countRow) {
+            SQLSerializer serializer = super.serialize(countRow);
+            String rv = serializer.toString();
+            if (expectedQuery != null) {
+                assertEquals(expectedQuery, rv.replace('\n', ' '));
+                expectedQuery = null;
+            }
+            logger.fine(rv);
+            return serializer;
+        }
+
+        public TestQuery<T> clone(Connection conn) {
+            TestQuery<T> q = new TestQuery<T>(conn, getConfiguration(), getMetadata().clone());
+            q.union = union;
+            q.unionAll = unionAll;
+            q.firstUnionSubQuery = firstUnionSubQuery;
+            return q;
+        }
+
+    }
+
+    protected Connection connection = Connections.getConnection();
+
+    protected Target target = Connections.getTarget();
+
+    protected Configuration configuration = Connections.getConfiguration();
+
+    @Nullable
+    protected String expectedQuery;
+
+    public AbstractBaseTest() {
+        // TODO enable registration of (jdbc type, java type) -> usertype mappings
+        if (target == Target.POSTGRESQL || target == Target.ORACLE) {
+            configuration.register("XML_TEST", "COL", new XMLAsStringType());
+        }
+    }
+
+    @Rule
+    public MethodRule skipForQuotedRule = new SkipForQuotedRule(configuration);
+
+    @Rule
+    @ClassRule
+    public static TestRule targetRule = new TargetRule();
+
+    protected <T> void add(List<T> list, T arg, Target... exclusions) {
+        if (exclusions.length > 0) {
+            for (Target t : exclusions) {
+                if (t.equals(target)) {
+                    return;
+                }
+            }
+        }
+        list.add(arg);
+    }
+
+    protected SQLUpdateClause update(RelationalPath<?> e) {
+        SQLUpdateClause sqlUpdateClause = new SQLUpdateClause(connection, configuration, e);
+        sqlUpdateClause.addListener(new TestLoggingListener());
+        return sqlUpdateClause;
+    }
+
+    protected SQLInsertClause insert(RelationalPath<?> e) {
+        SQLInsertClause sqlInsertClause = new SQLInsertClause(connection, configuration, e);
+        sqlInsertClause.addListener(new TestLoggingListener());
+        return sqlInsertClause;
+    }
+
+    protected SQLInsertClause insert(RelationalPath<?> e, SQLQuery<?> sq) {
+        SQLInsertClause sqlInsertClause = new SQLInsertClause(connection, configuration, e, sq);
+        sqlInsertClause.addListener(new TestLoggingListener());
+        return sqlInsertClause;
+    }
+
+    protected SQLDeleteClause delete(RelationalPath<?> e) {
+        SQLDeleteClause sqlDeleteClause = new SQLDeleteClause(connection, configuration, e);
+        sqlDeleteClause.addListener(new TestLoggingListener());
+        return sqlDeleteClause;
+    }
+
+    protected SQLMergeClause merge(RelationalPath<?> e) {
+        SQLMergeClause sqlMergeClause = new SQLMergeClause(connection, configuration, e);
+        sqlMergeClause.addListener(new TestLoggingListener());
+        return sqlMergeClause;
+    }
+
+    protected ExtendedSQLQuery<?> extQuery() {
+        ExtendedSQLQuery<?> extendedSQLQuery = new ExtendedSQLQuery<Void>(connection, configuration);
+        extendedSQLQuery.addListener(new TestLoggingListener());
+        return extendedSQLQuery;
+    }
+
+    protected SQLInsertClause mysqlReplace(RelationalPath<?> path) {
+        MySQLReplaceClause mySQLReplaceClause = new MySQLReplaceClause(connection, configuration, path);
+        mySQLReplaceClause.addListener(new TestLoggingListener());
+        return mySQLReplaceClause;
+    }
+
+    protected SQLQuery<?> query() {
+        SQLQuery<Void> testQuery = new TestQuery<Void>(connection, configuration);
+        testQuery.addListener(new TestLoggingListener());
+        return testQuery;
+    }
+
+    protected TeradataQuery<?> teradataQuery() {
+        TeradataQuery<?> teradataQuery = new TeradataQuery<Void>(connection, configuration);
+        teradataQuery.addListener(new TestLoggingListener());
+        return teradataQuery;
+    }
+
+    protected TestQuery<?> testQuery() {
+        TestQuery<Void> testQuery = new TestQuery<Void>(connection, configuration, new DefaultQueryMetadata());
+        testQuery.addListener(new TestLoggingListener());
+        return testQuery;
+    }
+
+    protected long execute(DMLClause<?>... clauses) {
+        long execute = 0;
+        for (DMLClause<?> clause : clauses) {
+            execute += clause.execute();
+        }
+        return execute;
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/AbstractJDBCTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java
similarity index 87%
rename from querydsl-sql/src/test/java/com/mysema/query/AbstractJDBCTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java
index 7f8c9173d8..6258b8267e 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/AbstractJDBCTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.sql;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -36,12 +36,12 @@ public void setUp() throws ClassNotFoundException, SQLException {
     }
 
     @After
-    public void tearDown() throws SQLException{
-        try{
+    public void tearDown() throws SQLException {
+        try {
             statement.close();
-        }finally{
+        } finally {
             connection.close();
         }
     }
-    
+
 }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java
new file mode 100644
index 0000000000..34404c064f
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.sql.domain.QSurvey;
+
+public abstract class AbstractSQLTemplatesTest {
+
+    protected static final QSurvey survey1 = new QSurvey("survey1");
+
+    protected static final QSurvey survey2 = new QSurvey("survey2");
+
+    private SQLTemplates templates;
+
+    protected SQLQuery<?> query;
+
+    protected abstract SQLTemplates createTemplates();
+
+    @Before
+    public void setUp() {
+        templates = createTemplates();
+        templates.newLineToSingleSpace();
+        query = new SQLQuery<Void>(new Configuration(templates));
+    }
+
+    @Test
+    public void noFrom() {
+        query.getMetadata().setProjection(Expressions.ONE);
+        if (templates.getDummyTable() == null) {
+            assertEquals("select 1", query.toString());
+        } else {
+            assertEquals("select 1 from " + templates.getDummyTable(), query.toString());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Union union = query.union(
+            select(one.as(col1)),
+            select(two),
+            select(three));
+
+        if (templates.getDummyTable() == null) {
+            if (templates.isUnionsWrapped()) {
+                assertEquals(
+                        "(select 1 as col1)\n" +
+                        "union\n" +
+                        "(select 2)\n" +
+                        "union\n" +
+                        "(select 3)", union.toString());
+            } else {
+                assertEquals(
+                        "select 1 as col1)\n" +
+                        "union\n" +
+                        "select 2\n" +
+                        "union\n" +
+                        "select 3", union.toString());
+            }
+        } else {
+            String dummyTable = templates.getDummyTable();
+            if (templates.isUnionsWrapped()) {
+                assertEquals(
+                        "(select 1 as col1 from " + dummyTable + ")\n" +
+                        "union\n" +
+                        "(select 2 from " + dummyTable + ")\n" +
+                        "union\n" +
+                        "(select 3 from " + dummyTable + ")", union.toString());
+            } else {
+                assertEquals(
+                        "select 1 as col1 from " + dummyTable + "\n" +
+                        "union\n" +
+                        "select 2 from " + dummyTable + "\n" +
+                        "union\n" +
+                        "select 3 from " + dummyTable, union.toString());
+            }
+        }
+    }
+
+    @Test
+    public void innerJoin() {
+        query.from(survey1).innerJoin(survey2);
+        assertEquals("from SURVEY survey1 inner join SURVEY survey2", query.toString());
+    }
+
+    protected int getPrecedence(Operator... ops) {
+        int precedence = templates.getPrecedence(ops[0]);
+        for (int i = 1; i < ops.length; i++) {
+            assertEquals(ops[i].name(), precedence, templates.getPrecedence(ops[i]));
+        }
+        return precedence;
+    }
+
+    @Test
+    public void generic_precedence() {
+        TemplatesTestUtils.testPrecedence(templates);
+    }
+
+    @Test
+    public void arithmetic() {
+        NumberExpression<Integer> one = Expressions.numberPath(Integer.class, "one");
+        NumberExpression<Integer> two = Expressions.numberPath(Integer.class, "two");
+
+        // add
+        assertSerialized(one.add(two), "one + two");
+        assertSerialized(one.add(two).multiply(1), "(one + two) * ?");
+        assertSerialized(one.add(two).divide(1), "(one + two) / ?");
+        assertSerialized(one.add(two).add(1), "one + two + ?");
+
+        assertSerialized(one.add(two.multiply(1)), "one + two * ?");
+        assertSerialized(one.add(two.divide(1)), "one + two / ?");
+        assertSerialized(one.add(two.add(1)), "one + (two + ?)"); // XXX could be better
+
+        // sub
+        assertSerialized(one.subtract(two), "one - two");
+        assertSerialized(one.subtract(two).multiply(1), "(one - two) * ?");
+        assertSerialized(one.subtract(two).divide(1), "(one - two) / ?");
+        assertSerialized(one.subtract(two).add(1), "one - two + ?");
+
+        assertSerialized(one.subtract(two.multiply(1)), "one - two * ?");
+        assertSerialized(one.subtract(two.divide(1)), "one - two / ?");
+        assertSerialized(one.subtract(two.add(1)), "one - (two + ?)");
+
+        // mult
+        assertSerialized(one.multiply(two), "one * two");
+        assertSerialized(one.multiply(two).multiply(1), "one * two * ?");
+        assertSerialized(one.multiply(two).divide(1), "one * two / ?");
+        assertSerialized(one.multiply(two).add(1), "one * two + ?");
+
+        assertSerialized(one.multiply(two.multiply(1)), "one * (two * ?)"); // XXX could better
+        assertSerialized(one.multiply(two.divide(1)), "one * (two / ?)");
+        assertSerialized(one.multiply(two.add(1)), "one * (two + ?)");
+    }
+
+    @Test
+    public void booleanTemplate() {
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.TRUE), "b = 1");
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.FALSE), "b = 0");
+        query.setUseLiterals(true);
+        query.where(Expressions.booleanPath("b").eq(true));
+        assertTrue(query.toString(), query.toString().endsWith("where b = 1"));
+    }
+
+    protected void assertSerialized(Expression<?> expr, String serialized) {
+        SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
+        serializer.handle(expr);
+        assertEquals(serialized, serializer.toString());
+    }
+
+    @Test
+    public void in() {
+        CollectionExpression<Collection<Integer>, Integer> ints = Expressions.collectionOperation(Integer.class, Ops.LIST,
+                Expressions.collectionOperation(Integer.class, Ops.LIST, Expressions.ONE, Expressions.TWO),
+                Expressions.THREE);
+        query.from(survey1).where(survey1.id.in(ints));
+        query.getMetadata().setProjection(survey1.name);
+        assertEquals("select survey1.NAME from SURVEY survey1 where survey1.ID in (1, 2, 3)", query.toString());
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java
new file mode 100644
index 0000000000..45fc4c0f46
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Types;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ArrayTypesTest {
+
+    private Configuration configuration;
+
+    @Before
+    public void setUp() {
+        configuration = Configuration.DEFAULT;
+    }
+
+    @Test
+    public void test() {
+        assertEquals(Integer[].class, getJavaType("_integer"));
+        assertEquals(Integer[].class, getJavaType("integer[]"));
+        assertEquals(Integer[].class, getJavaType("INTEGER ARRAY"));
+    }
+
+    private Class<?> getJavaType(String typeName) {
+        return configuration.getJavaType(Types.ARRAY, typeName, 0, 0, "", "");
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java
new file mode 100644
index 0000000000..faaaebb8fa
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.After;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.sql.dml.BeanMapper;
+import com.querydsl.sql.domain.Employee;
+import com.querydsl.sql.domain.QEmployee;
+
+@ExcludeIn({CUBRID, DB2, DERBY, ORACLE, SQLSERVER, POSTGRESQL, SQLITE, TERADATA})
+public class BeanPopulationBase extends AbstractBaseTest {
+
+    private final QEmployee e = new QEmployee("e");
+
+    @After
+    public void tearDown() {
+        delete(e).where(e.firstname.eq("John")).execute();
+    }
+
+    @Test
+    public void custom_projection() {
+        // Insert
+        Employee employee = new Employee();
+        employee.setFirstname("John");
+        Integer id = insert(e).populate(employee).executeWithKey(e.id);
+        employee.setId(id);
+
+        // Update
+        employee.setLastname("S");
+        assertEquals(1L, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
+
+        // Query
+        Employee smith = extQuery().from(e).where(e.lastname.eq("S"))
+            .limit(1)
+            .uniqueResult(Employee.class, e.lastname, e.firstname);
+        assertEquals("John", smith.getFirstname());
+        assertEquals("S", smith.getLastname());
+
+        // Query with alias
+        smith = extQuery().from(e).where(e.lastname.eq("S"))
+            .limit(1)
+            .uniqueResult(Employee.class, e.lastname.as("lastname"), e.firstname.as("firstname"));
+        assertEquals("John", smith.getFirstname());
+        assertEquals("S", smith.getLastname());
+
+        // Query into custom type
+        OtherEmployee other = extQuery().from(e).where(e.lastname.eq("S"))
+            .limit(1)
+            .uniqueResult(OtherEmployee.class, e.lastname, e.firstname);
+        assertEquals("John", other.getFirstname());
+        assertEquals("S", other.getLastname());
+
+        // Delete (no changes needed)
+        assertEquals(1L, delete(e).where(e.id.eq(employee.getId())).execute());
+    }
+
+    @Test
+    public void insert_update_query_and_delete() {
+        // Insert
+        Employee employee = new Employee();
+        employee.setFirstname("John");
+        Integer id = insert(e).populate(employee).executeWithKey(e.id);
+        assertNotNull(id);
+        employee.setId(id);
+
+        // Update
+        employee.setLastname("S");
+        assertEquals(1L, update(e).populate(employee).where(e.id.eq(employee.getId())).execute());
+
+        // Query
+        Employee smith = query().from(e).where(e.lastname.eq("S")).limit(1).select(e).fetchFirst();
+        assertEquals("John", smith.getFirstname());
+
+        // Delete (no changes needed)
+        assertEquals(1L, delete(e).where(e.id.eq(employee.getId())).execute());
+    }
+
+    @Test
+    public void populate_with_beanMapper() {
+        Employee employee = new Employee();
+        employee.setFirstname("John");
+        insert(e).populate(employee, new BeanMapper()).execute();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java
new file mode 100644
index 0000000000..969997d0ad
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import org.junit.Ignore;
+
+@Ignore
+public class CUBRIDTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new CUBRIDTemplates();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java
new file mode 100644
index 0000000000..c46f0bc237
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java
@@ -0,0 +1,21 @@
+package com.querydsl.sql;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Coalesce;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class CoalesceTest {
+
+    @Test
+    public void coalesce_supports_subquery() {
+        Coalesce<String> coalesce =
+                new Coalesce<String>(SQLExpressions.select(QCompanies.companies.name).from(QCompanies.companies), QCompanies.companies.name);
+        assertThat(SQLExpressions.select(coalesce).toString(),
+                is(equalTo("select coalesce((select COMPANIES.NAME\nfrom COMPANIES COMPANIES), COMPANIES.NAME)\nfrom dual")));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java
new file mode 100644
index 0000000000..04c45c3761
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java
@@ -0,0 +1,45 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.*;
+
+import java.sql.Types;
+
+import org.junit.Test;
+
+import com.querydsl.sql.domain.QEmployee;
+
+public class ColumnMetadataTest {
+
+    @Test
+    public void defaultColumn() {
+        ColumnMetadata column = ColumnMetadata.named("Person");
+        assertEquals("Person", column.getName());
+        assertFalse(column.hasJdbcType());
+        assertFalse(column.hasSize());
+        assertTrue(column.isNullable());
+    }
+
+    @Test
+    public void fullyConfigured() {
+        ColumnMetadata column = ColumnMetadata.named("Person").withSize(10)
+                .notNull().ofType(Types.BIGINT);
+        assertEquals("Person", column.getName());
+        assertTrue(column.hasJdbcType());
+        assertEquals(Types.BIGINT, column.getJdbcType());
+        assertTrue(column.hasSize());
+        assertEquals(10, column.getSize());
+        assertFalse(column.isNullable());
+    }
+
+    @Test
+    public void extractFromRelationalPath() {
+        ColumnMetadata column = ColumnMetadata.getColumnMetadata(QEmployee.employee.id);
+        assertEquals("ID", column.getName());
+    }
+
+    @Test
+    public void fallBackToDefaultWhenMissing() {
+        ColumnMetadata column = ColumnMetadata.getColumnMetadata(QEmployee.employee.salary);
+        assertEquals("SALARY", column.getName());
+    }
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java
new file mode 100644
index 0000000000..440ecd66e5
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Locale;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import com.querydsl.core.alias.Gender;
+import com.querydsl.sql.domain.QSurvey;
+import com.querydsl.sql.namemapping.ChainedNameMapping;
+import com.querydsl.sql.namemapping.ChangeLetterCaseNameMapping;
+import com.querydsl.sql.namemapping.ChangeLetterCaseNameMapping.LetterCase;
+import com.querydsl.sql.namemapping.NameMapping;
+import com.querydsl.sql.namemapping.PreConfiguredNameMapping;
+import com.querydsl.sql.types.EnumByNameType;
+import com.querydsl.sql.types.InputStreamType;
+import com.querydsl.sql.types.Null;
+import com.querydsl.sql.types.StringType;
+import com.querydsl.sql.types.UtilDateType;
+
+public class ConfigurationTest {
+
+    @Test
+    public void various() {
+        Configuration configuration = new Configuration(new H2Templates());
+//        configuration.setJavaType(Types.DATE, java.util.Date.class);
+        configuration.register(new UtilDateType());
+        configuration.register("person", "secureId", new EncryptedString());
+        configuration.register("person", "gender",  new EnumByNameType<Gender>(Gender.class));
+        configuration.register(new StringType());
+        assertEquals(Gender.class, configuration.getJavaType(java.sql.Types.VARCHAR, null, 0,0,"person", "gender"));
+    }
+
+    @Test
+    public void custom_type() {
+        Configuration configuration = new Configuration(new H2Templates());
+//        configuration.setJavaType(Types.BLOB, InputStream.class);
+        configuration.register(new InputStreamType());
+        assertEquals(InputStream.class, configuration.getJavaType(Types.BLOB, null, 0,0,"", ""));
+    }
+
+    @Test
+    public void set_null() throws SQLException {
+        Configuration configuration = new Configuration(new H2Templates());
+//        configuration.register(new UntypedNullType());
+        configuration.register("SURVEY", "NAME",  new EncryptedString());
+        PreparedStatement stmt = EasyMock.<PreparedStatement> createNiceMock(PreparedStatement.class);
+        configuration.set(stmt, QSurvey.survey.name, 0, Null.DEFAULT);
+    }
+
+    @Test
+    public void get_schema() {
+        Configuration configuration = new Configuration(new H2Templates());
+        configuration.registerSchemaOverride("public", "pub");
+        configuration.registerTableOverride("employee", "emp");
+        configuration.registerTableOverride("public", "employee", "employees");
+
+        assertEquals("pub", configuration.getOverride(new SchemaAndTable("public", "")).getSchema());
+        assertEquals("emp", configuration.getOverride(new SchemaAndTable("", "employee")).getTable());
+        assertEquals("employees", configuration.getOverride(new SchemaAndTable("public", "employee")).getTable());
+
+        configuration.setDynamicNameMapping(new PreConfiguredNameMapping());
+        SchemaAndTable notOverriddenSchemaAndTable = new SchemaAndTable("notoverridden", "notoverridden");
+        assertEquals(notOverriddenSchemaAndTable, configuration.getOverride(notOverriddenSchemaAndTable));
+
+        configuration.setDynamicNameMapping(new ChangeLetterCaseNameMapping(LetterCase.UPPER, Locale.ENGLISH));
+        String notDirectOverriden = "notDirectOverriden";
+        assertEquals(notDirectOverriden.toUpperCase(Locale.ENGLISH),
+                configuration.getOverride(new SchemaAndTable("public", notDirectOverriden)).getTable());
+
+    }
+
+    @Test
+    public void columnOverride() {
+        Configuration configuration = new Configuration(new H2Templates());
+        assertEquals("notoverriddencolumn", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "notoverriddencolumn"));
+
+        // Testing when chained name mapping does not give back any result.
+        configuration.setDynamicNameMapping(new PreConfiguredNameMapping());
+        assertEquals("notoverriddencolumn", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "notoverriddencolumn"));
+
+        // Testing all other use-cases when letter case changing is in the end of the chain
+        configuration.setDynamicNameMapping(new ChangeLetterCaseNameMapping(LetterCase.LOWER, Locale.ENGLISH));
+
+        configuration.registerColumnOverride("mytable", "oldcolumn", "newcolumn");
+        configuration.registerColumnOverride("mytable", "oldcolumn2", "newcolumn2");
+        assertEquals("newcolumn", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "oldcolumn"));
+        assertEquals("newcolumn2", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "oldcolumn2"));
+
+        configuration.registerColumnOverride("myschema", "mytable", "oldcolumn", "newcolumnwithschema");
+        configuration.registerColumnOverride("myschema", "mytable", "oldcolumn2", "newcolumnwithschema2");
+        assertEquals("newcolumnwithschema2", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "oldcolumn2"));
+        assertEquals("notoverriddencolumn", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "notoverriddencolumn"));
+
+        assertEquals("lower", configuration.getColumnOverride(new SchemaAndTable("myschema", "mytable"), "LOWER"));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void npeWithNullParameterOfChainedNameMappingConstructor() {
+        new ChainedNameMapping((NameMapping[]) null);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void npeWithNullElementInParameterOfChainedNameMappingConstructor() {
+        new ChainedNameMapping(new NameMapping[]  {null});
+    }
+
+    @Test
+    public void numericOverriden() {
+        Configuration configuration = new Configuration(new H2Templates());
+        configuration.registerNumeric(19, 0, BigInteger.class);
+        assertEquals(configuration.getJavaType(Types.NUMERIC, "", 19, 0, "", ""), BigInteger.class);
+    }
+
+    @Test
+    public void numericOverriden2() {
+        Configuration configuration = new Configuration(new H2Templates());
+        configuration.registerNumeric(18, 19, 0, 0, BigInteger.class);
+        assertEquals(configuration.getJavaType(Types.NUMERIC, "", 18, 0, "", ""), BigInteger.class);
+        assertEquals(configuration.getJavaType(Types.NUMERIC, "", 19, 0, "", ""), BigInteger.class);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
new file mode 100644
index 0000000000..2c730f0c45
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java
@@ -0,0 +1,1159 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hsqldb.types.Types;
+
+import com.querydsl.core.Target;
+import com.querydsl.sql.ddl.CreateTableClause;
+import com.querydsl.sql.ddl.DropTableClause;
+
+/**
+ * @author tiwe
+ *
+ */
+public final class Connections {
+
+    public static final int TEST_ROW_COUNT = 100;
+
+    private static ThreadLocal<Connection> connHolder = new ThreadLocal<Connection>();
+
+    private static ThreadLocal<Target> targetHolder = new ThreadLocal<Target>();
+
+    private static ThreadLocal<Configuration> configurationHolder = new ThreadLocal<Configuration>();
+
+    // datetest
+    private static final String CREATE_TABLE_DATETEST = "create table DATE_TEST(DATE_TEST date)";
+
+    // survey
+    private static final String CREATE_TABLE_SURVEY =
+            "create table SURVEY(ID int auto_increment, NAME varchar(30), NAME2 varchar(30))";
+
+    // test
+    private static final String CREATE_TABLE_TEST = "create table TEST(NAME varchar(255))";
+
+    // timetest
+    private static final String CREATE_TABLE_TIMETEST = "create table TIME_TEST(TIME_TEST time)";
+
+    // employee
+    private static final String INSERT_INTO_EMPLOYEE = "insert into EMPLOYEE " +
+            "(ID, FIRSTNAME, LASTNAME, SALARY, DATEFIELD, TIMEFIELD, SUPERIOR_ID) " +
+            "values (?,?,?,?,?,?,?)";
+
+    private static final String INSERT_INTO_TEST_VALUES = "insert into TEST values(?)";
+
+    private static ThreadLocal<Statement> stmtHolder = new ThreadLocal<Statement>();
+
+    private static boolean db2Inited, derbyInited, sqlServerInited, h2Inited, hsqlInited, mysqlInited, cubridInited, oracleInited, postgresqlInited, sqliteInited, teradataInited, firebirdInited;
+
+    public static void close() throws SQLException {
+        if (stmtHolder.get() != null) {
+            stmtHolder.get().close();
+        }
+        if (connHolder.get() != null) {
+            connHolder.get().close();
+        }
+    }
+
+    public static Connection getConnection() {
+        return connHolder.get();
+    }
+
+    public static Target getTarget() {
+        return targetHolder.get();
+    }
+
+    public static Configuration getConfiguration() {
+        return configurationHolder.get();
+    }
+
+    public static void initConfiguration(SQLTemplates templates) {
+        configurationHolder.set(new Configuration(templates));
+    }
+
+    private static Connection getDB2() throws SQLException, ClassNotFoundException {
+        Class.forName("com.ibm.db2.jcc.DB2Driver");
+        String url = "jdbc:db2://localhost:50000/sample";
+        return DriverManager.getConnection(url, "db2inst1", "a3sd!fDj");
+    }
+
+    private static Connection getDerby() throws SQLException, ClassNotFoundException {
+        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        String url = "jdbc:derby:target/demoDB;create=true";
+        return DriverManager.getConnection(url, "", "");
+    }
+
+    private static Connection getFirebird() throws SQLException, ClassNotFoundException {
+        Class.forName("org.firebirdsql.jdbc.FBDriver");
+        String url = "jdbc:firebirdsql:localhost/3050:/firebird/data/querydsl.fdb";
+        return DriverManager.getConnection(url, "sysdba", "masterkey");
+    }
+
+    private static Connection getHSQL() throws SQLException, ClassNotFoundException {
+        Class.forName("org.hsqldb.jdbcDriver");
+        String url = "jdbc:hsqldb:target/tutorial";
+        return DriverManager.getConnection(url, "sa", "");
+    }
+
+    public static Connection getH2() throws SQLException, ClassNotFoundException {
+        Class.forName("org.h2.Driver");
+        String url = "jdbc:h2:./target/h2-test;LOCK_MODE=0;AUTO_SERVER=TRUE";
+        return DriverManager.getConnection(url, "sa", "");
+    }
+
+    private static Connection getMySQL() throws SQLException, ClassNotFoundException {
+        Class.forName("com.mysql.jdbc.Driver");
+        String url = "jdbc:mysql://localhost:3306/querydsl?useLegacyDatetimeCode=false";
+        return DriverManager.getConnection(url, "querydsl", "querydsl");
+    }
+
+    private static Connection getOracle() throws SQLException, ClassNotFoundException {
+        Class.forName("oracle.jdbc.driver.OracleDriver");
+        String url = "jdbc:oracle:thin:@localhost:1521:xe";
+        return DriverManager.getConnection(url, "querydsl", "querydsl");
+    }
+
+    private static Connection getPostgreSQL() throws ClassNotFoundException, SQLException {
+        Class.forName("org.postgresql.Driver");
+        String url = "jdbc:postgresql://localhost:5433/querydsl";
+        return DriverManager.getConnection(url, "querydsl", "querydsl");
+    }
+
+    private static Connection getSQLServer() throws ClassNotFoundException, SQLException {
+        Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+        String url = "jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true";
+        return DriverManager.getConnection(url, "sa", "Password1!");
+    }
+
+    private static Connection getCubrid() throws ClassNotFoundException, SQLException {
+        Class.forName("cubrid.jdbc.driver.CUBRIDDriver");
+        String url = "jdbc:cubrid:localhost:30000:demodb:public::";
+        return DriverManager.getConnection(url);
+    }
+
+    private static Connection getSQLite() throws SQLException, ClassNotFoundException {
+        //System.setProperty("sqlite.purejava", "true");
+        Class.forName("org.sqlite.JDBC");
+        return DriverManager.getConnection("jdbc:sqlite:target/sample.db");
+    }
+
+    private static Connection getTeradata() throws SQLException, ClassNotFoundException {
+        Class.forName("com.teradata.jdbc.TeraDriver");
+        return DriverManager.getConnection("jdbc:teradata://teradata/dbc", "querydsl", "querydsl");
+    }
+
+    private static CreateTableClause createTable(SQLTemplates templates, String table) {
+        return new CreateTableClause(connHolder.get(), new Configuration(templates), table);
+    }
+
+    public static void dropTable(SQLTemplates templates, String table) throws SQLException {
+        new DropTableClause(connHolder.get(), new Configuration(templates), table).execute();
+    }
+
+    public static void dropType(Statement stmt, String type) throws SQLException {
+        try {
+            stmt.execute("drop type " + type);
+        } catch (SQLException e) {
+            if (!e.getMessage().contains("does not exist")) {
+                throw e;
+            }
+        }
+    }
+
+    public static Statement getStatement() {
+        return stmtHolder.get();
+    }
+
+    private static void createEmployeeTable(SQLTemplates templates) {
+        createTable(templates, "EMPLOYEE")
+                .column("ID", Integer.class).notNull()
+                .column("FIRSTNAME", String.class).size(50)
+                .column("LASTNAME", String.class).size(50)
+                .column("SALARY", Double.class)
+                .column("DATEFIELD", Date.class)
+                .column("TIMEFIELD", Time.class)
+                .column("SUPERIOR_ID", Integer.class)
+                .primaryKey("PK_EMPLOYEE", "ID")
+                .foreignKey("FK_SUPERIOR","SUPERIOR_ID").references("EMPLOYEE","ID")
+                .execute();
+    }
+
+    public static Map<Integer, String> getSpatialData() {
+        Map<Integer, String> m = new HashMap<>();
+        // point
+        m.put(1, "POINT (2 2)");
+        m.put(2, "POINT (8 7)");
+        m.put(3, "POINT (1 9)");
+        m.put(4, "POINT (9 2)");
+        m.put(5, "POINT (4 4)");
+        // linestring
+        m.put(6, "LINESTRING (30 10, 10 30)");
+        m.put(7, "LINESTRING (30 10, 10 30, 40 40)");
+        // polygon
+        m.put(8, "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10), (20 30, 35 35, 30 20, 20 30))");
+        m.put(9, "POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10), (20 30, 35 35, 30 20, 20 30))");
+        // multipoint
+        m.put(11, "MULTIPOINT (10 40, 40 30)");
+        m.put(11, "MULTIPOINT (10 40, 40 30, 20 20, 30 10)");
+        // multilinestring
+        m.put(12, "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))");
+        m.put(13, "MULTILINESTRING ((10 10, 20 20, 10 40))");
+        // multipolygon
+        m.put(14, "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))");
+        m.put(15, "MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)), " +
+                "((20 35, 10 30, 10 10, 30 5, 45 20, 20 35), " +
+                "(30 20, 20 15, 20 25, 30 20)))");
+
+        // XXX POLYHEDRALSURFACE not supported
+
+        /* GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))
+           CIRCULARSTRING(1 5, 6 2, 7 3)
+           COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))
+           CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
+           MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,2 1,2 2))
+           TRIANGLE((0 0 0,0 1 0,1 1 0,0 0 0))
+           TIN (((0 0 0, 0 0 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)))
+        */
+        return m;
+    }
+
+    public static void initCubrid() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.CUBRID);
+        //SQLTemplates templates = new MySQLTemplates();
+        Connection c = getCubrid();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (cubridInited) {
+            return;
+        }
+
+        // survey
+        stmt.execute("drop table if exists SURVEY");
+        stmt.execute("create table SURVEY(ID int auto_increment(16693,2), " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30)," +
+                "constraint suryey_pk primary key(ID))");
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
+
+        // test
+        stmt.execute("drop table if exists \"TEST\"");
+        stmt.execute("create table \"TEST\"(NAME varchar(255))");
+        try (PreparedStatement pstmt = c.prepareStatement("insert into \"TEST\" values(?)")) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        stmt.execute("drop table if exists EMPLOYEE");
+        //createEmployeeTable(templates);
+        stmt.execute("create table EMPLOYEE ( " +
+                "ID INT PRIMARY KEY AUTO_INCREMENT, " +
+                "FIRSTNAME VARCHAR(50), " +
+                "LASTNAME VARCHAR(50), " +
+                "SALARY DECIMAL, "  +
+                "DATEFIELD DATE, " +
+                "TIMEFIELD TIME, " +
+                "SUPERIOR_ID INT, " +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
+                ")");
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        stmt.execute("drop table if exists TIME_TEST");
+        stmt.execute("drop table if exists DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        stmt.execute("drop table if exists NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 int)");
+
+        // xml
+        stmt.execute("drop table if exists XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        cubridInited = true;
+    }
+
+    public static void initDB2() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.DB2);
+        SQLTemplates templates = new DB2Templates();
+        Connection c = getDB2();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (db2Inited) {
+            return;
+        }
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY(" +
+                "ID int generated by default as identity(start with 1, increment by 1), " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        stmt.execute("create index test_name on test(name)");
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+
+        createEmployeeTable(templates);
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 smallint)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        db2Inited = true;
+    }
+
+
+    public static void initDerby() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.DERBY);
+        SQLTemplates templates = new DerbyTemplates();
+        Connection c = getDerby();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (derbyInited) {
+            return;
+        }
+
+        // types
+        dropType(stmt, "price restrict");
+        stmt.execute("create type price external name 'com.example.Price' language java");
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY(" +
+                "ID int generated by default as identity(start with 1, increment by 1), " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        stmt.execute("create index test_name on test(name)");
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+
+        createEmployeeTable(templates);
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 boolean)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        derbyInited = true;
+    }
+
+    public static void initFirebird() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.FIREBIRD);
+        SQLTemplates templates = new FirebirdTemplates();
+        Connection c = getFirebird();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (firebirdInited) {
+            return;
+        }
+
+        try {
+            stmt.execute("DECLARE EXTERNAL FUNCTION ltrim\n" +
+                    "   CSTRING(255)\n" +
+                    "   RETURNS CSTRING(255) FREE_IT\n" +
+                    "   ENTRY_POINT 'IB_UDF_ltrim' MODULE_NAME 'ib_udf'");
+        } catch (SQLException e) {
+            // do nothing
+        }
+        try {
+            stmt.execute("DECLARE EXTERNAL FUNCTION rtrim\n" +
+                    "   CSTRING(255) NULL\n" +
+                    "   RETURNS CSTRING(255) FREE_IT\n" +
+                    "   ENTRY_POINT 'IB_UDF_rtrim' MODULE_NAME 'ib_udf'");
+        } catch (SQLException e) {
+            // do nothing
+        }
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY(ID int primary key, " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30))");
+
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
+
+        try {
+            //stmt.execute("DROP TRIGGER survey_auto_id;");
+            stmt.execute("DROP GENERATOR survey_gen_id;");
+        } catch (SQLException e) {
+            // do nothing
+        }
+
+        stmt.execute("CREATE GENERATOR survey_gen_id;");
+        stmt.execute("SET GENERATOR survey_gen_id TO 30;");
+        stmt.execute("CREATE TRIGGER survey_auto_id FOR survey\n" +
+                "ACTIVE BEFORE INSERT POSITION 0\n" +
+                "AS\n" +
+                "BEGIN\n" +
+                "IF (NEW.id IS NULL) THEN\n" +
+                "NEW.id = GEN_ID(survey_gen_id,1);\n" +
+                "END ");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+        //createEmployeeTable(templates);
+        stmt.execute("create table EMPLOYEE ( " +
+                "ID INT PRIMARY KEY, " +
+                "FIRSTNAME VARCHAR(50), " +
+                "LASTNAME VARCHAR(50), " +
+                "SALARY DECIMAL, "  +
+                "DATEFIELD DATE, " +
+                "TIMEFIELD TIME, " +
+                "SUPERIOR_ID INT, " +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
+                ")");
+
+        try {
+            //stmt.execute("DROP TRIGGER employee_auto_id;");
+            stmt.execute("DROP GENERATOR employee_gen_id;");
+        } catch (SQLException e) {
+            // do nothing
+        }
+
+        stmt.execute("CREATE GENERATOR employee_gen_id;");
+        stmt.execute("SET GENERATOR employee_gen_id TO 30;");
+        stmt.execute("CREATE TRIGGER employee_auto_id FOR employee\n" +
+                "ACTIVE BEFORE INSERT POSITION 0\n" +
+                "AS\n" +
+                "BEGIN\n" +
+                "IF (NEW.id IS NULL) THEN\n" +
+                "NEW.id = GEN_ID(employee_gen_id,1);\n" +
+                "END ");
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 char(1))");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        firebirdInited = true;
+    }
+
+    public static void initH2() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.H2);
+        SQLTemplates templates = new H2Templates();
+        Connection c = getH2();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (h2Inited) {
+            return;
+        }
+
+        stmt.execute("DROP ALIAS IF EXISTS H2GIS_SPATIAL");
+        stmt.execute("CREATE ALIAS IF NOT EXISTS H2GIS_SPATIAL FOR \"org.h2gis.functions.factory.H2GISFunctions.load\"");
+        stmt.execute("CALL H2GIS_SPATIAL();");
+
+        // shapes
+        dropTable(templates, "SHAPES");
+        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)");
+        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
+            stmt.execute("insert into SHAPES values(" + entry.getKey()
+                    + ", ST_GeomFromText('" + entry.getValue() + "'))");
+        }
+
+        // qtest
+        stmt.execute("drop table QTEST if exists");
+        stmt.execute("create table QTEST (ID int IDENTITY(1,1) NOT NULL,  C1 int NULL)");
+
+        // uuids
+        stmt.execute("drop table if exists UUIDS");
+        stmt.execute("create table UUIDS (FIELD uuid)");
+
+        // survey
+        stmt.execute("drop table SURVEY if exists");
+        stmt.execute(CREATE_TABLE_SURVEY);
+        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello');");
+        stmt.execute("alter table SURVEY alter column id int auto_increment");
+
+        // test
+        stmt.execute("drop table TEST if exists");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        stmt.execute("drop table EMPLOYEE if exists");
+        createEmployeeTable(templates);
+        stmt.execute("alter table EMPLOYEE alter column id int auto_increment");
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        stmt.execute("drop table TIME_TEST if exists");
+        stmt.execute("drop table DATE_TEST if exists");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 boolean)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        h2Inited = true;
+    }
+
+    public static void initHSQL() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.HSQLDB);
+        SQLTemplates templates = new HSQLDBTemplates();
+        Connection c = getHSQL();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (hsqlInited) {
+            return;
+        }
+
+        // arrays
+        stmt.execute("drop table ARRAYTEST if exists");
+        stmt.execute("create table ARRAYTEST ( " +
+                "ID bigint primary key, " +
+                "INTEGERS integer array, " +
+                "MYARRAY varchar(8) array)");
+
+        // dual
+        stmt.execute("drop table DUAL if exists");
+        stmt.execute("create table DUAL ( DUMMY varchar(1) )");
+        stmt.execute("insert into DUAL (DUMMY) values ('X')");
+
+        // survey
+        stmt.execute("drop table SURVEY if exists");
+        //stmt.execute(CREATE_TABLE_SURVEY);
+        stmt.execute("create table SURVEY(" +
+                "ID int generated by default as identity, " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello')");
+
+        // test
+        stmt.execute("drop table TEST if exists");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        stmt.execute("drop table EMPLOYEE if exists");
+        createEmployeeTable(templates);
+        stmt.execute("alter table EMPLOYEE alter column id int generated by default as identity");
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        stmt.execute("drop table TIME_TEST if exists");
+        stmt.execute("drop table DATE_TEST if exists");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 boolean)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        hsqlInited = true;
+    }
+
+    public static void initMySQL() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.MYSQL);
+        //SQLTemplates templates = new MySQLTemplates();
+        Connection c = getMySQL();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (mysqlInited) {
+            return;
+        }
+
+        // shapes
+        stmt.execute("drop table if exists SHAPES");
+        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)");
+        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
+            stmt.execute("insert into SHAPES values(" + entry.getKey()
+                    + ", GeomFromText('" + entry.getValue() + "'))");
+        }
+
+        // survey
+        stmt.execute("drop table if exists SURVEY");
+        stmt.execute("create table SURVEY(ID int primary key auto_increment, " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
+
+        // test
+        stmt.execute("drop table if exists TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        stmt.execute("drop table if exists EMPLOYEE");
+        //createEmployeeTable(templates);
+        stmt.execute("create table EMPLOYEE ( " +
+                "ID INT PRIMARY KEY AUTO_INCREMENT, " +
+                "FIRSTNAME VARCHAR(50), " +
+                "LASTNAME VARCHAR(50), " +
+                "SALARY DECIMAL, "  +
+                "DATEFIELD DATE, " +
+                "TIMEFIELD TIME, " +
+                "SUPERIOR_ID INT, " +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
+                ")");
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        stmt.execute("drop table if exists TIME_TEST");
+        stmt.execute("drop table if exists DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        stmt.execute("drop table if exists NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 tinyint(1))");
+
+        // xml
+        stmt.execute("drop table if exists XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        mysqlInited = true;
+    }
+
+    public static void initOracle() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.ORACLE);
+        SQLTemplates templates = new OracleTemplates();
+        Connection c = getOracle();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (oracleInited) {
+            return;
+        }
+
+        // types
+        stmt.execute("create or replace type ssn_t as object (ssn_type char(11))");
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY (ID number(10,0), " +
+                "NAME varchar(30 char)," +
+                "NAME2 varchar(30 char))");
+
+        try {
+            stmt.execute("drop sequence survey_seq");
+        } catch (SQLException e) {
+            if (!e.getMessage().contains("sequence does not exist")) {
+                throw e;
+            }
+        }
+
+        stmt.execute("create sequence survey_seq");
+        stmt.execute("create or replace trigger survey_trigger\n" +
+                "before insert on survey\n" +
+                "for each row\n"  +
+                "when (new.id is null)\n" +
+                "begin\n" +
+                "  select survey_seq.nextval into :new.id from dual;\n" +
+                "end;\n");
+
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute("create table TEST(name varchar(255))");
+        String sql  = "insert into TEST values(?)";
+        PreparedStatement pstmt = c.prepareStatement(sql);
+        for (int i = 0; i < TEST_ROW_COUNT; i++) {
+            pstmt.setString(1, "name" + i);
+            pstmt.addBatch();
+        }
+        pstmt.executeBatch();
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+        stmt.execute("create table EMPLOYEE ( " +
+                "ID NUMBER(10,0), " +
+                "FIRSTNAME VARCHAR2(50 CHAR), " +
+                "LASTNAME VARCHAR2(50 CHAR), " +
+                "SALARY DOUBLE PRECISION, " +
+                "DATEFIELD DATE, " +
+                "TIMEFIELD TIMESTAMP, " +
+                "SUPERIOR_ID NUMBER(10,0), " +
+                "CONSTRAINT PK_EMPLOYEE PRIMARY KEY(ID), " +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID)" +
+                ")");
+
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "DATE_TEST");
+        stmt.execute("create table date_test(date_test date)");
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 number(1,0))");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL XMLTYPE)");
+
+        oracleInited = true;
+    }
+
+    public static void initPostgreSQL() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.POSTGRESQL);
+        SQLTemplates templates = new PostgreSQLTemplates(true);
+        // NOTE : unquoted identifiers are converted to lower case in PostgreSQL
+        Connection c = getPostgreSQL();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (postgresqlInited) {
+            return;
+        }
+
+        // shapes
+        dropTable(templates, "SHAPES");
+//        stmt.execute("create table \"SHAPES\" (\"ID\" int not null primary key, \"GEOMETRY\" geography(POINT,4326))");
+        stmt.execute("create table \"SHAPES\" (\"ID\" int not null primary key)");
+        stmt.execute("select AddGeometryColumn('SHAPES', 'GEOMETRY', -1, 'GEOMETRY', 2)");
+        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
+            stmt.execute("insert into \"SHAPES\" values(" + entry.getKey()
+                    + ", '" + entry.getValue() + "')");
+        }
+
+        // types
+        dropType(stmt, "u_country");
+        stmt.execute("create type u_country as enum ('Brazil', 'England', 'Germany')");
+
+        dropType(stmt, "u_street_type");
+        stmt.execute("create type u_street_type as (street VARCHAR(100), number VARCHAR(30))");
+
+        // arrays
+        dropTable(templates, "ARRAYTEST");
+        stmt.execute("create table \"ARRAYTEST\" (\n" +
+                "\"ID\" bigint primary key,\n" +
+                "\"INTEGERS\" integer[],\n" +
+                "\"MYARRAY\" varchar(8)[])");
+
+        // uuids
+        dropTable(templates, "UUIDS");
+        stmt.execute("create table \"UUIDS\" (\"FIELD\" uuid)");
+
+        // survey
+        dropTable(templates, "SURVEY");
+        try {
+            stmt.execute("drop sequence SURVEY_SEQ");
+        } catch (SQLException e) {
+            if (!e.getMessage().contains("does not exist")) {
+                throw e;
+            }
+        }
+        stmt.execute("create sequence SURVEY_SEQ");
+        stmt.execute("create table \"SURVEY\"(" +
+                "\"ID\" int DEFAULT NEXTVAL('SURVEY_SEQ'), " +
+                "\"NAME\" varchar(30), \"NAME2\" varchar(30))");
+        stmt.execute("insert into \"SURVEY\" values (1, 'Hello World', 'Hello')");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(quote(CREATE_TABLE_TEST,"TEST","NAME"));
+        String sql = quote(INSERT_INTO_TEST_VALUES,"TEST");
+        try (PreparedStatement pstmt = c.prepareStatement(sql)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        // stmt.execute("drop table employee if exists");
+        dropTable(templates, "EMPLOYEE");
+        createEmployeeTable(templates);
+        addEmployees("insert into \"EMPLOYEE\" " +
+                "(\"ID\", \"FIRSTNAME\", \"LASTNAME\", \"SALARY\", \"DATEFIELD\", \"TIMEFIELD\", \"SUPERIOR_ID\") " +
+                "values (?,?,?,?,?,?,?)");
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(quote(CREATE_TABLE_TIMETEST, "TIME_TEST"));
+        stmt.execute(quote(CREATE_TABLE_DATETEST, "DATE_TEST"));
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table \"NUMBER_TEST\"(\"COL1\" boolean)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table \"XML_TEST\"(\"COL\" XML)");
+
+        postgresqlInited = true;
+    }
+
+    public static void initSQLite() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.SQLITE);
+//        SQLTemplates templates = new SQLiteTemplates();
+        Connection c = getSQLite();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (sqliteInited) {
+            return;
+        }
+
+        // qtest
+        stmt.execute("drop table if exists QTEST");
+        stmt.execute("create table QTEST (ID int IDENTITY(1,1) NOT NULL,  C1 int NULL)");
+
+        // survey
+        stmt.execute("drop table if exists SURVEY");
+        stmt.execute("create table SURVEY(ID int auto_increment, " +
+                "NAME varchar(30)," +
+                "NAME2 varchar(30)," +
+                "constraint survey_pk primary key(ID))");
+        stmt.execute("insert into SURVEY values (1,'Hello World','Hello');");
+
+        // test
+        stmt.execute("drop table if exists TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        stmt.execute("drop table if exists EMPLOYEE");
+        stmt.execute("create table EMPLOYEE ( " +
+                "ID INT AUTO_INCREMENT, " +
+                "FIRSTNAME VARCHAR(50), " +
+                "LASTNAME VARCHAR(50), " +
+                "SALARY DECIMAL, "  +
+                "DATEFIELD DATE, " +
+                "TIMEFIELD TIME, " +
+                "SUPERIOR_ID INT, " +
+                "CONSTRAINT PK_EMPLOYEE PRIMARY KEY(ID)," +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) " +
+                ")");
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+
+        // date_test and time_test
+        stmt.execute("drop table if exists TIME_TEST");
+        stmt.execute("drop table if exists DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        stmt.execute("drop table if exists NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 integer)");
+
+        // xml
+        stmt.execute("drop table if exists XML_TEST");
+        stmt.execute("create table XML_TEST(COL varchar(128))");
+
+        sqliteInited = true;
+    }
+
+    public static void initSQLServer() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.SQLSERVER);
+        SQLTemplates templates = new SQLServerTemplates();
+        Connection c = getSQLServer();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (sqlServerInited) {
+            return;
+        }
+
+        dropTable(templates, "SHAPES");
+        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)");
+        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
+            stmt.execute("insert into SHAPES values(" + entry.getKey()
+                    + ", geometry::STGeomFromText('" + entry.getValue() + "', 0))");
+        }
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY(ID int, NAME varchar(30), NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello')");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+        createEmployeeTable(templates);
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(col1 bit)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(COL XML)");
+
+        sqlServerInited = true;
+    }
+
+    public static void initTeradata() throws SQLException, ClassNotFoundException {
+        targetHolder.set(Target.TERADATA);
+        SQLTemplates templates = new TeradataTemplates();
+        Connection c = getTeradata();
+        connHolder.set(c);
+        Statement stmt = c.createStatement();
+        stmtHolder.set(stmt);
+
+        if (teradataInited) {
+            return;
+        }
+
+        String identity = "GENERATED ALWAYS AS IDENTITY(START WITH 1 INCREMENT BY 1)";
+
+        // shapes
+        dropTable(templates, "SHAPES");
+        stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY ST_GEOMETRY)");
+        for (Map.Entry<Integer, String> entry : getSpatialData().entrySet()) {
+            stmt.execute("insert into SHAPES values(" + entry.getKey()
+                    + ", '" + entry.getValue() + "')");
+        }
+
+        // qtest
+        dropTable(templates, "QTEST");
+        stmt.execute("create table QTEST (ID int " + identity + " NOT NULL, C1 int NULL)");
+
+        // survey
+        dropTable(templates, "SURVEY");
+        stmt.execute("create table SURVEY(ID int " + identity + ", NAME varchar(30), NAME2 varchar(30))");
+        stmt.execute("insert into SURVEY values (1, 'Hello World', 'Hello');");
+
+        // test
+        dropTable(templates, "TEST");
+        stmt.execute(CREATE_TABLE_TEST);
+        try (PreparedStatement pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) {
+            for (int i = 0; i < TEST_ROW_COUNT; i++) {
+                pstmt.setString(1, "name" + i);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+        }
+
+        // employee
+        dropTable(templates, "EMPLOYEE");
+        stmt.execute("create table EMPLOYEE (\n" +
+                "ID INTEGER NOT NULL PRIMARY KEY, \n" +
+                "FIRSTNAME VARCHAR(100),\n" +
+                "LASTNAME VARCHAR(100),\n" +
+                "SALARY DOUBLE PRECISION,\n" +
+                "DATEFIELD DATE,\n" +
+                "TIMEFIELD TIME,\n" +
+                "SUPERIOR_ID INTEGER,\n" +
+                "CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID))");
+        addEmployees(INSERT_INTO_EMPLOYEE);
+
+        // date_test and time_test
+        dropTable(templates, "TIME_TEST");
+        dropTable(templates, "DATE_TEST");
+        stmt.execute(CREATE_TABLE_TIMETEST);
+        stmt.execute(CREATE_TABLE_DATETEST);
+
+        // numbers
+        dropTable(templates, "NUMBER_TEST");
+        stmt.execute("create table NUMBER_TEST(ID int " + identity + " NOT NULL, col1 int)");
+
+        // xml
+        dropTable(templates, "XML_TEST");
+        stmt.execute("create table XML_TEST(ID int " + identity + " NOT NULL, COL varchar(128))");
+
+        teradataInited = true;
+    }
+
+    static void addEmployee(String sql, int id, String firstName, String lastName,
+                            double salary, int superiorId) throws SQLException {
+        PreparedStatement stmt = connHolder.get().prepareStatement(sql);
+        stmt.setInt(1, id);
+        stmt.setString(2, firstName);
+        stmt.setString(3,lastName);
+        stmt.setDouble(4, salary);
+        stmt.setDate(5, Constants.date);
+        stmt.setTime(6, Constants.time);
+        if (superiorId <= 0) {
+            stmt.setNull(7, Types.INTEGER);
+        } else {
+            stmt.setInt(7, superiorId);
+        }
+        stmt.execute();
+        stmt.close();
+    }
+
+    private static void addEmployees(String sql) throws SQLException {
+        addEmployee(sql, 1, "Mike", "Smith", 160000, -1);
+        addEmployee(sql, 2, "Mary", "Smith", 140000, -1);
+
+        // Employee under Mike
+        addEmployee(sql, 10, "Joe", "Divis", 50000, 1);
+        addEmployee(sql, 11, "Peter", "Mason", 45000, 1);
+        addEmployee(sql, 12, "Steve", "Johnson", 40000, 1);
+        addEmployee(sql, 13, "Jim", "Hood", 35000, 1);
+
+        // Employee under Mike
+        addEmployee(sql, 20, "Jennifer", "Divis", 60000, 2);
+        addEmployee(sql, 21, "Helen", "Mason", 50000, 2);
+        addEmployee(sql, 22, "Daisy", "Johnson", 40000, 2);
+        addEmployee(sql, 23, "Barbara", "Hood", 30000, 2);
+    }
+
+    private static String quote(String sql, String... identifiers) {
+        String rv = sql;
+        for (String id : identifiers) {
+            rv = rv.replace(id,  "\"" + id +  "\"");
+        }
+        return rv;
+    }
+
+    private Connections() { }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java
new file mode 100644
index 0000000000..55aa7bc529
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java
@@ -0,0 +1,17 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.geolatte.geom.codec.Wkt;
+import org.junit.Test;
+
+public class ConnectionsTest {
+
+    @Test
+    public void valid_wkt() {
+        for (String wkt : Connections.getSpatialData().values()) {
+            assertNotNull(Wkt.newDecoder(Wkt.Dialect.POSTGIS_EWKT_1).decode(wkt));
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Constants.java b/querydsl-sql/src/test/java/com/querydsl/sql/Constants.java
new file mode 100644
index 0000000000..447cd4c847
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Constants.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.Calendar;
+
+import org.joda.time.LocalDate;
+
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public final class Constants {
+
+    private Constants() { }
+
+    public static final java.sql.Date date;
+
+    public static final java.sql.Time time;
+
+    public static final QEmployee employee = new QEmployee("e");
+
+    public static final QEmployee employee2 = new QEmployee("e2");
+
+    public static final QSurvey survey = new QSurvey("s");
+
+    public static final QSurvey survey2 = new QSurvey("s2");
+
+    static {
+        LocalDate localDate = new LocalDate(2000, 2, 10);
+        date = new java.sql.Date(localDate.toDateMidnight().getMillis());
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(1970, 0, 1, 3, 4);
+        cal.set(Calendar.SECOND, 30);
+        cal.set(Calendar.MILLISECOND, 0);
+        time = new java.sql.Time(cal.getTimeInMillis());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java
new file mode 100644
index 0000000000..555b5f152b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+
+public class DB2TemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new DB2Templates();
+    }
+
+    @Test
+    public void precedence() {
+        // Expressions within parentheses are evaluated first. When the order of evaluation is not
+        // specified by parentheses, prefix operators are applied before multiplication and division,
+        // and multiplication, division, and concatenation are applied before addition and subtraction.
+        // Operators at the same precedence level are applied from left to right.
+
+        int p1 = getPrecedence(Ops.NEGATE);
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.CONCAT);
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        int p4 = getPrecedence(Ops.EQ, Ops.NE, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        int p5 = getPrecedence(Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN, Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+        int p6 = getPrecedence(Ops.NOT);
+        int p7 = getPrecedence(Ops.AND);
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java
new file mode 100644
index 0000000000..80264ec82f
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java
@@ -0,0 +1,59 @@
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.ReportingOnly;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.DateTimePath;
+import com.querydsl.core.types.dsl.Expressions;
+
+@Category(ReportingOnly.class)
+public class DateArithmeticTest {
+
+    private String serialize(Expression<?> expr, SQLTemplates templates) {
+        SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
+        serializer.handle(expr);
+        return serializer.toString();
+    }
+
+    @Test
+    public void test() {
+        List<SQLTemplates> list = new ArrayList<>();
+        list.add(new CUBRIDTemplates());
+        list.add(new DerbyTemplates());
+        list.add(new H2Templates());
+        list.add(new HSQLDBTemplates());
+        list.add(new MySQLTemplates());
+        list.add(new OracleTemplates());
+        list.add(new PostgreSQLTemplates());
+        list.add(new SQLiteTemplates());
+        list.add(new SQLServerTemplates());
+        list.add(new SQLServer2005Templates());
+        list.add(new SQLServer2012Templates());
+        list.add(new TeradataTemplates());
+
+        List<Expression<?>> exprs = new ArrayList<>();
+        DateTimePath<Date> path = Expressions.dateTimePath(Date.class, "date");
+        exprs.add(SQLExpressions.addYears(path, 2));
+        exprs.add(SQLExpressions.addMonths(path, 2));
+        exprs.add(SQLExpressions.addDays(path, 2));
+        exprs.add(SQLExpressions.addHours(path, 2));
+        exprs.add(SQLExpressions.addMinutes(path, 2));
+        exprs.add(SQLExpressions.addSeconds(path, 2));
+
+        for (SQLTemplates templates : list) {
+            System.out.println(templates.getClass().getSimpleName());
+            for (Expression<?> expr : exprs) {
+                System.err.println(serialize(expr, templates));
+            }
+            System.out.println();
+
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java
new file mode 100644
index 0000000000..7197d5fbca
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.survey;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.SQLException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class DeleteBase extends AbstractBaseTest {
+
+    private void reset() throws SQLException {
+        delete(survey).where(survey.name.isNotNull()).execute();
+        insert(survey).values(1, "Hello World", "Hello").execute();
+    }
+
+    @Before
+    public void setUp() throws SQLException {
+        reset();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        reset();
+    }
+
+    @Test
+    public void batch() throws SQLException {
+        insert(survey).values(2, "A","B").execute();
+        insert(survey).values(3, "B","C").execute();
+
+        SQLDeleteClause delete = delete(survey);
+        delete.where(survey.name.eq("A")).addBatch();
+        assertEquals(1, delete.getBatchCount());
+        delete.where(survey.name.eq("B")).addBatch();
+        assertEquals(2, delete.getBatchCount());
+        assertEquals(2, delete.execute());
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLITE})
+    public void batch_templates() throws SQLException {
+        insert(survey).values(2, "A","B").execute();
+        insert(survey).values(3, "B","C").execute();
+
+        SQLDeleteClause delete = delete(survey);
+        delete.where(survey.name.eq(Expressions.stringTemplate("'A'"))).addBatch();
+        delete.where(survey.name.eq(Expressions.stringTemplate("'B'"))).addBatch();
+        assertEquals(2, delete.execute());
+    }
+
+    @Test
+    @ExcludeIn(MYSQL)
+    public void delete() throws SQLException {
+        long count = query().from(survey).fetchCount();
+        assertEquals(0, delete(survey).where(survey.name.eq("XXX")).execute());
+        assertEquals(count, delete(survey).execute());
+    }
+
+    @Test
+    @IncludeIn({CUBRID, H2, MYSQL, ORACLE, SQLSERVER})
+    public void delete_limit() {
+        insert(survey).values(2, "A","B").execute();
+        insert(survey).values(3, "B","C").execute();
+        insert(survey).values(4, "D","E").execute();
+
+        assertEquals(2, delete(survey).limit(2).execute());
+    }
+
+    @Test
+    public void delete_with_subQuery_exists() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLDeleteClause delete = delete(survey1);
+        delete.where(survey1.name.eq("XXX"),
+                query().from(employee).where(survey1.id.eq(employee.id)).exists());
+        assertEquals(0, delete.execute());
+    }
+
+    @Test
+    public void delete_with_subQuery_exists_Params() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+
+        Param<Integer> param = new Param<Integer>(Integer.class, "param");
+        SQLQuery<?> sq = query().from(employee).where(employee.id.eq(param));
+        sq.set(param, -12478923);
+
+        SQLDeleteClause delete = delete(survey1);
+        delete.where(survey1.name.eq("XXX"), sq.exists());
+        assertEquals(0, delete.execute());
+    }
+
+    @Test
+    public void delete_with_subQuery_exists2() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLDeleteClause delete = delete(survey1);
+        delete.where(survey1.name.eq("XXX"),
+                query().from(employee).where(survey1.name.eq(employee.lastname)).exists());
+        assertEquals(0, delete.execute());
+    }
+
+
+    @Test
+    @ExcludeIn({CUBRID, SQLITE})
+    public void delete_with_tempateExpression_in_batch() {
+        assertEquals(1, delete(survey)
+            .where(survey.name.eq(Expressions.stringTemplate("'Hello World'")))
+            .addBatch()
+            .execute());
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java
new file mode 100644
index 0000000000..4c7a467664
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import jdepend.framework.JDepend;
+
+public class DependenciesTest {
+
+    @Test
+    @Ignore
+    public void test() throws IOException {
+        JDepend jdepend = new JDepend();
+        jdepend.addDirectory("target/classes/com/querydsl/sql");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/ddl");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/dml");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/mssql");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/mysql");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/oracle");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/support");
+        jdepend.addDirectory("target/classes/com/querydsl/sql/types");
+
+        jdepend.analyze();
+        assertFalse(jdepend.containsCycles());
+
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java
new file mode 100644
index 0000000000..2fd176dcb1
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.dsl.Expressions;
+
+public class DerbyTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new DerbyTemplates();
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertEquals("next value for myseq", new SQLSerializer(new Configuration(new DerbyTemplates())).handle(nextval).toString());
+    }
+
+    @Test
+    public void precedence() {
+        // unary + and -
+        int p1 = getPrecedence(Ops.NEGATE);
+        // *, /, || (concatenation)
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV);
+        // binary + and -
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        // comparisons, quantified comparisons, EXISTS, IN, IS NULL, LIKE, BETWEEN, IS
+        int p4 = getPrecedence(Ops.EQ, Ops.NE, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE, Ops.EXISTS,
+                Ops.IN, Ops.IS_NULL, Ops.LIKE, Ops.BETWEEN, Ops.IS_NOT_NULL);
+        // NOT
+        int p5 = getPrecedence(Ops.NOT);
+        // AND
+        int p6 = getPrecedence(Ops.AND);
+        // OR
+        int p7 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+    }
+
+    @Test
+    @Override
+    public void booleanTemplate() {
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.TRUE), "b = true");
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.FALSE), "b = false");
+        query.setUseLiterals(true);
+        query.where(Expressions.booleanPath("b").eq(true));
+        assertTrue(query.toString(), query.toString().endsWith("where b = true"));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/DummyBlob.java b/querydsl-sql/src/test/java/com/querydsl/sql/DummyBlob.java
similarity index 94%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/DummyBlob.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/DummyBlob.java
index a024103123..ebcce2519a 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/DummyBlob.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/DummyBlob.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.sql.Blob;
 import java.sql.SQLException;
 
-public class DummyBlob implements Blob{
+public class DummyBlob implements Blob {
 
     @Override
     public void free() throws SQLException {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -85,7 +85,7 @@ public int setBytes(long pos, byte[] bytes, int offset, int len)
     @Override
     public void truncate(long len) throws SQLException {
         // TODO Auto-generated method stub
-        
+
     }
 
 }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/EncryptedString.java b/querydsl-sql/src/test/java/com/querydsl/sql/EncryptedString.java
new file mode 100644
index 0000000000..77083aec07
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/EncryptedString.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.sql.types.StringType;
+
+public class EncryptedString extends StringType {
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java b/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java
new file mode 100644
index 0000000000..b912775495
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLQuery.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.Connection;
+import java.util.List;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Projections;
+
+/**
+ * @author tiwe
+ *
+ */
+public class ExtendedSQLQuery<T> extends AbstractSQLQuery<T, ExtendedSQLQuery<T>> {
+
+    public ExtendedSQLQuery(SQLTemplates templates) {
+        super((Connection) null, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public ExtendedSQLQuery(Connection conn, SQLTemplates templates) {
+        super(conn, new Configuration(templates), new DefaultQueryMetadata());
+    }
+
+    public ExtendedSQLQuery(Connection conn, Configuration configuration) {
+        super(conn, configuration, new DefaultQueryMetadata());
+    }
+
+    public ExtendedSQLQuery(Connection conn, Configuration configuration, QueryMetadata metadata) {
+        super(conn, configuration, metadata);
+    }
+
+    public <RT> CloseableIterator<RT> iterate(Class<RT> type, Expression<?>... exprs) {
+        return select(createProjection(type, exprs)).iterate();
+    }
+
+    public <RT> RT uniqueResult(Class<RT> type, Expression<?>... exprs) {
+        return select(createProjection(type, exprs)).fetchOne();
+    }
+
+    public <RT> List<RT> list(Class<RT> type, Expression<?>... exprs) {
+        return select(createProjection(type, exprs)).fetch();
+    }
+
+    public <RT> QueryResults<RT> listResults(Class<RT> type, Expression<?>... exprs) {
+        return select(createProjection(type, exprs)).fetchResults();
+    }
+
+    private <T> FactoryExpression<T> createProjection(Class<T> type, Expression<?>... exprs) {
+        return Projections.bean(type, exprs);
+    }
+
+    @Override
+    public ExtendedSQLQuery<T> clone(Connection connection) {
+        ExtendedSQLQuery<T> query = new ExtendedSQLQuery<T>(connection, getConfiguration(), getMetadata().clone());
+        query.clone(this);
+        return query;
+    }
+
+    @Override
+    public <U> ExtendedSQLQuery<U> select(Expression<U> expr) {
+        queryMixin.setProjection(expr);
+        @SuppressWarnings("unchecked") // This is the new type
+        ExtendedSQLQuery<U> newType = (ExtendedSQLQuery<U>) this;
+        return newType;
+    }
+
+    @Override
+    public ExtendedSQLQuery<Tuple> select(Expression<?>... exprs) {
+        queryMixin.setProjection(exprs);
+        @SuppressWarnings("unchecked") // This is the new type
+        ExtendedSQLQuery<Tuple> newType = (ExtendedSQLQuery<Tuple>) this;
+        return newType;
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java
similarity index 77%
rename from querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java
index a9a070164d..de87b9e66a 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/ExtendedSQLTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java
@@ -1,16 +1,18 @@
-package com.mysema.query;
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 
-import com.mysema.query.sql.*;
-import com.mysema.query.sql.mysql.MySQLQuery;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.expr.Wildcard;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.core.types.dsl.Wildcard;
+import com.querydsl.sql.mysql.MySQLQuery;
 
 public class ExtendedSQLTest {
 
@@ -81,7 +83,7 @@ public void test() {
 
         QAuthor author = QAuthor.author;
         QBook book = QBook.book;
-        MySQLQuery query = new MySQLQuery(null);
+        MySQLQuery<?> query = new MySQLQuery<Void>(null);
         query.from(author)
            .join(book).on(author.id.eq(book.authorId))
            .where(book.language.eq("DE"), book.published.eq(new Date()))
@@ -93,23 +95,21 @@ public void test() {
            .forUpdate();
            // of(author.firstName, author.lastName)
 
-        query.getMetadata().addProjection(author.firstName);
-        query.getMetadata().addProjection(author.lastName);
-        query.getMetadata().addProjection(Wildcard.count);
+        query.getMetadata().setProjection(Projections.tuple(author.firstName, author.lastName, Wildcard.count));
 
         SQLSerializer serializer = new SQLSerializer(new Configuration(new MySQLTemplates()));
         serializer.serialize(query.getMetadata(), false);
 
-        assertEquals("select author.FIRST_NAME, author.LAST_NAME, count(*)\n"+
-                     "from AUTHOR author\n"+
-                     "join BOOK book\n"+
-                     "on author.ID = book.AUTHOR_ID\n"+
-                     "where book.LANGUAGE = ? and book.PUBLISHED = ?\n"+
-                     "group by author.FIRST_NAME, author.LAST_NAME\n"+
-                     "having count(*) > ?\n"+
-                     "order by author.LAST_NAME asc\n"+
-                     "limit ?\n"+
-                     "offset ?\n"+
+        assertEquals("select author.FIRST_NAME, author.LAST_NAME, count(*)\n" +
+                     "from AUTHOR author\n" +
+                     "join BOOK book\n" +
+                     "on author.ID = book.AUTHOR_ID\n" +
+                     "where book.LANGUAGE = ? and book.PUBLISHED = ?\n" +
+                     "group by author.FIRST_NAME, author.LAST_NAME\n" +
+                     "having count(*) > ?\n" +
+                     "order by author.LAST_NAME asc\n" +
+                     "limit ?\n" +
+                     "offset ?\n" +
                      "for update", serializer.toString());
 
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java
new file mode 100644
index 0000000000..e65ef084c7
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public class FirebirdTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new FirebirdTemplates();
+    }
+
+    @Override
+    public void arithmetic() {
+        // uses additional casts
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @Override
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.numberPath(Integer.class,"col1");
+        Union union = query.union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+
+        assertEquals(
+                "select 1 as col1 from RDB$DATABASE\n" +
+                "union\n" +
+                "select 2 from RDB$DATABASE\n" +
+                "union\n" +
+                "select 3 from RDB$DATABASE", union.toString());
+    }
+
+    @Test
+    public void precedence() {
+        // concat
+        // *, /, +, -
+        // comparison
+        // NOT
+        // AND
+        // OR
+
+        int p1 = getPrecedence(Ops.CONCAT);
+        int p2 = getPrecedence(Ops.NEGATE);
+        int p3 = getPrecedence(Ops.MULT, Ops.DIV);
+        int p4 = getPrecedence(Ops.SUB, Ops.ADD);
+        int p5 = getPrecedence(Ops.EQ, Ops.GOE, Ops.GT, Ops.LT, Ops.NE, Ops.IS_NULL, Ops.IS_NOT_NULL,
+                               Ops.MATCHES, Ops.IN, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN);
+        int p6 = getPrecedence(Ops.NOT);
+        int p7 = getPrecedence(Ops.AND);
+        int p8 = getPrecedence(Ops.XOR, Ops.XNOR);
+        int p9 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+        assertTrue(p8 < p9);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/ForeignKeyTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java
similarity index 77%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/ForeignKeyTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java
index d62c1451a9..08bca342b8 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/ForeignKeyTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,20 +11,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.mysema.query.sql.domain.Employee;
-import com.mysema.query.sql.domain.QEmployee;
+import com.querydsl.sql.domain.Employee;
+import com.querydsl.sql.domain.QEmployee;
+
+import java.util.Arrays;
 
 public class ForeignKeyTest {
 
     @Test
-    public void On() {
+    public void on() {
         QEmployee employee = new QEmployee("employee");
         QEmployee employee2 = new QEmployee("employee2");
 
@@ -32,8 +33,8 @@ public void On() {
         assertEquals("employee.superiorId = employee2.ID", foreignKey.on(employee2).toString());
 
         foreignKey = new ForeignKey<Employee>(employee,
-               ImmutableList.of(employee.superiorId, employee.firstname),
-               ImmutableList.of("ID", "FN"));
+                Arrays.asList(employee.superiorId, employee.firstname),
+                Arrays.asList("ID", "FN"));
         assertEquals("employee.superiorId = employee2.ID && employee.firstname = employee2.FN", foreignKey.on(employee2).toString());
     }
 
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java
new file mode 100644
index 0000000000..41f398255a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+
+public class H2TemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new H2Templates();
+    }
+
+    @Test
+    public void builder() {
+        SQLTemplates templates = H2Templates.builder().quote()
+            .newLineToSingleSpace()
+            .build();
+
+        assertNotNull(templates);
+    }
+
+    @Test
+    public void precedence() {
+        // unary
+        // *, /, %
+        // +, -
+        // ||
+        // comparison
+        // NOT
+        // AND
+        // OR
+
+        int p1 = getPrecedence(Ops.NEGATE);
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        int p4 = getPrecedence(Ops.CONCAT);
+        int p5 = getPrecedence(Ops.EQ, Ops.NE, Ops.LT, Ops.GT); // ...
+        int p6 = getPrecedence(Ops.NOT);
+        int p7 = getPrecedence(Ops.AND);
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java
new file mode 100644
index 0000000000..bcbb75971e
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+
+public class HSQLDBTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new HSQLDBTemplates();
+    }
+
+    @Test
+    public void precedence() {
+        // Evaluation from left to right. Parentheses group operations.
+        // Multiplication and division take precedence over addition and subtraction.
+        // AND takes precedence over OR.
+        // NOT applies to the immediate term.
+        // LIKE applies to the result of any string concatenation to the right.
+        // Comparison ops are not combined without logical ops so there is no precedence issue.
+
+        //int p1 = getPrecedence(Ops.NEGATE);
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.CONCAT);
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        int p4 = getPrecedence(Ops.NOT);
+        int p5 = getPrecedence(Ops.EQ, Ops.NE, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        int p6 = getPrecedence(Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN, Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+        int p7 = getPrecedence(Ops.AND);
+        int p8 = getPrecedence(Ops.OR);
+
+        //assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java
new file mode 100644
index 0000000000..91c7ed19e7
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java
@@ -0,0 +1,511 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.survey;
+import static com.querydsl.sql.Constants.survey2;
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.*;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.core.QueryFlag.Position;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.sql.dml.DefaultMapper;
+import com.querydsl.sql.dml.Mapper;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.domain.*;
+
+public class InsertBase extends AbstractBaseTest {
+
+    private void reset() throws SQLException {
+        delete(survey).execute();
+        insert(survey).values(1, "Hello World", "Hello").execute();
+
+        delete(QDateTest.qDateTest).execute();
+    }
+
+    @Before
+    public void setUp() throws SQLException {
+        reset();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        reset();
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLITE}) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems
+    public void insert_dates() {
+        QDateTest dateTest = QDateTest.qDateTest;
+        LocalDate localDate = new LocalDate(1978, 1, 2);
+
+        Path<LocalDate> localDateProperty = ExpressionUtils.path(LocalDate.class, "DATE_TEST");
+        Path<DateTime> dateTimeProperty = ExpressionUtils.path(DateTime.class, "DATE_TEST");
+        SQLInsertClause insert = insert(dateTest);
+        insert.set(localDateProperty, localDate);
+        insert.execute();
+
+        Tuple result = query().from(dateTest).select(
+                dateTest.dateTest.year(),
+                dateTest.dateTest.month(),
+                dateTest.dateTest.dayOfMonth(),
+                dateTimeProperty).fetchFirst();
+        assertEquals(Integer.valueOf(1978), result.get(0, Integer.class));
+        assertEquals(Integer.valueOf(1), result.get(1, Integer.class));
+        assertEquals(Integer.valueOf(2), result.get(2, Integer.class));
+
+        DateTime dateTime = result.get(dateTimeProperty);
+        if (target == CUBRID) {
+            // XXX Cubrid adds random milliseconds for some reason
+            dateTime = dateTime.withMillisOfSecond(0);
+        }
+        assertEquals(localDate.toDateTimeAtStartOfDay(), dateTime);
+    }
+
+    @Test
+    public void complex1() {
+        // related to #584795
+        QSurvey survey = new QSurvey("survey");
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLInsertClause insert = insert(survey);
+        insert.columns(survey.id, survey.name);
+        insert.select(select(survey.id, emp2.firstname).from(survey)
+          .innerJoin(emp1)
+           .on(survey.id.eq(emp1.id))
+          .innerJoin(emp2)
+           .on(emp1.superiorId.eq(emp2.superiorId), emp1.firstname.eq(emp2.firstname)));
+
+        assertEquals(0, insert.execute());
+    }
+
+    @Test
+    public void insert_alternative_syntax() {
+        // with columns
+        assertEquals(1, insert(survey)
+            .set(survey.id, 3)
+            .set(survey.name, "Hello")
+            .execute());
+    }
+
+    @Test
+    public void insert_batch() {
+        SQLInsertClause insert = insert(survey)
+                .set(survey.id, 5)
+                .set(survey.name, "55")
+                .addBatch();
+
+        assertEquals(1, insert.getBatchCount());
+
+        insert.set(survey.id, 6)
+                .set(survey.name, "66")
+                .addBatch();
+
+        assertEquals(2, insert.getBatchCount());
+        assertEquals(2, insert.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("55")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.eq("66")).fetchCount());
+    }
+
+    @Test
+    public void insert_batch_to_bulk() {
+        SQLInsertClause insert = insert(survey);
+        insert.setBatchToBulk(true);
+
+        insert.set(survey.id, 5)
+                .set(survey.name, "55")
+                .addBatch();
+
+        assertEquals(1, insert.getBatchCount());
+
+        insert.set(survey.id, 6)
+                .set(survey.name, "66")
+                .addBatch();
+
+        assertEquals(2, insert.getBatchCount());
+        assertEquals(2, insert.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("55")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.eq("66")).fetchCount());
+    }
+
+    @Test
+    public void insert_batch_Templates() {
+        SQLInsertClause insert = insert(survey)
+                .set(survey.id, 5)
+                .set(survey.name, Expressions.stringTemplate("'55'"))
+                .addBatch();
+
+        insert.set(survey.id, 6)
+                .set(survey.name, Expressions.stringTemplate("'66'"))
+                .addBatch();
+
+        assertEquals(2, insert.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("55")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.eq("66")).fetchCount());
+    }
+
+    @Test
+    public void insert_batch2() {
+        SQLInsertClause insert = insert(survey)
+                .set(survey.id, 5)
+                .set(survey.name, "55")
+                .addBatch();
+
+        insert.set(survey.id, 6)
+                .setNull(survey.name)
+                .addBatch();
+
+        assertEquals(2, insert.execute());
+    }
+
+    @Test
+    public void insert_null_with_columns() {
+        assertEquals(1, insert(survey)
+                .columns(survey.id, survey.name)
+                .values(3, null).execute());
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY})
+    public void insert_null_without_columns() {
+        assertEquals(1, insert(survey)
+                .values(4, null, null).execute());
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD, HSQLDB, DB2, DERBY, ORACLE})
+    public void insert_without_values() {
+        assertEquals(1, insert(survey).execute());
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    public void insert_nulls_in_batch() {
+//        QFoo f= QFoo.foo;
+//        SQLInsertClause sic = new SQLInsertClause(c, new H2Templates(), f);
+//        sic.columns(f.c1,f.c2).values(null,null).addBatch();
+//        sic.columns(f.c1,f.c2).values(null,1).addBatch();
+//        sic.execute();
+        SQLInsertClause sic = insert(survey);
+        sic.columns(survey.name, survey.name2).values(null, null).addBatch();
+        sic.columns(survey.name, survey.name2).values(null, "X").addBatch();
+        assertEquals(2, sic.execute());
+    }
+
+    @Test
+    @Ignore
+    @ExcludeIn({DERBY})
+    public void insert_nulls_in_batch2() {
+        Mapper<Object> mapper = DefaultMapper.WITH_NULL_BINDINGS;
+//        QFoo f= QFoo.foo;
+//        SQLInsertClause sic = new SQLInsertClause(c, new H2Templates(), f);
+//        Foo f1=new Foo();
+//        sic.populate(f1).addBatch();
+//        f1=new Foo();
+//        f1.setC1(1);
+//        sic.populate(f1).addBatch();
+//        sic.execute();
+        QEmployee employee = QEmployee.employee;
+        SQLInsertClause sic = insert(employee);
+        Employee e = new Employee();
+        sic.populate(e, mapper).addBatch();
+        e = new Employee();
+        e.setFirstname("X");
+        sic.populate(e, mapper).addBatch();
+        assertEquals(0, sic.execute());
+
+    }
+
+    @Test
+    public void insert_with_columns() {
+        assertEquals(1, insert(survey)
+                .columns(survey.id, survey.name)
+                .values(3, "Hello").execute());
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLSERVER})
+    public void insert_with_keys() throws SQLException {
+        ResultSet rs = insert(survey).set(survey.name, "Hello World").executeWithKeys();
+        assertTrue(rs.next());
+        assertTrue(rs.getObject(1) != null);
+        rs.close();
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLSERVER})
+    public void insert_with_keys_listener() throws SQLException {
+        final AtomicBoolean result = new AtomicBoolean();
+        SQLListener listener = new SQLBaseListener() {
+            @Override
+            public void end(SQLListenerContext context) {
+                result.set(true);
+            }
+        };
+        SQLInsertClause clause = insert(survey).set(survey.name, "Hello World");
+        clause.addListener(listener);
+        ResultSet rs = clause.executeWithKeys();
+        assertFalse(result.get());
+        assertTrue(rs.next());
+        assertTrue(rs.getObject(1) != null);
+        rs.close();
+        assertTrue(result.get());
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLSERVER})
+    public void insert_with_keys_Projected() throws SQLException {
+        assertNotNull(insert(survey).set(survey.name, "Hello you").executeWithKey(survey.id));
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, SQLSERVER})
+    public void insert_with_keys_Projected2() throws SQLException {
+        Path<Object> idPath = ExpressionUtils.path(Object.class, "id");
+        Object id = insert(survey).set(survey.name, "Hello you").executeWithKey(idPath);
+        assertNotNull(id);
+    }
+
+    @Test(expected = QueryException.class)
+    @IncludeIn({DERBY, HSQLDB})
+    public void insert_with_keys_OverriddenColumn() throws SQLException {
+      String originalColumnName = ColumnMetadata.getName(survey.id);
+        try {
+            configuration.registerColumnOverride(survey.getSchemaName(), survey.getTableName(),
+                originalColumnName, "wrongColumnName");
+
+            SQLInsertClause sqlInsertClause = new SQLInsertClause(connection, configuration, survey);
+            sqlInsertClause.addListener(new TestLoggingListener());
+            Object id = sqlInsertClause.set(survey.name, "Hello you").executeWithKey(survey.id);
+            assertNotNull(id);
+        } finally {
+            configuration.registerColumnOverride(survey.getSchemaName(), survey.getTableName(),
+                originalColumnName, originalColumnName);
+        }
+    }
+
+ // http://sourceforge.net/tracker/index.php?func=detail&aid=3513432&group_id=280608&atid=2377440
+
+    @Test
+    public void insert_with_set() {
+        assertEquals(1, insert(survey)
+                .set(survey.id, 5)
+                .set(survey.name, (String) null)
+                .execute());
+    }
+
+    @Test
+    @IncludeIn(MYSQL)
+    @SkipForQuoted
+    public void insert_with_special_options() {
+        SQLInsertClause clause = insert(survey)
+            .columns(survey.id, survey.name)
+            .values(3, "Hello");
+
+        clause.addFlag(Position.START_OVERRIDE, "insert ignore into ");
+
+        assertEquals("insert ignore into SURVEY (ID, NAME) values (?, ?)", clause.toString());
+        assertEquals(1, clause.execute());
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insert_with_subQuery() {
+        int count = (int) query().from(survey).fetchCount();
+        assertEquals(count, insert(survey)
+            .columns(survey.id, survey.name)
+            .select(query().from(survey2).select(survey2.id.add(20), survey2.name))
+            .execute());
+    }
+
+    @Test
+    @ExcludeIn({DB2, HSQLDB, CUBRID, DERBY, FIREBIRD})
+    public void insert_with_subQuery2() {
+//        insert into modules(name)
+//        select 'MyModule'
+//        where not exists
+//        (select 1 from modules where modules.name = 'MyModule')
+
+        assertEquals(1, insert(survey).set(survey.name,
+            query().where(query().from(survey2)
+                           .where(survey2.name.eq("MyModule")).notExists())
+                .select(Expressions.constant("MyModule")).fetchFirst())
+            .execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("MyModule")).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn({HSQLDB, CUBRID, DERBY})
+    public void insert_with_subQuery3() {
+//        insert into modules(name)
+//        select 'MyModule'
+//        where not exists
+//        (select 1 from modules where modules.name = 'MyModule')
+
+        assertEquals(1, insert(survey).columns(survey.name).select(
+            query().where(query().from(survey2)
+                           .where(survey2.name.eq("MyModule2")).notExists())
+                .select(Expressions.constant("MyModule2")))
+            .execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("MyModule2")).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insert_with_subQuery_Params() {
+        Param<Integer> param = new Param<Integer>(Integer.class, "param");
+        SQLQuery<?> sq = query().from(survey2);
+        sq.set(param, 20);
+
+        int count = (int) query().from(survey).fetchCount();
+        assertEquals(count, insert(survey)
+            .columns(survey.id, survey.name)
+            .select(sq.select(survey2.id.add(param), survey2.name))
+            .execute());
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insert_with_subQuery_Via_Constructor() {
+        int count = (int) query().from(survey).fetchCount();
+        SQLInsertClause insert = insert(survey, query().from(survey2));
+        insert.set(survey.id, survey2.id.add(20));
+        insert.set(survey.name, survey2.name);
+        assertEquals(count, insert.execute());
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insert_with_subQuery_Without_Columns() {
+        int count = (int) query().from(survey).fetchCount();
+        assertEquals(count, insert(survey)
+            .select(query().from(survey2).select(survey2.id.add(10), survey2.name, survey2.name2))
+            .execute());
+
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insert_without_columns() {
+        assertEquals(1, insert(survey).values(4, "Hello", "World").execute());
+
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD) // too slow
+    public void insertBatch_with_subquery() {
+        SQLInsertClause insert = insert(survey)
+            .columns(survey.id, survey.name)
+            .select(query().from(survey2).select(survey2.id.add(20), survey2.name))
+            .addBatch();
+
+        insert(survey)
+            .columns(survey.id, survey.name)
+            .select(query().from(survey2).select(survey2.id.add(40), survey2.name))
+            .addBatch();
+
+        assertEquals(1, insert.execute());
+    }
+
+    @Test
+    public void like() {
+        insert(survey).values(11, "Hello World", "a\\b").execute();
+        assertEquals(1L, query().from(survey).where(survey.name2.contains("a\\b")).fetchCount());
+    }
+
+    @Test
+    public void like_with_escape() {
+        SQLInsertClause insert = insert(survey);
+        insert.set(survey.id, 5).set(survey.name, "aaa").addBatch();
+        insert.set(survey.id, 6).set(survey.name, "a_").addBatch();
+        insert.set(survey.id, 7).set(survey.name, "a%").addBatch();
+        assertEquals(3, insert.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.like("a|%", '|')).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.like("a|_", '|')).fetchCount());
+        assertEquals(3L, query().from(survey).where(survey.name.like("a%")).fetchCount());
+        assertEquals(2L, query().from(survey).where(survey.name.like("a_")).fetchCount());
+
+        assertEquals(1L, query().from(survey).where(survey.name.startsWith("a_")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.startsWith("a%")).fetchCount());
+    }
+
+    @Test
+    @IncludeIn(MYSQL)
+    @SkipForQuoted
+    public void replace() {
+        SQLInsertClause clause = mysqlReplace(survey);
+        clause.columns(survey.id, survey.name)
+            .values(3, "Hello");
+
+        assertEquals("replace into SURVEY (ID, NAME) values (?, ?)", clause.toString());
+        clause.execute();
+    }
+
+    @Test
+    public void insert_with_tempateExpression_in_batch() {
+        assertEquals(1, insert(survey)
+                .set(survey.id, 3)
+                .set(survey.name, Expressions.stringTemplate("'Hello'"))
+                .addBatch()
+                .execute());
+    }
+
+    @Test
+    @IncludeIn({H2, POSTGRESQL})
+    @SkipForQuoted
+    public void uuids() {
+        delete(QUuids.uuids).execute();
+        QUuids uuids = QUuids.uuids;
+        UUID uuid = UUID.randomUUID();
+        insert(uuids).set(uuids.field, uuid).execute();
+        assertEquals(uuid, query().from(uuids).select(uuids.field).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({ORACLE})
+    public void xml() {
+        delete(QXmlTest.xmlTest).execute();
+        QXmlTest xmlTest = QXmlTest.xmlTest;
+        String contents = "<html><head>a</head><body>b</body></html>";
+        insert(xmlTest).set(xmlTest.col, contents).execute();
+        assertEquals(contents, query().from(xmlTest).select(xmlTest.col).fetchFirst());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java
similarity index 75%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java
index 64b36ea829..808f3f84eb 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,19 +21,22 @@
 import java.sql.Types;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.ReportingOnly;
 
 public class JDBCTypeMappingTest {
 
     private JDBCTypeMapping typeMapping = new JDBCTypeMapping();
 
     @Test
-    public void Get() {
+    public void get() {
         assertEquals(Float.class, typeMapping.get(Types.FLOAT,0,0));
         assertEquals(Float.class, typeMapping.get(Types.REAL,0,0));
     }
 
     @Test
-    public void StringTypes() {
+    public void stringTypes() {
         assertEquals(String.class, typeMapping.get(Types.CHAR,0,0));
         assertEquals(String.class, typeMapping.get(Types.NCHAR,0,0));
         assertEquals(String.class, typeMapping.get(Types.CLOB,0,0));
@@ -46,28 +49,26 @@ public void StringTypes() {
     }
 
     @Test
-    public void BlobTypes() {
+    public void blobTypes() {
         assertEquals(Blob.class, typeMapping.get(Types.BLOB,0,0));
     }
 
     @Test
-    public void BytesTypes() {
+    public void bytesTypes() {
         assertEquals(byte[].class, typeMapping.get(Types.BINARY,0,0));
         assertEquals(byte[].class, typeMapping.get(Types.VARBINARY,0,0));
         assertEquals(byte[].class, typeMapping.get(Types.LONGVARBINARY,0,0));
     }
 
     @Test
-    public void NumericTypes() {
+    public void numericTypes() {
 //        19,0       -> BigInteger
 //        10-18,0    -> Long
 //        5-9,0      -> Integer
 //        3-4,0      -> Short
-//        2,0        -> Byte
-//        0-1,0      -> Boolean
+//        1-2,0      -> Byte
 
-//        17-...,?   -> BigDecimal
-//        0-16,?     -> Double
+//        ?,?   -> BigDecimal
         assertEquals(typeMapping.get(Types.NUMERIC, 20, 0), BigInteger.class);
         assertEquals(typeMapping.get(Types.NUMERIC, 19, 0), BigInteger.class);
         assertEquals(typeMapping.get(Types.NUMERIC, 15, 0), Long.class);
@@ -80,11 +81,12 @@ public void NumericTypes() {
         assertEquals(typeMapping.get(Types.NUMERIC, 0, 0),  BigInteger.class);
 
         assertEquals(typeMapping.get(Types.NUMERIC, 17, 2), BigDecimal.class);
-        assertEquals(typeMapping.get(Types.NUMERIC, 5, 2),  Double.class);
+        assertEquals(typeMapping.get(Types.NUMERIC, 5, 2),  BigDecimal.class);
     }
 
     @Test
-    public void Max() {
+    @Category(ReportingOnly.class)
+    public void max() {
         System.err.println("Byte: " + String.valueOf(Byte.MAX_VALUE).length());
         System.err.println("Short: " + String.valueOf(Short.MAX_VALUE).length());
         System.err.println("Integer: " + String.valueOf(Integer.MAX_VALUE).length());
@@ -92,9 +94,23 @@ public void Max() {
     }
 
     @Test
-    public void NumericOverriden() {
+    public void numericOverriden() {
         typeMapping.registerNumeric(19, 0, BigInteger.class);
         assertEquals(typeMapping.get(Types.NUMERIC, 19, 0), BigInteger.class);
     }
 
+    @Test
+    public void numericOverriden2() {
+        typeMapping.registerNumeric(19, 0, BigInteger.class);
+        assertEquals(typeMapping.get(Types.INTEGER, 19, 0), BigInteger.class);
+        assertEquals(typeMapping.get(Types.INTEGER, 18, 0), Integer.class);
+    }
+
+    @Test
+    public void numericOverriden3() {
+        typeMapping.registerNumeric(5, 2, BigDecimal.class);
+        assertEquals(typeMapping.get(Types.DOUBLE, 5, 2), BigDecimal.class);
+        assertEquals(typeMapping.get(Types.DOUBLE, 5, 1), Double.class);
+    }
+
 }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java
new file mode 100644
index 0000000000..c72bea501a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import org.junit.Test;
+
+import com.querydsl.sql.types.*;
+
+public class JavaTypeMappingTest {
+
+    private JavaTypeMapping typeMapping = new JavaTypeMapping();
+
+    @Test
+    public void getType_with_subtypes() {
+        typeMapping.register(new InputStreamType());
+        assertNotNull(typeMapping.getType(InputStream.class));
+        assertNotNull(typeMapping.getType(FileInputStream.class));
+    }
+
+    @Test
+    public void getType_with_interfaces() {
+        assertEquals(BlobType.class, typeMapping.getType(DummyBlob.class).getClass());
+    }
+
+    @Test
+    public void getType_for_object() {
+        assertEquals(ObjectType.class, typeMapping.getType(Object.class).getClass());
+    }
+
+    @Test
+    public void getType_for_primitive() {
+        assertEquals(ByteType.class, typeMapping.getType(byte.class).getClass());
+        assertEquals(ShortType.class, typeMapping.getType(short.class).getClass());
+        assertEquals(IntegerType.class, typeMapping.getType(int.class).getClass());
+        assertEquals(LongType.class, typeMapping.getType(long.class).getClass());
+        assertEquals(FloatType.class, typeMapping.getType(float.class).getClass());
+        assertEquals(DoubleType.class, typeMapping.getType(double.class).getClass());
+        assertEquals(BooleanType.class, typeMapping.getType(boolean.class).getClass());
+        assertEquals(CharacterType.class, typeMapping.getType(char.class).getClass());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java
new file mode 100644
index 0000000000..2b389e4293
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.JoinFlag;
+import com.querydsl.sql.domain.QSurvey;
+
+public class JoinFlagsTest {
+
+    private Connection connection = EasyMock.createMock(Connection.class);
+
+    private QSurvey s1, s2, s3, s4, s5, s6;
+
+    private SQLQuery query;
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() {
+        s1 = new QSurvey("s");
+        s2 = new QSurvey("s2");
+        s3 = new QSurvey("s3");
+        s4 = new QSurvey("s4");
+        s5 = new QSurvey("s5");
+        s6 = new QSurvey("s6");
+        query = new SQLQuery(connection,SQLTemplates.DEFAULT);
+        query.from(s1);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void joinFlags_beforeCondition() {
+        query.innerJoin(s2).on(s1.eq(s2));
+        query.addJoinFlag(" a ", JoinFlag.Position.BEFORE_CONDITION);
+
+        assertEquals("from SURVEY s\n" +
+                "inner join SURVEY s2 a \n" +
+                "on s.ID = s2.ID", query.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void joinFlags_beforeTarget() {
+        query.innerJoin(s3).on(s1.eq(s3));
+        query.addJoinFlag(" b ", JoinFlag.Position.BEFORE_TARGET);
+
+        assertEquals("from SURVEY s\n" +
+                "inner join  b SURVEY s3\n" +
+                "on s.ID = s3.ID", query.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void joinFlags_end() {
+        query.innerJoin(s4).on(s1.eq(s4));
+        query.addJoinFlag(" c ", JoinFlag.Position.END);
+
+        assertEquals("from SURVEY s\n" +
+                "inner join SURVEY s4\n" +
+                "on s.ID = s4.ID c", query.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void joinFlags_override() {
+        query.innerJoin(s5).on(s1.eq(s5));
+        query.addJoinFlag(" d ", JoinFlag.Position.OVERRIDE);
+
+        assertEquals("from SURVEY s d SURVEY s5\n" +
+                "on s.ID = s5.ID", query.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void joinFlags_start() {
+        query.innerJoin(s6).on(s1.eq(s6));
+        query.addJoinFlag(" e ", JoinFlag.Position.START);
+
+        assertEquals("from SURVEY s e \n" +
+                "inner join SURVEY s6\n" +
+                "on s.ID = s6.ID", query.toString());
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java
new file mode 100644
index 0000000000..be545bfb94
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.selectFrom;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.sql.domain.QSurvey;
+
+public class JoinUsageTest {
+
+    @Test(expected = IllegalStateException.class)
+    @Ignore
+    public void join_already_declared() {
+        QSurvey survey = QSurvey.survey;
+        selectFrom(survey).fullJoin(survey);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/KeyAccessorsTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java
similarity index 90%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/KeyAccessorsTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java
index a709cdac27..70e6705b7a 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/KeyAccessorsTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,14 +11,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.Serializable;
 
-import com.mysema.query.types.path.NumberPath;
 import org.junit.Test;
-import static com.mysema.query.types.PathMetadataFactory.forVariable;
-import static org.junit.Assert.assertNotNull;
+
+import com.querydsl.core.types.dsl.NumberPath;
 
 public class KeyAccessorsTest {
 
@@ -68,7 +70,7 @@ protected void addMetadata() {
     }
 
     @Test
-    public void Keys() {
+    public void keys() {
         QEmployee employee = QEmployee.employee;
         assertNotNull(employee.pk.sysIdx53);
         assertNotNull(employee.fk.superiorFk);
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/KeyTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java
similarity index 89%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/KeyTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java
index 241eebb678..f33567f6fc 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/KeyTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,18 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.selectOne;
 
 import org.junit.Test;
 
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.NumberPath;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.NumberPath;
 
 @SuppressWarnings("serial")
 public class KeyTest {
 
 //    @Table("USER")
-    public static class QUser extends RelationalPathBase<QUser>{
+    public static class QUser extends RelationalPathBase<QUser> {
 
         public final NumberPath<Integer> id = createNumber("id", Integer.class);
 
@@ -98,16 +100,12 @@ public void test() {
         QCompany company = new QCompany("company");
 
         // superiorId -> id
-        query().from(user).innerJoin(user.superiorIdKey, user2);
+        selectOne().from(user).innerJoin(user.superiorIdKey, user2);
 
         // department -> id / company -> id
-        query().from(user)
+        selectOne().from(user)
             .innerJoin(user.departmentKey, department)
             .innerJoin(department.companyKey, company);
     }
 
-    private SQLQuery query() {
-        return new SQLQuery(SQLTemplates.DEFAULT);
-    }
-
 }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java
new file mode 100644
index 0000000000..cb5a2b04ff
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.BooleanPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ddl.CreateTableClause;
+import com.querydsl.sql.ddl.DropTableClause;
+
+public class KeywordQuotingBase extends AbstractBaseTest {
+
+    private static class Quoting extends RelationalPathBase<Quoting> {
+
+        public static final Quoting quoting = new Quoting("quoting");
+
+        public final StringPath from = createString("from");
+        public final BooleanPath all = createBoolean("all");
+
+        private Quoting(String path) {
+            super(Quoting.class, PathMetadataFactory.forVariable(path), "PUBLIC", "quoting");
+            addMetadata();
+        }
+
+        Quoting(PathMetadata metadata) {
+            super(Quoting.class, metadata, "PUBLIC", "quoting");
+            addMetadata();
+        }
+
+        protected void addMetadata() {
+            addMetadata(from, ColumnMetadata.named("from"));
+            addMetadata(all, ColumnMetadata.named("all"));
+        }
+    }
+
+    private final Quoting quoting = Quoting.quoting;
+
+    @Before
+    public void setUp() throws Exception {
+        new CreateTableClause(connection, configuration, "quoting")
+                .column("from", String.class).size(30)
+                .column("all", Boolean.class)
+                .execute();
+        execute(insert(quoting)
+                .columns(quoting.from, quoting.all)
+                .values("from", true));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        new DropTableClause(connection, configuration, "quoting")
+                .execute();
+    }
+
+    @Test
+    public void keywords() {
+        Quoting from = new Quoting("from");
+        assertEquals("from", query().from(quoting.as(from))
+                .where(from.from.eq("from")
+                        .and(from.all.isNotNull()))
+                .select(from.from).fetchFirst());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java
new file mode 100644
index 0000000000..e81694c9f4
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.Constants.survey;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.SQLException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.dml.SQLInsertClause;
+
+public class LikeEscapeBase extends AbstractBaseTest {
+
+    @Before
+    public void setUp() throws SQLException {
+        delete(survey).execute();
+        SQLInsertClause insert = insert(survey);
+        insert.set(survey.id, 5).set(survey.name, "aaa").addBatch();
+        insert.set(survey.id, 6).set(survey.name, "a_").addBatch();
+        insert.set(survey.id, 7).set(survey.name, "a%").addBatch();
+        insert.execute();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        delete(survey).execute();
+        insert(survey).values(1, "Hello World", "Hello").execute();
+    }
+
+    @Test
+    public void like() {
+        assertEquals(0, query().from(survey).where(survey.name.like("a!%")).fetchCount());
+        assertEquals(0, query().from(survey).where(survey.name.like("a!_")).fetchCount());
+        assertEquals(3, query().from(survey).where(survey.name.like("a%")).fetchCount());
+        assertEquals(2, query().from(survey).where(survey.name.like("a_")).fetchCount());
+
+        assertEquals(1, query().from(survey).where(survey.name.startsWith("a_")).fetchCount());
+        assertEquals(1, query().from(survey).where(survey.name.startsWith("a%")).fetchCount());
+    }
+
+    @Test
+    public void like_with_escape() {
+        assertEquals(1, query().from(survey).where(survey.name.like("a!%", '!')).fetchCount());
+        assertEquals(1, query().from(survey).where(survey.name.like("a!_", '!')).fetchCount());
+        assertEquals(3, query().from(survey).where(survey.name.like("a%", '!')).fetchCount());
+        assertEquals(2, query().from(survey).where(survey.name.like("a_", '!')).fetchCount());
+    }
+
+    @Test
+    public void like_escaping_conclusion() {
+        assertTrue("Escaped like construct must return more results",
+                query().from(survey).where(survey.name.like("a!%")).fetchCount()
+                < query().from(survey).where(survey.name.like("a!%", '!')).fetchCount());
+        assertTrue("Escaped like construct must return more results",
+                query().from(survey).where(survey.name.like("a!_")).fetchCount()
+                < query().from(survey).where(survey.name.like("a!_", '!')).fetchCount());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java
new file mode 100644
index 0000000000..f48210ff55
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java
@@ -0,0 +1,43 @@
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class ListSubQueryTest {
+
+    @Test
+    public void hashCode1() {
+        QSurvey survey = QSurvey.survey;
+        QSurvey survey2 = new QSurvey("survey2");
+        SubQueryExpression<Tuple> query1 = select(survey.all()).from(survey);
+        SubQueryExpression<Tuple> query2 = select(survey2.all()).from(survey2);
+
+        Set<SubQueryExpression<Tuple>> queries = new HashSet<>();
+        queries.add(query1);
+        queries.add(query2);
+        assertEquals(2, queries.size());
+    }
+
+    @Test
+    public void hashCode2() {
+        QSurvey survey = new QSurvey("entity");
+        QEmployee employee = new QEmployee("entity");
+        SubQueryExpression<Integer> query1 = select(survey.id).from(survey);
+        SubQueryExpression<Integer> query2 = select(employee.id).from(employee);
+
+        Set<SubQueryExpression<Integer>> queries = new HashSet<>();
+        queries.add(query1);
+        queries.add(query2);
+        assertEquals(1, queries.size());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
new file mode 100644
index 0000000000..22f11a6a78
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.survey;
+import static com.querydsl.sql.Constants.survey2;
+import static org.junit.Assert.*;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.dml.SQLMergeClause;
+import com.querydsl.sql.domain.QSurvey;
+
+public class MergeBase extends AbstractBaseTest {
+
+    private void reset() throws SQLException {
+        delete(survey).execute();
+        insert(survey).values(1, "Hello World", "Hello").execute();
+    }
+
+    @Before
+    public void setUp() throws SQLException {
+        reset();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        reset();
+    }
+
+    @Test
+    @ExcludeIn({H2, CUBRID, SQLSERVER})
+    public void merge_with_keys() throws SQLException {
+        ResultSet rs = merge(survey).keys(survey.id)
+                .set(survey.id, 7)
+                .set(survey.name, "Hello World").executeWithKeys();
+        assertTrue(rs.next());
+        assertTrue(rs.getObject(1) != null);
+        rs.close();
+    }
+
+    @Test
+    @ExcludeIn({H2, CUBRID, SQLSERVER})
+    public void merge_with_keys_listener() throws SQLException {
+        final AtomicBoolean result = new AtomicBoolean();
+        SQLListener listener = new SQLBaseListener() {
+            @Override
+            public void end(SQLListenerContext context) {
+                result.set(true);
+            }
+        };
+        SQLMergeClause clause = merge(survey).keys(survey.id)
+                .set(survey.id, 7)
+                .set(survey.name, "Hello World");
+        clause.addListener(listener);
+        ResultSet rs = clause.executeWithKeys();
+        assertTrue(rs.next());
+        assertTrue(rs.getObject(1) != null);
+        rs.close();
+        assertTrue(result.get());
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void merge_with_keys_and_subQuery() {
+        assertEquals(1, insert(survey).set(survey.id, 6).set(survey.name, "H").execute());
+
+        // keys + subquery
+        QSurvey survey2 = new QSurvey("survey2");
+        assertEquals(2, merge(survey).keys(survey.id).select(
+                query().from(survey2).select(survey2.id.add(1), survey2.name, survey2.name2)).execute());
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void merge_with_keys_and_values() {
+        // NOTE : doesn't work with composite merge implementation
+        // keys + values
+        assertEquals(1, merge(survey).keys(survey.id).values(5, "Hello World", "Hello").execute());
+    }
+
+    @Test
+    public void merge_with_keys_columns_and_values() {
+        // keys + columns + values
+        assertEquals(1, merge(survey).keys(survey.id)
+            .set(survey.id, 5)
+            .set(survey.name, "Hello World").execute());
+    }
+
+    @Test
+    public void merge_with_keys_columns_and_values_using_null() {
+        // keys + columns + values
+        assertEquals(1, merge(survey).keys(survey.id)
+            .set(survey.id, 5)
+            .set(survey.name, (String) null).execute());
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, DB2, DERBY, POSTGRESQL, SQLSERVER, TERADATA})
+    public void merge_with_keys_Null_Id() throws SQLException {
+        ResultSet rs = merge(survey).keys(survey.id)
+                .setNull(survey.id)
+                .set(survey.name, "Hello World").executeWithKeys();
+        assertTrue(rs.next());
+        assertTrue(rs.getObject(1) != null);
+        rs.close();
+    }
+
+    @Test
+    @ExcludeIn({H2, CUBRID, SQLSERVER})
+    public void merge_with_keys_Projected() throws SQLException {
+        assertNotNull(merge(survey).keys(survey.id)
+                .set(survey.id, 8)
+                .set(survey.name, "Hello you").executeWithKey(survey.id));
+    }
+
+    @Test
+    @ExcludeIn({H2, CUBRID, SQLSERVER})
+    public void merge_with_keys_Projected2() throws SQLException {
+        Path<Object> idPath = ExpressionUtils.path(Object.class, "id");
+        Object id = merge(survey).keys(survey.id)
+                .set(survey.id, 9)
+                .set(survey.name, "Hello you").executeWithKey(idPath);
+        assertNotNull(id);
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void mergeBatch() {
+        SQLMergeClause merge = merge(survey)
+            .keys(survey.id)
+            .set(survey.id, 5)
+            .set(survey.name, "5")
+            .addBatch();
+        assertEquals(1, merge.getBatchCount());
+        assertFalse(merge.isEmpty());
+
+        merge
+            .keys(survey.id)
+            .set(survey.id, 6)
+            .set(survey.name, "6")
+            .addBatch();
+
+        assertEquals(2, merge.getBatchCount());
+        assertEquals(2, merge.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("5")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.eq("6")).fetchCount());
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void mergeBatch_templates() {
+        SQLMergeClause merge = merge(survey)
+            .keys(survey.id)
+            .set(survey.id, 5)
+            .set(survey.name, Expressions.stringTemplate("'5'"))
+            .addBatch();
+
+        merge
+            .keys(survey.id)
+            .set(survey.id, 6)
+            .set(survey.name, Expressions.stringTemplate("'6'"))
+            .addBatch();
+
+        assertEquals(2, merge.execute());
+
+        assertEquals(1L, query().from(survey).where(survey.name.eq("5")).fetchCount());
+        assertEquals(1L, query().from(survey).where(survey.name.eq("6")).fetchCount());
+    }
+
+
+    @Test
+    @IncludeIn(H2)
+    public void mergeBatch_with_subquery() {
+        SQLMergeClause merge = merge(survey)
+            .keys(survey.id)
+            .columns(survey.id, survey.name)
+            .select(query().from(survey2).select(survey2.id.add(20), survey2.name))
+            .addBatch();
+
+        merge(survey)
+            .keys(survey.id)
+            .columns(survey.id, survey.name)
+            .select(query().from(survey2).select(survey2.id.add(40), survey2.name))
+            .addBatch();
+
+        assertEquals(1, merge.execute());
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void merge_with_templateExpression_in_batch() {
+        SQLMergeClause merge = merge(survey)
+                .keys(survey.id)
+                .set(survey.id, 5)
+                .set(survey.name, Expressions.stringTemplate("'5'"))
+                .addBatch();
+
+        assertEquals(1, merge.execute());
+    }
+
+    @Test
+    public void merge_listener() {
+        final AtomicInteger calls = new AtomicInteger(0);
+        SQLListener listener = new SQLBaseListener() {
+            @Override
+            public void end(SQLListenerContext context) {
+                if (context.getData(AbstractSQLQuery.PARENT_CONTEXT) == null) {
+                    calls.incrementAndGet();
+                }
+            }
+        };
+
+        SQLMergeClause clause = merge(survey).keys(survey.id)
+                .set(survey.id, 5)
+                .set(survey.name, "Hello World");
+        clause.addListener(listener);
+        assertEquals(1, clause.execute());
+        assertEquals(1, calls.intValue());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/MetadataTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java
similarity index 93%
rename from querydsl-sql/src/test/java/com/mysema/query/MetadataTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java
index abe57719e9..327a8a1506 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/MetadataTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query;
+package com.querydsl.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -8,7 +8,7 @@
 
 @Ignore
 public class MetadataTest {
-    
+
 //    CUBRID
 //    Apache Derby
 //    H2
@@ -17,7 +17,7 @@ public class MetadataTest {
 //    Oracle
 //    PostgreSQL
 //    SQLite
-    
+
     @Test
     public void test() throws SQLException, ClassNotFoundException {
         Connections.initCubrid();
@@ -32,7 +32,7 @@ public void test() throws SQLException, ClassNotFoundException {
         printMetadata();
         Connections.initOracle();
         printMetadata();
-        Connections.initPostgres();
+        Connections.initPostgreSQL();
         printMetadata();
         Connections.initSQLite();
         printMetadata();
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/Multikey.java b/querydsl-sql/src/test/java/com/querydsl/sql/Multikey.java
similarity index 91%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/Multikey.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/Multikey.java
index c184162b56..b428d201e4 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/Multikey.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Multikey.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -68,7 +68,7 @@ public boolean equals(Object o) {
         if (!(o instanceof Multikey)) {
             return false;
         }
-        Multikey obj = (Multikey)o;
+        Multikey obj = (Multikey) o;
         return id.equals(obj.id) && id2.equals(obj.id2) && id3.equals(obj.id3);
     }
 
@@ -87,7 +87,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "Multikey#" + id+ ";" + id2+ ";" + id3;
+        return "Multikey#" + id + ";" + id2 + ";" + id3;
     }
 
 }
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/MultikeyTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java
similarity index 85%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/MultikeyTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java
index 5d8e9085ae..835650571f 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/MultikeyTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,47 +22,47 @@ public class MultikeyTest {
 
     Multikey multiKey1 = new Multikey();
     Multikey multiKey2 = new Multikey();
-    
+
     @Test
-    public void HashCode() {
+    public void hashCode_() {
         int hashCode = multiKey1.hashCode();
         multiKey1.setId(1);
         assertEquals(hashCode, multiKey1.hashCode());
-        
+
         multiKey1.setId2("2");
         multiKey1.setId3(3);
-        
+
         multiKey2.setId(1);
         multiKey2.setId2("2");
         multiKey2.setId3(3);
-        
-        assertEquals(multiKey1.hashCode(), multiKey2.hashCode());                
+
+        assertEquals(multiKey1.hashCode(), multiKey2.hashCode());
     }
-    
+
     @Test
-    public void Equals() {
+    public void equals() {
         multiKey1.setId(1);
         multiKey1.setId2("2");
         multiKey1.setId3(3);
-        
+
         assertFalse(multiKey1.equals(multiKey2));
-        multiKey2.setId(1);        
+        multiKey2.setId(1);
         assertFalse(multiKey1.equals(multiKey2));
-        
+
         multiKey2.setId2("2");
         multiKey2.setId3(3);
-        
+
         assertEquals(multiKey1, multiKey2);
     }
-    
+
     @Test
-    public void ToString() {
+    public void toString_() {
         assertEquals("Multikey#null;null;null", multiKey1.toString());
-        
+
         multiKey1.setId(1);
         multiKey1.setId2("2");
         multiKey1.setId3(3);
         assertEquals("Multikey#1;2;3", multiKey1.toString());
     }
-    
+
 }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java
new file mode 100644
index 0000000000..baa333dcd7
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.querydsl.core.types.dsl.Expressions;
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+
+
+public class MySQLTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new MySQLTemplates();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void test() {
+        SQLTemplates templates = MySQLTemplates.builder()
+                .printSchema()
+                .build();
+        Configuration conf = new Configuration(templates);
+        System.out.println(new SQLQuery(conf).from(survey1).toString());
+    }
+
+    @Test
+    public void order_nullsFirst() {
+        query.from(survey1).orderBy(survey1.name.asc().nullsFirst());
+        assertEquals("from SURVEY survey1 order by (case when survey1.NAME is null then 0 else 1 end), survey1.NAME asc", query.toString());
+    }
+
+    @Test
+    public void order_nullsLast() {
+        query.from(survey1).orderBy(survey1.name.asc().nullsLast());
+        assertEquals("from SURVEY survey1 order by (case when survey1.NAME is null then 1 else 0 end), survey1.NAME asc", query.toString());
+    }
+
+    @Test
+    public void precedence() {
+        // INTERVAL
+        // BINARY, COLLATE
+        // !
+        // - (unary minus), ~ (unary bit inversion)
+        int p0 = getPrecedence(Ops.NEGATE);
+        // ^
+        // *, /, DIV, %, MOD
+        int p1 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        // -, +
+        int p2 = getPrecedence(Ops.SUB, Ops.ADD);
+        // <<, >>
+        // &
+        // |
+        // = (comparison), <=>, >=, >, <=, <, <>, !=, IS, LIKE, REGEXP, IN
+        int p3 = getPrecedence(Ops.EQ, Ops.GOE, Ops.GT, Ops.LT, Ops.NE, Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.MATCHES, Ops.IN, Ops.LIKE, Ops.LIKE_ESCAPE);
+        // BETWEEN, CASE, WHEN, THEN, ELSE
+        int p4 = getPrecedence(Ops.BETWEEN, Ops.CASE, Ops.CASE_ELSE);
+        // NOT
+        int p5 = getPrecedence(Ops.NOT);
+        // &&, AND
+        int p6 = getPrecedence(Ops.AND);
+        // XOR
+        int p7 = getPrecedence(Ops.XOR, Ops.XNOR);
+        // ||, OR
+        int p8 = getPrecedence(Ops.OR);
+        // = (assignment), :=
+
+        assertTrue(p0 < p1);
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Test
+    public void truncateWeek() {
+        final SQLQuery<Comparable> expression = query.select(
+                SQLExpressions.datetrunc(DatePart.week,
+                        Expressions.dateTimeTemplate(Comparable.class, "dateExpression")));
+        assertEquals("select str_to_date(concat(date_format(dateExpression,'%Y-%u'),'-1'),'%Y-%u-%w') from dual",
+                expression.toString());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java
new file mode 100644
index 0000000000..9178547aa4
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class OracleTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new OracleTemplates();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union() {
+        SimpleExpression<Integer> one = Expressions.template(Integer.class, "1");
+        SimpleExpression<Integer> two = Expressions.template(Integer.class,"2");
+        SimpleExpression<Integer> three = Expressions.template(Integer.class,"3");
+        NumberPath<Integer> col1 = Expressions.numberPath(Integer.class, "col1");
+        Union union = query.union(
+            select(one.as(col1)),
+            select(two),
+            select(three));
+        assertEquals(
+                "(select 1 col1 from dual)\n" +
+                "union\n" +
+                "(select 2 from dual)\n" +
+                "union\n" +
+                "(select 3 from dual)", union.toString());
+    }
+
+    @Test
+    public void modifiers() {
+        query.from(survey1).limit(5).offset(3);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select * from (  " +
+                "select a.*, rownum rn from (   " +
+                "select survey1.ID from SURVEY survey1  ) " +
+                "a) " +
+                "where rn > 3 and rownum <= 5", query.toString());
+    }
+
+    @Test
+    public void modifiers2() {
+        query.from(survey1).limit(5).offset(3);
+        query.getMetadata().setProjection(survey1.id);
+        query.getMetadata().addFlag(new QueryFlag(QueryFlag.Position.AFTER_PROJECTION, ", count(*) over() "));
+
+        assertEquals("select * from (  " +
+            "select a.*, rownum rn from (   " +
+            "select survey1.ID, count(*) over()  from SURVEY survey1  ) " +
+            "a) " +
+            "where rn > 3 and rownum <= 5", query.toString());
+    }
+
+    @Test
+    public void in() {
+        List<Integer> ids = new ArrayList<Integer>();
+        for (int i = 0; i < 2000; i++) {
+            ids.add(i);
+        }
+        query.where(survey1.id.isNotNull());
+        query.where(survey1.id.in(ids));
+        assertTrue(query.toString().startsWith("from dual where survey1.ID is not null and (survey1.ID in "));
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new OracleTemplates())).handle(nextval).toString());
+    }
+
+    @Test
+    public void precedence() {
+        // +, - (as unary operators), PRIOR, CONNECT_BY_ROOT  identity, negation, location in hierarchy
+        int p1 = getPrecedence(Ops.NEGATE);
+        // *, / multiplication, division
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV);
+        // +, - (as binary operators), || addition, subtraction, concatenation
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB, Ops.CONCAT);
+        // =, !=, <, >, <=, >=, comparison
+        int p4 = getPrecedence(Ops.EQ, Ops.NE, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        // IS [NOT] NULL, LIKE, [NOT] BETWEEN, [NOT] IN, EXISTS, IS OF type comparison
+        int p5 = getPrecedence(Ops.IS_NULL, Ops.IS_NOT_NULL, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.BETWEEN, Ops.IN, Ops.NOT_IN, Ops.EXISTS);
+        // NOT exponentiation, logical negation
+        int p6 = getPrecedence(Ops.NOT);
+        // AND conjunction
+        int p7 = getPrecedence(Ops.AND);
+        // OR disjunction
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Test
+    public void truncateWeek() {
+        final SQLQuery<Comparable> expression = query.select(
+                SQLExpressions.datetrunc(DatePart.week,
+                        Expressions.dateTimeTemplate(Comparable.class, "dateExpression")));
+        assertEquals("select trunc(dateExpression, 'iw') from dual",
+                expression.toString());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/OracleTimeTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java
similarity index 97%
rename from querydsl-sql/src/test/java/com/mysema/query/OracleTimeTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java
index c544beb663..47982fa876 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/OracleTimeTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query;
+package com.querydsl.sql;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/querydsl-sql/src/test/java/com/mysema/query/OtherEmployee.java b/querydsl-sql/src/test/java/com/querydsl/sql/OtherEmployee.java
similarity index 90%
rename from querydsl-sql/src/test/java/com/mysema/query/OtherEmployee.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/OtherEmployee.java
index a0abe7326a..2e317e7184 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/OtherEmployee.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/OtherEmployee.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.sql;
 
 public class OtherEmployee {
-    
+
     private String firstname, lastname;
 
     public String getFirstname() {
@@ -32,5 +32,5 @@ public String getLastname() {
     public void setLastname(String lastname) {
         this.lastname = lastname;
     }
-    
+
 }
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java
new file mode 100644
index 0000000000..b9fefacd6b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java
@@ -0,0 +1,73 @@
+package com.querydsl.sql;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.testutil.ReportingOnly;
+import com.querydsl.sql.domain.QEmployee;
+
+@Category(ReportingOnly.class)
+public class PaginationTest {
+
+    private String serialize(QueryMetadata metadata, SQLTemplates templates) {
+        SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
+        serializer.serialize(metadata, false);
+        return serializer.toString();
+    }
+
+    @Test
+    public void test() {
+        List<SQLTemplates> list = new ArrayList<>();
+        list.add(new CUBRIDTemplates());
+        list.add(new DerbyTemplates());
+        list.add(new H2Templates());
+        list.add(new HSQLDBTemplates());
+        list.add(new MySQLTemplates());
+        list.add(new OracleTemplates());  // inner query
+        list.add(new PostgreSQLTemplates());
+        list.add(new SQLiteTemplates());
+        list.add(new SQLServerTemplates());
+        list.add(new SQLServer2005Templates()); // inner query
+        list.add(new SQLServer2012Templates());
+        list.add(new TeradataTemplates()); // qualify
+
+        for (SQLTemplates templates : list) {
+            QEmployee employee = QEmployee.employee;
+            QueryMixin<?> query = new QueryMixin<Void>();
+            query.from(employee);
+            query.orderBy(employee.firstname.asc());
+            query.setProjection(employee.id);
+
+            System.out.println(templates.getClass().getSimpleName());
+            System.out.println();
+
+            // limit
+            query.restrict(QueryModifiers.limit(10L));
+            System.out.println("* limit");
+            System.out.println(serialize(query.getMetadata(), templates));
+            System.out.println();
+
+            if (!templates.getClass().equals(SQLServerTemplates.class)) {
+                // offset
+                query.restrict(QueryModifiers.offset(10L));
+                System.out.println("* offset");
+                System.out.println(serialize(query.getMetadata(), templates));
+                System.out.println();
+
+                // limit and offset
+                query.restrict(new QueryModifiers(10L, 10L));
+                System.out.println("* limit and offset");
+                System.out.println(serialize(query.getMetadata(), templates));
+                System.out.println();
+            }
+
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java
new file mode 100644
index 0000000000..e9289c962b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+
+public class PostgreSQLTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new PostgreSQLTemplates();
+    }
+
+    @Test
+    public void noFrom() {
+        query.getMetadata().setProjection(Expressions.ONE);
+        assertEquals("select 1", query.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Union union = query.union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+        assertEquals(
+                "(select 1 as col1)\n" +
+                "union\n" +
+                "(select 2)\n" +
+                "union\n" +
+                "(select 3)", union.toString());
+    }
+
+    @Test
+    public void precedence() {
+        //.    left    table/column name separator
+        //        ::    left    PostgreSQL-style typecast
+        //[ ]    left    array element selection
+        //+ -    right    unary plus, unary minus
+        int p0 = getPrecedence(Ops.NEGATE);
+        //        ^    left    exponentiation
+        //        * / %    left    multiplication, division, modulo
+        int p1 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        //+ -    left    addition, subtraction
+        int p2 = getPrecedence(Ops.ADD, Ops.SUB);
+        //IS         IS TRUE, IS FALSE, IS NULL, etc
+        int p3 = getPrecedence(Ops.IS_NULL, Ops.IS_NOT_NULL);
+        //ISNULL         test for null
+        //NOTNULL         test for not null
+        //(any other)    left    all other native and user-defined operators
+        //IN         set membership
+        int p4 = getPrecedence(Ops.IN);
+        //BETWEEN         range containment
+        int p5 = getPrecedence(Ops.BETWEEN);
+        //OVERLAPS         time interval overlap
+        //LIKE ILIKE SIMILAR         string pattern matching
+        int p6 = getPrecedence(Ops.LIKE, Ops.LIKE_ESCAPE);
+        //< >         less than, greater than
+        int p7 = getPrecedence(Ops.LT, Ops.GT);
+        //        =    right    equality, assignment
+        int p8 = getPrecedence(Ops.EQ);
+        //NOT    right    logical negation
+        int p9 = getPrecedence(Ops.NOT);
+        //AND    left    logical conjunction
+        int p10 = getPrecedence(Ops.AND);
+        //OR    left    logical disjunction
+        int p11 = getPrecedence(Ops.OR);
+
+        assertTrue(p0 < p1);
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+        assertTrue(p8 < p9);
+        assertTrue(p9 < p10);
+        assertTrue(p10 < p11);
+    }
+
+    @Test
+    @Override
+    public void booleanTemplate() {
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.TRUE), "b = true");
+        assertSerialized(Expressions.booleanPath("b").eq(Expressions.FALSE), "b = false");
+        query.setUseLiterals(true);
+        query.where(Expressions.booleanPath("b").eq(true));
+        assertTrue(query.toString(), query.toString().endsWith("where b = true"));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java
new file mode 100644
index 0000000000..22da8d042b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java
@@ -0,0 +1,24 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class PrecedenceTest {
+
+    @Test
+    public void test() {
+        StringPath str1 = Expressions.stringPath("str1");
+        StringPath str2 = Expressions.stringPath("str2");
+        BooleanExpression pending = str1.eq("3").and(str2.eq("1"));
+        BooleanExpression notNew = str1.ne("1").and(str2.in("2", "3"));
+        BooleanExpression whereClause = str1.eq("a").and(pending.or(notNew));
+        String str = new SQLSerializer(Configuration.DEFAULT).handle(whereClause).toString();
+        assertEquals("str1 = ? and (str1 = ? and str2 = ? or str1 != ? and str2 in (?, ?))", str);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Projection.java b/querydsl-sql/src/test/java/com/querydsl/sql/Projection.java
new file mode 100644
index 0000000000..c11e120b1a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Projection.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.querydsl.core.types.Expression;
+
+public interface Projection {
+
+    @Nullable
+    <T> T get(Expression<T> expr);
+
+    @Nullable
+    <T> T get(int index, Class<T> type);
+
+    @Nullable
+    <T> Expression<T> getExpr(Expression<T> expr);
+
+    @Nullable
+    <T> Expression<T> getExpr(int index, Class<T> type);
+
+    Object[] toArray();
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java b/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java
new file mode 100644
index 0000000000..e25647b819
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QBean;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+public class QBean2Test {
+
+//    @Table("PERSON")
+    public static class QPerson extends RelationalPathBase<QPerson> {
+        private static final long serialVersionUID = 609527362;
+        public static final QPerson person = new QPerson("PERSON");
+        public final StringPath firstName = createString("firstName");
+        public final NumberPath<Integer> id = createNumber("id", Integer.class);
+        public final StringPath lastName = createString("lastName");
+
+        public QPerson(String variable) {
+           super(QPerson.class, PathMetadataFactory.forVariable(variable), "", "PERSON");
+           addMetadata();
+        }
+
+        public QPerson(BeanPath<? extends QPerson> entity) {
+            super(entity.getType(), entity.getMetadata(), "", "PERSON");
+            addMetadata();
+        }
+
+        public QPerson(PathMetadata metadata) {
+            super(QPerson.class, metadata, "", "PERSON");
+            addMetadata();
+        }
+
+        public void addMetadata() {
+            addMetadata(firstName, ColumnMetadata.named("FIRST_NAME"));
+            addMetadata(lastName, ColumnMetadata.named("LAST_NAME"));
+            addMetadata(id, ColumnMetadata.named("ID"));
+        }
+
+    }
+
+    public static class Person {
+        private int id;
+        private String firstName;
+        private String lastName;
+        public int getId() {
+            return id;
+        }
+        public void setId(int id) {
+            this.id = id;
+        }
+        public String getFirstName() {
+            return firstName;
+        }
+        public void setFirstName(String firstName) {
+            this.firstName = firstName;
+        }
+        public String getLastName() {
+            return lastName;
+        }
+        public void setLastName(String lastName) {
+            this.lastName = lastName;
+        }
+
+    }
+
+    @Test
+    public void newInstance() {
+        QPerson p = QPerson.person;
+        QBean<Person> projection = Projections.bean(Person.class, p.id, p.firstName.as("firstName"), p.lastName.as("lastName"));
+
+        Person person = projection.newInstance(3, "John", "Doe");
+        assertEquals(3,      person.getId());
+        assertEquals("John", person.getFirstName());
+        assertEquals("Doe",  person.getLastName());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java
new file mode 100644
index 0000000000..3830b8913d
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.sql.domain.Employee;
+import com.querydsl.sql.domain.QEmployee;
+
+public class QBeanTest {
+
+    private final QEmployee e = new QEmployee("e");
+
+    @Test
+    public void direct_to_managed_type() {
+        FactoryExpression<Employee> expr = Projections.bean(Employee.class, e.superiorId);
+        Employee e = expr.newInstance(3);
+        assertEquals(Integer.valueOf(3), e.getSuperiorId());
+    }
+
+    @Test
+    public void direct_to_custom_type() {
+        FactoryExpression<Employee> expr = Projections.bean(Employee.class, e.firstname, e.lastname);
+        Employee e = expr.newInstance("John","Smith");
+        assertEquals("John", e.getFirstname());
+        assertEquals("Smith", e.getLastname());
+    }
+
+    @Test
+    public void alias_to_managed_type() {
+        FactoryExpression<Employee> expr = Projections.bean(Employee.class, e.superiorId.as("id"));
+        Employee e = expr.newInstance(3);
+        assertEquals(3, e.getId().intValue());
+    }
+
+    @Test
+    public void alias_to_custom_type() {
+        FactoryExpression<Employee> expr = Projections.bean(Employee.class, e.firstname.as("lastname"), e.lastname.as("firstname"));
+        Employee e = expr.newInstance("John","Smith");
+        assertEquals("Smith", e.getFirstname());
+        assertEquals("John", e.getLastname());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QCompanies.java b/querydsl-sql/src/test/java/com/querydsl/sql/QCompanies.java
new file mode 100644
index 0000000000..e3f88f67da
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QCompanies.java
@@ -0,0 +1,49 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+
+/**
+ * QCompanies is a Querydsl query type for QCompanies
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class QCompanies extends com.querydsl.sql.RelationalPathBase<QCompanies> {
+
+    private static final long serialVersionUID = 1808918375;
+
+    public static final QCompanies companies = new QCompanies("COMPANIES");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final com.querydsl.sql.PrimaryKey<QCompanies> constraint5 = createPrimaryKey(id);
+
+    public QCompanies(String variable) {
+        super(QCompanies.class, forVariable(variable), "PUBLIC", "COMPANIES");
+        addMetadata();
+    }
+
+    public QCompanies(Path<? extends QCompanies> path) {
+        super(path.getType(), path.getMetadata(), "PUBLIC", "COMPANIES");
+        addMetadata();
+    }
+
+    public QCompanies(PathMetadata metadata) {
+        super(QCompanies.class, metadata, "PUBLIC", "COMPANIES");
+        addMetadata();
+    }
+
+    protected void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("ID"));
+        addMetadata(name, ColumnMetadata.named("NAME"));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/QGeneratedKeysEntity.java b/querydsl-sql/src/test/java/com/querydsl/sql/QGeneratedKeysEntity.java
similarity index 78%
rename from querydsl-sql/src/test/java/com/mysema/query/QGeneratedKeysEntity.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/QGeneratedKeysEntity.java
index c8d9d627b0..48a6536080 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/QGeneratedKeysEntity.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QGeneratedKeysEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,16 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.sql;
 
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
 
 //@Table("GENERATED_KEYS")
-public class QGeneratedKeysEntity extends RelationalPathBase<QGeneratedKeysEntity>{
+public class QGeneratedKeysEntity extends RelationalPathBase<QGeneratedKeysEntity> {
 
     private static final long serialVersionUID = 2002306246819687158L;
 
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QPerson.java b/querydsl-sql/src/test/java/com/querydsl/sql/QPerson.java
new file mode 100644
index 0000000000..17f1598264
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QPerson.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.BeanPath;
+import com.querydsl.core.types.dsl.EnumPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+//@Table("PERSON")
+public class QPerson extends RelationalPathBase<QPerson> {
+
+    private static final long serialVersionUID = 475064746;
+
+    public static final QPerson person = new QPerson("PERSON");
+
+    public final StringPath firstname = createString("firstname");
+
+    public final EnumPath<com.querydsl.core.alias.Gender> gender = createEnum("gender", com.querydsl.core.alias.Gender.class);
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath securedid = createString("securedid");
+
+    public final PrimaryKey<QPerson> sysIdx118 = createPrimaryKey(id);
+
+    public QPerson(String variable) {
+        super(QPerson.class, PathMetadataFactory.forVariable(variable), "", "PERSON");
+        addMetadata();
+    }
+
+    public QPerson(BeanPath<? extends QPerson> entity) {
+        super(entity.getType(), entity.getMetadata(), "", "PERSON");
+        addMetadata();
+    }
+
+    public QPerson(PathMetadata metadata) {
+        super(QPerson.class, metadata, "", "PERSON");
+        addMetadata();
+    }
+
+    protected void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("ID"));
+        addMetadata(firstname, ColumnMetadata.named("FIRSTNAME"));
+        addMetadata(securedid, ColumnMetadata.named("SECUREDID"));
+        addMetadata(gender, ColumnMetadata.named("GENDER"));
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/QPersonTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java
similarity index 82%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/QPersonTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java
index dd37210a71..731a5abedc 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/QPersonTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,13 +11,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.mysema.query.types.QBean;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QBean;
 
 public class QPersonTest {
 
@@ -54,9 +55,9 @@ public void setSecuredid(String securedid) {
     }
 
     @Test
-    public void Populate() {
+    public void populate() {
         QPerson person = QPerson.person;
-        QBean<Person> personProjection = new QBean<Person>(Person.class, person.id, person.firstname, person.securedid);
+        QBean<Person> personProjection = Projections.bean(Person.class, person.id, person.firstname, person.securedid);
         Person p = personProjection.newInstance(3, "X", "Y");
         assertEquals(3, p.getId());
         assertEquals("X", p.getFirstname());
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QProjection.java b/querydsl-sql/src/test/java/com/querydsl/sql/QProjection.java
new file mode 100644
index 0000000000..05724ebc16
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QProjection.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.querydsl.core.SimpleConstant;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionBase;
+import com.querydsl.core.types.FactoryExpression;
+import com.querydsl.core.types.Visitor;
+import org.jetbrains.annotations.Unmodifiable;
+
+public class QProjection extends ExpressionBase<Projection> implements FactoryExpression<Projection> {
+
+    private static final long serialVersionUID = -7330905848558102164L;
+
+    @Unmodifiable
+    private final List<Expression<?>> args;
+
+    public QProjection(Expression<?>... args) {
+        super(Projection.class);
+        this.args = Arrays.asList(args);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Projection newInstance(final Object... args) {
+        return new Projection() {
+
+            @Override
+            public <T> T get(int index, Class<T> type) {
+                return (T) args[index];
+            }
+
+            @Override
+            public <T> T get(Expression<T> expr) {
+                int index = getArgs().indexOf(expr);
+                return index != -1 ? (T) args[index] : null;
+            }
+
+            @Override
+            public <T> Expression<T> getExpr(Expression<T> expr) {
+                T val = get(expr);
+                return val != null ? SimpleConstant.create(val) : null;
+            }
+
+            @Override
+            public <T> Expression<T> getExpr(int index, Class<T> type) {
+                T val = (T) args[index];
+                return val != null ? SimpleConstant.create(val) : null;
+            }
+
+            @Override
+            public Object[] toArray() {
+                return args;
+            }
+
+        };
+    }
+
+    @Override
+    @Unmodifiable
+    public List<Expression<?>> getArgs() {
+        return args;
+    }
+
+    @Override
+    public <R, C> R accept(Visitor<R, C> v, C context) {
+        return v.visit(this, context);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java
new file mode 100644
index 0000000000..e77be1d9ae
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.QueryMutability;
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.sql.domain.QSurvey;
+
+@Category(Derby.class)
+public class QueryMutabilityTest {
+
+    private static final QSurvey survey = new QSurvey("survey");
+
+    private Connection connection;
+
+    @Before
+    public void setUp() throws Exception {
+        Connections.initDerby();
+        connection = Connections.getConnection();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        Connections.close();
+    }
+
+    @Test
+    public void test() throws IOException, SecurityException,
+            IllegalArgumentException, NoSuchMethodException,
+            IllegalAccessException, InvocationTargetException {
+        SQLQuery<?> query = new SQLQuery<Void>(connection, DerbyTemplates.DEFAULT);
+        query.from(survey);
+        query.addListener(new TestLoggingListener());
+        new QueryMutability(query).test(survey.id, survey.name);
+    }
+
+    @Test
+    public void clone_() {
+        SQLQuery<?> query = new SQLQuery<Void>(DerbyTemplates.DEFAULT).from(survey);
+        SQLQuery<?> query2 = query.clone(connection);
+        assertEquals(query.getMetadata().getJoins(), query2.getMetadata().getJoins());
+        assertEquals(query.getMetadata().getWhere(), query2.getMetadata().getWhere());
+        query2.select(survey.id).fetch();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java
new file mode 100644
index 0000000000..a1eef0ff77
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java
@@ -0,0 +1,252 @@
+package com.querydsl.sql;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.JoinType;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.core.testutil.Performance;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.runner.options.TimeValue;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertNotNull;
+
+@Category({H2.class, Performance.class})
+public class QueryPerformanceTest {
+
+    private static final String QUERY = "select COMPANIES.NAME\n" +
+            "from COMPANIES COMPANIES\n" +
+            "where COMPANIES.ID = ?";
+
+    private static final SQLTemplates templates = new H2Templates();
+
+    private static final Configuration conf = new Configuration(templates);
+
+    @BeforeClass
+    public static void setUpClass() throws SQLException, ClassNotFoundException {
+        Connections.initH2();
+        Connection conn = Connections.getConnection();
+        Statement stmt = conn.createStatement();
+        stmt.execute("create or replace table companies (id identity, name varchar(30) unique not null);");
+
+        PreparedStatement pstmt = conn.prepareStatement("insert into companies (name) values (?)");
+        final int iterations = 1000000;
+        for (int i = 0; i < iterations; i++) {
+            pstmt.setString(1, String.valueOf(i));
+            pstmt.execute();
+            pstmt.clearParameters();
+        }
+        pstmt.close();
+        stmt.close();
+
+        conn.setAutoCommit(false);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws SQLException {
+        Connection conn = Connections.getConnection();
+        Statement stmt = conn.createStatement();
+        stmt.execute("drop table companies");
+        stmt.close();
+        Connections.close();
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void jDBC() throws Exception {
+        try (Connection conn = Connections.getH2();
+             PreparedStatement stmt = conn.prepareStatement(QUERY)) {
+            stmt.setLong(1, ThreadLocalRandom.current().nextLong());
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    rs.getString(1);
+                }
+            }
+
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void jDBC2() throws Exception {
+        try (Connection conn = Connections.getH2();
+             PreparedStatement stmt = conn.prepareStatement(QUERY)) {
+            stmt.setString(1, String.valueOf(ThreadLocalRandom.current().nextLong()));
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    rs.getString(1);
+                }
+            }
+
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl1() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            query.from(companies).where(companies.id.eq((long) ThreadLocalRandom.current().nextLong()))
+                    .select(companies.name).fetch();
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl12() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            try (CloseableIterator<String> it = query.from(companies)
+                    .where(companies.id.eq((long) ThreadLocalRandom.current().nextLong())).select(companies.name).iterate()) {
+                while (it.hasNext()) {
+                    it.next();
+                }
+            }
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl13() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            try (ResultSet rs = query.select(companies.name).from(companies)
+                    .where(companies.id.eq((long) ThreadLocalRandom.current().nextLong())).getResults()) {
+                while (rs.next()) {
+                    rs.getString(1);
+                }
+            }
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl14() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf, new DefaultQueryMetadata());
+            query.from(companies).where(companies.id.eq((long) ThreadLocalRandom.current().nextLong()))
+                    .select(companies.name).fetch();
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl15() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            query.from(companies).where(companies.id.eq((long) ThreadLocalRandom.current().nextLong()))
+                    .select(companies.id, companies.name).fetch();
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl2() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            query.from(companies).where(companies.name.eq(String.valueOf(ThreadLocalRandom.current().nextLong())))
+                    .select(companies.name).fetch();
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl22() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf);
+            try (CloseableIterator<String> it = query.from(companies)
+                    .where(companies.name.eq(String.valueOf(ThreadLocalRandom.current().nextLong())))
+                    .select(companies.name).iterate()) {
+                while (it.hasNext()) {
+                    it.next();
+                }
+            }
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void querydsl23() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            SQLQuery<?> query = new SQLQuery<Void>(conn, conf, new DefaultQueryMetadata());
+            query.from(companies)
+                    .where(companies.name.eq(String.valueOf(ThreadLocalRandom.current().nextLong())))
+                    .select(companies.name).fetch();
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.MICROSECONDS)
+    public void serialization() throws Exception {
+        try (Connection conn = Connections.getH2()) {
+            QCompanies companies = QCompanies.companies;
+            final QueryMetadata md = new DefaultQueryMetadata();
+            md.addJoin(JoinType.DEFAULT, companies);
+            md.addWhere(companies.id.eq(1L));
+            md.setProjection(companies.name);
+
+            SQLSerializer serializer = new SQLSerializer(conf);
+            serializer.serialize(md, false);
+            serializer.getConstants();
+            serializer.getConstantPaths();
+            assertNotNull(serializer.toString());
+        }
+    }
+
+    @Test
+    public void launchBenchmark() throws Exception {
+        Options opt = new OptionsBuilder()
+                .include(this.getClass().getName() + ".*")
+                .mode(Mode.AverageTime)
+                .timeUnit(TimeUnit.MICROSECONDS)
+                .warmupTime(TimeValue.seconds(1))
+                .warmupIterations(1)
+                .measurementTime(TimeValue.seconds(1))
+                .measurementIterations(3)
+                .threads(1)
+                .forks(1)
+                .shouldFailOnError(true)
+                .shouldDoGC(true)
+                .build();
+
+        new Runner(opt).run();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java
new file mode 100644
index 0000000000..6f124febc3
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.selectOne;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.domain.QSurvey;
+
+public class RelationalFunctionCallTest {
+
+    private static Expression[] serializeCollection(String... tokens) {
+        Expression[] rv = new Expression[tokens.length];
+        for (int i = 0; i < tokens.length; i++) {
+            rv[i] = ConstantImpl.create(tokens[i]);
+        }
+        return rv;
+    }
+
+    private static class TokenizeFunction extends RelationalFunctionCall<String> {
+        final PathBuilder<String> alias;
+        final StringPath token;
+
+        TokenizeFunction(String alias, String... tokens) {
+           super(String.class, "tokenize", serializeCollection(tokens));
+           this.alias = new PathBuilder<String>(String.class, alias);
+           this.token = Expressions.stringPath(this.alias, "token");
+       }
+
+    }
+
+    @Test
+    public void validation() {
+        QSurvey survey = QSurvey.survey;
+        TokenizeFunction func = new TokenizeFunction("func", "a", "b");
+        SQLQuery<?> sub = selectOne().from(func.as(func.alias)).where(survey.name.like(func.token));
+        System.out.println(sub);
+
+    }
+
+    @Test
+    public void noArgs() {
+        RelationalFunctionCall<String> functionCall = SQLExpressions.relationalFunctionCall(String.class, "getElements");
+        assertEquals("getElements()", functionCall.getTemplate().toString());
+    }
+
+    @Test
+    public void twoArgs() {
+        StringPath str = Expressions.stringPath("str");
+        RelationalFunctionCall<String> functionCall = SQLExpressions.relationalFunctionCall(String.class, "getElements", "a", str);
+        assertEquals("getElements({0}, {1})", functionCall.getTemplate().toString());
+        assertEquals("a", functionCall.getArg(0));
+        assertEquals(str, functionCall.getArg(1));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java
new file mode 100644
index 0000000000..fabb60ee42
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java
@@ -0,0 +1,56 @@
+package com.querydsl.sql;
+
+import static com.querydsl.sql.Constants.employee;
+import static com.querydsl.sql.RelationalPathExtractor.extract;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.domain.QEmployee;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+
+public class RelationalPathExtractorTest {
+
+    private SQLQuery<?> query() {
+        return new SQLQuery<Void>();
+    }
+
+    @Test
+    public void simpleQuery() {
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLQuery<?> query = query().from(employee, employee2);
+
+        assertEquals(new HashSet<>(Arrays.asList(employee, employee2)), extract(query.getMetadata()));
+    }
+
+    @Test
+    public void joins() {
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLQuery<?> query = query().from(employee)
+                .innerJoin(employee2).on(employee.superiorId.eq(employee2.id));
+
+        assertEquals(new HashSet<>(Arrays.asList(employee, employee2)), extract(query.getMetadata()));
+    }
+
+    @Test
+    public void subQuery() {
+        SQLQuery<?> query = query().from(employee)
+                .where(employee.id.eq(query().from(employee).select(employee.id.max())));
+        assertEquals(Collections.singleton(employee), extract(query.getMetadata()));
+    }
+
+    @Test
+    public void subQuery2() {
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLQuery<?> query = query().from(employee)
+            .where(Expressions.list(employee.id, employee.lastname)
+                .in(query().from(employee2).select(employee2.id, employee2.lastname)));
+
+        assertEquals(new HashSet<>(Arrays.asList(employee, employee2)), extract(query.getMetadata()));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java
new file mode 100644
index 0000000000..623a50acad
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java
@@ -0,0 +1,35 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.testutil.Serialization.serialize;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.QTuple;
+import com.querydsl.sql.domain.QSurvey;
+
+public class RelationalPathTest {
+
+    @Test
+    public void path() throws ClassNotFoundException, IOException {
+        QSurvey survey = QSurvey.survey;
+        QSurvey survey2 = serialize(survey);
+        assertEquals(Arrays.asList(survey.all()), Arrays.asList(survey2.all()));
+        assertEquals(survey.getMetadata(), survey2.getMetadata());
+        assertEquals(survey.getMetadata(survey.id), survey2.getMetadata(survey.id));
+    }
+
+    @Test
+    public void in_tuple() throws ClassNotFoundException, IOException {
+        //(survey.id, survey.name)
+        QSurvey survey = QSurvey.survey;
+        QTuple tuple = Projections.tuple(survey.id, survey.name);
+        serialize(tuple);
+        serialize(tuple.newInstance(1, "a"));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java
new file mode 100644
index 0000000000..fa5000ae34
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java
@@ -0,0 +1,52 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLBindingsTest {
+
+    private QSurvey survey = QSurvey.survey;
+
+    private SQLQuery<?> query = new SQLQuery<Void>();
+
+    @Test
+    public void empty() {
+        SQLBindings bindings = query.getSQL();
+        assertEquals("\nfrom dual", bindings.getSQL());
+        assertTrue(bindings.getNullFriendlyBindings().isEmpty());
+    }
+
+    @Test
+    public void singleArg() {
+        query.from(survey).where(survey.name.eq("Bob")).select(survey.id);
+        SQLBindings bindings = query.getSQL();
+        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ?", bindings.getSQL());
+        assertEquals(Collections.singletonList("Bob"), bindings.getNullFriendlyBindings());
+    }
+
+    @Test
+    public void twoArgs() {
+        query.from(survey).where(survey.name.eq("Bob"), survey.name2.eq("A")).select(survey.id);
+        SQLBindings bindings = query.getSQL();
+        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ? and SURVEY.NAME2 = ?", bindings.getSQL());
+        assertEquals(Arrays.asList("Bob", "A"), bindings.getNullFriendlyBindings());
+    }
+
+    @Test
+    public void params() {
+        Param<String> name = new Param<String>(String.class, "name");
+        query.from(survey).where(survey.name.eq(name), survey.name2.eq("A")).select(survey.id);
+        query.set(name, "Bob");
+        SQLBindings bindings = query.getSQL();
+        assertEquals("select SURVEY.ID\nfrom SURVEY SURVEY\nwhere SURVEY.NAME = ? and SURVEY.NAME2 = ?", bindings.getSQL());
+        assertEquals(Arrays.asList("Bob", "A"), bindings.getNullFriendlyBindings());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java
new file mode 100644
index 0000000000..df8900d706
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java
@@ -0,0 +1,66 @@
+package com.querydsl.sql;
+
+import static com.querydsl.sql.Constants.employee;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.SQLException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.domain.Employee;
+
+@Category(H2.class)
+public class SQLCloseListenerTest {
+
+    private SQLQuery<Employee> query;
+
+    @Before
+    public void setUp() throws SQLException, ClassNotFoundException {
+        Connections.initH2();
+        Configuration conf = new Configuration(H2Templates.DEFAULT);
+        conf.addListener(SQLCloseListener.DEFAULT);
+        query = new SQLQuery<Void>(Connections.getConnection(), conf).select(employee).from(employee);
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        Connections.close();
+    }
+
+    @Test
+    public void fetch() {
+        assertFalse(query.fetch().isEmpty());
+    }
+
+    @Test
+    public void fetchOne() {
+        assertNotNull(query.limit(1).fetchOne());
+    }
+
+    @Test
+    public void fetchFirst() {
+        assertNotNull(query.fetchFirst());
+    }
+
+    @Test
+    public void fetchResults() {
+        assertNotNull(query.fetchResults());
+    }
+
+    @Test
+    public void iterate() {
+        try (CloseableIterator<Employee> it = query.iterate()) {
+            while (it.hasNext()) {
+                it.next();
+            }
+        }
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java
new file mode 100644
index 0000000000..7b1177923b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java
@@ -0,0 +1,190 @@
+package com.querydsl.sql;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+import java.util.Map;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+
+import com.querydsl.core.DefaultQueryMetadata;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
+
+public class SQLListenersTest {
+
+    @Test
+    public void notifyQuery() {
+        SQLListener listener = createMock(SQLListener.class);
+        SQLListeners listeners = new SQLListeners();
+        listeners.add(listener);
+
+        QueryMetadata md = new DefaultQueryMetadata();
+        listener.notifyQuery(md);
+        replay(listener);
+
+        listeners.notifyQuery(md);
+        verify(listener);
+    }
+
+    @Test
+    public void notifyQuery_parent() {
+        SQLListener listener = createMock(SQLListener.class);
+        SQLListeners listeners = new SQLListeners(listener);
+
+        QueryMetadata md = new DefaultQueryMetadata();
+        listener.notifyQuery(md);
+        replay(listener);
+
+        listeners.notifyQuery(md);
+        verify(listener);
+    }
+
+
+    @Test
+    public void notifyQuery_detailedListener_start() {
+        SQLListenerContext sqlListenerContext = createMock(SQLListenerContext.class);
+        SQLDetailedListener listenerParent = createMock(SQLDetailedListener.class);
+        SQLDetailedListener listener1 = createMock(SQLDetailedListener.class);
+        SQLDetailedListener listener2 = createMock(SQLDetailedListener.class);
+
+        listenerParent.start(sqlListenerContext);
+        replay(listenerParent);
+
+        listener1.start(sqlListenerContext);
+        replay(listener1);
+
+        listener2.start(sqlListenerContext);
+        replay(listener2);
+
+
+        SQLListeners listeners = new SQLListeners(listenerParent);
+        listeners.add(listener1);
+        listeners.add(listener2);
+
+        listeners.start(sqlListenerContext);
+        verify(listenerParent);
+        verify(listener1);
+        verify(listener2);
+    }
+
+
+    @Test
+    public void notifyQuery_detailedListener_contexSetting() {
+        SQLListenerContext sqlListenerContext = new SQLListenerContextImpl(new DefaultQueryMetadata());
+        SQLDetailedListener listenerParent = new AssertingDetailedListener("keyParent", "valueParent");
+        SQLDetailedListener listener1 = new AssertingDetailedListener("key1", "value1");
+        SQLDetailedListener listener2 = new AssertingDetailedListener("key1", "value1");
+
+        SQLListeners listeners = new SQLListeners(listenerParent);
+        listeners.add(listener1);
+        listeners.add(listener2);
+
+        listeners.start(sqlListenerContext);
+        listeners.preRender(sqlListenerContext);
+        listeners.rendered(sqlListenerContext);
+        listeners.prePrepare(sqlListenerContext);
+        listeners.prepared(sqlListenerContext);
+        listeners.preExecute(sqlListenerContext);
+        listeners.preExecute(sqlListenerContext);
+    }
+
+    static class AssertingDetailedListener implements SQLDetailedListener {
+        private final String key;
+        private final Object value;
+
+        AssertingDetailedListener(String key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public void start(SQLListenerContext context) {
+            context.setData(key, value);
+        }
+
+        @Override
+        public void preRender(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void rendered(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void prePrepare(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void prepared(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void preExecute(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void executed(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void exception(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void end(SQLListenerContext context) {
+            assertThat(this.value, CoreMatchers.equalTo(context.getData(key)));
+        }
+
+        @Override
+        public void notifyQuery(QueryMetadata md) {
+        }
+
+        @Override
+        public void notifyDelete(RelationalPath<?> entity, QueryMetadata md) {
+        }
+
+        @Override
+        public void notifyDeletes(RelationalPath<?> entity, List<QueryMetadata> batches) {
+        }
+
+        @Override
+        public void notifyMerge(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> keys, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        }
+
+        @Override
+        public void notifyMerges(RelationalPath<?> entity, QueryMetadata md, List<SQLMergeBatch> batches) {
+        }
+
+        @Override
+        public void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        }
+
+        @Override
+        public void notifyInserts(RelationalPath<?> entity, QueryMetadata md, List<SQLInsertBatch> batches) {
+        }
+
+        @Override
+        public void notifyUpdate(RelationalPath<?> entity, QueryMetadata md, Map<Path<?>, Expression<?>> updates) {
+        }
+
+        @Override
+        public void notifyUpdates(RelationalPath<?> entity, List<SQLUpdateBatch> batches) {
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java
new file mode 100644
index 0000000000..447dd0b874
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLQueryFactoryTest {
+
+    private SQLQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<Connection> provider = () -> EasyMock.<Connection> createNiceMock(Connection.class);
+        queryFactory = new SQLQueryFactory(SQLTemplates.DEFAULT, provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QSurvey.survey));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QSurvey.survey));
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QSurvey.survey));
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QSurvey.survey));
+    }
+
+    @Test
+    public void merge() {
+        assertNotNull(queryFactory.merge(QSurvey.survey));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java
new file mode 100644
index 0000000000..0b8bc33d11
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java
@@ -0,0 +1,15 @@
+package com.querydsl.sql;
+
+import org.junit.Test;
+
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLQueryTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noConnection() {
+        QSurvey survey = QSurvey.survey;
+        SQLExpressions.select(survey.id).from(survey).fetch();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java
new file mode 100644
index 0000000000..c5cfb17e64
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+
+import com.querydsl.core.types.*;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QEmployeeNoPK;
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLSerializerTest {
+
+    private static final QEmployee employee = QEmployee.employee;
+
+    private static final QSurvey survey = QSurvey.survey;
+
+    @Test
+    public void count() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(employee.id.count().add(employee.id.countDistinct()));
+        assertEquals("count(EMPLOYEE.ID) + count(distinct EMPLOYEE.ID)", serializer.toString());
+    }
+
+    @Test
+    public void countDistinct() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        SQLQuery<?> query = new SQLQuery<Void>();
+        query.from(QEmployeeNoPK.employee);
+        query.distinct();
+        serializer.serializeForQuery(query.getMetadata(), true);
+        assertEquals("select count(*)\n" +
+        "from (select distinct EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, " +
+            "EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID\n" +
+         "from EMPLOYEE EMPLOYEE) internal", serializer.toString());
+    }
+
+    @Test
+    public void countDistinct_postgreSQL() {
+        Configuration postgresql = new Configuration(new PostgreSQLTemplates());
+        SQLSerializer serializer = new SQLSerializer(postgresql);
+        SQLQuery<?> query = new SQLQuery<Void>();
+        query.from(QEmployeeNoPK.employee);
+        query.distinct();
+        serializer.serializeForQuery(query.getMetadata(), true);
+        assertEquals("select count(" +
+            "distinct (EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, " +
+            "EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID))\n" +
+            "from EMPLOYEE EMPLOYEE", serializer.toString());
+    }
+
+    @Test
+    public void dynamicQuery() {
+        Path<Object> userPath = Expressions.path(Object.class, "user");
+        NumberPath<Long> idPath = Expressions.numberPath(Long.class, userPath, "id");
+        StringPath usernamePath = Expressions.stringPath(userPath, "username");
+        Expression<?> sq = select(idPath, usernamePath)
+            .from(userPath).where(idPath.eq(1L));
+
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(sq);
+        //USER is a reserved word in ANSI SQL 2008
+        assertEquals("(select \"user\".id, \"user\".username\n" +
+                "from \"user\"\n" +
+                "where \"user\".id = ?)", serializer.toString());
+    }
+
+    @Test
+    public void dynamicQuery2() {
+        PathBuilder<Object> userPath = new PathBuilder<Object>(Object.class, "user");
+        NumberPath<Long> idPath = userPath.getNumber("id", Long.class);
+        StringPath usernamePath = userPath.getString("username");
+        Expression<?> sq = select(idPath, usernamePath)
+            .from(userPath).where(idPath.eq(1L));
+
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(sq);
+        //USER is a reserved word in ANSI SQL 2008
+        assertEquals("(select \"user\".id, \"user\".username\n" +
+                "from \"user\"\n" +
+                "where \"user\".id = ?)", serializer.toString());
+    }
+
+    @Test
+    public void in() {
+        StringPath path = Expressions.stringPath("str");
+        Expression<?> expr = ExpressionUtils.in(path, Arrays.asList("1", "2", "3"));
+
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(expr);
+        assertEquals(Arrays.asList(path, path, path), serializer.getConstantPaths());
+        assertEquals(3, serializer.getConstants().size());
+    }
+
+    @Test
+    public void fullJoinWithoutCodeGeneration() {
+        SQLQuery<?> sqlQuery = queryForMYSQLTemplate();
+
+        PathBuilder<Object> customerPath = new PathBuilder<Object>(Object.class, "customer");
+        PathBuilder<Object> deptPath = new PathBuilder<Object>(Object.class, "department");
+        Path<Object> deptAliasPath = new PathBuilder<Object>(Object.class, "d");
+        sqlQuery = sqlQuery.from(customerPath.as("c"));
+        NumberPath<Long> idPath = Expressions.numberPath(Long.class, deptAliasPath, "id");
+
+        sqlQuery = sqlQuery.fullJoin(deptPath, deptAliasPath).select(idPath);
+
+        assertEquals("select d.id from customer as c full join department as d", sqlQuery.toString());
+    }
+
+    @Test
+    public void innerJoinWithoutCodeGeneration() {
+        SQLQuery<?> sqlQuery = queryForMYSQLTemplate();
+
+        PathBuilder<Object> customerPath = new PathBuilder<Object>(Object.class, "customer");
+        PathBuilder<Object> deptPath = new PathBuilder<Object>(Object.class, "department");
+        Path<Object> deptAliasPath = new PathBuilder<Object>(Object.class, "d");
+        sqlQuery = sqlQuery.from(customerPath.as("c"));
+        NumberPath<Long> idPath = Expressions.numberPath(Long.class, deptAliasPath, "id");
+
+        sqlQuery = sqlQuery.innerJoin(deptPath, deptAliasPath).select(idPath);
+
+        assertEquals("select d.id from customer as c inner join department as d", sqlQuery.toString());
+    }
+
+    @Test
+    public void joinWithoutCodeGeneration() {
+        SQLQuery<?> sqlQuery = queryForMYSQLTemplate();
+
+        PathBuilder<Object> customerPath = new PathBuilder<Object>(Object.class, "customer");
+        PathBuilder<Object> deptPath = new PathBuilder<Object>(Object.class, "department");
+        Path<Object> deptAliasPath = new PathBuilder<Object>(Object.class, "d");
+        sqlQuery = sqlQuery.from(customerPath.as("c"));
+        NumberPath<Long> idPath = Expressions.numberPath(Long.class, deptAliasPath, "id");
+
+        sqlQuery = sqlQuery.join(deptPath, deptAliasPath).select(idPath);
+
+        assertEquals("select d.id from customer as c join department as d", sqlQuery.toString());
+    }
+
+    @Test
+    public void leftJoinWithoutCodeGeneration() {
+        SQLQuery<?> sqlQuery = queryForMYSQLTemplate();
+
+        PathBuilder<Object> customerPath = new PathBuilder<Object>(Object.class, "customer");
+        PathBuilder<Object> deptPath = new PathBuilder<Object>(Object.class, "department");
+        Path<Object> deptAliasPath = new PathBuilder<Object>(Object.class, "d");
+        sqlQuery = sqlQuery.from(customerPath.as("c"));
+        NumberPath<Long> idPath = Expressions.numberPath(Long.class, deptAliasPath, "id");
+
+        sqlQuery = sqlQuery.leftJoin(deptPath, deptAliasPath).select(idPath);
+
+        assertEquals("select d.id from customer as c left join department as d", sqlQuery.toString());
+    }
+
+    @Test
+    public void or_in() {
+        StringPath path = Expressions.stringPath("str");
+        Expression<?> expr = ExpressionUtils.anyOf(
+                ExpressionUtils.in(path, Arrays.asList("1", "2", "3")),
+                ExpressionUtils.in(path, Arrays.asList("4", "5", "6")));
+
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(expr);
+        assertEquals(Arrays.asList(path, path, path, path, path, path), serializer.getConstantPaths());
+        assertEquals(6, serializer.getConstants().size());
+    }
+
+    @Test
+    public void some() {
+        //select some((e.FIRSTNAME is not null)) from EMPLOYEE
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(SQLExpressions.any(employee.firstname.isNotNull()));
+        assertEquals("some(EMPLOYEE.FIRSTNAME is not null)", serializer.toString());
+    }
+
+    @Test
+    public void startsWith() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        QSurvey s1 = new QSurvey("s1");
+        serializer.handle(s1.name.startsWith("X"));
+        assertEquals("s1.NAME like ? escape '\\'", serializer.toString());
+        assertEquals(Collections.singletonList("X%"), serializer.getConstants());
+    }
+
+    @Test
+    public void from_function() {
+        SQLQuery<?> query = query();
+        query.from(Expressions.template(Survey.class, "functionCall()")).join(survey);
+        query.where(survey.name.isNotNull());
+        assertEquals("from functionCall()\njoin SURVEY SURVEY\nwhere SURVEY.NAME is not null", query.toString());
+    }
+
+    @Test
+    public void join_to_function_with_alias() {
+        SQLQuery<?> query = query();
+        query.from(survey).join(SQLExpressions.relationalFunctionCall(Survey.class, "functionCall"), Expressions.path(Survey.class, "fc"));
+        query.where(survey.name.isNotNull());
+        assertEquals("from SURVEY SURVEY\njoin functionCall() as fc\nwhere SURVEY.NAME is not null", query.toString());
+    }
+
+    @Test
+    public void join_to_function_in_derby() {
+        SQLQuery<?> query = new SQLQuery<Void>(DerbyTemplates.DEFAULT);
+        query.from(survey).join(SQLExpressions.relationalFunctionCall(Survey.class, "functionCall"), Expressions.path(Survey.class, "fc"));
+        query.where(survey.name.isNotNull());
+        assertEquals("from SURVEY SURVEY\njoin table(functionCall()) as fc\nwhere SURVEY.NAME is not null", query.toString());
+    }
+
+    @Test
+    public void crossJoin() {
+        SQLTemplates templates = new DerbyTemplates();
+        templates.setCrossJoin(" cross join ");
+        SQLQuery<?> query = new SQLQuery<Void>(templates);
+        query.from(survey, employee);
+        assertEquals("from SURVEY SURVEY cross join EMPLOYEE EMPLOYEE", query.toString());
+    }
+
+    @Test
+    public void keyword_after_dot() {
+        SQLQuery<?> query = new SQLQuery<Void>(MySQLTemplates.DEFAULT);
+        PathBuilder<Survey> surveyBuilder = new PathBuilder<Survey>(Survey.class, "survey");
+        query.from(surveyBuilder).where(surveyBuilder.get("not").isNotNull());
+        assertFalse(query.toString().contains("`"));
+    }
+
+    @Test
+    public void like() {
+        Expression<?> expr = Expressions.stringTemplate("'%a%'").contains("%a%");
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.handle(expr);
+        assertEquals("'%a%' like ? escape '\\'", serializer.toString());
+    }
+
+    @Test
+    public void override() {
+        Configuration conf = new Configuration(new DerbyTemplates());
+        conf.registerTableOverride("SURVEY", "surveys");
+
+        SQLQuery<?> query = new SQLQuery<Void>(conf);
+        query.from(survey);
+        assertEquals("from surveys SURVEY", query.toString());
+    }
+
+    @Test
+    public void columnOverrides() {
+        Configuration conf = new Configuration(new DerbyTemplates());
+        conf.registerColumnOverride("SURVEY", "NAME", "LABEL");
+
+        SQLQuery<?> query = new SQLQuery<Void>(conf);
+        query.from(survey).where(survey.name.isNull());
+        assertEquals("from SURVEY SURVEY\n" +
+                "where SURVEY.LABEL is null", query.toString());
+    }
+
+    @Test
+    public void columnOverrides2() {
+        Configuration conf = new Configuration(new DerbyTemplates());
+        conf.registerColumnOverride("PUBLIC", "SURVEY", "NAME", "LABEL");
+
+        SQLQuery<?> query = new SQLQuery<Void>(conf);
+        query.from(survey).where(survey.name.isNull());
+        assertEquals("from SURVEY SURVEY\n" +
+                "where SURVEY.LABEL is null", query.toString());
+    }
+
+    @Test
+    public void complex_subQuery() {
+        // create sub queries
+        List<SubQueryExpression<Tuple>> sq = new ArrayList<SubQueryExpression<Tuple>>();
+        String[] strs = new String[]{"a","b","c"};
+        for (String str : strs) {
+            Expression<Boolean> alias = Expressions.cases().when(survey.name.eq(str)).then(true).otherwise(false);
+            sq.add(select(survey.name, alias).from(survey).distinct());
+        }
+
+        // master query
+        PathBuilder<Tuple> subAlias = new PathBuilder<Tuple>(Tuple.class, "sub");
+        SubQueryExpression<?> master = selectOne()
+                .from(union(sq).as(subAlias))
+                .groupBy(subAlias.get("prop1"));
+
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.serialize(master.getMetadata(), false);
+        System.err.println(serializer);
+    }
+
+    @Test
+    public void boolean_() {
+        QSurvey s = new QSurvey("s");
+        BooleanBuilder bb1 = new BooleanBuilder();
+        bb1.and(s.name.eq(s.name));
+
+        BooleanBuilder bb2 = new BooleanBuilder();
+        bb2.or(s.name.eq(s.name));
+        bb2.or(s.name.eq(s.name));
+
+        String str = new SQLSerializer(Configuration.DEFAULT).handle(bb1.and(bb2)).toString();
+        assertEquals("s.NAME = s.NAME and (s.NAME = s.NAME or s.NAME = s.NAME)", str);
+    }
+
+    @Test
+    public void list_in_query() {
+        Expression<?> expr = Expressions.list(survey.id, survey.name).in(select(survey.id, survey.name).from(survey));
+
+        String str = new SQLSerializer(Configuration.DEFAULT).handle(expr).toString();
+        assertEquals("(SURVEY.ID, SURVEY.NAME) in (select SURVEY.ID, SURVEY.NAME\nfrom SURVEY SURVEY)", str);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void withRecursive() {
+        /*with sub (id, firstname, superior_id) as (
+            select id, firstname, superior_id from employee where firstname like 'Mike'
+            union all
+            select employee.id, employee.firstname, employee.superior_id from sub, employee
+            where employee.superior_id = sub.id)
+        select * from sub;*/
+
+        QEmployee e = QEmployee.employee;
+        PathBuilder<Tuple> sub = new PathBuilder<Tuple>(Tuple.class, "sub");
+        SQLQuery<?> query = new SQLQuery<Void>(SQLTemplates.DEFAULT);
+        query.withRecursive(sub,
+                unionAll(
+                        select(e.id, e.firstname, e.superiorId).from(e).where(e.firstname.eq("Mike")),
+                        select(e.id, e.firstname, e.superiorId).from(e, sub).where(e.superiorId.eq(sub.get(e.id)))))
+             .from(sub);
+
+        QueryMetadata md = query.getMetadata();
+        md.setProjection(Wildcard.all);
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.serialize(md, false);
+        assertEquals("with recursive sub as ((select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
+                "from EMPLOYEE EMPLOYEE\n" +
+                "where EMPLOYEE.FIRSTNAME = ?)\n" +
+                "union all\n" +
+                "(select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
+                "from EMPLOYEE EMPLOYEE, sub\n" +
+                "where EMPLOYEE.SUPERIOR_ID = sub.ID))\n" +
+                "select *\n" +
+                "from sub", serializer.toString());
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void withRecursive2() {
+        /*with sub (id, firstname, superior_id) as (
+            select id, firstname, superior_id from employee where firstname like 'Mike'
+            union all
+            select employee.id, employee.firstname, employee.superior_id from sub, employee
+            where employee.superior_id = sub.id)
+        select * from sub;*/
+
+        QEmployee e = QEmployee.employee;
+        PathBuilder<Tuple> sub = new PathBuilder<Tuple>(Tuple.class, "sub");
+        SQLQuery<?> query = new SQLQuery<Void>(SQLTemplates.DEFAULT);
+        query.withRecursive(sub, sub.get(e.id), sub.get(e.firstname), sub.get(e.superiorId)).as(
+                unionAll(
+                        select(e.id, e.firstname, e.superiorId).from(e).where(e.firstname.eq("Mike")),
+                        select(e.id, e.firstname, e.superiorId).from(e, sub).where(e.superiorId.eq(sub.get(e.id)))))
+             .from(sub);
+
+        QueryMetadata md = query.getMetadata();
+        md.setProjection(Wildcard.all);
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.serialize(md, false);
+        assertEquals("with recursive sub (ID, FIRSTNAME, SUPERIOR_ID) as ((select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
+                "from EMPLOYEE EMPLOYEE\n" +
+                "where EMPLOYEE.FIRSTNAME = ?)\n" +
+                "union all\n" +
+                "(select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.SUPERIOR_ID\n" +
+                "from EMPLOYEE EMPLOYEE, sub\n" +
+                "where EMPLOYEE.SUPERIOR_ID = sub.ID))\n" +
+                "select *\n" +
+                "from sub", serializer.toString());
+
+    }
+
+    @Test
+    public void useLiterals() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.setUseLiterals(true);
+
+        int offset = TimeZone.getDefault().getRawOffset();
+        Expression<?> expr = SQLExpressions.datediff(DatePart.year, employee.datefield, new java.sql.Date(-offset));
+        serializer.handle(expr);
+        assertEquals("datediff('year',EMPLOYEE.DATEFIELD,(date '1970-01-01'))", serializer.toString());
+    }
+
+    @Test
+    public void select_normalization() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.visit(select(
+                Expressions.stringPath("id"), Expressions.stringPath("ID")), null);
+        assertEquals("(select id, ID as col__ID1\n" +
+                "from dual)", serializer.toString());
+    }
+
+    @Test
+    public void noSchemaInWhere() {
+        Configuration defaultWithPrintSchema = new Configuration(new SQLTemplates(Keywords.DEFAULT, "\"", '\\', false, false));
+        defaultWithPrintSchema.getTemplates().setPrintSchema(true);
+
+        QEmployee e = QEmployee.employee;
+        SQLDeleteClause delete = new SQLDeleteClause(EasyMock.<Connection> createNiceMock(Connection.class), defaultWithPrintSchema, e);
+        delete.where(e.id.gt(100));
+
+        assertEquals("delete from PUBLIC.EMPLOYEE\n" +
+                "where EMPLOYEE.ID > ?", delete.toString());
+    }
+
+    @Test
+    public void schemaInWhere() {
+        Configuration derbyWithPrintSchema = new Configuration(DerbyTemplates.builder().printSchema().build());
+
+        QEmployee e = QEmployee.employee;
+        SQLDeleteClause delete = new SQLDeleteClause(EasyMock.<Connection> createNiceMock(Connection.class), derbyWithPrintSchema, e);
+        delete.where(e.id.gt(100));
+
+        assertEquals("delete from \"PUBLIC\".EMPLOYEE\n" +
+                "where \"PUBLIC\".EMPLOYEE.ID > ?", delete.toString());
+    }
+
+    private SQLQuery<?> query() {
+        return new SQLQuery<Void>();
+    }
+
+    private SQLQuery<?> queryForMYSQLTemplate() {
+        return new SQLQuery<Void>(MySQLTemplates.builder().printSchema().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java
new file mode 100644
index 0000000000..863c3cc420
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public class SQLServer2005TemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    @Test
+    public void noFrom() {
+        query.getMetadata().setProjection(Expressions.ONE);
+        assertEquals("select 1", query.toString());
+    }
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new SQLServer2005Templates();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @Override
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class, "col1");
+        Union union = query.union(
+            select(one.as(col1)),
+            select(two),
+            select(three));
+        assertEquals(
+                "(select 1 as col1)\n" +
+                "union\n" +
+                "(select 2)\n" +
+                "union\n" +
+                "(select 3)", union.toString());
+    }
+
+    @Test
+    public void limit() {
+        query.from(survey1).limit(5);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select top (?) survey1.ID from SURVEY survey1", query.toString());
+    }
+
+    @Test
+    public void modifiers() {
+        query.from(survey1).limit(5).offset(3);
+        query.orderBy(survey1.id.asc());
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select * from (" +
+              "   select survey1.ID, row_number() over (order by survey1.ID asc) as rn from SURVEY survey1) a " +
+              "where rn > ? and rn <= ? order by rn", query.toString());
+    }
+
+    @Test
+    public void modifiers_noOrder() {
+        query.from(survey1).limit(5).offset(3);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select * from (" +
+                "   select survey1.ID, row_number() over (order by current_timestamp asc) as rn from SURVEY survey1) a " +
+                "where rn > ? and rn <= ? order by rn", query.toString());
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString());
+    }
+
+    @Test
+    public void precedence() {
+        // 1  ~ (Bitwise NOT)
+        // 2  (Multiply), / (Division), % (Modulo)
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        // 3 + (Positive), - (Negative), + (Add), (+ Concatenate), - (Subtract), & (Bitwise AND), ^ (Bitwise Exclusive OR), | (Bitwise OR)
+        int p3 = getPrecedence(Ops.NEGATE, Ops.ADD, Ops.SUB, Ops.CONCAT);
+        // 4 =, >, <, >=, <=, <>, !=, !>, !< (Comparison operators)
+        int p4 = getPrecedence(Ops.EQ, Ops.GT, Ops.LT, Ops.GOE, Ops.LOE, Ops.NE);
+        // 5 NOT
+        int p5 = getPrecedence(Ops.NOT);
+        // 6 AND
+        int p6 = getPrecedence(Ops.AND);
+        // 7 ALL, ANY, BETWEEN, IN, LIKE, OR, SOME
+        int p7 = getPrecedence(Ops.BETWEEN, Ops.IN, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.OR);
+        // 8 = (Assignment)
+
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java
new file mode 100644
index 0000000000..694e3b00b1
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+
+
+public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    @Test
+    public void noFrom() {
+        query.getMetadata().setProjection(Expressions.ONE);
+        assertEquals("select 1", query.toString());
+    }
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new SQLServer2012Templates();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @Override
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Union union = query.union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+        assertEquals(
+                "(select 1 as col1)\n" +
+                "union\n" +
+                "(select 2)\n" +
+                "union\n" +
+                "(select 3)", union.toString());
+    }
+
+    @Test
+    public void limit() {
+        query.from(survey1).limit(5);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select top 5 survey1.ID from SURVEY survey1", query.toString());
+    }
+
+    @Test
+    public void limitOffset() {
+        query.from(survey1).limit(5).offset(5);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select survey1.ID from SURVEY survey1 " +
+                "order by 1 asc " +
+                "offset ? rows fetch next ? rows only", query.toString());
+    }
+
+    @Test
+    public void delete_limit() {
+        SQLDeleteClause clause = new SQLDeleteClause(null, createTemplates(), survey1);
+        clause.where(survey1.name.eq("Bob"));
+        clause.limit(5);
+        assertEquals("delete top 5 from SURVEY\n" +
+                "where SURVEY.NAME = ?", clause.toString());
+    }
+
+    @Test
+    public void update_limit() {
+        SQLUpdateClause clause = new SQLUpdateClause(null, createTemplates(), survey1);
+        clause.set(survey1.name, "Bob");
+        clause.limit(5);
+        assertEquals("update top 5 SURVEY\n" +
+                "set NAME = ?", clause.toString());
+    }
+
+    @Test
+    public void modifiers() {
+        query.from(survey1).limit(5).offset(3).orderBy(survey1.id.asc());
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select survey1.ID from SURVEY survey1 order by survey1.ID asc offset ? rows fetch next ? rows only", query.toString());
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertSerialized(nextval, "next value for myseq");
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java
new file mode 100644
index 0000000000..1fa0729aae
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Operation;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+
+public class SQLServerTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    @Test
+    public void noFrom() {
+        query.getMetadata().setProjection(Expressions.ONE);
+        assertEquals("select 1", query.toString());
+    }
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new SQLServerTemplates();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @Override
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Union union = query.union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+        assertEquals(
+                "(select 1 as col1)\n" +
+                "union\n" +
+                "(select 2)\n" +
+                "union\n" +
+                "(select 3)", union.toString());
+    }
+
+    @Test
+    public void limit() {
+        query.from(survey1).limit(5);
+        query.getMetadata().setProjection(survey1.id);
+        assertEquals("select top 5 survey1.ID from SURVEY survey1", query.toString());
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString());
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Test
+    public void truncateWeek() {
+        final SQLQuery<Comparable> expression = query.select(
+                SQLExpressions.datetrunc(DatePart.week,
+                        Expressions.dateTimeTemplate(Comparable.class, "dateExpression")));
+        assertEquals("select DATEADD(WEEK, DATEDIFF(WEEK, 0, dateExpression - 1), 0)",
+                expression.toString());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java
new file mode 100644
index 0000000000..ea7d141809
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static com.querydsl.sql.SQLExpressions.union;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.Wildcard;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLSubQueryTest {
+
+    private static final QEmployee employee = QEmployee.employee;
+
+    @Test(expected = IllegalArgumentException.class)
+    public void unknownOperator() {
+        Operator op = new Operator() {
+            public String name() {
+                return "unknownfn";
+            }
+            public String toString() {
+                return name();
+            }
+            public Class<?> getType() {
+                return Object.class;
+            }
+        };
+        SQLQuery<?> query = new SQLQuery<Void>();
+        query.from(employee)
+            .where(Expressions.booleanOperation(op, employee.id)).toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void list() {
+        SubQueryExpression<?> subQuery = select(employee.id, Expressions.constant("XXX"), employee.firstname).from(employee);
+        List<? extends Expression<?>> exprs = ((FactoryExpression) subQuery.getMetadata().getProjection()).getArgs();
+        assertEquals(employee.id, exprs.get(0));
+        assertEquals(ConstantImpl.create("XXX"), exprs.get(1));
+        assertEquals(employee.firstname, exprs.get(2));
+    }
+
+    @Test
+    public void list_entity() {
+        QEmployee employee2 = new QEmployee("employee2");
+        Expression<?> expr = select(employee, employee2.id).from(employee)
+             .innerJoin(employee.superiorIdKey, employee2);
+
+        SQLSerializer serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
+        serializer.handle(expr);
+
+        assertEquals("(select EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID, employee2.ID as col__ID7\n" +
+                "from EMPLOYEE EMPLOYEE\n" +
+                "inner join EMPLOYEE employee2\n" +
+                "on EMPLOYEE.SUPERIOR_ID = employee2.ID)", serializer.toString());
+    }
+
+    @Test
+    public void in() {
+        SubQueryExpression<Integer> ints = select(employee.id).from(employee);
+        QEmployee.employee.id.in(ints);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void in_union() {
+        SubQueryExpression<Integer> ints1 = select(employee.id).from(employee);
+        SubQueryExpression<Integer> ints2 = select(employee.id).from(employee);
+        QEmployee.employee.id.in(union(ints1, ints2));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void in_union2() {
+        SubQueryExpression<Integer> ints1 = select(employee.id).from(employee);
+        SubQueryExpression<Integer> ints2 = select(employee.id).from(employee);
+        QEmployee.employee.id.in(union(ints1, ints2));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void unique() {
+        SubQueryExpression<?> subQuery = select(employee.id, Expressions.constant("XXX"), employee.firstname).from(employee);
+        List<? extends Expression<?>> exprs = ((FactoryExpression) subQuery.getMetadata().getProjection()).getArgs();
+        assertEquals(employee.id, exprs.get(0));
+        assertEquals(ConstantImpl.create("XXX"), exprs.get(1));
+        assertEquals(employee.firstname, exprs.get(2));
+    }
+
+    @Test
+    public void complex() {
+        // related to #584795
+        QSurvey survey = new QSurvey("survey");
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SubQueryExpression<?> subQuery = select(survey.id, emp2.firstname).from(survey)
+          .innerJoin(emp1)
+           .on(survey.id.eq(emp1.id))
+          .innerJoin(emp2)
+           .on(emp1.superiorId.eq(emp2.superiorId), emp1.firstname.eq(emp2.firstname));
+
+        assertEquals(3, subQuery.getMetadata().getJoins().size());
+    }
+
+    @Test
+    public void validate() {
+        NumberPath<Long> operatorTotalPermits = Expressions.numberPath(Long.class, "operator_total_permits");
+        QSurvey survey = new QSurvey("survey");
+
+        // select survey.name, count(*) as operator_total_permits
+        // from survey
+        // where survey.name >= "A"
+        // group by survey.name
+        // order by operator_total_permits asc
+        // limit 10
+
+        Expression<?> e = select(survey.name, Wildcard.count.as(operatorTotalPermits)).from(survey)
+            .where(survey.name.goe("A"))
+            .groupBy(survey.name)
+            .orderBy(operatorTotalPermits.asc())
+            .limit(10)
+            .as("top");
+
+        select(Wildcard.all).from(e);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union1() {
+        QSurvey survey = QSurvey.survey;
+        SubQueryExpression<Integer> q1 = select(survey.id).from(survey);
+        SubQueryExpression<Integer> q2 = select(survey.id).from(survey);
+        union(q1, q2);
+        union(q1);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union1_with() {
+        QSurvey survey1 = new QSurvey("survey1");
+        QSurvey survey2 = new QSurvey("survey2");
+        QSurvey survey3 = new QSurvey("survey3");
+
+        SQLQuery<Void> query = new SQLQuery<Void>();
+        query.with(survey1, select(survey1.all()).from(survey1));
+        query.union(
+                select(survey2.all()).from(survey2),
+                select(survey3.all()).from(survey3));
+
+        assertEquals("with survey1 as (select survey1.NAME, survey1.NAME2, survey1.ID\n" +
+                "from SURVEY survey1)\n" +
+                "(select survey2.NAME, survey2.NAME2, survey2.ID\n" +
+                "from SURVEY survey2)\n" +
+                "union\n" +
+                "(select survey3.NAME, survey3.NAME2, survey3.ID\n" +
+                "from SURVEY survey3)", query.toString());
+
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesRegistryDump.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesRegistryDump.java
new file mode 100644
index 0000000000..c00c57d053
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesRegistryDump.java
@@ -0,0 +1,43 @@
+package com.querydsl.sql;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+public final class SQLTemplatesRegistryDump {
+
+    private SQLTemplatesRegistryDump() { }
+
+    public static void main(String[] args) throws SQLException, ClassNotFoundException {
+        Connections.initCubrid();
+        dump();
+        Connections.initDerby();
+        dump();
+        Connections.initFirebird();
+        dump();
+        Connections.initH2();
+        dump();
+        Connections.initHSQL();
+        dump();
+        Connections.initMySQL();
+        dump();
+        Connections.initOracle();
+        dump();
+        Connections.initPostgreSQL();
+        dump();
+        Connections.initSQLite();
+        dump();
+        Connections.initSQLServer();
+        dump();
+        /*Connections.initTeradata();
+        dump();*/
+    }
+
+    private static void dump() throws SQLException {
+        DatabaseMetaData md = Connections.getConnection().getMetaData();
+        System.out.println(md.getDatabaseProductName());
+        System.out.println(md.getDatabaseMajorVersion());
+        System.out.println(md.getDatabaseMinorVersion());
+        System.out.println();
+        Connections.close();
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java
new file mode 100644
index 0000000000..c7bbfae81e
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalTime;
+import org.junit.Test;
+
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class SQLTemplatesTest {
+
+    private static final String DATETIME = "\\(timestamp '\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}'\\)";
+    private static final String TIME = "\\(time '\\d{2}:\\d{2}:\\d{2}'\\)";
+    private static final String DATE = "\\(date '\\d{4}-\\d{2}-\\d{2}'\\)";
+
+    private static void assertMatches(String regex, String str) {
+        assertTrue(str, str.matches(regex));
+    }
+
+    @Test
+    public void test() {
+        Template template = TemplateFactory.DEFAULT.create("fetch first {0s} rows only");
+        assertTrue(template.getElements().get(1) instanceof Template.AsString);
+
+        SQLSerializer serializer = new SQLSerializer(new Configuration(new DerbyTemplates()));
+        serializer.handle(Expressions.template(Object.class, template, ConstantImpl.create(5)));
+        assertEquals("fetch first 5 rows only", serializer.toString());
+    }
+
+    @Test
+    public void testRequiresQuotes() {
+        assertTrue(SQLTemplates.DEFAULT.requiresQuotes("First Name", false));
+    }
+
+    @Test
+    public void asLiteral() {
+        SQLTemplates templates = SQLTemplates.DEFAULT;
+        Configuration conf = new Configuration(templates);
+        assertMatches(DATE, conf.asLiteral(new Date(0)));
+        assertMatches(TIME, conf.asLiteral(new Time(0)));
+        assertMatches(DATETIME, conf.asLiteral(new Timestamp(0)));
+    }
+
+    @Test
+    public void asLiteral_jodaTime() {
+        SQLTemplates templates = SQLTemplates.DEFAULT;
+        Configuration conf = new Configuration(templates);
+        assertMatches(DATE, conf.asLiteral(new LocalDate(0)));
+        assertMatches(TIME, conf.asLiteral(new LocalTime(0)));
+        assertMatches(DATETIME, conf.asLiteral(new DateTime(0)));
+    }
+
+    @Test
+    public void quote() {
+        SQLTemplates templates = SQLTemplates.DEFAULT;
+        // non quoted
+        assertEquals("employee", templates.quoteIdentifier("employee"));
+        assertEquals("Employee", templates.quoteIdentifier("Employee"));
+        assertEquals("employee1", templates.quoteIdentifier("employee1"));
+        assertEquals("employee_", templates.quoteIdentifier("employee_"));
+        // quoted
+        assertEquals("\"e e\"", templates.quoteIdentifier("e e"));
+        assertEquals("\"1phoenix2\"", templates.quoteIdentifier("1phoenix2"));
+    }
+
+    @Test
+    public void quoting_performance() {
+        // 385 -> 63
+        SQLTemplates templates = new H2Templates();
+        long start = System.currentTimeMillis();
+        int iterations = 1000000;
+        for (int i = 0; i < iterations; i++) {
+            templates.quoteIdentifier("companies");
+        }
+        System.err.println(System.currentTimeMillis() - start);
+    }
+
+    @Test
+    public void nextVal() {
+        Operation<String> nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq"));
+        assertEquals("nextval('myseq')", new SQLSerializer(new Configuration(SQLTemplates.DEFAULT)).handle(nextval).toString());
+        // Derby OK
+        // H2 OK
+        // HSQLDB OK
+        // MSSQL OK
+        // MySQL
+        // Oracle OK
+        // PostgreSQL OK
+
+    }
+
+    @Test
+    public void numeric_operations() {
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        NumberPath<Integer> intPath2 = Expressions.numberPath(Integer.class, "intPath2");
+        SQLSerializer serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
+        serializer.handle(intPath.subtract(intPath2.add(2)));
+        assertEquals("intPath - (intPath2 + ?)", serializer.toString());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTypeMappingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java
similarity index 80%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/SQLTypeMappingTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java
index 50442f9efd..861f2f0ec3 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTypeMappingTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql;
+package com.querydsl.sql;
 
 import static org.junit.Assert.fail;
 
@@ -22,13 +22,13 @@
 public class SQLTypeMappingTest {
 
     @Test
-    public void Get() throws IllegalArgumentException, IllegalAccessException {
+    public void get() throws IllegalArgumentException, IllegalAccessException {
         JDBCTypeMapping mapping = new JDBCTypeMapping();
         for (Field field : java.sql.Types.class.getFields()) {
             if (field.getType().equals(int.class)) {
                 int val = field.getInt(null);
                 if (mapping.get(val,0,0) == null) {
-                    fail("Got no value for " + field.getName());
+                    fail("Got no value for " + field.getName() + " (" + val + ")");
                 }
             }
         }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java
new file mode 100644
index 0000000000..5c1271378c
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+
+public class SQLiteTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new SQLiteTemplates();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void union() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        Path<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Union union = query.union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+
+        assertEquals(
+                "select 1 as col1\n" +
+                "union\n" +
+                "select 2\n" +
+                "union\n" +
+                "select 3", union.toString());
+    }
+
+    @Test
+    public void precedence() {
+        // ||
+        // *    /    %
+        int p1 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        // +    -
+        int p2 = getPrecedence(Ops.ADD, Ops.SUB);
+        // <<   >>   &    |
+        // <    <=   >    >=
+        int p3 = getPrecedence(Ops.LT, Ops.GT, Ops.LOE, Ops.GOE);
+        // =    ==   !=   <>   IS   IS NOT   IN   LIKE   GLOB   MATCH   REGEXP
+        int p4 = getPrecedence(Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.IS_NULL, Ops.IS_NOT_NULL,
+                Ops.IN, Ops.LIKE, Ops.LIKE_ESCAPE, Ops.MATCHES);
+        // AND
+        int p5 = getPrecedence(Ops.AND);
+        //  OR
+        int p6 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java
new file mode 100644
index 0000000000..6487319b5a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java
@@ -0,0 +1,17 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class SchemaAndTableTest {
+
+    @Test
+    public void equalsAndHashCode() {
+        SchemaAndTable st1 = new SchemaAndTable(null, "table");
+        SchemaAndTable st2 = new SchemaAndTable(null, "table");
+        assertEquals(st1, st2);
+        assertEquals(st1.hashCode(), st2.hashCode());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
new file mode 100644
index 0000000000..f5ed839b2d
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java
@@ -0,0 +1,2184 @@
+//CHECKSTYLERULE:OFF: FileLength
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.*;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.joda.time.*;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.Pair;
+import com.querydsl.core.*;
+import com.querydsl.core.group.Group;
+import com.querydsl.core.group.GroupBy;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.testutil.Serialization;
+import com.querydsl.core.types.*;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.domain.*;
+
+public class SelectBase extends AbstractBaseTest {
+
+    private static final Expression<?>[] NO_EXPRESSIONS = new Expression[0];
+
+    private final QueryExecution standardTest = new QueryExecution(QuerydslModule.SQL, Connections.getTarget()) {
+        @Override
+        protected Fetchable<?> createQuery() {
+            return testQuery().from(employee, employee2);
+        }
+        @Override
+        protected Fetchable<?> createQuery(Predicate filter) {
+            return testQuery().from(employee, employee2).where(filter).select(employee.firstname);
+        }
+    };
+
+    private <T> T firstResult(Expression<T> expr) {
+        return query().select(expr).fetchFirst();
+    }
+
+    private Tuple firstResult(Expression<?>... exprs) {
+        return query().select(exprs).fetchFirst();
+    }
+
+    @Test
+    public void aggregate_list() {
+        int min = 30000, avg = 65000, max = 160000;
+        // fetch
+        assertEquals(min, query().from(employee).select(employee.salary.min()).fetch().get(0).intValue());
+        assertEquals(avg, query().from(employee).select(employee.salary.avg()).fetch().get(0).intValue());
+        assertEquals(max, query().from(employee).select(employee.salary.max()).fetch().get(0).intValue());
+    }
+
+    @Test
+    public void aggregate_uniqueResult() {
+        int min = 30000, avg = 65000, max = 160000;
+        // fetchOne
+        assertEquals(min, query().from(employee).select(employee.salary.min()).fetchOne().intValue());
+        assertEquals(avg, query().from(employee).select(employee.salary.avg()).fetchOne().intValue());
+        assertEquals(max, query().from(employee).select(employee.salary.max()).fetchOne().intValue());
+    }
+
+    @Test
+    @ExcludeIn(ORACLE)
+    @SkipForQuoted
+    public void alias() {
+        expectedQuery = "select e.ID as id from EMPLOYEE e";
+        query().from().select(employee.id.as(employee.id)).from(employee).fetch();
+    }
+
+    @Test
+    @ExcludeIn({MYSQL, ORACLE})
+    @SkipForQuoted
+    public void alias_quotes() {
+        expectedQuery = "select e.FIRSTNAME as \"First Name\" from EMPLOYEE e";
+        query().from(employee).select(employee.firstname.as("First Name")).fetch();
+    }
+
+    @Test
+    @IncludeIn(MYSQL)
+    @SkipForQuoted
+    public void alias_quotes_MySQL() {
+        expectedQuery = "select e.FIRSTNAME as `First Name` from EMPLOYEE e";
+        query().from(employee).select(employee.firstname.as("First Name")).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void alias_quotes_Oracle() {
+        expectedQuery = "select e.FIRSTNAME \"First Name\" from EMPLOYEE e";
+        query().from(employee).select(employee.firstname.as("First Name"));
+    }
+
+    @Test
+    public void all() {
+        for (Expression<?> expr : survey.all()) {
+            Path<?> path = (Path<?>) expr;
+            assertEquals(survey, path.getMetadata().getParent());
+        }
+    }
+
+    private void arithmeticTests(NumberExpression<Integer> one, NumberExpression<Integer> two,
+                                 NumberExpression<Integer> three, NumberExpression<Integer> four) {
+        assertEquals(1, firstResult(one).intValue());
+        assertEquals(2, firstResult(two).intValue());
+        assertEquals(4, firstResult(four).intValue());
+
+        assertEquals(3, firstResult(one.subtract(two).add(four)).intValue());
+        assertEquals(-5, firstResult(one.subtract(two.add(four))).intValue());
+        assertEquals(-1, firstResult(one.add(two).subtract(four)).intValue());
+        assertEquals(-1, firstResult(one.add(two.subtract(four))).intValue());
+
+        assertEquals(12, firstResult(one.add(two).multiply(four)).intValue());
+        assertEquals(2, firstResult(four.multiply(one).divide(two)).intValue());
+        assertEquals(6, firstResult(four.divide(two).multiply(three)).intValue());
+        assertEquals(1, firstResult(four.divide(two.multiply(two))).intValue());
+    }
+
+    @Test
+    public void arithmetic() {
+        NumberExpression<Integer> one = Expressions.numberTemplate(Integer.class, "(1.0)");
+        NumberExpression<Integer> two = Expressions.numberTemplate(Integer.class, "(2.0)");
+        NumberExpression<Integer> three = Expressions.numberTemplate(Integer.class, "(3.0)");
+        NumberExpression<Integer> four = Expressions.numberTemplate(Integer.class, "(4.0)");
+        arithmeticTests(one, two, three, four);
+        // the following one doesn't work with integer arguments
+        assertEquals(2, firstResult(four.multiply(one.divide(two))).intValue());
+    }
+
+    @Test
+    public void arithmetic2() {
+        NumberExpression<Integer> one = Expressions.ONE;
+        NumberExpression<Integer> two = Expressions.TWO;
+        NumberExpression<Integer> three = Expressions.THREE;
+        NumberExpression<Integer> four = Expressions.FOUR;
+        arithmeticTests(one, two, three, four);
+    }
+
+    @Test
+    public void arithmetic_mod() {
+        NumberExpression<Integer> one = Expressions.numberTemplate(Integer.class, "(1)");
+        NumberExpression<Integer> two = Expressions.numberTemplate(Integer.class, "(2)");
+        NumberExpression<Integer> three = Expressions.numberTemplate(Integer.class, "(3)");
+        NumberExpression<Integer> four = Expressions.numberTemplate(Integer.class, "(4)");
+
+        assertEquals(4, firstResult(four.mod(three).add(three)).intValue());
+        assertEquals(1, firstResult(four.mod(two.add(one))).intValue());
+        assertEquals(0, firstResult(four.mod(two.multiply(one))).intValue());
+        assertEquals(2, firstResult(four.add(one).mod(three)).intValue());
+    }
+
+    @Test
+    @IncludeIn(POSTGRESQL) // TODO generalize array literal projections
+    public void array() {
+        Expression<Integer[]> expr = Expressions.template(Integer[].class, "'{1,2,3}'::int[]");
+        Integer[] result = firstResult(expr);
+        assertEquals(3, result.length);
+        assertEquals(1, result[0].intValue());
+        assertEquals(2, result[1].intValue());
+        assertEquals(3, result[2].intValue());
+    }
+
+    @Test
+    @IncludeIn(POSTGRESQL) // TODO generalize array literal projections
+    public void array2() {
+        Expression<int[]> expr = Expressions.template(int[].class, "'{1,2,3}'::int[]");
+        int[] result = firstResult(expr);
+        assertEquals(3, result.length);
+        assertEquals(1, result[0]);
+        assertEquals(2, result[1]);
+        assertEquals(3, result[2]);
+    }
+
+    @Test
+    @ExcludeIn({DERBY, HSQLDB})
+    public void array_null() {
+        Expression<Integer[]> expr = Expressions.template(Integer[].class, "null");
+        assertNull(firstResult(expr));
+    }
+
+    @Test
+    public void array_projection() {
+        List<String[]> results = query().from(employee).select(
+                new ArrayConstructorExpression<String>(String[].class, employee.firstname)).fetch();
+        assertFalse(results.isEmpty());
+        for (String[] result : results) {
+            assertNotNull(result[0]);
+        }
+    }
+
+    @Test
+    public void beans() {
+        List<Beans> rows = query().from(employee, employee2).select(new QBeans(employee, employee2)).fetch();
+        assertFalse(rows.isEmpty());
+        for (Beans row : rows) {
+            assertEquals(Employee.class, row.get(employee).getClass());
+            assertEquals(Employee.class, row.get(employee2).getClass());
+        }
+    }
+
+    @Test
+    public void between() {
+        // 11-13
+        assertEquals(Arrays.asList(11, 12, 13),
+                query().from(employee).where(employee.id.between(11, 13)).orderBy(employee.id.asc())
+                       .select(employee.id).fetch());
+    }
+
+    @Test
+    @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA})
+    public void boolean_all() {
+        assertTrue(query().from(employee).select(SQLExpressions.all(employee.firstname.isNotNull())).fetchOne());
+    }
+
+    @Test
+    @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA})
+    public void boolean_any() {
+        assertTrue(query().from(employee).select(SQLExpressions.any(employee.firstname.isNotNull())).fetchOne());
+    }
+
+    @Test
+    public void case_() {
+        NumberExpression<Float> numExpression = employee.salary.floatValue().divide(employee2.salary.floatValue()).multiply(100.1);
+        NumberExpression<Float> numExpression2 = employee.id.when(0).then(0.0F).otherwise(numExpression);
+        assertEquals(Arrays.asList(87, 90, 88, 87, 83, 80, 75),
+                query().from(employee, employee2)
+                        .where(employee.id.eq(employee2.id.add(1)))
+                        .orderBy(employee.id.asc(), employee2.id.asc())
+                        .select(numExpression2.floor().intValue()).fetch());
+    }
+
+    @Test
+    public void casts() throws SQLException {
+        NumberExpression<?> num = employee.id;
+        List<Expression<?>> exprs = new ArrayList<>();
+
+        add(exprs, num.byteValue(), MYSQL);
+        add(exprs, num.doubleValue());
+        add(exprs, num.floatValue());
+        add(exprs, num.intValue());
+        add(exprs, num.longValue(), MYSQL);
+        add(exprs, num.shortValue(), MYSQL);
+        add(exprs, num.stringValue(), DERBY);
+
+        for (Expression<?> expr : exprs) {
+            for (Object o : query().from(employee).select(expr).fetch()) {
+                assertEquals(expr.getType(), o.getClass());
+            }
+        }
+    }
+
+    @Test
+    public void coalesce() {
+        Coalesce<String> c = new Coalesce<String>(employee.firstname, employee.lastname).add("xxx");
+        assertEquals(Collections.emptyList(),
+                query().from(employee).where(c.getValue().eq("xxx")).select(employee.id).fetch());
+    }
+
+    @Test
+    public void compact_join() {
+        // verbose
+        assertEquals(8, query().from(employee)
+            .innerJoin(employee2)
+            .on(employee.superiorId.eq(employee2.id))
+            .select(employee.id, employee2.id).fetch().size());
+
+        // compact
+        assertEquals(8, query().from(employee)
+            .innerJoin(employee.superiorIdKey, employee2)
+            .select(employee.id, employee2.id).fetch().size());
+
+    }
+
+    @Test
+    public void complex_boolean() {
+        BooleanExpression first = employee.firstname.eq("Mike").and(employee.lastname.eq("Smith"));
+        BooleanExpression second = employee.firstname.eq("Joe").and(employee.lastname.eq("Divis"));
+        assertEquals(2, query().from(employee).where(first.or(second)).fetchCount());
+
+        assertEquals(0, query().from(employee).where(
+                employee.firstname.eq("Mike"),
+                employee.lastname.eq("Smith").or(employee.firstname.eq("Joe")),
+                employee.lastname.eq("Divis")
+        ).fetchCount());
+    }
+
+    @Test
+    public void complex_subQuery() {
+        // alias for the salary
+        NumberPath<BigDecimal> sal = Expressions.numberPath(BigDecimal.class, "sal");
+        // alias for the subquery
+        PathBuilder<BigDecimal> sq = new PathBuilder<BigDecimal>(BigDecimal.class, "sq");
+        // query execution
+        query().from(
+                query().from(employee)
+                        .select(employee.salary.add(employee.salary).add(employee.salary).as(sal)).as(sq)
+        ).select(sq.get(sal).avg(), sq.get(sal).min(), sq.get(sal).max()).fetch();
+    }
+
+    @Test
+    public void constructor_projection() {
+        for (IdName idAndName : query().from(survey).select(new QIdName(survey.id, survey.name)).fetch()) {
+            assertNotNull(idAndName);
+            assertNotNull(idAndName.getId());
+            assertNotNull(idAndName.getName());
+        }
+    }
+
+    @Test
+    public void constructor_projection2() {
+        List<SimpleProjection> projections = query().from(employee).select(
+                Projections.constructor(SimpleProjection.class,
+                        employee.firstname, employee.lastname)).fetch();
+        assertFalse(projections.isEmpty());
+        for (SimpleProjection projection : projections) {
+            assertNotNull(projection);
+        }
+    }
+
+    private double cot(double x) {
+        return Math.cos(x) / Math.sin(x);
+    }
+
+    private double coth(double x) {
+        return Math.cosh(x) / Math.sinh(x);
+    }
+
+    @Test
+    public void count_with_pK() {
+        assertEquals(10, query().from(employee).fetchCount());
+    }
+
+    @Test
+    public void count_without_pK() {
+        assertEquals(10, query().from(QEmployeeNoPK.employee).fetchCount());
+    }
+
+    @Test
+    public void count2() {
+        assertEquals(10, query().from(employee).select(employee.count()).fetchFirst().intValue());
+    }
+
+    @Test
+    @SkipForQuoted
+    @ExcludeIn(ORACLE)
+    public void count_all() {
+        expectedQuery = "select count(*) as rc from EMPLOYEE e";
+        NumberPath<Long> rowCount = Expressions.numberPath(Long.class, "rc");
+        assertEquals(10, query().from(employee).select(Wildcard.count.as(rowCount)).fetchOne().intValue());
+    }
+
+    @Test
+    @SkipForQuoted
+    @IncludeIn(ORACLE)
+    public void count_all_Oracle() {
+        expectedQuery = "select count(*) rc from EMPLOYEE e";
+        NumberPath<Long> rowCount = Expressions.numberPath(Long.class, "rc");
+        assertEquals(10, query().from(employee).select(Wildcard.count.as(rowCount)).fetchOne().intValue());
+    }
+
+    @Test
+    public void count_distinct_with_pK() {
+        assertEquals(10, query().from(employee).distinct().fetchCount());
+    }
+
+    @Test
+    public void count_distinct_without_pK() {
+        assertEquals(10, query().from(QEmployeeNoPK.employee).distinct().fetchCount());
+    }
+
+    @Test
+    public void count_distinct2() {
+        query().from(employee).select(employee.countDistinct()).fetchFirst();
+    }
+
+    @Test
+    public void custom_projection() {
+        List<Projection> tuples = query().from(employee).select(
+                new QProjection(employee.firstname, employee.lastname)).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Projection tuple : tuples) {
+            assertNotNull(tuple.get(employee.firstname));
+            assertNotNull(tuple.get(employee.lastname));
+            assertNotNull(tuple.getExpr(employee.firstname));
+            assertNotNull(tuple.getExpr(employee.lastname));
+        }
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, DB2, DERBY, HSQLDB, POSTGRESQL, SQLITE, TERADATA})
+    public void dates() throws SQLException {
+        if (!configuration.getUseLiterals()) {
+            dates(false);
+        }
+    }
+    
+    @Test
+    @ExcludeIn({CUBRID, DB2, DERBY, SQLITE, TERADATA})
+    public void dates_literals() throws SQLException {
+        if (configuration.getUseLiterals()) {
+            dates(true);
+        }
+    }
+    
+    private void dates(boolean literals) throws SQLException {
+        long ts = ((long) Math.floor(System.currentTimeMillis() / 1000)) * 1000;
+        long tsDate = new org.joda.time.LocalDate(ts).toDateMidnight().getMillis();
+        long tsTime = new org.joda.time.LocalTime(ts).getMillisOfDay();
+
+        List<Object> data = new ArrayList<>();
+        data.add(Constants.date);
+        data.add(Constants.time);
+        data.add(new java.util.Date(ts));
+        data.add(new java.util.Date(tsDate));
+        data.add(new java.util.Date(tsTime));
+        data.add(new java.sql.Timestamp(ts));
+        data.add(new java.sql.Timestamp(tsDate));
+        data.add(new java.sql.Date(110, 0, 1));
+        data.add(new java.sql.Date(tsDate));
+        data.add(new java.sql.Time(0, 0, 0));
+        data.add(new java.sql.Time(12, 30, 0));
+        data.add(new java.sql.Time(23, 59, 59));
+        //data.add(new java.sql.Time(tsTime));
+        data.add(new DateTime(ts));
+        data.add(new DateTime(tsDate));
+        data.add(new DateTime(tsTime));
+        data.add(new LocalDateTime(ts));
+        data.add(new LocalDateTime(tsDate));
+        data.add(new LocalDateTime(2014, 3, 30, 2, 0));
+        data.add(new LocalDate(2010, 1, 1));
+        data.add(new LocalDate(ts));
+        data.add(new LocalDate(tsDate));
+        data.add(new LocalTime(0, 0, 0));
+        data.add(new LocalTime(12, 30, 0));
+        data.add(new LocalTime(23, 59, 59));
+        data.add(new LocalTime(ts));
+        data.add(new LocalTime(tsTime));
+
+        java.time.Instant javaInstant = java.time.Instant.now().truncatedTo(java.time.temporal.ChronoUnit.SECONDS);
+        java.time.LocalDateTime javaDateTime = java.time.LocalDateTime.ofInstant(javaInstant, java.time.ZoneId.of("Z"));
+        java.time.LocalDate javaDate = javaDateTime.toLocalDate();
+        java.time.LocalTime javaTime = javaDateTime.toLocalTime();
+        data.add(javaInstant);                                      //java.time.Instant
+        data.add(javaDateTime);                                     //java.time.LocalDateTime
+        data.add(javaDate);                                         //java.time.LocalDate
+        data.add(javaTime);                                         //java.time.LocalTime
+        
+        // have to explicitly list these
+        // connection.getMetaData().getTypeInfo() is not helpful in this case for most drivers
+        boolean supportsTimeZones;
+        switch (target) {
+            case FIREBIRD:
+            case H2:
+            case HSQLDB:
+            case ORACLE:
+            case SQLSERVER:
+                supportsTimeZones = true;
+                break;
+            default:
+                supportsTimeZones = false;
+                break;
+        }
+        if (supportsTimeZones) {
+            // java.time.OffsetTime
+            // SQL Server does not support TIME WITH TIME ZONE
+            // H2 supports it starting in 1.4.200 but we are stuck on 1.4.197 due to h2gis
+            if (target != SQLSERVER && target != H2) {
+                data.add(javaTime.atOffset(java.time.ZoneOffset.UTC));
+                data.add(javaTime.atOffset(java.time.ZoneOffset.ofHours(-6)));
+            }
+            
+            /*
+             * TIMESTAMP WITH TIME ZONE is complicated.
+             * Contrary to the name, most databases that support this type do not actually support time zones.
+             * Instead, they support zone offsets which is not the same thing.
+             * E.g. America/New_York could be UTC-5 or UTC-4 depending on the time of year and acts of Congress.
+             * Which means if a database actually stores the zone ID, the time value can change.
+             * E.g. you put an entry in the database for 10 years in the future but then Congress abolishes DST.
+             * Other than Oracle, it does not look like any databases support storing the actual zone ID.
+             * Some databases, like H2, support specifying a time zone but convert it to an offset before storing it.
+             * Also, the JDBC specification does not say anything about ZonedDateTime.
+             * Therefore, we only test ZonedDateTime on Oracle because its behavior is poorly defined on anything else.
+             */
+            
+            // java.time.OffsetDateTime
+            data.add(javaDateTime.atOffset(java.time.ZoneOffset.UTC));
+            data.add(javaDateTime.atOffset(java.time.ZoneOffset.ofHours(-6)));
+            
+            // java.time.ZonedDateTime
+            if (target == ORACLE) {
+                data.add(javaDateTime.atZone(java.time.ZoneId.of("UTC")));
+                data.add(javaDateTime.atZone(java.time.ZoneId.of("America/Chicago")));
+            }
+        }
+
+        Map<Object, Object> failures = new IdentityHashMap<>();
+        for (Object dt : data) {
+            try {
+                Object dt2 = firstResult(Expressions.constant(dt));
+                if (!dt.equals(dt2)) {
+                    failures.put(dt, dt2);
+                }
+            } catch (Exception e) {
+                throw new RuntimeException("Error executing query for " + dt.getClass().getName() + " " + dt, e);
+            }
+        }
+        if (!failures.isEmpty()) {
+            for (Map.Entry<Object, Object> entry : failures.entrySet()) {
+                System.out.println(entry.getKey().getClass().getName()
+                        + ": " + entry.getKey() + " != " + entry.getValue());
+            }
+            Assert.fail("Failed with " + failures);
+        }
+    }
+
+    @Test
+    @ExcludeIn({SQLITE})
+    public void date_add() {
+        SQLQuery<?> query = query().from(employee);
+        Date date1 = query.select(employee.datefield).fetchFirst();
+        Date date2 = query.select(SQLExpressions.addYears(employee.datefield, 1)).fetchFirst();
+        Date date3 = query.select(SQLExpressions.addMonths(employee.datefield, 1)).fetchFirst();
+        Date date4 = query.select(SQLExpressions.addDays(employee.datefield, 1)).fetchFirst();
+
+        assertTrue(date2.getTime() > date1.getTime());
+        assertTrue(date3.getTime() > date1.getTime());
+        assertTrue(date4.getTime() > date1.getTime());
+    }
+
+    @Test
+    @ExcludeIn({SQLITE})
+    public void date_add_Timestamp() {
+        List<Expression<?>> exprs = new ArrayList<>();
+        DateTimeExpression<java.util.Date> dt = Expressions.currentTimestamp();
+
+        add(exprs, SQLExpressions.addYears(dt, 1));
+        add(exprs, SQLExpressions.addMonths(dt, 1), ORACLE);
+        add(exprs, SQLExpressions.addDays(dt, 1));
+        add(exprs, SQLExpressions.addHours(dt, 1), TERADATA);
+        add(exprs, SQLExpressions.addMinutes(dt, 1), TERADATA);
+        add(exprs, SQLExpressions.addSeconds(dt, 1), TERADATA);
+
+        for (Expression<?> expr : exprs) {
+            assertNotNull(firstResult(expr));
+        }
+    }
+
+    @Test
+    @ExcludeIn({DB2, SQLITE, TERADATA})
+    public void date_diff() {
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+        SQLQuery<?> query2 = query().from(employee, employee2)
+                .orderBy(employee.id.asc(), employee2.id.desc());
+
+        List<DatePart> dps = new ArrayList<>();
+        add(dps, DatePart.year);
+        add(dps, DatePart.month);
+        add(dps, DatePart.week);
+        add(dps, DatePart.day);
+        add(dps, DatePart.hour, HSQLDB);
+        add(dps, DatePart.minute, HSQLDB);
+        add(dps, DatePart.second, HSQLDB);
+
+        LocalDate localDate = new LocalDate(1970, 1, 10);
+        Date date = new Date(localDate.toDateMidnight().getMillis());
+
+        for (DatePart dp : dps) {
+            int diff1 = query.select(SQLExpressions.datediff(dp, date, employee.datefield)).fetchFirst();
+            int diff2 = query.select(SQLExpressions.datediff(dp, employee.datefield, date)).fetchFirst();
+            int diff3 = query2.select(SQLExpressions.datediff(dp, employee.datefield, employee2.datefield)).fetchFirst();
+            assertEquals(diff1, -diff2);
+        }
+
+        Timestamp timestamp = new Timestamp(new java.util.Date().getTime());
+        for (DatePart dp : dps) {
+            query.select(SQLExpressions.datediff(dp, Expressions.currentTimestamp(), timestamp)).fetchOne();
+        }
+    }
+
+    // TDO Date_diff with timestamps
+
+    @Test
+    @ExcludeIn({DB2, HSQLDB, SQLITE, TERADATA})
+    public void date_diff2() {
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+
+        LocalDate localDate = new LocalDate(1970, 1, 10);
+        Date date = new Date(localDate.toDateMidnight().getMillis());
+
+        int years = query.select(SQLExpressions.datediff(DatePart.year, date, employee.datefield)).fetchFirst();
+        int months = query.select(SQLExpressions.datediff(DatePart.month, date, employee.datefield)).fetchFirst();
+        // weeks
+        int days = query.select(SQLExpressions.datediff(DatePart.day, date, employee.datefield)).fetchFirst();
+        int hours = query.select(SQLExpressions.datediff(DatePart.hour, date, employee.datefield)).fetchFirst();
+        int minutes = query.select(SQLExpressions.datediff(DatePart.minute, date, employee.datefield)).fetchFirst();
+        int seconds = query.select(SQLExpressions.datediff(DatePart.second, date, employee.datefield)).fetchFirst();
+
+        assertEquals(949363200, seconds);
+        assertEquals(15822720,  minutes);
+        assertEquals(263712,    hours);
+        assertEquals(10988,     days);
+        assertEquals(361,       months);
+        assertEquals(30,        years);
+    }
+
+    @Test
+    @ExcludeIn({SQLITE}) // FIXME
+    public void date_trunc() {
+        DateTimeExpression<java.util.Date> expr = DateTimeExpression.currentTimestamp();
+
+        List<DatePart> dps = new ArrayList<>();
+        add(dps, DatePart.year);
+        add(dps, DatePart.month);
+        add(dps, DatePart.week, DERBY, FIREBIRD, SQLSERVER);
+        add(dps, DatePart.day);
+        add(dps, DatePart.hour);
+        add(dps, DatePart.minute);
+        add(dps, DatePart.second);
+
+        for (DatePart dp : dps) {
+            firstResult(SQLExpressions.datetrunc(dp, expr));
+        }
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, TERADATA}) // FIXME
+    public void date_trunc2() {
+        DateTimeExpression<DateTime> expr = DateTimeExpression.currentTimestamp(DateTime.class);
+
+        Tuple tuple = firstResult(
+                expr,
+                SQLExpressions.datetrunc(DatePart.year, expr),
+                SQLExpressions.datetrunc(DatePart.month, expr),
+                SQLExpressions.datetrunc(DatePart.day, expr),
+                SQLExpressions.datetrunc(DatePart.hour, expr),
+                SQLExpressions.datetrunc(DatePart.minute, expr),
+                SQLExpressions.datetrunc(DatePart.second, expr));
+        DateTime date = tuple.get(expr);
+        DateTime toYear = tuple.get(SQLExpressions.datetrunc(DatePart.year, expr));
+        DateTime toMonth = tuple.get(SQLExpressions.datetrunc(DatePart.month, expr));
+        DateTime toDay = tuple.get(SQLExpressions.datetrunc(DatePart.day, expr));
+        DateTime toHour = tuple.get(SQLExpressions.datetrunc(DatePart.hour, expr));
+        DateTime toMinute = tuple.get(SQLExpressions.datetrunc(DatePart.minute, expr));
+        DateTime toSecond = tuple.get(SQLExpressions.datetrunc(DatePart.second, expr));
+
+        assertEquals(date.getZone(), toYear.getZone());
+        assertEquals(date.getZone(), toMonth.getZone());
+        assertEquals(date.getZone(), toDay.getZone());
+        assertEquals(date.getZone(), toHour.getZone());
+        assertEquals(date.getZone(), toMinute.getZone());
+        assertEquals(date.getZone(), toSecond.getZone());
+
+        // year
+        assertEquals(date.getYear(), toYear.getYear());
+        assertEquals(date.getYear(), toMonth.getYear());
+        assertEquals(date.getYear(), toDay.getYear());
+        assertEquals(date.getYear(), toHour.getYear());
+        assertEquals(date.getYear(), toMinute.getYear());
+        assertEquals(date.getYear(), toSecond.getYear());
+
+        // month
+        assertEquals(1,                     toYear.getMonthOfYear());
+        assertEquals(date.getMonthOfYear(), toMonth.getMonthOfYear());
+        assertEquals(date.getMonthOfYear(), toDay.getMonthOfYear());
+        assertEquals(date.getMonthOfYear(), toHour.getMonthOfYear());
+        assertEquals(date.getMonthOfYear(), toMinute.getMonthOfYear());
+        assertEquals(date.getMonthOfYear(), toSecond.getMonthOfYear());
+
+        // day
+        assertEquals(1, toYear.getDayOfMonth());
+        assertEquals(1, toMonth.getDayOfMonth());
+        assertEquals(date.getDayOfMonth(), toDay.getDayOfMonth());
+        assertEquals(date.getDayOfMonth(), toHour.getDayOfMonth());
+        assertEquals(date.getDayOfMonth(), toMinute.getDayOfMonth());
+        assertEquals(date.getDayOfMonth(), toSecond.getDayOfMonth());
+
+        // hour
+        assertEquals(0, toYear.getHourOfDay());
+        assertEquals(0, toMonth.getHourOfDay());
+        assertEquals(0, toDay.getHourOfDay());
+        assertEquals(date.getHourOfDay(), toHour.getHourOfDay());
+        assertEquals(date.getHourOfDay(), toMinute.getHourOfDay());
+        assertEquals(date.getHourOfDay(), toSecond.getHourOfDay());
+
+        // minute
+        assertEquals(0, toYear.getMinuteOfHour());
+        assertEquals(0, toMonth.getMinuteOfHour());
+        assertEquals(0, toDay.getMinuteOfHour());
+        assertEquals(0, toHour.getMinuteOfHour());
+        assertEquals(date.getMinuteOfHour(), toMinute.getMinuteOfHour());
+        assertEquals(date.getMinuteOfHour(), toSecond.getMinuteOfHour());
+
+        // second
+        assertEquals(0, toYear.getSecondOfMinute());
+        assertEquals(0, toMonth.getSecondOfMinute());
+        assertEquals(0, toDay.getSecondOfMinute());
+        assertEquals(0, toHour.getSecondOfMinute());
+        assertEquals(0, toMinute.getSecondOfMinute());
+        assertEquals(date.getSecondOfMinute(), toSecond.getSecondOfMinute());
+    }
+
+    @Test
+    public void dateTime() {
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+        assertEquals(Integer.valueOf(10),     query.select(employee.datefield.dayOfMonth()).fetchFirst());
+        assertEquals(Integer.valueOf(2),      query.select(employee.datefield.month()).fetchFirst());
+        assertEquals(Integer.valueOf(2000),   query.select(employee.datefield.year()).fetchFirst());
+        assertEquals(Integer.valueOf(200002), query.select(employee.datefield.yearMonth()).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({SQLITE})
+    public void dateTime_to_date() {
+        firstResult(SQLExpressions.date(DateTimeExpression.currentTimestamp()));
+    }
+
+    private double degrees(double x) {
+        return x * 180.0 / Math.PI;
+    }
+
+    @Test
+    public void distinct_count() {
+        long count1 = query().from(employee).distinct().fetchCount();
+        long count2 = query().from(employee).distinct().fetchCount();
+        assertEquals(count1, count2);
+    }
+
+    @Test
+    public void distinct_list() {
+        List<Integer> lengths1 = query().from(employee).distinct().select(employee.firstname.length()).fetch();
+        List<Integer> lengths2 = query().from(employee).distinct().select(employee.firstname.length()).fetch();
+        assertEquals(lengths1, lengths2);
+    }
+
+    @Test
+    public void duplicate_columns() {
+        assertEquals(10, query().from(employee)
+                .select(employee.id, employee.id).fetch().size());
+    }
+
+    @Test
+    public void duplicate_columns_In_Subquery() {
+        QEmployee employee2 = new QEmployee("e2");
+        assertEquals(10, query().from(employee).where(
+                query().from(employee2)
+                        .where(employee2.id.eq(employee.id))
+                        .select(employee2.id, employee2.id).exists()).fetchCount());
+    }
+
+    @Test
+    public void factoryExpression_in_groupBy() {
+        Expression<Employee> empBean = Projections.bean(Employee.class, employee.id, employee.superiorId);
+        assertTrue(query().from(employee).groupBy(empBean).select(empBean).fetchFirst() != null);
+    }
+
+    @Test
+    @ExcludeIn({H2, SQLITE, DERBY, CUBRID, MYSQL})
+    public void full_join() throws SQLException {
+        assertEquals(18, query().from(employee).fullJoin(employee2)
+            .on(employee.superiorIdKey.on(employee2))
+            .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void getResultSet() throws IOException, SQLException {
+        ResultSet results = query().select(survey.id, survey.name).from(survey).getResults();
+        while (results.next()) {
+            assertNotNull(results.getObject(1));
+            assertNotNull(results.getObject(2));
+        }
+        results.close();
+    }
+
+    @Test
+    public void groupBy_superior() {
+        SQLQuery<?> qry = query()
+            .from(employee)
+            .innerJoin(employee._superiorIdKey, employee2);
+
+        QTuple subordinates = Projections.tuple(employee2.id, employee2.firstname, employee2.lastname);
+
+        Map<Integer, Group> results = qry.transform(
+            GroupBy.groupBy(employee.id).as(employee.firstname, employee.lastname,
+            GroupBy.map(employee2.id, subordinates)));
+
+        assertEquals(2, results.size());
+
+        // Mike Smith
+        Group group = results.get(1);
+        assertEquals("Mike", group.getOne(employee.firstname));
+        assertEquals("Smith", group.getOne(employee.lastname));
+
+        Map<Integer, Tuple> emps = group.getMap(employee2.id, subordinates);
+        assertEquals(4, emps.size());
+        assertEquals("Steve", emps.get(12).get(employee2.firstname));
+
+        // Mary Smith
+        group = results.get(2);
+        assertEquals("Mary", group.getOne(employee.firstname));
+        assertEquals("Smith", group.getOne(employee.lastname));
+
+        emps = group.getMap(employee2.id, subordinates);
+        assertEquals(4, emps.size());
+        assertEquals("Mason", emps.get(21).get(employee2.lastname));
+    }
+
+    @Test
+    public void groupBy_yearMonth() {
+        assertEquals(Collections.singletonList(10L), query().from(employee)
+               .groupBy(employee.datefield.yearMonth())
+               .orderBy(employee.datefield.yearMonth().asc())
+               .select(employee.id.count()).fetch());
+    }
+
+    @Test
+    @ExcludeIn({H2, DB2, DERBY, ORACLE, SQLSERVER})
+    public void groupBy_validate() {
+        NumberPath<BigDecimal> alias = Expressions.numberPath(BigDecimal.class, "alias");
+        assertEquals(8, query().from(employee)
+               .groupBy(alias)
+                .select(employee.salary.multiply(100).as(alias),
+                        employee.salary.avg()).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD})
+    public void groupBy_count() {
+        List<Integer> ids = query().from(employee).groupBy(employee.id).select(employee.id).fetch();
+        long count = query().from(employee).groupBy(employee.id).fetchCount();
+        QueryResults<Integer> results = query().from(employee).groupBy(employee.id)
+                .limit(1).select(employee.id).fetchResults();
+
+        assertEquals(10, ids.size());
+        assertEquals(10, count);
+        assertEquals(1, results.getResults().size());
+        assertEquals(10, results.getTotal());
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD, SQLSERVER, TERADATA})
+    public void groupBy_Distinct_count() {
+        List<Integer> ids = query().from(employee).groupBy(employee.id).distinct().select(Expressions.ONE).fetch();
+        QueryResults<Integer> results = query().from(employee).groupBy(employee.id)
+                .limit(1).distinct().select(Expressions.ONE).fetchResults();
+
+        assertEquals(1, ids.size());
+        assertEquals(1, results.getResults().size());
+        assertEquals(1, results.getTotal());
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD})
+    public void having_count() {
+        //Produces empty resultset https://github.com/querydsl/querydsl/issues/1055
+        query().from(employee)
+                .innerJoin(employee2).on(employee.id.eq(employee2.id))
+                .groupBy(employee.id)
+                .having(Wildcard.count.eq(4L))
+                .select(employee.id, employee.firstname).fetchResults();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(expected = IllegalArgumentException.class)
+    public void illegalUnion() throws SQLException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max());
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.max());
+        assertEquals(0, query().from(employee).union(sq1, sq2).list().size());
+    }
+
+    @Test
+    public void in() {
+        assertEquals(2, query().from(employee)
+                .where(employee.id.in(Arrays.asList(1, 2)))
+                .select(employee).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, FIREBIRD, SQLITE, SQLSERVER, TERADATA})
+    public void in_long_list() {
+        List<Integer> ids = new ArrayList<>();
+        for (int i = 0; i < 20000; i++) {
+            ids.add(i);
+        }
+        assertEquals(
+                query().from(employee).fetchCount(),
+                query().from(employee).where(employee.id.in(ids)).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, FIREBIRD, SQLITE, SQLSERVER, TERADATA})
+    public void notIn_long_list() {
+        List<Integer> ids = new ArrayList<>();
+        for (int i = 0; i < 20000; i++) {
+            ids.add(i);
+        }
+        assertEquals(0, query().from(employee).where(employee.id.notIn(ids)).fetchCount());
+    }
+
+    @Test
+    public void in_empty() {
+        assertEquals(0, query().from(employee).where(employee.id.in(Collections.emptyList())).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn(DERBY)
+    public void in_null() {
+        assertEquals(1, query().from(employee).where(employee.id.in(1, null)).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn({MYSQL, TERADATA})
+    public void in_subqueries() {
+        QEmployee e1 = new QEmployee("e1");
+        QEmployee e2 = new QEmployee("e2");
+        assertEquals(2, query().from(employee).where(employee.id.in(
+            query().from(e1).where(e1.firstname.eq("Mike")).select(e1.id),
+            query().from(e2).where(e2.firstname.eq("Mary")).select(e2.id)
+        )).fetchCount());
+    }
+
+    @Test
+    public void notIn_empty() {
+        long count = query().from(employee).fetchCount();
+        assertEquals(count, query().from(employee).where(employee.id.notIn(Collections.emptyList())).fetchCount());
+    }
+
+    @Test
+    public void inner_join() throws SQLException {
+        assertEquals(8, query().from(employee).innerJoin(employee2)
+            .on(employee.superiorIdKey.on(employee2))
+            .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void inner_join_2Conditions() {
+        assertEquals(8, query().from(employee).innerJoin(employee2)
+            .on(employee.superiorIdKey.on(employee2))
+            .on(employee2.firstname.isNotNull())
+            .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void join() throws Exception {
+        for (String name : query().from(survey, survey2)
+                .where(survey.id.eq(survey2.id)).select(survey.name).fetch()) {
+            assertNotNull(name);
+        }
+    }
+
+    @Test
+    public void joins() throws SQLException {
+        for (Tuple row : query().from(employee).innerJoin(employee2)
+                .on(employee.superiorId.eq(employee2.superiorId))
+                .where(employee2.id.eq(10))
+                .select(employee.id, employee2.id).fetch()) {
+            assertNotNull(row.get(employee.id));
+            assertNotNull(row.get(employee2.id));
+        }
+    }
+
+    @Test
+    public void left_join() throws SQLException {
+        assertEquals(10, query().from(employee).leftJoin(employee2)
+            .on(employee.superiorIdKey.on(employee2))
+            .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void like() {
+        assertEquals(0, query().from(employee).where(employee.firstname.like("\\")).fetchCount());
+        assertEquals(0, query().from(employee).where(employee.firstname.like("\\\\")).fetchCount());
+    }
+
+    @Test
+    public void like_ignore_case() {
+        assertEquals(3, query().from(employee).where(employee.firstname.likeIgnoreCase("%m%")).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn(FIREBIRD)
+    public void like_escape() {
+        List<String> strs = Arrays.asList("%a", "a%", "%a%", "_a", "a_", "_a_", "[C-P]arsen", "a\nb");
+
+        for (String str : strs) {
+            assertTrue(str, query()
+                .from(employee)
+                .where(Expressions.predicate(Ops.STRING_CONTAINS,
+                       Expressions.constant(str),
+                       Expressions.constant(str))).fetchCount() > 0);
+        }
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY})
+    public void like_number() {
+        assertEquals(5, query().from(employee)
+                .where(employee.id.like("1%")).fetchCount());
+    }
+
+    @Test
+    public void limit() throws SQLException {
+        assertEquals(Arrays.asList(23, 22, 21, 20), query().from(employee)
+            .orderBy(employee.firstname.asc())
+            .limit(4).select(employee.id).fetch());
+    }
+
+    @Test
+    public void limit_and_offset() throws SQLException {
+        assertEquals(Arrays.asList(20, 13, 10, 2),
+            query().from(employee)
+                   .orderBy(employee.firstname.asc())
+                   .limit(4).offset(3)
+                   .select(employee.id).fetch());
+    }
+
+    @Test
+    public void limit_and_offset_Group() {
+        assertEquals(9,
+                query().from(employee)
+                       .orderBy(employee.id.asc())
+                       .limit(100).offset(1)
+                .transform(GroupBy.groupBy(employee.id).as(employee)).size());
+    }
+
+    @Test
+    public void limit_and_offset_and_Order() {
+        List<String> names2 = Arrays.asList("Helen","Jennifer","Jim","Joe");
+        assertEquals(names2, query().from(employee)
+                .orderBy(employee.firstname.asc())
+                .limit(4).offset(2)
+                .select(employee.firstname).fetch());
+    }
+
+    @Test
+    @IncludeIn(DERBY)
+    public void limit_and_offset_In_Derby() throws SQLException {
+        expectedQuery = "select e.ID from EMPLOYEE e offset 3 rows fetch next 4 rows only";
+        query().from(employee).limit(4).offset(3).select(employee.id).fetch();
+
+        // limit
+        expectedQuery = "select e.ID from EMPLOYEE e fetch first 4 rows only";
+        query().from(employee).limit(4).select(employee.id).fetch();
+
+        // offset
+        expectedQuery = "select e.ID from EMPLOYEE e offset 3 rows";
+        query().from(employee).offset(3).select(employee.id).fetch();
+
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void limit_and_offset_In_Oracle() throws SQLException {
+        if (configuration.getUseLiterals()) {
+            return;
+        }
+
+        // limit
+        expectedQuery = "select * from (   select e.ID from EMPLOYEE e ) where rownum <= ?";
+        query().from(employee).limit(4).select(employee.id).fetch();
+
+        // offset
+        expectedQuery = "select * from (  select a.*, rownum rn from (   select e.ID from EMPLOYEE e  ) a) where rn > ?";
+        query().from(employee).offset(3).select(employee.id).fetch();
+
+        // limit offset
+        expectedQuery =  "select * from (  select a.*, rownum rn from (   select e.ID from EMPLOYEE e  ) a) where rn > 3 and rownum <= 4";
+        query().from(employee).limit(4).offset(3).select(employee.id).fetch();
+    }
+
+    @Test
+    @ExcludeIn({ORACLE, DB2, DERBY, FIREBIRD, SQLSERVER, CUBRID, TERADATA})
+    @SkipForQuoted
+    public void limit_and_offset2() throws SQLException {
+        // limit
+        expectedQuery = "select e.ID from EMPLOYEE e limit ?";
+        query().from(employee).limit(4).select(employee.id).fetch();
+
+        // limit offset
+        expectedQuery = "select e.ID from EMPLOYEE e limit ? offset ?";
+        query().from(employee).limit(4).offset(3).select(employee.id).fetch();
+
+    }
+
+    @Test
+    public void limit_and_order() {
+        List<String> names1 = Arrays.asList("Barbara","Daisy","Helen","Jennifer");
+        assertEquals(names1, query().from(employee)
+                .orderBy(employee.firstname.asc())
+                .limit(4)
+                .select(employee.firstname).fetch());
+    }
+
+    @Test
+    public void listResults() {
+        QueryResults<Integer> results = query().from(employee)
+                .limit(10).offset(1).orderBy(employee.id.asc())
+                .select(employee.id).fetchResults();
+        assertEquals(10, results.getTotal());
+    }
+
+    @Test
+    public void listResults2() {
+        QueryResults<Integer> results = query().from(employee)
+                .limit(2).offset(10).orderBy(employee.id.asc())
+                .select(employee.id).fetchResults();
+        assertEquals(10, results.getTotal());
+    }
+
+    @Test
+    public void listResults_factoryExpression() {
+        QueryResults<Employee> results = query().from(employee)
+                .limit(10).offset(1).orderBy(employee.id.asc())
+                .select(employee).fetchResults();
+        assertEquals(10, results.getTotal());
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY})
+    public void literals() {
+        assertEquals(1L, firstResult(ConstantImpl.create(1)).intValue());
+        assertEquals(2L, firstResult(ConstantImpl.create(2L)).longValue());
+        assertEquals(3.0, firstResult(ConstantImpl.create(3.0)), 0.001);
+        assertEquals(4.0f, firstResult(ConstantImpl.create(4.0f)), 0.001);
+        assertEquals(true, firstResult(ConstantImpl.create(true)));
+        assertEquals(false, firstResult(ConstantImpl.create(false)));
+        assertEquals("abc", firstResult(ConstantImpl.create("abc")));
+        assertEquals("'", firstResult(ConstantImpl.create("'")));
+        assertEquals("\"", firstResult(ConstantImpl.create("\"")));
+        assertEquals("\n", firstResult(ConstantImpl.create("\n")));
+        assertEquals("\r\n", firstResult(ConstantImpl.create("\r\n")));
+        assertEquals("\t", firstResult(ConstantImpl.create("\t")));
+    }
+
+    @Test
+    public void literals_literals() {
+        if (configuration.getUseLiterals()) {
+            literals();
+        }
+    }
+
+    private double log(double x, int y) {
+        return Math.log(x) / Math.log(y);
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, DERBY})
+    public void lPad() {
+        assertEquals("  ab", firstResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4)));
+        assertEquals("!!ab", firstResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4, '!')));
+    }
+
+//    @Test
+//    public void map() {
+//        Map<Integer, String> idToName = query().from(employee).map(employee.id.as("id"), employee.firstname);
+//        for (Map.Entry<Integer, String> entry : idToName.entrySet()) {
+//            assertNotNull(entry.getKey());
+//            assertNotNull(entry.getValue());
+//        }
+//    }
+
+    @Test
+    @SuppressWarnings("serial")
+    public void mappingProjection() {
+        List<Pair<String, String>> pairs = query().from(employee)
+                .select(new MappingProjection<Pair<String, String>>(Pair.class,
+                        employee.firstname, employee.lastname) {
+                    @Override
+                    protected Pair<String, String> map(Tuple row) {
+                        return Pair.of(row.get(employee.firstname), row.get(employee.lastname));
+                    }
+                }).fetch();
+
+        for (Pair<String, String> pair : pairs) {
+            assertNotNull(pair.getFirst());
+            assertNotNull(pair.getSecond());
+        }
+    }
+
+    @Test
+    @ExcludeIn({HSQLDB}) // FIXME
+    public void math() {
+        math(Expressions.numberTemplate(Double.class, "0.50"));
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD, SQLSERVER, HSQLDB}) // FIXME
+    public void math2() {
+        math(Expressions.constant(0.5));
+    }
+
+    private void math(Expression<Double> expr) {
+        double precision = 0.001;
+        assertEquals(Math.acos(0.5), firstResult(MathExpressions.acos(expr)), precision);
+        assertEquals(Math.asin(0.5), firstResult(MathExpressions.asin(expr)), precision);
+        assertEquals(Math.atan(0.5), firstResult(MathExpressions.atan(expr)), precision);
+        assertEquals(Math.cos(0.5),  firstResult(MathExpressions.cos(expr)), precision);
+        assertEquals(Math.cosh(0.5), firstResult(MathExpressions.cosh(expr)), precision);
+        assertEquals(cot(0.5),       firstResult(MathExpressions.cot(expr)), precision);
+        if (target != Target.DERBY || expr instanceof Constant) {
+            // FIXME: The resulting value is outside the range for the data type DECIMAL/NUMERIC(4,4).
+            assertEquals(coth(0.5),      firstResult(MathExpressions.coth(expr)), precision);
+        }
+
+        assertEquals(degrees(0.5),   firstResult(MathExpressions.degrees(expr)), precision);
+        assertEquals(Math.exp(0.5),  firstResult(MathExpressions.exp(expr)), precision);
+        assertEquals(Math.log(0.5),  firstResult(MathExpressions.ln(expr)), precision);
+        assertEquals(log(0.5, 10),   firstResult(MathExpressions.log(expr, 10)), precision);
+        assertEquals(0.25,           firstResult(MathExpressions.power(expr, 2)), precision);
+        assertEquals(radians(0.5),   firstResult(MathExpressions.radians(expr)), precision);
+        assertEquals(Integer.valueOf(1),
+                firstResult(MathExpressions.sign(expr)));
+        assertEquals(Math.sin(0.5),  firstResult(MathExpressions.sin(expr)), precision);
+        assertEquals(Math.sinh(0.5), firstResult(MathExpressions.sinh(expr)), precision);
+        assertEquals(Math.tan(0.5),  firstResult(MathExpressions.tan(expr)), precision);
+        assertEquals(Math.tanh(0.5), firstResult(MathExpressions.tanh(expr)), precision);
+    }
+
+    @Test
+    @ExcludeIn(DERBY) // Derby doesn't support mod with decimal operands
+    public void math3() {
+        // 1.0 + 2.0 * 3.0 - 4.0 / 5.0 + 6.0 % 3.0
+        NumberTemplate<Double> one = Expressions.numberTemplate(Double.class, "1.0");
+        NumberTemplate<Double> two = Expressions.numberTemplate(Double.class, "2.0");
+        NumberTemplate<Double> three = Expressions.numberTemplate(Double.class, "3.0");
+        NumberTemplate<Double> four = Expressions.numberTemplate(Double.class, "4.0");
+        NumberTemplate<Double> five = Expressions.numberTemplate(Double.class, "5.0");
+        NumberTemplate<Double> six = Expressions.numberTemplate(Double.class, "6.0");
+        Double num = query().select(one.add(two.multiply(three)).subtract(four.divide(five)).add(six.mod(three))).fetchFirst();
+        assertEquals(6.2, num, 0.001);
+    }
+
+    @Test
+    public void nested_tuple_projection() {
+        Concatenation concat = new Concatenation(employee.firstname, employee.lastname);
+        List<Tuple> tuples = query().from(employee)
+                .select(employee.firstname, employee.lastname, concat).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Tuple tuple : tuples) {
+            String firstName = tuple.get(employee.firstname);
+            String lastName = tuple.get(employee.lastname);
+            assertEquals(firstName + lastName, tuple.get(concat));
+        }
+    }
+
+
+    @Test
+    @ExcludeIn({SQLITE})
+    public void no_from() {
+        assertNotNull(firstResult(DateExpression.currentDate()));
+    }
+
+    @Test
+    public void nullif() {
+        query().from(employee).select(employee.firstname.nullif(employee.lastname)).fetch();
+    }
+
+    @Test
+    public void nullif_constant() {
+        query().from(employee).select(employee.firstname.nullif("xxx")).fetch();
+    }
+
+    @Test
+    public void num_cast() {
+        query().from(employee).select(employee.id.castToNum(Long.class)).fetch();
+        query().from(employee).select(employee.id.castToNum(Float.class)).fetch();
+        query().from(employee).select(employee.id.castToNum(Double.class)).fetch();
+    }
+
+    @Test
+    public void num_cast2() {
+        NumberExpression<Integer> num = Expressions.numberTemplate(Integer.class, "0");
+        firstResult(num.castToNum(Byte.class));
+        firstResult(num.castToNum(Short.class));
+        firstResult(num.castToNum(Integer.class));
+        firstResult(num.castToNum(Long.class));
+        firstResult(num.castToNum(Float.class));
+        firstResult(num.castToNum(Double.class));
+    }
+
+    @Test
+    public void num_date_operation() {
+        long result = query()
+                .select(employee.datefield.year().mod(1))
+                .from(employee)
+                .fetchFirst();
+        assertEquals(0, result);
+    }
+
+    @Test
+    @ExcludeIn({DERBY, FIREBIRD, POSTGRESQL})
+    public void number_as_boolean() {
+        QNumberTest numberTest = QNumberTest.numberTest;
+        delete(numberTest).execute();
+        insert(numberTest).set(numberTest.col1Boolean, true).execute();
+        insert(numberTest).set(numberTest.col1Number, (byte) 1).execute();
+        assertEquals(2, query().from(numberTest).select(numberTest.col1Boolean).fetch().size());
+        assertEquals(2, query().from(numberTest).select(numberTest.col1Number).fetch().size());
+    }
+
+    @Test
+    public void number_as_boolean_Null() {
+        QNumberTest numberTest = QNumberTest.numberTest;
+        delete(numberTest).execute();
+        insert(numberTest).setNull(numberTest.col1Boolean).execute();
+        insert(numberTest).setNull(numberTest.col1Number).execute();
+        assertEquals(2, query().from(numberTest).select(numberTest.col1Boolean).fetch().size());
+        assertEquals(2, query().from(numberTest).select(numberTest.col1Number).fetch().size());
+    }
+
+    @Test
+    public void offset_only() {
+        assertEquals(Arrays.asList(20, 13, 10, 2, 1, 11, 12), query().from(employee)
+            .orderBy(employee.firstname.asc())
+            .offset(3)
+            .select(employee.id).fetch());
+    }
+
+    @Test
+    public void operation_in_constant_list() {
+        assertEquals(0, query().from(survey).where(survey.name.charAt(0).in(Collections.singletonList('a'))).fetchCount());
+        assertEquals(0, query().from(survey).where(survey.name.charAt(0).in(Arrays.asList('a','b'))).fetchCount());
+        assertEquals(0, query().from(survey).where(survey.name.charAt(0).in(Arrays.asList('a','b','c'))).fetchCount());
+    }
+
+    @Test
+    public void order_nullsFirst() {
+        assertEquals(Collections.singletonList("Hello World"), query().from(survey)
+            .orderBy(survey.name.asc().nullsFirst())
+            .select(survey.name).fetch());
+    }
+
+    @Test
+    public void order_nullsLast() {
+        assertEquals(Collections.singletonList("Hello World"), query().from(survey)
+            .orderBy(survey.name.asc().nullsLast())
+            .select(survey.name).fetch());
+    }
+
+    @Test
+    public void params() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Mike", query()
+                .from(employee).where(employee.firstname.eq(name))
+                .set(name, "Mike")
+                .select(employee.firstname).fetchFirst());
+    }
+
+    @Test
+    public void params_anon() {
+        Param<String> name = new Param<String>(String.class);
+        assertEquals("Mike", query()
+                .from(employee).where(employee.firstname.eq(name))
+                .set(name, "Mike")
+                .select(employee.firstname).fetchFirst());
+    }
+
+    @Test(expected = ParamNotSetException.class)
+    public void params_not_set() {
+        Param<String> name = new Param<String>(String.class,"name");
+        assertEquals("Mike", query()
+                .from(employee).where(employee.firstname.eq(name))
+                .select(employee.firstname).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY, FIREBIRD, HSQLDB, ORACLE, SQLSERVER})
+    @SkipForQuoted
+    public void path_alias() {
+        expectedQuery = "select e.LASTNAME, sum(e.SALARY) as salarySum " +
+                "from EMPLOYEE e " +
+                "group by e.LASTNAME having salarySum > ?";
+
+        NumberExpression<BigDecimal> salarySum = employee.salary.sum().as("salarySum");
+        query().from(employee)
+            .groupBy(employee.lastname)
+            .having(salarySum.gt(10000))
+            .select(employee.lastname, salarySum).fetch();
+    }
+
+    @Test
+    public void path_in_constant_list() {
+        assertEquals(0, query().from(survey).where(survey.name.in(Collections.singletonList("a"))).fetchCount());
+        assertEquals(0, query().from(survey).where(survey.name.in(Arrays.asList("a","b"))).fetchCount());
+        assertEquals(0, query().from(survey).where(survey.name.in(Arrays.asList("a","b","c"))).fetchCount());
+    }
+
+    @Test
+    public void precedence() {
+        StringPath fn = employee.firstname;
+        StringPath ln = employee.lastname;
+        Predicate where = fn.eq("Mike").and(ln.eq("Smith")).or(fn.eq("Joe").and(ln.eq("Divis")));
+        assertEquals(2L, query().from(employee).where(where).fetchCount());
+    }
+
+    @Test
+    public void precedence2() {
+        StringPath fn = employee.firstname;
+        StringPath ln = employee.lastname;
+        Predicate where = fn.eq("Mike").and(ln.eq("Smith").or(fn.eq("Joe")).and(ln.eq("Divis")));
+        assertEquals(0L, query().from(employee).where(where).fetchCount());
+    }
+
+    @Test
+    public void projection() throws IOException {
+        CloseableIterator<Tuple> results = query().from(survey).select(survey.all()).iterate();
+        assertTrue(results.hasNext());
+        while (results.hasNext()) {
+            assertEquals(3, results.next().size());
+        }
+        results.close();
+    }
+
+    @Test
+    public void projection_and_twoColumns() {
+        // projection and two columns
+        for (Tuple row : query().from(survey)
+                .select(new QIdName(survey.id, survey.name), survey.id, survey.name).fetch()) {
+            assertEquals(3, row.size());
+            assertEquals(IdName.class, row.get(0, Object.class).getClass());
+            assertEquals(Integer.class, row.get(1, Object.class).getClass());
+            assertEquals(String.class, row.get(2, Object.class).getClass());
+        }
+    }
+
+    @Test
+    public void projection2() throws IOException {
+        CloseableIterator<Tuple> results = query().from(survey).select(survey.id, survey.name).iterate();
+        assertTrue(results.hasNext());
+        while (results.hasNext()) {
+            assertEquals(2, results.next().size());
+        }
+        results.close();
+    }
+
+    @Test
+    public void projection3() throws IOException {
+        CloseableIterator<String> names = query().from(survey).select(survey.name).iterate();
+        assertTrue(names.hasNext());
+        while (names.hasNext()) {
+            System.out.println(names.next());
+        }
+        names.close();
+    }
+
+    @Test
+    public void qBeanUsage() {
+        PathBuilder<Object[]> sq = new PathBuilder<Object[]>(Object[].class, "sq");
+        List<Survey> surveys =
+            query().from(
+                    query().from(survey).select(survey.all()).as("sq"))
+                    .select(Projections.bean(Survey.class, Collections.singletonMap("name", sq.get(survey.name)))).fetch();
+        assertFalse(surveys.isEmpty());
+
+    }
+
+    @Test
+    public void query_with_constant() throws Exception {
+        for (Tuple row : query().from(survey)
+                .where(survey.id.eq(1))
+                .select(survey.id, survey.name).fetch()) {
+            assertNotNull(row.get(survey.id));
+            assertNotNull(row.get(survey.name));
+        }
+    }
+
+    @Test
+    public void query1() throws Exception {
+        for (String s : query().from(survey).select(survey.name).fetch()) {
+            assertNotNull(s);
+        }
+    }
+
+    @Test
+    public void query2() throws Exception {
+        for (Tuple row : query().from(survey).select(survey.id, survey.name).fetch()) {
+            assertNotNull(row.get(survey.id));
+            assertNotNull(row.get(survey.name));
+        }
+    }
+
+    private double radians(double x) {
+        return x * Math.PI / 180.0;
+    }
+
+    @Test
+    public void random() {
+        firstResult(MathExpressions.random());
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD, ORACLE, POSTGRESQL, SQLITE, TERADATA})
+    public void random2() {
+        firstResult(MathExpressions.random(10));
+    }
+
+    @Test
+    public void relationalPath_projection() {
+        List<Tuple> results = query().from(employee, employee2).where(employee.id.eq(employee2.id))
+                .select(employee, employee2).fetch();
+        assertFalse(results.isEmpty());
+        for (Tuple row : results) {
+            Employee e1 = row.get(employee);
+            Employee e2 = row.get(employee2);
+            assertEquals(e1.getId(), e2.getId());
+        }
+    }
+
+    @Test
+    public void relationalPath_eq() {
+        assertEquals(10, query().from(employee, employee2)
+                .where(employee.eq(employee2))
+                .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void relationalPath_ne() {
+        assertEquals(90, query().from(employee, employee2)
+                .where(employee.ne(employee2))
+                .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void relationalPath_eq2() {
+        assertEquals(1, query().from(survey, survey2)
+                .where(survey.eq(survey2))
+                .select(survey.id, survey2.id).fetch().size());
+    }
+
+    @Test
+    public void relationalPath_ne2() {
+        assertEquals(0, query().from(survey, survey2)
+                .where(survey.ne(survey2))
+                .select(survey.id, survey2.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void right_join() throws SQLException {
+        assertEquals(16, query().from(employee).rightJoin(employee2)
+            .on(employee.superiorIdKey.on(employee2))
+            .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn(DERBY)
+    public void round() {
+        Expression<Double> expr = Expressions.numberTemplate(Double.class, "1.32");
+
+        assertEquals(Double.valueOf(1.0), firstResult(MathExpressions.round(expr)));
+        assertEquals(Double.valueOf(1.3), firstResult(MathExpressions.round(expr, 1)));
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, DERBY})
+    public void rpad() {
+        assertEquals("ab  ", firstResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4)));
+        assertEquals("ab!!", firstResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4, '!')));
+    }
+
+    @Test
+    @Ignore
+    @ExcludeIn({ORACLE, DERBY, SQLSERVER})
+    public void select_booleanExpr() throws SQLException {
+        // TODO : FIXME
+        System.out.println(query().from(survey).select(survey.id.eq(0)).fetch());
+    }
+
+    @Test
+    @Ignore
+    @ExcludeIn({ORACLE, DERBY, SQLSERVER})
+    public void select_booleanExpr2() throws SQLException {
+        // TODO : FIXME
+        System.out.println(query().from(survey).select(survey.id.gt(0)).fetch());
+    }
+
+    @Test
+    public void select_booleanExpr3() {
+        assertTrue(query().select(Expressions.TRUE).fetchFirst());
+        assertFalse(query().select(Expressions.FALSE).fetchFirst());
+    }
+
+    @Test
+    public void select_concat() throws SQLException {
+        for (Tuple row : query().from(survey).select(survey.name, survey.name.append("Hello World")).fetch()) {
+            assertEquals(
+                    row.get(survey.name) + "Hello World",
+                    row.get(survey.name.append("Hello World")));
+        }
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, CUBRID, TERADATA})
+    public void select_for_update() {
+        assertEquals(1, query().from(survey).forUpdate().select(survey.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, CUBRID, TERADATA})
+    public void select_for_update_Where() {
+        assertEquals(1, query().from(survey).forUpdate().where(survey.id.isNotNull()).select(survey.id).fetch().size());
+    }
+
+    @Test
+    @ExcludeIn({SQLITE, CUBRID, TERADATA})
+    public void select_for_update_UniqueResult() {
+        query().from(survey).forUpdate().select(survey.id).fetchOne();
+    }
+
+    @Test
+    public void select_for_share() {
+        if (configuration.getTemplates().isForShareSupported()) {
+            assertEquals(1, query().from(survey).forShare().where(survey.id.isNotNull()).select(survey.id).fetch().size());
+        } else {
+            try {
+                query().from(survey).forShare().where(survey.id.isNotNull()).select(survey.id).fetch().size();
+                fail();
+            } catch (QueryException e) {
+                assertTrue(e.getMessage().equals("Using forShare() is not supported"));
+            }
+        }
+    }
+
+    @Test
+    @SkipForQuoted
+    public void serialization() {
+        SQLQuery<?> query = query();
+        query.from(survey);
+        assertEquals("from SURVEY s", query.toString());
+        query.from(survey2);
+        assertEquals("from SURVEY s, SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void serialization2() throws Exception {
+        List<Tuple> rows = query().from(survey).select(survey.id, survey.name).fetch();
+        serialize(rows);
+    }
+
+    private void serialize(List<Tuple> rows) throws IOException, ClassNotFoundException {
+        rows = Serialization.serialize(rows);
+        for (Tuple row : rows) {
+            row.hashCode();
+        }
+    }
+
+    @Test
+    public void single() {
+        assertNotNull(query().from(survey).select(survey.name).fetchFirst());
+    }
+
+    @Test
+    public void single_array() {
+        assertNotNull(query().from(survey).select(new Expression<?>[]{survey.name}).fetchFirst());
+    }
+
+    @Test
+    public void single_column() {
+        // single column
+        for (String s : query().from(survey).select(survey.name).fetch()) {
+            assertNotNull(s);
+        }
+    }
+
+    @Test
+    public void single_column_via_Object_type() {
+        for (Object s : query().from(survey)
+                .select(ExpressionUtils.path(Object.class, survey.name.getMetadata())).fetch()) {
+            assertEquals(String.class, s.getClass());
+        }
+    }
+
+    @Test
+    public void specialChars() {
+        assertEquals(0, query().from(survey).where(survey.name.in("\n", "\r", "\\", "\'", "\"")).fetchCount());
+    }
+
+    @Test
+    public void standardTest() {
+        standardTest.runBooleanTests(employee.firstname.isNull(), employee2.lastname.isNotNull());
+        // datetime
+        standardTest.runDateTests(employee.datefield, employee2.datefield, date);
+
+        // numeric
+        standardTest.runNumericCasts(employee.id, employee2.id, 1);
+        standardTest.runNumericTests(employee.id, employee2.id, 1);
+        // BigDecimal
+        standardTest.runNumericTests(employee.salary, employee2.salary, new BigDecimal("30000.00"));
+
+        standardTest.runStringTests(employee.firstname, employee2.firstname, "Jennifer");
+        Target target = Connections.getTarget();
+        if (target != SQLITE) {
+            standardTest.runTimeTests(employee.timefield, employee2.timefield, time);
+        }
+
+        standardTest.report();
+    }
+
+    @Test
+    @IncludeIn(H2)
+    public void standardTest_turkish() {
+        Locale defaultLocale = Locale.getDefault();
+        Locale.setDefault(new Locale("tr", "TR"));
+        try {
+            standardTest();
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void string() {
+        StringExpression str = Expressions.stringTemplate("'  abcd  '");
+
+        assertEquals("abcd  ",           firstResult(StringExpressions.ltrim(str)));
+        assertEquals(Integer.valueOf(3), firstResult(str.locate("a")));
+        assertEquals(Integer.valueOf(0), firstResult(str.locate("a", 4)));
+        assertEquals(Integer.valueOf(4), firstResult(str.locate("b", 2)));
+        assertEquals("  abcd",           firstResult(StringExpressions.rtrim(str)));
+        assertEquals("abc",              firstResult(str.substring(2, 5)));
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void string_withTemplate() {
+        StringExpression str = Expressions.stringTemplate("'  abcd  '");
+
+        NumberExpression<Integer> four = Expressions.numberTemplate(Integer.class, "4");
+        NumberExpression<Integer> two = Expressions.numberTemplate(Integer.class, "2");
+        NumberExpression<Integer> five = Expressions.numberTemplate(Integer.class, "5");
+
+        assertEquals("abcd  ",           firstResult(StringExpressions.ltrim(str)));
+        assertEquals(Integer.valueOf(3), firstResult(str.locate("a")));
+        assertEquals(Integer.valueOf(0), firstResult(str.locate("a", four)));
+        assertEquals(Integer.valueOf(4), firstResult(str.locate("b", two)));
+        assertEquals("  abcd",           firstResult(StringExpressions.rtrim(str)));
+        assertEquals("abc",              firstResult(str.substring(two, five)));
+    }
+
+    @Test
+    @ExcludeIn({POSTGRESQL, SQLITE})
+    public void string_indexOf() {
+        StringExpression str = Expressions.stringTemplate("'  abcd  '");
+
+        assertEquals(Integer.valueOf(2),  firstResult(str.indexOf("a")));
+        assertEquals(Integer.valueOf(-1), firstResult(str.indexOf("a", 4)));
+        assertEquals(Integer.valueOf(3), firstResult(str.indexOf("b", 2)));
+    }
+
+    @Test
+    public void stringFunctions2() throws SQLException {
+        for (BooleanExpression where : Arrays.asList(
+                employee.firstname.startsWith("a"),
+                employee.firstname.startsWithIgnoreCase("a"),
+                employee.firstname.endsWith("a"),
+                employee.firstname.endsWithIgnoreCase("a"))) {
+            query().from(employee).where(where).select(employee.firstname).fetch();
+        }
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void string_left() {
+        assertEquals("John", query().from(employee).where(employee.lastname.eq("Johnson"))
+                                    .select(SQLExpressions.left(employee.lastname, 4)).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, SQLITE})
+    public void string_right() {
+        assertEquals("son", query().from(employee).where(employee.lastname.eq("Johnson"))
+                                   .select(SQLExpressions.right(employee.lastname, 3)).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, SQLITE})
+    public void string_left_Right() {
+        assertEquals("hn", query().from(employee).where(employee.lastname.eq("Johnson"))
+                                  .select(SQLExpressions.right(SQLExpressions.left(employee.lastname, 4), 2)).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({DERBY, SQLITE})
+    public void string_right_Left() {
+        assertEquals("ns", query().from(employee).where(employee.lastname.eq("Johnson"))
+                                  .select(SQLExpressions.left(SQLExpressions.right(employee.lastname, 4), 2)).fetchFirst());
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY, FIREBIRD})
+    public void substring() {
+        //SELECT * FROM account where SUBSTRING(name, -x, 1) = SUBSTRING(name, -y, 1)
+        query().from(employee)
+                .where(employee.firstname.substring(-3, 1).eq(employee.firstname.substring(-2, 1)))
+                .select(employee.id).fetch();
+    }
+
+    @Test
+    public void syntax_for_employee() throws SQLException {
+        assertEquals(3, query().from(employee).groupBy(employee.superiorId)
+            .orderBy(employee.superiorId.asc())
+            .select(employee.salary.avg(), employee.id.max()).fetch().size());
+
+        assertEquals(2, query().from(employee).groupBy(employee.superiorId)
+            .having(employee.id.max().gt(5))
+            .orderBy(employee.superiorId.asc())
+            .select(employee.salary.avg(), employee.id.max()).fetch().size());
+
+        assertEquals(2, query().from(employee).groupBy(employee.superiorId)
+            .having(employee.superiorId.isNotNull())
+            .orderBy(employee.superiorId.asc())
+            .select(employee.salary.avg(), employee.id.max()).fetch().size());
+    }
+
+    @Test
+    public void templateExpression() {
+        NumberExpression<Integer> one = Expressions.numberTemplate(Integer.class, "1");
+        assertEquals(Collections.singletonList(1), query().from(survey).select(one.as("col1")).fetch());
+    }
+
+    @Test
+    public void transform_groupBy() {
+        QEmployee employee = new QEmployee("employee");
+        QEmployee employee2 = new QEmployee("employee2");
+        Map<Integer, Map<Integer, Employee>> results = query().from(employee, employee2)
+            .transform(GroupBy.groupBy(employee.id).as(GroupBy.map(employee2.id, employee2)));
+
+        int count = (int) query().from(employee).fetchCount();
+        assertEquals(count, results.size());
+        for (Map.Entry<Integer, Map<Integer, Employee>> entry : results.entrySet()) {
+            Map<Integer, Employee> employees = entry.getValue();
+            assertEquals(count, employees.size());
+        }
+
+    }
+
+    @Test
+    public void tuple_projection() {
+        List<Tuple> tuples = query().from(employee)
+                .select(employee.firstname, employee.lastname).fetch();
+        assertFalse(tuples.isEmpty());
+        for (Tuple tuple : tuples) {
+            assertNotNull(tuple.get(employee.firstname));
+            assertNotNull(tuple.get(employee.lastname));
+        }
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY})
+    public void tuple2() {
+        assertEquals(10, query().from(employee)
+                .select(Expressions.as(ConstantImpl.create("1"), "code"),
+                        employee.id).fetch().size());
+    }
+
+    @Test
+    public void twoColumns() {
+        // two columns
+        for (Tuple row : query().from(survey).select(survey.id, survey.name).fetch()) {
+            assertEquals(2, row.size());
+            assertEquals(Integer.class, row.get(0, Object.class).getClass());
+            assertEquals(String.class, row.get(1, Object.class).getClass());
+        }
+    }
+
+    @Test
+    public void twoColumns_and_projection() {
+        // two columns and projection
+        for (Tuple row : query().from(survey)
+                .select(survey.id, survey.name, new QIdName(survey.id, survey.name)).fetch()) {
+            assertEquals(3, row.size());
+            assertEquals(Integer.class, row.get(0, Object.class).getClass());
+            assertEquals(String.class, row.get(1, Object.class).getClass());
+            assertEquals(IdName.class, row.get(2, Object.class).getClass());
+        }
+    }
+
+    @Test
+    public void unique_Constructor_projection() {
+        IdName idAndName = query().from(survey).limit(1).select(new QIdName(survey.id, survey.name)).fetchFirst();
+        assertNotNull(idAndName);
+        assertNotNull(idAndName.getId());
+        assertNotNull(idAndName.getName());
+    }
+
+    @Test
+    public void unique_single() {
+        String s = query().from(survey).limit(1).select(survey.name).fetchFirst();
+        assertNotNull(s);
+    }
+
+    @Test
+    public void unique_wildcard() {
+        // unique wildcard
+        Tuple row = query().from(survey).limit(1).select(survey.all()).fetchFirst();
+        assertNotNull(row);
+        assertEquals(3, row.size());
+        assertNotNull(row.get(0, Object.class));
+        assertNotNull(row.get(0, Object.class) + " is not null", row.get(1, Object.class));
+    }
+
+    @Test(expected = NonUniqueResultException.class)
+    public void uniqueResultContract() {
+        query().from(employee).select(employee.all()).fetchOne();
+    }
+
+    @Test
+    public void various() throws SQLException {
+        for (String s : query().from(survey).select(survey.name.lower()).fetch()) {
+            assertEquals(s, s.toLowerCase());
+        }
+
+        for (String s : query().from(survey).select(survey.name.append("abc")).fetch()) {
+            assertTrue(s.endsWith("abc"));
+        }
+
+        System.out.println(query().from(survey).select(survey.id.sqrt()).fetch());
+    }
+
+    @Test
+    public void where_exists() throws SQLException {
+        SQLQuery<Integer> sq1 = query().from(employee).select(employee.id.max());
+        assertEquals(10, query().from(employee).where(sq1.exists()).fetchCount());
+    }
+
+    @Test
+    public void where_exists_Not() throws SQLException {
+        SQLQuery<Integer> sq1 = query().from(employee).select(employee.id.max());
+        assertEquals(0, query().from(employee).where(sq1.exists().not()).fetchCount());
+    }
+
+    @Test
+    @IncludeIn({HSQLDB, ORACLE, POSTGRESQL})
+    public void with() {
+        assertEquals(10, query().with(employee2, query().from(employee)
+                .where(employee.firstname.eq("Jim"))
+                .select(Wildcard.all))
+               .from(employee, employee2)
+               .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    @IncludeIn({HSQLDB, ORACLE, POSTGRESQL})
+    public void with2() {
+        QEmployee employee3 = new QEmployee("e3");
+        assertEquals(100, query().with(employee2, query().from(employee)
+                .where(employee.firstname.eq("Jim"))
+                .select(Wildcard.all))
+               .with(employee2, query().from(employee)
+                       .where(employee.firstname.eq("Jim"))
+                       .select(Wildcard.all))
+               .from(employee, employee2, employee3)
+               .select(employee.id, employee2.id, employee3.id).fetch().size());
+    }
+
+    @Test
+    @IncludeIn({HSQLDB, ORACLE, POSTGRESQL})
+    public void with3() {
+        assertEquals(10, query().with(employee2, employee2.all()).as(
+                query().from(employee)
+                        .where(employee.firstname.eq("Jim"))
+                        .select(Wildcard.all))
+               .from(employee, employee2)
+               .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    @IncludeIn({HSQLDB, ORACLE, POSTGRESQL})
+    public void with_limit() {
+        assertEquals(5, query().with(employee2, employee2.all()).as(
+                query().from(employee)
+                        .where(employee.firstname.eq("Jim"))
+                        .select(Wildcard.all))
+                .from(employee, employee2)
+                .limit(5)
+                .orderBy(employee.id.asc(), employee2.id.asc())
+                .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    @IncludeIn({HSQLDB, ORACLE, POSTGRESQL})
+    public void with_limitOffset() {
+        assertEquals(5, query().with(employee2, employee2.all()).as(
+                query().from(employee)
+                        .where(employee.firstname.eq("Jim"))
+                        .select(Wildcard.all))
+                .from(employee, employee2)
+                .limit(10)
+                .offset(5)
+                .orderBy(employee.id.asc(), employee2.id.asc())
+                .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    @IncludeIn({ORACLE, POSTGRESQL})
+    public void with_recursive() {
+        assertEquals(10, query().withRecursive(employee2, query().from(employee)
+                .where(employee.firstname.eq("Jim"))
+                .select(Wildcard.all))
+               .from(employee, employee2)
+               .select(employee.id, employee2.id).fetch().size());
+    }
+
+
+    @Test
+    @IncludeIn({ORACLE, POSTGRESQL})
+    public void with_recursive2() {
+        assertEquals(10, query().withRecursive(employee2, employee2.all()).as(
+                query().from(employee)
+                        .where(employee.firstname.eq("Jim"))
+                        .select(Wildcard.all))
+               .from(employee, employee2)
+               .select(employee.id, employee2.id).fetch().size());
+    }
+
+    @Test
+    public void wildcard() {
+        // wildcard
+        for (Tuple row : query().from(survey).select(survey.all()).fetch()) {
+            assertNotNull(row);
+            assertEquals(3, row.size());
+            assertNotNull(row.get(0, Object.class));
+            assertNotNull(row.get(0, Object.class) + " is not null", row.get(1, Object.class));
+        }
+    }
+
+    @Test
+    @SkipForQuoted
+    public void wildcard_all() {
+        expectedQuery = "select * from EMPLOYEE e";
+        query().from(employee).select(Wildcard.all).fetch();
+    }
+
+    @Test
+    public void wildcard_all2() {
+        assertEquals(10, query().from(new RelationalPathBase<Object>(Object.class, "employee", "public", "EMPLOYEE"))
+                .select(Wildcard.all).fetch().size());
+    }
+
+    @Test
+    public void wildcard_and_qTuple() {
+        // wildcard and QTuple
+        for (Tuple tuple : query().from(survey).select(survey.all()).fetch()) {
+            assertNotNull(tuple.get(survey.id));
+            assertNotNull(tuple.get(survey.name));
+        }
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    public void withinGroup() {
+        List<WithinGroup<?>> exprs = new ArrayList<WithinGroup<?>>();
+        NumberPath<Integer> path = survey.id;
+
+        // two args
+        add(exprs, SQLExpressions.cumeDist(2, 3));
+        add(exprs, SQLExpressions.denseRank(4, 5));
+        add(exprs, SQLExpressions.listagg(path, ","));
+        add(exprs, SQLExpressions.percentRank(6, 7));
+        add(exprs, SQLExpressions.rank(8, 9));
+
+        for (WithinGroup<?> wg : exprs) {
+            query().from(survey).select(wg.withinGroup().orderBy(survey.id, survey.id)).fetch();
+            query().from(survey).select(wg.withinGroup().orderBy(survey.id.asc(), survey.id.asc())).fetch();
+        }
+
+        // one arg
+        exprs.clear();
+        add(exprs, SQLExpressions.percentileCont(0.1));
+        add(exprs, SQLExpressions.percentileDisc(0.9));
+
+        for (WithinGroup<?> wg : exprs) {
+            query().from(survey).select(wg.withinGroup().orderBy(survey.id)).fetch();
+            query().from(survey).select(wg.withinGroup().orderBy(survey.id.asc())).fetch();
+        }
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY, H2})
+    public void yearWeek() {
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+        assertEquals(Integer.valueOf(200006), query.select(employee.datefield.yearWeek()).fetchFirst());
+    }
+
+    @Test
+    @IncludeIn({H2})
+    public void yearWeek_h2() {
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+        assertEquals(Integer.valueOf(200007), query.select(employee.datefield.yearWeek()).fetchFirst());
+    }
+
+    @Test
+    public void statementOptions() {
+        StatementOptions options = StatementOptions.builder().setFetchSize(15).setMaxRows(150).build();
+        SQLQuery<?> query = query().from(employee).orderBy(employee.id.asc());
+        query.setStatementOptions(options);
+        query.addListener(new SQLBaseListener() {
+            public void preExecute(SQLListenerContext context) {
+                try {
+                    assertEquals(15, context.getPreparedStatement().getFetchSize());
+                    assertEquals(150, context.getPreparedStatement().getMaxRows());
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+        query.select(employee.id).fetch();
+    }
+
+    @Test
+    public void getResults() throws SQLException, InterruptedException {
+        final AtomicLong endCalled = new AtomicLong(0);
+        SQLQuery<Integer> query = query().select(employee.id).from(employee);
+        query.addListener(new SQLBaseListener() {
+            @Override
+            public void end(SQLListenerContext context) {
+                endCalled.set(System.currentTimeMillis());
+            }
+        });
+        ResultSet results = query.getResults(employee.id);
+        long getResultsCalled = System.currentTimeMillis();
+        Thread.sleep(100);
+        results.close();
+        assertTrue(endCalled.get() - getResultsCalled >= 100);
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY, ORACLE, SQLSERVER})
+    public void groupConcat() {
+        List<String> expected = Arrays.asList("Mike,Mary", "Joe,Peter,Steve,Jim", "Jennifer,Helen,Daisy,Barbara");
+        if (Connections.getTarget() == POSTGRESQL) {
+            expected = Arrays.asList("Steve,Jim,Joe,Peter", "Barbara,Helen,Daisy,Jennifer", "Mary,Mike");
+        }
+        assertEquals(
+                expected,
+                query().select(SQLExpressions.groupConcat(employee.firstname))
+                        .from(employee)
+                        .groupBy(employee.superiorId).fetch());
+    }
+
+    @Test
+    @ExcludeIn({DB2, DERBY, ORACLE, SQLSERVER})
+    public void groupConcat2() {
+        List<String> expected = Arrays.asList("Mike-Mary", "Joe-Peter-Steve-Jim", "Jennifer-Helen-Daisy-Barbara");
+        if (Connections.getTarget() == POSTGRESQL) {
+            expected = Arrays.asList("Steve-Jim-Joe-Peter", "Barbara-Helen-Daisy-Jennifer", "Mary-Mike");
+        }
+        assertEquals(
+                expected,
+                query().select(SQLExpressions.groupConcat(employee.firstname, "-"))
+                        .from(employee)
+                        .groupBy(employee.superiorId).fetch());
+    }
+
+}
+//CHECKSTYLERULE:ON: FileLength
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java
new file mode 100644
index 0000000000..4abc9b6231
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java
@@ -0,0 +1,33 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.MYSQL;
+import static com.querydsl.sql.Constants.survey;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.sql.mysql.MySQLQuery;
+
+
+public class SelectMySQLBase extends AbstractBaseTest {
+
+    protected MySQLQuery<?> mysqlQuery() {
+        return new MySQLQuery<Void>(connection, configuration);
+    }
+
+    @Test
+    @IncludeIn(MYSQL)
+    public void mysql_extensions() {
+        mysqlQuery().from(survey).bigResult().select(survey.id).fetch();
+        mysqlQuery().from(survey).bufferResult().select(survey.id).fetch();
+        mysqlQuery().from(survey).cache().select(survey.id).fetch();
+        mysqlQuery().from(survey).calcFoundRows().select(survey.id).fetch();
+        mysqlQuery().from(survey).noCache().select(survey.id).fetch();
+
+        mysqlQuery().from(survey).highPriority().select(survey.id).fetch();
+        mysqlQuery().from(survey).lockInShareMode().select(survey.id).fetch();
+        mysqlQuery().from(survey).smallResult().select(survey.id).fetch();
+        mysqlQuery().from(survey).straightJoin().select(survey.id).fetch();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java
new file mode 100644
index 0000000000..27990c6697
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java
@@ -0,0 +1,155 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.ORACLE;
+import static com.querydsl.sql.Constants.employee;
+import static com.querydsl.sql.oracle.OracleGrammar.level;
+
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.oracle.OracleQuery;
+
+public class SelectOracleBase extends AbstractBaseTest {
+
+    private static final Logger logger = Logger.getLogger(AbstractSQLQuery.class.getName());
+
+    protected OracleQuery<?> oracleQuery() {
+        return new OracleQuery<Void>(connection, configuration) {
+            @Override
+            protected SQLSerializer serialize(boolean forCountRow) {
+                SQLSerializer serializer = super.serialize(forCountRow);
+                String rv = serializer.toString();
+                if (expectedQuery != null) {
+                   Assert.assertEquals(expectedQuery, rv.replace('\n', ' '));
+                   expectedQuery = null;
+                }
+                logger.fine(rv);
+                return serializer;
+            }
+        };
+    }
+
+    @Test
+    @Ignore
+    public void connectBy() throws SQLException {
+        // TODO : come up with a legal case
+        oracleQuery().from(employee)
+            .where(level.eq(-1))
+            .connectBy(level.lt(1000))
+            .select(employee.id).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void connectByPrior() throws SQLException {
+        expectedQuery =  "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
+                        "from EMPLOYEE e " +
+                        "connect by prior e.ID = e.SUPERIOR_ID";
+        oracleQuery().from(employee)
+            .connectByPrior(employee.id.eq(employee.superiorId))
+            .select(employee.id, employee.lastname, employee.superiorId).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void connectByPrior2() throws SQLException {
+        if (configuration.getUseLiterals()) {
+            return;
+        }
+
+        expectedQuery =
+                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
+                "from EMPLOYEE e " +
+                "start with e.ID = ? " +
+                "connect by prior e.ID = e.SUPERIOR_ID";
+        oracleQuery().from(employee)
+            .startWith(employee.id.eq(1))
+            .connectByPrior(employee.id.eq(employee.superiorId))
+            .select(employee.id, employee.lastname, employee.superiorId).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void connectByPrior3() throws SQLException {
+        if (configuration.getUseLiterals()) {
+            return;
+        }
+
+        expectedQuery =
+                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
+                "from EMPLOYEE e " +
+                "start with e.ID = ? " +
+                "connect by prior e.ID = e.SUPERIOR_ID " +
+                "order siblings by e.LASTNAME";
+        oracleQuery().from(employee)
+            .startWith(employee.id.eq(1))
+            .connectByPrior(employee.id.eq(employee.superiorId))
+            .orderSiblingsBy(employee.lastname)
+            .select(employee.id, employee.lastname, employee.superiorId).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void connectByPrior4() throws SQLException {
+        if (configuration.getUseLiterals()) {
+            return;
+        }
+
+        expectedQuery =
+                "select e.ID, e.LASTNAME, e.SUPERIOR_ID " +
+                "from EMPLOYEE e " +
+                "connect by nocycle prior e.ID = e.SUPERIOR_ID";
+        oracleQuery().from(employee)
+            .connectByNocyclePrior(employee.id.eq(employee.superiorId))
+            .select(employee.id, employee.lastname, employee.superiorId).fetch();
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    @SkipForQuoted
+    public void sumOver() throws SQLException {
+//        SQL> select deptno,
+//        2  ename,
+//        3  sal,
+//        4  sum(sal) over (partition by deptno
+//        5  order by sal,ename) CumDeptTot,
+//        6  sum(sal) over (partition by deptno) SalByDept,
+//        7  sum(sal) over (order by deptno, sal) CumTot,
+//        8  sum(sal) over () TotSal
+//        9  from emp
+//       10  order by deptno, sal;
+        expectedQuery = "select e.LASTNAME, e.SALARY, " +
+            "sum(e.SALARY) over (partition by e.SUPERIOR_ID order by e.LASTNAME asc, e.SALARY asc), " +
+            "sum(e.SALARY) over (order by e.SUPERIOR_ID asc, e.SALARY asc), " +
+            "sum(e.SALARY) over () from EMPLOYEE e order by e.SALARY asc, e.SUPERIOR_ID asc";
+
+        oracleQuery().from(employee)
+            .orderBy(employee.salary.asc(), employee.superiorId.asc())
+            .select(
+               employee.lastname,
+               employee.salary,
+               SQLExpressions.sum(employee.salary).over().partitionBy(employee.superiorId).orderBy(employee.lastname, employee.salary),
+               SQLExpressions.sum(employee.salary).over().orderBy(employee.superiorId, employee.salary),
+               SQLExpressions.sum(employee.salary).over()).fetch();
+
+        // shorter version
+        QEmployee e = employee;
+        oracleQuery().from(e)
+            .orderBy(e.salary.asc(), e.superiorId.asc())
+            .select(e.lastname, e.salary,
+               SQLExpressions.sum(e.salary).over().partitionBy(e.superiorId).orderBy(e.lastname, e.salary),
+               SQLExpressions.sum(e.salary).over().orderBy(e.superiorId, e.salary),
+               SQLExpressions.sum(e.salary).over()).fetch();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java
new file mode 100644
index 0000000000..3d5b75ed45
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.TERADATA;
+import static com.querydsl.sql.Constants.survey;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.sql.teradata.SetQueryBandClause;
+
+public class SelectTeradataBase extends AbstractBaseTest {
+
+    protected SetQueryBandClause setQueryBand() {
+        return new SetQueryBandClause(connection, configuration);
+    }
+
+    @Test
+    @IncludeIn(TERADATA)
+    public void setQueryBand_forSession() {
+        setQueryBand().set("a", "bb").forSession().execute();
+        query().from(survey).select(survey.id).fetch();
+    }
+
+    @Test
+    @IncludeIn(TERADATA)
+    public void setQueryBand_forTransaction() {
+        setQueryBand().set("a", "bb").forTransaction().execute();
+        query().from(survey).select(survey.id).fetch();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java
new file mode 100644
index 0000000000..2f36f9e199
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java
@@ -0,0 +1,223 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.core.types.dsl.Wildcard;
+
+public class SelectWindowFunctionsBase extends AbstractBaseTest {
+
+    @Test
+    @ExcludeIn(SQLSERVER) // FIXME
+    public void windowFunctions() {
+        NumberPath<Integer> path = survey.id;
+        NumberPath<?> path2 = survey.id;
+
+        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
+        add(exprs, SQLExpressions.avg(path));
+        add(exprs, SQLExpressions.count(path));
+        add(exprs, SQLExpressions.corr(path, path2));
+        add(exprs, SQLExpressions.covarPop(path, path2), DB2);
+        add(exprs, SQLExpressions.covarSamp(path, path2), DB2);
+        add(exprs, SQLExpressions.cumeDist(), DB2, TERADATA);
+        add(exprs, SQLExpressions.denseRank(), TERADATA);
+        add(exprs, SQLExpressions.firstValue(path), TERADATA);
+        add(exprs, SQLExpressions.lag(path), TERADATA);
+        add(exprs, SQLExpressions.lastValue(path), TERADATA);
+        add(exprs, SQLExpressions.lead(path), TERADATA);
+        add(exprs, SQLExpressions.max(path));
+        add(exprs, SQLExpressions.min(path));
+        add(exprs, SQLExpressions.nthValue(path, 2), DB2, TERADATA);
+        add(exprs, SQLExpressions.ntile(3), DB2, TERADATA);
+        add(exprs, SQLExpressions.percentRank(), DB2);
+        add(exprs, SQLExpressions.rank());
+        add(exprs, SQLExpressions.rowNumber());
+        add(exprs, SQLExpressions.stddev(path), TERADATA);
+        add(exprs, SQLExpressions.stddevPop(path), DB2, TERADATA);
+        add(exprs, SQLExpressions.stddevSamp(path), DB2, TERADATA);
+        add(exprs, SQLExpressions.sum(path));
+        add(exprs, SQLExpressions.variance(path), TERADATA);
+        add(exprs, SQLExpressions.varPop(path), DB2, TERADATA);
+        add(exprs, SQLExpressions.varSamp(path), DB2, TERADATA);
+
+        for (WindowOver<?> wo : exprs) {
+            query().from(survey).select(wo.over().partitionBy(survey.name).orderBy(survey.id)).fetch();
+        }
+    }
+
+    @Test
+    public void windowFunctions_manual_paging() {
+        Expression<Long> rowNumber = SQLExpressions.rowNumber().over().orderBy(employee.lastname.asc()).as("rn");
+        Expression<Object[]> all = Wildcard.all;
+
+        // simple
+        System.out.println("#1");
+        for (Tuple row : query().from(employee).select(employee.firstname, employee.lastname, rowNumber).fetch()) {
+            System.out.println(row);
+        }
+        System.out.println();
+
+        // with subquery, generic alias
+        System.out.println("#2");
+        SQLQuery<Tuple> sub = query().from(employee).select(employee.firstname, employee.lastname, rowNumber);
+        SimplePath<Tuple> subAlias = Expressions.path(Tuple.class, "s");
+        for (Object[] row : query().from(sub.as(subAlias)).select(all).fetch()) {
+            System.out.println(Arrays.asList(row));
+        }
+        System.out.println();
+
+        // with subquery, only row number
+        System.out.println("#3");
+        SQLQuery<Long> sub2 = query().from(employee).select(rowNumber);
+        SimplePath<Long> subAlias2 = Expressions.path(Long.class, "s");
+        for (Object[] row : query().from(sub2.as(subAlias2)).select(all).fetch()) {
+            System.out.println(Arrays.asList(row));
+        }
+        System.out.println();
+
+        // with subquery, specific alias
+        System.out.println("#4");
+        SQLQuery<Tuple> sub3 = query().from(employee).select(employee.firstname, employee.lastname, rowNumber);
+        for (Tuple row : query().from(sub3.as(employee2)).select(employee2.firstname, employee2.lastname).fetch()) {
+            System.out.println(Collections.singletonList(row));
+        }
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    public void windowFunctions_keep() {
+        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
+        NumberPath<Integer> path = survey.id;
+
+        add(exprs, SQLExpressions.avg(path));
+        add(exprs, SQLExpressions.count(path));
+        add(exprs, SQLExpressions.max(path));
+        add(exprs, SQLExpressions.min(path));
+        add(exprs, SQLExpressions.stddev(path));
+        add(exprs, SQLExpressions.variance(path));
+
+        for (WindowOver<?> wo : exprs) {
+            query().from(survey).select(wo.keepFirst().orderBy(survey.id)).fetch();
+        }
+    }
+
+    @Test
+    @ExcludeIn({DB2, SQLSERVER})
+    public void windowFunctions_regr() {
+        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
+        NumberPath<Integer> path = survey.id;
+        NumberPath<?> path2 = survey.id;
+
+        add(exprs, SQLExpressions.regrSlope(path,  path2), SQLSERVER);
+        add(exprs, SQLExpressions.regrIntercept(path,  path2));
+        add(exprs, SQLExpressions.regrCount(path,  path2));
+        add(exprs, SQLExpressions.regrR2(path,  path2));
+        add(exprs, SQLExpressions.regrAvgx(path, path2));
+        add(exprs, SQLExpressions.regrSxx(path, path2));
+        add(exprs, SQLExpressions.regrSyy(path, path2));
+        add(exprs, SQLExpressions.regrSxy(path,  path2));
+
+        for (WindowOver<?> wo : exprs) {
+            query().from(survey).select(wo.over().partitionBy(survey.name).orderBy(survey.id)).fetch();
+        }
+    }
+
+    @Test
+    @IncludeIn(ORACLE)
+    public void windowFunctions_oracle() {
+        List<WindowOver<?>> exprs = new ArrayList<WindowOver<?>>();
+        NumberPath<Integer> path = survey.id;
+        add(exprs, SQLExpressions.countDistinct(path));
+        add(exprs, SQLExpressions.ratioToReport(path));
+        add(exprs, SQLExpressions.stddevDistinct(path));
+
+        for (WindowOver<?> wo : exprs) {
+            query().from(survey).select(wo.over().partitionBy(survey.name)).fetch();
+        }
+    }
+
+    @Test
+    public void windowFunctions_over() {
+        //SELECT Shipment_id,Ship_date, SUM(Qty) OVER () AS Total_Qty
+        //FROM TestDB.Shipment
+
+        query().from(employee).select(
+                employee.id,
+                SQLExpressions.sum(employee.salary).over()).fetch();
+    }
+
+    @Test
+    public void windowFunctions_partitionBy() {
+        //SELECT Shipment_id,Ship_date,Ship_Type,
+        //SUM(Qty) OVER (PARTITION BY Ship_Type ) AS Total_Qty
+        //FROM TestDB.Shipment
+
+        query().from(employee).select(
+                employee.id,
+                employee.superiorId,
+                SQLExpressions.sum(employee.salary).over()
+                    .partitionBy(employee.superiorId)).fetch();
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void windowFunctions_orderBy() {
+        //SELECT Shipment_id,Ship_date,Ship_Type,
+        //SUM(Qty) OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ) AS Total_Qty
+        //FROM TestDB.Shipment
+
+        query().from(employee).select(
+                employee.id,
+                SQLExpressions.sum(employee.salary).over()
+                    .partitionBy(employee.superiorId)
+                    .orderBy(employee.datefield)).fetch();
+    }
+
+    @Test
+    @ExcludeIn(SQLSERVER)
+    public void windowFunctions_unboundedRows() {
+        //SELECT Shipment_id,Ship_date,Ship_Type,
+        //SUM(Qty) OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt
+        //ROWS BETWEEN UNBOUNDED PRECEDING
+        //AND CURRENT ROW) AS Total_Qty
+        //FROM TestDB.Shipment
+
+        query().from(employee).select(
+                employee.id,
+                SQLExpressions.sum(employee.salary).over()
+                    .partitionBy(employee.superiorId)
+                    .orderBy(employee.datefield)
+                    .rows().between().unboundedPreceding().currentRow()).fetch();
+    }
+
+    @Test
+    @IncludeIn({TERADATA})
+    public void windowFunctions_qualify() {
+        //SELECT Shipment_id,Ship_date,Ship_Type,
+        //Rank() OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ) AS rnk
+        //FROM TestDB.Shipment
+        //QUALIFY  (Rank() OVER (PARTITION BY Ship_Type ORDER BY Ship_Dt ))  =1
+
+        teradataQuery().from(employee)
+               .qualify(SQLExpressions.rank().over()
+                       .partitionBy(employee.superiorId)
+                       .orderBy(employee.datefield).eq(1L))
+               .select(employee.id,SQLExpressions.sum(employee.salary).over()).fetch();
+
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java
new file mode 100644
index 0000000000..2b582ce317
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.*;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.sql.dml.SQLDeleteClause;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.dml.SQLUpdateClause;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class SerializationTest {
+
+    private static final QSurvey survey = QSurvey.survey;
+
+    private final Connection connection = EasyMock.createMock(Connection.class);
+
+    @Test
+    public void innerJoin() {
+        SQLQuery<?> query = new SQLQuery<Void>(connection,SQLTemplates.DEFAULT);
+        query.from(new QSurvey("s1")).innerJoin(new QSurvey("s2"));
+        assertEquals("from SURVEY s1\ninner join SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void leftJoin() {
+        SQLQuery<?> query = new SQLQuery<Void>(connection,SQLTemplates.DEFAULT);
+        query.from(new QSurvey("s1")).leftJoin(new QSurvey("s2"));
+        assertEquals("from SURVEY s1\nleft join SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void rightJoin() {
+        SQLQuery<?> query = new SQLQuery<Void>(connection,SQLTemplates.DEFAULT);
+        query.from(new QSurvey("s1")).rightJoin(new QSurvey("s2"));
+        assertEquals("from SURVEY s1\nright join SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void fullJoin() {
+        SQLQuery<?> query = new SQLQuery<Void>(connection,SQLTemplates.DEFAULT);
+        query.from(new QSurvey("s1")).fullJoin(new QSurvey("s2"));
+        assertEquals("from SURVEY s1\nfull join SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void update() {
+        SQLUpdateClause updateClause = new SQLUpdateClause(connection,SQLTemplates.DEFAULT,survey);
+        updateClause.set(survey.id, 1);
+        updateClause.set(survey.name, (String) null);
+        assertEquals("update SURVEY\nset ID = ?, NAME = ?", updateClause.toString());
+    }
+
+    @Test
+    public void update_where() {
+        SQLUpdateClause updateClause = new SQLUpdateClause(connection,SQLTemplates.DEFAULT,survey);
+        updateClause.set(survey.id, 1);
+        updateClause.set(survey.name, (String) null);
+        updateClause.where(survey.name.eq("XXX"));
+        assertEquals("update SURVEY\nset ID = ?, NAME = ?\nwhere SURVEY.NAME = ?", updateClause.toString());
+    }
+
+    @Test
+    public void insert() {
+        SQLInsertClause insertClause = new SQLInsertClause(connection,SQLTemplates.DEFAULT,survey);
+        insertClause.set(survey.id, 1);
+        insertClause.set(survey.name, (String) null);
+        assertEquals("insert into SURVEY (ID, NAME)\nvalues (?, ?)", insertClause.toString());
+    }
+
+    @Test
+    public void delete_with_subQuery_exists() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLDeleteClause delete = new SQLDeleteClause(connection, SQLTemplates.DEFAULT,survey1);
+        delete.where(survey1.name.eq("XXX"), selectOne().from(employee).where(survey1.id.eq(employee.id)).exists());
+        assertEquals("delete from SURVEY\n" +
+                     "where SURVEY.NAME = ? and exists (select 1\n" +
+                     "from EMPLOYEE e\n" +
+                     "where SURVEY.ID = e.ID)", delete.toString());
+    }
+
+    @Test
+    public void nextval() {
+        SubQueryExpression<?> sq = select(SQLExpressions.nextval("myseq")).from(QSurvey.survey);
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+        serializer.serialize(sq.getMetadata(), false);
+        assertEquals("select nextval('myseq')\nfrom SURVEY SURVEY", serializer.toString());
+    }
+
+    @Test
+    public void functionCall() {
+        RelationalFunctionCall<String> func = SQLExpressions.relationalFunctionCall(String.class, "TableValuedFunction", "parameter");
+        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
+        SubQueryExpression<?> expr = select(survey.name).from(survey)
+            .join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not());
+
+        SQLSerializer serializer = new SQLSerializer(new Configuration(new SQLServerTemplates()));
+        serializer.serialize(expr.getMetadata(), false);
+        assertEquals("select SURVEY.NAME\n" +
+                "from SURVEY SURVEY\n" +
+                "join TableValuedFunction(?) as tokFunc\n" +
+                "on not (SURVEY.NAME like tokFunc.prop escape '\\')", serializer.toString());
+
+    }
+
+    @Test
+    public void functionCall2() {
+        RelationalFunctionCall<String> func = SQLExpressions.relationalFunctionCall(String.class, "TableValuedFunction", "parameter");
+        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
+        SQLQuery<?> q = new SQLQuery<Void>(SQLServerTemplates.DEFAULT);
+        q.from(survey)
+            .join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not());
+
+        assertEquals("from SURVEY SURVEY\n" +
+                "join TableValuedFunction(?) as tokFunc\n" +
+                "on not (SURVEY.NAME like tokFunc.prop escape '\\')", q.toString());
+    }
+
+    @Test
+    public void functionCall3() {
+        RelationalFunctionCall<String> func = SQLExpressions.relationalFunctionCall(String.class, "TableValuedFunction", "parameter");
+        PathBuilder<String> funcAlias = new PathBuilder<String>(String.class, "tokFunc");
+        SQLQuery<?> q = new SQLQuery<Void>(HSQLDBTemplates.DEFAULT);
+        q.from(survey)
+            .join(func, funcAlias).on(survey.name.like(funcAlias.getString("prop")).not());
+
+        assertEquals("from SURVEY SURVEY\n" +
+                "join table(TableValuedFunction(?)) as tokFunc\n" +
+                "on not (SURVEY.NAME like tokFunc.prop escape '\\')", q.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union1() {
+        Expression<?> q = union(select(survey.all()).from(survey),
+                select(survey.all()).from(survey));
+
+        assertEquals("(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)\n" +
+            "union\n" +
+            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)", q.toString());
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union1_groupBy() {
+        Expression<?> q = union(select(survey.all()).from(survey),
+                select(survey.all()).from(survey))
+                .groupBy(survey.id);
+
+        assertEquals("(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)\n" +
+            "union\n" +
+            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)\n" +
+            "group by SURVEY.ID", q.toString());
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union2() {
+        Expression<?> q = new SQLQuery<Void>().union(survey,
+                select(survey.all()).from(survey),
+                select(survey.all()).from(survey));
+
+        assertEquals("from ((select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)\n" +
+            "union\n" +
+            "(select SURVEY.NAME, SURVEY.NAME2, SURVEY.ID\n" +
+            "from SURVEY SURVEY)) as SURVEY", q.toString());
+
+    }
+
+    @Test
+    public void with() {
+        QSurvey survey2 = new QSurvey("survey2");
+        SQLQuery<?> q = new SQLQuery<Void>();
+        q.with(survey, survey.id, survey.name).as(
+                select(survey2.id, survey2.name).from(survey2));
+
+        assertEquals("with SURVEY (ID, NAME) as (select survey2.ID, survey2.NAME\n" +
+                "from SURVEY survey2)\n\n" +
+                "from dual", q.toString());
+    }
+
+    @Test
+    public void with_complex() {
+        QSurvey s = new QSurvey("s");
+        SQLQuery<?> q = new SQLQuery<Void>();
+        q.with(s, s.id, s.name).as(
+                select(survey.id, survey.name).from(survey))
+          .select(s.id, s.name, survey.id, survey.name).from(s, survey);
+
+        assertEquals("with s (ID, NAME) as (select SURVEY.ID, SURVEY.NAME\n" +
+                "from SURVEY SURVEY)\n" +
+                "select s.ID, s.NAME, SURVEY.ID, SURVEY.NAME\n" +
+                "from s s, SURVEY SURVEY", q.toString());
+    }
+
+    @Test
+    public void with_tuple() {
+        PathBuilder<Survey> survey = new PathBuilder<Survey>(Survey.class, "SURVEY");
+        QSurvey survey2 = new QSurvey("survey2");
+        SQLQuery<?> q = new SQLQuery<Void>();
+        q.with(survey, survey.get(survey2.id), survey.get(survey2.name)).as(
+                select(survey2.id, survey2.name).from(survey2));
+
+        assertEquals("with SURVEY (ID, NAME) as (select survey2.ID, survey2.NAME\n" +
+            "from SURVEY survey2)\n\n" +
+            "from dual", q.toString());
+    }
+
+    @Test
+    public void with_tuple2() {
+        QSurvey survey2 = new QSurvey("survey2");
+        SQLQuery<?> q = new SQLQuery<Void>();
+        q.with(survey, survey.id, survey.name).as(
+                select(survey2.id, survey2.name).from(survey2));
+
+        assertEquals("with SURVEY (ID, NAME) as (select survey2.ID, survey2.NAME\n" +
+                "from SURVEY survey2)\n\n" +
+                "from dual", q.toString());
+    }
+
+    @Test
+    public void with_singleColumn() {
+        QSurvey survey2 = new QSurvey("survey2");
+        SQLQuery<?> q = new SQLQuery<Void>();
+        q.with(survey, new Path<?>[]{survey.id}).as(
+                select(survey2.id).from(survey2));
+
+        assertEquals("with SURVEY (ID) as (select survey2.ID\n" +
+            "from SURVEY survey2)\n\n" +
+            "from dual", q.toString());
+    }
+
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SimpleProjection.java b/querydsl-sql/src/test/java/com/querydsl/sql/SimpleProjection.java
similarity index 78%
rename from querydsl-sql/src/test/java/com/mysema/query/SimpleProjection.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/SimpleProjection.java
index af38f02b22..7d0a4d8201 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/SimpleProjection.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SimpleProjection.java
@@ -1,4 +1,4 @@
-package com.mysema.query;
+package com.querydsl.sql;
 
 public class SimpleProjection {
 
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SkipForQuoted.java b/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuoted.java
similarity index 90%
rename from querydsl-sql/src/test/java/com/mysema/query/SkipForQuoted.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuoted.java
index 4dc2473706..f8e1bd00a3 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/SkipForQuoted.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuoted.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query;
+package com.querydsl.sql;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java b/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java
new file mode 100644
index 0000000000..04a8b4356f
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java
@@ -0,0 +1,28 @@
+package com.querydsl.sql;
+
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+
+import com.querydsl.core.testutil.EmptyStatement;
+
+public class SkipForQuotedRule implements MethodRule {
+
+    private final Configuration configuration;
+
+    public SkipForQuotedRule(Configuration conf) {
+        this.configuration = conf;
+    }
+
+    @Override
+    public Statement apply(Statement base, FrameworkMethod method, Object target) {
+        SQLTemplates templates = configuration.getTemplates();
+        if (templates.isUseQuotes() || templates.isPrintSchema() || configuration.getUseLiterals()) {
+            boolean skip = method.getMethod().isAnnotationPresent(SkipForQuoted.class);
+            return skip ? EmptyStatement.DEFAULT : base;
+        } else {
+            return base;
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/StoredProcedures.java b/querydsl-sql/src/test/java/com/querydsl/sql/StoredProcedures.java
new file mode 100644
index 0000000000..a3e840bc34
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/StoredProcedures.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import java.sql.*;
+
+public final class StoredProcedures {
+
+    private StoredProcedures() { }
+
+    public static void main(String[] args) throws ClassNotFoundException, SQLException {
+        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        String url = "jdbc:derby:target/procedure_test;create=true";
+
+        try (Connection connection = DriverManager.getConnection(url, "", "")) {
+            DatabaseMetaData md = connection.getMetaData();
+            try (ResultSet procedures = md.getProcedures(null, null, null)) {
+                while (procedures.next()) {
+                    String cat = procedures.getString(1);
+                    String schema = procedures.getString(2);
+                    String name = procedures.getString(3);
+                    String remarks = procedures.getString(7);
+                    String type = procedures.getString(8);
+                    String specificName = procedures.getString(9);
+                    System.out.println(name + "\n" + remarks + "\n" + type + "\n" + specificName);
+
+                    try (ResultSet procedureColumns = md.getProcedureColumns(cat, schema, name, null)) {
+                        while (procedureColumns.next()) {
+                            String columnName = procedureColumns.getString(4);
+                            int columnType = procedureColumns.getInt(5);
+                            int dataType = procedureColumns.getInt(6);
+                            String typeName = procedureColumns.getString(7);
+                            short nullable = procedureColumns.getShort(12);
+                            System.out.println(" " + columnName + " " + columnType + " " + dataType + " " + typeName + " " + nullable);
+                        }
+                        System.out.println();
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java
new file mode 100644
index 0000000000..c2ba367081
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java
@@ -0,0 +1,207 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.*;
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.*;
+import com.querydsl.sql.domain.Employee;
+import com.querydsl.sql.domain.QEmployee;
+
+public class SubqueriesBase extends AbstractBaseTest {
+
+    @Test
+    @ExcludeIn({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, SQLITE, SQLSERVER})
+    public void keys() {
+        QEmployee employee2 = new QEmployee("employee2");
+        ForeignKey<Employee> nameKey1 = new ForeignKey<Employee>(employee,
+                Arrays.asList(employee.firstname, employee.lastname),
+                Arrays.asList("a", "b"));
+        ForeignKey<Employee> nameKey2 = new ForeignKey<Employee>(employee,
+                Arrays.asList(employee.firstname, employee.lastname),
+                Arrays.asList("a", "b"));
+
+        query().from(employee)
+        .where(nameKey1.in(query().from(employee2).select(nameKey2.getProjection())))
+            .select(employee.id).fetch();
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, DERBY, FIREBIRD, H2, HSQLDB, SQLITE, SQLSERVER})
+    public void list_in_query() {
+        QEmployee employee2 = new QEmployee("employee2");
+        query().from(employee)
+            .where(Expressions.list(employee.id, employee.lastname)
+                .in(query().from(employee2).select(employee2.id, employee2.lastname)))
+            .select(employee.id).fetch();
+    }
+
+    @Test
+    @SkipForQuoted
+    @ExcludeIn(DB2) // ID is reserved IN DB2
+    public void subQueries() throws SQLException {
+        // subquery in where block
+        expectedQuery = "select e.ID from EMPLOYEE e "
+            + "where e.ID = (select max(e.ID) "
+            + "from EMPLOYEE e)";
+        List<Integer> list = query().from(employee)
+        .where(employee.id.eq(query().from(employee).select(employee.id.max())))
+        .select(employee.id).fetch();
+        assertFalse(list.isEmpty());
+    }
+
+    @Test
+    public void subQuery_alias() {
+        query().from(query().from(employee).select(employee.all()).as(employee2)).select(employee2.all()).fetch();
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void subQuery_all() {
+        query().from(employee).where(employee.id.gtAll(
+                query().from(employee2).select(employee2.id))).fetchCount();
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void subQuery_any() {
+        query().from(employee).where(employee.id.gtAny(
+                query().from(employee2).select(employee2.id))).fetchCount();
+    }
+
+    @Test
+    public void subQuery_innerJoin() {
+        SubQueryExpression<Integer> sq = query().from(employee2).select(employee2.id);
+        QEmployee sqEmp = new QEmployee("sq");
+        query().from(employee).innerJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).select(employee.id).fetch();
+
+    }
+
+    @Test
+    public void subQuery_leftJoin() {
+        SubQueryExpression<Integer> sq = query().from(employee2).select(employee2.id);
+        QEmployee sqEmp = new QEmployee("sq");
+        query().from(employee).leftJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).select(employee.id).fetch();
+
+    }
+
+    @Test
+    @ExcludeIn({MYSQL, POSTGRESQL, DERBY, SQLSERVER, TERADATA})
+    public void subQuery_params() {
+        Param<String> aParam = new Param<String>(String.class, "param");
+        SQLQuery<?> subQuery = select(Wildcard.all).from(employee).where(employee.firstname.eq(aParam));
+        subQuery.set(aParam, "Mike");
+
+        assertEquals(1, query().from(subQuery).fetchCount());
+    }
+
+    @Test
+    @ExcludeIn(SQLITE)
+    public void subQuery_rightJoin() {
+        SubQueryExpression<Integer> sq = query().from(employee2).select(employee2.id);
+        QEmployee sqEmp = new QEmployee("sq");
+        query().from(employee).rightJoin(sq, sqEmp).on(sqEmp.id.eq(employee.id)).select(employee.id).fetch();
+    }
+
+    @Test
+    public void subQuery_with_alias() {
+        List<Integer> ids1 = query().from(employee).select(employee.id).fetch();
+        List<Integer> ids2 = query().from(query().from(employee).select(employee.id), employee).select(employee.id).fetch();
+        assertEquals(ids1, ids2);
+    }
+
+    @Test
+    public void subQuery_with_alias2() {
+        List<Integer> ids1 = query().from(employee).select(employee.id).fetch();
+        List<Integer> ids2 = query().from(query().from(employee).select(employee.id).as(employee)).select(employee.id).fetch();
+        assertEquals(ids1, ids2);
+    }
+
+    @Test
+    @SkipForQuoted
+    public void subQuerySerialization() {
+        SQLQuery<?> query = query();
+        query.from(survey);
+        assertEquals("from SURVEY s", query.toString());
+
+        query.from(survey2);
+        assertEquals("from SURVEY s, SURVEY s2", query.toString());
+    }
+
+    @Test
+    public void subQuerySerialization2() {
+        NumberPath<BigDecimal> sal = Expressions.numberPath(BigDecimal.class, "sal");
+        PathBuilder<Object[]> sq = new PathBuilder<Object[]>(Object[].class, "sq");
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+
+        serializer.handle(
+                query()
+                .from(employee)
+                .select(employee.salary.add(employee.salary).add(employee.salary).as(sal))
+                .as(sq));
+        assertEquals(
+                "(select (e.SALARY + e.SALARY + e.SALARY) as sal\nfrom EMPLOYEE e) as sq",
+                serializer.toString());
+    }
+
+    @Test
+    public void scalarSubQueryInClause() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+
+        serializer.handle(
+            this.query()
+                .from(employee)
+                .where(
+                    SQLExpressions
+                        .select(employee.firstname)
+                        .from(employee)
+                        .orderBy(employee.salary.asc())
+                        .limit(1)
+                        .in(Arrays.asList("Mike", "Mary"))
+                ));
+
+        expectedQuery = "(\nfrom EMPLOYEE e\n"
+            + "where (select e.FIRSTNAME\n"
+            + "from EMPLOYEE e\n"
+            + "order by e.SALARY asc\n"
+            + "limit ?) in (?, ?))";
+
+        assertEquals(expectedQuery, serializer.toString());
+    }
+
+    @Test
+    public void scalarSubQueryInClause2() {
+        SQLSerializer serializer = new SQLSerializer(Configuration.DEFAULT);
+
+        serializer.handle(
+            this.query()
+                .from(employee)
+                .where(
+                    SQLExpressions
+                        .select(employee.firstname)
+                        .from(employee)
+                        .orderBy(employee.salary.asc())
+                        .limit(1)
+                        .in("Mike", "Mary")
+                ));
+
+        expectedQuery = "(\nfrom EMPLOYEE e\n"
+            + "where (select e.FIRSTNAME\n"
+            + "from EMPLOYEE e\n"
+            + "order by e.SALARY asc\n"
+            + "limit ?) in (?, ?))";
+
+        assertEquals(expectedQuery, serializer.toString());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/Survey.java b/querydsl-sql/src/test/java/com/querydsl/sql/Survey.java
new file mode 100644
index 0000000000..4686e14c9a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/Survey.java
@@ -0,0 +1,16 @@
+package com.querydsl.sql;
+
+public class Survey {
+
+    @Column("NAME")
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java b/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java
new file mode 100644
index 0000000000..f0098fb548
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java
@@ -0,0 +1,37 @@
+package com.querydsl.sql;
+
+import java.util.Arrays;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import com.querydsl.core.Target;
+import com.querydsl.core.testutil.EmptyStatement;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+
+public class TargetRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        Target target = Connections.getTarget();
+        boolean run = target == null || isExecuted(description, target);
+        return run ? base : EmptyStatement.DEFAULT;
+    }
+
+    private boolean isExecuted(Description description, Target target) {
+        ExcludeIn ex = description.getAnnotation(ExcludeIn.class);
+        // excluded in given targets
+        if (ex != null && Arrays.asList(ex.value()).contains(target)) {
+            return false;
+        }
+        // included only in given targets
+        IncludeIn in = description.getAnnotation(IncludeIn.class);
+        if (in != null && !Arrays.asList(in.value()).contains(target)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java
new file mode 100644
index 0000000000..e930df5849
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.DateExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringExpression;
+
+public class TemplateTest {
+
+    @Test
+    public void toDate() {
+        StringExpression str = Expressions.stringPath("str");
+        assertEquals("to_date(str,'DD-MON-YYYY')", to_date(str, "DD-MON-YYYY").toString());
+    }
+
+    @Test
+    public void toChar() {
+        DateExpression<Date> date = Expressions.datePath(Date.class,"date");
+        assertEquals("to_char(date,'DD-MON-YYYY')", to_char(date, "DD-MON-YYYY").toString());
+    }
+
+    private DateExpression<Date> to_date(Expression<String> expr, String pattern) {
+        return Expressions.dateTemplate(Date.class, "to_date({0},'{1s}')", expr, ConstantImpl.create(pattern));
+    }
+
+    private StringExpression to_char(Expression<?> expr, String pattern) {
+        return Expressions.stringTemplate("to_char({0},'{1s}')", expr, ConstantImpl.create(pattern));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java
new file mode 100644
index 0000000000..be92198f27
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import org.junit.Test;
+
+import com.querydsl.core.TemplatesTestBase;
+
+public class TemplatesTest extends TemplatesTestBase {
+
+    @Test
+    public void test() {
+        new DerbyTemplates();
+        new H2Templates();
+        new HSQLDBTemplates();
+        new MySQLTemplates();
+        new OracleTemplates();
+        new PostgreSQLTemplates();
+        new SQLTemplates("\"",'\\',false);
+        new SQLServerTemplates();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java
new file mode 100644
index 0000000000..c8ef55ec78
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java
@@ -0,0 +1,76 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Ops;
+
+public class TeradataTemplatesTest extends AbstractSQLTemplatesTest {
+
+    @Override
+    protected SQLTemplates createTemplates() {
+        return new TeradataTemplates();
+    }
+
+    @Test
+    public void limit() {
+        query.from(survey1).limit(5);
+        assertEquals("from SURVEY survey1 " +
+            "qualify row_number() over (order by 1) <= ?", query.toString());
+    }
+
+    @Test
+    public void offset() {
+        query.from(survey1).offset(5);
+        assertEquals("from SURVEY survey1 " +
+            "qualify row_number() over (order by 1) > ?", query.toString());
+    }
+
+    @Test
+    public void limit_offset() {
+        query.from(survey1).limit(5).offset(10);
+        assertEquals("from SURVEY survey1 " +
+            "qualify row_number() over (order by 1) between ? and ?", query.toString());
+    }
+
+    @Test
+    public void orderBy_limit() {
+        query.from(survey1).orderBy(survey1.name.asc()).limit(5);
+        assertEquals("from SURVEY survey1 " +
+            "order by survey1.NAME asc " +
+            "qualify row_number() over (order by survey1.NAME asc) <= ?", query.toString());
+    }
+
+    @Test
+    public void precedence() {
+        // +, - (unary)
+        int p1 = getPrecedence(Ops.NEGATE);
+        // ** (exponentation)
+        // * / MOD
+        int p2 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+        // +, - (binary)
+        int p3 = getPrecedence(Ops.ADD, Ops.SUB);
+        // concat
+        int p4 = getPrecedence(Ops.CONCAT);
+        // EQ, NE, GT, LE, LT, GE, IN, NOT IN, BEWEEN, LIKE
+        int p5 = getPrecedence(Ops.EQ, Ops.NE, Ops.GT, Ops.LT, Ops.GOE, Ops.LOE, Ops.IN, Ops.NOT_IN,
+                Ops.BETWEEN, Ops.LIKE, Ops.LIKE_ESCAPE);
+        // NOT
+        int p6 = getPrecedence(Ops.NOT);
+        // AND
+        int p7 = getPrecedence(Ops.AND);
+        // OR
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TestLoggingListener.java b/querydsl-sql/src/test/java/com/querydsl/sql/TestLoggingListener.java
new file mode 100644
index 0000000000..c462f8a10a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TestLoggingListener.java
@@ -0,0 +1,160 @@
+package com.querydsl.sql;
+
+import static java.lang.String.format;
+
+import java.util.List;
+import java.util.Map;
+
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.sql.dml.SQLInsertBatch;
+import com.querydsl.sql.dml.SQLMergeBatch;
+import com.querydsl.sql.dml.SQLUpdateBatch;
+
+/**
+ */
+public class TestLoggingListener implements SQLDetailedListener {
+    private static boolean enabled = false;
+
+    /**
+     * Called to enable logging in tests
+     */
+    public static void enable() {
+        enabled = true;
+    }
+
+    /**
+     * Called to disable logging in tests
+     */
+    public static void disable() {
+        enabled = false;
+    }
+
+    @Override
+    public void start(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\n\tstart %s", context));
+        }
+    }
+
+    @Override
+    public void preRender(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\tpreRender %s", context));
+        }
+    }
+
+    @Override
+    public void rendered(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\t\trendered %s", context));
+        }
+    }
+
+    @Override
+    public void prePrepare(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\tprePrepare %s", context));
+        }
+    }
+
+    @Override
+    public void prepared(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\t\tprepared %s", context));
+        }
+    }
+
+    @Override
+    public void preExecute(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\tpreExecute %s", context));
+        }
+    }
+
+    @Override
+    public void executed(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\t\texecuted %s", context));
+        }
+    }
+
+    @Override
+    public void exception(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\t\texception %s", context));
+        }
+    }
+
+    @Override
+    public void end(SQLListenerContext context) {
+        if (enabled) {
+            System.out.println(format("\tend %s\n\n", context));
+        }
+    }
+
+    @Override
+    public void notifyQuery(QueryMetadata md) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyQuery %s", md));
+        }
+    }
+
+    @Override
+    public void notifyDelete(RelationalPath<?> entity, QueryMetadata md) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyDelete %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyDeletes(RelationalPath<?> entity, List<QueryMetadata> batches) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyDeletes %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyMerge(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> keys, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyMerge %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyMerges(RelationalPath<?> entity, QueryMetadata md, List<SQLMergeBatch> batches) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyMerges %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyInsert(RelationalPath<?> entity, QueryMetadata md, List<Path<?>> columns, List<Expression<?>> values, SubQueryExpression<?> subQuery) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyInsert %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyInserts(RelationalPath<?> entity, QueryMetadata md, List<SQLInsertBatch> batches) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyInserts %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyUpdate(RelationalPath<?> entity, QueryMetadata md, Map<Path<?>, Expression<?>> updates) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyUpdate %s", entity));
+        }
+    }
+
+    @Override
+    public void notifyUpdates(RelationalPath<?> entity, List<SQLUpdateBatch> batches) {
+        if (enabled) {
+            System.out.println(format("\t\t\tnotifyUpdates %s", entity));
+        }
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java
new file mode 100644
index 0000000000..39c3cf525d
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java
@@ -0,0 +1,97 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.sql.ddl.CreateTableClause;
+import com.querydsl.sql.ddl.DropTableClause;
+
+public class TypesBase extends AbstractBaseTest {
+
+    @Test
+    public void create_tables() {
+        Map<Class<?>, Object> instances = new LinkedHashMap<>();
+        instances.put(BigInteger.class, BigInteger.valueOf(1));
+        instances.put(Long.class, 1L);
+        instances.put(Integer.class, 1);
+        instances.put(Short.class, (short) 1);
+        instances.put(Byte.class, (byte) 1);
+        instances.put(BigDecimal.class, BigDecimal.valueOf(1.0));
+        instances.put(Double.class, 1.0);
+        instances.put(Float.class, 1.0f);
+        instances.put(Boolean.class, Boolean.TRUE);
+        instances.put(Character.class, 'a');
+        instances.put(String.class, "ABC");
+
+        for (Map.Entry<Class<?>, Object> entry : instances.entrySet()) {
+            String tableName = "test_" + entry.getKey().getSimpleName();
+            new DropTableClause(connection, configuration, tableName).execute();
+            CreateTableClause c = new CreateTableClause(connection, configuration, tableName)
+                    .column("col", entry.getKey());
+            if (entry.getKey().equals(String.class)) {
+                c.size(256);
+            }
+            c.execute();
+            RelationalPath<Object> entityPath = new RelationalPathBase<Object>(Object.class, tableName, "PUBLIC", tableName);
+            Path<?> columnPath = Expressions.path(entry.getKey(), entityPath, "col");
+            insert(entityPath).set((Path) columnPath, entry.getValue()).execute();
+            new DropTableClause(connection, configuration, tableName).execute();
+        }
+
+    }
+
+    @Test
+    @ExcludeIn({CUBRID, POSTGRESQL, TERADATA})
+    public void dump_types() throws SQLException {
+        Connection conn = Connections.getConnection();
+        DatabaseMetaData md = conn.getMetaData();
+
+        // types
+        try (ResultSet rs = md.getUDTs(null, null, null, null)) {
+            while (rs.next()) {
+                // cat, schema, name, classname, datatype, remarks, base_type
+                String cat = rs.getString(1);
+                String schema = rs.getString(2);
+                String name = rs.getString(3);
+                String classname = rs.getString(4);
+                String datatype = rs.getString(5);
+                String remarks = rs.getString(6);
+                String baseType = rs.getString(7);
+                System.out.println(name + " " + classname + " " + datatype + " " +
+                        remarks + " " + baseType);
+
+                // attributes
+                try (ResultSet rs2 = md.getAttributes(cat, schema, name, null)) {
+                    while (rs2.next()) {
+                        // cat, schema, name, attr_name, data_type, attr_type_name, attr_size
+                        // decimal_digits, num_prec_radix, nullable, remarks, attr_def, sql_data_type, ordinal_position
+                        // ...
+                        String cat2 = rs2.getString(1);
+                        String schema2 = rs2.getString(2);
+                        String name2 = rs2.getString(3);
+                        String attrName2 = rs2.getString(4);
+                        String dataType2 = rs2.getString(5);
+                        String attrTypeName2 = rs2.getString(6);
+                        String attrSize2 = rs2.getString(7);
+
+                        System.out.println(" " + attrName2 + " " + dataType2 + " " + attrTypeName2 + " " + attrSize2);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/TypesDump.java b/querydsl-sql/src/test/java/com/querydsl/sql/TypesDump.java
new file mode 100644
index 0000000000..e44442c31f
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/TypesDump.java
@@ -0,0 +1,47 @@
+package com.querydsl.sql;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class TypesDump {
+
+    private TypesDump() { }
+
+    public static void main(String[] args) throws Exception {
+        Map<Integer, String> typeConstants = new HashMap<>();
+        for (Field field : java.sql.Types.class.getDeclaredFields()) {
+            if (field.getType().equals(Integer.TYPE)) {
+                typeConstants.put(field.getInt(null), field.getName());
+            }
+        }
+
+        Connections.initOracle();
+        try {
+            Connection c = Connections.getConnection();
+            DatabaseMetaData m = c.getMetaData();
+            System.out.println(m.getDatabaseProductName());
+            try (ResultSet rs = m.getTypeInfo()) {
+                while (rs.next()) {
+                    String name = rs.getString("TYPE_NAME");
+                    int jdbcType = rs.getInt("DATA_TYPE");
+                    String jdbcTypeField = typeConstants.get(jdbcType);
+                    if (jdbcTypeField == null || !jdbcTypeField.equalsIgnoreCase(name)) {
+                        String prefix = rs.getString("LITERAL_PREFIX");
+                        String suffix = rs.getString("LITERAL_SUFFIX");
+                        String jdbcTypeStr = jdbcTypeField != null ? ("Types." + jdbcTypeField) : String.valueOf(jdbcType);
+                        System.out.println("addTypeNameToCode(\"" + name.toLowerCase() + "\", " + jdbcTypeStr + ");");
+                        //System.out.println(rs.getInt("PRECISION"));
+                    }
+                }
+            }
+        } finally {
+            Connections.close();
+        }
+
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java
new file mode 100644
index 0000000000..3102057795
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java
@@ -0,0 +1,268 @@
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.employee;
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.querydsl.core.Tuple;
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.SubQueryExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.domain.Employee;
+import com.querydsl.sql.domain.QEmployee;
+
+public class UnionBase extends AbstractBaseTest {
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({MYSQL, TERADATA})
+    public void in_union() {
+        assertNotNull(query().from(employee)
+                .where(employee.id.in(
+                        query().union(query().select(Expressions.ONE),
+                                query().select(Expressions.TWO))))
+                .select(Expressions.ONE).fetchFirst());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    @ExcludeIn(FIREBIRD) // order is not properly supported
+    public void union() throws SQLException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max().as("ID"));
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.min().as("ID"));
+        assertEquals(
+                Arrays.asList(query().select(employee.id.min()).from(employee).fetchFirst(),
+                        query().select(employee.id.max()).from(employee).fetchFirst()),
+                query().union(sq1, sq2).orderBy(employee.id.asc()).fetch());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union_list() throws SQLException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max());
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.min());
+        assertEquals(
+                query().union(sq1, sq2).fetch(),
+                query().union(sq1, sq2).list());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union_all() {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max());
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.min());
+        List<Integer> list = query().unionAll(sq1, sq2).fetch();
+        assertFalse(list.isEmpty());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union_multiple_columns() throws SQLException {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.firstname, employee.lastname);
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.lastname, employee.firstname);
+        List<Tuple> list = query().union(sq1, sq2).fetch();
+        assertFalse(list.isEmpty());
+        for (Tuple row : list) {
+            assertNotNull(row.get(0, Object.class));
+            assertNotNull(row.get(1, Object.class));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn(DERBY)
+    public void union_multiple_columns2() throws SQLException {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.firstname, employee.lastname);
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.firstname, employee.lastname);
+        SQLQuery<?> query = query();
+        query.union(sq1, sq2);
+        List<String> list = query.select(employee.firstname).fetch();
+        assertFalse(list.isEmpty());
+        for (String row : list) {
+            assertNotNull(row);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn(DERBY)
+    public void union_multiple_columns3() throws SQLException {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.firstname, employee.lastname);
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.firstname, employee.lastname);
+        SQLQuery<?> query = query();
+        query.union(sq1, sq2);
+        List<Tuple> list = query.select(employee.lastname, employee.firstname).fetch();
+        assertFalse(list.isEmpty());
+        for (Tuple row : list) {
+            System.out.println(row.get(0, String.class) + " " + row.get(1, String.class));
+        }
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union_empty_result() throws SQLException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).where(employee.firstname.eq("XXX")).select(employee.id);
+        SubQueryExpression<Integer> sq2 = query().from(employee).where(employee.firstname.eq("YYY")).select(employee.id);
+        List<Integer> list = query().union(sq1, sq2).fetch();
+        assertTrue(list.isEmpty());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union2() throws SQLException {
+        List<Integer> list = query().union(
+                query().from(employee).select(employee.id.max()),
+                query().from(employee).select(employee.id.min())).fetch();
+        assertFalse(list.isEmpty());
+
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void union3() throws SQLException {
+        SubQueryExpression<Tuple> sq3 = query().from(employee).select(new Expression[]{employee.id.max()});
+        SubQueryExpression<Tuple> sq4 = query().from(employee).select(new Expression[]{employee.id.min()});
+        List<Tuple> list2 = query().union(sq3, sq4).fetch();
+        assertFalse(list2.isEmpty());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({DERBY})
+    public void union4() {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.id, employee.firstname);
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.id, employee.firstname);
+        assertEquals(1, query().union(employee, sq1, sq2).select(employee.id.count()).fetch().size());
+    }
+
+    // FIXME for CUBRID
+    // Teradata: The ORDER BY clause must contain only integer constants.
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({DERBY, CUBRID, FIREBIRD, TERADATA})
+    @Ignore // FIXME
+    public void union5() {
+        /* (select e.ID, e.FIRSTNAME, superior.ID as sup_id, superior.FIRSTNAME as sup_name
+         * from EMPLOYEE e join EMPLOYEE superior on e.SUPERIOR_ID = superior.ID)
+         * union
+         * (select e.ID, e.FIRSTNAME, null, null from EMPLOYEE e)
+         * order by ID asc
+         */
+        QEmployee superior = new QEmployee("superior");
+        SubQueryExpression<Tuple> sq1 = query().from(employee)
+                .join(employee.superiorIdKey, superior)
+                .select(employee.id, employee.firstname, superior.id.as("sup_id"), superior.firstname.as("sup_name"));
+        SubQueryExpression<Tuple> sq2 = query().from(employee)
+                .select(employee.id, employee.firstname, null, null);
+        List<Tuple> results = query().union(sq1, sq2).orderBy(employee.id.asc()).fetch();
+        for (Tuple result : results) {
+            System.err.println(Collections.singletonList(result));
+        }
+    }
+
+    @Test
+    @ExcludeIn({FIREBIRD, TERADATA}) // The ORDER BY clause must contain only integer constants.
+    @SuppressWarnings("unchecked")
+    public void union_with_order() throws SQLException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id);
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id);
+        List<Integer> list = query().union(sq1, sq2).orderBy(employee.id.asc()).fetch();
+        assertFalse(list.isEmpty());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn(FIREBIRD)
+    public void union_multi_column_projection_list() throws IOException {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.id.max(), employee.id.max().subtract(1));
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.id.min(), employee.id.min().subtract(1));
+
+        List<Tuple> list = query().union(sq1, sq2).list();
+        assertEquals(2, list.size());
+        assertTrue(list.get(0) != null);
+        assertTrue(list.get(1) != null);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn(FIREBIRD)
+    public void union_multi_column_projection_iterate() throws IOException {
+        SubQueryExpression<Tuple> sq1 = query().from(employee).select(employee.id.max(), employee.id.max().subtract(1));
+        SubQueryExpression<Tuple> sq2 = query().from(employee).select(employee.id.min(), employee.id.min().subtract(1));
+
+        try (CloseableIterator<Tuple> iterator = query().union(sq1, sq2).iterate()) {
+            assertTrue(iterator.hasNext());
+            assertTrue(iterator.next() != null);
+            assertTrue(iterator.next() != null);
+            assertFalse(iterator.hasNext());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union_single_column_projections_list() throws IOException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max());
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.min());
+
+        List<Integer> list = query().union(sq1, sq2).list();
+        assertEquals(2, list.size());
+        assertTrue(list.get(0) != null);
+        assertTrue(list.get(1) != null);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union_single_column_projections_iterate() throws IOException {
+        SubQueryExpression<Integer> sq1 = query().from(employee).select(employee.id.max());
+        SubQueryExpression<Integer> sq2 = query().from(employee).select(employee.id.min());
+
+        try (CloseableIterator<Integer> iterator = query().union(sq1, sq2).iterate()) {
+            assertTrue(iterator.hasNext());
+            assertTrue(iterator.next() != null);
+            assertTrue(iterator.next() != null);
+            assertFalse(iterator.hasNext());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union_factoryExpression() {
+        SubQueryExpression<Employee> sq1 = query().from(employee)
+                .select(Projections.constructor(Employee.class, employee.id));
+        SubQueryExpression<Employee> sq2 = query().from(employee)
+                .select(Projections.constructor(Employee.class, employee.id));
+        List<Employee> employees = query().union(sq1, sq2).list();
+        for (Employee employee : employees) {
+            assertNotNull(employee);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    @ExcludeIn({DERBY, CUBRID})
+    public void union_clone() {
+        NumberPath<Integer> idAlias = Expressions.numberPath(Integer.class, "id");
+        SubQueryExpression<Employee> sq1 = query().from(employee)
+                .select(Projections.constructor(Employee.class, employee.id.as(idAlias)));
+        SubQueryExpression<Employee> sq2 = query().from(employee)
+                .select(Projections.constructor(Employee.class, employee.id.as(idAlias)));
+
+        SQLQuery<?> query = query();
+        query.union(sq1, sq2);
+        assertEquals(10, query.clone().select(idAlias).fetch().size());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java
new file mode 100644
index 0000000000..dc4a4f7d50
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.sql.SQLExpressions.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.SimpleExpression;
+import com.querydsl.core.types.dsl.SimplePath;
+
+public class UnionSubQueryTest {
+
+    private static final SimpleExpression<Integer> one = Expressions.numberTemplate(Integer.class, "1");
+
+    private static final SimpleExpression<Integer> two = Expressions.numberTemplate(Integer.class, "2");
+
+    private static final SimpleExpression<Integer> three = Expressions.numberTemplate(Integer.class,"3");
+
+    private SQLTemplates templates = H2Templates.builder().newLineToSingleSpace().build();
+
+    private SQLSerializer serializer = new SQLSerializer(new Configuration(templates));
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void in_union() {
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        Expression<?> expr = intPath.in(union(
+                select(one),
+                select(two)));
+
+        serializer.handle(expr);
+        assertEquals(
+            "intPath in ((select 1 from dual)\n" +
+            "union\n" +
+            "(select 2 from dual))", serializer.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void union_subQuery() {
+        SimplePath<Integer> col1 = Expressions.path(Integer.class, "col1");
+        Expression<?> union = union(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+
+        serializer.handle(union);
+        assertEquals(
+                "(select 1 as col1 from dual)\n" +
+                "union\n" +
+                "(select 2 from dual)\n" +
+                "union\n" +
+                "(select 3 from dual)", serializer.toString());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void unionAll_subQuery() {
+        SimplePath<Integer> col1 = Expressions.path(Integer.class,"col1");
+        Expression<?> union = unionAll(
+                select(one.as(col1)),
+                select(two),
+                select(three));
+
+        serializer.handle(union);
+        assertEquals(
+                "(select 1 as col1 from dual)\n" +
+                "union all\n" +
+                "(select 2 from dual)\n" +
+                "union all\n" +
+                "(select 3 from dual)", serializer.toString());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java b/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java
new file mode 100644
index 0000000000..f0e883697e
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql;
+
+import static com.querydsl.core.Target.*;
+import static com.querydsl.sql.Constants.survey;
+import static com.querydsl.sql.SQLExpressions.selectOne;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.testutil.ExcludeIn;
+import com.querydsl.core.testutil.IncludeIn;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.Param;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.dml.SQLUpdateClause;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class UpdateBase extends AbstractBaseTest {
+
+    protected void reset() throws SQLException {
+        delete(survey).execute();
+        insert(survey).values(1, "Hello World", "Hello").execute();
+    }
+
+    @Before
+    public void setUp() throws SQLException {
+        reset();
+    }
+
+    @After
+    public void tearDown() throws SQLException {
+        reset();
+    }
+
+    @Test
+    public void update() throws SQLException {
+        // original state
+        long count = query().from(survey).fetchCount();
+        assertEquals(0, query().from(survey).where(survey.name.eq("S")).fetchCount());
+
+        // update call with 0 update count
+        assertEquals(0, update(survey).where(survey.name.eq("XXX")).set(survey.name, "S").execute());
+        assertEquals(0, query().from(survey).where(survey.name.eq("S")).fetchCount());
+
+        // update call with full update count
+        assertEquals(count, update(survey).set(survey.name, "S").execute());
+        assertEquals(count, query().from(survey).where(survey.name.eq("S")).fetchCount());
+    }
+
+    @Test
+    @IncludeIn({CUBRID, H2, MYSQL, ORACLE, SQLSERVER})
+    public void update_limit() {
+        assertEquals(1, insert(survey).values(2, "A","B").execute());
+        assertEquals(1, insert(survey).values(3, "B","C").execute());
+
+        assertEquals(2, update(survey).set(survey.name, "S").limit(2).execute());
+    }
+
+    @Test
+    public void update2() throws SQLException {
+        List<Path<?>> paths = Collections.<Path<?>>singletonList(survey.name);
+        List<?> values = Collections.singletonList("S");
+
+        // original state
+        long count = query().from(survey).fetchCount();
+        assertEquals(0, query().from(survey).where(survey.name.eq("S")).fetchCount());
+
+        // update call with 0 update count
+        assertEquals(0, update(survey).where(survey.name.eq("XXX")).set(paths, values).execute());
+        assertEquals(0, query().from(survey).where(survey.name.eq("S")).fetchCount());
+
+        // update call with full update count
+        assertEquals(count, update(survey).set(paths, values).execute());
+        assertEquals(count, query().from(survey).where(survey.name.eq("S")).fetchCount());
+
+    }
+
+    @Test
+    public void update3() {
+        assertEquals(1, update(survey).set(survey.name, survey.name.append("X")).execute());
+    }
+
+    @Test
+    public void update4() {
+        assertEquals(1, insert(survey).values(2, "A","B").execute());
+        assertEquals(1, update(survey).set(survey.name, "AA").where(survey.name.eq("A")).execute());
+    }
+
+    @Test
+    public void update5() {
+        assertEquals(1, insert(survey).values(3, "B","C").execute());
+        assertEquals(1, update(survey).set(survey.name, "BB").where(survey.name.eq("B")).execute());
+    }
+
+    @Test
+    public void setNull() {
+        List<Path<?>> paths = Collections.<Path<?>>singletonList(survey.name);
+        List<?> values = Collections.singletonList(null);
+        long count = query().from(survey).fetchCount();
+        assertEquals(count, update(survey).set(paths, values).execute());
+    }
+
+    @Test
+    public void setNull2() {
+        long count = query().from(survey).fetchCount();
+        assertEquals(count, update(survey).set(survey.name, (String) null).execute());
+    }
+
+    @Test
+    @SkipForQuoted
+    @ExcludeIn({DB2, DERBY})
+    public void setNullEmptyRootPath() {
+        StringPath name = Expressions.stringPath("name");
+        long count = query().from(survey).fetchCount();
+        assertEquals(count, execute(update(survey).setNull(name)));
+    }
+
+    @Test
+    public void batch() throws SQLException {
+        assertEquals(1, insert(survey).values(2, "A","B").execute());
+        assertEquals(1, insert(survey).values(3, "B","C").execute());
+
+        SQLUpdateClause update = update(survey);
+        update.set(survey.name, "AA").where(survey.name.eq("A")).addBatch();
+        assertEquals(1, update.getBatchCount());
+        update.set(survey.name, "BB").where(survey.name.eq("B")).addBatch();
+        assertEquals(2, update.getBatchCount());
+        assertEquals(2, update.execute());
+    }
+
+    @Test
+    public void batch_templates() throws SQLException {
+        assertEquals(1, insert(survey).values(2, "A","B").execute());
+        assertEquals(1, insert(survey).values(3, "B","C").execute());
+
+        SQLUpdateClause update = update(survey);
+        update.set(survey.name, "AA").where(survey.name.eq(Expressions.stringTemplate("'A'"))).addBatch();
+        update.set(survey.name, "BB").where(survey.name.eq(Expressions.stringTemplate("'B'"))).addBatch();
+        assertEquals(2, update.execute());
+    }
+
+    @Test
+    public void update_with_subQuery_exists() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLUpdateClause update = update(survey1);
+        update.set(survey1.name, "AA");
+        update.where(selectOne().from(employee).where(survey1.id.eq(employee.id)).exists());
+        assertEquals(1, update.execute());
+    }
+
+    @Test
+    public void update_with_subQuery_exists_Params() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+
+        Param<Integer> param = new Param<Integer>(Integer.class, "param");
+        SQLQuery<?> sq = query().from(employee).where(employee.id.eq(param));
+        sq.set(param, -12478923);
+
+        SQLUpdateClause update = update(survey1);
+        update.set(survey1.name, "AA");
+        update.where(sq.exists());
+        assertEquals(0, update.execute());
+    }
+
+    @Test
+    public void update_with_subQuery_exists2() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLUpdateClause update = update(survey1);
+        update.set(survey1.name, "AA");
+        update.where(selectOne().from(employee).where(survey1.name.eq(employee.lastname)).exists());
+        assertEquals(0, update.execute());
+    }
+
+    @Test
+    public void update_with_subQuery_notExists() {
+        QSurvey survey1 = new QSurvey("s1");
+        QEmployee employee = new QEmployee("e");
+        SQLUpdateClause update = update(survey1);
+        update.set(survey1.name, "AA");
+        update.where(query().from(employee).where(survey1.id.eq(employee.id)).notExists());
+        assertEquals(0, update.execute());
+    }
+
+    @Test
+    @ExcludeIn(TERADATA)
+    public void update_with_templateExpression_in_batch() {
+        assertEquals(1, update(survey)
+            .set(survey.id, 3)
+            .set(survey.name, Expressions.stringTemplate("'Hello'"))
+            .addBatch()
+            .execute());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java
new file mode 100644
index 0000000000..7ed52053d6
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java
@@ -0,0 +1,155 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class WindowFunctionTest {
+
+    private static String toString(Expression<?> e) {
+        return new SQLSerializer(Configuration.DEFAULT).handle(e).toString();
+    }
+
+    @Test
+    public void complex() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        Expression<?> wf = SQLExpressions.sum(path).over().partitionBy(path2).orderBy(path);
+        assertEquals("sum(path) over (partition by path2 order by path asc)", toString(wf));
+    }
+
+    @Test
+    public void complex_nullsFirst() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        Expression<?> wf = SQLExpressions.sum(path).over().partitionBy(path2).orderBy(path.desc().nullsFirst());
+        assertEquals("sum(path) over (partition by path2 order by path desc nulls first)", toString(wf));
+    }
+
+    @Test
+    public void all() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        assertEquals("avg(path)", toString(SQLExpressions.avg(path)));
+        assertEquals("count(path)", toString(SQLExpressions.count(path)));
+        assertEquals("corr(path,path2)", toString(SQLExpressions.corr(path, path2)));
+        assertEquals("covar_pop(path,path2)", toString(SQLExpressions.covarPop(path, path2)));
+        assertEquals("covar_samp(path,path2)", toString(SQLExpressions.covarSamp(path, path2)));
+        assertEquals("cume_dist()", toString(SQLExpressions.cumeDist()));
+        assertEquals("dense_rank()", toString(SQLExpressions.denseRank()));
+        assertEquals("first_value(path)", toString(SQLExpressions.firstValue(path)));
+        assertEquals("lag(path)", toString(SQLExpressions.lag(path)));
+        assertEquals("last_value(path)", toString(SQLExpressions.lastValue(path)));
+        assertEquals("lead(path)", toString(SQLExpressions.lead(path)));
+        assertEquals("max(path)", toString(SQLExpressions.max(path)));
+        assertEquals("min(path)", toString(SQLExpressions.min(path)));
+        assertEquals("nth_value(path, ?)", toString(SQLExpressions.nthValue(path, 3)));
+        assertEquals("ntile(?)", toString(SQLExpressions.ntile(4)));
+        assertEquals("percent_rank()", toString(SQLExpressions.percentRank()));
+        assertEquals("rank()", toString(SQLExpressions.rank()));
+        assertEquals("ratio_to_report(path)", toString(SQLExpressions.ratioToReport(path)));
+        assertEquals("row_number()", toString(SQLExpressions.rowNumber()));
+        assertEquals("stddev(path)", toString(SQLExpressions.stddev(path)));
+        assertEquals("stddev(distinct path)", toString(SQLExpressions.stddevDistinct(path)));
+        assertEquals("stddev_pop(path)", toString(SQLExpressions.stddevPop(path)));
+        assertEquals("stddev_samp(path)", toString(SQLExpressions.stddevSamp(path)));
+        assertEquals("sum(path)", toString(SQLExpressions.sum(path)));
+        assertEquals("variance(path)", toString(SQLExpressions.variance(path)));
+        assertEquals("var_pop(path)", toString(SQLExpressions.varPop(path)));
+        assertEquals("var_samp(path)", toString(SQLExpressions.varSamp(path)));
+
+        // TODO FIRST
+        // TODO LAST
+        // TODO NTH_VALUE ... FROM (FIRST|LAST) (RESPECT|IGNORE) NULLS
+    }
+
+    @Test
+    public void regr() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        assertEquals("regr_slope(path, path2)", toString(SQLExpressions.regrSlope(path, path2)));
+        assertEquals("regr_intercept(path, path2)", toString(SQLExpressions.regrIntercept(path, path2)));
+        assertEquals("regr_count(path, path2)", toString(SQLExpressions.regrCount(path, path2)));
+        assertEquals("regr_r2(path, path2)", toString(SQLExpressions.regrR2(path, path2)));
+        assertEquals("regr_avgx(path, path2)", toString(SQLExpressions.regrAvgx(path, path2)));
+        assertEquals("regr_avgy(path, path2)", toString(SQLExpressions.regrAvgy(path, path2)));
+        assertEquals("regr_sxx(path, path2)", toString(SQLExpressions.regrSxx(path, path2)));
+        assertEquals("regr_syy(path, path2)", toString(SQLExpressions.regrSyy(path, path2)));
+        assertEquals("regr_sxy(path, path2)", toString(SQLExpressions.regrSxy(path, path2)));
+    }
+
+    @Test
+    public void rows_between() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
+
+        assertEquals("sum(path) over (order by path asc rows between current row and unbounded following)",
+                toString(wf.rows().between().currentRow().unboundedFollowing()));
+        assertEquals("sum(path) over (order by path asc rows between preceding intPath and following intPath)",
+                toString(wf.rows().between().preceding(intPath).following(intPath)));
+        assertEquals("sum(path) over (order by path asc rows between preceding ? and following ?)",
+                toString(wf.rows().between().preceding(1).following(3)));
+    }
+
+    @Test
+    public void rows_unboundedPreceding() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
+
+        assertEquals("sum(path) over (order by path asc rows unbounded preceding)",
+                toString(wf.rows().unboundedPreceding()));
+    }
+
+    @Test
+    public void rows_currentRow() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
+
+        assertEquals("sum(path) over (order by path asc rows current row)",
+                toString(wf.rows().currentRow()));
+    }
+
+    @Test
+    public void rows_precedingRow() {
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Integer> intPath = Expressions.numberPath(Integer.class, "intPath");
+        WindowFunction<Long> wf = SQLExpressions.sum(path).over().orderBy(path);
+
+        assertEquals("sum(path) over (order by path asc rows preceding intPath)",
+                toString(wf.rows().preceding(intPath)));
+        assertEquals("sum(path) over (order by path asc rows preceding ?)",
+                toString(wf.rows().preceding(3)));
+    }
+
+    @Test
+    public void keep_first() {
+        //MIN(salary) KEEP (DENSE_RANK FIRST ORDER BY commission_pct) OVER (PARTITION BY department_id)
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        NumberPath<Long> path3 = Expressions.numberPath(Long.class, "path3");
+        assertEquals(
+                "min(path) keep (dense_rank first order by path2 asc)",
+                toString(SQLExpressions.min(path).keepFirst().orderBy(path2)));
+        assertEquals(
+                "min(path) keep (dense_rank first order by path2 asc) over (partition by path3)",
+                toString(SQLExpressions.min(path).keepFirst().orderBy(path2).over().partitionBy(path3)));
+    }
+
+    @Test
+    public void keep_last() {
+        //MIN(salary) KEEP (DENSE_RANK FIRST ORDER BY commission_pct) OVER (PARTITION BY department_id)
+        NumberPath<Long> path = Expressions.numberPath(Long.class, "path");
+        NumberPath<Long> path2 = Expressions.numberPath(Long.class, "path2");
+        NumberPath<Long> path3 = Expressions.numberPath(Long.class, "path3");
+        assertEquals(
+                "min(path) keep (dense_rank last order by path2 asc) over (partition by path3)",
+                toString(SQLExpressions.min(path).keepLast().orderBy(path2).over().partitionBy(path3)));
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java
new file mode 100644
index 0000000000..18d837c96f
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java
@@ -0,0 +1,82 @@
+package com.querydsl.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberPath;
+
+public class WithinGroupTest {
+    NumberPath<Long> path = null;
+    NumberPath<Long> path2 = null;
+
+    private static String toString(Expression<?> e) {
+        return new SQLSerializer(Configuration.DEFAULT).handle(e).toString();
+    }
+    @Before
+    public void setPaths() {
+        this.path = Expressions.numberPath(Long.class, "path");
+        this.path2 = Expressions.numberPath(Long.class, "path2");
+    }
+
+    @Test
+    public void cume_Dist() {
+        assertEquals("cume_dist(path)", toString(SQLExpressions.cumeDist(path)));
+        assertEquals("cume_dist(path, path2)", toString(SQLExpressions.cumeDist(path, path2)));
+    }
+
+    @Test
+    public void dense_Rank() {
+        assertEquals("dense_rank(path, path2)", toString(SQLExpressions.denseRank(path, path2)));
+    }
+
+    @Test
+    public void perfect_Rank() {
+        assertEquals("percent_rank(path, path2)", toString(SQLExpressions.percentRank(path, path2)));
+    }
+
+    @Test
+    public void percentile() {
+        assertEquals("percentile_cont(path)", toString(SQLExpressions.percentileCont(path)));
+        assertEquals("percentile_disc(path)", toString(SQLExpressions.percentileDisc(path)));
+    }
+
+    @Test
+    public void rank() {
+        assertEquals("rank(path, path2)", toString(SQLExpressions.rank(path, path2)));
+    }
+
+    @Test
+    public void listaggComma() {
+        assertEquals("listagg(path,',')", toString(SQLExpressions.listagg(path, ",")));
+    }
+
+    @Test
+    public void listaggEmpty() {
+        assertEquals("listagg(path,'')", toString(SQLExpressions.listagg(path, "")));
+    }
+
+    @Test
+    public void listaggSpace() {
+        assertEquals("listagg(path,' ')", toString(SQLExpressions.listagg(path, " ")));
+    }
+
+    @Test
+    public void listaggDelimiter() {
+        assertEquals("listagg(path,'|')", toString(SQLExpressions.listagg(path, "|")));
+    }
+
+    @Test
+    public void listaggCommaWithSpace() {
+        assertEquals("listagg(path,', ')", toString(SQLExpressions.listagg(path, ", ")));
+    }
+
+    @Test
+    public void listaggIntString() {
+        assertEquals("listagg(path,'1')", toString(SQLExpressions.listagg(path, "1")));
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ColumnData.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ColumnData.java
new file mode 100644
index 0000000000..b7e56a18ff
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ColumnData.java
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2010 Mysema Ltd.
+* All rights reserved.
+*
+*/
+package com.querydsl.sql.ddl;
+
+/**
+* @author tiwe
+*
+*/
+public class ColumnData {
+
+    private final String name;
+
+    private final String type;
+
+    private boolean nullAllowed = true;
+
+    private boolean autoIncrement;
+
+    private Integer size;
+
+    public ColumnData(String name, String type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public boolean isNullAllowed() {
+        return nullAllowed;
+    }
+
+    public void setNullAllowed(boolean nullAllowed) {
+        this.nullAllowed = nullAllowed;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public boolean isAutoIncrement() {
+        return autoIncrement;
+    }
+
+    public void setAutoIncrement(boolean autoIncrement) {
+        this.autoIncrement = autoIncrement;
+    }
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/CreateTableClause.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/CreateTableClause.java
new file mode 100644
index 0000000000..973f480307
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/CreateTableClause.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.sql.ddl;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+
+/**
+ * CreateTableClause defines a CREATE TABLE clause
+ *
+ * @author tiwe
+ *
+ */
+public class CreateTableClause {
+
+    private static final Logger logger = Logger.getLogger(CreateTableClause.class.getName());
+
+    private final Connection connection;
+
+    private final Configuration configuration;
+
+    private final SQLTemplates templates;
+
+    private final String table;
+
+    private final List<ColumnData> columns = new ArrayList<ColumnData>();
+
+    private final List<IndexData> indexes = new ArrayList<IndexData>();
+
+    private PrimaryKeyData primaryKey;
+
+    private final List<ForeignKeyData> foreignKeys = new ArrayList<ForeignKeyData>();
+
+    public CreateTableClause(Connection conn, Configuration c, String table) {
+        this.connection = conn;
+        this.configuration = c;
+        this.templates = c.getTemplates();
+        this.table = templates.quoteIdentifier(table);
+    }
+
+    /**
+     * Add a new column definition
+     *
+     * @param name
+     * @param type
+     * @return
+     */
+    public CreateTableClause column(String name, Class<?> type) {
+        String typeName = configuration.getTypeName(type);
+        columns.add(new ColumnData(templates.quoteIdentifier(name), typeName));
+        return this;
+    }
+
+    private ColumnData lastColumn() {
+        return columns.get(columns.size() - 1);
+    }
+
+    /**
+     * Set the last added column to not null
+     *
+     * @return
+     */
+    public CreateTableClause notNull() {
+        lastColumn().setNullAllowed(false);
+        return this;
+    }
+
+    /**
+     * Set the size of the last column's type
+     *
+     * @param size
+     * @return
+     */
+    public CreateTableClause size(int size) {
+        lastColumn().setSize(size);
+        return this;
+    }
+
+    /**
+     * Set the last column to auto increment
+     *
+     * @return
+     */
+    public CreateTableClause autoIncrement() {
+        lastColumn().setAutoIncrement(true);
+        return this;
+    }
+
+    /**
+     * Set the primary key
+     *
+     * @param name
+     * @param columns
+     * @return
+     */
+    public CreateTableClause primaryKey(String name, String... columns) {
+        for (int i = 0; i < columns.length; i++) {
+            columns[i] = templates.quoteIdentifier(columns[i]);
+        }
+        primaryKey = new PrimaryKeyData(templates.quoteIdentifier(name), columns);
+        return this;
+    }
+
+    /**
+     * Add an index
+     *
+     * @param name
+     * @param columns
+     * @return
+     */
+    public CreateTableClause index(String name, String... columns) {
+        indexes.add(new IndexData(name, columns));
+        return this;
+    }
+
+    /**
+     * Set the last added index to unique
+     *
+     * @return
+     */
+    public CreateTableClause unique() {
+        indexes.get(indexes.size() - 1).setUnique(true);
+        return this;
+    }
+
+    /**
+     * Add a foreign key
+     *
+     * @param name
+     * @param columns
+     * @return
+     */
+    public ForeignKeyBuilder foreignKey(String name, String... columns) {
+        return new ForeignKeyBuilder(this, templates, foreignKeys, templates.quoteIdentifier(name), columns);
+    }
+
+    /**
+     * Execute the clause
+     */
+    @SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
+    public void execute() {
+        StringBuilder builder = new StringBuilder();
+        builder.append(templates.getCreateTable()).append(table).append(" (\n");
+        List<String> lines = new ArrayList<String>(columns.size() + foreignKeys.size() + 1);
+        // columns
+        for (ColumnData column : columns) {
+            StringBuilder line = new StringBuilder();
+            line.append(column.getName()).append(" ").append(column.getType().toUpperCase());
+            if (column.getSize() != null) {
+                line.append("(").append(column.getSize()).append(")");
+            }
+            if (!column.isNullAllowed()) {
+                line.append(templates.getNotNull().toUpperCase());
+            }
+            if (column.isAutoIncrement()) {
+                line.append(templates.getAutoIncrement().toUpperCase());
+            }
+            lines.add(line.toString());
+        }
+
+        // primary key
+        if (primaryKey != null) {
+            StringBuilder line = new StringBuilder();
+            line.append("CONSTRAINT ").append(primaryKey.getName()).append(" ");
+            line.append("PRIMARY KEY(").append(String.join(", ", primaryKey.getColumns())).append(")");
+            lines.add(line.toString());
+        }
+
+        // foreign keys
+        for (ForeignKeyData foreignKey : foreignKeys) {
+            StringBuilder line = new StringBuilder();
+            line.append("CONSTRAINT ").append(foreignKey.getName()).append(" ");
+            line.append("FOREIGN KEY(").append(String.join(", ", foreignKey.getForeignColumns())).append(") ");
+            line.append("REFERENCES ").append(foreignKey.getTable()).append("(").append(String.join(", ", foreignKey.getParentColumns())).append(")");
+            lines.add(line.toString());
+        }
+        builder.append("  ").append(String.join(",\n  ", lines));
+        builder.append("\n)\n");
+        logger.info(builder.toString());
+
+        try (Statement stmt = connection.createStatement()) {
+            stmt.execute(builder.toString());
+
+            // indexes
+            for (IndexData index : indexes) {
+                String indexColumns = String.join(", ", index.getColumns());
+                String prefix = templates.getCreateIndex();
+                if (index.isUnique()) {
+                    prefix = templates.getCreateUniqueIndex();
+                }
+                String sql = prefix + index.getName() + templates.getOn() + table + "(" + indexColumns + ")";
+                logger.info(sql);
+                stmt.execute(sql);
+            }
+        } catch (SQLException e) {
+            System.err.println(builder.toString());
+            throw new QueryException(e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/DropTableClause.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/DropTableClause.java
new file mode 100644
index 0000000000..c3da8ba83c
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/DropTableClause.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.sql.ddl;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.sql.Configuration;
+
+/**
+ * DropTableClause defines a DROP TABLE clause
+ *
+ * @author tiwe
+ *
+ */
+public class DropTableClause {
+
+    private final Connection connection;
+
+    private final String table;
+
+    public DropTableClause(Connection conn, Configuration c, String table) {
+        this.connection = conn;
+        this.table = c.getTemplates().quoteIdentifier(table);
+    }
+
+    @SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
+    public void execute() {
+        Statement stmt = null;
+        try {
+            stmt = connection.createStatement();
+            stmt.execute("DROP TABLE " + table);
+        } catch (SQLException e) {
+            // do not rethrow
+        } finally {
+            if (stmt != null) {
+                try {
+                    stmt.close();
+                } catch (SQLException e) {
+                    throw new QueryException(e);
+                }
+            }
+        }
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyBuilder.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyBuilder.java
similarity index 88%
rename from querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyBuilder.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyBuilder.java
index b6f92e37cc..313235f8f7 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/ddl/ForeignKeyBuilder.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyBuilder.java
@@ -3,30 +3,30 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.ddl;
+package com.querydsl.sql.ddl;
 
 import java.util.List;
 
-import com.mysema.query.sql.SQLTemplates;
+import com.querydsl.sql.SQLTemplates;
 
 /**
  * ForeignKeyBuilder is part of the fluent interface of CreateTableClause
- * 
+ *
  * @author tiwe
  *
  */
 public class ForeignKeyBuilder {
 
     private final List<ForeignKeyData> foreignKeys;
-    
+
     private final CreateTableClause clause;
-    
+
     private final String name;
-    
+
     private final String[] foreignColumns;
 
     private final SQLTemplates templates;
-    
+
     public ForeignKeyBuilder(CreateTableClause clause, SQLTemplates templates, List<ForeignKeyData> foreignKeys, String name, String[] columns) {
         this.clause = clause;
         this.templates = templates;
@@ -39,7 +39,7 @@ public CreateTableClause references(String table, String... parentColumns) {
         ForeignKeyData foreignKey = new ForeignKeyData(name, templates.quoteIdentifier(table));
         for (int i = 0; i < parentColumns.length; i++) {
             foreignKey.add(
-                templates.quoteIdentifier(foreignColumns[i]), 
+                templates.quoteIdentifier(foreignColumns[i]),
                 templates.quoteIdentifier(parentColumns[i]));
         }
         foreignKeys.add(foreignKey);
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyData.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyData.java
new file mode 100644
index 0000000000..5d46f58357
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/ForeignKeyData.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.sql.ddl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author tiwe
+ *
+ */
+public class ForeignKeyData implements KeyData {
+
+    private final String name;
+
+    private final String table;
+
+    private final List<String> foreignColumns = new ArrayList<String>();
+
+    private final List<String> parentColumns = new ArrayList<String>();
+
+    public ForeignKeyData(String name, String parentTable) {
+        this.name = name;
+        this.table = parentTable;
+    }
+
+    public void add(String foreignColumn, String parentColumn) {
+        foreignColumns.add(foreignColumn);
+        parentColumns.add(parentColumn);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getTable() {
+        return table;
+    }
+
+    public List<String> getForeignColumns() {
+        return foreignColumns;
+    }
+
+    public List<String> getParentColumns() {
+        return parentColumns;
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/IndexData.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/IndexData.java
new file mode 100644
index 0000000000..e30d2eedf6
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/IndexData.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.sql.ddl;
+
+/**
+ * @author tiwe
+ *
+ */
+public class IndexData {
+
+    private final String name;
+
+    private final String[] columns;
+
+    private boolean unique;
+
+    public IndexData(String name, String[] columns) {
+        this.name = name;
+        this.columns = columns.clone();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String[] getColumns() {
+        return columns.clone();
+    }
+
+    public boolean isUnique() {
+        return unique;
+    }
+
+    public void setUnique(boolean unique) {
+        this.unique = unique;
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/KeyData.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/KeyData.java
new file mode 100644
index 0000000000..a8e411b938
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/KeyData.java
@@ -0,0 +1,24 @@
+/*
+ *
+ */
+package com.querydsl.sql.ddl;
+
+import java.util.List;
+
+/**
+ * Common interface for ForeignKeyData and InverseForeignKeyData
+ *
+ * @author tiwe
+ *
+ */
+public interface KeyData {
+
+    String getName();
+
+    String getTable();
+
+    List<String> getForeignColumns();
+
+    List<String> getParentColumns();
+
+}
\ No newline at end of file
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/ddl/PrimaryKeyData.java b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/PrimaryKeyData.java
new file mode 100644
index 0000000000..36f22c5b55
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/ddl/PrimaryKeyData.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010 Mysema Ltd.
+ * All rights reserved.
+ *
+ */
+package com.querydsl.sql.ddl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author tiwe
+ *
+ */
+public class PrimaryKeyData {
+
+    private final String name;
+
+    private final List<String> columns = new ArrayList<String>();
+
+    public PrimaryKeyData(String name) {
+        this.name = name;
+    }
+
+    public PrimaryKeyData(String name, String[] c) {
+        this.name = name;
+        columns.addAll(Arrays.asList(c));
+    }
+
+    public void add(String column) {
+        columns.add(column);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<String> getColumns() {
+        return columns;
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/AbstractMapperTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java
similarity index 85%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/dml/AbstractMapperTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java
index c672051f4d..bd1d4620bd 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/AbstractMapperTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import java.math.BigDecimal;
 import java.sql.Date;
@@ -19,38 +19,38 @@
 
 import org.junit.Before;
 
-import com.mysema.query.sql.Column;
-import com.mysema.query.sql.domain.Employee;
+import com.querydsl.sql.Column;
+import com.querydsl.sql.domain.Employee;
 
 public abstract class AbstractMapperTest {
-    
+
     public static class EmployeeX {
-        
+
         private String property;
-        
+
         public String getProperty() {
             return property;
         }
-        
+
         public void setProperty(String property) {
             this.property = property;
         }
     }
-    
+
     public static class EmployeeNames {
 
         @Column("ID")
         Integer _id;
-        
+
         @Column("FIRSTNAME")
         String _firstname;
-        
+
         @Column("LASTNAME")
-        String _lastname;        
+        String _lastname;
     }
 
     protected Employee employee;
-    
+
     @Before
     public void setUp() {
         employee = new Employee();
@@ -61,6 +61,6 @@ public void setUp() {
         employee.setSuperiorId(2);
         employee.setTimefield(new Time(0));
     }
-     
+
 
 }
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/AnnotationMapperTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java
similarity index 79%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/dml/AnnotationMapperTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java
index 8a8ff49b63..26a849f31e 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/AnnotationMapperTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -7,35 +7,35 @@
 
 import org.junit.Test;
 
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.types.Path;
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.domain.QEmployee;
 
 public class AnnotationMapperTest extends AbstractMapperTest {
-    
+
     private static final QEmployee emp = QEmployee.employee;
-    
+
     @Test
-    public void Extract_Success() {
+    public void extract_success() {
         EmployeeNames names = new EmployeeNames();
         names._id = 9;
         names._firstname = "A";
         names._lastname = "B";
-                
+
         Map<Path<?>, Object> values = AnnotationMapper.DEFAULT.createMap(emp, names);
         assertEquals(3, values.size());
         assertEquals(names._id, values.get(emp.id));
         assertEquals(names._firstname, values.get(emp.firstname));
-        assertEquals(names._lastname, values.get(emp.lastname));        
+        assertEquals(names._lastname, values.get(emp.lastname));
     }
-    
+
     @Test
-    public void Extract_Failure() {        
+    public void extract_failure() {
         Map<Path<?>, Object> values = AnnotationMapper.DEFAULT.createMap(emp, employee);
         assertTrue(values.isEmpty());
     }
-    
+
     @Test
-    public void Extract2() {
+    public void extract2() {
         Map<Path<?>, Object> values = AnnotationMapper.DEFAULT.createMap(emp, new EmployeeX());
         assertTrue(values.isEmpty());
     }
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/BeanMapperTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java
similarity index 81%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/dml/BeanMapperTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java
index bf5b60b991..1adbde38af 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/dml/BeanMapperTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.sql.dml;
+package com.querydsl.sql.dml;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -7,16 +7,16 @@
 
 import org.junit.Test;
 
-import com.mysema.query.sql.domain.QEmployee;
-import com.mysema.query.types.Path;
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.domain.QEmployee;
 
 public class BeanMapperTest extends AbstractMapperTest {
-    
+
     private static final QEmployee emp = QEmployee.employee;
-    
+
     @Test
-    public void Extract() {
-        Map<Path<?>, Object> values = BeanMapper.DEFAULT.createMap(emp, employee);        
+    public void extract() {
+        Map<Path<?>, Object> values = BeanMapper.DEFAULT.createMap(emp, employee);
         assertEquals(employee.getDatefield(), values.get(emp.datefield));
         assertEquals(employee.getFirstname(), values.get(emp.firstname));
         assertEquals(employee.getLastname(), values.get(emp.lastname));
@@ -24,9 +24,9 @@ public void Extract() {
         assertEquals(employee.getSuperiorId(), values.get(emp.superiorId));
         assertEquals(employee.getTimefield(), values.get(emp.timefield));
     }
-    
+
     @Test
-    public void Extract2() {
+    public void extract2() {
         Map<Path<?>, Object> values = BeanMapper.DEFAULT.createMap(emp, new EmployeeX());
         assertTrue(values.isEmpty());
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java
new file mode 100644
index 0000000000..e0b838c370
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java
@@ -0,0 +1,42 @@
+package com.querydsl.sql.dml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.*;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.sql.domain.QEmployee;
+
+public class DefaultMapperTest extends AbstractMapperTest {
+
+    private static final QEmployee emp = QEmployee.employee;
+
+    @Test
+    public void extract() {
+        Map<Path<?>, Object> values = DefaultMapper.DEFAULT.createMap(emp, employee);
+        assertEquals(employee.getDatefield(), values.get(emp.datefield));
+        assertEquals(employee.getFirstname(), values.get(emp.firstname));
+        assertEquals(employee.getLastname(), values.get(emp.lastname));
+        assertEquals(employee.getSalary(), values.get(emp.salary));
+        assertEquals(employee.getSuperiorId(), values.get(emp.superiorId));
+        assertEquals(employee.getTimefield(), values.get(emp.timefield));
+    }
+
+    @Test
+    public void extract2() {
+        Map<Path<?>, Object> values = DefaultMapper.DEFAULT.createMap(emp, new EmployeeX());
+        assertTrue(values.isEmpty());
+    }
+
+    @Test
+    public void preservedColumnOrder() {
+        final Map<String, Path<?>> columns = DefaultMapper.DEFAULT.getColumns(emp);
+        final List<String> expectedKeySet = Arrays.asList("id", "firstname", "lastname",
+                "salary", "datefield", "timefield", "superiorId");
+        assertEquals(expectedKeySet, new ArrayList<String>(columns.keySet()));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java
new file mode 100644
index 0000000000..c8160b89fc
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java
@@ -0,0 +1,55 @@
+package com.querydsl.sql.dml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.querydsl.sql.KeyAccessorsTest.QEmployee;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLTemplates;
+
+import java.util.Collections;
+
+public class SQLDeleteClauseTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noConnection() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
+        delete.where(emp1.id.eq(1));
+        delete.execute();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @Ignore
+    public void error() {
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
+        delete.where(emp2.id.eq(1));
+    }
+
+    @Test
+    public void getSQL() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
+        delete.where(emp1.id.eq(1));
+
+        SQLBindings sql = delete.getSQL().get(0);
+        assertEquals("delete from EMPLOYEE\nwhere EMPLOYEE.ID = ?", sql.getSQL());
+        assertEquals(Collections.singletonList(1), sql.getNullFriendlyBindings());
+    }
+
+    @Test
+    public void clear() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLDeleteClause delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1);
+        delete.where(emp1.id.eq(1));
+        delete.addBatch();
+        assertEquals(1, delete.getBatchCount());
+        delete.clear();
+        assertEquals(0, delete.getBatchCount());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java
new file mode 100644
index 0000000000..9e838eeeb1
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java
@@ -0,0 +1,73 @@
+package com.querydsl.sql.dml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.QueryFlag;
+import com.querydsl.sql.KeyAccessorsTest.QEmployee;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLTemplates;
+
+import java.util.Collections;
+
+public class SQLInsertClauseTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noConnection() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
+        insert.set(emp1.id, 1);
+        insert.execute();
+    }
+
+    @Test
+    public void getSQL() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
+        insert.set(emp1.id, 1);
+
+        SQLBindings sql = insert.getSQL().get(0);
+        assertEquals("insert into EMPLOYEE (ID)\nvalues (?)", sql.getSQL());
+        assertEquals(Collections.singletonList(1), sql.getNullFriendlyBindings());
+    }
+
+    @Test
+    public void bulk() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
+        insert.set(emp1.id, 1);
+        insert.addBatch();
+        insert.set(emp1.id, 2);
+        insert.addBatch();
+        insert.addFlag(QueryFlag.Position.END, " on duplicate key ignore");
+        insert.setBatchToBulk(true);
+        assertEquals("insert into EMPLOYEE (ID)\n" +
+                "values (?), (?) on duplicate key ignore", insert.getSQL().get(0).getSQL());
+
+    }
+
+    @Test
+    public void getSQLWithPreservedColumnOrder() {
+        com.querydsl.sql.domain.QEmployee emp1 = new com.querydsl.sql.domain.QEmployee("emp1");
+        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
+        insert.populate(emp1);
+
+        SQLBindings sql = insert.getSQL().get(0);
+        assertEquals("The order of columns in generated sql should be predictable",
+                "insert into EMPLOYEE (ID, FIRSTNAME, LASTNAME, SALARY, DATEFIELD, TIMEFIELD, SUPERIOR_ID)\n" +
+                "values (EMPLOYEE.ID, EMPLOYEE.FIRSTNAME, EMPLOYEE.LASTNAME, EMPLOYEE.SALARY, EMPLOYEE.DATEFIELD, EMPLOYEE.TIMEFIELD, EMPLOYEE.SUPERIOR_ID)", sql.getSQL());
+    }
+
+    @Test
+    public void clear() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLInsertClause insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1);
+        insert.set(emp1.id, 1);
+        insert.addBatch();
+        assertEquals(1, insert.getBatchCount());
+        insert.clear();
+        assertEquals(0, insert.getBatchCount());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java
new file mode 100644
index 0000000000..97a7b1ce16
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java
@@ -0,0 +1,22 @@
+package com.querydsl.sql.dml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.KeyAccessorsTest;
+
+public class SQLMergeClauseTest {
+
+    @Test
+    public void clear() {
+        KeyAccessorsTest.QEmployee emp1 = new KeyAccessorsTest.QEmployee("emp1");
+        SQLMergeClause merge = new SQLMergeClause(null, new H2Templates(), emp1);
+        merge.set(emp1.id, 1);
+        merge.addBatch();
+        assertEquals(1, merge.getBatchCount());
+        merge.clear();
+        assertEquals(0, merge.getBatchCount());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java
new file mode 100644
index 0000000000..0864e0aa99
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java
@@ -0,0 +1,120 @@
+package com.querydsl.sql.dml;
+
+import static com.querydsl.sql.SQLExpressions.select;
+import static org.junit.Assert.assertEquals;
+
+import com.querydsl.core.QueryFlag.Position;
+import org.junit.Test;
+
+import com.querydsl.sql.KeyAccessorsTest.QEmployee;
+import com.querydsl.sql.SQLBindings;
+import com.querydsl.sql.SQLTemplates;
+
+import java.util.Collections;
+
+public class SQLUpdateClauseTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noConnection() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.id, 1);
+        update.execute();
+    }
+
+    @Test
+    public void getSQL() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.id, 1);
+
+        SQLBindings sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\nset ID = ?", sql.getSQL());
+        assertEquals(Collections.singletonList(1), sql.getNullFriendlyBindings());
+    }
+
+    @Test
+    public void intertable() {
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.id, 1)
+              .where(emp1.id.eq(select(emp2.id).from(emp2)
+                      .where(emp2.superiorId.isNotNull())));
+
+        SQLBindings sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\n" +
+                "set ID = ?\n" +
+                "where EMPLOYEE.ID = (select emp2.ID\n" +
+                "from EMPLOYEE emp2\n" +
+                "where emp2.SUPERIOR_ID is not null)", sql.getSQL());
+    }
+
+    @Test
+    public void intertable2() {
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.id, select(emp2.id).from(emp2)
+              .where(emp2.superiorId.isNotNull()));
+
+        SQLBindings sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\n" +
+                "set ID = (select emp2.ID\n" +
+                "from EMPLOYEE emp2\n" +
+                "where emp2.SUPERIOR_ID is not null)", sql.getSQL());
+    }
+
+    @Test
+    public void intertable3() {
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.superiorId, select(emp2.id).from(emp2)
+                .where(emp2.id.eq(emp1.id)));
+
+        SQLBindings sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\n" +
+                "set SUPERIOR_ID = (select emp2.ID\n" +
+                "from EMPLOYEE emp2\n" +
+                "where emp2.ID = EMPLOYEE.ID)", sql.getSQL());
+    }
+
+    @Test
+    public void testBeforeFiltersFlag() {
+        QEmployee emp1 = new QEmployee("emp1");
+        QEmployee emp2 = new QEmployee("emp2");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1)
+          .set(emp1.superiorId, emp2.id)
+          .addFlag(Position.BEFORE_FILTERS, String.format("\nfrom %s %s", emp2.getTableName(), emp2))
+          .where(emp2.id.eq(emp1.id));
+
+        SQLBindings sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\n" +
+                "set SUPERIOR_ID = emp2.ID\n" +
+                "from EMPLOYEE emp2\n" +
+                "where emp2.ID = EMPLOYEE.ID", sql.getSQL());
+
+        update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1)
+          .set(emp1.superiorId, emp2.id)
+          .addFlag(Position.BEFORE_FILTERS, " THE_FLAG")
+          .where(emp2.id.eq(emp1.id));
+
+        sql = update.getSQL().get(0);
+        assertEquals("update EMPLOYEE\n" +
+          "set SUPERIOR_ID = emp2.ID THE_FLAG\n" +
+          "where emp2.ID = EMPLOYEE.ID", sql.getSQL());
+    }
+
+    @Test
+    public void clear() {
+        QEmployee emp1 = new QEmployee("emp1");
+        SQLUpdateClause update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1);
+        update.set(emp1.id, 1);
+        update.addBatch();
+        assertEquals(1, update.getBatchCount());
+        update.clear();
+        assertEquals(0, update.getBatchCount());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/Employee.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/Employee.java
new file mode 100644
index 0000000000..a012302d83
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/Employee.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.domain;
+
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.Time;
+
+//@Schema("PUBLIC")
+//@Table("EMPLOYEE")
+public class Employee {
+
+    //@Column("ID")
+    private Integer id;
+
+    //@Column("FIRSTNAME")
+    private String firstname;
+
+    //@Column("LASTNAME")
+    private String lastname;
+
+    //@Column("SALARY")
+    private BigDecimal salary;
+
+    //@Column("DATEFIELD")
+    private Date datefield;
+
+    //@Column("TIMEFIELD")
+    private Time timefield;
+
+    //@Column("SUPERIOR_ID")
+    private Integer superiorId;
+
+    public Employee() { }
+
+    public Employee(int id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public BigDecimal getSalary() {
+        return salary;
+    }
+
+    public void setSalary(BigDecimal salary) {
+        this.salary = salary;
+    }
+
+    public Date getDatefield() {
+        return new Date(datefield.getTime());
+    }
+
+    public void setDatefield(Date datefield) {
+        this.datefield = new Date(datefield.getTime());
+    }
+
+    public Time getTimefield() {
+        return timefield;
+    }
+
+    public void setTimefield(Time timefield) {
+        this.timefield = timefield;
+    }
+
+    public Integer getSuperiorId() {
+        return superiorId;
+    }
+
+    public void setSuperiorId(Integer superiorId) {
+        this.superiorId = superiorId;
+    }
+
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/IdName.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/IdName.java
similarity index 84%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/domain/IdName.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/domain/IdName.java
index 62464cf50c..c67a059766 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/IdName.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/IdName.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.domain;
+package com.querydsl.sql.domain;
 
-import com.mysema.query.annotations.QueryProjection;
+import com.querydsl.core.annotations.QueryProjection;
 
 public class IdName {
 
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QDateTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QDateTest.java
new file mode 100644
index 0000000000..4c3d815c81
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QDateTest.java
@@ -0,0 +1,33 @@
+package com.querydsl.sql.domain;
+
+import java.sql.Date;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPathBase;
+
+public class QDateTest extends RelationalPathBase<QDateTest> {
+
+    private static final long serialVersionUID = 1394463749655231079L;
+
+    public static final QDateTest qDateTest = new QDateTest("DATE_TEST");
+
+    public final DatePath<Date> dateTest = createDate("dateTest", java.sql.Date.class);
+
+    public QDateTest(String path) {
+        super(QDateTest.class, PathMetadataFactory.forVariable(path), "PUBLIC", "DATE_TEST");
+        addMetadata();
+    }
+
+    public QDateTest(PathMetadata metadata) {
+        super(QDateTest.class, metadata, "PUBLIC", "DATE_TEST");
+        addMetadata();
+    }
+
+    protected void addMetadata() {
+        addMetadata(dateTest, ColumnMetadata.named("DATE_TEST"));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployee.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployee.java
new file mode 100644
index 0000000000..ef204aab9a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployee.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.domain;
+
+import java.math.BigDecimal;
+import java.sql.Types;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.core.types.dsl.TimePath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+//@Schema("PUBLIC")
+//@Table("EMPLOYEE")
+public class QEmployee extends RelationalPathBase<Employee> {
+
+    private static final long serialVersionUID = 1394463749655231079L;
+
+    public static final QEmployee employee = new QEmployee("EMPLOYEE");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final StringPath firstname = createString("firstname");
+
+    public final StringPath lastname = createString("lastname");
+
+    public final NumberPath<BigDecimal> salary = createNumber("salary", BigDecimal.class);
+
+    public final DatePath<java.sql.Date> datefield = createDate("datefield", java.sql.Date.class);
+
+    public final TimePath<java.sql.Time> timefield = createTime("timefield", java.sql.Time.class);
+
+    public final NumberPath<Integer> superiorId = createNumber("superiorId", Integer.class);
+
+    public final PrimaryKey<Employee> idKey = createPrimaryKey(id);
+
+    public final ForeignKey<Employee> superiorIdKey = createForeignKey(superiorId, "ID");
+
+    public final ForeignKey<Employee> _superiorIdKey = createInvForeignKey(id, "SUPERIOR_ID");
+
+    public QEmployee(String path) {
+        super(Employee.class, PathMetadataFactory.forVariable(path), "PUBLIC", "EMPLOYEE");
+        addMetadata();
+    }
+
+    public QEmployee(PathMetadata metadata) {
+        super(Employee.class, metadata, "PUBLIC", "EMPLOYEE");
+        addMetadata();
+    }
+
+    protected void addMetadata() {
+        addMetadata(id, ColumnMetadata.named("ID").ofType(Types.INTEGER));
+        addMetadata(firstname, ColumnMetadata.named("FIRSTNAME").ofType(Types.VARCHAR));
+        addMetadata(lastname, ColumnMetadata.named("LASTNAME").ofType(Types.VARCHAR));
+        addMetadata(salary, ColumnMetadata.named("SALARY").ofType(Types.DECIMAL));
+        addMetadata(datefield, ColumnMetadata.named("DATEFIELD").ofType(Types.DATE));
+        addMetadata(timefield, ColumnMetadata.named("TIMEFIELD").ofType(Types.TIME));
+        addMetadata(superiorId, ColumnMetadata.named("SUPERIOR_ID").ofType(Types.INTEGER));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployeeNoPK.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployeeNoPK.java
similarity index 81%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployeeNoPK.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployeeNoPK.java
index 0474dd64a6..dffc72914f 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QEmployeeNoPK.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QEmployeeNoPK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,19 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.domain;
+package com.querydsl.sql.domain;
 
 import java.math.BigDecimal;
 
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.ForeignKey;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.DatePath;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
-import com.mysema.query.types.path.TimePath;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.DatePath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.core.types.dsl.TimePath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.ForeignKey;
+import com.querydsl.sql.RelationalPathBase;
 
 //@Schema("PUBLIC")
 //@Table("EMPLOYEE")
@@ -56,7 +56,7 @@ public QEmployeeNoPK(String path) {
         addMetadata();
     }
 
-    public QEmployeeNoPK(PathMetadata<?> metadata) {
+    public QEmployeeNoPK(PathMetadata metadata) {
         super(Employee.class, metadata, "PUBLIC", "EMPLOYEE");
         addMetadata();
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QIdName.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QIdName.java
new file mode 100644
index 0000000000..e34bef479a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QIdName.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.domain;
+
+import com.querydsl.core.types.ConstructorExpression;
+import com.querydsl.core.types.Expression;
+
+public class QIdName extends ConstructorExpression<IdName> {
+
+    private static final long serialVersionUID = 5770565824515003611L;
+
+    public QIdName(Expression<java.lang.Integer> id, Expression<java.lang.String> name) {
+        super(IdName.class, new Class<?>[]{int.class, String.class}, id, name);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QNumberTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QNumberTest.java
new file mode 100644
index 0000000000..225b806b5c
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QNumberTest.java
@@ -0,0 +1,57 @@
+package com.querydsl.sql.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Types;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.BooleanPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPathBase;
+
+
+
+/**
+ * QNumberTest is a Querydsl query type for QNumberTest
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class QNumberTest extends RelationalPathBase<QNumberTest> {
+
+    private static final long serialVersionUID = 291758928;
+
+    public static final QNumberTest numberTest = new QNumberTest("NUMBER_TEST");
+
+    public final BooleanPath col1Boolean = createBoolean("col1");
+
+    public final NumberPath<Byte> col1Number = createNumber("col2", Byte.class);
+
+    public QNumberTest(String variable) {
+        super(QNumberTest.class, forVariable(variable), "PUBLIC", "NUMBER_TEST");
+        addMetadata();
+    }
+
+    public QNumberTest(String variable, String schema, String table) {
+        super(QNumberTest.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public QNumberTest(Path<? extends QNumberTest> path) {
+        super(path.getType(), path.getMetadata(), "PUBLIC", "NUMBER_TEST");
+        addMetadata();
+    }
+
+    public QNumberTest(PathMetadata metadata) {
+        super(QNumberTest.class, metadata, "PUBLIC", "NUMBER_TEST");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(col1Boolean, ColumnMetadata.named("COL1").withIndex(1).ofType(Types.BIT));
+        addMetadata(col1Number, ColumnMetadata.named("COL1").withIndex(1).ofType(Types.BIT));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurvey.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurvey.java
new file mode 100644
index 0000000000..7fb419ac20
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurvey.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.domain;
+
+import java.sql.Types;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.PrimaryKey;
+import com.querydsl.sql.RelationalPathBase;
+
+//@Schema("PUBLIC")
+//@Table("SURVEY")
+public class QSurvey extends RelationalPathBase<QSurvey> {
+
+    private static final long serialVersionUID = -7427577079709192842L;
+
+    public static final QSurvey survey = new QSurvey("SURVEY");
+
+    public final StringPath name = createString("name");
+
+    public final StringPath name2 = createString("name2");
+
+    public final NumberPath<Integer> id = createNumber("id", Integer.class);
+
+    public final PrimaryKey<QSurvey> idKey = createPrimaryKey(id);
+
+    public QSurvey(String path) {
+        super(QSurvey.class, PathMetadataFactory.forVariable(path), "PUBLIC", "SURVEY");
+        addMetadata();
+    }
+
+    public QSurvey(PathMetadata metadata) {
+        super(QSurvey.class, metadata, "PUBLIC", "SURVEY");
+        addMetadata();
+    }
+
+    protected void addMetadata() {
+        addMetadata(name, ColumnMetadata.named("NAME").ofType(Types.VARCHAR));
+        addMetadata(name2, ColumnMetadata.named("NAME2").ofType(Types.VARCHAR));
+        addMetadata(id, ColumnMetadata.named("ID").ofType(Types.INTEGER));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurveyNoPK.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurveyNoPK.java
similarity index 77%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurveyNoPK.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurveyNoPK.java
index 0f3d51ab9c..b70d3fda0a 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/domain/QSurveyNoPK.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QSurveyNoPK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,18 +11,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.domain;
+package com.querydsl.sql.domain;
 
-import com.mysema.query.sql.ColumnMetadata;
-import com.mysema.query.sql.RelationalPathBase;
-import com.mysema.query.types.PathMetadata;
-import com.mysema.query.types.PathMetadataFactory;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPathBase;
 
 //@Schema("PUBLIC")
 //@Table("SURVEY")
-public class QSurveyNoPK extends RelationalPathBase<QSurveyNoPK>{
+public class QSurveyNoPK extends RelationalPathBase<QSurveyNoPK> {
 
     private static final long serialVersionUID = -7427577079709192842L;
 
@@ -39,7 +39,7 @@ public QSurveyNoPK(String path) {
         addMetadata();
     }
 
-    public QSurveyNoPK(PathMetadata<?> metadata) {
+    public QSurveyNoPK(PathMetadata metadata) {
         super(QSurveyNoPK.class, metadata, "PUBLIC", "SURVEY");
         addMetadata();
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QTestX.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QTestX.java
new file mode 100644
index 0000000000..97ba8bf46a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QTestX.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.domain;
+
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.PathMetadataFactory;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.StringPath;
+
+//@Table("TEST")
+public class QTestX extends EntityPathBase<Object> {
+
+    private static final long serialVersionUID = -8421112749591552595L;
+
+    public final StringPath name = createString("NAME");
+
+    public QTestX(String path) {
+        super(Object.class, PathMetadataFactory.forVariable(path));
+    }
+
+    public QTestX(PathMetadata metadata) {
+        super(Object.class, metadata);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QUuids.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QUuids.java
new file mode 100644
index 0000000000..7d9d8b7d07
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QUuids.java
@@ -0,0 +1,54 @@
+package com.querydsl.sql.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Types;
+import java.util.UUID;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.SimplePath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPathBase;
+
+
+
+/**
+ * QUuids is a Querydsl query type for QUuids
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class QUuids extends RelationalPathBase<QUuids> {
+
+    private static final long serialVersionUID = -1780705501;
+
+    public static final QUuids uuids = new QUuids("UUIDS");
+
+    public final SimplePath<UUID> field = createSimple("field", UUID.class);
+
+    public QUuids(String variable) {
+        super(QUuids.class, forVariable(variable), "public", "UUIDS");
+        addMetadata();
+    }
+
+    public QUuids(String variable, String schema, String table) {
+        super(QUuids.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public QUuids(Path<? extends QUuids> path) {
+        super(path.getType(), path.getMetadata(), "public", "UUIDS");
+        addMetadata();
+    }
+
+    public QUuids(PathMetadata metadata) {
+        super(QUuids.class, metadata, "public", "UUIDS");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(field, ColumnMetadata.named("FIELD").withIndex(1).ofType(Types.OTHER).withSize(2147483647));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/domain/QXmlTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QXmlTest.java
new file mode 100644
index 0000000000..f6a32f43c8
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/domain/QXmlTest.java
@@ -0,0 +1,53 @@
+package com.querydsl.sql.domain;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+import java.sql.Types;
+
+import javax.annotation.Generated;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.StringPath;
+import com.querydsl.sql.ColumnMetadata;
+import com.querydsl.sql.RelationalPathBase;
+
+
+
+/**
+ * QXmlTest is a Querydsl query type for QXmlTest
+ */
+@Generated("com.querydsl.sql.codegen.MetaDataSerializer")
+public class QXmlTest extends RelationalPathBase<QXmlTest> {
+
+    private static final long serialVersionUID = 574759316;
+
+    public static final QXmlTest xmlTest = new QXmlTest("XML_TEST");
+
+    public final StringPath col = createString("COL");
+
+    public QXmlTest(String variable) {
+        super(QXmlTest.class, forVariable(variable), "PUBLIC", "XML_TEST");
+        addMetadata();
+    }
+
+    public QXmlTest(String variable, String schema, String table) {
+        super(QXmlTest.class, forVariable(variable), schema, table);
+        addMetadata();
+    }
+
+    public QXmlTest(Path<? extends QXmlTest> path) {
+        super(path.getType(), path.getMetadata(), "PUBLIC", "XML_TEST");
+        addMetadata();
+    }
+
+    public QXmlTest(PathMetadata metadata) {
+        super(QXmlTest.class, metadata, "PUBLIC", "XML_TEST");
+        addMetadata();
+    }
+
+    public void addMetadata() {
+        addMetadata(col, ColumnMetadata.named("COL").withIndex(1).ofType(Types.SQLXML).withSize(2147483647));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/h2/GeneratedKeysH2Test.java b/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java
similarity index 85%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/h2/GeneratedKeysH2Test.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java
index 03ee033967..f4fbb04d2b 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/h2/GeneratedKeysH2Test.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,18 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.h2;
+package com.querydsl.sql.h2;
+
+import static org.junit.Assert.*;
 
 import java.sql.*;
 import java.util.Collections;
 
-import com.mysema.query.QGeneratedKeysEntity;
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.dml.SQLInsertClause;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.QGeneratedKeysEntity;
+import com.querydsl.sql.dml.SQLInsertClause;
 
 public class GeneratedKeysH2Test {
 
@@ -31,24 +33,24 @@ public class GeneratedKeysH2Test {
     private Statement stmt;
 
     @Before
-    public void setUp() throws ClassNotFoundException, SQLException{
+    public void setUp() throws ClassNotFoundException, SQLException {
         Class.forName("org.h2.Driver");
-        String url = "jdbc:h2:~/dbs/h2-gen";
+        String url = "jdbc:h2:./target/h2-gen";
         conn = DriverManager.getConnection(url, "sa", "");
         stmt = conn.createStatement();
     }
 
     @After
-    public void tearDown() throws SQLException{
-        try{
+    public void tearDown() throws SQLException {
+        try {
             stmt.close();
-        }finally{
+        } finally {
             conn.close();
         }
     }
 
     @Test
-    public void test() throws SQLException{
+    public void test() throws SQLException {
         stmt.execute("drop table GENERATED_KEYS if exists");
         stmt.execute("create table GENERATED_KEYS(" +
                  "ID int AUTO_INCREMENT PRIMARY KEY, " +
@@ -59,7 +61,7 @@ public void test() throws SQLException{
         ResultSet rs = insertClause.set(entity.name, "Hello").executeWithKeys();
         ResultSetMetaData md = rs.getMetaData();
         System.out.println(md.getColumnName(1));
-        
+
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
         assertFalse(rs.next());
@@ -72,7 +74,7 @@ public void test() throws SQLException{
 
         insertClause = new SQLInsertClause(conn, new H2Templates(), entity);
         assertEquals(3, insertClause.set(entity.name, "World").executeWithKey(entity.id).intValue());
-        
+
         insertClause = new SQLInsertClause(conn, new H2Templates(), entity);
         assertEquals(Collections.singletonList(4), insertClause.set(entity.name, "World").executeWithKeys(entity.id));
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java
new file mode 100644
index 0000000000..dd45c2b213
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java
@@ -0,0 +1,48 @@
+package com.querydsl.sql.h2;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.domain.QSurvey;
+
+public class H2QueryTest {
+
+    private SQLQuery<?> query;
+
+    private QSurvey survey = new QSurvey("survey");
+
+    @Before
+    public void setUp() {
+        query = new SQLQuery(H2Templates.builder().newLineToSingleSpace().build());
+    }
+
+    @Test
+    public void syntax() {
+//        SELECT TOP? [DISTINCT | All]? selectExpression
+//        FROM tableExpression+
+        query.from(survey);
+//        WHERE expression+
+        query.where(survey.name.isNotNull());
+//        GROUP BY expression+
+        query.groupBy(survey.name);
+//        HAVING expression
+        query.having(survey.name.lt(""));
+//        [
+//          UNION ALL?  select ORDER BY order
+//          MINUS
+//          EXCEPT
+//          INTERSECT
+//        ]
+//        LIMIT expression
+        query.limit(2);
+//        OFFSET expression
+        query.offset(3);
+//        SAMPLE_SIZE rowCountInt
+        // TODO
+//        FOR UPDATE
+        query.forUpdate();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java
new file mode 100644
index 0000000000..de297124db
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java
@@ -0,0 +1,47 @@
+package com.querydsl.sql.hsqldb;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.HSQLDBTemplates;
+import com.querydsl.sql.SQLQuery;
+import com.querydsl.sql.domain.QSurvey;
+
+public class HsqldbQueryTest {
+
+    private SQLQuery<?> query;
+
+    private QSurvey survey = new QSurvey("survey");
+
+    @Before
+    public void setUp() {
+        query = new SQLQuery(HSQLDBTemplates.builder().newLineToSingleSpace().build());
+    }
+
+    @Test
+    public void syntax() {
+//        SELECT [{LIMIT <offset> <limit> | TOP <limit>}[2]][ALL | DISTINCT]
+//        { selectExpression | table.* | * } [, ...]
+//        [INTO [CACHED | TEMP  | TEXT][2] newTable]
+//        FROM tableList
+        query.from(survey);
+//        [WHERE Expression]
+        query.where(survey.id.isNotNull());
+//        [GROUP BY Expression [, ...]]
+        query.groupBy(survey.name);
+//        [HAVING Expression]
+        query.having(survey.id.isNotNull());
+//        [{ UNION [ALL | DISTINCT] | {MINUS [DISTINCT] | EXCEPT [DISTINCT] } |
+        // TODO MINUS
+        // TODO EXCEPT
+//        INTERSECT [DISTINCT] } selectStatement]
+        // TODO INTERSECT
+//        [ORDER BY orderExpression [, ...]]
+        query.orderBy(survey.name.asc());
+//        [LIMIT <limit> [OFFSET <offset>]];
+        query.limit(4);
+        query.offset(4);
+
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java
new file mode 100644
index 0000000000..3ce8a9c59a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+import static org.junit.Assert.assertEquals;
+
+import com.querydsl.sql.domain.QEmployee;
+import org.junit.Test;
+
+import com.querydsl.sql.SQLServerTemplates;
+import com.querydsl.sql.domain.QSurvey;
+
+public class SQLServerQueryTest {
+
+    private static final QSurvey survey = QSurvey.survey;
+
+    @Test
+    public void tableHints_single() {
+        SQLServerQuery<?> query = new SQLServerQuery<Void>(null, new SQLServerTemplates());
+        query.from(survey).tableHints(SQLServerTableHints.NOWAIT).where(survey.name.isNull());
+        assertEquals("from SURVEY SURVEY with (NOWAIT)\nwhere SURVEY.NAME is null", query.toString());
+    }
+
+    @Test
+    public void tableHints_multiple() {
+        SQLServerQuery<?> query = new SQLServerQuery<Void>(null, new SQLServerTemplates());
+        query.from(survey).tableHints(SQLServerTableHints.NOWAIT, SQLServerTableHints.NOLOCK).where(survey.name.isNull());
+        assertEquals("from SURVEY SURVEY with (NOWAIT, NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
+    }
+
+    @Test
+    public void tableHints_multiple2() {
+        QSurvey survey2 = new QSurvey("survey2");
+        SQLServerQuery<?> query = new SQLServerQuery<Void>(null, new SQLServerTemplates());
+        query.from(survey).tableHints(SQLServerTableHints.NOWAIT)
+             .from(survey2).tableHints(SQLServerTableHints.NOLOCK)
+             .where(survey.name.isNull());
+        assertEquals("from SURVEY SURVEY with (NOWAIT), SURVEY survey2 with (NOLOCK)\nwhere SURVEY.NAME is null", query.toString());
+    }
+
+
+    @Test
+    public void join_tableHints_single() {
+        QEmployee employee1 = QEmployee.employee;
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLServerQuery<?> query = new SQLServerQuery<Void>(null, new SQLServerTemplates());
+        query.from(employee1).tableHints(SQLServerTableHints.NOLOCK)
+                .join(employee2).tableHints(SQLServerTableHints.NOLOCK)
+                .on(employee1.superiorId.eq(employee2.id));
+        assertEquals("from EMPLOYEE EMPLOYEE with (NOLOCK)\njoin EMPLOYEE employee2 with (NOLOCK)\non EMPLOYEE.SUPERIOR_ID = employee2.ID", query.toString());
+    }
+
+    @Test
+    public void join_tableHints_multiple() {
+        QEmployee employee1 = QEmployee.employee;
+        QEmployee employee2 = new QEmployee("employee2");
+        SQLServerQuery<?> query = new SQLServerQuery<Void>(null, new SQLServerTemplates());
+        query.from(employee1).tableHints(SQLServerTableHints.NOLOCK,SQLServerTableHints.READUNCOMMITTED)
+                .join(employee2).tableHints(SQLServerTableHints.NOLOCK,SQLServerTableHints.READUNCOMMITTED)
+                .on(employee1.superiorId.eq(employee2.id));
+        assertEquals("from EMPLOYEE EMPLOYEE with (NOLOCK, READUNCOMMITTED)\njoin EMPLOYEE employee2 with (NOLOCK, READUNCOMMITTED)\non EMPLOYEE.SUPERIOR_ID = employee2.ID", query.toString());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java
new file mode 100644
index 0000000000..0769202f2a
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mssql;
+
+import static com.querydsl.sql.Constants.employee;
+import static com.querydsl.sql.SQLExpressions.rowNumber;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Expression;
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLSerializer;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.WindowFunction;
+
+public class WindowFunctionTest {
+
+    private static final Configuration configuration = new Configuration(SQLTemplates.DEFAULT);
+
+    private static String toString(Expression<?> e) {
+        return new SQLSerializer(configuration).handle(e).toString();
+    }
+
+//    ROW_NUMBER() OVER (ORDER BY OrderDate) AS 'RowNumber'
+
+//    ROW_NUMBER() OVER (PARTITION BY PostalCode ORDER BY SalesYTD DESC)
+
+    @Test
+    public void mutable() {
+        WindowFunction<Long> rn = rowNumber().over().orderBy(employee.firstname);
+        assertEquals("row_number() over (order by e.FIRSTNAME asc)", toString(rn));
+        assertEquals("row_number() over (order by e.FIRSTNAME asc, e.LASTNAME asc)", toString(rn.orderBy(employee.lastname)));
+    }
+
+    @Test
+    public void orderBy() {
+        assertEquals("row_number() over (order by e.FIRSTNAME asc)",
+            toString(rowNumber().over().orderBy(employee.firstname.asc())));
+
+        assertEquals("row_number() over (order by e.FIRSTNAME asc)",
+            toString(rowNumber().over().orderBy(employee.firstname)));
+
+        assertEquals("row_number() over (order by e.FIRSTNAME asc) as rn",
+            toString(rowNumber().over().orderBy(employee.firstname.asc()).as("rn")));
+
+        assertEquals("row_number() over (order by e.FIRSTNAME desc)",
+            toString(rowNumber().over().orderBy(employee.firstname.desc())));
+    }
+
+    @Test
+    public void partitionBy() {
+        assertEquals("row_number() over (partition by e.LASTNAME order by e.FIRSTNAME asc)",
+            toString(rowNumber().over().partitionBy(employee.lastname).orderBy(employee.firstname.asc())));
+
+        assertEquals("row_number() over (partition by e.LASTNAME, e.FIRSTNAME order by e.FIRSTNAME asc)",
+            toString(rowNumber().over().partitionBy(employee.lastname, employee.firstname).orderBy(employee.firstname.asc())));
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/GeneratedKeysMySQLTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java
similarity index 83%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/mysql/GeneratedKeysMySQLTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java
index f056d55c8a..989816306c 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/GeneratedKeysMySQLTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,21 +11,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.mysql;
+package com.querydsl.sql.mysql;
+
+import static org.junit.Assert.*;
 
 import java.sql.*;
 
-import com.mysema.query.QGeneratedKeysEntity;
-import com.mysema.query.sql.H2Templates;
-import com.mysema.query.sql.dml.SQLInsertClause;
-import com.mysema.testutil.ExternalDB;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import static org.junit.Assert.*;
 
-@Category(ExternalDB.class)
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.QGeneratedKeysEntity;
+import com.querydsl.sql.dml.SQLInsertClause;
+
+@Category(MySQL.class)
 public class GeneratedKeysMySQLTest {
 
     private Connection conn;
@@ -33,7 +35,7 @@ public class GeneratedKeysMySQLTest {
     private Statement stmt;
 
     @Before
-    public void setUp() throws ClassNotFoundException, SQLException{
+    public void setUp() throws ClassNotFoundException, SQLException {
         Class.forName("com.mysql.jdbc.Driver");
         String url = "jdbc:mysql://localhost:3306/querydsl";
         conn = DriverManager.getConnection(url, "querydsl", "querydsl");
@@ -41,16 +43,16 @@ public void setUp() throws ClassNotFoundException, SQLException{
     }
 
     @After
-    public void tearDown() throws SQLException{
-        try{
+    public void tearDown() throws SQLException {
+        try {
             stmt.close();
-        }finally{
+        } finally {
             conn.close();
         }
     }
 
     @Test
-    public void test() throws SQLException{
+    public void test() throws SQLException {
         stmt.execute("drop table if exists GENERATED_KEYS");
         stmt.execute("create table GENERATED_KEYS(" +
                  "ID int AUTO_INCREMENT PRIMARY KEY, " +
@@ -61,7 +63,7 @@ public void test() throws SQLException{
         ResultSet rs = insertClause.set(entity.name, "Hello").executeWithKeys();
         ResultSetMetaData md = rs.getMetaData();
         System.out.println(md.getColumnName(1));
-        
+
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
         assertFalse(rs.next());
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java
new file mode 100644
index 0000000000..aaf729d589
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.mysql;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.SQLExpressions;
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.dml.SQLInsertClause;
+import com.querydsl.sql.domain.QSurvey;
+
+public class MySQLQueryFactoryTest {
+
+    private MySQLQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<Connection> provider = () -> EasyMock.<Connection> createNiceMock(Connection.class);
+        queryFactory = new MySQLQueryFactory(SQLTemplates.DEFAULT, provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QSurvey.survey));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QSurvey.survey));
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QSurvey.survey));
+    }
+
+    @Test
+    public void insertIgnore() {
+        SQLInsertClause clause = queryFactory.insertIgnore(QSurvey.survey);
+        assertEquals("insert ignore into SURVEY\nvalues ()", clause.toString());
+    }
+
+    @Test
+    public void insertOnDuplicateKeyUpdate() {
+        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey, "c = c+1");
+        assertEquals("insert into SURVEY\nvalues () on duplicate key update c = c+1", clause.toString());
+    }
+
+    @Test
+    public void insertOnDuplicateKeyUpdate2() {
+        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey, QSurvey.survey.id.eq(2));
+        assertEquals("insert into SURVEY\nvalues () on duplicate key update SURVEY.ID = ?", clause.toString());
+    }
+
+    @Test
+    public void insertOnDuplicateKeyUpdate_multiple() {
+        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey,
+                SQLExpressions.set(QSurvey.survey.id, 2),
+                SQLExpressions.set(QSurvey.survey.name, "B"));
+        assertEquals("insert into SURVEY\n" +
+                "values () on duplicate key update SURVEY.ID = ?, SURVEY.NAME = ?", clause.toString());
+    }
+
+    @Test
+    public void insertOnDuplicateKeyUpdate_values() {
+        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey,
+                SQLExpressions.set(QSurvey.survey.name, QSurvey.survey.name));
+        assertEquals("insert into SURVEY\n" +
+                "values () on duplicate key update SURVEY.NAME = values(SURVEY.NAME)", clause.toString());
+    }
+
+    @Test
+    public void insertOnDuplicateKeyUpdate_null() {
+        SQLInsertClause clause = queryFactory.insertOnDuplicateKeyUpdate(QSurvey.survey,
+                SQLExpressions.set(QSurvey.survey.name, (String) null));
+        assertEquals("insert into SURVEY\n" +
+                "values () on duplicate key update SURVEY.NAME = null", clause.toString());
+    }
+
+
+    @Test
+    public void replace() {
+        assertNotNull(queryFactory.replace(QSurvey.survey));
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QSurvey.survey));
+    }
+
+    @Test
+    public void merge() {
+        assertNotNull(queryFactory.merge(QSurvey.survey));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java
similarity index 79%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java
index 9a036da342..e3833623ed 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/mysql/MySQLQueryTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.mysql;
+package com.querydsl.sql.mysql;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,26 +20,24 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.query.sql.MySQLTemplates;
-import com.mysema.query.sql.domain.QSurvey;
+import com.querydsl.sql.MySQLTemplates;
+import com.querydsl.sql.domain.QSurvey;
 
 public class MySQLQueryTest {
-    private MySQLQuery query;
+    private MySQLQuery<?> query;
 
     private QSurvey survey = new QSurvey("survey");
 
     @Before
     public void setUp() {
-        query = new MySQLQuery(null, new MySQLTemplates() {{
-            newLineToSingleSpace();
-        }});
+        query = new MySQLQuery<Void>(null, MySQLTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.orderBy(survey.name.asc());
-        query.getMetadata().addProjection(survey.name);
+        query.getMetadata().setProjection(survey.name);
     }
 
     @Test
-    public void Syntax() {
+    public void syntax() {
 //        SELECT
 //        [ALL | DISTINCT | DISTINCTROW ]
 //          [HIGH_PRIORITY]
@@ -82,119 +80,111 @@ public void Syntax() {
     }
 
     @Test
-    public void ForceIndex() {
-        query = new MySQLQuery(null, new MySQLTemplates() {{
-            newLineToSingleSpace();
-        }});
+    public void forceIndex() {
+        query = new MySQLQuery<Void>(null, MySQLTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.forceIndex("col1_index");
         query.orderBy(survey.name.asc());
-        query.getMetadata().addProjection(survey.name);
+        query.getMetadata().setProjection(survey.name);
 
         assertEquals("select survey.NAME from SURVEY survey force index (col1_index) " +
                      "order by survey.NAME asc", toString(query));
     }
 
     @Test
-    public void IgnoreIndex() {
-        query = new MySQLQuery(null, new MySQLTemplates() {{
-            newLineToSingleSpace();
-        }});
+    public void ignoreIndex() {
+        query = new MySQLQuery<Void>(null, MySQLTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.ignoreIndex("col1_index");
         query.orderBy(survey.name.asc());
-        query.getMetadata().addProjection(survey.name);
+        query.getMetadata().setProjection(survey.name);
 
         assertEquals("select survey.NAME from SURVEY survey ignore index (col1_index) " +
                      "order by survey.NAME asc", toString(query));
     }
 
     @Test
-    public void UseIndex() {
-        query = new MySQLQuery(null, new MySQLTemplates() {{
-            newLineToSingleSpace();
-        }});
+    public void useIndex() {
+        query = new MySQLQuery<Void>(null, MySQLTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.useIndex("col1_index");
         query.orderBy(survey.name.asc());
-        query.getMetadata().addProjection(survey.name);
+        query.getMetadata().setProjection(survey.name);
 
         assertEquals("select survey.NAME from SURVEY survey use index (col1_index) " +
                      "order by survey.NAME asc", toString(query));
     }
 
     @Test
-    public void UseIndex2() {
-        query = new MySQLQuery(null, new MySQLTemplates() {{
-            newLineToSingleSpace();
-        }});
+    public void useIndex2() {
+        query = new MySQLQuery<Void>(null, MySQLTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.useIndex("col1_index","col2_index");
         query.orderBy(survey.name.asc());
-        query.getMetadata().addProjection(survey.name);
+        query.getMetadata().setProjection(survey.name);
 
         assertEquals("select survey.NAME from SURVEY survey use index (col1_index, col2_index) " +
                      "order by survey.NAME asc", toString(query));
     }
 
     @Test
-    public void HighPriority() {
+    public void highPriority() {
         query.highPriority();
         assertEquals("select high_priority survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void StraightJoin() {
+    public void straightJoin() {
         query.straightJoin();
         assertEquals("select straight_join survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void SmallResult() {
+    public void smallResult() {
         query.smallResult();
         assertEquals("select sql_small_result survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void BigResult() {
+    public void bigResult() {
         query.bigResult();
         assertEquals("select sql_big_result survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void BufferResult() {
+    public void bufferResult() {
         query.bufferResult();
         assertEquals("select sql_buffer_result survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void Cache() {
+    public void cache() {
         query.cache();
         assertEquals("select sql_cache survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void NoCache() {
+    public void noCache() {
         query.noCache();
         assertEquals("select sql_no_cache survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void CalcFoundRows() {
+    public void calcFoundRows() {
         query.calcFoundRows();
         assertEquals("select sql_calc_found_rows survey.NAME from SURVEY survey order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void WithRollup() {
+    public void withRollup() {
         query.groupBy(survey.name);
         query.withRollup();
         assertEquals("select survey.NAME from SURVEY survey group by survey.NAME with rollup  order by survey.NAME asc",
@@ -202,14 +192,14 @@ public void WithRollup() {
     }
 
     @Test
-    public void ForUpdate() {
+    public void forUpdate() {
         query.forUpdate();
         assertEquals("select survey.NAME from SURVEY survey order by survey.NAME asc for update",
                 toString(query));
     }
 
     @Test
-    public void ForUpdate_With_Limit() {
+    public void forUpdate_with_limit() {
         query.forUpdate();
         query.limit(2);
         assertEquals("select survey.NAME from SURVEY survey order by survey.NAME asc limit ? for update",
@@ -217,34 +207,34 @@ public void ForUpdate_With_Limit() {
     }
 
     @Test
-    public void IntoOutfile() {
+    public void intoOutfile() {
         query.intoOutfile(new File("target/out"));
         assertEquals("select survey.NAME from SURVEY survey " +
                      "order by survey.NAME asc into outfile 'target" + File.separator + "out'", toString(query));
     }
 
     @Test
-    public void IntoDumpfile() {
+    public void intoDumpfile() {
         query.intoDumpfile(new File("target/out"));
         assertEquals("select survey.NAME from SURVEY survey " +
                      "order by survey.NAME asc into dumpfile 'target" + File.separator + "out'", toString(query));
     }
 
     @Test
-    public void IntoString() {
+    public void intoString() {
         query.into("var1");
         assertEquals("select survey.NAME from SURVEY survey " +
                      "order by survey.NAME asc into var1", toString(query));
     }
 
     @Test
-    public void LockInShareMode() {
+    public void lockInShareMode() {
         query.lockInShareMode();
         assertEquals("select survey.NAME from SURVEY survey " +
                      "order by survey.NAME asc lock in share mode", toString(query));
     }
 
-    private String toString(MySQLQuery query) {
+    private String toString(MySQLQuery<?> query) {
         return query.toString().replace('\n', ' ');
     }
 
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleGrammarTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java
similarity index 86%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleGrammarTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java
index 2612d3a305..ce938ff55b 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleGrammarTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Mysema Ltd
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.oracle;
+package com.querydsl.sql.oracle;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -20,7 +20,7 @@
 public class OracleGrammarTest {
 
     @Test
-    public void Constants() {
+    public void constants() {
         assertNotNull(OracleGrammar.level);
         assertNotNull(OracleGrammar.rownum);
         assertNotNull(OracleGrammar.sysdate);
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java
new file mode 100644
index 0000000000..aa560c0910
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.oracle;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.domain.QSurvey;
+
+public class OracleQueryFactoryTest {
+
+    private OracleQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<Connection> provider = () -> EasyMock.<Connection> createNiceMock(Connection.class);
+        queryFactory = new OracleQueryFactory(SQLTemplates.DEFAULT, provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QSurvey.survey));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QSurvey.survey));
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QSurvey.survey));
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QSurvey.survey));
+    }
+
+    @Test
+    public void merge() {
+        assertNotNull(queryFactory.merge(QSurvey.survey));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java
similarity index 75%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java
index 0e9d6aae25..90bb1c1d01 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/oracle/OracleQueryTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2011, Mysema Ltd
- * 
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,68 +11,66 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mysema.query.sql.oracle;
+package com.querydsl.sql.oracle;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mysema.query.sql.OracleTemplates;
-import com.mysema.query.sql.domain.QSurvey;
+import com.querydsl.sql.OracleTemplates;
+import com.querydsl.sql.domain.QSurvey;
 
 public class OracleQueryTest {
-    
-    private OracleQuery query;
-    
+
+    private OracleQuery<?> query;
+
     private QSurvey survey = new QSurvey("survey");
-    
+
     @Before
     public void setUp() {
-        query = new OracleQuery(null, new OracleTemplates() {{
-            newLineToSingleSpace();
-        }});
+        query = new OracleQuery<Void>(null, OracleTemplates.builder().newLineToSingleSpace().build());
         query.from(survey);
         query.orderBy(survey.name.asc());
-    }    
+    }
 
     @Test
-    public void ConnectByPrior() {
+    public void connectByPrior() {
         query.connectByPrior(survey.name.isNull());
-        assertEquals("from SURVEY survey connect by prior survey.NAME is null order by survey.NAME asc", 
+        assertEquals("from SURVEY survey connect by prior survey.NAME is null order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void ConnectBy() {
+    public void connectBy() {
         query.connectByPrior(survey.name.isNull());
         assertEquals("from SURVEY survey connect by prior survey.NAME is null order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void ConnectByNocyclePrior() {
+    public void connectByNocyclePrior() {
         query.connectByNocyclePrior(survey.name.isNull());
         assertEquals("from SURVEY survey connect by nocycle prior survey.NAME is null order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void StartWith() {
+    public void startWith() {
         query.startWith(survey.name.isNull());
-        assertEquals("from SURVEY survey start with survey.NAME is null order by survey.NAME asc", 
+        assertEquals("from SURVEY survey start with survey.NAME is null order by survey.NAME asc",
                 toString(query));
     }
 
     @Test
-    public void OrderSiblingsBy() {
+    public void orderSiblingsBy() {
         query.orderSiblingsBy(survey.name);
-        assertEquals("from SURVEY survey order siblings by survey.NAME order by survey.NAME asc", 
+        assertEquals("from SURVEY survey order siblings by survey.NAME order by survey.NAME asc",
                 toString(query));
     }
-    
+
     @Test
-    public void RowNum() {
+    public void rowNum() {
         query.where(OracleGrammar.rownum.lt(5));
         assertEquals("from SURVEY survey where rownum < ? order by survey.NAME asc", toString(query));
     }
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java
new file mode 100644
index 0000000000..1627c716c6
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.postgresql;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.SQLTemplates;
+import com.querydsl.sql.domain.QSurvey;
+
+public class PostgreSQLQueryFactoryTest {
+
+    private PostgreSQLQueryFactory queryFactory;
+
+    @Before
+    public void setUp() {
+        Supplier<Connection> provider = () -> EasyMock.<Connection> createNiceMock(Connection.class);
+        queryFactory = new PostgreSQLQueryFactory(SQLTemplates.DEFAULT, provider);
+    }
+
+    @Test
+    public void query() {
+        assertNotNull(queryFactory.query());
+    }
+
+    @Test
+    public void from() {
+        assertNotNull(queryFactory.from(QSurvey.survey));
+    }
+
+    @Test
+    public void delete() {
+        assertNotNull(queryFactory.delete(QSurvey.survey));
+    }
+
+    @Test
+    public void insert() {
+        assertNotNull(queryFactory.insert(QSurvey.survey));
+    }
+
+    @Test
+    public void update() {
+        assertNotNull(queryFactory.update(QSurvey.survey));
+    }
+
+    @Test
+    public void merge() {
+        assertNotNull(queryFactory.merge(QSurvey.survey));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java
new file mode 100644
index 0000000000..66ce6e4e5e
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java
@@ -0,0 +1,108 @@
+package com.querydsl.sql.postgresql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.PostgreSQLTemplates;
+import com.querydsl.sql.domain.QEmployee;
+import com.querydsl.sql.domain.QSurvey;
+
+public class PostgreSQLQueryTest {
+
+    private PostgreSQLQuery<?> query;
+
+    private QSurvey survey = new QSurvey("survey");
+
+    private QEmployee employee = new QEmployee("employee");
+
+    @Before
+    public void setUp() {
+        query = new PostgreSQLQuery<Void>(null, PostgreSQLTemplates.builder().newLineToSingleSpace().build());
+    }
+
+    @Test
+    public void syntax() {
+//        [ WITH [ RECURSIVE ] with_query [, ...] ]
+//        SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]
+        query.distinctOn(survey.name);
+//            * | expression [ [ AS ] output_name ] [, ...]
+//            [ FROM from_item [, ...] ]
+        query.from(survey);
+//            [ WHERE condition ]
+        query.where(survey.name.isNull());
+//            [ GROUP BY expression [, ...] ]
+        query.groupBy(survey.name);
+//            [ HAVING condition [, ...] ]
+        query.having(survey.id.isNotNull());
+//            [ WINDOW window_name AS ( window_definition ) [, ...] ]
+        // TODO
+//            [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]
+        // TODO INTERSECT
+        // TODO EXCEPT
+//            [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]
+        query.orderBy(survey.name.asc());
+//            [ LIMIT { count | ALL } ]
+        query.limit(4);
+//            [ OFFSET start [ ROW | ROWS ] ]
+        query.offset(4);
+//            [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]
+//            [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]
+        query.forUpdate();
+        query.forShare();
+        query.noWait();
+
+        query.forUpdate().of(survey);
+
+//        where from_item can be one of:
+//
+//            [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+//            ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]
+//            with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+//            function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias [, ...] | column_definition [, ...] ) ]
+//            function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )
+//            from_item [ NATURAL ] join_type from_item [ ON join_condition | USING ( join_column [, ...] ) ]
+//
+//        and with_query is:
+//
+//            with_query_name [ ( column_name [, ...] ) ] AS ( select )
+//
+//        TABLE { [ ONLY ] table_name [ * ] | with_query_name }
+    }
+
+    @Test
+    public void forShare() {
+        query.from(survey).forShare();
+        assertEquals("from SURVEY survey for share", toString(query));
+    }
+
+    @Test
+    public void forUpDate_noWait() {
+        query.from(survey).forUpdate().noWait();
+        assertEquals("from SURVEY survey for update nowait", toString(query));
+    }
+
+    @Test
+    public void forUpdate_of() {
+        query.from(survey).forUpdate().of(survey);
+        assertEquals("from SURVEY survey for update of SURVEY", toString(query));
+    }
+
+    @Test
+    public void distinct_on() {
+        query.from(employee)
+            .distinctOn(employee.datefield, employee.timefield)
+            .orderBy(employee.datefield.asc(), employee.timefield.asc(), employee.salary.asc())
+            .select(employee.id);
+
+        assertEquals(
+            "select distinct on(employee.DATEFIELD, employee.TIMEFIELD) employee.ID from EMPLOYEE employee order by employee.DATEFIELD asc, employee.TIMEFIELD asc, employee.SALARY asc",
+            toString(query));
+    }
+
+    private String toString(PostgreSQLQuery query) {
+        return query.toString().replace('\n', ' ');
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java
new file mode 100644
index 0000000000..5fbfcb493e
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java
@@ -0,0 +1,19 @@
+package com.querydsl.sql.suites;
+
+import java.sql.SQLException;
+
+import org.junit.AfterClass;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import com.querydsl.sql.Connections;
+
+@RunWith(Enclosed.class)
+public abstract class AbstractSuite {
+
+    @AfterClass
+    public static void tearDown() throws SQLException {
+        Connections.close();
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java
new file mode 100644
index 0000000000..eb789bddce
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java
@@ -0,0 +1,33 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.CUBRID;
+import com.querydsl.sql.*;
+
+@Ignore
+@Category(CUBRID.class)
+public class CUBRIDLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initCubrid();
+        Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java
new file mode 100644
index 0000000000..5539155332
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.CUBRID;
+import com.querydsl.sql.*;
+
+@Ignore
+@Category(CUBRID.class)
+public class CUBRIDSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initCubrid();
+        Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java
new file mode 100644
index 0000000000..f2ab9148f2
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.DB2;
+import com.querydsl.sql.*;
+
+@Category(DB2.class)
+public class DB2LiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDB2();
+        Connections.initConfiguration(DB2Templates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java
new file mode 100644
index 0000000000..210aa64dc5
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.DB2;
+import com.querydsl.sql.*;
+
+@Category(DB2.class)
+public class DB2SuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDB2();
+        Connections.initConfiguration(DB2Templates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java
new file mode 100644
index 0000000000..848f4fc692
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.sql.*;
+
+@Category(Derby.class)
+public class DerbyLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDerby();
+        Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java
new file mode 100644
index 0000000000..d2228478c3
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Derby;
+import com.querydsl.sql.*;
+
+@Category(Derby.class)
+public class DerbySuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initDerby();
+        Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java
new file mode 100644
index 0000000000..9cf32bbb85
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Firebird;
+import com.querydsl.sql.*;
+
+@Category(Firebird.class)
+public class FirebirdLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initFirebird();
+        Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java
new file mode 100644
index 0000000000..1a1f1cd99b
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Firebird;
+import com.querydsl.sql.*;
+
+@Category(Firebird.class)
+public class FirebirdSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initFirebird();
+        Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build());
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java
new file mode 100644
index 0000000000..2d0e33dc78
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java
@@ -0,0 +1,72 @@
+package com.querydsl.sql.suites;
+
+import com.querydsl.core.QueryException;
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.AbstractBaseTest;
+import com.querydsl.sql.Connections;
+import com.querydsl.sql.DefaultSQLExceptionTranslator;
+import com.querydsl.sql.H2Templates;
+import com.querydsl.sql.SQLExceptionTranslator;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.sql.SQLException;
+
+import static com.querydsl.sql.domain.QSurvey.survey;
+import static org.hamcrest.Matchers.emptyArray;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
+@Category(H2.class)
+public class H2ExceptionSuiteTest extends AbstractBaseTest {
+
+    private static final SQLExceptionTranslator exceptionTranslator = DefaultSQLExceptionTranslator.DEFAULT;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2Templates.builder().build());
+
+        Connections.getConnection().createStatement()
+                .execute("ALTER TABLE SURVEY ADD CONSTRAINT UNIQUE_ID UNIQUE(ID)");
+    }
+
+    public static void tearDown() throws Exception {
+        Connections.getConnection().createStatement()
+                .execute("ALTER TABLE SURVEY DROP CONSTRAINT UNIQUE_ID");
+    }
+
+    @Test
+    public void sQLExceptionCreationTranslated() {
+        SQLException e1 = new SQLException("Exception #1", "42001", 181);
+        SQLException e2 = new SQLException("Exception #2", "HY000", 1030);
+        e1.setNextException(e2);
+        SQLException sqlException = new SQLException("Batch operation failed");
+        sqlException.setNextException(e1);
+        RuntimeException result = exceptionTranslator.translate(sqlException);
+        inspectExceptionResult(result);
+    }
+
+    @Test
+    public void updateBatchFailed() {
+        execute(insert(survey).columns(survey.name, survey.name2)
+                .values("New Survey", "New Survey"));
+        Exception result = null;
+        try {
+            execute(update(survey)
+                    .set(survey.id, 1).addBatch()
+                    .set(survey.id, 2).addBatch());
+        } catch (QueryException e) {
+            result = e;
+        }
+        assertNotNull(result);
+        inspectExceptionResult(result);
+    }
+
+    private void inspectExceptionResult(Exception result) {
+        assertThat(result.getSuppressed(), is(not(emptyArray())));
+    }
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java
new file mode 100644
index 0000000000..7c5b0bc2f7
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.*;
+
+@Category(H2.class)
+public class H2LiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java
new file mode 100644
index 0000000000..f6b9640116
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.*;
+
+@Category(H2.class)
+public class H2SuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java
new file mode 100644
index 0000000000..11ef094dce
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.*;
+
+@Category(H2.class)
+public class H2WithQuotingTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2Templates.builder().quote().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java
new file mode 100644
index 0000000000..eccba6c754
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.H2;
+import com.querydsl.sql.*;
+
+@Category(H2.class)
+public class H2WithSchemaTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initH2();
+        Connections.initConfiguration(H2Templates.builder().printSchema().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java
new file mode 100644
index 0000000000..7cc5a06896
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.HSQLDB;
+import com.querydsl.sql.*;
+
+@Category(HSQLDB.class)
+public class HsqldbLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initHSQL();
+        Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java
new file mode 100644
index 0000000000..6c3845b2cd
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.HSQLDB;
+import com.querydsl.sql.*;
+
+@Category(HSQLDB.class)
+public class HsqldbSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initHSQL();
+        Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..351dbcab23
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.sql.*;
+
+@Category(SQLServer.class)
+public class MSSQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLServer();
+        Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java
new file mode 100644
index 0000000000..3da1326936
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLServer;
+import com.querydsl.sql.*;
+
+@Category(SQLServer.class)
+public class MSSQLSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLServer();
+        Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..7f19e44a73
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.*;
+
+@Category(MySQL.class)
+public class MySQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectMySQL extends SelectMySQLBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initMySQL();
+        Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java
new file mode 100644
index 0000000000..c3b57401ce
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.*;
+
+@Category(MySQL.class)
+public class MySQLSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectMySQL extends SelectMySQLBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initMySQL();
+        Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java
new file mode 100644
index 0000000000..119bf80f81
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.MySQL;
+import com.querydsl.sql.*;
+
+@Category(MySQL.class)
+public class MySQLWithQuotingTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initMySQL();
+        Connections.initConfiguration(MySQLTemplates.builder().quote().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java
new file mode 100644
index 0000000000..bb8cbd85c3
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java
@@ -0,0 +1,33 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Oracle;
+import com.querydsl.sql.*;
+
+@Category(Oracle.class)
+public class OracleLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectOracle extends SelectOracleBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initOracle();
+        Connections.initConfiguration(OracleTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java
new file mode 100644
index 0000000000..d689315ed9
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java
@@ -0,0 +1,32 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Oracle;
+import com.querydsl.sql.*;
+
+@Category(Oracle.class)
+public class OracleSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectOracle extends SelectOracleBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initOracle();
+        Connections.initConfiguration(OracleTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java
new file mode 100644
index 0000000000..2d436cce07
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.Oracle;
+import com.querydsl.sql.*;
+
+@Category(Oracle.class)
+public class OracleWithQuotingTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initOracle();
+        Connections.initConfiguration(OracleTemplates.builder().quote().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java
new file mode 100644
index 0000000000..2bbfc6eadf
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java
@@ -0,0 +1,51 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.sql.*;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase {
+
+        private Configuration previous;
+
+        @Override
+        public void setUp() throws Exception {
+            //NOTE: replacing the templates with a non-quoting one
+            previous = configuration;
+            configuration = new Configuration(PostgreSQLTemplates.builder().newLineToSingleSpace().build());
+            super.setUp();
+        }
+
+        @Override
+        public void tearDown() throws Exception {
+            super.tearDown();
+            //NOTE: restoring old templates
+            configuration = previous;
+        }
+
+    }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initPostgreSQL();
+        Connections.initConfiguration(PostgreSQLTemplates.builder().quote().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java
new file mode 100644
index 0000000000..6e3d19edde
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java
@@ -0,0 +1,50 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.PostgreSQL;
+import com.querydsl.sql.*;
+
+@Category(PostgreSQL.class)
+public class PostgreSQLSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase {
+
+        private Configuration previous;
+
+        @Override
+        public void setUp() throws Exception {
+            //NOTE: replacing the templates with a non-quoting one
+            previous = configuration;
+            configuration = new Configuration(PostgreSQLTemplates.builder().newLineToSingleSpace().build());
+            super.setUp();
+        }
+
+        @Override
+        public void tearDown() throws Exception {
+            super.tearDown();
+            //NOTE: restoring old templates
+            configuration = previous;
+        }
+
+    }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class SelectWindowFunctions extends SelectWindowFunctionsBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initPostgreSQL();
+        Connections.initConfiguration(PostgreSQLTemplates.builder().quote().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java
new file mode 100644
index 0000000000..c313009a91
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java
@@ -0,0 +1,31 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLite;
+import com.querydsl.sql.*;
+
+@Category(SQLite.class)
+public class SQLiteLiteralsSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLite();
+        Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build());
+        Connections.getConfiguration().setUseLiterals(true);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java
new file mode 100644
index 0000000000..66ac3a0dc1
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java
@@ -0,0 +1,30 @@
+package com.querydsl.sql.suites;
+
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import com.querydsl.core.testutil.SQLite;
+import com.querydsl.sql.*;
+
+@Category(SQLite.class)
+public class SQLiteSuiteTest extends AbstractSuite {
+
+    public static class BeanPopulation extends BeanPopulationBase { }
+    public static class Delete extends DeleteBase { }
+    public static class Insert extends InsertBase { }
+    public static class KeywordQuoting extends KeywordQuotingBase { }
+    public static class LikeEscape extends LikeEscapeBase { }
+    public static class Merge extends MergeBase { }
+    public static class Select extends SelectBase { }
+    public static class Subqueries extends SubqueriesBase { }
+    public static class Types extends TypesBase { }
+    public static class Union extends UnionBase { }
+    public static class Update extends UpdateBase { }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        Connections.initSQLite();
+        Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java
new file mode 100644
index 0000000000..580393c4cb
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java
@@ -0,0 +1,56 @@
+package com.querydsl.sql.teradata;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.querydsl.sql.Configuration;
+import com.querydsl.sql.SQLTemplates;
+
+public class SetQueryBandClauseTest {
+
+    private Configuration conf;
+
+    private SetQueryBandClause clause;
+
+    @Before
+    public void setUp() {
+        conf = new Configuration(SQLTemplates.DEFAULT);
+        conf.setUseLiterals(true);
+        clause = new SetQueryBandClause((Connection) null, conf);
+    }
+
+    @Test
+    public void toString_() {
+        clause.set("a", "b");
+        assertEquals("set query_band='a=b;' for session", clause.toString());
+    }
+
+    @Test
+    public void toString2() {
+        conf.setUseLiterals(false);
+        clause.set("a", "b");
+        clause.forTransaction();
+        assertEquals("set query_band=? for transaction", clause.toString());
+    }
+
+    @Test
+    public void forTransaction() {
+        clause.forTransaction();
+        clause.set("a", "b");
+        clause.set("b", "c");
+        assertEquals("set query_band='a=b;b=c;' for transaction", clause.toString());
+    }
+
+    @Test
+    public void getSQL() {
+        clause.forTransaction();
+        clause.set("a", "b");
+        clause.set("b", "c");
+        assertEquals("set query_band='a=b;b=c;' for transaction", clause.getSQL().get(0).getSQL());
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java
new file mode 100644
index 0000000000..a3cf601370
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java
@@ -0,0 +1,106 @@
+package com.querydsl.sql.types;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertSame;
+
+import java.sql.Array;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+public class ArrayTypeTest {
+
+    @Test
+    public void set_object_array() throws SQLException {
+        Integer[] value = new Integer[] {1, 2, 3};
+        ArrayType<Integer[]> type = new ArrayType<>(Integer[].class, "INTEGER ARRAY");
+        
+        Array arr = EasyMock.createMock(Array.class);
+        Connection conn = EasyMock.createMock(Connection.class);
+        PreparedStatement stmt = EasyMock.createMock(PreparedStatement.class);
+        EasyMock.expect(stmt.getConnection()).andStubReturn(conn);
+        EasyMock.expect(conn.createArrayOf("INTEGER ARRAY", value)).andReturn(arr);
+        stmt.setArray(1, arr);
+        EasyMock.replay(arr, conn, stmt);
+        
+        type.setValue(stmt, 1, value);
+        
+        EasyMock.verify(arr, conn, stmt);
+    }
+    
+    @Test
+    public void set_primitive_array() throws SQLException {
+        int[] value = new int[] {1, 2, 3};
+        Integer[] boxedValue = new Integer[] {1, 2, 3};
+        ArrayType<int[]> type = new ArrayType<>(int[].class, "INTEGER ARRAY");
+        
+        Array arr = EasyMock.createMock(Array.class);
+        Connection conn = EasyMock.createMock(Connection.class);
+        PreparedStatement stmt = EasyMock.createMock(PreparedStatement.class);
+        EasyMock.expect(stmt.getConnection()).andStubReturn(conn);
+        EasyMock.expect(conn.createArrayOf("INTEGER ARRAY", boxedValue)).andReturn(arr);
+        stmt.setArray(1, arr);
+        EasyMock.replay(arr, conn, stmt);
+        
+        type.setValue(stmt, 1, value);
+        
+        EasyMock.verify(arr, conn, stmt);
+    }
+    
+    @Test
+    public void get_typed_object_array() throws SQLException {
+        Integer[] value = new Integer[] {1, 2, 3};
+        ArrayType<Integer[]> type = new ArrayType<>(Integer[].class, "INTEGER ARRAY");
+        
+        ResultSet rs = EasyMock.createMock(ResultSet.class);
+        Array arr = EasyMock.createMock(Array.class);
+        EasyMock.expect(rs.getArray(1)).andReturn(arr);
+        EasyMock.expect(arr.getArray()).andReturn(value);
+        EasyMock.replay(rs, arr);
+        
+        Integer[] result = type.getValue(rs, 1);
+        assertSame(value, result);
+        
+        EasyMock.verify(rs, arr);
+    }
+    
+    @Test
+    public void get_generic_object_array() throws SQLException {
+        Object[] value = new Object[] {1, 2, 3};
+        ArrayType<Integer[]> type = new ArrayType<>(Integer[].class, "INTEGER ARRAY");
+        
+        ResultSet rs = EasyMock.createMock(ResultSet.class);
+        Array arr = EasyMock.createMock(Array.class);
+        EasyMock.expect(rs.getArray(1)).andReturn(arr);
+        EasyMock.expect(arr.getArray()).andReturn(value);
+        EasyMock.replay(rs, arr);
+        
+        Integer[] result = type.getValue(rs, 1);
+        assertArrayEquals(value, result);
+        
+        EasyMock.verify(rs, arr);
+    }
+    
+    @Test
+    public void get_primitive_array() throws SQLException {
+        int[] value = new int[] {1, 2, 3};
+        Integer[] boxedValue = new Integer[] {1, 2, 3};
+        ArrayType<Integer[]> type = new ArrayType<>(Integer[].class, "INTEGER ARRAY");
+        
+        ResultSet rs = EasyMock.createMock(ResultSet.class);
+        Array arr = EasyMock.createMock(Array.class);
+        EasyMock.expect(rs.getArray(1)).andReturn(arr);
+        EasyMock.expect(arr.getArray()).andReturn(value);
+        EasyMock.replay(rs, arr);
+        
+        Integer[] result = type.getValue(rs, 1);
+        assertArrayEquals(boxedValue, result);
+        
+        EasyMock.verify(rs, arr);
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/types/LocalDateTimeTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java
similarity index 88%
rename from querydsl-sql/src/test/java/com/mysema/query/sql/types/LocalDateTimeTest.java
rename to querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java
index 4bdafc1d89..0834a25f15 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/sql/types/LocalDateTimeTest.java
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java
@@ -1,4 +1,4 @@
-package com.mysema.query.sql.types;
+package com.querydsl.sql.types;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -13,8 +13,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.mysema.query.sql.types.LocalDateTimeType;
-
 public class LocalDateTimeTest {
 
     private static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
@@ -27,7 +25,7 @@ public static void setUpClass() {
     }
 
     @Test
-    public void Set() throws SQLException {
+    public void set() throws SQLException {
         LocalDateTime value = new LocalDateTime();
         DateTime dt = value.toDateTime(DateTimeZone.UTC);
         Timestamp ts = new Timestamp(dt.getMillis());
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java
new file mode 100644
index 0000000000..fc0e0a2834
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java
@@ -0,0 +1,29 @@
+package com.querydsl.sql.types;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class LocaleTypeTest {
+
+    @Test
+    public void lang() {
+        Locale l = new Locale("en");
+        assertEquals(l, LocaleType.toLocale(l.toString()));
+    }
+
+    @Test
+    public void lang_country() {
+        Locale l = new Locale("en", "US");
+        assertEquals(l, LocaleType.toLocale(l.toString()));
+    }
+
+    @Test
+    public void lang_country_variant() {
+        Locale l = new Locale("en", "US", "X");
+        assertEquals(l, LocaleType.toLocale(l.toString()));
+    }
+
+}
diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java
new file mode 100644
index 0000000000..10258a2b87
--- /dev/null
+++ b/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.querydsl.sql.types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.*;
+import java.util.*;
+
+import org.easymock.EasyMock;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalDateTime;
+import org.joda.time.LocalTime;
+import org.junit.Test;
+
+import com.mysema.commons.lang.Pair;
+
+public class TypeTest implements InvocationHandler {
+
+    public enum Gender {
+        MALE, FEMALE
+    }
+
+    private Object value;
+
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if (method.getName().equals("wasNull")) {
+            return value == null;
+        } else if (method.getName().startsWith("get")) {
+            if (method.getReturnType().isPrimitive() && value == null) {
+                Class<?> rt = method.getReturnType();
+                if (rt == Byte.TYPE) {
+                    return (byte) 0;
+                } else if (rt == Short.TYPE) {
+                    return (short) 0;
+                } else if (rt == Integer.TYPE) {
+                    return 0;
+                } else if (rt == Long.TYPE) {
+                    return 0L;
+                } else if (rt == Float.TYPE) {
+                    return 0.0f;
+                } else if (rt == Double.TYPE) {
+                    return 0.0;
+                } else if (rt == Boolean.TYPE) {
+                    return Boolean.FALSE;
+                } else if (rt == Character.TYPE) {
+                    return (char) 0;
+                }
+            }
+            return value;
+        } else {
+            value = args[1];
+            return null;
+        }
+    }
+
+    private final ResultSet resultSet = (ResultSet) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{ResultSet.class}, this);
+
+    private final PreparedStatement statement = (PreparedStatement) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{PreparedStatement.class}, this);
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void test() throws MalformedURLException, SQLException {
+        List<Pair<?,?>> valueAndType = new ArrayList<Pair<?,?>>();
+        valueAndType.add(Pair.of(new BigDecimal("1"), new BigDecimalType()));
+        valueAndType.add(Pair.of(new BigInteger("2"), new BigIntegerType()));
+        valueAndType.add(Pair.of(new BigDecimal("1.0"), new BigDecimalAsDoubleType()));
+        valueAndType.add(Pair.of(new BigInteger("2"), new BigIntegerAsLongType()));
+        //valueAndType.add(Pair.of(Boolean.TRUE,         new BooleanType()));
+        valueAndType.add(Pair.of((byte) 1,   new ByteType()));
+        valueAndType.add(Pair.of(new byte[0],         new BytesType()));
+        valueAndType.add(Pair.of(Calendar.getInstance(), new CalendarType()));
+        valueAndType.add(Pair.of('c',  new CharacterType()));
+        valueAndType.add(Pair.of(Currency.getInstance("EUR"), new CurrencyType()));
+        valueAndType.add(Pair.of(new java.sql.Date(0),new DateType()));
+        valueAndType.add(Pair.of(1.0,       new DoubleType()));
+        valueAndType.add(Pair.of(1.0f,        new FloatType()));
+        valueAndType.add(Pair.of(1,      new IntegerType()));
+        valueAndType.add(Pair.of(true,                    new NumericBooleanType()));
+        valueAndType.add(Pair.of(1L,         new LongType()));
+        valueAndType.add(Pair.of(new Object(),        new ObjectType()));
+        valueAndType.add(Pair.of((short) 1, new ShortType()));
+        valueAndType.add(Pair.of("",                   new StringType()));
+        valueAndType.add(Pair.of(true,                 new TrueFalseType()));
+        valueAndType.add(Pair.of(true,                 new YesNoType()));
+        valueAndType.add(Pair.of(new Timestamp(0),    new TimestampType()));
+        valueAndType.add(Pair.of(new Time(0),         new TimeType()));
+        valueAndType.add(Pair.of(new URL("http://www.mysema.com"), new URLType()));
+        valueAndType.add(Pair.of(new java.util.Date(),new UtilDateType()));
+
+        valueAndType.add(Pair.of(new DateTime(),      new DateTimeType()));
+        valueAndType.add(Pair.of(new LocalDateTime(), new LocalDateTimeType()));
+        valueAndType.add(Pair.of(new LocalDate(),     new LocalDateType()));
+        valueAndType.add(Pair.of(new LocalTime(),     new LocalTimeType()));
+
+        valueAndType.add(Pair.of(Gender.MALE,         new EnumByNameType<Gender>(Gender.class)));
+        valueAndType.add(Pair.of(Gender.MALE,         new EnumByOrdinalType<Gender>(Gender.class)));
+
+        valueAndType.add(Pair.of(EasyMock.createNiceMock(Blob.class), new BlobType()));
+        valueAndType.add(Pair.of(EasyMock.createNiceMock(Clob.class), new ClobType()));
+
+        valueAndType.add(Pair.of(UUID.randomUUID(),   new UtilUUIDType(true)));
+        valueAndType.add(Pair.of(UUID.randomUUID(),   new UtilUUIDType(false)));
+
+        for (Pair pair : valueAndType) {
+            value = null;
+            Type type = (Type) pair.getSecond();
+            assertNull(type.toString(),   type.getValue(resultSet, 0));
+            type.setValue(statement, 0, pair.getFirst());
+            assertEquals(type.toString(), pair.getFirst(), type.getValue(resultSet, 0));
+        }
+    }
+
+
+}
diff --git a/querydsl-sql/src/test/resources/log4j.properties b/querydsl-sql/src/test/resources/log4j.properties
index d03c22d72e..b898adda1c 100644
--- a/querydsl-sql/src/test/resources/log4j.properties
+++ b/querydsl-sql/src/test/resources/log4j.properties
@@ -2,10 +2,10 @@
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 #log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%5p [%d{yyyy-MM-dd HH:mm:ss}] (%F:%L) - %m %X%n
 
 ### set log levels - for more verbose logging change 'info' to 'debug' ###
 
 log4j.rootLogger=WARN, stdout
 
-#log4j.logger.com.mysema.query.sql=DEBUG
\ No newline at end of file
+#log4j.logger.com.querydsl.sql=DEBUG
\ No newline at end of file
diff --git a/querydsl-sql/template.mf b/querydsl-sql/template.mf
deleted file mode 100644
index 4236d60490..0000000000
--- a/querydsl-sql/template.mf
+++ /dev/null
@@ -1,17 +0,0 @@
-Bundle-SymbolicName: com.mysema.querydsl.sql
-Bundle-Name: Querydsl SQL
-Bundle-Vendor: Mysema
-Bundle-ManifestVersion: 2
-Excluded-Imports: com.infradna.tool.bridge_method_injector, org.postgis, org.geolatte.*, oracle.*, com.vividsolutions.jts.*
-Import-Template:
-  com.mysema.commons.lang.*;version="${mysema.lang.version}",
-  com.mysema.query.*;version="${project.version}",   
-  com.mysema.util.*;version="${project.version}",
-  javax.annotation.*;version="0",
-  javax.inject.*;version="0",
-  javax.sql.*;version="0",
-  javax.validation.*;version="1.0.0",
-  com.google.common.*;version="${guava.version}",
-  org.joda.time.*;version="1.6",
-  org.slf4j.*;version="${slf4j.version}"
-  
\ No newline at end of file
diff --git a/release.sh b/release.sh
new file mode 100755
index 0000000000..cbdd45d8f3
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+set -e
+
+VERSION=$2
+TAG=QUERYDSL_`sed 's/\./_/g' <<< $VERSION`
+
+pre() {
+  git checkout master
+  git pull
+  mvn -Pall,docs versions:set -DgenerateBackupPoms=false -DnewVersion=$VERSION
+  sed -i '' "s/4\..\../$VERSION/" querydsl-docs/src/main/docbook/en-US/Querydsl_Reference.xml
+  git checkout -b querydsl-$VERSION
+  git add .
+  git commit -m "Querydsl $VERSION"
+  git push origin querydsl-$VERSION
+  # TODO create PR
+}
+
+doit() {
+  git checkout master
+  git pull --ff-only
+  export GPG_TTY=$(tty)
+  mvn clean deploy -DskipTests -Pall -Dgpg.skip=false -Dgpg.keyname=57312C37B064EE0FDAB0130490D5CE79E1DE6A2C -Denforcer.skip=true
+  ./dist.sh
+  ssh -i ~/.ssh/querydsl.com root@querydsl.com "mkdir /var/www/html/static/querydsl/$VERSION"
+  scp -r -i ~/.ssh/querydsl.com target/dist/* root@querydsl.com:/var/www/html/static/querydsl/$VERSION/
+  ssh root@querydsl.com "cd /var/www/html/static/querydsl && unlink latest && ln -sT $VERSION latest"
+  git tag $TAG
+  git push --tags
+  echo -e "Don't forget \x1b[33mquerydsl-contrib\x1b[m."
+}
+
+post() {
+  echo "post release stuff"
+  # TODO update querydsl.com
+  # TODO close github milestone
+  # TODO bump version
+}
+
+if [ “$1” == “pre” ]; then
+  pre
+elif [ “$1” == “doit” ]; then
+  doit
+elif [ “$1” == “post” ]; then
+  post
+else
+  echo "./release (pre|doit|post) VERSION"
+fi
diff --git a/querydsl-root/src/main/assembly.xml b/src/main/assembly.xml
similarity index 87%
rename from querydsl-root/src/main/assembly.xml
rename to src/main/assembly.xml
index 8fea4e7a7d..ececdf6bad 100644
--- a/querydsl-root/src/main/assembly.xml
+++ b/src/main/assembly.xml
@@ -8,7 +8,7 @@
   </formats>
   <files>
     <file>
-      <source>../querydsl-root/LICENSE.txt</source>
+      <source>../LICENSE.txt</source>
       <outputDirectory>/</outputDirectory>
     </file>
   </files>
@@ -45,7 +45,7 @@
     </fileSet>
 
     <fileSet>
-      <directory>../querydsl-core/target</directory>
+      <directory>querydsl-core/target</directory>
       <includes>
         <include>*-sources.jar</include>
       </includes>
@@ -62,7 +62,5 @@
       <scope>compile</scope>
       <outputDirectory>lib/all</outputDirectory>
     </dependencySet>
-    <!-- <dependencySet> <scope>provided</scope> <outputDirectory>lib/all</outputDirectory> 
-      </dependencySet> -->
   </dependencySets>
 </assembly>
diff --git a/src/main/resources/querydsl_checks_base.xml b/src/main/resources/querydsl_checks_base.xml
new file mode 100644
index 0000000000..9f8d6bfe13
--- /dev/null
+++ b/src/main/resources/querydsl_checks_base.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <property name="charset" value="UTF-8"/>
+  <property name="fileExtensions" value="java, properties, xml"/>
+
+  <!-- maximum file length 2000 lines -->
+  <!-- <module name="FileLength"/> -->
+
+  <!-- check that there are no tab characters in the file -->
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
+  <module name="TreeWalker">
+
+    <!-- no trailing whitespace -->
+    <module name="RegexpSinglelineJava">
+      <property name="format" value="\S+\s+$"/>
+      <property name="message" value="Line has trailing spaces."/>
+      <property name="ignoreComments" value="true"/>
+    </module>
+
+    <module name="SuppressWarningsHolder"/>
+
+    <!-- <module name="ConstantName"/> -->
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <!-- FIXME, fails with _super in various places
+    <module name="MemberName"/>
+    -->
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="StaticVariableName"/>
+    <!-- FIXME, fails with various generated classes
+    <module name="TypeName"/>-->
+
+    <module name="IllegalImport">
+      <property name="illegalPkgs" value="junit.framework, sun" />
+    </module>
+
+    <!-- XXX <module name="RedundantImport"/> -->
+    <module name="UnusedImports">
+      <property name="processJavadoc" value="true"/>
+    </module>
+
+    <!-- <module name="ImportOrder">
+      <property name="groups" value="java,javax,org,com"/>
+      <property name="ordered" value="false"/>
+      <property name="option" value="top"/>
+      <property name="sortStaticImportsAlphabetically" value="true"/>
+    </module> -->
+
+    <!-- FIXME <module name="LineLength"> -->
+    <!-- FIXME <module name="MethodLength"/> -->
+
+    <module name="EmptyForIteratorPad"/>
+    <module name="MethodParamPad"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="AT , INC , DEC , UNARY_MINUS , UNARY_PLUS , BNOT , LNOT , DOT , ARRAY_DECLARATOR , INDEX_OP"/>
+    </module>
+    <module name="NoWhitespaceBefore"/>
+    <module name="ParenPad"/>
+    <module name="TypecastParenPad"/>
+
+    <module name="WhitespaceAfter">
+      <property name="tokens" value="SEMI, TYPECAST"/>
+    </module>
+    <module name="WhitespaceAround"/>
+
+    <module name="ModifierOrder"/>
+<!--    <module name="RedundantModifier"/>-->
+
+    <module name="EmptyBlock"/>
+    <module name="LeftCurly"/>
+    <module name="NeedBraces"/>
+    <module name="RightCurly"/>
+
+    <module name="EmptyStatement"/>
+    <module name="IllegalInstantiation"/>
+    <!-- FIXME <module name="InnerAssignment"/> -->
+    <module name="SimplifyBooleanExpression"/>
+    <!-- FIXME <module name="SimplifyBooleanReturn"/> -->
+
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+
+  </module>
+
+  <module name="SuppressWarningsFilter"/>
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLERULE:OFF: ([\w\|]+)"/>
+    <property name="onCommentFormat" value="CHECKSTYLERULE:ON: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
+  </module>
+
+  <module name="SuppressWarningsFilter"/>
+
+  <module name="UniqueProperties"/>
+
+</module>
\ No newline at end of file
diff --git a/src/main/resources/querydsl_checks_main.xml b/src/main/resources/querydsl_checks_main.xml
new file mode 100644
index 0000000000..8489cbf7c8
--- /dev/null
+++ b/src/main/resources/querydsl_checks_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <property name="charset" value="UTF-8"/>
+  <property name="fileExtensions" value="java, properties, xml"/>
+
+  <module name="JavadocPackage"/>
+
+  <module name="TreeWalker">
+
+    <module name="JavadocType">
+      <property name="scope" value="public"/>
+      <!-- needed for Maven plugin javadocs -->
+      <property name="allowUnknownTags" value="true"/>
+    </module>
+
+    <module name="JavadocStyle">
+      <property name="checkFirstSentence" value="false"/>
+      <property name="checkEmptyJavadoc" value="true"/>
+    </module>
+
+  </module>
+
+</module>
\ No newline at end of file